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

Guillaume GARDET guillaume.gardet at free.fr
Tue Sep 15 01:13:29 PDT 2015


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

---
 Documentation/50-pot/subsurface-manual.pot  | 1178 ++---
 Documentation/fr/po/subsurface-manual.fr.po | 1162 ++---
 Documentation/user-manual_fr.html.git       | 6955 ++++++++++++++-------------
 Documentation/user-manual_fr.txt            |  129 +-
 4 files changed, 4804 insertions(+), 4620 deletions(-)

diff --git a/Documentation/50-pot/subsurface-manual.pot b/Documentation/50-pot/subsurface-manual.pot
index 4bc7550..6b63bb4 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-09 14:50+0200\n"
+"POT-Creation-Date: 2015-09-15 10:07+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"
@@ -574,7 +574,7 @@ msgid ""
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: ./user-manual.txt:289 ./user-manual.txt:2838
+#: ./user-manual.txt:289 ./user-manual.txt:2858
 #, no-wrap
 msgid "images/icons/warning2.png"
 msgstr ""
@@ -4822,86 +4822,132 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2486
+#: ./user-manual.txt:2488
 msgid ""
 "_Subsurface_ includes access to a transparently integrated cloud storage "
-"backend that is available to all Subsurface users. In order to use the "
-"_Subsurface cloud storage_ the users need to follow these steps"
+"backend that is available to all Subsurface users. Storing and retrieving a "
+"dive log from the cloud is no more difficult than accessing the dives on the "
+"local hard disk.  The only requirement is that one should first register as "
+"a user on the cloud.  To use _Subsurface cloud storage_ , follow these "
+"steps:"
 msgstr ""
 
-#. type: Plain text
-#: ./user-manual.txt:2488
-msgid "Create a cloud storage account:"
+#. type: Title ===
+#: ./user-manual.txt:2489
+#, no-wrap
+msgid "Create a cloud storage account"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2502
+#: ./user-manual.txt:2506
 #, no-wrap
 msgid ""
-"** Open the _Preferences_\n"
-"** Under _Defaults_, in the _Subsurface cloud storage_ section, enter\n"
-"their email address and a password\n"
-"** Click _Apply_ or _Done_ to send email address and password to the\n"
-"server\n"
-"** The server will respond with an email to the given address that\n"
-"contains a verification PIN\n"
-"** Enter the PIN in the corresponding field in the _Preferences_ dialog\n"
-"(this field is only visible while the backend server is waiting for email\n"
+"** Open the *Network Preferences* by selecting _File_ -> _Preferences_ -> "
+"_Network_.\n"
+"** In the section headed _Subsurface cloud storage_, enter an email address "
+"that\n"
+"   _Su bsurface can use for user registration.\n"
+"** Enter a novel password that_Subsurface_ will use to store the\n"
+"  dive log in the cloud.\n"
+"** Click _Apply_ to send the above email address and password to the\n"
+"  (remote) cloud server. The server responds by sending a verification PIN "
+"to\n"
+"  the above email address (This is the *only* occasion that _Subsurface_ "
+"uses the\n"
+"  email address provided above). The *Network Preferences* dialog now has a "
+"new PIN text\n"
+"   box, not visible previously.\n"
+"** Enter the PIN in the corresponding text box in the *Network Preferences* "
+"dialog\n"
+"(this field is only visible while the server is waiting for email\n"
 "address confirmation)\n"
-"** Click _Apply_ or _Done_ again, the _Subsurface cloud storage_ account\n"
-"will be marked as verified and the _Subsurface cloud storage_ service can\n"
-"be used\n"
+"** Click _Apply_ again. The _Subsurface cloud storage_ account\n"
+"will be marked as verified and the _Subsurface cloud storage_ service is "
+"initialised for use.\n"
 msgstr ""
 
-#. type: Plain text
-#: ./user-manual.txt:2504
-msgid "Use _Subsurface cloud storage_"
+#. type: Title ===
+#: ./user-manual.txt:2507
+#, no-wrap
+msgid "Using _Subsurface cloud storage_"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2510
+#: ./user-manual.txt:2517
 #, no-wrap
 msgid ""
-"** From the _File_ menu users can load and save data to the _Subsurface\n"
-"cloud storage_ server\n"
-"** In the _Preferences_, users can select to use the _Subsurface cloud\n"
-"storage_ data as their default data file which means that the data from\n"
-"the _Subsurface cloud storage_ will be displayed when _Subsurface_ starts.\n"
+"** Once the cloud storage has been initialised, two new items appear in "
+"the\n"
+"   _File_ menu of the main menu system: _Open cloud storage_ and _Save to "
+"cloud storage_.\n"
+"These options allow the user to load and save data to the _Subsurface\n"
+"cloud storage_ server.\n"
+"** In the _Defaults Preferences_ tab, one can select to use the _Subsurface "
+"cloud\n"
+"storage_ data as one's default data file by checking the check box marked "
+"_Cloud storage default file_.\n"
+" This means that the data from\n"
+"the _Subsurface cloud storage_ is loaded when _Subsurface_ starts ans saved "
+"there when one closes _Subsurface_.\n"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2515
+#: ./user-manual.txt:2522
+#, no-wrap
 msgid ""
-"_Subsurface_ keeps a local copy of the data and _Subsurface_ stays fully "
-"functional if used while offline. _Subsurface_ will simply synchronize the "
-"data with the backend serer the next time it is used while the computer is "
-"online."
+"** _Subsurface_ keeps a local copy of the data and the cloud facility "
+"remains fully\n"
+"functional even if used while disconnected to the Internet. _Subsurface_ "
+"simply synchronises the\n"
+"data with the cloud server the next time ithe program is used while the "
+"computer is\n"
+"connected to the Internet.\n"
+msgstr ""
+
+#. type: Title ===
+#: ./user-manual.txt:2523
+#, no-wrap
+msgid "Web access to _Subsurface cloud storage_"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2519
+#: ./user-manual.txt:2533
 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 "
-"Internet."
+"One of the nice side benefits of using _Subsurface cloud storage_ is that "
+"one can also access one's dive data from any web browser. Simply open "
+"https://cloud.subsurface-divelog.org[_https://cloud.subsurface-divelog.org_], "
+"log in with the same email and password, and you can see an HTML export of "
+"the last dive data that was synced to the _Subsurface cloud storage_. The "
+"dive information that is shown is only the contents of the recorded dive "
+"logs, NOT the calculated values shown in the *Profile* panel, including some "
+"cylinder pressures, deco ceilings and O~2~/He/N~2~ partial pressures."
+msgstr ""
+
+#. type: Title ===
+#: ./user-manual.txt:2534
+#, no-wrap
+msgid "Other cloud services"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2524
+#: ./user-manual.txt:2544
 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 "
-"one's desktop computer."
+"If one prefers not to use the integrated cloud storage of dive logs (and "
+"don't need the web access), it is also simple to store dive logs in the "
+"cloud using several of the existing facilities on the Internet.  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 one's "
+"desktop computer."
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:2525
+#: ./user-manual.txt:2545
 #, no-wrap
 msgid "images/Cloud.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2534
+#: ./user-manual.txt:2554
 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, "
@@ -4914,7 +4960,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2541
+#: ./user-manual.txt:2561
 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 "
@@ -4924,31 +4970,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2547
+#: ./user-manual.txt:2567
 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 "
+"log. To Store a dive log on _Dropbox_, select _File -> Save as_ from the "
 "_Subsurface_ main menu, navigate to the _Dropbox_ folder and select the "
-"_Save_ button. To access the dive log in the Cloud, select _File -> Open "
+"_Save_ button. To access the dive log in _Dropbox_, select _File -> Open "
 "Logbook_ from the _Subsurface_ main menu and navigate to the dive log file "
 "in the _Dropbox_ folder and select the _Open_ button."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2550
+#: ./user-manual.txt:2570
 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:2553
+#: ./user-manual.txt:2573
 #, no-wrap
 msgid "Printing a dive log"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2557
+#: ./user-manual.txt:2577
 #, no-wrap
 msgid ""
 "_Subsurface_ provides a simple and flexible interface to print a whole dive "
@@ -4958,12 +5004,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2559
+#: ./user-manual.txt:2579
 msgid "Before printing, two decisions are required:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2562
+#: ./user-manual.txt:2582
 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* "
@@ -4971,7 +5017,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2564
+#: ./user-manual.txt:2584
 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 "
@@ -4979,7 +5025,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2567
+#: ./user-manual.txt:2587
 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 "
@@ -4987,35 +5033,35 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:2568 ./user-manual.txt:3962
+#: ./user-manual.txt:2588 ./user-manual.txt:3990
 #, no-wrap
 msgid "images/Print1_f22.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2571
+#: ./user-manual.txt:2591
 msgid "Under _Print type_ select one of two options:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2573
+#: ./user-manual.txt:2593
 msgid ""
 "_Dive list print_: Print dives from the *Dive List* panel with profiles and "
 "other information."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2574
+#: ./user-manual.txt:2594
 msgid "_Statistics print_: Print yearly statistics of the dives."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2576
+#: ./user-manual.txt:2596
 msgid "Under _Print options_ select:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2581
+#: ./user-manual.txt:2601
 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 "
@@ -5023,85 +5069,85 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2583
+#: ./user-manual.txt:2603
 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:2586
+#: ./user-manual.txt:2606
 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:2588
+#: ./user-manual.txt:2608
 msgid "_Table_: This prints a summary table of all dives selected (see below)."
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:2589
+#: ./user-manual.txt:2609
 #, no-wrap
 msgid "images/Print_summarylist_f22.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2592
+#: ./user-manual.txt:2612
 msgid ""
 "_Flow layout_: Print the text associated with each diev without printing the "
 "dive profiles"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2593
+#: ./user-manual.txt:2613
 msgid "of each dive (see below):"
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:2594
+#: ./user-manual.txt:2614
 #, no-wrap
 msgid "images/Print_flow_layout_f22.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2597
+#: ./user-manual.txt:2617
 msgid ""
 "_One Dive_: Print one dive per page, also showing the dive profile (see "
 "below)"
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:2598
+#: ./user-manual.txt:2618
 #, no-wrap
 msgid "images/print2_f22.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2602
+#: ./user-manual.txt:2622
 msgid "_Two Dives_: Print two dives per page, also showing the dive profiles."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2603
+#: ./user-manual.txt:2623
 msgid "_Six Dives_: Print six dives per page, also showing the dive profiles."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2604
+#: ./user-manual.txt:2624
 msgid ""
 "_Custom_: This option allows customisation of the print contents and "
 "layout. This is"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2605
+#: ./user-manual.txt:2625
 msgid "discussed at the end of this section."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2609
+#: ./user-manual.txt:2629
 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, "
@@ -5110,7 +5156,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2613
+#: ./user-manual.txt:2633
 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 "
@@ -5119,13 +5165,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:2614
+#: ./user-manual.txt:2634
 #, no-wrap
 msgid "images/Print_print_f22.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2619
+#: ./user-manual.txt:2639
 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 "
@@ -5134,19 +5180,19 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:2620
+#: ./user-manual.txt:2640
 #, no-wrap
 msgid "images/Printpreview.jpg"
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:2622
+#: ./user-manual.txt:2642
 #, no-wrap
 msgid "Write a custom printing template (advanced)"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2626
+#: ./user-manual.txt:2646
 msgid ""
 "Writing a custom template is an effective way to produce highly customized "
 "printouts. Subsurface uses HTML templates to render printing. One can create "
@@ -5157,13 +5203,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ==
-#: ./user-manual.txt:2628
+#: ./user-manual.txt:2648
 #, no-wrap
 msgid "Configuring a dive computer"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2636
+#: ./user-manual.txt:2656
 msgid ""
 "_Subsurface_ enables one to configure a dive computer. Currently the "
 "Heinrichs-Weikamp (OSTC 2, OSTC 3) and Suunto Vyper (Stinger, Mosquito, D3, "
@@ -5177,7 +5223,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2641
+#: ./user-manual.txt:2661
 msgid ""
 "Once the dive computer is connected to the _Subsurface_ computer, select "
 "_File -> Configure dive computer_ from the _Main Menu_. Provide the "
@@ -5187,20 +5233,20 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:2642
+#: ./user-manual.txt:2662
 #, no-wrap
 msgid "images/Configure_dc_f20.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2645
+#: ./user-manual.txt:2665
 msgid ""
 "Using the appropriate buttons on the configuration panel, the following "
 "actions can be performed:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2648
+#: ./user-manual.txt:2668
 #, no-wrap
 msgid ""
 "*Retrieve available details*. This loads the existing configuration from the "
@@ -5209,7 +5255,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2650
+#: ./user-manual.txt:2670
 #, no-wrap
 msgid ""
 "*Save changes to device*. This changes the configuration of the\n"
@@ -5218,7 +5264,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2652
+#: ./user-manual.txt:2672
 #, no-wrap
 msgid ""
 "*Backup*. This saves the configuration data to a file. _Subsurface_ asks "
@@ -5227,7 +5273,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2654
+#: ./user-manual.txt:2674
 #, no-wrap
 msgid ""
 "*Restore backup*. This loads the information from a backup file and displays "
@@ -5236,7 +5282,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2656
+#: ./user-manual.txt:2676
 #, no-wrap
 msgid ""
 "*Update firmware*. If new firmware is available for the dive computer, this "
@@ -5245,13 +5291,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ==
-#: ./user-manual.txt:2659
+#: ./user-manual.txt:2679
 #, no-wrap
 msgid "Setting user _Preferences_ for _Subsurface_"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2667
+#: ./user-manual.txt:2687
 msgid ""
 "There are several settings within _Subsurface_ that the user can "
 "specify. These are found when selecting _File -> Preferences_. The settings "
@@ -5263,24 +5309,24 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:2668
+#: ./user-manual.txt:2688
 #, no-wrap
 msgid "Defaults"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2671
+#: ./user-manual.txt:2691
 msgid "There are several settings in the *Defaults* panel:"
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:2672
+#: ./user-manual.txt:2692
 #, no-wrap
 msgid "images/Pref1_f20.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2676
+#: ./user-manual.txt:2696
 #, no-wrap
 msgid ""
 "  ** *Lists and tables*: Here one can specify the font type and font size of "
@@ -5290,7 +5336,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2681
+#: ./user-manual.txt:2701
 #, no-wrap
 msgid ""
 "  ** *Dives*: For the _Default Dive File_ one need to specify the directory "
@@ -5303,7 +5349,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2686
+#: ./user-manual.txt:2706
 #, no-wrap
 msgid ""
 "  ** *Display invalid*:  Dives can be marked as invalid (when a user wishes "
@@ -5316,7 +5362,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2689
+#: ./user-manual.txt:2709
 #, no-wrap
 msgid ""
 "  ** *Default cylinder*: Here users can specify the default cylinder listed "
@@ -5325,7 +5371,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2697
+#: ./user-manual.txt:2717
 #, no-wrap
 msgid ""
 "  ** *Animations*: Some actions in showing the dive profile are performed "
@@ -5343,7 +5389,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2702
+#: ./user-manual.txt:2722
 #, no-wrap
 msgid ""
 "  ** *Subsurface web service*: When one subscribes to the "
@@ -5356,7 +5402,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2705
+#: ./user-manual.txt:2725
 #, no-wrap
 msgid ""
 "  ** *Clear all settings*: As indicated in the button below this heading, "
@@ -5365,19 +5411,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:2706
+#: ./user-manual.txt:2726
 #, no-wrap
 msgid "Units"
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:2707
+#: ./user-manual.txt:2727
 #, no-wrap
 msgid "images/Pref2_f20.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2714
+#: ./user-manual.txt:2734
 msgid ""
 "Here user can choose between metric and imperial units of depth, pressure, "
 "volume, temperature and mass. By selecting the Metric or Imperial radio "
@@ -5388,24 +5434,24 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:2715
+#: ./user-manual.txt:2735
 #, no-wrap
 msgid "Graph"
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:2717
+#: ./user-manual.txt:2737
 #, no-wrap
 msgid "images/Pref3_f20.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2721
+#: ./user-manual.txt:2741
 msgid "This panel allows two type of selections:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2729
+#: ./user-manual.txt:2749
 #, no-wrap
 msgid ""
 "*Show*: Here users can specify the amount of information shown as part of\n"
@@ -5422,7 +5468,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2734
+#: ./user-manual.txt:2754
 #, no-wrap
 msgid ""
 "** _Draw dive computer reported ceiling red_: This checkbox allows exactly "
@@ -5436,7 +5482,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2736
+#: ./user-manual.txt:2756
 #, no-wrap
 msgid ""
 "** _Show unused cylinders in Equipment Tab_: This checkbox allows display of "
@@ -5447,7 +5493,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2742
+#: ./user-manual.txt:2762
 #, no-wrap
 msgid ""
 "** _Show average depth_: Activating this checkbox causes _Subsurface_ to "
@@ -5460,13 +5506,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2744
+#: ./user-manual.txt:2764
 #, no-wrap
 msgid "*Misc*:\n"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2756
+#: ./user-manual.txt:2776
 #, no-wrap
 msgid ""
 "** Gradient Factors:* Here users can set the _gradient factors_ used while "
@@ -5493,7 +5539,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2758
+#: ./user-manual.txt:2778
 #, no-wrap
 msgid ""
 " *** http://www.tek-dive.com/portal/upload/M-Values.pdf[Understanding "
@@ -5501,7 +5547,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2760
+#: ./user-manual.txt:2780
 #, no-wrap
 msgid ""
 " *** "
@@ -5510,7 +5556,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2764
+#: ./user-manual.txt:2784
 #, no-wrap
 msgid ""
 " ** _CCR: Show setpoints when viewing pO2:_ With this checkbox ativated, the "
@@ -5522,7 +5568,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2768
+#: ./user-manual.txt:2788
 #, no-wrap
 msgid ""
 " ** _CCR: Show individual O~2~ sensor values when viewing pO~2~:_ Show the "
@@ -5533,13 +5579,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2770
+#: ./user-manual.txt:2790
 #, no-wrap
 msgid "*Configuring dive planning using rebreather equipment:*\n"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2772
+#: ./user-manual.txt:2792
 #, no-wrap
 msgid ""
 "** _Default CCR setpoint for dive planning:_ Specify the O~2~ setpoint for "
@@ -5547,7 +5593,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2776
+#: ./user-manual.txt:2796
 #, no-wrap
 msgid ""
 "CCR dive plan. This determines the pO~2~ that will be maintained\n"
@@ -5557,7 +5603,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2778
+#: ./user-manual.txt:2798
 #, no-wrap
 msgid ""
 "** _pSCR O~2~ metabolism rate:_ For a semiclosed rebreather (pSCR) system, "
@@ -5565,7 +5611,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2780
+#: ./user-manual.txt:2800
 #, no-wrap
 msgid ""
 "volume of oxygen used by a diver each minute. Set this value for pSCR dive "
@@ -5574,7 +5620,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2782
+#: ./user-manual.txt:2802
 #, no-wrap
 msgid ""
 "** _pSCR ratio:_ For pSCR equipment the dump ratio is the ratio of gas "
@@ -5582,7 +5628,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2784
+#: ./user-manual.txt:2804
 #, no-wrap
 msgid ""
 "environment to that of the gas recirculated to the diver. Set this value for "
@@ -5591,24 +5637,24 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:2786
+#: ./user-manual.txt:2806
 #, no-wrap
 msgid "Language"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2788
+#: ./user-manual.txt:2808
 msgid "Choose a language that _Subsurface_ will use."
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:2789
+#: ./user-manual.txt:2809
 #, no-wrap
 msgid "images/Pref4_f20.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2799
+#: ./user-manual.txt:2819
 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 "
@@ -5621,26 +5667,26 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:2800
+#: ./user-manual.txt:2820
 #, no-wrap
 msgid "Network"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2802
+#: ./user-manual.txt:2822
 msgid ""
 "This panel facilitates communication between _Subsurface_ and data sources "
 "on the Internet."
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:2803
+#: ./user-manual.txt:2823
 #, no-wrap
 msgid "images/Pref5_f20.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2816
+#: ./user-manual.txt:2836
 msgid ""
 "This is important, for instance, when _Subsurface_ needs to communicate with "
 "Internet services such as the <<S_Companion,_Subsurface Companion app_>> or "
@@ -5657,26 +5703,26 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:2817
+#: ./user-manual.txt:2837
 #, no-wrap
 msgid "Facebook Accesss"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2820
+#: ./user-manual.txt:2840
 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:2821
+#: ./user-manual.txt:2841
 #, no-wrap
 msgid "images/Pref6_f20.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2829
+#: ./user-manual.txt:2849
 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 "
@@ -5686,13 +5732,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ==
-#: ./user-manual.txt:2831
+#: ./user-manual.txt:2851
 #, no-wrap
 msgid "The _Subsurface_ dive planner"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2836
+#: ./user-manual.txt:2856
 msgid ""
 "Dive planning is an advanced feature of _Subsurface_, accessible by "
 "selecting _Log -> Plan Dive_ from the main menu. It allows calculation of "
@@ -5701,7 +5747,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block *
-#: ./user-manual.txt:2844
+#: ./user-manual.txt:2864
 msgid ""
 "The _Subsurface_ dive planner IS CURRENTLY EXPERIMENTAL and assumes the user "
 "is already familiar with the _Subsurface_ user interface. It is explicitly "
@@ -5709,19 +5755,19 @@ msgid ""
 msgstr ""
 
 #. type: delimited block *
-#: ./user-manual.txt:2847
+#: ./user-manual.txt:2867
 msgid ""
 "The user is conversant with dive planning and has the necessary training to "
 "perform dive planning."
 msgstr ""
 
 #. type: delimited block *
-#: ./user-manual.txt:2848
+#: ./user-manual.txt:2868
 msgid "The user plans dives within his/her certification limits."
 msgstr ""
 
 #. type: delimited block *
-#: ./user-manual.txt:2851
+#: ./user-manual.txt:2871
 msgid ""
 "Dive planning makes large assumptions about the characteristics of the "
 "_average person_ and cannot compensate for individual physiology or health "
@@ -5729,32 +5775,32 @@ msgid ""
 msgstr ""
 
 #. type: delimited block *
-#: ./user-manual.txt:2852
+#: ./user-manual.txt:2872
 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:2853
+#: ./user-manual.txt:2873
 msgid "The user is familiar with the user interface of _Subsurface_."
 msgstr ""
 
 #. type: delimited block *
-#: ./user-manual.txt:2855
+#: ./user-manual.txt:2875
 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:2857
+#: ./user-manual.txt:2877
 #, no-wrap
 msgid "The _Subsurface_ dive planner screen"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2862
+#: ./user-manual.txt:2882
 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 "
@@ -5764,7 +5810,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2866
+#: ./user-manual.txt:2886
 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 "
@@ -5773,7 +5819,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2870
+#: ./user-manual.txt:2890
 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 "
@@ -5782,26 +5828,26 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:2871
+#: ./user-manual.txt:2891
 #, no-wrap
 msgid "images/PlannerWindow1_f20.jpg"
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:2874
+#: ./user-manual.txt:2894
 #, no-wrap
 msgid "Open circuit dives"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2877
+#: ./user-manual.txt:2897
 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:2880
+#: ./user-manual.txt:2900
 #, no-wrap
 msgid ""
 "** Open Circuit (the default)\n"
@@ -5810,12 +5856,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2882
+#: ./user-manual.txt:2902
 msgid "Choose the Open Circuit option."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2886
+#: ./user-manual.txt:2906
 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 "
@@ -5825,7 +5871,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2895
+#: ./user-manual.txt:2915
 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 "
@@ -5839,12 +5885,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2897
+#: ./user-manual.txt:2917
 msgid "The profile of the planned dive can be created in two ways:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2902
+#: ./user-manual.txt:2922
 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 "
@@ -5854,7 +5900,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2910
+#: ./user-manual.txt:2930
 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 "
@@ -5868,13 +5914,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: ./user-manual.txt:2911
+#: ./user-manual.txt:2931
 #, no-wrap
 msgid "Recreational dives"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2926
+#: ./user-manual.txt:2946
 msgid ""
 "The _Subsurface_ dive planner allows a sophisticated way of planning "
 "recreational dives, i.e. dives that remain within no-decompression limits.  "
@@ -5895,26 +5941,26 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2929
+#: ./user-manual.txt:2949
 msgid "To plan a dive, the appropriate settings need to be defined."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2932
+#: ./user-manual.txt:2952
 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:2935
+#: ./user-manual.txt:2955
 msgid ""
 "Immediately under the heading _Planning_ are two checkboxes _Recreational_ "
 "and _Safety Stop_.  Check these two boxes."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2939
+#: ./user-manual.txt:2959
 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 "
@@ -5922,7 +5968,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2944
+#: ./user-manual.txt:2964
 msgid ""
 "The planner calculates whether the specified cylinder contains enough "
 "air/gas to complete the planned dive. In order for this to be realistic, "
@@ -5932,7 +5978,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2947
+#: ./user-manual.txt:2967
 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 "
@@ -5940,7 +5986,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2954
+#: ./user-manual.txt:2974
 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 "
@@ -5951,14 +5997,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2957
+#: ./user-manual.txt:2977
 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:2965
+#: ./user-manual.txt:2985
 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 "
@@ -5974,43 +6020,48 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2969
+#: ./user-manual.txt:2989
 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 limited by the amount of air in the cylinder, reflected by the "
-"information in the text box at the bottom right of the panel."
+"information in the text box at the bottom right of the panel that requires "
+"sufficient air for buddy-sharing during the ascent."
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:2970
+#: ./user-manual.txt:2990
 #, no-wrap
 msgid "images/rec_diveplan.jpg"
 msgstr ""
 
 #. type: Title ====
-#: ./user-manual.txt:2972
+#: ./user-manual.txt:2992
 #, no-wrap
 msgid "Non-recreational open circuit dives, including decompression"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2976
+#: ./user-manual.txt:2996
 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:2986
