[PATCH] Documentation: update french translation of user-manual

Guillaume GARDET guillaume.gardet at free.fr
Wed Sep 9 05:54:50 PDT 2015


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

---
 Documentation/50-pot/subsurface-manual.pot  | 2630 ++++++------
 Documentation/fr/po/subsurface-manual.fr.po | 2630 ++++++------
 Documentation/user-manual_fr.html.git       | 6149 +++++++++++++--------------
 Documentation/user-manual_fr.txt            |  358 +-
 4 files changed, 5480 insertions(+), 6287 deletions(-)

diff --git a/Documentation/50-pot/subsurface-manual.pot b/Documentation/50-pot/subsurface-manual.pot
index f129fac..4bc7550 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 at subsurface-divelog.org\n"
-"POT-Creation-Date: 2015-09-08 10:29+0200\n"
+"POT-Creation-Date: 2015-09-09 14:50+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -241,7 +241,7 @@ msgstr ""
 #. type: Target for macro image
 #: ./user-manual.txt:127
 #, no-wrap
-msgid "images/main_window_f20.jpg"
+msgid "images/main_window_f22.jpg"
 msgstr ""
 
 #. type: Plain text
@@ -440,7 +440,7 @@ msgstr ""
 #. type: Target for macro image
 #: ./user-manual.txt:210
 #, no-wrap
-msgid "images/AddDive1_f20.jpg"
+msgid "images/AddDive1_f22.jpg"
 msgstr ""
 
 #. type: Plain text
@@ -453,407 +453,31 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:216 ./user-manual.txt:820
+#: ./user-manual.txt:216 ./user-manual.txt:646
 #, no-wrap
-msgid "images/BlueEditBar_f20.jpg"
+msgid "images/BlueEditBar_f22.jpg"
 msgstr ""
 
 #. type: Plain text
 #: ./user-manual.txt:223
 msgid ""
-"The _Save_ button should only be selected after all the parts of a dive have "
-"been entered.  When entering dives by hand, the _Info_, _Equipment_ and "
-"_Profile_ tabs should be completed before saving the information. By "
-"selecting the _Save_ 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."
+"The _Apply changes_ button should only be selected after all the parts of a "
+"dive have been entered.  When entering dives by hand, the _Info_, "
+"_Equipment_ and _Profile_ tabs should be completed before saving the "
+"information. By selecting the _Apply changes_ 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."
 msgstr ""
 
 #. type: Title ====
-#: ./user-manual.txt:224 ./user-manual.txt:700
-#, no-wrap
-msgid "Notes"
-msgstr ""
-
-#. 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 *Notes* tab, the following "
-"fields are visible:"
-msgstr ""
-
-#. type: Target for macro image
-#: ./user-manual.txt:231
-#, no-wrap
-msgid "images/AddDive2_f20.jpg"
-msgstr ""
-
-#. type: Plain text
-#: ./user-manual.txt:240
-msgid ""
-"The *Time* 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 "
-"box and by overtyping the information displayed. The default date is the "
-"present date and the default time is an hour in advance of the present time."
-msgstr ""
-
-#. type: Plain text
-#: ./user-manual.txt:247
-#, no-wrap
-msgid ""
-"*Air and water temperatures*: the air and water temperatures during the\n"
-"dive can be typed directly on the fields to the right of the Start time.\n"
-"Temperature units are not needed, as they will be automatically supplied "
-"by\n"
-"_Subsurface_. Only the numerical value must be\n"
-"typed by the user (the units selected in the 'Preferences'\n"
-"will determine whether metric or imperial units are used).\n"
-msgstr ""
-
-#. type: Plain text
-#: ./user-manual.txt:252
-#, no-wrap
-msgid ""
-"*Location*: Here the name of the dive site can be entered, e.g. \"Tihany, "
-"Lake\n"
-"Balaton,\n"
-"Hungary\". Auto completion of location names will make this easier if one\n"
-"frequently dives at the same sites.\n"
-msgstr ""
-
-#. type: Plain text
-#: ./user-manual.txt:255 ./user-manual.txt:738
-#, no-wrap
-msgid ""
-"*Coordinates*: The geographic coordinates of the dive site should be "
-"entered\n"
-"here. These can come from three sources:\n"
-msgstr ""
-
-#. type: Plain text
-#: ./user-manual.txt:262
-msgid ""
-"One can find the coordinates on the world map in the bottom right hand part "
-"of the Subsurface window. The map displays a green bar indicating \"No "
-"location data - Move the map and double-click to set the dive "
-"location\". Upon a double-click at the appropriate place, the green bar "
-"disappears and the coordinates are stored."
-msgstr ""
-
-#. type: Plain text
-#: ./user-manual.txt:267
-msgid ""
-"The coordinates can be obtained from the _Subsurface_ Companion app if the "
-"user has an Android or iPhone device with GPS and if the coordinates of the "
-"dive site were stored using that device.  xref:S_Companion[Click here for "
-"more information]"
-msgstr ""
-
-#. type: Plain text
-#: ./user-manual.txt:270 ./user-manual.txt:753
-msgid ""
-"The coordinates can be entered by hand if they are known, using one of four "
-"formats with latitude followed by longitude:"
-msgstr ""
-
-#. type: Plain text
-#: ./user-manual.txt:275 ./user-manual.txt:758
-msgid ""
-"ISO 6709 Annex D format e.g. 30°13'28.9\"N 30°49'1.5\"E Degrees and decimal "
-"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"
-msgstr ""
-
-#. type: Plain text
-#: ./user-manual.txt:279
-msgid ""
-"Southern hemisphere latitudes are given with a *S*, e.g. S30°, or with a "
-"negative value, e.g. -30.22496. Similarly western longitudes are given with "
-"a *W*, e.g. W07°, or with a negative value, e.g. -7.34323."
-msgstr ""
-
-#. type: Plain text
-#: ./user-manual.txt:282
-msgid ""
-"Some keyboards don't have the degree sign (°). It can be replaced by a d "
-"like that: N30d W20d."
-msgstr ""
-
-#. type: Plain text
-#: ./user-manual.txt:288
-msgid ""
-"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)."
-msgstr ""
-
-#. type: Plain text
-#: ./user-manual.txt:293
-#, no-wrap
-msgid ""
-"*Dive mode*: This is a dropdown box allowing one to choose the type of "
-"dive\n"
-"performed. The options are OC (Open Circuit, the default setting, meant for "
-"most recreational dives),\n"
-"Freedive (dive without SCUBA equipment), CCR (Closed-circuit\n"
-"rebreather) and pSCR (Passive semi-closed rebreather).\n"
-msgstr ""
-
-#. type: Plain text
-#: ./user-manual.txt:298
-#, no-wrap
-msgid ""
-"*Divemaster*: The name of the dive master or dive guide for this dive can "
-"be\n"
-"entered here.\n"
-"Again, this field offers auto completion based on the list of dive masters "
-"in\n"
-"the current logbook.\n"
-msgstr ""
-
-#. type: Plain text
-#: ./user-manual.txt:302
-#, no-wrap
-msgid ""
-"*Buddy*: In this field one can enter the name(s) of the buddy / buddies\n"
-"(separated by commas) who accompanied the user on the dive. Auto "
-"completion\n"
-"is offered based on the list of buddies in the current logbook.\n"
-msgstr ""
-
-#. type: Plain text
-#: ./user-manual.txt:307
-#, no-wrap
-msgid ""
-"*Suit*: The type of diving suit used for the dive can be entered here.\n"
-"As with the other items, auto completion of the suit description is "
-"available.\n"
-"Some dry-suit users may choose to use this field to record what combination "
-"of\n"
-"suit and thermal protection undersuit was used.\n"
-msgstr ""
-
-#. type: Plain text
-#: ./user-manual.txt:310 ./user-manual.txt:791
-#, no-wrap
-msgid ""
-"*Rating*: One can provide a subjective overall rating of the dive on a\n"
-"5-point scale by clicking the appropriate star on the rating scale.\n"
-msgstr ""
-
-#. type: Plain text
-#: ./user-manual.txt:314 ./user-manual.txt:795
-#, no-wrap
-msgid ""
-"*Visibility*: Similarly, one can provide a rating of visibility during the\n"
-"dive on a\n"
-"5-point scale by clicking the appropriate star.\n"
-msgstr ""
-
-#. type: Plain text
-#: ./user-manual.txt:320
-#, no-wrap
-msgid ""
-"*Tags*: Tags that describe the type of dive performed may\n"
-"be entered here (separated by commas). Examples of common tags are boat, "
-"drift,\n"
-"training, cave etc. _Subsurface_ has many built-in tags. Auto completion is "
-"once again offered.\n"
-"For instance, if +cav+ was typed, then the tags *cave* and *cavern* are\n"
-"shown for the user to choose from.\n"
-msgstr ""
-
-#. type: Plain text
-#: ./user-manual.txt:322
-#, no-wrap
-msgid "*Notes*: Any additional information can be typed here.\n"
-msgstr ""
-
-#. type: Plain text
-#: ./user-manual.txt:327 ./user-manual.txt:811
-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 Notes panel:"
-msgstr ""
-
-#. type: Target for macro image
-#: ./user-manual.txt:328 ./user-manual.txt:812
-#, no-wrap
-msgid "images/CompletedDiveInfo_f20.jpg"
-msgstr ""
-
-#. type: Title ====
-#: ./user-manual.txt:330 ./user-manual.txt:814
-#, no-wrap
-msgid "Equipment"
-msgstr ""
-
-#. type: Plain text
-#: ./user-manual.txt:337
-msgid ""
-"The Equipment tab allows the user to enter information about the type of "
-"cylinder and gas used, as well as the weights used for a dive. This is a "
-"highly interactive part of _Subsurface_ and the information on cylinders and "
-"gases (entered here) affects the behaviour of the dive profile (top "
-"right-hand panel)."
-msgstr ""
-
-#. type: Plain text
-#: ./user-manual.txt:341 ./user-manual.txt:830
-#, no-wrap
-msgid ""
-"*Cylinders*: The cylinder information is entered through a dialogue that "
-"looks\n"
-"like this:\n"
-msgstr ""
-
-#. type: Target for macro image
-#: ./user-manual.txt:342
-#, no-wrap
-msgid "images/Gas_dialogue1_f20.jpg"
-msgstr ""
-
-#. type: Plain text
-#: ./user-manual.txt:350
-msgid ""
-"The + button at the top right allows the user to add more cylinders for this "
-"dive.  The dark dustbin icon on the left allows one to delete information "
-"for a particular cylinder. Note that it is not possible to delete a cylinder "
-"if it is used during the dive. One cylinder is implicitly used in the dive, "
-"even without a gas change event. Thus the first cylinder cannot be deleted "
-"until another cylinder is created."
-msgstr ""
-
-#. type: Plain text
-#: ./user-manual.txt:355
-msgid ""
-"Start by selecting a cylinder type on the left-hand side of the table.  To "
-"select a cylinder, click in the *Type* box.  This brings up a button that "
-"can be used to display a dropdown list of cylinders:"
-msgstr ""
-
-#. type: Target for macro image
-#: ./user-manual.txt:356
-#, no-wrap
-msgid "images/Gas_dialogue2_f20.jpg"
-msgstr ""
-
-#. type: Plain text
-#: ./user-manual.txt:364
-msgid ""
-"The drop-down list can be used to select the cylinder type used for the dive "
-"or the user may start typing in the box which shows the available options "
-"for the entered characters. The *Size* of the cylinder as well as its "
-"working pressure (*WorkPress*) will automatically be shown in the "
-"dialogue. If a cylinder is not shown in the dropdown list, type the name and "
-"description of that cylinder into the *Type* field."
-msgstr ""
-
-#. type: Plain text
-#: ./user-manual.txt:369
-msgid ""
-"Next, indicate the starting pressure and the ending pressure of the gas used "
-"during the dive. The unit of pressure (metric/imperial) corresponds to the "
-"setting in the _Preferences_."
-msgstr ""
-
-#. type: Plain text
-#: ./user-manual.txt:380
-msgid ""
-"Finally, type in the gas mixture used in the *O2%* field. If air was used, a "
-"value of 21% can be entered on this field, or it might be left blank. If "
-"nitrox or trimix were used, their percentages of oxygen and/or helium must "
-"be specified.  Any inappropriate fields should be left empty. After typing "
-"the information for the cylinder, press _ENTER_ on the keyboard or click "
-"outside the cell that contains the cursor. Information for any additional "
-"cylinders can be added by using the + button at the top right "
-"hand. Following is an example of a complete description for a dive made "
-"using two cylinders (air and EAN50):"
-msgstr ""
-
-#. type: Target for macro image
-#: ./user-manual.txt:381 ./user-manual.txt:868
-#, no-wrap
-msgid "images/CylinderDataEntry3_f20.jpg"
-msgstr ""
-
-#. type: Plain text
-#: ./user-manual.txt:387
-#, no-wrap
-msgid ""
-"*Weights*: Information about the weight system used during a dive can be "
-"entered\n"
-"using a dialogue very similar to that for the cylinder information. If the "
-"user\n"
-"clicks the + button on the top right of the weights dialogue, the table "
-"looks\n"
-"like this:\n"
-msgstr ""
-
-#. type: Target for macro image
-#: ./user-manual.txt:388 ./user-manual.txt:876
-#, no-wrap
-msgid "images/WeightsDataEntry1_f20.jpg"
-msgstr ""
-
-#. type: Plain text
-#: ./user-manual.txt:392
-msgid ""
-"If one then clicks on the *Type* field, a drop-down list becomes accessible "
-"through a down-arrow:"
-msgstr ""
-
-#. type: Target for macro image
-#: ./user-manual.txt:393 ./user-manual.txt:881
-#, no-wrap
-msgid "images/WeightsDataEntry2_f20.jpg"
-msgstr ""
-
-#. type: Plain text
-#: ./user-manual.txt:407
-msgid ""
-"The drop-down list can then be used to select the type of weight system or "
-"the user may start typing in the box which shows the available options for "
-"the entered characters. In the *Weight* field, the weight used during the "
-"dive must be typed. After typing the information for the weight system the "
-"user must either press _ENTER_ on the keyboard or click outside the cell "
-"that contains the cursor. It is possible to enter information for more than "
-"one weight system by adding an additional system using the + button on the "
-"top right hand. Weight systems can be deleted using the dustbin icon on the "
-"left hand. Here is an example of information for a dive with two types of "
-"weights: integrated and a weight belt:"
-msgstr ""
-
-#. type: Target for macro image
-#: ./user-manual.txt:408 ./user-manual.txt:897
-#, no-wrap
-msgid "images/WeightsDataEntry3_f20.jpg"
-msgstr ""
-
-#. type: Plain text
-#: ./user-manual.txt:412
-msgid ""
-"There's NO need to click the _Save_ button before the dive profile has been "
-"completed."
-msgstr ""
-
-#. type: Title ====
-#: ./user-manual.txt:414
+#: ./user-manual.txt:225
 #, no-wrap
 msgid "Creating a Dive Profile"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:421
+#: ./user-manual.txt:232
 msgid ""
 "The *Dive Profile* (a graphical representation of the depth of the dive as a "
 "function of time) is indicated in the panel on the top right hand of the "
@@ -863,13 +487,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:422
+#: ./user-manual.txt:233
 #, no-wrap
 msgid "images/DiveProfile1_f20.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:440
+#: ./user-manual.txt:251
 msgid ""
 "_Modifying the dive profile_: When the cursor is moved around the dive "
 "profile, its position is indicated by two coloured lines (red and green) as "
@@ -888,13 +512,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:441
+#: ./user-manual.txt:252
 #, no-wrap
 msgid "images/DiveProfile2_f20.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:453
+#: ./user-manual.txt:265
 msgid ""
 "_Specifying the gas composition:_ The gas composition used is clearly "
 "indicated along the line segments of the dive profile. This defaults to the "
@@ -904,62 +528,40 @@ msgid ""
 "waypoint and selecting the appropriate gas from the context menu. Changing "
 "the gas for a waypoint affects the gas shown in the segment _to the left_ of "
 "that waypoint. Note that only the gases defined in the *Equipment* tab "
-"appear in the context menu."
+"appear in the context menu. Below is the profile of a dive to 25 m for 30 "
+"min and with a switch from air to EAN50 at the end of the duration at 20m."
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:454
+#: ./user-manual.txt:266
 #, no-wrap
 msgid "images/DiveProfile3_f20.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:459
-msgid ""
-"Below is the profile of a dive to 25 m for 30 min and with a switch from air "
-"to EAN50 at the end of the duration at 20m. In this case the first cylinder "
-"in the *Equipment* tab contained air and the second cylinder contained "
-"EAN50."
-msgstr ""
-
-#. type: Target for macro image
-#: ./user-manual.txt:460
-#, no-wrap
-msgid "images/DiveProfile4_f20.jpg"
-msgstr ""
-
-#. type: Title ====
-#: ./user-manual.txt:462
-#, no-wrap
-msgid "Saving the hand-entered dive information"
-msgstr ""
-
-#. type: Plain text
-#: ./user-manual.txt:473
+#: ./user-manual.txt:273
 msgid ""
-"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)."
+"With the profile having been defined, more details must be added in order to "
+"have a fuller record of the dive. To do this, the *Notes* and the "
+"*Equipment* tabs on the top left hand of the _Subsurface_ window should be "
+"used. Click on xref:S_Notes_dc[*this link*] for instructions to use these "
+"tabs."
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:475
+#: ./user-manual.txt:275
 #, no-wrap
 msgid "Importing new dive information from a Dive Computer"
 msgstr ""
 
 #. type: Title ====
-#: ./user-manual.txt:477
+#: ./user-manual.txt:277
 #, no-wrap
 msgid "Connecting and importing data from a dive computer."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:488
+#: ./user-manual.txt:288
 msgid ""
 "The use of dive computers allows the collection of a large amount of "
 "information about each dive, e.g. a detailed record of depth, duration, "
@@ -972,13 +574,13 @@ msgid ""
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: ./user-manual.txt:489 ./user-manual.txt:3012
+#: ./user-manual.txt:289 ./user-manual.txt:2838
 #, no-wrap
 msgid "images/icons/warning2.png"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:500
+#: ./user-manual.txt:300
 msgid ""
 "Several dive computers consume more power when they are in their "
 "PC-Communication mode. **This could drain the dive computer's battery**. We "
@@ -990,7 +592,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:516
+#: ./user-manual.txt:316
 msgid ""
 "To import dive information from a dive computer to a computer with "
 "_Subsurface_, it is necessary that the two pieces of equipment communicate "
@@ -1007,47 +609,47 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:519
+#: ./user-manual.txt:319
 msgid ""
 "After this, the dive computer can be hooked up to the user's PC, which can "
 "be achieved by following these steps:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:521
+#: ./user-manual.txt:321
 msgid "The interface cable should be connected to a free USB port (or the Infra-red"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:522
+#: ./user-manual.txt:322
 msgid "or Bluetooth connection set up as described later in this manual)"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:524
+#: ./user-manual.txt:324
 msgid "The dive computer should be placed into PC Communication mode."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:525
+#: ./user-manual.txt:325
 msgid "(Users should refer to the manual of their specific dive computer)"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:529
+#: ./user-manual.txt:329
 msgid ""
 "In _Subsurface_, from the Main Menu, the user must select _Import -> Import "
 "From Dive Computer_.  Dialogue *A* in the figure below appears:"
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:531
+#: ./user-manual.txt:331
 #, no-wrap
 msgid "images/DC_import_f20.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:542
+#: ./user-manual.txt:342
 msgid ""
 "Dive computers tend to keep a certain number of dives in their memory, even "
 "though these dives have already been imported to _Subsurface_. For that "
@@ -1061,7 +663,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:549
+#: ./user-manual.txt:349
 msgid ""
 "The dialogue has two drop-down lists, *Vendor* and *Dive Computer*. On the "
 "*vendor* drop-down list select the make of the computer, e.g.  Suunto, "
@@ -1071,7 +673,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:560
+#: ./user-manual.txt:360
 msgid ""
 "The *Device or Mount Point* drop-down list contains the USB or Bluetooth "
 "port name that _Subsurface_ needs in order to communicate with the dive "
@@ -1086,7 +688,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:570
+#: ./user-manual.txt:370
 msgid ""
 "If all the dives on the dive computer need to be downloaded, check the "
 "checkbox _Force download of all dives_. Normally, _Subsurface_ only "
@@ -1101,7 +703,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:576
+#: ./user-manual.txt:376
 msgid ""
 "If the checkbox _Always prefer downloaded dives_ has been checked and, "
 "during download, dives with identical date-times exist on the dive computer "
@@ -1110,14 +712,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:579
+#: ./user-manual.txt:379
 msgid ""
 "The checkbox marked _Download into new trip_ ensures that, after upload, the "
 "downloaded dives are grouped together as a new trip(s) in the *Dive List*."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:583
+#: ./user-manual.txt:383
 msgid ""
 "Do *not* check the checkboxes labelled _Save libdivecomputer logfile_ and "
 "_Save libdivecomputer dumpfile_. These are only used as diagnostic tools "
@@ -1125,14 +727,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:586
+#: ./user-manual.txt:386
 msgid ""
 "Then select the _Download_ button. After successful download, Dialogue *B* "
 "in the figure above appears."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:601
+#: ./user-manual.txt:401
 msgid ""
 "With communication established, one can see how the data are retrieved from "
 "the dive computer.  Depending on the make of the dive computer and/or number "
@@ -1148,7 +750,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:608
+#: ./user-manual.txt:408
 msgid ""
 "After the dives have been downloaded, they appear in a tabular format on the "
 "righthand side of the dialogue (see image *B*, above). Each dive comprises a "
@@ -1159,14 +761,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:611
+#: ./user-manual.txt:411
 msgid ""
 "After this has been completed, select the OK button.  The checked dives are "
 "transfered to the *Dive List*."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:615
+#: ./user-manual.txt:415
 msgid ""
 "If there is a problem in communicating with the dive computer, an error "
 "message will be shown, similar to this text: \"Unable to open /dev/ttyUSB0 "
@@ -1174,36 +776,36 @@ msgid ""
 msgstr ""
 
 #. type: delimited block *
-#: ./user-manual.txt:619
+#: ./user-manual.txt:419
 #, no-wrap
 msgid "*PROBLEMS WITH DATA DOWNLOAD FROM A DIVE COMPUTER?*\n"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: ./user-manual.txt:619 ./user-manual.txt:1185 ./user-manual.txt:1251 ./user-manual.txt:1304 ./user-manual.txt:1380 ./user-manual.txt:1691
+#: ./user-manual.txt:419 ./user-manual.txt:1011 ./user-manual.txt:1077 ./user-manual.txt:1130 ./user-manual.txt:1206 ./user-manual.txt:1517
 #, no-wrap
 msgid "images/icons/important.png"
 msgstr ""
 
 #. type: delimited block *
-#: ./user-manual.txt:622
+#: ./user-manual.txt:422
 msgid "Check the following:"
 msgstr ""
 
 #. type: delimited block *
-#: ./user-manual.txt:625
+#: ./user-manual.txt:425
 msgid "Is the dive computer still in PC-communication or Upload mode?"
 msgstr ""
 
 #. type: delimited block *
-#: ./user-manual.txt:628
+#: ./user-manual.txt:428
 msgid ""
 "Is the battery of the dive computer fully charged? If not then the battery "
 "must be charged or replaced."
 msgstr ""
 
 #. type: delimited block *
-#: ./user-manual.txt:632
+#: ./user-manual.txt:432
 msgid ""
 "Is the connecting cable faulty? Does the cable work perfectly using other "
 "software? Has it worked before, or is this the first time the cable is being "
@@ -1211,7 +813,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block *
-#: ./user-manual.txt:637
+#: ./user-manual.txt:437
 msgid ""
 "Consult "
 "xref:_appendix_a_operating_system_specific_information_for_importing_dive_information_from_a_dive_computer[Appendix "
@@ -1219,7 +821,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block *
-#: ./user-manual.txt:641
+#: ./user-manual.txt:441
 msgid ""
 "On Unix-like operating systems, does the user have write permission to the "
 "USB port? If not, consult "
@@ -1228,7 +830,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block *
-#: ./user-manual.txt:649
+#: ./user-manual.txt:449
 msgid ""
 "If the _Subsurface_ computer does not recognise the USB adaptor by showing "
 "an appropriate device name next to the Mount Point, then there is a "
@@ -1241,7 +843,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block *
-#: ./user-manual.txt:652
+#: ./user-manual.txt:452
 #, no-wrap
 msgid ""
 "\tSave libdivecomputer logfile\n"
@@ -1249,7 +851,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block *
-#: ./user-manual.txt:658
+#: ./user-manual.txt:458
 #, no-wrap
 msgid ""
 "*Important*: These check boxes are only used when problems are encountered\n"
@@ -1262,7 +864,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block *
-#: ./user-manual.txt:662
+#: ./user-manual.txt:462
 #, no-wrap
 msgid ""
 "*Important:* _After downloading with the above checkboxes\n"
@@ -1271,7 +873,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block *
-#: ./user-manual.txt:665
+#: ./user-manual.txt:465
 #, no-wrap
 msgid ""
 "\tsubsurface.log\n"
@@ -1279,7 +881,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block *
-#: ./user-manual.txt:671
+#: ./user-manual.txt:471
 msgid ""
 "These files should be send to the _Subsurface_ mail list: "
 "_subsurface at subsurface-divelog.org_ with a request for the files to be "
@@ -1288,13 +890,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: ./user-manual.txt:674
+#: ./user-manual.txt:474
 #, no-wrap
 msgid "Changing the name of a dive computer"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:690
+#: ./user-manual.txt:490
 msgid ""
 "It may be necessary to distinguish between different dive computers used to "
 "upload dive logs to _Subsurface_. For instance if one's partner's dive "
@@ -1313,13 +915,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: ./user-manual.txt:692
+#: ./user-manual.txt:492
 #, no-wrap
 msgid "Updating the dive information imported from the dive computer."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:699
+#: ./user-manual.txt:499
 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 "
@@ -1327,37 +929,52 @@ msgid ""
 "on the top left hand of the _Subsurface_ window should be used."
 msgstr ""
 
+#. type: Title ====
+#: ./user-manual.txt:501
+#, no-wrap
+msgid "Notes"
+msgstr ""
+
 #. type: Plain text
-#: ./user-manual.txt:710
+#: ./user-manual.txt:506
 msgid ""
-"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 *Notes* tab, the following "
-"fields are visible:"
+"The user needs to add additional information by hand in order to have a more "
+"complete dive record. The information below is almost identical for "
+"hand-entered dives and for dives downloaded from a dive computer."
+msgstr ""
+
+#. type: Plain text
+#: ./user-manual.txt:516
+msgid ""
+"In some cases, one has to provide the date and time of the dive, e.g. when "
+"entering a dive by hand or when a dive computer does not privide the date "
+"and time of the dive.  (Often, the date and time of the dive, gas mixture "
+"and water temperature are usually shown as obtained from the dive computer)  "
+"If the contents of the *Notes 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 (left hand image, below):"
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:711
+#: ./user-manual.txt:517
 #, no-wrap
-msgid "images/AddDive3_f20.jpg"
+msgid "images/AddDive3_f22.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:719
+#: ./user-manual.txt:526
 msgid ""
-"The *Time* 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 "
-"by overtyping the information displayed."
+"The right hand image, above, shows a *Notes tab* filled with dive "
+"information.  The *Time* 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 by overtyping the information displayed."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:730
+#: ./user-manual.txt:537
 #, no-wrap
 msgid ""
 "*Air/water temperatures*: Air and water temperatures during the dive are "
@@ -1381,54 +998,121 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:735
+#: ./user-manual.txt:550
+#, no-wrap
+msgid ""
+"*Location*: Here the name of the dive site can be entered, e.g. \"Tihany, "
+"Lake\n"
+"Balaton, Hungary\". Dive locations are managed as a separate part of the "
+"dive log.\n"
+"After entering the information for a particilar dive site, and several dives "
+"are\n"
+"performed at the same location, the information is re-used without "
+"requiring\n"
+"full dive site information again. Existing dive location information\n"
+"can be edited at any time by selecting (on the *Dive List* panel) a dive "
+"performed at that site\n"
+"and by opening the location information by clicking the globe button on "
+"the\n"
+"right of the location name (see image on the right above). When entering a "
+"dive location name, auto completion of\n"
+"location names makes it easy to select a dive site that already exists in "
+"the dive log\n"
+"(i.e. when typing in the name of a dive site,\n"
+"a dropdown list appears showing all sites with similar names). If the dive\n"
+"site has been used before, click on the already-existing name.\n"
+msgstr ""
+
+#. type: Plain text
+#: ./user-manual.txt:553
+msgid ""
+"If the present dive site has not been used before, a message appears as "
+"follows (image *A* below):"
+msgstr ""
+
+#. type: Target for macro image
+#: ./user-manual.txt:554
 #, no-wrap
+msgid "images/Locations1_f22.jpg"
+msgstr ""
+
+#. type: Plain text
+#: ./user-manual.txt:559
 msgid ""
-"*Location*: In this field one should type in text that describes the site\n"
-"where the dive was performed, e.g. \"Tihany, Lake Balaton, Hungary\".\n"
-"Auto completion of location names will\n"
-"make this easier if one frequently dives at the same sites.\n"
+"Click the + icon on the right hand side. A panel appears to enter the "
+"coordinates and other important information about the site (image *B*, "
+"above). The most important items are the coordinates of the site. There are "
+"three ways of specifying the coordinates:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:745
+#: ./user-manual.txt:566
 msgid ""
-"The user can find the coordinates on the world map in the bottom right hand "
-"part of the Subsurface window. The map displays a green bar indicating "
-"\"Move the map and double-click to set the dive location\". Double-click at "
-"the appropriate place, the green bar disappears and the coordinates are "
-"stored."
+"One can find the coordinates on the world map in the bottom right hand part "
+"of the Subsurface window. The map displays an orange bar indicating \"No "
+"location data - Move the map and double-click to set the dive "
+"location\". Upon a double-click at the appropriate place, the orange bar "
+"disappears and the coordinates are stored."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:750
+#: ./user-manual.txt:571
 msgid ""
-"The user can obtain the coordinates from the _Subsurface_ Companion app if "
-"an Android or iPhone device with GPS was used and if the coordinates of the "
+"The coordinates can be obtained from the _Subsurface_ Companion app if the "
+"user has an Android or iPhone device with GPS and if the coordinates of the "
 "dive site were stored using that device.  xref:S_Companion[Click here for "
 "more information]"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:762
+#: ./user-manual.txt:574
+msgid ""
+"The coordinates can be entered by hand if they are known, using one of four "
+"formats with latitude followed by longitude:"
+msgstr ""
+
+#. type: Plain text
+#: ./user-manual.txt:579
+msgid ""
+"ISO 6709 Annex D format e.g. 30°13'28.9\"N 30°49'1.5\"E Degrees and decimal "
+"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"
+msgstr ""
+
+#. type: Plain text
+#: ./user-manual.txt:584
 msgid ""
 "Southern hemisphere latitudes are given with a *S*, e.g. S30°, or with a "
-"negative value, e.g. -30.22496. Similarly, western longitudes are given with "
-"a *W*, e.g. W07°, or with a negative value, e.g. -7.34323."
+"negative value, e.g. -30.22496. Similarly western longitudes are given with "
+"a *W*, e.g. W07°, or with a negative value, e.g. -7.34323. Some keyboards "
+"don't have the degree sign (°). It can be replaced by a *d* like this: N30d "
+"W20d."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:768
+#: ./user-manual.txt:590
+#, no-wrap
 msgid ""
-"Please note that GPS coordinates of a dive site are linked to the Location "
+"*Important*: GPS coordinates of a dive site are linked to the Location\n"
 "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)."
+"description\n"
+"will cause unexpected behaviour (Subsurface will think that all of these\n"
+"dives have the same location and try to keep their GPS coordinates the\n"
+"same).\n"
+msgstr ""
+
+#. type: Plain text
+#: ./user-manual.txt:595
+msgid ""
+"Enter any other textual information about the dive site (Description and "
+"Notes), then select _Apply Changes_ to save the information for this dive "
+"site. At a later stage the dive site information can be edited by clicking "
+"the globe icon to the right of the dive site name in the *Notes tab*."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:773
+#: ./user-manual.txt:600
 #, no-wrap
 msgid ""
 "*Dive mode*: This is a dropdown box allowing one to choose the type of "
@@ -1440,7 +1124,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:778
+#: ./user-manual.txt:605
 #, no-wrap
 msgid ""
 "*Divemaster*: The name of the dive master or dive guide for this dive should "
@@ -1451,7 +1135,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:783
+#: ./user-manual.txt:610
 #, no-wrap
 msgid ""
 "*Buddy*: In this field, one enters the name(s) of the buddy / buddies\n"
@@ -1462,7 +1146,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:788
+#: ./user-manual.txt:615
 #, no-wrap
 msgid ""
 "*Suit*: Here the type of diving suit used for the dive can be entered.\n"
@@ -1473,7 +1157,24 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:804
+#: ./user-manual.txt:618
+#, no-wrap
+msgid ""
+"*Rating*: One can provide a subjective overall rating of the dive on a\n"
+"5-point scale by clicking the appropriate star on the rating scale.\n"
+msgstr ""
+
+#. type: Plain text
+#: ./user-manual.txt:622
+#, no-wrap
+msgid ""
+"*Visibility*: Similarly, one can provide a rating of visibility during the\n"
+"dive on a\n"
+"5-point scale by clicking the appropriate star.\n"
+msgstr ""
+
+#. type: Plain text
+#: ./user-manual.txt:631
 #, no-wrap
 msgid ""
 "*Tags*: Tags that describe the type of dive performed can be entered\n"
@@ -1490,13 +1191,29 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:806
+#: ./user-manual.txt:633
 #, no-wrap
 msgid "*Notes*: Any additional information for the dive can be entered here.\n"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:819
+#: ./user-manual.txt:638
+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. The image "
+"xref:S_Notes_dc[at the beginning of this section] shows an example of a "
+"*Notes tab* containing dive information."
+msgstr ""
+
+#. type: Title ====
+#: ./user-manual.txt:640
+#, no-wrap
+msgid "Equipment"
+msgstr ""
+
+#. type: Plain text
+#: ./user-manual.txt:645
 msgid ""
 "The Equipment tab allows one to enter information about the type of cylinder "
 "and gas used as well as the weights used for the dive. The message in a blue "
@@ -1504,23 +1221,33 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:826
+#: ./user-manual.txt:652
 msgid ""
 "indicates that the dive is being edited. This is a highly interactive part "
 "of _Subsurface_ and the information on cylinders and gases (entered here) "
 "determines the behaviour of the dive profile (top right-hand panel)."
 msgstr ""
 
+#. type: Plain text
+#: ./user-manual.txt:656
+#, no-wrap
+msgid ""
+"*Cylinders*: The cylinder information is entered through a dialogue that "
+"looks\n"
+"like this:\n"
+msgstr ""
+
 #. type: Target for macro image
-#: ./user-manual.txt:831
+#: ./user-manual.txt:657
 #, no-wrap
 msgid "images/DC_gas-dialogue1_f20.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:839
+#: ./user-manual.txt:666
 msgid ""
-"In most cases _Subsurface_ obtains the gas used from the dive computer and "
+"For hand-entered dives, this information needs to be typed in. For dive "
+"computers _Subsurface_ often obtains the gas used from the dive computer and "
 "automatically inserts the gas composition(% oxygen) in the table. The + "
 "button at the top right allows the user to add more cylinders for this "
 "dive. The dark dustbin icon on the left allows the deletion of information "
@@ -1530,7 +1257,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:844
+#: ./user-manual.txt:671
 msgid ""
 "The user should start by selecting a cylinder type on the left-hand side of "
 "the table.  To select a cylinder, the *cylinder type* box should be "
@@ -1539,13 +1266,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:845
+#: ./user-manual.txt:672
 #, no-wrap
 msgid "images/DC_gas-dialogue2_f20.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:852
+#: ./user-manual.txt:679
 msgid ""
 "The drop-down list can then be used to select the cylinder type that was "
 "used for this dive or the user may start typing in the box which shows the "
@@ -1555,7 +1282,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:856
+#: ./user-manual.txt:683
 msgid ""
 "Next one must indicate the starting pressure and the ending pressure of the "
 "specified gas during the dive. The unit of pressure (metric/imperial)  "
@@ -1563,7 +1290,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:867
+#: ./user-manual.txt:694
 msgid ""
 "Finally, provide the gas mixture used. If air was used, the value of 21% can "
 "be entered or this field can be left blank. If nitrox or trimix were used, "
@@ -1575,8 +1302,14 @@ msgid ""
 "of a complete description for a dive using two cylinders (air and EAN50):"
 msgstr ""
 
+#. type: Target for macro image
+#: ./user-manual.txt:695
+#, no-wrap
+msgid "images/CylinderDataEntry3_f20.jpg"
+msgstr ""
+
 #. type: Plain text
-#: ./user-manual.txt:875
+#: ./user-manual.txt:702
 #, no-wrap
 msgid ""
 "*Weights*: Information about the weight system used can be entered\n"
@@ -1587,15 +1320,27 @@ msgid ""
 "this:\n"
 msgstr ""
 
+#. type: Target for macro image
+#: ./user-manual.txt:703
+#, no-wrap
+msgid "images/WeightsDataEntry1_f20.jpg"
+msgstr ""
+
 #. type: Plain text
-#: ./user-manual.txt:880
+#: ./user-manual.txt:707
 msgid ""
 "By clicking on the *Type* field, a drop-down list becomes accessible through "
 "a down-arrow:"
 msgstr ""
 
+#. type: Target for macro image
+#: ./user-manual.txt:708
+#, no-wrap
+msgid "images/WeightsDataEntry2_f20.jpg"
+msgstr ""
+
 #. type: Plain text
-#: ./user-manual.txt:896
+#: ./user-manual.txt:723
 msgid ""
 "The drop-down list can then be used to select the type of weight system used "
 "during the dive or the user may start typing in the box which shows the "
@@ -1609,14 +1354,20 @@ msgid ""
 "weights: integrated as well as a weight belt:"
 msgstr ""
 
+#. type: Target for macro image
+#: ./user-manual.txt:724
+#, no-wrap
+msgid "images/WeightsDataEntry3_f20.jpg"
+msgstr ""
+
 #. type: Title ====
-#: ./user-manual.txt:899
+#: ./user-manual.txt:726
 #, no-wrap
 msgid "Editing several selected dives simultaneously"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:914
+#: ./user-manual.txt:741
 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 "
@@ -1634,7 +1385,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:924
+#: ./user-manual.txt:751
 msgid ""
 "The simultaneous editing only works with fields that do not already contain "
 "information.  This means that, if some fields have been edited for a "
@@ -1649,7 +1400,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:933
+#: ./user-manual.txt:760
 msgid ""
 "_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 "
@@ -1664,13 +1415,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: ./user-manual.txt:934
+#: ./user-manual.txt:761
 #, no-wrap
 msgid "Adding Bookmarks to a dive"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:939
+#: ./user-manual.txt:766
 msgid ""
 "Many divers wish to annotate their dives with text that indicate particular "
 "events during the dive, e.g. \"Saw dolphins\", or \"Released surface "
@@ -1678,7 +1429,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:943
+#: ./user-manual.txt:770
 msgid ""
 "Right-click at the appropriate point on the dive profile.  This brings up "
 "the dive profile context menu. Select _Add bookmark_. A red flag is placed "
@@ -1687,52 +1438,53 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:945
+#: ./user-manual.txt:772
 msgid ""
 "Right-click on the red flag. This brings up the context menu (see *B* "
 "below). Select _Edit name_."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:948
+#: ./user-manual.txt:775
 msgid ""
 "A text box is shown. Type the explanatory text for the bookmark (see *C* "
 "below). Select _OK_.  This saves the text associated with the bookmark."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:951
+#: ./user-manual.txt:778
 msgid ""
 "If one hovers using the mouse over the red bookmark, the appropriate text is "
 "shown at the bottom of the information box (see *D* below)."
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:952
+#: ./user-manual.txt:779
 #, no-wrap
 msgid "images/Bookmarks.jpg"
 msgstr ""
 
 #. type: Title ====
-#: ./user-manual.txt:955
+#: ./user-manual.txt:782
 #, no-wrap
 msgid "Saving the updated dive information"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:967
+#: ./user-manual.txt:793
 msgid ""
 "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 _Apply changes_ button is clicked, the dive data are saved in the memory "
+"image of the dive. If the _Discard changes_ button is clicked, then the "
+"newly entered dive data are erased from the computer memory, although the "
+"dive profile is retained. When the user exits _Subsurface_ there is a final "
+"prompt to confirm that the new data should now be saved permanently on the "
+"computer disk."
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:968
+#: ./user-manual.txt:794
 #, no-wrap
 msgid ""
 "Importing dive information from other digital data sources or other data "
@@ -1740,7 +1492,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:994
+#: ./user-manual.txt:820
 msgid ""
 "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 "
@@ -1762,7 +1514,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1003
+#: ./user-manual.txt:829
 msgid ""
 "If the format of other software is supported natively on Subsurface, it "
 "should be sufficient to select either _Import -> Import log files_ or _File "
@@ -1775,13 +1527,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: ./user-manual.txt:1004
+#: ./user-manual.txt:830
 #, no-wrap
 msgid "Using the universal import dialogue"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1010
+#: ./user-manual.txt:836
 msgid ""
 "Importing dives from other software is performed through a universal "
 "interface that is activated by selecting _Import_ from the Main Menu, then "
@@ -1789,13 +1541,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:1011
+#: ./user-manual.txt:837
 #, no-wrap
 msgid "images/Import1_f20.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1016
+#: ./user-manual.txt:842
 msgid ""
 "Towards the bottom right is a dropdown selector with a default label of "
 "_Dive Log Files_ which gives access to the different types of direct imports "
@@ -1803,44 +1555,44 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1018
+#: ./user-manual.txt:844
 msgid ""
 "XML-formatted dive logs (DivingLog 5.0, MacDive and several other dive log "
 "systems)"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1019
+#: ./user-manual.txt:845
 msgid "UDDF-formatted dive logs (e.g. Kenozoooid)"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1020
+#: ./user-manual.txt:846
 msgid "UDCF-formatted dive logs"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1021
+#: ./user-manual.txt:847
 msgid "Poseidon MkVI CCR logs"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1022
+#: ./user-manual.txt:848
 msgid "JDiveLog"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1023
+#: ./user-manual.txt:849
 msgid "Suunto Dive Manager (DM3 and DM4)"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1024
+#: ./user-manual.txt:850
 msgid "CSV (text-based and spreadsheet-based) dive logs, including APD CCR logs"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1028
+#: ./user-manual.txt:854
 msgid ""
 "Selecting the appropriate file in the file list of the dialogue opens the "
 "imported dive log in the _Subsurface_ *Dive List*. Some other formats, not "
@@ -1849,13 +1601,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: ./user-manual.txt:1029
+#: ./user-manual.txt:855
 #, no-wrap
 msgid "Importing from  OSTCTools"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1038
+#: ./user-manual.txt:864
 msgid ""
 "_OSTC Tools_ is a Microsoft-based suite of dive download and dive management "
 "tools for the OSTC family of dive computers. _OSTC Tools_ downloads dive "
@@ -1868,7 +1620,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1042
+#: ./user-manual.txt:868
 msgid ""
 "Actually, every H&W device supported by OSTCTools can be imported to "
 "_Subsurface_, this includes OSTC, OSTC Mk2, OSTC 2N/2C, OSTC3, OSTC Sport, "
@@ -1876,7 +1628,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1047
+#: ./user-manual.txt:873
 msgid ""
 "Please, remember that OSTCTools is *not* a true diving log software, but a "
 "useful set of tools for analysis and management of OSTC devices. This way, "
@@ -1886,13 +1638,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: ./user-manual.txt:1049
+#: ./user-manual.txt:875
 #, no-wrap
 msgid "Importing from Mares Dive Organiser V2.1"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1056
+#: ./user-manual.txt:882
 msgid ""
 "Since Mares utilise proprietary Windows software not compatible with "
 "multi-platform applications, these dive logs cannot be directly imported "
@@ -1902,7 +1654,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1061
+#: ./user-manual.txt:887
 msgid ""
 "The dive log data from Mares Dive Organiser need to be exported to the "
 "user's desktop, using a _.sdf_ file name extension. Refer to "
@@ -1910,7 +1662,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1067
+#: ./user-manual.txt:893
 msgid ""
 "Data should then be imported into _www.divelogs.de_. One needs to create a "
 "user account in _www.divelogs.de_, log into that web site, then select "
@@ -1920,20 +1672,20 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1069
+#: ./user-manual.txt:895
 msgid ""
 "Finally, import the dives from _divelogs.de_ to _Subsurface_, using the "
 "instructions below."
 msgstr ""
 
 #. type: Title ====
-#: ./user-manual.txt:1072
+#: ./user-manual.txt:898
 #, no-wrap
 msgid "Importing dives from *divelogs.de*"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1085
+#: ./user-manual.txt:911
 msgid ""
 "The import of dive information from _divelogs.de_ is simple, using a single "
 "dialogue box. The _Import -> Import from Divelogs.de_ option should be "
@@ -1947,19 +1699,19 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:1086
+#: ./user-manual.txt:912
 #, no-wrap
 msgid "images/Divelogs1.jpg"
 msgstr ""
 
 #. type: Title ====
-#: ./user-manual.txt:1089
+#: ./user-manual.txt:915
 #, no-wrap
 msgid "Importing data in CSV format"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1100
+#: ./user-manual.txt:926
 msgid ""
 "A comma-separated file (.csv) can be used to import dive information either "
 "as dive profiles (as in the case of the APD Inspiration and Evolution closed "
@@ -1975,13 +1727,13 @@ msgid ""
 msgstr ""
 
 #. type: Title =====
-#: ./user-manual.txt:1102
+#: ./user-manual.txt:928
 #, no-wrap
 msgid "Importing dives in CSV format from dive computers or other dive log software"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1107
+#: ./user-manual.txt:933
 msgid ""
 "One can view a _CSV_ file by using an ordinary text editor. It is normally "
 "organised into a single line that provides the headers (or _field names_ or "
@@ -1990,14 +1742,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1109
+#: ./user-manual.txt:935
 msgid ""
 "There are two types of _CSV_ dive logs that can be imported into "
 "_Subsurface_:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1115
+#: ./user-manual.txt:941
 msgid ""
 "_CSV dive details_: This dive log format contains similar information to "
 "that of a typical written dive log, e.g. dive date and time, dive depth, "
@@ -2008,7 +1760,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1124
+#: ./user-manual.txt:950
 msgid ""
 "_CSV dive profile_: This dive log format includes much more information "
 "about a single dive. For instance there may be information at 30-second "
@@ -2022,14 +1774,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1127
+#: ./user-manual.txt:953
 msgid ""
 "Before being able to import the _CSV_ data to _Subsurface_ *one needs to "
 "know a few things about the data being imported*:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1135
+#: ./user-manual.txt:961
 msgid ""
 "Which character separates the different columns within a single line of "
 "data? This field separator should be either a comma (,) or a TAB character.  "
@@ -2041,7 +1793,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1139
+#: ./user-manual.txt:965
 msgid ""
 "Which data columns need to be imported into _Subsurface_? Is it a _CSV dive "
 "details_ file or a _CSV dive profile_ file? Open the file using a text "
@@ -2050,12 +1802,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1141
+#: ./user-manual.txt:967
 msgid "Is the numeric information (e.g. dive depth) in metric or in imperial unis?"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1148
+#: ./user-manual.txt:974
 msgid ""
 "Armed with this information, importing the data into _Subsurface_ is "
 "straightforward. Select _Import -> Import Log Files_ from the main menu. In "
@@ -2065,13 +1817,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:1149
+#: ./user-manual.txt:975
 #, no-wrap
 msgid "images/csv_import1_f20.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1160
+#: ./user-manual.txt:986
 msgid ""
 "Notice that, at the top left, there is a dropdown list containing "
 "pre-configured settings for some of the more common dive computers and "
@@ -2086,7 +1838,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1174
+#: ./user-manual.txt:1000
 msgid ""
 "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 "
@@ -2105,13 +1857,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:1175
+#: ./user-manual.txt:1001
 #, no-wrap
 msgid "images/csv_import2_f20.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1181
+#: ./user-manual.txt:1007
 msgid ""
 "Continue in this way to ensure that all the column headings in the blue row "
 "of cells correspond to the headings listed in the top part of the "
@@ -2121,13 +1873,13 @@ msgid ""
 msgstr ""
 
 #. type: delimited block *
-#: ./user-manual.txt:1185
+#: ./user-manual.txt:1011
 #, no-wrap
 msgid "*A Diver's Introduction to _CSV_ Files*\n"
 msgstr ""
 
 #. type: delimited block *
-#: ./user-manual.txt:1199
+#: ./user-manual.txt:1025
 msgid ""
 "_CSV_ is an abbreviation for a data file format: _Comma-Separated "
 "Values_. It is a file format allowing someone to view or edit the "
@@ -2144,7 +1896,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block *
-#: ./user-manual.txt:1208
+#: ./user-manual.txt:1034
 msgid ""
 "_CSV_ files can be created or edited with a normal text editor. The most "
 "important attribute of a _CSV_ file is the _field separator_, the character "
@@ -2160,7 +1912,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block *
-#: ./user-manual.txt:1214
+#: ./user-manual.txt:1040
 #, no-wrap
 msgid ""
 "\tDive site,Dive date,Time,Dive_duration, Dive_depth,Dive buddy\n"
@@ -2171,14 +1923,14 @@ msgid ""
 msgstr ""
 
 #. type: delimited block *
-#: ./user-manual.txt:1216
+#: ./user-manual.txt:1042
 msgid ""
 "In this format the data are not easily read by a human. Here is the same "
 "information in TAB-delimited format:"
 msgstr ""
 
 #. type: delimited block *
-#: ./user-manual.txt:1222
+#: ./user-manual.txt:1048
 #, no-wrap
 msgid ""
 "\tDive site\tDive date\tTime\tDive_duration\tDive_depth\tDive buddy\n"
@@ -2189,7 +1941,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block *
-#: ./user-manual.txt:1230
+#: ./user-manual.txt:1056
 msgid ""
 "It is clear why many people prefer the TAB-delimited format to the "
 "comma-delimited format. The disadvantage is that one cannot see the TAB "
@@ -2203,7 +1955,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block *
-#: ./user-manual.txt:1241
+#: ./user-manual.txt:1067
 #, no-wrap
 msgid ""
 "\tDive Time (s)\tDepth (m)\tpO₂ - Setpoint (Bar) \tpO₂ - C1 Cell 1 "
@@ -2220,7 +1972,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block *
-#: ./user-manual.txt:1247
+#: ./user-manual.txt:1073
 msgid ""
 "When a _CSV_ file is selected for import, _Subsurface_ displays the column "
 "headers as well as some of the data in the first few lines of the _CSV_ "
@@ -2231,7 +1983,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1261
+#: ./user-manual.txt:1087
 msgid ""
 "The _CSV_ import has a couple of caveats. One should avoid some special "
 "characters like ampersand (&), less than (<), greater than (>) and double "
@@ -2244,7 +1996,7 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:1264
+#: ./user-manual.txt:1090
 #, no-wrap
 msgid ""
 "Importing GPS coordinates with the _Subsurface Companion App_ for mobile "
@@ -2252,7 +2004,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1273
+#: ./user-manual.txt:1099
 msgid ""
 "Using the *Subsurface Companion App* on an _Android device_ with a GPS or "
 "xref:S_iphone[_iPhone_], the coordinates for the diving location can be "
@@ -2262,18 +2014,18 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1275
+#: ./user-manual.txt:1101
 msgid "To do this:"
 msgstr ""
 
 #. type: Title ====
-#: ./user-manual.txt:1276
+#: ./user-manual.txt:1102
 #, no-wrap
 msgid "Create a Companion App account"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1281
+#: ./user-manual.txt:1107
 msgid ""
 "Register on the http://api.hohndel.org/login/[_Subsurface companion web "
 "page_].  A confirmation email with instructions and a personal *DIVERID* "
@@ -2282,7 +2034,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1286
+#: ./user-manual.txt:1112
 msgid ""
 "Download the app from "
 "https://play.google.com/store/apps/details?id=org.subsurface[Google Play "
@@ -2291,18 +2043,18 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: ./user-manual.txt:1287
+#: ./user-manual.txt:1113
 #, no-wrap
 msgid "Using the Subsurface companion app on an Android smartphone"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1290
+#: ./user-manual.txt:1116
 msgid "On first use the app has three options:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1296
+#: ./user-manual.txt:1122
 msgid ""
 "_Create a new account._ Equivalent to registering in _Subsurface_ companion "
 "page using an Internet browser. One can request a *DIVERID* using this "
@@ -2312,14 +2064,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1299
+#: ./user-manual.txt:1125
 msgid ""
 "_Retrieve an account._ If users forgot their *DIVERID* they will receive an "
 "email to recover the number."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1303
+#: ./user-manual.txt:1129
 msgid ""
 "_Use an existing account._ Users are prompted for their *DIVERID*. The app "
 "saves this *DIVERID* and does not ask for it again unless one uses the "
@@ -2327,7 +2079,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1311
+#: ./user-manual.txt:1137
 msgid ""
 "In the _Subsurface_ main program, the *DIVERID* should also be entered on "
 "the Default Preferences panel, obtained by selecting _File -> Preferences -> "
@@ -2336,13 +2088,13 @@ msgid ""
 msgstr ""
 
 #. type: Title =====
-#: ./user-manual.txt:1312
+#: ./user-manual.txt:1138
 #, no-wrap
 msgid "Creating new dive locations"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1317
+#: ./user-manual.txt:1143
 msgid ""
 "Now one is ready to get a dive position and send it to the server. The "
 "Android display will look like the left hand image (*A*) below, but without "
@@ -2350,21 +2102,21 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1320
+#: ./user-manual.txt:1146
 msgid ""
 "Touch the \"+\" icon on the top right to add a new dive site, a menu will be "
 "showed with 3 options:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1323
+#: ./user-manual.txt:1149
 msgid ""
 "Current: A prompt for a place name (or a request to activate the GPS if it "
 "is turned off) will be displayed, after which the current location is saved."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1332
+#: ./user-manual.txt:1158
 msgid ""
 "Use Map: This option allows the user to fix a position by searching a world "
 "map. A world map is shown (see *B* below) on which one should indicate the "
@@ -2377,13 +2129,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:1333
+#: ./user-manual.txt:1159
 #, no-wrap
 msgid "images/Companion_5.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1341
+#: ./user-manual.txt:1167
 msgid ""
 "Import local GPX file: The android device searches for .gpx files and "
 "located archives will be shown. The selected .gpx file is opened and the "
@@ -2393,13 +2145,13 @@ msgid ""
 msgstr ""
 
 #. type: Title =====
-#: ./user-manual.txt:1342
+#: ./user-manual.txt:1168
 #, no-wrap
 msgid "Dive lists of dive locations"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1350
+#: ./user-manual.txt:1176
 msgid ""
 "The main screen shows a list of dive locations, each with a name, date and "
 "time (see *A* below). Some locations may have an arrow-up icon over the "
@@ -2411,7 +2163,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1358
+#: ./user-manual.txt:1184
 msgid ""
 "Dive locations in this list can be viewed in two ways: a list of locations "
 "or a map indicating the dive locations. The display mode (List or Map) is "
@@ -2423,13 +2175,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:1359
+#: ./user-manual.txt:1185
 #, no-wrap
 msgid "images/Companion_4.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1365
+#: ./user-manual.txt:1191
 msgid ""
 "When one clicks on a dive (*not* selecting the check box), the name given to "
 "it, date/time and GPS coordinates will be shown, with two options at the top "
@@ -2437,32 +2189,32 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1367
+#: ./user-manual.txt:1193
 msgid ""
 "Edit (pencil): Change the text name or other characteristics of the dive "
 "location."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1369
+#: ./user-manual.txt:1195
 msgid "Maps: Display a map showing the dive location."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1372
+#: ./user-manual.txt:1198
 msgid ""
 "After editing and saving a dive location (see *C* above), one needs to "
 "upload it to the web service, as explained below."
 msgstr ""
 
 #. type: Title =====
-#: ./user-manual.txt:1373
+#: ./user-manual.txt:1199
 #, no-wrap
 msgid "Uploading dive locations"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1379
+#: ./user-manual.txt:1205
 msgid ""
 "There are several ways to send locations to the server.  The easiest is by "
 "simply selecting the locations (See *A* below) and then touching the right "
@@ -2470,51 +2222,51 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1384
+#: ./user-manual.txt:1210
 msgid ""
 "Users must be careful, as the trash icon on the right means exactly what it "
 "should; it deletes the selected dive location(s)."
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:1385
+#: ./user-manual.txt:1211
 #, no-wrap
 msgid "images/Companion_1.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1390
+#: ./user-manual.txt:1216
 msgid ""
 "After a dive trip using the Companion App, all dive locations are ready to "
 "be downloaded to a _Subsurface_ dive log (see below)."
 msgstr ""
 
 #. type: Title =====
-#: ./user-manual.txt:1392
+#: ./user-manual.txt:1218
 #, no-wrap
 msgid "Settings on the Companion app"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1395
+#: ./user-manual.txt:1221
 msgid ""
 "Selecting the _Settings_ menu option results in the right hand image above "
 "(*B*)."
 msgstr ""
 
 #. type: Title =====
-#: ./user-manual.txt:1396
+#: ./user-manual.txt:1222
 #, no-wrap
 msgid "Server and account"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1399
+#: ./user-manual.txt:1225
 msgid "_Web-service URL._ This is predefined (http://api.hohndel.org/)"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1403
+#: ./user-manual.txt:1229
 msgid ""
 "_User ID._ The DIVERID obtained by registering as described above. The "
 "easiest way to obtain it is simply to copy and paste from the confirmation "
@@ -2522,33 +2274,33 @@ msgid ""
 msgstr ""
 
 #. type: Title =====
-#: ./user-manual.txt:1404
+#: ./user-manual.txt:1230
 #, no-wrap
 msgid "Synchronisation"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1408
+#: ./user-manual.txt:1234
 msgid ""
 "_Synchronize on startup._ If selected, dive locations in the Android device "
 "and those on the web service synchronise each time the app is started."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1411
+#: ./user-manual.txt:1237
 msgid ""
 "_Upload new dives._ If selected, each time the user adds a dive location it "
 "is automatically sent to the server."
 msgstr ""
 
 #. type: Title =====
-#: ./user-manual.txt:1412
+#: ./user-manual.txt:1238
 #, no-wrap
 msgid "Background service"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1415
+#: ./user-manual.txt:1241
 msgid ""
 "Instead of entering a unique dive location, users can leave the service "
 "running in the background of their Android device, allowing the continuous "
@@ -2556,35 +2308,35 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1418
+#: ./user-manual.txt:1244
 msgid "The settings below define the behaviour of the service:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1421
+#: ./user-manual.txt:1247
 msgid ""
 "_Min duration._ In minutes. The app will try to get a location every X "
 "minutes until stopped by the user."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1423
+#: ./user-manual.txt:1249
 msgid "_Min distance._ In meters. Minimum distance between two locations."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1425
+#: ./user-manual.txt:1251
 msgid "_Name template._ The name the app will use when saving the locations."
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: ./user-manual.txt:1426 ./user-manual.txt:1523 ./user-manual.txt:1939
+#: ./user-manual.txt:1252 ./user-manual.txt:1349 ./user-manual.txt:1765
 #, no-wrap
 msgid "images/icons/info.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1436
+#: ./user-manual.txt:1262
 msgid ""
 "_How does the background service work?_ Assuming the user sets 5 minutes and "
 "50 meters in the settings above, the app will start by recording a location "
@@ -2597,60 +2349,60 @@ msgid ""
 msgstr ""
 
 #. type: Title =====
-#: ./user-manual.txt:1437
+#: ./user-manual.txt:1263
 #, no-wrap
 msgid "Other"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1441
+#: ./user-manual.txt:1267
 msgid ""
 "_Mailing List._ The mail box for _Subsurface_. Users can send an email to "
 "the Subsurface mailing list."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1443
+#: ./user-manual.txt:1269
 msgid "_Subsurface website._ A link to the URL of Subsurface web"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1445
+#: ./user-manual.txt:1271
 msgid "_Version._ Displays the current version of the Companion App."
 msgstr ""
 
 #. type: Title =====
-#: ./user-manual.txt:1446
+#: ./user-manual.txt:1272
 #, no-wrap
 msgid "Search"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1449
+#: ./user-manual.txt:1275
 msgid "Search the saved dive locations by name or by date and time."
 msgstr ""
 
 #. type: Title =====
-#: ./user-manual.txt:1450
+#: ./user-manual.txt:1276
 #, no-wrap
 msgid "Start service"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1453
+#: ./user-manual.txt:1279
 msgid ""
 "Initiates the _background service_ following the previously defined "
 "settings."
 msgstr ""
 
 #. type: Title =====
-#: ./user-manual.txt:1454
+#: ./user-manual.txt:1280
 #, no-wrap
 msgid "Disconnect"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1462
+#: ./user-manual.txt:1288
 msgid ""
 "This is a badly named option that disconnects the app from the server by "
 "resetting the user ID in the app, showing the first screen where an account "
@@ -2660,24 +2412,24 @@ msgid ""
 msgstr ""
 
 #. type: Title =====
-#: ./user-manual.txt:1463
+#: ./user-manual.txt:1289
 #, no-wrap
 msgid "Send all locations"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1466
+#: ./user-manual.txt:1292
 msgid "This option sends all locations stored in the Android device to the server."
 msgstr ""
 
 #. type: Title ====
-#: ./user-manual.txt:1468
+#: ./user-manual.txt:1294
 #, no-wrap
 msgid "Using the Subsurface companion app on an _iPhone_ to record dive locations"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1473
+#: ./user-manual.txt:1299
 msgid ""
 "The iPhone interface is quite simple. One needs to type the user ID "
 "(obtained during registration) into the space reserved for it, then select "
@@ -2686,13 +2438,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:1474
+#: ./user-manual.txt:1300
 #, no-wrap
 msgid "images/iphone.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1481
+#: ./user-manual.txt:1307
 msgid ""
 "Dives can be added automatically or manually. In manual mode, a dive "
 "location or waypoint is added to the GPS input stream. In automatic mode, a "
@@ -2706,7 +2458,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1487
+#: ./user-manual.txt:1313
 msgid ""
 "One can edit the site name afterwards by selecting the dive from the dive "
 "list and clicking on the site name. There are no other editable fields. The "
@@ -2715,13 +2467,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: ./user-manual.txt:1489
+#: ./user-manual.txt:1315
 #, no-wrap
 msgid "Downloading dive locations to the _Subsurface_ divelog"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1498
+#: ./user-manual.txt:1324
 msgid ""
 "Download dive(s) from a dive computer or enter them manually into "
 "_Subsurface_ before obtaining the GPS coordinates from the server. The "
@@ -2733,13 +2485,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:1499
+#: ./user-manual.txt:1325
 #, no-wrap
 msgid "images/DownloadGPS.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1507
+#: ./user-manual.txt:1333
 msgid ""
 "Note that the _Apply_ button is now active. By clicking on it, users can "
 "update the locations of the newly entered or uploaded dives in _Subsurface_ "
@@ -2750,7 +2502,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1514
+#: ./user-manual.txt:1340
 msgid ""
 "Since _Subsurface_ matches GPS locations from the Android device and dive "
 "information from the dive computer based on date-time data, automatic "
@@ -2762,7 +2514,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1522
+#: ./user-manual.txt:1348
 msgid ""
 "Similar date-times may not always be possible and there may be many reasons "
 "for this (e.g. time zones), or _Subsurface_ may be unable to decide which is "
@@ -2776,12 +2528,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1526
+#: ./user-manual.txt:1352
 msgid "TIPS:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1533
+#: ./user-manual.txt:1359
 msgid ""
 "_Background service_, being a very powerful tool, may fill the location list "
 "with many unnecessary locations not corresponding to the exact dive point "
@@ -2794,7 +2546,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1537
+#: ./user-manual.txt:1363
 msgid ""
 "It may also make sense to give informative names to the locations sent to "
 "the web server, or at least to use an informative name in the _Name "
@@ -2803,13 +2555,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:1539
+#: ./user-manual.txt:1365
 #, no-wrap
 msgid "Adding photographs to dives"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1545
+#: ./user-manual.txt:1371
 msgid ""
 "Many (if not most) divers take a camera with them and take photographs "
 "during a dive. One would like to associate each photograph with a specific "
@@ -2818,13 +2570,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: ./user-manual.txt:1546
+#: ./user-manual.txt:1372
 #, no-wrap
 msgid "Loading photos and getting synchronisation between dive computer and camera"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1550
+#: ./user-manual.txt:1376
 msgid ""
 "Left-lick on a dive or on a group of dives on the dive list. Then "
 "right-click on this dive or group of dives and choose the option _Load "
@@ -2832,26 +2584,26 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:1551
+#: ./user-manual.txt:1377
 #, no-wrap
 msgid "images/LoadImage1_f20.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1555
+#: ./user-manual.txt:1381
 msgid ""
 "The system file browser appears. Select the folder and photographs that need "
 "to be loaded into _Subsurface_ and click the _Open_ button."
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:1556
+#: ./user-manual.txt:1382
 #, no-wrap
 msgid "images/LoadImage2_f20.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1565
+#: ./user-manual.txt:1391
 msgid ""
 "This brings one to the time synchronisation dialog, shown below. The "
 "critical problem is that the time synchronisation is not perfect between the "
@@ -2862,12 +2614,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1567
+#: ./user-manual.txt:1393
 msgid "_Subsurface_ achieves this synchronisation in two ways:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1579
+#: ./user-manual.txt:1405
 #, no-wrap
 msgid ""
 "*Manually*: If the user wrote down the exact camera time at the start of a "
@@ -2894,13 +2646,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:1580
+#: ./user-manual.txt:1406
 #, no-wrap
 msgid "images/LoadImage3b_f20.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1598
+#: ./user-manual.txt:1424
 #, no-wrap
 msgid ""
 "*By photograph*: There is a very slick way of achieving synchronisation. If "
@@ -2933,7 +2685,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1601
+#: ./user-manual.txt:1427
 msgid ""
 "If the timestamp of a photograph is long before or after the dive, it is not "
 "placed on the dive profile. If the timestamp of the photo is within 30 "
@@ -2941,62 +2693,62 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: ./user-manual.txt:1602
+#: ./user-manual.txt:1428
 #, no-wrap
 msgid "Viewing the photos"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1606
+#: ./user-manual.txt:1432
 msgid ""
 "In order to view the photos added to a dive, activate the _show-photos_ "
 "button in the tool bar to the left of the dive profile:"
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:1607
+#: ./user-manual.txt:1433
 #, no-wrap
 msgid "images/icons/ShowPhotos_f20.png"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1610
+#: ./user-manual.txt:1436
 msgid "After the images have been loaded, they appear in two places:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1612
+#: ./user-manual.txt:1438
 msgid "the _Photos_ tab of the *Notes* panel."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1614
+#: ./user-manual.txt:1440
 msgid ""
 "as tiny icons (stubs) on the dive profile at the appropriate positions "
 "reflecting the time each photograph was taken. See below:"
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:1615
+#: ./user-manual.txt:1441
 #, no-wrap
 msgid "images/LoadImage4_f20.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1619
+#: ./user-manual.txt:1445
 msgid ""
 "If one hovers with the mouse over any of the photo icons, then a thumbnail "
 "photo is shown of the appropriate photo. See the image below:"
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:1620
+#: ./user-manual.txt:1446
 #, no-wrap
 msgid "images/LoadImage5_f20.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1629
+#: ./user-manual.txt:1455
 msgid ""
 "Clicking on the thumbnail brings up a full size photo overlaid on the "
 "_Subsurface_ window. This allows good viewing of the photographs that have "
@@ -3008,19 +2760,19 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:1630
+#: ./user-manual.txt:1456
 #, no-wrap
 msgid "images/LoadImage6_f20.jpg"
 msgstr ""
 
 #. type: Title ====
-#: ./user-manual.txt:1632
+#: ./user-manual.txt:1458
 #, no-wrap
 msgid "The _Photos_ tab"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1643
+#: ./user-manual.txt:1469
 msgid ""
 "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 "
@@ -3036,13 +2788,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: ./user-manual.txt:1644
+#: ./user-manual.txt:1470
 #, no-wrap
 msgid "Photos on an external hard disk"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1655
+#: ./user-manual.txt:1481
 msgid ""
 "Most underwater photographers store their photos on an external drive. If "
 "such a drive can be mapped (almost always the case) the photos can be "
@@ -3060,13 +2812,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: ./user-manual.txt:1657
+#: ./user-manual.txt:1483
 #, no-wrap
 msgid "Moving photographs among directories, hard disks or computers"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1667
+#: ./user-manual.txt:1493
 #, no-wrap
 msgid ""
 "After a photograph has been loaded into _Subsurface_ and associated with a "
@@ -3088,7 +2840,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1672
+#: ./user-manual.txt:1498
 #, no-wrap
 msgid ""
 "When a photo is loaded into _Subsurface_, a fingerprint for the image is "
@@ -3101,31 +2853,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1674
+#: ./user-manual.txt:1500
 msgid ""
 "look through a particular directory (and all its subdirectories recursively) "
 "where photos have been moved"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1675
+#: ./user-manual.txt:1501
 msgid "to,"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1677
+#: ./user-manual.txt:1503
 msgid "calculate fingerprints for all photos in this directory, and"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1679
+#: ./user-manual.txt:1505
 msgid ""
 "if there is a match between a calculated fingerprint and the one originally "
 "calculated when a photo was"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1681
+#: ./user-manual.txt:1507
 msgid ""
 "loaded into _Subsurface_ (even if the original file name has changed), to "
 "automatically update the directory information so that _Subsurface_ can find "
@@ -3133,7 +2885,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1686
+#: ./user-manual.txt:1512
 #, no-wrap
 msgid ""
 "This is achieved by selecting from the Main Menu: _File ->      Find moved "
@@ -3147,13 +2899,13 @@ msgid ""
 msgstr ""
 
 #. type: delimited block *
-#: ./user-manual.txt:1691
+#: ./user-manual.txt:1517
 #, no-wrap
 msgid "*Upgrading existing photo collections without fingerprints*\n"
 msgstr ""
 
 #. type: delimited block *
-#: ./user-manual.txt:1701
+#: ./user-manual.txt:1527
 msgid ""
 "Software for the automated update of existing photo collections is under "
 "developement. Currently single dives must be upgraded one at a time. Select "
@@ -3168,19 +2920,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:1705
+#: ./user-manual.txt:1531
 #, no-wrap
 msgid "Logging special types of dives"
 msgstr ""
 
 #. type: Title ====
-#: ./user-manual.txt:1708
+#: ./user-manual.txt:1534
 #, no-wrap
 msgid "Multicylinder dives"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1715
+#: ./user-manual.txt:1541
 msgid ""
 "_Subsurface_ easily handles dives involving more than one "
 "cylinder. Multicylinder diving usually happens (a) if a diver does not have "
@@ -3192,7 +2944,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1719
+#: ./user-manual.txt:1545
 #, no-wrap
 msgid ""
 "*Describe the cylinders used during the dive* This is performed in the "
@@ -3204,7 +2956,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1724
+#: ./user-manual.txt:1550
 #, no-wrap
 msgid ""
 "*Record the times at which switches from one cylinder to another was done:* "
@@ -3217,7 +2969,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1732
+#: ./user-manual.txt:1558
 #, no-wrap
 msgid ""
 "*Record the cylinder changes on the dive profile*: If the latter option\n"
@@ -3234,7 +2986,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1736
+#: ./user-manual.txt:1562
 msgid ""
 "Having performed these tasks, _Subsurface_ indicates the appropriate use of "
 "cylinders in the dive profile.  Below is a multi-cylinder dive, starting off "
@@ -3243,19 +2995,19 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:1737
+#: ./user-manual.txt:1563
 #, no-wrap
 msgid "images/multicylinder_dive.jpg"
 msgstr ""
 
 #. type: Title ====
-#: ./user-manual.txt:1739
+#: ./user-manual.txt:1565
 #, no-wrap
 msgid "Sidemount dives"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1745
+#: ./user-manual.txt:1571
 msgid ""
 "Sidemount diving is just another form of multicylinder diving, often with "
 "both or all cylinders having the same gas mixture. Although it is a popular "
@@ -3266,7 +3018,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1754
+#: ./user-manual.txt:1580
 #, no-wrap
 msgid ""
 "*During the dive, record cylinder switch events*. Since sidemount diving "
@@ -3288,7 +3040,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1757
+#: ./user-manual.txt:1583
 #, no-wrap
 msgid ""
 "*Within _Subsurface_ describe the cylinders used during the dive*. The diver "
@@ -3299,7 +3051,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1767
+#: ./user-manual.txt:1593
 #, no-wrap
 msgid ""
 "*Indicate cylinder change events on the _Subsurface_ dive profile*. Once the "
@@ -3324,32 +3076,32 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:1768
+#: ./user-manual.txt:1594
 #, no-wrap
 msgid "images/sidemount1.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1771
+#: ./user-manual.txt:1597
 msgid ""
 "This section gives an example of the versatility of _Subsurface_ as a dive "
 "logging tool."
 msgstr ""
 
 #. type: Title ====
-#: ./user-manual.txt:1774
+#: ./user-manual.txt:1600
 #, no-wrap
 msgid "Semi-closed circuit rebreather (SCR) dives"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: ./user-manual.txt:1776
+#: ./user-manual.txt:1602
 #, no-wrap
 msgid "images/halcyon_RB80.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1786
+#: ./user-manual.txt:1612
 msgid ""
 "Passive semi-closed rebreathers (pSCR) comprise a technical advance in "
 "diving equipment that recirculates the breathing gas that a diver breathes, "
@@ -3365,19 +3117,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1788
+#: ./user-manual.txt:1614
 msgid ""
 "To log pSCR dives, no special procedures are required, just the normal steps "
 "outlined above:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1790
+#: ./user-manual.txt:1616
 msgid "Select pSCR in the _Dive Mode_ dropdown list on the *Info* panel."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1794
+#: ./user-manual.txt:1620
 msgid ""
 "pSCR diving often involves gas changes, requiring an additional cylinder.  "
 "Define all the appropriate cylinders as described above and indicate the "
@@ -3386,7 +3138,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1799
+#: ./user-manual.txt:1625
 msgid ""
 "If a pSCR _Dive Mode_ has been selected, the dive ceiling for pSCR dives is "
 "adjusted for the oxygen drop across the mouthpiece which often requires "
@@ -3396,25 +3148,25 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:1800
+#: ./user-manual.txt:1626
 #, no-wrap
 msgid "images/pSCR_profile.jpg"
 msgstr ""
 
 #. type: Title ====
-#: ./user-manual.txt:1805
+#: ./user-manual.txt:1631
 #, no-wrap
 msgid "Closed circuit rebreather (CCR) dives"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: ./user-manual.txt:1807
+#: ./user-manual.txt:1633
 #, no-wrap
 msgid "images/APD.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1812
+#: ./user-manual.txt:1638
 msgid ""
 "Closed system rebreathers use advanced technology to recirculate gas that "
 "has been breathed while doing two things to maintain a breathable oxygen "
@@ -3422,12 +3174,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1813
+#: ./user-manual.txt:1639
 msgid "remove carbon dioxide from the gas that has been exhaled"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1822
+#: ./user-manual.txt:1648
 msgid ""
 "regulate the oxygen concentration to remain within safe diving limits.  The "
 "CCR interface of _Subsurface_ is currently experimental and under active "
@@ -3442,13 +3194,13 @@ msgid ""
 msgstr ""
 
 #. type: Title =====
-#: ./user-manual.txt:1823
+#: ./user-manual.txt:1649
 #, no-wrap
 msgid "Import a CCR dive"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1837
+#: ./user-manual.txt:1663
 msgid ""
 "See the section dealing with xref:S_ImportingAlienDiveLogs[Importing dive "
 "information from other digital sources]. From the main menu of _Subsurface_, "
@@ -3466,13 +3218,13 @@ msgid ""
 msgstr ""
 
 #. type: Title =====
-#: ./user-manual.txt:1838
+#: ./user-manual.txt:1664
 #, no-wrap
 msgid "Displayed information for a CCR dive"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1848
+#: ./user-manual.txt:1674
 msgid ""
 "_Partial pressures of gases_: The graph of oxygen partial pressure shows the "
 "information from the oxygen sensors of the CCR equipment. In contrast to "
@@ -3486,12 +3238,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1850
+#: ./user-manual.txt:1676
 msgid "For TWO O~2~ sensors the mean value of the two sensors are given."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1854
+#: ./user-manual.txt:1680
 msgid ""
 "For THREE-sensor systems (e.g. APD), the mean value is also used. However "
 "differences of more than 0,1 bar in the simultaneous readings of different "
@@ -3500,19 +3252,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1856
+#: ./user-manual.txt:1682
 msgid ""
 "If no sensor data is available, the pO~2~ value is assumed to be equal to "
 "the setpoint."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1858
+#: ./user-manual.txt:1684
 msgid "The mean pO~2~ of the sensors is indicated with a green line,"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1866
+#: ./user-manual.txt:1692
 msgid ""
 "The oxygen setpoint values as well as the readings from the individual "
 "oxygen sensors can be shown. The display of additional CCR information is "
@@ -3524,13 +3276,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:1867
+#: ./user-manual.txt:1693
 #, no-wrap
 msgid "images/CCR_preferences_f20.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1874
+#: ./user-manual.txt:1700
 msgid ""
 "Checking any of these check boxes allows the display of additional "
 "oxygen-related information whenever the pO~2~ toolbar button on the "
@@ -3541,13 +3293,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:1875
+#: ./user-manual.txt:1701
 #, no-wrap
 msgid "images/CCR_setpoint_f20.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1879
+#: ./user-manual.txt:1705
 msgid ""
 "The second checkbox allows the display of the data from each individual "
 "oxygen sensor of the CCR equipment. The data for each sensor is colour-coded "
@@ -3555,22 +3307,22 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1881
+#: ./user-manual.txt:1707
 msgid "Sensor 1: grey"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1882
+#: ./user-manual.txt:1708
 msgid "Sensor 2: blue"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1883
+#: ./user-manual.txt:1709
 msgid "Sensor 3: brown"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1887
+#: ./user-manual.txt:1713
 msgid ""
 "The mean oxygen pO~2~ is indicated by the green line. This allows the direct "
 "comparison of data from each of the oxygen sensors, useful for detecting "
@@ -3578,13 +3330,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:1888
+#: ./user-manual.txt:1714
 #, no-wrap
 msgid "images/CCR_sensor_data_f20.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1893
+#: ./user-manual.txt:1719
 msgid ""
 "The setpoint data can be overlaid on the oxygen sensor data by activating "
 "both of the above check boxes. Partial pressures for nitrogen (and helium, "
@@ -3592,7 +3344,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1897
+#: ./user-manual.txt:1723
 msgid ""
 "_Events_: Several events are logged, e.g. switching the mouthpiece to open "
 "circuit.  These events are indicated by yellow triangles and, if one hovers "
@@ -3601,7 +3353,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1905
+#: ./user-manual.txt:1731
 msgid ""
 "_Cylinder pressures_: Some CCR dive computers like the Poseidon MkVI record "
 "the pressures of the oxygen and diluent cylinders. The pressures of these "
@@ -3614,13 +3366,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:1906
+#: ./user-manual.txt:1732
 #, no-wrap
 msgid "images/CCR_dive_profile_f22.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1911
+#: ./user-manual.txt:1737
 msgid ""
 "_Equipment-specific information_: Equipment-specific information gathered by "
 "_Subsurface_ is shown in the xref:S_ExtraDataTab[Extra data tab]. This may "
@@ -3628,7 +3380,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1917
+#: ./user-manual.txt:1743
 msgid ""
 "The deco ceiling calculated by Subsurface is not very accurate because the "
 "precise pressure of nitrogen in the loop can usually not be determined from "
@@ -3640,13 +3392,13 @@ msgid ""
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: ./user-manual.txt:1918 ./user-manual.txt:2101
+#: ./user-manual.txt:1744 ./user-manual.txt:1927
 #, no-wrap
 msgid "images/icons/cceiling.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1923
+#: ./user-manual.txt:1749
 msgid ""
 "The default colour of the computer-generated deco ceiling is white. However, "
 "this can be set to red by checking the appropriate check box after selecting "
@@ -3655,13 +3407,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:1924
+#: ./user-manual.txt:1750
 #, no-wrap
 msgid "images/CCR_dive_ceilingF22.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1928
+#: ./user-manual.txt:1754
 msgid ""
 "More equipment-specific information for downloading CCR dive logs for "
 "Poseidon MkVI and APD equipment can be found in "
@@ -3670,19 +3422,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ==
-#: ./user-manual.txt:1929
+#: ./user-manual.txt:1755
 #, no-wrap
 msgid "Obtaining more information about dives entered into the logbook"
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:1931
+#: ./user-manual.txt:1757
 #, no-wrap
 msgid "The *Info* tab (for individual dives)"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1938
+#: ./user-manual.txt:1764
 msgid ""
 "The Info tab gives some summary information about a particular dive that has "
 "been selected in the *Dive List*. Useful information here includes the "
@@ -3692,7 +3444,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1945
+#: ./user-manual.txt:1771
 msgid ""
 "Gas consumption and SAC calculations: _Subsurface_ calculates SAC and Gas "
 "consumption taking in account gas incompressibility, particularly at tank "
@@ -3701,13 +3453,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:1947
+#: ./user-manual.txt:1773
 #, no-wrap
 msgid "The *Extra Data* tab (usually for individual dives)"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1955
+#: ./user-manual.txt:1781
 msgid ""
 "When using a dive computer, it often reports several data items that cannot "
 "easily be presented in a standardised way because the nature of the "
@@ -3719,19 +3471,19 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:1956
+#: ./user-manual.txt:1782
 #, no-wrap
 msgid "images/ExtraDataTab_f20.jpg"
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:1958
+#: ./user-manual.txt:1784
 #, no-wrap
 msgid "The *Stats* tab (for groups of dives)"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1969
+#: ./user-manual.txt:1795
 msgid ""
 "The Stats tab gives summary statistics for more than one dive, assuming that "
 "more than one dive has been selected in the *Dive List* using the standard "
@@ -3744,19 +3496,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:1971
+#: ./user-manual.txt:1797
 #, no-wrap
 msgid "The *Dive Profile*"
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:1973
+#: ./user-manual.txt:1799
 #, no-wrap
 msgid "images/Profile2.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1984
+#: ./user-manual.txt:1810
 msgid ""
 "Of all the panels in _Subsurface_, the Dive Profile contains the most "
 "detailed information about each dive. The Dive Profile has a *button bar* on "
@@ -3769,7 +3521,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block |
-#: ./user-manual.txt:1991
+#: ./user-manual.txt:1817
 #, no-wrap
 msgid ""
 "|*Colour*|*Descent speed (m/min)*|*Ascent speed (m/min)*\n"
@@ -3781,7 +3533,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1996
+#: ./user-manual.txt:1822
 msgid ""
 "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 "
@@ -3790,13 +3542,13 @@ msgid ""
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: ./user-manual.txt:1997
+#: ./user-manual.txt:1823
 #, no-wrap
 msgid "images/icons/scale.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2002
+#: ./user-manual.txt:1828
 msgid ""
 "In some cases the dive profile does not fill the whole area of the *Dive "
 "Profile* panel. Clicking the *Scale* button in the toolbar on the left of "
@@ -3805,7 +3557,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2005
+#: ./user-manual.txt:1831
 #, no-wrap
 msgid ""
 "*Water temperature* is displayed with its own blue line with temperature "
@@ -3814,7 +3566,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2012
+#: ./user-manual.txt:1838
 msgid ""
 "The dive profile can include graphs of the *partial pressures* of O2, N2, "
 "and He during the dive (see figure above) as well as a calculated and dive "
@@ -3825,13 +3577,13 @@ msgid ""
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: ./user-manual.txt:2013
+#: ./user-manual.txt:1839
 #, no-wrap
 msgid "images/icons/O2.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2017
+#: ./user-manual.txt:1843
 msgid ""
 "Clicking this button allows display of the partial pressure of *oxygen* "
 "during the dive. This is depicted below the dive depth and water temperature "
@@ -3839,26 +3591,26 @@ msgid ""
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: ./user-manual.txt:2018
+#: ./user-manual.txt:1844
 #, no-wrap
 msgid "images/icons/N2.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2021
+#: ./user-manual.txt:1847
 msgid ""
 "Clicking this button allows display of the partial pressure of *nitrogen* "
 "during the dive."
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: ./user-manual.txt:2022
+#: ./user-manual.txt:1848
 #, no-wrap
 msgid "images/icons/He.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2026
+#: ./user-manual.txt:1852
 msgid ""
 "Clicking this button allows display of the partial pressure of *helium* "
 "during the dive.  This is only of importance to divers using Trimix, "
@@ -3866,7 +3618,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2039
+#: ./user-manual.txt:1865
 msgid ""
 "The *air consumption* graph displays the tank pressure and its change during "
 "the dive. The air consumption takes depth into account so that even when "
@@ -3881,13 +3633,13 @@ msgid ""
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: ./user-manual.txt:2040
+#: ./user-manual.txt:1866
 #, no-wrap
 msgid "images/icons/Heartbutton.png"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2044
+#: ./user-manual.txt:1870
 msgid ""
 "Clicking on the heart rate button will allow the display of heart rate "
 "information during the dive if the dive computer was attached to a heart "
@@ -3895,7 +3647,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2052
+#: ./user-manual.txt:1878
 #, no-wrap
 msgid ""
 "It is possible to *zoom* into the profile graph. This is done either by "
@@ -3910,19 +3662,19 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:2053
+#: ./user-manual.txt:1879
 #, no-wrap
 msgid "images/MeasuringBar.png"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: ./user-manual.txt:2055
+#: ./user-manual.txt:1881
 #, no-wrap
 msgid "images/icons/ruler.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2063
+#: ./user-manual.txt:1889
 msgid ""
 "Measurements of *depth or time differences* can be achieved by using the "
 "*ruler button* on the left of the dive profile panel.  The measurement is "
@@ -3932,13 +3684,13 @@ msgid ""
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: ./user-manual.txt:2064
+#: ./user-manual.txt:1890
 #, no-wrap
 msgid "images/icons/ShowPhotos.png"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2071
+#: ./user-manual.txt:1897
 msgid ""
 "Photographs that have been added to a dive can be shown on the profile by "
 "selecting the *Show-photo* button. The position of a photo on the profile "
@@ -3947,7 +3699,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2100
+#: ./user-manual.txt:1926
 msgid ""
 "The profile can also include the dive computer reported *ceiling* (more "
 "precisely, the deepest deco stop that the dive computer calculated for each "
@@ -3977,7 +3729,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2106
+#: ./user-manual.txt:1932
 msgid ""
 "If the dive computer itself calculates a ceiling and makes it available to "
 "_Subsurface_ during upload of dives, this can be shown as a red area by "
@@ -3985,13 +3737,13 @@ msgid ""
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: ./user-manual.txt:2107
+#: ./user-manual.txt:1933
 #, no-wrap
 msgid "images/icons/ceiling1.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2112
+#: ./user-manual.txt:1938
 msgid ""
 "If the *Calculated ceiling* button on the Profile Panel is clicked, then a "
 "ceiling, calculated by _Subsurface_, is shown in green if it exists for a "
@@ -4000,13 +3752,13 @@ msgid ""
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: ./user-manual.txt:2113
+#: ./user-manual.txt:1939
 #, no-wrap
 msgid "images/icons/ceiling2.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2117
+#: ./user-manual.txt:1943
 msgid ""
 "If, in addition, the *show all tissues* button on the Profile Panel is "
 "clicked, the ceiling is shown for the tissue compartments following the "
@@ -4014,32 +3766,32 @@ msgid ""
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: ./user-manual.txt:2118
+#: ./user-manual.txt:1944
 #, no-wrap
 msgid "images/icons/ceiling3.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2122
+#: ./user-manual.txt:1948
 msgid ""
 "If, in addition, the *3m increments* button on the Profile Panel is clicked, "
 "then the ceiling is indicated in 3 m increments (*C* in figure below)."
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:2123
+#: ./user-manual.txt:1949
 #, no-wrap
 msgid "images/Ceilings2.jpg"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: ./user-manual.txt:2125
+#: ./user-manual.txt:1951
 #, no-wrap
 msgid "images/icons/ShowCylindersButton.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2131
+#: ./user-manual.txt:1957
 msgid ""
 "By selecting this icon, the different cylinders used during a dive can be "
 "represented as a coloured bar at the bottom of the *Dive Profile*. In "
@@ -4051,19 +3803,19 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:2132
+#: ./user-manual.txt:1958
 #, no-wrap
 msgid "images/ShowCylinders_f20.jpg"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: ./user-manual.txt:2135
+#: ./user-manual.txt:1961
 #, no-wrap
 msgid "images/tissues.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2147
+#: ./user-manual.txt:1973
 msgid ""
 "Display inert gas tissue pressures relative to ambient inert gas pressure "
 "(horizontal grey line).  Tissue pressures are calculated using the Bühlmann "
@@ -4082,13 +3834,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:2148
+#: ./user-manual.txt:1974
 #, no-wrap
 msgid "images/tissuesGraph.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2156
+#: ./user-manual.txt:1982
 msgid ""
 "Gradient Factor settings strongly affect the calculated ceilings and their "
 "depths.  For more information about Gradient factors, see the section on "
@@ -4101,7 +3853,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2158
+#: ./user-manual.txt:1984
 #, no-wrap
 msgid ""
 " ** http://www.tek-dive.com/portal/upload/M-Values.pdf[Understanding "
@@ -4109,7 +3861,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2160
+#: ./user-manual.txt:1986
 #, no-wrap
 msgid ""
 " ** "
@@ -4118,13 +3870,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:2162
+#: ./user-manual.txt:1988
 #, no-wrap
 msgid "The Dive Profile context menu"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2180
+#: ./user-manual.txt:2006
 msgid ""
 "The context menu for the Dive Profile is accessed by right-clicking while "
 "the mouse cursor is over the Dive Profile panel. The menu allows the "
@@ -4145,13 +3897,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:2182
+#: ./user-manual.txt:2008
 #, no-wrap
 msgid "The *Information Box*"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2192
+#: ./user-manual.txt:2018
 msgid ""
 "The Information box displays a large range of information pertaining to the "
 "dive profile. Normally the Information Box is located to the top left of the "
@@ -4164,13 +3916,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:2193
+#: ./user-manual.txt:2019
 #, no-wrap
 msgid "images/InfoBox2.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2210
+#: ./user-manual.txt:2036
 msgid ""
 "The moment the mouse points inside the *Dive Profile* panel, the information "
 "box expands and shows many data items. In this situation, the data reflect "
@@ -4191,20 +3943,20 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2213
+#: ./user-manual.txt:2039
 msgid ""
 "The user has control over the display of several statistics, represented as "
 "four buttons on the left of the profile panel. These are:"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: ./user-manual.txt:2214
+#: ./user-manual.txt:2040
 #, no-wrap
 msgid "images/icons/MOD.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2221
+#: ./user-manual.txt:2047
 msgid ""
 "Clicking this button causes the Information Box to display the *Maximum "
 "Operating Depth (MOD)* of the dive, given the gas mixture used. MOD is "
@@ -4214,13 +3966,13 @@ msgid ""
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: ./user-manual.txt:2222
+#: ./user-manual.txt:2048
 #, no-wrap
 msgid "images/icons/NDL.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2231
+#: ./user-manual.txt:2057
 msgid ""
 "Clicking this button causes the Information Box to display the *No-deco "
 "Limit (NDL)* or the *Total Time to Surface (TTS)*. NDL is the time duration "
@@ -4233,13 +3985,13 @@ msgid ""
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: ./user-manual.txt:2232
+#: ./user-manual.txt:2058
 #, no-wrap
 msgid "images/icons/SAC.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2241
+#: ./user-manual.txt:2067
 msgid ""
 "Clicking this button causes the Information Box to display the *Surface Air "
 "Consumption (SAC)*.  SAC is an indication of the surface-normalised "
@@ -4252,13 +4004,13 @@ msgid ""
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: ./user-manual.txt:2242
+#: ./user-manual.txt:2068
 #, no-wrap
 msgid "images/icons/EAD.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2257
+#: ./user-manual.txt:2083
 msgid ""
 "Clicking this button displays the *Equivalent Air Depth (EAD)* for nitrox "
 "dives as well as the *Equivalent Narcotic Depth (END)* for trimix "
@@ -4275,20 +4027,20 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2259
+#: ./user-manual.txt:2085
 msgid ""
 "Figure (*B*) above shows an information box with a nearly complete set of "
 "data."
 msgstr ""
 
 #. type: Title ====
-#: ./user-manual.txt:2261
+#: ./user-manual.txt:2087
 #, no-wrap
 msgid "The Gas Pressure Bar Graph"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2268
+#: ./user-manual.txt:2094
 msgid ""
 "On the left of the *Information Box* is a vertical bar graph indicating the "
 "pressures of the nitrogen (and other inert gases, e.g. helium, if "
@@ -4299,13 +4051,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:2269
+#: ./user-manual.txt:2095
 #, no-wrap
 msgid "images/GasPressureBarGraph.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2275
+#: ./user-manual.txt:2101
 msgid ""
 "The light green area indicates the total gas, with the top margin of the "
 "light green area indicating the total gas pressure inhaled by the diver and "
@@ -4315,7 +4067,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2281
+#: ./user-manual.txt:2107
 msgid ""
 "The horizontal black line underneath the light green margin indicates the "
 "equilibrium pressure of the inert gases inhaled by the diver, usually "
@@ -4326,7 +4078,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2285
+#: ./user-manual.txt:2111
 msgid ""
 "The dark green area at the bottom of the graph represents the pressures of "
 "inert gas in each of the 16 tissue compartments, following the Bühlmann "
@@ -4334,7 +4086,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2290
+#: ./user-manual.txt:2116
 msgid ""
 "The top black horizontal line indicates the gradient factor that applies to "
 "the depth of the diver at the particular point on the *Dive Profile*. The "
@@ -4344,7 +4096,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2294
+#: ./user-manual.txt:2120
 msgid ""
 "The bottom margin of the red area in the graph indicates the Bühlman-derived "
 "M-value, that is the pressure value of inert gases at which bubble formation "
@@ -4352,7 +4104,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2297
+#: ./user-manual.txt:2123
 msgid ""
 "These five values are indicated on the left in the graph above. The way the "
 "Gas Pressure Bar Graph changes during a dive is indicated on the right hand "
@@ -4360,7 +4112,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2300
+#: ./user-manual.txt:2126
 msgid ""
 "Graph *A* indicates the situation at the start of a dive with diver at the "
 "surface. The pressures in all the tissue compartments are still at the "
@@ -4368,7 +4120,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2303
+#: ./user-manual.txt:2129
 msgid ""
 "Graph *B* indicates the situation after a descent to 30 meters. Few of the "
 "tissue compartments have had time to respond to the descent, their gas "
@@ -4376,7 +4128,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2308
+#: ./user-manual.txt:2134
 msgid ""
 "Graph *C* represents the pressures after 30 minutes at 30 m. The fast "
 "compartments have attained equilibrium (i.e. they have reached the hight of "
@@ -4386,7 +4138,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2314
+#: ./user-manual.txt:2140
 msgid ""
 "Graph *D* shows the pressures after ascent to a depth of 4.5 meters. Since, "
 "during ascent, the total inhaled gas pressure has decreased strongly from 4 "
@@ -4397,7 +4149,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2319
+#: ./user-manual.txt:2145
 msgid ""
 "Graph *E* indicates the situation after remaining at 4.5 meters for 10 "
 "minutes. The fast compartments have decreased in pressure. As expected, the "
@@ -4407,19 +4159,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ==
-#: ./user-manual.txt:2322
+#: ./user-manual.txt:2148
 #, no-wrap
 msgid "Organising the logbook (Manipulating groups of dives)"
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:2324
+#: ./user-manual.txt:2150
 #, no-wrap
 msgid "The Dive List context menu"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2328
+#: ./user-manual.txt:2154
 msgid ""
 "Several actions on either a single dive or a group of dives can be performed "
 "using the Dive List Context Menu, found by selecting either a single dive or "
@@ -4427,30 +4179,30 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:2329
+#: ./user-manual.txt:2155
 #, no-wrap
 msgid "images/ContextMenu.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2332
+#: ./user-manual.txt:2158
 msgid "The context menu is used in many manipulations described below."
 msgstr ""
 
 #. type: Title ====
-#: ./user-manual.txt:2333
+#: ./user-manual.txt:2159
 #, no-wrap
 msgid "Customising the information showed in the *Dive List* panel"
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:2335
+#: ./user-manual.txt:2161
 #, no-wrap
 msgid "images/DiveListOptions.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2343
+#: ./user-manual.txt:2169
 msgid ""
 "The default information in the *Dive List* includes, for each dive, "
 "Dive_number, Date, Rating, Dive_depth, Dive_duration and Dive_location. This "
@@ -4464,13 +4216,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: ./user-manual.txt:2344
+#: ./user-manual.txt:2170
 #, no-wrap
 msgid "Selecting dives from a particular dive site"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2350
+#: ./user-manual.txt:2176
 msgid ""
 "Many divers have long dive lists and it may be difficult to locate all the "
 "dives at a particular site.  By pressing _Ctl-F_ on the keyboard, a text box "
@@ -4480,13 +4232,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:2352
+#: ./user-manual.txt:2178
 #, no-wrap
 msgid "Renumbering the dives"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2364
+#: ./user-manual.txt:2190
 msgid ""
 "Dives are normally numbered incrementally from non-recent dives (low "
 "sequence numbers) to recent dives (having the highest sequence numbers). The "
@@ -4502,7 +4254,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2369
+#: ./user-manual.txt:2195
 msgid ""
 "One can also renumber a few selected dives in the dive list. Select the "
 "dives that need renumbering. Right-click on the selected list and use the "
@@ -4512,13 +4264,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:2371
+#: ./user-manual.txt:2197
 #, no-wrap
 msgid "Grouping dives into trips and manipulating trips"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2379
+#: ./user-manual.txt:2205
 msgid ""
 "For regular divers, the dive list can rapidly become very long. _Subsurface_ "
 "can group dives into _trips_. It performs this by grouping dives that have "
@@ -4529,13 +4281,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:2380
+#: ./user-manual.txt:2206
 #, no-wrap
 msgid "images/Group2.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2386
+#: ./user-manual.txt:2212
 msgid ""
 "Grouping into trips allows a rapid way of accessing individual dives without "
 "having to scan a long lists of dives. In order to group the dives in a dive "
@@ -4544,13 +4296,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: ./user-manual.txt:2387
+#: ./user-manual.txt:2213
 #, no-wrap
 msgid "Editing the title and associated information for a particular trip"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2400
+#: ./user-manual.txt:2226
 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 "
@@ -4565,13 +4317,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: ./user-manual.txt:2401
+#: ./user-manual.txt:2227
 #, no-wrap
 msgid "Viewing the dives during a particular trip"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2406
+#: ./user-manual.txt:2232
 msgid ""
 "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 "
@@ -4580,13 +4332,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: ./user-manual.txt:2407
+#: ./user-manual.txt:2233
 #, no-wrap
 msgid "Collapsing or expanding dive information for different trips"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2413
+#: ./user-manual.txt:2239
 msgid ""
 "After selecting a particular trip in the dive list, the context menu allows "
 "several possibilities to expand or collapse dives within trips. This "
@@ -4595,13 +4347,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: ./user-manual.txt:2414
+#: ./user-manual.txt:2240
 #, no-wrap
 msgid "Merging dives from more than one trip into a single trip"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2419
+#: ./user-manual.txt:2245
 msgid ""
 "After selecting a trip title, the context menu allows the merging of trips "
 "by either merging the selected trip with the trip below or with the trip "
@@ -4609,13 +4361,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: ./user-manual.txt:2420
+#: ./user-manual.txt:2246
 #, no-wrap
 msgid "Splitting a single trip into more than one trip"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2430
+#: ./user-manual.txt:2256
 msgid ""
 "If a trip includes five dives, the user can split this trip into two trips "
 "(trip 1: top 3 dives; trip 2: bottom 2 dives) by selecting and "
@@ -4627,25 +4379,25 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:2431
+#: ./user-manual.txt:2257
 #, no-wrap
 msgid "images/SplitDive3a.jpg"
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:2433
+#: ./user-manual.txt:2259
 #, no-wrap
 msgid "Manipulating single dives"
 msgstr ""
 
 #. type: Title ====
-#: ./user-manual.txt:2435
+#: ./user-manual.txt:2261
 #, no-wrap
 msgid "Delete a dive from the dive log"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2442
+#: ./user-manual.txt:2268
 msgid ""
 "Dives can be permanently deleted from the dive log by selecting and "
 "right-clicking them to bring up the context menu, and then selecting *Delete "
@@ -4655,13 +4407,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: ./user-manual.txt:2443
+#: ./user-manual.txt:2269
 #, no-wrap
 msgid "Unlink a dive from a trip"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2450
+#: ./user-manual.txt:2276
 msgid ""
 "Users can unlink dives from the trip to which they belong. In order to do "
 "this, select and right-click the relevant dives to bring up the context "
@@ -4671,13 +4423,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: ./user-manual.txt:2451
+#: ./user-manual.txt:2277
 #, no-wrap
 msgid "Add a dive to the trip immediately above"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2456
+#: ./user-manual.txt:2282
 msgid ""
 "Selected dives can be moved from the trip to which they belong and placed "
 "within a separate trip. To do this, select and right-click the dive(s) to "
@@ -4685,13 +4437,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: ./user-manual.txt:2457
+#: ./user-manual.txt:2283
 #, no-wrap
 msgid "Shift the start time of dive(s)"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2468
+#: ./user-manual.txt:2294
 msgid ""
 "Sometimes it is necessary to adjust the start time of a dive. This may apply "
 "to situations where dives are performed in different time zones or when the "
@@ -4704,13 +4456,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: ./user-manual.txt:2469
+#: ./user-manual.txt:2295
 #, no-wrap
 msgid "Merge dives into a single dive"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2479
+#: ./user-manual.txt:2305
 msgid ""
 "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 "
@@ -4724,19 +4476,19 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:2480
+#: ./user-manual.txt:2306
 #, no-wrap
 msgid "images/MergedDive.png"
 msgstr ""
 
 #. type: Title ====
-#: ./user-manual.txt:2482
+#: ./user-manual.txt:2308
 #, no-wrap
 msgid "Undo dive manipulations"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2488
+#: ./user-manual.txt:2314
 msgid ""
 "Important actions on dives or trips, described above, can be undone or "
 "redone.  This includes: _delete dives_, _merge dives_, _renumber dives_ and "
@@ -4746,13 +4498,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:2491
+#: ./user-manual.txt:2317
 #, no-wrap
 msgid "Filtering the dive list"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2497
+#: ./user-manual.txt:2323
 msgid ""
 "The dives in the *Dive List* panel can be filtered, that is, one can select "
 "only some of the dives based on their attributes, e.g. dive tags, dive site, "
@@ -4762,7 +4514,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2506
+#: ./user-manual.txt:2332
 msgid ""
 "To open the filter, select _Log -> Filter divelist_ from the main menu. This "
 "opens the _Filter Panel_ at the top of the _Subsurface_ window. Three icons "
@@ -4776,13 +4528,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:2507
+#: ./user-manual.txt:2333
 #, no-wrap
 msgid "images/Filterpanel.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2516
+#: ./user-manual.txt:2342
 msgid ""
 "Four filter criteria may be used to filter the dive list: dive tags, person "
 "(buddy / dive master), dive site and dive suit, each of which is represented "
@@ -4795,7 +4547,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2524
+#: ./user-manual.txt:2350
 msgid ""
 "To activate filtering of the dive list, check at least tone check box in one "
 "of the four check lists. The dive list is then shortened to include only the "
@@ -4807,36 +4559,36 @@ msgid ""
 msgstr ""
 
 #. type: Title ==
-#: ./user-manual.txt:2526
+#: ./user-manual.txt:2352
 #, no-wrap
 msgid "Exporting the dive log or parts of the dive log"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2529
+#: ./user-manual.txt:2355
 msgid "There are two routes for the export of dive information from Subsurface:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2531
+#: ./user-manual.txt:2357
 msgid "Export dive information to _Facebook_"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2533
+#: ./user-manual.txt:2359
 msgid ""
 "xref:S_Export_other[Export dive information to other destinations or "
 "formats]"
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:2535
+#: ./user-manual.txt:2361
 #, no-wrap
 msgid "Exporting dive information to _Facebook_"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2544
+#: ./user-manual.txt:2370
 msgid ""
 "Export of dives to _Facebook_ is handled differently from other types of "
 "export. This is because export to _Facebook_ needs a connection to "
@@ -4849,13 +4601,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:2545
+#: ./user-manual.txt:2371
 #, no-wrap
 msgid "images/facebook1_f20.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2558
+#: ./user-manual.txt:2384
 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 *Notes* "
@@ -4876,7 +4628,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2565
+#: ./user-manual.txt:2391
 msgid ""
 "Both the Album created and the post to your time line will be marked as "
 "private. In order for friends to be able to see the post you have to change "
@@ -4886,13 +4638,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:2566
+#: ./user-manual.txt:2392
 #, no-wrap
 msgid "images/facebook2_f20.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2569
+#: ./user-manual.txt:2395
 msgid ""
 "If required, then close the _Facebook_ connection by either closing "
 "_Subsurface_ or by selecting _File -> Preferences -> Facebook_ from the Main "
@@ -4900,13 +4652,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:2571
+#: ./user-manual.txt:2397
 #, no-wrap
 msgid "Export dive information  to other destinations or formats"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2576
+#: ./user-manual.txt:2402
 msgid ""
 "For non-_Facebook exports_, the export function can be reached by selecting "
 "_File -> Export_, which brings up the Export dialog. This dialog always "
@@ -4916,23 +4668,23 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:2577
+#: ./user-manual.txt:2403
 #, no-wrap
 msgid "images/Export_f20.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2580
+#: ./user-manual.txt:2406
 msgid "A dive log or part of it can be saved in three formats:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2582
+#: ./user-manual.txt:2408
 msgid "_Subsurface XML_ format. This is the native format used by _Subsurface_."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2586
+#: ./user-manual.txt:2412
 msgid ""
 "Universal Dive Data Format (_UDDF_). Refer to _http://uddf.org_ for more "
 "information.  UDDF is a generic format that enables communication among many "
@@ -4940,7 +4692,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2590
+#: ./user-manual.txt:2416
 msgid ""
 "_Divelogs.de_, an Internet-based dive log repository. In order to upload to "
 "_Divelogs.de_, one needs a user-ID as well as a password for "
@@ -4949,7 +4701,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2594
+#: ./user-manual.txt:2420
 msgid ""
 "_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, "
@@ -4957,7 +4709,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2599
+#: ./user-manual.txt:2425
 msgid ""
 "_CSV dive details_, that includes the most critical information of the dive "
 "profile. Included information of a dive is: dive number, date, time, buddy, "
@@ -4966,7 +4718,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2602
+#: ./user-manual.txt:2428
 msgid ""
 "_CSV dive profile_, that includes a large amount of detail for each dive, "
 "including the depth profile, temperature and pressure information of each "
@@ -4974,7 +4726,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2614
+#: ./user-manual.txt:2440
 msgid ""
 "_HTML_ format, in which the dive(s) are stored in HTML files, readable with "
 "an Internet browser. Most modern web browsers are supported, but JavaScript "
@@ -4989,7 +4741,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2619
+#: ./user-manual.txt:2445
 msgid ""
 "_Worldmap_ format, an HTML file with a world map upon which each dive and "
 "some information about it are indicated. This map is not editable. However, "
@@ -4998,13 +4750,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:2620
+#: ./user-manual.txt:2446
 #, no-wrap
 msgid "images/mapview_f20.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2627
+#: ./user-manual.txt:2453
 msgid ""
 "_Image depths_, which creates a text file that contains the file names of "
 "all photos or images attached to any of the selected dives in the _Dive "
@@ -5013,12 +4765,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2629
+#: ./user-manual.txt:2455
 msgid "_General Settings_, under the HTML tab, provides the following options:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2637
+#: ./user-manual.txt:2463
 #, no-wrap
 msgid ""
 "** Subsurface Numbers: if this option is checked, the dive(s) are exported "
@@ -5035,27 +4787,27 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2640
+#: ./user-manual.txt:2466
 msgid ""
 "Under _Style Options_ some style-related options are available like font "
 "size and theme."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2643
+#: ./user-manual.txt:2469
 msgid ""
 "Export to other formats can be achieved through third party facilities, for "
 "instance _www.divelogs.de_."
 msgstr ""
 
 #. type: Title ==
-#: ./user-manual.txt:2645
+#: ./user-manual.txt:2471
 #, no-wrap
 msgid "Keeping a _Subsurface_ dive log in the Cloud"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2656
+#: ./user-manual.txt:2482
 msgid ""
 "For each diver, dive log information is highly important. Not only is it a "
 "record of diving activities for one's own pleasure, but it is important "
@@ -5070,7 +4822,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2660
+#: ./user-manual.txt:2486
 msgid ""
 "_Subsurface_ includes access to a transparently integrated cloud storage "
 "backend that is available to all Subsurface users. In order to use the "
@@ -5078,12 +4830,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2662
+#: ./user-manual.txt:2488
 msgid "Create a cloud storage account:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2676
+#: ./user-manual.txt:2502
 #, no-wrap
 msgid ""
 "** Open the _Preferences_\n"
@@ -5102,12 +4854,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2678
+#: ./user-manual.txt:2504
 msgid "Use _Subsurface cloud storage_"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2684
+#: ./user-manual.txt:2510
 #, no-wrap
 msgid ""
 "** From the _File_ menu users can load and save data to the _Subsurface\n"
@@ -5118,7 +4870,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2689
+#: ./user-manual.txt:2515
 msgid ""
 "_Subsurface_ keeps a local copy of the data and _Subsurface_ stays fully "
 "functional if used while offline. _Subsurface_ will simply synchronize the "
@@ -5127,7 +4879,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2693
+#: ./user-manual.txt:2519
 msgid ""
 "Although _Subsurface_ offers integrated Cloud storage of dive logs, it is "
 "also simple to achieve this using several of the existing facilities on the "
@@ -5135,7 +4887,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2698
+#: ./user-manual.txt:2524
 msgid ""
 "For instance http://www.dropbox.com/[_Dropbox_] offers a free application "
 "that allows files on the Dropbox servers to be seen as a local folder on "
@@ -5143,13 +4895,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:2699
+#: ./user-manual.txt:2525
 #, no-wrap
 msgid "images/Cloud.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2708
+#: ./user-manual.txt:2534
 msgid ""
 "The _Dropbox_ program creates a copy of the _Dropbox_ Internet Cloud content "
 "on one's desktop computer. When the computer is connected to the Internet, "
@@ -5162,7 +4914,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2715
+#: ./user-manual.txt:2541
 msgid ""
 "In this way a dive log in one's _Dropbox_ folder can be accessed seamlessly "
 "from the Internet and can be accessed from any place with Internet "
@@ -5172,7 +4924,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2721
+#: ./user-manual.txt:2547
 msgid ""
 "Alternatively one can use _Dropbox_ as a mechanism to backup one's dive "
 "log. To Store a dive log in the Cloud, select _File -> Save as_ from the "
@@ -5183,20 +4935,20 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2724
+#: ./user-manual.txt:2550
 msgid ""
 "Several paid services exist on the Internet (e.g. Google, Amazon) where the "
 "same process could be used for the Cloud-based storage of dive logs."
 msgstr ""
 
 #. type: Title ==
-#: ./user-manual.txt:2727
+#: ./user-manual.txt:2553
 #, no-wrap
 msgid "Printing a dive log"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2731
+#: ./user-manual.txt:2557
 #, no-wrap
 msgid ""
 "_Subsurface_ provides a simple and flexible interface to print a whole dive "
@@ -5206,12 +4958,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2733
+#: ./user-manual.txt:2559
 msgid "Before printing, two decisions are required:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2736
+#: ./user-manual.txt:2562
 msgid ""
 "Should the whole dive log be printed or only part of it? If only part of the "
 "dive log is required, then select the required dives from the *Dive List* "
@@ -5219,7 +4971,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2738
+#: ./user-manual.txt:2564
 msgid ""
 "If the dive profiles needs printing, what gas partial pressure information "
 "should be shown? Select the appropriate toggle-buttons on the button bar to "
@@ -5227,7 +4979,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2741
+#: ./user-manual.txt:2567
 msgid ""
 "If _File -> Print_ is selected from the Main menu, the the dialogue below "
 "(image *A*) appears. Three specifications are needed to achieve the desired "
@@ -5235,35 +4987,35 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:2742 ./user-manual.txt:4136
+#: ./user-manual.txt:2568 ./user-manual.txt:3962
 #, no-wrap
 msgid "images/Print1_f22.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2745
+#: ./user-manual.txt:2571
 msgid "Under _Print type_ select one of two options:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2747
+#: ./user-manual.txt:2573
 msgid ""
 "_Dive list print_: Print dives from the *Dive List* panel with profiles and "
 "other information."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2748
+#: ./user-manual.txt:2574
 msgid "_Statistics print_: Print yearly statistics of the dives."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2750
+#: ./user-manual.txt:2576
 msgid "Under _Print options_ select:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2755
+#: ./user-manual.txt:2581
 msgid ""
 "Printing only the dives selected from the dive list prior to activating the "
 "print dialogue by checking the box _Print only selected dives_. If this "
@@ -5271,85 +5023,85 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2757
+#: ./user-manual.txt:2583
 msgid ""
 "Printing in colour, achieved by checking the box with _Print in colour_. If "
 "this check box is not checked, printing is in monochrome (grey scale)."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2760
+#: ./user-manual.txt:2586
 msgid ""
 "Under _Template_ select a template to be used as the page layout. There are "
 "several templates (see image *B*, above)."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2762
+#: ./user-manual.txt:2588
 msgid "_Table_: This prints a summary table of all dives selected (see below)."
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:2763
+#: ./user-manual.txt:2589
 #, no-wrap
 msgid "images/Print_summarylist_f22.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2766
+#: ./user-manual.txt:2592
 msgid ""
 "_Flow layout_: Print the text associated with each diev without printing the "
 "dive profiles"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2767
+#: ./user-manual.txt:2593
 msgid "of each dive (see below):"
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:2768
+#: ./user-manual.txt:2594
 #, no-wrap
 msgid "images/Print_flow_layout_f22.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2771
+#: ./user-manual.txt:2597
 msgid ""
 "_One Dive_: Print one dive per page, also showing the dive profile (see "
 "below)"
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:2772
+#: ./user-manual.txt:2598
 #, no-wrap
 msgid "images/print2_f22.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2776
+#: ./user-manual.txt:2602
 msgid "_Two Dives_: Print two dives per page, also showing the dive profiles."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2777
+#: ./user-manual.txt:2603
 msgid "_Six Dives_: Print six dives per page, also showing the dive profiles."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2778
+#: ./user-manual.txt:2604
 msgid ""
 "_Custom_: This option allows customisation of the print contents and "
 "layout. This is"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2779
+#: ./user-manual.txt:2605
 msgid "discussed at the end of this section."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2783
+#: ./user-manual.txt:2609
 msgid ""
 "Users can _Preview_ the printed page by selecting the _Preview_ button on "
 "the dialogue (see image *A* at the start of this section). After preview, "
@@ -5358,7 +5110,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2787
+#: ./user-manual.txt:2613
 msgid ""
 "Next, select the _Print_ button (see image *A* at the start of this "
 "section). This activates the regular print dialogue used by the user "
@@ -5367,13 +5119,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:2788
+#: ./user-manual.txt:2614
 #, no-wrap
 msgid "images/Print_print_f22.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2793
+#: ./user-manual.txt:2619
 msgid ""
 "Set the print resolution of the printer to an appropriate value by changing "
 "the printer _Properties_. Finally, select the _Print_ button to print the "
@@ -5382,19 +5134,19 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:2794
+#: ./user-manual.txt:2620
 #, no-wrap
 msgid "images/Printpreview.jpg"
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:2796
+#: ./user-manual.txt:2622
 #, no-wrap
 msgid "Write a custom printing template (advanced)"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2800
+#: ./user-manual.txt:2626
 msgid ""
 "Writing a custom template is an effective way to produce highly customized "
 "printouts. Subsurface uses HTML templates to render printing. One can create "
@@ -5405,13 +5157,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ==
-#: ./user-manual.txt:2802
+#: ./user-manual.txt:2628
 #, no-wrap
 msgid "Configuring a dive computer"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2810
+#: ./user-manual.txt:2636
 msgid ""
 "_Subsurface_ enables one to configure a dive computer. Currently the "
 "Heinrichs-Weikamp (OSTC 2, OSTC 3) and Suunto Vyper (Stinger, Mosquito, D3, "
@@ -5425,7 +5177,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2815
+#: ./user-manual.txt:2641
 msgid ""
 "Once the dive computer is connected to the _Subsurface_ computer, select "
 "_File -> Configure dive computer_ from the _Main Menu_. Provide the "
@@ -5435,20 +5187,20 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:2816
+#: ./user-manual.txt:2642
 #, no-wrap
 msgid "images/Configure_dc_f20.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2819
+#: ./user-manual.txt:2645
 msgid ""
 "Using the appropriate buttons on the configuration panel, the following "
 "actions can be performed:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2822
+#: ./user-manual.txt:2648
 #, no-wrap
 msgid ""
 "*Retrieve available details*. This loads the existing configuration from the "
@@ -5457,7 +5209,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2824
+#: ./user-manual.txt:2650
 #, no-wrap
 msgid ""
 "*Save changes to device*. This changes the configuration of the\n"
@@ -5466,7 +5218,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2826
+#: ./user-manual.txt:2652
 #, no-wrap
 msgid ""
 "*Backup*. This saves the configuration data to a file. _Subsurface_ asks "
@@ -5475,7 +5227,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2828
+#: ./user-manual.txt:2654
 #, no-wrap
 msgid ""
 "*Restore backup*. This loads the information from a backup file and displays "
@@ -5484,7 +5236,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2830
+#: ./user-manual.txt:2656
 #, no-wrap
 msgid ""
 "*Update firmware*. If new firmware is available for the dive computer, this "
@@ -5493,13 +5245,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ==
-#: ./user-manual.txt:2833
+#: ./user-manual.txt:2659
 #, no-wrap
 msgid "Setting user _Preferences_ for _Subsurface_"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2841
+#: ./user-manual.txt:2667
 msgid ""
 "There are several settings within _Subsurface_ that the user can "
 "specify. These are found when selecting _File -> Preferences_. The settings "
@@ -5511,24 +5263,24 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:2842
+#: ./user-manual.txt:2668
 #, no-wrap
 msgid "Defaults"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2845
+#: ./user-manual.txt:2671
 msgid "There are several settings in the *Defaults* panel:"
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:2846
+#: ./user-manual.txt:2672
 #, no-wrap
 msgid "images/Pref1_f20.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2850
+#: ./user-manual.txt:2676
 #, no-wrap
 msgid ""
 "  ** *Lists and tables*: Here one can specify the font type and font size of "
@@ -5538,7 +5290,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2855
+#: ./user-manual.txt:2681
 #, no-wrap
 msgid ""
 "  ** *Dives*: For the _Default Dive File_ one need to specify the directory "
@@ -5551,7 +5303,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2860
+#: ./user-manual.txt:2686
 #, no-wrap
 msgid ""
 "  ** *Display invalid*:  Dives can be marked as invalid (when a user wishes "
@@ -5564,7 +5316,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2863
+#: ./user-manual.txt:2689
 #, no-wrap
 msgid ""
 "  ** *Default cylinder*: Here users can specify the default cylinder listed "
@@ -5573,7 +5325,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2871
+#: ./user-manual.txt:2697
 #, no-wrap
 msgid ""
 "  ** *Animations*: Some actions in showing the dive profile are performed "
@@ -5591,7 +5343,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2876
+#: ./user-manual.txt:2702
 #, no-wrap
 msgid ""
 "  ** *Subsurface web service*: When one subscribes to the "
@@ -5604,7 +5356,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2879
+#: ./user-manual.txt:2705
 #, no-wrap
 msgid ""
 "  ** *Clear all settings*: As indicated in the button below this heading, "
@@ -5613,19 +5365,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:2880
+#: ./user-manual.txt:2706
 #, no-wrap
 msgid "Units"
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:2881
+#: ./user-manual.txt:2707
 #, no-wrap
 msgid "images/Pref2_f20.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2888
+#: ./user-manual.txt:2714
 msgid ""
 "Here user can choose between metric and imperial units of depth, pressure, "
 "volume, temperature and mass. By selecting the Metric or Imperial radio "
@@ -5636,24 +5388,24 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:2889
+#: ./user-manual.txt:2715
 #, no-wrap
 msgid "Graph"
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:2891
+#: ./user-manual.txt:2717
 #, no-wrap
 msgid "images/Pref3_f20.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2895
+#: ./user-manual.txt:2721
 msgid "This panel allows two type of selections:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2903
+#: ./user-manual.txt:2729
 #, no-wrap
 msgid ""
 "*Show*: Here users can specify the amount of information shown as part of\n"
@@ -5670,7 +5422,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2908
+#: ./user-manual.txt:2734
 #, no-wrap
 msgid ""
 "** _Draw dive computer reported ceiling red_: This checkbox allows exactly "
@@ -5684,7 +5436,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2910
+#: ./user-manual.txt:2736
 #, no-wrap
 msgid ""
 "** _Show unused cylinders in Equipment Tab_: This checkbox allows display of "
@@ -5695,7 +5447,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2916
+#: ./user-manual.txt:2742
 #, no-wrap
 msgid ""
 "** _Show average depth_: Activating this checkbox causes _Subsurface_ to "
@@ -5708,13 +5460,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2918
+#: ./user-manual.txt:2744
 #, no-wrap
 msgid "*Misc*:\n"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2930
+#: ./user-manual.txt:2756
 #, no-wrap
 msgid ""
 "** Gradient Factors:* Here users can set the _gradient factors_ used while "
@@ -5741,7 +5493,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2932
+#: ./user-manual.txt:2758
 #, no-wrap
 msgid ""
 " *** http://www.tek-dive.com/portal/upload/M-Values.pdf[Understanding "
@@ -5749,7 +5501,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2934
+#: ./user-manual.txt:2760
 #, no-wrap
 msgid ""
 " *** "
@@ -5758,7 +5510,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2938
+#: ./user-manual.txt:2764
 #, no-wrap
 msgid ""
 " ** _CCR: Show setpoints when viewing pO2:_ With this checkbox ativated, the "
@@ -5770,7 +5522,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2942
+#: ./user-manual.txt:2768
 #, no-wrap
 msgid ""
 " ** _CCR: Show individual O~2~ sensor values when viewing pO~2~:_ Show the "
@@ -5781,13 +5533,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2944
+#: ./user-manual.txt:2770
 #, no-wrap
 msgid "*Configuring dive planning using rebreather equipment:*\n"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2946
+#: ./user-manual.txt:2772
 #, no-wrap
 msgid ""
 "** _Default CCR setpoint for dive planning:_ Specify the O~2~ setpoint for "
@@ -5795,7 +5547,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2950
+#: ./user-manual.txt:2776
 #, no-wrap
 msgid ""
 "CCR dive plan. This determines the pO~2~ that will be maintained\n"
@@ -5805,7 +5557,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2952
+#: ./user-manual.txt:2778
 #, no-wrap
 msgid ""
 "** _pSCR O~2~ metabolism rate:_ For a semiclosed rebreather (pSCR) system, "
@@ -5813,7 +5565,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2954
+#: ./user-manual.txt:2780
 #, no-wrap
 msgid ""
 "volume of oxygen used by a diver each minute. Set this value for pSCR dive "
@@ -5822,7 +5574,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2956
+#: ./user-manual.txt:2782
 #, no-wrap
 msgid ""
 "** _pSCR ratio:_ For pSCR equipment the dump ratio is the ratio of gas "
@@ -5830,7 +5582,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2958
+#: ./user-manual.txt:2784
 #, no-wrap
 msgid ""
 "environment to that of the gas recirculated to the diver. Set this value for "
@@ -5839,24 +5591,24 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:2960
+#: ./user-manual.txt:2786
 #, no-wrap
 msgid "Language"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2962
+#: ./user-manual.txt:2788
 msgid "Choose a language that _Subsurface_ will use."
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:2963
+#: ./user-manual.txt:2789
 #, no-wrap
 msgid "images/Pref4_f20.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2973
+#: ./user-manual.txt:2799
 msgid ""
 "A checkbox allows one to use the _System Default_ language which in most "
 "cases will be the correct setting; with this _Subsurface_ simply runs in the "
@@ -5869,26 +5621,26 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:2974
+#: ./user-manual.txt:2800
 #, no-wrap
 msgid "Network"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2976
+#: ./user-manual.txt:2802
 msgid ""
 "This panel facilitates communication between _Subsurface_ and data sources "
 "on the Internet."
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:2977
+#: ./user-manual.txt:2803
 #, no-wrap
 msgid "images/Pref5_f20.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2990
+#: ./user-manual.txt:2816
 msgid ""
 "This is important, for instance, when _Subsurface_ needs to communicate with "
 "Internet services such as the <<S_Companion,_Subsurface Companion app_>> or "
@@ -5905,26 +5657,26 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:2991
+#: ./user-manual.txt:2817
 #, no-wrap
 msgid "Facebook Accesss"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2994
+#: ./user-manual.txt:2820
 msgid ""
 "This panel allows one to log into a Facebook account in order to transfer "
 "information from Subsurface to Facefook."
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:2995
+#: ./user-manual.txt:2821
 #, no-wrap
 msgid "images/Pref6_f20.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3003
+#: ./user-manual.txt:2829
 msgid ""
 "If one provides a valid Facebook userID and password, a connection to "
 "Facebook is created. The connection to Facebook is closed when one closes "
@@ -5934,13 +5686,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ==
-#: ./user-manual.txt:3005
+#: ./user-manual.txt:2831
 #, no-wrap
 msgid "The _Subsurface_ dive planner"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3010
+#: ./user-manual.txt:2836
 msgid ""
 "Dive planning is an advanced feature of _Subsurface_, accessible by "
 "selecting _Log -> Plan Dive_ from the main menu. It allows calculation of "
@@ -5949,7 +5701,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block *
-#: ./user-manual.txt:3018
+#: ./user-manual.txt:2844
 msgid ""
 "The _Subsurface_ dive planner IS CURRENTLY EXPERIMENTAL and assumes the user "
 "is already familiar with the _Subsurface_ user interface. It is explicitly "
@@ -5957,19 +5709,19 @@ msgid ""
 msgstr ""
 
 #. type: delimited block *
-#: ./user-manual.txt:3021
+#: ./user-manual.txt:2847
 msgid ""
 "The user is conversant with dive planning and has the necessary training to "
 "perform dive planning."
 msgstr ""
 
 #. type: delimited block *
-#: ./user-manual.txt:3022
+#: ./user-manual.txt:2848
 msgid "The user plans dives within his/her certification limits."
 msgstr ""
 
 #. type: delimited block *
-#: ./user-manual.txt:3025
+#: ./user-manual.txt:2851
 msgid ""
 "Dive planning makes large assumptions about the characteristics of the "
 "_average person_ and cannot compensate for individual physiology or health "
@@ -5977,32 +5729,32 @@ msgid ""
 msgstr ""
 
 #. type: delimited block *
-#: ./user-manual.txt:3026
+#: ./user-manual.txt:2852
 msgid ""
 "The safety of a dive plan depends heavily on the way in which the planner is "
 "used."
 msgstr ""
 
 #. type: delimited block *
-#: ./user-manual.txt:3027
+#: ./user-manual.txt:2853
 msgid "The user is familiar with the user interface of _Subsurface_."
 msgstr ""
 
 #. type: delimited block *
-#: ./user-manual.txt:3029
+#: ./user-manual.txt:2855
 msgid ""
 "A user who is not absolutely sure about any of the above requirements should "
 "not use this feature."
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:3031
+#: ./user-manual.txt:2857
 #, no-wrap
 msgid "The _Subsurface_ dive planner screen"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3036
+#: ./user-manual.txt:2862
 msgid ""
 "Like the _Subsurface_ dive log, the planner screen is divided into several "
 "sections (see image below). The *setup* parameters for a dive are entered "
@@ -6012,7 +5764,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3040
+#: ./user-manual.txt:2866
 msgid ""
 "At the top right hand is a green *design panel* upon which the profile of "
 "the dive can be manipulated directly by dragging and clicking as explained "
@@ -6021,7 +5773,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3044
+#: ./user-manual.txt:2870
 msgid ""
 "At the bottom right is a text panel with a heading of _Dive Plan "
 "Details_. This is where the details of the dive plan are provided in a way "
@@ -6030,26 +5782,26 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:3045
+#: ./user-manual.txt:2871
 #, no-wrap
 msgid "images/PlannerWindow1_f20.jpg"
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:3048
+#: ./user-manual.txt:2874
 #, no-wrap
 msgid "Open circuit dives"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3051
+#: ./user-manual.txt:2877
 msgid ""
 "Towards the centre bottom of the planner (circled in blue in the image "
 "above) is a dropbox with three options. Select the appropriate one of these:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3054
+#: ./user-manual.txt:2880
 #, no-wrap
 msgid ""
 "** Open Circuit (the default)\n"
@@ -6058,12 +5810,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3056
+#: ./user-manual.txt:2882
 msgid "Choose the Open Circuit option."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3060
+#: ./user-manual.txt:2886
 msgid ""
 "In the top left-hand area of the planning screen, ensure that the constant "
 "dive parameters are appropriate. These are: Start date and time of the "
@@ -6073,7 +5825,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3069
+#: ./user-manual.txt:2895
 msgid ""
 "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 "
@@ -6087,12 +5839,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3071
+#: ./user-manual.txt:2897
 msgid "The profile of the planned dive can be created in two ways:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3076
+#: ./user-manual.txt:2902
 msgid ""
 "Drag the waypoints (the small white circles) on the existing dive profile in "
 "a way to represent the dive. Additional waypoints can be created by "
@@ -6102,7 +5854,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3084
+#: ./user-manual.txt:2910
 msgid ""
 "The most efficient way to create a dive profile is to enter the appropriate "
 "values into the table marked _Dive planner points_. The first line of the "
@@ -6116,13 +5868,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: ./user-manual.txt:3085
+#: ./user-manual.txt:2911
 #, no-wrap
 msgid "Recreational dives"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3100
+#: ./user-manual.txt:2926
 msgid ""
 "The _Subsurface_ dive planner allows a sophisticated way of planning "
 "recreational dives, i.e. dives that remain within no-decompression limits.  "
@@ -6143,26 +5895,26 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3103
+#: ./user-manual.txt:2929
 msgid "To plan a dive, the appropriate settings need to be defined."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3106
+#: ./user-manual.txt:2932
 msgid ""
 "Ensure that the date and time is set to that of the intended dive. This "
 "allows calculation of the nitrogen load incurred during previous dives."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3109
+#: ./user-manual.txt:2935
 msgid ""
 "Immediately under the heading _Planning_ are two checkboxes _Recreational_ "
 "and _Safety Stop_.  Check these two boxes."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3113
+#: ./user-manual.txt:2939
 msgid ""
 "Then define the cylinder size, the gas mixture (air or % oxygen) and the "
 "starting cylinder pressure in the top left-hand section of the planner under "
@@ -6170,7 +5922,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3118
+#: ./user-manual.txt:2944
 msgid ""
 "The planner calculates whether the specified cylinder contains enough "
 "air/gas to complete the planned dive. In order for this to be realistic, "
@@ -6180,7 +5932,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3121
+#: ./user-manual.txt:2947
 msgid ""
 "Define the amount of gas that the cylinder must have at the end of the "
 "bottom section of the dive just before ascent. A value of 50 bar is often "
@@ -6188,7 +5940,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3128
+#: ./user-manual.txt:2954
 msgid ""
 "Define the depth of the dive by dragging the waypoints (white dots) on the "
 "dive profile or (even better) defining the appropriate depths using the "
@@ -6199,14 +5951,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3131
+#: ./user-manual.txt:2957
 msgid ""
 "The ascent speed can be changed. The default ascent speeds are those "
 "considered safe for recreational divers."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3139
+#: ./user-manual.txt:2965
 msgid ""
 "The dive profile in the planner indicates the maximum dive time within "
 "no-deco limits using the Bühlmann ZH-L16 algorithm and the gas and depth "
@@ -6222,7 +5974,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3143
+#: ./user-manual.txt:2969
 msgid ""
 "Below is an image of a dive plan for a recreational dive at 30 "
 "metres. Although the no-deco limit (NDL) is 23 minutes, the duration of the "
@@ -6231,26 +5983,26 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:3144
+#: ./user-manual.txt:2970
 #, no-wrap
 msgid "images/rec_diveplan.jpg"
 msgstr ""
 
 #. type: Title ====
-#: ./user-manual.txt:3146
+#: ./user-manual.txt:2972
 #, no-wrap
 msgid "Non-recreational open circuit dives, including decompression"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3150
+#: ./user-manual.txt:2976
 msgid ""
 "Non-recreational dive planning involves exceeding the no-deco limits and/or "
 "using multiple breathing gases.  Such dives are planned in three stages:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3160
+#: ./user-manual.txt:2986
 #, no-wrap
 msgid ""
 "*a) Nitrogen management*: This is performed by specifying the rates for "
@@ -6272,21 +6024,21 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3162
+#: ./user-manual.txt:2988
 msgid ""
 "link:http://www.tek-dive.com/portal/upload/M-Values.pdf[Understanding "
 "M-values by Erik Baker, _Immersed_ Vol. 3, No. 3.]"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3163
+#: ./user-manual.txt:2989
 msgid ""
 "link:http://www.rebreatherworld.com/general-and-new-to-rebreather-articles/5037-gradient-factors-for-dummies.html[Gradient "
 "factors for dummies, by Kevin Watts]"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3165
+#: ./user-manual.txt:2991
 msgid ""
 "link:http://www.amazon.com/Deco-Divers-Decompression-Theory-Physiology/dp/1905492073/ref=sr_1_1?s=books&ie=UTF8&qid=1403932320&sr=1-1&keywords=deco+for+divers[_Deco "
 "for Divers_, by Mark Powell (2008). Aquapress] Southend-on-Sea, UK. ISBN 10: "
@@ -6294,7 +6046,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3173
+#: ./user-manual.txt:2999
 msgid ""
 "The ascent rate is critical for nitrogen off-gassing at the end of the dive "
 "and is specified for several depth ranges, utilising the average (or mean) "
@@ -6308,7 +6060,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3182
+#: ./user-manual.txt:3008
 #, no-wrap
 msgid ""
 "*b) Oxygen management*: In the *Gas Options* part of the dive specification, "
@@ -6328,7 +6080,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3196
+#: ./user-manual.txt:3022
 #, no-wrap
 msgid ""
 "*c) Gas management*: With open-circuit dives this is a primary "
@@ -6359,7 +6111,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3208
+#: ./user-manual.txt:3034
 msgid ""
 "Now (at last) one can start the detailed time-depth planning of the "
 "dive. _Subsurface_ offers a unique graphical interface for performing this "
@@ -6378,7 +6130,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3220
+#: ./user-manual.txt:3046
 msgid ""
 "Each waypoint on the dive profile creates a _Dive Planner Point_ in the "
 "table on the left of the dive planner panel. Ensure that the _Used Gas_ "
@@ -6396,7 +6148,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3228
+#: ./user-manual.txt:3054
 msgid ""
 "Indicate any changes in gas cylinder used by indicating gas changes as "
 "explained in the section <<S_CreateProfile,hand-creating a dive "
@@ -6409,7 +6161,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3237
+#: ./user-manual.txt:3063
 msgid ""
 "A non-zero value in the \"CC set point\" column of the table of dive planner "
 "points indicates a valid setpoint for oxygen partial pressure and that the "
@@ -6422,20 +6174,20 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3240
+#: ./user-manual.txt:3066
 msgid ""
 "Below is an example of a dive plan to 45m using EAN26, followed by an ascent "
 "using EAN50 and using the settings as described above."
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:3241
+#: ./user-manual.txt:3067
 #, no-wrap
 msgid "images/DivePlanner2_f20.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3246
+#: ./user-manual.txt:3072
 msgid ""
 "Once the above has been completed, one can save it by clicking the _Save_ "
 "button towards the top middle of the planner. The saved dive plan will "
@@ -6443,13 +6195,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3248
+#: ./user-manual.txt:3074
 #, no-wrap
 msgid "*The dive plan details*\n"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3256
+#: ./user-manual.txt:3082
 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 "
@@ -6462,7 +6214,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3261
+#: ./user-manual.txt:3087
 msgid ""
 "If the option _Display segment duration_ is checked, then the duration of "
 "each depth level is indicated in the _Dive Plan Details_. This duration "
@@ -6472,13 +6224,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:3262
+#: ./user-manual.txt:3088
 #, no-wrap
 msgid "Planning pSCR dives"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3277
+#: ./user-manual.txt:3103
 #, no-wrap
 msgid ""
 "To plan a dive using a passive semi-closed rebreather (pSCR), select _pSCR_ "
@@ -6508,26 +6260,26 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:3278
+#: ./user-manual.txt:3104
 #, no-wrap
 msgid "images/Planner_pSCR1_f20.jpg"
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:3281
+#: ./user-manual.txt:3107
 #, no-wrap
 msgid "Planning CCR dives"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3285
+#: ./user-manual.txt:3111
 msgid ""
 "To plan a dive using a closed circuit rebreather, select the _CCR_ option in "
 "the dropdown list, circled in blue in the image below."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3289
+#: ./user-manual.txt:3115
 #, no-wrap
 msgid ""
 "*Available gases*: In the _Available gases_ table, enter the cylinder "
@@ -6538,7 +6290,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3297
+#: ./user-manual.txt:3123
 #, no-wrap
 msgid ""
 "*Entering setpoints*: Specify a default setpoint in the Preferences tab, by "
@@ -6559,31 +6311,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3299
+#: ./user-manual.txt:3125
 msgid "The dive profile for a CCR dive may look something like the image below."
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:3300
+#: ./user-manual.txt:3126
 #, no-wrap
 msgid "images/Planner_CCR1_f20.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3304
+#: ./user-manual.txt:3130
 msgid ""
 "Note that, in the _Dive plan details_, the gas consumption for a CCR segment "
 "is not calculated, so gas consumptions of 0 litres are the norm."
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:3306
+#: ./user-manual.txt:3132
 #, no-wrap
 msgid "Modifying an existing dive plan"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3313
+#: ./user-manual.txt:3139
 msgid ""
 "Normally, when a dive plan has been saved, it is accessible from the *Dive "
 "List*, like any other dive log. Within the *Dive List* there is not a way to "
@@ -6594,7 +6346,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3319
+#: ./user-manual.txt:3145
 msgid ""
 "In addition there is the option \"Save new\". This keeps the original "
 "planned dive and adds a (possibly modified) copy to the dive list. If that "
@@ -6604,13 +6356,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:3320
+#: ./user-manual.txt:3146
 #, no-wrap
 msgid "Planning for repetitive dives"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3327
+#: ./user-manual.txt:3153
 msgid ""
 "Repetitive dives can easily be planned if the dates and start times of the "
 "repetitive dive set is specified appropriately in the top left-hand _Start "
@@ -6619,7 +6371,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3333
+#: ./user-manual.txt:3159
 msgid ""
 "If one has just completed a long/deep dive and is planning another dive, "
 "then highlight, in the *Dive List*, the dive that has just been completed "
@@ -6629,7 +6381,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3338
+#: ./user-manual.txt:3164
 msgid ""
 "If only a few standard configurations are used (e.g. in GUE), then a "
 "template dive can be created conforming to one of the configurations. If one "
@@ -6639,13 +6391,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:3339
+#: ./user-manual.txt:3165
 #, no-wrap
 msgid "Printing the dive plan"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3344
+#: ./user-manual.txt:3170
 msgid ""
 "Selecting the _Print_ button in the planner allows printing of the _Dive "
 "Plan Details_ for wet notes. Alternatively one can cut and paste the _Dive "
@@ -6653,7 +6405,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3354
+#: ./user-manual.txt:3180
 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 "
@@ -6669,13 +6421,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ==
-#: ./user-manual.txt:3355
+#: ./user-manual.txt:3181
 #, no-wrap
 msgid "Description of the Subsurface Main Menu items"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3360
+#: ./user-manual.txt:3186
 msgid ""
 "This section describes the functions and operation of the items in the Main "
 "Menu of Subsurface. Several of the items below are links to sections of this "
@@ -6683,299 +6435,299 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:3361
+#: ./user-manual.txt:3187
 #, no-wrap
 msgid "File"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3364
+#: ./user-manual.txt:3190
 msgid ""
 "<<S_NewLogbook,_New Logbook_>> - Close the currently open dive logbook and "
 "clear all dive information."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3366
+#: ./user-manual.txt:3192
 msgid ""
 "_Open logbook_ - This opens the file manager in order to select a dive "
 "logbook to open."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3367
+#: ./user-manual.txt:3193
 msgid "_Save_ - Save the dive logbook that is currently open."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3368
+#: ./user-manual.txt:3194
 msgid "_Save as_ - Save the current logbook under a different file name."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3369
+#: ./user-manual.txt:3195
 msgid "_Close_ - Close the dive logbook that is currently open."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3371
+#: ./user-manual.txt:3197
 msgid ""
 "<<S_ExportLog,_Export_>> - Export the currently open dive logbook (or the "
 "selected dives in the logbook) to one of several formats."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3372
+#: ./user-manual.txt:3198
 msgid "<<S_PrintDivelog,_Print_>> - Print the currently open logbook."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3373
+#: ./user-manual.txt:3199
 msgid ""
 "<<S_FindMovedImages, _Find moved images_>> - If photos taken during dives "
 "have been moved to"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3374
+#: ./user-manual.txt:3200
 msgid ""
 "a different disk or directory, locate them and link them to the appropriate "
 "dives."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3375
+#: ./user-manual.txt:3201
 msgid "<<S_Preferences,_Preferences_>> - Set the _Subsurface_ preferences."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3376
+#: ./user-manual.txt:3202
 msgid ""
 "<<S_Configure,_Configure dive computer_>> - Edit the configuration of a dive "
 "computer."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3377
+#: ./user-manual.txt:3203
 msgid "_Quit_ - Quit _Subsurface_."
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:3378
+#: ./user-manual.txt:3204
 #, no-wrap
 msgid "Import"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3381
+#: ./user-manual.txt:3207
 msgid ""
 "<<S_ImportDiveComputer,_Import from dive computer_>> - Import dive "
 "information from a dive computer."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3383
+#: ./user-manual.txt:3209
 msgid ""
 "<<Unified_import,_Import Log Files_>> - Import dive information from a file "
 "in in a _Subsurface_-compatible format."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3385
+#: ./user-manual.txt:3211
 msgid ""
 "<<S_Companion,_Import GPS data from Subsurface web service_>> - Load GPS "
 "coordinates from the _Subsurface_ mobile phone app."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3387
+#: ./user-manual.txt:3213
 msgid ""
 "<<S_ImportingDivelogsDe,_Import from Divelogs.de_>> - Import dive "
 "information from _www.Divelogs.de_."
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:3388
+#: ./user-manual.txt:3214
 #, no-wrap
 msgid "Log"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3390
+#: ./user-manual.txt:3216
 msgid ""
 "<<S_EnterData,_Add Dive_>> - Manually add a new dive to the *Dive List* "
 "panel."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3391
+#: ./user-manual.txt:3217
 msgid ""
 "_Edit dive_ - Edit a dive of which the profile was entered by hande and not "
 "from a dive computer."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3392
+#: ./user-manual.txt:3218
 msgid "<<S_DivePlanner,_Plan Dive_>> - This feature allows the planning of dives."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3393
+#: ./user-manual.txt:3219
 msgid ""
 "<<S_Replan,_Edit dive in planner_>> - Edit a dive plan that has been saved "
 "into the *Dive List*."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3395
+#: ./user-manual.txt:3221
 msgid ""
 "<<S_CopyComponents,_Copy dive components_>> - By selecting this option, one "
 "can copy information from several fields of a dive log onto the clipboard."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3397
+#: ./user-manual.txt:3223
 msgid ""
 "_Paste dive components_ - Paste, into the selected dives in the *Dive List*, "
 "the information copied using the _Copy dive components_ option."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3399
+#: ./user-manual.txt:3225
 msgid ""
 "<<S_Renumber,_Renumber_>> - Renumber the dives listed in the *Dive List* "
 "panel."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3401
+#: ./user-manual.txt:3227
 msgid ""
 "<<S_Group,_Auto Group_>> - Group the dives in the *Dive List* panel into "
 "dive trips."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3402
+#: ./user-manual.txt:3228
 msgid ""
 "<<S_DeviceNames,_Edit Device Names_>> - Edit the names of dive computers to "
 "facilitate your logs."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3403
+#: ./user-manual.txt:3229
 msgid ""
 "<<S_Filter,_Filter divelist_>> - Select only some dives, based on specific "
 "tags or dive criteria."
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:3404
+#: ./user-manual.txt:3230
 #, no-wrap
 msgid "View"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3407
+#: ./user-manual.txt:3233
 msgid ""
 "<<S_ViewPanels,_All_>> - View the four main _Subsurface_ panels "
 "simmultaneously."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3408
+#: ./user-manual.txt:3234
 msgid "<<S_ViewPanels,_Dive List_>> - View only the *Dive List* panel."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3409
+#: ./user-manual.txt:3235
 msgid "<<S_ViewPanels,_Profile_>> - View only the *Dive Profile* panel."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3410
+#: ./user-manual.txt:3236
 msgid "<<S_ViewPanels,_Info_>> - View only the *Notes* panel."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3411
+#: ./user-manual.txt:3237
 msgid "<<S_ViewPanels,_Globe_>> - View only the *World Map* panel."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3413
+#: ./user-manual.txt:3239
 msgid ""
 "_Yearly Statistics_ - Display summary statistics about dives during this and "
 "past years."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3414
+#: ./user-manual.txt:3240
 msgid "_Prev DC_ - Switch to previous dive computer."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3415
+#: ./user-manual.txt:3241
 msgid "_Next DC_ - Switch to next dive computer."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3416
+#: ./user-manual.txt:3242
 msgid "_Full Screen_ - Toggles Full Screen mode."
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:3417
+#: ./user-manual.txt:3243
 #, no-wrap
 msgid "Help"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3420
+#: ./user-manual.txt:3246
 msgid ""
 "_About Subsurface_ - Show a panel with the version number of _Subsurface_ as "
 "well as licensing information."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3422
+#: ./user-manual.txt:3248
 msgid ""
 "_Check for updates_ - Find out whether a newer version of Subsurface is "
 "available on the http://subsurface-divelog.org/[_Subsurface_ web site]."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3423
+#: ./user-manual.txt:3249
 msgid ""
 "<<S_UserSurvey,_User survey_>> - Help to make _Subsurface_ even better by "
 "taking part in our user survey."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3424
+#: ./user-manual.txt:3250
 msgid "_User manual_ - Open a window showing this user manual."
 msgstr ""
 
 #. type: Title ==
-#: ./user-manual.txt:3426
+#: ./user-manual.txt:3252
 #, no-wrap
 msgid "Mobile Version"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3429
+#: ./user-manual.txt:3255
 msgid ""
 "_Subsurface_ has a mobile version, which can be used to view the dives "
 "stored in the user's cloud account."
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:3430
+#: ./user-manual.txt:3256
 #, no-wrap
 msgid "How to use the mobile version"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3434
+#: ./user-manual.txt:3260
 msgid ""
 "When you first open the mobile app, you will have to log into your cloud "
 "account. To do this, click on the menu icon on the upper right, then click "
@@ -6983,7 +6735,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3438
+#: ./user-manual.txt:3264
 msgid ""
 "To load dives the first time, click on the menu icon, and then click on "
 "_Load Dives_. This will fetch the dive list from the cloud storage onto your "
@@ -6992,7 +6744,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3441
+#: ./user-manual.txt:3267
 msgid ""
 "To view dive details, tap on any dive in the dive list. This will open the "
 "dive details window, which shows the dive profile and below it, the dive "
@@ -7000,7 +6752,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3444
+#: ./user-manual.txt:3270
 msgid ""
 "To save changes made to the dive details, click on the back icon, then from "
 "the menu select _Save Changes_. This will save your changes to the cloud "
@@ -7008,7 +6760,7 @@ msgid ""
 msgstr ""
 
 #. type: Title ==
-#: ./user-manual.txt:3446
+#: ./user-manual.txt:3272
 #, no-wrap
 msgid ""
 "APPENDIX A: Operating system specific information for importing dive "
@@ -7016,19 +6768,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:3448
+#: ./user-manual.txt:3274
 #, no-wrap
 msgid "Make sure that the OS has the required drivers installed"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: ./user-manual.txt:3449
+#: ./user-manual.txt:3275
 #, no-wrap
 msgid "images/icons/drivers.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3454
+#: ./user-manual.txt:3280
 msgid ""
 "The operating system of the desktop computer needs the appropriate drivers "
 "in order to communicate with the dive computer in whichever way the dive "
@@ -7036,7 +6788,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3460
+#: ./user-manual.txt:3286
 msgid ""
 "On Linux users need to have the correct kernel module loaded. Most "
 "distributions will do this automatically, so the user does not need to load "
@@ -7045,7 +6797,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3464
+#: ./user-manual.txt:3290
 msgid ""
 "On Windows, the OS should offer to download the correct driver once the user "
 "connects the dive computer to the USB port and operating system sees the "
@@ -7053,7 +6805,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3471
+#: ./user-manual.txt:3297
 msgid ""
 "On a Mac users sometimes have to manually hunt for the correct driver. For "
 "example the correct driver for the Mares Puck devices or any other dive "
@@ -7064,19 +6816,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:3473
+#: ./user-manual.txt:3299
 #, no-wrap
 msgid "How to Find the Device Name for USB devices and set its write permission"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: ./user-manual.txt:3474
+#: ./user-manual.txt:3300
 #, no-wrap
 msgid "images/icons/usb.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3482
+#: ./user-manual.txt:3308
 msgid ""
 "When a user connects the dive computer by using a USB connector, usually "
 "_Subsurface_ will either propose a drop down list that contains the correct "
@@ -7087,67 +6839,67 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: ./user-manual.txt:3483 ./user-manual.txt:3566
+#: ./user-manual.txt:3309 ./user-manual.txt:3392
 #, no-wrap
 msgid "On Windows:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3487
+#: ./user-manual.txt:3313
 msgid ""
 "Simply try COM1, COM2, etc. The drop down list should contain all connected "
 "COM devices."
 msgstr ""
 
 #. type: Title ====
-#: ./user-manual.txt:3488 ./user-manual.txt:3581
+#: ./user-manual.txt:3314 ./user-manual.txt:3407
 #, no-wrap
 msgid "On MacOS:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3491
+#: ./user-manual.txt:3317
 msgid "The drop down box should find all connected dive computers."
 msgstr ""
 
 #. type: Block title
-#: ./user-manual.txt:3492
+#: ./user-manual.txt:3318
 #, no-wrap
 msgid "On Linux:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3495
+#: ./user-manual.txt:3321
 msgid "There is a definitive way to find the port:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3497
+#: ./user-manual.txt:3323
 msgid "Disconnect the USB cable from the dive computer"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3498
+#: ./user-manual.txt:3324
 msgid "Open a terminal"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3499 ./user-manual.txt:3501
+#: ./user-manual.txt:3325 ./user-manual.txt:3327
 msgid "Type the command: 'dmesg' and press enter"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3500
+#: ./user-manual.txt:3326
 msgid "Plug in the USB cable of the dive computer"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3503
+#: ./user-manual.txt:3329
 msgid "A message similar to this one should appear:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3519
+#: ./user-manual.txt:3345
 #, no-wrap
 msgid ""
 "\tusb 2-1.1: new full speed USB device number 14 using ehci_hcd\n"
@@ -7168,7 +6920,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3524
+#: ./user-manual.txt:3350
 msgid ""
 "The third line from the bottom shows that the FTDI USB adapter is detected "
 "and connected to +ttyUSB3+. This information can now be used in the import "
@@ -7176,12 +6928,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3526
+#: ./user-manual.txt:3352
 msgid "Ensuring that the user has write permission to the USB serial port:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3532
+#: ./user-manual.txt:3358
 msgid ""
 "On Unix-like operating systems the USB ports can only be accessed by users "
 "who are members of the +dialout+ group. If one is not root, one may not be a "
@@ -7190,14 +6942,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3536
+#: ./user-manual.txt:3362
 msgid ""
 "As root, type: +usermod -a -G dialout johnB+ (Ubuntu users: +sudo usermod -a "
 "-G dialout johnB+)  This makes johnB a member of the +dialout+ group."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3541
+#: ./user-manual.txt:3367
 #, no-wrap
 msgid ""
 "Type: +id johnB+     This lists all the groups that johnB belongs to and\n"
@@ -7209,7 +6961,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3543
+#: ./user-manual.txt:3369
 #, no-wrap
 msgid ""
 "Under some circumstances this change takes only effect (eg. on Ubuntu) "
@@ -7218,7 +6970,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3548
+#: ./user-manual.txt:3374
 msgid ""
 "With the appropriate device name (e.g. +dev/ttyUSB3+) and with write "
 "permission to the USB port, the dive computer interface can connect and one "
@@ -7226,19 +6978,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:3550
+#: ./user-manual.txt:3376
 #, no-wrap
 msgid "Setting up bluetooth enabled devices"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: ./user-manual.txt:3551
+#: ./user-manual.txt:3377
 #, no-wrap
 msgid "images/icons/bluetooth.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3557
+#: ./user-manual.txt:3383
 msgid ""
 "For dive computers communicating through bluetooth like the Heinrichs "
 "Weikamp Frog or the Shearwater Predator and Petrel there is a different "
@@ -7247,7 +6999,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3559
+#: ./user-manual.txt:3385
 #, no-wrap
 msgid ""
 "*For the dive computer, after enabling Bluetooth, ensure it is in Upload "
@@ -7255,7 +7007,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3563
+#: ./user-manual.txt:3389
 msgid ""
 "For Bluetooth pairing of the dive computer, refer to the manufacturer's user "
 "guide. When using a Shearwater Predator/Petrel, select _Dive Log -> Upload "
@@ -7263,13 +7015,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3565
+#: ./user-manual.txt:3391
 #, no-wrap
 msgid "*Pair the _Subsurface_ computer with the dive computer.*\n"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3574
+#: ./user-manual.txt:3400
 msgid ""
 "Bluetooth is most likely already enabled. For pairing with the dive computer "
 "choose _Control Panel -> Bluetooth Devices -> Add Wireless Device_.  This "
@@ -7281,21 +7033,21 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3577
+#: ./user-manual.txt:3403
 msgid ""
 "For downloading to _Subsurface_, the _Subsurface_ drop-down list should "
 "contain this COM port already. If not, enter it manually."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3580
+#: ./user-manual.txt:3406
 msgid ""
 "Note: If there are issues afterwards when downloading from the dive computer "
 "using other software, remove the existing pairing with the dive computer."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3587
+#: ./user-manual.txt:3413
 msgid ""
 "Click on the Bluetooth symbol in the menu bar and select _Set up Bluetooth "
 "Device..._. The dive computer should then show up in the list of "
@@ -7304,20 +7056,20 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3590
+#: ./user-manual.txt:3416
 msgid ""
 "Once the pairing is completed the correct device is shown in the 'Device or "
 "Mount Point' drop-down in the _Subsurface_ *Import* dialog."
 msgstr ""
 
 #. type: Title ====
-#: ./user-manual.txt:3591
+#: ./user-manual.txt:3417
 #, no-wrap
 msgid "On Linux"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3599
+#: ./user-manual.txt:3425
 msgid ""
 "Ensure Bluetooth is enabled on the _Subsurface_ computer.  On most common "
 "distributions this should be true out of the box and pairing should be "
@@ -7330,7 +7082,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3603
+#: ./user-manual.txt:3429
 msgid ""
 "Setting up a connection to download dives from your Bluetooth-enabled "
 "device, such as the _Shearwater Petrel_, is not yet an automated process and "
@@ -7339,22 +7091,22 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3605
+#: ./user-manual.txt:3431
 msgid "Enable the Bluetooth controller and pair your dive computer</li>"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3606
+#: ./user-manual.txt:3432
 msgid "Establish an RFCOMM connection"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3607
+#: ./user-manual.txt:3433
 msgid "Download the dives with Subsurface"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3613
+#: ./user-manual.txt:3439
 msgid ""
 "Ensure the dive computer is in upload mode. On the _Shearwater Petrel_ and "
 "_Petrel 2_, cycle through the menu, select 'Dive Log', then 'Upload Log'.  "
@@ -7365,7 +7117,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3618
+#: ./user-manual.txt:3444
 msgid ""
 "To establish the connection, establish root access through +sudo+ or +su+.  "
 "The correct permission is required to download the dives in the computer. On "
@@ -7375,23 +7127,23 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3620
+#: ./user-manual.txt:3446
 msgid "+sudo usermod -a -G dialout username+"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3622
+#: ./user-manual.txt:3448
 msgid "Then log out and log in for the change to take effect."
 msgstr ""
 
 #. type: Title =====
-#: ./user-manual.txt:3623
+#: ./user-manual.txt:3449
 #, no-wrap
 msgid "Enabling the Bluetooth controller and pairing your dive computer"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3629
+#: ./user-manual.txt:3455
 msgid ""
 "Attempt to set up the Bluetooth controller and pair your dive computer using "
 "the graphical environment of the operating system. After setting the dive "
@@ -7402,7 +7154,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3632
+#: ./user-manual.txt:3458
 msgid ""
 "If the graphical method didn't work, pair the device from the command "
 "line. Open a terminal and use +hciconfig+ to check the Bluetooth controller "
@@ -7410,7 +7162,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3639
+#: ./user-manual.txt:3465
 #, no-wrap
 msgid ""
 "\t$ hciconfig\n"
@@ -7422,7 +7174,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3644
+#: ./user-manual.txt:3470
 msgid ""
 "This indicates a Bluetooth controller with MAC address 01:23:45:67:89:AB, "
 "connected as hci0.  Its status is 'DOWN', i.e. not powered.  Additional "
@@ -7432,7 +7184,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3652
+#: ./user-manual.txt:3478
 #, no-wrap
 msgid ""
 "\tsudo hciconfig hci0 up auth+  (enter password when prompted)\n"
@@ -7445,25 +7197,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3654
+#: ./user-manual.txt:3480
 msgid "+Check that the status now includes +'UP', 'RUNNING' AND 'AUTH'+."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3656
+#: ./user-manual.txt:3482
 msgid ""
 "If there are multiple controllers running, it's easiest to off the unused "
 "controller(s). For example, for +hci1+:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3658
+#: ./user-manual.txt:3484
 #, no-wrap
 msgid "\tsudo hciconfig hci1 down\n"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3661
+#: ./user-manual.txt:3487
 msgid ""
 "Next step is to 'trust' and 'pair' the dive computer. On distros with Bluez "
 "5, such as Fedora 22, one can use a tool called +blutootctl+, which will "
@@ -7471,7 +7223,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3682
+#: ./user-manual.txt:3508
 #, no-wrap
 msgid ""
 "\tbluetoothctl\n"
@@ -7500,14 +7252,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3685
+#: ./user-manual.txt:3511
 msgid ""
 "If asked for a password, enter 0000. It's ok if the last line says "
 "'Connected: no'. The important part is the line above, +Pairing successful+."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3688
+#: ./user-manual.txt:3514
 msgid ""
 "If the system has Bluez version 4 (e.g. Ubuntu 12.04 through to 15.04), "
 "there is probably not a +bluetoothctl+, but a script called "
@@ -7515,7 +7267,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3693
+#: ./user-manual.txt:3519
 #, no-wrap
 msgid ""
 "\thcitool -i hci0 scanning\n"
@@ -7525,77 +7277,77 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3695
+#: ./user-manual.txt:3521
 msgid "Once ther dive computer is pired, set up the RFCOMM connection"
 msgstr ""
 
 #. type: Title =====
-#: ./user-manual.txt:3696
+#: ./user-manual.txt:3522
 #, no-wrap
 msgid "Establishing the RFCOMM connection"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3699
+#: ./user-manual.txt:3525
 msgid "The command to establish an RFCOMM connection is:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3701
+#: ./user-manual.txt:3527
 msgid "+sudo rfcomm -i <controller> connect <dev> <bdaddr> [channel]+"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3703
+#: ./user-manual.txt:3529
 msgid "<controller>+ is the Bluetooth controller, +hci0+."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3704
+#: ./user-manual.txt:3530
 msgid "<dev> is the RFCOMM device file, +rfcomm0+"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3705
+#: ./user-manual.txt:3531
 msgid "<bdaddr> is the dive computer's MAC address, +00:11:22:33:44:55+"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3706
+#: ./user-manual.txt:3532
 msgid "[channel] is the dive computer's Bluetooth channel we need to connect to."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3709
+#: ./user-manual.txt:3535
 msgid ""
 "If one omits it, channel 1 is assumed.  Based on a limited number of user "
 "reports, the appropriate channel for the dive computer is probably:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3711
+#: ./user-manual.txt:3537
 msgid "_Shearwater Petrel 2_: channel 5"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3712
+#: ./user-manual.txt:3538
 msgid "_Shearwater Petrel 1_: channel 1"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3713
+#: ./user-manual.txt:3539
 msgid "_Heinrichs-Weikamp OSTC Sport_: channel 1"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3715
+#: ./user-manual.txt:3541
 msgid ""
 "E.g. to connect a _Shearwater Petrel 2_, set the dive computer to upload "
 "mode and enter:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3717
+#: ./user-manual.txt:3543
 #, no-wrap
 msgid ""
 "\tsudo rfcomm -i hci0 connect rfcomm0 00:11:22:33:44:55 5 (enter a password, "
@@ -7603,12 +7355,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3719
+#: ./user-manual.txt:3545
 msgid "This gives the response:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3722
+#: ./user-manual.txt:3548
 #, no-wrap
 msgid ""
 "\tConnected /dev/rfcomm0 to 00:11:22:33:44:55 on channel 5\n"
@@ -7616,14 +7368,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3724
+#: ./user-manual.txt:3550
 msgid ""
 "To connect a _Shearwater Petrel 1+ or + HW OSTC Sport+, set the dive "
 "computer to upload mode and enter:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3728
+#: ./user-manual.txt:3554
 #, no-wrap
 msgid ""
 "\tsudo rfcomm -i hci0 connect rfcomm0 00:11:22:33:44:55   (enter a password, "
@@ -7633,7 +7385,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3732
+#: ./user-manual.txt:3558
 msgid ""
 "If the specific channel the dive computer needs is not known, or the channel "
 "in the list above doesn't work, the command +sdptool records+ should help "
@@ -7642,7 +7394,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3742
+#: ./user-manual.txt:3568
 #, no-wrap
 msgid ""
 "\tsdptool -i hci0 records 00:11:22:33:44:55\n"
@@ -7657,7 +7409,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3745
+#: ./user-manual.txt:3571
 msgid ""
 "For a Bluetooth dive computer not in the list above, or if the channel "
 "listed is not correct, please let the Subsurface developers know on the user "
@@ -7665,13 +7417,13 @@ msgid ""
 msgstr ""
 
 #. type: Title =====
-#: ./user-manual.txt:3746
+#: ./user-manual.txt:3572
 #, no-wrap
 msgid "Download the dives with Subsurface</em>"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3748
+#: ./user-manual.txt:3574
 msgid ""
 "After establishing the RFCOMM connection and while the dive computer's "
 "upload mode countdown is still running, go to_Subsurface_, select "
@@ -7681,25 +7433,25 @@ msgid ""
 msgstr ""
 
 #. type: Title ==
-#: ./user-manual.txt:3751
+#: ./user-manual.txt:3577
 #, no-wrap
 msgid "APPENDIX B: Dive Computer specific information for importing dive data."
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:3754
+#: ./user-manual.txt:3580
 #, no-wrap
 msgid "Importing from Uemis Zurich"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: ./user-manual.txt:3756
+#: ./user-manual.txt:3582
 #, no-wrap
 msgid "images/icons/iumis.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3772
+#: ./user-manual.txt:3598
 msgid ""
 "_Subsurface_ downloads the information stored on the SDA (the built-in file "
 "system of the Uemis) including information about dive spots and "
@@ -7716,7 +7468,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3787
+#: ./user-manual.txt:3613
 msgid ""
 "After selecting the above device name, download the dives from the Uemis "
 "Zurich. One technical issue with the Uemis Zurich download implementation "
@@ -7733,19 +7485,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:3789
+#: ./user-manual.txt:3615
 #, no-wrap
 msgid "Importing from Uwatec Galileo"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: ./user-manual.txt:3791
+#: ./user-manual.txt:3617
 #, no-wrap
 msgid "images/icons/Galileo.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3806
+#: ./user-manual.txt:3632
 msgid ""
 "The Uwatec Galileo dive computers use infra red (IrDA) communication between "
 "the dive computer and Subsurface. The Uwatec hardware uses a USB dongle "
@@ -7761,14 +7513,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3809
+#: ./user-manual.txt:3635
 msgid ""
 "After executing this command, Subsurface will recognise the Galileo dive "
 "computer and download dive information."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3815
+#: ./user-manual.txt:3641
 msgid ""
 "Under Windows, a similar situation exists. Drivers for the MCS7780 are "
 "available from some Internet web sites e.g.  "
@@ -7779,26 +7531,26 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3818
+#: ./user-manual.txt:3644
 msgid ""
 "For the Apple Mac, IrDA communication via the MCS7780 link is not available "
 "for OSX 10.6 or higher."
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:3820
+#: ./user-manual.txt:3646
 #, no-wrap
 msgid "Importing from Heinrichs Weikamp DR5"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: ./user-manual.txt:3822
+#: ./user-manual.txt:3648
 #, no-wrap
 msgid "images/icons/HW_DR5.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3832
+#: ./user-manual.txt:3658
 msgid ""
 "When mounted as a USB drive the Heinrichs Weikamp DR5 saves a single UDDF "
 "file for every dive.  Mark all the dives you'd like to import or open.  "
@@ -7811,19 +7563,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:3835
+#: ./user-manual.txt:3661
 #, no-wrap
 msgid "Importing from xDEEP BLACK"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: ./user-manual.txt:3837
+#: ./user-manual.txt:3663
 #, no-wrap
 msgid "images/icons/HW_xdeepblack.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3846
+#: ./user-manual.txt:3672
 msgid ""
 "Each dive has to be individually saved as UDDF file using \"Export UDDF\" "
 "option in BLACK's logbook menu.  When mounted as a USB drive UDDF files are "
@@ -7837,19 +7589,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:3848
+#: ./user-manual.txt:3674
 #, no-wrap
 msgid "Importing from Shearwater Predator using Bluetooth"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: ./user-manual.txt:3850
+#: ./user-manual.txt:3676
 #, no-wrap
 msgid "images/icons/predator.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3858
+#: ./user-manual.txt:3684
 msgid ""
 "Using a Shearwater Predator one may be able to pair Bluetooth but then "
 "encounter issues when downloading, showing errors like _Slip RX: unexp. SLIP "
@@ -7860,36 +7612,36 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3861
+#: ./user-manual.txt:3687
 msgid ""
 "use the Bluetooth dongle which came with the Shearwater Predator instead of "
 "the built-in one of the _Subsurface_ computer"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3862
+#: ./user-manual.txt:3688
 msgid "switch to different Bluetooth drivers for the same hardware"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3863
+#: ./user-manual.txt:3689
 msgid "switch off WiFi while using Bluetooth"
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:3865
+#: ./user-manual.txt:3691
 #, no-wrap
 msgid "Importing from Poseidon MkVI Discovery"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: ./user-manual.txt:3867
+#: ./user-manual.txt:3693
 #, no-wrap
 msgid "images/MkVI.jpeg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3875
+#: ./user-manual.txt:3701
 msgid ""
 "Download of dive logs from the MkVI is performed using a custom "
 "communications adapter and the _Poseidon PC Configuration Software_, "
@@ -7901,45 +7653,45 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3878
+#: ./user-manual.txt:3704
 msgid ""
 "Setup configuration for the dive and key dive parameters (file with a .txt "
 "extension)"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3879
+#: ./user-manual.txt:3705
 msgid "Dive log details (file with a .csv extension)"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3881
+#: ./user-manual.txt:3707
 msgid ""
 "Redbook format dive log (file with .cvsr extension). This is a compressed "
 "version of the dive log using a proprietary format."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3883
+#: ./user-manual.txt:3709
 msgid ""
 "_Subsurface_ accesses the .txt and the .csv files to obtain dive log "
 "information."
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:3885
+#: ./user-manual.txt:3711
 #, no-wrap
 msgid "Importing from APD Inspiration/Evolution CCR"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: ./user-manual.txt:3887
+#: ./user-manual.txt:3713
 #, no-wrap
 msgid "images/APDComputer.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3895
+#: ./user-manual.txt:3721
 msgid ""
 "The dive logs of an APD Inspiration or similar CCR dive computer are "
 "downloaded using a communications adapter and _AP Communicator_, obtained "
@@ -7951,55 +7703,55 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3897
+#: ./user-manual.txt:3723
 msgid "Download the dive using _AP Communicator_."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3898
+#: ./user-manual.txt:3724
 msgid "Open a dive within the _AP Log Viewer_."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3899
+#: ./user-manual.txt:3725
 msgid "Select the tab at the top of the screen, entitled \"_Data_\"."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3900
+#: ./user-manual.txt:3726
 msgid ""
 "With the raw dive log data show on the screen, click on \"_Copy to "
 "Clipboard_\"."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3901
+#: ./user-manual.txt:3727
 msgid "Open a text editor, e.g. Notepad (Windows) or TextWrangler (Mac)."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3903
+#: ./user-manual.txt:3729
 msgid ""
 "Copy the contents of the clipboard into the text editor and save the text "
 "file with a filename extension of _.apd_"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3904
+#: ./user-manual.txt:3730
 msgid ""
 "Within _Subsurface_, select _Import -> Import log files_ to open the "
 "xref:Unified_import[universal import dialogue]."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3905
+#: ./user-manual.txt:3731
 msgid ""
 "In the dropdown list towards the bottom right of the dialogue (labled "
 "'Filter:'), select \"APD log viewer\"."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3908
+#: ./user-manual.txt:3734
 msgid ""
 "On the list of file names select the _.apd_ file that has been created "
 "above. An import dialogue opens indicating the default settings for the data "
@@ -8008,13 +7760,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:3909
+#: ./user-manual.txt:3735
 #, no-wrap
 msgid "images/APD_CSVimportF22.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3917
+#: ./user-manual.txt:3743
 msgid ""
 "The top left hand dropdown box in the import panel allows one to select the "
 "APD dive computer for which the dive log needs to be imported. The default "
@@ -8026,12 +7778,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3918
+#: ./user-manual.txt:3744
 msgid "Click the _Ok_ button at the bottom of the import panel."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3923
+#: ./user-manual.txt:3749
 msgid ""
 "The APD dive log will appear within _Subsurface_. The dive "
 "computer-generated ceiling generated by the Inspiration can be viewed by "
@@ -8041,13 +7793,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ==
-#: ./user-manual.txt:3924
+#: ./user-manual.txt:3750
 #, no-wrap
 msgid "APPENDIX C: Exporting Dive log information from external dive log software."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3933
+#: ./user-manual.txt:3759
 msgid ""
 "The import of dive log data from external dive log software is mostly "
 "performed using the dialogue found by selecting _Import_ from the Main Menu, "
@@ -8057,22 +7809,22 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3935
+#: ./user-manual.txt:3761
 msgid "Export the foreign dive log data to format that is accessible from"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3936
+#: ./user-manual.txt:3762
 msgid "_Subsurface_."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3937
+#: ./user-manual.txt:3763
 msgid "Import the accessible dive log data into _Subsurface_."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3941
+#: ./user-manual.txt:3767
 msgid ""
 "This appendix provides some information about approaches to export dive log "
 "data from foreign dive log software. The procedures below mostly apply to "
@@ -8080,19 +7832,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:3943
+#: ./user-manual.txt:3769
 #, no-wrap
 msgid "Exporting from *Suunto Divemanager (DM3, DM4 or DM5)*"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: ./user-manual.txt:3944
+#: ./user-manual.txt:3770
 #, no-wrap
 msgid "images/icons/suuntologo.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3951
+#: ./user-manual.txt:3777
 msgid ""
 "DiveManager is a MS Windows application for Suunto dive computers.  "
 "Divemanager 3 (DM3) is an older version of the Suunto software. More recent "
@@ -8102,64 +7854,64 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3953
+#: ./user-manual.txt:3779
 #, no-wrap
 msgid "*Divemanager 3 (DM3):*\n"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3955
+#: ./user-manual.txt:3781
 msgid "Start 'Suunto Divemanager 3' and log in with the name containing the logs"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3956
+#: ./user-manual.txt:3782
 msgid "Do not start the import wizard to import dives from the dive computer."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3958
+#: ./user-manual.txt:3784
 msgid ""
 "In the navigation tree on the left side of the program-window, select the "
 "appropriate dives."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3959
+#: ./user-manual.txt:3785
 msgid "Within the list of dives, select the dives you would like to import later:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3960
+#: ./user-manual.txt:3786
 msgid "To select certain dives: hold 'ctrl' and click the dive"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3962
+#: ./user-manual.txt:3788
 msgid ""
 "To select all dives: Select the first dive, hold down shift and select the "
 "last dive"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3963
+#: ./user-manual.txt:3789
 msgid "With the dives marked, use the program menu _File -> Export_"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3964
+#: ./user-manual.txt:3790
 msgid ""
 "The export pop-up will show. Within this pop-up, there is one field called "
 "'Export Path'."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3965
+#: ./user-manual.txt:3791
 msgid "Click the browse button next to the field Export Path"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3967
+#: ./user-manual.txt:3793
 #, no-wrap
 msgid ""
 "** A file-manager like window pops up\n"
@@ -8167,13 +7919,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3968
+#: ./user-manual.txt:3794
 #, no-wrap
 msgid "Divelog.SDE file\n"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3970
+#: ./user-manual.txt:3796
 #, no-wrap
 msgid ""
 "** Optionally change the name of the file for saving\n"
@@ -8181,25 +7933,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3971
+#: ./user-manual.txt:3797
 #, no-wrap
 msgid "Back in the Export pop-up, press the button 'Export'\n"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3972
+#: ./user-manual.txt:3798
 #, no-wrap
 msgid "The dives are now exported to the file Divelog.SDE.\n"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3974
+#: ./user-manual.txt:3800
 #, no-wrap
 msgid "*Divemanager 4 (DM4) and Divemanager 5 (DM5):*\n"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3979
+#: ./user-manual.txt:3805
 msgid ""
 "DM4 and DM5 use identical mechanisms for exporting dive logs.  To export a "
 "divelog from Divemanager one needs to locate the DM4/DM5 database where the "
@@ -8208,81 +7960,81 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3981
+#: ./user-manual.txt:3807
 msgid "Locating the Suunto DM4 (or DM5) database:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3983 ./user-manual.txt:3992
+#: ./user-manual.txt:3809 ./user-manual.txt:3818
 msgid "Start Suunto DM4/DM5"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3984
+#: ./user-manual.txt:3810
 msgid "Select 'Help -> About'"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3985
+#: ./user-manual.txt:3811
 msgid "Click 'Copy' after text 'Copy log folder path to clipboard'"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3986
+#: ./user-manual.txt:3812
 msgid "Now open Windows Explorer"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3987
+#: ./user-manual.txt:3813
 msgid "Paste the address to the path box at the top of the File Explorer"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3988
+#: ./user-manual.txt:3814
 msgid "The database is called DM4.db or DM5.db"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3990
+#: ./user-manual.txt:3816
 msgid "Making a backup copy of the Suunto DM4/DM5 database:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3993
+#: ./user-manual.txt:3819
 msgid "Select 'File - Create backup'"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3995
+#: ./user-manual.txt:3821
 msgid ""
 "From the file menu select the location and name for the backup, we'll use "
 "DM4 (or DM5) in here with the default extension .bak"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3996
+#: ./user-manual.txt:3822
 msgid "Click 'Save'"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3997
+#: ./user-manual.txt:3823
 msgid "The dives are now exported to the file DM4.bak (or DM5.bak)"
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:3999
+#: ./user-manual.txt:3825
 #, no-wrap
 msgid "Exporting from Atomic Logbook"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: ./user-manual.txt:4002
+#: ./user-manual.txt:3828
 #, no-wrap
 msgid "images/icons/atomiclogo.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4009
+#: ./user-manual.txt:3835
 msgid ""
 "Atomic Logbook is a Windows software by Atomic Aquatics. It allows "
 "downloading of dive information from Cobalt and Cobalt 2 dive computers.  "
@@ -8292,19 +8044,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:4011
+#: ./user-manual.txt:3837
 #, no-wrap
 msgid "Exporting from Mares Dive Organiser V2.1"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: ./user-manual.txt:4014
+#: ./user-manual.txt:3840
 #, no-wrap
 msgid "images/icons/mareslogo.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4022
+#: ./user-manual.txt:3848
 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 "
@@ -8315,7 +8067,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4027
+#: ./user-manual.txt:3853
 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 "
@@ -8323,36 +8075,36 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4030
+#: ./user-manual.txt:3856
 msgid ""
 "Rename the file to DiveOrganiserxxxxx.zip. Inside the zipped directory is a "
 "file _DiveOrganiser.sdf_."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4031
+#: ./user-manual.txt:3857
 msgid "Extract the _.sdf_ file from the zipped folder to your Desktop."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4032
+#: ./user-manual.txt:3858
 msgid "The password for accessing the .zip file is _mares_."
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:4034
+#: ./user-manual.txt:3860
 #, no-wrap
 msgid "Exporting from *DivingLog 5.0 and 6.0*"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: ./user-manual.txt:4036
+#: ./user-manual.txt:3862
 #, no-wrap
 msgid "images/icons/divingloglogo.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4043
+#: ./user-manual.txt:3869
 msgid ""
 "The best way to bring your logs from DivingLog to Subsurface is to convert "
 "the whole database. This is because other export formats do not include all "
@@ -8362,37 +8114,37 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4045
+#: ./user-manual.txt:3871
 msgid "To transfer all files from DivingLog to Subsurface, do the following:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4047
+#: ./user-manual.txt:3873
 msgid "In DivingLog open the 'File -> Export -> SQLite' menu"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4048
+#: ./user-manual.txt:3874
 msgid "Select 'Settings' button"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4049
+#: ./user-manual.txt:3875
 msgid "Set the 'RTF2Plaintext' to 'true'"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4050
+#: ./user-manual.txt:3876
 msgid "Close the Settings dialog"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4051
+#: ./user-manual.txt:3877
 msgid "Click 'Export' button and select the filename"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4055
+#: ./user-manual.txt:3881
 msgid ""
 "Once this is done, open the saved database file with Subsurface and the "
 "dives are automatically converted to our own format. Last step to do is save "
@@ -8400,13 +8152,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ==
-#: ./user-manual.txt:4056
+#: ./user-manual.txt:3882
 #, no-wrap
 msgid "APPENDIX D: Exporting a spreadsheet to CSV format"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4066
+#: ./user-manual.txt:3892
 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 "
@@ -8419,7 +8171,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4072
+#: ./user-manual.txt:3898
 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 "
@@ -8430,40 +8182,40 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4074
+#: ./user-manual.txt:3900
 msgid "Date: use one of the following formats: yyyy-mm-dd, dd.mm.yyyy, mm/dd/yyyy"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4075
+#: ./user-manual.txt:3901
 msgid "Duration: the format should be minutes:seconds."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4076
+#: ./user-manual.txt:3902
 msgid ""
 "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:4077
+#: ./user-manual.txt:3903
 msgid "Tags and buddies: values should be separated using a comma."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4078
+#: ./user-manual.txt:3904
 msgid "GPS position: users must use decimal degrees, e.g. 30.22496 30.821798"
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:4079
+#: ./user-manual.txt:3905
 #, no-wrap
 msgid "_LibreOffice Calc_ and _OpenOffice Calc_"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4083
+#: ./user-manual.txt:3909
 msgid ""
 "These are open source spreadsheet applications forming parts of larger open "
 "source office suite applications. The user interaction with _LibreOffice_ "
@@ -8474,13 +8226,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:4084
+#: ./user-manual.txt:3910
 #, no-wrap
 msgid "images/LOffice_spreadsheetdata.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4087
+#: ./user-manual.txt:3913
 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 "
@@ -8488,13 +8240,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:4088
+#: ./user-manual.txt:3914
 #, no-wrap
 msgid "images/LOffice_save_as_options.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4091
+#: ./user-manual.txt:3917
 msgid ""
 "After selecting _Save_, select the appropriate field delimiter (choose _Tab_ "
 "to prevent conflicts with the comma when using this as a decimal point), "
@@ -8502,13 +8254,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:4092
+#: ./user-manual.txt:3918
 #, no-wrap
 msgid "images/LOffice_field_options.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4095
+#: ./user-manual.txt:3921
 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 "
@@ -8516,13 +8268,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:4096
+#: ./user-manual.txt:3922
 #, no-wrap
 msgid "Microsoft _Excel_"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4102
+#: ./user-manual.txt:3928
 msgid ""
 "The field delimiter (called \"_list separator_\" in Microsoft manuals) is "
 "not accessible from within _Excel_ and needs to be set through the "
@@ -8533,19 +8285,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4104
+#: ./user-manual.txt:3930
 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:4105
+#: ./user-manual.txt:3931
 msgid "Open the _Regional and Language Options_ dialog box."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4108
+#: ./user-manual.txt:3934
 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 "
@@ -8553,48 +8305,48 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4109
+#: ./user-manual.txt:3935
 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:4110
+#: ./user-manual.txt:3936
 msgid "Click _OK_ twice."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4112
+#: ./user-manual.txt:3938
 msgid "Below is an image of the _Control Panel_:"
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:4113
+#: ./user-manual.txt:3939
 #, no-wrap
 msgid "images/Win_SaveCSV2.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4116
+#: ./user-manual.txt:3942
 msgid "To export the dive log in CSV format:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4118
+#: ./user-manual.txt:3944
 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:4119
+#: ./user-manual.txt:3945
 #, no-wrap
 msgid "images/Win_SaveCSV1.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4122
+#: ./user-manual.txt:3948
 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 "
@@ -8604,13 +8356,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:4123
+#: ./user-manual.txt:3949
 #, no-wrap
 msgid "images/Win_SaveCSV3.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4126
+#: ./user-manual.txt:3952
 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 "
@@ -8619,13 +8371,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ==
-#: ./user-manual.txt:4128
+#: ./user-manual.txt:3954
 #, no-wrap
 msgid "APPENDIX E: Writing a custom print template"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4133
+#: ./user-manual.txt:3959
 msgid ""
 "_Subsurface_ provides a mechanism to create or modify templates for printing "
 "dive logs in order to produce customised printouts of dive logs. Templates, "
@@ -8634,12 +8386,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4135
+#: ./user-manual.txt:3961
 msgid "Templates are accessed using the print dialogue (see image *B* below)."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4143
+#: ./user-manual.txt:3969
 msgid ""
 "The buttons under the _Template_ dropdown box allows one to _Edit_, "
 "_Delete_, _Import_ and to _Export_ templates (see image *A* above). New or "
@@ -8650,18 +8402,18 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4145
+#: ./user-manual.txt:3971
 msgid "The Edit Panel comprises three tabs:"
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:4146
+#: ./user-manual.txt:3972
 #, no-wrap
 msgid "images/Template1_f22.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4150
+#: ./user-manual.txt:3976
 msgid ""
 "The _Style_ tab (image *A* above) controls the font, line spacing and colour "
 "template used for printing the dive log.  The style attributes are "
@@ -8669,7 +8421,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4154
+#: ./user-manual.txt:3980
 msgid ""
 "The _Colors_ tab (image *B* above) allows editing the colours used for "
 "printing the dive log. The colours are highly customisable: the _Edit_ "
@@ -8678,7 +8430,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4163
+#: ./user-manual.txt:3989
 msgid ""
 "The _Template_ tab of the Edit Panel (see image below) allows creating a "
 "template using HTML as well as a few Grantlee programming "
@@ -8694,13 +8446,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:4164
+#: ./user-manual.txt:3990
 #, no-wrap
 msgid "images/Template2_f22.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4167
+#: ./user-manual.txt:3993
 msgid ""
 "One can adapt any of the existing templates and save it to the dive log "
 "directory. The standard templates (e.g. One dive, Six dives, Table) can be "
@@ -8708,33 +8460,33 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4169
+#: ./user-manual.txt:3995
 msgid ""
 "To write a custom template the following elements must exist so that the "
 "template will be correctly handled and rendered."
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:4170
+#: ./user-manual.txt:3996
 #, no-wrap
 msgid "Main dive loop"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4172
+#: ./user-manual.txt:3998
 msgid ""
 "_Subsurface_ exports a dive list called (*dives*) to the _Grantlee_ "
 "backend. It is possible to iterate over the list as follows:"
 msgstr ""
 
 #. type: Block title
-#: ./user-manual.txt:4173 ./user-manual.txt:4227 ./user-manual.txt:4244
+#: ./user-manual.txt:3999 ./user-manual.txt:4053 ./user-manual.txt:4070
 #, no-wrap
 msgid "template.html"
 msgstr ""
 
 #. type: delimited block .
-#: ./user-manual.txt:4178
+#: ./user-manual.txt:4004
 #, no-wrap
 msgid ""
 "\t{% for dive in dives %}\n"
@@ -8743,13 +8495,13 @@ msgid ""
 msgstr ""
 
 #. type: Block title
-#: ./user-manual.txt:4180 ./user-manual.txt:4232 ./user-manual.txt:4251
+#: ./user-manual.txt:4006 ./user-manual.txt:4058 ./user-manual.txt:4077
 #, no-wrap
 msgid "output.html"
 msgstr ""
 
 #. type: delimited block .
-#: ./user-manual.txt:4185
+#: ./user-manual.txt:4011
 #, no-wrap
 msgid ""
 "\t<h1> 1 </h1>\n"
@@ -8758,25 +8510,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4188
+#: ./user-manual.txt:4014
 msgid ""
 "Additional information about _Grantlee_ can be found "
 "http://www.grantlee.org/apidox/for_themers.html[here]"
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:4189
+#: ./user-manual.txt:4015
 #, no-wrap
 msgid "Grantlee exported variables"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4191
+#: ./user-manual.txt:4017
 msgid "Only a subset of the dive data is exported:"
 msgstr ""
 
 #. type: delimited block |
-#: ./user-manual.txt:4209
+#: ./user-manual.txt:4035
 #, no-wrap
 msgid ""
 "|*Name*|*Description*\n"
@@ -8799,7 +8551,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4213
+#: ./user-manual.txt:4039
 msgid ""
 "_Subsurface_ also exports *template_options* data. This data must be used as "
 "_CSS_ values to provide a dynamically editable template. The exported data "
@@ -8807,7 +8559,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block |
-#: ./user-manual.txt:4225
+#: ./user-manual.txt:4051
 #, no-wrap
 msgid ""
 "|*Name*|*Description*\n"
@@ -8826,26 +8578,26 @@ msgid ""
 msgstr ""
 
 #. type: delimited block .
-#: ./user-manual.txt:4230
+#: ./user-manual.txt:4056
 #, no-wrap
 msgid "\tborder-width: {{ template_options.borderwidth }}px;\n"
 msgstr ""
 
 #. type: delimited block .
-#: ./user-manual.txt:4235
+#: ./user-manual.txt:4061
 #, no-wrap
 msgid "\tborder-width: 3px;\n"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4238
+#: ./user-manual.txt:4064
 msgid ""
 "Another variable that _Subsurface_ exports is *print_options*. This variable "
 "contains a single member:"
 msgstr ""
 
 #. type: delimited block |
-#: ./user-manual.txt:4241
+#: ./user-manual.txt:4067
 #, no-wrap
 msgid ""
 "|*Name*|*Description*\n"
@@ -8854,7 +8606,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block .
-#: ./user-manual.txt:4249
+#: ./user-manual.txt:4075
 #, no-wrap
 msgid ""
 "\tbody {\n"
@@ -8863,7 +8615,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block .
-#: ./user-manual.txt:4256
+#: ./user-manual.txt:4082
 #, no-wrap
 msgid ""
 "\tbody {\n"
@@ -8872,13 +8624,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:4258
+#: ./user-manual.txt:4084
 #, no-wrap
 msgid "Defined CSS selectors"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4262
+#: ./user-manual.txt:4088
 msgid ""
 "As the dive profile is placed after rendering, _Subsurface_ uses a special "
 "_CSS_ selectors to do some searches in the HTML output. The _CSS_ selectors "
@@ -8886,7 +8638,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block |
-#: ./user-manual.txt:4269
+#: ./user-manual.txt:4095
 #, no-wrap
 msgid ""
 "|*Selector*|*Type*|*Description*\n"
@@ -8899,20 +8651,20 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4272
+#: ./user-manual.txt:4098
 msgid ""
 "Rendering dive profiles is not supported for flow layout templates (when "
 "data-numberofdives = 0)."
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:4273
+#: ./user-manual.txt:4099
 #, no-wrap
 msgid "Special attributes"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4277
+#: ./user-manual.txt:4103
 msgid ""
 "There are two ways of rendering- either rendering a specific number of dives "
 "in each page or make _Subsurface_ try to fit as much dives as possible into "
@@ -8920,55 +8672,55 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4279
+#: ./user-manual.txt:4105
 msgid ""
 "The *data-numberofdives* data attribute is added to the body tag to set the "
 "rendering mode"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4281
+#: ./user-manual.txt:4107
 msgid "render 6 dives per page:"
 msgstr ""
 
 #. type: delimited block .
-#: ./user-manual.txt:4284
+#: ./user-manual.txt:4110
 #, no-wrap
 msgid "\t<body data-numberofdives = 6>\n"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4287
+#: ./user-manual.txt:4113
 msgid "render as much dives as possible:"
 msgstr ""
 
 #. type: delimited block .
-#: ./user-manual.txt:4290
+#: ./user-manual.txt:4116
 #, no-wrap
 msgid "\t<body data-numberofdives = 0>\n"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4293
+#: ./user-manual.txt:4119
 msgid ""
 "All CSS units should be in relative lengths only, to support printing on any "
 "page size."
 msgstr ""
 
 #. type: Title ==
-#: ./user-manual.txt:4294
+#: ./user-manual.txt:4120
 #, no-wrap
 msgid "APPENDIX F: FAQs."
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:4296
+#: ./user-manual.txt:4122
 #, no-wrap
 msgid "Subsurface appears to miscalculate gas consumption and SAC"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4300
+#: ./user-manual.txt:4126
 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_ "
@@ -8976,7 +8728,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4306
+#: ./user-manual.txt:4132
 msgid ""
 "'Answer': Not really. What happens is that _Subsurface_ actually calculates "
 "gas consumption differently - and better - than you expect.  In particular, "
@@ -8986,7 +8738,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4312
+#: ./user-manual.txt:4138
 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 "
@@ -8996,12 +8748,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4314
+#: ./user-manual.txt:4140
 msgid "+consumption = (amount_of_air_at_beginning - amount_of_air_at_end)+"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4320
+#: ./user-manual.txt:4146
 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 "
@@ -9012,12 +8764,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4322
+#: ./user-manual.txt:4148
 msgid "+12.2*((220-100)/1.013)+"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4327
+#: ./user-manual.txt:4153
 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 "
@@ -9027,7 +8779,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4333
+#: ./user-manual.txt:4159
 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 "
@@ -9038,7 +8790,7 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:4334
+#: ./user-manual.txt:4160
 #, no-wrap
 msgid ""
 "Some dive profiles have time discrepancies with the recorded samples from my "
@@ -9046,7 +8798,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4338
+#: ./user-manual.txt:4164
 msgid ""
 "_Subsurface_ ends up ignoring surface time for many things (average depth, "
 "divetime, SAC, etc).  'Question': Why do dive durations in my dive computer "
@@ -9054,7 +8806,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4346
+#: ./user-manual.txt:4172
 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 "
@@ -9068,13 +8820,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:4347
+#: ./user-manual.txt:4173
 #, no-wrap
 msgid "Some dive profiles are missing from the download"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4353
+#: ./user-manual.txt:4179
 msgid ""
 "'Question': I cannot download all my dives, only the most recent ones even "
 "though my dive computer's manual states that it records history of e.g. 999 "
@@ -9082,7 +8834,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4362
+#: ./user-manual.txt:4188
 msgid ""
 "'Answer': Dive history is different than the dive profiles on the log.  The "
 "history only keeps track of the total number of dives and total amount of "
@@ -9095,7 +8847,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4366
+#: ./user-manual.txt:4192
 msgid ""
 "If you have downloaded your dives to different dive logging software before "
 "they were overwritten, there is a high change that Subsurface can import "
diff --git a/Documentation/fr/po/subsurface-manual.fr.po b/Documentation/fr/po/subsurface-manual.fr.po
index 705bf88..d0972f0 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 at subsurface-divelog.org\n"
-"POT-Creation-Date: 2015-09-08 10:29+0200\n"
-"PO-Revision-Date: 2015-09-08 10:31+0200\n"
+"POT-Creation-Date: 2015-09-09 14:50+0200\n"
+"PO-Revision-Date: 2015-09-09 14:51+0200\n"
 "Last-Translator: Guillaume GARDET <guillaume.gardet at opensuse.org>\n"
 "Language-Team: French <opensuse-fr at opensuse.org>\n"
 "Language: fr\n"
@@ -330,8 +330,8 @@ msgstr ""
 #. type: Target for macro image
 #: user-manual.txt:127
 #, no-wrap
-msgid "images/main_window_f20.jpg"
-msgstr "images/main_window_f20.jpg"
+msgid "images/main_window_f22.jpg"
+msgstr "images/main_window_f22.jpg"
 
 #. type: Plain text
 #: user-manual.txt:132
@@ -582,8 +582,8 @@ msgstr ""
 #. type: Target for macro image
 #: user-manual.txt:210
 #, no-wrap
-msgid "images/AddDive1_f20.jpg"
-msgstr "images/AddDive1_f20.jpg"
+msgid "images/AddDive1_f22.jpg"
+msgstr "images/AddDive1_f22.jpg"
 
 #. type: Plain text
 #: user-manual.txt:215
@@ -595,390 +595,31 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:216 user-manual.txt:820
+#: user-manual.txt:216 user-manual.txt:646
 #, no-wrap
-msgid "images/BlueEditBar_f20.jpg"
-msgstr "images/BlueEditBar_f20.jpg"
+msgid "images/BlueEditBar_f22.jpg"
+msgstr "images/BlueEditBar_f22.jpg"
 
 #. type: Plain text
 #: user-manual.txt:223
 msgid ""
-"The _Save_ button should only be selected after all the parts of a dive have "
-"been entered.  When entering dives by hand, the _Info_, _Equipment_ and "
-"_Profile_ tabs should be completed before saving the information. By "
-"selecting the _Save_ 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."
+"The _Apply changes_ button should only be selected after all the parts of a "
+"dive have been entered.  When entering dives by hand, the _Info_, "
+"_Equipment_ and _Profile_ tabs should be completed before saving the "
+"information. By selecting the _Apply changes_ 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."
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:224 user-manual.txt:700
-#, no-wrap
-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 *Notes* tab, the following "
-"fields are visible:"
-msgstr ""
-
-#. type: Target for macro image
-#: user-manual.txt:231
-#, no-wrap
-msgid "images/AddDive2_f20.jpg"
-msgstr "images/AddDive2_f20.jpg"
-
-#. type: Plain text
-#: user-manual.txt:240
-msgid ""
-"The *Time* 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 box and "
-"by overtyping the information displayed. The default date is the present "
-"date and the default time is an hour in advance of the present time."
-msgstr ""
-
-#. type: Plain text
-#: user-manual.txt:247
-#, no-wrap
-msgid ""
-"*Air and water temperatures*: the air and water temperatures during the\n"
-"dive can be typed directly on the fields to the right of the Start time.\n"
-"Temperature units are not needed, as they will be automatically supplied by\n"
-"_Subsurface_. Only the numerical value must be\n"
-"typed by the user (the units selected in the 'Preferences'\n"
-"will determine whether metric or imperial units are used).\n"
-msgstr ""
-
-#. type: Plain text
-#: user-manual.txt:252
-#, no-wrap
-msgid ""
-"*Location*: Here the name of the dive site can be entered, e.g. \"Tihany, Lake\n"
-"Balaton,\n"
-"Hungary\". Auto completion of location names will make this easier if one\n"
-"frequently dives at the same sites.\n"
-msgstr ""
-
-#. type: Plain text
-#: user-manual.txt:255 user-manual.txt:738
-#, no-wrap
-msgid ""
-"*Coordinates*: The geographic coordinates of the dive site should be entered\n"
-"here. These can come from three sources:\n"
-msgstr ""
-
-#. type: Plain text
-#: user-manual.txt:262
-msgid ""
-"One can find the coordinates on the world map in the bottom right hand part "
-"of the Subsurface window. The map displays a green bar indicating \"No "
-"location data - Move the map and double-click to set the dive location\". "
-"Upon a double-click at the appropriate place, the green bar disappears and "
-"the coordinates are stored."
-msgstr ""
-
-#. type: Plain text
-#: user-manual.txt:267
-msgid ""
-"The coordinates can be obtained from the _Subsurface_ Companion app if the "
-"user has an Android or iPhone device with GPS and if the coordinates of the "
-"dive site were stored using that device.  xref:S_Companion[Click here for "
-"more information]"
-msgstr ""
-
-#. type: Plain text
-#: user-manual.txt:270 user-manual.txt:753
-msgid ""
-"The coordinates can be entered by hand if they are known, using one of four "
-"formats with latitude followed by longitude:"
-msgstr ""
-
-#. type: Plain text
-#: user-manual.txt:275 user-manual.txt:758
-msgid ""
-"ISO 6709 Annex D format e.g. 30°13'28.9\"N 30°49'1.5\"E Degrees and decimal "
-"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"
-msgstr ""
-
-#. type: Plain text
-#: user-manual.txt:279
-msgid ""
-"Southern hemisphere latitudes are given with a *S*, e.g. S30°, or with a "
-"negative value, e.g. -30.22496. Similarly western longitudes are given with "
-"a *W*, e.g. W07°, or with a negative value, e.g. -7.34323."
-msgstr ""
-
-#. type: Plain text
-#: user-manual.txt:282
-msgid ""
-"Some keyboards don't have the degree sign (°). It can be replaced by a d "
-"like that: N30d W20d."
-msgstr ""
-
-#. type: Plain text
-#: user-manual.txt:288
-msgid ""
-"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)."
-msgstr ""
-
-#. type: Plain text
-#: user-manual.txt:293
-#, no-wrap
-msgid ""
-"*Dive mode*: This is a dropdown box allowing one to choose the type of dive\n"
-"performed. The options are OC (Open Circuit, the default setting, meant for most recreational dives),\n"
-"Freedive (dive without SCUBA equipment), CCR (Closed-circuit\n"
-"rebreather) and pSCR (Passive semi-closed rebreather).\n"
-msgstr ""
-
-#. type: Plain text
-#: user-manual.txt:298
-#, no-wrap
-msgid ""
-"*Divemaster*: The name of the dive master or dive guide for this dive can be\n"
-"entered here.\n"
-"Again, this field offers auto completion based on the list of dive masters in\n"
-"the current logbook.\n"
-msgstr ""
-
-#. type: Plain text
-#: user-manual.txt:302
-#, no-wrap
-msgid ""
-"*Buddy*: In this field one can enter the name(s) of the buddy / buddies\n"
-"(separated by commas) who accompanied the user on the dive. Auto completion\n"
-"is offered based on the list of buddies in the current logbook.\n"
-msgstr ""
-
-#. type: Plain text
-#: user-manual.txt:307
-#, no-wrap
-msgid ""
-"*Suit*: The type of diving suit used for the dive can be entered here.\n"
-"As with the other items, auto completion of the suit description is available.\n"
-"Some dry-suit users may choose to use this field to record what combination of\n"
-"suit and thermal protection undersuit was used.\n"
-msgstr ""
-
-#. type: Plain text
-#: user-manual.txt:310 user-manual.txt:791
-#, no-wrap
-msgid ""
-"*Rating*: One can provide a subjective overall rating of the dive on a\n"
-"5-point scale by clicking the appropriate star on the rating scale.\n"
-msgstr ""
-
-#. type: Plain text
-#: user-manual.txt:314 user-manual.txt:795
-#, no-wrap
-msgid ""
-"*Visibility*: Similarly, one can provide a rating of visibility during the\n"
-"dive on a\n"
-"5-point scale by clicking the appropriate star.\n"
-msgstr ""
-
-#. type: Plain text
-#: user-manual.txt:320
-#, no-wrap
-msgid ""
-"*Tags*: Tags that describe the type of dive performed may\n"
-"be entered here (separated by commas). Examples of common tags are boat, drift,\n"
-"training, cave etc. _Subsurface_ has many built-in tags. Auto completion is once again offered.\n"
-"For instance, if +cav+ was typed, then the tags *cave* and *cavern* are\n"
-"shown for the user to choose from.\n"
-msgstr ""
-
-#. type: Plain text
-#: user-manual.txt:322
-#, no-wrap
-msgid "*Notes*: Any additional information can be typed here.\n"
-msgstr ""
-
-#. type: Plain text
-#: user-manual.txt:327 user-manual.txt:811
-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 Notes panel:"
-msgstr ""
-
-#. type: Target for macro image
-#: user-manual.txt:328 user-manual.txt:812
-#, no-wrap
-msgid "images/CompletedDiveInfo_f20.jpg"
-msgstr "images/CompletedDiveInfo_f20.jpg"
-
-#. type: Title ====
-#: user-manual.txt:330 user-manual.txt:814
-#, no-wrap
-msgid "Equipment"
-msgstr ""
-
-#. type: Plain text
-#: user-manual.txt:337
-msgid ""
-"The Equipment tab allows the user to enter information about the type of "
-"cylinder and gas used, as well as the weights used for a dive. This is a "
-"highly interactive part of _Subsurface_ and the information on cylinders and "
-"gases (entered here) affects the behaviour of the dive profile (top right-"
-"hand panel)."
-msgstr ""
-
-#. type: Plain text
-#: user-manual.txt:341 user-manual.txt:830
-#, no-wrap
-msgid ""
-"*Cylinders*: The cylinder information is entered through a dialogue that looks\n"
-"like this:\n"
-msgstr ""
-
-#. type: Target for macro image
-#: user-manual.txt:342
-#, no-wrap
-msgid "images/Gas_dialogue1_f20.jpg"
-msgstr "images/Gas_dialogue1_f20.jpg"
-
-#. type: Plain text
-#: user-manual.txt:350
-msgid ""
-"The + button at the top right allows the user to add more cylinders for this "
-"dive.  The dark dustbin icon on the left allows one to delete information "
-"for a particular cylinder. Note that it is not possible to delete a cylinder "
-"if it is used during the dive. One cylinder is implicitly used in the dive, "
-"even without a gas change event. Thus the first cylinder cannot be deleted "
-"until another cylinder is created."
-msgstr ""
-
-#. type: Plain text
-#: user-manual.txt:355
-msgid ""
-"Start by selecting a cylinder type on the left-hand side of the table.  To "
-"select a cylinder, click in the *Type* box.  This brings up a button that "
-"can be used to display a dropdown list of cylinders:"
-msgstr ""
-
-#. type: Target for macro image
-#: user-manual.txt:356
-#, no-wrap
-msgid "images/Gas_dialogue2_f20.jpg"
-msgstr "images/Gas_dialogue2_f20.jpg"
-
-#. type: Plain text
-#: user-manual.txt:364
-msgid ""
-"The drop-down list can be used to select the cylinder type used for the dive "
-"or the user may start typing in the box which shows the available options "
-"for the entered characters. The *Size* of the cylinder as well as its "
-"working pressure (*WorkPress*) will automatically be shown in the dialogue. "
-"If a cylinder is not shown in the dropdown list, type the name and "
-"description of that cylinder into the *Type* field."
-msgstr ""
-
-#. type: Plain text
-#: user-manual.txt:369
-msgid ""
-"Next, indicate the starting pressure and the ending pressure of the gas used "
-"during the dive. The unit of pressure (metric/imperial) corresponds to the "
-"setting in the _Preferences_."
-msgstr ""
-
-#. type: Plain text
-#: user-manual.txt:380
-msgid ""
-"Finally, type in the gas mixture used in the *O2%* field. If air was used, a "
-"value of 21% can be entered on this field, or it might be left blank. If "
-"nitrox or trimix were used, their percentages of oxygen and/or helium must "
-"be specified.  Any inappropriate fields should be left empty. After typing "
-"the information for the cylinder, press _ENTER_ on the keyboard or click "
-"outside the cell that contains the cursor. Information for any additional "
-"cylinders can be added by using the + button at the top right hand. "
-"Following is an example of a complete description for a dive made using two "
-"cylinders (air and EAN50):"
-msgstr ""
-
-#. type: Target for macro image
-#: user-manual.txt:381 user-manual.txt:868
-#, no-wrap
-msgid "images/CylinderDataEntry3_f20.jpg"
-msgstr "images/CylinderDataEntry3_f20.jpg"
-
-#. type: Plain text
-#: user-manual.txt:387
-#, no-wrap
-msgid ""
-"*Weights*: Information about the weight system used during a dive can be entered\n"
-"using a dialogue very similar to that for the cylinder information. If the user\n"
-"clicks the + button on the top right of the weights dialogue, the table looks\n"
-"like this:\n"
-msgstr ""
-
-#. type: Target for macro image
-#: user-manual.txt:388 user-manual.txt:876
-#, no-wrap
-msgid "images/WeightsDataEntry1_f20.jpg"
-msgstr "images/WeightsDataEntry1_f20.jpg"
-
-#. type: Plain text
-#: user-manual.txt:392
-msgid ""
-"If one then clicks on the *Type* field, a drop-down list becomes accessible "
-"through a down-arrow:"
-msgstr ""
-
-#. type: Target for macro image
-#: user-manual.txt:393 user-manual.txt:881
-#, no-wrap
-msgid "images/WeightsDataEntry2_f20.jpg"
-msgstr "images/WeightsDataEntry2_f20.jpg"
-
-#. type: Plain text
-#: user-manual.txt:407
-msgid ""
-"The drop-down list can then be used to select the type of weight system or "
-"the user may start typing in the box which shows the available options for "
-"the entered characters. In the *Weight* field, the weight used during the "
-"dive must be typed. After typing the information for the weight system the "
-"user must either press _ENTER_ on the keyboard or click outside the cell "
-"that contains the cursor. It is possible to enter information for more than "
-"one weight system by adding an additional system using the + button on the "
-"top right hand. Weight systems can be deleted using the dustbin icon on the "
-"left hand. Here is an example of information for a dive with two types of "
-"weights: integrated and a weight belt:"
-msgstr ""
-
-#. type: Target for macro image
-#: user-manual.txt:408 user-manual.txt:897
-#, no-wrap
-msgid "images/WeightsDataEntry3_f20.jpg"
-msgstr "images/WeightsDataEntry3_f20.jpg"
-
-#. type: Plain text
-#: user-manual.txt:412
-msgid ""
-"There's NO need to click the _Save_ button before the dive profile has been "
-"completed."
-msgstr ""
-
-#. type: Title ====
-#: user-manual.txt:414
+#: user-manual.txt:225
 #, no-wrap
 msgid "Creating a Dive Profile"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:421
+#: user-manual.txt:232
 msgid ""
 "The *Dive Profile* (a graphical representation of the depth of the dive as a "
 "function of time) is indicated in the panel on the top right hand of the "
@@ -988,13 +629,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:422
+#: user-manual.txt:233
 #, no-wrap
 msgid "images/DiveProfile1_f20.jpg"
 msgstr "images/DiveProfile1_f20.jpg"
 
 #. type: Plain text
-#: user-manual.txt:440
+#: user-manual.txt:251
 msgid ""
 "_Modifying the dive profile_: When the cursor is moved around the dive "
 "profile, its position is indicated by two coloured lines (red and green) as "
@@ -1013,13 +654,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:441
+#: user-manual.txt:252
 #, no-wrap
 msgid "images/DiveProfile2_f20.jpg"
 msgstr "images/DiveProfile2_f20.jpg"
 
 #. type: Plain text
-#: user-manual.txt:453
+#: user-manual.txt:265
 msgid ""
 "_Specifying the gas composition:_ The gas composition used is clearly "
 "indicated along the line segments of the dive profile. This defaults to the "
@@ -1029,61 +670,40 @@ msgid ""
 "waypoint and selecting the appropriate gas from the context menu. Changing "
 "the gas for a waypoint affects the gas shown in the segment _to the left_ of "
 "that waypoint. Note that only the gases defined in the *Equipment* tab "
-"appear in the context menu."
+"appear in the context menu. Below is the profile of a dive to 25 m for 30 "
+"min and with a switch from air to EAN50 at the end of the duration at 20m."
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:454
+#: user-manual.txt:266
 #, no-wrap
 msgid "images/DiveProfile3_f20.jpg"
 msgstr "images/DiveProfile3_f20.jpg"
 
 #. type: Plain text
-#: user-manual.txt:459
-msgid ""
-"Below is the profile of a dive to 25 m for 30 min and with a switch from air "
-"to EAN50 at the end of the duration at 20m. In this case the first cylinder "
-"in the *Equipment* tab contained air and the second cylinder contained EAN50."
-msgstr ""
-
-#. type: Target for macro image
-#: user-manual.txt:460
-#, no-wrap
-msgid "images/DiveProfile4_f20.jpg"
-msgstr "images/DiveProfile4_f20.jpg"
-
-#. type: Title ====
-#: user-manual.txt:462
-#, no-wrap
-msgid "Saving the hand-entered dive information"
-msgstr ""
-
-#. type: Plain text
-#: user-manual.txt:473
+#: user-manual.txt:273
 msgid ""
-"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)."
+"With the profile having been defined, more details must be added in order to "
+"have a fuller record of the dive. To do this, the *Notes* and the "
+"*Equipment* tabs on the top left hand of the _Subsurface_ window should be "
+"used. Click on xref:S_Notes_dc[*this link*] for instructions to use these "
+"tabs."
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:475
+#: user-manual.txt:275
 #, no-wrap
 msgid "Importing new dive information from a Dive Computer"
 msgstr "Importer de nouvelles informations de plongée à partir de l'ordinateur de plongée"
 
 #. type: Title ====
-#: user-manual.txt:477
+#: user-manual.txt:277
 #, no-wrap
 msgid "Connecting and importing data from a dive computer."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:488
+#: user-manual.txt:288
 msgid ""
 "The use of dive computers allows the collection of a large amount of "
 "information about each dive, e.g. a detailed record of depth, duration, "
@@ -1095,13 +715,13 @@ msgid ""
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:489 user-manual.txt:3012
+#: user-manual.txt:289 user-manual.txt:2838
 #, no-wrap
 msgid "images/icons/warning2.png"
 msgstr "images/icons/warning2.png"
 
 #. type: Plain text
-#: user-manual.txt:500
+#: user-manual.txt:300
 msgid ""
 "Several dive computers consume more power when they are in their PC-"
 "Communication mode. **This could drain the dive computer's battery**. We "
@@ -1113,7 +733,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:516
+#: user-manual.txt:316
 msgid ""
 "To import dive information from a dive computer to a computer with "
 "_Subsurface_, it is necessary that the two pieces of equipment communicate "
@@ -1130,48 +750,48 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:519
+#: user-manual.txt:319
 msgid ""
 "After this, the dive computer can be hooked up to the user's PC, which can "
 "be achieved by following these steps:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:521
+#: user-manual.txt:321
 msgid ""
 "The interface cable should be connected to a free USB port (or the Infra-red"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:522
+#: user-manual.txt:322
 msgid "or Bluetooth connection set up as described later in this manual)"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:524
+#: user-manual.txt:324
 msgid "The dive computer should be placed into PC Communication mode."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:525
+#: user-manual.txt:325
 msgid "(Users should refer to the manual of their specific dive computer)"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:529
+#: user-manual.txt:329
 msgid ""
 "In _Subsurface_, from the Main Menu, the user must select _Import -> Import "
 "From Dive Computer_.  Dialogue *A* in the figure below appears:"
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:531
+#: user-manual.txt:331
 #, no-wrap
 msgid "images/DC_import_f20.jpg"
 msgstr "images/DC_import_f20.jpg"
 
 #. type: Plain text
-#: user-manual.txt:542
+#: user-manual.txt:342
 msgid ""
 "Dive computers tend to keep a certain number of dives in their memory, even "
 "though these dives have already been imported to _Subsurface_. For that "
@@ -1185,7 +805,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:549
+#: user-manual.txt:349
 msgid ""
 "The dialogue has two drop-down lists, *Vendor* and *Dive Computer*. On the "
 "*vendor* drop-down list select the make of the computer, e.g.  Suunto, "
@@ -1195,7 +815,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:560
+#: user-manual.txt:360
 msgid ""
 "The *Device or Mount Point* drop-down list contains the USB or Bluetooth "
 "port name that _Subsurface_ needs in order to communicate with the dive "
@@ -1210,7 +830,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:570
+#: user-manual.txt:370
 msgid ""
 "If all the dives on the dive computer need to be downloaded, check the "
 "checkbox _Force download of all dives_. Normally, _Subsurface_ only "
@@ -1225,7 +845,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:576
+#: user-manual.txt:376
 msgid ""
 "If the checkbox _Always prefer downloaded dives_ has been checked and, "
 "during download, dives with identical date-times exist on the dive computer "
@@ -1234,14 +854,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:579
+#: user-manual.txt:379
 msgid ""
 "The checkbox marked _Download into new trip_ ensures that, after upload, the "
 "downloaded dives are grouped together as a new trip(s) in the *Dive List*."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:583
+#: user-manual.txt:383
 msgid ""
 "Do *not* check the checkboxes labelled _Save libdivecomputer logfile_ and "
 "_Save libdivecomputer dumpfile_. These are only used as diagnostic tools "
@@ -1249,14 +869,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:586
+#: user-manual.txt:386
 msgid ""
 "Then select the _Download_ button. After successful download, Dialogue *B* "
 "in the figure above appears."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:601
+#: user-manual.txt:401
 msgid ""
 "With communication established, one can see how the data are retrieved from "
 "the dive computer.  Depending on the make of the dive computer and/or number "
@@ -1272,7 +892,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:608
+#: user-manual.txt:408
 msgid ""
 "After the dives have been downloaded, they appear in a tabular format on the "
 "righthand side of the dialogue (see image *B*, above). Each dive comprises a "
@@ -1283,14 +903,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:611
+#: user-manual.txt:411
 msgid ""
 "After this has been completed, select the OK button.  The checked dives are "
 "transfered to the *Dive List*."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:615
+#: user-manual.txt:415
 msgid ""
 "If there is a problem in communicating with the dive computer, an error "
 "message will be shown, similar to this text: \"Unable to open /dev/ttyUSB0 "
@@ -1298,37 +918,37 @@ msgid ""
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:619
+#: user-manual.txt:419
 #, no-wrap
 msgid "*PROBLEMS WITH DATA DOWNLOAD FROM A DIVE COMPUTER?*\n"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:619 user-manual.txt:1185 user-manual.txt:1251
-#: user-manual.txt:1304 user-manual.txt:1380 user-manual.txt:1691
+#: user-manual.txt:419 user-manual.txt:1011 user-manual.txt:1077
+#: user-manual.txt:1130 user-manual.txt:1206 user-manual.txt:1517
 #, no-wrap
 msgid "images/icons/important.png"
 msgstr "images/icons/important.png"
 
 #. type: delimited block *
-#: user-manual.txt:622
+#: user-manual.txt:422
 msgid "Check the following:"
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:625
+#: user-manual.txt:425
 msgid "Is the dive computer still in PC-communication or Upload mode?"
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:628
+#: user-manual.txt:428
 msgid ""
 "Is the battery of the dive computer fully charged? If not then the battery "
 "must be charged or replaced."
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:632
+#: user-manual.txt:432
 msgid ""
 "Is the connecting cable faulty? Does the cable work perfectly using other "
 "software? Has it worked before, or is this the first time the cable is being "
@@ -1336,7 +956,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:637
+#: user-manual.txt:437
 msgid ""
 "Consult xref:"
 "_appendix_a_operating_system_specific_information_for_importing_dive_information_from_a_dive_computer[Appendix "
@@ -1344,7 +964,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:641
+#: user-manual.txt:441
 msgid ""
 "On Unix-like operating systems, does the user have write permission to the "
 "USB port? If not, consult xref:"
@@ -1353,7 +973,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:649
+#: user-manual.txt:449
 msgid ""
 "If the _Subsurface_ computer does not recognise the USB adaptor by showing "
 "an appropriate device name next to the Mount Point, then there is a "
@@ -1366,7 +986,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:652
+#: user-manual.txt:452
 #, no-wrap
 msgid ""
 "\tSave libdivecomputer logfile\n"
@@ -1374,7 +994,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:658
+#: user-manual.txt:458
 #, no-wrap
 msgid ""
 "*Important*: These check boxes are only used when problems are encountered\n"
@@ -1385,7 +1005,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:662
+#: user-manual.txt:462
 #, no-wrap
 msgid ""
 "*Important:* _After downloading with the above checkboxes\n"
@@ -1394,7 +1014,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:665
+#: user-manual.txt:465
 #, no-wrap
 msgid ""
 "\tsubsurface.log\n"
@@ -1402,7 +1022,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:671
+#: user-manual.txt:471
 msgid ""
 "These files should be send to the _Subsurface_ mail list: "
 "_subsurface at subsurface-divelog.org_ with a request for the files to be "
@@ -1411,13 +1031,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:674
+#: user-manual.txt:474
 #, no-wrap
 msgid "Changing the name of a dive computer"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:690
+#: user-manual.txt:490
 msgid ""
 "It may be necessary to distinguish between different dive computers used to "
 "upload dive logs to _Subsurface_. For instance if one's partner's dive "
@@ -1436,13 +1056,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:692
+#: user-manual.txt:492
 #, no-wrap
 msgid "Updating the dive information imported from the dive computer."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:699
+#: user-manual.txt:499
 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 "
@@ -1450,37 +1070,52 @@ msgid ""
 "on the top left hand of the _Subsurface_ window should be used."
 msgstr ""
 
+#. type: Title ====
+#: user-manual.txt:501
+#, no-wrap
+msgid "Notes"
+msgstr "Notes"
+
 #. type: Plain text
-#: user-manual.txt:710
+#: user-manual.txt:506
 msgid ""
-"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 *Notes* tab, the following fields "
-"are visible:"
+"The user needs to add additional information by hand in order to have a more "
+"complete dive record. The information below is almost identical for hand-"
+"entered dives and for dives downloaded from a dive computer."
+msgstr ""
+
+#. type: Plain text
+#: user-manual.txt:516
+msgid ""
+"In some cases, one has to provide the date and time of the dive, e.g. when "
+"entering a dive by hand or when a dive computer does not privide the date "
+"and time of the dive.  (Often, the date and time of the dive, gas mixture "
+"and water temperature are usually shown as obtained from the dive computer)  "
+"If the contents of the *Notes 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 (left hand image, below):"
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:711
+#: user-manual.txt:517
 #, no-wrap
-msgid "images/AddDive3_f20.jpg"
-msgstr "images/AddDive3_f20.jpg"
+msgid "images/AddDive3_f22.jpg"
+msgstr "images/AddDive3_f22.jpg"
 
 #. type: Plain text
-#: user-manual.txt:719
+#: user-manual.txt:526
 msgid ""
-"The *Time* 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 by "
-"overtyping the information displayed."
+"The right hand image, above, shows a *Notes tab* filled with dive "
+"information.  The *Time* 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 by overtyping the information displayed."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:730
+#: user-manual.txt:537
 #, no-wrap
 msgid ""
 "*Air/water temperatures*: Air and water temperatures during the dive are shown\n"
@@ -1496,54 +1131,111 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:735
+#: user-manual.txt:550
 #, no-wrap
 msgid ""
-"*Location*: In this field one should type in text that describes the site\n"
-"where the dive was performed, e.g. \"Tihany, Lake Balaton, Hungary\".\n"
-"Auto completion of location names will\n"
-"make this easier if one frequently dives at the same sites.\n"
+"*Location*: Here the name of the dive site can be entered, e.g. \"Tihany, Lake\n"
+"Balaton, Hungary\". Dive locations are managed as a separate part of the dive log.\n"
+"After entering the information for a particilar dive site, and several dives are\n"
+"performed at the same location, the information is re-used without requiring\n"
+"full dive site information again. Existing dive location information\n"
+"can be edited at any time by selecting (on the *Dive List* panel) a dive performed at that site\n"
+"and by opening the location information by clicking the globe button on the\n"
+"right of the location name (see image on the right above). When entering a dive location name, auto completion of\n"
+"location names makes it easy to select a dive site that already exists in the dive log\n"
+"(i.e. when typing in the name of a dive site,\n"
+"a dropdown list appears showing all sites with similar names). If the dive\n"
+"site has been used before, click on the already-existing name.\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:745
+#: user-manual.txt:553
 msgid ""
-"The user can find the coordinates on the world map in the bottom right hand "
-"part of the Subsurface window. The map displays a green bar indicating "
-"\"Move the map and double-click to set the dive location\". Double-click at "
-"the appropriate place, the green bar disappears and the coordinates are "
-"stored."
+"If the present dive site has not been used before, a message appears as "
+"follows (image *A* below):"
 msgstr ""
 
+#. type: Target for macro image
+#: user-manual.txt:554
+#, no-wrap
+msgid "images/Locations1_f22.jpg"
+msgstr "images/Locations1_f22.jpg"
+
 #. type: Plain text
-#: user-manual.txt:750
+#: user-manual.txt:559
 msgid ""
-"The user can obtain the coordinates from the _Subsurface_ Companion app if "
-"an Android or iPhone device with GPS was used and if the coordinates of the "
+"Click the + icon on the right hand side. A panel appears to enter the "
+"coordinates and other important information about the site (image *B*, "
+"above). The most important items are the coordinates of the site. There are "
+"three ways of specifying the coordinates:"
+msgstr ""
+
+#. type: Plain text
+#: user-manual.txt:566
+msgid ""
+"One can find the coordinates on the world map in the bottom right hand part "
+"of the Subsurface window. The map displays an orange bar indicating \"No "
+"location data - Move the map and double-click to set the dive location\". "
+"Upon a double-click at the appropriate place, the orange bar disappears and "
+"the coordinates are stored."
+msgstr ""
+
+#. type: Plain text
+#: user-manual.txt:571
+msgid ""
+"The coordinates can be obtained from the _Subsurface_ Companion app if the "
+"user has an Android or iPhone device with GPS and if the coordinates of the "
 "dive site were stored using that device.  xref:S_Companion[Click here for "
 "more information]"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:762
+#: user-manual.txt:574
+msgid ""
+"The coordinates can be entered by hand if they are known, using one of four "
+"formats with latitude followed by longitude:"
+msgstr ""
+
+#. type: Plain text
+#: user-manual.txt:579
+msgid ""
+"ISO 6709 Annex D format e.g. 30°13'28.9\"N 30°49'1.5\"E Degrees and decimal "
+"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"
+msgstr ""
+
+#. type: Plain text
+#: user-manual.txt:584
 msgid ""
 "Southern hemisphere latitudes are given with a *S*, e.g. S30°, or with a "
-"negative value, e.g. -30.22496. Similarly, western longitudes are given with "
-"a *W*, e.g. W07°, or with a negative value, e.g. -7.34323."
+"negative value, e.g. -30.22496. Similarly western longitudes are given with "
+"a *W*, e.g. W07°, or with a negative value, e.g. -7.34323. Some keyboards "
+"don't have the degree sign (°). It can be replaced by a *d* like this: N30d "
+"W20d."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:768
+#: user-manual.txt:590
+#, no-wrap
 msgid ""
-"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)."
+"*Important*: GPS coordinates of a dive site are linked to the Location\n"
+"name - so adding coordinates to dives that do not have a location description\n"
+"will cause unexpected behaviour (Subsurface will think that all of these\n"
+"dives have the same location and try to keep their GPS coordinates the\n"
+"same).\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:773
+#: user-manual.txt:595
+msgid ""
+"Enter any other textual information about the dive site (Description and "
+"Notes), then select _Apply Changes_ to save the information for this dive "
+"site. At a later stage the dive site information can be edited by clicking "
+"the globe icon to the right of the dive site name in the *Notes tab*."
+msgstr ""
+
+#. type: Plain text
+#: user-manual.txt:600
 #, no-wrap
 msgid ""
 "*Dive mode*: This is a dropdown box allowing one to choose the type of dive\n"
@@ -1553,7 +1245,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:778
+#: user-manual.txt:605
 #, no-wrap
 msgid ""
 "*Divemaster*: The name of the dive master or dive guide for this dive should be\n"
@@ -1563,7 +1255,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:783
+#: user-manual.txt:610
 #, no-wrap
 msgid ""
 "*Buddy*: In this field, one enters the name(s) of the buddy / buddies\n"
@@ -1573,7 +1265,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:788
+#: user-manual.txt:615
 #, no-wrap
 msgid ""
 "*Suit*: Here the type of diving suit used for the dive can be entered.\n"
@@ -1583,7 +1275,24 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:804
+#: user-manual.txt:618
+#, no-wrap
+msgid ""
+"*Rating*: One can provide a subjective overall rating of the dive on a\n"
+"5-point scale by clicking the appropriate star on the rating scale.\n"
+msgstr ""
+
+#. type: Plain text
+#: user-manual.txt:622
+#, no-wrap
+msgid ""
+"*Visibility*: Similarly, one can provide a rating of visibility during the\n"
+"dive on a\n"
+"5-point scale by clicking the appropriate star.\n"
+msgstr ""
+
+#. type: Plain text
+#: user-manual.txt:631
 #, no-wrap
 msgid ""
 "*Tags*: Tags that describe the type of dive performed can be entered\n"
@@ -1597,13 +1306,29 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:806
+#: user-manual.txt:633
 #, no-wrap
 msgid "*Notes*: Any additional information for the dive can be entered here.\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:819
+#: user-manual.txt:638
+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. The image xref:"
+"S_Notes_dc[at the beginning of this section] shows an example of a *Notes "
+"tab* containing dive information."
+msgstr ""
+
+#. type: Title ====
+#: user-manual.txt:640
+#, no-wrap
+msgid "Equipment"
+msgstr ""
+
+#. type: Plain text
+#: user-manual.txt:645
 msgid ""
 "The Equipment tab allows one to enter information about the type of cylinder "
 "and gas used as well as the weights used for the dive. The message in a blue "
@@ -1611,23 +1336,32 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:826
+#: user-manual.txt:652
 msgid ""
 "indicates that the dive is being edited. This is a highly interactive part "
 "of _Subsurface_ and the information on cylinders and gases (entered here) "
 "determines the behaviour of the dive profile (top right-hand panel)."
 msgstr ""
 
+#. type: Plain text
+#: user-manual.txt:656
+#, no-wrap
+msgid ""
+"*Cylinders*: The cylinder information is entered through a dialogue that looks\n"
+"like this:\n"
+msgstr ""
+
 #. type: Target for macro image
-#: user-manual.txt:831
+#: user-manual.txt:657
 #, no-wrap
 msgid "images/DC_gas-dialogue1_f20.jpg"
 msgstr "images/DC_gas-dialogue1_f20.jpg"
 
 #. type: Plain text
-#: user-manual.txt:839
+#: user-manual.txt:666
 msgid ""
-"In most cases _Subsurface_ obtains the gas used from the dive computer and "
+"For hand-entered dives, this information needs to be typed in. For dive "
+"computers _Subsurface_ often obtains the gas used from the dive computer and "
 "automatically inserts the gas composition(% oxygen) in the table. The + "
 "button at the top right allows the user to add more cylinders for this dive. "
 "The dark dustbin icon on the left allows the deletion of information for a "
@@ -1637,7 +1371,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:844
+#: user-manual.txt:671
 msgid ""
 "The user should start by selecting a cylinder type on the left-hand side of "
 "the table.  To select a cylinder, the *cylinder type* box should be clicked. "
@@ -1646,13 +1380,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:845
+#: user-manual.txt:672
 #, no-wrap
 msgid "images/DC_gas-dialogue2_f20.jpg"
 msgstr "images/DC_gas-dialogue2_f20.jpg"
 
 #. type: Plain text
-#: user-manual.txt:852
+#: user-manual.txt:679
 msgid ""
 "The drop-down list can then be used to select the cylinder type that was "
 "used for this dive or the user may start typing in the box which shows the "
@@ -1662,7 +1396,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:856
+#: user-manual.txt:683
 msgid ""
 "Next one must indicate the starting pressure and the ending pressure of the "
 "specified gas during the dive. The unit of pressure (metric/imperial)  "
@@ -1670,7 +1404,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:867
+#: user-manual.txt:694
 msgid ""
 "Finally, provide the gas mixture used. If air was used, the value of 21% can "
 "be entered or this field can be left blank. If nitrox or trimix were used, "
@@ -1682,8 +1416,14 @@ msgid ""
 "of a complete description for a dive using two cylinders (air and EAN50):"
 msgstr ""
 
+#. type: Target for macro image
+#: user-manual.txt:695
+#, no-wrap
+msgid "images/CylinderDataEntry3_f20.jpg"
+msgstr "images/CylinderDataEntry3_f20.jpg"
+
 #. type: Plain text
-#: user-manual.txt:875
+#: user-manual.txt:702
 #, no-wrap
 msgid ""
 "*Weights*: Information about the weight system used can be entered\n"
@@ -1693,15 +1433,27 @@ msgid ""
 "this:\n"
 msgstr ""
 
+#. type: Target for macro image
+#: user-manual.txt:703
+#, no-wrap
+msgid "images/WeightsDataEntry1_f20.jpg"
+msgstr "images/WeightsDataEntry1_f20.jpg"
+
 #. type: Plain text
-#: user-manual.txt:880
+#: user-manual.txt:707
 msgid ""
 "By clicking on the *Type* field, a drop-down list becomes accessible through "
 "a down-arrow:"
 msgstr ""
 
+#. type: Target for macro image
+#: user-manual.txt:708
+#, no-wrap
+msgid "images/WeightsDataEntry2_f20.jpg"
+msgstr "images/WeightsDataEntry2_f20.jpg"
+
 #. type: Plain text
-#: user-manual.txt:896
+#: user-manual.txt:723
 msgid ""
 "The drop-down list can then be used to select the type of weight system used "
 "during the dive or the user may start typing in the box which shows the "
@@ -1715,14 +1467,20 @@ msgid ""
 "weights: integrated as well as a weight belt:"
 msgstr ""
 
+#. type: Target for macro image
+#: user-manual.txt:724
+#, no-wrap
+msgid "images/WeightsDataEntry3_f20.jpg"
+msgstr "images/WeightsDataEntry3_f20.jpg"
+
 #. type: Title ====
-#: user-manual.txt:899
+#: user-manual.txt:726
 #, no-wrap
 msgid "Editing several selected dives simultaneously"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:914
+#: user-manual.txt:741
 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 "
@@ -1740,7 +1498,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:924
+#: user-manual.txt:751
 msgid ""
 "The simultaneous editing only works with fields that do not already contain "
 "information.  This means that, if some fields have been edited for a "
@@ -1755,7 +1513,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:933
+#: user-manual.txt:760
 msgid ""
 "_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 "
@@ -1770,13 +1528,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:934
+#: user-manual.txt:761
 #, no-wrap
 msgid "Adding Bookmarks to a dive"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:939
+#: user-manual.txt:766
 msgid ""
 "Many divers wish to annotate their dives with text that indicate particular "
 "events during the dive, e.g. \"Saw dolphins\", or \"Released surface buoy\". "
@@ -1784,7 +1542,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:943
+#: user-manual.txt:770
 msgid ""
 "Right-click at the appropriate point on the dive profile.  This brings up "
 "the dive profile context menu. Select _Add bookmark_. A red flag is placed "
@@ -1792,58 +1550,59 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:945
+#: user-manual.txt:772
 msgid ""
 "Right-click on the red flag. This brings up the context menu (see *B* "
 "below). Select _Edit name_."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:948
+#: user-manual.txt:775
 msgid ""
 "A text box is shown. Type the explanatory text for the bookmark (see *C* "
 "below). Select _OK_.  This saves the text associated with the bookmark."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:951
+#: user-manual.txt:778
 msgid ""
 "If one hovers using the mouse over the red bookmark, the appropriate text is "
 "shown at the bottom of the information box (see *D* below)."
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:952
+#: user-manual.txt:779
 #, no-wrap
 msgid "images/Bookmarks.jpg"
 msgstr "images/Bookmarks.jpg"
 
 #. type: Title ====
-#: user-manual.txt:955
+#: user-manual.txt:782
 #, no-wrap
 msgid "Saving the updated dive information"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:967
+#: user-manual.txt:793
 msgid ""
 "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 _Apply changes_ button is clicked, the dive data are saved in the memory "
+"image of the dive. If the _Discard changes_ button is clicked, then the "
+"newly entered dive data are erased from the computer memory, although the "
+"dive profile is retained. When the user exits _Subsurface_ there is a final "
+"prompt to confirm that the new data should now be saved permanently on the "
+"computer disk."
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:968
+#: user-manual.txt:794
 #, no-wrap
 msgid "Importing dive information from other digital data sources or other data formats"
 msgstr "Importer les informations à partir d'autres sources de données numériques ou d'autres formats de données"
 
 #. type: Plain text
-#: user-manual.txt:994
+#: user-manual.txt:820
 msgid ""
 "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 "
@@ -1865,7 +1624,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1003
+#: user-manual.txt:829
 msgid ""
 "If the format of other software is supported natively on Subsurface, it "
 "should be sufficient to select either _Import -> Import log files_ or _File -"
@@ -1878,13 +1637,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:1004
+#: user-manual.txt:830
 #, no-wrap
 msgid "Using the universal import dialogue"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1010
+#: user-manual.txt:836
 msgid ""
 "Importing dives from other software is performed through a universal "
 "interface that is activated by selecting _Import_ from the Main Menu, then "
@@ -1892,13 +1651,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:1011
+#: user-manual.txt:837
 #, no-wrap
 msgid "images/Import1_f20.jpg"
 msgstr "images/Import1_f20.jpg"
 
 #. type: Plain text
-#: user-manual.txt:1016
+#: user-manual.txt:842
 msgid ""
 "Towards the bottom right is a dropdown selector with a default label of "
 "_Dive Log Files_ which gives access to the different types of direct imports "
@@ -1906,45 +1665,45 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1018
+#: user-manual.txt:844
 msgid ""
 "XML-formatted dive logs (DivingLog 5.0, MacDive and several other dive log "
 "systems)"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1019
+#: user-manual.txt:845
 msgid "UDDF-formatted dive logs (e.g. Kenozoooid)"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1020
+#: user-manual.txt:846
 msgid "UDCF-formatted dive logs"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1021
+#: user-manual.txt:847
 msgid "Poseidon MkVI CCR logs"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1022
+#: user-manual.txt:848
 msgid "JDiveLog"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1023
+#: user-manual.txt:849
 msgid "Suunto Dive Manager (DM3 and DM4)"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1024
+#: user-manual.txt:850
 msgid ""
 "CSV (text-based and spreadsheet-based) dive logs, including APD CCR logs"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1028
+#: user-manual.txt:854
 msgid ""
 "Selecting the appropriate file in the file list of the dialogue opens the "
 "imported dive log in the _Subsurface_ *Dive List*. Some other formats, not "
@@ -1953,13 +1712,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:1029
+#: user-manual.txt:855
 #, no-wrap
 msgid "Importing from  OSTCTools"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1038
+#: user-manual.txt:864
 msgid ""
 "_OSTC Tools_ is a Microsoft-based suite of dive download and dive management "
 "tools for the OSTC family of dive computers. _OSTC Tools_ downloads dive "
@@ -1972,7 +1731,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1042
+#: user-manual.txt:868
 msgid ""
 "Actually, every H&W device supported by OSTCTools can be imported to "
 "_Subsurface_, this includes OSTC, OSTC Mk2, OSTC 2N/2C, OSTC3, OSTC Sport, "
@@ -1980,7 +1739,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1047
+#: user-manual.txt:873
 msgid ""
 "Please, remember that OSTCTools is *not* a true diving log software, but a "
 "useful set of tools for analysis and management of OSTC devices. This way, "
@@ -1990,13 +1749,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:1049
+#: user-manual.txt:875
 #, no-wrap
 msgid "Importing from Mares Dive Organiser V2.1"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1056
+#: user-manual.txt:882
 msgid ""
 "Since Mares utilise proprietary Windows software not compatible with multi-"
 "platform applications, these dive logs cannot be directly imported into "
@@ -2006,7 +1765,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1061
+#: user-manual.txt:887
 msgid ""
 "The dive log data from Mares Dive Organiser need to be exported to the "
 "user's desktop, using a _.sdf_ file name extension. Refer to xref:"
@@ -2014,7 +1773,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1067
+#: user-manual.txt:893
 msgid ""
 "Data should then be imported into _www.divelogs.de_. One needs to create a "
 "user account in _www.divelogs.de_, log into that web site, then select "
@@ -2024,20 +1783,20 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1069
+#: user-manual.txt:895
 msgid ""
 "Finally, import the dives from _divelogs.de_ to _Subsurface_, using the "
 "instructions below."
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:1072
+#: user-manual.txt:898
 #, no-wrap
 msgid "Importing dives from *divelogs.de*"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1085
+#: user-manual.txt:911
 msgid ""
 "The import of dive information from _divelogs.de_ is simple, using a single "
 "dialogue box. The _Import -> Import from Divelogs.de_ option should be "
@@ -2051,19 +1810,19 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:1086
+#: user-manual.txt:912
 #, no-wrap
 msgid "images/Divelogs1.jpg"
 msgstr "images/Divelogs1.jpg"
 
 #. type: Title ====
-#: user-manual.txt:1089
+#: user-manual.txt:915
 #, no-wrap
 msgid "Importing data in CSV format"
 msgstr "Importer des données au format CSV"
 
 #. type: Plain text
-#: user-manual.txt:1100
+#: user-manual.txt:926
 msgid ""
 "A comma-separated file (.csv) can be used to import dive information either "
 "as dive profiles (as in the case of the APD Inspiration and Evolution closed "
@@ -2079,13 +1838,13 @@ msgid ""
 msgstr ""
 
 #. type: Title =====
-#: user-manual.txt:1102
+#: user-manual.txt:928
 #, no-wrap
 msgid "Importing dives in CSV format from dive computers or other dive log software"
 msgstr "Importer les plongées au format CSV à partir des ordinateurs de plongées ou d'autres logiciels de carnet de plongée"
 
 #. type: Plain text
-#: user-manual.txt:1107
+#: user-manual.txt:933
 msgid ""
 "One can view a _CSV_ file by using an ordinary text editor. It is normally "
 "organised into a single line that provides the headers (or _field names_ or "
@@ -2094,14 +1853,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1109
+#: user-manual.txt:935
 msgid ""
 "There are two types of _CSV_ dive logs that can be imported into "
 "_Subsurface_:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1115
+#: user-manual.txt:941
 msgid ""
 "_CSV dive details_: This dive log format contains similar information to "
 "that of a typical written dive log, e.g. dive date and time, dive depth, "
@@ -2112,7 +1871,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1124
+#: user-manual.txt:950
 msgid ""
 "_CSV dive profile_: This dive log format includes much more information "
 "about a single dive. For instance there may be information at 30-second "
@@ -2126,14 +1885,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1127
+#: user-manual.txt:953
 msgid ""
 "Before being able to import the _CSV_ data to _Subsurface_ *one needs to "
 "know a few things about the data being imported*:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1135
+#: user-manual.txt:961
 msgid ""
 "Which character separates the different columns within a single line of "
 "data? This field separator should be either a comma (,) or a TAB character.  "
@@ -2144,7 +1903,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1139
+#: user-manual.txt:965
 msgid ""
 "Which data columns need to be imported into _Subsurface_? Is it a _CSV dive "
 "details_ file or a _CSV dive profile_ file? Open the file using a text "
@@ -2153,13 +1912,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1141
+#: user-manual.txt:967
 msgid ""
 "Is the numeric information (e.g. dive depth) in metric or in imperial unis?"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1148
+#: user-manual.txt:974
 msgid ""
 "Armed with this information, importing the data into _Subsurface_ is "
 "straightforward. Select _Import -> Import Log Files_ from the main menu. In "
@@ -2169,13 +1928,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:1149
+#: user-manual.txt:975
 #, no-wrap
 msgid "images/csv_import1_f20.jpg"
 msgstr "images/csv_import1_f20.jpg"
 
 #. type: Plain text
-#: user-manual.txt:1160
+#: user-manual.txt:986
 msgid ""
 "Notice that, at the top left, there is a dropdown list containing pre-"
 "configured settings for some of the more common dive computers and software "
@@ -2190,7 +1949,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1174
+#: user-manual.txt:1000
 msgid ""
 "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 "
@@ -2209,13 +1968,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:1175
+#: user-manual.txt:1001
 #, no-wrap
 msgid "images/csv_import2_f20.jpg"
 msgstr "images/csv_import2_f20.jpg"
 
 #. type: Plain text
-#: user-manual.txt:1181
+#: user-manual.txt:1007
 msgid ""
 "Continue in this way to ensure that all the column headings in the blue row "
 "of cells correspond to the headings listed in the top part of the dialogue. "
@@ -2225,13 +1984,13 @@ msgid ""
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:1185
+#: user-manual.txt:1011
 #, no-wrap
 msgid "*A Diver's Introduction to _CSV_ Files*\n"
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:1199
+#: user-manual.txt:1025
 msgid ""
 "_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 "
@@ -2248,7 +2007,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:1208
+#: user-manual.txt:1034
 msgid ""
 "_CSV_ files can be created or edited with a normal text editor. The most "
 "important attribute of a _CSV_ file is the _field separator_, the character "
@@ -2264,7 +2023,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:1214
+#: user-manual.txt:1040
 #, no-wrap
 msgid ""
 "\tDive site,Dive date,Time,Dive_duration, Dive_depth,Dive buddy\n"
@@ -2275,14 +2034,14 @@ msgid ""
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:1216
+#: user-manual.txt:1042
 msgid ""
 "In this format the data are not easily read by a human. Here is the same "
 "information in TAB-delimited format:"
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:1222
+#: user-manual.txt:1048
 #, no-wrap
 msgid ""
 "\tDive site\tDive date\tTime\tDive_duration\tDive_depth\tDive buddy\n"
@@ -2293,7 +2052,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:1230
+#: user-manual.txt:1056
 msgid ""
 "It is clear why many people prefer the TAB-delimited format to the comma-"
 "delimited format. The disadvantage is that one cannot see the TAB "
@@ -2307,7 +2066,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:1241
+#: user-manual.txt:1067
 #, no-wrap
 msgid ""
 "\tDive Time (s)\tDepth (m)\tpO₂ - Setpoint (Bar) \tpO₂ - C1 Cell 1 (Bar)\tAmbient temp. (Celsius)\n"
@@ -2323,7 +2082,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:1247
+#: user-manual.txt:1073
 msgid ""
 "When a _CSV_ file is selected for import, _Subsurface_ displays the column "
 "headers as well as some of the data in the first few lines of the _CSV_ "
@@ -2334,7 +2093,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1261
+#: user-manual.txt:1087
 msgid ""
 "The _CSV_ import has a couple of caveats. One should avoid some special "
 "characters like ampersand (&), less than (<), greater than (>) and double "
@@ -2347,13 +2106,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:1264
+#: user-manual.txt:1090
 #, no-wrap
 msgid "Importing GPS coordinates with the _Subsurface Companion App_ for mobile phones"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1273
+#: user-manual.txt:1099
 msgid ""
 "Using the *Subsurface Companion App* on an _Android device_ with a GPS or "
 "xref:S_iphone[_iPhone_], the coordinates for the diving location can be "
@@ -2363,18 +2122,18 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1275
+#: user-manual.txt:1101
 msgid "To do this:"
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:1276
+#: user-manual.txt:1102
 #, no-wrap
 msgid "Create a Companion App account"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1281
+#: user-manual.txt:1107
 msgid ""
 "Register on the http://api.hohndel.org/login/[_Subsurface companion web "
 "page_].  A confirmation email with instructions and a personal *DIVERID* "
@@ -2383,7 +2142,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1286
+#: user-manual.txt:1112
 msgid ""
 "Download the app from https://play.google.com/store/apps/details?id=org."
 "subsurface[Google Play Store] or from http://f-droid.org/repository/browse/?"
@@ -2391,18 +2150,18 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:1287
+#: user-manual.txt:1113
 #, no-wrap
 msgid "Using the Subsurface companion app on an Android smartphone"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1290
+#: user-manual.txt:1116
 msgid "On first use the app has three options:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1296
+#: user-manual.txt:1122
 msgid ""
 "_Create a new account._ Equivalent to registering in _Subsurface_ companion "
 "page using an Internet browser. One can request a *DIVERID* using this "
@@ -2412,14 +2171,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1299
+#: user-manual.txt:1125
 msgid ""
 "_Retrieve an account._ If users forgot their *DIVERID* they will receive an "
 "email to recover the number."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1303
+#: user-manual.txt:1129
 msgid ""
 "_Use an existing account._ Users are prompted for their *DIVERID*. The app "
 "saves this *DIVERID* and does not ask for it again unless one uses the "
@@ -2427,7 +2186,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1311
+#: user-manual.txt:1137
 msgid ""
 "In the _Subsurface_ main program, the *DIVERID* should also be entered on "
 "the Default Preferences panel, obtained by selecting _File -> Preferences -> "
@@ -2436,13 +2195,13 @@ msgid ""
 msgstr ""
 
 #. type: Title =====
-#: user-manual.txt:1312
+#: user-manual.txt:1138
 #, no-wrap
 msgid "Creating new dive locations"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1317
+#: user-manual.txt:1143
 msgid ""
 "Now one is ready to get a dive position and send it to the server. The "
 "Android display will look like the left hand image (*A*) below, but without "
@@ -2450,21 +2209,21 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1320
+#: user-manual.txt:1146
 msgid ""
 "Touch the \"+\" icon on the top right to add a new dive site, a menu will be "
 "showed with 3 options:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1323
+#: user-manual.txt:1149
 msgid ""
 "Current: A prompt for a place name (or a request to activate the GPS if it "
 "is turned off) will be displayed, after which the current location is saved."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1332
+#: user-manual.txt:1158
 msgid ""
 "Use Map: This option allows the user to fix a position by searching a world "
 "map. A world map is shown (see *B* below) on which one should indicate the "
@@ -2477,13 +2236,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:1333
+#: user-manual.txt:1159
 #, no-wrap
 msgid "images/Companion_5.jpg"
 msgstr "images/Companion_5.jpg"
 
 #. type: Plain text
-#: user-manual.txt:1341
+#: user-manual.txt:1167
 msgid ""
 "Import local GPX file: The android device searches for .gpx files and "
 "located archives will be shown. The selected .gpx file is opened and the "
@@ -2493,13 +2252,13 @@ msgid ""
 msgstr ""
 
 #. type: Title =====
-#: user-manual.txt:1342
+#: user-manual.txt:1168
 #, no-wrap
 msgid "Dive lists of dive locations"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1350
+#: user-manual.txt:1176
 msgid ""
 "The main screen shows a list of dive locations, each with a name, date and "
 "time (see *A* below). Some locations may have an arrow-up icon over the "
@@ -2510,7 +2269,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1358
+#: user-manual.txt:1184
 msgid ""
 "Dive locations in this list can be viewed in two ways: a list of locations "
 "or a map indicating the dive locations. The display mode (List or Map) is "
@@ -2522,13 +2281,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:1359
+#: user-manual.txt:1185
 #, no-wrap
 msgid "images/Companion_4.jpg"
 msgstr "images/Companion_4.jpg"
 
 #. type: Plain text
-#: user-manual.txt:1365
+#: user-manual.txt:1191
 msgid ""
 "When one clicks on a dive (*not* selecting the check box), the name given to "
 "it, date/time and GPS coordinates will be shown, with two options at the top "
@@ -2536,32 +2295,32 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1367
+#: user-manual.txt:1193
 msgid ""
 "Edit (pencil): Change the text name or other characteristics of the dive "
 "location."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1369
+#: user-manual.txt:1195
 msgid "Maps: Display a map showing the dive location."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1372
+#: user-manual.txt:1198
 msgid ""
 "After editing and saving a dive location (see *C* above), one needs to "
 "upload it to the web service, as explained below."
 msgstr ""
 
 #. type: Title =====
-#: user-manual.txt:1373
+#: user-manual.txt:1199
 #, no-wrap
 msgid "Uploading dive locations"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1379
+#: user-manual.txt:1205
 msgid ""
 "There are several ways to send locations to the server.  The easiest is by "
 "simply selecting the locations (See *A* below) and then touching the right "
@@ -2569,51 +2328,51 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1384
+#: user-manual.txt:1210
 msgid ""
 "Users must be careful, as the trash icon on the right means exactly what it "
 "should; it deletes the selected dive location(s)."
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:1385
+#: user-manual.txt:1211
 #, no-wrap
 msgid "images/Companion_1.jpg"
 msgstr "images/Companion_1.jpg"
 
 #. type: Plain text
-#: user-manual.txt:1390
+#: user-manual.txt:1216
 msgid ""
 "After a dive trip using the Companion App, all dive locations are ready to "
 "be downloaded to a _Subsurface_ dive log (see below)."
 msgstr ""
 
 #. type: Title =====
-#: user-manual.txt:1392
+#: user-manual.txt:1218
 #, no-wrap
 msgid "Settings on the Companion app"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1395
+#: user-manual.txt:1221
 msgid ""
 "Selecting the _Settings_ menu option results in the right hand image above "
 "(*B*)."
 msgstr ""
 
 #. type: Title =====
-#: user-manual.txt:1396
+#: user-manual.txt:1222
 #, no-wrap
 msgid "Server and account"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1399
+#: user-manual.txt:1225
 msgid "_Web-service URL._ This is predefined (http://api.hohndel.org/)"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1403
+#: user-manual.txt:1229
 msgid ""
 "_User ID._ The DIVERID obtained by registering as described above. The "
 "easiest way to obtain it is simply to copy and paste from the confirmation "
@@ -2621,33 +2380,33 @@ msgid ""
 msgstr ""
 
 #. type: Title =====
-#: user-manual.txt:1404
+#: user-manual.txt:1230
 #, no-wrap
 msgid "Synchronisation"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1408
+#: user-manual.txt:1234
 msgid ""
 "_Synchronize on startup._ If selected, dive locations in the Android device "
 "and those on the web service synchronise each time the app is started."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1411
+#: user-manual.txt:1237
 msgid ""
 "_Upload new dives._ If selected, each time the user adds a dive location it "
 "is automatically sent to the server."
 msgstr ""
 
 #. type: Title =====
-#: user-manual.txt:1412
+#: user-manual.txt:1238
 #, no-wrap
 msgid "Background service"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1415
+#: user-manual.txt:1241
 msgid ""
 "Instead of entering a unique dive location, users can leave the service "
 "running in the background of their Android device, allowing the continuous "
@@ -2655,35 +2414,35 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1418
+#: user-manual.txt:1244
 msgid "The settings below define the behaviour of the service:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1421
+#: user-manual.txt:1247
 msgid ""
 "_Min duration._ In minutes. The app will try to get a location every X "
 "minutes until stopped by the user."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1423
+#: user-manual.txt:1249
 msgid "_Min distance._ In meters. Minimum distance between two locations."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1425
+#: user-manual.txt:1251
 msgid "_Name template._ The name the app will use when saving the locations."
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:1426 user-manual.txt:1523 user-manual.txt:1939
+#: user-manual.txt:1252 user-manual.txt:1349 user-manual.txt:1765
 #, no-wrap
 msgid "images/icons/info.jpg"
 msgstr "images/icons/info.jpg"
 
 #. type: Plain text
-#: user-manual.txt:1436
+#: user-manual.txt:1262
 msgid ""
 "_How does the background service work?_ Assuming the user sets 5 minutes and "
 "50 meters in the settings above, the app will start by recording a location "
@@ -2696,59 +2455,59 @@ msgid ""
 msgstr ""
 
 #. type: Title =====
-#: user-manual.txt:1437
+#: user-manual.txt:1263
 #, no-wrap
 msgid "Other"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1441
+#: user-manual.txt:1267
 msgid ""
 "_Mailing List._ The mail box for _Subsurface_. Users can send an email to "
 "the Subsurface mailing list."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1443
+#: user-manual.txt:1269
 msgid "_Subsurface website._ A link to the URL of Subsurface web"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1445
+#: user-manual.txt:1271
 msgid "_Version._ Displays the current version of the Companion App."
 msgstr ""
 
 #. type: Title =====
-#: user-manual.txt:1446
+#: user-manual.txt:1272
 #, no-wrap
 msgid "Search"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1449
+#: user-manual.txt:1275
 msgid "Search the saved dive locations by name or by date and time."
 msgstr ""
 
 #. type: Title =====
-#: user-manual.txt:1450
+#: user-manual.txt:1276
 #, no-wrap
 msgid "Start service"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1453
+#: user-manual.txt:1279
 msgid ""
 "Initiates the _background service_ following the previously defined settings."
 msgstr ""
 
 #. type: Title =====
-#: user-manual.txt:1454
+#: user-manual.txt:1280
 #, no-wrap
 msgid "Disconnect"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1462
+#: user-manual.txt:1288
 msgid ""
 "This is a badly named option that disconnects the app from the server by "
 "resetting the user ID in the app, showing the first screen where an account "
@@ -2758,25 +2517,25 @@ msgid ""
 msgstr ""
 
 #. type: Title =====
-#: user-manual.txt:1463
+#: user-manual.txt:1289
 #, no-wrap
 msgid "Send all locations"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1466
+#: user-manual.txt:1292
 msgid ""
 "This option sends all locations stored in the Android device to the server."
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:1468
+#: user-manual.txt:1294
 #, no-wrap
 msgid "Using the Subsurface companion app on an _iPhone_ to record dive locations"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1473
+#: user-manual.txt:1299
 msgid ""
 "The iPhone interface is quite simple. One needs to type the user ID "
 "(obtained during registration) into the space reserved for it, then select "
@@ -2785,13 +2544,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:1474
+#: user-manual.txt:1300
 #, no-wrap
 msgid "images/iphone.jpg"
 msgstr "images/iphone.jpg"
 
 #. type: Plain text
-#: user-manual.txt:1481
+#: user-manual.txt:1307
 msgid ""
 "Dives can be added automatically or manually. In manual mode, a dive "
 "location or waypoint is added to the GPS input stream. In automatic mode, a "
@@ -2805,7 +2564,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1487
+#: user-manual.txt:1313
 msgid ""
 "One can edit the site name afterwards by selecting the dive from the dive "
 "list and clicking on the site name. There are no other editable fields. The "
@@ -2814,13 +2573,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:1489
+#: user-manual.txt:1315
 #, no-wrap
 msgid "Downloading dive locations to the _Subsurface_ divelog"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1498
+#: user-manual.txt:1324
 msgid ""
 "Download dive(s) from a dive computer or enter them manually into "
 "_Subsurface_ before obtaining the GPS coordinates from the server. The "
@@ -2832,13 +2591,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:1499
+#: user-manual.txt:1325
 #, no-wrap
 msgid "images/DownloadGPS.jpg"
 msgstr "images/DownloadGPS.jpg"
 
 #. type: Plain text
-#: user-manual.txt:1507
+#: user-manual.txt:1333
 msgid ""
 "Note that the _Apply_ button is now active. By clicking on it, users can "
 "update the locations of the newly entered or uploaded dives in _Subsurface_ "
@@ -2849,7 +2608,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1514
+#: user-manual.txt:1340
 msgid ""
 "Since _Subsurface_ matches GPS locations from the Android device and dive "
 "information from the dive computer based on date-time data, automatic "
@@ -2861,7 +2620,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1522
+#: user-manual.txt:1348
 msgid ""
 "Similar date-times may not always be possible and there may be many reasons "
 "for this (e.g. time zones), or _Subsurface_ may be unable to decide which is "
@@ -2875,12 +2634,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1526
+#: user-manual.txt:1352
 msgid "TIPS:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1533
+#: user-manual.txt:1359
 msgid ""
 "_Background service_, being a very powerful tool, may fill the location list "
 "with many unnecessary locations not corresponding to the exact dive point "
@@ -2893,7 +2652,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1537
+#: user-manual.txt:1363
 msgid ""
 "It may also make sense to give informative names to the locations sent to "
 "the web server, or at least to use an informative name in the _Name "
@@ -2902,13 +2661,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:1539
+#: user-manual.txt:1365
 #, no-wrap
 msgid "Adding photographs to dives"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1545
+#: user-manual.txt:1371
 msgid ""
 "Many (if not most) divers take a camera with them and take photographs "
 "during a dive. One would like to associate each photograph with a specific "
@@ -2917,39 +2676,39 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:1546
+#: user-manual.txt:1372
 #, no-wrap
 msgid "Loading photos and getting synchronisation between dive computer and camera"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1550
+#: user-manual.txt:1376
 msgid ""
 "Left-lick on a dive or on a group of dives on the dive list. Then right-"
 "click on this dive or group of dives and choose the option _Load Images_:"
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:1551
+#: user-manual.txt:1377
 #, no-wrap
 msgid "images/LoadImage1_f20.jpg"
 msgstr "images/LoadImage1_f20.jpg"
 
 #. type: Plain text
-#: user-manual.txt:1555
+#: user-manual.txt:1381
 msgid ""
 "The system file browser appears. Select the folder and photographs that need "
 "to be loaded into _Subsurface_ and click the _Open_ button."
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:1556
+#: user-manual.txt:1382
 #, no-wrap
 msgid "images/LoadImage2_f20.jpg"
 msgstr "images/LoadImage2_f20.jpg"
 
 #. type: Plain text
-#: user-manual.txt:1565
+#: user-manual.txt:1391
 msgid ""
 "This brings one to the time synchronisation dialog, shown below. The "
 "critical problem is that the time synchronisation is not perfect between the "
@@ -2960,12 +2719,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1567
+#: user-manual.txt:1393
 msgid "_Subsurface_ achieves this synchronisation in two ways:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1579
+#: user-manual.txt:1405
 #, no-wrap
 msgid ""
 "*Manually*: If the user wrote down the exact camera time at the start of a dive, the\n"
@@ -2982,13 +2741,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:1580
+#: user-manual.txt:1406
 #, no-wrap
 msgid "images/LoadImage3b_f20.jpg"
 msgstr "images/LoadImage3b_f20.jpg"
 
 #. type: Plain text
-#: user-manual.txt:1598
+#: user-manual.txt:1424
 #, no-wrap
 msgid ""
 "*By photograph*: There is a very slick way of achieving synchronisation. If one takes a\n"
@@ -3009,7 +2768,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1601
+#: user-manual.txt:1427
 msgid ""
 "If the timestamp of a photograph is long before or after the dive, it is not "
 "placed on the dive profile. If the timestamp of the photo is within 30 "
@@ -3017,62 +2776,62 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:1602
+#: user-manual.txt:1428
 #, no-wrap
 msgid "Viewing the photos"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1606
+#: user-manual.txt:1432
 msgid ""
 "In order to view the photos added to a dive, activate the _show-photos_ "
 "button in the tool bar to the left of the dive profile:"
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:1607
+#: user-manual.txt:1433
 #, no-wrap
 msgid "images/icons/ShowPhotos_f20.png"
 msgstr "images/icons/ShowPhotos_f20.png"
 
 #. type: Plain text
-#: user-manual.txt:1610
+#: user-manual.txt:1436
 msgid "After the images have been loaded, they appear in two places:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1612
+#: user-manual.txt:1438
 msgid "the _Photos_ tab of the *Notes* panel."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1614
+#: user-manual.txt:1440
 msgid ""
 "as tiny icons (stubs) on the dive profile at the appropriate positions "
 "reflecting the time each photograph was taken. See below:"
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:1615
+#: user-manual.txt:1441
 #, no-wrap
 msgid "images/LoadImage4_f20.jpg"
 msgstr "images/LoadImage4_f20.jpg"
 
 #. type: Plain text
-#: user-manual.txt:1619
+#: user-manual.txt:1445
 msgid ""
 "If one hovers with the mouse over any of the photo icons, then a thumbnail "
 "photo is shown of the appropriate photo. See the image below:"
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:1620
+#: user-manual.txt:1446
 #, no-wrap
 msgid "images/LoadImage5_f20.jpg"
 msgstr "images/LoadImage5_f20.jpg"
 
 #. type: Plain text
-#: user-manual.txt:1629
+#: user-manual.txt:1455
 msgid ""
 "Clicking on the thumbnail brings up a full size photo overlaid on the "
 "_Subsurface_ window. This allows good viewing of the photographs that have "
@@ -3084,19 +2843,19 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:1630
+#: user-manual.txt:1456
 #, no-wrap
 msgid "images/LoadImage6_f20.jpg"
 msgstr "images/LoadImage6_f20.jpg"
 
 #. type: Title ====
-#: user-manual.txt:1632
+#: user-manual.txt:1458
 #, no-wrap
 msgid "The _Photos_ tab"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1643
+#: user-manual.txt:1469
 msgid ""
 "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 "
@@ -3112,13 +2871,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:1644
+#: user-manual.txt:1470
 #, no-wrap
 msgid "Photos on an external hard disk"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1655
+#: user-manual.txt:1481
 msgid ""
 "Most underwater photographers store their photos on an external drive. If "
 "such a drive can be mapped (almost always the case) the photos can be "
@@ -3136,13 +2895,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:1657
+#: user-manual.txt:1483
 #, no-wrap
 msgid "Moving photographs among directories, hard disks or computers"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1667
+#: user-manual.txt:1493
 #, no-wrap
 msgid ""
 "After a photograph has been loaded into _Subsurface_ and associated with a specific dive, the directory\n"
@@ -3156,7 +2915,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1672
+#: user-manual.txt:1498
 #, no-wrap
 msgid ""
 "When a photo is loaded into _Subsurface_, a fingerprint for the image is calculated and stored with the\n"
@@ -3166,31 +2925,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1674
+#: user-manual.txt:1500
 msgid ""
 "look through a particular directory (and all its subdirectories recursively) "
 "where photos have been moved"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1675
+#: user-manual.txt:1501
 msgid "to,"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1677
+#: user-manual.txt:1503
 msgid "calculate fingerprints for all photos in this directory, and"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1679
+#: user-manual.txt:1505
 msgid ""
 "if there is a match between a calculated fingerprint and the one originally "
 "calculated when a photo was"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1681
+#: user-manual.txt:1507
 msgid ""
 "loaded into _Subsurface_ (even if the original file name has changed), to "
 "automatically update the directory information so that _Subsurface_ can find "
@@ -3198,7 +2957,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1686
+#: user-manual.txt:1512
 #, no-wrap
 msgid ""
 "This is achieved by selecting from the Main Menu: _File ->      Find moved images_. This brings up a window within\n"
@@ -3208,13 +2967,13 @@ msgid ""
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:1691
+#: user-manual.txt:1517
 #, no-wrap
 msgid "*Upgrading existing photo collections without fingerprints*\n"
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:1701
+#: user-manual.txt:1527
 msgid ""
 "Software for the automated update of existing photo collections is under "
 "developement. Currently single dives must be upgraded one at a time. Select "
@@ -3229,19 +2988,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:1705
+#: user-manual.txt:1531
 #, no-wrap
 msgid "Logging special types of dives"
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:1708
+#: user-manual.txt:1534
 #, no-wrap
 msgid "Multicylinder dives"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1715
+#: user-manual.txt:1541
 msgid ""
 "_Subsurface_ easily handles dives involving more than one cylinder. "
 "Multicylinder diving usually happens (a) if a diver does not have enough gas "
@@ -3253,7 +3012,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1719
+#: user-manual.txt:1545
 #, no-wrap
 msgid ""
 "*Describe the cylinders used during the dive* This is performed in the *Equipment tab* of\n"
@@ -3262,7 +3021,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1724
+#: user-manual.txt:1550
 #, no-wrap
 msgid ""
 "*Record the times at which switches from one cylinder to another was done:* This is information\n"
@@ -3272,7 +3031,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1732
+#: user-manual.txt:1558
 #, no-wrap
 msgid ""
 "*Record the cylinder changes on the dive profile*: If the latter option\n"
@@ -3285,7 +3044,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1736
+#: user-manual.txt:1562
 msgid ""
 "Having performed these tasks, _Subsurface_ indicates the appropriate use of "
 "cylinders in the dive profile.  Below is a multi-cylinder dive, starting off "
@@ -3294,19 +3053,19 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:1737
+#: user-manual.txt:1563
 #, no-wrap
 msgid "images/multicylinder_dive.jpg"
 msgstr "images/multicylinder_dive.jpg"
 
 #. type: Title ====
-#: user-manual.txt:1739
+#: user-manual.txt:1565
 #, no-wrap
 msgid "Sidemount dives"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1745
+#: user-manual.txt:1571
 msgid ""
 "Sidemount diving is just another form of multicylinder diving, often with "
 "both or all cylinders having the same gas mixture. Although it is a popular "
@@ -3317,7 +3076,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1754
+#: user-manual.txt:1580
 #, no-wrap
 msgid ""
 "*During the dive, record cylinder switch events*. Since sidemount diving normally involves two\n"
@@ -3331,7 +3090,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1757
+#: user-manual.txt:1583
 #, no-wrap
 msgid ""
 "*Within _Subsurface_ describe the cylinders used during the dive*. The diver needs to provide the\n"
@@ -3340,7 +3099,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1767
+#: user-manual.txt:1593
 #, no-wrap
 msgid ""
 "*Indicate cylinder change events on the _Subsurface_ dive profile*. Once the dive log has been imported\n"
@@ -3356,32 +3115,32 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:1768
+#: user-manual.txt:1594
 #, no-wrap
 msgid "images/sidemount1.jpg"
 msgstr "images/sidemount1.jpg"
 
 #. type: Plain text
-#: user-manual.txt:1771
+#: user-manual.txt:1597
 msgid ""
 "This section gives an example of the versatility of _Subsurface_ as a dive "
 "logging tool."
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:1774
+#: user-manual.txt:1600
 #, no-wrap
 msgid "Semi-closed circuit rebreather (SCR) dives"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:1776
+#: user-manual.txt:1602
 #, no-wrap
 msgid "images/halcyon_RB80.jpg"
 msgstr "images/halcyon_RB80.jpg"
 
 #. type: Plain text
-#: user-manual.txt:1786
+#: user-manual.txt:1612
 msgid ""
 "Passive semi-closed rebreathers (pSCR) comprise a technical advance in "
 "diving equipment that recirculates the breathing gas that a diver breathes, "
@@ -3397,19 +3156,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1788
+#: user-manual.txt:1614
 msgid ""
 "To log pSCR dives, no special procedures are required, just the normal steps "
 "outlined above:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1790
+#: user-manual.txt:1616
 msgid "Select pSCR in the _Dive Mode_ dropdown list on the *Info* panel."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1794
+#: user-manual.txt:1620
 msgid ""
 "pSCR diving often involves gas changes, requiring an additional cylinder.  "
 "Define all the appropriate cylinders as described above and indicate the "
@@ -3418,7 +3177,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1799
+#: user-manual.txt:1625
 msgid ""
 "If a pSCR _Dive Mode_ has been selected, the dive ceiling for pSCR dives is "
 "adjusted for the oxygen drop across the mouthpiece which often requires "
@@ -3428,25 +3187,25 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:1800
+#: user-manual.txt:1626
 #, no-wrap
 msgid "images/pSCR_profile.jpg"
 msgstr "images/pSCR_profile.jpg"
 
 #. type: Title ====
-#: user-manual.txt:1805
+#: user-manual.txt:1631
 #, no-wrap
 msgid "Closed circuit rebreather (CCR) dives"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:1807
+#: user-manual.txt:1633
 #, no-wrap
 msgid "images/APD.jpg"
 msgstr "images/APD.jpg"
 
 #. type: Plain text
-#: user-manual.txt:1812
+#: user-manual.txt:1638
 msgid ""
 "Closed system rebreathers use advanced technology to recirculate gas that "
 "has been breathed while doing two things to maintain a breathable oxygen "
@@ -3454,12 +3213,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1813
+#: user-manual.txt:1639
 msgid "remove carbon dioxide from the gas that has been exhaled"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1822
+#: user-manual.txt:1648
 msgid ""
 "regulate the oxygen concentration to remain within safe diving limits.  The "
 "CCR interface of _Subsurface_ is currently experimental and under active "
@@ -3473,13 +3232,13 @@ msgid ""
 msgstr ""
 
 #. type: Title =====
-#: user-manual.txt:1823
+#: user-manual.txt:1649
 #, no-wrap
 msgid "Import a CCR dive"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1837
+#: user-manual.txt:1663
 msgid ""
 "See the section dealing with xref:S_ImportingAlienDiveLogs[Importing dive "
 "information from other digital sources]. From the main menu of _Subsurface_, "
@@ -3497,13 +3256,13 @@ msgid ""
 msgstr ""
 
 #. type: Title =====
-#: user-manual.txt:1838
+#: user-manual.txt:1664
 #, no-wrap
 msgid "Displayed information for a CCR dive"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1848
+#: user-manual.txt:1674
 msgid ""
 "_Partial pressures of gases_: The graph of oxygen partial pressure shows the "
 "information from the oxygen sensors of the CCR equipment. In contrast to "
@@ -3517,12 +3276,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1850
+#: user-manual.txt:1676
 msgid "For TWO O~2~ sensors the mean value of the two sensors are given."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1854
+#: user-manual.txt:1680
 msgid ""
 "For THREE-sensor systems (e.g. APD), the mean value is also used. However "
 "differences of more than 0,1 bar in the simultaneous readings of different "
@@ -3531,19 +3290,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1856
+#: user-manual.txt:1682
 msgid ""
 "If no sensor data is available, the pO~2~ value is assumed to be equal to "
 "the setpoint."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1858
+#: user-manual.txt:1684
 msgid "The mean pO~2~ of the sensors is indicated with a green line,"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1866
+#: user-manual.txt:1692
 msgid ""
 "The oxygen setpoint values as well as the readings from the individual "
 "oxygen sensors can be shown. The display of additional CCR information is "
@@ -3555,13 +3314,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:1867
+#: user-manual.txt:1693
 #, no-wrap
 msgid "images/CCR_preferences_f20.jpg"
 msgstr "images/CCR_preferences_f20.jpg"
 
 #. type: Plain text
-#: user-manual.txt:1874
+#: user-manual.txt:1700
 msgid ""
 "Checking any of these check boxes allows the display of additional oxygen-"
 "related information whenever the pO~2~ toolbar button on the _Profile_ panel "
@@ -3572,13 +3331,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:1875
+#: user-manual.txt:1701
 #, no-wrap
 msgid "images/CCR_setpoint_f20.jpg"
 msgstr "images/CCR_setpoint_f20.jpg"
 
 #. type: Plain text
-#: user-manual.txt:1879
+#: user-manual.txt:1705
 msgid ""
 "The second checkbox allows the display of the data from each individual "
 "oxygen sensor of the CCR equipment. The data for each sensor is colour-coded "
@@ -3586,22 +3345,22 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1881
+#: user-manual.txt:1707
 msgid "Sensor 1: grey"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1882
+#: user-manual.txt:1708
 msgid "Sensor 2: blue"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1883
+#: user-manual.txt:1709
 msgid "Sensor 3: brown"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1887
+#: user-manual.txt:1713
 msgid ""
 "The mean oxygen pO~2~ is indicated by the green line. This allows the direct "
 "comparison of data from each of the oxygen sensors, useful for detecting "
@@ -3609,13 +3368,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:1888
+#: user-manual.txt:1714
 #, no-wrap
 msgid "images/CCR_sensor_data_f20.jpg"
 msgstr "images/CCR_sensor_data_f20.jpg"
 
 #. type: Plain text
-#: user-manual.txt:1893
+#: user-manual.txt:1719
 msgid ""
 "The setpoint data can be overlaid on the oxygen sensor data by activating "
 "both of the above check boxes. Partial pressures for nitrogen (and helium, "
@@ -3623,7 +3382,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1897
+#: user-manual.txt:1723
 msgid ""
 "_Events_: Several events are logged, e.g. switching the mouthpiece to open "
 "circuit.  These events are indicated by yellow triangles and, if one hovers "
@@ -3632,7 +3391,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1905
+#: user-manual.txt:1731
 msgid ""
 "_Cylinder pressures_: Some CCR dive computers like the Poseidon MkVI record "
 "the pressures of the oxygen and diluent cylinders. The pressures of these "
@@ -3645,13 +3404,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:1906
+#: user-manual.txt:1732
 #, no-wrap
 msgid "images/CCR_dive_profile_f22.jpg"
 msgstr "images/CCR_dive_profile_f22.jpg"
 
 #. type: Plain text
-#: user-manual.txt:1911
+#: user-manual.txt:1737
 msgid ""
 "_Equipment-specific information_: Equipment-specific information gathered by "
 "_Subsurface_ is shown in the xref:S_ExtraDataTab[Extra data tab]. This may "
@@ -3659,7 +3418,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1917
+#: user-manual.txt:1743
 msgid ""
 "The deco ceiling calculated by Subsurface is not very accurate because the "
 "precise pressure of nitrogen in the loop can usually not be determined from "
@@ -3671,13 +3430,13 @@ msgid ""
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:1918 user-manual.txt:2101
+#: user-manual.txt:1744 user-manual.txt:1927
 #, no-wrap
 msgid "images/icons/cceiling.jpg"
 msgstr "images/icons/cceiling.jpg"
 
 #. type: Plain text
-#: user-manual.txt:1923
+#: user-manual.txt:1749
 msgid ""
 "The default colour of the computer-generated deco ceiling is white. However, "
 "this can be set to red by checking the appropriate check box after selecting "
@@ -3686,13 +3445,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:1924
+#: user-manual.txt:1750
 #, no-wrap
 msgid "images/CCR_dive_ceilingF22.jpg"
 msgstr "images/CCR_dive_ceilingF22.jpg"
 
 #. type: Plain text
-#: user-manual.txt:1928
+#: user-manual.txt:1754
 msgid ""
 "More equipment-specific information for downloading CCR dive logs for "
 "Poseidon MkVI and APD equipment can be found in xref:"
@@ -3701,19 +3460,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ==
-#: user-manual.txt:1929
+#: user-manual.txt:1755
 #, no-wrap
 msgid "Obtaining more information about dives entered into the logbook"
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:1931
+#: user-manual.txt:1757
 #, no-wrap
 msgid "The *Info* tab (for individual dives)"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1938
+#: user-manual.txt:1764
 msgid ""
 "The Info tab gives some summary information about a particular dive that has "
 "been selected in the *Dive List*. Useful information here includes the "
@@ -3723,7 +3482,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1945
+#: user-manual.txt:1771
 msgid ""
 "Gas consumption and SAC calculations: _Subsurface_ calculates SAC and Gas "
 "consumption taking in account gas incompressibility, particularly at tank "
@@ -3732,13 +3491,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:1947
+#: user-manual.txt:1773
 #, no-wrap
 msgid "The *Extra Data* tab (usually for individual dives)"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1955
+#: user-manual.txt:1781
 msgid ""
 "When using a dive computer, it often reports several data items that cannot "
 "easily be presented in a standardised way because the nature of the "
@@ -3750,19 +3509,19 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:1956
+#: user-manual.txt:1782
 #, no-wrap
 msgid "images/ExtraDataTab_f20.jpg"
 msgstr "images/ExtraDataTab_f20.jpg"
 
 #. type: Title ===
-#: user-manual.txt:1958
+#: user-manual.txt:1784
 #, no-wrap
 msgid "The *Stats* tab (for groups of dives)"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1969
+#: user-manual.txt:1795
 msgid ""
 "The Stats tab gives summary statistics for more than one dive, assuming that "
 "more than one dive has been selected in the *Dive List* using the standard "
@@ -3775,19 +3534,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:1971
+#: user-manual.txt:1797
 #, no-wrap
 msgid "The *Dive Profile*"
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:1973
+#: user-manual.txt:1799
 #, no-wrap
 msgid "images/Profile2.jpg"
 msgstr "images/Profile2.jpg"
 
 #. type: Plain text
-#: user-manual.txt:1984
+#: user-manual.txt:1810
 msgid ""
 "Of all the panels in _Subsurface_, the Dive Profile contains the most "
 "detailed information about each dive. The Dive Profile has a *button bar* on "
@@ -3800,7 +3559,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block |
-#: user-manual.txt:1991
+#: user-manual.txt:1817
 #, no-wrap
 msgid ""
 "|*Colour*|*Descent speed (m/min)*|*Ascent speed (m/min)*\n"
@@ -3818,7 +3577,7 @@ msgstr ""
 "|Vert foncé|< 1.5|< 1.5\n"
 
 #. type: Plain text
-#: user-manual.txt:1996
+#: user-manual.txt:1822
 msgid ""
 "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 "
@@ -3827,13 +3586,13 @@ msgid ""
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:1997
+#: user-manual.txt:1823
 #, no-wrap
 msgid "images/icons/scale.jpg"
 msgstr "images/icons/scale.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2002
+#: user-manual.txt:1828
 msgid ""
 "In some cases the dive profile does not fill the whole area of the *Dive "
 "Profile* panel. Clicking the *Scale* button in the toolbar on the left of "
@@ -3842,7 +3601,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2005
+#: user-manual.txt:1831
 #, no-wrap
 msgid ""
 "*Water temperature* is displayed with its own blue line with temperature values\n"
@@ -3850,7 +3609,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2012
+#: user-manual.txt:1838
 msgid ""
 "The dive profile can include graphs of the *partial pressures* of O2, N2, "
 "and He during the dive (see figure above) as well as a calculated and dive "
@@ -3861,13 +3620,13 @@ msgid ""
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:2013
+#: user-manual.txt:1839
 #, no-wrap
 msgid "images/icons/O2.jpg"
 msgstr "images/icons/O2.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2017
+#: user-manual.txt:1843
 msgid ""
 "Clicking this button allows display of the partial pressure of *oxygen* "
 "during the dive. This is depicted below the dive depth and water temperature "
@@ -3875,26 +3634,26 @@ msgid ""
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:2018
+#: user-manual.txt:1844
 #, no-wrap
 msgid "images/icons/N2.jpg"
 msgstr "images/icons/N2.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2021
+#: user-manual.txt:1847
 msgid ""
 "Clicking this button allows display of the partial pressure of *nitrogen* "
 "during the dive."
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:2022
+#: user-manual.txt:1848
 #, no-wrap
 msgid "images/icons/He.jpg"
 msgstr "images/icons/He.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2026
+#: user-manual.txt:1852
 msgid ""
 "Clicking this button allows display of the partial pressure of *helium* "
 "during the dive.  This is only of importance to divers using Trimix, "
@@ -3902,7 +3661,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2039
+#: user-manual.txt:1865
 msgid ""
 "The *air consumption* graph displays the tank pressure and its change during "
 "the dive. The air consumption takes depth into account so that even when "
@@ -3917,13 +3676,13 @@ msgid ""
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:2040
+#: user-manual.txt:1866
 #, no-wrap
 msgid "images/icons/Heartbutton.png"
 msgstr "images/icons/Heartbutton.png"
 
 #. type: Plain text
-#: user-manual.txt:2044
+#: user-manual.txt:1870
 msgid ""
 "Clicking on the heart rate button will allow the display of heart rate "
 "information during the dive if the dive computer was attached to a heart "
@@ -3931,7 +3690,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2052
+#: user-manual.txt:1878
 #, no-wrap
 msgid ""
 "It is possible to *zoom* into the profile graph. This is done either by using\n"
@@ -3944,19 +3703,19 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2053
+#: user-manual.txt:1879
 #, no-wrap
 msgid "images/MeasuringBar.png"
 msgstr "images/MeasuringBar.png"
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:2055
+#: user-manual.txt:1881
 #, no-wrap
 msgid "images/icons/ruler.jpg"
 msgstr "images/icons/ruler.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2063
+#: user-manual.txt:1889
 msgid ""
 "Measurements of *depth or time differences* can be achieved by using the "
 "*ruler button* on the left of the dive profile panel.  The measurement is "
@@ -3966,13 +3725,13 @@ msgid ""
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:2064
+#: user-manual.txt:1890
 #, no-wrap
 msgid "images/icons/ShowPhotos.png"
 msgstr "images/icons/ShowPhotos.png"
 
 #. type: Plain text
-#: user-manual.txt:2071
+#: user-manual.txt:1897
 msgid ""
 "Photographs that have been added to a dive can be shown on the profile by "
 "selecting the *Show-photo* button. The position of a photo on the profile "
@@ -3981,7 +3740,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2100
+#: user-manual.txt:1926
 msgid ""
 "The profile can also include the dive computer reported *ceiling* (more "
 "precisely, the deepest deco stop that the dive computer calculated for each "
@@ -4011,7 +3770,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2106
+#: user-manual.txt:1932
 msgid ""
 "If the dive computer itself calculates a ceiling and makes it available to "
 "_Subsurface_ during upload of dives, this can be shown as a red area by "
@@ -4019,13 +3778,13 @@ msgid ""
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:2107
+#: user-manual.txt:1933
 #, no-wrap
 msgid "images/icons/ceiling1.jpg"
 msgstr "images/icons/ceiling1.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2112
+#: user-manual.txt:1938
 msgid ""
 "If the *Calculated ceiling* button on the Profile Panel is clicked, then a "
 "ceiling, calculated by _Subsurface_, is shown in green if it exists for a "
@@ -4034,13 +3793,13 @@ msgid ""
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:2113
+#: user-manual.txt:1939
 #, no-wrap
 msgid "images/icons/ceiling2.jpg"
 msgstr "images/icons/ceiling2.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2117
+#: user-manual.txt:1943
 msgid ""
 "If, in addition, the *show all tissues* button on the Profile Panel is "
 "clicked, the ceiling is shown for the tissue compartments following the "
@@ -4048,32 +3807,32 @@ msgid ""
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:2118
+#: user-manual.txt:1944
 #, no-wrap
 msgid "images/icons/ceiling3.jpg"
 msgstr "images/icons/ceiling3.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2122
+#: user-manual.txt:1948
 msgid ""
 "If, in addition, the *3m increments* button on the Profile Panel is clicked, "
 "then the ceiling is indicated in 3 m increments (*C* in figure below)."
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2123
+#: user-manual.txt:1949
 #, no-wrap
 msgid "images/Ceilings2.jpg"
 msgstr "images/Ceilings2.jpg"
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:2125
+#: user-manual.txt:1951
 #, no-wrap
 msgid "images/icons/ShowCylindersButton.jpg"
 msgstr "images/icons/ShowCylindersButton.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2131
+#: user-manual.txt:1957
 msgid ""
 "By selecting this icon, the different cylinders used during a dive can be "
 "represented as a coloured bar at the bottom of the *Dive Profile*. In "
@@ -4085,19 +3844,19 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2132
+#: user-manual.txt:1958
 #, no-wrap
 msgid "images/ShowCylinders_f20.jpg"
 msgstr "images/ShowCylinders_f20.jpg"
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:2135
+#: user-manual.txt:1961
 #, no-wrap
 msgid "images/tissues.jpg"
 msgstr "images/tissues.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2147
+#: user-manual.txt:1973
 msgid ""
 "Display inert gas tissue pressures relative to ambient inert gas pressure "
 "(horizontal grey line).  Tissue pressures are calculated using the Bühlmann "
@@ -4116,13 +3875,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2148
+#: user-manual.txt:1974
 #, no-wrap
 msgid "images/tissuesGraph.jpg"
 msgstr "images/tissuesGraph.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2156
+#: user-manual.txt:1982
 msgid ""
 "Gradient Factor settings strongly affect the calculated ceilings and their "
 "depths.  For more information about Gradient factors, see the section on "
@@ -4135,25 +3894,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2158
+#: user-manual.txt:1984
 #, no-wrap
 msgid " ** http://www.tek-dive.com/portal/upload/M-Values.pdf[Understanding M-values by Erik Baker, _Immersed_ Vol. 3, No. 3.]\n"
 msgstr " ** http://www.tek-dive.com/portal/upload/M-Values.pdf[Understanding M-values by Erik Baker, _Immersed_ Vol. 3, No. 3.]\n"
 
 #. type: Plain text
-#: user-manual.txt:2160
+#: user-manual.txt:1986
 #, no-wrap
 msgid " ** link:http://www.rebreatherworld.com/general-and-new-to-rebreather-articles/5037-gradient-factors-for-dummies.html[Gradient factors for dummies, by Kevin Watts]\n"
 msgstr " ** link:http://www.rebreatherworld.com/general-and-new-to-rebreather-articles/5037-gradient-factors-for-dummies.html[Gradient factors for dummies, by Kevin Watts]\n"
 
 #. type: Title ===
-#: user-manual.txt:2162
+#: user-manual.txt:1988
 #, no-wrap
 msgid "The Dive Profile context menu"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2180
+#: user-manual.txt:2006
 msgid ""
 "The context menu for the Dive Profile is accessed by right-clicking while "
 "the mouse cursor is over the Dive Profile panel. The menu allows the "
@@ -4174,13 +3933,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:2182
+#: user-manual.txt:2008
 #, no-wrap
 msgid "The *Information Box*"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2192
+#: user-manual.txt:2018
 msgid ""
 "The Information box displays a large range of information pertaining to the "
 "dive profile. Normally the Information Box is located to the top left of the "
@@ -4193,13 +3952,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2193
+#: user-manual.txt:2019
 #, no-wrap
 msgid "images/InfoBox2.jpg"
 msgstr "images/InfoBox2.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2210
+#: user-manual.txt:2036
 msgid ""
 "The moment the mouse points inside the *Dive Profile* panel, the information "
 "box expands and shows many data items. In this situation, the data reflect "
@@ -4220,20 +3979,20 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2213
+#: user-manual.txt:2039
 msgid ""
 "The user has control over the display of several statistics, represented as "
 "four buttons on the left of the profile panel. These are:"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:2214
+#: user-manual.txt:2040
 #, no-wrap
 msgid "images/icons/MOD.jpg"
 msgstr "images/icons/MOD.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2221
+#: user-manual.txt:2047
 msgid ""
 "Clicking this button causes the Information Box to display the *Maximum "
 "Operating Depth (MOD)* of the dive, given the gas mixture used. MOD is "
@@ -4243,13 +4002,13 @@ msgid ""
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:2222
+#: user-manual.txt:2048
 #, no-wrap
 msgid "images/icons/NDL.jpg"
 msgstr "images/icons/NDL.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2231
+#: user-manual.txt:2057
 msgid ""
 "Clicking this button causes the Information Box to display the *No-deco "
 "Limit (NDL)* or the *Total Time to Surface (TTS)*. NDL is the time duration "
@@ -4262,13 +4021,13 @@ msgid ""
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:2232
+#: user-manual.txt:2058
 #, no-wrap
 msgid "images/icons/SAC.jpg"
 msgstr "images/icons/SAC.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2241
+#: user-manual.txt:2067
 msgid ""
 "Clicking this button causes the Information Box to display the *Surface Air "
 "Consumption (SAC)*.  SAC is an indication of the surface-normalised "
@@ -4281,13 +4040,13 @@ msgid ""
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:2242
+#: user-manual.txt:2068
 #, no-wrap
 msgid "images/icons/EAD.jpg"
 msgstr "images/icons/EAD.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2257
+#: user-manual.txt:2083
 msgid ""
 "Clicking this button displays the *Equivalent Air Depth (EAD)* for nitrox "
 "dives as well as the *Equivalent Narcotic Depth (END)* for trimix dives. "
@@ -4303,20 +4062,20 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2259
+#: user-manual.txt:2085
 msgid ""
 "Figure (*B*) above shows an information box with a nearly complete set of "
 "data."
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:2261
+#: user-manual.txt:2087
 #, no-wrap
 msgid "The Gas Pressure Bar Graph"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2268
+#: user-manual.txt:2094
 msgid ""
 "On the left of the *Information Box* is a vertical bar graph indicating the "
 "pressures of the nitrogen (and other inert gases, e.g. helium, if "
@@ -4327,13 +4086,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2269
+#: user-manual.txt:2095
 #, no-wrap
 msgid "images/GasPressureBarGraph.jpg"
 msgstr "images/GasPressureBarGraph.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2275
+#: user-manual.txt:2101
 msgid ""
 "The light green area indicates the total gas, with the top margin of the "
 "light green area indicating the total gas pressure inhaled by the diver and "
@@ -4343,7 +4102,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2281
+#: user-manual.txt:2107
 msgid ""
 "The horizontal black line underneath the light green margin indicates the "
 "equilibrium pressure of the inert gases inhaled by the diver, usually "
@@ -4354,7 +4113,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2285
+#: user-manual.txt:2111
 msgid ""
 "The dark green area at the bottom of the graph represents the pressures of "
 "inert gas in each of the 16 tissue compartments, following the Bühlmann "
@@ -4362,7 +4121,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2290
+#: user-manual.txt:2116
 msgid ""
 "The top black horizontal line indicates the gradient factor that applies to "
 "the depth of the diver at the particular point on the *Dive Profile*. The "
@@ -4371,7 +4130,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2294
+#: user-manual.txt:2120
 msgid ""
 "The bottom margin of the red area in the graph indicates the Bühlman-derived "
 "M-value, that is the pressure value of inert gases at which bubble formation "
@@ -4379,7 +4138,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2297
+#: user-manual.txt:2123
 msgid ""
 "These five values are indicated on the left in the graph above. The way the "
 "Gas Pressure Bar Graph changes during a dive is indicated on the right hand "
@@ -4387,7 +4146,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2300
+#: user-manual.txt:2126
 msgid ""
 "Graph *A* indicates the situation at the start of a dive with diver at the "
 "surface. The pressures in all the tissue compartments are still at the "
@@ -4395,7 +4154,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2303
+#: user-manual.txt:2129
 msgid ""
 "Graph *B* indicates the situation after a descent to 30 meters. Few of the "
 "tissue compartments have had time to respond to the descent, their gas "
@@ -4403,7 +4162,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2308
+#: user-manual.txt:2134
 msgid ""
 "Graph *C* represents the pressures after 30 minutes at 30 m. The fast "
 "compartments have attained equilibrium (i.e. they have reached the hight of "
@@ -4413,7 +4172,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2314
+#: user-manual.txt:2140
 msgid ""
 "Graph *D* shows the pressures after ascent to a depth of 4.5 meters. Since, "
 "during ascent, the total inhaled gas pressure has decreased strongly from 4 "
@@ -4424,7 +4183,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2319
+#: user-manual.txt:2145
 msgid ""
 "Graph *E* indicates the situation after remaining at 4.5 meters for 10 "
 "minutes. The fast compartments have decreased in pressure. As expected, the "
@@ -4434,19 +4193,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ==
-#: user-manual.txt:2322
+#: user-manual.txt:2148
 #, no-wrap
 msgid "Organising the logbook (Manipulating groups of dives)"
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:2324
+#: user-manual.txt:2150
 #, no-wrap
 msgid "The Dive List context menu"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2328
+#: user-manual.txt:2154
 msgid ""
 "Several actions on either a single dive or a group of dives can be performed "
 "using the Dive List Context Menu, found by selecting either a single dive or "
@@ -4454,30 +4213,30 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2329
+#: user-manual.txt:2155
 #, no-wrap
 msgid "images/ContextMenu.jpg"
 msgstr "images/ContextMenu.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2332
+#: user-manual.txt:2158
 msgid "The context menu is used in many manipulations described below."
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:2333
+#: user-manual.txt:2159
 #, no-wrap
 msgid "Customising the information showed in the *Dive List* panel"
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2335
+#: user-manual.txt:2161
 #, no-wrap
 msgid "images/DiveListOptions.jpg"
 msgstr "images/DiveListOptions.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2343
+#: user-manual.txt:2169
 msgid ""
 "The default information in the *Dive List* includes, for each dive, "
 "Dive_number, Date, Rating, Dive_depth, Dive_duration and Dive_location. This "
@@ -4491,13 +4250,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:2344
+#: user-manual.txt:2170
 #, no-wrap
 msgid "Selecting dives from a particular dive site"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2350
+#: user-manual.txt:2176
 msgid ""
 "Many divers have long dive lists and it may be difficult to locate all the "
 "dives at a particular site.  By pressing _Ctl-F_ on the keyboard, a text box "
@@ -4507,13 +4266,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:2352
+#: user-manual.txt:2178
 #, no-wrap
 msgid "Renumbering the dives"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2364
+#: user-manual.txt:2190
 msgid ""
 "Dives are normally numbered incrementally from non-recent dives (low "
 "sequence numbers) to recent dives (having the highest sequence numbers). The "
@@ -4529,7 +4288,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2369
+#: user-manual.txt:2195
 msgid ""
 "One can also renumber a few selected dives in the dive list. Select the "
 "dives that need renumbering. Right-click on the selected list and use the "
@@ -4539,13 +4298,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:2371
+#: user-manual.txt:2197
 #, no-wrap
 msgid "Grouping dives into trips and manipulating trips"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2379
+#: user-manual.txt:2205
 msgid ""
 "For regular divers, the dive list can rapidly become very long. _Subsurface_ "
 "can group dives into _trips_. It performs this by grouping dives that have "
@@ -4556,13 +4315,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2380
+#: user-manual.txt:2206
 #, no-wrap
 msgid "images/Group2.jpg"
 msgstr "images/Group2.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2386
+#: user-manual.txt:2212
 msgid ""
 "Grouping into trips allows a rapid way of accessing individual dives without "
 "having to scan a long lists of dives. In order to group the dives in a dive "
@@ -4571,13 +4330,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:2387
+#: user-manual.txt:2213
 #, no-wrap
 msgid "Editing the title and associated information for a particular trip"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2400
+#: user-manual.txt:2226
 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 "
@@ -4592,13 +4351,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:2401
+#: user-manual.txt:2227
 #, no-wrap
 msgid "Viewing the dives during a particular trip"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2406
+#: user-manual.txt:2232
 msgid ""
 "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 "
@@ -4607,13 +4366,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:2407
+#: user-manual.txt:2233
 #, no-wrap
 msgid "Collapsing or expanding dive information for different trips"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2413
+#: user-manual.txt:2239
 msgid ""
 "After selecting a particular trip in the dive list, the context menu allows "
 "several possibilities to expand or collapse dives within trips. This "
@@ -4622,13 +4381,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:2414
+#: user-manual.txt:2240
 #, no-wrap
 msgid "Merging dives from more than one trip into a single trip"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2419
+#: user-manual.txt:2245
 msgid ""
 "After selecting a trip title, the context menu allows the merging of trips "
 "by either merging the selected trip with the trip below or with the trip "
@@ -4636,13 +4395,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:2420
+#: user-manual.txt:2246
 #, no-wrap
 msgid "Splitting a single trip into more than one trip"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2430
+#: user-manual.txt:2256
 msgid ""
 "If a trip includes five dives, the user can split this trip into two trips "
 "(trip 1: top 3 dives; trip 2: bottom 2 dives) by selecting and right-"
@@ -4654,25 +4413,25 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2431
+#: user-manual.txt:2257
 #, no-wrap
 msgid "images/SplitDive3a.jpg"
 msgstr "images/SplitDive3a.jpg"
 
 #. type: Title ===
-#: user-manual.txt:2433
+#: user-manual.txt:2259
 #, no-wrap
 msgid "Manipulating single dives"
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:2435
+#: user-manual.txt:2261
 #, no-wrap
 msgid "Delete a dive from the dive log"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2442
+#: user-manual.txt:2268
 msgid ""
 "Dives can be permanently deleted from the dive log by selecting and right-"
 "clicking them to bring up the context menu, and then selecting *Delete "
@@ -4682,13 +4441,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:2443
+#: user-manual.txt:2269
 #, no-wrap
 msgid "Unlink a dive from a trip"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2450
+#: user-manual.txt:2276
 msgid ""
 "Users can unlink dives from the trip to which they belong. In order to do "
 "this, select and right-click the relevant dives to bring up the context "
@@ -4698,13 +4457,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:2451
+#: user-manual.txt:2277
 #, no-wrap
 msgid "Add a dive to the trip immediately above"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2456
+#: user-manual.txt:2282
 msgid ""
 "Selected dives can be moved from the trip to which they belong and placed "
 "within a separate trip. To do this, select and right-click the dive(s) to "
@@ -4712,13 +4471,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:2457
+#: user-manual.txt:2283
 #, no-wrap
 msgid "Shift the start time of dive(s)"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2468
+#: user-manual.txt:2294
 msgid ""
 "Sometimes it is necessary to adjust the start time of a dive. This may apply "
 "to situations where dives are performed in different time zones or when the "
@@ -4731,13 +4490,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:2469
+#: user-manual.txt:2295
 #, no-wrap
 msgid "Merge dives into a single dive"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2479
+#: user-manual.txt:2305
 msgid ""
 "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 "
@@ -4751,19 +4510,19 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2480
+#: user-manual.txt:2306
 #, no-wrap
 msgid "images/MergedDive.png"
 msgstr "images/MergedDive.png"
 
 #. type: Title ====
-#: user-manual.txt:2482
+#: user-manual.txt:2308
 #, no-wrap
 msgid "Undo dive manipulations"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2488
+#: user-manual.txt:2314
 msgid ""
 "Important actions on dives or trips, described above, can be undone or "
 "redone.  This includes: _delete dives_, _merge dives_, _renumber dives_ and "
@@ -4773,13 +4532,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:2491
+#: user-manual.txt:2317
 #, no-wrap
 msgid "Filtering the dive list"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2497
+#: user-manual.txt:2323
 msgid ""
 "The dives in the *Dive List* panel can be filtered, that is, one can select "
 "only some of the dives based on their attributes, e.g. dive tags, dive site, "
@@ -4789,7 +4548,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2506
+#: user-manual.txt:2332
 msgid ""
 "To open the filter, select _Log -> Filter divelist_ from the main menu. This "
 "opens the _Filter Panel_ at the top of the _Subsurface_ window. Three icons "
@@ -4803,13 +4562,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2507
+#: user-manual.txt:2333
 #, no-wrap
 msgid "images/Filterpanel.jpg"
 msgstr "images/Filterpanel.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2516
+#: user-manual.txt:2342
 msgid ""
 "Four filter criteria may be used to filter the dive list: dive tags, person "
 "(buddy / dive master), dive site and dive suit, each of which is represented "
@@ -4822,7 +4581,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2524
+#: user-manual.txt:2350
 msgid ""
 "To activate filtering of the dive list, check at least tone check box in one "
 "of the four check lists. The dive list is then shortened to include only the "
@@ -4834,24 +4593,24 @@ msgid ""
 msgstr ""
 
 #. type: Title ==
-#: user-manual.txt:2526
+#: user-manual.txt:2352
 #, no-wrap
 msgid "Exporting the dive log or parts of the dive log"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2529
+#: user-manual.txt:2355
 msgid ""
 "There are two routes for the export of dive information from Subsurface:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2531
+#: user-manual.txt:2357
 msgid "Export dive information to _Facebook_"
 msgstr "Exporter les informations de plongée vers _Facebook_"
 
 #. type: Plain text
-#: user-manual.txt:2533
+#: user-manual.txt:2359
 msgid ""
 "xref:S_Export_other[Export dive information to other destinations or formats]"
 msgstr ""
@@ -4859,13 +4618,13 @@ msgstr ""
 "destinations ou formats]"
 
 #. type: Title ===
-#: user-manual.txt:2535
+#: user-manual.txt:2361
 #, no-wrap
 msgid "Exporting dive information to _Facebook_"
 msgstr "Export des informations de plongée vers _Facebook_"
 
 #. type: Plain text
-#: user-manual.txt:2544
+#: user-manual.txt:2370
 msgid ""
 "Export of dives to _Facebook_ is handled differently from other types of "
 "export. This is because export to _Facebook_ needs a connection to "
@@ -4887,13 +4646,13 @@ msgstr ""
 "connexion _Facebook_."
 
 #. type: Target for macro image
-#: user-manual.txt:2545
+#: user-manual.txt:2371
 #, no-wrap
 msgid "images/facebook1_f20.jpg"
 msgstr "images/facebook1_f20.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2558
+#: user-manual.txt:2384
 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 *Notes* "
@@ -4930,7 +4689,7 @@ msgstr ""
 "indiquant le succès du transfert."
 
 #. type: Plain text
-#: user-manual.txt:2565
+#: user-manual.txt:2391
 msgid ""
 "Both the Album created and the post to your time line will be marked as "
 "private. In order for friends to be able to see the post you have to change "
@@ -4947,13 +4706,13 @@ msgstr ""
 "temporelle publique."
 
 #. type: Target for macro image
-#: user-manual.txt:2566
+#: user-manual.txt:2392
 #, no-wrap
 msgid "images/facebook2_f20.jpg"
 msgstr "images/facebook2_f20.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2569
+#: user-manual.txt:2395
 msgid ""
 "If required, then close the _Facebook_ connection by either closing "
 "_Subsurface_ or by selecting _File -> Preferences -> Facebook_ from the Main "
@@ -4965,13 +4724,13 @@ msgstr ""
 "préférences Facebook."
 
 #. type: Title ===
-#: user-manual.txt:2571
+#: user-manual.txt:2397
 #, no-wrap
 msgid "Export dive information  to other destinations or formats"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2576
+#: user-manual.txt:2402
 msgid ""
 "For non-_Facebook exports_, the export function can be reached by selecting "
 "_File -> Export_, which brings up the Export dialog. This dialog always "
@@ -4981,24 +4740,24 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2577
+#: user-manual.txt:2403
 #, no-wrap
 msgid "images/Export_f20.jpg"
 msgstr "images/Export_f20.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2580
+#: user-manual.txt:2406
 msgid "A dive log or part of it can be saved in three formats:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2582
+#: user-manual.txt:2408
 msgid ""
 "_Subsurface XML_ format. This is the native format used by _Subsurface_."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2586
+#: user-manual.txt:2412
 msgid ""
 "Universal Dive Data Format (_UDDF_). Refer to _http://uddf.org_ for more "
 "information.  UDDF is a generic format that enables communication among many "
@@ -5006,7 +4765,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2590
+#: user-manual.txt:2416
 msgid ""
 "_Divelogs.de_, an Internet-based dive log repository. In order to upload to "
 "_Divelogs.de_, one needs a user-ID as well as a password for _Divelogs.de_. "
@@ -5015,7 +4774,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2594
+#: user-manual.txt:2420
 msgid ""
 "_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, "
@@ -5023,7 +4782,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2599
+#: user-manual.txt:2425
 msgid ""
 "_CSV dive details_, that includes the most critical information of the dive "
 "profile. Included information of a dive is: dive number, date, time, buddy, "
@@ -5032,7 +4791,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2602
+#: user-manual.txt:2428
 msgid ""
 "_CSV dive profile_, that includes a large amount of detail for each dive, "
 "including the depth profile, temperature and pressure information of each "
@@ -5040,7 +4799,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2614
+#: user-manual.txt:2440
 msgid ""
 "_HTML_ format, in which the dive(s) are stored in HTML files, readable with "
 "an Internet browser. Most modern web browsers are supported, but JavaScript "
@@ -5055,7 +4814,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2619
+#: user-manual.txt:2445
 msgid ""
 "_Worldmap_ format, an HTML file with a world map upon which each dive and "
 "some information about it are indicated. This map is not editable. However, "
@@ -5064,13 +4823,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2620
+#: user-manual.txt:2446
 #, no-wrap
 msgid "images/mapview_f20.jpg"
 msgstr "images/mapview_f20.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2627
+#: user-manual.txt:2453
 msgid ""
 "_Image depths_, which creates a text file that contains the file names of "
 "all photos or images attached to any of the selected dives in the _Dive "
@@ -5079,12 +4838,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2629
+#: user-manual.txt:2455
 msgid "_General Settings_, under the HTML tab, provides the following options:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2637
+#: user-manual.txt:2463
 #, no-wrap
 msgid ""
 "** Subsurface Numbers: if this option is checked, the dive(s) are exported with the\n"
@@ -5097,27 +4856,27 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2640
+#: user-manual.txt:2466
 msgid ""
 "Under _Style Options_ some style-related options are available like font "
 "size and theme."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2643
+#: user-manual.txt:2469
 msgid ""
 "Export to other formats can be achieved through third party facilities, for "
 "instance _www.divelogs.de_."
 msgstr ""
 
 #. type: Title ==
-#: user-manual.txt:2645
+#: user-manual.txt:2471
 #, no-wrap
 msgid "Keeping a _Subsurface_ dive log in the Cloud"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2656
+#: user-manual.txt:2482
 msgid ""
 "For each diver, dive log information is highly important. Not only is it a "
 "record of diving activities for one's own pleasure, but it is important "
@@ -5132,7 +4891,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2660
+#: user-manual.txt:2486
 msgid ""
 "_Subsurface_ includes access to a transparently integrated cloud storage "
 "backend that is available to all Subsurface users. In order to use the "
@@ -5140,12 +4899,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2662
+#: user-manual.txt:2488
 msgid "Create a cloud storage account:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2676
+#: user-manual.txt:2502
 #, no-wrap
 msgid ""
 "** Open the _Preferences_\n"
@@ -5164,12 +4923,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2678
+#: user-manual.txt:2504
 msgid "Use _Subsurface cloud storage_"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2684
+#: user-manual.txt:2510
 #, no-wrap
 msgid ""
 "** From the _File_ menu users can load and save data to the _Subsurface\n"
@@ -5180,7 +4939,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2689
+#: user-manual.txt:2515
 msgid ""
 "_Subsurface_ keeps a local copy of the data and _Subsurface_ stays fully "
 "functional if used while offline. _Subsurface_ will simply synchronize the "
@@ -5189,7 +4948,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2693
+#: user-manual.txt:2519
 msgid ""
 "Although _Subsurface_ offers integrated Cloud storage of dive logs, it is "
 "also simple to achieve this using several of the existing facilities on the "
@@ -5197,7 +4956,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2698
+#: user-manual.txt:2524
 msgid ""
 "For instance http://www.dropbox.com/[_Dropbox_] offers a free application "
 "that allows files on the Dropbox servers to be seen as a local folder on "
@@ -5205,13 +4964,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2699
+#: user-manual.txt:2525
 #, no-wrap
 msgid "images/Cloud.jpg"
 msgstr "images/Cloud.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2708
+#: user-manual.txt:2534
 msgid ""
 "The _Dropbox_ program creates a copy of the _Dropbox_ Internet Cloud content "
 "on one's desktop computer. When the computer is connected to the Internet, "
@@ -5224,7 +4983,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2715
+#: user-manual.txt:2541
 msgid ""
 "In this way a dive log in one's _Dropbox_ folder can be accessed seamlessly "
 "from the Internet and can be accessed from any place with Internet access. "
@@ -5234,7 +4993,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2721
+#: user-manual.txt:2547
 msgid ""
 "Alternatively one can use _Dropbox_ as a mechanism to backup one's dive log. "
 "To Store a dive log in the Cloud, select _File -> Save as_ from the "
@@ -5245,20 +5004,20 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2724
+#: user-manual.txt:2550
 msgid ""
 "Several paid services exist on the Internet (e.g. Google, Amazon) where the "
 "same process could be used for the Cloud-based storage of dive logs."
 msgstr ""
 
 #. type: Title ==
-#: user-manual.txt:2727
+#: user-manual.txt:2553
 #, no-wrap
 msgid "Printing a dive log"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2731
+#: user-manual.txt:2557
 #, no-wrap
 msgid ""
 "_Subsurface_ provides a simple and flexible interface to print a whole dive log or only a few selected dives.\n"
@@ -5266,12 +5025,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2733
+#: user-manual.txt:2559
 msgid "Before printing, two decisions are required:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2736
+#: user-manual.txt:2562
 msgid ""
 "Should the whole dive log be printed or only part of it? If only part of the "
 "dive log is required, then select the required dives from the *Dive List* "
@@ -5279,7 +5038,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2738
+#: user-manual.txt:2564
 msgid ""
 "If the dive profiles needs printing, what gas partial pressure information "
 "should be shown? Select the appropriate toggle-buttons on the button bar to "
@@ -5287,7 +5046,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2741
+#: user-manual.txt:2567
 msgid ""
 "If _File -> Print_ is selected from the Main menu, the the dialogue below "
 "(image *A*) appears. Three specifications are needed to achieve the desired "
@@ -5295,35 +5054,35 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2742 user-manual.txt:4136
+#: user-manual.txt:2568 user-manual.txt:3962
 #, no-wrap
 msgid "images/Print1_f22.jpg"
 msgstr "images/Print1_f22.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2745
+#: user-manual.txt:2571
 msgid "Under _Print type_ select one of two options:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2747
+#: user-manual.txt:2573
 msgid ""
 "_Dive list print_: Print dives from the *Dive List* panel with profiles and "
 "other information."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2748
+#: user-manual.txt:2574
 msgid "_Statistics print_: Print yearly statistics of the dives."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2750
+#: user-manual.txt:2576
 msgid "Under _Print options_ select:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2755
+#: user-manual.txt:2581
 msgid ""
 "Printing only the dives selected from the dive list prior to activating the "
 "print dialogue by checking the box _Print only selected dives_. If this "
@@ -5331,85 +5090,85 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2757
+#: user-manual.txt:2583
 msgid ""
 "Printing in colour, achieved by checking the box with _Print in colour_. If "
 "this check box is not checked, printing is in monochrome (grey scale)."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2760
+#: user-manual.txt:2586
 msgid ""
 "Under _Template_ select a template to be used as the page layout. There are "
 "several templates (see image *B*, above)."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2762
+#: user-manual.txt:2588
 msgid "_Table_: This prints a summary table of all dives selected (see below)."
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2763
+#: user-manual.txt:2589
 #, no-wrap
 msgid "images/Print_summarylist_f22.jpg"
 msgstr "images/Print_summarylist_f22.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2766
+#: user-manual.txt:2592
 msgid ""
 "_Flow layout_: Print the text associated with each diev without printing the "
 "dive profiles"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2767
+#: user-manual.txt:2593
 msgid "of each dive (see below):"
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2768
+#: user-manual.txt:2594
 #, no-wrap
 msgid "images/Print_flow_layout_f22.jpg"
 msgstr "images/Print_flow_layout_f22.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2771
+#: user-manual.txt:2597
 msgid ""
 "_One Dive_: Print one dive per page, also showing the dive profile (see "
 "below)"
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2772
+#: user-manual.txt:2598
 #, no-wrap
 msgid "images/print2_f22.jpg"
 msgstr "images/print2_f22.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2776
+#: user-manual.txt:2602
 msgid "_Two Dives_: Print two dives per page, also showing the dive profiles."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2777
+#: user-manual.txt:2603
 msgid "_Six Dives_: Print six dives per page, also showing the dive profiles."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2778
+#: user-manual.txt:2604
 msgid ""
 "_Custom_: This option allows customisation of the print contents and layout. "
 "This is"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2779
+#: user-manual.txt:2605
 msgid "discussed at the end of this section."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2783
+#: user-manual.txt:2609
 msgid ""
 "Users can _Preview_ the printed page by selecting the _Preview_ button on "
 "the dialogue (see image *A* at the start of this section). After preview, "
@@ -5418,7 +5177,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2787
+#: user-manual.txt:2613
 msgid ""
 "Next, select the _Print_ button (see image *A* at the start of this "
 "section). This activates the regular print dialogue used by the user "
@@ -5427,13 +5186,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2788
+#: user-manual.txt:2614
 #, no-wrap
 msgid "images/Print_print_f22.jpg"
 msgstr "images/Print_print_f22.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2793
+#: user-manual.txt:2619
 msgid ""
 "Set the print resolution of the printer to an appropriate value by changing "
 "the printer _Properties_. Finally, select the _Print_ button to print the "
@@ -5442,19 +5201,19 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2794
+#: user-manual.txt:2620
 #, no-wrap
 msgid "images/Printpreview.jpg"
 msgstr "images/Printpreview.jpg"
 
 #. type: Title ===
-#: user-manual.txt:2796
+#: user-manual.txt:2622
 #, no-wrap
 msgid "Write a custom printing template (advanced)"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2800
+#: user-manual.txt:2626
 msgid ""
 "Writing a custom template is an effective way to produce highly customized "
 "printouts. Subsurface uses HTML templates to render printing. One can create "
@@ -5465,13 +5224,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ==
-#: user-manual.txt:2802
+#: user-manual.txt:2628
 #, no-wrap
 msgid "Configuring a dive computer"
 msgstr "Configurer un ordinateur de plongée"
 
 #. type: Plain text
-#: user-manual.txt:2810
+#: user-manual.txt:2636
 msgid ""
 "_Subsurface_ enables one to configure a dive computer. Currently the "
 "Heinrichs-Weikamp (OSTC 2, OSTC 3) and Suunto Vyper (Stinger, Mosquito, D3, "
@@ -5494,7 +5253,7 @@ msgstr ""
 "APPENDIX A>> pour plus d'informations sur la manière de procéder."
 
 #. type: Plain text
-#: user-manual.txt:2815
+#: user-manual.txt:2641
 msgid ""
 "Once the dive computer is connected to the _Subsurface_ computer, select "
 "_File -> Configure dive computer_ from the _Main Menu_. Provide the "
@@ -5509,13 +5268,13 @@ msgstr ""
 "de plongée à partir du panneau à gauche (voir l'image ci-dessous)."
 
 #. type: Target for macro image
-#: user-manual.txt:2816
+#: user-manual.txt:2642
 #, no-wrap
 msgid "images/Configure_dc_f20.jpg"
 msgstr "images/Configure_dc_f20.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2819
+#: user-manual.txt:2645
 msgid ""
 "Using the appropriate buttons on the configuration panel, the following "
 "actions can be performed:"
@@ -5524,7 +5283,7 @@ msgstr ""
 "suivantes peuvent être réalisées :"
 
 #. type: Plain text
-#: user-manual.txt:2822
+#: user-manual.txt:2648
 #, no-wrap
 msgid ""
 "*Retrieve available details*. This loads the existing configuration from the dive computer\n"
@@ -5534,7 +5293,7 @@ msgstr ""
 "dans _Subsurface_, en l'affichant dans le panneau de configuration.\n"
 
 #. type: Plain text
-#: user-manual.txt:2824
+#: user-manual.txt:2650
 #, no-wrap
 msgid ""
 "*Save changes to device*. This changes the configuration of the\n"
@@ -5544,7 +5303,7 @@ msgstr ""
 "de plongée pour correspondre aux informations affichées dans le panneau de configuration.\n"
 
 #. type: Plain text
-#: user-manual.txt:2826
+#: user-manual.txt:2652
 #, no-wrap
 msgid ""
 "*Backup*. This saves the configuration data to a file. _Subsurface_ asks for\n"
@@ -5554,7 +5313,7 @@ msgstr ""
 "l'emplacement et le nom du fichier pour enregistrer les informations.\n"
 
 #. type: Plain text
-#: user-manual.txt:2828
+#: user-manual.txt:2654
 #, no-wrap
 msgid ""
 "*Restore backup*. This loads the information from a backup file and displays it\n"
@@ -5564,7 +5323,7 @@ msgstr ""
 "dans le panneau de configuration.\n"
 
 #. type: Plain text
-#: user-manual.txt:2830
+#: user-manual.txt:2656
 #, no-wrap
 msgid ""
 "*Update firmware*. If new firmware is available for the dive computer, this is\n"
@@ -5574,13 +5333,13 @@ msgstr ""
 "il sera chargé dans l'ordinateur de plongée.\n"
 
 #. type: Title ==
-#: user-manual.txt:2833
+#: user-manual.txt:2659
 #, no-wrap
 msgid "Setting user _Preferences_ for _Subsurface_"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2841
+#: user-manual.txt:2667
 msgid ""
 "There are several settings within _Subsurface_ that the user can specify. "
 "These are found when selecting _File -> Preferences_. The settings are "
@@ -5592,24 +5351,24 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:2842
+#: user-manual.txt:2668
 #, no-wrap
 msgid "Defaults"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2845
+#: user-manual.txt:2671
 msgid "There are several settings in the *Defaults* panel:"
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2846
+#: user-manual.txt:2672
 #, no-wrap
 msgid "images/Pref1_f20.jpg"
 msgstr "images/Pref1_f20.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2850
+#: user-manual.txt:2676
 #, no-wrap
 msgid ""
 "  ** *Lists and tables*: Here one can specify the font type and font size of the\n"
@@ -5617,7 +5376,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2855
+#: user-manual.txt:2681
 #, no-wrap
 msgid ""
 "  ** *Dives*: For the _Default Dive File_ one need to specify the directory and\n"
@@ -5627,7 +5386,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2860
+#: user-manual.txt:2686
 #, no-wrap
 msgid ""
 "  ** *Display invalid*:  Dives can be marked as invalid (when a user wishes to hide\n"
@@ -5637,7 +5396,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2863
+#: user-manual.txt:2689
 #, no-wrap
 msgid ""
 "  ** *Default cylinder*: Here users can specify the default cylinder listed in\n"
@@ -5645,7 +5404,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2871
+#: user-manual.txt:2697
 #, no-wrap
 msgid ""
 "  ** *Animations*: Some actions in showing the dive profile are performed using\n"
@@ -5658,7 +5417,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2876
+#: user-manual.txt:2702
 #, no-wrap
 msgid ""
 "  ** *Subsurface web service*: When one subscribes to the <<S_Companion,Subsurface web service>>, a very\n"
@@ -5668,7 +5427,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2879
+#: user-manual.txt:2705
 #, no-wrap
 msgid ""
 "  ** *Clear all settings*: As indicated in the button below this heading, all settings are\n"
@@ -5676,19 +5435,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:2880
+#: user-manual.txt:2706
 #, no-wrap
 msgid "Units"
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2881
+#: user-manual.txt:2707
 #, no-wrap
 msgid "images/Pref2_f20.jpg"
 msgstr "images/Pref2_f20.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2888
+#: user-manual.txt:2714
 msgid ""
 "Here user can choose between metric and imperial units of depth, pressure, "
 "volume, temperature and mass. By selecting the Metric or Imperial radio "
@@ -5699,24 +5458,24 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:2889
+#: user-manual.txt:2715
 #, no-wrap
 msgid "Graph"
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2891
+#: user-manual.txt:2717
 #, no-wrap
 msgid "images/Pref3_f20.jpg"
 msgstr "images/Pref3_f20.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2895
+#: user-manual.txt:2721
 msgid "This panel allows two type of selections:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2903
+#: user-manual.txt:2729
 #, no-wrap
 msgid ""
 "*Show*: Here users can specify the amount of information shown as part of\n"
@@ -5729,7 +5488,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2908
+#: user-manual.txt:2734
 #, no-wrap
 msgid ""
 "** _Draw dive computer reported ceiling red_: This checkbox allows exactly what it says.\n"
@@ -5739,13 +5498,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2910
+#: user-manual.txt:2736
 #, no-wrap
 msgid "** _Show unused cylinders in Equipment Tab_: This checkbox allows display of information about unused cylinders when viewing the *Equipment Tab*. Conversely, if this box is not checked, and any cylinders entered using the *Equipment Tab* are not used (e.g. there was no gas switch to such a cylinder), then these cylinders are omitted from that list.\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2916
+#: user-manual.txt:2742
 #, no-wrap
 msgid ""
 "** _Show average depth_: Activating this checkbox causes _Subsurface_ to draw a grey line across\n"
@@ -5755,13 +5514,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2918
+#: user-manual.txt:2744
 #, no-wrap
 msgid "*Misc*:\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2930
+#: user-manual.txt:2756
 #, no-wrap
 msgid ""
 "** Gradient Factors:* Here users can set the _gradient factors_ used while diving. GF_Low is\n"
@@ -5778,19 +5537,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2932
+#: user-manual.txt:2758
 #, no-wrap
 msgid " *** http://www.tek-dive.com/portal/upload/M-Values.pdf[Understanding M-values by Erik Baker, _Immersed_ Vol. 3, No. 3.]\n"
 msgstr " *** http://www.tek-dive.com/portal/upload/M-Values.pdf[Understanding M-values by Erik Baker, _Immersed_ Vol. 3, No. 3.]\n"
 
 #. type: Plain text
-#: user-manual.txt:2934
+#: user-manual.txt:2760
 #, no-wrap
 msgid " *** link:http://www.rebreatherworld.com/general-and-new-to-rebreather-articles/5037-gradient-factors-for-dummies.html[Gradient factors for dummies, by Kevin Watts]\n"
 msgstr " *** link:http://www.rebreatherworld.com/general-and-new-to-rebreather-articles/5037-gradient-factors-for-dummies.html[Gradient factors for dummies, by Kevin Watts]\n"
 
 #. type: Plain text
-#: user-manual.txt:2938
+#: user-manual.txt:2764
 #, no-wrap
 msgid ""
 " ** _CCR: Show setpoints when viewing pO2:_ With this checkbox ativated, the pO~2~\n"
@@ -5799,7 +5558,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2942
+#: user-manual.txt:2768
 #, no-wrap
 msgid ""
 " ** _CCR: Show individual O~2~ sensor values when viewing pO~2~:_ Show the pO~2~\n"
@@ -5808,19 +5567,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2944
+#: user-manual.txt:2770
 #, no-wrap
 msgid "*Configuring dive planning using rebreather equipment:*\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2946
+#: user-manual.txt:2772
 #, no-wrap
 msgid "** _Default CCR setpoint for dive planning:_ Specify the O~2~ setpoint for a\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2950
+#: user-manual.txt:2776
 #, no-wrap
 msgid ""
 "CCR dive plan. This determines the pO~2~ that will be maintained\n"
@@ -5830,13 +5589,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2952
+#: user-manual.txt:2778
 #, no-wrap
 msgid "** _pSCR O~2~ metabolism rate:_ For a semiclosed rebreather (pSCR) system, this is the\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2954
+#: user-manual.txt:2780
 #, no-wrap
 msgid ""
 "volume of oxygen used by a diver each minute. Set this value for pSCR dive planning\n"
@@ -5844,13 +5603,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2956
+#: user-manual.txt:2782
 #, no-wrap
 msgid "** _pSCR ratio:_ For pSCR equipment the dump ratio is the ratio of gas released to the\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2958
+#: user-manual.txt:2784
 #, no-wrap
 msgid ""
 "environment to that of the gas recirculated to the diver. Set this value for a\n"
@@ -5858,24 +5617,24 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:2960
+#: user-manual.txt:2786
 #, no-wrap
 msgid "Language"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2962
+#: user-manual.txt:2788
 msgid "Choose a language that _Subsurface_ will use."
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2963
+#: user-manual.txt:2789
 #, no-wrap
 msgid "images/Pref4_f20.jpg"
 msgstr "images/Pref4_f20.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2973
+#: user-manual.txt:2799
 msgid ""
 "A checkbox allows one to use the _System Default_ language which in most "
 "cases will be the correct setting; with this _Subsurface_ simply runs in the "
@@ -5888,26 +5647,26 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:2974
+#: user-manual.txt:2800
 #, no-wrap
 msgid "Network"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2976
+#: user-manual.txt:2802
 msgid ""
 "This panel facilitates communication between _Subsurface_ and data sources "
 "on the Internet."
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2977
+#: user-manual.txt:2803
 #, no-wrap
 msgid "images/Pref5_f20.jpg"
 msgstr "images/Pref5_f20.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2990
+#: user-manual.txt:2816
 msgid ""
 "This is important, for instance, when _Subsurface_ needs to communicate with "
 "Internet services such as the <<S_Companion,_Subsurface Companion app_>> or "
@@ -5924,13 +5683,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:2991
+#: user-manual.txt:2817
 #, no-wrap
 msgid "Facebook Accesss"
 msgstr "Accès Facebook"
 
 #. type: Plain text
-#: user-manual.txt:2994
+#: user-manual.txt:2820
 msgid ""
 "This panel allows one to log into a Facebook account in order to transfer "
 "information from Subsurface to Facefook."
@@ -5939,13 +5698,13 @@ msgstr ""
 "transférer des informations de Subsurface vers Facebook."
 
 #. type: Target for macro image
-#: user-manual.txt:2995
+#: user-manual.txt:2821
 #, no-wrap
 msgid "images/Pref6_f20.jpg"
 msgstr "images/Pref6_f20.jpg"
 
 #. type: Plain text
-#: user-manual.txt:3003
+#: user-manual.txt:2829
 msgid ""
 "If one provides a valid Facebook userID and password, a connection to "
 "Facebook is created. The connection to Facebook is closed when one closes "
@@ -5961,13 +5720,13 @@ msgstr ""
 "vers Facebook] pour plus d'informations."
 
 #. type: Title ==
-#: user-manual.txt:3005
+#: user-manual.txt:2831
 #, no-wrap
 msgid "The _Subsurface_ dive planner"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3010
+#: user-manual.txt:2836
 msgid ""
 "Dive planning is an advanced feature of _Subsurface_, accessible by "
 "selecting _Log -> Plan Dive_ from the main menu. It allows calculation of "
@@ -5976,7 +5735,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:3018
+#: user-manual.txt:2844
 msgid ""
 "The _Subsurface_ dive planner IS CURRENTLY EXPERIMENTAL and assumes the user "
 "is already familiar with the _Subsurface_ user interface. It is explicitly "
@@ -5984,19 +5743,19 @@ msgid ""
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:3021
+#: user-manual.txt:2847
 msgid ""
 "The user is conversant with dive planning and has the necessary training to "
 "perform dive planning."
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:3022
+#: user-manual.txt:2848
 msgid "The user plans dives within his/her certification limits."
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:3025
+#: user-manual.txt:2851
 msgid ""
 "Dive planning makes large assumptions about the characteristics of the "
 "_average person_ and cannot compensate for individual physiology or health "
@@ -6004,32 +5763,32 @@ msgid ""
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:3026
+#: user-manual.txt:2852
 msgid ""
 "The safety of a dive plan depends heavily on the way in which the planner is "
 "used."
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:3027
+#: user-manual.txt:2853
 msgid "The user is familiar with the user interface of _Subsurface_."
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:3029
+#: user-manual.txt:2855
 msgid ""
 "A user who is not absolutely sure about any of the above requirements should "
 "not use this feature."
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:3031
+#: user-manual.txt:2857
 #, no-wrap
 msgid "The _Subsurface_ dive planner screen"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3036
+#: user-manual.txt:2862
 msgid ""
 "Like the _Subsurface_ dive log, the planner screen is divided into several "
 "sections (see image below). The *setup* parameters for a dive are entered "
@@ -6039,7 +5798,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3040
+#: user-manual.txt:2866
 msgid ""
 "At the top right hand is a green *design panel* upon which the profile of "
 "the dive can be manipulated directly by dragging and clicking as explained "
@@ -6048,7 +5807,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3044
+#: user-manual.txt:2870
 msgid ""
 "At the bottom right is a text panel with a heading of _Dive Plan Details_. "
 "This is where the details of the dive plan are provided in a way that can "
@@ -6057,26 +5816,26 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:3045
+#: user-manual.txt:2871
 #, no-wrap
 msgid "images/PlannerWindow1_f20.jpg"
 msgstr "images/PlannerWindow1_f20.jpg"
 
 #. type: Title ===
-#: user-manual.txt:3048
+#: user-manual.txt:2874
 #, no-wrap
 msgid "Open circuit dives"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3051
+#: user-manual.txt:2877
 msgid ""
 "Towards the centre bottom of the planner (circled in blue in the image "
 "above) is a dropbox with three options. Select the appropriate one of these:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3054
+#: user-manual.txt:2880
 #, no-wrap
 msgid ""
 "** Open Circuit (the default)\n"
@@ -6085,12 +5844,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3056
+#: user-manual.txt:2882
 msgid "Choose the Open Circuit option."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3060
+#: user-manual.txt:2886
 msgid ""
 "In the top left-hand area of the planning screen, ensure that the constant "
 "dive parameters are appropriate. These are: Start date and time of the "
@@ -6100,7 +5859,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3069
+#: user-manual.txt:2895
 msgid ""
 "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 "
@@ -6114,12 +5873,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3071
+#: user-manual.txt:2897
 msgid "The profile of the planned dive can be created in two ways:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3076
+#: user-manual.txt:2902
 msgid ""
 "Drag the waypoints (the small white circles) on the existing dive profile in "
 "a way to represent the dive. Additional waypoints can be created by double-"
@@ -6129,7 +5888,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3084
+#: user-manual.txt:2910
 msgid ""
 "The most efficient way to create a dive profile is to enter the appropriate "
 "values into the table marked _Dive planner points_. The first line of the "
@@ -6143,13 +5902,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:3085
+#: user-manual.txt:2911
 #, no-wrap
 msgid "Recreational dives"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3100
+#: user-manual.txt:2926
 msgid ""
 "The _Subsurface_ dive planner allows a sophisticated way of planning "
 "recreational dives, i.e. dives that remain within no-decompression limits.  "
@@ -6170,26 +5929,26 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3103
+#: user-manual.txt:2929
 msgid "To plan a dive, the appropriate settings need to be defined."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3106
+#: user-manual.txt:2932
 msgid ""
 "Ensure that the date and time is set to that of the intended dive. This "
 "allows calculation of the nitrogen load incurred during previous dives."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3109
+#: user-manual.txt:2935
 msgid ""
 "Immediately under the heading _Planning_ are two checkboxes _Recreational_ "
 "and _Safety Stop_.  Check these two boxes."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3113
+#: user-manual.txt:2939
 msgid ""
 "Then define the cylinder size, the gas mixture (air or % oxygen) and the "
 "starting cylinder pressure in the top left-hand section of the planner under "
@@ -6197,7 +5956,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3118
+#: user-manual.txt:2944
 msgid ""
 "The planner calculates whether the specified cylinder contains enough air/"
 "gas to complete the planned dive. In order for this to be realistic, under "
@@ -6207,7 +5966,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3121
+#: user-manual.txt:2947
 msgid ""
 "Define the amount of gas that the cylinder must have at the end of the "
 "bottom section of the dive just before ascent. A value of 50 bar is often "
@@ -6215,7 +5974,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3128
+#: user-manual.txt:2954
 msgid ""
 "Define the depth of the dive by dragging the waypoints (white dots) on the "
 "dive profile or (even better) defining the appropriate depths using the "
@@ -6226,14 +5985,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3131
+#: user-manual.txt:2957
 msgid ""
 "The ascent speed can be changed. The default ascent speeds are those "
 "considered safe for recreational divers."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3139
+#: user-manual.txt:2965
 msgid ""
 "The dive profile in the planner indicates the maximum dive time within no-"
 "deco limits using the Bühlmann ZH-L16 algorithm and the gas and depth "
@@ -6249,7 +6008,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3143
+#: user-manual.txt:2969
 msgid ""
 "Below is an image of a dive plan for a recreational dive at 30 metres. "
 "Although the no-deco limit (NDL) is 23 minutes, the duration of the dive is "
@@ -6258,26 +6017,26 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:3144
+#: user-manual.txt:2970
 #, no-wrap
 msgid "images/rec_diveplan.jpg"
 msgstr "images/rec_diveplan.jpg"
 
 #. type: Title ====
-#: user-manual.txt:3146
+#: user-manual.txt:2972
 #, no-wrap
 msgid "Non-recreational open circuit dives, including decompression"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3150
+#: user-manual.txt:2976
 msgid ""
 "Non-recreational dive planning involves exceeding the no-deco limits and/or "
 "using multiple breathing gases.  Such dives are planned in three stages:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3160
+#: user-manual.txt:2986
 #, no-wrap
 msgid ""
 "*a) Nitrogen management*: This is performed by specifying the rates for descent and ascent,\n"
@@ -6292,7 +6051,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3162
+#: user-manual.txt:2988
 msgid ""
 "link:http://www.tek-dive.com/portal/upload/M-Values.pdf[Understanding M-"
 "values by Erik Baker, _Immersed_ Vol. 3, No. 3.]"
@@ -6301,7 +6060,7 @@ msgstr ""
 "values by Erik Baker, _Immersed_ Vol. 3, No. 3.]"
 
 #. type: Plain text
-#: user-manual.txt:3163
+#: user-manual.txt:2989
 msgid ""
 "link:http://www.rebreatherworld.com/general-and-new-to-rebreather-"
 "articles/5037-gradient-factors-for-dummies.html[Gradient factors for "
@@ -6312,7 +6071,7 @@ msgstr ""
 "dummies, by Kevin Watts]"
 
 #. type: Plain text
-#: user-manual.txt:3165
+#: user-manual.txt:2991
 msgid ""
 "link:http://www.amazon.com/Deco-Divers-Decompression-Theory-Physiology/"
 "dp/1905492073/ref=sr_1_1?s=books&ie=UTF8&qid=1403932320&sr=1-1&keywords=deco"
@@ -6325,7 +6084,7 @@ msgstr ""
 "Sea, UK. ISBN 10: 1-905492-07-3.  An excellent non-technical review."
 
 #. type: Plain text
-#: user-manual.txt:3173
+#: user-manual.txt:2999
 msgid ""
 "The ascent rate is critical for nitrogen off-gassing at the end of the dive "
 "and is specified for several depth ranges, utilising the average (or mean) "
@@ -6339,7 +6098,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3182
+#: user-manual.txt:3008
 #, no-wrap
 msgid ""
 "*b) Oxygen management*: In the *Gas Options* part of the dive specification, the maximum partial\n"
@@ -6353,7 +6112,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3196
+#: user-manual.txt:3022
 #, no-wrap
 msgid ""
 "*c) Gas management*: With open-circuit dives this is a primary consideration. One needs to keep within the limits of the amount of gas within the dive\n"
@@ -6372,7 +6131,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3208
+#: user-manual.txt:3034
 msgid ""
 "Now (at last) one can start the detailed time-depth planning of the dive. "
 "_Subsurface_ offers a unique graphical interface for performing this part of "
@@ -6390,7 +6149,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3220
+#: user-manual.txt:3046
 msgid ""
 "Each waypoint on the dive profile creates a _Dive Planner Point_ in the "
 "table on the left of the dive planner panel. Ensure that the _Used Gas_ "
@@ -6408,7 +6167,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3228
+#: user-manual.txt:3054
 msgid ""
 "Indicate any changes in gas cylinder used by indicating gas changes as "
 "explained in the section <<S_CreateProfile,hand-creating a dive profile>>. "
@@ -6420,7 +6179,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3237
+#: user-manual.txt:3063
 msgid ""
 "A non-zero value in the \"CC set point\" column of the table of dive planner "
 "points indicates a valid setpoint for oxygen partial pressure and that the "
@@ -6433,20 +6192,20 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3240
+#: user-manual.txt:3066
 msgid ""
 "Below is an example of a dive plan to 45m using EAN26, followed by an ascent "
 "using EAN50 and using the settings as described above."
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:3241
+#: user-manual.txt:3067
 #, no-wrap
 msgid "images/DivePlanner2_f20.jpg"
 msgstr "images/DivePlanner2_f20.jpg"
 
 #. type: Plain text
-#: user-manual.txt:3246
+#: user-manual.txt:3072
 msgid ""
 "Once the above has been completed, one can save it by clicking the _Save_ "
 "button towards the top middle of the planner. The saved dive plan will "
@@ -6454,13 +6213,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3248
+#: user-manual.txt:3074
 #, no-wrap
 msgid "*The dive plan details*\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3256
+#: user-manual.txt:3082
 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 "
@@ -6473,7 +6232,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3261
+#: user-manual.txt:3087
 msgid ""
 "If the option _Display segment duration_ is checked, then the duration of "
 "each depth level is indicated in the _Dive Plan Details_. This duration "
@@ -6483,13 +6242,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:3262
+#: user-manual.txt:3088
 #, no-wrap
 msgid "Planning pSCR dives"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3277
+#: user-manual.txt:3103
 #, no-wrap
 msgid ""
 "To plan a dive using a passive semi-closed rebreather (pSCR), select _pSCR_ rather than\n"
@@ -6508,26 +6267,26 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:3278
+#: user-manual.txt:3104
 #, no-wrap
 msgid "images/Planner_pSCR1_f20.jpg"
 msgstr "images/Planner_pSCR1_f20.jpg"
 
 #. type: Title ===
-#: user-manual.txt:3281
+#: user-manual.txt:3107
 #, no-wrap
 msgid "Planning CCR dives"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3285
+#: user-manual.txt:3111
 msgid ""
 "To plan a dive using a closed circuit rebreather, select the _CCR_ option in "
 "the dropdown list, circled in blue in the image below."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3289
+#: user-manual.txt:3115
 #, no-wrap
 msgid ""
 "*Available gases*: In the _Available gases_ table, enter the cylinder information for the\n"
@@ -6536,7 +6295,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3297
+#: user-manual.txt:3123
 #, no-wrap
 msgid ""
 "*Entering setpoints*: Specify a default setpoint in the Preferences tab, by selecting _File ->  Preferences ->  Graph_ from the main menu. All user-entered segments in the _Dive planner points_ table\n"
@@ -6549,32 +6308,32 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3299
+#: user-manual.txt:3125
 msgid ""
 "The dive profile for a CCR dive may look something like the image below."
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:3300
+#: user-manual.txt:3126
 #, no-wrap
 msgid "images/Planner_CCR1_f20.jpg"
 msgstr "images/Planner_CCR1_f20.jpg"
 
 #. type: Plain text
-#: user-manual.txt:3304
+#: user-manual.txt:3130
 msgid ""
 "Note that, in the _Dive plan details_, the gas consumption for a CCR segment "
 "is not calculated, so gas consumptions of 0 litres are the norm."
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:3306
+#: user-manual.txt:3132
 #, no-wrap
 msgid "Modifying an existing dive plan"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3313
+#: user-manual.txt:3139
 msgid ""
 "Normally, when a dive plan has been saved, it is accessible from the *Dive "
 "List*, like any other dive log. Within the *Dive List* there is not a way to "
@@ -6585,7 +6344,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3319
+#: user-manual.txt:3145
 msgid ""
 "In addition there is the option \"Save new\". This keeps the original "
 "planned dive and adds a (possibly modified) copy to the dive list. If that "
@@ -6595,13 +6354,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:3320
+#: user-manual.txt:3146
 #, no-wrap
 msgid "Planning for repetitive dives"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3327
+#: user-manual.txt:3153
 msgid ""
 "Repetitive dives can easily be planned if the dates and start times of the "
 "repetitive dive set is specified appropriately in the top left-hand _Start "
@@ -6610,7 +6369,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3333
+#: user-manual.txt:3159
 msgid ""
 "If one has just completed a long/deep dive and is planning another dive, "
 "then highlight, in the *Dive List*, the dive that has just been completed "
@@ -6620,7 +6379,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3338
+#: user-manual.txt:3164
 msgid ""
 "If only a few standard configurations are used (e.g. in GUE), then a "
 "template dive can be created conforming to one of the configurations. If one "
@@ -6630,13 +6389,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:3339
+#: user-manual.txt:3165
 #, no-wrap
 msgid "Printing the dive plan"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3344
+#: user-manual.txt:3170
 msgid ""
 "Selecting the _Print_ button in the planner allows printing of the _Dive "
 "Plan Details_ for wet notes. Alternatively one can cut and paste the _Dive "
@@ -6644,7 +6403,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3354
+#: user-manual.txt:3180
 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 "
@@ -6660,13 +6419,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ==
-#: user-manual.txt:3355
+#: user-manual.txt:3181
 #, no-wrap
 msgid "Description of the Subsurface Main Menu items"
 msgstr "Description des éléments du menu principal de Subsurface"
 
 #. type: Plain text
-#: user-manual.txt:3360
+#: user-manual.txt:3186
 msgid ""
 "This section describes the functions and operation of the items in the Main "
 "Menu of Subsurface. Several of the items below are links to sections of this "
@@ -6677,13 +6436,13 @@ msgstr ""
 "des sections de ce manuel traitant des opérations relatives."
 
 #. type: Title ===
-#: user-manual.txt:3361
+#: user-manual.txt:3187
 #, no-wrap
 msgid "File"
 msgstr "Fichier"
 
 #. type: Plain text
-#: user-manual.txt:3364
+#: user-manual.txt:3190
 msgid ""
 "<<S_NewLogbook,_New Logbook_>> - Close the currently open dive logbook and "
 "clear all dive information."
@@ -6692,7 +6451,7 @@ msgstr ""
 "actuellement ouvert et supprime toutes les informations de plongées."
 
 #. type: Plain text
-#: user-manual.txt:3366
+#: user-manual.txt:3192
 msgid ""
 "_Open logbook_ - This opens the file manager in order to select a dive "
 "logbook to open."
@@ -6701,24 +6460,24 @@ msgstr ""
 "carnet de plongée à ouvrir."
 
 #. type: Plain text
-#: user-manual.txt:3367
+#: user-manual.txt:3193
 msgid "_Save_ - Save the dive logbook that is currently open."
 msgstr ""
 "_Sauvegarder_ - Enregistrer le carnet de plongée qui est actuellement ouvert."
 
 #. type: Plain text
-#: user-manual.txt:3368
+#: user-manual.txt:3194
 msgid "_Save as_ - Save the current logbook under a different file name."
 msgstr ""
 "_Enregsitrer sous_ - Enregistrer le carnet actuel sous un nom différent."
 
 #. type: Plain text
-#: user-manual.txt:3369
+#: user-manual.txt:3195
 msgid "_Close_ - Close the dive logbook that is currently open."
 msgstr "_Fermer_ - Fermer le carnet de plongée actuellement ouvert."
 
 #. type: Plain text
-#: user-manual.txt:3371
+#: user-manual.txt:3197
 msgid ""
 "<<S_ExportLog,_Export_>> - Export the currently open dive logbook (or the "
 "selected dives in the logbook) to one of several formats."
@@ -6728,34 +6487,34 @@ msgstr ""
 "formats."
 
 #. type: Plain text
-#: user-manual.txt:3372
+#: user-manual.txt:3198
 msgid "<<S_PrintDivelog,_Print_>> - Print the currently open logbook."
 msgstr ""
 "<<S_PrintDivelog,_Imprimer_>> - Imprimer le carnet de plongée actuellement "
 "ouvert."
 
 #. type: Plain text
-#: user-manual.txt:3373
+#: user-manual.txt:3199
 msgid ""
 "<<S_FindMovedImages, _Find moved images_>> - If photos taken during dives "
 "have been moved to"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3374
+#: user-manual.txt:3200
 msgid ""
 "a different disk or directory, locate them and link them to the appropriate "
 "dives."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3375
+#: user-manual.txt:3201
 msgid "<<S_Preferences,_Preferences_>> - Set the _Subsurface_ preferences."
 msgstr ""
 "<<S_Preferences,_Préférences_>> - Définir les  préférences de _Subsurface_."
 
 #. type: Plain text
-#: user-manual.txt:3376
+#: user-manual.txt:3202
 msgid ""
 "<<S_Configure,_Configure dive computer_>> - Edit the configuration of a dive "
 "computer."
@@ -6764,18 +6523,18 @@ msgstr ""
 "configuration d'un ordinateur de plongée."
 
 #. type: Plain text
-#: user-manual.txt:3377
+#: user-manual.txt:3203
 msgid "_Quit_ - Quit _Subsurface_."
 msgstr "_Quitter_ - Quitter _Subsurface_."
 
 #. type: Title ===
-#: user-manual.txt:3378
+#: user-manual.txt:3204
 #, no-wrap
 msgid "Import"
 msgstr "Importer"
 
 #. type: Plain text
-#: user-manual.txt:3381
+#: user-manual.txt:3207
 msgid ""
 "<<S_ImportDiveComputer,_Import from dive computer_>> - Import dive "
 "information from a dive computer."
@@ -6784,7 +6543,7 @@ msgstr ""
 "Importer des informations de plongées à partir de l'ordinateur de plongée."
 
 #. type: Plain text
-#: user-manual.txt:3383
+#: user-manual.txt:3209
 msgid ""
 "<<Unified_import,_Import Log Files_>> - Import dive information from a file "
 "in in a _Subsurface_-compatible format."
@@ -6794,7 +6553,7 @@ msgstr ""
 "_Subsurface_."
 
 #. type: Plain text
-#: user-manual.txt:3385
+#: user-manual.txt:3211
 msgid ""
 "<<S_Companion,_Import GPS data from Subsurface web service_>> - Load GPS "
 "coordinates from the _Subsurface_ mobile phone app."
@@ -6804,7 +6563,7 @@ msgstr ""
 "(téléphones et tablettes)."
 
 #. type: Plain text
-#: user-manual.txt:3387
+#: user-manual.txt:3213
 msgid ""
 "<<S_ImportingDivelogsDe,_Import from Divelogs.de_>> - Import dive "
 "information from _www.Divelogs.de_."
@@ -6813,13 +6572,13 @@ msgstr ""
 "informations de plongées à partir de _www.Divelogs.de_."
 
 #. type: Title ===
-#: user-manual.txt:3388
+#: user-manual.txt:3214
 #, no-wrap
 msgid "Log"
 msgstr "Journal (log)"
 
 #. type: Plain text
-#: user-manual.txt:3390
+#: user-manual.txt:3216
 msgid ""
 "<<S_EnterData,_Add Dive_>> - Manually add a new dive to the *Dive List* "
 "panel."
@@ -6828,14 +6587,14 @@ msgstr ""
 "plongée au panneau de la *liste des plongées*."
 
 #. type: Plain text
-#: user-manual.txt:3391
+#: user-manual.txt:3217
 msgid ""
 "_Edit dive_ - Edit a dive of which the profile was entered by hande and not "
 "from a dive computer."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3392
+#: user-manual.txt:3218
 msgid ""
 "<<S_DivePlanner,_Plan Dive_>> - This feature allows the planning of dives."
 msgstr ""
@@ -6843,7 +6602,7 @@ msgstr ""
 "planifier des plongées."
 
 #. type: Plain text
-#: user-manual.txt:3393
+#: user-manual.txt:3219
 msgid ""
 "<<S_Replan,_Edit dive in planner_>> - Edit a dive plan that has been saved "
 "into the *Dive List*."
@@ -6852,7 +6611,7 @@ msgstr ""
 "plongée planifiée qui a été enregistrée dans la *liste des plongées*."
 
 #. type: Plain text
-#: user-manual.txt:3395
+#: user-manual.txt:3221
 msgid ""
 "<<S_CopyComponents,_Copy dive components_>> - By selecting this option, one "
 "can copy information from several fields of a dive log onto the clipboard."
@@ -6862,7 +6621,7 @@ msgstr ""
 "champs d'un journal de plongée vers le presse-papier."
 
 #. type: Plain text
-#: user-manual.txt:3397
+#: user-manual.txt:3223
 msgid ""
 "_Paste dive components_ - Paste, into the selected dives in the *Dive List*, "
 "the information copied using the _Copy dive components_ option."
@@ -6872,7 +6631,7 @@ msgstr ""
 "préalable avec l'option _Copier les composants de la plongée_."
 
 #. type: Plain text
-#: user-manual.txt:3399
+#: user-manual.txt:3225
 msgid ""
 "<<S_Renumber,_Renumber_>> - Renumber the dives listed in the *Dive List* "
 "panel."
@@ -6881,7 +6640,7 @@ msgstr ""
 "le panneau de la *liste des plongées*."
 
 #. type: Plain text
-#: user-manual.txt:3401
+#: user-manual.txt:3227
 msgid ""
 "<<S_Group,_Auto Group_>> - Group the dives in the *Dive List* panel into "
 "dive trips."
@@ -6890,7 +6649,7 @@ msgstr ""
 "*liste des plongées* dans des voyages de plongées."
 
 #. type: Plain text
-#: user-manual.txt:3402
+#: user-manual.txt:3228
 msgid ""
 "<<S_DeviceNames,_Edit Device Names_>> - Edit the names of dive computers to "
 "facilitate your logs."
@@ -6899,7 +6658,7 @@ msgstr ""
 "les noms des ordinateurs de plongée pour faciliter vos journaux (logs)."
 
 #. type: Plain text
-#: user-manual.txt:3403
+#: user-manual.txt:3229
 msgid ""
 "<<S_Filter,_Filter divelist_>> - Select only some dives, based on specific "
 "tags or dive criteria."
@@ -6908,13 +6667,13 @@ msgstr ""
 "certaines plongées, à partir de tags ou de critères de plongées."
 
 #. type: Title ===
-#: user-manual.txt:3404
+#: user-manual.txt:3230
 #, no-wrap
 msgid "View"
 msgstr "Vue"
 
 #. type: Plain text
-#: user-manual.txt:3407
+#: user-manual.txt:3233
 msgid ""
 "<<S_ViewPanels,_All_>> - View the four main _Subsurface_ panels "
 "simmultaneously."
@@ -6923,33 +6682,33 @@ msgstr ""
 "_Subsurface_ simultanément."
 
 #. type: Plain text
-#: user-manual.txt:3408
+#: user-manual.txt:3234
 msgid "<<S_ViewPanels,_Dive List_>> - View only the *Dive List* panel."
 msgstr ""
 "<<S_ViewPanels,_Liste des plongées_>> - Affiche uniquement le panneau de la "
 "*liste des plongées*."
 
 #. type: Plain text
-#: user-manual.txt:3409
+#: user-manual.txt:3235
 msgid "<<S_ViewPanels,_Profile_>> - View only the *Dive Profile* panel."
 msgstr ""
 "<<S_ViewPanels,_Profil_>> - Affiche uniquement le panneau du *profil de la "
 "plongée*."
 
 #. type: Plain text
-#: user-manual.txt:3410
+#: user-manual.txt:3236
 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:3411
+#: user-manual.txt:3237
 msgid "<<S_ViewPanels,_Globe_>> - View only the *World Map* panel."
 msgstr ""
 "<<S_ViewPanels,_Globe_>> - Affiche uniquement le panneau de la *carte "
 "mondiale*."
 
 #. type: Plain text
-#: user-manual.txt:3413
+#: user-manual.txt:3239
 msgid ""
 "_Yearly Statistics_ - Display summary statistics about dives during this and "
 "past years."
@@ -6958,28 +6717,28 @@ msgstr ""
 "plongées effectuées."
 
 #. type: Plain text
-#: user-manual.txt:3414
+#: user-manual.txt:3240
 msgid "_Prev DC_ - Switch to previous dive computer."
 msgstr "_Ordinateur précédent_  - Passer à l'ordinateur de plongée précédent."
 
 #. type: Plain text
-#: user-manual.txt:3415
+#: user-manual.txt:3241
 msgid "_Next DC_ - Switch to next dive computer."
 msgstr "_Ordinateur suivant_  - Passer à l'ordinateur de plongée suivant."
 
 #. type: Plain text
-#: user-manual.txt:3416
+#: user-manual.txt:3242
 msgid "_Full Screen_ - Toggles Full Screen mode."
 msgstr "_Plein écran_  - Passer en mode plein écran."
 
 #. type: Title ===
-#: user-manual.txt:3417
+#: user-manual.txt:3243
 #, no-wrap
 msgid "Help"
 msgstr "Aide"
 
 #. type: Plain text
-#: user-manual.txt:3420
+#: user-manual.txt:3246
 msgid ""
 "_About Subsurface_ - Show a panel with the version number of _Subsurface_ as "
 "well as licensing information."
@@ -6988,7 +6747,7 @@ msgstr ""
 "_Subsurface_ ainsi que les informations de licence."
 
 #. type: Plain text
-#: user-manual.txt:3422
+#: user-manual.txt:3248
 msgid ""
 "_Check for updates_ - Find out whether a newer version of Subsurface is "
 "available on the http://subsurface-divelog.org/[_Subsurface_ web site]."
@@ -6998,7 +6757,7 @@ msgstr ""
 "_Subsurface_ ]."
 
 #. type: Plain text
-#: user-manual.txt:3423
+#: user-manual.txt:3249
 msgid ""
 "<<S_UserSurvey,_User survey_>> - Help to make _Subsurface_ even better by "
 "taking part in our user survey."
@@ -7007,32 +6766,32 @@ msgstr ""
 "meilleur en répondant à notre sondage utilisateur."
 
 #. type: Plain text
-#: user-manual.txt:3424
+#: user-manual.txt:3250
 msgid "_User manual_ - Open a window showing this user manual."
 msgstr ""
 "_Manuel utilisateur_  - Ouvre une fenêtre affichant ce manuel utilisateur."
 
 #. type: Title ==
-#: user-manual.txt:3426
+#: user-manual.txt:3252
 #, no-wrap
 msgid "Mobile Version"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3429
+#: user-manual.txt:3255
 msgid ""
 "_Subsurface_ has a mobile version, which can be used to view the dives "
 "stored in the user's cloud account."
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:3430
+#: user-manual.txt:3256
 #, no-wrap
 msgid "How to use the mobile version"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3434
+#: user-manual.txt:3260
 msgid ""
 "When you first open the mobile app, you will have to log into your cloud "
 "account. To do this, click on the menu icon on the upper right, then click "
@@ -7040,7 +6799,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3438
+#: user-manual.txt:3264
 msgid ""
 "To load dives the first time, click on the menu icon, and then click on "
 "_Load Dives_. This will fetch the dive list from the cloud storage onto your "
@@ -7049,7 +6808,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3441
+#: user-manual.txt:3267
 msgid ""
 "To view dive details, tap on any dive in the dive list. This will open the "
 "dive details window, which shows the dive profile and below it, the dive "
@@ -7057,7 +6816,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3444
+#: user-manual.txt:3270
 msgid ""
 "To save changes made to the dive details, click on the back icon, then from "
 "the menu select _Save Changes_. This will save your changes to the cloud "
@@ -7065,25 +6824,25 @@ msgid ""
 msgstr ""
 
 #. type: Title ==
-#: user-manual.txt:3446
+#: user-manual.txt:3272
 #, no-wrap
 msgid "APPENDIX A: Operating system specific information for importing dive information from a dive computer."
 msgstr "ANNEXE A : informations spécifiques au système d'exploitation utilisé pour importer les informations de plongées depuis un ordinateur de plongée."
 
 #. type: Title ===
-#: user-manual.txt:3448
+#: user-manual.txt:3274
 #, no-wrap
 msgid "Make sure that the OS has the required drivers installed"
 msgstr "Assurez-vous que les pilotes (drivers) nécessaires sont installés"
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:3449
+#: user-manual.txt:3275
 #, no-wrap
 msgid "images/icons/drivers.jpg"
 msgstr "images/icons/drivers.jpg"
 
 #. type: Plain text
-#: user-manual.txt:3454
+#: user-manual.txt:3280
 msgid ""
 "The operating system of the desktop computer needs the appropriate drivers "
 "in order to communicate with the dive computer in whichever way the dive "
@@ -7094,7 +6853,7 @@ msgstr ""
 "l'ordinateur de plongée (Bluetooth, USB, infra-rouge)."
 
 #. type: Plain text
-#: user-manual.txt:3460
+#: user-manual.txt:3286
 msgid ""
 "On Linux users need to have the correct kernel module loaded. Most "
 "distributions will do this automatically, so the user does not need to load "
@@ -7108,7 +6867,7 @@ msgstr ""
 "particulièrement pour certaines technologies telles que l'infra-rouge."
 
 #. type: Plain text
-#: user-manual.txt:3464
+#: user-manual.txt:3290
 msgid ""
 "On Windows, the OS should offer to download the correct driver once the user "
 "connects the dive computer to the USB port and operating system sees the "
@@ -7119,7 +6878,7 @@ msgstr ""
 "port USB de son ordinateur de bureau."
 
 #. type: Plain text
-#: user-manual.txt:3471
+#: user-manual.txt:3297
 msgid ""
 "On a Mac users sometimes have to manually hunt for the correct driver. For "
 "example the correct driver for the Mares Puck devices or any other dive "
@@ -7137,19 +6896,19 @@ msgstr ""
 "documents et logiciels Silicon Labs]."
 
 #. type: Title ===
-#: user-manual.txt:3473
+#: user-manual.txt:3299
 #, no-wrap
 msgid "How to Find the Device Name for USB devices and set its write permission"
 msgstr "Comment trouver le nom du périphérique branché sur USB et paramétrer les permissions en écriture"
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:3474
+#: user-manual.txt:3300
 #, no-wrap
 msgid "images/icons/usb.jpg"
 msgstr "images/icons/usb.jpg"
 
 #. type: Plain text
-#: user-manual.txt:3482
+#: user-manual.txt:3308
 msgid ""
 "When a user connects the dive computer by using a USB connector, usually "
 "_Subsurface_ will either propose a drop down list that contains the correct "
@@ -7166,13 +6925,13 @@ msgstr ""
 "nom de votre périphérique ;"
 
 #. type: Title ====
-#: user-manual.txt:3483 user-manual.txt:3566
+#: user-manual.txt:3309 user-manual.txt:3392
 #, no-wrap
 msgid "On Windows:"
 msgstr "Sur Windows :"
 
 #. type: Plain text
-#: user-manual.txt:3487
+#: user-manual.txt:3313
 msgid ""
 "Simply try COM1, COM2, etc. The drop down list should contain all connected "
 "COM devices."
@@ -7181,56 +6940,56 @@ msgstr ""
 "tous les périphériques COM connectés."
 
 #. type: Title ====
-#: user-manual.txt:3488 user-manual.txt:3581
+#: user-manual.txt:3314 user-manual.txt:3407
 #, no-wrap
 msgid "On MacOS:"
 msgstr "Sur MacOS :"
 
 #. type: Plain text
-#: user-manual.txt:3491
+#: user-manual.txt:3317
 msgid "The drop down box should find all connected dive computers."
 msgstr ""
 "La liste déroulante devrait contenir tous les ordinateurs de plongée "
 "connectés."
 
 #. type: Block title
-#: user-manual.txt:3492
+#: user-manual.txt:3318
 #, no-wrap
 msgid "On Linux:"
 msgstr "Sur Linux :"
 
 #. type: Plain text
-#: user-manual.txt:3495
+#: user-manual.txt:3321
 msgid "There is a definitive way to find the port:"
 msgstr "Il existe un moyen sûr de trouver le port :"
 
 #. type: Plain text
-#: user-manual.txt:3497
+#: user-manual.txt:3323
 msgid "Disconnect the USB cable from the dive computer"
 msgstr "Déconnecter le cable USB de l'ordinateur de plongée"
 
 #. type: Plain text
-#: user-manual.txt:3498
+#: user-manual.txt:3324
 msgid "Open a terminal"
 msgstr "Ouvrir un terminal"
 
 #. type: Plain text
-#: user-manual.txt:3499 user-manual.txt:3501
+#: user-manual.txt:3325 user-manual.txt:3327
 msgid "Type the command: 'dmesg' and press enter"
 msgstr "Taper la commande 'dmesg' et appuyer sur la touche Entrer"
 
 #. type: Plain text
-#: user-manual.txt:3500
+#: user-manual.txt:3326
 msgid "Plug in the USB cable of the dive computer"
 msgstr "Connecter le cable USB de l'ordinateur de plongée"
 
 #. type: Plain text
-#: user-manual.txt:3503
+#: user-manual.txt:3329
 msgid "A message similar to this one should appear:"
 msgstr "Un message similaire à celui-ci devrait apparaitre :"
 
 #. type: Plain text
-#: user-manual.txt:3519
+#: user-manual.txt:3345
 #, no-wrap
 msgid ""
 "\tusb 2-1.1: new full speed USB device number 14 using ehci_hcd\n"
@@ -7266,7 +7025,7 @@ msgstr ""
 "\tftdi_sio: v1.6.0:USB FTDI Serial Converters Driver\n"
 
 #. type: Plain text
-#: user-manual.txt:3524
+#: user-manual.txt:3350
 msgid ""
 "The third line from the bottom shows that the FTDI USB adapter is detected "
 "and connected to +ttyUSB3+. This information can now be used in the import "
@@ -7278,14 +7037,14 @@ msgstr ""
 "que Subsurface utilise le bon port USB."
 
 #. type: Plain text
-#: user-manual.txt:3526
+#: user-manual.txt:3352
 msgid "Ensuring that the user has write permission to the USB serial port:"
 msgstr ""
 "S'assurer que l'utilisateur possède les droits d'écriture sur le port série "
 "USB :"
 
 #. type: Plain text
-#: user-manual.txt:3532
+#: user-manual.txt:3358
 msgid ""
 "On Unix-like operating systems the USB ports can only be accessed by users "
 "who are members of the +dialout+ group. If one is not root, one may not be a "
@@ -7298,7 +7057,7 @@ msgstr ""
 "utiliser le port USB. Si votre nom d'utilisateur est 'johnB' :"
 
 #. type: Plain text
-#: user-manual.txt:3536
+#: user-manual.txt:3362
 msgid ""
 "As root, type: +usermod -a -G dialout johnB+ (Ubuntu users: +sudo usermod -a "
 "-G dialout johnB+)  This makes johnB a member of the +dialout+ group."
@@ -7308,7 +7067,7 @@ msgstr ""
 "+dialout+."
 
 #. type: Plain text
-#: user-manual.txt:3541
+#: user-manual.txt:3367
 #, no-wrap
 msgid ""
 "Type: +id johnB+     This lists all the groups that johnB belongs to and\n"
@@ -7324,7 +7083,7 @@ msgstr ""
 "parmi les différents IDs.\n"
 
 #. type: Plain text
-#: user-manual.txt:3543
+#: user-manual.txt:3369
 #, no-wrap
 msgid ""
 "Under some circumstances this change takes only effect (eg. on Ubuntu) after\n"
@@ -7332,7 +7091,7 @@ msgid ""
 msgstr "Sous certaines circonstances, les modifications ne prennent effet qu'après une déconnexionpuis reconnexion sur l'ordinateur (sous Ubuntu, par exemple)."
 
 #. type: Plain text
-#: user-manual.txt:3548
+#: user-manual.txt:3374
 msgid ""
 "With the appropriate device name (e.g. +dev/ttyUSB3+) and with write "
 "permission to the USB port, the dive computer interface can connect and one "
@@ -7343,19 +7102,19 @@ msgstr ""
 "vous devriez pouvoir importer vos plongées."
 
 #. type: Title ===
-#: user-manual.txt:3550
+#: user-manual.txt:3376
 #, no-wrap
 msgid "Setting up bluetooth enabled devices"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:3551
+#: user-manual.txt:3377
 #, no-wrap
 msgid "images/icons/bluetooth.jpg"
 msgstr "images/icons/bluetooth.jpg"
 
 #. type: Plain text
-#: user-manual.txt:3557
+#: user-manual.txt:3383
 msgid ""
 "For dive computers communicating through bluetooth like the Heinrichs "
 "Weikamp Frog or the Shearwater Predator and Petrel there is a different "
@@ -7364,13 +7123,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3559
+#: user-manual.txt:3385
 #, no-wrap
 msgid "*For the dive computer, after enabling Bluetooth, ensure it is in Upload mode.*\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3563
+#: user-manual.txt:3389
 msgid ""
 "For Bluetooth pairing of the dive computer, refer to the manufacturer's user "
 "guide. When using a Shearwater Predator/Petrel, select _Dive Log -> Upload "
@@ -7378,13 +7137,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3565
+#: user-manual.txt:3391
 #, no-wrap
 msgid "*Pair the _Subsurface_ computer with the dive computer.*\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3574
+#: user-manual.txt:3400
 msgid ""
 "Bluetooth is most likely already enabled. For pairing with the dive computer "
 "choose _Control Panel -> Bluetooth Devices -> Add Wireless Device_.  This "
@@ -7396,21 +7155,21 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3577
+#: user-manual.txt:3403
 msgid ""
 "For downloading to _Subsurface_, the _Subsurface_ drop-down list should "
 "contain this COM port already. If not, enter it manually."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3580
+#: user-manual.txt:3406
 msgid ""
 "Note: If there are issues afterwards when downloading from the dive computer "
 "using other software, remove the existing pairing with the dive computer."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3587
+#: user-manual.txt:3413
 msgid ""
 "Click on the Bluetooth symbol in the menu bar and select _Set up Bluetooth "
 "Device..._. The dive computer should then show up in the list of devices. "
@@ -7419,20 +7178,20 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3590
+#: user-manual.txt:3416
 msgid ""
 "Once the pairing is completed the correct device is shown in the 'Device or "
 "Mount Point' drop-down in the _Subsurface_ *Import* dialog."
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:3591
+#: user-manual.txt:3417
 #, no-wrap
 msgid "On Linux"
 msgstr "Sur Linux"
 
 #. type: Plain text
-#: user-manual.txt:3599
+#: user-manual.txt:3425
 msgid ""
 "Ensure Bluetooth is enabled on the _Subsurface_ computer.  On most common "
 "distributions this should be true out of the box and pairing should be "
@@ -7445,7 +7204,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3603
+#: user-manual.txt:3429
 msgid ""
 "Setting up a connection to download dives from your Bluetooth-enabled "
 "device, such as the _Shearwater Petrel_, is not yet an automated process and "
@@ -7454,22 +7213,22 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3605
+#: user-manual.txt:3431
 msgid "Enable the Bluetooth controller and pair your dive computer</li>"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3606
+#: user-manual.txt:3432
 msgid "Establish an RFCOMM connection"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3607
+#: user-manual.txt:3433
 msgid "Download the dives with Subsurface"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3613
+#: user-manual.txt:3439
 msgid ""
 "Ensure the dive computer is in upload mode. On the _Shearwater Petrel_ and "
 "_Petrel 2_, cycle through the menu, select 'Dive Log', then 'Upload Log'.  "
@@ -7480,7 +7239,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3618
+#: user-manual.txt:3444
 msgid ""
 "To establish the connection, establish root access through +sudo+ or +su+.  "
 "The correct permission is required to download the dives in the computer. On "
@@ -7490,23 +7249,23 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3620
+#: user-manual.txt:3446
 msgid "+sudo usermod -a -G dialout username+"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3622
+#: user-manual.txt:3448
 msgid "Then log out and log in for the change to take effect."
 msgstr ""
 
 #. type: Title =====
-#: user-manual.txt:3623
+#: user-manual.txt:3449
 #, no-wrap
 msgid "Enabling the Bluetooth controller and pairing your dive computer"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3629
+#: user-manual.txt:3455
 msgid ""
 "Attempt to set up the Bluetooth controller and pair your dive computer using "
 "the graphical environment of the operating system. After setting the dive "
@@ -7517,14 +7276,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3632
+#: user-manual.txt:3458
 msgid ""
 "If the graphical method didn't work, pair the device from the command line. "
 "Open a terminal and use +hciconfig+ to check the Bluetooth controller status"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3639
+#: user-manual.txt:3465
 #, no-wrap
 msgid ""
 "\t$ hciconfig\n"
@@ -7536,7 +7295,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3644
+#: user-manual.txt:3470
 msgid ""
 "This indicates a Bluetooth controller with MAC address 01:23:45:67:89:AB, "
 "connected as hci0.  Its status is 'DOWN', i.e. not powered.  Additional "
@@ -7546,7 +7305,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3652
+#: user-manual.txt:3478
 #, no-wrap
 msgid ""
 "\tsudo hciconfig hci0 up auth+  (enter password when prompted)\n"
@@ -7559,25 +7318,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3654
+#: user-manual.txt:3480
 msgid "+Check that the status now includes +'UP', 'RUNNING' AND 'AUTH'+."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3656
+#: user-manual.txt:3482
 msgid ""
 "If there are multiple controllers running, it's easiest to off the unused "
 "controller(s). For example, for +hci1+:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3658
+#: user-manual.txt:3484
 #, no-wrap
 msgid "\tsudo hciconfig hci1 down\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3661
+#: user-manual.txt:3487
 msgid ""
 "Next step is to 'trust' and 'pair' the dive computer. On distros with Bluez "
 "5, such as Fedora 22, one can use a tool called +blutootctl+, which will "
@@ -7585,7 +7344,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3682
+#: user-manual.txt:3508
 #, no-wrap
 msgid ""
 "\tbluetoothctl\n"
@@ -7611,14 +7370,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3685
+#: user-manual.txt:3511
 msgid ""
 "If asked for a password, enter 0000. It's ok if the last line says "
 "'Connected: no'. The important part is the line above, +Pairing successful+."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3688
+#: user-manual.txt:3514
 msgid ""
 "If the system has Bluez version 4 (e.g. Ubuntu 12.04 through to 15.04), "
 "there is probably not a +bluetoothctl+, but a script called +bluez-simple-"
@@ -7626,7 +7385,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3693
+#: user-manual.txt:3519
 #, no-wrap
 msgid ""
 "\thcitool -i hci0 scanning\n"
@@ -7636,89 +7395,89 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3695
+#: user-manual.txt:3521
 msgid "Once ther dive computer is pired, set up the RFCOMM connection"
 msgstr ""
 
 #. type: Title =====
-#: user-manual.txt:3696
+#: user-manual.txt:3522
 #, no-wrap
 msgid "Establishing the RFCOMM connection"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3699
+#: user-manual.txt:3525
 msgid "The command to establish an RFCOMM connection is:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3701
+#: user-manual.txt:3527
 msgid "+sudo rfcomm -i <controller> connect <dev> <bdaddr> [channel]+"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3703
+#: user-manual.txt:3529
 msgid "<controller>+ is the Bluetooth controller, +hci0+."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3704
+#: user-manual.txt:3530
 msgid "<dev> is the RFCOMM device file, +rfcomm0+"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3705
+#: user-manual.txt:3531
 msgid "<bdaddr> is the dive computer's MAC address, +00:11:22:33:44:55+"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3706
+#: user-manual.txt:3532
 msgid ""
 "[channel] is the dive computer's Bluetooth channel we need to connect to."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3709
+#: user-manual.txt:3535
 msgid ""
 "If one omits it, channel 1 is assumed.  Based on a limited number of user "
 "reports, the appropriate channel for the dive computer is probably:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3711
+#: user-manual.txt:3537
 msgid "_Shearwater Petrel 2_: channel 5"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3712
+#: user-manual.txt:3538
 msgid "_Shearwater Petrel 1_: channel 1"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3713
+#: user-manual.txt:3539
 msgid "_Heinrichs-Weikamp OSTC Sport_: channel 1"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3715
+#: user-manual.txt:3541
 msgid ""
 "E.g. to connect a _Shearwater Petrel 2_, set the dive computer to upload "
 "mode and enter:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3717
+#: user-manual.txt:3543
 #, no-wrap
 msgid "\tsudo rfcomm -i hci0 connect rfcomm0 00:11:22:33:44:55 5 (enter a password, probably 0000, when prompted)\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3719
+#: user-manual.txt:3545
 msgid "This gives the response:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3722
+#: user-manual.txt:3548
 #, no-wrap
 msgid ""
 "\tConnected /dev/rfcomm0 to 00:11:22:33:44:55 on channel 5\n"
@@ -7726,14 +7485,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3724
+#: user-manual.txt:3550
 msgid ""
 "To connect a _Shearwater Petrel 1+ or + HW OSTC Sport+, set the dive "
 "computer to upload mode and enter:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3728
+#: user-manual.txt:3554
 #, no-wrap
 msgid ""
 "\tsudo rfcomm -i hci0 connect rfcomm0 00:11:22:33:44:55   (enter a password, probably 0000, when prompted)\n"
@@ -7742,7 +7501,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3732
+#: user-manual.txt:3558
 msgid ""
 "If the specific channel the dive computer needs is not known, or the channel "
 "in the list above doesn't work, the command +sdptool records+ should help "
@@ -7751,7 +7510,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3742
+#: user-manual.txt:3568
 #, no-wrap
 msgid ""
 "\tsdptool -i hci0 records 00:11:22:33:44:55\n"
@@ -7766,7 +7525,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3745
+#: user-manual.txt:3571
 msgid ""
 "For a Bluetooth dive computer not in the list above, or if the channel "
 "listed is not correct, please let the Subsurface developers know on the user "
@@ -7774,13 +7533,13 @@ msgid ""
 msgstr ""
 
 #. type: Title =====
-#: user-manual.txt:3746
+#: user-manual.txt:3572
 #, no-wrap
 msgid "Download the dives with Subsurface</em>"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3748
+#: user-manual.txt:3574
 msgid ""
 "After establishing the RFCOMM connection and while the dive computer's "
 "upload mode countdown is still running, go to_Subsurface_, select _Import-"
@@ -7790,25 +7549,25 @@ msgid ""
 msgstr ""
 
 #. type: Title ==
-#: user-manual.txt:3751
+#: user-manual.txt:3577
 #, no-wrap
 msgid "APPENDIX B: Dive Computer specific information for importing dive data."
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:3754
+#: user-manual.txt:3580
 #, no-wrap
 msgid "Importing from Uemis Zurich"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:3756
+#: user-manual.txt:3582
 #, no-wrap
 msgid "images/icons/iumis.jpg"
 msgstr "images/icons/iumis.jpg"
 
 #. type: Plain text
-#: user-manual.txt:3772
+#: user-manual.txt:3598
 msgid ""
 "_Subsurface_ downloads the information stored on the SDA (the built-in file "
 "system of the Uemis) including information about dive spots and equipment. "
@@ -7824,7 +7583,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3787
+#: user-manual.txt:3613
 msgid ""
 "After selecting the above device name, download the dives from the Uemis "
 "Zurich. One technical issue with the Uemis Zurich download implementation "
@@ -7841,19 +7600,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:3789
+#: user-manual.txt:3615
 #, no-wrap
 msgid "Importing from Uwatec Galileo"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:3791
+#: user-manual.txt:3617
 #, no-wrap
 msgid "images/icons/Galileo.jpg"
 msgstr "images/icons/Galileo.jpg"
 
 #. type: Plain text
-#: user-manual.txt:3806
+#: user-manual.txt:3632
 msgid ""
 "The Uwatec Galileo dive computers use infra red (IrDA) communication between "
 "the dive computer and Subsurface. The Uwatec hardware uses a USB dongle "
@@ -7869,14 +7628,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3809
+#: user-manual.txt:3635
 msgid ""
 "After executing this command, Subsurface will recognise the Galileo dive "
 "computer and download dive information."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3815
+#: user-manual.txt:3641
 msgid ""
 "Under Windows, a similar situation exists. Drivers for the MCS7780 are "
 "available from some Internet web sites e.g.  http://www.drivers-download.com/"
@@ -7886,26 +7645,26 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3818
+#: user-manual.txt:3644
 msgid ""
 "For the Apple Mac, IrDA communication via the MCS7780 link is not available "
 "for OSX 10.6 or higher."
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:3820
+#: user-manual.txt:3646
 #, no-wrap
 msgid "Importing from Heinrichs Weikamp DR5"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:3822
+#: user-manual.txt:3648
 #, no-wrap
 msgid "images/icons/HW_DR5.jpg"
 msgstr "images/icons/HW_DR5.jpg"
 
 #. type: Plain text
-#: user-manual.txt:3832
+#: user-manual.txt:3658
 msgid ""
 "When mounted as a USB drive the Heinrichs Weikamp DR5 saves a single UDDF "
 "file for every dive.  Mark all the dives you'd like to import or open.  "
@@ -7918,19 +7677,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:3835
+#: user-manual.txt:3661
 #, no-wrap
 msgid "Importing from xDEEP BLACK"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:3837
+#: user-manual.txt:3663
 #, no-wrap
 msgid "images/icons/HW_xdeepblack.jpg"
 msgstr "images/icons/HW_xdeepblack.jpg"
 
 #. type: Plain text
-#: user-manual.txt:3846
+#: user-manual.txt:3672
 msgid ""
 "Each dive has to be individually saved as UDDF file using \"Export UDDF\" "
 "option in BLACK's logbook menu.  When mounted as a USB drive UDDF files are "
@@ -7944,19 +7703,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:3848
+#: user-manual.txt:3674
 #, no-wrap
 msgid "Importing from Shearwater Predator using Bluetooth"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:3850
+#: user-manual.txt:3676
 #, no-wrap
 msgid "images/icons/predator.jpg"
 msgstr "images/icons/predator.jpg"
 
 #. type: Plain text
-#: user-manual.txt:3858
+#: user-manual.txt:3684
 msgid ""
 "Using a Shearwater Predator one may be able to pair Bluetooth but then "
 "encounter issues when downloading, showing errors like _Slip RX: unexp. SLIP "
@@ -7967,36 +7726,36 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3861
+#: user-manual.txt:3687
 msgid ""
 "use the Bluetooth dongle which came with the Shearwater Predator instead of "
 "the built-in one of the _Subsurface_ computer"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3862
+#: user-manual.txt:3688
 msgid "switch to different Bluetooth drivers for the same hardware"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3863
+#: user-manual.txt:3689
 msgid "switch off WiFi while using Bluetooth"
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:3865
+#: user-manual.txt:3691
 #, no-wrap
 msgid "Importing from Poseidon MkVI Discovery"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:3867
+#: user-manual.txt:3693
 #, no-wrap
 msgid "images/MkVI.jpeg"
 msgstr "images/MkVI.jpeg"
 
 #. type: Plain text
-#: user-manual.txt:3875
+#: user-manual.txt:3701
 msgid ""
 "Download of dive logs from the MkVI is performed using a custom "
 "communications adapter and the _Poseidon PC Configuration Software_, "
@@ -8008,45 +7767,45 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3878
+#: user-manual.txt:3704
 msgid ""
 "Setup configuration for the dive and key dive parameters (file with a .txt "
 "extension)"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3879
+#: user-manual.txt:3705
 msgid "Dive log details (file with a .csv extension)"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3881
+#: user-manual.txt:3707
 msgid ""
 "Redbook format dive log (file with .cvsr extension). This is a compressed "
 "version of the dive log using a proprietary format."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3883
+#: user-manual.txt:3709
 msgid ""
 "_Subsurface_ accesses the .txt and the .csv files to obtain dive log "
 "information."
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:3885
+#: user-manual.txt:3711
 #, no-wrap
 msgid "Importing from APD Inspiration/Evolution CCR"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:3887
+#: user-manual.txt:3713
 #, no-wrap
 msgid "images/APDComputer.jpg"
 msgstr "images/APDComputer.jpg"
 
 #. type: Plain text
-#: user-manual.txt:3895
+#: user-manual.txt:3721
 msgid ""
 "The dive logs of an APD Inspiration or similar CCR dive computer are "
 "downloaded using a communications adapter and _AP Communicator_, obtained "
@@ -8058,55 +7817,55 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3897
+#: user-manual.txt:3723
 msgid "Download the dive using _AP Communicator_."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3898
+#: user-manual.txt:3724
 msgid "Open a dive within the _AP Log Viewer_."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3899
+#: user-manual.txt:3725
 msgid "Select the tab at the top of the screen, entitled \"_Data_\"."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3900
+#: user-manual.txt:3726
 msgid ""
 "With the raw dive log data show on the screen, click on \"_Copy to Clipboard_"
 "\"."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3901
+#: user-manual.txt:3727
 msgid "Open a text editor, e.g. Notepad (Windows) or TextWrangler (Mac)."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3903
+#: user-manual.txt:3729
 msgid ""
 "Copy the contents of the clipboard into the text editor and save the text "
 "file with a filename extension of _.apd_"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3904
+#: user-manual.txt:3730
 msgid ""
 "Within _Subsurface_, select _Import -> Import log files_ to open the xref:"
 "Unified_import[universal import dialogue]."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3905
+#: user-manual.txt:3731
 msgid ""
 "In the dropdown list towards the bottom right of the dialogue (labled "
 "'Filter:'), select \"APD log viewer\"."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3908
+#: user-manual.txt:3734
 msgid ""
 "On the list of file names select the _.apd_ file that has been created "
 "above. An import dialogue opens indicating the default settings for the data "
@@ -8115,13 +7874,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:3909
+#: user-manual.txt:3735
 #, no-wrap
 msgid "images/APD_CSVimportF22.jpg"
 msgstr "images/APD_CSVimportF22.jpg"
 
 #. type: Plain text
-#: user-manual.txt:3917
+#: user-manual.txt:3743
 msgid ""
 "The top left hand dropdown box in the import panel allows one to select the "
 "APD dive computer for which the dive log needs to be imported. The default "
@@ -8133,12 +7892,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3918
+#: user-manual.txt:3744
 msgid "Click the _Ok_ button at the bottom of the import panel."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3923
+#: user-manual.txt:3749
 msgid ""
 "The APD dive log will appear within _Subsurface_. The dive computer-"
 "generated ceiling generated by the Inspiration can be viewed by selecting "
@@ -8148,13 +7907,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ==
-#: user-manual.txt:3924
+#: user-manual.txt:3750
 #, no-wrap
 msgid "APPENDIX C: Exporting Dive log information from external dive log software."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3933
+#: user-manual.txt:3759
 msgid ""
 "The import of dive log data from external dive log software is mostly "
 "performed using the dialogue found by selecting _Import_ from the Main Menu, "
@@ -8164,22 +7923,22 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3935
+#: user-manual.txt:3761
 msgid "Export the foreign dive log data to format that is accessible from"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3936
+#: user-manual.txt:3762
 msgid "_Subsurface_."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3937
+#: user-manual.txt:3763
 msgid "Import the accessible dive log data into _Subsurface_."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3941
+#: user-manual.txt:3767
 msgid ""
 "This appendix provides some information about approaches to export dive log "
 "data from foreign dive log software. The procedures below mostly apply to "
@@ -8187,19 +7946,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:3943
+#: user-manual.txt:3769
 #, no-wrap
 msgid "Exporting from *Suunto Divemanager (DM3, DM4 or DM5)*"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:3944
+#: user-manual.txt:3770
 #, no-wrap
 msgid "images/icons/suuntologo.jpg"
 msgstr "images/icons/suuntologo.jpg"
 
 #. type: Plain text
-#: user-manual.txt:3951
+#: user-manual.txt:3777
 msgid ""
 "DiveManager is a MS Windows application for Suunto dive computers.  "
 "Divemanager 3 (DM3) is an older version of the Suunto software. More recent "
@@ -8209,66 +7968,66 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3953
+#: user-manual.txt:3779
 #, no-wrap
 msgid "*Divemanager 3 (DM3):*\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3955
+#: user-manual.txt:3781
 msgid ""
 "Start 'Suunto Divemanager 3' and log in with the name containing the logs"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3956
+#: user-manual.txt:3782
 msgid "Do not start the import wizard to import dives from the dive computer."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3958
+#: user-manual.txt:3784
 msgid ""
 "In the navigation tree on the left side of the program-window, select the "
 "appropriate dives."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3959
+#: user-manual.txt:3785
 msgid ""
 "Within the list of dives, select the dives you would like to import later:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3960
+#: user-manual.txt:3786
 msgid "To select certain dives: hold 'ctrl' and click the dive"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3962
+#: user-manual.txt:3788
 msgid ""
 "To select all dives: Select the first dive, hold down shift and select the "
 "last dive"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3963
+#: user-manual.txt:3789
 msgid "With the dives marked, use the program menu _File -> Export_"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3964
+#: user-manual.txt:3790
 msgid ""
 "The export pop-up will show. Within this pop-up, there is one field called "
 "'Export Path'."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3965
+#: user-manual.txt:3791
 msgid "Click the browse button next to the field Export Path"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3967
+#: user-manual.txt:3793
 #, no-wrap
 msgid ""
 "** A file-manager like window pops up\n"
@@ -8276,13 +8035,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3968
+#: user-manual.txt:3794
 #, no-wrap
 msgid "Divelog.SDE file\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3970
+#: user-manual.txt:3796
 #, no-wrap
 msgid ""
 "** Optionally change the name of the file for saving\n"
@@ -8290,25 +8049,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3971
+#: user-manual.txt:3797
 #, no-wrap
 msgid "Back in the Export pop-up, press the button 'Export'\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3972
+#: user-manual.txt:3798
 #, no-wrap
 msgid "The dives are now exported to the file Divelog.SDE.\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3974
+#: user-manual.txt:3800
 #, no-wrap
 msgid "*Divemanager 4 (DM4) and Divemanager 5 (DM5):*\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3979
+#: user-manual.txt:3805
 msgid ""
 "DM4 and DM5 use identical mechanisms for exporting dive logs.  To export a "
 "divelog from Divemanager one needs to locate the DM4/DM5 database where the "
@@ -8317,81 +8076,81 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3981
+#: user-manual.txt:3807
 msgid "Locating the Suunto DM4 (or DM5) database:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3983 user-manual.txt:3992
+#: user-manual.txt:3809 user-manual.txt:3818
 msgid "Start Suunto DM4/DM5"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3984
+#: user-manual.txt:3810
 msgid "Select 'Help -> About'"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3985
+#: user-manual.txt:3811
 msgid "Click 'Copy' after text 'Copy log folder path to clipboard'"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3986
+#: user-manual.txt:3812
 msgid "Now open Windows Explorer"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3987
+#: user-manual.txt:3813
 msgid "Paste the address to the path box at the top of the File Explorer"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3988
+#: user-manual.txt:3814
 msgid "The database is called DM4.db or DM5.db"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3990
+#: user-manual.txt:3816
 msgid "Making a backup copy of the Suunto DM4/DM5 database:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3993
+#: user-manual.txt:3819
 msgid "Select 'File - Create backup'"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3995
+#: user-manual.txt:3821
 msgid ""
 "From the file menu select the location and name for the backup, we'll use "
 "DM4 (or DM5) in here with the default extension .bak"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3996
+#: user-manual.txt:3822
 msgid "Click 'Save'"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3997
+#: user-manual.txt:3823
 msgid "The dives are now exported to the file DM4.bak (or DM5.bak)"
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:3999
+#: user-manual.txt:3825
 #, no-wrap
 msgid "Exporting from Atomic Logbook"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:4002
+#: user-manual.txt:3828
 #, no-wrap
 msgid "images/icons/atomiclogo.jpg"
 msgstr "images/icons/atomiclogo.jpg"
 
 #. type: Plain text
-#: user-manual.txt:4009
+#: user-manual.txt:3835
 msgid ""
 "Atomic Logbook is a Windows software by Atomic Aquatics. It allows "
 "downloading of dive information from Cobalt and Cobalt 2 dive computers.  "
@@ -8401,19 +8160,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:4011
+#: user-manual.txt:3837
 #, no-wrap
 msgid "Exporting from Mares Dive Organiser V2.1"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:4014
+#: user-manual.txt:3840
 #, no-wrap
 msgid "images/icons/mareslogo.jpg"
 msgstr "images/icons/mareslogo.jpg"
 
 #. type: Plain text
-#: user-manual.txt:4022
+#: user-manual.txt:3848
 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 "
@@ -8424,7 +8183,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4027
+#: user-manual.txt:3853
 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 "
@@ -8432,36 +8191,36 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4030
+#: user-manual.txt:3856
 msgid ""
 "Rename the file to DiveOrganiserxxxxx.zip. Inside the zipped directory is a "
 "file _DiveOrganiser.sdf_."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4031
+#: user-manual.txt:3857
 msgid "Extract the _.sdf_ file from the zipped folder to your Desktop."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4032
+#: user-manual.txt:3858
 msgid "The password for accessing the .zip file is _mares_."
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:4034
+#: user-manual.txt:3860
 #, no-wrap
 msgid "Exporting from *DivingLog 5.0 and 6.0*"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:4036
+#: user-manual.txt:3862
 #, no-wrap
 msgid "images/icons/divingloglogo.jpg"
 msgstr "images/icons/divingloglogo.jpg"
 
 #. type: Plain text
-#: user-manual.txt:4043
+#: user-manual.txt:3869
 msgid ""
 "The best way to bring your logs from DivingLog to Subsurface is to convert "
 "the whole database. This is because other export formats do not include all "
@@ -8471,37 +8230,37 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4045
+#: user-manual.txt:3871
 msgid "To transfer all files from DivingLog to Subsurface, do the following:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4047
+#: user-manual.txt:3873
 msgid "In DivingLog open the 'File -> Export -> SQLite' menu"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4048
+#: user-manual.txt:3874
 msgid "Select 'Settings' button"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4049
+#: user-manual.txt:3875
 msgid "Set the 'RTF2Plaintext' to 'true'"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4050
+#: user-manual.txt:3876
 msgid "Close the Settings dialog"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4051
+#: user-manual.txt:3877
 msgid "Click 'Export' button and select the filename"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4055
+#: user-manual.txt:3881
 msgid ""
 "Once this is done, open the saved database file with Subsurface and the "
 "dives are automatically converted to our own format. Last step to do is save "
@@ -8509,13 +8268,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ==
-#: user-manual.txt:4056
+#: user-manual.txt:3882
 #, no-wrap
 msgid "APPENDIX D: Exporting a spreadsheet to CSV format"
 msgstr "ANNEXE D : Exporter un tableur vers le format CSV"
 
 #. type: Plain text
-#: user-manual.txt:4066
+#: user-manual.txt:3892
 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 "
@@ -8536,7 +8295,7 @@ msgstr ""
 "selon le tableur utilisé."
 
 #. type: Plain text
-#: user-manual.txt:4072
+#: user-manual.txt:3898
 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 "
@@ -8554,19 +8313,19 @@ msgstr ""
 "règles simples :"
 
 #. type: Plain text
-#: user-manual.txt:4074
+#: user-manual.txt:3900
 msgid ""
 "Date: use one of the following formats: yyyy-mm-dd, dd.mm.yyyy, mm/dd/yyyy"
 msgstr ""
 "Date : utiliser un des formats suivants : aaaa-mm-jj, jj.mm.aaaa, mm/jj/aaaa"
 
 #. type: Plain text
-#: user-manual.txt:4075
+#: user-manual.txt:3901
 msgid "Duration: the format should be minutes:seconds."
 msgstr "Durée : le format est minutes:secondes."
 
 #. type: Plain text
-#: user-manual.txt:4076
+#: user-manual.txt:3902
 msgid ""
 "Unit system: only one unit system should be used (i.e., no mixture between "
 "imperial and metric units)"
@@ -8575,26 +8334,26 @@ msgstr ""
 "entre les unités impériales et métriques)"
 
 #. type: Plain text
-#: user-manual.txt:4077
+#: user-manual.txt:3903
 msgid "Tags and buddies: values should be separated using a comma."
 msgstr ""
 "Étiquettes et équipiers : les valeurs doivent être séparées par des virgules."
 
 #. type: Plain text
-#: user-manual.txt:4078
+#: user-manual.txt:3904
 msgid "GPS position: users must use decimal degrees, e.g. 30.22496 30.821798"
 msgstr ""
 "Position GPS : vous devez utiliser les degrés décimaux, par exemple : "
 "30.22496 30.821798"
 
 #. type: Title ===
-#: user-manual.txt:4079
+#: user-manual.txt:3905
 #, no-wrap
 msgid "_LibreOffice Calc_ and _OpenOffice Calc_"
 msgstr "_LibreOffice Calc_ et _OpenOffice Calc_"
 
 #. type: Plain text
-#: user-manual.txt:4083
+#: user-manual.txt:3909
 msgid ""
 "These are open source spreadsheet applications forming parts of larger open "
 "source office suite applications. The user interaction with _LibreOffice_ "
@@ -8605,13 +8364,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:4084
+#: user-manual.txt:3910
 #, no-wrap
 msgid "images/LOffice_spreadsheetdata.jpg"
 msgstr "images/LOffice_spreadsheetdata.jpg"
 
 #. type: Plain text
-#: user-manual.txt:4087
+#: user-manual.txt:3913
 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 "
@@ -8619,13 +8378,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:4088
+#: user-manual.txt:3914
 #, no-wrap
 msgid "images/LOffice_save_as_options.jpg"
 msgstr "images/LOffice_save_as_options.jpg"
 
 #. type: Plain text
-#: user-manual.txt:4091
+#: user-manual.txt:3917
 msgid ""
 "After selecting _Save_, select the appropriate field delimiter (choose _Tab_ "
 "to prevent conflicts with the comma when using this as a decimal point), "
@@ -8633,13 +8392,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:4092
+#: user-manual.txt:3918
 #, no-wrap
 msgid "images/LOffice_field_options.jpg"
 msgstr "images/LOffice_field_options.jpg"
 
 #. type: Plain text
-#: user-manual.txt:4095
+#: user-manual.txt:3921
 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:"
@@ -8647,13 +8406,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:4096
+#: user-manual.txt:3922
 #, no-wrap
 msgid "Microsoft _Excel_"
 msgstr "Microsoft _Excel_"
 
 #. type: Plain text
-#: user-manual.txt:4102
+#: user-manual.txt:3928
 msgid ""
 "The field delimiter (called \"_list separator_\" in Microsoft manuals) is "
 "not accessible from within _Excel_ and needs to be set through the "
@@ -8664,19 +8423,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4104
+#: user-manual.txt:3930
 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:4105
+#: user-manual.txt:3931
 msgid "Open the _Regional and Language Options_ dialog box."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4108
+#: user-manual.txt:3934
 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 "
@@ -8684,48 +8443,48 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4109
+#: user-manual.txt:3935
 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:4110
+#: user-manual.txt:3936
 msgid "Click _OK_ twice."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4112
+#: user-manual.txt:3938
 msgid "Below is an image of the _Control Panel_:"
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:4113
+#: user-manual.txt:3939
 #, no-wrap
 msgid "images/Win_SaveCSV2.jpg"
 msgstr "images/Win_SaveCSV2.jpg"
 
 #. type: Plain text
-#: user-manual.txt:4116
+#: user-manual.txt:3942
 msgid "To export the dive log in CSV format:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4118
+#: user-manual.txt:3944
 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:4119
+#: user-manual.txt:3945
 #, no-wrap
 msgid "images/Win_SaveCSV1.jpg"
 msgstr "images/Win_SaveCSV1.jpg"
 
 #. type: Plain text
-#: user-manual.txt:4122
+#: user-manual.txt:3948
 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 "
@@ -8735,13 +8494,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:4123
+#: user-manual.txt:3949
 #, no-wrap
 msgid "images/Win_SaveCSV3.jpg"
 msgstr "images/Win_SaveCSV3.jpg"
 
 #. type: Plain text
-#: user-manual.txt:4126
+#: user-manual.txt:3952
 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 "
@@ -8750,13 +8509,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ==
-#: user-manual.txt:4128
+#: user-manual.txt:3954
 #, no-wrap
 msgid "APPENDIX E: Writing a custom print template"
 msgstr "ANNEXE E : Créer un modèle d'impression personnalisé"
 
 #. type: Plain text
-#: user-manual.txt:4133
+#: user-manual.txt:3959
 msgid ""
 "_Subsurface_ provides a mechanism to create or modify templates for printing "
 "dive logs in order to produce customised printouts of dive logs. Templates, "
@@ -8765,12 +8524,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4135
+#: user-manual.txt:3961
 msgid "Templates are accessed using the print dialogue (see image *B* below)."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4143
+#: user-manual.txt:3969
 msgid ""
 "The buttons under the _Template_ dropdown box allows one to _Edit_, "
 "_Delete_, _Import_ and to _Export_ templates (see image *A* above). New or "
@@ -8781,18 +8540,18 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4145
+#: user-manual.txt:3971
 msgid "The Edit Panel comprises three tabs:"
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:4146
+#: user-manual.txt:3972
 #, no-wrap
 msgid "images/Template1_f22.jpg"
 msgstr "images/Template1_f22.jpg"
 
 #. type: Plain text
-#: user-manual.txt:4150
+#: user-manual.txt:3976
 msgid ""
 "The _Style_ tab (image *A* above) controls the font, line spacing and colour "
 "template used for printing the dive log.  The style attributes are editable. "
@@ -8800,7 +8559,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4154
+#: user-manual.txt:3980
 msgid ""
 "The _Colors_ tab (image *B* above) allows editing the colours used for "
 "printing the dive log. The colours are highly customisable: the _Edit_ "
@@ -8809,7 +8568,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4163
+#: user-manual.txt:3989
 msgid ""
 "The _Template_ tab of the Edit Panel (see image below) allows creating a "
 "template using HTML as well as a few Grantlee programming primitives. "
@@ -8825,13 +8584,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:4164
+#: user-manual.txt:3990
 #, no-wrap
 msgid "images/Template2_f22.jpg"
 msgstr "images/Template2_f22.jpg"
 
 #. type: Plain text
-#: user-manual.txt:4167
+#: user-manual.txt:3993
 msgid ""
 "One can adapt any of the existing templates and save it to the dive log "
 "directory. The standard templates (e.g. One dive, Six dives, Table) can be "
@@ -8839,33 +8598,33 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4169
+#: user-manual.txt:3995
 msgid ""
 "To write a custom template the following elements must exist so that the "
 "template will be correctly handled and rendered."
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:4170
+#: user-manual.txt:3996
 #, no-wrap
 msgid "Main dive loop"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4172
+#: user-manual.txt:3998
 msgid ""
 "_Subsurface_ exports a dive list called (*dives*) to the _Grantlee_ backend. "
 "It is possible to iterate over the list as follows:"
 msgstr ""
 
 #. type: Block title
-#: user-manual.txt:4173 user-manual.txt:4227 user-manual.txt:4244
+#: user-manual.txt:3999 user-manual.txt:4053 user-manual.txt:4070
 #, no-wrap
 msgid "template.html"
 msgstr ""
 
 #. type: delimited block .
-#: user-manual.txt:4178
+#: user-manual.txt:4004
 #, no-wrap
 msgid ""
 "\t{% for dive in dives %}\n"
@@ -8874,13 +8633,13 @@ msgid ""
 msgstr ""
 
 #. type: Block title
-#: user-manual.txt:4180 user-manual.txt:4232 user-manual.txt:4251
+#: user-manual.txt:4006 user-manual.txt:4058 user-manual.txt:4077
 #, no-wrap
 msgid "output.html"
 msgstr ""
 
 #. type: delimited block .
-#: user-manual.txt:4185
+#: user-manual.txt:4011
 #, no-wrap
 msgid ""
 "\t<h1> 1 </h1>\n"
@@ -8889,25 +8648,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4188
+#: user-manual.txt:4014
 msgid ""
 "Additional information about _Grantlee_ can be found http://www.grantlee.org/"
 "apidox/for_themers.html[here]"
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:4189
+#: user-manual.txt:4015
 #, no-wrap
 msgid "Grantlee exported variables"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4191
+#: user-manual.txt:4017
 msgid "Only a subset of the dive data is exported:"
 msgstr ""
 
 #. type: delimited block |
-#: user-manual.txt:4209
+#: user-manual.txt:4035
 #, no-wrap
 msgid ""
 "|*Name*|*Description*\n"
@@ -8930,7 +8689,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4213
+#: user-manual.txt:4039
 msgid ""
 "_Subsurface_ also exports *template_options* data. This data must be used as "
 "_CSS_ values to provide a dynamically editable template. The exported data "
@@ -8938,7 +8697,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block |
-#: user-manual.txt:4225
+#: user-manual.txt:4051
 #, no-wrap
 msgid ""
 "|*Name*|*Description*\n"
@@ -8955,26 +8714,26 @@ msgid ""
 msgstr ""
 
 #. type: delimited block .
-#: user-manual.txt:4230
+#: user-manual.txt:4056
 #, no-wrap
 msgid "\tborder-width: {{ template_options.borderwidth }}px;\n"
 msgstr ""
 
 #. type: delimited block .
-#: user-manual.txt:4235
+#: user-manual.txt:4061
 #, no-wrap
 msgid "\tborder-width: 3px;\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4238
+#: user-manual.txt:4064
 msgid ""
 "Another variable that _Subsurface_ exports is *print_options*. This variable "
 "contains a single member:"
 msgstr ""
 
 #. type: delimited block |
-#: user-manual.txt:4241
+#: user-manual.txt:4067
 #, no-wrap
 msgid ""
 "|*Name*|*Description*\n"
@@ -8982,7 +8741,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block .
-#: user-manual.txt:4249
+#: user-manual.txt:4075
 #, no-wrap
 msgid ""
 "\tbody {\n"
@@ -8991,7 +8750,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block .
-#: user-manual.txt:4256
+#: user-manual.txt:4082
 #, no-wrap
 msgid ""
 "\tbody {\n"
@@ -9000,13 +8759,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:4258
+#: user-manual.txt:4084
 #, no-wrap
 msgid "Defined CSS selectors"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4262
+#: user-manual.txt:4088
 msgid ""
 "As the dive profile is placed after rendering, _Subsurface_ uses a special "
 "_CSS_ selectors to do some searches in the HTML output. The _CSS_ selectors "
@@ -9014,7 +8773,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block |
-#: user-manual.txt:4269
+#: user-manual.txt:4095
 #, no-wrap
 msgid ""
 "|*Selector*|*Type*|*Description*\n"
@@ -9025,20 +8784,20 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4272
+#: user-manual.txt:4098
 msgid ""
 "Rendering dive profiles is not supported for flow layout templates (when "
 "data-numberofdives = 0)."
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:4273
+#: user-manual.txt:4099
 #, no-wrap
 msgid "Special attributes"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4277
+#: user-manual.txt:4103
 msgid ""
 "There are two ways of rendering- either rendering a specific number of dives "
 "in each page or make _Subsurface_ try to fit as much dives as possible into "
@@ -9046,55 +8805,55 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4279
+#: user-manual.txt:4105
 msgid ""
 "The *data-numberofdives* data attribute is added to the body tag to set the "
 "rendering mode"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4281
+#: user-manual.txt:4107
 msgid "render 6 dives per page:"
 msgstr ""
 
 #. type: delimited block .
-#: user-manual.txt:4284
+#: user-manual.txt:4110
 #, no-wrap
 msgid "\t<body data-numberofdives = 6>\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4287
+#: user-manual.txt:4113
 msgid "render as much dives as possible:"
 msgstr ""
 
 #. type: delimited block .
-#: user-manual.txt:4290
+#: user-manual.txt:4116
 #, no-wrap
 msgid "\t<body data-numberofdives = 0>\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4293
+#: user-manual.txt:4119
 msgid ""
 "All CSS units should be in relative lengths only, to support printing on any "
 "page size."
 msgstr ""
 
 #. type: Title ==
-#: user-manual.txt:4294
+#: user-manual.txt:4120
 #, no-wrap
 msgid "APPENDIX F: FAQs."
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:4296
+#: user-manual.txt:4122
 #, no-wrap
 msgid "Subsurface appears to miscalculate gas consumption and SAC"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4300
+#: user-manual.txt:4126
 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_ "
@@ -9102,7 +8861,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4306
+#: user-manual.txt:4132
 msgid ""
 "'Answer': Not really. What happens is that _Subsurface_ actually calculates "
 "gas consumption differently - and better - than you expect.  In particular, "
@@ -9112,7 +8871,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4312
+#: user-manual.txt:4138
 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 "
@@ -9122,12 +8881,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4314
+#: user-manual.txt:4140
 msgid "+consumption = (amount_of_air_at_beginning - amount_of_air_at_end)+"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4320
+#: user-manual.txt:4146
 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 "
@@ -9138,12 +8897,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4322
+#: user-manual.txt:4148
 msgid "+12.2*((220-100)/1.013)+"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4327
+#: user-manual.txt:4153
 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 "
@@ -9153,7 +8912,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4333
+#: user-manual.txt:4159
 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 "
@@ -9164,13 +8923,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:4334
+#: user-manual.txt:4160
 #, no-wrap
 msgid "Some dive profiles have time discrepancies with the recorded samples from my dive computer..."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4338
+#: user-manual.txt:4164
 msgid ""
 "_Subsurface_ ends up ignoring surface time for many things (average depth, "
 "divetime, SAC, etc).  'Question': Why do dive durations in my dive computer "
@@ -9178,7 +8937,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4346
+#: user-manual.txt:4172
 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 "
@@ -9192,13 +8951,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:4347
+#: user-manual.txt:4173
 #, no-wrap
 msgid "Some dive profiles are missing from the download"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4353
+#: user-manual.txt:4179
 msgid ""
 "'Question': I cannot download all my dives, only the most recent ones even "
 "though my dive computer's manual states that it records history of e.g. 999 "
@@ -9206,7 +8965,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4362
+#: user-manual.txt:4188
 msgid ""
 "'Answer': Dive history is different than the dive profiles on the log.  The "
 "history only keeps track of the total number of dives and total amount of "
@@ -9219,7 +8978,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4366
+#: user-manual.txt:4192
 msgid ""
 "If you have downloaded your dives to different dive logging software before "
 "they were overwritten, there is a high change that Subsurface can import "
@@ -9227,6 +8986,21 @@ msgid ""
 "salvaged after being over written by new dives."
 msgstr ""
 
+#~ msgid "images/AddDive2_f20.jpg"
+#~ msgstr "images/AddDive2_f20.jpg"
+
+#~ msgid "images/CompletedDiveInfo_f20.jpg"
+#~ msgstr "images/CompletedDiveInfo_f20.jpg"
+
+#~ msgid "images/Gas_dialogue1_f20.jpg"
+#~ msgstr "images/Gas_dialogue1_f20.jpg"
+
+#~ msgid "images/Gas_dialogue2_f20.jpg"
+#~ msgstr "images/Gas_dialogue2_f20.jpg"
+
+#~ msgid "images/DiveProfile4_f20.jpg"
+#~ msgstr "images/DiveProfile4_f20.jpg"
+
 #~ msgid "images/PrintDiveLog.jpg"
 #~ msgstr "images/PrintDiveLog.jpg"
 
diff --git a/Documentation/user-manual_fr.html.git b/Documentation/user-manual_fr.html.git
index cb9b707..d2f4318 100644
--- a/Documentation/user-manual_fr.html.git
+++ b/Documentation/user-manual_fr.html.git
@@ -404,19 +404,19 @@ asciidoc.install(3);
 <div id="content">
 <div class="imageblock" style="text-align:center;">
 <div class="content">
-<img src="images/Subsurface4Banner.jpg" alt="Banner" />
-</div>
-</div>
-<div class="paragraph"><p><span class="big">MANUEL UTILISATEUR</span></p></div>
-<div class="paragraph"><p><strong>Auteurs du manuel</strong> : Willem Ferguson, Jacco van Koll, Dirk Hohndel, Reinout Hoornweg,
-Linus Torvalds, Miika Turkia, Amit Chaudhuri, Jan Schubert, Salvador Cuñat, Pedro Neves</p></div>
-<div class="paragraph"><p><span class="blue"><em>Version 4.5, Septembre 2015</em></span></p></div>
-<div class="paragraph"><p>Bienvenue en tant qu’utilisateur de <em>Subsurface</em>, un programme avancé
-d’enregistrement de plongées (carnet de plongées) avec une bonne
-infrastructure pour décrire, organiser, interpréter et imprimer des plongées
-en scaphandre et en apnée. <em>Subsurface</em> offre de nombreux avantages par
-rapport à d’autres solutions logicielles similaires :</p></div>
-<div class="ulist"><ul>
+<img src="images/Subsurface4Banner.jpg" alt="Banner" />
+</div>
+</div>
+<div class="paragraph"><p><span class="big">MANUEL UTILISATEUR</span></p></div>
+<div class="paragraph"><p><strong>Auteurs du manuel</strong> : Willem Ferguson, Jacco van Koll, Dirk Hohndel, Reinout Hoornweg,
+Linus Torvalds, Miika Turkia, Amit Chaudhuri, Jan Schubert, Salvador Cuñat, Pedro Neves</p></div>
+<div class="paragraph"><p><span class="blue"><em>Version 4.5, Septembre 2015</em></span></p></div>
+<div class="paragraph"><p>Bienvenue en tant qu’utilisateur de <em>Subsurface</em>, un programme avancé
+d’enregistrement de plongées (carnet de plongées) avec une bonne
+infrastructure pour décrire, organiser, interpréter et imprimer des plongées
+en scaphandre et en apnée. <em>Subsurface</em> offre de nombreux avantages par
+rapport à d’autres solutions logicielles similaires :</p></div>
+<div class="ulist"><ul>
 <li>
 <p>
 Avez-vous besoin d’une façon d’enregistrer vos plongées utilisant des
@@ -496,40 +496,40 @@ utilisateurs de la meilleur manière qu’il soit, il est important d’
 informations sur les utilisateurs. À l’ouverture de <em>Subsurface</em> après avoir
 utilisé le logiciel pendant une semaine environ, une fenêtre de sondage
 apparait. Cela est complètement optionnel et l’utilisateur contrôle quelles
-informations sont envoyées ou non à l'équipe de développement de
-<em>Subsurface</em>. Toutes les données que l’utilisateur choisit d’envoyer sont
-extrêmement utiles et ne seront utilisées que pour les futures
-développements et modifications du logiciel pour coller au mieux aux besoins
-des utilisateurs de <em>Subsurface</em>. Si vous complétez le sondage ou cliquez
-sur l’option pour ne plus être sondé, cela devrait être la dernière
-communication de ce type que vous recevrez. Cependant, si vos habitudes de
-plongées ou d’utilisation de Subsurface changent, vous pouvez envoyer un
-nouveau sondage en démarrant <em>Subsurface</em> avec l’option  <em>--survey</em> sur la
-ligne de commande.</p></div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="S_StartUsing">3. Commencer à utiliser le programme</h2>
-<div class="sectionbody">
-<div class="paragraph"><p>La fenêtre <em>Subsurface</em> est généralement divisée en 4 panneaux avec un <strong>Menu
-principal</strong> (Fichier Importer Journal Vue Aide) en haut de la fenêtre (pour
-Windows et Linux) ou en haut de l'écran (pour Mac et Ubuntu Unity). Les
-quatre panneaux sont :</p></div>
-<div class="paragraph"><p>La <strong>liste des plongées</strong> en bas à gauche, contenant une liste de toutes les
-plongées du journal (carnet) de plongées de l’utilisateur. Une plongée peut
-être sélectionnée et mise en surbrillance dans la liste en cliquant
-dessus. Dans la plupart des cas, les touches haut/bas peuvent être utilisée
-pour passer d’une plongée à l’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’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>
+informations sont envoyées ou non à l'équipe de développement de
+<em>Subsurface</em>. Toutes les données que l’utilisateur choisit d’envoyer sont
+extrêmement utiles et ne seront utilisées que pour les futures
+développements et modifications du logiciel pour coller au mieux aux besoins
+des utilisateurs de <em>Subsurface</em>. Si vous complétez le sondage ou cliquez
+sur l’option pour ne plus être sondé, cela devrait être la dernière
+communication de ce type que vous recevrez. Cependant, si vos habitudes de
+plongées ou d’utilisation de Subsurface changent, vous pouvez envoyer un
+nouveau sondage en démarrant <em>Subsurface</em> avec l’option  <em>--survey</em> sur la
+ligne de commande.</p></div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="S_StartUsing">3. Commencer à utiliser le programme</h2>
+<div class="sectionbody">
+<div class="paragraph"><p>La fenêtre <em>Subsurface</em> est généralement divisée en 4 panneaux avec un <strong>Menu
+principal</strong> (Fichier Importer Journal Vue Aide) en haut de la fenêtre (pour
+Windows et Linux) ou en haut de l'écran (pour Mac et Ubuntu Unity). Les
+quatre panneaux sont :</p></div>
+<div class="paragraph"><p>La <strong>liste des plongées</strong> en bas à gauche, contenant une liste de toutes les
+plongées du journal (carnet) de plongées de l’utilisateur. Une plongée peut
+être sélectionnée et mise en surbrillance dans la liste en cliquant
+dessus. Dans la plupart des cas, les touches haut/bas peuvent être utilisée
+pour passer d’une plongée à l’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’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’au prochain lancement <em>Subsurface</em> utilise ces
@@ -545,7 +545,7 @@ durées, les températures de l’eau et le SAC (air consommé); temps total
 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" />
+<img src="images/main_window_f22.jpg" alt="The Main Window" />
 </div>
 </div>
 <div class="paragraph"><p>L’utilisateur peut déterminer si lesquels des quatre panneaux sont affichés
@@ -574,297 +574,106 @@ carnet de plongée sera détaillée.</p></div>
 <div class="sectionbody">
 <div class="paragraph"><p>Sélectionner <em>Fichier → Nouveau carnet de plongée</em> à partir du menu
 principal. Toutes les données de plongées sont effacées pour que de
-nouvelles puissent être ajoutées. S’il existe des données non encore
-enregistrées dans le carnet ouvert, l’utilisateur devra sélectionner s’il
-faut les enregistrer ou non avant de créer le nouveau carnet.</p></div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="S_GetInformation">5. Enregistrement des informations de plongée dans le carnet</h2>
-<div class="sectionbody">
-<div class="paragraph"><p>Maintenant qu’un nouveau carnet de plongée a été créé, il est simple de lui
-ajouter des données. <em>Subsurface</em> permet plusieurs façons pour ajouter des
-données de plongée au carnet. Plus de détails dans les sections suivantes.</p></div>
-<div class="paragraph"><p>1) Si l’utilisateur possède un carnet manuscrit, un tableur ou une autre forme
-   de
- carnet maintenu manuellement, les données de plongée peuvent être ajoutées
- au carnet en utilisant une des approches suivantes :</p></div>
-<div class="ulist"><ul>
-<li>
-<p>
-Entrer les informations de plongée à la main. Cela est utile si le plongeur
-   n’a pas
- utilisé d’ordinateur de plongée et que les plongées sont inscrites dans un
- carnet manuscrit. Voir  <a href="#S_EnterData">Entrer les informations de plongée
- à la main</a>
-</p>
-</li>
-<li>
-<p>
-Importer les informations de plongée qui ont été maintenues soit dans un
-   tableur
- soit dans un fichier CSV. Se reporter à : <a href="#S_Appendix_D">ANNEXE D :
- Exporter un tableur vers le format CSV</a> et à
- <a href="#S_ImportingCSVDives">Importer des plongées au format CSV</a>.
-</p>
-</li>
-</ul></div>
-<div class="paragraph"><p>2) Si les plongées ont été enregistrées en utilisant un ordinateur de plongée,
-   le profil de profondeur de la
- plongée et de nombreuses informations supplémentaires peuvent être
- utilisées. Ces plongées peuvent être importées à partir de :</p></div>
-<div class="ulist"><ul>
-<li>
-<p>
-L’ordinateur de plongée lui-même. Voir : <a href="#S_ImportDiveComputer">Importer
-   de nouvelles informations de plongée à partir de l’ordinateur de plongée</a> ou
-</p>
-</li>
-<li>
-<p>
-Logiciels propriétaires fournis par les fabricants d’ordinateurs de
-   plongée. Voir
- <a href="#S_ImportingAlienDiveLogs">Importer les informations à partir d’autres
- sources de données numériques ou d’autres formats de données</a>.
-</p>
-</li>
-<li>
-<p>
-Importer à partir d’un tableur ou de fichiers CSV contenant les profils de
-   plongées.
- Voir : <a href="#S_ImportingCSVDives">Importer les plongées au format CSV à partir
- des ordinateurs de plongées ou d’autres logiciels de carnet de plongée</a>
-</p>
-</li>
-</ul></div>
-<div class="sect2">
-<h3 id="S_EnterData">5.1. Entrer les informations de plongée à la main</h3>
-<div class="paragraph"><p>This is usually the approach for dives without a dive computer. The basic
-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 → 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
-been entered.  When entering dives by hand, the <em>Info</em>, <em>Equipment</em> and
-<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">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" />
+nouvelles puissent être ajoutées. S’il existe des données non encore
+enregistrées dans le carnet ouvert, l’utilisateur devra sélectionner s’il
+faut les enregistrer ou non avant de créer le nouveau carnet.</p></div>
 </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
-box and by overtyping the information displayed. The default date is the
-present date and the default time is an hour in advance of the present time.</p></div>
-<div class="paragraph"><p><strong>Air and water temperatures</strong>: the air and water temperatures during the
-dive can be typed directly on the fields to the right of the Start time.
-Temperature units are not needed, as they will be automatically supplied by
-<em>Subsurface</em>. Only the numerical value must be
-typed by the user (the units selected in the <em>Preferences</em>
-will determine whether metric or imperial units are used).</p></div>
-<div class="paragraph"><p><strong>Location</strong>: Here the name of the dive site can be entered, e.g. "Tihany, Lake
-Balaton,
-Hungary". Auto completion of location names will make this easier if one
-frequently dives at the same sites.</p></div>
-<div class="paragraph"><p><strong>Coordinates</strong>: The geographic coordinates of the dive site should be entered
-here. These can come from three sources:</p></div>
-<div class="olist loweralpha"><ol class="loweralpha">
+<div class="sect1">
+<h2 id="S_GetInformation">5. Enregistrement des informations de plongée dans le carnet</h2>
+<div class="sectionbody">
+<div class="paragraph"><p>Maintenant qu’un nouveau carnet de plongée a été créé, il est simple de lui
+ajouter des données. <em>Subsurface</em> permet plusieurs façons pour ajouter des
+données de plongée au carnet. Plus de détails dans les sections suivantes.</p></div>
+<div class="paragraph"><p>1) Si l’utilisateur possède un carnet manuscrit, un tableur ou une autre forme
+   de
+ carnet maintenu manuellement, les données de plongée peuvent être ajoutées
+ au carnet en utilisant une des approches suivantes :</p></div>
+<div class="ulist"><ul>
 <li>
 <p>
-One can find the coordinates on the world map in the bottom right hand part
-   of the Subsurface window. The map displays a green bar indicating "No
-   location data - Move the map and double-click to set the dive
-   location". Upon a double-click at the appropriate place, the green bar
-   disappears and the coordinates are stored.
+Entrer les informations de plongée à la main. Cela est utile si le plongeur
+   n’a pas
+ utilisé d’ordinateur de plongée et que les plongées sont inscrites dans un
+ carnet manuscrit. Voir  <a href="#S_EnterData">Entrer les informations de plongée
+ à la main</a>
 </p>
 </li>
 <li>
 <p>
-The coordinates can be obtained from the <em>Subsurface</em> Companion app if the
-   user has an Android or iPhone device with GPS and if the coordinates of the
-   dive site were stored using that device.  <a href="#S_Companion">Click here for
-   more information</a>
+Importer les informations de plongée qui ont été maintenues soit dans un
+   tableur
+ soit dans un fichier CSV. Se reporter à : <a href="#S_Appendix_D">ANNEXE D :
+ Exporter un tableur vers le format CSV</a> et à
+ <a href="#S_ImportingCSVDives">Importer des plongées au format CSV</a>.
 </p>
 </li>
+</ul></div>
+<div class="paragraph"><p>2) Si les plongées ont été enregistrées en utilisant un ordinateur de plongée,
+   le profil de profondeur de la
+ plongée et de nombreuses informations supplémentaires peuvent être
+ utilisées. Ces plongées peuvent être importées à partir de :</p></div>
+<div class="ulist"><ul>
 <li>
 <p>
-The coordinates can be entered by hand if they are known, using one of four
-   formats with latitude followed by longitude:
+L’ordinateur de plongée lui-même. Voir : <a href="#S_ImportDiveComputer">Importer
+   de nouvelles informations de plongée à partir de l’ordinateur de plongée</a> ou
 </p>
-<div class="literalblock">
-<div class="content">
-<pre><code>ISO 6709 Annex D format e.g. 30°13'28.9"N 30°49'1.5"E Degrees and decimal
-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 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>
-<div class="paragraph"><p>Some keyboards don’t have the degree sign (°). It can be replaced by a d
-like that: N30d W20d.</p></div>
-<div class="paragraph"><p>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
-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>
-<div class="paragraph"><p><strong>Divemaster</strong>: The name of the dive master or dive guide for this dive can be
-entered here.
-Again, this field offers auto completion based on the list of dive masters in
-the current logbook.</p></div>
-<div class="paragraph"><p><strong>Buddy</strong>: In this field one can enter the name(s) of the buddy / buddies
-(separated by commas) who accompanied the user on the dive. Auto completion
-is offered based on the list of buddies in the current logbook.</p></div>
-<div class="paragraph"><p><strong>Suit</strong>: The type of diving suit used for the dive can be entered here.
-As with the other items, auto completion of the suit description is available.
-Some dry-suit users may choose to use this field to record what combination of
-suit and thermal protection undersuit was used.</p></div>
-<div class="paragraph"><p><strong>Rating</strong>: One can provide a subjective overall rating of the dive on a
-5-point scale by clicking the appropriate star on the rating scale.</p></div>
-<div class="paragraph"><p><strong>Visibility</strong>: Similarly, one can provide a rating of visibility during the
-dive on a
-5-point scale by clicking the appropriate star.</p></div>
-<div class="paragraph"><p><strong>Tags</strong>: Tags that describe the type of dive performed may
-be entered here (separated by commas). Examples of common tags are boat, drift,
-training, cave etc. <em>Subsurface</em> has many built-in tags. Auto completion is once again offered.
-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’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
-cylinder and gas used, as well as the weights used for a dive. This is a
-highly interactive part of <em>Subsurface</em> and the information on cylinders and
-gases (entered here) affects the behaviour of the dive profile (top
-right-hand panel).</p></div>
-<div class="paragraph" id="S_CylinderData"><p><strong>Cylinders</strong>: The cylinder information is entered through a dialogue that looks
-like this:</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/Gas_dialogue1_f20.jpg" alt="FIGURE:Initial cylinder dialogue" />
-</div>
-</div>
-<div class="paragraph"><p>The + button at the top right allows the user to add more cylinders for this
-dive.  The dark dustbin icon on the left allows one to delete information
-for a particular cylinder. Note that it is not possible to delete a cylinder
-if it is used during the dive. One cylinder is implicitly used in the dive,
-even without a gas change event. Thus the first cylinder cannot be deleted
-until another cylinder is created.</p></div>
-<div class="paragraph"><p>Start by selecting a cylinder type on the left-hand side of the table.  To
-select a cylinder, click in the <strong>Type</strong> box.  This brings up a button that
-can be used to display a dropdown list of cylinders:</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/Gas_dialogue2_f20.jpg" alt="FIGURE:The cylinder drop-down list button" />
-</div>
-</div>
-<div class="paragraph"><p>The drop-down list can be used to select the cylinder type used for the dive
-or the user may start typing in the box which shows the available options
-for the entered characters. The <strong>Size</strong> of the cylinder as well as its
-working pressure (<strong>WorkPress</strong>) will automatically be shown in the
-dialogue. If a cylinder is not shown in the dropdown list, type the name and
-description of that cylinder into the <strong>Type</strong> field.</p></div>
-<div class="paragraph"><p>Next, indicate the starting pressure and the ending pressure of the gas used
-during the dive. The unit of pressure (metric/imperial) corresponds to the
-setting in the <em>Preferences</em>.</p></div>
-<div class="paragraph"><p>Finally, type in the gas mixture used in the <strong>O2%</strong> field. If air was used, a
-value of 21% can be entered on this field, or it might be left blank. If
-nitrox or trimix were used, their percentages of oxygen and/or helium must
-be specified.  Any inappropriate fields should be left empty. After typing
-the information for the cylinder, press <em>ENTER</em> on the keyboard or click
-outside the cell that contains the cursor. Information for any additional
-cylinders can be added by using the + button at the top right
-hand. Following is an example of a complete description for a dive made
-using two cylinders (air and EAN50):</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/CylinderDataEntry3_f20.jpg" alt="FIGURE: a completed cylinder dive information table" />
-</div>
-</div>
-<div class="paragraph"><p><strong>Weights</strong>: Information about the weight system used during a dive can be entered
-using a dialogue very similar to that for the cylinder information. If the user
-clicks the + button on the top right of the weights dialogue, the table looks
-like this:</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/WeightsDataEntry1_f20.jpg" alt="FIGURE: The Weights dialogue" />
-</div>
-</div>
-<div class="paragraph"><p>If one then clicks on the <strong>Type</strong> field, a drop-down list becomes accessible
-through a down-arrow:</p></div>
+<li>
+<p>
+Logiciels propriétaires fournis par les fabricants d’ordinateurs de
+   plongée. Voir
+ <a href="#S_ImportingAlienDiveLogs">Importer les informations à partir d’autres
+ sources de données numériques ou d’autres formats de données</a>.
+</p>
+</li>
+<li>
+<p>
+Importer à partir d’un tableur ou de fichiers CSV contenant les profils de
+   plongées.
+ Voir : <a href="#S_ImportingCSVDives">Importer les plongées au format CSV à partir
+ des ordinateurs de plongées ou d’autres logiciels de carnet de plongée</a>
+</p>
+</li>
+</ul></div>
+<div class="sect2">
+<h3 id="S_EnterData">5.1. Entrer les informations de plongée à la main</h3>
+<div class="paragraph"><p>This is usually the approach for dives without a dive computer. The basic
+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 → 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/WeightsDataEntry2_f20.jpg" alt="FIGURE: Weights type drop-down list button" />
+<img src="images/AddDive1_f22.jpg" alt="FIGURE: Add dive" />
 </div>
 </div>
-<div class="paragraph"><p>The drop-down list can then be used to select the type of weight system or
-the user may start typing in the box which shows the available options for
-the entered characters. In the <strong>Weight</strong> field, the weight used during the
-dive must be typed. After typing the information for the weight system the
-user must either press <em>ENTER</em> on the keyboard or click outside the cell
-that contains the cursor. It is possible to enter information for more than
-one weight system by adding an additional system using the + button on the
-top right hand. Weight systems can be deleted using the dustbin icon on the
-left hand. Here is an example of information for a dive with two types of
-weights: integrated and a weight belt:</p></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/WeightsDataEntry3_f20.jpg" alt="FIGURE: A completed weights information table" />
-</div>
+<img src="images/BlueEditBar_f22.jpg" alt="Blue edit bar" />
 </div>
-<div class="paragraph"><p>There’s NO need to click the <em>Save</em> button before the dive profile has been
-completed.</p></div>
 </div>
+<div class="paragraph"><p>The <em>Apply changes</em> button should only be selected after all the parts of a
+dive have been entered.  When entering dives by hand, the <em>Info</em>,
+<em>Equipment</em> and <em>Profile</em> tabs should be completed before saving the
+information. By selecting the <em>Apply changes</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="S_CreateProfile">5.1.3. Creating a Dive Profile</h4>
+<h4 id="S_CreateProfile">5.1.1. Creating a Dive Profile</h4>
 <div class="paragraph"><p>The <strong>Dive Profile</strong> (a graphical representation of the depth of the dive as a
 function of time) is indicated in the panel on the top right hand of the
 <em>Subsurface</em> window. When a dive is manually added to a logbook,
@@ -902,41 +711,28 @@ dive profile can be edited. This is done by right-clicking on the particular
 waypoint and selecting the appropriate gas from the context menu. Changing
 the gas for a waypoint affects the gas shown in the segment <em>to the left</em> of
 that waypoint. Note that only the gases defined in the <strong>Equipment</strong> tab
-appear in the context menu.</p></div>
+appear in the context menu. Below is the profile of a dive to 25 m for 30
+min and with a switch from air to EAN50 at the end of the duration at 20m.</p></div>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
 <img src="images/DiveProfile3_f20.jpg" alt="FIGURE: Gas composition context menu" />
 </div>
 </div>
-<div class="paragraph"><p>Below is the profile of a dive to 25 m for 30 min and with a switch from air
-to EAN50 at the end of the duration at 20m. In this case the first cylinder
-in the <strong>Equipment</strong> tab contained air and the second cylinder contained
-EAN50.</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/DiveProfile4_f20.jpg" alt="FIGURE: Completed dive profile" />
-</div>
+<div class="paragraph"><p>With the profile having been defined, more details must be added in order to
+have a fuller record of the dive. 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. Click on <a href="#S_Notes_dc"><strong>this link</strong></a> for instructions to use these
+tabs.</p></div>
 </div>
 </div>
+<div class="sect2">
+<h3 id="S_ImportDiveComputer">5.2. Importer de nouvelles informations de plongée à partir de l’ordinateur de plongée</h3>
 <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’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. Importer de nouvelles informations de plongée à partir de l’ordinateur de plongée</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>
-<div class="paragraph"><p>The use of dive computers allows the collection of a large amount of
-information about each dive, e.g. a detailed record of depth, duration,
-rates of ascent/descent and of gas partial pressures. <em>Subsurface</em> can
-capture this information and present it as part of the dive information,
+<h4 id="_connecting_and_importing_data_from_a_dive_computer">5.2.1. Connecting and importing data from a dive computer.</h4>
+<div class="paragraph"><p>The use of dive computers allows the collection of a large amount of
+information about each dive, e.g. a detailed record of depth, duration,
+rates of ascent/descent and of gas partial pressures. <em>Subsurface</em> can
+capture this information and present it as part of the dive information,
 using dive information from a wide range of dive computers. The latest list
 of supported dive computers can be found at:
 <a href="http://subsurface-divelog.org/documentation/supported-dive-computers/">
@@ -1204,25 +1000,29 @@ fuller record of the dives. To do this, the <strong>Notes</strong> and the <stro
 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>
+<h4 id="S_Notes_dc">5.2.4. Notes</h4>
+<div class="paragraph"><p>The user needs to add additional information by hand in order to have a more
+complete dive record. The information below is almost identical for
+hand-entered dives and for dives downloaded from a dive computer.</p></div>
+<div class="paragraph"><p>In some cases, one has to provide the date and time of the dive, e.g. when
+entering a dive by hand or when a dive computer does not privide the date
+and time of the dive.  (Often, the date and time of the dive, gas mixture
+and water temperature are usually shown as obtained from the dive computer)
+If the contents of the <strong>Notes tab</strong> 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 (left hand image, below):</p></div>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
-<img src="images/AddDive3_f20.jpg" alt="FIGURE: The Notes tab" />
+<img src="images/AddDive3_f22.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
-by overtyping the information displayed.</p></div>
+<div class="paragraph"><p>The right hand image, above, shows a <strong>Notes tab</strong> filled with dive
+information.  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 by overtyping the information displayed.</p></div>
 <div class="paragraph"><p><strong>Air/water temperatures</strong>: Air and water temperatures during the dive are shown
 in these fields to the right of the Start time. Many dive computers supply water
 temperature information and this field may therefore contain information obtained from the dive computer.
@@ -1233,25 +1033,43 @@ If editing is required, only a value is required, the units of temperature will
 automatically supplied by
 <em>Subsurface</em> (according to the <em>Preferences</em>, metric or imperial units will
 be used).</p></div>
-<div class="paragraph"><p><strong>Location</strong>: In this field one should type in text that describes the site
-where the dive was performed, e.g. "Tihany, Lake Balaton, Hungary".
-Auto completion of location names will
-make this easier if one frequently dives at the same sites.</p></div>
-<div class="paragraph"><p><strong>Coordinates</strong>: The geographic coordinates of the dive site should be entered
-here. These can come from three sources:</p></div>
+<div class="paragraph"><p><strong>Location</strong>: Here the name of the dive site can be entered, e.g. "Tihany, Lake
+Balaton, Hungary". Dive locations are managed as a separate part of the dive log.
+After entering the information for a particilar dive site, and several dives are
+performed at the same location, the information is re-used without requiring
+full dive site information again. Existing dive location information
+can be edited at any time by selecting (on the <strong>Dive List</strong> panel) a dive performed at that site
+and by opening the location information by clicking the globe button on the
+right of the location name (see image on the right above). When entering a dive location name, auto completion of
+location names makes it easy to select a dive site that already exists in the dive log
+(i.e. when typing in the name of a dive site,
+a dropdown list appears showing all sites with similar names). If the dive
+site has been used before, click on the already-existing name.</p></div>
+<div class="paragraph"><p>If the present dive site has not been used before, a message appears as
+follows (image <strong>A</strong> below):</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/Locations1_f22.jpg" alt="FIGURE:Location description panel" />
+</div>
+</div>
+<div class="paragraph"><p>Click the + icon on the right hand side. A panel appears to enter the
+coordinates and other important information about the site (image <strong>B</strong>,
+above). The most important items are the coordinates of the site. There are
+three ways of specifying the coordinates:</p></div>
 <div class="olist loweralpha"><ol class="loweralpha">
 <li>
 <p>
-The user can find the coordinates on the world map in the bottom right hand
-   part of the Subsurface window. The map displays a green bar indicating "Move
-   the map and double-click to set the dive location". Double-click at the
-   appropriate place, the green bar disappears and the coordinates are stored.
+One can find the coordinates on the world map in the bottom right hand part
+   of the Subsurface window. The map displays an orange bar indicating "No
+   location data - Move the map and double-click to set the dive
+   location". Upon a double-click at the appropriate place, the orange bar
+   disappears and the coordinates are stored.
 </p>
 </li>
 <li>
 <p>
-The user can obtain the coordinates from the <em>Subsurface</em> Companion app if
-   an Android or iPhone device with GPS was used and if the coordinates of the
+The coordinates can be obtained from the <em>Subsurface</em> Companion app if the
+   user has an Android or iPhone device with GPS and if the coordinates of the
    dive site were stored using that device.  <a href="#S_Companion">Click here for
    more information</a>
 </p>
@@ -1271,13 +1089,19 @@ e.g. N30° 13' 29.8" , E30° 49' 1.5" Decimal degrees, e.g. 30.22496 ,
 </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>
-<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>
+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. Some keyboards
+don’t have the degree sign (°). It can be replaced by a <strong>d</strong> like this: N30d
+W20d.</p></div>
+<div class="paragraph"><p><strong>Important</strong>: 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>Enter any other textual information about the dive site (Description and
+Notes), then select <em>Apply Changes</em> to save the information for this dive
+site. At a later stage the dive site information can be edited by clicking
+the globe icon to the right of the dive site name in the <strong>Notes tab</strong>.</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 seting, meant for most recreational dives),
 Freedive (dive without SCUBA equipment), CCR (Closed-circuit
@@ -1310,22 +1134,18 @@ typed
 <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’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>
+use them until ALL other information has been added. The image
+<a href="#S_Notes_dc">at the beginning of this section</a> shows an example of a
+<strong>Notes tab</strong> containing dive information.</p></div>
 </div>
 <div class="sect3">
-<h4 id="_equipment_2">5.2.5. Equipment</h4>
+<h4 id="_equipment">5.2.5. Equipment</h4>
 <div class="paragraph"><p>The Equipment tab allows one to enter information about the type of cylinder
 and gas used as well as the weights used for the dive. The message in a blue
 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" />
+<img src="images/BlueEditBar_f22.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
@@ -1338,7 +1158,8 @@ like this:</p></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
+<div class="paragraph"><p>For hand-entered dives, this information needs to be typed in. For dive
+computers <em>Subsurface</em> often 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
 dive. The dark dustbin icon on the left allows the deletion of information
@@ -1487,21 +1308,22 @@ If one hovers using the mouse over the red bookmark, the appropriate text is
 <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="_importer_les_informations_à_partir_d_8217_autres_sources_de_données_numériques_ou_d_8217_autres_formats_de_données">5.3. Importer les informations à partir d’autres sources de données numériques ou d’autres formats de données</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
-retyping because these dive logs can probably be imported into
-<em>Subsurface</em>. <em>Subsurface</em> will import dive logs from a range of other dive
-log software. While some software is supported natively, for others the user
-has to export the logbook(s) to an intermediate format so that they can then
+the <em>Apply changes</em> button is clicked, the dive data are saved in the memory
+image of the dive. If the <em>Discard changes</em> button is clicked, then the
+newly entered dive data are erased from the computer memory, although the
+dive profile is retained. When the user exits <em>Subsurface</em> there is a final
+prompt to confirm that the new data should now be saved permanently on the
+computer disk.</p></div>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_importer_les_informations_à_partir_d_8217_autres_sources_de_données_numériques_ou_d_8217_autres_formats_de_données">5.3. Importer les informations à partir d’autres sources de données numériques ou d’autres formats de données</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
+retyping because these dive logs can probably be imported into
+<em>Subsurface</em>. <em>Subsurface</em> will import dive logs from a range of other dive
+log software. While some software is supported natively, for others the user
+has to export the logbook(s) to an intermediate format so that they can then
 be imported by <em>Subsurface</em>.  Currently, <em>Subsurface</em> supports importing CSV
 log files from several sources.  APD LogViewer, XP5, Sensus and Seabear
 files are preconfigured, but because the import is flexible, users can
@@ -1563,109 +1385,109 @@ JDiveLog
 </li>
 <li>
 <p>
-Suunto Dive Manager (DM3 and DM4)
-</p>
-</li>
-<li>
-<p>
-CSV (text-based and spreadsheet-based) dive logs, including APD CCR logs
-</p>
-</li>
-</ul></div>
-<div class="paragraph"><p>Selecting the appropriate file in the file list of the dialogue opens the
-imported dive log in the <em>Subsurface</em> <strong>Dive List</strong>. Some other formats, not
-accessible through the Import dialogue are also supported, as explained
-below.</p></div>
-</div>
-<div class="sect3">
-<h4 id="_importing_from_ostctools">5.3.2. Importing from  OSTCTools</h4>
-<div class="paragraph"><p><em>OSTC Tools</em> is a Microsoft-based suite of dive download and dive management
-tools for the OSTC family of dive computers. <em>OSTC Tools</em> downloads dive
-data from the dive computer and stores it as a binary file with file
-extension <em>.dive</em> . Subsurface can directly import these files when using
-the universal import dialogue. From the dropdown list at the bottom right
-select <em>OSTCTools Files (.dive .DIVE)</em>. This makes the <em>OSTC Tools</em> dive
-logs visible in the file list panel. Select one or more dive, then click the
-<em>Open</em> button. The OSTC dives are shown in the <strong>Dive List</strong> panel.</p></div>
-<div class="paragraph"><p>Actually, every H&W device supported by OSTCTools can be imported to
-<em>Subsurface</em>, this includes OSTC, OSTC Mk2, OSTC 2N/2C, OSTC3, OSTC Sport,
-and probably although untested, Frog, OSTC2 and OSTC CR.</p></div>
-<div class="paragraph"><p>Please, remember that OSTCTools is <strong>not</strong> a true diving log software, but a
-useful set of tools for analysis and management of OSTC devices. This way,
-only raw dive computer data will be achieved with the import to
-<em>Subsurface</em>; user still have to manually complete the rest of data which
-may be of some importance for him (buddies, equipment, notes, etc).</p></div>
-</div>
-<div class="sect3">
-<h4 id="_importing_from_mares_dive_organiser_v2_1">5.3.3. Importing from Mares Dive Organiser V2.1</h4>
-<div class="paragraph"><p>Since Mares utilise proprietary Windows software not compatible with
-multi-platform applications, these dive logs cannot be directly imported
-into <em>Subsurface</em>. Mares dive logs need to be imported using a three-step
-process, using <em>www.divelogs.de</em> as a mechanism to extract the dive log
-information.</p></div>
-<div class="olist arabic"><ol class="arabic">
-<li>
-<p>
-The dive log data from Mares Dive Organiser need to be exported to the
-   user’s desktop, using a <em>.sdf</em> file name extension. Refer to
-   <a href="#Mares_Export">Appendix C</a> for more information.
-</p>
-</li>
-<li>
-<p>
+Suunto Dive Manager (DM3 and DM4)
+</p>
+</li>
+<li>
+<p>
+CSV (text-based and spreadsheet-based) dive logs, including APD CCR logs
+</p>
+</li>
+</ul></div>
+<div class="paragraph"><p>Selecting the appropriate file in the file list of the dialogue opens the
+imported dive log in the <em>Subsurface</em> <strong>Dive List</strong>. Some other formats, not
+accessible through the Import dialogue are also supported, as explained
+below.</p></div>
+</div>
+<div class="sect3">
+<h4 id="_importing_from_ostctools">5.3.2. Importing from  OSTCTools</h4>
+<div class="paragraph"><p><em>OSTC Tools</em> is a Microsoft-based suite of dive download and dive management
+tools for the OSTC family of dive computers. <em>OSTC Tools</em> downloads dive
+data from the dive computer and stores it as a binary file with file
+extension <em>.dive</em> . Subsurface can directly import these files when using
+the universal import dialogue. From the dropdown list at the bottom right
+select <em>OSTCTools Files (.dive .DIVE)</em>. This makes the <em>OSTC Tools</em> dive
+logs visible in the file list panel. Select one or more dive, then click the
+<em>Open</em> button. The OSTC dives are shown in the <strong>Dive List</strong> panel.</p></div>
+<div class="paragraph"><p>Actually, every H&W device supported by OSTCTools can be imported to
+<em>Subsurface</em>, this includes OSTC, OSTC Mk2, OSTC 2N/2C, OSTC3, OSTC Sport,
+and probably although untested, Frog, OSTC2 and OSTC CR.</p></div>
+<div class="paragraph"><p>Please, remember that OSTCTools is <strong>not</strong> a true diving log software, but a
+useful set of tools for analysis and management of OSTC devices. This way,
+only raw dive computer data will be achieved with the import to
+<em>Subsurface</em>; user still have to manually complete the rest of data which
+may be of some importance for him (buddies, equipment, notes, etc).</p></div>
+</div>
+<div class="sect3">
+<h4 id="_importing_from_mares_dive_organiser_v2_1">5.3.3. Importing from Mares Dive Organiser V2.1</h4>
+<div class="paragraph"><p>Since Mares utilise proprietary Windows software not compatible with
+multi-platform applications, these dive logs cannot be directly imported
+into <em>Subsurface</em>. Mares dive logs need to be imported using a three-step
+process, using <em>www.divelogs.de</em> as a mechanism to extract the dive log
+information.</p></div>
+<div class="olist arabic"><ol class="arabic">
+<li>
+<p>
+The dive log data from Mares Dive Organiser need to be exported to the
+   user’s desktop, using a <em>.sdf</em> file name extension. Refer to
+   <a href="#Mares_Export">Appendix C</a> for more information.
+</p>
+</li>
+<li>
+<p>
 Data should then be imported into <em>www.divelogs.de</em>. One needs to create a
-   user account in <em>www.divelogs.de</em>, log into that web site, then select
-   <em>Import Logbook → Dive Organiser</em> from the menu on the left hand side.  The
-   instructions must be carefully followed to transfer the dive information (in
-   <em>.sdf</em> format) from the Dive Organiser database to <em>www.divelogs.de</em>.
-</p>
-</li>
-<li>
-<p>
-Finally, import the dives from <em>divelogs.de</em> to <em>Subsurface</em>, using the
-   instructions below.
-</p>
-</li>
-</ol></div>
-</div>
-<div class="sect3">
-<h4 id="S_ImportingDivelogsDe">5.3.4. Importing dives from <strong>divelogs.de</strong></h4>
-<div class="paragraph"><p>The import of dive information from <em>divelogs.de</em> is simple, using a single
-dialogue box. The <em>Import → Import from Divelogs.de</em> option should be
-selected from the Main Menu. This brings up a dialogue box (see figure on
-left [<strong>A</strong>] below). Enter a user-ID and password for <em>divelogs.de</em> into the
-appropriate fields and then select the <em>Download</em> button. Download from
-<em>divelogs.de</em> starts immediately, displaying a progress bar in the dialogue
-box. At the end of the download, the success status is indicated (see figure
-on the right [<strong>B</strong>], below). The <em>Apply</em> button should then be selected,
-after which the imported dives appear in the <em>Subsurface</em> <strong>Dive List</strong> panel.</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/Divelogs1.jpg" alt="FIGURE:Download from Divelogs.de" />
-</div>
-</div>
-</div>
-<div class="sect3">
-<h4 id="S_ImportingCSVData">5.3.5. Importer des données au format CSV</h4>
-<div class="paragraph"><p>A comma-separated file (.csv) can be used to import dive information either
-as dive profiles (as in the case of the APD Inspiration and Evolution closed
-circuit rebreathers) or as dive metadata (in case the user keeps dive data
-in a spreadsheet). The <em>CSV</em> format is a universal simplified format that
-allows for easy information exchange between different computers or software
-packages. For an introduction to CSV-formatted files see <a href="#S_CSV_Intro">A
-Diver’s Introduction To CSV Files</a>. <em>Subsurface</em> dive logs can also be
-exported in <em>CSV</em> format to other software that reads this format. See
-<a href="#S_Appendix_D">APPENDIX D: Exporting a spreadsheet to CSV format</a> for
-information that may be helpful for importing spreadsheet-based data into
-<em>Subsurface</em>.</p></div>
-<div class="sect4">
-<h5 id="S_ImportingCSVDives">Importer les plongées au format CSV à partir des ordinateurs de plongées ou d’autres logiciels de carnet de plongée</h5>
-<div class="paragraph"><p>One can view a <em>CSV</em> file by using an ordinary text editor. It is normally
-organised into a single line that provides the headers (or <em>field names</em> or
-<em>column headings</em>) of the data columns, followed by the data, one record per
-line.</p></div>
-<div class="paragraph"><p>There are two types of <em>CSV</em> dive logs that can be imported into
-<em>Subsurface</em>:</p></div>
+   user account in <em>www.divelogs.de</em>, log into that web site, then select
+   <em>Import Logbook → Dive Organiser</em> from the menu on the left hand side.  The
+   instructions must be carefully followed to transfer the dive information (in
+   <em>.sdf</em> format) from the Dive Organiser database to <em>www.divelogs.de</em>.
+</p>
+</li>
+<li>
+<p>
+Finally, import the dives from <em>divelogs.de</em> to <em>Subsurface</em>, using the
+   instructions below.
+</p>
+</li>
+</ol></div>
+</div>
+<div class="sect3">
+<h4 id="S_ImportingDivelogsDe">5.3.4. Importing dives from <strong>divelogs.de</strong></h4>
+<div class="paragraph"><p>The import of dive information from <em>divelogs.de</em> is simple, using a single
+dialogue box. The <em>Import → Import from Divelogs.de</em> option should be
+selected from the Main Menu. This brings up a dialogue box (see figure on
+left [<strong>A</strong>] below). Enter a user-ID and password for <em>divelogs.de</em> into the
+appropriate fields and then select the <em>Download</em> button. Download from
+<em>divelogs.de</em> starts immediately, displaying a progress bar in the dialogue
+box. At the end of the download, the success status is indicated (see figure
+on the right [<strong>B</strong>], below). The <em>Apply</em> button should then be selected,
+after which the imported dives appear in the <em>Subsurface</em> <strong>Dive List</strong> panel.</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/Divelogs1.jpg" alt="FIGURE:Download from Divelogs.de" />
+</div>
+</div>
+</div>
+<div class="sect3">
+<h4 id="S_ImportingCSVData">5.3.5. Importer des données au format CSV</h4>
+<div class="paragraph"><p>A comma-separated file (.csv) can be used to import dive information either
+as dive profiles (as in the case of the APD Inspiration and Evolution closed
+circuit rebreathers) or as dive metadata (in case the user keeps dive data
+in a spreadsheet). The <em>CSV</em> format is a universal simplified format that
+allows for easy information exchange between different computers or software
+packages. For an introduction to CSV-formatted files see <a href="#S_CSV_Intro">A
+Diver’s Introduction To CSV Files</a>. <em>Subsurface</em> dive logs can also be
+exported in <em>CSV</em> format to other software that reads this format. See
+<a href="#S_Appendix_D">APPENDIX D: Exporting a spreadsheet to CSV format</a> for
+information that may be helpful for importing spreadsheet-based data into
+<em>Subsurface</em>.</p></div>
+<div class="sect4">
+<h5 id="S_ImportingCSVDives">Importer les plongées au format CSV à partir des ordinateurs de plongées ou d’autres logiciels de carnet de plongée</h5>
+<div class="paragraph"><p>One can view a <em>CSV</em> file by using an ordinary text editor. It is normally
+organised into a single line that provides the headers (or <em>field names</em> or
+<em>column headings</em>) of the data columns, followed by the data, one record per
+line.</p></div>
+<div class="paragraph"><p>There are two types of <em>CSV</em> dive logs that can be imported into
+<em>Subsurface</em>:</p></div>
 <div class="olist arabic"><ol class="arabic">
 <li>
 <p>
@@ -2385,410 +2207,415 @@ window. A photo can be deleted from the <em>Photos</em> panel by selecting it
 removes the photo both from the <em>Photos</em> tab as well as the dive profile.</p></div>
 </div>
 <div class="sect3">
-<h4 id="_photos_on_an_external_hard_disk">5.5.4. Photos on an external hard disk</h4>
-<div class="paragraph"><p>Most underwater photographers store their photos on an external drive. If
-such a drive can be mapped (almost always the case) the photos can be
-directly accessed by <em>Subsurface</em>. This facilitates the interaction between
-<em>Subsurface</em> and an external repository of photos. When associating a dive
-profile with photos from an external drive, the normal procedure of
-selection and synchronisation (see text above) is used.  However, after the
-external drive has been disconnected, <em>Subsurface</em> cannot access these
-photos any more.  If the display of photos is activated (using the toolbox
-to the left of the <em>Dive Profile</em>), the program only shows a small white dot
-where each photo should be on the dive profile.  In addition the <em>Photos</em>
-tab only shows the file names of the photos. This is normal behaviour.  If,
-later, the external drive with the photos is connected again, the photos can
-be seen in the normal way.</p></div>
-</div>
-<div class="sect3">
-<h4 id="S_FindMovedImages">5.5.5. Moving photographs among directories, hard disks or computers</h4>
-<div class="paragraph"><p>After a photograph has been loaded into <em>Subsurface</em> and associated with a specific dive, the directory
- where the photo lies is stored, allowing <em>Subsurface</em> to find the photograph when the dive is
- opened again. If the photo or the whole photo collection is moved to another drive or to a different
- machine, it is unlikely that the directory structure will remain identical to that of the original uploaded
- photo. When this happens, <em>Subsurface</em> looks for the photos at their original location before they were moved,
- cannot find them and therefore cannot display them. Because, after moving photos, large numbers of photos
- may need to be deleted and re-imported from the new location, <em>Subsurface</em> has a mechanism that eases the
- process of updating the directory information for each photo: automatic updates using fingerprints.</p></div>
-<div class="paragraph"><p>When a photo is loaded into <em>Subsurface</em>, a fingerprint for the image is calculated and stored with the
- other reference information for that photo. After moving a photo collection (that has already been loaded
- into <em>Subsurface</em>) to a different directory, disk or computer, <em>Subsurface</em> can  perform the
- following steps:</p></div>
-<div class="ulist"><ul>
-<li>
-<p>
-look through a particular directory (and all its subdirectories recursively)
-  where photos have been moved
- to,
-</p>
-</li>
-<li>
-<p>
-calculate fingerprints for all photos in this directory, and
-</p>
-</li>
-<li>
-<p>
-if there is a match between a calculated fingerprint and the one originally
-  calculated when a photo was
- loaded into <em>Subsurface</em> (even if the original file name has changed), to
- automatically update the directory information so that <em>Subsurface</em> can find
- the photo in the new moved directory.
-</p>
-</li>
-</ul></div>
-<div class="paragraph"><p>This is achieved by selecting from the Main Menu: <em>File →      Find moved images</em>. This brings up a window within
- which the NEW directory of the photos needs to be specified. Select the appropriate directory and click
- the <em>Scan</em> button towards the bottom right of the panel. The process may require several minutes to
- complete, after which <em>subsurface</em> will show the appropriate photographs when a particular dive is opened.</p></div>
-<div class="sidebarblock" id="Image_fingerprint_upgrade">
-<div class="content">
-<div class="paragraph"><p><strong>Upgrading existing photo collections without fingerprints</strong></p></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="images/icons/important.png" alt="Important" />
-</td>
-<td class="content">Software for the automated update of existing photo collections is under
-developement. Currently single dives must be upgraded one at a time. Select
-the toolbar button on the <strong>Dive profile</strong> panel that enables the display of
-images. The thumbnails of images are shown on the dive profile. Then open
-the dive and change anything in the <strong>Notes</strong> panel that brings up the blue
-edit bar at the top of the notes panel to save the edits. For instance, add
-a space character at the end of the <em>Notes</em> text box and immediately delete
-that space character. Select the optio <em>Apply changes</em> in the blue edit bar
-to save the dive information.  Fingerprints are calculated while saving this
-specific dive.</td>
-</tr></table>
-</div>
-</div></div>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_logging_special_types_of_dives">5.6. Logging special types of dives</h3>
-<div class="sect3">
-<h4 id="S_MulticylinderDives">5.6.1. Multicylinder dives</h4>
-<div class="paragraph"><p><em>Subsurface</em> easily handles dives involving more than one
-cylinder. Multicylinder diving usually happens (a) if a diver does not have
-enough gas for the complete dive in a single cylinder; (b) if the diver
-needs more than one gas mixture because of the depth or the decompression
-needs of the dive. For this reason multicylinder dives are often used by
-technical divers who dive deep or long. As far as <em>Subsurface</em> is concerned,
-there are only two types of information that need to be provided:</p></div>
-<div class="ulist"><ul>
-<li>
-<p>
-<strong>Describe the cylinders used during the dive</strong> This is performed in the <strong>Equipment tab</strong> of
-  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>
-<li>
-<p>
-<strong>Record the times at which switches from one cylinder to another was done:</strong> This is information
-  provided by some dive computers (provided the diver indicated these changes to the dive computer
-  by pressing specific buttons). If the dive computer does not provide the information, the diver has to
-  record these changes using a different method, e.g. writing it on a slate.
-</p>
-</li>
-<li>
-<p>
-<strong>Record the cylinder changes on the dive profile</strong>: If the latter option
-  was followed, the diver needs to indicate the gas change event by right-clicking at the appropriate point
-  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 toolbar has been activated, the cylinder switches are also indicated in the
-  tank bar.
-</p>
-</li>
-</ul></div>
-<div class="paragraph"><p>Having performed these tasks, <em>Subsurface</em> indicates the appropriate use of
-cylinders in the dive profile.  Below is a multi-cylinder dive, starting off
-with EAN28, then changing cylinders to EAN50 after 26 minutes to perform
-decompression.</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/multicylinder_dive.jpg" alt="FIGURE: Multicylinder profile" />
-</div>
-</div>
-</div>
-<div class="sect3">
-<h4 id="_sidemount_dives">5.6.2. Sidemount dives</h4>
-<div class="paragraph"><p>Sidemount diving is just another form of multicylinder diving, often with
-both or all cylinders having the same gas mixture. Although it is a popular
-configuration for cave divers, sidemount diving can be performed by
-recreational divers who have completed the appropriate training. Sidemount
-dive logging involves, exactly as with multicylinder dives, above, three
-steps:</p></div>
-<div class="ulist"><ul>
-<li>
-<p>
-<strong>During the dive, record cylinder switch events</strong>. Since sidemount diving normally involves two
-  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 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>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
-  from a dive computer into <em>Subsurface</em>, the cylinder switch events need to be indicated on the dive profile.
-  Cylinder changes are recorded by right-clicking at the appropriate point on the dive profile and then
-  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 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 dive
-logging tool.</p></div>
-</div>
-<div class="sect3">
-<h4 id="S_sSCR_dives">5.6.3. Semi-closed circuit rebreather (SCR) dives</h4>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="images/halcyon_RB80.jpg" alt="Note" />
-</td>
-<td class="content">Passive semi-closed rebreathers (pSCR) comprise a technical advance in
-diving equipment that recirculates the breathing gas that a diver breathes,
-while removing carbon dioxide from the exhaled gas. While a small amount
-(typically a tenth) of the exhaled breathing gas is released into the water,
-a small amount of fresh gas is released from the back gas cylinder
-(typically containing nitrox).  A diver, using a single cylinder of
-breathing gas can therefore dive for much longer periods than using a
-recreational open-circuit configuration. With pSCR equipment, a very small
-amount of breathing gas is released every time the breather inhales. With
-active SCR (aSCR) equipment, in contrast, a small amount of breathing gas is
-released continuously from the back cylinder.</td>
-</tr></table>
-</div>
-<div class="paragraph"><p>To log pSCR dives, no special procedures are required, just the normal steps
-outlined above:</p></div>
-<div class="ulist"><ul>
-<li>
-<p>
-Select pSCR in the <em>Dive Mode</em> dropdown list on the <strong>Info</strong> panel.
-</p>
-</li>
-<li>
-<p>
-pSCR diving often involves gas changes, requiring an additional cylinder.
-  Define all the appropriate cylinders as described above and indicate the
-  cylinder/gas changes as described above in the section on
-  <a href="#S_MulticylinderDives">multicylinder dives</a>.
-</p>
-</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 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>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/pSCR_profile.jpg" alt="FIGURE: pSCR profile" />
-</div>
-</div>
-</div>
-<div class="sect3">
-<h4 id="S_CCR_dives">5.6.4. Closed circuit rebreather (CCR) dives</h4>
-<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
-has been breathed while doing two things to maintain a breathable oxygen
-concentration:
-a) remove carbon dioxide from the gas that has been exhaled
-regulate the oxygen concentration to remain within safe diving limits.  The
-CCR interface of <em>Subsurface</em> is currently experimental and under active
-development. Subsurface currently supports Poseidon MkVI and APD
-Discovery/Evolution dive computers. In contrast to a conventional
-recreational dive computer, a CCR system computer does not allow the
-download of a log containing multiple dives. Rather, each dive is stored
-independently. This means that <em>Subsurface</em> cannot download a dive log
-directly from a CCR dive computer, but that it imports CCR dive logs in the
-same way that it imports dive log data from other digital databases: one
-dive at a time.</td>
-</tr></table>
-</div>
-<div class="sect4">
-<h5 id="_import_a_ccr_dive">Import a CCR dive</h5>
-<div class="paragraph"><p>See the section dealing with <a href="#S_ImportingAlienDiveLogs">Importing dive
-information from other digital sources</a>. From the main menu of <em>Subsurface</em>,
-select <em>Import → Import log files</em> to bring up the
-<a href="#Unified_import">universal import dialogue</a>. As explained in that
-section, the bottom right hand of the import dialogue contains a dropdown
-list (labled <em>Filter:</em>) of appropriate devices that currently
-includes(Poseidon) MkVI or APD log viewer files (import for other CCR
-equipment is under active development). Having selected the appropriate CCR
-format and the directory where the original dive logs have been stored from
-the CCR dive computer, one can select a particular dive log file (in the
-case of the MkVI it is a file with a .txt extension). After selecting the
-appropriate dive log, activate the <em>Open</em> button at the bottom right hand of
-the universal import dialogue.  See the section below for</p></div>
-</div>
-<div class="sect4">
-<h5 id="_displayed_information_for_a_ccr_dive">Displayed information for a CCR dive</h5>
-<div class="paragraph"><p><em>Partial pressures of gases</em>: The graph of oxygen partial pressure shows the
-information from the oxygen sensors of the CCR equipment. In contrast to
-recreational equipment (where pO<sub>2</sub> values are calculated based on gas
-composition and dive depth), CCR equipment provide actual measurements of
-pO<sub>2</sub>, derived from oxygen sensors.  In this case the graph for oxygen
-partial pressure should be fairly flat, reflecting the setpoint settings
-during the dive. The mean pO<sub>2</sub> is NOT the mean oxygen partial pressure as
-given by the CCR equipment, but a value calculated by <em>Subsurface</em> as
-follows:</p></div>
+<h4 id="_photos_on_an_external_hard_disk">5.5.4. Photos on an external hard disk</h4>
+<div class="paragraph"><p>Most underwater photographers store their photos on an external drive. If
+such a drive can be mapped (almost always the case) the photos can be
+directly accessed by <em>Subsurface</em>. This facilitates the interaction between
+<em>Subsurface</em> and an external repository of photos. When associating a dive
+profile with photos from an external drive, the normal procedure of
+selection and synchronisation (see text above) is used.  However, after the
+external drive has been disconnected, <em>Subsurface</em> cannot access these
+photos any more.  If the display of photos is activated (using the toolbox
+to the left of the <em>Dive Profile</em>), the program only shows a small white dot
+where each photo should be on the dive profile.  In addition the <em>Photos</em>
+tab only shows the file names of the photos. This is normal behaviour.  If,
+later, the external drive with the photos is connected again, the photos can
+be seen in the normal way.</p></div>
+</div>
+<div class="sect3">
+<h4 id="S_FindMovedImages">5.5.5. Moving photographs among directories, hard disks or computers</h4>
+<div class="paragraph"><p>After a photograph has been loaded into <em>Subsurface</em> and associated with a specific dive, the directory
+ where the photo lies is stored, allowing <em>Subsurface</em> to find the photograph when the dive is
+ opened again. If the photo or the whole photo collection is moved to another drive or to a different
+ machine, it is unlikely that the directory structure will remain identical to that of the original uploaded
+ photo. When this happens, <em>Subsurface</em> looks for the photos at their original location before they were moved,
+ cannot find them and therefore cannot display them. Because, after moving photos, large numbers of photos
+ may need to be deleted and re-imported from the new location, <em>Subsurface</em> has a mechanism that eases the
+ process of updating the directory information for each photo: automatic updates using fingerprints.</p></div>
+<div class="paragraph"><p>When a photo is loaded into <em>Subsurface</em>, a fingerprint for the image is calculated and stored with the
+ other reference information for that photo. After moving a photo collection (that has already been loaded
+ into <em>Subsurface</em>) to a different directory, disk or computer, <em>Subsurface</em> can  perform the
+ following steps:</p></div>
 <div class="ulist"><ul>
 <li>
 <p>
-For TWO O<sub>2</sub> sensors the mean value of the two sensors are given.
+look through a particular directory (and all its subdirectories recursively)
+  where photos have been moved
+ to,
 </p>
 </li>
 <li>
 <p>
-For THREE-sensor systems (e.g. APD), the mean value is also used. However
-  differences of more than 0,1 bar in the simultaneous readings of different
-  sensors are treated as spurious. If one of the three sensors provides
-  spurious data, it is ignored.
+calculate fingerprints for all photos in this directory, and
 </p>
 </li>
 <li>
 <p>
-If no sensor data is available, the pO<sub>2</sub> value is assumed to be equal to
-  the setpoint.
+if there is a match between a calculated fingerprint and the one originally
+  calculated when a photo was
+ loaded into <em>Subsurface</em> (even if the original file name has changed), to
+ automatically update the directory information so that <em>Subsurface</em> can find
+ the photo in the new moved directory.
 </p>
 </li>
 </ul></div>
-<div class="paragraph"><p>The mean pO<sub>2</sub> of the sensors is indicated with a green line,</p></div>
-<div class="paragraph"><p>The oxygen setpoint values as well as the readings from the individual
-oxygen sensors can be shown. The display of additional CCR information is
-turned on by checking the appropriate checkboxes in the <em>Preferences</em> panel
-(accessible by selecting <a href="#S_CCR_options"><em>File → Preferences →
-Graph</em></a>). This part of the <em>Preferences</em> panel is shown in the image below,
-representing two checkboxes that modify the display of pO<sub>2</sub> when the
-appropriate toolbar button on the Dive Profile has been activated.</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/CCR_preferences_f20.jpg" alt="FIGURE: CCR preferences panel" />
-</div>
-</div>
-<div class="paragraph"><p>Checking any of these check boxes allows the display of additional
-oxygen-related information whenever the pO<sub>2</sub> toolbar button on the
-<em>Profile</em> panel is activated.  The first checkbox allows the display of
-setpoint information. This is a red line superimposed on the green oxygen
-partial pressure graph and allows a comparison of the mean measured oxygen
-partial pressure and the setpoint values, as shown below.</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/CCR_setpoint_f20.jpg" alt="FIGURE: CCR setpoint and po2 graph" />
+<div class="paragraph"><p>This is achieved by selecting from the Main Menu: <em>File →      Find moved images</em>. This brings up a window within
+ which the NEW directory of the photos needs to be specified. Select the appropriate directory and click
+ the <em>Scan</em> button towards the bottom right of the panel. The process may require several minutes to
+ complete, after which <em>subsurface</em> will show the appropriate photographs when a particular dive is opened.</p></div>
+<div class="sidebarblock" id="Image_fingerprint_upgrade">
+<div class="content">
+<div class="paragraph"><p><strong>Upgrading existing photo collections without fingerprints</strong></p></div>
+<div class="admonitionblock">
+<table><tr>
+<td class="icon">
+<img src="images/icons/important.png" alt="Important" />
+</td>
+<td class="content">Software for the automated update of existing photo collections is under
+developement. Currently single dives must be upgraded one at a time. Select
+the toolbar button on the <strong>Dive profile</strong> panel that enables the display of
+images. The thumbnails of images are shown on the dive profile. Then open
+the dive and change anything in the <strong>Notes</strong> panel that brings up the blue
+edit bar at the top of the notes panel to save the edits. For instance, add
+a space character at the end of the <em>Notes</em> text box and immediately delete
+that space character. Select the optio <em>Apply changes</em> in the blue edit bar
+to save the dive information.  Fingerprints are calculated while saving this
+specific dive.</td>
+</tr></table>
 </div>
+</div></div>
 </div>
-<div class="paragraph"><p>The second checkbox allows the display of the data from each individual
-oxygen sensor of the CCR equipment. The data for each sensor is colour-coded
-as follows:</p></div>
+</div>
+<div class="sect2">
+<h3 id="_logging_special_types_of_dives">5.6. Logging special types of dives</h3>
+<div class="sect3">
+<h4 id="S_MulticylinderDives">5.6.1. Multicylinder dives</h4>
+<div class="paragraph"><p><em>Subsurface</em> easily handles dives involving more than one
+cylinder. Multicylinder diving usually happens (a) if a diver does not have
+enough gas for the complete dive in a single cylinder; (b) if the diver
+needs more than one gas mixture because of the depth or the decompression
+needs of the dive. For this reason multicylinder dives are often used by
+technical divers who dive deep or long. As far as <em>Subsurface</em> is concerned,
+there are only two types of information that need to be provided:</p></div>
 <div class="ulist"><ul>
 <li>
 <p>
-Sensor 1: grey
+<strong>Describe the cylinders used during the dive</strong> This is performed in the <strong>Equipment tab</strong> of
+  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>
 <li>
 <p>
-Sensor 2: blue
+<strong>Record the times at which switches from one cylinder to another was done:</strong> This is information
+  provided by some dive computers (provided the diver indicated these changes to the dive computer
+  by pressing specific buttons). If the dive computer does not provide the information, the diver has to
+  record these changes using a different method, e.g. writing it on a slate.
 </p>
 </li>
 <li>
 <p>
-Sensor 3: brown
+<strong>Record the cylinder changes on the dive profile</strong>: If the latter option
+  was followed, the diver needs to indicate the gas change event by right-clicking at the appropriate point
+  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 toolbar has been activated, the cylinder switches are also indicated in the
+  tank bar.
 </p>
 </li>
 </ul></div>
-<div class="paragraph"><p>The mean oxygen pO<sub>2</sub> is indicated by the green line. This allows the direct
-comparison of data from each of the oxygen sensors, useful for detecting
-abnormally low or erratic readings from a particular sensor.</p></div>
+<div class="paragraph"><p>Having performed these tasks, <em>Subsurface</em> indicates the appropriate use of
+cylinders in the dive profile.  Below is a multi-cylinder dive, starting off
+with EAN28, then changing cylinders to EAN50 after 26 minutes to perform
+decompression.</p></div>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
-<img src="images/CCR_sensor_data_f20.jpg" alt="FIGURE: CCR sensor data graph" />
+<img src="images/multicylinder_dive.jpg" alt="FIGURE: Multicylinder profile" />
 </div>
 </div>
-<div class="paragraph"><p>The setpoint data can be overlaid on the oxygen sensor data by activating
-both of the above check boxes. Partial pressures for nitrogen (and helium,
-if applicable) are shown in the usual way as for open circuit dives.</p></div>
-<div class="paragraph"><p><em>Events</em>: Several events are logged, e.g. switching the mouthpiece to open
-circuit.  These events are indicated by yellow triangles and, if one hovers
-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 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_f22.jpg" alt="FIGURE: CCR dive profile" />
-</div>
-</div>
-<div class="paragraph"><p><em>Equipment-specific information</em>: Equipment-specific information gathered by
-<em>Subsurface</em> is shown in the <a href="#S_ExtraDataTab">Extra data tab</a>. This may
-include setup information or metadata about the dive.</p></div>
-<div class="paragraph"><p>The deco ceiling calculated by Subsurface is not very accurate because the
-precise pressure of nitrogen in the loop can usually not be determined from
-the dive log imported from the CCR equipment. Many CCR dive computers,
-however, report an internally-calculated deco ceiling that is reported in
-the dive log, reflecting a more accurate assessment. The display of this
-ceiling is activated by clicking the appropriate button to the left of the
-dive profile:</p></div>
-<div class="paragraph"><p>The default colour of the computer-generated deco ceiling is white. However,
-this can be set to red by checking the appropriate check box after selecting
-<em>File → Preferences → Graph</em>.  Below is a dive profile indicating the dive
-computer-generated deco ceiling:</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/CCR_dive_ceilingF22.jpg" alt="FIGURE: CCR computer-generated deco ceiling" />
-</div>
-</div>
-<div class="paragraph"><p>More equipment-specific information for downloading CCR dive logs for
-Poseidon MkVI and APD equipment can be found in
-<a href="#_appendix_b_dive_computer_specific_information_for_importing_dive_information">Appendix
-B</a>.</p></div>
-</div>
-</div>
 </div>
+<div class="sect3">
+<h4 id="_sidemount_dives">5.6.2. Sidemount dives</h4>
+<div class="paragraph"><p>Sidemount diving is just another form of multicylinder diving, often with
+both or all cylinders having the same gas mixture. Although it is a popular
+configuration for cave divers, sidemount diving can be performed by
+recreational divers who have completed the appropriate training. Sidemount
+dive logging involves, exactly as with multicylinder dives, above, three
+steps:</p></div>
+<div class="ulist"><ul>
+<li>
+<p>
+<strong>During the dive, record cylinder switch events</strong>. Since sidemount diving normally involves two
+  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 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>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
+  from a dive computer into <em>Subsurface</em>, the cylinder switch events need to be indicated on the dive profile.
+  Cylinder changes are recorded by right-clicking at the appropriate point on the dive profile and then
+  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 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="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_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
+<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">
+<h4 id="S_sSCR_dives">5.6.3. Semi-closed circuit rebreather (SCR) dives</h4>
+<div class="admonitionblock">
+<table><tr>
+<td class="icon">
+<img src="images/halcyon_RB80.jpg" alt="Note" />
+</td>
+<td class="content">Passive semi-closed rebreathers (pSCR) comprise a technical advance in
+diving equipment that recirculates the breathing gas that a diver breathes,
+while removing carbon dioxide from the exhaled gas. While a small amount
+(typically a tenth) of the exhaled breathing gas is released into the water,
+a small amount of fresh gas is released from the back gas cylinder
+(typically containing nitrox).  A diver, using a single cylinder of
+breathing gas can therefore dive for much longer periods than using a
+recreational open-circuit configuration. With pSCR equipment, a very small
+amount of breathing gas is released every time the breather inhales. With
+active SCR (aSCR) equipment, in contrast, a small amount of breathing gas is
+released continuously from the back cylinder.</td>
+</tr></table>
+</div>
+<div class="paragraph"><p>To log pSCR dives, no special procedures are required, just the normal steps
+outlined above:</p></div>
+<div class="ulist"><ul>
+<li>
+<p>
+Select pSCR in the <em>Dive Mode</em> dropdown list on the <strong>Info</strong> panel.
+</p>
+</li>
+<li>
+<p>
+pSCR diving often involves gas changes, requiring an additional cylinder.
+  Define all the appropriate cylinders as described above and indicate the
+  cylinder/gas changes as described above in the section on
+  <a href="#S_MulticylinderDives">multicylinder dives</a>.
+</p>
+</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 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>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/pSCR_profile.jpg" alt="FIGURE: pSCR profile" />
+</div>
+</div>
+</div>
+<div class="sect3">
+<h4 id="S_CCR_dives">5.6.4. Closed circuit rebreather (CCR) dives</h4>
+<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
+has been breathed while doing two things to maintain a breathable oxygen
+concentration:
+a) remove carbon dioxide from the gas that has been exhaled
+regulate the oxygen concentration to remain within safe diving limits.  The
+CCR interface of <em>Subsurface</em> is currently experimental and under active
+development. Subsurface currently supports Poseidon MkVI and APD
+Discovery/Evolution dive computers. In contrast to a conventional
+recreational dive computer, a CCR system computer does not allow the
+download of a log containing multiple dives. Rather, each dive is stored
+independently. This means that <em>Subsurface</em> cannot download a dive log
+directly from a CCR dive computer, but that it imports CCR dive logs in the
+same way that it imports dive log data from other digital databases: one
+dive at a time.</td>
+</tr></table>
+</div>
+<div class="sect4">
+<h5 id="_import_a_ccr_dive">Import a CCR dive</h5>
+<div class="paragraph"><p>See the section dealing with <a href="#S_ImportingAlienDiveLogs">Importing dive
+information from other digital sources</a>. From the main menu of <em>Subsurface</em>,
+select <em>Import → Import log files</em> to bring up the
+<a href="#Unified_import">universal import dialogue</a>. As explained in that
+section, the bottom right hand of the import dialogue contains a dropdown
+list (labled <em>Filter:</em>) of appropriate devices that currently
+includes(Poseidon) MkVI or APD log viewer files (import for other CCR
+equipment is under active development). Having selected the appropriate CCR
+format and the directory where the original dive logs have been stored from
+the CCR dive computer, one can select a particular dive log file (in the
+case of the MkVI it is a file with a .txt extension). After selecting the
+appropriate dive log, activate the <em>Open</em> button at the bottom right hand of
+the universal import dialogue.  See the section below for</p></div>
+</div>
+<div class="sect4">
+<h5 id="_displayed_information_for_a_ccr_dive">Displayed information for a CCR dive</h5>
+<div class="paragraph"><p><em>Partial pressures of gases</em>: The graph of oxygen partial pressure shows the
+information from the oxygen sensors of the CCR equipment. In contrast to
+recreational equipment (where pO<sub>2</sub> values are calculated based on gas
+composition and dive depth), CCR equipment provide actual measurements of
+pO<sub>2</sub>, derived from oxygen sensors.  In this case the graph for oxygen
+partial pressure should be fairly flat, reflecting the setpoint settings
+during the dive. The mean pO<sub>2</sub> is NOT the mean oxygen partial pressure as
+given by the CCR equipment, but a value calculated by <em>Subsurface</em> as
+follows:</p></div>
+<div class="ulist"><ul>
+<li>
+<p>
+For TWO O<sub>2</sub> sensors the mean value of the two sensors are given.
+</p>
+</li>
+<li>
+<p>
+For THREE-sensor systems (e.g. APD), the mean value is also used. However
+  differences of more than 0,1 bar in the simultaneous readings of different
+  sensors are treated as spurious. If one of the three sensors provides
+  spurious data, it is ignored.
+</p>
+</li>
+<li>
+<p>
+If no sensor data is available, the pO<sub>2</sub> value is assumed to be equal to
+  the setpoint.
+</p>
+</li>
+</ul></div>
+<div class="paragraph"><p>The mean pO<sub>2</sub> of the sensors is indicated with a green line,</p></div>
+<div class="paragraph"><p>The oxygen setpoint values as well as the readings from the individual
+oxygen sensors can be shown. The display of additional CCR information is
+turned on by checking the appropriate checkboxes in the <em>Preferences</em> panel
+(accessible by selecting <a href="#S_CCR_options"><em>File → Preferences →
+Graph</em></a>). This part of the <em>Preferences</em> panel is shown in the image below,
+representing two checkboxes that modify the display of pO<sub>2</sub> when the
+appropriate toolbar button on the Dive Profile has been activated.</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/CCR_preferences_f20.jpg" alt="FIGURE: CCR preferences panel" />
+</div>
+</div>
+<div class="paragraph"><p>Checking any of these check boxes allows the display of additional
+oxygen-related information whenever the pO<sub>2</sub> toolbar button on the
+<em>Profile</em> panel is activated.  The first checkbox allows the display of
+setpoint information. This is a red line superimposed on the green oxygen
+partial pressure graph and allows a comparison of the mean measured oxygen
+partial pressure and the setpoint values, as shown below.</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/CCR_setpoint_f20.jpg" alt="FIGURE: CCR setpoint and po2 graph" />
+</div>
+</div>
+<div class="paragraph"><p>The second checkbox allows the display of the data from each individual
+oxygen sensor of the CCR equipment. The data for each sensor is colour-coded
+as follows:</p></div>
+<div class="ulist"><ul>
+<li>
+<p>
+Sensor 1: grey
+</p>
+</li>
+<li>
+<p>
+Sensor 2: blue
+</p>
+</li>
+<li>
+<p>
+Sensor 3: brown
+</p>
+</li>
+</ul></div>
+<div class="paragraph"><p>The mean oxygen pO<sub>2</sub> is indicated by the green line. This allows the direct
+comparison of data from each of the oxygen sensors, useful for detecting
+abnormally low or erratic readings from a particular sensor.</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/CCR_sensor_data_f20.jpg" alt="FIGURE: CCR sensor data graph" />
+</div>
+</div>
+<div class="paragraph"><p>The setpoint data can be overlaid on the oxygen sensor data by activating
+both of the above check boxes. Partial pressures for nitrogen (and helium,
+if applicable) are shown in the usual way as for open circuit dives.</p></div>
+<div class="paragraph"><p><em>Events</em>: Several events are logged, e.g. switching the mouthpiece to open
+circuit.  These events are indicated by yellow triangles and, if one hovers
+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 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_f22.jpg" alt="FIGURE: CCR dive profile" />
+</div>
+</div>
+<div class="paragraph"><p><em>Equipment-specific information</em>: Equipment-specific information gathered by
+<em>Subsurface</em> is shown in the <a href="#S_ExtraDataTab">Extra data tab</a>. This may
+include setup information or metadata about the dive.</p></div>
+<div class="paragraph"><p>The deco ceiling calculated by Subsurface is not very accurate because the
+precise pressure of nitrogen in the loop can usually not be determined from
+the dive log imported from the CCR equipment. Many CCR dive computers,
+however, report an internally-calculated deco ceiling that is reported in
+the dive log, reflecting a more accurate assessment. The display of this
+ceiling is activated by clicking the appropriate button to the left of the
+dive profile:</p></div>
+<div class="imageblock">
+<div class="content">
+<img src="images/icons/cceiling.jpg" alt="DC ceiling icon" />
+</div>
+</div>
+<div class="paragraph"><p>The default colour of the computer-generated deco ceiling is white. However,
+this can be set to red by checking the appropriate check box after selecting
+<em>File → Preferences → Graph</em>.  Below is a dive profile indicating the dive
+computer-generated deco ceiling:</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/CCR_dive_ceilingF22.jpg" alt="FIGURE: CCR computer-generated deco ceiling" />
+</div>
+</div>
+<div class="paragraph"><p>More equipment-specific information for downloading CCR dive logs for
+Poseidon MkVI and APD equipment can be found in
+<a href="#_appendix_b_dive_computer_specific_information_for_importing_dive_information">Appendix
+B</a>.</p></div>
+</div>
+</div>
+</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_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
@@ -3344,39 +3171,39 @@ Graph <strong>D</strong> shows the pressures after ascent to a depth of 4.5 mete
 <p>
 Graph <strong>E</strong> indicates the situation after remaining at 4.5 meters for 10
   minutes. The fast compartments have decreased in pressure. As expected, the
-  pressures in the slow compartments have not changed much.  The pressures in
-  the fast compartments do not approach the GFHigh value any more and the
-  diver is safer than in the situation indicated in graph <strong>D</strong>.
-</p>
-</li>
-</ul></div>
-</div>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_organising_the_logbook_manipulating_groups_of_dives">7. Organising the logbook (Manipulating groups of dives)</h2>
-<div class="sectionbody">
-<div class="sect2">
-<h3 id="_the_dive_list_context_menu">7.1. The Dive List context menu</h3>
-<div class="paragraph"><p>Several actions on either a single dive or a group of dives can be performed
-using the Dive List Context Menu, found by selecting either a single dive or
-a group of dives and then right-clicking.</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/ContextMenu.jpg" alt="Figure: Context Menu" />
-</div>
-</div>
-<div class="paragraph"><p>The context menu is used in many manipulations described below.</p></div>
-<div class="sect3">
-<h4 id="_customising_the_information_showed_in_the_strong_dive_list_strong_panel">7.1.1. Customising the information showed in the <strong>Dive List</strong> panel</h4>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/DiveListOptions.jpg" alt="Example: Dive list info options" />
-</div>
-</div>
-<div class="paragraph"><p>The default information in the <strong>Dive List</strong> includes, for each dive,
-Dive_number, Date, Rating, Dive_depth, Dive_duration and Dive_location. This
+  pressures in the slow compartments have not changed much.  The pressures in
+  the fast compartments do not approach the GFHigh value any more and the
+  diver is safer than in the situation indicated in graph <strong>D</strong>.
+</p>
+</li>
+</ul></div>
+</div>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_organising_the_logbook_manipulating_groups_of_dives">7. Organising the logbook (Manipulating groups of dives)</h2>
+<div class="sectionbody">
+<div class="sect2">
+<h3 id="_the_dive_list_context_menu">7.1. The Dive List context menu</h3>
+<div class="paragraph"><p>Several actions on either a single dive or a group of dives can be performed
+using the Dive List Context Menu, found by selecting either a single dive or
+a group of dives and then right-clicking.</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/ContextMenu.jpg" alt="Figure: Context Menu" />
+</div>
+</div>
+<div class="paragraph"><p>The context menu is used in many manipulations described below.</p></div>
+<div class="sect3">
+<h4 id="_customising_the_information_showed_in_the_strong_dive_list_strong_panel">7.1.1. Customising the information showed in the <strong>Dive List</strong> panel</h4>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/DiveListOptions.jpg" alt="Example: Dive list info options" />
+</div>
+</div>
+<div class="paragraph"><p>The default information in the <strong>Dive List</strong> includes, for each dive,
+Dive_number, Date, Rating, Dive_depth, Dive_duration and Dive_location. This
 information can be controlled and changed by right-clicking on the header
 bar of the <strong>Dive List</strong>. For instance, a right-click on the <em>Date</em> header
 brings up a list of items that can be shown in the dive list (see
@@ -3392,205 +3219,205 @@ dives at a particular site.  By pressing <em>Ctl-F</em> on the keyboard, a text
 is opened at the top left hand of the <strong>Dive List</strong>.  Type the name of a dive
 site in this text box and the <strong>Dive List</strong> is immediately filtered to show
 only the dives for that site.</p></div>
-</div>
-</div>
-<div class="sect2">
-<h3 id="S_Renumber">7.2. Renumbering the dives</h3>
-<div class="paragraph"><p>Dives are normally numbered incrementally from non-recent dives (low
-sequence numbers) to recent dives (having the highest sequence numbers). The
-numbering of the dives is not always consistent. For instance, when
-non-recent dives are added to the dive list the numbering does not
-automatically follow on because of the dives that are more recent in
-date/time than the newly-added dive with an older date/time. Therefore, one
-may sometimes need to renumber the dives.  This is performed by selecting
-(from the Main Menu) <em>Log → Renumber</em>. Users are given a choice with
-respect to the lowest sequence number to be used.  Completing this operation
-results in new sequence numbers (based on date/time)  for the dives in the
-<strong>Dive List</strong> panel.</p></div>
-<div class="paragraph"><p>One can also renumber a few selected dives in the dive list. Select the
-dives that need renumbering. Right-click on the selected list and use the
-Dive List Context Menu to perform the renumbering. A popup window appears
-requiring the user to specify the starting number for the renumbering
-process.</p></div>
-</div>
-<div class="sect2">
-<h3 id="S_Group">7.3. Grouping dives into trips and manipulating trips</h3>
-<div class="paragraph"><p>For regular divers, the dive list can rapidly become very long. <em>Subsurface</em>
-can group dives into <em>trips</em>. It performs this by grouping dives that have
-date/times not separated in time by more than two days, thus creating a
-single heading for each diving trip represented in the dive log. Below is an
-ungrouped dive list (<strong>A</strong>, on the left) as well as the corresponding grouped
-dive list comprising five dive trips (<strong>B</strong>, on the right):</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/Group2.jpg" alt="Figure: Grouping dives" />
-</div>
-</div>
-<div class="paragraph"><p>Grouping into trips allows a rapid way of accessing individual dives without
-having to scan a long lists of dives. In order to group the dives in a dive
-list, (from the Main Menu) select <em>Log → 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>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
-the trip.</p></div>
-</div>
-<div class="sect3">
-<h4 id="_collapsing_or_expanding_dive_information_for_different_trips">7.3.3. Collapsing or expanding dive information for different trips</h4>
-<div class="paragraph"><p>After selecting a particular trip in the dive list, the context menu allows
-several possibilities to expand or collapse dives within trips. This
-includes expanding all trips, collapsing all trips and collapsing all trips
-except the selected one.</p></div>
-</div>
-<div class="sect3">
-<h4 id="_merging_dives_from_more_than_one_trip_into_a_single_trip">7.3.4. Merging dives from more than one trip into a single trip</h4>
-<div class="paragraph"><p>After selecting a trip title, the context menu allows the merging of trips
-by either merging the selected trip with the trip below or with the trip
-above.(Merge trip with trip below; Merge trip with trip above)</p></div>
-</div>
-<div class="sect3">
-<h4 id="_splitting_a_single_trip_into_more_than_one_trip">7.3.5. Splitting a single trip into more than one trip</h4>
-<div class="paragraph"><p>If a trip includes five dives, the user can split this trip into two trips
-(trip 1: top 3 dives; trip 2: bottom 2 dives) by selecting and
-right-clicking the top three dives. The resulting context menu allows the
-user to create a new trip by choosing the option <strong>Create new trip
-above</strong>. The top three dives are then grouped into a separate trip. The
-figures below shows the selection and context menu on the left (A) and the
-completed action on the right (B):</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/SplitDive3a.jpg" alt="FIGURE: Split a trip into 2 trips" />
-</div>
-</div>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_manipulating_single_dives">7.4. Manipulating single dives</h3>
-<div class="sect3">
-<h4 id="_delete_a_dive_from_the_dive_log">7.4.1. Delete a dive from the dive log</h4>
-<div class="paragraph"><p>Dives can be permanently deleted from the dive log by selecting and
-right-clicking them to bring up the context menu, and then selecting <strong>Delete
-dive(s)</strong>. Typically this would apply to a case where a user wishes to delete
-workshop calibration dives of the dive computer or dives of extremely short
-duration.</p></div>
-</div>
-<div class="sect3">
-<h4 id="_unlink_a_dive_from_a_trip">7.4.2. Unlink a dive from a trip</h4>
-<div class="paragraph"><p>Users can unlink dives from the trip to which they belong. In order to do
-this, select and right-click the relevant dives to bring up the context
-menu. Then select the option <strong>Remove dive(s)  from trip</strong>. The dive(s) now
-appear immediately above or below the trip to which they belonged, depending
-on the date and time of the unliked dive.</p></div>
-</div>
-<div class="sect3">
-<h4 id="_add_a_dive_to_the_trip_immediately_above">7.4.3. Add a dive to the trip immediately above</h4>
-<div class="paragraph"><p>Selected dives can be moved from the trip to which they belong and placed
-within a separate trip. To do this, select and right-click the dive(s) to
-bring up the context menu, and then select <strong>Create new trip above</strong>.</p></div>
-</div>
-<div class="sect3">
-<h4 id="_shift_the_start_time_of_dive_s">7.4.4. Shift the start time of dive(s)</h4>
-<div class="paragraph"><p>Sometimes it is necessary to adjust the start time of a dive. This may apply
-to situations where dives are performed in different time zones or when the
-dive computer has an erroneous time. In order to do this, user must select
-and right-click the dive(s) to be adjusted. This action brings up the
-context menu on which the <strong>Shift times</strong> option should be selected. User must
-then specify the time (in hours and minutes) by which the dives should be
-adjusted and click on the option indicating whether the time adjustment
-should be ealier or later.</p></div>
-</div>
-<div class="sect3">
-<h4 id="_merge_dives_into_a_single_dive">7.4.5. Merge dives into a single dive</h4>
-<div class="paragraph"><p>Sometimes a dive is briefly interrupted, e.g. if a diver returns to the
-surface for a few minutes, resulting in two or more dives being recorded by
-the dive computer and appearing as different dives in the <strong>Dive List</strong>
-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>
-<div class="sect3">
-<h4 id="_undo_dive_manipulations">7.4.6. Undo dive manipulations</h4>
-<div class="paragraph"><p>Important actions on dives or trips, described above, can be undone or
-redone.  This includes: <em>delete dives</em>, <em>merge dives</em>, <em>renumber dives</em> and
-<em>shift dive times</em>.  To do this after performing any of these actions, from
-the <strong>Main Menu</strong> select <em>Edit</em>. This brings up the possibility to <em>Undo</em> or
-<em>Redo</em> an action.</p></div>
-</div>
-</div>
-<div class="sect2">
-<h3 id="S_Filter">7.5. Filtering the dive list</h3>
-<div class="paragraph"><p>The dives in the <strong>Dive List</strong> panel can be filtered, that is, one can select
-only some of the dives based on their attributes, e.g. dive tags, dive site,
-dive master, buddy or protective clothing. For instance, filtering allows
-one to list the deep dives at a particular dive site, or otherwise the cave
-dives with a particular buddy.</p></div>
-<div class="paragraph"><p>To open the filter, select <em>Log → Filter divelist</em> from the main menu. This
-opens the <em>Filter Panel</em> at the top of the <em>Subsurface</em> window. Three icons
-are located at the top right hand of the filter panel. The <em>Filter Panel</em>
-can be reset (i.e. all current filters cleared) by selecting the <strong>yellow
-angled arrow</strong>. The <em>Filter Panel</em> may also be minimised by selecting the
-<strong>green up-arrow". When minimised, only these three icons are shown.  The
-panel can be maximised by clicking the icon that minimised the panel. The
-filter may also be reset and closed by selecting the *red button</strong> with the
-white cross.  An example of the <em>Filter Panel</em> is shown in the figure below.</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/Filterpanel.jpg" alt="Figure: Filter panel" />
-</div>
-</div>
-<div class="paragraph"><p>Four filter criteria may be used to filter the dive list: dive tags, person
-(buddy / dive master), dive site and dive suit, each of which is represented
-by a check list with check boxes. Above each check list is a second-level
-filter tool, allowing the listing of only some of the attributes within that
-check list. For instance, typing "<em>ca</em>" in the filter textbox above the tags
-check list results in the tags check list being reduced to "<em>cave</em>" and
-"<em>cavern</em>". Filtering of the check list enables the rapid finding of search
-terms for filtering the dive list.</p></div>
-<div class="paragraph"><p>To activate filtering of the dive list, check at least tone check box in one
-of the four check lists. The dive list is then shortened to include only the
-dives that pertain to the criteria specified in the check lists.  The four
-check lists work as a filter with <em>AND</em> operators, Subsurface filters
-therefore for <em>cave</em> as a tag AND <em>Joe Smith</em> as a buddy; but the filters
-within a category are inclusive - filtering for <em>cave</em> and <em>boat</em> shows
-those dives that have either one OR both of these tags.</p></div>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="S_ExportLog">8. Exporting the dive log or parts of the dive log</h2>
-<div class="sectionbody">
-<div class="paragraph"><p>There are two routes for the export of dive information from Subsurface:</p></div>
-<div class="ulist"><ul>
-<li>
-<p>
-Exporter les informations de plongée vers <em>Facebook</em>
-</p>
-</li>
-<li>
-<p>
+</div>
+</div>
+<div class="sect2">
+<h3 id="S_Renumber">7.2. Renumbering the dives</h3>
+<div class="paragraph"><p>Dives are normally numbered incrementally from non-recent dives (low
+sequence numbers) to recent dives (having the highest sequence numbers). The
+numbering of the dives is not always consistent. For instance, when
+non-recent dives are added to the dive list the numbering does not
+automatically follow on because of the dives that are more recent in
+date/time than the newly-added dive with an older date/time. Therefore, one
+may sometimes need to renumber the dives.  This is performed by selecting
+(from the Main Menu) <em>Log → Renumber</em>. Users are given a choice with
+respect to the lowest sequence number to be used.  Completing this operation
+results in new sequence numbers (based on date/time)  for the dives in the
+<strong>Dive List</strong> panel.</p></div>
+<div class="paragraph"><p>One can also renumber a few selected dives in the dive list. Select the
+dives that need renumbering. Right-click on the selected list and use the
+Dive List Context Menu to perform the renumbering. A popup window appears
+requiring the user to specify the starting number for the renumbering
+process.</p></div>
+</div>
+<div class="sect2">
+<h3 id="S_Group">7.3. Grouping dives into trips and manipulating trips</h3>
+<div class="paragraph"><p>For regular divers, the dive list can rapidly become very long. <em>Subsurface</em>
+can group dives into <em>trips</em>. It performs this by grouping dives that have
+date/times not separated in time by more than two days, thus creating a
+single heading for each diving trip represented in the dive log. Below is an
+ungrouped dive list (<strong>A</strong>, on the left) as well as the corresponding grouped
+dive list comprising five dive trips (<strong>B</strong>, on the right):</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/Group2.jpg" alt="Figure: Grouping dives" />
+</div>
+</div>
+<div class="paragraph"><p>Grouping into trips allows a rapid way of accessing individual dives without
+having to scan a long lists of dives. In order to group the dives in a dive
+list, (from the Main Menu) select <em>Log → 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>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
+the trip.</p></div>
+</div>
+<div class="sect3">
+<h4 id="_collapsing_or_expanding_dive_information_for_different_trips">7.3.3. Collapsing or expanding dive information for different trips</h4>
+<div class="paragraph"><p>After selecting a particular trip in the dive list, the context menu allows
+several possibilities to expand or collapse dives within trips. This
+includes expanding all trips, collapsing all trips and collapsing all trips
+except the selected one.</p></div>
+</div>
+<div class="sect3">
+<h4 id="_merging_dives_from_more_than_one_trip_into_a_single_trip">7.3.4. Merging dives from more than one trip into a single trip</h4>
+<div class="paragraph"><p>After selecting a trip title, the context menu allows the merging of trips
+by either merging the selected trip with the trip below or with the trip
+above.(Merge trip with trip below; Merge trip with trip above)</p></div>
+</div>
+<div class="sect3">
+<h4 id="_splitting_a_single_trip_into_more_than_one_trip">7.3.5. Splitting a single trip into more than one trip</h4>
+<div class="paragraph"><p>If a trip includes five dives, the user can split this trip into two trips
+(trip 1: top 3 dives; trip 2: bottom 2 dives) by selecting and
+right-clicking the top three dives. The resulting context menu allows the
+user to create a new trip by choosing the option <strong>Create new trip
+above</strong>. The top three dives are then grouped into a separate trip. The
+figures below shows the selection and context menu on the left (A) and the
+completed action on the right (B):</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/SplitDive3a.jpg" alt="FIGURE: Split a trip into 2 trips" />
+</div>
+</div>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_manipulating_single_dives">7.4. Manipulating single dives</h3>
+<div class="sect3">
+<h4 id="_delete_a_dive_from_the_dive_log">7.4.1. Delete a dive from the dive log</h4>
+<div class="paragraph"><p>Dives can be permanently deleted from the dive log by selecting and
+right-clicking them to bring up the context menu, and then selecting <strong>Delete
+dive(s)</strong>. Typically this would apply to a case where a user wishes to delete
+workshop calibration dives of the dive computer or dives of extremely short
+duration.</p></div>
+</div>
+<div class="sect3">
+<h4 id="_unlink_a_dive_from_a_trip">7.4.2. Unlink a dive from a trip</h4>
+<div class="paragraph"><p>Users can unlink dives from the trip to which they belong. In order to do
+this, select and right-click the relevant dives to bring up the context
+menu. Then select the option <strong>Remove dive(s)  from trip</strong>. The dive(s) now
+appear immediately above or below the trip to which they belonged, depending
+on the date and time of the unliked dive.</p></div>
+</div>
+<div class="sect3">
+<h4 id="_add_a_dive_to_the_trip_immediately_above">7.4.3. Add a dive to the trip immediately above</h4>
+<div class="paragraph"><p>Selected dives can be moved from the trip to which they belong and placed
+within a separate trip. To do this, select and right-click the dive(s) to
+bring up the context menu, and then select <strong>Create new trip above</strong>.</p></div>
+</div>
+<div class="sect3">
+<h4 id="_shift_the_start_time_of_dive_s">7.4.4. Shift the start time of dive(s)</h4>
+<div class="paragraph"><p>Sometimes it is necessary to adjust the start time of a dive. This may apply
+to situations where dives are performed in different time zones or when the
+dive computer has an erroneous time. In order to do this, user must select
+and right-click the dive(s) to be adjusted. This action brings up the
+context menu on which the <strong>Shift times</strong> option should be selected. User must
+then specify the time (in hours and minutes) by which the dives should be
+adjusted and click on the option indicating whether the time adjustment
+should be ealier or later.</p></div>
+</div>
+<div class="sect3">
+<h4 id="_merge_dives_into_a_single_dive">7.4.5. Merge dives into a single dive</h4>
+<div class="paragraph"><p>Sometimes a dive is briefly interrupted, e.g. if a diver returns to the
+surface for a few minutes, resulting in two or more dives being recorded by
+the dive computer and appearing as different dives in the <strong>Dive List</strong>
+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>
+<div class="sect3">
+<h4 id="_undo_dive_manipulations">7.4.6. Undo dive manipulations</h4>
+<div class="paragraph"><p>Important actions on dives or trips, described above, can be undone or
+redone.  This includes: <em>delete dives</em>, <em>merge dives</em>, <em>renumber dives</em> and
+<em>shift dive times</em>.  To do this after performing any of these actions, from
+the <strong>Main Menu</strong> select <em>Edit</em>. This brings up the possibility to <em>Undo</em> or
+<em>Redo</em> an action.</p></div>
+</div>
+</div>
+<div class="sect2">
+<h3 id="S_Filter">7.5. Filtering the dive list</h3>
+<div class="paragraph"><p>The dives in the <strong>Dive List</strong> panel can be filtered, that is, one can select
+only some of the dives based on their attributes, e.g. dive tags, dive site,
+dive master, buddy or protective clothing. For instance, filtering allows
+one to list the deep dives at a particular dive site, or otherwise the cave
+dives with a particular buddy.</p></div>
+<div class="paragraph"><p>To open the filter, select <em>Log → Filter divelist</em> from the main menu. This
+opens the <em>Filter Panel</em> at the top of the <em>Subsurface</em> window. Three icons
+are located at the top right hand of the filter panel. The <em>Filter Panel</em>
+can be reset (i.e. all current filters cleared) by selecting the <strong>yellow
+angled arrow</strong>. The <em>Filter Panel</em> may also be minimised by selecting the
+<strong>green up-arrow". When minimised, only these three icons are shown.  The
+panel can be maximised by clicking the icon that minimised the panel. The
+filter may also be reset and closed by selecting the *red button</strong> with the
+white cross.  An example of the <em>Filter Panel</em> is shown in the figure below.</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/Filterpanel.jpg" alt="Figure: Filter panel" />
+</div>
+</div>
+<div class="paragraph"><p>Four filter criteria may be used to filter the dive list: dive tags, person
+(buddy / dive master), dive site and dive suit, each of which is represented
+by a check list with check boxes. Above each check list is a second-level
+filter tool, allowing the listing of only some of the attributes within that
+check list. For instance, typing "<em>ca</em>" in the filter textbox above the tags
+check list results in the tags check list being reduced to "<em>cave</em>" and
+"<em>cavern</em>". Filtering of the check list enables the rapid finding of search
+terms for filtering the dive list.</p></div>
+<div class="paragraph"><p>To activate filtering of the dive list, check at least tone check box in one
+of the four check lists. The dive list is then shortened to include only the
+dives that pertain to the criteria specified in the check lists.  The four
+check lists work as a filter with <em>AND</em> operators, Subsurface filters
+therefore for <em>cave</em> as a tag AND <em>Joe Smith</em> as a buddy; but the filters
+within a category are inclusive - filtering for <em>cave</em> and <em>boat</em> shows
+those dives that have either one OR both of these tags.</p></div>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="S_ExportLog">8. Exporting the dive log or parts of the dive log</h2>
+<div class="sectionbody">
+<div class="paragraph"><p>There are two routes for the export of dive information from Subsurface:</p></div>
+<div class="ulist"><ul>
+<li>
+<p>
+Exporter les informations de plongée vers <em>Facebook</em>
+</p>
+</li>
+<li>
+<p>
 <a href="#S_Export_other">Exporter des informations de plongée vers d’autres
   destinations ou formats</a>
 </p>
@@ -3603,56 +3430,56 @@ d’export. Cela est du au fait que l’export vers <em>Facebook</em> n
 connexion vers <em>Facebook</em>, nécessitant un identifiant et un mot de passe. À
 partir du menu principal, si vous sélectionnez <em>Fichier → Préférences →
 Facebook</em>, un écran de connexion est présenté (voir l’image <strong>A</strong> sur la
-gauche, ci dessous). Entrez vos identifiant et mot de passe <em>Facebook</em>. Une
-fois connecté à <em>Facebook</em>, le panneau de l’image <strong>B</strong> ci dessous est
-présenté. Ce panneau a un bouton qui doit être sélectionné pour fermer la
-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>Une fois qu’une connexion à <em>Facebook</em> est établie, transférer un profil de
-plongée vers <em>Facebook</em> est facile. Une icône <em>Facebook</em> apparait dans le
-panneau <strong>Notes</strong> de <em>Subsurface</em> (voir l’image <strong>A</strong> ci-dessous). Assurez-vous
-que la plongée à transférer est affichée dans le panneau <strong>Profil de plongée</strong>
-de <em>Subsurface</em>. Sélectionnez l’icône <em>Facebook</em> et une fenêtre s’affiche,
-pour déterminer quelles informations seront transférées avec le profil de
-plongée (voir l’image <strong>B</strong> ci-dessous). Pour transférer un profil de plongée
-vers <em>Facebook</em>, le nom d’un album <em>Facebook</em> doit être fourni. Les cases à
-cocher sur la partie gauche permettent de sélectionner des informations
-supplémentaires à transférer avec le profil de plongée. Ces informations
-sont affichées dans le champs de texte sur la partie droite du
-panneau. (voir l’image <strong>B</strong> ci dessous). Vous pouvez facilement modifier le
-message qui sera envoyé directement dans ce champs. Une fois les
-informations supplémentaires ajoutées et vérifiées, sélectionner le bouton
-<em>OK</em> qui lance le transfert vers <em>Facebook</em>. Après un moment, une fenêtre
-apparait indiquant le succès du transfert.</p></div>
-<div class="paragraph"><p>À la fois l’album créé et la publication sur votre ligne temporelle seront
-marquées comme privés. Pour que vos amis puissent voir la publication, vous
-devrez modifier les permissions à partir d’une connexion Facebook standard
-depuis un navigateur ou l’application Facebook. Malgré que cela soit une
-étape supplémentaire, les développeurs ont pensé que c'était la meilleure
-solution pour éviter d’avoir des publications non désirées sur votre ligne
-temporelle publique.</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/facebook2_f20.jpg" alt="Figure: Facebook login" />
-</div>
-</div>
-<div class="paragraph"><p>Si besoin, fermer la connexion <em>Facebook</em> en fermant <em>Subsurface</em> ou en
-sélectionnant _Fichier → Préférences → Facebook, à partir du menu
-principal et en cliquant sur le bouton approprié dans le panneau des
-préférences Facebook.</p></div>
-</div>
-<div class="sect2">
-<h3 id="S_Export_other">8.2. Export dive information  to other destinations or formats</h3>
-<div class="paragraph"><p>For non-<em>Facebook exports</em>, the export function can be reached by selecting
-<em>File → Export</em>, which brings up the Export dialog. This dialog always
-gives two options: save ALL dives, or save only the dives selected in <strong>Dive
-List</strong> panel of <em>Subsurface</em>. Click the appropriate radio button (see images
-below).</p></div>
-<div class="imageblock" style="text-align:center;">
+gauche, ci dessous). Entrez vos identifiant et mot de passe <em>Facebook</em>. Une
+fois connecté à <em>Facebook</em>, le panneau de l’image <strong>B</strong> ci dessous est
+présenté. Ce panneau a un bouton qui doit être sélectionné pour fermer la
+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>Une fois qu’une connexion à <em>Facebook</em> est établie, transférer un profil de
+plongée vers <em>Facebook</em> est facile. Une icône <em>Facebook</em> apparait dans le
+panneau <strong>Notes</strong> de <em>Subsurface</em> (voir l’image <strong>A</strong> ci-dessous). Assurez-vous
+que la plongée à transférer est affichée dans le panneau <strong>Profil de plongée</strong>
+de <em>Subsurface</em>. Sélectionnez l’icône <em>Facebook</em> et une fenêtre s’affiche,
+pour déterminer quelles informations seront transférées avec le profil de
+plongée (voir l’image <strong>B</strong> ci-dessous). Pour transférer un profil de plongée
+vers <em>Facebook</em>, le nom d’un album <em>Facebook</em> doit être fourni. Les cases à
+cocher sur la partie gauche permettent de sélectionner des informations
+supplémentaires à transférer avec le profil de plongée. Ces informations
+sont affichées dans le champs de texte sur la partie droite du
+panneau. (voir l’image <strong>B</strong> ci dessous). Vous pouvez facilement modifier le
+message qui sera envoyé directement dans ce champs. Une fois les
+informations supplémentaires ajoutées et vérifiées, sélectionner le bouton
+<em>OK</em> qui lance le transfert vers <em>Facebook</em>. Après un moment, une fenêtre
+apparait indiquant le succès du transfert.</p></div>
+<div class="paragraph"><p>À la fois l’album créé et la publication sur votre ligne temporelle seront
+marquées comme privés. Pour que vos amis puissent voir la publication, vous
+devrez modifier les permissions à partir d’une connexion Facebook standard
+depuis un navigateur ou l’application Facebook. Malgré que cela soit une
+étape supplémentaire, les développeurs ont pensé que c'était la meilleure
+solution pour éviter d’avoir des publications non désirées sur votre ligne
+temporelle publique.</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/facebook2_f20.jpg" alt="Figure: Facebook login" />
+</div>
+</div>
+<div class="paragraph"><p>Si besoin, fermer la connexion <em>Facebook</em> en fermant <em>Subsurface</em> ou en
+sélectionnant _Fichier → Préférences → Facebook, à partir du menu
+principal et en cliquant sur le bouton approprié dans le panneau des
+préférences Facebook.</p></div>
+</div>
+<div class="sect2">
+<h3 id="S_Export_other">8.2. Export dive information  to other destinations or formats</h3>
+<div class="paragraph"><p>For non-<em>Facebook exports</em>, the export function can be reached by selecting
+<em>File → Export</em>, which brings up the Export dialog. This dialog always
+gives two options: save ALL dives, or save only the dives selected in <strong>Dive
+List</strong> panel of <em>Subsurface</em>. Click the appropriate radio button (see images
+below).</p></div>
+<div class="imageblock" style="text-align:center;">
 <div class="content">
 <img src="images/Export_f20.jpg" alt="Figure: Export dialog" />
 </div>
@@ -3778,317 +3605,317 @@ instance <em>www.divelogs.de</em>.</p></div>
 </div>
 <div class="sect1">
 <h2 id="S_Cloud_access">9. Keeping a <em>Subsurface</em> dive log in the Cloud</h2>
-<div class="sectionbody">
-<div class="paragraph"><p>For each diver, dive log information is highly important. Not only is it a
-record of diving activities for one’s own pleasure, but it is important
-information required for admission to further training courses or
-(sometimes) even diving sites. The security of the dive log is therefore
-critical. In order to have a dive log that is resistant to failure of a home
-computer hard drive, loss or theft of equipment, the Cloud is an obvious
-solution. This also has the added benefit that one can access one’s dive log
-from anywhere in the world without having to carry it with oneself. For this
-reason, facilities such as <em>divelogs.de</em> and <em>Diving Log</em> offer to store
-dive log information on the Internet.</p></div>
-<div class="paragraph"><p><em>Subsurface</em> includes access to a transparently integrated cloud storage
-backend that is available to all Subsurface users. In order to use the
-<em>Subsurface cloud storage</em> the users need to follow these steps</p></div>
-<div class="ulist"><ul>
-<li>
-<p>
-Create a cloud storage account:
-</p>
-<div class="ulist"><ul>
-<li>
-<p>
-Open the <em>Preferences</em>
-</p>
-</li>
-<li>
-<p>
-Under <em>Defaults</em>, in the <em>Subsurface cloud storage</em> section, enter
-their email address and a password
-</p>
-</li>
-<li>
-<p>
-Click <em>Apply</em> or <em>Done</em> to send email address and password to the
-server
-</p>
-</li>
-<li>
-<p>
-The server will respond with an email to the given address that
-contains a verification PIN
-</p>
-</li>
-<li>
-<p>
-Enter the PIN in the corresponding field in the <em>Preferences</em> dialog
-(this field is only visible while the backend server is waiting for email
-address confirmation)
-</p>
-</li>
-<li>
-<p>
-Click <em>Apply</em> or <em>Done</em> again, the <em>Subsurface cloud storage</em> account
-will be marked as verified and the <em>Subsurface cloud storage</em> service can
-be used
-</p>
-</li>
-</ul></div>
-</li>
-<li>
-<p>
-Use <em>Subsurface cloud storage</em>
-</p>
-<div class="ulist"><ul>
-<li>
-<p>
-From the <em>File</em> menu users can load and save data to the <em>Subsurface
-cloud storage</em> server
-</p>
-</li>
-<li>
-<p>
-In the <em>Preferences</em>, users can select to use the <em>Subsurface cloud
-storage</em> data as their default data file which means that the data from
-the <em>Subsurface cloud storage</em> will be displayed when <em>Subsurface</em> starts.
-</p>
-</li>
-</ul></div>
-</li>
-</ul></div>
-<div class="paragraph"><p><em>Subsurface</em> keeps a local copy of the data and <em>Subsurface</em> stays fully
-functional if used while offline. <em>Subsurface</em> will simply synchronize the
-data with the backend serer the next time it is used while the computer is
-online.</p></div>
-<div class="paragraph"><p>Although <em>Subsurface</em> offers integrated Cloud storage of dive logs, it is
-also simple to achieve this using several of the existing facilities on the
-Internet.</p></div>
-<div class="paragraph"><p>For instance <a href="http://www.dropbox.com/"><em>Dropbox</em></a> offers a free application
-that allows files on the Dropbox servers to be seen as a local folder on
-one’s desktop computer.</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/Cloud.jpg" alt="FIGURE: Dropbox folder" />
-</div>
-</div>
-<div class="paragraph"><p>The <em>Dropbox</em> program creates a copy of the <em>Dropbox</em> Internet Cloud content
-on one’s desktop computer. When the computer is connected to the Internet,
-the Internet content is automatically updated. Therefore both the <em>Open</em> and
-<em>Save</em> of dive logs are done using the local copy of the dive log in the
-local <em>Dropbox</em> folder, so there’s no need for a direct internet
-connection. If the local copy is modified, e.g. by adding a dive, the remote
-copy in the <em>Dropbox</em> server in the Cloud will be automatically updated
-whenever Internet access is available.</p></div>
-<div class="paragraph"><p>In this way a dive log in one’s <em>Dropbox</em> folder can be accessed seamlessly
-from the Internet and can be accessed from any place with Internet
-access. Currently there are no costs involved for this service. Dropbox
-(Windows, Mac and Linux) can be installed by accessing the
-<a href="http://www.dropbox.com/install"><em>Install Page on the Dropbox website</em></a>
-Alternatively one can use <em>Dropbox</em> as a mechanism to backup one’s dive
-log. To Store a dive log in the Cloud, select <em>File → Save as</em> from the
-<em>Subsurface</em> main menu, navigate to the <em>Dropbox</em> folder and select the
-<em>Save</em> button. To access the dive log in the Cloud, select <em>File → Open
-Logbook</em> from the <em>Subsurface</em> main menu and navigate to the dive log file
-in the <em>Dropbox</em> folder and select the <em>Open</em> button.</p></div>
-<div class="paragraph"><p>Several paid services exist on the Internet (e.g. Google, Amazon) where the
-same process could be used for the Cloud-based storage of dive logs.</p></div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="S_PrintDivelog">10. Printing a dive log</h2>
-<div class="sectionbody">
-<div class="paragraph"><p><em>Subsurface</em> provides a simple and flexible interface to print a whole dive log or only a few selected dives.
-  Pre-installed templates or a custom written template can be used to choose where the data are fitted into the page.</p></div>
-<div class="paragraph"><p>Before printing, two decisions are required:</p></div>
-<div class="ulist"><ul>
-<li>
-<p>
-Should the whole dive log be printed or only part of it? If only part of the
-  dive log is required, then select the required dives from the <strong>Dive List</strong>
-  panel.
-</p>
-</li>
-<li>
-<p>
-If the dive profiles needs printing, what gas partial pressure information
-  should be shown? Select the appropriate toggle-buttons on the button bar to
-  the left of the <strong>Dive Profile</strong> panel.
-</p>
-</li>
-</ul></div>
-<div class="paragraph"><p>If <em>File → Print</em> is selected from the Main menu, the the dialogue below
-(image <strong>A</strong>) appears. Three specifications are needed to achieve the desired
-information and page layout:</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/Print1_f22.jpg" alt="FIGURE: Print dialogue" />
-</div>
-</div>
-<div class="olist arabic"><ol class="arabic">
-<li>
-<p>
-Under <em>Print type</em> select one of two options:
-</p>
-<div class="ulist"><ul>
-<li>
-<p>
-<em>Dive list print</em>: Print dives from the <strong>Dive List</strong> panel with profiles and
-  other information.
-</p>
-</li>
-<li>
-<p>
-<em>Statistics print</em>: Print yearly statistics of the dives.
-</p>
-</li>
-</ul></div>
-</li>
-<li>
-<p>
-Under <em>Print options</em> select:
-</p>
-<div class="ulist"><ul>
-<li>
-<p>
-Printing only the dives selected from the dive list prior to activating the
-  print dialogue by checking the box <em>Print only selected dives</em>. If this
-  check box is <strong>not</strong> checked all dives in the <strong>Dive List</strong> panel are printed.
-</p>
-</li>
-<li>
-<p>
-Printing in colour, achieved by checking the box with <em>Print in colour</em>. If
-  this check box is not checked, printing is in monochrome (grey scale).
-</p>
-</li>
-</ul></div>
-</li>
-</ol></div>
-<div class="paragraph"><p>Under <em>Template</em> select a template to be used as the page layout. There are
-several templates (see image <strong>B</strong>, above).</p></div>
-<div class="ulist"><ul>
-<li>
-<p>
-<em>Table</em>: This prints a summary table of all dives selected (see below).
-</p>
-</li>
-</ul></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/Print_summarylist_f22.jpg" alt="FIGURE: Print summary table" />
-</div>
-</div>
-<div class="ulist"><ul>
-<li>
-<p>
-<em>Flow layout</em>: Print the text associated with each diev without printing the
-  dive profiles
-     of each dive (see below):
-</p>
-</li>
-</ul></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/Print_flow_layout_f22.jpg" alt="FIGURE: Print flow layout" />
-</div>
-</div>
-<div class="ulist"><ul>
-<li>
-<p>
-<em>One Dive</em>: Print one dive per page, also showing the dive profile (see
-  below)
-</p>
-</li>
-</ul></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/print2_f22.jpg" alt="FIGURE: Print one dive / page" />
-</div>
-</div>
-<div class="ulist"><ul>
-<li>
-<p>
-<em>Two Dives</em>: Print two dives per page, also showing the dive profiles.
-</p>
-</li>
-<li>
-<p>
-<em>Six Dives</em>: Print six dives per page, also showing the dive profiles.
-</p>
-</li>
-<li>
-<p>
-<em>Custom</em>: This option allows customisation of the print contents and
-  layout. This is
-     discussed at the end of this section.
-</p>
-</li>
-</ul></div>
-<div class="paragraph"><p>Users can <em>Preview</em> the printed page by selecting the <em>Preview</em> button on
-the dialogue (see image <strong>A</strong> at the start of this section). After preview,
-changes to the options in the print dialogue can be made, resulting in a
-layout that fits personal taste.</p></div>
-<div class="paragraph"><p>Next, select the <em>Print</em> button (see image <strong>A</strong> at the start of this
-section). This activates the regular print dialogue used by the user
-operating system, allowing one to choose a printer and to set its properties
-(see image below):</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/Print_print_f22.jpg" alt="FIGURE: Print one dive / page" />
-</div>
-</div>
-<div class="paragraph"><p>Set the print resolution of the printer to an appropriate value by changing
-the printer <em>Properties</em>. Finally, select the <em>Print</em> button to print the
-dives.  Below is a (rather small) example of the output for one particular
-page.</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/Printpreview.jpg" alt="FIGURE: Print preview page" />
-</div>
-</div>
-<div class="sect2">
-<h3 id="_write_a_custom_printing_template_advanced">10.1. Write a custom printing template (advanced)</h3>
-<div class="paragraph"><p>Writing a custom template is an effective way to produce highly customized
-printouts. Subsurface uses HTML templates to render printing. One can create
-a template, export a new template, import an existing template and delete an
-existing template by using the appropriate buttons under the <em>Template</em>
-dropdown list in the print dialogue. See <a href="#S_APPENDIX_E">APPENDIX E</a> for
-information on how to write or modify a template.</p></div>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="S_Configure">11. Configurer un ordinateur de plongée</h2>
-<div class="sectionbody">
-<div class="paragraph"><p><em>Subsurface</em> permet de configurer son ordinateur de plongée. Actuellement,
-les familles d’ordinateurs supportés sont Heinrichs-Weikamp (OSTC 2, OSTC 3)
-et Suunto Vyper (Stinger, Mosquito, D3, Vyper, Vytec, Cobra, Gekko et
-Zoop). De nombreux paramètres de ces ordinateurs de plongée peuvent être
-lues et modifiées. La première étape est de s’assurer que les pilotes pour
-votre ordinateur de plongée sont installés et que le nom de périphérique de
-l’ordinateur de plongée est connu. Voir
-<a href="#_appendix_a_operating_system_specific_information_for_importing_dive_information_from_a_dive_computer">APPENDIX A</a> pour plus d’informations sur la manière de procéder.</p></div>
-<div class="paragraph"><p>Une fois que l’ordinateur de plongée est connecté à <em>Subsurface</em>,
-sélectionner <em>Fichier → Configurer l’ordinateur de plongée</em>, à partir du
-menu principal. Fournir le nom du périphérique dans le champ en haut du
-panneau de configuration qui ouvre et sélectionne le bon modèle d’ordinateur
-de plongée à partir du panneau à gauche (voir l’image ci-dessous).</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/Configure_dc_f20.jpg" alt="FIGURE: Configure dive computer" />
-</div>
-</div>
-<div class="paragraph"><p>En utilisant les boutons appropriés du panneau de configuration, les actions
-suivantes peuvent être réalisées :</p></div>
+<div class="sectionbody">
+<div class="paragraph"><p>For each diver, dive log information is highly important. Not only is it a
+record of diving activities for one’s own pleasure, but it is important
+information required for admission to further training courses or
+(sometimes) even diving sites. The security of the dive log is therefore
+critical. In order to have a dive log that is resistant to failure of a home
+computer hard drive, loss or theft of equipment, the Cloud is an obvious
+solution. This also has the added benefit that one can access one’s dive log
+from anywhere in the world without having to carry it with oneself. For this
+reason, facilities such as <em>divelogs.de</em> and <em>Diving Log</em> offer to store
+dive log information on the Internet.</p></div>
+<div class="paragraph"><p><em>Subsurface</em> includes access to a transparently integrated cloud storage
+backend that is available to all Subsurface users. In order to use the
+<em>Subsurface cloud storage</em> the users need to follow these steps</p></div>
 <div class="ulist"><ul>
 <li>
 <p>
-<strong>Récupérer les détails disponibles</strong>. Cela charge la configuration existante à partir de l’ordinateur de plongée
-   dans <em>Subsurface</em>, en l’affichant dans le panneau de configuration.
+Create a cloud storage account:
 </p>
-</li>
+<div class="ulist"><ul>
+<li>
+<p>
+Open the <em>Preferences</em>
+</p>
+</li>
+<li>
+<p>
+Under <em>Defaults</em>, in the <em>Subsurface cloud storage</em> section, enter
+their email address and a password
+</p>
+</li>
+<li>
+<p>
+Click <em>Apply</em> or <em>Done</em> to send email address and password to the
+server
+</p>
+</li>
+<li>
+<p>
+The server will respond with an email to the given address that
+contains a verification PIN
+</p>
+</li>
+<li>
+<p>
+Enter the PIN in the corresponding field in the <em>Preferences</em> dialog
+(this field is only visible while the backend server is waiting for email
+address confirmation)
+</p>
+</li>
+<li>
+<p>
+Click <em>Apply</em> or <em>Done</em> again, the <em>Subsurface cloud storage</em> account
+will be marked as verified and the <em>Subsurface cloud storage</em> service can
+be used
+</p>
+</li>
+</ul></div>
+</li>
+<li>
+<p>
+Use <em>Subsurface cloud storage</em>
+</p>
+<div class="ulist"><ul>
+<li>
+<p>
+From the <em>File</em> menu users can load and save data to the <em>Subsurface
+cloud storage</em> server
+</p>
+</li>
+<li>
+<p>
+In the <em>Preferences</em>, users can select to use the <em>Subsurface cloud
+storage</em> data as their default data file which means that the data from
+the <em>Subsurface cloud storage</em> will be displayed when <em>Subsurface</em> starts.
+</p>
+</li>
+</ul></div>
+</li>
+</ul></div>
+<div class="paragraph"><p><em>Subsurface</em> keeps a local copy of the data and <em>Subsurface</em> stays fully
+functional if used while offline. <em>Subsurface</em> will simply synchronize the
+data with the backend serer the next time it is used while the computer is
+online.</p></div>
+<div class="paragraph"><p>Although <em>Subsurface</em> offers integrated Cloud storage of dive logs, it is
+also simple to achieve this using several of the existing facilities on the
+Internet.</p></div>
+<div class="paragraph"><p>For instance <a href="http://www.dropbox.com/"><em>Dropbox</em></a> offers a free application
+that allows files on the Dropbox servers to be seen as a local folder on
+one’s desktop computer.</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/Cloud.jpg" alt="FIGURE: Dropbox folder" />
+</div>
+</div>
+<div class="paragraph"><p>The <em>Dropbox</em> program creates a copy of the <em>Dropbox</em> Internet Cloud content
+on one’s desktop computer. When the computer is connected to the Internet,
+the Internet content is automatically updated. Therefore both the <em>Open</em> and
+<em>Save</em> of dive logs are done using the local copy of the dive log in the
+local <em>Dropbox</em> folder, so there’s no need for a direct internet
+connection. If the local copy is modified, e.g. by adding a dive, the remote
+copy in the <em>Dropbox</em> server in the Cloud will be automatically updated
+whenever Internet access is available.</p></div>
+<div class="paragraph"><p>In this way a dive log in one’s <em>Dropbox</em> folder can be accessed seamlessly
+from the Internet and can be accessed from any place with Internet
+access. Currently there are no costs involved for this service. Dropbox
+(Windows, Mac and Linux) can be installed by accessing the
+<a href="http://www.dropbox.com/install"><em>Install Page on the Dropbox website</em></a>
+Alternatively one can use <em>Dropbox</em> as a mechanism to backup one’s dive
+log. To Store a dive log in the Cloud, select <em>File → Save as</em> from the
+<em>Subsurface</em> main menu, navigate to the <em>Dropbox</em> folder and select the
+<em>Save</em> button. To access the dive log in the Cloud, select <em>File → Open
+Logbook</em> from the <em>Subsurface</em> main menu and navigate to the dive log file
+in the <em>Dropbox</em> folder and select the <em>Open</em> button.</p></div>
+<div class="paragraph"><p>Several paid services exist on the Internet (e.g. Google, Amazon) where the
+same process could be used for the Cloud-based storage of dive logs.</p></div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="S_PrintDivelog">10. Printing a dive log</h2>
+<div class="sectionbody">
+<div class="paragraph"><p><em>Subsurface</em> provides a simple and flexible interface to print a whole dive log or only a few selected dives.
+  Pre-installed templates or a custom written template can be used to choose where the data are fitted into the page.</p></div>
+<div class="paragraph"><p>Before printing, two decisions are required:</p></div>
+<div class="ulist"><ul>
+<li>
+<p>
+Should the whole dive log be printed or only part of it? If only part of the
+  dive log is required, then select the required dives from the <strong>Dive List</strong>
+  panel.
+</p>
+</li>
+<li>
+<p>
+If the dive profiles needs printing, what gas partial pressure information
+  should be shown? Select the appropriate toggle-buttons on the button bar to
+  the left of the <strong>Dive Profile</strong> panel.
+</p>
+</li>
+</ul></div>
+<div class="paragraph"><p>If <em>File → Print</em> is selected from the Main menu, the the dialogue below
+(image <strong>A</strong>) appears. Three specifications are needed to achieve the desired
+information and page layout:</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/Print1_f22.jpg" alt="FIGURE: Print dialogue" />
+</div>
+</div>
+<div class="olist arabic"><ol class="arabic">
+<li>
+<p>
+Under <em>Print type</em> select one of two options:
+</p>
+<div class="ulist"><ul>
+<li>
+<p>
+<em>Dive list print</em>: Print dives from the <strong>Dive List</strong> panel with profiles and
+  other information.
+</p>
+</li>
+<li>
+<p>
+<em>Statistics print</em>: Print yearly statistics of the dives.
+</p>
+</li>
+</ul></div>
+</li>
+<li>
+<p>
+Under <em>Print options</em> select:
+</p>
+<div class="ulist"><ul>
+<li>
+<p>
+Printing only the dives selected from the dive list prior to activating the
+  print dialogue by checking the box <em>Print only selected dives</em>. If this
+  check box is <strong>not</strong> checked all dives in the <strong>Dive List</strong> panel are printed.
+</p>
+</li>
+<li>
+<p>
+Printing in colour, achieved by checking the box with <em>Print in colour</em>. If
+  this check box is not checked, printing is in monochrome (grey scale).
+</p>
+</li>
+</ul></div>
+</li>
+</ol></div>
+<div class="paragraph"><p>Under <em>Template</em> select a template to be used as the page layout. There are
+several templates (see image <strong>B</strong>, above).</p></div>
+<div class="ulist"><ul>
+<li>
+<p>
+<em>Table</em>: This prints a summary table of all dives selected (see below).
+</p>
+</li>
+</ul></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/Print_summarylist_f22.jpg" alt="FIGURE: Print summary table" />
+</div>
+</div>
+<div class="ulist"><ul>
+<li>
+<p>
+<em>Flow layout</em>: Print the text associated with each diev without printing the
+  dive profiles
+     of each dive (see below):
+</p>
+</li>
+</ul></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/Print_flow_layout_f22.jpg" alt="FIGURE: Print flow layout" />
+</div>
+</div>
+<div class="ulist"><ul>
+<li>
+<p>
+<em>One Dive</em>: Print one dive per page, also showing the dive profile (see
+  below)
+</p>
+</li>
+</ul></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/print2_f22.jpg" alt="FIGURE: Print one dive / page" />
+</div>
+</div>
+<div class="ulist"><ul>
+<li>
+<p>
+<em>Two Dives</em>: Print two dives per page, also showing the dive profiles.
+</p>
+</li>
+<li>
+<p>
+<em>Six Dives</em>: Print six dives per page, also showing the dive profiles.
+</p>
+</li>
+<li>
+<p>
+<em>Custom</em>: This option allows customisation of the print contents and
+  layout. This is
+     discussed at the end of this section.
+</p>
+</li>
+</ul></div>
+<div class="paragraph"><p>Users can <em>Preview</em> the printed page by selecting the <em>Preview</em> button on
+the dialogue (see image <strong>A</strong> at the start of this section). After preview,
+changes to the options in the print dialogue can be made, resulting in a
+layout that fits personal taste.</p></div>
+<div class="paragraph"><p>Next, select the <em>Print</em> button (see image <strong>A</strong> at the start of this
+section). This activates the regular print dialogue used by the user
+operating system, allowing one to choose a printer and to set its properties
+(see image below):</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/Print_print_f22.jpg" alt="FIGURE: Print one dive / page" />
+</div>
+</div>
+<div class="paragraph"><p>Set the print resolution of the printer to an appropriate value by changing
+the printer <em>Properties</em>. Finally, select the <em>Print</em> button to print the
+dives.  Below is a (rather small) example of the output for one particular
+page.</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/Printpreview.jpg" alt="FIGURE: Print preview page" />
+</div>
+</div>
+<div class="sect2">
+<h3 id="_write_a_custom_printing_template_advanced">10.1. Write a custom printing template (advanced)</h3>
+<div class="paragraph"><p>Writing a custom template is an effective way to produce highly customized
+printouts. Subsurface uses HTML templates to render printing. One can create
+a template, export a new template, import an existing template and delete an
+existing template by using the appropriate buttons under the <em>Template</em>
+dropdown list in the print dialogue. See <a href="#S_APPENDIX_E">APPENDIX E</a> for
+information on how to write or modify a template.</p></div>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="S_Configure">11. Configurer un ordinateur de plongée</h2>
+<div class="sectionbody">
+<div class="paragraph"><p><em>Subsurface</em> permet de configurer son ordinateur de plongée. Actuellement,
+les familles d’ordinateurs supportés sont Heinrichs-Weikamp (OSTC 2, OSTC 3)
+et Suunto Vyper (Stinger, Mosquito, D3, Vyper, Vytec, Cobra, Gekko et
+Zoop). De nombreux paramètres de ces ordinateurs de plongée peuvent être
+lues et modifiées. La première étape est de s’assurer que les pilotes pour
+votre ordinateur de plongée sont installés et que le nom de périphérique de
+l’ordinateur de plongée est connu. Voir
+<a href="#_appendix_a_operating_system_specific_information_for_importing_dive_information_from_a_dive_computer">APPENDIX A</a> pour plus d’informations sur la manière de procéder.</p></div>
+<div class="paragraph"><p>Une fois que l’ordinateur de plongée est connecté à <em>Subsurface</em>,
+sélectionner <em>Fichier → Configurer l’ordinateur de plongée</em>, à partir du
+menu principal. Fournir le nom du périphérique dans le champ en haut du
+panneau de configuration qui ouvre et sélectionne le bon modèle d’ordinateur
+de plongée à partir du panneau à gauche (voir l’image ci-dessous).</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/Configure_dc_f20.jpg" alt="FIGURE: Configure dive computer" />
+</div>
+</div>
+<div class="paragraph"><p>En utilisant les boutons appropriés du panneau de configuration, les actions
+suivantes peuvent être réalisées :</p></div>
+<div class="ulist"><ul>
+<li>
+<p>
+<strong>Récupérer les détails disponibles</strong>. Cela charge la configuration existante à partir de l’ordinateur de plongée
+   dans <em>Subsurface</em>, en l’affichant dans le panneau de configuration.
+</p>
+</li>
 <li>
 <p>
 <strong>Enregistrer les modifications sur le périphérique</strong>. Cela change la configuration de l’ordinateur
@@ -4225,37 +4052,37 @@ the dive profile:
 <em>Draw dive computer reported ceiling red</em>: This checkbox allows exactly what it says.
    Not all dive computers report ceiling values. If the dive computer does report it, it may differ
    from the ceilings calculated by <em>Subsurface</em>. This is because of the different algorithms and gradient factors available for calculating ceilings, as well as the dynamic way that a
-   dive computer can calculate ceilings during a dive.
-</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>
-</li>
-<li>
-<p>
-<em>Show average depth</em>: Activating this checkbox causes <em>Subsurface</em> to draw a grey line across
-   the dive profile, indicating the mean depth of the dive up to a particular point in time during
-   that dive. Normally this is a u-shaped line indicating the deepest average depth just before the
-   ascent.
-</p>
-<div class="ulist" id="GradientFactors_Ref"><ul>
-<li>
-<p>
-<strong>Misc</strong>:
-</p>
-</li>
-</ul></div>
-</li>
-<li>
-<p>
-Gradient Factors:* Here users can set the <em>gradient factors</em> used while diving. GF_Low is
-   the gradient factor at depth and GF_High is used just below the surface.
-   At intermediate depths gradient factors between GF_Low and GF_High are used.
-   Gradient factors add conservatism to the nitrogen exposure during a dive, in a
-   similar way that many dive computers have a conservatism setting. The lower
-   the value of a gradient factor, the more conservative the calculations are with
+   dive computer can calculate ceilings during a dive.
+</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>
+</li>
+<li>
+<p>
+<em>Show average depth</em>: Activating this checkbox causes <em>Subsurface</em> to draw a grey line across
+   the dive profile, indicating the mean depth of the dive up to a particular point in time during
+   that dive. Normally this is a u-shaped line indicating the deepest average depth just before the
+   ascent.
+</p>
+<div class="ulist" id="GradientFactors_Ref"><ul>
+<li>
+<p>
+<strong>Misc</strong>:
+</p>
+</li>
+</ul></div>
+</li>
+<li>
+<p>
+Gradient Factors:* Here users can set the <em>gradient factors</em> used while diving. GF_Low is
+   the gradient factor at depth and GF_High is used just below the surface.
+   At intermediate depths gradient factors between GF_Low and GF_High are used.
+   Gradient factors add conservatism to the nitrogen exposure during a dive, in a
+   similar way that many dive computers have a conservatism setting. The lower
+   the value of a gradient factor, the more conservative the calculations are with
    respect to nitrogen loading and the deeper the ascent ceilings are. Gradient
    factors of 20/60 are considered conservative and values of 60/90 are considered
    harsh. Checking <strong>GFLow at max depth</strong> box causes GF_Low to be used at the
@@ -4352,38 +4179,38 @@ Internet services such as the <a href="#S_Companion"><em>Subsurface Companion ap
 data export/import from <em>Divelogs.de</em>. These Internet requirements are
 determined by one’s type of connection to the Internet and by the Internet
 Service Provider (ISP) used.  One’s ISP should provide the appropriate
-information.  If a proxy server is used for Internet access, the appropriate
-information needs to be provided here. The type of proxy needs to be
-selected from the dropdown list.  after which the IP address of the host and
-the appropriate port number should be provided. If the proxy server uses
-authentication, the appropriate userID and password also needs to be
-provided so that <em>Subsurface</em> can automatically pass through the proxy
-server to access the Internet.</p></div>
-</div>
-<div class="sect2">
-<h3 id="_accès_facebook">12.6. Accès Facebook</h3>
-<div class="paragraph"><p>Ce panneau vous permet de vous connecter à votre compte Facebook pour
-transférer des informations de Subsurface vers Facebook.</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/Pref6_f20.jpg" alt="FIGURE: Facebook login panel" />
-</div>
-</div>
-<div class="paragraph"><p>Si un identifiant Facebook et un mot de passe valides ont été fournis, une
-connexion vers Facebook est créée. Cette connexion est fermée lorsque
-Subsurface est fermé. Pour le moment, la case à cocher nommée "Conserver ma
-connexion à Subsurface", sur l'écran de connexion, n’a aucun
-effet. Reportez-vous à la section <a href="#S_facebook">Export des profils de
-plongée vers Facebook</a> pour plus d’informations.</p></div>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="S_DivePlanner">13. The <em>Subsurface</em> dive planner</h2>
-<div class="sectionbody">
-<div class="paragraph"><p>Dive planning is an advanced feature of <em>Subsurface</em>, accessible by
-selecting <em>Log → Plan Dive</em> from the main menu. It allows calculation of
-nitrogen load during a dive by using the Bühlmann ZH-L16 algorithm with the
+information.  If a proxy server is used for Internet access, the appropriate
+information needs to be provided here. The type of proxy needs to be
+selected from the dropdown list.  after which the IP address of the host and
+the appropriate port number should be provided. If the proxy server uses
+authentication, the appropriate userID and password also needs to be
+provided so that <em>Subsurface</em> can automatically pass through the proxy
+server to access the Internet.</p></div>
+</div>
+<div class="sect2">
+<h3 id="_accès_facebook">12.6. Accès Facebook</h3>
+<div class="paragraph"><p>Ce panneau vous permet de vous connecter à votre compte Facebook pour
+transférer des informations de Subsurface vers Facebook.</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/Pref6_f20.jpg" alt="FIGURE: Facebook login panel" />
+</div>
+</div>
+<div class="paragraph"><p>Si un identifiant Facebook et un mot de passe valides ont été fournis, une
+connexion vers Facebook est créée. Cette connexion est fermée lorsque
+Subsurface est fermé. Pour le moment, la case à cocher nommée "Conserver ma
+connexion à Subsurface", sur l'écran de connexion, n’a aucun
+effet. Reportez-vous à la section <a href="#S_facebook">Export des profils de
+plongée vers Facebook</a> pour plus d’informations.</p></div>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="S_DivePlanner">13. The <em>Subsurface</em> dive planner</h2>
+<div class="sectionbody">
+<div class="paragraph"><p>Dive planning is an advanced feature of <em>Subsurface</em>, accessible by
+selecting <em>Log → Plan Dive</em> from the main menu. It allows calculation of
+nitrogen load during a dive by using the Bühlmann ZH-L16 algorithm with the
 addition of gradient factors as implemented by Erik Baker.</p></div>
 <div class="sidebarblock">
 <div class="content">
@@ -4442,406 +4269,406 @@ sections (see image below). The <strong>setup</strong> parameters for a dive are
 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
-that can easily be copied to other software. This is also where any warning
-messages about the dive plan are printed.</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/PlannerWindow1_f20.jpg" alt="FIGURE: Dive planner startup window" />
-</div>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_open_circuit_dives">13.2. Open circuit dives</h3>
-<div class="ulist"><ul>
-<li>
-<p>
-Towards the centre bottom of the planner (circled in blue in the image
-   above) is a dropbox with three options. Select the appropriate one of these:
-</p>
-<div class="ulist"><ul>
-<li>
-<p>
-Open Circuit (the default)
-</p>
-</li>
-<li>
-<p>
-CCR
-</p>
-</li>
-<li>
-<p>
-pSCR
-</p>
-</li>
-</ul></div>
-</li>
-<li>
-<p>
-Choose the Open Circuit option.
-</p>
-</li>
-<li>
-<p>
-In the top left-hand area of the planning screen, ensure that the constant
-  dive parameters are appropriate. These are: Start date and time of the
-  intended dive, Atmospheric Pressure and Altitude above sea level of the dive
-  site. The atmospheric pressure can also be entered as an altitude in metres,
-  assuming a sea-level atmospheric pressure of 1.013 bar.
-</p>
-</li>
-<li>
-<p>
-In the table labeled <em>Available Gases</em>, add the information of the cylinders
-  to be used as well as the gas composition within that cylinder. This is done
-  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 profile of the planned dive can be created in two ways:
-</p>
-<div class="ulist"><ul>
-<li>
-<p>
-Drag the waypoints (the small white circles) on the existing dive profile in
-    a way to represent the dive. Additional waypoints can be created by
-    double-clicking the existing dive profile. Waypoints can be deleted by
-    right-clicking a particular waypoint and selecting the <em>delete</em> item from
-    the resulting context menu.
-</p>
-</li>
-<li>
-<p>
-The most efficient way to create a dive profile is to enter the appropriate
-    values into the table marked <em>Dive planner points</em>. The first line of the
-    table represents the duration and the final depth of the descent from the
-    surface. Subsequent segments describe the bottom phase of the dive.  The <em>CC
-    set point</em> column is only relevant for closed circuit divers.  The ascent is
-    usually not specified because this is what the planner is supposed to
-    calculate.  Add additional segments to the profile by selecting the "+" icon
-    at the top right hand of the table. Segments entered into the <em>Dive planner
-    points</em> table automatically appear in the <strong>Dive Profile</strong> diagram.
-</p>
-</li>
-</ul></div>
-</li>
-</ul></div>
-<div class="sect3">
-<h4 id="_recreational_dives">13.2.1. Recreational dives</h4>
-<div class="paragraph"><p>The <em>Subsurface</em> dive planner allows a sophisticated way of planning
-recreational dives, i.e. dives that remain within no-decompression limits.
-The dive planner automatically takes into account the nitrogen load incurred
-in previous dives. But conventional dive tables are also used in a way that
-can take into account previous dives. Why use a dive planner for
-recreational dives? Using recreational dive tables, the maximum depth of a
-dive is taken into acount. However, few dives are undertaken at a constant
-depth corresponding to the maximum depth (i.e. a "square" dive
-profile). This means that dive tables overestimate the nitrogen load
-incurred during previous dives. The <em>Subsurface</em> dive planner calculates
-nitrogen load according to the real dive profiles of all uploaded previous
-dives, in a similar way as dive computers calculate nitrogen load during a
-dive. This mean that the diver gets <em>credit</em> in terms of nitrogen loading
-for not remaining at maximum depth during previous dives, enabling planning
-a longer subsequent dive. For the planner to work it is therefore crucial to
-upload all previous dives onto <em>Subsurface</em> before performing dive planning.</p></div>
-<div class="paragraph"><p>To plan a dive, the appropriate settings need to be defined.</p></div>
-<div class="paragraph"><p>Ensure that the date and time is set to that of the intended dive. This
-allows calculation of the nitrogen load incurred during previous dives.</p></div>
-<div class="ulist"><ul>
-<li>
-<p>
-Immediately under the heading <em>Planning</em> are two checkboxes <em>Recreational</em>
-  and <em>Safety Stop</em>.  Check these two boxes.
-</p>
-</li>
-<li>
-<p>
-Then define the cylinder size, the gas mixture (air or % oxygen) and the
-  starting cylinder pressure in the top left-hand section of the planner under
-  <em>Available gases</em>.
-</p>
-</li>
-<li>
-<p>
-The planner calculates whether the specified cylinder contains enough
-  air/gas to complete the planned dive. In order for this to be realistic,
-  under <em>Gas options</em>, specify an appropriate surface air consumption (SAC)
-  rate for <em>Bottom SAC</em>. Suitable values are between 15 l/min and 30 l/min,
-  with novice divers or difficult dives requiring SAC rates closer to 30l/min.
-</p>
-</li>
-<li>
-<p>
-Define the amount of gas that the cylinder must have at the end of the
-  bottom section of the dive just before ascent. A value of 50 bar is often
-  used.
-</p>
-</li>
-<li>
-<p>
-Define the depth of the dive by dragging the waypoints (white dots) on the
-  dive profile or (even better) defining the appropriate depths using the
-  table under <em>Dive planner points</em> as desribed under the previous heading. If
-  this is a multilevel dive, set the appropriate dive depths to represent the
-  dive plan by adding waypoints to the dive profile or by adding appropriate
-  dive planner points to the <em>Dive Planner Points</em> table.
-</p>
-</li>
-<li>
-<p>
-The ascent speed can be changed. The default ascent speeds are those
-  considered safe for recreational divers.
-</p>
-</li>
-</ul></div>
-<div class="paragraph"><p>The dive profile in the planner indicates the maximum dive time within
-no-deco limits using the Bühlmann ZH-L16 algorithm and the gas and depth
-settings specified as described above. The <em>Subsurface</em> planner allows rapid
-assessment of dive duration as a function of dive depth, given the nitrogen
-load incurred during previous dives. The dive plan includes estimates of the
-amount of air/gas used, depending on the cylinder settings specified under
-<em>Available gases</em>. If the initial cylinder pressure is set to 0, the dive
-duration shown is the true no-deco limit (NDL) without taking into account
-gas used during the dive. If the surface above the dive profile is RED it
-means that recreational dive limits are exceeded and either the dive
-duration or the dive depth needs to be reduced.</p></div>
-<div class="paragraph"><p>Below is an image of a dive plan for a recreational dive at 30
-metres. Although the no-deco limit (NDL) is 23 minutes, the duration of the
-dive is limited by the amount of air in the cylinder, reflected by the
-information in the text box at the bottom right of the panel.</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/rec_diveplan.jpg" alt="FIGURE: A recreational dive plan: setup" />
-</div>
-</div>
-</div>
-<div class="sect3">
-<h4 id="_non_recreational_open_circuit_dives_including_decompression">13.2.2. Non-recreational open circuit dives, including decompression</h4>
-<div class="paragraph"><p>Non-recreational dive planning involves exceeding the no-deco limits and/or
-using multiple breathing gases.  Such dives are planned in three stages:</p></div>
-<div class="paragraph"><p><strong>a) Nitrogen management</strong>: This is performed by specifying the rates for descent and ascent,
-as well as the gradient factors (GFLow and GFHigh) under the headings <em>Rates</em> and <em>Planning</em>
-to the bottom left of the planning screen. Initially, the GFHigh and GFLow values in the <em>Preferences</em>
-panel of <em>Subsurface</em> is used. If these are changed within the planner (see <em>Gas Options</em> within
-the planner), the new values are
-used without changing the original values in the <em>Preferences</em>. Gradient Factor settings strongly affect the calculated ceilings and their depths.
-A very low GFLow value brings about decompression stops early on during the dive.
- ** For more information about Gradient factors, see the section on <a href="#S_GradientFactors">Gradient Factor Preference settings</a>.
-For more information external to this manual see:</p></div>
-<div class="ulist"><ul>
-<li>
-<p>
-<a href="http://www.tek-dive.com/portal/upload/M-Values.pdf">Understanding
-   M-values by Erik Baker, <em>Immersed</em> Vol. 3, No. 3.</a>
-</p>
-</li>
-<li>
-<p>
-<a href="http://www.rebreatherworld.com/general-and-new-to-rebreather-articles/5037-gradient-factors-for-dummies.html">Gradient
-   factors for dummies, by Kevin Watts</a>
-<a href="http://www.amazon.com/Deco-Divers-Decompression-Theory-Physiology/dp/1905492073/ref=sr_1_1?s=books&ie=UTF8&qid=1403932320&sr=1-1&keywords=deco+for+divers"><em>Deco
-for Divers</em>, by Mark Powell (2008). Aquapress</a> Southend-on-Sea, UK. ISBN 10:
-1-905492-07-3.  An excellent non-technical review.
-</p>
-</li>
-</ul></div>
-<div class="paragraph"><p>The ascent rate is critical for nitrogen off-gassing at the end of the dive
-and is specified for several depth ranges, utilising the average (or mean)
-depth as a yardstick. The mean depth of the dive plan is indicated by a
-light grey line on the dive profile. Ascent rates at deeper levels are often
-in the range of 8-12 m/min, while ascent rates near the surface are often in
-the range of 4-9 m/min. The descent rate is also specified. If the option
-<em>Drop to first depth</em> is activated, then the descent phase of the planned
-dive will be at the maximal descent rate specified in the <em>Rates</em> section of
-the dive setup.</p></div>
-<div class="paragraph"><p><strong>b) Oxygen management</strong>: In the <strong>Gas Options</strong> part of the dive specification, the maximum partial
-pressure for oxygen needs to be specified for the
-bottom part of the dive (<em>bottom po2</em>) as well as for the decompression part of the dive (<em>deco po2</em>).
-The most commonly
-used values are 1.4 bar for the bottom part of the dive and 1.6 bar for any decompression
-stages. Normally, a partial pressure of 1.6 bar is not exceeded. PO2 settings and the depth at which switching to a gas takes place can also be edited in the
-<em>Available Gases</em> dialog. Normally the planner decides on switching to a new gas when, during
-ascent, the partial pressure of the new gas has increased to 1.6 bar.</p></div>
-<div class="paragraph"><p><strong>c) Gas management</strong>: With open-circuit dives this is a primary consideration. One needs to keep within the limits of the amount of gas within the dive
-cylinder(s), allowing for an appropriate margin for a safe return to the surface, possibly
-sharing with a buddy. Under the <em>Gas Options</em> heading, specify the best (but conservative) estimate
-of your surface-equivalent air consumption (SAC, also termed RMV) in
-litres/min (for the time being, only SI units are supported).  Specify the SAC during the
-bottom part of the dive (<em>bottom SAC</em>) as well as during the decompression or safety stops of the
-dive (<em>deco SAC</em>). Values of 15-30 l/min are common. For good gas management, a thumbsuck guess
-is not sufficient and one needs to
-monitor one’s gas consumption on a regular basis, dependent on different dive conditions and/or equipment.
-The planner calculates the total volume of gas used during the dive and issues a warning
-if one exceeds the total amount of gas available. Good practice demands that one does not dive to
-the limit of the gas supply but that an appropriate reserve is kept for unforeseen circumstances.
-For technical diving, this reserve can be up to 66% of the total available gas.</p></div>
-<div class="paragraph"><p>Now (at last) one can start the detailed time-depth planning of the
-dive. <em>Subsurface</em> offers a unique graphical interface for performing this
-part of the planning. The mechanics of doing this is similar to
-hand-entering a dive profile in the dive log part of <em>Subsurface</em>. Upon
-activating the planner, a default dive of depth 15 m for 40 min is offered
-in the bue design surface to the top right hand of the screen. The white
-dots (waypoints) on the profile can be dragged with a mouse. Create more
-waypoints by double-clicking on the profile line and ensuring that the
-profile reflects the intended dive. Drag the waypoints to represent the
-depth and duration of the dive. It is NOt necessary to specify the ascent
-part of the dive since the planner calculates this, based on the settings
-that have been specified.  If any of the management limits (for nitrogen,
-oxygen or gas) is exceeded, the surface above the dive profile changes from
-BLUE to RED.</p></div>
-<div class="paragraph"><p>Each waypoint on the dive profile creates a <em>Dive Planner Point</em> in the
-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 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
-explained in the section <a href="#S_CreateProfile">hand-creating a dive profile</a>. These changes should reflect the cylinders and gas compositions
-defined in the table with <em>Available Gases</em>.  If two or more gases are used,
-automatic gas switches will be suggested during the ascent to the
-surface. However, these changes can be deleted by right-clicking the gas
-change and by manually creating a gas change by right-clicking on the
-appropriate waypoint.</p></div>
-<div class="paragraph"><p>A non-zero value in the "CC set point" column of the table of dive planner
-points indicates a valid setpoint for oxygen partial pressure and that the
-segment is dived using a closed circuit rebreather (CCR). If the last
-manually entered segment is a CCR segment, the decompression phase is
-computed assuming the diver uses a CCR with the specified set-point. If the
-last segment (however short) is on open circuit (OC, indicated by a zero
-set-point) the decompression is computed in OC mode. The planner only
-considers gas changes in OC mode.</p></div>
-<div class="paragraph"><p>Below is an example of a dive plan to 45m using EAN26, followed by an ascent
-using EAN50 and using the settings as described above.</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
+that can easily be copied to other software. This is also where any warning
+messages about the dive plan are printed.</p></div>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
-<img src="images/DivePlanner2_f20.jpg" alt="FIGURE: Planning a dive: setup" />
+<img src="images/PlannerWindow1_f20.jpg" alt="FIGURE: Dive planner startup window" />
 </div>
 </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>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
-each depth level is indicated in the <em>Dive Plan Details</em>. This duration
-INCLUDES the transition time to get to that level. However, if the <em>Display
-transition in deco</em> option is checked, the transitions are shown separately
-from the segment durations at a particular level.</p></div>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_planning_pscr_dives">13.3. Planning pSCR dives</h3>
-<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 →   Preferences →   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 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>
-<div class="sect2">
-<h3 id="_planning_ccr_dives">13.4. Planning CCR dives</h3>
-<div class="paragraph"><p>To plan a dive using a closed circuit rebreather, select the <em>CCR</em> option in
-the dropdown list, circled in blue in the image below.</p></div>
-<div class="paragraph"><p><strong>Available gases</strong>: In the <em>Available gases</em> table, enter the cylinder information for the
-diluent cylinder and for any bail-out cylinders. Do NOT enter the information for the oxygen
-cylinder since it is implied when the <em>CCR</em> dropdown selection is made.</p></div>
-<div class="paragraph"><p><strong>Entering setpoints</strong>: Specify a default setpoint in the Preferences tab, by selecting <em>File →  Preferences →  Graph</em> from the main menu. All user-entered segments in the <em>Dive planner points</em> table
-use the default setpoint value. Then, different setpoints can be specified for dive segments
-in the <em>Dive planner points</em> table. A zero setpoint
-means the diver bails out to open circuit mode for that segment. The decompression is always calculated
-using the setpoint of the last manually entered segment. So, to plan a bail out ascent for a
-CCR dive, add a one-minute dive segment to the end with a setpoint value of 0. The decompression
-algorithm does not switch deco-gases automatically while in CCR mode (i.e. when a positive setpoint is specified) but, of course, this is calculated for bail out ascents.</p></div>
-<div class="paragraph"><p>The dive profile for a CCR dive may look something like the image below.</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/Planner_CCR1_f20.jpg" alt="FIGURE: Planning a CCR dive: setup" />
-</div>
-</div>
-<div class="paragraph"><p>Note that, in the <em>Dive plan details</em>, the gas consumption for a CCR segment
-is not calculated, so gas consumptions of 0 litres are the norm.</p></div>
-</div>
-<div class="sect2">
-<h3 id="S_Replan">13.5. Modifying an existing dive plan</h3>
-<div class="paragraph"><p>Normally, when a dive plan has been saved, it is accessible from the <strong>Dive
-List</strong>, like any other dive log. Within the <strong>Dive List</strong> there is not a way to
-change a saved dive plan.  To perform changes to a dive plan, select it on
-the <strong>Dive List</strong>. Then, in the main menu, select <em>Log → Re-plan dive</em>. This
-will open the selected dive plan within the dive planner, allowing changes
-to be made and saved as usual.</p></div>
-<div class="paragraph"><p>In addition there is the option "Save new". This keeps the original planned
-dive and adds a (possibly modified) copy to the dive list. If that copy is
-saved with the same start time as the original, the two dives are considered
-two versions of the same dive and do not influence other each during
-decompression calculation (see next section).</p></div>
-</div>
-<div class="sect2">
-<h3 id="_planning_for_repetitive_dives">13.6. Planning for repetitive dives</h3>
-<div class="paragraph"><p>Repetitive dives can easily be planned if the dates and start times of the
-repetitive dive set is specified appropriately in the top left-hand <em>Start
-Time</em> field. <em>Subsurface</em> calculates the gas loading figures correctly and
-the effect of the first dive is evaluated on later dives.</p></div>
-<div class="paragraph"><p>If one has just completed a long/deep dive and is planning another dive,
-then highlight, in the <strong>Dive List</strong>, the dive that has just been completed
-and then activate the planner. Depending on the start time of the planned
-dive, the planner takes into account the gas loading incurred during the
-completed dive and allows planning within these limitations.</p></div>
-<div class="paragraph"><p>If only a few standard configurations are used (e.g. in GUE), then a
-template dive can be created conforming to one of the configurations. If one
-now wishes to plan a dive using this configuration, just highlight the
-template dive in the <strong>Dive List</strong> and activate the planner: the planner takes
-into account the configuration in the highlighted dive.</p></div>
 </div>
 <div class="sect2">
-<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>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
+<h3 id="_open_circuit_dives">13.2. Open circuit dives</h3>
+<div class="ulist"><ul>
+<li>
+<p>
+Towards the centre bottom of the planner (circled in blue in the image
+   above) is a dropbox with three options. Select the appropriate one of these:
+</p>
+<div class="ulist"><ul>
+<li>
+<p>
+Open Circuit (the default)
+</p>
+</li>
+<li>
+<p>
+CCR
+</p>
+</li>
+<li>
+<p>
+pSCR
+</p>
+</li>
+</ul></div>
+</li>
+<li>
+<p>
+Choose the Open Circuit option.
+</p>
+</li>
+<li>
+<p>
+In the top left-hand area of the planning screen, ensure that the constant
+  dive parameters are appropriate. These are: Start date and time of the
+  intended dive, Atmospheric Pressure and Altitude above sea level of the dive
+  site. The atmospheric pressure can also be entered as an altitude in metres,
+  assuming a sea-level atmospheric pressure of 1.013 bar.
+</p>
+</li>
+<li>
+<p>
+In the table labeled <em>Available Gases</em>, add the information of the cylinders
+  to be used as well as the gas composition within that cylinder. This is done
+  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 profile of the planned dive can be created in two ways:
+</p>
+<div class="ulist"><ul>
+<li>
+<p>
+Drag the waypoints (the small white circles) on the existing dive profile in
+    a way to represent the dive. Additional waypoints can be created by
+    double-clicking the existing dive profile. Waypoints can be deleted by
+    right-clicking a particular waypoint and selecting the <em>delete</em> item from
+    the resulting context menu.
+</p>
+</li>
+<li>
+<p>
+The most efficient way to create a dive profile is to enter the appropriate
+    values into the table marked <em>Dive planner points</em>. The first line of the
+    table represents the duration and the final depth of the descent from the
+    surface. Subsequent segments describe the bottom phase of the dive.  The <em>CC
+    set point</em> column is only relevant for closed circuit divers.  The ascent is
+    usually not specified because this is what the planner is supposed to
+    calculate.  Add additional segments to the profile by selecting the "+" icon
+    at the top right hand of the table. Segments entered into the <em>Dive planner
+    points</em> table automatically appear in the <strong>Dive Profile</strong> diagram.
+</p>
+</li>
+</ul></div>
+</li>
+</ul></div>
+<div class="sect3">
+<h4 id="_recreational_dives">13.2.1. Recreational dives</h4>
+<div class="paragraph"><p>The <em>Subsurface</em> dive planner allows a sophisticated way of planning
+recreational dives, i.e. dives that remain within no-decompression limits.
+The dive planner automatically takes into account the nitrogen load incurred
+in previous dives. But conventional dive tables are also used in a way that
+can take into account previous dives. Why use a dive planner for
+recreational dives? Using recreational dive tables, the maximum depth of a
+dive is taken into acount. However, few dives are undertaken at a constant
+depth corresponding to the maximum depth (i.e. a "square" dive
+profile). This means that dive tables overestimate the nitrogen load
+incurred during previous dives. The <em>Subsurface</em> dive planner calculates
+nitrogen load according to the real dive profiles of all uploaded previous
+dives, in a similar way as dive computers calculate nitrogen load during a
+dive. This mean that the diver gets <em>credit</em> in terms of nitrogen loading
+for not remaining at maximum depth during previous dives, enabling planning
+a longer subsequent dive. For the planner to work it is therefore crucial to
+upload all previous dives onto <em>Subsurface</em> before performing dive planning.</p></div>
+<div class="paragraph"><p>To plan a dive, the appropriate settings need to be defined.</p></div>
+<div class="paragraph"><p>Ensure that the date and time is set to that of the intended dive. This
+allows calculation of the nitrogen load incurred during previous dives.</p></div>
+<div class="ulist"><ul>
+<li>
+<p>
+Immediately under the heading <em>Planning</em> are two checkboxes <em>Recreational</em>
+  and <em>Safety Stop</em>.  Check these two boxes.
+</p>
+</li>
+<li>
+<p>
+Then define the cylinder size, the gas mixture (air or % oxygen) and the
+  starting cylinder pressure in the top left-hand section of the planner under
+  <em>Available gases</em>.
+</p>
+</li>
+<li>
+<p>
+The planner calculates whether the specified cylinder contains enough
+  air/gas to complete the planned dive. In order for this to be realistic,
+  under <em>Gas options</em>, specify an appropriate surface air consumption (SAC)
+  rate for <em>Bottom SAC</em>. Suitable values are between 15 l/min and 30 l/min,
+  with novice divers or difficult dives requiring SAC rates closer to 30l/min.
+</p>
+</li>
+<li>
+<p>
+Define the amount of gas that the cylinder must have at the end of the
+  bottom section of the dive just before ascent. A value of 50 bar is often
+  used.
+</p>
+</li>
+<li>
+<p>
+Define the depth of the dive by dragging the waypoints (white dots) on the
+  dive profile or (even better) defining the appropriate depths using the
+  table under <em>Dive planner points</em> as desribed under the previous heading. If
+  this is a multilevel dive, set the appropriate dive depths to represent the
+  dive plan by adding waypoints to the dive profile or by adding appropriate
+  dive planner points to the <em>Dive Planner Points</em> table.
+</p>
+</li>
+<li>
+<p>
+The ascent speed can be changed. The default ascent speeds are those
+  considered safe for recreational divers.
+</p>
+</li>
+</ul></div>
+<div class="paragraph"><p>The dive profile in the planner indicates the maximum dive time within
+no-deco limits using the Bühlmann ZH-L16 algorithm and the gas and depth
+settings specified as described above. The <em>Subsurface</em> planner allows rapid
+assessment of dive duration as a function of dive depth, given the nitrogen
+load incurred during previous dives. The dive plan includes estimates of the
+amount of air/gas used, depending on the cylinder settings specified under
+<em>Available gases</em>. If the initial cylinder pressure is set to 0, the dive
+duration shown is the true no-deco limit (NDL) without taking into account
+gas used during the dive. If the surface above the dive profile is RED it
+means that recreational dive limits are exceeded and either the dive
+duration or the dive depth needs to be reduced.</p></div>
+<div class="paragraph"><p>Below is an image of a dive plan for a recreational dive at 30
+metres. Although the no-deco limit (NDL) is 23 minutes, the duration of the
+dive is limited by the amount of air in the cylinder, reflected by the
+information in the text box at the bottom right of the panel.</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/rec_diveplan.jpg" alt="FIGURE: A recreational dive plan: setup" />
+</div>
+</div>
+</div>
+<div class="sect3">
+<h4 id="_non_recreational_open_circuit_dives_including_decompression">13.2.2. Non-recreational open circuit dives, including decompression</h4>
+<div class="paragraph"><p>Non-recreational dive planning involves exceeding the no-deco limits and/or
+using multiple breathing gases.  Such dives are planned in three stages:</p></div>
+<div class="paragraph"><p><strong>a) Nitrogen management</strong>: This is performed by specifying the rates for descent and ascent,
+as well as the gradient factors (GFLow and GFHigh) under the headings <em>Rates</em> and <em>Planning</em>
+to the bottom left of the planning screen. Initially, the GFHigh and GFLow values in the <em>Preferences</em>
+panel of <em>Subsurface</em> is used. If these are changed within the planner (see <em>Gas Options</em> within
+the planner), the new values are
+used without changing the original values in the <em>Preferences</em>. Gradient Factor settings strongly affect the calculated ceilings and their depths.
+A very low GFLow value brings about decompression stops early on during the dive.
+ ** For more information about Gradient factors, see the section on <a href="#S_GradientFactors">Gradient Factor Preference settings</a>.
+For more information external to this manual see:</p></div>
+<div class="ulist"><ul>
+<li>
+<p>
+<a href="http://www.tek-dive.com/portal/upload/M-Values.pdf">Understanding
+   M-values by Erik Baker, <em>Immersed</em> Vol. 3, No. 3.</a>
+</p>
+</li>
+<li>
+<p>
+<a href="http://www.rebreatherworld.com/general-and-new-to-rebreather-articles/5037-gradient-factors-for-dummies.html">Gradient
+   factors for dummies, by Kevin Watts</a>
+<a href="http://www.amazon.com/Deco-Divers-Decompression-Theory-Physiology/dp/1905492073/ref=sr_1_1?s=books&ie=UTF8&qid=1403932320&sr=1-1&keywords=deco+for+divers"><em>Deco
+for Divers</em>, by Mark Powell (2008). Aquapress</a> Southend-on-Sea, UK. ISBN 10:
+1-905492-07-3.  An excellent non-technical review.
+</p>
+</li>
+</ul></div>
+<div class="paragraph"><p>The ascent rate is critical for nitrogen off-gassing at the end of the dive
+and is specified for several depth ranges, utilising the average (or mean)
+depth as a yardstick. The mean depth of the dive plan is indicated by a
+light grey line on the dive profile. Ascent rates at deeper levels are often
+in the range of 8-12 m/min, while ascent rates near the surface are often in
+the range of 4-9 m/min. The descent rate is also specified. If the option
+<em>Drop to first depth</em> is activated, then the descent phase of the planned
+dive will be at the maximal descent rate specified in the <em>Rates</em> section of
+the dive setup.</p></div>
+<div class="paragraph"><p><strong>b) Oxygen management</strong>: In the <strong>Gas Options</strong> part of the dive specification, the maximum partial
+pressure for oxygen needs to be specified for the
+bottom part of the dive (<em>bottom po2</em>) as well as for the decompression part of the dive (<em>deco po2</em>).
+The most commonly
+used values are 1.4 bar for the bottom part of the dive and 1.6 bar for any decompression
+stages. Normally, a partial pressure of 1.6 bar is not exceeded. PO2 settings and the depth at which switching to a gas takes place can also be edited in the
+<em>Available Gases</em> dialog. Normally the planner decides on switching to a new gas when, during
+ascent, the partial pressure of the new gas has increased to 1.6 bar.</p></div>
+<div class="paragraph"><p><strong>c) Gas management</strong>: With open-circuit dives this is a primary consideration. One needs to keep within the limits of the amount of gas within the dive
+cylinder(s), allowing for an appropriate margin for a safe return to the surface, possibly
+sharing with a buddy. Under the <em>Gas Options</em> heading, specify the best (but conservative) estimate
+of your surface-equivalent air consumption (SAC, also termed RMV) in
+litres/min (for the time being, only SI units are supported).  Specify the SAC during the
+bottom part of the dive (<em>bottom SAC</em>) as well as during the decompression or safety stops of the
+dive (<em>deco SAC</em>). Values of 15-30 l/min are common. For good gas management, a thumbsuck guess
+is not sufficient and one needs to
+monitor one’s gas consumption on a regular basis, dependent on different dive conditions and/or equipment.
+The planner calculates the total volume of gas used during the dive and issues a warning
+if one exceeds the total amount of gas available. Good practice demands that one does not dive to
+the limit of the gas supply but that an appropriate reserve is kept for unforeseen circumstances.
+For technical diving, this reserve can be up to 66% of the total available gas.</p></div>
+<div class="paragraph"><p>Now (at last) one can start the detailed time-depth planning of the
+dive. <em>Subsurface</em> offers a unique graphical interface for performing this
+part of the planning. The mechanics of doing this is similar to
+hand-entering a dive profile in the dive log part of <em>Subsurface</em>. Upon
+activating the planner, a default dive of depth 15 m for 40 min is offered
+in the bue design surface to the top right hand of the screen. The white
+dots (waypoints) on the profile can be dragged with a mouse. Create more
+waypoints by double-clicking on the profile line and ensuring that the
+profile reflects the intended dive. Drag the waypoints to represent the
+depth and duration of the dive. It is NOt necessary to specify the ascent
+part of the dive since the planner calculates this, based on the settings
+that have been specified.  If any of the management limits (for nitrogen,
+oxygen or gas) is exceeded, the surface above the dive profile changes from
+BLUE to RED.</p></div>
+<div class="paragraph"><p>Each waypoint on the dive profile creates a <em>Dive Planner Point</em> in the
+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 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
+explained in the section <a href="#S_CreateProfile">hand-creating a dive profile</a>. These changes should reflect the cylinders and gas compositions
+defined in the table with <em>Available Gases</em>.  If two or more gases are used,
+automatic gas switches will be suggested during the ascent to the
+surface. However, these changes can be deleted by right-clicking the gas
+change and by manually creating a gas change by right-clicking on the
+appropriate waypoint.</p></div>
+<div class="paragraph"><p>A non-zero value in the "CC set point" column of the table of dive planner
+points indicates a valid setpoint for oxygen partial pressure and that the
+segment is dived using a closed circuit rebreather (CCR). If the last
+manually entered segment is a CCR segment, the decompression phase is
+computed assuming the diver uses a CCR with the specified set-point. If the
+last segment (however short) is on open circuit (OC, indicated by a zero
+set-point) the decompression is computed in OC mode. The planner only
+considers gas changes in OC mode.</p></div>
+<div class="paragraph"><p>Below is an example of a dive plan to 45m using EAN26, followed by an ascent
+using EAN50 and using the settings as described above.</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/DivePlanner2_f20.jpg" alt="FIGURE: Planning a dive: setup" />
+</div>
+</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>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
+each depth level is indicated in the <em>Dive Plan Details</em>. This duration
+INCLUDES the transition time to get to that level. However, if the <em>Display
+transition in deco</em> option is checked, the transitions are shown separately
+from the segment durations at a particular level.</p></div>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_planning_pscr_dives">13.3. Planning pSCR dives</h3>
+<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 →   Preferences →   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 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>
+<div class="sect2">
+<h3 id="_planning_ccr_dives">13.4. Planning CCR dives</h3>
+<div class="paragraph"><p>To plan a dive using a closed circuit rebreather, select the <em>CCR</em> option in
+the dropdown list, circled in blue in the image below.</p></div>
+<div class="paragraph"><p><strong>Available gases</strong>: In the <em>Available gases</em> table, enter the cylinder information for the
+diluent cylinder and for any bail-out cylinders. Do NOT enter the information for the oxygen
+cylinder since it is implied when the <em>CCR</em> dropdown selection is made.</p></div>
+<div class="paragraph"><p><strong>Entering setpoints</strong>: Specify a default setpoint in the Preferences tab, by selecting <em>File →  Preferences →  Graph</em> from the main menu. All user-entered segments in the <em>Dive planner points</em> table
+use the default setpoint value. Then, different setpoints can be specified for dive segments
+in the <em>Dive planner points</em> table. A zero setpoint
+means the diver bails out to open circuit mode for that segment. The decompression is always calculated
+using the setpoint of the last manually entered segment. So, to plan a bail out ascent for a
+CCR dive, add a one-minute dive segment to the end with a setpoint value of 0. The decompression
+algorithm does not switch deco-gases automatically while in CCR mode (i.e. when a positive setpoint is specified) but, of course, this is calculated for bail out ascents.</p></div>
+<div class="paragraph"><p>The dive profile for a CCR dive may look something like the image below.</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/Planner_CCR1_f20.jpg" alt="FIGURE: Planning a CCR dive: setup" />
+</div>
+</div>
+<div class="paragraph"><p>Note that, in the <em>Dive plan details</em>, the gas consumption for a CCR segment
+is not calculated, so gas consumptions of 0 litres are the norm.</p></div>
+</div>
+<div class="sect2">
+<h3 id="S_Replan">13.5. Modifying an existing dive plan</h3>
+<div class="paragraph"><p>Normally, when a dive plan has been saved, it is accessible from the <strong>Dive
+List</strong>, like any other dive log. Within the <strong>Dive List</strong> there is not a way to
+change a saved dive plan.  To perform changes to a dive plan, select it on
+the <strong>Dive List</strong>. Then, in the main menu, select <em>Log → Re-plan dive</em>. This
+will open the selected dive plan within the dive planner, allowing changes
+to be made and saved as usual.</p></div>
+<div class="paragraph"><p>In addition there is the option "Save new". This keeps the original planned
+dive and adds a (possibly modified) copy to the dive list. If that copy is
+saved with the same start time as the original, the two dives are considered
+two versions of the same dive and do not influence other each during
+decompression calculation (see next section).</p></div>
+</div>
+<div class="sect2">
+<h3 id="_planning_for_repetitive_dives">13.6. Planning for repetitive dives</h3>
+<div class="paragraph"><p>Repetitive dives can easily be planned if the dates and start times of the
+repetitive dive set is specified appropriately in the top left-hand <em>Start
+Time</em> field. <em>Subsurface</em> calculates the gas loading figures correctly and
+the effect of the first dive is evaluated on later dives.</p></div>
+<div class="paragraph"><p>If one has just completed a long/deep dive and is planning another dive,
+then highlight, in the <strong>Dive List</strong>, the dive that has just been completed
+and then activate the planner. Depending on the start time of the planned
+dive, the planner takes into account the gas loading incurred during the
+completed dive and allows planning within these limitations.</p></div>
+<div class="paragraph"><p>If only a few standard configurations are used (e.g. in GUE), then a
+template dive can be created conforming to one of the configurations. If one
+now wishes to plan a dive using this configuration, just highlight the
+template dive in the <strong>Dive List</strong> and activate the planner: the planner takes
+into account the configuration in the highlighted dive.</p></div>
+</div>
+<div class="sect2">
+<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>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 → Print</em>
 facility on the main menu in the same way as for dive logs or by copy and
@@ -4889,38 +4716,38 @@ des sections de ce manuel traitant des opérations relatives.</p></div>
 <li>
 <p>
 <a href="#S_ExportLog"><em>Exporter</em></a> - Exporter le carnet de plongée actuellement
-  ouvert (ou les plongées sélectionnées dans le carnet) vers un des nombreux
-  formats.
-</p>
-</li>
-<li>
-<p>
-<a href="#S_PrintDivelog"><em>Imprimer</em></a> - Imprimer le carnet de plongée actuellement
-  ouvert.
-</p>
-</li>
-<li>
-<p>
-<a href="#S_FindMovedImages"><em>Find moved images</em></a> - If photos taken during dives
-  have been moved to
-      a different disk or directory, locate them and link them to the appropriate
-      dives.
-</p>
-</li>
-<li>
-<p>
-<a href="#S_Preferences"><em>Préférences</em></a> - Définir les  préférences de <em>Subsurface</em>.
-</p>
-</li>
-<li>
-<p>
-<a href="#S_Configure"><em>Configurer l’ordinateur de plongée</em></a> - Modifier la
-  configuration d’un ordinateur de plongée.
-</p>
-</li>
-<li>
-<p>
-<em>Quitter</em> - Quitter <em>Subsurface</em>.
+  ouvert (ou les plongées sélectionnées dans le carnet) vers un des nombreux
+  formats.
+</p>
+</li>
+<li>
+<p>
+<a href="#S_PrintDivelog"><em>Imprimer</em></a> - Imprimer le carnet de plongée actuellement
+  ouvert.
+</p>
+</li>
+<li>
+<p>
+<a href="#S_FindMovedImages"><em>Find moved images</em></a> - If photos taken during dives
+  have been moved to
+      a different disk or directory, locate them and link them to the appropriate
+      dives.
+</p>
+</li>
+<li>
+<p>
+<a href="#S_Preferences"><em>Préférences</em></a> - Définir les  préférences de <em>Subsurface</em>.
+</p>
+</li>
+<li>
+<p>
+<a href="#S_Configure"><em>Configurer l’ordinateur de plongée</em></a> - Modifier la
+  configuration d’un ordinateur de plongée.
+</p>
+</li>
+<li>
+<p>
+<em>Quitter</em> - Quitter <em>Subsurface</em>.
 </p>
 </li>
 </ul></div>
@@ -4955,44 +4782,44 @@ des sections de ce manuel traitant des opérations relatives.</p></div>
 </p>
 </li>
 </ul></div>
-</div>
-<div class="sect2">
-<h3 id="_journal_log">14.3. Journal (log)</h3>
-<div class="ulist"><ul>
-<li>
-<p>
-<a href="#S_EnterData"><em>Ajouter une plongée</em></a> -  Ajouter manuellement une nouvelle
-  plongée au panneau de la <strong>liste des plongées</strong>.
-</p>
-</li>
-<li>
-<p>
-<em>Edit dive</em> - Edit a dive of which the profile was entered by hande and not
-  from a dive computer.
-</p>
-</li>
-<li>
-<p>
-<a href="#S_DivePlanner"><em>Planifier une plongée</em></a> - Cette fonctionnalité permet de
-  planifier des plongées.
-</p>
-</li>
-<li>
-<p>
-<a href="#S_Replan"><em>Modifier la plongée dans le planificateur</em></a> - Modifier une
-  plongée planifiée qui a été enregistrée dans la <strong>liste des plongées</strong>.
-</p>
-</li>
-<li>
-<p>
-<a href="#S_CopyComponents"><em>Copier les composants de la plongée</em></a> - En
-  sélectionnant cette option, vous pouvez copier les informations de plusieurs
-  champs d’un journal de plongée vers le presse-papier.
-</p>
-</li>
-<li>
-<p>
-<em>Coller les composants de la plongée</em>  - Colle, dans les plongées
+</div>
+<div class="sect2">
+<h3 id="_journal_log">14.3. Journal (log)</h3>
+<div class="ulist"><ul>
+<li>
+<p>
+<a href="#S_EnterData"><em>Ajouter une plongée</em></a> -  Ajouter manuellement une nouvelle
+  plongée au panneau de la <strong>liste des plongées</strong>.
+</p>
+</li>
+<li>
+<p>
+<em>Edit dive</em> - Edit a dive of which the profile was entered by hande and not
+  from a dive computer.
+</p>
+</li>
+<li>
+<p>
+<a href="#S_DivePlanner"><em>Planifier une plongée</em></a> - Cette fonctionnalité permet de
+  planifier des plongées.
+</p>
+</li>
+<li>
+<p>
+<a href="#S_Replan"><em>Modifier la plongée dans le planificateur</em></a> - Modifier une
+  plongée planifiée qui a été enregistrée dans la <strong>liste des plongées</strong>.
+</p>
+</li>
+<li>
+<p>
+<a href="#S_CopyComponents"><em>Copier les composants de la plongée</em></a> - En
+  sélectionnant cette option, vous pouvez copier les informations de plusieurs
+  champs d’un journal de plongée vers le presse-papier.
+</p>
+</li>
+<li>
+<p>
+<em>Coller les composants de la plongée</em>  - Colle, dans les plongées
   sélectionnées dans la <strong>liste des plongées</strong>, les informations copiées au
   préalable avec l’option <em>Copier les composants de la plongée</em>.
 </p>
@@ -5104,45 +4931,45 @@ des sections de ce manuel traitant des opérations relatives.</p></div>
 <p>
 <em>Manuel utilisateur</em>  - Ouvre une fenêtre affichant ce manuel utilisateur.
 </p>
-</li>
-</ul></div>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_mobile_version">15. Mobile Version</h2>
-<div class="sectionbody">
-<div class="paragraph"><p><em>Subsurface</em> has a mobile version, which can be used to view the dives
-stored in the user’s cloud account.</p></div>
-<div class="sect2">
-<h3 id="_how_to_use_the_mobile_version">15.1. How to use the mobile version</h3>
-<div class="paragraph"><p>When you first open the mobile app, you will have to log into your cloud
-account. To do this, click on the menu icon on the upper right, then click
-on preferences. Enter your cloud email and password, then click on save.</p></div>
-<div class="paragraph"><p>To load dives the first time, click on the menu icon, and then click on
-<em>Load Dives</em>. This will fetch the dive list from the cloud storage onto your
-device. On subsequent runs, the divelist will be loaded automatically when
-you open the app.</p></div>
-<div class="paragraph"><p>To view dive details, tap on any dive in the dive list. This will open the
-dive details window, which shows the dive profile and below it, the dive
-details. Any of the dive details can be changed.</p></div>
-<div class="paragraph"><p>To save changes made to the dive details, click on the back icon, then from
-the menu select <em>Save Changes</em>. This will save your changes to the cloud
-storage.</p></div>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_annexe_a_informations_spécifiques_au_système_d_8217_exploitation_utilisé_pour_importer_les_informations_de_plongées_depuis_un_ordinateur_de_plongée">16. ANNEXE A : informations spécifiques au système d’exploitation utilisé pour importer les informations de plongées depuis un ordinateur de plongée.</h2>
-<div class="sectionbody">
-<div class="sect2">
-<h3 id="_assurez_vous_que_les_pilotes_drivers_nécessaires_sont_installés">16.1. Assurez-vous que les pilotes (drivers) nécessaires sont installés</h3>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="images/icons/drivers.jpg" alt="Note" />
-</td>
-<td class="content">Le système d’exploitation de l’ordinateur nécessite les bons pilotes pour
+</li>
+</ul></div>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_mobile_version">15. Mobile Version</h2>
+<div class="sectionbody">
+<div class="paragraph"><p><em>Subsurface</em> has a mobile version, which can be used to view the dives
+stored in the user’s cloud account.</p></div>
+<div class="sect2">
+<h3 id="_how_to_use_the_mobile_version">15.1. How to use the mobile version</h3>
+<div class="paragraph"><p>When you first open the mobile app, you will have to log into your cloud
+account. To do this, click on the menu icon on the upper right, then click
+on preferences. Enter your cloud email and password, then click on save.</p></div>
+<div class="paragraph"><p>To load dives the first time, click on the menu icon, and then click on
+<em>Load Dives</em>. This will fetch the dive list from the cloud storage onto your
+device. On subsequent runs, the divelist will be loaded automatically when
+you open the app.</p></div>
+<div class="paragraph"><p>To view dive details, tap on any dive in the dive list. This will open the
+dive details window, which shows the dive profile and below it, the dive
+details. Any of the dive details can be changed.</p></div>
+<div class="paragraph"><p>To save changes made to the dive details, click on the back icon, then from
+the menu select <em>Save Changes</em>. This will save your changes to the cloud
+storage.</p></div>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_annexe_a_informations_spécifiques_au_système_d_8217_exploitation_utilisé_pour_importer_les_informations_de_plongées_depuis_un_ordinateur_de_plongée">16. ANNEXE A : informations spécifiques au système d’exploitation utilisé pour importer les informations de plongées depuis un ordinateur de plongée.</h2>
+<div class="sectionbody">
+<div class="sect2">
+<h3 id="_assurez_vous_que_les_pilotes_drivers_nécessaires_sont_installés">16.1. Assurez-vous que les pilotes (drivers) nécessaires sont installés</h3>
+<div class="admonitionblock">
+<table><tr>
+<td class="icon">
+<img src="images/icons/drivers.jpg" alt="Note" />
+</td>
+<td class="content">Le système d’exploitation de l’ordinateur nécessite les bons pilotes pour
 communiquer avec l’ordinateur de plongée de la façon utilisée par
 l’ordinateur de plongée (Bluetooth, USB, infra-rouge).</td>
 </tr></table>
@@ -5168,19 +4995,19 @@ Sous Windows, le bon pilote devrait être téléchargé automatiquement la
 <div class="paragraph"><p>Sous Mac, les utilisateurs peuvent parfois avoir besoin d’installer
 manuellement le bon pilote. Par exemple, pour le Mares Puck ou n’importe
 quel autre ordinateur de plongée utilisant une interface USB-série basé sur
-le composant Silicon Labs CP2101 ou similaire, le bon pilote est disponible
-sous <em>Mac_OSX_VCP_Driver.zip</em> sur le
-<a href="http://www.silabs.com/support/pages/document-library.aspx?p=Interface&f=USB%20Bridges&pn=CP2101">dépôt
-de documents et logiciels Silicon Labs</a>.</p></div>
-</div>
-<div class="sect2">
-<h3 id="S_HowFindDeviceName">16.2. Comment trouver le nom du périphérique branché sur USB et paramétrer les permissions en écriture</h3>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="images/icons/usb.jpg" alt="Note" />
-</td>
-<td class="content">Lorsqu’un utilisateur connecte un ordinateur de plongée en utilisant l’USB,
+le composant Silicon Labs CP2101 ou similaire, le bon pilote est disponible
+sous <em>Mac_OSX_VCP_Driver.zip</em> sur le
+<a href="http://www.silabs.com/support/pages/document-library.aspx?p=Interface&f=USB%20Bridges&pn=CP2101">dépôt
+de documents et logiciels Silicon Labs</a>.</p></div>
+</div>
+<div class="sect2">
+<h3 id="S_HowFindDeviceName">16.2. Comment trouver le nom du périphérique branché sur USB et paramétrer les permissions en écriture</h3>
+<div class="admonitionblock">
+<table><tr>
+<td class="icon">
+<img src="images/icons/usb.jpg" alt="Note" />
+</td>
+<td class="content">Lorsqu’un utilisateur connecte un ordinateur de plongée en utilisant l’USB,
 généralement <em>Subsurface</em> proposera soit une liste déroulante contenant le
 bon nom (ou le point de montage pour un Uemis Zurich) ou la liste sera
 désactivée si aucun nom de périphérique n’est nécessaire. Dans les rares cas
@@ -5257,19 +5084,19 @@ vérifiez que
 l’appartenance au groupe est bien effectif. Le groupe <code>dialout</code> devrait
 être listé
 parmi les différents IDs.
-Sous certaines circonstances, les modifications ne prennent effet qu’après une déconnexionpuis reconnexion sur l’ordinateur (sous Ubuntu, par exemple).
-Avec le bon nom de périphérique (par exemple <code>dev/ttyUSB3</code>) et avec un accès
-en écriture au port USB, l’ordinateur de plongée devrait se connecter et
-vous devriez pouvoir importer vos plongées.</p></div>
-</div>
-<div class="sect2">
-<h3 id="S_HowFindBluetoothDeviceName">16.3. Setting up bluetooth enabled devices</h3>
-<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
+Sous certaines circonstances, les modifications ne prennent effet qu’après une déconnexionpuis reconnexion sur l’ordinateur (sous Ubuntu, par exemple).
+Avec le bon nom de périphérique (par exemple <code>dev/ttyUSB3</code>) et avec un accès
+en écriture au port USB, l’ordinateur de plongée devrait se connecter et
+vous devriez pouvoir importer vos plongées.</p></div>
+</div>
+<div class="sect2">
+<h3 id="S_HowFindBluetoothDeviceName">16.3. Setting up bluetooth enabled devices</h3>
+<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
 Weikamp Frog or the Shearwater Predator and Petrel there is a different
 procedure to get the devices name to communicate with <em>Subsurface</em>. Follow
 these steps:</td>
@@ -5280,411 +5107,411 @@ these steps:</td>
 <p>
 <strong>For the dive computer, after enabling Bluetooth, ensure it is in Upload mode.</strong>
 </p>
-</li>
-</ul></div>
-<div class="paragraph"><p>For Bluetooth pairing of the dive computer, refer to the manufacturer’s user
-guide. When using a Shearwater Predator/Petrel, select <em>Dive Log → Upload
-Log</em> and wait for the <em>Wait PC</em> message.</p></div>
-<div class="ulist"><ul>
-<li>
-<p>
-<strong>Pair the <em>Subsurface</em> computer with the dive computer.</strong>
-</p>
-</li>
-</ul></div>
-<div class="sect3">
-<h4 id="_sur_windows">16.3.1. Sur Windows :</h4>
-<div class="paragraph"><p>Bluetooth is most likely already enabled. For pairing with the dive computer
-choose <em>Control Panel → Bluetooth Devices → Add Wireless Device</em>.  This
-should bring up a dialog showing your dive computer (which should be in
-Bluetooth mode) and allowing pairing. Right click on it and choose
-<em>Properties→ COM Ports</em> to identify the port used for your dive
-computer. If there are several ports listed, use the one saying "Outgoing"
-instead of "Incoming".</p></div>
-<div class="paragraph"><p>For downloading to <em>Subsurface</em>, the <em>Subsurface</em> drop-down list should
-contain this COM port already. If not, enter it manually.</p></div>
-<div class="paragraph"><p>Note: If there are issues afterwards when downloading from the dive computer
-using other software, remove the existing pairing with the dive computer.</p></div>
-</div>
-<div class="sect3">
-<h4 id="_sur_macos">16.3.2. Sur MacOS :</h4>
-<div class="paragraph"><p>Click on the Bluetooth symbol in the menu bar and select <em>Set up Bluetooth
-Device…</em>. The dive computer should then show up in the list of
-devices. Select it and go through the pairing process. This step should only
-be needed once for initial setup.</p></div>
-<div class="paragraph"><p>Once the pairing is completed the correct device is shown in the <em>Device or
-Mount Point</em> drop-down in the <em>Subsurface</em> <strong>Import</strong> dialog.</p></div>
-</div>
-<div class="sect3">
-<h4 id="_sur_linux">16.3.3. Sur Linux</h4>
-<div class="paragraph"><p>Ensure Bluetooth is enabled on the <em>Subsurface</em> computer.  On most common
-distributions this should be true out of the box and pairing should be
-straight forward. For instance, Gnome3 shows a Bluetooth icon on the right
-of the toolbar at the top of the screen.  Users have reported difficulties
-with some Bluetooth controllers.  If you have an onboard controller, try
-that first.  It is simplest if you remove any USB Bluetooth dongles.  If you
-have a USB dongle that came with your dive computer, try that before any
-others.</p></div>
-<div class="paragraph"><p>Setting up a connection to download dives from your Bluetooth-enabled
-device, such as the <em>Shearwater Petrel</em>, is not yet an automated process and
-will generally require the command prompt.  It is essentially a three step
-process.</p></div>
-<div class="ulist"><ul>
-<li>
-<p>
-Enable the Bluetooth controller and pair your dive computer</li>
-</p>
-</li>
-<li>
-<p>
-Establish an RFCOMM connection
-</p>
-</li>
-<li>
-<p>
-Download the dives with Subsurface
-</p>
-</li>
-</ul></div>
-<div class="paragraph"><p>Ensure the dive computer is in upload mode. On the <em>Shearwater Petrel</em> and
-<em>Petrel 2</em>, cycle through the menu, select <em>Dive Log</em>, then <em>Upload Log</em>.
-The display will read <em>Initializing</em>, then <em>Wait PC 3:00</em> and will
-countdown.  Once the connection is established, the display reads <em>Wait CMD
-…</em> and the countdown continues. When downloading the dive from Subsurface,
-the display reads <em>Sending</em> then <em>Sent Dive</em>.</p></div>
-<div class="paragraph"><p>To establish the connection, establish root access through <code>sudo</code> or <code>su</code>.
-The correct permission is required to download the dives in the computer. On
-most Linux systems this means becoming a member of the dialout group (This
-is identical as for many dive computers using a Linux USB port, descibed in
-the previous section). On the command terminal, enter:</p></div>
-<div class="paragraph"><p><code>sudo usermod -a -G dialout username</code></p></div>
-<div class="paragraph"><p>Then log out and log in for the change to take effect.</p></div>
-<div class="sect4">
-<h5 id="_enabling_the_bluetooth_controller_and_pairing_your_dive_computer">Enabling the Bluetooth controller and pairing your dive computer</h5>
-<div class="paragraph"><p>Attempt to set up the Bluetooth controller and pair your dive computer using
-the graphical environment of the operating system. After setting the dive
-computer to upload mode, click the Bluetooth icon in the system tray and
-select <em>Add new device</em>. The dive computer should appear. If asked for a
-password, enter 0000.  Write down or copy the MAC address of your dive
-computer - this needed later and should be in the form  00:11:22:33:44:55.</p></div>
-<div class="paragraph"><p>If the graphical method didn’t work, pair the device from the command
-line. Open a terminal and use <code>hciconfig</code> to check the Bluetooth controller
-status</p></div>
-<div class="literalblock">
-<div class="content">
-<pre><code>$ hciconfig
-hci0:   Type: BR/EDR  Bus: USB
-        BD Address: 01:23:45:67:89:AB  ACL MTU: 310:10  SCO MTU: 64:8
-        *DOWN*
-        RX bytes:504 acl:0 sco:0 events:22 errors:0
-        TX bytes:92 acl:0 sco:0 commands:21 errors:0</code></pre>
-</div></div>
-<div class="paragraph"><p>This indicates a Bluetooth controller with MAC address 01:23:45:67:89:AB,
-connected as hci0.  Its status is <em>DOWN</em>, i.e. not powered.  Additional
-controllers will appear as hci1, etc.  If there is not a Bluetooth dongle
-plugged in upon booting the computer, hci0 is probably the onboard.  Now
-power on the controller and enable authentication:</p></div>
-<div class="literalblock">
-<div class="content">
-<pre><code>sudo hciconfig hci0 up auth+  (enter password when prompted)
-hciconfig
-hci0:  Type: BR/EDR  Bus: USB
-        BD Address: 01:23:45:67:89:AB  ACL MTU: 310:10  SCO MTU: 64:8
-        *UP RUNNING PSCAN AUTH*
-        RX bytes:1026 acl:0 sco:0 events:47 errors:0
-        TX bytes:449 acl:0 sco:0 commands:46 errors:0</code></pre>
-</div></div>
-<div class="paragraph"><p><code>Check that the status now includes +<em>UP</em>, <em>RUNNING</em> AND <em>AUTH</em></code>.</p></div>
-<div class="paragraph"><p>If there are multiple controllers running, it’s easiest to off the unused
-controller(s). For example, for <code>hci1</code>:</p></div>
-<div class="literalblock">
-<div class="content">
-<pre><code>sudo hciconfig hci1 down</code></pre>
-</div></div>
-<div class="paragraph"><p>Next step is to <em>trust</em> and <em>pair</em> the dive computer. On distros with Bluez
-5, such as Fedora 22, one can use a tool called <code>blutootctl</code>, which will
-bring up its own command prompt.</p></div>
-<div class="literalblock">
-<div class="content">
-<pre><code>bluetoothctl
-[NEW] Controller 01:23:45:67:89:AB localhost.localdomain [default]
-[bluetooth]# agent on
-Agent registered
-[bluetooth]# default-agent
-Default agent request successful
-[bluetooth]# scan on                        <----now set your dive computer to upload mode
-Discovery started
-[CHG] Controller 01:23:45:67:89:AB Discovering: yes
-[NEW] Device 00:11:22:33:44:55 Petrel
-[bluetooth]# trust 00:11:22:33:44:55        <----you can use the tab key to autocomplete the MAC address
-[CHG] Device 00:11:22:33:44:55 Trusted: yes
-Changing 00:11:22:33:44:55 trust succeeded
-[bluetooth]# pair 00:11:22:33:44:55
-Attempting to pair with 00:11:22:33:44:55
-[CHG] Device 00:11:22:33:44:55 Connected: yes
-[CHG] Device 00:11:22:33:44:55 UUIDs: 00001101-0000-1000-8000-0089abc12345
-[CHG] Device 00:11:22:33:44:55 Paired: yes
-Pairing successful
-[CHG] Device 00:11:22:33:44:55 Connected: no</code></pre>
-</div></div>
-<div class="paragraph"><p>If asked for a password, enter 0000. It’s ok if the last line says
-<em>Connected: no</em>. The important part is the line above, <code>Pairing successful</code>.</p></div>
-<div class="paragraph"><p>If the system has Bluez version 4 (e.g. Ubuntu 12.04 through to 15.04),
-there is probably not a <code>bluetoothctl</code>, but a script called
-<code>bluez-simple-agent</code> or just <code>simple-agent</code>.</p></div>
-<div class="literalblock">
-<div class="content">
-<pre><code>hcitool -i hci0 scanning
-Scanning ...
-        00:11:22:33:44:55       Petrel
-        bluez-simple-agent hci0 00:11:22:33:44:55</code></pre>
-</div></div>
-<div class="paragraph"><p>Once ther dive computer is pired, set up the RFCOMM connection</p></div>
-</div>
-<div class="sect4">
-<h5 id="_establishing_the_rfcomm_connection">Establishing the RFCOMM connection</h5>
-<div class="paragraph"><p>The command to establish an RFCOMM connection is:</p></div>
-<div class="paragraph"><p><code>sudo rfcomm -i <controller> connect <dev> <bdaddr> [channel]</code></p></div>
-<div class="ulist"><ul>
-<li>
-<p>
-<controller>+ is the Bluetooth controller, <code>hci0</code>.
-</p>
-</li>
-<li>
-<p>
-<dev> is the RFCOMM device file, <code>rfcomm0</code>
-</p>
-</li>
-<li>
-<p>
-<bdaddr> is the dive computer’s MAC address, <code>00:11:22:33:44:55</code>
-</p>
-</li>
-<li>
-<p>
-[channel] is the dive computer’s Bluetooth channel we need to connect to.
-</p>
-</li>
-</ul></div>
-<div class="paragraph"><p>If one omits it, channel 1 is assumed.  Based on a limited number of user
-reports, the appropriate channel for the dive computer is probably:</p></div>
-<div class="ulist"><ul>
-<li>
-<p>
-<em>Shearwater Petrel 2</em>: channel 5
-</p>
-</li>
-<li>
-<p>
-<em>Shearwater Petrel 1</em>: channel 1
-</p>
-</li>
-<li>
-<p>
-<em>Heinrichs-Weikamp OSTC Sport</em>: channel 1
-</p>
-</li>
-</ul></div>
-<div class="paragraph"><p>E.g. to connect a <em>Shearwater Petrel 2</em>, set the dive computer to upload
-mode and enter:</p></div>
-<div class="literalblock">
-<div class="content">
-<pre><code>sudo rfcomm -i hci0 connect rfcomm0 00:11:22:33:44:55 5 (enter a password, probably 0000, when prompted)</code></pre>
-</div></div>
-<div class="paragraph"><p>This gives the response:</p></div>
-<div class="literalblock">
-<div class="content">
-<pre><code>Connected /dev/rfcomm0 to 00:11:22:33:44:55 on channel 5
-Press CTRL-C for hangup</code></pre>
-</div></div>
-<div class="paragraph"><p>To connect a _Shearwater Petrel 1+ or + HW OSTC Sport+, set the dive
-computer to upload mode and enter:</p></div>
-<div class="literalblock">
-<div class="content">
-<pre><code>sudo rfcomm -i hci0 connect rfcomm0 00:11:22:33:44:55   (enter a password, probably 0000, when prompted)
-Connected /dev/rfcomm0 to 00:11:22:33:44:55 on channel 1
-Press CTRL-C for hangup</code></pre>
-</div></div>
-<div class="paragraph"><p>If the specific channel the dive computer needs is not known, or the channel
-in the list above doesn’t work, the command <code>sdptool records</code> should help
-determine the appropriate channel. The output below is for a <em>Shearwater
-Petrel 2</em>.</p></div>
-<div class="literalblock">
-<div class="content">
-<pre><code>sdptool -i hci0 records 00:11:22:33:44:55
-Service Name: Serial Port
-Service RecHandle: 0x10000
-Service Class ID List:
-        "Serial Port" (0x1101)
-        Protocol Descriptor List:
-        "L2CAP" (0x0100)
-        "RFCOMM" (0x0003)
-        Channel: 5</code></pre>
-</div></div>
-<div class="paragraph"><p>For a Bluetooth dive computer not in the list above, or if the channel
-listed is not correct, please let the Subsurface developers know on the user
-forum or the developer mailing list <em>subsurface at subsurface-divelog.org</em>.</p></div>
-</div>
-<div class="sect4">
-<h5 id="_download_the_dives_with_subsurface_lt_em_gt">Download the dives with Subsurface</em></h5>
-<div class="paragraph"><p>After establishing the RFCOMM connection and while the dive computer’s
-upload mode countdown is still running, go to_Subsurface_, select
-<em>Import→Import from dive computer</em> and enter appropriate Vendor
-(e.g. <em>Shearwater</em>), Dive Computer (<em>Petrel</em>), Device or Mount Point
-(<em>/dev/rfcomm0</em>) and click <em>Download</em>.</p></div>
-</div>
-</div>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_appendix_b_dive_computer_specific_information_for_importing_dive_information">17. APPENDIX B: Dive Computer specific information for importing dive data.</h2>
-<div class="sectionbody">
-<div class="sect2">
-<h3 id="S_ImportUemis">17.1. Importing from Uemis Zurich</h3>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="images/icons/iumis.jpg" alt="Note" />
-</td>
-<td class="content"><em>Subsurface</em> downloads the information stored on the SDA (the built-in file
-system of the Uemis) including information about dive spots and
-equipment. Buddy information is not yet downloadable.  Things are very
-similar to a normal USB-connected dive computer (the Uemis is one of those
-that recharge when connected to the USB port).  The main difference is that
-one does not enter a device name, but instead the location where the
-UEMISSDA file system is mounted once connected to the dive computer. On
-Windows this is a drive letter ( often <em>E:</em> or <em>F:</em>), on a Mac this is
-<em>/Volumes/UEMISSDA</em> and on Linux systems this differs depending on the
-distribution. On Fedora it usually is
-<em>/var/run/media/<your_username>/UEMISSDA</em>. In all cases <em>Subsurface</em> should
-suggest the correct location in the drop down list.</td>
-</tr></table>
-</div>
-<div class="paragraph"><p>After selecting the above device name, download the dives from the Uemis
-Zurich. One technical issue with the Uemis Zurich download implementation
-(this is a Uemis firmware limitation, not a <em>Subsurface</em> issue) is that one
-cannot download more than about 40-50 dives without running out of memory on
-the SDA. This will usually only happen the very first time one downloads
-dives from the Uemis Zurich.  Normally when downloading at the end of a day
-or even after a dive trip, the capacity is sufficient. If <em>Subsurface</em>
-displays an error that the dive computer ran out of space the solution is
-straight forward.  Disconnect the SDA, turn it off and on again, and
-reconnect it. You can now retry (or start a new download session) and the
-download will continue where it stopped previously. One may have to do this
-more than once, depending on how many dives are stored on the dive computer.</p></div>
-</div>
-<div class="sect2">
-<h3 id="S_ImportingGalileo">17.2. Importing from Uwatec Galileo</h3>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="images/icons/Galileo.jpg" alt="Note" />
-</td>
-<td class="content">The Uwatec Galileo dive computers use infra red (IrDA) communication between
-the dive computer and Subsurface. The Uwatec hardware uses a USB dongle
-based on the serial infra-red (SIR) protocol and the MSC7780 IrDA controller
-manufactured by MosChip and marketed by Scubapro and some electronics
-companies.  Under Linux, the kernel already provides for communication using
-the IrDA protocol. However, the user additionally needs to load a driver for
-the IrDA interface with the dive computer. The easiest way is to load the
-<strong>irda-tools</strong> package from the
-<a href="http://irda.sourceforge.net/docs/startirda.html">Linux IrDA Project</a>.  After
-the installation of the irda-tools, the <strong>root user</strong> can specify a device
-name from the console as follows: <code>irattach irda0</code></td>
-</tr></table>
-</div>
-<div class="paragraph"><p>After executing this command, Subsurface will recognise the Galileo dive
-computer and download dive information.</p></div>
-<div class="paragraph"><p>Under Windows, a similar situation exists. Drivers for the MCS7780 are
-available from some Internet web sites e.g.
-<a href="http://www.drivers-download.com/Drv/MosChip/MCS7780/">www.drivers-download.com</a>.
-Windows-based IrDA drivers for the Uwatec can also be downloaded from the
-ScubaPro web site, drivers being located on the download page for the
-ScubaPro SmartTrak software.</p></div>
-<div class="paragraph"><p>For the Apple Mac, IrDA communication via the MCS7780 link is not available
-for OSX 10.6 or higher.</p></div>
-</div>
-<div class="sect2">
-<h3 id="S_ImportingDR5">17.3. Importing from Heinrichs Weikamp DR5</h3>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="images/icons/HW_DR5.jpg" alt="Note" />
-</td>
-<td class="content">When mounted as a USB drive the Heinrichs Weikamp DR5 saves a single UDDF
-file for every dive.  Mark all the dives you’d like to import or open.
-Note: The DR5 does not seem to store gradient factors nor deco information,
-so for <em>Subsurface</em> it is not possible to display them. Adjust the gradient
-factors in the <em>Graph Settings</em> in <em>Subsurface</em> to generate a deco overlay
-in the <em>Subsurface</em> <strong>Dive Profile</strong> panel but please note that the deco
-calculated by <em>Subsurface</em> will most likely differ from the one displayed on
-the DR5.</td>
-</tr></table>
-</div>
-</div>
-<div class="sect2">
-<h3 id="S_ImportingXDeep">17.4. Importing from xDEEP BLACK</h3>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="images/icons/HW_xdeepblack.jpg" alt="Note" />
-</td>
-<td class="content">Each dive has to be individually saved as UDDF file using "Export UDDF"
-option in BLACK’s logbook menu.  When mounted as a USB drive UDDF files are
-available in LOGBOOK directory.  Note: The xDEEP BLACK saves NDL time but
-does not seem to store gradient factors nor deco information, so for
-<em>Subsurface</em> it is not possible to display them. Adjust the gradient factors
-in the <em>Graph Settings</em> in <em>Subsurface</em> to generate a deco overlay in the
-<em>Subsurface</em> <strong>Dive Profile</strong> panel but please note that the deco calculated
-by <em>Subsurface</em> will most likely differ from the one displayed on the xDEEP
-BLACK.</td>
-</tr></table>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_importing_from_shearwater_predator_using_bluetooth">17.5. Importing from Shearwater Predator using Bluetooth</h3>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="images/icons/predator.jpg" alt="Note" />
-</td>
-<td class="content">Using a Shearwater Predator one may be able to pair Bluetooth but then
-encounter issues when downloading, showing errors like <em>Slip RX: unexp. SLIP
-END</em> on the Predator.  This might also arise when using other dive log
-software and operating systems other than Linux. We have no detailed idea
-about the source and how to fix this, but it is reported to be solved
-sometimes by one of these steps:</td>
-</tr></table>
-</div>
+</li>
+</ul></div>
+<div class="paragraph"><p>For Bluetooth pairing of the dive computer, refer to the manufacturer’s user
+guide. When using a Shearwater Predator/Petrel, select <em>Dive Log → Upload
+Log</em> and wait for the <em>Wait PC</em> message.</p></div>
 <div class="ulist"><ul>
 <li>
 <p>
-use the Bluetooth dongle which came with the Shearwater Predator instead of
-   the built-in one of the <em>Subsurface</em> computer
+<strong>Pair the <em>Subsurface</em> computer with the dive computer.</strong>
 </p>
 </li>
-<li>
-<p>
+</ul></div>
+<div class="sect3">
+<h4 id="_sur_windows">16.3.1. Sur Windows :</h4>
+<div class="paragraph"><p>Bluetooth is most likely already enabled. For pairing with the dive computer
+choose <em>Control Panel → Bluetooth Devices → Add Wireless Device</em>.  This
+should bring up a dialog showing your dive computer (which should be in
+Bluetooth mode) and allowing pairing. Right click on it and choose
+<em>Properties→ COM Ports</em> to identify the port used for your dive
+computer. If there are several ports listed, use the one saying "Outgoing"
+instead of "Incoming".</p></div>
+<div class="paragraph"><p>For downloading to <em>Subsurface</em>, the <em>Subsurface</em> drop-down list should
+contain this COM port already. If not, enter it manually.</p></div>
+<div class="paragraph"><p>Note: If there are issues afterwards when downloading from the dive computer
+using other software, remove the existing pairing with the dive computer.</p></div>
+</div>
+<div class="sect3">
+<h4 id="_sur_macos">16.3.2. Sur MacOS :</h4>
+<div class="paragraph"><p>Click on the Bluetooth symbol in the menu bar and select <em>Set up Bluetooth
+Device…</em>. The dive computer should then show up in the list of
+devices. Select it and go through the pairing process. This step should only
+be needed once for initial setup.</p></div>
+<div class="paragraph"><p>Once the pairing is completed the correct device is shown in the <em>Device or
+Mount Point</em> drop-down in the <em>Subsurface</em> <strong>Import</strong> dialog.</p></div>
+</div>
+<div class="sect3">
+<h4 id="_sur_linux">16.3.3. Sur Linux</h4>
+<div class="paragraph"><p>Ensure Bluetooth is enabled on the <em>Subsurface</em> computer.  On most common
+distributions this should be true out of the box and pairing should be
+straight forward. For instance, Gnome3 shows a Bluetooth icon on the right
+of the toolbar at the top of the screen.  Users have reported difficulties
+with some Bluetooth controllers.  If you have an onboard controller, try
+that first.  It is simplest if you remove any USB Bluetooth dongles.  If you
+have a USB dongle that came with your dive computer, try that before any
+others.</p></div>
+<div class="paragraph"><p>Setting up a connection to download dives from your Bluetooth-enabled
+device, such as the <em>Shearwater Petrel</em>, is not yet an automated process and
+will generally require the command prompt.  It is essentially a three step
+process.</p></div>
+<div class="ulist"><ul>
+<li>
+<p>
+Enable the Bluetooth controller and pair your dive computer</li>
+</p>
+</li>
+<li>
+<p>
+Establish an RFCOMM connection
+</p>
+</li>
+<li>
+<p>
+Download the dives with Subsurface
+</p>
+</li>
+</ul></div>
+<div class="paragraph"><p>Ensure the dive computer is in upload mode. On the <em>Shearwater Petrel</em> and
+<em>Petrel 2</em>, cycle through the menu, select <em>Dive Log</em>, then <em>Upload Log</em>.
+The display will read <em>Initializing</em>, then <em>Wait PC 3:00</em> and will
+countdown.  Once the connection is established, the display reads <em>Wait CMD
+…</em> and the countdown continues. When downloading the dive from Subsurface,
+the display reads <em>Sending</em> then <em>Sent Dive</em>.</p></div>
+<div class="paragraph"><p>To establish the connection, establish root access through <code>sudo</code> or <code>su</code>.
+The correct permission is required to download the dives in the computer. On
+most Linux systems this means becoming a member of the dialout group (This
+is identical as for many dive computers using a Linux USB port, descibed in
+the previous section). On the command terminal, enter:</p></div>
+<div class="paragraph"><p><code>sudo usermod -a -G dialout username</code></p></div>
+<div class="paragraph"><p>Then log out and log in for the change to take effect.</p></div>
+<div class="sect4">
+<h5 id="_enabling_the_bluetooth_controller_and_pairing_your_dive_computer">Enabling the Bluetooth controller and pairing your dive computer</h5>
+<div class="paragraph"><p>Attempt to set up the Bluetooth controller and pair your dive computer using
+the graphical environment of the operating system. After setting the dive
+computer to upload mode, click the Bluetooth icon in the system tray and
+select <em>Add new device</em>. The dive computer should appear. If asked for a
+password, enter 0000.  Write down or copy the MAC address of your dive
+computer - this needed later and should be in the form  00:11:22:33:44:55.</p></div>
+<div class="paragraph"><p>If the graphical method didn’t work, pair the device from the command
+line. Open a terminal and use <code>hciconfig</code> to check the Bluetooth controller
+status</p></div>
+<div class="literalblock">
+<div class="content">
+<pre><code>$ hciconfig
+hci0:   Type: BR/EDR  Bus: USB
+        BD Address: 01:23:45:67:89:AB  ACL MTU: 310:10  SCO MTU: 64:8
+        *DOWN*
+        RX bytes:504 acl:0 sco:0 events:22 errors:0
+        TX bytes:92 acl:0 sco:0 commands:21 errors:0</code></pre>
+</div></div>
+<div class="paragraph"><p>This indicates a Bluetooth controller with MAC address 01:23:45:67:89:AB,
+connected as hci0.  Its status is <em>DOWN</em>, i.e. not powered.  Additional
+controllers will appear as hci1, etc.  If there is not a Bluetooth dongle
+plugged in upon booting the computer, hci0 is probably the onboard.  Now
+power on the controller and enable authentication:</p></div>
+<div class="literalblock">
+<div class="content">
+<pre><code>sudo hciconfig hci0 up auth+  (enter password when prompted)
+hciconfig
+hci0:  Type: BR/EDR  Bus: USB
+        BD Address: 01:23:45:67:89:AB  ACL MTU: 310:10  SCO MTU: 64:8
+        *UP RUNNING PSCAN AUTH*
+        RX bytes:1026 acl:0 sco:0 events:47 errors:0
+        TX bytes:449 acl:0 sco:0 commands:46 errors:0</code></pre>
+</div></div>
+<div class="paragraph"><p><code>Check that the status now includes +<em>UP</em>, <em>RUNNING</em> AND <em>AUTH</em></code>.</p></div>
+<div class="paragraph"><p>If there are multiple controllers running, it’s easiest to off the unused
+controller(s). For example, for <code>hci1</code>:</p></div>
+<div class="literalblock">
+<div class="content">
+<pre><code>sudo hciconfig hci1 down</code></pre>
+</div></div>
+<div class="paragraph"><p>Next step is to <em>trust</em> and <em>pair</em> the dive computer. On distros with Bluez
+5, such as Fedora 22, one can use a tool called <code>blutootctl</code>, which will
+bring up its own command prompt.</p></div>
+<div class="literalblock">
+<div class="content">
+<pre><code>bluetoothctl
+[NEW] Controller 01:23:45:67:89:AB localhost.localdomain [default]
+[bluetooth]# agent on
+Agent registered
+[bluetooth]# default-agent
+Default agent request successful
+[bluetooth]# scan on                        <----now set your dive computer to upload mode
+Discovery started
+[CHG] Controller 01:23:45:67:89:AB Discovering: yes
+[NEW] Device 00:11:22:33:44:55 Petrel
+[bluetooth]# trust 00:11:22:33:44:55        <----you can use the tab key to autocomplete the MAC address
+[CHG] Device 00:11:22:33:44:55 Trusted: yes
+Changing 00:11:22:33:44:55 trust succeeded
+[bluetooth]# pair 00:11:22:33:44:55
+Attempting to pair with 00:11:22:33:44:55
+[CHG] Device 00:11:22:33:44:55 Connected: yes
+[CHG] Device 00:11:22:33:44:55 UUIDs: 00001101-0000-1000-8000-0089abc12345
+[CHG] Device 00:11:22:33:44:55 Paired: yes
+Pairing successful
+[CHG] Device 00:11:22:33:44:55 Connected: no</code></pre>
+</div></div>
+<div class="paragraph"><p>If asked for a password, enter 0000. It’s ok if the last line says
+<em>Connected: no</em>. The important part is the line above, <code>Pairing successful</code>.</p></div>
+<div class="paragraph"><p>If the system has Bluez version 4 (e.g. Ubuntu 12.04 through to 15.04),
+there is probably not a <code>bluetoothctl</code>, but a script called
+<code>bluez-simple-agent</code> or just <code>simple-agent</code>.</p></div>
+<div class="literalblock">
+<div class="content">
+<pre><code>hcitool -i hci0 scanning
+Scanning ...
+        00:11:22:33:44:55       Petrel
+        bluez-simple-agent hci0 00:11:22:33:44:55</code></pre>
+</div></div>
+<div class="paragraph"><p>Once ther dive computer is pired, set up the RFCOMM connection</p></div>
+</div>
+<div class="sect4">
+<h5 id="_establishing_the_rfcomm_connection">Establishing the RFCOMM connection</h5>
+<div class="paragraph"><p>The command to establish an RFCOMM connection is:</p></div>
+<div class="paragraph"><p><code>sudo rfcomm -i <controller> connect <dev> <bdaddr> [channel]</code></p></div>
+<div class="ulist"><ul>
+<li>
+<p>
+<controller>+ is the Bluetooth controller, <code>hci0</code>.
+</p>
+</li>
+<li>
+<p>
+<dev> is the RFCOMM device file, <code>rfcomm0</code>
+</p>
+</li>
+<li>
+<p>
+<bdaddr> is the dive computer’s MAC address, <code>00:11:22:33:44:55</code>
+</p>
+</li>
+<li>
+<p>
+[channel] is the dive computer’s Bluetooth channel we need to connect to.
+</p>
+</li>
+</ul></div>
+<div class="paragraph"><p>If one omits it, channel 1 is assumed.  Based on a limited number of user
+reports, the appropriate channel for the dive computer is probably:</p></div>
+<div class="ulist"><ul>
+<li>
+<p>
+<em>Shearwater Petrel 2</em>: channel 5
+</p>
+</li>
+<li>
+<p>
+<em>Shearwater Petrel 1</em>: channel 1
+</p>
+</li>
+<li>
+<p>
+<em>Heinrichs-Weikamp OSTC Sport</em>: channel 1
+</p>
+</li>
+</ul></div>
+<div class="paragraph"><p>E.g. to connect a <em>Shearwater Petrel 2</em>, set the dive computer to upload
+mode and enter:</p></div>
+<div class="literalblock">
+<div class="content">
+<pre><code>sudo rfcomm -i hci0 connect rfcomm0 00:11:22:33:44:55 5 (enter a password, probably 0000, when prompted)</code></pre>
+</div></div>
+<div class="paragraph"><p>This gives the response:</p></div>
+<div class="literalblock">
+<div class="content">
+<pre><code>Connected /dev/rfcomm0 to 00:11:22:33:44:55 on channel 5
+Press CTRL-C for hangup</code></pre>
+</div></div>
+<div class="paragraph"><p>To connect a _Shearwater Petrel 1+ or + HW OSTC Sport+, set the dive
+computer to upload mode and enter:</p></div>
+<div class="literalblock">
+<div class="content">
+<pre><code>sudo rfcomm -i hci0 connect rfcomm0 00:11:22:33:44:55   (enter a password, probably 0000, when prompted)
+Connected /dev/rfcomm0 to 00:11:22:33:44:55 on channel 1
+Press CTRL-C for hangup</code></pre>
+</div></div>
+<div class="paragraph"><p>If the specific channel the dive computer needs is not known, or the channel
+in the list above doesn’t work, the command <code>sdptool records</code> should help
+determine the appropriate channel. The output below is for a <em>Shearwater
+Petrel 2</em>.</p></div>
+<div class="literalblock">
+<div class="content">
+<pre><code>sdptool -i hci0 records 00:11:22:33:44:55
+Service Name: Serial Port
+Service RecHandle: 0x10000
+Service Class ID List:
+        "Serial Port" (0x1101)
+        Protocol Descriptor List:
+        "L2CAP" (0x0100)
+        "RFCOMM" (0x0003)
+        Channel: 5</code></pre>
+</div></div>
+<div class="paragraph"><p>For a Bluetooth dive computer not in the list above, or if the channel
+listed is not correct, please let the Subsurface developers know on the user
+forum or the developer mailing list <em>subsurface at subsurface-divelog.org</em>.</p></div>
+</div>
+<div class="sect4">
+<h5 id="_download_the_dives_with_subsurface_lt_em_gt">Download the dives with Subsurface</em></h5>
+<div class="paragraph"><p>After establishing the RFCOMM connection and while the dive computer’s
+upload mode countdown is still running, go to_Subsurface_, select
+<em>Import→Import from dive computer</em> and enter appropriate Vendor
+(e.g. <em>Shearwater</em>), Dive Computer (<em>Petrel</em>), Device or Mount Point
+(<em>/dev/rfcomm0</em>) and click <em>Download</em>.</p></div>
+</div>
+</div>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_appendix_b_dive_computer_specific_information_for_importing_dive_information">17. APPENDIX B: Dive Computer specific information for importing dive data.</h2>
+<div class="sectionbody">
+<div class="sect2">
+<h3 id="S_ImportUemis">17.1. Importing from Uemis Zurich</h3>
+<div class="admonitionblock">
+<table><tr>
+<td class="icon">
+<img src="images/icons/iumis.jpg" alt="Note" />
+</td>
+<td class="content"><em>Subsurface</em> downloads the information stored on the SDA (the built-in file
+system of the Uemis) including information about dive spots and
+equipment. Buddy information is not yet downloadable.  Things are very
+similar to a normal USB-connected dive computer (the Uemis is one of those
+that recharge when connected to the USB port).  The main difference is that
+one does not enter a device name, but instead the location where the
+UEMISSDA file system is mounted once connected to the dive computer. On
+Windows this is a drive letter ( often <em>E:</em> or <em>F:</em>), on a Mac this is
+<em>/Volumes/UEMISSDA</em> and on Linux systems this differs depending on the
+distribution. On Fedora it usually is
+<em>/var/run/media/<your_username>/UEMISSDA</em>. In all cases <em>Subsurface</em> should
+suggest the correct location in the drop down list.</td>
+</tr></table>
+</div>
+<div class="paragraph"><p>After selecting the above device name, download the dives from the Uemis
+Zurich. One technical issue with the Uemis Zurich download implementation
+(this is a Uemis firmware limitation, not a <em>Subsurface</em> issue) is that one
+cannot download more than about 40-50 dives without running out of memory on
+the SDA. This will usually only happen the very first time one downloads
+dives from the Uemis Zurich.  Normally when downloading at the end of a day
+or even after a dive trip, the capacity is sufficient. If <em>Subsurface</em>
+displays an error that the dive computer ran out of space the solution is
+straight forward.  Disconnect the SDA, turn it off and on again, and
+reconnect it. You can now retry (or start a new download session) and the
+download will continue where it stopped previously. One may have to do this
+more than once, depending on how many dives are stored on the dive computer.</p></div>
+</div>
+<div class="sect2">
+<h3 id="S_ImportingGalileo">17.2. Importing from Uwatec Galileo</h3>
+<div class="admonitionblock">
+<table><tr>
+<td class="icon">
+<img src="images/icons/Galileo.jpg" alt="Note" />
+</td>
+<td class="content">The Uwatec Galileo dive computers use infra red (IrDA) communication between
+the dive computer and Subsurface. The Uwatec hardware uses a USB dongle
+based on the serial infra-red (SIR) protocol and the MSC7780 IrDA controller
+manufactured by MosChip and marketed by Scubapro and some electronics
+companies.  Under Linux, the kernel already provides for communication using
+the IrDA protocol. However, the user additionally needs to load a driver for
+the IrDA interface with the dive computer. The easiest way is to load the
+<strong>irda-tools</strong> package from the
+<a href="http://irda.sourceforge.net/docs/startirda.html">Linux IrDA Project</a>.  After
+the installation of the irda-tools, the <strong>root user</strong> can specify a device
+name from the console as follows: <code>irattach irda0</code></td>
+</tr></table>
+</div>
+<div class="paragraph"><p>After executing this command, Subsurface will recognise the Galileo dive
+computer and download dive information.</p></div>
+<div class="paragraph"><p>Under Windows, a similar situation exists. Drivers for the MCS7780 are
+available from some Internet web sites e.g.
+<a href="http://www.drivers-download.com/Drv/MosChip/MCS7780/">www.drivers-download.com</a>.
+Windows-based IrDA drivers for the Uwatec can also be downloaded from the
+ScubaPro web site, drivers being located on the download page for the
+ScubaPro SmartTrak software.</p></div>
+<div class="paragraph"><p>For the Apple Mac, IrDA communication via the MCS7780 link is not available
+for OSX 10.6 or higher.</p></div>
+</div>
+<div class="sect2">
+<h3 id="S_ImportingDR5">17.3. Importing from Heinrichs Weikamp DR5</h3>
+<div class="admonitionblock">
+<table><tr>
+<td class="icon">
+<img src="images/icons/HW_DR5.jpg" alt="Note" />
+</td>
+<td class="content">When mounted as a USB drive the Heinrichs Weikamp DR5 saves a single UDDF
+file for every dive.  Mark all the dives you’d like to import or open.
+Note: The DR5 does not seem to store gradient factors nor deco information,
+so for <em>Subsurface</em> it is not possible to display them. Adjust the gradient
+factors in the <em>Graph Settings</em> in <em>Subsurface</em> to generate a deco overlay
+in the <em>Subsurface</em> <strong>Dive Profile</strong> panel but please note that the deco
+calculated by <em>Subsurface</em> will most likely differ from the one displayed on
+the DR5.</td>
+</tr></table>
+</div>
+</div>
+<div class="sect2">
+<h3 id="S_ImportingXDeep">17.4. Importing from xDEEP BLACK</h3>
+<div class="admonitionblock">
+<table><tr>
+<td class="icon">
+<img src="images/icons/HW_xdeepblack.jpg" alt="Note" />
+</td>
+<td class="content">Each dive has to be individually saved as UDDF file using "Export UDDF"
+option in BLACK’s logbook menu.  When mounted as a USB drive UDDF files are
+available in LOGBOOK directory.  Note: The xDEEP BLACK saves NDL time but
+does not seem to store gradient factors nor deco information, so for
+<em>Subsurface</em> it is not possible to display them. Adjust the gradient factors
+in the <em>Graph Settings</em> in <em>Subsurface</em> to generate a deco overlay in the
+<em>Subsurface</em> <strong>Dive Profile</strong> panel but please note that the deco calculated
+by <em>Subsurface</em> will most likely differ from the one displayed on the xDEEP
+BLACK.</td>
+</tr></table>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_importing_from_shearwater_predator_using_bluetooth">17.5. Importing from Shearwater Predator using Bluetooth</h3>
+<div class="admonitionblock">
+<table><tr>
+<td class="icon">
+<img src="images/icons/predator.jpg" alt="Note" />
+</td>
+<td class="content">Using a Shearwater Predator one may be able to pair Bluetooth but then
+encounter issues when downloading, showing errors like <em>Slip RX: unexp. SLIP
+END</em> on the Predator.  This might also arise when using other dive log
+software and operating systems other than Linux. We have no detailed idea
+about the source and how to fix this, but it is reported to be solved
+sometimes by one of these steps:</td>
+</tr></table>
+</div>
+<div class="ulist"><ul>
+<li>
+<p>
+use the Bluetooth dongle which came with the Shearwater Predator instead of
+   the built-in one of the <em>Subsurface</em> computer
+</p>
+</li>
+<li>
+<p>
 switch to different Bluetooth drivers for the same hardware
 </p>
 </li>
 <li>
 <p>
-switch off WiFi while using Bluetooth
-</p>
-</li>
-</ul></div>
-</div>
-<div class="sect2">
-<h3 id="S_PoseidonMkVI">17.6. Importing from Poseidon MkVI Discovery</h3>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="images/MkVI.jpeg" alt="Note" />
-</td>
-<td class="content">Download of dive logs from the MkVI is performed using a custom
+switch off WiFi while using Bluetooth
+</p>
+</li>
+</ul></div>
+</div>
+<div class="sect2">
+<h3 id="S_PoseidonMkVI">17.6. Importing from Poseidon MkVI Discovery</h3>
+<div class="admonitionblock">
+<table><tr>
+<td class="icon">
+<img src="images/MkVI.jpeg" alt="Note" />
+</td>
+<td class="content">Download of dive logs from the MkVI is performed using a custom
 communications adapter and the <em>Poseidon PC Configuration Software</em>,
 obtained when purchasing the MKVI equipment. The latter is a Windows
 application allowing configuration of equipment and storage of dive
@@ -5710,19 +5537,19 @@ Dive log details (file with a .csv extension)
 Redbook format dive log (file with .cvsr extension). This is a compressed
   version of the dive log using a proprietary format.
 </p>
-</li>
-</ul></div>
-<div class="paragraph"><p><em>Subsurface</em> accesses the .txt and the .csv files to obtain dive log
-information.</p></div>
-</div>
-<div class="sect2">
-<h3 id="_importing_from_apd_inspiration_evolution_ccr">17.7. Importing from APD Inspiration/Evolution CCR</h3>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="images/APDComputer.jpg" alt="Note" />
-</td>
-<td class="content">The dive logs of an APD Inspiration or similar CCR dive computer are
+</li>
+</ul></div>
+<div class="paragraph"><p><em>Subsurface</em> accesses the .txt and the .csv files to obtain dive log
+information.</p></div>
+</div>
+<div class="sect2">
+<h3 id="_importing_from_apd_inspiration_evolution_ccr">17.7. Importing from APD Inspiration/Evolution CCR</h3>
+<div class="admonitionblock">
+<table><tr>
+<td class="icon">
+<img src="images/APDComputer.jpg" alt="Note" />
+</td>
+<td class="content">The dive logs of an APD Inspiration or similar CCR dive computer are
 downloaded using a communications adapter and <em>AP Communicator</em>, obtained
 when purchasing the equipment. The dive logs can be viewed using the <em>AP Log
 Viewer</em>, within Windows or Mac/OS. However, APD logs can be viewed and
@@ -5731,99 +5558,99 @@ of dive computer). The APD inspiration dive logs are imported into
 <em>Subsurface</em> as follows:</td>
 </tr></table>
 </div>
-<div class="ulist"><ul>
-<li>
-<p>
-Download the dive using <em>AP Communicator</em>.
-</p>
-</li>
-<li>
-<p>
-Open a dive within the <em>AP Log Viewer</em>.
-</p>
-</li>
+<div class="ulist"><ul>
+<li>
+<p>
+Download the dive using <em>AP Communicator</em>.
+</p>
+</li>
+<li>
+<p>
+Open a dive within the <em>AP Log Viewer</em>.
+</p>
+</li>
 <li>
 <p>
 Select the tab at the top of the screen, entitled "<em>Data</em>".
 </p>
-</li>
-<li>
-<p>
-With the raw dive log data show on the screen, click on "<em>Copy to
-  Clipboard</em>".
-</p>
-</li>
-<li>
-<p>
-Open a text editor, e.g. Notepad (Windows) or TextWrangler (Mac).
-</p>
-</li>
-<li>
-<p>
-Copy the contents of the clipboard into the text editor and save the text
-  file with a filename extension of <em>.apd</em>
-</p>
-</li>
-<li>
+</li>
+<li>
+<p>
+With the raw dive log data show on the screen, click on "<em>Copy to
+  Clipboard</em>".
+</p>
+</li>
+<li>
+<p>
+Open a text editor, e.g. Notepad (Windows) or TextWrangler (Mac).
+</p>
+</li>
+<li>
+<p>
+Copy the contents of the clipboard into the text editor and save the text
+  file with a filename extension of <em>.apd</em>
+</p>
+</li>
+<li>
 <p>
 Within <em>Subsurface</em>, select <em>Import → Import log files</em> to open the
   <a href="#Unified_import">universal import dialogue</a>.
 </p>
-</li>
-<li>
-<p>
-In the dropdown list towards the bottom right of the dialogue (labled
-  <em>Filter:</em>), select "APD log viewer".
-</p>
-</li>
-<li>
-<p>
-On the list of file names select the <em>.apd</em> file that has been created
-  above. An import dialogue opens indicating the default settings for the data
-  in the <em>.apd</em> file. If any changes are required, do this as for
-  <a href="#S_ImportingCSVDives">CSV imports</a>.
-</p>
-</li>
-</ul></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/APD_CSVimportF22.jpg" alt="Figure: APD log viewer import" />
-</div>
-</div>
-<div class="ulist"><ul>
-<li>
-<p>
-The top left hand dropdown box in the import panel allows one to select the
-  APD dive computer for which the dive log needs to be imported. The default
-  it is DC1, <em>i.e.</em> the first of the two dive computers the APD uses. It is
-  possible to sequentially import the data for both dive computers by first
-  importing CD1 and then DC2.(<strong>Hint</strong>: The logs for the two dive computers are
-  viewed by selecting <em>View → Next DC</em> from the Main Menu after the uploading
-  has been completed)
-</p>
-</li>
-<li>
-<p>
-Click the <em>Ok</em> button at the bottom of the import panel.
-</p>
-</li>
-</ul></div>
-<div class="paragraph"><p>The APD dive log will appear within <em>Subsurface</em>. The dive
-computer-generated ceiling generated by the Inspiration can be viewed by
-selecting the appropriate button on the left of the <strong>Dive Profile</strong>. Cylinder
-pressure data are not logged by the APD equipment but can be manually
-entered in the <em>Equipment</em> Tab.</p></div>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_appendix_c_exporting_dive_log_information_from_external_dive_log_software">18. APPENDIX C: Exporting Dive log information from external dive log software.</h2>
-<div class="sectionbody">
-<div class="paragraph"><p>The import of dive log data from external dive log software is mostly
-performed using the dialogue found by selecting <em>Import</em> from the Main Menu,
-then clicking on <em>Import Log Files</em>. This is a single-step process, more
-information about which can be found <a href="#Unified_import">here.</a> However, in
-some cases, a two-step process may be required:</p></div>
+</li>
+<li>
+<p>
+In the dropdown list towards the bottom right of the dialogue (labled
+  <em>Filter:</em>), select "APD log viewer".
+</p>
+</li>
+<li>
+<p>
+On the list of file names select the <em>.apd</em> file that has been created
+  above. An import dialogue opens indicating the default settings for the data
+  in the <em>.apd</em> file. If any changes are required, do this as for
+  <a href="#S_ImportingCSVDives">CSV imports</a>.
+</p>
+</li>
+</ul></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/APD_CSVimportF22.jpg" alt="Figure: APD log viewer import" />
+</div>
+</div>
+<div class="ulist"><ul>
+<li>
+<p>
+The top left hand dropdown box in the import panel allows one to select the
+  APD dive computer for which the dive log needs to be imported. The default
+  it is DC1, <em>i.e.</em> the first of the two dive computers the APD uses. It is
+  possible to sequentially import the data for both dive computers by first
+  importing CD1 and then DC2.(<strong>Hint</strong>: The logs for the two dive computers are
+  viewed by selecting <em>View → Next DC</em> from the Main Menu after the uploading
+  has been completed)
+</p>
+</li>
+<li>
+<p>
+Click the <em>Ok</em> button at the bottom of the import panel.
+</p>
+</li>
+</ul></div>
+<div class="paragraph"><p>The APD dive log will appear within <em>Subsurface</em>. The dive
+computer-generated ceiling generated by the Inspiration can be viewed by
+selecting the appropriate button on the left of the <strong>Dive Profile</strong>. Cylinder
+pressure data are not logged by the APD equipment but can be manually
+entered in the <em>Equipment</em> Tab.</p></div>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_appendix_c_exporting_dive_log_information_from_external_dive_log_software">18. APPENDIX C: Exporting Dive log information from external dive log software.</h2>
+<div class="sectionbody">
+<div class="paragraph"><p>The import of dive log data from external dive log software is mostly
+performed using the dialogue found by selecting <em>Import</em> from the Main Menu,
+then clicking on <em>Import Log Files</em>. This is a single-step process, more
+information about which can be found <a href="#Unified_import">here.</a> However, in
+some cases, a two-step process may be required:</p></div>
 <div class="olist arabic"><ol class="arabic">
 <li>
 <p>
@@ -5835,19 +5662,19 @@ Export the foreign dive log data to format that is accessible from
 <p>
 Import the accessible dive log data into <em>Subsurface</em>.
 </p>
-</li>
-</ol></div>
-<div class="paragraph"><p>This appendix provides some information about approaches to export dive log
-data from foreign dive log software. The procedures below mostly apply to
-Linux and/or Windows.</p></div>
-<div class="sect2">
-<h3 id="S_ImportingDivesSuunto">18.1. Exporting from <strong>Suunto Divemanager (DM3, DM4 or DM5)</strong></h3>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="images/icons/suuntologo.jpg" alt="Note" />
-</td>
-<td class="content">DiveManager is a MS Windows application for Suunto dive computers.
+</li>
+</ol></div>
+<div class="paragraph"><p>This appendix provides some information about approaches to export dive log
+data from foreign dive log software. The procedures below mostly apply to
+Linux and/or Windows.</p></div>
+<div class="sect2">
+<h3 id="S_ImportingDivesSuunto">18.1. Exporting from <strong>Suunto Divemanager (DM3, DM4 or DM5)</strong></h3>
+<div class="admonitionblock">
+<table><tr>
+<td class="icon">
+<img src="images/icons/suuntologo.jpg" alt="Note" />
+</td>
+<td class="content">DiveManager is a MS Windows application for Suunto dive computers.
 Divemanager 3 (DM3) is an older version of the Suunto software. More recent
 Suunto dive computers use Divemanager version 4 or 5 (DM4 or DM5). The
 different versions of Divemanager use different methods and different file
@@ -5869,38 +5696,38 @@ Do not start the import wizard to import dives from the dive computer.
 <li>
 <p>
 In the navigation tree on the left side of the program-window, select the
-   appropriate dives.
-</p>
-</li>
-<li>
-<p>
-Within the list of dives, select the dives you would like to import later:
-</p>
-<div class="ulist"><ul>
-<li>
-<p>
-To select certain dives: hold <em>ctrl</em> and click the dive
-</p>
-</li>
-<li>
-<p>
-To select all dives: Select the first dive, hold down shift and select the
-          last dive
-</p>
-</li>
-</ul></div>
-</li>
-<li>
-<p>
-With the dives marked, use the program menu <em>File → Export</em>
-</p>
-</li>
-<li>
-<p>
-The export pop-up will show. Within this pop-up, there is one field called
-   <em>Export Path</em>.
-</p>
-<div class="ulist"><ul>
+   appropriate dives.
+</p>
+</li>
+<li>
+<p>
+Within the list of dives, select the dives you would like to import later:
+</p>
+<div class="ulist"><ul>
+<li>
+<p>
+To select certain dives: hold <em>ctrl</em> and click the dive
+</p>
+</li>
+<li>
+<p>
+To select all dives: Select the first dive, hold down shift and select the
+          last dive
+</p>
+</li>
+</ul></div>
+</li>
+<li>
+<p>
+With the dives marked, use the program menu <em>File → Export</em>
+</p>
+</li>
+<li>
+<p>
+The export pop-up will show. Within this pop-up, there is one field called
+   <em>Export Path</em>.
+</p>
+<div class="ulist"><ul>
 <li>
 <p>
 Click the browse button next to the field Export Path
@@ -6005,35 +5832,35 @@ Click <em>Save</em>
 </li>
 <li>
 <p>
-The dives are now exported to the file DM4.bak (or DM5.bak)
-</p>
-</li>
-</ol></div>
-</div>
-<div class="sect2">
-<h3 id="_exporting_from_atomic_logbook">18.2. Exporting from Atomic Logbook</h3>
-<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">
-<h3 id="_exporting_from_mares_dive_organiser_v2_1">18.3. Exporting from Mares Dive Organiser V2.1</h3>
-<div class="admonitionblock" id="Mares_Export">
-<table><tr>
-<td class="icon">
-<img src="images/icons/mareslogo.jpg" alt="Note" />
-</td>
-<td class="content">Mares Dive Organiser is a Windows application. The dive log is kept as a
-Microsoft SQL Compact Edition database with a <em>.sdf</em> filename extension. The
+The dives are now exported to the file DM4.bak (or DM5.bak)
+</p>
+</li>
+</ol></div>
+</div>
+<div class="sect2">
+<h3 id="_exporting_from_atomic_logbook">18.2. Exporting from Atomic Logbook</h3>
+<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">
+<h3 id="_exporting_from_mares_dive_organiser_v2_1">18.3. Exporting from Mares Dive Organiser V2.1</h3>
+<div class="admonitionblock" id="Mares_Export">
+<table><tr>
+<td class="icon">
+<img src="images/icons/mareslogo.jpg" alt="Note" />
+</td>
+<td class="content">Mares Dive Organiser is a Windows application. The dive log is kept as a
+Microsoft SQL Compact Edition database with a <em>.sdf</em> filename extension. The
 database includes all Dive Organiser-registered divers on the particular
 computer and all Mares dive computers used. The safest way to obtain a copy
 of the dive database is to export the information to another compatible
@@ -6061,121 +5888,121 @@ Extract the <em>.sdf</em> file from the zipped folder to your Desktop.
 </li>
 <li>
 <p>
-The password for accessing the .zip file is <em>mares</em>.
-</p>
-</li>
-</ol></div>
-</div>
-<div class="sect2">
-<h3 id="S_ImportingDivingLog">18.4. Exporting from <strong>DivingLog 5.0 and 6.0</strong></h3>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="images/icons/divingloglogo.jpg" alt="Note" />
-</td>
-<td class="content">The best way to bring your logs from DivingLog to Subsurface is to convert
-the whole database. This is because other export formats do not include all
-the details, and we would lack e.g. gas switches and information of what
-units are used. With database import, all this information is included and
-readily available for us.</td>
-</tr></table>
-</div>
-<div class="paragraph"><p>To transfer all files from DivingLog to Subsurface, do the following:</p></div>
-<div class="olist arabic"><ol class="arabic">
-<li>
-<p>
-In DivingLog open the <em>File → Export → SQLite</em> menu
-</p>
-</li>
-<li>
-<p>
-Select <em>Settings</em> button
-</p>
-</li>
-<li>
-<p>
-Set the <em>RTF2Plaintext</em> to <em>true</em>
-</p>
-</li>
-<li>
-<p>
-Close the Settings dialog
-</p>
-</li>
-<li>
-<p>
-Click <em>Export</em> button and select the filename
-</p>
-</li>
-</ol></div>
-<div class="paragraph"><p>Once this is done, open the saved database file with Subsurface and the
-dives are automatically converted to our own format. Last step to do is save
-the log file in Subsurface.</p></div>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_annexe_d_exporter_un_tableur_vers_le_format_csv">19. ANNEXE D : Exporter un tableur vers le format CSV</h2>
-<div class="sectionbody">
-<div class="paragraph" id="S_Appendix_D"><p>De nombreux plongeurs conservent un carnet de plongée sous forme de fichier
-numérique, souvent un tableur avec différents champs et informations. Ces
-données peuvent facilement être importées dans <em>Subsurface</em> après que le
-tableur a été converti en fichier CSV. Cette section explique la procedure
-pour convertir un carnet de plongée enregistrée sous forme de tableur vers
-un fichier CSV qui pourra ensuite être importé dans <em>Subsurface</em>. Créer un
-fichier CSV est une tache simple malgré que la procédure soit différente
-selon le tableur utilisé.</p></div>
-<div class="paragraph"><p>La première étape est d’organiser les données de plongées dans le tableur
-pour que la première ligne contienne le nom (ou le titre) de chaque colonne
-et que les informations de chaque plongée soient contenues sur une seule
-ligne. <em>Subsurface</em> supporte de nombreux éléments (Dive #, Date, Time,
-Duration, Location, GPS, Max Depth, Mean Depth, Buddy, Notes, Weight et
-Tags). L’utilisateur peut organiser les données de plongées selon quelques
-règles simples :</p></div>
-<div class="olist arabic"><ol class="arabic">
-<li>
-<p>
-Date : utiliser un des formats suivants : aaaa-mm-jj, jj.mm.aaaa, mm/jj/aaaa
-</p>
-</li>
-<li>
-<p>
-Durée : le format est minutes:secondes.
-</p>
-</li>
-<li>
-<p>
-Système d’unité : un seul système d’unité doit être utilisé (pas de mélange
-   entre les unités impériales et métriques)
-</p>
-</li>
-<li>
-<p>
-Étiquettes et équipiers : les valeurs doivent être séparées par des
-   virgules.
-</p>
-</li>
-<li>
-<p>
-Position GPS : vous devez utiliser les degrés décimaux, par exemple :
-   30.22496 30.821798
-</p>
-</li>
-</ol></div>
-<div class="sect2">
-<h3 id="_em_libreoffice_calc_em_et_em_openoffice_calc_em">19.1. <em>LibreOffice Calc</em> et <em>OpenOffice Calc</em></h3>
-<div class="paragraph"><p>These are open source spreadsheet applications forming parts of larger open
-source office suite applications. The user interaction with <em>LibreOffice</em>
-and <em>OpenOffice</em> is very similar.  In Libreoffice Calc the time format
-should be set to minutes:seconds - [mm]:ss and dates should be set to one
-of: yyyy-mm-dd, dd.mm.yyyy, mm/dd/yyyy. A typical dive log may look like
-this:</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/LOffice_spreadsheetdata.jpg" alt="FIGURE: Spreadsheet data" />
-</div>
-</div>
-<div class="paragraph"><p>To export the data as a .CSV file from within LibreOffice click <em>File →
+The password for accessing the .zip file is <em>mares</em>.
+</p>
+</li>
+</ol></div>
+</div>
+<div class="sect2">
+<h3 id="S_ImportingDivingLog">18.4. Exporting from <strong>DivingLog 5.0 and 6.0</strong></h3>
+<div class="admonitionblock">
+<table><tr>
+<td class="icon">
+<img src="images/icons/divingloglogo.jpg" alt="Note" />
+</td>
+<td class="content">The best way to bring your logs from DivingLog to Subsurface is to convert
+the whole database. This is because other export formats do not include all
+the details, and we would lack e.g. gas switches and information of what
+units are used. With database import, all this information is included and
+readily available for us.</td>
+</tr></table>
+</div>
+<div class="paragraph"><p>To transfer all files from DivingLog to Subsurface, do the following:</p></div>
+<div class="olist arabic"><ol class="arabic">
+<li>
+<p>
+In DivingLog open the <em>File → Export → SQLite</em> menu
+</p>
+</li>
+<li>
+<p>
+Select <em>Settings</em> button
+</p>
+</li>
+<li>
+<p>
+Set the <em>RTF2Plaintext</em> to <em>true</em>
+</p>
+</li>
+<li>
+<p>
+Close the Settings dialog
+</p>
+</li>
+<li>
+<p>
+Click <em>Export</em> button and select the filename
+</p>
+</li>
+</ol></div>
+<div class="paragraph"><p>Once this is done, open the saved database file with Subsurface and the
+dives are automatically converted to our own format. Last step to do is save
+the log file in Subsurface.</p></div>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_annexe_d_exporter_un_tableur_vers_le_format_csv">19. ANNEXE D : Exporter un tableur vers le format CSV</h2>
+<div class="sectionbody">
+<div class="paragraph" id="S_Appendix_D"><p>De nombreux plongeurs conservent un carnet de plongée sous forme de fichier
+numérique, souvent un tableur avec différents champs et informations. Ces
+données peuvent facilement être importées dans <em>Subsurface</em> après que le
+tableur a été converti en fichier CSV. Cette section explique la procedure
+pour convertir un carnet de plongée enregistrée sous forme de tableur vers
+un fichier CSV qui pourra ensuite être importé dans <em>Subsurface</em>. Créer un
+fichier CSV est une tache simple malgré que la procédure soit différente
+selon le tableur utilisé.</p></div>
+<div class="paragraph"><p>La première étape est d’organiser les données de plongées dans le tableur
+pour que la première ligne contienne le nom (ou le titre) de chaque colonne
+et que les informations de chaque plongée soient contenues sur une seule
+ligne. <em>Subsurface</em> supporte de nombreux éléments (Dive #, Date, Time,
+Duration, Location, GPS, Max Depth, Mean Depth, Buddy, Notes, Weight et
+Tags). L’utilisateur peut organiser les données de plongées selon quelques
+règles simples :</p></div>
+<div class="olist arabic"><ol class="arabic">
+<li>
+<p>
+Date : utiliser un des formats suivants : aaaa-mm-jj, jj.mm.aaaa, mm/jj/aaaa
+</p>
+</li>
+<li>
+<p>
+Durée : le format est minutes:secondes.
+</p>
+</li>
+<li>
+<p>
+Système d’unité : un seul système d’unité doit être utilisé (pas de mélange
+   entre les unités impériales et métriques)
+</p>
+</li>
+<li>
+<p>
+Étiquettes et équipiers : les valeurs doivent être séparées par des
+   virgules.
+</p>
+</li>
+<li>
+<p>
+Position GPS : vous devez utiliser les degrés décimaux, par exemple :
+   30.22496 30.821798
+</p>
+</li>
+</ol></div>
+<div class="sect2">
+<h3 id="_em_libreoffice_calc_em_et_em_openoffice_calc_em">19.1. <em>LibreOffice Calc</em> et <em>OpenOffice Calc</em></h3>
+<div class="paragraph"><p>These are open source spreadsheet applications forming parts of larger open
+source office suite applications. The user interaction with <em>LibreOffice</em>
+and <em>OpenOffice</em> is very similar.  In Libreoffice Calc the time format
+should be set to minutes:seconds - [mm]:ss and dates should be set to one
+of: yyyy-mm-dd, dd.mm.yyyy, mm/dd/yyyy. A typical dive log may look like
+this:</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/LOffice_spreadsheetdata.jpg" alt="FIGURE: Spreadsheet data" />
+</div>
+</div>
+<div class="paragraph"><p>To export the data as a .CSV file from within LibreOffice click <em>File →
 Save As</em>. On the dialogue that comes up, select the <em>Text CSV (.csv)</em> as the
 file type and select the option <em>Edit filter settings</em>.</p></div>
 <div class="imageblock" style="text-align:center;">
@@ -6190,19 +6017,19 @@ then select <em>OK</em>.</p></div>
 <div class="content">
 <img src="images/LOffice_field_options.jpg" alt="FIGURE: Field options" />
 </div>
-</div>
-<div class="paragraph"><p>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
-<a href="#S_ImportingCSVDives">Importing CSV dives</a>.</p></div>
-</div>
-<div class="sect2">
-<h3 id="_microsoft_em_excel_em">19.2. Microsoft <em>Excel</em></h3>
-<div class="paragraph"><p>The field delimiter (called "<em>list separator</em>" in Microsoft manuals) is not
-accessible from within <em>Excel</em> and needs to be set through the <em>Microsoft
-Control Panel</em>. After changing the separator character, all software on the
-Windows machine use the new character as a separator.  One can change the
-character back to the default character by following the same procedure,
-outlined below.</p></div>
+</div>
+<div class="paragraph"><p>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
+<a href="#S_ImportingCSVDives">Importing CSV dives</a>.</p></div>
+</div>
+<div class="sect2">
+<h3 id="_microsoft_em_excel_em">19.2. Microsoft <em>Excel</em></h3>
+<div class="paragraph"><p>The field delimiter (called "<em>list separator</em>" in Microsoft manuals) is not
+accessible from within <em>Excel</em> and needs to be set through the <em>Microsoft
+Control Panel</em>. After changing the separator character, all software on the
+Windows machine use the new character as a separator.  One can change the
+character back to the default character by following the same procedure,
+outlined below.</p></div>
 <div class="ulist"><ul>
 <li>
 <p>
@@ -6260,371 +6087,371 @@ the appropriate folder has been selected to save the CSV file into.</p></div>
 </div>
 <div class="paragraph"><p>Select the <em>Save</em> 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
-text editor, and then import the dive data as explained on the section
-<a href="#S_ImportingCSVDives">Importing CSV dives</a>.</p></div>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="S_APPENDIX_E">20. ANNEXE E : Créer un modèle d’impression personnalisé</h2>
-<div class="sectionbody">
-<div class="paragraph"><p><em>Subsurface</em> provides a mechanism to create or modify templates for printing
-dive logs in order to produce customised printouts of dive logs. Templates,
-written in HTML as well as a simple Grantlee instruction set, are rendered
-to the print device by <em>Subsurface</em>.</p></div>
-<div class="paragraph"><p>Templates are accessed using the print dialogue (see image <strong>B</strong> below).</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/Print1_f22.jpg" alt="FIGURE: Print dialogue" />
-</div>
-</div>
-<div class="paragraph"><p>The buttons under the <em>Template</em> dropdown box allows one to <em>Edit</em>,
-<em>Delete</em>, <em>Import</em> and to <em>Export</em> templates (see image <strong>A</strong> above). New or
-modified templates are stored as HTML files in the same directory as the
-dive log being processed. In order to create or modify a template, select
-the <em>Custom</em> template from the template dropdown list in the print dialogue
-(see image <strong>B</strong> above), then select <em>Edit</em>.</p></div>
-<div class="paragraph"><p>The Edit Panel comprises three tabs:</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/Template1_f22.jpg" alt="FIGURE: template edit dialogue" />
-</div>
-</div>
-<div class="paragraph"><p>1) The <em>Style</em> tab (image <strong>A</strong> above) controls the font, line spacing and colour
-   template used for printing the dive log.  The style attributes are
-   editable. Choose one of the four colour palets used for colour printing.</p></div>
-<div class="paragraph"><p>2) The <em>Colors</em> tab (image <strong>B</strong> above) allows editing the colours used for
-   printing the dive log. The colours are highly customisable: the <em>Edit</em>
-   buttons in the <em>Colors</em> tab allows choosing abritrary colours for different
-   components of the dive log printout.</p></div>
-<div class="paragraph"><p>3) The <em>Template</em> tab of the Edit Panel (see image below) allows creating a
-   template using HTML as well as a few Grantlee programming
-   primitives. Grantlee provides the ability to create and format HTML code in
-   a highly simple but efficient way (see below). The HTML of the template can
-   be edited and saved. The saved template is stored in the same directory as
-   the dive being processed. By default, a <em>Custom</em> template is a skeleton with
-   no specific print instructions. The informastion being printed needs to be
-   specified and formatted in the by replacing the section marked with: "<!--
-   Template must be filled -→". Writing HTML code with Grantlee instructions
-   allows unlimited freedom in determining what is printed an in which way it
-   should be rendered.</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/Template2_f22.jpg" alt="FIGURE:Template tab" />
-</div>
-</div>
-<div class="paragraph"><p>One can adapt any of the existing templates and save it to the dive log
-directory. The standard templates (e.g. One dive, Six dives, Table) can be
-modified in this way.</p></div>
-<div class="paragraph"><p>To write a custom template the following elements must exist so that the
-template will be correctly handled and rendered.</p></div>
-<div class="sect2">
-<h3 id="_main_dive_loop">20.1. Main dive loop</h3>
-<div class="paragraph"><p><em>Subsurface</em> exports a dive list called (<strong>dives</strong>) to the <em>Grantlee</em>
-backend. It is possible to iterate over the list as follows:</p></div>
-<div class="literalblock">
-<div class="title">template.html</div>
-<div class="content">
-<pre><code>        {% for dive in dives %}
-                <h1> {{ dive.number }} </h1>
-        {% endfor %}</code></pre>
-</div></div>
-<div class="literalblock">
-<div class="title">output.html</div>
-<div class="content">
-<pre><code>        <h1> 1 </h1>
-        <h1> 2 </h1>
-        <h1> 3 </h1></code></pre>
-</div></div>
-<div class="paragraph"><p>Additional information about <em>Grantlee</em> can be found
-<a href="http://www.grantlee.org/apidox/for_themers.html">here</a></p></div>
-</div>
-<div class="sect2">
-<h3 id="_grantlee_exported_variables">20.2. Grantlee exported variables</h3>
-<div class="paragraph"><p>Only a subset of the dive data is exported:</p></div>
-<div class="tableblock">
-<table rules="all"
-width="100%"
-frame="border"
-cellspacing="0" cellpadding="4">
-<col width="50%" />
-<col width="50%" />
-<tbody>
-<tr>
-<td align="left" valign="top"><p class="table"><strong>Name</strong></p></td>
-<td align="left" valign="top"><p class="table"><strong>Description</strong></p></td>
-</tr>
-<tr>
-<td align="left" valign="top"><p class="table">number</p></td>
-<td align="left" valign="top"><p class="table">(<strong>int</strong>) dive number</p></td>
-</tr>
-<tr>
-<td align="left" valign="top"><p class="table">id</p></td>
-<td align="left" valign="top"><p class="table">(<strong>int</strong>) unique dive ID, should be used to fetch the dive profile</p></td>
-</tr>
-<tr>
-<td align="left" valign="top"><p class="table">date</p></td>
-<td align="left" valign="top"><p class="table">(<strong>string</strong>) data of the dive</p></td>
-</tr>
-<tr>
-<td align="left" valign="top"><p class="table">time</p></td>
-<td align="left" valign="top"><p class="table">(<strong>string</strong>) time of the dive</p></td>
-</tr>
-<tr>
-<td align="left" valign="top"><p class="table">location</p></td>
-<td align="left" valign="top"><p class="table">(<strong>string</strong>) location of the dive</p></td>
-</tr>
-<tr>
-<td align="left" valign="top"><p class="table">duration</p></td>
-<td align="left" valign="top"><p class="table">(<strong>string</strong>) duration of the dive</p></td>
-</tr>
-<tr>
-<td align="left" valign="top"><p class="table">depth</p></td>
-<td align="left" valign="top"><p class="table">(<strong>string</strong>) depth of the dive</p></td>
-</tr>
-<tr>
-<td align="left" valign="top"><p class="table">divemaster</p></td>
-<td align="left" valign="top"><p class="table">(<strong>string</strong>) divemaster data</p></td>
-</tr>
-<tr>
-<td align="left" valign="top"><p class="table">buddy</p></td>
-<td align="left" valign="top"><p class="table">(<strong>string</strong>) buddy data</p></td>
-</tr>
-<tr>
-<td align="left" valign="top"><p class="table">airTemp</p></td>
-<td align="left" valign="top"><p class="table">(<strong>string</strong>) air temperature of dive</p></td>
-</tr>
-<tr>
-<td align="left" valign="top"><p class="table">waterTemp</p></td>
-<td align="left" valign="top"><p class="table">(<strong>string</strong>) water temperature of dive</p></td>
-</tr>
-<tr>
-<td align="left" valign="top"><p class="table">notes</p></td>
-<td align="left" valign="top"><p class="table">(<strong>string</strong>) dive notes</p></td>
-</tr>
-<tr>
-<td align="left" valign="top"><p class="table">rating</p></td>
-<td align="left" valign="top"><p class="table">(<strong>int</strong>) dive rating ranges from 0 to 5</p></td>
-</tr>
-<tr>
-<td align="left" valign="top"><p class="table">sac</p></td>
-<td align="left" valign="top"><p class="table">(<strong>string</strong>) sac value</p></td>
-</tr>
-<tr>
-<td align="left" valign="top"><p class="table">tags</p></td>
-<td align="left" valign="top"><p class="table">(<strong>string</strong>) all dive tags concatenate together</p></td>
-</tr>
-<tr>
-<td align="left" valign="top"><p class="table">gas</p></td>
-<td align="left" valign="top"><p class="table">(<strong>string</strong>) used gas cylinder</p></td>
-</tr>
-</tbody>
-</table>
-</div>
-<div class="paragraph"><p><em>Subsurface</em> also exports <strong>template_options</strong> data. This data must be used as
-<em>CSS</em> values to provide a dynamically editable template. The exported data
-is shown in the following table:</p></div>
-<div class="tableblock">
-<table rules="all"
-width="100%"
-frame="border"
-cellspacing="0" cellpadding="4">
-<col width="50%" />
-<col width="50%" />
-<tbody>
-<tr>
-<td align="left" valign="top"><p class="table"><strong>Name</strong></p></td>
-<td align="left" valign="top"><p class="table"><strong>Description</strong></p></td>
-</tr>
-<tr>
-<td align="left" valign="top"><p class="table">font</p></td>
-<td align="left" valign="top"><p class="table">(<strong>string</strong>) font family</p></td>
-</tr>
-<tr>
-<td align="left" valign="top"><p class="table">borderwidth</p></td>
-<td align="left" valign="top"><p class="table">(<strong>int</strong>) border-width value dynamically calculated as 0.1% of the page width with minimum value of 1px</p></td>
-</tr>
-<tr>
-<td align="left" valign="top"><p class="table">font_size</p></td>
-<td align="left" valign="top"><p class="table">(<strong>double</strong>) size of fonts in vw, ranges between 1.0 and 2.0</p></td>
-</tr>
-<tr>
-<td align="left" valign="top"><p class="table">line_spacing</p></td>
-<td align="left" valign="top"><p class="table">(<strong>double</strong>) distance between text lines, ranges between 1.0 and 3.0</p></td>
-</tr>
-<tr>
-<td align="left" valign="top"><p class="table">color1</p></td>
-<td align="left" valign="top"><p class="table">(<strong>string</strong>) background color</p></td>
-</tr>
-<tr>
-<td align="left" valign="top"><p class="table">color2</p></td>
-<td align="left" valign="top"><p class="table">(<strong>string</strong>) primary table cell color</p></td>
-</tr>
-<tr>
-<td align="left" valign="top"><p class="table">color3</p></td>
-<td align="left" valign="top"><p class="table">(<strong>string</strong>) secondary table cell color</p></td>
-</tr>
-<tr>
-<td align="left" valign="top"><p class="table">color4</p></td>
-<td align="left" valign="top"><p class="table">(<strong>string</strong>) primary text color</p></td>
-</tr>
-<tr>
-<td align="left" valign="top"><p class="table">color5</p></td>
-<td align="left" valign="top"><p class="table">(<strong>string</strong>) secondary text color</p></td>
-</tr>
-<tr>
-<td align="left" valign="top"><p class="table">color6</p></td>
-<td align="left" valign="top"><p class="table">(<strong>string</strong>) border colors</p></td>
-</tr>
-</tbody>
-</table>
-</div>
-<div class="literalblock">
-<div class="title">template.html</div>
-<div class="content">
-<pre><code>        border-width: {{ template_options.borderwidth }}px;</code></pre>
-</div></div>
-<div class="literalblock">
-<div class="title">output.html</div>
-<div class="content">
-<pre><code>        border-width: 3px;</code></pre>
-</div></div>
-<div class="paragraph"><p>Another variable that <em>Subsurface</em> exports is <strong>print_options</strong>. This variable
-contains a single member:</p></div>
-<div class="tableblock">
-<table rules="all"
-width="100%"
-frame="border"
-cellspacing="0" cellpadding="4">
-<col width="50%" />
-<col width="50%" />
-<tbody>
-<tr>
-<td align="left" valign="top"><p class="table"><strong>Name</strong></p></td>
-<td align="left" valign="top"><p class="table"><strong>Description</strong></p></td>
-</tr>
-<tr>
-<td align="left" valign="top"><p class="table">grayscale</p></td>
-<td align="left" valign="top"><p class="table">Use <em>CSS</em> filters to convert the page into grayscale (should be added to body style to enable printing grayscale prints)</p></td>
-</tr>
-</tbody>
-</table>
-</div>
-<div class="literalblock">
-<div class="title">template.html</div>
-<div class="content">
-<pre><code>        body {
-                {{ print_options.grayscale }};
-        }</code></pre>
-</div></div>
-<div class="literalblock">
-<div class="title">output.html</div>
-<div class="content">
-<pre><code>        body {
-                -webkit-filter: grayscale(100%);
-        }</code></pre>
-</div></div>
-</div>
-<div class="sect2">
-<h3 id="_defined_css_selectors">20.3. Defined CSS selectors</h3>
-<div class="paragraph"><p>As the dive profile is placed after rendering, <em>Subsurface</em> uses a special
-<em>CSS</em> selectors to do some searches in the HTML output. The <em>CSS</em> selectors
-in the following table should be added.</p></div>
-<div class="tableblock">
-<table rules="all"
-width="100%"
-frame="border"
-cellspacing="0" cellpadding="4">
-<col width="33%" />
-<col width="33%" />
-<col width="33%" />
-<tbody>
-<tr>
-<td align="left" valign="top"><p class="table"><strong>Selector</strong></p></td>
-<td align="left" valign="top"><p class="table"><strong>Type</strong></p></td>
-<td align="left" valign="top"><p class="table"><strong>Description</strong></p></td>
-</tr>
-<tr>
-<td align="left" valign="top"><p class="table">dive_{{ dive.id }}</p></td>
-<td align="left" valign="top"><p class="table">id</p></td>
-<td align="left" valign="top"><p class="table">is used to fetch the relevant dive profile</p></td>
-</tr>
-<tr>
-<td align="left" valign="top"><p class="table">diveProfile</p></td>
-<td align="left" valign="top"><p class="table">class</p></td>
-<td align="left" valign="top"><p class="table">each div that will contain a dive profile should have this class selector in addition to the dive_{{ dive.id }} id selector</p></td>
-</tr>
-<tr>
-<td align="left" valign="top"><p class="table">dontbreak</p></td>
-<td align="left" valign="top"><p class="table">class</p></td>
-<td align="left" valign="top"><p class="table">prevents the div with this class to be divided into two pages, this can be used
-in flow layout templates only (when data-numberofdives = 0)</p></td>
-</tr>
-</tbody>
-</table>
-</div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/important.png" alt="Important" />
-</td>
-<td class="content">Rendering dive profiles is not supported for flow layout templates (when
-data-numberofdives = 0).</td>
-</tr></table>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_special_attributes">20.4. Special attributes</h3>
-<div class="paragraph"><p>There are two ways of rendering- either rendering a specific number of dives
-in each page or make <em>Subsurface</em> try to fit as much dives as possible into
-one page (<em>flow</em> rendering).</p></div>
-<div class="paragraph"><p>The <strong>data-numberofdives</strong> data attribute is added to the body tag to set the
-rendering mode</p></div>
-<div class="ulist"><ul>
-<li>
-<p>
-render 6 dives per page:
-</p>
-</li>
-</ul></div>
-<div class="literalblock">
-<div class="content">
-<pre><code>        <body data-numberofdives = 6></code></pre>
-</div></div>
-<div class="ulist"><ul>
-<li>
-<p>
-render as much dives as possible:
-</p>
-</li>
-</ul></div>
-<div class="literalblock">
-<div class="content">
-<pre><code>        <body data-numberofdives = 0></code></pre>
-</div></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/important.png" alt="Important" />
-</td>
-<td class="content">All CSS units should be in relative lengths only, to support printing on any
-page size.</td>
-</tr></table>
-</div>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_appendix_f_faqs">21. APPENDIX F: FAQs.</h2>
-<div class="sectionbody">
-<div class="sect2">
-<h3 id="S_APPENDIX_F">21.1. Subsurface appears to miscalculate gas consumption and SAC</h3>
-<div class="paragraph" id="SAC_CALCULATION"><p><em>Question</em>: 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 <em>Subsurface</em>
-calculates. Is <em>Subsurface</em> miscalculating?</p></div>
-<div class="paragraph"><p><em>Answer</em>: Not really. What happens is that <em>Subsurface</em> actually calculates
-gas consumption differently - and better - than you expect.  In particular,
-it takes the incompressibility of the gas into account.  Traditionally, Gas
+text editor, and then import the dive data as explained on the section
+<a href="#S_ImportingCSVDives">Importing CSV dives</a>.</p></div>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="S_APPENDIX_E">20. ANNEXE E : Créer un modèle d’impression personnalisé</h2>
+<div class="sectionbody">
+<div class="paragraph"><p><em>Subsurface</em> provides a mechanism to create or modify templates for printing
+dive logs in order to produce customised printouts of dive logs. Templates,
+written in HTML as well as a simple Grantlee instruction set, are rendered
+to the print device by <em>Subsurface</em>.</p></div>
+<div class="paragraph"><p>Templates are accessed using the print dialogue (see image <strong>B</strong> below).</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/Print1_f22.jpg" alt="FIGURE: Print dialogue" />
+</div>
+</div>
+<div class="paragraph"><p>The buttons under the <em>Template</em> dropdown box allows one to <em>Edit</em>,
+<em>Delete</em>, <em>Import</em> and to <em>Export</em> templates (see image <strong>A</strong> above). New or
+modified templates are stored as HTML files in the same directory as the
+dive log being processed. In order to create or modify a template, select
+the <em>Custom</em> template from the template dropdown list in the print dialogue
+(see image <strong>B</strong> above), then select <em>Edit</em>.</p></div>
+<div class="paragraph"><p>The Edit Panel comprises three tabs:</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/Template1_f22.jpg" alt="FIGURE: template edit dialogue" />
+</div>
+</div>
+<div class="paragraph"><p>1) The <em>Style</em> tab (image <strong>A</strong> above) controls the font, line spacing and colour
+   template used for printing the dive log.  The style attributes are
+   editable. Choose one of the four colour palets used for colour printing.</p></div>
+<div class="paragraph"><p>2) The <em>Colors</em> tab (image <strong>B</strong> above) allows editing the colours used for
+   printing the dive log. The colours are highly customisable: the <em>Edit</em>
+   buttons in the <em>Colors</em> tab allows choosing abritrary colours for different
+   components of the dive log printout.</p></div>
+<div class="paragraph"><p>3) The <em>Template</em> tab of the Edit Panel (see image below) allows creating a
+   template using HTML as well as a few Grantlee programming
+   primitives. Grantlee provides the ability to create and format HTML code in
+   a highly simple but efficient way (see below). The HTML of the template can
+   be edited and saved. The saved template is stored in the same directory as
+   the dive being processed. By default, a <em>Custom</em> template is a skeleton with
+   no specific print instructions. The informastion being printed needs to be
+   specified and formatted in the by replacing the section marked with: "<!--
+   Template must be filled -→". Writing HTML code with Grantlee instructions
+   allows unlimited freedom in determining what is printed an in which way it
+   should be rendered.</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/Template2_f22.jpg" alt="FIGURE:Template tab" />
+</div>
+</div>
+<div class="paragraph"><p>One can adapt any of the existing templates and save it to the dive log
+directory. The standard templates (e.g. One dive, Six dives, Table) can be
+modified in this way.</p></div>
+<div class="paragraph"><p>To write a custom template the following elements must exist so that the
+template will be correctly handled and rendered.</p></div>
+<div class="sect2">
+<h3 id="_main_dive_loop">20.1. Main dive loop</h3>
+<div class="paragraph"><p><em>Subsurface</em> exports a dive list called (<strong>dives</strong>) to the <em>Grantlee</em>
+backend. It is possible to iterate over the list as follows:</p></div>
+<div class="literalblock">
+<div class="title">template.html</div>
+<div class="content">
+<pre><code>        {% for dive in dives %}
+                <h1> {{ dive.number }} </h1>
+        {% endfor %}</code></pre>
+</div></div>
+<div class="literalblock">
+<div class="title">output.html</div>
+<div class="content">
+<pre><code>        <h1> 1 </h1>
+        <h1> 2 </h1>
+        <h1> 3 </h1></code></pre>
+</div></div>
+<div class="paragraph"><p>Additional information about <em>Grantlee</em> can be found
+<a href="http://www.grantlee.org/apidox/for_themers.html">here</a></p></div>
+</div>
+<div class="sect2">
+<h3 id="_grantlee_exported_variables">20.2. Grantlee exported variables</h3>
+<div class="paragraph"><p>Only a subset of the dive data is exported:</p></div>
+<div class="tableblock">
+<table rules="all"
+width="100%"
+frame="border"
+cellspacing="0" cellpadding="4">
+<col width="50%" />
+<col width="50%" />
+<tbody>
+<tr>
+<td align="left" valign="top"><p class="table"><strong>Name</strong></p></td>
+<td align="left" valign="top"><p class="table"><strong>Description</strong></p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">number</p></td>
+<td align="left" valign="top"><p class="table">(<strong>int</strong>) dive number</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">id</p></td>
+<td align="left" valign="top"><p class="table">(<strong>int</strong>) unique dive ID, should be used to fetch the dive profile</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">date</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) data of the dive</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">time</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) time of the dive</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">location</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) location of the dive</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">duration</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) duration of the dive</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">depth</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) depth of the dive</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">divemaster</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) divemaster data</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">buddy</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) buddy data</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">airTemp</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) air temperature of dive</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">waterTemp</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) water temperature of dive</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">notes</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) dive notes</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">rating</p></td>
+<td align="left" valign="top"><p class="table">(<strong>int</strong>) dive rating ranges from 0 to 5</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">sac</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) sac value</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">tags</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) all dive tags concatenate together</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">gas</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) used gas cylinder</p></td>
+</tr>
+</tbody>
+</table>
+</div>
+<div class="paragraph"><p><em>Subsurface</em> also exports <strong>template_options</strong> data. This data must be used as
+<em>CSS</em> values to provide a dynamically editable template. The exported data
+is shown in the following table:</p></div>
+<div class="tableblock">
+<table rules="all"
+width="100%"
+frame="border"
+cellspacing="0" cellpadding="4">
+<col width="50%" />
+<col width="50%" />
+<tbody>
+<tr>
+<td align="left" valign="top"><p class="table"><strong>Name</strong></p></td>
+<td align="left" valign="top"><p class="table"><strong>Description</strong></p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">font</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) font family</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">borderwidth</p></td>
+<td align="left" valign="top"><p class="table">(<strong>int</strong>) border-width value dynamically calculated as 0.1% of the page width with minimum value of 1px</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">font_size</p></td>
+<td align="left" valign="top"><p class="table">(<strong>double</strong>) size of fonts in vw, ranges between 1.0 and 2.0</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">line_spacing</p></td>
+<td align="left" valign="top"><p class="table">(<strong>double</strong>) distance between text lines, ranges between 1.0 and 3.0</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">color1</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) background color</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">color2</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) primary table cell color</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">color3</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) secondary table cell color</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">color4</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) primary text color</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">color5</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) secondary text color</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">color6</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) border colors</p></td>
+</tr>
+</tbody>
+</table>
+</div>
+<div class="literalblock">
+<div class="title">template.html</div>
+<div class="content">
+<pre><code>        border-width: {{ template_options.borderwidth }}px;</code></pre>
+</div></div>
+<div class="literalblock">
+<div class="title">output.html</div>
+<div class="content">
+<pre><code>        border-width: 3px;</code></pre>
+</div></div>
+<div class="paragraph"><p>Another variable that <em>Subsurface</em> exports is <strong>print_options</strong>. This variable
+contains a single member:</p></div>
+<div class="tableblock">
+<table rules="all"
+width="100%"
+frame="border"
+cellspacing="0" cellpadding="4">
+<col width="50%" />
+<col width="50%" />
+<tbody>
+<tr>
+<td align="left" valign="top"><p class="table"><strong>Name</strong></p></td>
+<td align="left" valign="top"><p class="table"><strong>Description</strong></p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">grayscale</p></td>
+<td align="left" valign="top"><p class="table">Use <em>CSS</em> filters to convert the page into grayscale (should be added to body style to enable printing grayscale prints)</p></td>
+</tr>
+</tbody>
+</table>
+</div>
+<div class="literalblock">
+<div class="title">template.html</div>
+<div class="content">
+<pre><code>        body {
+                {{ print_options.grayscale }};
+        }</code></pre>
+</div></div>
+<div class="literalblock">
+<div class="title">output.html</div>
+<div class="content">
+<pre><code>        body {
+                -webkit-filter: grayscale(100%);
+        }</code></pre>
+</div></div>
+</div>
+<div class="sect2">
+<h3 id="_defined_css_selectors">20.3. Defined CSS selectors</h3>
+<div class="paragraph"><p>As the dive profile is placed after rendering, <em>Subsurface</em> uses a special
+<em>CSS</em> selectors to do some searches in the HTML output. The <em>CSS</em> selectors
+in the following table should be added.</p></div>
+<div class="tableblock">
+<table rules="all"
+width="100%"
+frame="border"
+cellspacing="0" cellpadding="4">
+<col width="33%" />
+<col width="33%" />
+<col width="33%" />
+<tbody>
+<tr>
+<td align="left" valign="top"><p class="table"><strong>Selector</strong></p></td>
+<td align="left" valign="top"><p class="table"><strong>Type</strong></p></td>
+<td align="left" valign="top"><p class="table"><strong>Description</strong></p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">dive_{{ dive.id }}</p></td>
+<td align="left" valign="top"><p class="table">id</p></td>
+<td align="left" valign="top"><p class="table">is used to fetch the relevant dive profile</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">diveProfile</p></td>
+<td align="left" valign="top"><p class="table">class</p></td>
+<td align="left" valign="top"><p class="table">each div that will contain a dive profile should have this class selector in addition to the dive_{{ dive.id }} id selector</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">dontbreak</p></td>
+<td align="left" valign="top"><p class="table">class</p></td>
+<td align="left" valign="top"><p class="table">prevents the div with this class to be divided into two pages, this can be used
+in flow layout templates only (when data-numberofdives = 0)</p></td>
+</tr>
+</tbody>
+</table>
+</div>
+<div class="admonitionblock">
+<table><tr>
+<td class="icon">
+<img src="./images/icons/important.png" alt="Important" />
+</td>
+<td class="content">Rendering dive profiles is not supported for flow layout templates (when
+data-numberofdives = 0).</td>
+</tr></table>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_special_attributes">20.4. Special attributes</h3>
+<div class="paragraph"><p>There are two ways of rendering- either rendering a specific number of dives
+in each page or make <em>Subsurface</em> try to fit as much dives as possible into
+one page (<em>flow</em> rendering).</p></div>
+<div class="paragraph"><p>The <strong>data-numberofdives</strong> data attribute is added to the body tag to set the
+rendering mode</p></div>
+<div class="ulist"><ul>
+<li>
+<p>
+render 6 dives per page:
+</p>
+</li>
+</ul></div>
+<div class="literalblock">
+<div class="content">
+<pre><code>        <body data-numberofdives = 6></code></pre>
+</div></div>
+<div class="ulist"><ul>
+<li>
+<p>
+render as much dives as possible:
+</p>
+</li>
+</ul></div>
+<div class="literalblock">
+<div class="content">
+<pre><code>        <body data-numberofdives = 0></code></pre>
+</div></div>
+<div class="admonitionblock">
+<table><tr>
+<td class="icon">
+<img src="./images/icons/important.png" alt="Important" />
+</td>
+<td class="content">All CSS units should be in relative lengths only, to support printing on any
+page size.</td>
+</tr></table>
+</div>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_appendix_f_faqs">21. APPENDIX F: FAQs.</h2>
+<div class="sectionbody">
+<div class="sect2">
+<h3 id="S_APPENDIX_F">21.1. Subsurface appears to miscalculate gas consumption and SAC</h3>
+<div class="paragraph" id="SAC_CALCULATION"><p><em>Question</em>: 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 <em>Subsurface</em>
+calculates. Is <em>Subsurface</em> miscalculating?</p></div>
+<div class="paragraph"><p><em>Answer</em>: Not really. What happens is that <em>Subsurface</em> actually calculates
+gas consumption differently - and better - than you expect.  In particular,
+it takes the incompressibility of the gas into account.  Traditionally, Gas
 consumption and SAC should be: <code>consumption = tank size x (start pressure -
 end pressure)</code></p></div>
 <div class="paragraph"><p>and that’s true for an ideal gas, and it’s what you get taught in dive
@@ -6647,52 +6474,52 @@ eight litres more, so you really did use only about 1437 l of air at surface
 pressure.</p></div>
 <div class="paragraph"><p>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
-mentioned, the "contains less air than you thought it did" really starts
-becoming much more noticeable at high pressure. A 400 bar really does not
-contain twice as much air as a 200 bar one. At lower pressures, air acts
-pretty much like an ideal gas.</p></div>
-</div>
-<div class="sect2">
-<h3 id="_some_dive_profiles_have_time_discrepancies_with_the_recorded_samples_from_my_dive_computer_8230">21.2. Some dive profiles have time discrepancies with the recorded samples from my dive computer…</h3>
-<div class="paragraph"><p><em>Subsurface</em> ends up ignoring surface time for many things (average depth,
-divetime, SAC, etc).  <em>Question</em>: Why do dive durations in my dive computer
-differ from that given by <em>Subsurface</em>?</p></div>
-<div class="paragraph"><p><em>Answer</em>: 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 for
-your buddies, your dive computer may say that your dive is 50 minutes long -
-because you have fifty minutes worth of samples - but subsurface will say
-it’s 45 minutes - because you were actually diving for 45 minutes.  It’s
-even more noticeable if you do things like divemastering the initial OW
-dives, when you may stay in the water for a long time, but spend most of it
-at the surface. And then you don’t want that to count as some kind of long
-dive”.</p></div>
-</div>
-<div class="sect2">
-<h3 id="_some_dive_profiles_are_missing_from_the_download">21.3. Some dive profiles are missing from the download</h3>
-<div class="paragraph" id="DC_HISTORY"><p><em>Question</em>: I cannot download all my dives, only the most recent ones even
-though my dive computer’s manual states that it records history of e.g. 999
-dives.</p></div>
-<div class="paragraph"><p><em>Answer</em>: Dive history is different than the dive profiles on the log.  The
-history only keeps track of the total number of dives and total amount of
-time spent below surface. The logs, on the other hand, store the dive
-profile, but they have limited amount of memory to do so. The exact amount
-of dive profiles that can be stored on the device depend on sample interval
-and duration of the dives. Once the memory is full the oldest dives get
-overwritten with new dives. Thus we are only able to download the last 13,
-30 or 199 dives.</p></div>
-<div class="paragraph"><p>If you have downloaded your dives to different dive logging software before
-they were overwritten, there is a high change that Subsurface can import
-these. However, if the logs are only on your dive computer, they cannot be
-salvaged after being over written by new dives.</p></div>
-</div>
-</div>
-</div>
-</div>
-<div id="footnotes"><hr /></div>
-<div id="footer">
-<div id="footer-text">
-Last updated 2015-09-08 10:31:18 CEST
-</div>
-</div>
-</body>
-</html>
+mentioned, the "contains less air than you thought it did" really starts
+becoming much more noticeable at high pressure. A 400 bar really does not
+contain twice as much air as a 200 bar one. At lower pressures, air acts
+pretty much like an ideal gas.</p></div>
+</div>
+<div class="sect2">
+<h3 id="_some_dive_profiles_have_time_discrepancies_with_the_recorded_samples_from_my_dive_computer_8230">21.2. Some dive profiles have time discrepancies with the recorded samples from my dive computer…</h3>
+<div class="paragraph"><p><em>Subsurface</em> ends up ignoring surface time for many things (average depth,
+divetime, SAC, etc).  <em>Question</em>: Why do dive durations in my dive computer
+differ from that given by <em>Subsurface</em>?</p></div>
+<div class="paragraph"><p><em>Answer</em>: 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 for
+your buddies, your dive computer may say that your dive is 50 minutes long -
+because you have fifty minutes worth of samples - but subsurface will say
+it’s 45 minutes - because you were actually diving for 45 minutes.  It’s
+even more noticeable if you do things like divemastering the initial OW
+dives, when you may stay in the water for a long time, but spend most of it
+at the surface. And then you don’t want that to count as some kind of long
+dive”.</p></div>
+</div>
+<div class="sect2">
+<h3 id="_some_dive_profiles_are_missing_from_the_download">21.3. Some dive profiles are missing from the download</h3>
+<div class="paragraph" id="DC_HISTORY"><p><em>Question</em>: I cannot download all my dives, only the most recent ones even
+though my dive computer’s manual states that it records history of e.g. 999
+dives.</p></div>
+<div class="paragraph"><p><em>Answer</em>: Dive history is different than the dive profiles on the log.  The
+history only keeps track of the total number of dives and total amount of
+time spent below surface. The logs, on the other hand, store the dive
+profile, but they have limited amount of memory to do so. The exact amount
+of dive profiles that can be stored on the device depend on sample interval
+and duration of the dives. Once the memory is full the oldest dives get
+overwritten with new dives. Thus we are only able to download the last 13,
+30 or 199 dives.</p></div>
+<div class="paragraph"><p>If you have downloaded your dives to different dive logging software before
+they were overwritten, there is a high change that Subsurface can import
+these. However, if the logs are only on your dive computer, they cannot be
+salvaged after being over written by new dives.</p></div>
+</div>
+</div>
+</div>
+</div>
+<div id="footnotes"><hr /></div>
+<div id="footer">
+<div id="footer-text">
+Last updated 2015-09-09 14:51:47 CEST
+</div>
+</div>
+</body>
+</html>
diff --git a/Documentation/user-manual_fr.txt b/Documentation/user-manual_fr.txt
index 5683597..3af9569 100644
--- a/Documentation/user-manual_fr.txt
+++ b/Documentation/user-manual_fr.txt
@@ -56,7 +56,7 @@ des instructions de compilation du logiciel et (si besoin) de ses
 dépendances, merci de consulter le fichier INSTALL inclus dans les sources
 logicielles.
 
-*Public* : Plongeurs loisirs, apnéistes, plongeurs Tek et plongeurs
+*Public* : Plongeurs loisirs, apnéistes, plongeurs Tek et plongeurs 
 professionnels
 
 toc::[]
@@ -133,7 +133,7 @@ nombre de plongées sélectionnées).
 
 [[S_ViewPanels]]
 
-image::images/main_window_f20.jpg["The Main Window", align="center"]
+image::images/main_window_f22.jpg["The Main Window", align="center"]
 
 L'utilisateur peut déterminer si lesquels des quatre panneaux sont affichés
 en sélectionnant l'option *Vue* dans le menu principal. Cette fonctionnalité
@@ -179,7 +179,7 @@ ajouter des données. _Subsurface_ permet plusieurs façons pour ajouter des
 données de plongée au carnet. Plus de détails dans les sections suivantes.
 
 1) Si l'utilisateur possède un carnet manuscrit, un tableur ou une autre forme
-   de
+   de 
  carnet maintenu manuellement, les données de plongée peuvent être ajoutées
  au carnet en utilisant une des approches suivantes :
 
@@ -230,203 +230,22 @@ 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"]
+image::images/AddDive1_f22.jpg["FIGURE: Add dive", align="center"]
 
 When one edits a field in Notes or Equipment panels, _Subsurface_ enters
 *Editing Mode*, indicated by the message in the blue box at the top of the
 _Notes_ panel (see the image below). This message is displayed in all the
 panels under Notes and Equipment when in *Editing Mode*.
 
-image::images/BlueEditBar_f20.jpg["Blue edit bar", align="center"]
+image::images/BlueEditBar_f22.jpg["Blue edit bar", align="center"]
 
-The _Save_ button should only be selected after all the parts of a dive have
-been entered.  When entering dives by hand, the _Info_, _Equipment_ and
-_Profile_ tabs should be completed before saving the information. By
-selecting the _Save_ 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.
-
-==== 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:
-
-image::images/AddDive2_f20.jpg["FIGURE: The Notes tab", align="center"]
-
-The *Time* 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
-box and by overtyping the information displayed. The default date is the
-present date and the default time is an hour in advance of the present time.
-
-*Air and water temperatures*: the air and water temperatures during the
-dive can be typed directly on the fields to the right of the Start time.
-Temperature units are not needed, as they will be automatically supplied by
-_Subsurface_. Only the numerical value must be
-typed by the user (the units selected in the 'Preferences'
-will determine whether metric or imperial units are used).
-
-*Location*: Here the name of the dive site can be entered, e.g. "Tihany, Lake
-Balaton,
-Hungary". Auto completion of location names will make this easier if one
-frequently dives at the same sites.
-
-*Coordinates*: The geographic coordinates of the dive site should be entered
-here. These can come from three sources:
-
-a. One can find the coordinates on the world map in the bottom right hand part
-   of the Subsurface window. The map displays a green bar indicating "No
-   location data - Move the map and double-click to set the dive
-   location". Upon a double-click at the appropriate place, the green bar
-   disappears and the coordinates are stored.
-
-b. The coordinates can be obtained from the _Subsurface_ Companion app if the
-   user has an Android or iPhone device with GPS and if the coordinates of the
-   dive site were stored using that device.  xref:S_Companion[Click here for
-   more information]
-
-c. The coordinates can be entered by hand if they are known, using one of four
-   formats with latitude followed by longitude:
-
-	ISO 6709 Annex D format e.g. 30°13'28.9"N 30°49'1.5"E Degrees and decimal
-	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
-
-Southern hemisphere latitudes are given with a *S*, e.g. S30°, or with a
-negative value, e.g. -30.22496. Similarly western longitudes are given with
-a *W*, e.g. W07°, or with a negative value, e.g. -7.34323.
-
-Some keyboards don't have the degree sign (°). It can be replaced by a d
-like that: N30d W20d.
-
-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).
-
-*Dive mode*: 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).
-
-*Divemaster*: The name of the dive master or dive guide for this dive can be
-entered here.
-Again, this field offers auto completion based on the list of dive masters in
-the current logbook.
-
-*Buddy*: In this field one can enter the name(s) of the buddy / buddies
-(separated by commas) who accompanied the user on the dive. Auto completion
-is offered based on the list of buddies in the current logbook.
-
-*Suit*: The type of diving suit used for the dive can be entered here.
-As with the other items, auto completion of the suit description is available.
-Some dry-suit users may choose to use this field to record what combination of
-suit and thermal protection undersuit was used.
-
-*Rating*: One can provide a subjective overall rating of the dive on a
-5-point scale by clicking the appropriate star on the rating scale.
-
-*Visibility*: Similarly, one can provide a rating of visibility during the
-dive on a
-5-point scale by clicking the appropriate star.
-
-*Tags*: Tags that describe the type of dive performed may
-be entered here (separated by commas). Examples of common tags are boat, drift,
-training, cave etc. _Subsurface_ has many built-in tags. Auto completion is once again offered.
-For instance, if +cav+ was typed, then the tags *cave* and *cavern* are
-shown for the user to choose from.
-
-*Notes*: Any additional information can be typed here.
-
-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 Notes panel:
-
-image::images/CompletedDiveInfo_f20.jpg["FIGURE: A completed Notes tab", align="center"]
-
-==== Equipment
-
-The Equipment tab allows the user to enter information about the type of
-cylinder and gas used, as well as the weights used for a dive. This is a
-highly interactive part of _Subsurface_ and the information on cylinders and
-gases (entered here) affects the behaviour of the dive profile (top
-right-hand panel).
-
-[[S_CylinderData]]
-*Cylinders*: The cylinder information is entered through a dialogue that looks
-like this:
-
-image::images/Gas_dialogue1_f20.jpg["FIGURE:Initial cylinder dialogue", align="center"]
-
-The + button at the top right allows the user to add more cylinders for this
-dive.  The dark dustbin icon on the left allows one to delete information
-for a particular cylinder. Note that it is not possible to delete a cylinder
-if it is used during the dive. One cylinder is implicitly used in the dive,
-even without a gas change event. Thus the first cylinder cannot be deleted
-until another cylinder is created.
-
-Start by selecting a cylinder type on the left-hand side of the table.  To
-select a cylinder, click in the *Type* box.  This brings up a button that
-can be used to display a dropdown list of cylinders:
-
-image::images/Gas_dialogue2_f20.jpg["FIGURE:The cylinder drop-down list button", align="center"]
-
-The drop-down list can be used to select the cylinder type used for the dive
-or the user may start typing in the box which shows the available options
-for the entered characters. The *Size* of the cylinder as well as its
-working pressure (*WorkPress*) will automatically be shown in the
-dialogue. If a cylinder is not shown in the dropdown list, type the name and
-description of that cylinder into the *Type* field.
-
-Next, indicate the starting pressure and the ending pressure of the gas used
-during the dive. The unit of pressure (metric/imperial) corresponds to the
-setting in the _Preferences_.
-
-Finally, type in the gas mixture used in the *O2%* field. If air was used, a
-value of 21% can be entered on this field, or it might be left blank. If
-nitrox or trimix were used, their percentages of oxygen and/or helium must
-be specified.  Any inappropriate fields should be left empty. After typing
-the information for the cylinder, press _ENTER_ on the keyboard or click
-outside the cell that contains the cursor. Information for any additional
-cylinders can be added by using the + button at the top right
-hand. Following is an example of a complete description for a dive made
-using two cylinders (air and EAN50):
-
-image::images/CylinderDataEntry3_f20.jpg["FIGURE: a completed cylinder dive information table", align="center"]
-
-*Weights*: Information about the weight system used during a dive can be entered
-using a dialogue very similar to that for the cylinder information. If the user
-clicks the + button on the top right of the weights dialogue, the table looks
-like this:
-
-image::images/WeightsDataEntry1_f20.jpg["FIGURE: The Weights dialogue", align="center"]
-
-If one then clicks on the *Type* field, a drop-down list becomes accessible
-through a down-arrow:
-
-image::images/WeightsDataEntry2_f20.jpg["FIGURE: Weights type drop-down list button", align="center"]
-
-The drop-down list can then be used to select the type of weight system or
-the user may start typing in the box which shows the available options for
-the entered characters. In the *Weight* field, the weight used during the
-dive must be typed. After typing the information for the weight system the
-user must either press _ENTER_ on the keyboard or click outside the cell
-that contains the cursor. It is possible to enter information for more than
-one weight system by adding an additional system using the + button on the
-top right hand. Weight systems can be deleted using the dustbin icon on the
-left hand. Here is an example of information for a dive with two types of
-weights: integrated and a weight belt:
-
-image::images/WeightsDataEntry3_f20.jpg["FIGURE: A completed weights information table", align="center"]
-
-There's NO need to click the _Save_ button before the dive profile has been
-completed.
+The _Apply changes_ button should only be selected after all the parts of a
+dive have been entered.  When entering dives by hand, the _Info_,
+_Equipment_ and _Profile_ tabs should be completed before saving the
+information. By selecting the _Apply changes_ 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.
 
 [[S_CreateProfile]]
 ==== Creating a Dive Profile
@@ -464,26 +283,16 @@ dive profile can be edited. This is done by right-clicking on the particular
 waypoint and selecting the appropriate gas from the context menu. Changing
 the gas for a waypoint affects the gas shown in the segment _to the left_ of
 that waypoint. Note that only the gases defined in the *Equipment* tab
-appear in the context menu.
+appear in the context menu. Below is the profile of a dive to 25 m for 30
+min and with a switch from air to EAN50 at the end of the duration at 20m.
 
 image::images/DiveProfile3_f20.jpg["FIGURE: Gas composition context menu", align="center"]
 
-Below is the profile of a dive to 25 m for 30 min and with a switch from air
-to EAN50 at the end of the duration at 20m. In this case the first cylinder
-in the *Equipment* tab contained air and the second cylinder contained
-EAN50.
-
-image::images/DiveProfile4_f20.jpg["FIGURE: Completed dive profile", align="center"]
-
-==== 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).
+With the profile having been defined, more details must be added in order to
+have a fuller record of the dive. To do this, the *Notes* and the
+*Equipment* tabs on the top left hand of the _Subsurface_ window should be
+used. Click on xref:S_Notes_dc[*this link*] for instructions to use these
+tabs.
 
 [[S_ImportDiveComputer]]
 === Importer de nouvelles informations de plongée à partir de l'ordinateur de plongée
@@ -699,24 +508,30 @@ 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.
 
+[[S_Notes_dc]]
 ==== 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
-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:
-
-image::images/AddDive3_f20.jpg["FIGURE: The Notes tab", align="center"]
-
-The *Time* 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
-by overtyping the information displayed.
+The user needs to add additional information by hand in order to have a more
+complete dive record. The information below is almost identical for
+hand-entered dives and for dives downloaded from a dive computer.
+
+In some cases, one has to provide the date and time of the dive, e.g. when
+entering a dive by hand or when a dive computer does not privide the date
+and time of the dive.  (Often, the date and time of the dive, gas mixture
+and water temperature are usually shown as obtained from the dive computer)
+If the contents of the *Notes 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 (left hand image, below):
+
+image::images/AddDive3_f22.jpg["FIGURE: The Notes tab", align="center"]
+
+The right hand image, above, shows a *Notes tab* filled with dive
+information.  The *Time* 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 by overtyping the information displayed.
 
 *Air/water temperatures*: Air and water temperatures during the dive are shown
 in these fields to the right of the Start time. Many dive computers supply water
@@ -729,21 +544,37 @@ automatically supplied by
 _Subsurface_ (according to the _Preferences_, metric or imperial units will
 be used).
 
-*Location*: In this field one should type in text that describes the site
-where the dive was performed, e.g. "Tihany, Lake Balaton, Hungary".
-Auto completion of location names will
-make this easier if one frequently dives at the same sites.
-
-*Coordinates*: The geographic coordinates of the dive site should be entered
-here. These can come from three sources:
+*Location*: Here the name of the dive site can be entered, e.g. "Tihany, Lake
+Balaton, Hungary". Dive locations are managed as a separate part of the dive log.
+After entering the information for a particilar dive site, and several dives are
+performed at the same location, the information is re-used without requiring
+full dive site information again. Existing dive location information
+can be edited at any time by selecting (on the *Dive List* panel) a dive performed at that site
+and by opening the location information by clicking the globe button on the
+right of the location name (see image on the right above). When entering a dive location name, auto completion of
+location names makes it easy to select a dive site that already exists in the dive log
+(i.e. when typing in the name of a dive site,
+a dropdown list appears showing all sites with similar names). If the dive
+site has been used before, click on the already-existing name.
+
+If the present dive site has not been used before, a message appears as
+follows (image *A* below):
+
+image::images/Locations1_f22.jpg["FIGURE:Location description panel", align="center"]
+
+Click the + icon on the right hand side. A panel appears to enter the
+coordinates and other important information about the site (image *B*,
+above). The most important items are the coordinates of the site. There are
+three ways of specifying the coordinates:
 
-a. The user can find the coordinates on the world map in the bottom right hand
-   part of the Subsurface window. The map displays a green bar indicating "Move
-   the map and double-click to set the dive location". Double-click at the
-   appropriate place, the green bar disappears and the coordinates are stored.
+a. One can find the coordinates on the world map in the bottom right hand part
+   of the Subsurface window. The map displays an orange bar indicating "No
+   location data - Move the map and double-click to set the dive
+   location". Upon a double-click at the appropriate place, the orange bar
+   disappears and the coordinates are stored.
 
-b. The user can obtain the coordinates from the _Subsurface_ Companion app if
-   an Android or iPhone device with GPS was used and if the coordinates of the
+b. The coordinates can be obtained from the _Subsurface_ Companion app if the
+   user has an Android or iPhone device with GPS and if the coordinates of the
    dive site were stored using that device.  xref:S_Companion[Click here for
    more information]
 
@@ -756,14 +587,21 @@ c. The coordinates can be entered by hand if they are known, using one of four
 	30.821798
 
 Southern hemisphere latitudes are given with a *S*, e.g. S30°, or with a
-negative value, e.g. -30.22496. Similarly, western longitudes are given with
-a *W*, e.g. W07°, or with a negative value, e.g. -7.34323.
+negative value, e.g. -30.22496. Similarly western longitudes are given with
+a *W*, e.g. W07°, or with a negative value, e.g. -7.34323. Some keyboards
+don't have the degree sign (°). It can be replaced by a *d* like this: N30d
+W20d.
 
-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).
+*Important*: 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).
+
+Enter any other textual information about the dive site (Description and
+Notes), then select _Apply Changes_ to save the information for this dive
+site. At a later stage the dive site information can be edited by clicking
+the globe icon to the right of the dive site name in the *Notes tab*.
 
 *Dive mode*: This is a dropdown box allowing one to choose the type of dive
 performed. The options are OC (Open Circuit, the default seting, meant for most recreational dives),
@@ -805,10 +643,10 @@ typed
 
 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 Notes panel:
+use them until ALL other information has been added. The image
+xref:S_Notes_dc[at the beginning of this section] shows an example of a
+*Notes tab* containing dive information.
 
-image::images/CompletedDiveInfo_f20.jpg["FIGURE: A completed Notes tab", align="center"]
 
 ==== Equipment
 
@@ -816,7 +654,7 @@ The Equipment tab allows one to enter information about the type of cylinder
 and gas used as well as the weights used for the dive. The message in a blue
 box at the top of the panel:
 
-image::images/BlueEditBar_f20.jpg["FIGURE: Blue edit bar", align="center"]
+image::images/BlueEditBar_f22.jpg["FIGURE: Blue edit bar", align="center"]
 
 indicates that the dive is being edited. This is a highly interactive part
 of _Subsurface_ and the information on cylinders and gases (entered here)
@@ -828,7 +666,8 @@ like this:
 
 image::images/DC_gas-dialogue1_f20.jpg["FIGURE: Initial cylinder dialogue", align="center"]
 
-In most cases _Subsurface_ obtains the gas used from the dive computer and
+For hand-entered dives, this information needs to be typed in. For dive
+computers _Subsurface_ often obtains the gas used from the dive computer and
 automatically inserts the gas composition(% oxygen) in the table. The +
 button at the top right allows the user to add more cylinders for this
 dive. The dark dustbin icon on the left allows the deletion of information
@@ -956,11 +795,12 @@ image::images/Bookmarks.jpg["FIGURE: Bookmark dialog", align="center"]
 
 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 _Apply changes_ button is clicked, the dive data are saved in the memory
+image of the dive. If the _Discard changes_ button is clicked, then the
+newly entered dive data are erased from the computer memory, although the
+dive profile is retained. When the user exits _Subsurface_ there is a final
+prompt to confirm that the new data should now be saved permanently on the
+computer disk.
 
 === Importer les informations à partir d'autres sources de données numériques ou d'autres formats de données
 
@@ -1971,7 +1811,7 @@ the dive log, reflecting a more accurate assessment. The display of this
 ceiling is activated by clicking the appropriate button to the left of the
 dive profile:
 
-[icon="images/icons/cceiling.jpg"]
+image::images/icons/cceiling.jpg["DC ceiling icon"]
 
 The default colour of the computer-generated deco ceiling is white. However,
 this can be set to red by checking the appropriate check box after selecting
@@ -3724,8 +3564,8 @@ En tant que root, tapez : usermod -a -G dialout johnB+ (utilisateurs
 d'Ubuntu : +sudo usermod -a -G dialout johnB+)  Cela ajoute johnB au groupe
 +dialout+.
 Tapez : +id johnB+     Cela liste tous les groupes auquel johnB appartient et
-vérifiez que
-l'appartenance au groupe est bien effectif. Le groupe +dialout+ devrait
+vérifiez que 
+l'appartenance au groupe est bien effectif. Le groupe +dialout+ devrait 
 être listé
 parmi les différents IDs.
 Sous certaines circonstances, les modifications ne prennent effet qu'après une déconnexionpuis reconnexion sur l'ordinateur (sous Ubuntu, par exemple).
-- 
1.8.4.5



More information about the subsurface mailing list