+#: ./user-manual.txt:3007
 #, no-wrap
 msgid ""
 "*a) Nitrogen management*: This is performed by specifying the rates for "
 "descent and ascent,\n"
-"as well as the gradient factors (GFLow and GFHigh) under the headings "
-"_Rates_ and _Planning_\n"
-"to the bottom left of the planning screen. Initially, the GFHigh and GFLow "
-"values in the _Preferences_\n"
+"as well as the deco model (GFLow, GFHigh or Conservatism level) under the "
+"headings _Rates_ and _Planning_\n"
+"to the bottom left of the planning screen. Two deco models are supported the "
+"Buehlmann model and the VPM-B\n"
+"model. Select one of the two models. When selecting the Buehlmann model, the "
+"gradient factors (GF_high and GF_low\n"
+"need to be specified. Initially, the GFHigh and GFLow values in the "
+"_Preferences_\n"
 "panel of _Subsurface_ is used. If these are changed within the planner (see "
 "_Gas Options_ within\n"
 "the planner), the new values are\n"
@@ -6020,33 +6071,50 @@ msgid ""
 "dive.\n"
 " ** For more information about Gradient factors, see the section on "
 "xref:S_GradientFactors[Gradient Factor Preference settings].\n"
-"For more information external to this manual see:\n"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2988
+#: ./user-manual.txt:3012
+msgid ""
+"If the VPM-B model is selected, the Conservatism_level needs to be specified "
+"on a scale of 0 (least conservative) to 4 (most conservative).  This model "
+"tends to give deco stops at deeper levels than the Beuhlmann model and often "
+"results in slightly shorter dive durations than the Buehlmann model. When "
+"selecting one of these models, keep in mind that they are NOT exact "
+"physiological models but only mathematical models that appear to work in "
+"practice."
+msgstr ""
+
+#. type: Plain text
+#: ./user-manual.txt:3014
+msgid "For more information external to this manual see:"
+msgstr ""
+
+#. type: Plain text
+#: ./user-manual.txt:3016
 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:2989
+#: ./user-manual.txt:3017
 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:2991
+#: ./user-manual.txt:3019
 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: "
-"1-905492-07-3.  An excellent non-technical review."
+"1-905492-07-3.  An excellent non-technical review that discusses both the "
+"Buehlmann deco model and the VPM-B model."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2999
+#: ./user-manual.txt:3027
 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) "
@@ -6060,7 +6128,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3008
+#: ./user-manual.txt:3036
 #, no-wrap
 msgid ""
 "*b) Oxygen management*: In the *Gas Options* part of the dive specification, "
@@ -6080,7 +6148,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3022
+#: ./user-manual.txt:3050
 #, no-wrap
 msgid ""
 "*c) Gas management*: With open-circuit dives this is a primary "
@@ -6111,7 +6179,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3034
+#: ./user-manual.txt:3062
 msgid ""
 "Now (at last) one can start the detailed time-depth planning of the "
 "dive. _Subsurface_ offers a unique graphical interface for performing this "
@@ -6130,7 +6198,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3046
+#: ./user-manual.txt:3074
 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_ "
@@ -6148,7 +6216,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3054
+#: ./user-manual.txt:3082
 msgid ""
 "Indicate any changes in gas cylinder used by indicating gas changes as "
 "explained in the section <<S_CreateProfile,hand-creating a dive "
@@ -6161,7 +6229,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3063
+#: ./user-manual.txt:3091
 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 "
@@ -6174,20 +6242,20 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3066
+#: ./user-manual.txt:3094
 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:3067
+#: ./user-manual.txt:3095
 #, no-wrap
 msgid "images/DivePlanner2_f20.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3072
+#: ./user-manual.txt:3100
 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 "
@@ -6195,13 +6263,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3074
+#: ./user-manual.txt:3102
 #, no-wrap
 msgid "*The dive plan details*\n"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3082
+#: ./user-manual.txt:3110
 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 "
@@ -6214,7 +6282,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3087
+#: ./user-manual.txt:3115
 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 "
@@ -6224,13 +6292,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:3088
+#: ./user-manual.txt:3116
 #, no-wrap
 msgid "Planning pSCR dives"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3103
+#: ./user-manual.txt:3131
 #, no-wrap
 msgid ""
 "To plan a dive using a passive semi-closed rebreather (pSCR), select _pSCR_ "
@@ -6260,26 +6328,26 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:3104
+#: ./user-manual.txt:3132
 #, no-wrap
 msgid "images/Planner_pSCR1_f20.jpg"
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:3107
+#: ./user-manual.txt:3135
 #, no-wrap
 msgid "Planning CCR dives"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3111
+#: ./user-manual.txt:3139
 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:3115
+#: ./user-manual.txt:3143
 #, no-wrap
 msgid ""
 "*Available gases*: In the _Available gases_ table, enter the cylinder "
@@ -6290,7 +6358,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3123
+#: ./user-manual.txt:3151
 #, no-wrap
 msgid ""
 "*Entering setpoints*: Specify a default setpoint in the Preferences tab, by "
@@ -6311,31 +6379,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3125
+#: ./user-manual.txt:3153
 msgid "The dive profile for a CCR dive may look something like the image below."
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:3126
+#: ./user-manual.txt:3154
 #, no-wrap
 msgid "images/Planner_CCR1_f20.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3130
+#: ./user-manual.txt:3158
 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:3132
+#: ./user-manual.txt:3160
 #, no-wrap
 msgid "Modifying an existing dive plan"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3139
+#: ./user-manual.txt:3167
 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 "
@@ -6346,7 +6414,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3145
+#: ./user-manual.txt:3173
 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 "
@@ -6356,13 +6424,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:3146
+#: ./user-manual.txt:3174
 #, no-wrap
 msgid "Planning for repetitive dives"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3153
+#: ./user-manual.txt:3181
 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 "
@@ -6371,7 +6439,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3159
+#: ./user-manual.txt:3187
 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 "
@@ -6381,7 +6449,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3164
+#: ./user-manual.txt:3192
 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 "
@@ -6391,13 +6459,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:3165
+#: ./user-manual.txt:3193
 #, no-wrap
 msgid "Printing the dive plan"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3170
+#: ./user-manual.txt:3198
 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 "
@@ -6405,7 +6473,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3180
+#: ./user-manual.txt:3208
 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 "
@@ -6421,13 +6489,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ==
-#: ./user-manual.txt:3181
+#: ./user-manual.txt:3209
 #, no-wrap
 msgid "Description of the Subsurface Main Menu items"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3186
+#: ./user-manual.txt:3214
 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 "
@@ -6435,299 +6503,299 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:3187
+#: ./user-manual.txt:3215
 #, no-wrap
 msgid "File"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3190
+#: ./user-manual.txt:3218
 msgid ""
 "<<S_NewLogbook,_New Logbook_>> - Close the currently open dive logbook and "
 "clear all dive information."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3192
+#: ./user-manual.txt:3220
 msgid ""
 "_Open logbook_ - This opens the file manager in order to select a dive "
 "logbook to open."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3193
+#: ./user-manual.txt:3221
 msgid "_Save_ - Save the dive logbook that is currently open."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3194
+#: ./user-manual.txt:3222
 msgid "_Save as_ - Save the current logbook under a different file name."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3195
+#: ./user-manual.txt:3223
 msgid "_Close_ - Close the dive logbook that is currently open."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3197
+#: ./user-manual.txt:3225
 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:3198
+#: ./user-manual.txt:3226
 msgid "<<S_PrintDivelog,_Print_>> - Print the currently open logbook."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3199
+#: ./user-manual.txt:3227
 msgid ""
 "<<S_FindMovedImages, _Find moved images_>> - If photos taken during dives "
 "have been moved to"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3200
+#: ./user-manual.txt:3228
 msgid ""
 "a different disk or directory, locate them and link them to the appropriate "
 "dives."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3201
+#: ./user-manual.txt:3229
 msgid "<<S_Preferences,_Preferences_>> - Set the _Subsurface_ preferences."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3202
+#: ./user-manual.txt:3230
 msgid ""
 "<<S_Configure,_Configure dive computer_>> - Edit the configuration of a dive "
 "computer."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3203
+#: ./user-manual.txt:3231
 msgid "_Quit_ - Quit _Subsurface_."
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:3204
+#: ./user-manual.txt:3232
 #, no-wrap
 msgid "Import"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3207
+#: ./user-manual.txt:3235
 msgid ""
 "<<S_ImportDiveComputer,_Import from dive computer_>> - Import dive "
 "information from a dive computer."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3209
+#: ./user-manual.txt:3237
 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:3211
+#: ./user-manual.txt:3239
 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:3213
+#: ./user-manual.txt:3241
 msgid ""
 "<<S_ImportingDivelogsDe,_Import from Divelogs.de_>> - Import dive "
 "information from _www.Divelogs.de_."
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:3214
+#: ./user-manual.txt:3242
 #, no-wrap
 msgid "Log"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3216
+#: ./user-manual.txt:3244
 msgid ""
 "<<S_EnterData,_Add Dive_>> - Manually add a new dive to the *Dive List* "
 "panel."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3217
+#: ./user-manual.txt:3245
 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:3218
+#: ./user-manual.txt:3246
 msgid "<<S_DivePlanner,_Plan Dive_>> - This feature allows the planning of dives."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3219
+#: ./user-manual.txt:3247
 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:3221
+#: ./user-manual.txt:3249
 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:3223
+#: ./user-manual.txt:3251
 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:3225
+#: ./user-manual.txt:3253
 msgid ""
 "<<S_Renumber,_Renumber_>> - Renumber the dives listed in the *Dive List* "
 "panel."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3227
+#: ./user-manual.txt:3255
 msgid ""
 "<<S_Group,_Auto Group_>> - Group the dives in the *Dive List* panel into "
 "dive trips."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3228
+#: ./user-manual.txt:3256
 msgid ""
 "<<S_DeviceNames,_Edit Device Names_>> - Edit the names of dive computers to "
 "facilitate your logs."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3229
+#: ./user-manual.txt:3257
 msgid ""
 "<<S_Filter,_Filter divelist_>> - Select only some dives, based on specific "
 "tags or dive criteria."
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:3230
+#: ./user-manual.txt:3258
 #, no-wrap
 msgid "View"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3233
+#: ./user-manual.txt:3261
 msgid ""
 "<<S_ViewPanels,_All_>> - View the four main _Subsurface_ panels "
 "simmultaneously."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3234
+#: ./user-manual.txt:3262
 msgid "<<S_ViewPanels,_Dive List_>> - View only the *Dive List* panel."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3235
+#: ./user-manual.txt:3263
 msgid "<<S_ViewPanels,_Profile_>> - View only the *Dive Profile* panel."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3236
+#: ./user-manual.txt:3264
 msgid "<<S_ViewPanels,_Info_>> - View only the *Notes* panel."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3237
+#: ./user-manual.txt:3265
 msgid "<<S_ViewPanels,_Globe_>> - View only the *World Map* panel."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3239
+#: ./user-manual.txt:3267
 msgid ""
 "_Yearly Statistics_ - Display summary statistics about dives during this and "
 "past years."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3240
+#: ./user-manual.txt:3268
 msgid "_Prev DC_ - Switch to previous dive computer."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3241
+#: ./user-manual.txt:3269
 msgid "_Next DC_ - Switch to next dive computer."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3242
+#: ./user-manual.txt:3270
 msgid "_Full Screen_ - Toggles Full Screen mode."
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:3243
+#: ./user-manual.txt:3271
 #, no-wrap
 msgid "Help"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3246
+#: ./user-manual.txt:3274
 msgid ""
 "_About Subsurface_ - Show a panel with the version number of _Subsurface_ as "
 "well as licensing information."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3248
+#: ./user-manual.txt:3276
 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:3249
+#: ./user-manual.txt:3277
 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:3250
+#: ./user-manual.txt:3278
 msgid "_User manual_ - Open a window showing this user manual."
 msgstr ""
 
 #. type: Title ==
-#: ./user-manual.txt:3252
+#: ./user-manual.txt:3280
 #, no-wrap
 msgid "Mobile Version"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3255
+#: ./user-manual.txt:3283
 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:3256
+#: ./user-manual.txt:3284
 #, no-wrap
 msgid "How to use the mobile version"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3260
+#: ./user-manual.txt:3288
 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 "
@@ -6735,7 +6803,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3264
+#: ./user-manual.txt:3292
 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 "
@@ -6744,7 +6812,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3267
+#: ./user-manual.txt:3295
 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 "
@@ -6752,7 +6820,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3270
+#: ./user-manual.txt:3298
 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 "
@@ -6760,7 +6828,7 @@ msgid ""
 msgstr ""
 
 #. type: Title ==
-#: ./user-manual.txt:3272
+#: ./user-manual.txt:3300
 #, no-wrap
 msgid ""
 "APPENDIX A: Operating system specific information for importing dive "
@@ -6768,19 +6836,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:3274
+#: ./user-manual.txt:3302
 #, 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:3275
+#: ./user-manual.txt:3303
 #, no-wrap
 msgid "images/icons/drivers.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3280
+#: ./user-manual.txt:3308
 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 "
@@ -6788,7 +6856,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3286
+#: ./user-manual.txt:3314
 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 "
@@ -6797,7 +6865,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3290
+#: ./user-manual.txt:3318
 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 "
@@ -6805,7 +6873,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3297
+#: ./user-manual.txt:3325
 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 "
@@ -6816,19 +6884,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:3299
+#: ./user-manual.txt:3327
 #, 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:3300
+#: ./user-manual.txt:3328
 #, no-wrap
 msgid "images/icons/usb.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3308
+#: ./user-manual.txt:3336
 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 "
@@ -6839,67 +6907,67 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: ./user-manual.txt:3309 ./user-manual.txt:3392
+#: ./user-manual.txt:3337 ./user-manual.txt:3420
 #, no-wrap
 msgid "On Windows:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3313
+#: ./user-manual.txt:3341
 msgid ""
 "Simply try COM1, COM2, etc. The drop down list should contain all connected "
 "COM devices."
 msgstr ""
 
 #. type: Title ====
-#: ./user-manual.txt:3314 ./user-manual.txt:3407
+#: ./user-manual.txt:3342 ./user-manual.txt:3435
 #, no-wrap
 msgid "On MacOS:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3317
+#: ./user-manual.txt:3345
 msgid "The drop down box should find all connected dive computers."
 msgstr ""
 
 #. type: Block title
-#: ./user-manual.txt:3318
+#: ./user-manual.txt:3346
 #, no-wrap
 msgid "On Linux:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3321
+#: ./user-manual.txt:3349
 msgid "There is a definitive way to find the port:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3323
+#: ./user-manual.txt:3351
 msgid "Disconnect the USB cable from the dive computer"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3324
+#: ./user-manual.txt:3352
 msgid "Open a terminal"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3325 ./user-manual.txt:3327
+#: ./user-manual.txt:3353 ./user-manual.txt:3355
 msgid "Type the command: 'dmesg' and press enter"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3326
+#: ./user-manual.txt:3354
 msgid "Plug in the USB cable of the dive computer"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3329
+#: ./user-manual.txt:3357
 msgid "A message similar to this one should appear:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3345
+#: ./user-manual.txt:3373
 #, no-wrap
 msgid ""
 "\tusb 2-1.1: new full speed USB device number 14 using ehci_hcd\n"
@@ -6920,7 +6988,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3350
+#: ./user-manual.txt:3378
 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 "
@@ -6928,12 +6996,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3352
+#: ./user-manual.txt:3380
 msgid "Ensuring that the user has write permission to the USB serial port:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3358
+#: ./user-manual.txt:3386
 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 "
@@ -6942,14 +7010,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3362
+#: ./user-manual.txt:3390
 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:3367
+#: ./user-manual.txt:3395
 #, no-wrap
 msgid ""
 "Type: +id johnB+     This lists all the groups that johnB belongs to and\n"
@@ -6961,7 +7029,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3369
+#: ./user-manual.txt:3397
 #, no-wrap
 msgid ""
 "Under some circumstances this change takes only effect (eg. on Ubuntu) "
@@ -6970,7 +7038,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3374
+#: ./user-manual.txt:3402
 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 "
@@ -6978,19 +7046,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:3376
+#: ./user-manual.txt:3404
 #, no-wrap
 msgid "Setting up bluetooth enabled devices"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: ./user-manual.txt:3377
+#: ./user-manual.txt:3405
 #, no-wrap
 msgid "images/icons/bluetooth.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3383
+#: ./user-manual.txt:3411
 msgid ""
 "For dive computers communicating through bluetooth like the Heinrichs "
 "Weikamp Frog or the Shearwater Predator and Petrel there is a different "
@@ -6999,7 +7067,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3385
+#: ./user-manual.txt:3413
 #, no-wrap
 msgid ""
 "*For the dive computer, after enabling Bluetooth, ensure it is in Upload "
@@ -7007,7 +7075,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3389
+#: ./user-manual.txt:3417
 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 "
@@ -7015,13 +7083,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3391
+#: ./user-manual.txt:3419
 #, no-wrap
 msgid "*Pair the _Subsurface_ computer with the dive computer.*\n"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3400
+#: ./user-manual.txt:3428
 msgid ""
 "Bluetooth is most likely already enabled. For pairing with the dive computer "
 "choose _Control Panel -> Bluetooth Devices -> Add Wireless Device_.  This "
@@ -7033,21 +7101,21 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3403
+#: ./user-manual.txt:3431
 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:3406
+#: ./user-manual.txt:3434
 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:3413
+#: ./user-manual.txt:3441
 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 "
@@ -7056,20 +7124,20 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3416
+#: ./user-manual.txt:3444
 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:3417
+#: ./user-manual.txt:3445
 #, no-wrap
 msgid "On Linux"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3425
+#: ./user-manual.txt:3453
 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 "
@@ -7082,7 +7150,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3429
+#: ./user-manual.txt:3457
 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 "
@@ -7091,22 +7159,22 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3431
+#: ./user-manual.txt:3459
 msgid "Enable the Bluetooth controller and pair your dive computer</li>"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3432
+#: ./user-manual.txt:3460
 msgid "Establish an RFCOMM connection"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3433
+#: ./user-manual.txt:3461
 msgid "Download the dives with Subsurface"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3439
+#: ./user-manual.txt:3467
 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'.  "
@@ -7117,7 +7185,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3444
+#: ./user-manual.txt:3472
 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 "
@@ -7127,23 +7195,23 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3446
+#: ./user-manual.txt:3474
 msgid "+sudo usermod -a -G dialout username+"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3448
+#: ./user-manual.txt:3476
 msgid "Then log out and log in for the change to take effect."
 msgstr ""
 
 #. type: Title =====
-#: ./user-manual.txt:3449
+#: ./user-manual.txt:3477
 #, no-wrap
 msgid "Enabling the Bluetooth controller and pairing your dive computer"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3455
+#: ./user-manual.txt:3483
 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 "
@@ -7154,7 +7222,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3458
+#: ./user-manual.txt:3486
 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 "
@@ -7162,7 +7230,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3465
+#: ./user-manual.txt:3493
 #, no-wrap
 msgid ""
 "\t$ hciconfig\n"
@@ -7174,7 +7242,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3470
+#: ./user-manual.txt:3498
 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 "
@@ -7184,7 +7252,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3478
+#: ./user-manual.txt:3506
 #, no-wrap
 msgid ""
 "\tsudo hciconfig hci0 up auth+  (enter password when prompted)\n"
@@ -7197,25 +7265,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3480
+#: ./user-manual.txt:3508
 msgid "+Check that the status now includes +'UP', 'RUNNING' AND 'AUTH'+."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3482
+#: ./user-manual.txt:3510
 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:3484
+#: ./user-manual.txt:3512
 #, no-wrap
 msgid "\tsudo hciconfig hci1 down\n"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3487
+#: ./user-manual.txt:3515
 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 "
@@ -7223,7 +7291,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3508
+#: ./user-manual.txt:3536
 #, no-wrap
 msgid ""
 "\tbluetoothctl\n"
@@ -7252,14 +7320,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3511
+#: ./user-manual.txt:3539
 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:3514
+#: ./user-manual.txt:3542
 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 "
@@ -7267,7 +7335,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3519
+#: ./user-manual.txt:3547
 #, no-wrap
 msgid ""
 "\thcitool -i hci0 scanning\n"
@@ -7277,77 +7345,77 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3521
+#: ./user-manual.txt:3549
 msgid "Once ther dive computer is pired, set up the RFCOMM connection"
 msgstr ""
 
 #. type: Title =====
-#: ./user-manual.txt:3522
+#: ./user-manual.txt:3550
 #, no-wrap
 msgid "Establishing the RFCOMM connection"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3525
+#: ./user-manual.txt:3553
 msgid "The command to establish an RFCOMM connection is:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3527
+#: ./user-manual.txt:3555
 msgid "+sudo rfcomm -i <controller> connect <dev> <bdaddr> [channel]+"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3529
+#: ./user-manual.txt:3557
 msgid "<controller>+ is the Bluetooth controller, +hci0+."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3530
+#: ./user-manual.txt:3558
 msgid "<dev> is the RFCOMM device file, +rfcomm0+"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3531
+#: ./user-manual.txt:3559
 msgid "<bdaddr> is the dive computer's MAC address, +00:11:22:33:44:55+"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3532
+#: ./user-manual.txt:3560
 msgid "[channel] is the dive computer's Bluetooth channel we need to connect to."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3535
+#: ./user-manual.txt:3563
 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:3537
+#: ./user-manual.txt:3565
 msgid "_Shearwater Petrel 2_: channel 5"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3538
+#: ./user-manual.txt:3566
 msgid "_Shearwater Petrel 1_: channel 1"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3539
+#: ./user-manual.txt:3567
 msgid "_Heinrichs-Weikamp OSTC Sport_: channel 1"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3541
+#: ./user-manual.txt:3569
 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:3543
+#: ./user-manual.txt:3571
 #, no-wrap
 msgid ""
 "\tsudo rfcomm -i hci0 connect rfcomm0 00:11:22:33:44:55 5 (enter a password, "
@@ -7355,12 +7423,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3545
+#: ./user-manual.txt:3573
 msgid "This gives the response:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3548
+#: ./user-manual.txt:3576
 #, no-wrap
 msgid ""
 "\tConnected /dev/rfcomm0 to 00:11:22:33:44:55 on channel 5\n"
@@ -7368,14 +7436,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3550
+#: ./user-manual.txt:3578
 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:3554
+#: ./user-manual.txt:3582
 #, no-wrap
 msgid ""
 "\tsudo rfcomm -i hci0 connect rfcomm0 00:11:22:33:44:55   (enter a password, "
@@ -7385,7 +7453,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3558
+#: ./user-manual.txt:3586
 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 "
@@ -7394,7 +7462,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3568
+#: ./user-manual.txt:3596
 #, no-wrap
 msgid ""
 "\tsdptool -i hci0 records 00:11:22:33:44:55\n"
@@ -7409,7 +7477,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3571
+#: ./user-manual.txt:3599
 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 "
@@ -7417,13 +7485,13 @@ msgid ""
 msgstr ""
 
 #. type: Title =====
-#: ./user-manual.txt:3572
+#: ./user-manual.txt:3600
 #, no-wrap
 msgid "Download the dives with Subsurface</em>"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3574
+#: ./user-manual.txt:3602
 msgid ""
 "After establishing the RFCOMM connection and while the dive computer's "
 "upload mode countdown is still running, go to_Subsurface_, select "
@@ -7433,25 +7501,25 @@ msgid ""
 msgstr ""
 
 #. type: Title ==
-#: ./user-manual.txt:3577
+#: ./user-manual.txt:3605
 #, no-wrap
 msgid "APPENDIX B: Dive Computer specific information for importing dive data."
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:3580
+#: ./user-manual.txt:3608
 #, no-wrap
 msgid "Importing from Uemis Zurich"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: ./user-manual.txt:3582
+#: ./user-manual.txt:3610
 #, no-wrap
 msgid "images/icons/iumis.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3598
+#: ./user-manual.txt:3626
 msgid ""
 "_Subsurface_ downloads the information stored on the SDA (the built-in file "
 "system of the Uemis) including information about dive spots and "
@@ -7468,7 +7536,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3613
+#: ./user-manual.txt:3641
 msgid ""
 "After selecting the above device name, download the dives from the Uemis "
 "Zurich. One technical issue with the Uemis Zurich download implementation "
@@ -7485,19 +7553,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:3615
+#: ./user-manual.txt:3643
 #, no-wrap
 msgid "Importing from Uwatec Galileo"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: ./user-manual.txt:3617
+#: ./user-manual.txt:3645
 #, no-wrap
 msgid "images/icons/Galileo.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3632
+#: ./user-manual.txt:3660
 msgid ""
 "The Uwatec Galileo dive computers use infra red (IrDA) communication between "
 "the dive computer and Subsurface. The Uwatec hardware uses a USB dongle "
@@ -7513,14 +7581,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3635
+#: ./user-manual.txt:3663
 msgid ""
 "After executing this command, Subsurface will recognise the Galileo dive "
 "computer and download dive information."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3641
+#: ./user-manual.txt:3669
 msgid ""
 "Under Windows, a similar situation exists. Drivers for the MCS7780 are "
 "available from some Internet web sites e.g.  "
@@ -7531,26 +7599,26 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3644
+#: ./user-manual.txt:3672
 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:3646
+#: ./user-manual.txt:3674
 #, no-wrap
 msgid "Importing from Heinrichs Weikamp DR5"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: ./user-manual.txt:3648
+#: ./user-manual.txt:3676
 #, no-wrap
 msgid "images/icons/HW_DR5.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3658
+#: ./user-manual.txt:3686
 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.  "
@@ -7563,19 +7631,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:3661
+#: ./user-manual.txt:3689
 #, no-wrap
 msgid "Importing from xDEEP BLACK"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: ./user-manual.txt:3663
+#: ./user-manual.txt:3691
 #, no-wrap
 msgid "images/icons/HW_xdeepblack.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3672
+#: ./user-manual.txt:3700
 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 "
@@ -7589,19 +7657,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:3674
+#: ./user-manual.txt:3702
 #, no-wrap
 msgid "Importing from Shearwater Predator using Bluetooth"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: ./user-manual.txt:3676
+#: ./user-manual.txt:3704
 #, no-wrap
 msgid "images/icons/predator.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3684
+#: ./user-manual.txt:3712
 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 "
@@ -7612,36 +7680,36 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3687
+#: ./user-manual.txt:3715
 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:3688
+#: ./user-manual.txt:3716
 msgid "switch to different Bluetooth drivers for the same hardware"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3689
+#: ./user-manual.txt:3717
 msgid "switch off WiFi while using Bluetooth"
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:3691
+#: ./user-manual.txt:3719
 #, no-wrap
 msgid "Importing from Poseidon MkVI Discovery"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: ./user-manual.txt:3693
+#: ./user-manual.txt:3721
 #, no-wrap
 msgid "images/MkVI.jpeg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3701
+#: ./user-manual.txt:3729
 msgid ""
 "Download of dive logs from the MkVI is performed using a custom "
 "communications adapter and the _Poseidon PC Configuration Software_, "
@@ -7653,45 +7721,45 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3704
+#: ./user-manual.txt:3732
 msgid ""
 "Setup configuration for the dive and key dive parameters (file with a .txt "
 "extension)"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3705
+#: ./user-manual.txt:3733
 msgid "Dive log details (file with a .csv extension)"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3707
+#: ./user-manual.txt:3735
 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:3709
+#: ./user-manual.txt:3737
 msgid ""
 "_Subsurface_ accesses the .txt and the .csv files to obtain dive log "
 "information."
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:3711
+#: ./user-manual.txt:3739
 #, no-wrap
 msgid "Importing from APD Inspiration/Evolution CCR"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: ./user-manual.txt:3713
+#: ./user-manual.txt:3741
 #, no-wrap
 msgid "images/APDComputer.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3721
+#: ./user-manual.txt:3749
 msgid ""
 "The dive logs of an APD Inspiration or similar CCR dive computer are "
 "downloaded using a communications adapter and _AP Communicator_, obtained "
@@ -7703,55 +7771,55 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3723
+#: ./user-manual.txt:3751
 msgid "Download the dive using _AP Communicator_."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3724
+#: ./user-manual.txt:3752
 msgid "Open a dive within the _AP Log Viewer_."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3725
+#: ./user-manual.txt:3753
 msgid "Select the tab at the top of the screen, entitled \"_Data_\"."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3726
+#: ./user-manual.txt:3754
 msgid ""
 "With the raw dive log data show on the screen, click on \"_Copy to "
 "Clipboard_\"."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3727
+#: ./user-manual.txt:3755
 msgid "Open a text editor, e.g. Notepad (Windows) or TextWrangler (Mac)."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3729
+#: ./user-manual.txt:3757
 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:3730
+#: ./user-manual.txt:3758
 msgid ""
 "Within _Subsurface_, select _Import -> Import log files_ to open the "
 "xref:Unified_import[universal import dialogue]."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3731
+#: ./user-manual.txt:3759
 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:3734
+#: ./user-manual.txt:3762
 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 "
@@ -7760,13 +7828,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:3735
+#: ./user-manual.txt:3763
 #, no-wrap
 msgid "images/APD_CSVimportF22.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3743
+#: ./user-manual.txt:3771
 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 "
@@ -7778,12 +7846,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3744
+#: ./user-manual.txt:3772
 msgid "Click the _Ok_ button at the bottom of the import panel."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3749
+#: ./user-manual.txt:3777
 msgid ""
 "The APD dive log will appear within _Subsurface_. The dive "
 "computer-generated ceiling generated by the Inspiration can be viewed by "
@@ -7793,13 +7861,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ==
-#: ./user-manual.txt:3750
+#: ./user-manual.txt:3778
 #, no-wrap
 msgid "APPENDIX C: Exporting Dive log information from external dive log software."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3759
+#: ./user-manual.txt:3787
 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, "
@@ -7809,22 +7877,22 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3761
+#: ./user-manual.txt:3789
 msgid "Export the foreign dive log data to format that is accessible from"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3762
+#: ./user-manual.txt:3790
 msgid "_Subsurface_."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3763
+#: ./user-manual.txt:3791
 msgid "Import the accessible dive log data into _Subsurface_."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3767
+#: ./user-manual.txt:3795
 msgid ""
 "This appendix provides some information about approaches to export dive log "
 "data from foreign dive log software. The procedures below mostly apply to "
@@ -7832,19 +7900,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:3769
+#: ./user-manual.txt:3797
 #, no-wrap
 msgid "Exporting from *Suunto Divemanager (DM3, DM4 or DM5)*"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: ./user-manual.txt:3770
+#: ./user-manual.txt:3798
 #, no-wrap
 msgid "images/icons/suuntologo.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3777
+#: ./user-manual.txt:3805
 msgid ""
 "DiveManager is a MS Windows application for Suunto dive computers.  "
 "Divemanager 3 (DM3) is an older version of the Suunto software. More recent "
@@ -7854,64 +7922,64 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3779
+#: ./user-manual.txt:3807
 #, no-wrap
 msgid "*Divemanager 3 (DM3):*\n"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3781
+#: ./user-manual.txt:3809
 msgid "Start 'Suunto Divemanager 3' and log in with the name containing the logs"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3782
+#: ./user-manual.txt:3810
 msgid "Do not start the import wizard to import dives from the dive computer."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3784
+#: ./user-manual.txt:3812
 msgid ""
 "In the navigation tree on the left side of the program-window, select the "
 "appropriate dives."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3785
+#: ./user-manual.txt:3813
 msgid "Within the list of dives, select the dives you would like to import later:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3786
+#: ./user-manual.txt:3814
 msgid "To select certain dives: hold 'ctrl' and click the dive"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3788
+#: ./user-manual.txt:3816
 msgid ""
 "To select all dives: Select the first dive, hold down shift and select the "
 "last dive"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3789
+#: ./user-manual.txt:3817
 msgid "With the dives marked, use the program menu _File -> Export_"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3790
+#: ./user-manual.txt:3818
 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:3791
+#: ./user-manual.txt:3819
 msgid "Click the browse button next to the field Export Path"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3793
+#: ./user-manual.txt:3821
 #, no-wrap
 msgid ""
 "** A file-manager like window pops up\n"
@@ -7919,13 +7987,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3794
+#: ./user-manual.txt:3822
 #, no-wrap
 msgid "Divelog.SDE file\n"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3796
+#: ./user-manual.txt:3824
 #, no-wrap
 msgid ""
 "** Optionally change the name of the file for saving\n"
@@ -7933,25 +8001,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3797
+#: ./user-manual.txt:3825
 #, no-wrap
 msgid "Back in the Export pop-up, press the button 'Export'\n"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3798
+#: ./user-manual.txt:3826
 #, no-wrap
 msgid "The dives are now exported to the file Divelog.SDE.\n"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3800
+#: ./user-manual.txt:3828
 #, no-wrap
 msgid "*Divemanager 4 (DM4) and Divemanager 5 (DM5):*\n"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3805
+#: ./user-manual.txt:3833
 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 "
@@ -7960,81 +8028,81 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3807
+#: ./user-manual.txt:3835
 msgid "Locating the Suunto DM4 (or DM5) database:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3809 ./user-manual.txt:3818
+#: ./user-manual.txt:3837 ./user-manual.txt:3846
 msgid "Start Suunto DM4/DM5"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3810
+#: ./user-manual.txt:3838
 msgid "Select 'Help -> About'"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3811
+#: ./user-manual.txt:3839
 msgid "Click 'Copy' after text 'Copy log folder path to clipboard'"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3812
+#: ./user-manual.txt:3840
 msgid "Now open Windows Explorer"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3813
+#: ./user-manual.txt:3841
 msgid "Paste the address to the path box at the top of the File Explorer"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3814
+#: ./user-manual.txt:3842
 msgid "The database is called DM4.db or DM5.db"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3816
+#: ./user-manual.txt:3844
 msgid "Making a backup copy of the Suunto DM4/DM5 database:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3819
+#: ./user-manual.txt:3847
 msgid "Select 'File - Create backup'"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3821
+#: ./user-manual.txt:3849
 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:3822
+#: ./user-manual.txt:3850
 msgid "Click 'Save'"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3823
+#: ./user-manual.txt:3851
 msgid "The dives are now exported to the file DM4.bak (or DM5.bak)"
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:3825
+#: ./user-manual.txt:3853
 #, no-wrap
 msgid "Exporting from Atomic Logbook"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: ./user-manual.txt:3828
+#: ./user-manual.txt:3856
 #, no-wrap
 msgid "images/icons/atomiclogo.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3835
+#: ./user-manual.txt:3863
 msgid ""
 "Atomic Logbook is a Windows software by Atomic Aquatics. It allows "
 "downloading of dive information from Cobalt and Cobalt 2 dive computers.  "
@@ -8044,19 +8112,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:3837
+#: ./user-manual.txt:3865
 #, no-wrap
 msgid "Exporting from Mares Dive Organiser V2.1"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: ./user-manual.txt:3840
+#: ./user-manual.txt:3868
 #, no-wrap
 msgid "images/icons/mareslogo.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3848
+#: ./user-manual.txt:3876
 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 "
@@ -8067,7 +8135,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3853
+#: ./user-manual.txt:3881
 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 "
@@ -8075,36 +8143,36 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3856
+#: ./user-manual.txt:3884
 msgid ""
 "Rename the file to DiveOrganiserxxxxx.zip. Inside the zipped directory is a "
 "file _DiveOrganiser.sdf_."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3857
+#: ./user-manual.txt:3885
 msgid "Extract the _.sdf_ file from the zipped folder to your Desktop."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3858
+#: ./user-manual.txt:3886
 msgid "The password for accessing the .zip file is _mares_."
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:3860
+#: ./user-manual.txt:3888
 #, no-wrap
 msgid "Exporting from *DivingLog 5.0 and 6.0*"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: ./user-manual.txt:3862
+#: ./user-manual.txt:3890
 #, no-wrap
 msgid "images/icons/divingloglogo.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3869
+#: ./user-manual.txt:3897
 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 "
@@ -8114,37 +8182,37 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3871
+#: ./user-manual.txt:3899
 msgid "To transfer all files from DivingLog to Subsurface, do the following:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3873
+#: ./user-manual.txt:3901
 msgid "In DivingLog open the 'File -> Export -> SQLite' menu"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3874
+#: ./user-manual.txt:3902
 msgid "Select 'Settings' button"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3875
+#: ./user-manual.txt:3903
 msgid "Set the 'RTF2Plaintext' to 'true'"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3876
+#: ./user-manual.txt:3904
 msgid "Close the Settings dialog"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3877
+#: ./user-manual.txt:3905
 msgid "Click 'Export' button and select the filename"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3881
+#: ./user-manual.txt:3909
 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 "
@@ -8152,13 +8220,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ==
-#: ./user-manual.txt:3882
+#: ./user-manual.txt:3910
 #, no-wrap
 msgid "APPENDIX D: Exporting a spreadsheet to CSV format"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3892
+#: ./user-manual.txt:3920
 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 "
@@ -8171,7 +8239,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3898
+#: ./user-manual.txt:3926
 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 "
@@ -8182,40 +8250,40 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3900
+#: ./user-manual.txt:3928
 msgid "Date: use one of the following formats: yyyy-mm-dd, dd.mm.yyyy, mm/dd/yyyy"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3901
+#: ./user-manual.txt:3929
 msgid "Duration: the format should be minutes:seconds."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3902
+#: ./user-manual.txt:3930
 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:3903
+#: ./user-manual.txt:3931
 msgid "Tags and buddies: values should be separated using a comma."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3904
+#: ./user-manual.txt:3932
 msgid "GPS position: users must use decimal degrees, e.g. 30.22496 30.821798"
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:3905
+#: ./user-manual.txt:3933
 #, no-wrap
 msgid "_LibreOffice Calc_ and _OpenOffice Calc_"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3909
+#: ./user-manual.txt:3937
 msgid ""
 "These are open source spreadsheet applications forming parts of larger open "
 "source office suite applications. The user interaction with _LibreOffice_ "
@@ -8226,13 +8294,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:3910
+#: ./user-manual.txt:3938
 #, no-wrap
 msgid "images/LOffice_spreadsheetdata.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3913
+#: ./user-manual.txt:3941
 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 "
@@ -8240,13 +8308,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:3914
+#: ./user-manual.txt:3942
 #, no-wrap
 msgid "images/LOffice_save_as_options.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3917
+#: ./user-manual.txt:3945
 msgid ""
 "After selecting _Save_, select the appropriate field delimiter (choose _Tab_ "
 "to prevent conflicts with the comma when using this as a decimal point), "
@@ -8254,13 +8322,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:3918
+#: ./user-manual.txt:3946
 #, no-wrap
 msgid "images/LOffice_field_options.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3921
+#: ./user-manual.txt:3949
 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 "
@@ -8268,13 +8336,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:3922
+#: ./user-manual.txt:3950
 #, no-wrap
 msgid "Microsoft _Excel_"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3928
+#: ./user-manual.txt:3956
 msgid ""
 "The field delimiter (called \"_list separator_\" in Microsoft manuals) is "
 "not accessible from within _Excel_ and needs to be set through the "
@@ -8285,19 +8353,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3930
+#: ./user-manual.txt:3958
 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:3931
+#: ./user-manual.txt:3959
 msgid "Open the _Regional and Language Options_ dialog box."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3934
+#: ./user-manual.txt:3962
 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 "
@@ -8305,48 +8373,48 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3935
+#: ./user-manual.txt:3963
 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:3936
+#: ./user-manual.txt:3964
 msgid "Click _OK_ twice."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3938
+#: ./user-manual.txt:3966
 msgid "Below is an image of the _Control Panel_:"
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:3939
+#: ./user-manual.txt:3967
 #, no-wrap
 msgid "images/Win_SaveCSV2.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3942
+#: ./user-manual.txt:3970
 msgid "To export the dive log in CSV format:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3944
+#: ./user-manual.txt:3972
 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:3945
+#: ./user-manual.txt:3973
 #, no-wrap
 msgid "images/Win_SaveCSV1.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3948
+#: ./user-manual.txt:3976
 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 "
@@ -8356,13 +8424,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:3949
+#: ./user-manual.txt:3977
 #, no-wrap
 msgid "images/Win_SaveCSV3.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3952
+#: ./user-manual.txt:3980
 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 "
@@ -8371,13 +8439,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ==
-#: ./user-manual.txt:3954
+#: ./user-manual.txt:3982
 #, no-wrap
 msgid "APPENDIX E: Writing a custom print template"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3959
+#: ./user-manual.txt:3987
 msgid ""
 "_Subsurface_ provides a mechanism to create or modify templates for printing "
 "dive logs in order to produce customised printouts of dive logs. Templates, "
@@ -8386,12 +8454,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3961
+#: ./user-manual.txt:3989
 msgid "Templates are accessed using the print dialogue (see image *B* below)."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3969
+#: ./user-manual.txt:3997
 msgid ""
 "The buttons under the _Template_ dropdown box allows one to _Edit_, "
 "_Delete_, _Import_ and to _Export_ templates (see image *A* above). New or "
@@ -8402,18 +8470,18 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3971
+#: ./user-manual.txt:3999
 msgid "The Edit Panel comprises three tabs:"
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:3972
+#: ./user-manual.txt:4000
 #, no-wrap
 msgid "images/Template1_f22.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3976
+#: ./user-manual.txt:4004
 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 "
@@ -8421,7 +8489,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3980
+#: ./user-manual.txt:4008
 msgid ""
 "The _Colors_ tab (image *B* above) allows editing the colours used for "
 "printing the dive log. The colours are highly customisable: the _Edit_ "
@@ -8430,7 +8498,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3989
+#: ./user-manual.txt:4017
 msgid ""
 "The _Template_ tab of the Edit Panel (see image below) allows creating a "
 "template using HTML as well as a few Grantlee programming "
@@ -8446,13 +8514,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:3990
+#: ./user-manual.txt:4018
 #, no-wrap
 msgid "images/Template2_f22.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3993
+#: ./user-manual.txt:4021
 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 "
@@ -8460,33 +8528,33 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3995
+#: ./user-manual.txt:4023
 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:3996
+#: ./user-manual.txt:4024
 #, no-wrap
 msgid "Main dive loop"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3998
+#: ./user-manual.txt:4026
 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:3999 ./user-manual.txt:4053 ./user-manual.txt:4070
+#: ./user-manual.txt:4027 ./user-manual.txt:4081 ./user-manual.txt:4098
 #, no-wrap
 msgid "template.html"
 msgstr ""
 
 #. type: delimited block .
-#: ./user-manual.txt:4004
+#: ./user-manual.txt:4032
 #, no-wrap
 msgid ""
 "\t{% for dive in dives %}\n"
@@ -8495,13 +8563,13 @@ msgid ""
 msgstr ""
 
 #. type: Block title
-#: ./user-manual.txt:4006 ./user-manual.txt:4058 ./user-manual.txt:4077
+#: ./user-manual.txt:4034 ./user-manual.txt:4086 ./user-manual.txt:4105
 #, no-wrap
 msgid "output.html"
 msgstr ""
 
 #. type: delimited block .
-#: ./user-manual.txt:4011
+#: ./user-manual.txt:4039
 #, no-wrap
 msgid ""
 "\t<h1> 1 </h1>\n"
@@ -8510,25 +8578,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4014
+#: ./user-manual.txt:4042
 msgid ""
 "Additional information about _Grantlee_ can be found "
 "http://www.grantlee.org/apidox/for_themers.html[here]"
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:4015
+#: ./user-manual.txt:4043
 #, no-wrap
 msgid "Grantlee exported variables"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4017
+#: ./user-manual.txt:4045
 msgid "Only a subset of the dive data is exported:"
 msgstr ""
 
 #. type: delimited block |
-#: ./user-manual.txt:4035
+#: ./user-manual.txt:4063
 #, no-wrap
 msgid ""
 "|*Name*|*Description*\n"
@@ -8551,7 +8619,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4039
+#: ./user-manual.txt:4067
 msgid ""
 "_Subsurface_ also exports *template_options* data. This data must be used as "
 "_CSS_ values to provide a dynamically editable template. The exported data "
@@ -8559,7 +8627,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block |
-#: ./user-manual.txt:4051
+#: ./user-manual.txt:4079
 #, no-wrap
 msgid ""
 "|*Name*|*Description*\n"
@@ -8578,26 +8646,26 @@ msgid ""
 msgstr ""
 
 #. type: delimited block .
-#: ./user-manual.txt:4056
+#: ./user-manual.txt:4084
 #, no-wrap
 msgid "\tborder-width: {{ template_options.borderwidth }}px;\n"
 msgstr ""
 
 #. type: delimited block .
-#: ./user-manual.txt:4061
+#: ./user-manual.txt:4089
 #, no-wrap
 msgid "\tborder-width: 3px;\n"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4064
+#: ./user-manual.txt:4092
 msgid ""
 "Another variable that _Subsurface_ exports is *print_options*. This variable "
 "contains a single member:"
 msgstr ""
 
 #. type: delimited block |
-#: ./user-manual.txt:4067
+#: ./user-manual.txt:4095
 #, no-wrap
 msgid ""
 "|*Name*|*Description*\n"
@@ -8606,7 +8674,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block .
-#: ./user-manual.txt:4075
+#: ./user-manual.txt:4103
 #, no-wrap
 msgid ""
 "\tbody {\n"
@@ -8615,7 +8683,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block .
-#: ./user-manual.txt:4082
+#: ./user-manual.txt:4110
 #, no-wrap
 msgid ""
 "\tbody {\n"
@@ -8624,13 +8692,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:4084
+#: ./user-manual.txt:4112
 #, no-wrap
 msgid "Defined CSS selectors"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4088
+#: ./user-manual.txt:4116
 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 "
@@ -8638,7 +8706,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block |
-#: ./user-manual.txt:4095
+#: ./user-manual.txt:4123
 #, no-wrap
 msgid ""
 "|*Selector*|*Type*|*Description*\n"
@@ -8651,20 +8719,20 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4098
+#: ./user-manual.txt:4126
 msgid ""
 "Rendering dive profiles is not supported for flow layout templates (when "
 "data-numberofdives = 0)."
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:4099
+#: ./user-manual.txt:4127
 #, no-wrap
 msgid "Special attributes"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4103
+#: ./user-manual.txt:4131
 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 "
@@ -8672,55 +8740,55 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4105
+#: ./user-manual.txt:4133
 msgid ""
 "The *data-numberofdives* data attribute is added to the body tag to set the "
 "rendering mode"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4107
+#: ./user-manual.txt:4135
 msgid "render 6 dives per page:"
 msgstr ""
 
 #. type: delimited block .
-#: ./user-manual.txt:4110
+#: ./user-manual.txt:4138
 #, no-wrap
 msgid "\t<body data-numberofdives = 6>\n"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4113
+#: ./user-manual.txt:4141
 msgid "render as much dives as possible:"
 msgstr ""
 
 #. type: delimited block .
-#: ./user-manual.txt:4116
+#: ./user-manual.txt:4144
 #, no-wrap
 msgid "\t<body data-numberofdives = 0>\n"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4119
+#: ./user-manual.txt:4147
 msgid ""
 "All CSS units should be in relative lengths only, to support printing on any "
 "page size."
 msgstr ""
 
 #. type: Title ==
-#: ./user-manual.txt:4120
+#: ./user-manual.txt:4148
 #, no-wrap
 msgid "APPENDIX F: FAQs."
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:4122
+#: ./user-manual.txt:4150
 #, no-wrap
 msgid "Subsurface appears to miscalculate gas consumption and SAC"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4126
+#: ./user-manual.txt:4154
 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_ "
@@ -8728,7 +8796,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4132
+#: ./user-manual.txt:4160
 msgid ""
 "'Answer': Not really. What happens is that _Subsurface_ actually calculates "
 "gas consumption differently - and better - than you expect.  In particular, "
@@ -8738,7 +8806,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4138
+#: ./user-manual.txt:4166
 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 "
@@ -8748,12 +8816,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4140
+#: ./user-manual.txt:4168
 msgid "+consumption = (amount_of_air_at_beginning - amount_of_air_at_end)+"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4146
+#: ./user-manual.txt:4174
 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 "
@@ -8764,12 +8832,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4148
+#: ./user-manual.txt:4176
 msgid "+12.2*((220-100)/1.013)+"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4153
+#: ./user-manual.txt:4181
 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 "
@@ -8779,7 +8847,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4159
+#: ./user-manual.txt:4187
 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 "
@@ -8790,7 +8858,7 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:4160
+#: ./user-manual.txt:4188
 #, no-wrap
 msgid ""
 "Some dive profiles have time discrepancies with the recorded samples from my "
@@ -8798,7 +8866,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4164
+#: ./user-manual.txt:4192
 msgid ""
 "_Subsurface_ ends up ignoring surface time for many things (average depth, "
 "divetime, SAC, etc).  'Question': Why do dive durations in my dive computer "
@@ -8806,7 +8874,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4172
+#: ./user-manual.txt:4200
 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 "
@@ -8820,13 +8888,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:4173
+#: ./user-manual.txt:4201
 #, no-wrap
 msgid "Some dive profiles are missing from the download"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4179
+#: ./user-manual.txt:4207
 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 "
@@ -8834,7 +8902,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4188
+#: ./user-manual.txt:4216
 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 "
@@ -8847,7 +8915,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4192
+#: ./user-manual.txt:4220
 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 d0972f0..5d81c9c 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-09 14:50+0200\n"
-"PO-Revision-Date: 2015-09-09 14:51+0200\n"
+"POT-Creation-Date: 2015-09-15 10:07+0200\n"
+"PO-Revision-Date: 2015-09-15 10:10+0200\n"
 "Last-Translator: Guillaume GARDET <guillaume.gardet at opensuse.org>\n"
 "Language-Team: French <opensuse-fr at opensuse.org>\n"
 "Language: fr\n"
@@ -715,7 +715,7 @@ msgid ""
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:289 user-manual.txt:2838
+#: user-manual.txt:289 user-manual.txt:2858
 #, no-wrap
 msgid "images/icons/warning2.png"
 msgstr "images/icons/warning2.png"
@@ -4891,86 +4891,117 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2486
+#: user-manual.txt:2488
 msgid ""
 "_Subsurface_ includes access to a transparently integrated cloud storage "
-"backend that is available to all Subsurface users. In order to use the "
-"_Subsurface cloud storage_ the users need to follow these steps"
+"backend that is available to all Subsurface users. Storing and retrieving a "
+"dive log from the cloud is no more difficult than accessing the dives on the "
+"local hard disk.  The only requirement is that one should first register as "
+"a user on the cloud.  To use _Subsurface cloud storage_ , follow these steps:"
 msgstr ""
 
-#. type: Plain text
-#: user-manual.txt:2488
-msgid "Create a cloud storage account:"
+#. type: Title ===
+#: user-manual.txt:2489
+#, no-wrap
+msgid "Create a cloud storage account"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2502
+#: user-manual.txt:2506
 #, no-wrap
 msgid ""
-"** Open the _Preferences_\n"
-"** Under _Defaults_, in the _Subsurface cloud storage_ section, enter\n"
-"their email address and a password\n"
-"** Click _Apply_ or _Done_ to send email address and password to the\n"
-"server\n"
-"** The server will respond with an email to the given address that\n"
-"contains a verification PIN\n"
-"** Enter the PIN in the corresponding field in the _Preferences_ dialog\n"
-"(this field is only visible while the backend server is waiting for email\n"
+"** Open the *Network Preferences* by selecting _File_ -> _Preferences_ -> _Network_.\n"
+"** In the section headed _Subsurface cloud storage_, enter an email address that\n"
+"   _Su bsurface can use for user registration.\n"
+"** Enter a novel password that_Subsurface_ will use to store the\n"
+"  dive log in the cloud.\n"
+"** Click _Apply_ to send the above email address and password to the\n"
+"  (remote) cloud server. The server responds by sending a verification PIN to\n"
+"  the above email address (This is the *only* occasion that _Subsurface_ uses the\n"
+"  email address provided above). The *Network Preferences* dialog now has a new PIN text\n"
+"   box, not visible previously.\n"
+"** Enter the PIN in the corresponding text box in the *Network Preferences* dialog\n"
+"(this field is only visible while the server is waiting for email\n"
 "address confirmation)\n"
-"** Click _Apply_ or _Done_ again, the _Subsurface cloud storage_ account\n"
-"will be marked as verified and the _Subsurface cloud storage_ service can\n"
-"be used\n"
+"** Click _Apply_ again. The _Subsurface cloud storage_ account\n"
+"will be marked as verified and the _Subsurface cloud storage_ service is initialised for use.\n"
 msgstr ""
 
-#. type: Plain text
-#: user-manual.txt:2504
-msgid "Use _Subsurface cloud storage_"
+#. type: Title ===
+#: user-manual.txt:2507
+#, no-wrap
+msgid "Using _Subsurface cloud storage_"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2510
+#: user-manual.txt:2517
 #, no-wrap
 msgid ""
-"** From the _File_ menu users can load and save data to the _Subsurface\n"
-"cloud storage_ server\n"
-"** In the _Preferences_, users can select to use the _Subsurface cloud\n"
-"storage_ data as their default data file which means that the data from\n"
-"the _Subsurface cloud storage_ will be displayed when _Subsurface_ starts.\n"
+"** Once the cloud storage has been initialised, two new items appear in the\n"
+"   _File_ menu of the main menu system: _Open cloud storage_ and _Save to cloud storage_.\n"
+"These options allow the user to load and save data to the _Subsurface\n"
+"cloud storage_ server.\n"
+"** In the _Defaults Preferences_ tab, one can select to use the _Subsurface cloud\n"
+"storage_ data as one's default data file by checking the check box marked _Cloud storage default file_.\n"
+" This means that the data from\n"
+"the _Subsurface cloud storage_ is loaded when _Subsurface_ starts ans saved there when one closes _Subsurface_.\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2515
+#: user-manual.txt:2522
+#, no-wrap
 msgid ""
-"_Subsurface_ keeps a local copy of the data and _Subsurface_ stays fully "
-"functional if used while offline. _Subsurface_ will simply synchronize the "
-"data with the backend serer the next time it is used while the computer is "
-"online."
+"** _Subsurface_ keeps a local copy of the data and the cloud facility remains fully\n"
+"functional even if used while disconnected to the Internet. _Subsurface_ simply synchronises the\n"
+"data with the cloud server the next time ithe program is used while the computer is\n"
+"connected to the Internet.\n"
+msgstr ""
+
+#. type: Title ===
+#: user-manual.txt:2523
+#, no-wrap
+msgid "Web access to _Subsurface cloud storage_"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2519
+#: user-manual.txt:2533
 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 "
-"Internet."
+"One of the nice side benefits of using _Subsurface cloud storage_ is that "
+"one can also access one's dive data from any web browser. Simply open "
+"https://cloud.subsurface-divelog.org[_https://cloud.subsurface-divelog."
+"org_], log in with the same email and password, and you can see an HTML "
+"export of the last dive data that was synced to the _Subsurface cloud "
+"storage_. The dive information that is shown is only the contents of the "
+"recorded dive logs, NOT the calculated values shown in the *Profile* panel, "
+"including some cylinder pressures, deco ceilings and O~2~/He/N~2~ partial "
+"pressures."
+msgstr ""
+
+#. type: Title ===
+#: user-manual.txt:2534
+#, no-wrap
+msgid "Other cloud services"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2524
+#: user-manual.txt:2544
 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 "
-"one's desktop computer."
+"If one prefers not to use the integrated cloud storage of dive logs (and "
+"don't need the web access), it is also simple to store dive logs in the "
+"cloud using several of the existing facilities on the Internet.  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 one's "
+"desktop computer."
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2525
+#: user-manual.txt:2545
 #, no-wrap
 msgid "images/Cloud.jpg"
 msgstr "images/Cloud.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2534
+#: user-manual.txt:2554
 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, "
@@ -4983,7 +5014,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2541
+#: user-manual.txt:2561
 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. "
@@ -4993,31 +5024,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2547
+#: user-manual.txt:2567
 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 "
+"To Store a dive log on _Dropbox_, select _File -> Save as_ from the "
 "_Subsurface_ main menu, navigate to the _Dropbox_ folder and select the "
-"_Save_ button. To access the dive log in the Cloud, select _File -> Open "
+"_Save_ button. To access the dive log in _Dropbox_, select _File -> Open "
 "Logbook_ from the _Subsurface_ main menu and navigate to the dive log file "
 "in the _Dropbox_ folder and select the _Open_ button."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2550
+#: user-manual.txt:2570
 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:2553
+#: user-manual.txt:2573
 #, no-wrap
 msgid "Printing a dive log"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2557
+#: user-manual.txt:2577
 #, no-wrap
 msgid ""
 "_Subsurface_ provides a simple and flexible interface to print a whole dive log or only a few selected dives.\n"
@@ -5025,12 +5056,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2559
+#: user-manual.txt:2579
 msgid "Before printing, two decisions are required:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2562
+#: user-manual.txt:2582
 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* "
@@ -5038,7 +5069,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2564
+#: user-manual.txt:2584
 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 "
@@ -5046,7 +5077,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2567
+#: user-manual.txt:2587
 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 "
@@ -5054,35 +5085,35 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2568 user-manual.txt:3962
+#: user-manual.txt:2588 user-manual.txt:3990
 #, no-wrap
 msgid "images/Print1_f22.jpg"
 msgstr "images/Print1_f22.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2571
+#: user-manual.txt:2591
 msgid "Under _Print type_ select one of two options:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2573
+#: user-manual.txt:2593
 msgid ""
 "_Dive list print_: Print dives from the *Dive List* panel with profiles and "
 "other information."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2574
+#: user-manual.txt:2594
 msgid "_Statistics print_: Print yearly statistics of the dives."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2576
+#: user-manual.txt:2596
 msgid "Under _Print options_ select:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2581
+#: user-manual.txt:2601
 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 "
@@ -5090,85 +5121,85 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2583
+#: user-manual.txt:2603
 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:2586
+#: user-manual.txt:2606
 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:2588
+#: user-manual.txt:2608
 msgid "_Table_: This prints a summary table of all dives selected (see below)."
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2589
+#: user-manual.txt:2609
 #, no-wrap
 msgid "images/Print_summarylist_f22.jpg"
 msgstr "images/Print_summarylist_f22.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2592
+#: user-manual.txt:2612
 msgid ""
 "_Flow layout_: Print the text associated with each diev without printing the "
 "dive profiles"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2593
+#: user-manual.txt:2613
 msgid "of each dive (see below):"
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2594
+#: user-manual.txt:2614
 #, no-wrap
 msgid "images/Print_flow_layout_f22.jpg"
 msgstr "images/Print_flow_layout_f22.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2597
+#: user-manual.txt:2617
 msgid ""
 "_One Dive_: Print one dive per page, also showing the dive profile (see "
 "below)"
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2598
+#: user-manual.txt:2618
 #, no-wrap
 msgid "images/print2_f22.jpg"
 msgstr "images/print2_f22.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2602
+#: user-manual.txt:2622
 msgid "_Two Dives_: Print two dives per page, also showing the dive profiles."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2603
+#: user-manual.txt:2623
 msgid "_Six Dives_: Print six dives per page, also showing the dive profiles."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2604
+#: user-manual.txt:2624
 msgid ""
 "_Custom_: This option allows customisation of the print contents and layout. "
 "This is"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2605
+#: user-manual.txt:2625
 msgid "discussed at the end of this section."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2609
+#: user-manual.txt:2629
 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, "
@@ -5177,7 +5208,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2613
+#: user-manual.txt:2633
 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 "
@@ -5186,13 +5217,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2614
+#: user-manual.txt:2634
 #, no-wrap
 msgid "images/Print_print_f22.jpg"
 msgstr "images/Print_print_f22.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2619
+#: user-manual.txt:2639
 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 "
@@ -5201,19 +5232,19 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2620
+#: user-manual.txt:2640
 #, no-wrap
 msgid "images/Printpreview.jpg"
 msgstr "images/Printpreview.jpg"
 
 #. type: Title ===
-#: user-manual.txt:2622
+#: user-manual.txt:2642
 #, no-wrap
 msgid "Write a custom printing template (advanced)"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2626
+#: user-manual.txt:2646
 msgid ""
 "Writing a custom template is an effective way to produce highly customized "
 "printouts. Subsurface uses HTML templates to render printing. One can create "
@@ -5224,13 +5255,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ==
-#: user-manual.txt:2628
+#: user-manual.txt:2648
 #, no-wrap
 msgid "Configuring a dive computer"
 msgstr "Configurer un ordinateur de plongée"
 
 #. type: Plain text
-#: user-manual.txt:2636
+#: user-manual.txt:2656
 msgid ""
 "_Subsurface_ enables one to configure a dive computer. Currently the "
 "Heinrichs-Weikamp (OSTC 2, OSTC 3) and Suunto Vyper (Stinger, Mosquito, D3, "
@@ -5253,7 +5284,7 @@ msgstr ""
 "APPENDIX A>> pour plus d'informations sur la manière de procéder."
 
 #. type: Plain text
-#: user-manual.txt:2641
+#: user-manual.txt:2661
 msgid ""
 "Once the dive computer is connected to the _Subsurface_ computer, select "
 "_File -> Configure dive computer_ from the _Main Menu_. Provide the "
@@ -5268,13 +5299,13 @@ msgstr ""
 "de plongée à partir du panneau à gauche (voir l'image ci-dessous)."
 
 #. type: Target for macro image
-#: user-manual.txt:2642
+#: user-manual.txt:2662
 #, no-wrap
 msgid "images/Configure_dc_f20.jpg"
 msgstr "images/Configure_dc_f20.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2645
+#: user-manual.txt:2665
 msgid ""
 "Using the appropriate buttons on the configuration panel, the following "
 "actions can be performed:"
@@ -5283,7 +5314,7 @@ msgstr ""
 "suivantes peuvent être réalisées :"
 
 #. type: Plain text
-#: user-manual.txt:2648
+#: user-manual.txt:2668
 #, no-wrap
 msgid ""
 "*Retrieve available details*. This loads the existing configuration from the dive computer\n"
@@ -5293,7 +5324,7 @@ msgstr ""
 "dans _Subsurface_, en l'affichant dans le panneau de configuration.\n"
 
 #. type: Plain text
-#: user-manual.txt:2650
+#: user-manual.txt:2670
 #, no-wrap
 msgid ""
 "*Save changes to device*. This changes the configuration of the\n"
@@ -5303,7 +5334,7 @@ msgstr ""
 "de plongée pour correspondre aux informations affichées dans le panneau de configuration.\n"
 
 #. type: Plain text
-#: user-manual.txt:2652
+#: user-manual.txt:2672
 #, no-wrap
 msgid ""
 "*Backup*. This saves the configuration data to a file. _Subsurface_ asks for\n"
@@ -5313,7 +5344,7 @@ msgstr ""
 "l'emplacement et le nom du fichier pour enregistrer les informations.\n"
 
 #. type: Plain text
-#: user-manual.txt:2654
+#: user-manual.txt:2674
 #, no-wrap
 msgid ""
 "*Restore backup*. This loads the information from a backup file and displays it\n"
@@ -5323,7 +5354,7 @@ msgstr ""
 "dans le panneau de configuration.\n"
 
 #. type: Plain text
-#: user-manual.txt:2656
+#: user-manual.txt:2676
 #, no-wrap
 msgid ""
 "*Update firmware*. If new firmware is available for the dive computer, this is\n"
@@ -5333,13 +5364,13 @@ msgstr ""
 "il sera chargé dans l'ordinateur de plongée.\n"
 
 #. type: Title ==
-#: user-manual.txt:2659
+#: user-manual.txt:2679
 #, no-wrap
 msgid "Setting user _Preferences_ for _Subsurface_"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2667
+#: user-manual.txt:2687
 msgid ""
 "There are several settings within _Subsurface_ that the user can specify. "
 "These are found when selecting _File -> Preferences_. The settings are "
@@ -5351,24 +5382,24 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:2668
+#: user-manual.txt:2688
 #, no-wrap
 msgid "Defaults"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2671
+#: user-manual.txt:2691
 msgid "There are several settings in the *Defaults* panel:"
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2672
+#: user-manual.txt:2692
 #, no-wrap
 msgid "images/Pref1_f20.jpg"
 msgstr "images/Pref1_f20.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2676
+#: user-manual.txt:2696
 #, no-wrap
 msgid ""
 "  ** *Lists and tables*: Here one can specify the font type and font size of the\n"
@@ -5376,7 +5407,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2681
+#: user-manual.txt:2701
 #, no-wrap
 msgid ""
 "  ** *Dives*: For the _Default Dive File_ one need to specify the directory and\n"
@@ -5386,7 +5417,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2686
+#: user-manual.txt:2706
 #, no-wrap
 msgid ""
 "  ** *Display invalid*:  Dives can be marked as invalid (when a user wishes to hide\n"
@@ -5396,7 +5427,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2689
+#: user-manual.txt:2709
 #, no-wrap
 msgid ""
 "  ** *Default cylinder*: Here users can specify the default cylinder listed in\n"
@@ -5404,7 +5435,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2697
+#: user-manual.txt:2717
 #, no-wrap
 msgid ""
 "  ** *Animations*: Some actions in showing the dive profile are performed using\n"
@@ -5417,7 +5448,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2702
+#: user-manual.txt:2722
 #, no-wrap
 msgid ""
 "  ** *Subsurface web service*: When one subscribes to the <<S_Companion,Subsurface web service>>, a very\n"
@@ -5427,7 +5458,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2705
+#: user-manual.txt:2725
 #, no-wrap
 msgid ""
 "  ** *Clear all settings*: As indicated in the button below this heading, all settings are\n"
@@ -5435,19 +5466,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:2706
+#: user-manual.txt:2726
 #, no-wrap
 msgid "Units"
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2707
+#: user-manual.txt:2727
 #, no-wrap
 msgid "images/Pref2_f20.jpg"
 msgstr "images/Pref2_f20.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2714
+#: user-manual.txt:2734
 msgid ""
 "Here user can choose between metric and imperial units of depth, pressure, "
 "volume, temperature and mass. By selecting the Metric or Imperial radio "
@@ -5458,24 +5489,24 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:2715
+#: user-manual.txt:2735
 #, no-wrap
 msgid "Graph"
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2717
+#: user-manual.txt:2737
 #, no-wrap
 msgid "images/Pref3_f20.jpg"
 msgstr "images/Pref3_f20.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2721
+#: user-manual.txt:2741
 msgid "This panel allows two type of selections:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2729
+#: user-manual.txt:2749
 #, no-wrap
 msgid ""
 "*Show*: Here users can specify the amount of information shown as part of\n"
@@ -5488,7 +5519,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2734
+#: user-manual.txt:2754
 #, no-wrap
 msgid ""
 "** _Draw dive computer reported ceiling red_: This checkbox allows exactly what it says.\n"
@@ -5498,13 +5529,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2736
+#: user-manual.txt:2756
 #, 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:2742
+#: user-manual.txt:2762
 #, no-wrap
 msgid ""
 "** _Show average depth_: Activating this checkbox causes _Subsurface_ to draw a grey line across\n"
@@ -5514,13 +5545,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2744
+#: user-manual.txt:2764
 #, no-wrap
 msgid "*Misc*:\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2756
+#: user-manual.txt:2776
 #, no-wrap
 msgid ""
 "** Gradient Factors:* Here users can set the _gradient factors_ used while diving. GF_Low is\n"
@@ -5537,19 +5568,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2758
+#: user-manual.txt:2778
 #, 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:2760
+#: user-manual.txt:2780
 #, 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:2764
+#: user-manual.txt:2784
 #, no-wrap
 msgid ""
 " ** _CCR: Show setpoints when viewing pO2:_ With this checkbox ativated, the pO~2~\n"
@@ -5558,7 +5589,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2768
+#: user-manual.txt:2788
 #, no-wrap
 msgid ""
 " ** _CCR: Show individual O~2~ sensor values when viewing pO~2~:_ Show the pO~2~\n"
@@ -5567,19 +5598,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2770
+#: user-manual.txt:2790
 #, no-wrap
 msgid "*Configuring dive planning using rebreather equipment:*\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2772
+#: user-manual.txt:2792
 #, no-wrap
 msgid "** _Default CCR setpoint for dive planning:_ Specify the O~2~ setpoint for a\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2776
+#: user-manual.txt:2796
 #, no-wrap
 msgid ""
 "CCR dive plan. This determines the pO~2~ that will be maintained\n"
@@ -5589,13 +5620,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2778
+#: user-manual.txt:2798
 #, 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:2780
+#: user-manual.txt:2800
 #, no-wrap
 msgid ""
 "volume of oxygen used by a diver each minute. Set this value for pSCR dive planning\n"
@@ -5603,13 +5634,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2782
+#: user-manual.txt:2802
 #, 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:2784
+#: user-manual.txt:2804
 #, no-wrap
 msgid ""
 "environment to that of the gas recirculated to the diver. Set this value for a\n"
@@ -5617,24 +5648,24 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:2786
+#: user-manual.txt:2806
 #, no-wrap
 msgid "Language"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2788
+#: user-manual.txt:2808
 msgid "Choose a language that _Subsurface_ will use."
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2789
+#: user-manual.txt:2809
 #, no-wrap
 msgid "images/Pref4_f20.jpg"
 msgstr "images/Pref4_f20.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2799
+#: user-manual.txt:2819
 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 "
@@ -5647,26 +5678,26 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:2800
+#: user-manual.txt:2820
 #, no-wrap
 msgid "Network"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2802
+#: user-manual.txt:2822
 msgid ""
 "This panel facilitates communication between _Subsurface_ and data sources "
 "on the Internet."
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2803
+#: user-manual.txt:2823
 #, no-wrap
 msgid "images/Pref5_f20.jpg"
 msgstr "images/Pref5_f20.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2816
+#: user-manual.txt:2836
 msgid ""
 "This is important, for instance, when _Subsurface_ needs to communicate with "
 "Internet services such as the <<S_Companion,_Subsurface Companion app_>> or "
@@ -5683,13 +5714,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:2817
+#: user-manual.txt:2837
 #, no-wrap
 msgid "Facebook Accesss"
 msgstr "Accès Facebook"
 
 #. type: Plain text
-#: user-manual.txt:2820
+#: user-manual.txt:2840
 msgid ""
 "This panel allows one to log into a Facebook account in order to transfer "
 "information from Subsurface to Facefook."
@@ -5698,13 +5729,13 @@ msgstr ""
 "transférer des informations de Subsurface vers Facebook."
 
 #. type: Target for macro image
-#: user-manual.txt:2821
+#: user-manual.txt:2841
 #, no-wrap
 msgid "images/Pref6_f20.jpg"
 msgstr "images/Pref6_f20.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2829
+#: user-manual.txt:2849
 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 "
@@ -5720,13 +5751,13 @@ msgstr ""
 "vers Facebook] pour plus d'informations."
 
 #. type: Title ==
-#: user-manual.txt:2831
+#: user-manual.txt:2851
 #, no-wrap
 msgid "The _Subsurface_ dive planner"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2836
+#: user-manual.txt:2856
 msgid ""
 "Dive planning is an advanced feature of _Subsurface_, accessible by "
 "selecting _Log -> Plan Dive_ from the main menu. It allows calculation of "
@@ -5735,7 +5766,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:2844
+#: user-manual.txt:2864
 msgid ""
 "The _Subsurface_ dive planner IS CURRENTLY EXPERIMENTAL and assumes the user "
 "is already familiar with the _Subsurface_ user interface. It is explicitly "
@@ -5743,19 +5774,19 @@ msgid ""
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:2847
+#: user-manual.txt:2867
 msgid ""
 "The user is conversant with dive planning and has the necessary training to "
 "perform dive planning."
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:2848
+#: user-manual.txt:2868
 msgid "The user plans dives within his/her certification limits."
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:2851
+#: user-manual.txt:2871
 msgid ""
 "Dive planning makes large assumptions about the characteristics of the "
 "_average person_ and cannot compensate for individual physiology or health "
@@ -5763,32 +5794,32 @@ msgid ""
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:2852
+#: user-manual.txt:2872
 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:2853
+#: user-manual.txt:2873
 msgid "The user is familiar with the user interface of _Subsurface_."
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:2855
+#: user-manual.txt:2875
 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:2857
+#: user-manual.txt:2877
 #, no-wrap
 msgid "The _Subsurface_ dive planner screen"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2862
+#: user-manual.txt:2882
 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 "
@@ -5798,7 +5829,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2866
+#: user-manual.txt:2886
 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 "
@@ -5807,7 +5838,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2870
+#: user-manual.txt:2890
 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 "
@@ -5816,26 +5847,26 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2871
+#: user-manual.txt:2891
 #, no-wrap
 msgid "images/PlannerWindow1_f20.jpg"
 msgstr "images/PlannerWindow1_f20.jpg"
 
 #. type: Title ===
-#: user-manual.txt:2874
+#: user-manual.txt:2894
 #, no-wrap
 msgid "Open circuit dives"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2877
+#: user-manual.txt:2897
 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:2880
+#: user-manual.txt:2900
 #, no-wrap
 msgid ""
 "** Open Circuit (the default)\n"
@@ -5844,12 +5875,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2882
+#: user-manual.txt:2902
 msgid "Choose the Open Circuit option."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2886
+#: user-manual.txt:2906
 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 "
@@ -5859,7 +5890,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2895
+#: user-manual.txt:2915
 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 "
@@ -5873,12 +5904,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2897
+#: user-manual.txt:2917
 msgid "The profile of the planned dive can be created in two ways:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2902
+#: user-manual.txt:2922
 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-"
@@ -5888,7 +5919,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2910
+#: user-manual.txt:2930
 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 "
@@ -5902,13 +5933,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:2911
+#: user-manual.txt:2931
 #, no-wrap
 msgid "Recreational dives"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2926
+#: user-manual.txt:2946
 msgid ""
 "The _Subsurface_ dive planner allows a sophisticated way of planning "
 "recreational dives, i.e. dives that remain within no-decompression limits.  "
@@ -5929,26 +5960,26 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2929
+#: user-manual.txt:2949
 msgid "To plan a dive, the appropriate settings need to be defined."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2932
+#: user-manual.txt:2952
 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:2935
+#: user-manual.txt:2955
 msgid ""
 "Immediately under the heading _Planning_ are two checkboxes _Recreational_ "
 "and _Safety Stop_.  Check these two boxes."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2939
+#: user-manual.txt:2959
 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 "
@@ -5956,7 +5987,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2944
+#: user-manual.txt:2964
 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 "
@@ -5966,7 +5997,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2947
+#: user-manual.txt:2967
 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 "
@@ -5974,7 +6005,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2954
+#: user-manual.txt:2974
 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 "
@@ -5985,14 +6016,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2957
+#: user-manual.txt:2977
 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:2965
+#: user-manual.txt:2985
 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 "
@@ -6008,50 +6039,69 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2969
+#: user-manual.txt:2989
 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 "
 "limited by the amount of air in the cylinder, reflected by the information "
-"in the text box at the bottom right of the panel."
+"in the text box at the bottom right of the panel that requires sufficient "
+"air for buddy-sharing during the ascent."
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2970
+#: user-manual.txt:2990
 #, no-wrap
 msgid "images/rec_diveplan.jpg"
 msgstr "images/rec_diveplan.jpg"
 
 #. type: Title ====
-#: user-manual.txt:2972
+#: user-manual.txt:2992
 #, no-wrap
 msgid "Non-recreational open circuit dives, including decompression"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2976
+#: user-manual.txt:2996
 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:2986
+#: user-manual.txt:3007
 #, no-wrap
 msgid ""
 "*a) Nitrogen management*: This is performed by specifying the rates for descent and ascent,\n"
-"as well as the gradient factors (GFLow and GFHigh) under the headings _Rates_ and _Planning_\n"
-"to the bottom left of the planning screen. Initially, the GFHigh and GFLow values in the _Preferences_\n"
+"as well as the deco model (GFLow, GFHigh or Conservatism level) under the headings _Rates_ and _Planning_\n"
+"to the bottom left of the planning screen. Two deco models are supported the Buehlmann model and the VPM-B\n"
+"model. Select one of the two models. When selecting the Buehlmann model, the gradient factors (GF_high and GF_low\n"
+"need to be specified. Initially, the GFHigh and GFLow values in the _Preferences_\n"
 "panel of _Subsurface_ is used. If these are changed within the planner (see _Gas Options_ within\n"
 "the planner), the new values are\n"
 "used without changing the original values in the _Preferences_. Gradient Factor settings strongly affect the calculated ceilings and their depths.\n"
 "A very low GFLow value brings about decompression stops early on during the dive.\n"
 " ** For more information about Gradient factors, see the section on xref:S_GradientFactors[Gradient Factor Preference settings].\n"
-"For more information external to this manual see:\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2988
+#: user-manual.txt:3012
+msgid ""
+"If the VPM-B model is selected, the Conservatism_level needs to be specified "
+"on a scale of 0 (least conservative) to 4 (most conservative).  This model "
+"tends to give deco stops at deeper levels than the Beuhlmann model and often "
+"results in slightly shorter dive durations than the Buehlmann model. When "
+"selecting one of these models, keep in mind that they are NOT exact "
+"physiological models but only mathematical models that appear to work in "
+"practice."
+msgstr ""
+
+#. type: Plain text
+#: user-manual.txt:3014
+msgid "For more information external to this manual see:"
+msgstr ""
+
+#. type: Plain text
+#: user-manual.txt:3016
 msgid ""
 "link:http://www.tek-dive.com/portal/upload/M-Values.pdf[Understanding M-"
 "values by Erik Baker, _Immersed_ Vol. 3, No. 3.]"
@@ -6060,7 +6110,7 @@ msgstr ""
 "values by Erik Baker, _Immersed_ Vol. 3, No. 3.]"
 
 #. type: Plain text
-#: user-manual.txt:2989
+#: user-manual.txt:3017
 msgid ""
 "link:http://www.rebreatherworld.com/general-and-new-to-rebreather-"
 "articles/5037-gradient-factors-for-dummies.html[Gradient factors for "
@@ -6071,20 +6121,22 @@ msgstr ""
 "dummies, by Kevin Watts]"
 
 #. type: Plain text
-#: user-manual.txt:2991
+#: user-manual.txt:3019
 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: 1-905492-07-3.  An excellent non-technical review."
+"Sea, UK. ISBN 10: 1-905492-07-3.  An excellent non-technical review that "
+"discusses both the Buehlmann deco model and the VPM-B model."
 msgstr ""
 "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: 1-905492-07-3.  An excellent non-technical review."
+"Sea, UK. ISBN 10: 1-905492-07-3.  Un excellent livre non technique qui "
+"traite à la fois des modèles de décompression Buehlmann et VPM-B."
 
 #. type: Plain text
-#: user-manual.txt:2999
+#: user-manual.txt:3027
 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) "
@@ -6098,7 +6150,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3008
+#: user-manual.txt:3036
 #, no-wrap
 msgid ""
 "*b) Oxygen management*: In the *Gas Options* part of the dive specification, the maximum partial\n"
@@ -6112,7 +6164,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3022
+#: user-manual.txt:3050
 #, 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"
@@ -6131,7 +6183,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3034
+#: user-manual.txt:3062
 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 "
@@ -6149,7 +6201,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3046
+#: user-manual.txt:3074
 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_ "
@@ -6167,7 +6219,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3054
+#: user-manual.txt:3082
 msgid ""
 "Indicate any changes in gas cylinder used by indicating gas changes as "
 "explained in the section <<S_CreateProfile,hand-creating a dive profile>>. "
@@ -6179,7 +6231,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3063
+#: user-manual.txt:3091
 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 "
@@ -6192,20 +6244,20 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3066
+#: user-manual.txt:3094
 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:3067
+#: user-manual.txt:3095
 #, no-wrap
 msgid "images/DivePlanner2_f20.jpg"
 msgstr "images/DivePlanner2_f20.jpg"
 
 #. type: Plain text
-#: user-manual.txt:3072
+#: user-manual.txt:3100
 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 "
@@ -6213,13 +6265,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3074
+#: user-manual.txt:3102
 #, no-wrap
 msgid "*The dive plan details*\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3082
+#: user-manual.txt:3110
 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 "
@@ -6232,7 +6284,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3087
+#: user-manual.txt:3115
 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 "
@@ -6242,13 +6294,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:3088
+#: user-manual.txt:3116
 #, no-wrap
 msgid "Planning pSCR dives"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3103
+#: user-manual.txt:3131
 #, no-wrap
 msgid ""
 "To plan a dive using a passive semi-closed rebreather (pSCR), select _pSCR_ rather than\n"
@@ -6267,26 +6319,26 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:3104
+#: user-manual.txt:3132
 #, no-wrap
 msgid "images/Planner_pSCR1_f20.jpg"
 msgstr "images/Planner_pSCR1_f20.jpg"
 
 #. type: Title ===
-#: user-manual.txt:3107
+#: user-manual.txt:3135
 #, no-wrap
 msgid "Planning CCR dives"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3111
+#: user-manual.txt:3139
 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:3115
+#: user-manual.txt:3143
 #, no-wrap
 msgid ""
 "*Available gases*: In the _Available gases_ table, enter the cylinder information for the\n"
@@ -6295,7 +6347,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3123
+#: user-manual.txt:3151
 #, 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"
@@ -6308,32 +6360,32 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3125
+#: user-manual.txt:3153
 msgid ""
 "The dive profile for a CCR dive may look something like the image below."
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:3126
+#: user-manual.txt:3154
 #, no-wrap
 msgid "images/Planner_CCR1_f20.jpg"
 msgstr "images/Planner_CCR1_f20.jpg"
 
 #. type: Plain text
-#: user-manual.txt:3130
+#: user-manual.txt:3158
 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:3132
+#: user-manual.txt:3160
 #, no-wrap
 msgid "Modifying an existing dive plan"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3139
+#: user-manual.txt:3167
 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 "
@@ -6344,7 +6396,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3145
+#: user-manual.txt:3173
 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 "
@@ -6354,13 +6406,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:3146
+#: user-manual.txt:3174
 #, no-wrap
 msgid "Planning for repetitive dives"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3153
+#: user-manual.txt:3181
 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 "
@@ -6369,7 +6421,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3159
+#: user-manual.txt:3187
 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 "
@@ -6379,7 +6431,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3164
+#: user-manual.txt:3192
 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 "
@@ -6389,13 +6441,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:3165
+#: user-manual.txt:3193
 #, no-wrap
 msgid "Printing the dive plan"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3170
+#: user-manual.txt:3198
 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 "
@@ -6403,7 +6455,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3180
+#: user-manual.txt:3208
 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 "
@@ -6419,13 +6471,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ==
-#: user-manual.txt:3181
+#: user-manual.txt:3209
 #, 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:3186
+#: user-manual.txt:3214
 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 "
@@ -6436,13 +6488,13 @@ msgstr ""
 "des sections de ce manuel traitant des opérations relatives."
 
 #. type: Title ===
-#: user-manual.txt:3187
+#: user-manual.txt:3215
 #, no-wrap
 msgid "File"
 msgstr "Fichier"
 
 #. type: Plain text
-#: user-manual.txt:3190
+#: user-manual.txt:3218
 msgid ""
 "<<S_NewLogbook,_New Logbook_>> - Close the currently open dive logbook and "
 "clear all dive information."
@@ -6451,7 +6503,7 @@ msgstr ""
 "actuellement ouvert et supprime toutes les informations de plongées."
 
 #. type: Plain text
-#: user-manual.txt:3192
+#: user-manual.txt:3220
 msgid ""
 "_Open logbook_ - This opens the file manager in order to select a dive "
 "logbook to open."
@@ -6460,24 +6512,24 @@ msgstr ""
 "carnet de plongée à ouvrir."
 
 #. type: Plain text
-#: user-manual.txt:3193
+#: user-manual.txt:3221
 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:3194
+#: user-manual.txt:3222
 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:3195
+#: user-manual.txt:3223
 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:3197
+#: user-manual.txt:3225
 msgid ""
 "<<S_ExportLog,_Export_>> - Export the currently open dive logbook (or the "
 "selected dives in the logbook) to one of several formats."
@@ -6487,34 +6539,34 @@ msgstr ""
 "formats."
 
 #. type: Plain text
-#: user-manual.txt:3198
+#: user-manual.txt:3226
 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:3199
+#: user-manual.txt:3227
 msgid ""
 "<<S_FindMovedImages, _Find moved images_>> - If photos taken during dives "
 "have been moved to"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3200
+#: user-manual.txt:3228
 msgid ""
 "a different disk or directory, locate them and link them to the appropriate "
 "dives."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3201
+#: user-manual.txt:3229
 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:3202
+#: user-manual.txt:3230
 msgid ""
 "<<S_Configure,_Configure dive computer_>> - Edit the configuration of a dive "
 "computer."
@@ -6523,18 +6575,18 @@ msgstr ""
 "configuration d'un ordinateur de plongée."
 
 #. type: Plain text
-#: user-manual.txt:3203
+#: user-manual.txt:3231
 msgid "_Quit_ - Quit _Subsurface_."
 msgstr "_Quitter_ - Quitter _Subsurface_."
 
 #. type: Title ===
-#: user-manual.txt:3204
+#: user-manual.txt:3232
 #, no-wrap
 msgid "Import"
 msgstr "Importer"
 
 #. type: Plain text
-#: user-manual.txt:3207
+#: user-manual.txt:3235
 msgid ""
 "<<S_ImportDiveComputer,_Import from dive computer_>> - Import dive "
 "information from a dive computer."
@@ -6543,7 +6595,7 @@ msgstr ""
 "Importer des informations de plongées à partir de l'ordinateur de plongée."
 
 #. type: Plain text
-#: user-manual.txt:3209
+#: user-manual.txt:3237
 msgid ""
 "<<Unified_import,_Import Log Files_>> - Import dive information from a file "
 "in in a _Subsurface_-compatible format."
@@ -6553,7 +6605,7 @@ msgstr ""
 "_Subsurface_."
 
 #. type: Plain text
-#: user-manual.txt:3211
+#: user-manual.txt:3239
 msgid ""
 "<<S_Companion,_Import GPS data from Subsurface web service_>> - Load GPS "
 "coordinates from the _Subsurface_ mobile phone app."
@@ -6563,7 +6615,7 @@ msgstr ""
 "(téléphones et tablettes)."
 
 #. type: Plain text
-#: user-manual.txt:3213
+#: user-manual.txt:3241
 msgid ""
 "<<S_ImportingDivelogsDe,_Import from Divelogs.de_>> - Import dive "
 "information from _www.Divelogs.de_."
@@ -6572,13 +6624,13 @@ msgstr ""
 "informations de plongées à partir de _www.Divelogs.de_."
 
 #. type: Title ===
-#: user-manual.txt:3214
+#: user-manual.txt:3242
 #, no-wrap
 msgid "Log"
 msgstr "Journal (log)"
 
 #. type: Plain text
-#: user-manual.txt:3216
+#: user-manual.txt:3244
 msgid ""
 "<<S_EnterData,_Add Dive_>> - Manually add a new dive to the *Dive List* "
 "panel."
@@ -6587,14 +6639,14 @@ msgstr ""
 "plongée au panneau de la *liste des plongées*."
 
 #. type: Plain text
-#: user-manual.txt:3217
+#: user-manual.txt:3245
 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:3218
+#: user-manual.txt:3246
 msgid ""
 "<<S_DivePlanner,_Plan Dive_>> - This feature allows the planning of dives."
 msgstr ""
@@ -6602,7 +6654,7 @@ msgstr ""
 "planifier des plongées."
 
 #. type: Plain text
-#: user-manual.txt:3219
+#: user-manual.txt:3247
 msgid ""
 "<<S_Replan,_Edit dive in planner_>> - Edit a dive plan that has been saved "
 "into the *Dive List*."
@@ -6611,7 +6663,7 @@ msgstr ""
 "plongée planifiée qui a été enregistrée dans la *liste des plongées*."
 
 #. type: Plain text
-#: user-manual.txt:3221
+#: user-manual.txt:3249
 msgid ""
 "<<S_CopyComponents,_Copy dive components_>> - By selecting this option, one "
 "can copy information from several fields of a dive log onto the clipboard."
@@ -6621,7 +6673,7 @@ msgstr ""
 "champs d'un journal de plongée vers le presse-papier."
 
 #. type: Plain text
-#: user-manual.txt:3223
+#: user-manual.txt:3251
 msgid ""
 "_Paste dive components_ - Paste, into the selected dives in the *Dive List*, "
 "the information copied using the _Copy dive components_ option."
@@ -6631,7 +6683,7 @@ msgstr ""
 "préalable avec l'option _Copier les composants de la plongée_."
 
 #. type: Plain text
-#: user-manual.txt:3225
+#: user-manual.txt:3253
 msgid ""
 "<<S_Renumber,_Renumber_>> - Renumber the dives listed in the *Dive List* "
 "panel."
@@ -6640,7 +6692,7 @@ msgstr ""
 "le panneau de la *liste des plongées*."
 
 #. type: Plain text
-#: user-manual.txt:3227
+#: user-manual.txt:3255
 msgid ""
 "<<S_Group,_Auto Group_>> - Group the dives in the *Dive List* panel into "
 "dive trips."
@@ -6649,7 +6701,7 @@ msgstr ""
 "*liste des plongées* dans des voyages de plongées."
 
 #. type: Plain text
-#: user-manual.txt:3228
+#: user-manual.txt:3256
 msgid ""
 "<<S_DeviceNames,_Edit Device Names_>> - Edit the names of dive computers to "
 "facilitate your logs."
@@ -6658,7 +6710,7 @@ msgstr ""
 "les noms des ordinateurs de plongée pour faciliter vos journaux (logs)."
 
 #. type: Plain text
-#: user-manual.txt:3229
+#: user-manual.txt:3257
 msgid ""
 "<<S_Filter,_Filter divelist_>> - Select only some dives, based on specific "
 "tags or dive criteria."
@@ -6667,13 +6719,13 @@ msgstr ""
 "certaines plongées, à partir de tags ou de critères de plongées."
 
 #. type: Title ===
-#: user-manual.txt:3230
+#: user-manual.txt:3258
 #, no-wrap
 msgid "View"
 msgstr "Vue"
 
 #. type: Plain text
-#: user-manual.txt:3233
+#: user-manual.txt:3261
 msgid ""
 "<<S_ViewPanels,_All_>> - View the four main _Subsurface_ panels "
 "simmultaneously."
@@ -6682,33 +6734,33 @@ msgstr ""
 "_Subsurface_ simultanément."
 
 #. type: Plain text
-#: user-manual.txt:3234
+#: user-manual.txt:3262
 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:3235
+#: user-manual.txt:3263
 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:3236
+#: user-manual.txt:3264
 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:3237
+#: user-manual.txt:3265
 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:3239
+#: user-manual.txt:3267
 msgid ""
 "_Yearly Statistics_ - Display summary statistics about dives during this and "
 "past years."
@@ -6717,28 +6769,28 @@ msgstr ""
 "plongées effectuées."
 
 #. type: Plain text
-#: user-manual.txt:3240
+#: user-manual.txt:3268
 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:3241
+#: user-manual.txt:3269
 msgid "_Next DC_ - Switch to next dive computer."
 msgstr "_Ordinateur suivant_  - Passer à l'ordinateur de plongée suivant."
 
 #. type: Plain text
-#: user-manual.txt:3242
+#: user-manual.txt:3270
 msgid "_Full Screen_ - Toggles Full Screen mode."
 msgstr "_Plein écran_  - Passer en mode plein écran."
 
 #. type: Title ===
-#: user-manual.txt:3243
+#: user-manual.txt:3271
 #, no-wrap
 msgid "Help"
 msgstr "Aide"
 
 #. type: Plain text
-#: user-manual.txt:3246
+#: user-manual.txt:3274
 msgid ""
 "_About Subsurface_ - Show a panel with the version number of _Subsurface_ as "
 "well as licensing information."
@@ -6747,7 +6799,7 @@ msgstr ""
 "_Subsurface_ ainsi que les informations de licence."
 
 #. type: Plain text
-#: user-manual.txt:3248
+#: user-manual.txt:3276
 msgid ""
 "_Check for updates_ - Find out whether a newer version of Subsurface is "
 "available on the http://subsurface-divelog.org/[_Subsurface_ web site]."
@@ -6757,7 +6809,7 @@ msgstr ""
 "_Subsurface_ ]."
 
 #. type: Plain text
-#: user-manual.txt:3249
+#: user-manual.txt:3277
 msgid ""
 "<<S_UserSurvey,_User survey_>> - Help to make _Subsurface_ even better by "
 "taking part in our user survey."
@@ -6766,32 +6818,32 @@ msgstr ""
 "meilleur en répondant à notre sondage utilisateur."
 
 #. type: Plain text
-#: user-manual.txt:3250
+#: user-manual.txt:3278
 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:3252
+#: user-manual.txt:3280
 #, no-wrap
 msgid "Mobile Version"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3255
+#: user-manual.txt:3283
 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:3256
+#: user-manual.txt:3284
 #, no-wrap
 msgid "How to use the mobile version"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3260
+#: user-manual.txt:3288
 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 "
@@ -6799,7 +6851,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3264
+#: user-manual.txt:3292
 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 "
@@ -6808,7 +6860,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3267
+#: user-manual.txt:3295
 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 "
@@ -6816,7 +6868,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3270
+#: user-manual.txt:3298
 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 "
@@ -6824,25 +6876,25 @@ msgid ""
 msgstr ""
 
 #. type: Title ==
-#: user-manual.txt:3272
+#: user-manual.txt:3300
 #, 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:3274
+#: user-manual.txt:3302
 #, 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:3275
+#: user-manual.txt:3303
 #, no-wrap
 msgid "images/icons/drivers.jpg"
 msgstr "images/icons/drivers.jpg"
 
 #. type: Plain text
-#: user-manual.txt:3280
+#: user-manual.txt:3308
 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 "
@@ -6853,7 +6905,7 @@ msgstr ""
 "l'ordinateur de plongée (Bluetooth, USB, infra-rouge)."
 
 #. type: Plain text
-#: user-manual.txt:3286
+#: user-manual.txt:3314
 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 "
@@ -6867,7 +6919,7 @@ msgstr ""
 "particulièrement pour certaines technologies telles que l'infra-rouge."
 
 #. type: Plain text
-#: user-manual.txt:3290
+#: user-manual.txt:3318
 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 "
@@ -6878,7 +6930,7 @@ msgstr ""
 "port USB de son ordinateur de bureau."
 
 #. type: Plain text
-#: user-manual.txt:3297
+#: user-manual.txt:3325
 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 "
@@ -6896,19 +6948,19 @@ msgstr ""
 "documents et logiciels Silicon Labs]."
 
 #. type: Title ===
-#: user-manual.txt:3299
+#: user-manual.txt:3327
 #, 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:3300
+#: user-manual.txt:3328
 #, no-wrap
 msgid "images/icons/usb.jpg"
 msgstr "images/icons/usb.jpg"
 
 #. type: Plain text
-#: user-manual.txt:3308
+#: user-manual.txt:3336
 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 "
@@ -6925,13 +6977,13 @@ msgstr ""
 "nom de votre périphérique ;"
 
 #. type: Title ====
-#: user-manual.txt:3309 user-manual.txt:3392
+#: user-manual.txt:3337 user-manual.txt:3420
 #, no-wrap
 msgid "On Windows:"
 msgstr "Sur Windows :"
 
 #. type: Plain text
-#: user-manual.txt:3313
+#: user-manual.txt:3341
 msgid ""
 "Simply try COM1, COM2, etc. The drop down list should contain all connected "
 "COM devices."
@@ -6940,56 +6992,56 @@ msgstr ""
 "tous les périphériques COM connectés."
 
 #. type: Title ====
-#: user-manual.txt:3314 user-manual.txt:3407
+#: user-manual.txt:3342 user-manual.txt:3435
 #, no-wrap
 msgid "On MacOS:"
 msgstr "Sur MacOS :"
 
 #. type: Plain text
-#: user-manual.txt:3317
+#: user-manual.txt:3345
 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:3318
+#: user-manual.txt:3346
 #, no-wrap
 msgid "On Linux:"
 msgstr "Sur Linux :"
 
 #. type: Plain text
-#: user-manual.txt:3321
+#: user-manual.txt:3349
 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:3323
+#: user-manual.txt:3351
 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:3324
+#: user-manual.txt:3352
 msgid "Open a terminal"
 msgstr "Ouvrir un terminal"
 
 #. type: Plain text
-#: user-manual.txt:3325 user-manual.txt:3327
+#: user-manual.txt:3353 user-manual.txt:3355
 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:3326
+#: user-manual.txt:3354
 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:3329
+#: user-manual.txt:3357
 msgid "A message similar to this one should appear:"
 msgstr "Un message similaire à celui-ci devrait apparaitre :"
 
 #. type: Plain text
-#: user-manual.txt:3345
+#: user-manual.txt:3373
 #, no-wrap
 msgid ""
 "\tusb 2-1.1: new full speed USB device number 14 using ehci_hcd\n"
@@ -7025,7 +7077,7 @@ msgstr ""
 "\tftdi_sio: v1.6.0:USB FTDI Serial Converters Driver\n"
 
 #. type: Plain text
-#: user-manual.txt:3350
+#: user-manual.txt:3378
 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 "
@@ -7037,14 +7089,14 @@ msgstr ""
 "que Subsurface utilise le bon port USB."
 
 #. type: Plain text
-#: user-manual.txt:3352
+#: user-manual.txt:3380
 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:3358
+#: user-manual.txt:3386
 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 "
@@ -7057,7 +7109,7 @@ msgstr ""
 "utiliser le port USB. Si votre nom d'utilisateur est 'johnB' :"
 
 #. type: Plain text
-#: user-manual.txt:3362
+#: user-manual.txt:3390
 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."
@@ -7067,7 +7119,7 @@ msgstr ""
 "+dialout+."
 
 #. type: Plain text
-#: user-manual.txt:3367
+#: user-manual.txt:3395
 #, no-wrap
 msgid ""
 "Type: +id johnB+     This lists all the groups that johnB belongs to and\n"
@@ -7083,7 +7135,7 @@ msgstr ""
 "parmi les différents IDs.\n"
 
 #. type: Plain text
-#: user-manual.txt:3369
+#: user-manual.txt:3397
 #, no-wrap
 msgid ""
 "Under some circumstances this change takes only effect (eg. on Ubuntu) after\n"
@@ -7091,7 +7143,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:3374
+#: user-manual.txt:3402
 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 "
@@ -7102,19 +7154,19 @@ msgstr ""
 "vous devriez pouvoir importer vos plongées."
 
 #. type: Title ===
-#: user-manual.txt:3376
+#: user-manual.txt:3404
 #, no-wrap
 msgid "Setting up bluetooth enabled devices"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:3377
+#: user-manual.txt:3405
 #, no-wrap
 msgid "images/icons/bluetooth.jpg"
 msgstr "images/icons/bluetooth.jpg"
 
 #. type: Plain text
-#: user-manual.txt:3383
+#: user-manual.txt:3411
 msgid ""
 "For dive computers communicating through bluetooth like the Heinrichs "
 "Weikamp Frog or the Shearwater Predator and Petrel there is a different "
@@ -7123,13 +7175,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3385
+#: user-manual.txt:3413
 #, no-wrap
 msgid "*For the dive computer, after enabling Bluetooth, ensure it is in Upload mode.*\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3389
+#: user-manual.txt:3417
 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 "
@@ -7137,13 +7189,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3391
+#: user-manual.txt:3419
 #, no-wrap
 msgid "*Pair the _Subsurface_ computer with the dive computer.*\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3400
+#: user-manual.txt:3428
 msgid ""
 "Bluetooth is most likely already enabled. For pairing with the dive computer "
 "choose _Control Panel -> Bluetooth Devices -> Add Wireless Device_.  This "
@@ -7155,21 +7207,21 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3403
+#: user-manual.txt:3431
 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:3406
+#: user-manual.txt:3434
 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:3413
+#: user-manual.txt:3441
 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. "
@@ -7178,20 +7230,20 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3416
+#: user-manual.txt:3444
 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:3417
+#: user-manual.txt:3445
 #, no-wrap
 msgid "On Linux"
 msgstr "Sur Linux"
 
 #. type: Plain text
-#: user-manual.txt:3425
+#: user-manual.txt:3453
 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 "
@@ -7204,7 +7256,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3429
+#: user-manual.txt:3457
 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 "
@@ -7213,22 +7265,22 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3431
+#: user-manual.txt:3459
 msgid "Enable the Bluetooth controller and pair your dive computer</li>"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3432
+#: user-manual.txt:3460
 msgid "Establish an RFCOMM connection"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3433
+#: user-manual.txt:3461
 msgid "Download the dives with Subsurface"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3439
+#: user-manual.txt:3467
 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'.  "
@@ -7239,7 +7291,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3444
+#: user-manual.txt:3472
 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 "
@@ -7249,23 +7301,23 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3446
+#: user-manual.txt:3474
 msgid "+sudo usermod -a -G dialout username+"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3448
+#: user-manual.txt:3476
 msgid "Then log out and log in for the change to take effect."
 msgstr ""
 
 #. type: Title =====
-#: user-manual.txt:3449
+#: user-manual.txt:3477
 #, no-wrap
 msgid "Enabling the Bluetooth controller and pairing your dive computer"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3455
+#: user-manual.txt:3483
 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 "
@@ -7276,14 +7328,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3458
+#: user-manual.txt:3486
 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:3465
+#: user-manual.txt:3493
 #, no-wrap
 msgid ""
 "\t$ hciconfig\n"
@@ -7295,7 +7347,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3470
+#: user-manual.txt:3498
 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 "
@@ -7305,7 +7357,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3478
+#: user-manual.txt:3506
 #, no-wrap
 msgid ""
 "\tsudo hciconfig hci0 up auth+  (enter password when prompted)\n"
@@ -7318,25 +7370,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3480
+#: user-manual.txt:3508
 msgid "+Check that the status now includes +'UP', 'RUNNING' AND 'AUTH'+."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3482
+#: user-manual.txt:3510
 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:3484
+#: user-manual.txt:3512
 #, no-wrap
 msgid "\tsudo hciconfig hci1 down\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3487
+#: user-manual.txt:3515
 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 "
@@ -7344,7 +7396,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3508
+#: user-manual.txt:3536
 #, no-wrap
 msgid ""
 "\tbluetoothctl\n"
@@ -7370,14 +7422,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3511
+#: user-manual.txt:3539
 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:3514
+#: user-manual.txt:3542
 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-"
@@ -7385,7 +7437,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3519
+#: user-manual.txt:3547
 #, no-wrap
 msgid ""
 "\thcitool -i hci0 scanning\n"
@@ -7395,89 +7447,89 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3521
+#: user-manual.txt:3549
 msgid "Once ther dive computer is pired, set up the RFCOMM connection"
 msgstr ""
 
 #. type: Title =====
-#: user-manual.txt:3522
+#: user-manual.txt:3550
 #, no-wrap
 msgid "Establishing the RFCOMM connection"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3525
+#: user-manual.txt:3553
 msgid "The command to establish an RFCOMM connection is:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3527
+#: user-manual.txt:3555
 msgid "+sudo rfcomm -i <controller> connect <dev> <bdaddr> [channel]+"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3529
+#: user-manual.txt:3557
 msgid "<controller>+ is the Bluetooth controller, +hci0+."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3530
+#: user-manual.txt:3558
 msgid "<dev> is the RFCOMM device file, +rfcomm0+"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3531
+#: user-manual.txt:3559
 msgid "<bdaddr> is the dive computer's MAC address, +00:11:22:33:44:55+"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3532
+#: user-manual.txt:3560
 msgid ""
 "[channel] is the dive computer's Bluetooth channel we need to connect to."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3535
+#: user-manual.txt:3563
 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:3537
+#: user-manual.txt:3565
 msgid "_Shearwater Petrel 2_: channel 5"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3538
+#: user-manual.txt:3566
 msgid "_Shearwater Petrel 1_: channel 1"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3539
+#: user-manual.txt:3567
 msgid "_Heinrichs-Weikamp OSTC Sport_: channel 1"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3541
+#: user-manual.txt:3569
 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:3543
+#: user-manual.txt:3571
 #, 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:3545
+#: user-manual.txt:3573
 msgid "This gives the response:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3548
+#: user-manual.txt:3576
 #, no-wrap
 msgid ""
 "\tConnected /dev/rfcomm0 to 00:11:22:33:44:55 on channel 5\n"
@@ -7485,14 +7537,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3550
+#: user-manual.txt:3578
 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:3554
+#: user-manual.txt:3582
 #, no-wrap
 msgid ""
 "\tsudo rfcomm -i hci0 connect rfcomm0 00:11:22:33:44:55   (enter a password, probably 0000, when prompted)\n"
@@ -7501,7 +7553,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3558
+#: user-manual.txt:3586
 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 "
@@ -7510,7 +7562,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3568
+#: user-manual.txt:3596
 #, no-wrap
 msgid ""
 "\tsdptool -i hci0 records 00:11:22:33:44:55\n"
@@ -7525,7 +7577,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3571
+#: user-manual.txt:3599
 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 "
@@ -7533,13 +7585,13 @@ msgid ""
 msgstr ""
 
 #. type: Title =====
-#: user-manual.txt:3572
+#: user-manual.txt:3600
 #, no-wrap
 msgid "Download the dives with Subsurface</em>"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3574
+#: user-manual.txt:3602
 msgid ""
 "After establishing the RFCOMM connection and while the dive computer's "
 "upload mode countdown is still running, go to_Subsurface_, select _Import-"
@@ -7549,25 +7601,25 @@ msgid ""
 msgstr ""
 
 #. type: Title ==
-#: user-manual.txt:3577
+#: user-manual.txt:3605
 #, no-wrap
 msgid "APPENDIX B: Dive Computer specific information for importing dive data."
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:3580
+#: user-manual.txt:3608
 #, no-wrap
 msgid "Importing from Uemis Zurich"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:3582
+#: user-manual.txt:3610
 #, no-wrap
 msgid "images/icons/iumis.jpg"
 msgstr "images/icons/iumis.jpg"
 
 #. type: Plain text
-#: user-manual.txt:3598
+#: user-manual.txt:3626
 msgid ""
 "_Subsurface_ downloads the information stored on the SDA (the built-in file "
 "system of the Uemis) including information about dive spots and equipment. "
@@ -7583,7 +7635,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3613
+#: user-manual.txt:3641
 msgid ""
 "After selecting the above device name, download the dives from the Uemis "
 "Zurich. One technical issue with the Uemis Zurich download implementation "
@@ -7600,19 +7652,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:3615
+#: user-manual.txt:3643
 #, no-wrap
 msgid "Importing from Uwatec Galileo"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:3617
+#: user-manual.txt:3645
 #, no-wrap
 msgid "images/icons/Galileo.jpg"
 msgstr "images/icons/Galileo.jpg"
 
 #. type: Plain text
-#: user-manual.txt:3632
+#: user-manual.txt:3660
 msgid ""
 "The Uwatec Galileo dive computers use infra red (IrDA) communication between "
 "the dive computer and Subsurface. The Uwatec hardware uses a USB dongle "
@@ -7628,14 +7680,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3635
+#: user-manual.txt:3663
 msgid ""
 "After executing this command, Subsurface will recognise the Galileo dive "
 "computer and download dive information."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3641
+#: user-manual.txt:3669
 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/"
@@ -7645,26 +7697,26 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3644
+#: user-manual.txt:3672
 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:3646
+#: user-manual.txt:3674
 #, no-wrap
 msgid "Importing from Heinrichs Weikamp DR5"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:3648
+#: user-manual.txt:3676
 #, no-wrap
 msgid "images/icons/HW_DR5.jpg"
 msgstr "images/icons/HW_DR5.jpg"
 
 #. type: Plain text
-#: user-manual.txt:3658
+#: user-manual.txt:3686
 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.  "
@@ -7677,19 +7729,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:3661
+#: user-manual.txt:3689
 #, no-wrap
 msgid "Importing from xDEEP BLACK"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:3663
+#: user-manual.txt:3691
 #, no-wrap
 msgid "images/icons/HW_xdeepblack.jpg"
 msgstr "images/icons/HW_xdeepblack.jpg"
 
 #. type: Plain text
-#: user-manual.txt:3672
+#: user-manual.txt:3700
 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 "
@@ -7703,19 +7755,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:3674
+#: user-manual.txt:3702
 #, no-wrap
 msgid "Importing from Shearwater Predator using Bluetooth"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:3676
+#: user-manual.txt:3704
 #, no-wrap
 msgid "images/icons/predator.jpg"
 msgstr "images/icons/predator.jpg"
 
 #. type: Plain text
-#: user-manual.txt:3684
+#: user-manual.txt:3712
 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 "
@@ -7726,36 +7778,36 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3687
+#: user-manual.txt:3715
 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:3688
+#: user-manual.txt:3716
 msgid "switch to different Bluetooth drivers for the same hardware"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3689
+#: user-manual.txt:3717
 msgid "switch off WiFi while using Bluetooth"
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:3691
+#: user-manual.txt:3719
 #, no-wrap
 msgid "Importing from Poseidon MkVI Discovery"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:3693
+#: user-manual.txt:3721
 #, no-wrap
 msgid "images/MkVI.jpeg"
 msgstr "images/MkVI.jpeg"
 
 #. type: Plain text
-#: user-manual.txt:3701
+#: user-manual.txt:3729
 msgid ""
 "Download of dive logs from the MkVI is performed using a custom "
 "communications adapter and the _Poseidon PC Configuration Software_, "
@@ -7767,45 +7819,45 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3704
+#: user-manual.txt:3732
 msgid ""
 "Setup configuration for the dive and key dive parameters (file with a .txt "
 "extension)"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3705
+#: user-manual.txt:3733
 msgid "Dive log details (file with a .csv extension)"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3707
+#: user-manual.txt:3735
 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:3709
+#: user-manual.txt:3737
 msgid ""
 "_Subsurface_ accesses the .txt and the .csv files to obtain dive log "
 "information."
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:3711
+#: user-manual.txt:3739
 #, no-wrap
 msgid "Importing from APD Inspiration/Evolution CCR"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:3713
+#: user-manual.txt:3741
 #, no-wrap
 msgid "images/APDComputer.jpg"
 msgstr "images/APDComputer.jpg"
 
 #. type: Plain text
-#: user-manual.txt:3721
+#: user-manual.txt:3749
 msgid ""
 "The dive logs of an APD Inspiration or similar CCR dive computer are "
 "downloaded using a communications adapter and _AP Communicator_, obtained "
@@ -7817,55 +7869,55 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3723
+#: user-manual.txt:3751
 msgid "Download the dive using _AP Communicator_."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3724
+#: user-manual.txt:3752
 msgid "Open a dive within the _AP Log Viewer_."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3725
+#: user-manual.txt:3753
 msgid "Select the tab at the top of the screen, entitled \"_Data_\"."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3726
+#: user-manual.txt:3754
 msgid ""
 "With the raw dive log data show on the screen, click on \"_Copy to Clipboard_"
 "\"."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3727
+#: user-manual.txt:3755
 msgid "Open a text editor, e.g. Notepad (Windows) or TextWrangler (Mac)."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3729
+#: user-manual.txt:3757
 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:3730
+#: user-manual.txt:3758
 msgid ""
 "Within _Subsurface_, select _Import -> Import log files_ to open the xref:"
 "Unified_import[universal import dialogue]."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3731
+#: user-manual.txt:3759
 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:3734
+#: user-manual.txt:3762
 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 "
@@ -7874,13 +7926,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:3735
+#: user-manual.txt:3763
 #, no-wrap
 msgid "images/APD_CSVimportF22.jpg"
 msgstr "images/APD_CSVimportF22.jpg"
 
 #. type: Plain text
-#: user-manual.txt:3743
+#: user-manual.txt:3771
 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 "
@@ -7892,12 +7944,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3744
+#: user-manual.txt:3772
 msgid "Click the _Ok_ button at the bottom of the import panel."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3749
+#: user-manual.txt:3777
 msgid ""
 "The APD dive log will appear within _Subsurface_. The dive computer-"
 "generated ceiling generated by the Inspiration can be viewed by selecting "
@@ -7907,13 +7959,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ==
-#: user-manual.txt:3750
+#: user-manual.txt:3778
 #, no-wrap
 msgid "APPENDIX C: Exporting Dive log information from external dive log software."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3759
+#: user-manual.txt:3787
 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, "
@@ -7923,22 +7975,22 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3761
+#: user-manual.txt:3789
 msgid "Export the foreign dive log data to format that is accessible from"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3762
+#: user-manual.txt:3790
 msgid "_Subsurface_."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3763
+#: user-manual.txt:3791
 msgid "Import the accessible dive log data into _Subsurface_."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3767
+#: user-manual.txt:3795
 msgid ""
 "This appendix provides some information about approaches to export dive log "
 "data from foreign dive log software. The procedures below mostly apply to "
@@ -7946,19 +7998,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:3769
+#: user-manual.txt:3797
 #, no-wrap
 msgid "Exporting from *Suunto Divemanager (DM3, DM4 or DM5)*"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:3770
+#: user-manual.txt:3798
 #, no-wrap
 msgid "images/icons/suuntologo.jpg"
 msgstr "images/icons/suuntologo.jpg"
 
 #. type: Plain text
-#: user-manual.txt:3777
+#: user-manual.txt:3805
 msgid ""
 "DiveManager is a MS Windows application for Suunto dive computers.  "
 "Divemanager 3 (DM3) is an older version of the Suunto software. More recent "
@@ -7968,66 +8020,66 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3779
+#: user-manual.txt:3807
 #, no-wrap
 msgid "*Divemanager 3 (DM3):*\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3781
+#: user-manual.txt:3809
 msgid ""
 "Start 'Suunto Divemanager 3' and log in with the name containing the logs"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3782
+#: user-manual.txt:3810
 msgid "Do not start the import wizard to import dives from the dive computer."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3784
+#: user-manual.txt:3812
 msgid ""
 "In the navigation tree on the left side of the program-window, select the "
 "appropriate dives."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3785
+#: user-manual.txt:3813
 msgid ""
 "Within the list of dives, select the dives you would like to import later:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3786
+#: user-manual.txt:3814
 msgid "To select certain dives: hold 'ctrl' and click the dive"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3788
+#: user-manual.txt:3816
 msgid ""
 "To select all dives: Select the first dive, hold down shift and select the "
 "last dive"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3789
+#: user-manual.txt:3817
 msgid "With the dives marked, use the program menu _File -> Export_"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3790
+#: user-manual.txt:3818
 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:3791
+#: user-manual.txt:3819
 msgid "Click the browse button next to the field Export Path"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3793
+#: user-manual.txt:3821
 #, no-wrap
 msgid ""
 "** A file-manager like window pops up\n"
@@ -8035,13 +8087,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3794
+#: user-manual.txt:3822
 #, no-wrap
 msgid "Divelog.SDE file\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3796
+#: user-manual.txt:3824
 #, no-wrap
 msgid ""
 "** Optionally change the name of the file for saving\n"
@@ -8049,25 +8101,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3797
+#: user-manual.txt:3825
 #, no-wrap
 msgid "Back in the Export pop-up, press the button 'Export'\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3798
+#: user-manual.txt:3826
 #, no-wrap
 msgid "The dives are now exported to the file Divelog.SDE.\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3800
+#: user-manual.txt:3828
 #, no-wrap
 msgid "*Divemanager 4 (DM4) and Divemanager 5 (DM5):*\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3805
+#: user-manual.txt:3833
 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 "
@@ -8076,81 +8128,81 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3807
+#: user-manual.txt:3835
 msgid "Locating the Suunto DM4 (or DM5) database:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3809 user-manual.txt:3818
+#: user-manual.txt:3837 user-manual.txt:3846
 msgid "Start Suunto DM4/DM5"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3810
+#: user-manual.txt:3838
 msgid "Select 'Help -> About'"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3811
+#: user-manual.txt:3839
 msgid "Click 'Copy' after text 'Copy log folder path to clipboard'"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3812
+#: user-manual.txt:3840
 msgid "Now open Windows Explorer"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3813
+#: user-manual.txt:3841
 msgid "Paste the address to the path box at the top of the File Explorer"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3814
+#: user-manual.txt:3842
 msgid "The database is called DM4.db or DM5.db"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3816
+#: user-manual.txt:3844
 msgid "Making a backup copy of the Suunto DM4/DM5 database:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3819
+#: user-manual.txt:3847
 msgid "Select 'File - Create backup'"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3821
+#: user-manual.txt:3849
 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:3822
+#: user-manual.txt:3850
 msgid "Click 'Save'"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3823
+#: user-manual.txt:3851
 msgid "The dives are now exported to the file DM4.bak (or DM5.bak)"
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:3825
+#: user-manual.txt:3853
 #, no-wrap
 msgid "Exporting from Atomic Logbook"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:3828
+#: user-manual.txt:3856
 #, no-wrap
 msgid "images/icons/atomiclogo.jpg"
 msgstr "images/icons/atomiclogo.jpg"
 
 #. type: Plain text
-#: user-manual.txt:3835
+#: user-manual.txt:3863
 msgid ""
 "Atomic Logbook is a Windows software by Atomic Aquatics. It allows "
 "downloading of dive information from Cobalt and Cobalt 2 dive computers.  "
@@ -8160,19 +8212,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:3837
+#: user-manual.txt:3865
 #, no-wrap
 msgid "Exporting from Mares Dive Organiser V2.1"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:3840
+#: user-manual.txt:3868
 #, no-wrap
 msgid "images/icons/mareslogo.jpg"
 msgstr "images/icons/mareslogo.jpg"
 
 #. type: Plain text
-#: user-manual.txt:3848
+#: user-manual.txt:3876
 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 "
@@ -8183,7 +8235,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3853
+#: user-manual.txt:3881
 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 "
@@ -8191,36 +8243,36 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3856
+#: user-manual.txt:3884
 msgid ""
 "Rename the file to DiveOrganiserxxxxx.zip. Inside the zipped directory is a "
 "file _DiveOrganiser.sdf_."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3857
+#: user-manual.txt:3885
 msgid "Extract the _.sdf_ file from the zipped folder to your Desktop."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3858
+#: user-manual.txt:3886
 msgid "The password for accessing the .zip file is _mares_."
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:3860
+#: user-manual.txt:3888
 #, no-wrap
 msgid "Exporting from *DivingLog 5.0 and 6.0*"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:3862
+#: user-manual.txt:3890
 #, no-wrap
 msgid "images/icons/divingloglogo.jpg"
 msgstr "images/icons/divingloglogo.jpg"
 
 #. type: Plain text
-#: user-manual.txt:3869
+#: user-manual.txt:3897
 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 "
@@ -8230,37 +8282,37 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3871
+#: user-manual.txt:3899
 msgid "To transfer all files from DivingLog to Subsurface, do the following:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3873
+#: user-manual.txt:3901
 msgid "In DivingLog open the 'File -> Export -> SQLite' menu"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3874
+#: user-manual.txt:3902
 msgid "Select 'Settings' button"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3875
+#: user-manual.txt:3903
 msgid "Set the 'RTF2Plaintext' to 'true'"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3876
+#: user-manual.txt:3904
 msgid "Close the Settings dialog"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3877
+#: user-manual.txt:3905
 msgid "Click 'Export' button and select the filename"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3881
+#: user-manual.txt:3909
 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 "
@@ -8268,13 +8320,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ==
-#: user-manual.txt:3882
+#: user-manual.txt:3910
 #, 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:3892
+#: user-manual.txt:3920
 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 "
@@ -8295,7 +8347,7 @@ msgstr ""
 "selon le tableur utilisé."
 
 #. type: Plain text
-#: user-manual.txt:3898
+#: user-manual.txt:3926
 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 "
@@ -8313,19 +8365,19 @@ msgstr ""
 "règles simples :"
 
 #. type: Plain text
-#: user-manual.txt:3900
+#: user-manual.txt:3928
 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:3901
+#: user-manual.txt:3929
 msgid "Duration: the format should be minutes:seconds."
 msgstr "Durée : le format est minutes:secondes."
 
 #. type: Plain text
-#: user-manual.txt:3902
+#: user-manual.txt:3930
 msgid ""
 "Unit system: only one unit system should be used (i.e., no mixture between "
 "imperial and metric units)"
@@ -8334,26 +8386,26 @@ msgstr ""
 "entre les unités impériales et métriques)"
 
 #. type: Plain text
-#: user-manual.txt:3903
+#: user-manual.txt:3931
 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:3904
+#: user-manual.txt:3932
 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:3905
+#: user-manual.txt:3933
 #, no-wrap
 msgid "_LibreOffice Calc_ and _OpenOffice Calc_"
 msgstr "_LibreOffice Calc_ et _OpenOffice Calc_"
 
 #. type: Plain text
-#: user-manual.txt:3909
+#: user-manual.txt:3937
 msgid ""
 "These are open source spreadsheet applications forming parts of larger open "
 "source office suite applications. The user interaction with _LibreOffice_ "
@@ -8364,13 +8416,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:3910
+#: user-manual.txt:3938
 #, no-wrap
 msgid "images/LOffice_spreadsheetdata.jpg"
 msgstr "images/LOffice_spreadsheetdata.jpg"
 
 #. type: Plain text
-#: user-manual.txt:3913
+#: user-manual.txt:3941
 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 "
@@ -8378,13 +8430,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:3914
+#: user-manual.txt:3942
 #, no-wrap
 msgid "images/LOffice_save_as_options.jpg"
 msgstr "images/LOffice_save_as_options.jpg"
 
 #. type: Plain text
-#: user-manual.txt:3917
+#: user-manual.txt:3945
 msgid ""
 "After selecting _Save_, select the appropriate field delimiter (choose _Tab_ "
 "to prevent conflicts with the comma when using this as a decimal point), "
@@ -8392,13 +8444,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:3918
+#: user-manual.txt:3946
 #, no-wrap
 msgid "images/LOffice_field_options.jpg"
 msgstr "images/LOffice_field_options.jpg"
 
 #. type: Plain text
-#: user-manual.txt:3921
+#: user-manual.txt:3949
 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:"
@@ -8406,13 +8458,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:3922
+#: user-manual.txt:3950
 #, no-wrap
 msgid "Microsoft _Excel_"
 msgstr "Microsoft _Excel_"
 
 #. type: Plain text
-#: user-manual.txt:3928
+#: user-manual.txt:3956
 msgid ""
 "The field delimiter (called \"_list separator_\" in Microsoft manuals) is "
 "not accessible from within _Excel_ and needs to be set through the "
@@ -8423,19 +8475,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3930
+#: user-manual.txt:3958
 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:3931
+#: user-manual.txt:3959
 msgid "Open the _Regional and Language Options_ dialog box."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3934
+#: user-manual.txt:3962
 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 "
@@ -8443,48 +8495,48 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3935
+#: user-manual.txt:3963
 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:3936
+#: user-manual.txt:3964
 msgid "Click _OK_ twice."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3938
+#: user-manual.txt:3966
 msgid "Below is an image of the _Control Panel_:"
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:3939
+#: user-manual.txt:3967
 #, no-wrap
 msgid "images/Win_SaveCSV2.jpg"
 msgstr "images/Win_SaveCSV2.jpg"
 
 #. type: Plain text
-#: user-manual.txt:3942
+#: user-manual.txt:3970
 msgid "To export the dive log in CSV format:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3944
+#: user-manual.txt:3972
 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:3945
+#: user-manual.txt:3973
 #, no-wrap
 msgid "images/Win_SaveCSV1.jpg"
 msgstr "images/Win_SaveCSV1.jpg"
 
 #. type: Plain text
-#: user-manual.txt:3948
+#: user-manual.txt:3976
 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 "
@@ -8494,13 +8546,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:3949
+#: user-manual.txt:3977
 #, no-wrap
 msgid "images/Win_SaveCSV3.jpg"
 msgstr "images/Win_SaveCSV3.jpg"
 
 #. type: Plain text
-#: user-manual.txt:3952
+#: user-manual.txt:3980
 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 "
@@ -8509,13 +8561,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ==
-#: user-manual.txt:3954
+#: user-manual.txt:3982
 #, 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:3959
+#: user-manual.txt:3987
 msgid ""
 "_Subsurface_ provides a mechanism to create or modify templates for printing "
 "dive logs in order to produce customised printouts of dive logs. Templates, "
@@ -8524,12 +8576,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3961
+#: user-manual.txt:3989
 msgid "Templates are accessed using the print dialogue (see image *B* below)."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3969
+#: user-manual.txt:3997
 msgid ""
 "The buttons under the _Template_ dropdown box allows one to _Edit_, "
 "_Delete_, _Import_ and to _Export_ templates (see image *A* above). New or "
@@ -8540,18 +8592,18 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3971
+#: user-manual.txt:3999
 msgid "The Edit Panel comprises three tabs:"
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:3972
+#: user-manual.txt:4000
 #, no-wrap
 msgid "images/Template1_f22.jpg"
 msgstr "images/Template1_f22.jpg"
 
 #. type: Plain text
-#: user-manual.txt:3976
+#: user-manual.txt:4004
 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. "
@@ -8559,7 +8611,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3980
+#: user-manual.txt:4008
 msgid ""
 "The _Colors_ tab (image *B* above) allows editing the colours used for "
 "printing the dive log. The colours are highly customisable: the _Edit_ "
@@ -8568,7 +8620,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3989
+#: user-manual.txt:4017
 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. "
@@ -8584,13 +8636,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:3990
+#: user-manual.txt:4018
 #, no-wrap
 msgid "images/Template2_f22.jpg"
 msgstr "images/Template2_f22.jpg"
 
 #. type: Plain text
-#: user-manual.txt:3993
+#: user-manual.txt:4021
 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 "
@@ -8598,33 +8650,33 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3995
+#: user-manual.txt:4023
 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:3996
+#: user-manual.txt:4024
 #, no-wrap
 msgid "Main dive loop"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3998
+#: user-manual.txt:4026
 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:3999 user-manual.txt:4053 user-manual.txt:4070
+#: user-manual.txt:4027 user-manual.txt:4081 user-manual.txt:4098
 #, no-wrap
 msgid "template.html"
 msgstr ""
 
 #. type: delimited block .
-#: user-manual.txt:4004
+#: user-manual.txt:4032
 #, no-wrap
 msgid ""
 "\t{% for dive in dives %}\n"
@@ -8633,13 +8685,13 @@ msgid ""
 msgstr ""
 
 #. type: Block title
-#: user-manual.txt:4006 user-manual.txt:4058 user-manual.txt:4077
+#: user-manual.txt:4034 user-manual.txt:4086 user-manual.txt:4105
 #, no-wrap
 msgid "output.html"
 msgstr ""
 
 #. type: delimited block .
-#: user-manual.txt:4011
+#: user-manual.txt:4039
 #, no-wrap
 msgid ""
 "\t<h1> 1 </h1>\n"
@@ -8648,25 +8700,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4014
+#: user-manual.txt:4042
 msgid ""
 "Additional information about _Grantlee_ can be found http://www.grantlee.org/"
 "apidox/for_themers.html[here]"
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:4015
+#: user-manual.txt:4043
 #, no-wrap
 msgid "Grantlee exported variables"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4017
+#: user-manual.txt:4045
 msgid "Only a subset of the dive data is exported:"
 msgstr ""
 
 #. type: delimited block |
-#: user-manual.txt:4035
+#: user-manual.txt:4063
 #, no-wrap
 msgid ""
 "|*Name*|*Description*\n"
@@ -8689,7 +8741,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4039
+#: user-manual.txt:4067
 msgid ""
 "_Subsurface_ also exports *template_options* data. This data must be used as "
 "_CSS_ values to provide a dynamically editable template. The exported data "
@@ -8697,7 +8749,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block |
-#: user-manual.txt:4051
+#: user-manual.txt:4079
 #, no-wrap
 msgid ""
 "|*Name*|*Description*\n"
@@ -8714,26 +8766,26 @@ msgid ""
 msgstr ""
 
 #. type: delimited block .
-#: user-manual.txt:4056
+#: user-manual.txt:4084
 #, no-wrap
 msgid "\tborder-width: {{ template_options.borderwidth }}px;\n"
 msgstr ""
 
 #. type: delimited block .
-#: user-manual.txt:4061
+#: user-manual.txt:4089
 #, no-wrap
 msgid "\tborder-width: 3px;\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4064
+#: user-manual.txt:4092
 msgid ""
 "Another variable that _Subsurface_ exports is *print_options*. This variable "
 "contains a single member:"
 msgstr ""
 
 #. type: delimited block |
-#: user-manual.txt:4067
+#: user-manual.txt:4095
 #, no-wrap
 msgid ""
 "|*Name*|*Description*\n"
@@ -8741,7 +8793,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block .
-#: user-manual.txt:4075
+#: user-manual.txt:4103
 #, no-wrap
 msgid ""
 "\tbody {\n"
@@ -8750,7 +8802,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block .
-#: user-manual.txt:4082
+#: user-manual.txt:4110
 #, no-wrap
 msgid ""
 "\tbody {\n"
@@ -8759,13 +8811,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:4084
+#: user-manual.txt:4112
 #, no-wrap
 msgid "Defined CSS selectors"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4088
+#: user-manual.txt:4116
 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 "
@@ -8773,7 +8825,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block |
-#: user-manual.txt:4095
+#: user-manual.txt:4123
 #, no-wrap
 msgid ""
 "|*Selector*|*Type*|*Description*\n"
@@ -8784,20 +8836,20 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4098
+#: user-manual.txt:4126
 msgid ""
 "Rendering dive profiles is not supported for flow layout templates (when "
 "data-numberofdives = 0)."
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:4099
+#: user-manual.txt:4127
 #, no-wrap
 msgid "Special attributes"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4103
+#: user-manual.txt:4131
 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 "
@@ -8805,55 +8857,55 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4105
+#: user-manual.txt:4133
 msgid ""
 "The *data-numberofdives* data attribute is added to the body tag to set the "
 "rendering mode"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4107
+#: user-manual.txt:4135
 msgid "render 6 dives per page:"
 msgstr ""
 
 #. type: delimited block .
-#: user-manual.txt:4110
+#: user-manual.txt:4138
 #, no-wrap
 msgid "\t<body data-numberofdives = 6>\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4113
+#: user-manual.txt:4141
 msgid "render as much dives as possible:"
 msgstr ""
 
 #. type: delimited block .
-#: user-manual.txt:4116
+#: user-manual.txt:4144
 #, no-wrap
 msgid "\t<body data-numberofdives = 0>\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4119
+#: user-manual.txt:4147
 msgid ""
 "All CSS units should be in relative lengths only, to support printing on any "
 "page size."
 msgstr ""
 
 #. type: Title ==
-#: user-manual.txt:4120
+#: user-manual.txt:4148
 #, no-wrap
 msgid "APPENDIX F: FAQs."
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:4122
+#: user-manual.txt:4150
 #, no-wrap
 msgid "Subsurface appears to miscalculate gas consumption and SAC"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4126
+#: user-manual.txt:4154
 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_ "
@@ -8861,7 +8913,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4132
+#: user-manual.txt:4160
 msgid ""
 "'Answer': Not really. What happens is that _Subsurface_ actually calculates "
 "gas consumption differently - and better - than you expect.  In particular, "
@@ -8871,7 +8923,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4138
+#: user-manual.txt:4166
 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 "
@@ -8881,12 +8933,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4140
+#: user-manual.txt:4168
 msgid "+consumption = (amount_of_air_at_beginning - amount_of_air_at_end)+"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4146
+#: user-manual.txt:4174
 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 "
@@ -8897,12 +8949,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4148
+#: user-manual.txt:4176
 msgid "+12.2*((220-100)/1.013)+"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4153
+#: user-manual.txt:4181
 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 "
@@ -8912,7 +8964,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4159
+#: user-manual.txt:4187
 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 "
@@ -8923,13 +8975,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:4160
+#: user-manual.txt:4188
 #, no-wrap
 msgid "Some dive profiles have time discrepancies with the recorded samples from my dive computer..."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4164
+#: user-manual.txt:4192
 msgid ""
 "_Subsurface_ ends up ignoring surface time for many things (average depth, "
 "divetime, SAC, etc).  'Question': Why do dive durations in my dive computer "
@@ -8937,7 +8989,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4172
+#: user-manual.txt:4200
 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 "
@@ -8951,13 +9003,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:4173
+#: user-manual.txt:4201
 #, no-wrap
 msgid "Some dive profiles are missing from the download"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4179
+#: user-manual.txt:4207
 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 "
@@ -8965,7 +9017,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4188
+#: user-manual.txt:4216
 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 "
@@ -8978,7 +9030,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4192
+#: user-manual.txt:4220
 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/user-manual_fr.html.git b/Documentation/user-manual_fr.html.git
index 4a4c543..f0c7581 100644
--- a/Documentation/user-manual_fr.html.git
+++ b/Documentation/user-manual_fr.html.git
@@ -401,25 +401,25 @@ asciidoc.install(3);
 <body class="article">
 <div id="header">
 </div>
-<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>
-<li>
-<p>
-Avez-vous besoin d’une façon d’enregistrer vos plongées utilisant des
+<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>
+<li>
+<p>
+Avez-vous besoin d’une façon d’enregistrer vos plongées utilisant des
    équipements loisirs, même sans utiliser d’ordinateur de plongée ?
 </p>
 </li>
@@ -493,46 +493,46 @@ pour rechercher n’importe quel terme dans le manuel.</p></div>
 <div class="sectionbody">
 <div class="paragraph"><p>Dans le but de développer <em>Subsurface</em> d’une manière qui serve ses
 utilisateurs de la meilleur manière qu’il soit, il est important d’avoir des
-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>
-<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
+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>
+<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
 positions.</p></div>
 <div class="paragraph"><p>Si une plongée est sélectionnée dans la <strong>liste des plongées</strong>, l’emplacement
 de la plongée, les informations détaillées et le profil de la <em>plongée
@@ -542,13 +542,13 @@ surbrillance est la <em>plongée sélectionnée</em>, mais les données de <em>t
 plongées mises en surbrillances</em> sont affichées dans l’onglet <strong>Stats</strong> du
 panneau <strong>informations</strong> (profondeur maximale, minimale et moyenne, les
 durées, les températures de l’eau et le SAC (air consommé); temps total et
-nombre de plongées sélectionnées).</p></div>
-<div class="imageblock" id="S_ViewPanels" style="text-align:center;">
-<div class="content">
-<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
+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_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
 en sélectionnant l’option <strong>Vue</strong> dans le menu principal. Cette fonctionnalité
 permet plusieurs choix d’affichage :</p></div>
 <div class="paragraph"><p><strong>Tout</strong> : affiche les quatre panneaux tels que sur la capture d'écran ci-dessus.</p></div>
@@ -571,112 +571,112 @@ carnet de plongée sera détaillée.</p></div>
 </div>
 <div class="sect1">
 <h2 id="S_NewLogbook">4. Créer un nouveau carnet de plongée</h2>
-<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_f22.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_f22.jpg" alt="Blue edit bar" />
-</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.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,
+<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_f22.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_f22.jpg" alt="Blue edit bar" />
+</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.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,
 <em>Subsurface</em> presents a default dive profile that needs to be modified to
 best represent the dive being described:</p></div>
 <div class="imageblock" style="text-align:center;">
@@ -708,34 +708,34 @@ indicated along the line segments of the dive profile. This defaults to the
 first gas mixture specified in the <strong>Equipment</strong> tab, which was air in the
 case of the profile illustrated above. The gas mixtures of segments of the
 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. 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>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="_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/">
+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. 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>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="_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/">
 Supported dive computers</a>.</p></div>
 <div class="admonitionblock">
 <table><tr>
@@ -997,82 +997,82 @@ device instead of the model name, allowing easy identification of devices.</p></
 <div class="paragraph"><p>With the uploaded dives in the <strong>Dive List</strong>, the information from the dive
 computer is not complete and more details must be added in order to have a
 fuller record of the dives. To do this, the <strong>Notes</strong> and the <strong>Equipment</strong> tabs
-on the top left hand of the <em>Subsurface</em> window should be used.</p></div>
-</div>
-<div class="sect3">
-<h4 id="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_f22.jpg" alt="FIGURE: The Notes tab" />
-</div>
-</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.
+on the top left hand of the <em>Subsurface</em> window should be used.</p></div>
+</div>
+<div class="sect3">
+<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_f22.jpg" alt="FIGURE: The Notes tab" />
+</div>
+</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.
 If air temperature is not provided by the dive computer, the first temperature reading
 might be used for the air temperature. Generally this is close enough to the real air temperature as
 the change in the temperature sensor reading is quite slow to follow the changes in the environment.
 If editing is required, only a value is required, the units of temperature will be
-automatically supplied by
-<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>: 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>
-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 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>
+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>: 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>
+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 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>
 </li>
 <li>
 <p>
@@ -1086,25 +1086,25 @@ 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. 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
+</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. 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
 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 should be
 entered in this field
@@ -1131,38 +1131,38 @@ program
 will list the tags that correspond to the typing. For instance, if the user
 typed
 <code>cav</code>, then the tags <strong>cave</strong> and <strong>cavern</strong> are shown for the user to choose from.</p></div>
-<div class="paragraph"><p><strong>Notes</strong>: Any additional information for the dive can be entered here.</p></div>
-<div class="paragraph"><p>The <strong>Save</strong> and <strong>Cancel</strong> buttons are used to save all the information for
-tabs in the info panel and in the dive profile panel, so there’s no need to
-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">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_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
+<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. 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">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_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
 of <em>Subsurface</em> and the information on cylinders and gases (entered here)
 determines the behaviour of the dive profile (top right-hand panel).</p></div>
 <div class="paragraph" id="cylinder_definitions"><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/DC_gas-dialogue1_f20.jpg" alt="FIGURE: Initial cylinder dialogue" />
-</div>
-</div>
-<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
+<img src="images/DC_gas-dialogue1_f20.jpg" alt="FIGURE: Initial cylinder dialogue" />
+</div>
+</div>
+<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
 for a cylinder.  Note that it is not possible to delete a cylinder if it is
 used during the dive. A cylinder might be implicitly used in the dive, even
 without a gas change event.</p></div>
@@ -1305,28 +1305,28 @@ If one hovers using the mouse over the red bookmark, the appropriate text is
 </div>
 </div>
 <div class="sect3">
-<h4 id="_saving_the_updated_dive_information">5.2.8. Saving the updated dive information</h4>
-<div class="paragraph"><p>The information entered in the <strong>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>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
+<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>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
 configure their own imports.  Manually kept log files (e.g. in spreadsheet)
 can also be imported by configuring the CSV import.  <em>Subsurface</em> can also
 import UDDF and UDCF files used by some divelog software and some dive
@@ -1382,115 +1382,115 @@ Poseidon MkVI CCR logs
 <p>
 JDiveLog
 </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>
-<div class="olist arabic"><ol class="arabic">
-<li>
-<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>
+<div class="olist arabic"><ol class="arabic">
+<li>
+<p>
 <em>CSV dive details</em>: This dive log format contains similar information to
    that of a typical written dive log, e.g. dive date and time, dive depth,
    dive duration, names of buddy and dive master and perhaps some information
@@ -2204,494 +2204,494 @@ thumbnail in the <em>Photos</em> panel, a photo is selected. By double-clicking
 thumbnail, the full-sized image is shown, overlaying the <em>Subsurface</em>
 window. A photo can be deleted from the <em>Photos</em> panel by selecting it
 (single-click) and then by pressing the <em>Del</em> key on the keyboard. This
-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>
-<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
-oxygen toxicity units (OTU) incurred.</p></div>
+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/info.jpg" alt="Note" />
+<img src="images/icons/important.png" alt="Important" />
 </td>
-<td class="content">Gas consumption and SAC calculations: <em>Subsurface</em> calculates SAC and Gas
-consumption taking in account gas incompressibility, particularly at tank
-pressures above 200 bar, making them more accurate.  Users should refer to
-<a href="#SAC_CALCULATION">Appendix D</a> for more information.</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="S_ExtraDataTab">6.2. The <strong>Extra Data</strong> tab (usually for individual dives)</h3>
-<div class="paragraph"><p>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
-information differs from one dive computer to another. These data often
-comprise setup information, metadata about a dive, battery levels, no fly
-times, or gradient factors used during the dive. When possible, this
-information is presented in the <strong>Extra Data</strong> tab. Below is an image showing
-extra data for a dive using a Poseidon rebreather.</p></div>
+<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/ExtraDataTab_f20.jpg" alt="FIGURE: Extra Data tab" />
+<img src="images/multicylinder_dive.jpg" alt="FIGURE: Multicylinder profile" />
 </div>
 </div>
 </div>
-<div class="sect2">
-<h3 id="_the_strong_stats_strong_tab_for_groups_of_dives">6.3. The <strong>Stats</strong> tab (for groups of dives)</h3>
-<div class="paragraph"><p>The Stats tab gives summary statistics for more than one dive, assuming that
-more than one dive has been selected in the <strong>Dive List</strong> using the standard
-Ctrl-click or Shift-click of the mouse. If only one dive has been selected,
-figures pertaining to only that dive are given. This tab shows the number of
-dives selected, the total amount of dive time in these dives, as well as the
-minimum, maximum and mean for the dive duration, water temperature and
-surface air consumption (SAC). It also shows the depth of the shallowest and
-deepest dives of those selected.</p></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 class="sect2">
-<h3 id="S_DiveProfile">6.4. The <strong>Dive Profile</strong></h3>
+</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/Profile2.jpg" alt="Typical dive profile" />
+<img src="images/pSCR_profile.jpg" alt="FIGURE: pSCR profile" />
 </div>
 </div>
-<div class="paragraph"><p>Of all the panels in <em>Subsurface</em>, the Dive Profile contains the most
-detailed information about each dive. The Dive Profile has a <strong>button bar</strong> on
-the left hand side that allows control over several display options. The
-functions of these buttons are described below. The main item in the Dive
-Profile is the graph of dive depth as a function of time. In addition to the
-obvious information of the depth it also shows the ascent and descent rates
-compared to the recommended speed of going up or down in the water
-column. This information is given using different colours:</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>Couleur</strong></p></td>
-<td align="left" valign="top"><p class="table"><strong>Vitesse de descente (m/min)</strong></p></td>
-<td align="left" valign="top"><p class="table"><strong>Vitesse de remontée (m/min)</strong></p></td>
-</tr>
-<tr>
-<td align="left" valign="top"><p class="table">Rouge</p></td>
-<td align="left" valign="top"><p class="table">> 30</p></td>
-<td align="left" valign="top"><p class="table">> 18</p></td>
-</tr>
+</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
+oxygen toxicity units (OTU) incurred.</p></div>
+<div class="admonitionblock">
+<table><tr>
+<td class="icon">
+<img src="images/icons/info.jpg" alt="Note" />
+</td>
+<td class="content">Gas consumption and SAC calculations: <em>Subsurface</em> calculates SAC and Gas
+consumption taking in account gas incompressibility, particularly at tank
+pressures above 200 bar, making them more accurate.  Users should refer to
+<a href="#SAC_CALCULATION">Appendix D</a> for more information.</td>
+</tr></table>
+</div>
+</div>
+<div class="sect2">
+<h3 id="S_ExtraDataTab">6.2. The <strong>Extra Data</strong> tab (usually for individual dives)</h3>
+<div class="paragraph"><p>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
+information differs from one dive computer to another. These data often
+comprise setup information, metadata about a dive, battery levels, no fly
+times, or gradient factors used during the dive. When possible, this
+information is presented in the <strong>Extra Data</strong> tab. Below is an image showing
+extra data for a dive using a Poseidon rebreather.</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/ExtraDataTab_f20.jpg" alt="FIGURE: Extra Data tab" />
+</div>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_the_strong_stats_strong_tab_for_groups_of_dives">6.3. The <strong>Stats</strong> tab (for groups of dives)</h3>
+<div class="paragraph"><p>The Stats tab gives summary statistics for more than one dive, assuming that
+more than one dive has been selected in the <strong>Dive List</strong> using the standard
+Ctrl-click or Shift-click of the mouse. If only one dive has been selected,
+figures pertaining to only that dive are given. This tab shows the number of
+dives selected, the total amount of dive time in these dives, as well as the
+minimum, maximum and mean for the dive duration, water temperature and
+surface air consumption (SAC). It also shows the depth of the shallowest and
+deepest dives of those selected.</p></div>
+</div>
+<div class="sect2">
+<h3 id="S_DiveProfile">6.4. The <strong>Dive Profile</strong></h3>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/Profile2.jpg" alt="Typical dive profile" />
+</div>
+</div>
+<div class="paragraph"><p>Of all the panels in <em>Subsurface</em>, the Dive Profile contains the most
+detailed information about each dive. The Dive Profile has a <strong>button bar</strong> on
+the left hand side that allows control over several display options. The
+functions of these buttons are described below. The main item in the Dive
+Profile is the graph of dive depth as a function of time. In addition to the
+obvious information of the depth it also shows the ascent and descent rates
+compared to the recommended speed of going up or down in the water
+column. This information is given using different colours:</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>Couleur</strong></p></td>
+<td align="left" valign="top"><p class="table"><strong>Vitesse de descente (m/min)</strong></p></td>
+<td align="left" valign="top"><p class="table"><strong>Vitesse de remontée (m/min)</strong></p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">Rouge</p></td>
+<td align="left" valign="top"><p class="table">> 30</p></td>
+<td align="left" valign="top"><p class="table">> 18</p></td>
+</tr>
 <tr>
 <td align="left" valign="top"><p class="table">Orange</p></td>
 <td align="left" valign="top"><p class="table">18 - 30</p></td>
@@ -3168,45 +3168,45 @@ Graph <strong>D</strong> shows the pressures after ascent to a depth of 4.5 mete
 </p>
 </li>
 <li>
-<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
-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
+<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
+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
 above). Select an item to be shown in the <strong>Dive List</strong> or to be deleted from
 the dive list, and the list is immediately updated accordingly. Preferences
 for information shown in the <strong>Dive List</strong> is saved and used when <em>Subsurface</em>
@@ -3216,273 +3216,273 @@ is re-opened.</p></div>
 <h4 id="_selecting_dives_from_a_particular_dive_site">7.1.2. Selecting dives from a particular dive site</h4>
 <div class="paragraph"><p>Many divers have long dive lists and it may be difficult to locate all the
 dives at a particular site.  By pressing <em>Ctl-F</em> on the keyboard, a text box
-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>
-<a href="#S_Export_other">Exporter des informations de plongée vers d’autres
-  destinations ou formats</a>
-</p>
+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>
+<a href="#S_Export_other">Exporter des informations de plongée vers d’autres
+  destinations ou formats</a>
+</p>
 </li>
 </ul></div>
 <div class="sect2">
 <h3 id="S_facebook">8.1. Export des informations de plongée vers <em>Facebook</em></h3>
 <div class="paragraph"><p>L’export des plongées vers <em>Facebook</em> est géré différemment des autres types
 d’export. Cela est du au fait que l’export vers <em>Facebook</em> nécessite une
-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;">
-<div class="content">
-<img src="images/Export_f20.jpg" alt="Figure: Export dialog" />
-</div>
+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;">
+<div class="content">
+<img src="images/Export_f20.jpg" alt="Figure: Export dialog" />
+</div>
 </div>
 <div class="paragraph"><p>A dive log or part of it can be saved in three formats:</p></div>
 <div class="ulist"><ul>
@@ -3602,349 +3602,369 @@ Under <em>Style Options</em> some style-related options are available like font
 instance <em>www.divelogs.de</em>.</p></div>
 </div>
 </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="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
-   de plongée pour correspondre aux informations affichées dans le panneau de configuration.
+</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. Storing and retrieving a
+dive log from the cloud is no more difficult than accessing the dives on the
+local hard disk.  The only requirement is that one should first register as
+a user on the cloud.  To use <em>Subsurface cloud storage</em> , follow these
+steps:</p></div>
+<div class="sect2">
+<h3 id="_create_a_cloud_storage_account">9.1. Create a cloud storage account</h3>
+<div class="ulist"><ul>
+<li>
+<p>
+Open the <strong>Network Preferences</strong> by selecting <em>File</em> → <em>Preferences</em> → <em>Network</em>.
 </p>
 </li>
 <li>
 <p>
-<strong>Sauvegarder</strong>. Cela enregistre la configuration dans un fichier. <em>Subsurface</em> demande
-   l’emplacement et le nom du fichier pour enregistrer les informations.
+In the section headed <em>Subsurface cloud storage</em>, enter an email address that
+   _Su bsurface can use for user registration.
 </p>
 </li>
 <li>
 <p>
-<strong>Restaurer une sauvegarde</strong>. Cela charge les informations à partir d’un fichier de sauvegarde et l’affiche
-   dans le panneau de configuration.
+Enter a novel password that_Subsurface_ will use to store the
+  dive log in the cloud.
 </p>
 </li>
 <li>
 <p>
-<strong>Mettre à jour le firmware</strong>. Si un nouveau firmware est disponible pour l’ordinateur de plongée,
-   il sera chargé dans l’ordinateur de plongée.
+Click <em>Apply</em> to send the above email address and password to the
+  (remote) cloud server. The server responds by sending a verification PIN to
+  the above email address (This is the <strong>only</strong> occasion that <em>Subsurface</em> uses the
+  email address provided above). The <strong>Network Preferences</strong> dialog now has a new PIN text
+   box, not visible previously.
+</p>
+</li>
+<li>
+<p>
+Enter the PIN in the corresponding text box in the <strong>Network Preferences</strong> dialog
+(this field is only visible while the server is waiting for email
+address confirmation)
+</p>
+</li>
+<li>
+<p>
+Click <em>Apply</em> again. The <em>Subsurface cloud storage</em> account
+will be marked as verified and the <em>Subsurface cloud storage</em> service is initialised for use.
 </p>
 </li>
 </ul></div>
 </div>
-</div>
-<div class="sect1">
-<h2 id="S_Preferences">12. Setting user <em>Preferences</em> for <em>Subsurface</em></h2>
+<div class="sect2">
+<h3 id="_using_em_subsurface_cloud_storage_em">9.2. Using <em>Subsurface cloud storage</em></h3>
+<div class="ulist"><ul>
+<li>
+<p>
+Once the cloud storage has been initialised, two new items appear in the
+   <em>File</em> menu of the main menu system: <em>Open cloud storage</em> and <em>Save to cloud storage</em>.
+These options allow the user to load and save data to the <em>Subsurface
+cloud storage</em> server.
+</p>
+</li>
+<li>
+<p>
+In the <em>Defaults Preferences</em> tab, one can select to use the <em>Subsurface cloud
+storage</em> data as one’s default data file by checking the check box marked <em>Cloud storage default file</em>.
+ This means that the data from
+the <em>Subsurface cloud storage</em> is loaded when <em>Subsurface</em> starts ans saved there when one closes <em>Subsurface</em>.
+</p>
+</li>
+<li>
+<p>
+<em>Subsurface</em> keeps a local copy of the data and the cloud facility remains fully
+functional even if used while disconnected to the Internet. <em>Subsurface</em> simply synchronises the
+data with the cloud server the next time ithe program is used while the computer is
+connected to the Internet.
+</p>
+</li>
+</ul></div>
+</div>
+<div class="sect2">
+<h3 id="_web_access_to_em_subsurface_cloud_storage_em">9.3. Web access to <em>Subsurface cloud storage</em></h3>
+<div class="paragraph"><p>One of the nice side benefits of using <em>Subsurface cloud storage</em> is that
+one can also access one’s dive data from any web browser. Simply open
+<a href="https://cloud.subsurface-divelog.org"><em>https://cloud.subsurface-divelog.org</em></a>,
+log in with the same email and password, and you can see an HTML export of
+the last dive data that was synced to the <em>Subsurface cloud storage</em>. The
+dive information that is shown is only the contents of the recorded dive
+logs, NOT the calculated values shown in the <strong>Profile</strong> panel, including some
+cylinder pressures, deco ceilings and O<sub>2</sub>/He/N<sub>2</sub> partial pressures.</p></div>
+</div>
+<div class="sect2">
+<h3 id="_other_cloud_services">9.4. Other cloud services</h3>
+<div class="paragraph"><p>If one prefers not to use the integrated cloud storage of dive logs (and
+don’t need the web access), it is also simple to store dive logs in the
+cloud using several of the existing facilities on the Internet.  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 on <em>Dropbox</em>, 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 <em>Dropbox</em>, 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>
+<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
+   de plongée pour correspondre aux informations affichées dans le panneau de configuration.
+</p>
+</li>
+<li>
+<p>
+<strong>Sauvegarder</strong>. Cela enregistre la configuration dans un fichier. <em>Subsurface</em> demande
+   l’emplacement et le nom du fichier pour enregistrer les informations.
+</p>
+</li>
+<li>
+<p>
+<strong>Restaurer une sauvegarde</strong>. Cela charge les informations à partir d’un fichier de sauvegarde et l’affiche
+   dans le panneau de configuration.
+</p>
+</li>
+<li>
+<p>
+<strong>Mettre à jour le firmware</strong>. Si un nouveau firmware est disponible pour l’ordinateur de plongée,
+   il sera chargé dans l’ordinateur de plongée.
+</p>
+</li>
+</ul></div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="S_Preferences">12. Setting user <em>Preferences</em> for <em>Subsurface</em></h2>
 <div class="sectionbody">
 <div class="paragraph"><p>There are several settings within <em>Subsurface</em> that the user can
 specify. These are found when selecting <em>File → Preferences</em>. The settings
@@ -4049,43 +4069,43 @@ the dive profile:
 <div class="ulist"><ul>
 <li>
 <p>
-<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
-   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
+<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
+   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
    deepest depth of a dive. If this box is not checked, GF_Low is applied at
    all depths deeper than the first deco stop. For more information see:
 </p>
@@ -4176,44 +4196,44 @@ on the Internet.</p></div>
 </div>
 <div class="paragraph"><p>This is important, for instance, when <em>Subsurface</em> needs to communicate with
 Internet services such as the <a href="#S_Companion"><em>Subsurface Companion app</em></a> or
-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
-addition of gradient factors as implemented by Erik Baker.</p></div>
-<div class="sidebarblock">
-<div class="content">
+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
+addition of gradient factors as implemented by Erik Baker.</p></div>
+<div class="sidebarblock">
+<div class="content">
 <div class="admonitionblock">
 <table><tr>
 <td class="icon">
@@ -4266,602 +4286,613 @@ A user who is not absolutely sure about any of the above requirements should
 <h3 id="_the_em_subsurface_em_dive_planner_screen">13.1. The <em>Subsurface</em> dive planner screen</h3>
 <div class="paragraph"><p>Like the <em>Subsurface</em> dive log, the planner screen is divided into several
 sections (see image below). The <strong>setup</strong> parameters for a dive are entered
-into the several sections on the left hand side of the screen.  The setup is
-divided into several sections: Available Gases, Rates, Planning, Gas Options
-and 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="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
-paste to a word processor.</p></div>
+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="sect1">
-<h2 id="_description_des_éléments_du_menu_principal_de_subsurface">14. Description des éléments du menu principal de Subsurface</h2>
-<div class="sectionbody">
-<div class="paragraph"><p>Cette section décrit les fonctions et les opérations des éléments du menu
-principal de Subsurface. Plusieurs éléments ci-dessous sont des liens vers
-des sections de ce manuel traitant des opérations relatives.</p></div>
 <div class="sect2">
-<h3 id="_fichier">14.1. Fichier</h3>
+<h3 id="_open_circuit_dives">13.2. Open circuit dives</h3>
 <div class="ulist"><ul>
 <li>
 <p>
-<a href="#S_NewLogbook"><em>Nouveau carnet de plongée</em></a> - Fermer le carnet de plongée
-  actuellement ouvert et supprime toutes les informations de plongées.
+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>
-</li>
+<div class="ulist"><ul>
 <li>
 <p>
-<em>Ouvrir un carnet de plongée</em> - Cela ouvre une fenêtre pour sélectionner le
-  carnet de plongée à ouvrir.
+Open Circuit (the default)
 </p>
 </li>
 <li>
 <p>
-<em>Sauvegarder</em> - Enregistrer le carnet de plongée qui est actuellement
-  ouvert.
+CCR
 </p>
 </li>
 <li>
 <p>
-<em>Enregsitrer sous</em> - Enregistrer le carnet actuel sous un nom différent.
+pSCR
 </p>
 </li>
+</ul></div>
+</li>
 <li>
 <p>
-<em>Fermer</em> - Fermer le carnet de plongée actuellement ouvert.
+Choose the Open Circuit option.
 </p>
 </li>
-<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>.
-</p>
-</li>
-</ul></div>
-</div>
-<div class="sect2">
-<h3 id="_importer">14.2. Importer</h3>
-<div class="ulist"><ul>
 <li>
 <p>
-<a href="#S_ImportDiveComputer"><em>Importer depuis un l’ordinateur de plongée</em></a> -
-  Importer des informations de plongées à partir de l’ordinateur de plongée.
+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>
-<a href="#Unified_import"><em>Importer des fichiers de log</em></a> - Importer des
-  informations de plongées à partir d’un fichier d’un format compatible avec
-  <em>Subsurface</em>.
+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>
-<a href="#S_Companion"><em>Importer les données GPS depis le service web Subsurface</em></a> -
-  Charge les coordonnées GPS à partir de l’application mobile <em>Subsurface</em>
-  (téléphones et tablettes).
+The profile of the planned dive can be created in two ways:
 </p>
-</li>
+<div class="ulist"><ul>
 <li>
 <p>
-<a href="#S_ImportingDivelogsDe"><em>Importer depuis Divelogs.de</em></a> - Importer des
-  informations de plongées à partir de <em>www.Divelogs.de</em>.
-</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
-  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>
+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>
-<a href="#S_Renumber"><em>Renuméroter</em></a> - Renuméroter les plongées sélectionnées dans
-  le panneau de la <strong>liste des plongées</strong>.
+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>
-<a href="#S_Group"><em>Grouper automatiquement</em></a> - Grouper les plongées du panneau de
-  <strong>liste des plongées</strong> dans des voyages de plongées.
+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>
-<a href="#S_DeviceNames"><em>Editer les noms des ordinateurs de plongée</em></a> - Modifier
-  les noms des ordinateurs de plongée pour faciliter vos journaux (logs).
+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>
-<a href="#S_Filter"><em>Filtrer la liste des plongées</em></a> - Sélectionner seulement
-  certaines plongées, à partir de tags ou de critères de plongées.
+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>
-</ul></div>
-</div>
-<div class="sect2">
-<h3 id="_vue">14.4. Vue</h3>
-<div class="ulist"><ul>
 <li>
 <p>
-<a href="#S_ViewPanels"><em>Tout</em></a> - Affiche les quatre panneaux principaux de
-  <em>Subsurface</em> simultanément.
+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>
-<a href="#S_ViewPanels"><em>Liste des plongées</em></a> - Affiche uniquement le panneau de la
+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 that requires
+sufficient air for buddy-sharing during the ascent.</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 deco model (GFLow, GFHigh or Conservatism level) under the headings <em>Rates</em> and <em>Planning</em>
+to the bottom left of the planning screen. Two deco models are supported the Buehlmann model and the VPM-B
+model. Select one of the two models. When selecting the Buehlmann model, the gradient factors (GF_high and GF_low
+need to be specified. 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>.</p></div>
+<div class="paragraph"><p>If the VPM-B model is selected, the Conservatism_level needs to be specified
+on a scale of 0 (least conservative) to 4 (most conservative).  This model
+tends to give deco stops at deeper levels than the Beuhlmann model and often
+results in slightly shorter dive durations than the Buehlmann model. When
+selecting one of these models, keep in mind that they are NOT exact
+physiological models but only mathematical models that appear to work in
+practice.</p></div>
+<div class="paragraph"><p>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.  Un excellent livre non technique qui traite à la fois des
+modèles de décompression Buehlmann et VPM-B.
+</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
+paste to a word processor.</p></div>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_description_des_éléments_du_menu_principal_de_subsurface">14. Description des éléments du menu principal de Subsurface</h2>
+<div class="sectionbody">
+<div class="paragraph"><p>Cette section décrit les fonctions et les opérations des éléments du menu
+principal de Subsurface. Plusieurs éléments ci-dessous sont des liens vers
+des sections de ce manuel traitant des opérations relatives.</p></div>
+<div class="sect2">
+<h3 id="_fichier">14.1. Fichier</h3>
+<div class="ulist"><ul>
+<li>
+<p>
+<a href="#S_NewLogbook"><em>Nouveau carnet de plongée</em></a> - Fermer le carnet de plongée
+  actuellement ouvert et supprime toutes les informations de plongées.
+</p>
+</li>
+<li>
+<p>
+<em>Ouvrir un carnet de plongée</em> - Cela ouvre une fenêtre pour sélectionner le
+  carnet de plongée à ouvrir.
+</p>
+</li>
+<li>
+<p>
+<em>Sauvegarder</em> - Enregistrer le carnet de plongée qui est actuellement
+  ouvert.
+</p>
+</li>
+<li>
+<p>
+<em>Enregsitrer sous</em> - Enregistrer le carnet actuel sous un nom différent.
+</p>
+</li>
+<li>
+<p>
+<em>Fermer</em> - Fermer le carnet de plongée actuellement ouvert.
+</p>
+</li>
+<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>.
+</p>
+</li>
+</ul></div>
+</div>
+<div class="sect2">
+<h3 id="_importer">14.2. Importer</h3>
+<div class="ulist"><ul>
+<li>
+<p>
+<a href="#S_ImportDiveComputer"><em>Importer depuis un l’ordinateur de plongée</em></a> -
+  Importer des informations de plongées à partir de l’ordinateur de plongée.
+</p>
+</li>
+<li>
+<p>
+<a href="#Unified_import"><em>Importer des fichiers de log</em></a> - Importer des
+  informations de plongées à partir d’un fichier d’un format compatible avec
+  <em>Subsurface</em>.
+</p>
+</li>
+<li>
+<p>
+<a href="#S_Companion"><em>Importer les données GPS depis le service web Subsurface</em></a> -
+  Charge les coordonnées GPS à partir de l’application mobile <em>Subsurface</em>
+  (téléphones et tablettes).
+</p>
+</li>
+<li>
+<p>
+<a href="#S_ImportingDivelogsDe"><em>Importer depuis Divelogs.de</em></a> - Importer des
+  informations de plongées à partir de <em>www.Divelogs.de</em>.
+</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
+  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>
+</li>
+<li>
+<p>
+<a href="#S_Renumber"><em>Renuméroter</em></a> - Renuméroter les plongées sélectionnées dans
+  le panneau de la <strong>liste des plongées</strong>.
+</p>
+</li>
+<li>
+<p>
+<a href="#S_Group"><em>Grouper automatiquement</em></a> - Grouper les plongées du panneau de
+  <strong>liste des plongées</strong> dans des voyages de plongées.
+</p>
+</li>
+<li>
+<p>
+<a href="#S_DeviceNames"><em>Editer les noms des ordinateurs de plongée</em></a> - Modifier
+  les noms des ordinateurs de plongée pour faciliter vos journaux (logs).
+</p>
+</li>
+<li>
+<p>
+<a href="#S_Filter"><em>Filtrer la liste des plongées</em></a> - Sélectionner seulement
+  certaines plongées, à partir de tags ou de critères de plongées.
+</p>
+</li>
+</ul></div>
+</div>
+<div class="sect2">
+<h3 id="_vue">14.4. Vue</h3>
+<div class="ulist"><ul>
+<li>
+<p>
+<a href="#S_ViewPanels"><em>Tout</em></a> - Affiche les quatre panneaux principaux de
+  <em>Subsurface</em> simultanément.
+</p>
+</li>
+<li>
+<p>
+<a href="#S_ViewPanels"><em>Liste des plongées</em></a> - Affiche uniquement le panneau de la
   <strong>liste des plongées</strong>.
 </p>
 </li>
@@ -4928,51 +4959,51 @@ des sections de ce manuel traitant des opérations relatives.</p></div>
 </p>
 </li>
 <li>
-<p>
-<em>Manuel utilisateur</em>  - Ouvre une fenêtre affichant ce manuel utilisateur.
-</p>
-</li>
-</ul></div>
-</div>
-</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>
+<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
+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>
 </div>
 <div class="ulist"><ul>
 <li>
@@ -4992,25 +5023,25 @@ Sous Windows, le bon pilote devrait être téléchargé automatiquement la
 </p>
 </li>
 </ul></div>
-<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,
-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
+<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,
+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
 où cela ne fonctionnerait pas, voici quelques suggestions pour trouver le
 nom de votre périphérique ;</td>
 </tr></table>
@@ -5081,603 +5112,603 @@ d’Ubuntu : <code>sudo usermod -a -G dialout johnB</code>)  Cela ajoute joh
 <code>dialout</code>.
 Tapez : <code>id johnB</code>     Cela liste tous les groupes auquel johnB appartient et
 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
-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>
-</tr></table>
+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="ulist"><ul>
-<li>
-<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>
-<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
-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
-logs. Communication between dive computer and desktop computer utilises the
-IrDA infra-red protocol. Only data for one dive can be downloaded at a time,
-comprising three files:</td>
+<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>
 </tr></table>
 </div>
 <div class="ulist"><ul>
 <li>
 <p>
-Setup configuration for the dive and key dive parameters (file with a .txt
-  extension)
+<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>
-Dive log details (file with a .csv extension)
+<strong>Pair the <em>Subsurface</em> computer with the dive computer.</strong>
 </p>
 </li>
-<li>
-<p>
-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
-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
-managed from within <em>Subsurface</em> (together with dives using many other types
-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>
-<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>
-<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>
-<div class="olist arabic"><ol class="arabic">
-<li>
-<p>
-Export the foreign dive log data to format that is accessible from
-  <em>Subsurface</em>.
+</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>
-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.
-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
+<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
+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
+logs. Communication between dive computer and desktop computer utilises the
+IrDA infra-red protocol. Only data for one dive can be downloaded at a time,
+comprising three files:</td>
+</tr></table>
+</div>
+<div class="ulist"><ul>
+<li>
+<p>
+Setup configuration for the dive and key dive parameters (file with a .txt
+  extension)
+</p>
+</li>
+<li>
+<p>
+Dive log details (file with a .csv extension)
+</p>
+</li>
+<li>
+<p>
+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
+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
+managed from within <em>Subsurface</em> (together with dives using many other types
+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>
+<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>
+<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>
+<div class="olist arabic"><ol class="arabic">
+<li>
+<p>
+Export the foreign dive log data to format that is accessible from
+  <em>Subsurface</em>.
+</p>
+</li>
+<li>
+<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.
+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
 naming conventions to export dive log data.</td>
 </tr></table>
 </div>
@@ -5693,44 +5724,44 @@ Start <em>Suunto Divemanager 3</em> and log in with the name containing the logs
 Do not start the import wizard to import dives from the dive computer.
 </p>
 </li>
-<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>
-<li>
-<p>
-Click the browse button next to the field Export Path
+<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>
+<li>
+<p>
+Click the browse button next to the field Export Path
 </p>
 <div class="ulist"><ul>
 <li>
@@ -5778,234 +5809,234 @@ a backup of the dives. Both methods are described here.</p></div>
 <div class="olist arabic"><ol class="arabic">
 <li>
 <p>
-Start Suunto DM4/DM5
+Start Suunto DM4/DM5
+</p>
+</li>
+<li>
+<p>
+Select <em>Help → About</em>
+</p>
+</li>
+<li>
+<p>
+Click <em>Copy</em> after text <em>Copy log folder path to clipboard</em>
+</p>
+</li>
+<li>
+<p>
+Now open Windows Explorer
+</p>
+</li>
+<li>
+<p>
+Paste the address to the path box at the top of the File Explorer
+</p>
+</li>
+<li>
+<p>
+The database is called DM4.db or DM5.db
+</p>
+</li>
+</ol></div>
+<div class="paragraph"><p>Making a backup copy of the Suunto DM4/DM5 database:</p></div>
+<div class="olist arabic"><ol class="arabic">
+<li>
+<p>
+Start Suunto DM4/DM5
+</p>
+</li>
+<li>
+<p>
+Select <em>File - Create backup</em>
+</p>
+</li>
+<li>
+<p>
+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
+</p>
+</li>
+<li>
+<p>
+Click <em>Save</em>
+</p>
+</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
+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
+format which can be imported into <em>Subsurface</em>.</td>
+</tr></table>
+</div>
+<div class="olist arabic"><ol class="arabic">
+<li>
+<p>
+Within Dive Organiser, select <em>Database → Backup</em> from the main menu and
+   back up the database to the desk top.  This creates a zipped file
+   DiveOrganiserxxxxx.dbf.
+</p>
+</li>
+<li>
+<p>
+Rename the file to DiveOrganiserxxxxx.zip. Inside the zipped directory is a
+   file <em>DiveOrganiser.sdf</em>.
 </p>
 </li>
 <li>
 <p>
-Select <em>Help → About</em>
+Extract the <em>.sdf</em> file from the zipped folder to your Desktop.
 </p>
 </li>
 <li>
 <p>
-Click <em>Copy</em> after text <em>Copy log folder path to clipboard</em>
+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>
-Now open Windows Explorer
+In DivingLog open the <em>File → Export → SQLite</em> menu
 </p>
 </li>
 <li>
 <p>
-Paste the address to the path box at the top of the File Explorer
+Select <em>Settings</em> button
 </p>
 </li>
 <li>
 <p>
-The database is called DM4.db or DM5.db
+Set the <em>RTF2Plaintext</em> to <em>true</em>
 </p>
 </li>
-</ol></div>
-<div class="paragraph"><p>Making a backup copy of the Suunto DM4/DM5 database:</p></div>
-<div class="olist arabic"><ol class="arabic">
 <li>
 <p>
-Start Suunto DM4/DM5
+Close the Settings dialog
 </p>
 </li>
 <li>
 <p>
-Select <em>File - Create backup</em>
+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>
-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
+Date : utiliser un des formats suivants : aaaa-mm-jj, jj.mm.aaaa, mm/jj/aaaa
 </p>
 </li>
 <li>
 <p>
-Click <em>Save</em>
+Durée : le format est minutes:secondes.
 </p>
-</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
-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
-format which can be imported into <em>Subsurface</em>.</td>
-</tr></table>
-</div>
-<div class="olist arabic"><ol class="arabic">
+</li>
 <li>
 <p>
-Within Dive Organiser, select <em>Database → Backup</em> from the main menu and
-   back up the database to the desk top.  This creates a zipped file
-   DiveOrganiserxxxxx.dbf.
+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>
-Rename the file to DiveOrganiserxxxxx.zip. Inside the zipped directory is a
-   file <em>DiveOrganiser.sdf</em>.
+Étiquettes et équipiers : les valeurs doivent être séparées par des
+   virgules.
 </p>
 </li>
 <li>
 <p>
-Extract the <em>.sdf</em> file from the zipped folder to your Desktop.
+Position GPS : vous devez utiliser les degrés décimaux, par exemple :
+   30.22496 30.821798
 </p>
-</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 →
-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;">
+</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;">
 <div class="content">
 <img src="images/LOffice_save_as_options.jpg" alt="FIGURE: Save as options" />
 </div>
@@ -6014,25 +6045,25 @@ file type and select the option <em>Edit filter settings</em>.</p></div>
 to prevent conflicts with the comma when using this as a decimal point),
 then select <em>OK</em>.</p></div>
 <div class="imageblock" style="text-align:center;">
-<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 class="ulist"><ul>
-<li>
-<p>
+<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 class="ulist"><ul>
+<li>
+<p>
 In Microsoft Windows, click the <strong>Start</strong> button, and then select <em>Control
   Panel</em> from the list on the right-hand side.
 </p>
@@ -6084,377 +6115,377 @@ the appropriate folder has been selected to save the CSV file into.</p></div>
 <div class="content">
 <img src="images/Win_SaveCSV3.jpg" alt="FIGURE: Excel save CSV dialogue" />
 </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
-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
+</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
+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
 theory.  But an "ideal gas" doesn’t actually exist, and real gases actually
 don’t compress linearly with pressure. Also, you are missing the fact that
 one atmosphere of pressure isn’t actually one bar.  So the <strong>real</strong>
@@ -6471,55 +6502,55 @@ the compressibility, your gas use is:</p></div>
 calculation that ignored the difference between 1 bar and one ATM.  The
 compressibility does show up above 200 bar, and takes that 1445 down about
 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-09 14:51:47 CEST
-</div>
-</div>
-</body>
-</html>
+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-15 10:11:12 CEST
+</div>
+</div>
+</body>
+</html>
diff --git a/Documentation/user-manual_fr.txt b/Documentation/user-manual_fr.txt
index 7f9b15c..ac74eb1 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::[]
@@ -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 :
 
@@ -2603,45 +2603,65 @@ reason, facilities such as _divelogs.de_ and _Diving Log_ offer to store
 dive log information on the Internet.
 
 _Subsurface_ includes access to a transparently integrated cloud storage
-backend that is available to all Subsurface users. In order to use the
-_Subsurface cloud storage_ the users need to follow these steps
-
-* Create a cloud storage account:
-
-** Open the _Preferences_
-** Under _Defaults_, in the _Subsurface cloud storage_ section, enter
-their email address and a password
-** Click _Apply_ or _Done_ to send email address and password to the
-server
-** The server will respond with an email to the given address that
-contains a verification PIN
-** Enter the PIN in the corresponding field in the _Preferences_ dialog
-(this field is only visible while the backend server is waiting for email
-address confirmation)
-** Click _Apply_ or _Done_ again, the _Subsurface cloud storage_ account
-will be marked as verified and the _Subsurface cloud storage_ service can
-be used
-
-* Use _Subsurface cloud storage_
-
-** From the _File_ menu users can load and save data to the _Subsurface
-cloud storage_ server
-** In the _Preferences_, users can select to use the _Subsurface cloud
-storage_ data as their default data file which means that the data from
-the _Subsurface cloud storage_ will be displayed when _Subsurface_ starts.
-
-_Subsurface_ keeps a local copy of the data and _Subsurface_ stays fully
-functional if used while offline. _Subsurface_ will simply synchronize the
-data with the backend serer the next time it is used while the computer is
-online.
-
-Although _Subsurface_ offers integrated Cloud storage of dive logs, it is
-also simple to achieve this using several of the existing facilities on the
-Internet.
+backend that is available to all Subsurface users. Storing and retrieving a
+dive log from the cloud is no more difficult than accessing the dives on the
+local hard disk.  The only requirement is that one should first register as
+a user on the cloud.  To use _Subsurface cloud storage_ , follow these
+steps:
 
-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
-one's desktop computer.
+=== Create a cloud storage account
+
+** Open the *Network Preferences* by selecting _File_ -> _Preferences_ -> _Network_.
+** In the section headed _Subsurface cloud storage_, enter an email address that
+   _Su bsurface can use for user registration.
+** Enter a novel password that_Subsurface_ will use to store the
+  dive log in the cloud.
+** Click _Apply_ to send the above email address and password to the
+  (remote) cloud server. The server responds by sending a verification PIN to
+  the above email address (This is the *only* occasion that _Subsurface_ uses the
+  email address provided above). The *Network Preferences* dialog now has a new PIN text
+   box, not visible previously.
+** Enter the PIN in the corresponding text box in the *Network Preferences* dialog
+(this field is only visible while the server is waiting for email
+address confirmation)
+** Click _Apply_ again. The _Subsurface cloud storage_ account
+will be marked as verified and the _Subsurface cloud storage_ service is initialised for use.
+
+=== Using _Subsurface cloud storage_
+
+** Once the cloud storage has been initialised, two new items appear in the
+   _File_ menu of the main menu system: _Open cloud storage_ and _Save to cloud storage_.
+These options allow the user to load and save data to the _Subsurface
+cloud storage_ server.
+** In the _Defaults Preferences_ tab, one can select to use the _Subsurface cloud
+storage_ data as one's default data file by checking the check box marked _Cloud storage default file_.
+ This means that the data from
+the _Subsurface cloud storage_ is loaded when _Subsurface_ starts ans saved there when one closes _Subsurface_.
+
+** _Subsurface_ keeps a local copy of the data and the cloud facility remains fully
+functional even if used while disconnected to the Internet. _Subsurface_ simply synchronises the
+data with the cloud server the next time ithe program is used while the computer is
+connected to the Internet.
+
+=== Web access to _Subsurface cloud storage_
+
+One of the nice side benefits of using _Subsurface cloud storage_ is that
+one can also access one's dive data from any web browser. Simply open
+https://cloud.subsurface-divelog.org[_https://cloud.subsurface-divelog.org_],
+log in with the same email and password, and you can see an HTML export of
+the last dive data that was synced to the _Subsurface cloud storage_. The
+dive information that is shown is only the contents of the recorded dive
+logs, NOT the calculated values shown in the *Profile* panel, including some
+cylinder pressures, deco ceilings and O~2~/He/N~2~ partial pressures.
+
+=== Other cloud services
+
+If one prefers not to use the integrated cloud storage of dive logs (and
+don't need the web access), it is also simple to store dive logs in the
+cloud using several of the existing facilities on the Internet.  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 one's
+desktop computer.
 
 image::images/Cloud.jpg["FIGURE: Dropbox folder", align="center"]
 
@@ -2660,9 +2680,9 @@ access. Currently there are no costs involved for this service. Dropbox
 (Windows, Mac and Linux) can be installed by accessing the
 http://www.dropbox.com/install[_Install Page on the Dropbox website_]
 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
+log. To Store a dive log on _Dropbox_, select _File -> Save as_ from the
 _Subsurface_ main menu, navigate to the _Dropbox_ folder and select the
-_Save_ button. To access the dive log in the Cloud, select _File -> Open
+_Save_ button. To access the dive log in _Dropbox_, select _File -> Open
 Logbook_ from the _Subsurface_ main menu and navigate to the dive log file
 in the _Dropbox_ folder and select the _Open_ button.
 
@@ -3126,7 +3146,8 @@ duration or the dive depth needs to be reduced.
 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.
+information in the text box at the bottom right of the panel that requires
+sufficient air for buddy-sharing during the ascent.
 
 image::images/rec_diveplan.jpg["FIGURE: A recreational dive plan: setup", align="center"]
 
@@ -3136,13 +3157,24 @@ Non-recreational dive planning involves exceeding the no-deco limits and/or
 using multiple breathing gases.  Such dives are planned in three stages:
 
 *a) Nitrogen management*: This is performed by specifying the rates for descent and ascent,
-as well as the gradient factors (GFLow and GFHigh) under the headings _Rates_ and _Planning_
-to the bottom left of the planning screen. Initially, the GFHigh and GFLow values in the _Preferences_
+as well as the deco model (GFLow, GFHigh or Conservatism level) under the headings _Rates_ and _Planning_
+to the bottom left of the planning screen. Two deco models are supported the Buehlmann model and the VPM-B
+model. Select one of the two models. When selecting the Buehlmann model, the gradient factors (GF_high and GF_low
+need to be specified. Initially, the GFHigh and GFLow values in the _Preferences_
 panel of _Subsurface_ is used. If these are changed within the planner (see _Gas Options_ within
 the planner), the new values are
 used without changing the original values in the _Preferences_. 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 xref:S_GradientFactors[Gradient Factor Preference settings].
+
+If the VPM-B model is selected, the Conservatism_level needs to be specified
+on a scale of 0 (least conservative) to 4 (most conservative).  This model
+tends to give deco stops at deeper levels than the Beuhlmann model and often
+results in slightly shorter dive durations than the Buehlmann model. When
+selecting one of these models, keep in mind that they are NOT exact
+physiological models but only mathematical models that appear to work in
+practice.
+
 For more information external to this manual see:
 
  * link:http://www.tek-dive.com/portal/upload/M-Values.pdf[Understanding
@@ -3151,7 +3183,8 @@ For more information external to this manual see:
    factors for dummies, by Kevin Watts]
 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:
-1-905492-07-3.  An excellent non-technical review.
+1-905492-07-3.  Un excellent livre non technique qui traite à la fois des
+modèles de décompression Buehlmann et VPM-B.
 
 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)
@@ -3564,8 +3597,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