[PATCH] Documentation: update french translation

Guillaume GARDET guillaume.gardet at free.fr
Tue Feb 3 06:49:36 PST 2015


Update french translation of user-manual and merge latest user-manual updates.

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

---
 Documentation/50-pot/subsurface-manual.pot  | 1989 +++++++++++++++-----------
 Documentation/fr/po/subsurface-manual.fr.po | 2031 +++++++++++++++------------
 Documentation/user-manual_fr.txt            |  411 ++++--
 3 files changed, 2582 insertions(+), 1849 deletions(-)

diff --git a/Documentation/50-pot/subsurface-manual.pot b/Documentation/50-pot/subsurface-manual.pot
index 93639d2..86d1bda 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-01-29 16:16+0100\n"
+"POT-Creation-Date: 2015-02-03 15:45+0100\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"
@@ -549,9 +549,9 @@ msgstr ""
 #: ./user-manual.txt:267
 msgid ""
 "The coordinates can be obtained from the _Subsurface_ Companion app if the "
-"user has an Android device with GPS and if the coordinates of the dive site "
-"were stored using that device.  xref:S_Companion[Click here for more "
-"information]"
+"user has an Android or iPhone device with GPS and if the coordinates of the "
+"dive site were stored using that device.  xref:S_Companion[Click here for "
+"more information]"
 msgstr ""
 
 #. type: Plain text
@@ -966,7 +966,7 @@ msgid ""
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: ./user-manual.txt:486 ./user-manual.txt:2681
+#: ./user-manual.txt:486 ./user-manual.txt:2796
 #, no-wrap
 msgid "images/icons/warning2.png"
 msgstr ""
@@ -1174,7 +1174,7 @@ msgid "*PROBLEMS WITH DATA DOWNLOAD FROM A DIVE COMPUTER?*\n"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: ./user-manual.txt:616 ./user-manual.txt:1161 ./user-manual.txt:1227 ./user-manual.txt:1279 ./user-manual.txt:1355
+#: ./user-manual.txt:616 ./user-manual.txt:1161 ./user-manual.txt:1227 ./user-manual.txt:1280 ./user-manual.txt:1356
 #, no-wrap
 msgid "images/icons/important.png"
 msgstr ""
@@ -1398,9 +1398,9 @@ msgstr ""
 #: ./user-manual.txt:747
 msgid ""
 "The user can obtain the coordinates from the _Subsurface_ Companion app if "
-"an Android device with GPS was used and if the coordinates of the dive site "
-"were stored using that device.  xref:S_Companion[Click here for more "
-"information]"
+"an Android or iPhone device with GPS was used and if the coordinates of the "
+"dive site were stored using that device.  xref:S_Companion[Click here for "
+"more information]"
 msgstr ""
 
 #. type: Plain text
@@ -2199,28 +2199,28 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1248
+#: ./user-manual.txt:1249
 msgid ""
-"Using the *Subsurface Companion App* on an Android device with a GPS, the "
-"coordinates for the diving location can be automatically passed to the "
-"_Subsurface_ dive log. The Companion App stores the dive locations on a "
-"dedicated Internet-based file server. _Subsurface_, in turn, can collect the "
-"localities from the file server."
+"Using the *Subsurface Companion App* on an _Android device_ with a GPS or "
+"xref:S_iphone[_iPhone_], the coordinates for the diving location can be "
+"automatically passed to the _Subsurface_ dive log. The Companion App stores "
+"the dive locations on a dedicated Internet-based file server. _Subsurface_, "
+"in turn, can collect the localities from the file server."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1250
+#: ./user-manual.txt:1251
 msgid "To do this:"
 msgstr ""
 
 #. type: Title ====
-#: ./user-manual.txt:1251
+#: ./user-manual.txt:1252
 #, no-wrap
 msgid "Create a Companion App account"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1256
+#: ./user-manual.txt:1257
 msgid ""
 "Register on the http://api.hohndel.org/login/[_Subsurface companion web "
 "page_].  A confirmation email with instructions and a personal *DIVERID* "
@@ -2229,7 +2229,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1261
+#: ./user-manual.txt:1262
 msgid ""
 "Download the app from "
 "https://play.google.com/store/apps/details?id=org.subsurface[Google Play "
@@ -2238,18 +2238,18 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: ./user-manual.txt:1262
+#: ./user-manual.txt:1263
 #, no-wrap
-msgid "Using the Subsurface companion app on a smartphone"
+msgid "Using the Subsurface companion app on an Android smartphone"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1265
+#: ./user-manual.txt:1266
 msgid "On first use the app has three options:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1271
+#: ./user-manual.txt:1272
 msgid ""
 "_Create a new account._ Equivalent to registering in _Subsurface_ companion "
 "page using an Internet browser. One can request a *DIVERID* using this "
@@ -2259,14 +2259,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1274
+#: ./user-manual.txt:1275
 msgid ""
 "_Retrieve an account._ If users forgot their *DIVERID* they will receive an "
 "email to recover the number."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1278
+#: ./user-manual.txt:1279
 msgid ""
 "_Use an existing account._ Users are prompted for their *DIVERID*. The app "
 "saves this *DIVERID* and does not ask for it again unless one uses the "
@@ -2274,7 +2274,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1286
+#: ./user-manual.txt:1287
 msgid ""
 "In the _Subsurface_ main program, the *DIVERID* should also be entered on "
 "the Default Preferences panel, obtained by selecting _File -> Preferences -> "
@@ -2283,13 +2283,13 @@ msgid ""
 msgstr ""
 
 #. type: Title =====
-#: ./user-manual.txt:1287
+#: ./user-manual.txt:1288
 #, no-wrap
 msgid "Creating new dive locations"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1292
+#: ./user-manual.txt:1293
 msgid ""
 "Now one is ready to get a dive position and send it to the server. The "
 "Android display will look like the left hand image (*A*) below, but without "
@@ -2297,21 +2297,21 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1295
+#: ./user-manual.txt:1296
 msgid ""
 "Touch the \"+\" icon on the top right to add a new dive site, a menu will be "
 "showed with 3 options:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1298
+#: ./user-manual.txt:1299
 msgid ""
 "Current: A prompt for a place name (or a request to activate the GPS if it "
 "is turned off) will be displayed, after which the current location is saved."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1307
+#: ./user-manual.txt:1308
 msgid ""
 "Use Map: This option allows the user to fix a position by searching a world "
 "map. A world map is shown (see *B* below) on which one should indicate the "
@@ -2324,13 +2324,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:1308
+#: ./user-manual.txt:1309
 #, no-wrap
 msgid "images/Companion_5.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1316
+#: ./user-manual.txt:1317
 msgid ""
 "Import local GPX file: The android device searches for .gpx files and "
 "located archives will be shown. The selected .gpx file is opened and the "
@@ -2340,13 +2340,13 @@ msgid ""
 msgstr ""
 
 #. type: Title =====
-#: ./user-manual.txt:1317
+#: ./user-manual.txt:1318
 #, no-wrap
 msgid "Dive lists of dive locations"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1325
+#: ./user-manual.txt:1326
 msgid ""
 "The main screen shows a list of dive locations, each with a name, date and "
 "time (see *A* below). Some locations may have an arrow-up icon over the "
@@ -2358,7 +2358,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1333
+#: ./user-manual.txt:1334
 msgid ""
 "Dive locations in this list can be viewed in two ways: a list of locations "
 "or a map indicating the dive locations. The display mode (List or Map) is "
@@ -2370,13 +2370,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:1334
+#: ./user-manual.txt:1335
 #, no-wrap
 msgid "images/Companion_4.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1340
+#: ./user-manual.txt:1341
 msgid ""
 "When one clicks on a dive (*not* selecting the check box), the name given to "
 "it, date/time and GPS coordinates will be shown, with two options at the top "
@@ -2384,32 +2384,32 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1342
+#: ./user-manual.txt:1343
 msgid ""
 "Edit (pencil): Change the text name or other characteristics of the dive "
 "location."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1344
+#: ./user-manual.txt:1345
 msgid "Maps: Display a map showing the dive location."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1347
+#: ./user-manual.txt:1348
 msgid ""
 "After editing and saving a dive location (see *C* above), one needs to "
 "upload it to the web service, as explained below."
 msgstr ""
 
 #. type: Title =====
-#: ./user-manual.txt:1348
+#: ./user-manual.txt:1349
 #, no-wrap
 msgid "Uploading dive locations"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1354
+#: ./user-manual.txt:1355
 msgid ""
 "There are several ways to send locations to the server.  The easiest is by "
 "simply selecting the locations (See *A* below) and then touching the right "
@@ -2417,51 +2417,51 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1359
+#: ./user-manual.txt:1360
 msgid ""
 "Users must be careful, as the trash icon on the right means exactly what it "
 "should; it deletes the selected dive location(s)."
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:1360
+#: ./user-manual.txt:1361
 #, no-wrap
 msgid "images/Companion_1.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1365
+#: ./user-manual.txt:1366
 msgid ""
 "After a dive trip using the Companion App, all dive locations are ready to "
 "be downloaded to a _Subsurface_ dive log (see below)."
 msgstr ""
 
 #. type: Title =====
-#: ./user-manual.txt:1367
+#: ./user-manual.txt:1368
 #, no-wrap
 msgid "Settings on the Companion app"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1370
+#: ./user-manual.txt:1371
 msgid ""
 "Selecting the _Settings_ menu option results in the right hand image above "
 "(*B*)."
 msgstr ""
 
 #. type: Title =====
-#: ./user-manual.txt:1371
+#: ./user-manual.txt:1372
 #, no-wrap
 msgid "Server and account"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1374
+#: ./user-manual.txt:1375
 msgid "_Web-service URL._ This is predefined (http://api.hohndel.org/)"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1378
+#: ./user-manual.txt:1379
 msgid ""
 "_User ID._ The DIVERID obtained by registering as described above. The "
 "easiest way to obtain it is simply to copy and paste from the confirmation "
@@ -2469,33 +2469,33 @@ msgid ""
 msgstr ""
 
 #. type: Title =====
-#: ./user-manual.txt:1379
+#: ./user-manual.txt:1380
 #, no-wrap
 msgid "Synchronisation"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1383
+#: ./user-manual.txt:1384
 msgid ""
 "_Synchronize on startup._ If selected, dive locations in the Android device "
 "and those on the web service synchronise each time the app is started."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1386
+#: ./user-manual.txt:1387
 msgid ""
 "_Upload new dives._ If selected, each time the user adds a dive location it "
 "is automatically sent to the server."
 msgstr ""
 
 #. type: Title =====
-#: ./user-manual.txt:1387
+#: ./user-manual.txt:1388
 #, no-wrap
 msgid "Background service"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1390
+#: ./user-manual.txt:1391
 msgid ""
 "Instead of entering a unique dive location, users can leave the service "
 "running in the background of their Android device, allowing the continuous "
@@ -2503,35 +2503,35 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1393
+#: ./user-manual.txt:1394
 msgid "The settings below define the behaviour of the service:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1396
+#: ./user-manual.txt:1397
 msgid ""
 "_Min duration._ In minutes. The app will try to get a location every X "
 "minutes until stopped by the user."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1398
+#: ./user-manual.txt:1399
 msgid "_Min distance._ In meters. Minimum distance between two locations."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1400
+#: ./user-manual.txt:1401
 msgid "_Name template._ The name the app will use when saving the locations."
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: ./user-manual.txt:1401 ./user-manual.txt:1477 ./user-manual.txt:1762
+#: ./user-manual.txt:1402 ./user-manual.txt:1499 ./user-manual.txt:1786
 #, no-wrap
 msgid "images/icons/info.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1411
+#: ./user-manual.txt:1412
 msgid ""
 "_How does the background service work?_ Assuming the user sets 5 minutes and "
 "50 meters in the settings above, the app will start by recording a location "
@@ -2544,60 +2544,60 @@ msgid ""
 msgstr ""
 
 #. type: Title =====
-#: ./user-manual.txt:1412
+#: ./user-manual.txt:1413
 #, no-wrap
 msgid "Other"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1416
+#: ./user-manual.txt:1417
 msgid ""
 "_Mailing List._ The mail box for _Subsurface_. Users can send an email to "
 "the Subsurface mailing list."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1418
+#: ./user-manual.txt:1419
 msgid "_Subsurface website._ A link to the URL of Subsurface web"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1420
+#: ./user-manual.txt:1421
 msgid "_Version._ Displays the current version of the Companion App."
 msgstr ""
 
 #. type: Title =====
-#: ./user-manual.txt:1421
+#: ./user-manual.txt:1422
 #, no-wrap
 msgid "Search"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1424
+#: ./user-manual.txt:1425
 msgid "Search the saved dive locations by name or by date and time."
 msgstr ""
 
 #. type: Title =====
-#: ./user-manual.txt:1425
+#: ./user-manual.txt:1426
 #, no-wrap
 msgid "Start service"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1428
+#: ./user-manual.txt:1429
 msgid ""
 "Initiates the _background service_ following the previously defined "
 "settings."
 msgstr ""
 
 #. type: Title =====
-#: ./user-manual.txt:1429
+#: ./user-manual.txt:1430
 #, no-wrap
 msgid "Disconnect"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1437
+#: ./user-manual.txt:1438
 msgid ""
 "This is a badly named option that disconnects the app from the server by "
 "resetting the user ID in the app, showing the first screen where an account "
@@ -2607,24 +2607,68 @@ msgid ""
 msgstr ""
 
 #. type: Title =====
-#: ./user-manual.txt:1438
+#: ./user-manual.txt:1439
 #, no-wrap
 msgid "Send all locations"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1441
+#: ./user-manual.txt:1442
 msgid "This option sends all locations stored in the Android device to the server."
 msgstr ""
 
 #. type: Title ====
-#: ./user-manual.txt:1443
+#: ./user-manual.txt:1444
+#, no-wrap
+msgid "Using the Subsurface companion app on an _iPhone_ to record dive locations"
+msgstr ""
+
+#. type: Plain text
+#: ./user-manual.txt:1449
+msgid ""
+"The iPhone interface is quite simple. One needs to type the user ID "
+"(obtained during registration) into the space reserved for it, then select "
+"\"Dive in\" (see left part of the image below) and start collecting dive "
+"location information."
+msgstr ""
+
+#. type: Target for macro image
+#: ./user-manual.txt:1450
+#, no-wrap
+msgid "images/iphone.jpg"
+msgstr ""
+
+#. type: Plain text
+#: ./user-manual.txt:1457
+msgid ""
+"Dives can be added automatically or manually. In manual mode, a dive "
+"location or waypoint is added to the GPS input stream. In automatic mode, a "
+"continuous path of GPS locations is created from which, much later, after "
+"import, subsurface can select the appropriate GPS locations based on the "
+"times of dives. The default mode for the _iphone_ is automatic. When one "
+"adds a dive, the location service is started automatically and a red bar "
+"appears at the bottom of the screen. After the dive one can click on the red "
+"bar to end the location service. While the location service is running one "
+"can only add dives using the manual mechanism."
+msgstr ""
+
+#. type: Plain text
+#: ./user-manual.txt:1463
+msgid ""
+"One can edit the site name afterwards by selecting the dive from the dive "
+"list and clicking on the site name. There are no other editable fields. The "
+"dive list is automatically uploaded from the iphone to the webservice and "
+"there is not an option to trigger upload manually."
+msgstr ""
+
+#. type: Title ====
+#: ./user-manual.txt:1465
 #, no-wrap
 msgid "Downloading dive locations to the _Subsurface_ divelog"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1452
+#: ./user-manual.txt:1474
 msgid ""
 "Download dive(s) from a dive computer or enter them manually into "
 "_Subsurface_ before obtaining the GPS coordinates from the server. The "
@@ -2636,13 +2680,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:1453
+#: ./user-manual.txt:1475
 #, no-wrap
 msgid "images/DownloadGPS.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1461
+#: ./user-manual.txt:1483
 msgid ""
 "Note that the _Apply_ button is now active. By clicking on it, users can "
 "update the locations of the newly entered or uploaded dives in _Subsurface_ "
@@ -2653,7 +2697,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1468
+#: ./user-manual.txt:1490
 msgid ""
 "Since _Subsurface_ matches GPS locations from the Android device and dive "
 "information from the dive computer based on date-time data, automatic "
@@ -2665,7 +2709,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1476
+#: ./user-manual.txt:1498
 msgid ""
 "Similar date-times may not always be possible and there may be many reasons "
 "for this (e.g. time zones), or _Subsurface_ may be unable to decide which is "
@@ -2679,12 +2723,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1480
+#: ./user-manual.txt:1502
 msgid "TIPS:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1487
+#: ./user-manual.txt:1509
 msgid ""
 "_Background service_, being a very powerful tool, may fill the location list "
 "with many unnecessary locations not corresponding to the exact dive point "
@@ -2697,7 +2741,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1491
+#: ./user-manual.txt:1513
 msgid ""
 "It may also make sense to give informative names to the locations sent to "
 "the web server, or at least to use an informative name in the _Name "
@@ -2706,13 +2750,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:1493
+#: ./user-manual.txt:1515
 #, no-wrap
 msgid "Adding photographs to dives"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1499
+#: ./user-manual.txt:1521
 msgid ""
 "Many (if not most) divers take a camera with them and take photographs "
 "during a dive. One would like to associate each photograph with a specific "
@@ -2721,13 +2765,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: ./user-manual.txt:1500
+#: ./user-manual.txt:1522
 #, no-wrap
 msgid "Loading photos and getting synchronisation between dive computer and camera"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1504
+#: ./user-manual.txt:1526
 msgid ""
 "Left-lick on a dive or on a group of dives on the dive list. Then "
 "right-click on this dive or group of dives and choose the option _Load "
@@ -2735,26 +2779,26 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:1505
+#: ./user-manual.txt:1527
 #, no-wrap
 msgid "images/LoadImage1_f20.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1509
+#: ./user-manual.txt:1531
 msgid ""
 "The system file browser appears. Select the folder and photographs that need "
 "to be loaded into _Subsurface_ and click the _Open_ button."
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:1510
+#: ./user-manual.txt:1532
 #, no-wrap
 msgid "images/LoadImage2_f20.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1519
+#: ./user-manual.txt:1541
 msgid ""
 "This brings one to the time synchronisation dialog, shown below. The "
 "critical problem is that the time synchronisation is not perfect between the "
@@ -2765,12 +2809,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1521
+#: ./user-manual.txt:1543
 msgid "_Subsurface_ achieves this synchronisation in two ways:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1533
+#: ./user-manual.txt:1555
 #, no-wrap
 msgid ""
 "*Manually*: If the user wrote down the exact camera time at the start of a "
@@ -2797,13 +2841,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:1534
+#: ./user-manual.txt:1556
 #, no-wrap
 msgid "images/LoadImage3b_f20.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1552
+#: ./user-manual.txt:1574
 #, no-wrap
 msgid ""
 "*By photograph*: There is a very slick way of achieving synchronisation. If "
@@ -2836,7 +2880,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1555
+#: ./user-manual.txt:1577
 msgid ""
 "If the timestamp of a photograph is long before or after the dive, it is not "
 "placed on the dive profile. If the timestamp of the photo is within 30 "
@@ -2844,62 +2888,62 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: ./user-manual.txt:1556
+#: ./user-manual.txt:1578
 #, no-wrap
 msgid "Viewing the photos"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1560
+#: ./user-manual.txt:1582
 msgid ""
 "In order to view the photos added to a dive, activate the _show-photos_ "
 "button in the tool bar to the left of the dive profile:"
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:1561
+#: ./user-manual.txt:1583
 #, no-wrap
 msgid "images/icons/ShowPhotos_f20.png"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1564
+#: ./user-manual.txt:1586
 msgid "After the images have been loaded, they appear in two places:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1566
+#: ./user-manual.txt:1588
 msgid "the _Photos_ tab of the *Dive Notes* panel."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1568
+#: ./user-manual.txt:1590
 msgid ""
 "as tiny icons (stubs) on the dive profile at the appropriate positions "
 "reflecting the time each photograph was taken. See below:"
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:1569
+#: ./user-manual.txt:1591
 #, no-wrap
 msgid "images/LoadImage4_f20.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1573
+#: ./user-manual.txt:1595
 msgid ""
 "If one hovers with the mouse over any of the photo icons, then a thumbnail "
 "photo is shown of the appropriate photo. See the image below:"
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:1574
+#: ./user-manual.txt:1596
 #, no-wrap
 msgid "images/LoadImage5_f20.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1583
+#: ./user-manual.txt:1605
 msgid ""
 "Clicking on the thumbnail brings up a full size photo overlaid on the "
 "_Subsurface_ window. This allows good viewing of the photographs that have "
@@ -2911,19 +2955,19 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:1584
+#: ./user-manual.txt:1606
 #, no-wrap
 msgid "images/LoadImage6_f20.jpg"
 msgstr ""
 
 #. type: Title ====
-#: ./user-manual.txt:1586
+#: ./user-manual.txt:1608
 #, no-wrap
 msgid "The _Photos_ tab"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1597
+#: ./user-manual.txt:1619
 msgid ""
 "Photographs associated with a dive are shown as thumbnails in the _Photos_ "
 "tab of the _Dive Notes_ panel. Photos taken in rapid succession during a "
@@ -2939,13 +2983,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: ./user-manual.txt:1598
+#: ./user-manual.txt:1620
 #, no-wrap
 msgid "Photos on an external hard disk"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1609
+#: ./user-manual.txt:1631
 msgid ""
 "Most underwater photographers store their photos on an external drive. If "
 "such a drive can be mapped (almost always the case) the photos can be "
@@ -2963,26 +3007,26 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:1611
+#: ./user-manual.txt:1633
 #, no-wrap
 msgid "Logging special types of dives"
 msgstr ""
 
 #. type: Title ====
-#: ./user-manual.txt:1613
+#: ./user-manual.txt:1635
 #, no-wrap
 msgid "Sidemount dives"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1617
+#: ./user-manual.txt:1639
 msgid ""
 "_Subsurface_ easily handles dives involving more than one "
 "cylinder. Sidemount dive logging involves three steps:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1626
+#: ./user-manual.txt:1648
 #, no-wrap
 msgid ""
 "*During the dive, recording cylinder switch events*. Since sidemount diving "
@@ -3004,7 +3048,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1629
+#: ./user-manual.txt:1651
 #, no-wrap
 msgid ""
 "*Within _Subsurface_ describe the cylinders used during the dive*. The diver "
@@ -3015,7 +3059,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1639
+#: ./user-manual.txt:1661
 #, no-wrap
 msgid ""
 "*Indicate cylinder change events on the _Subsurface_ dive profile*. Once the "
@@ -3040,32 +3084,32 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:1640
+#: ./user-manual.txt:1662
 #, no-wrap
 msgid "images/sidemount1.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1643
+#: ./user-manual.txt:1665
 msgid ""
 "This section gives an example of the versatility of _Subsurface_ as a give "
 "logging tool."
 msgstr ""
 
 #. type: Title ====
-#: ./user-manual.txt:1645
+#: ./user-manual.txt:1667
 #, no-wrap
 msgid "Closed circuit rebreather (CCR) dives"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: ./user-manual.txt:1647
+#: ./user-manual.txt:1669
 #, no-wrap
 msgid "images/APD.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1652
+#: ./user-manual.txt:1674
 msgid ""
 "Closed system rebreathers use advanced technology to recirculate gas that "
 "has been breathed while doing two things to maintain a breathable oxygen "
@@ -3073,12 +3117,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1653
+#: ./user-manual.txt:1675
 msgid "remove carbon dioxide from the gas that has been exhaled"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1662
+#: ./user-manual.txt:1684
 msgid ""
 "regulate the oxygen concentration to remain within safe diving limits.  "
 "Currently, within _Subsurface_, the Poseidon MkVI Discovery is the best "
@@ -3092,13 +3136,13 @@ msgid ""
 msgstr ""
 
 #. type: Title =====
-#: ./user-manual.txt:1663
+#: ./user-manual.txt:1685
 #, no-wrap
 msgid "Import a CCR dive"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1676
+#: ./user-manual.txt:1698
 msgid ""
 "See the section dealing with xref:S_ImportingAlienDiveLogs[Importing dive "
 "information from other digital sources]. From the main menu of _Subsurface_, "
@@ -3116,13 +3160,13 @@ msgid ""
 msgstr ""
 
 #. type: Title =====
-#: ./user-manual.txt:1677
+#: ./user-manual.txt:1699
 #, no-wrap
 msgid "Displayed information for a CCR dive"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1687
+#: ./user-manual.txt:1709
 msgid ""
 "_Partial pressures of gases_: The graph of oxygen partial pressure shows the "
 "information from the oxygen sensors of the CCR equipment. In contrast to "
@@ -3131,17 +3175,17 @@ msgid ""
 "pO~2~, 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~2~ is NOT the mean oxygen partial pressure as "
-"given by the CCR equipment, but a value xalculated by _Subsurface_ as "
+"given by the CCR equipment, but a value calculated by _Subsurface_ as "
 "follows:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1689
+#: ./user-manual.txt:1711
 msgid "For TWO O~2~ sensors the mean value of the two sensors are given."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1693
+#: ./user-manual.txt:1715
 msgid ""
 "For THREE-sensor systems (e.g. APD), the mean value is also used. However "
 "differences of more than 0,1 bar in the simultaneous readings of different "
@@ -3150,12 +3194,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1695
+#: ./user-manual.txt:1717
+msgid ""
+"If no sensor data is available, the pO~2~ value is assumed to be equal to "
+"the setpoint."
+msgstr ""
+
+#. type: Plain text
+#: ./user-manual.txt:1719
 msgid "The mean pO~2~ of the sensors is indicated with a green line,"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1703
+#: ./user-manual.txt:1727
 msgid ""
 "The oxygen setpoint values as well as the readings from the individual "
 "oxygen sensors can be shown. The display of additional CCR information is "
@@ -3167,13 +3218,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:1704
+#: ./user-manual.txt:1728
 #, no-wrap
 msgid "images/CCR_preferences_f20.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1711
+#: ./user-manual.txt:1735
 msgid ""
 "Checking any of the check boxes allows the display of additional "
 "oxygen-related information whenever the pO~2~ toolbar button on the "
@@ -3184,13 +3235,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:1712
+#: ./user-manual.txt:1736
 #, no-wrap
 msgid "images/CCR_setpoint_f20.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1716
+#: ./user-manual.txt:1740
 msgid ""
 "The second checkbox allows the display of the data from each individual "
 "oxygen sensor of the CCR equipment. The data for each sensor is colour-coded "
@@ -3198,22 +3249,22 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1718
+#: ./user-manual.txt:1742
 msgid "Sensor 1: grey"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1719
+#: ./user-manual.txt:1743
 msgid "Sensor 2: blue"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1720
+#: ./user-manual.txt:1744
 msgid "Sensor 3: brown"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1724
+#: ./user-manual.txt:1748
 msgid ""
 "The mean oxygen pO~2~ is indicated by the green line. This allows the direct "
 "comparison of data from each of the oxygen sensors, useful for detecting "
@@ -3221,13 +3272,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:1725
+#: ./user-manual.txt:1749
 #, no-wrap
 msgid "images/CCR_sensor_data_f20.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1730
+#: ./user-manual.txt:1754
 msgid ""
 "The setpoint data can be overlaid on the oxygen sensor data by activating "
 "both of the above check boxes. Partial pressures for nitrogen (and helium, "
@@ -3235,7 +3286,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1734
+#: ./user-manual.txt:1758
 msgid ""
 "_Events_: Several events are logged, e.g. switching the mouthpiece to open "
 "circuit.  These events are indicated by yellow triangles and, if one hovers "
@@ -3244,7 +3295,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1742
+#: ./user-manual.txt:1766
 msgid ""
 "_Cylinder pressures_: Some CCR dive computers like the Poseidon MkVI record "
 "the pressures of the oxygen and diluent cylinders. The pressures of these "
@@ -3257,21 +3308,21 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:1743
+#: ./user-manual.txt:1767
 #, no-wrap
 msgid "images/CCR_dive_profile_f20.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1748
+#: ./user-manual.txt:1772
 msgid ""
 "_Equipment-specific information_: Equipment-specific information gathered by "
-"_Subsurface_ is shown in the xref:S_ExtraTab[Extra data tab]. This may "
+"_Subsurface_ is shown in the xref:S_ExtraDataTab[Extra data tab]. This may "
 "include setup information or metadata about the dive."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1751
+#: ./user-manual.txt:1775
 msgid ""
 "More equipment-specific information for downloading CCR dive logs for "
 "Poseidon MkVI and APD equipment can be found in xref:S_PoseidonMkVI[Appendix "
@@ -3279,19 +3330,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ==
-#: ./user-manual.txt:1752
+#: ./user-manual.txt:1776
 #, no-wrap
 msgid "Obtaining more information about dives entered into the logbook"
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:1754
+#: ./user-manual.txt:1778
 #, no-wrap
 msgid "The *Dive Info* tab (for individual dives)"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1761
+#: ./user-manual.txt:1785
 msgid ""
 "The Dive Info tab gives some summary information about a particular dive "
 "that has been selected in the *Dive List*. Useful information here includes "
@@ -3301,7 +3352,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1768
+#: ./user-manual.txt:1792
 msgid ""
 "Gas consumption and SAC calculations: _Subsurface_ calculates SAC and Gas "
 "consumption taking in account gas incompressibility, particularly at tank "
@@ -3310,13 +3361,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:1769
+#: ./user-manual.txt:1794
 #, no-wrap
 msgid "The *Extra Data* tab (usually for individual dives)"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1777
+#: ./user-manual.txt:1802
 msgid ""
 "When using a dive computer, it often reports several data items that cannot "
 "easily be presented in a standardised way because the nature of the "
@@ -3328,19 +3379,19 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:1778
+#: ./user-manual.txt:1803
 #, no-wrap
 msgid "images/ExtraDataTab_f20.jpg"
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:1780
+#: ./user-manual.txt:1805
 #, no-wrap
 msgid "The *Stats* tab (for groups of dives)"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1791
+#: ./user-manual.txt:1816
 msgid ""
 "The Stats tab gives summary statistics for more than one dive, assuming that "
 "more than one dive has been selected in the *Dive List* using the standard "
@@ -3353,19 +3404,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:1793
+#: ./user-manual.txt:1818
 #, no-wrap
 msgid "The *Dive Profile*"
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:1795
+#: ./user-manual.txt:1820
 #, no-wrap
 msgid "images/Profile2.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1806
+#: ./user-manual.txt:1831
 msgid ""
 "Of all the panels in _Subsurface_, the Dive Profile contains the most "
 "detailed information about each dive. The Dive Profile has a *button bar* on "
@@ -3378,7 +3429,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block |
-#: ./user-manual.txt:1813
+#: ./user-manual.txt:1838
 #, no-wrap
 msgid ""
 "|*Colour*|*Descent speed (m/min)*|*Ascent speed (m/min)*\n"
@@ -3390,7 +3441,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1818
+#: ./user-manual.txt:1843
 msgid ""
 "The profile also includes depth readings for the peaks and troughs in the "
 "graph.  Thus, users should see the depth of the deepest point and other "
@@ -3398,13 +3449,13 @@ msgid ""
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: ./user-manual.txt:1819
+#: ./user-manual.txt:1844
 #, no-wrap
 msgid "images/icons/scale.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1824
+#: ./user-manual.txt:1849
 msgid ""
 "In some cases the dive profile does not fill the whole area of the *Dive "
 "Profile* panel. Clicking the *Scale* button in the toolbar on the left of "
@@ -3413,7 +3464,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1827
+#: ./user-manual.txt:1852
 #, no-wrap
 msgid ""
 "*Water temperature* is displayed with its own blue line with temperature "
@@ -3422,7 +3473,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1834
+#: ./user-manual.txt:1859
 msgid ""
 "The dive profile can include graphs of the *partial pressures* of O2, N2, "
 "and He during the dive (see figure above) as well as a calculated and dive "
@@ -3433,13 +3484,13 @@ msgid ""
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: ./user-manual.txt:1835
+#: ./user-manual.txt:1860
 #, no-wrap
 msgid "images/icons/O2.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1839
+#: ./user-manual.txt:1864
 msgid ""
 "Clicking this button allows display of the partial pressure of *oxygen* "
 "during the dive. This is depicted below the dive depth and water temperature "
@@ -3447,26 +3498,26 @@ msgid ""
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: ./user-manual.txt:1840
+#: ./user-manual.txt:1865
 #, no-wrap
 msgid "images/icons/N2.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1843
+#: ./user-manual.txt:1868
 msgid ""
 "Clicking this button allows display of the partial pressure of *nitrogen* "
 "during the dive."
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: ./user-manual.txt:1844
+#: ./user-manual.txt:1869
 #, no-wrap
 msgid "images/icons/He.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1848
+#: ./user-manual.txt:1873
 msgid ""
 "Clicking this button allows display of the partial pressure of *helium* "
 "during the dive.  This is only of importance to divers using Trimix, "
@@ -3474,7 +3525,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1861
+#: ./user-manual.txt:1886
 msgid ""
 "The *air consumption* graph displays the tank pressure and its change during "
 "the dive. The air consumption takes depth into account so that even when "
@@ -3489,13 +3540,13 @@ msgid ""
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: ./user-manual.txt:1862
+#: ./user-manual.txt:1887
 #, no-wrap
 msgid "images/icons/Heartbutton.png"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1866
+#: ./user-manual.txt:1891
 msgid ""
 "Clicking on the heart rate button will allow the display of heart rate "
 "information during the dive if the dive computer was attached to a heart "
@@ -3503,7 +3554,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1874
+#: ./user-manual.txt:1899
 #, no-wrap
 msgid ""
 "It is possible to *zoom* into the profile graph. This is done either by "
@@ -3518,19 +3569,19 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:1875
+#: ./user-manual.txt:1900
 #, no-wrap
 msgid "images/MeasuringBar.png"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: ./user-manual.txt:1877
+#: ./user-manual.txt:1902
 #, no-wrap
 msgid "images/icons/ruler.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1885
+#: ./user-manual.txt:1910
 msgid ""
 "Measurements of *depth or time differences* can be achieved by using the "
 "*ruler button* on the left of the dive profile panel.  The measurement is "
@@ -3540,13 +3591,13 @@ msgid ""
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: ./user-manual.txt:1886
+#: ./user-manual.txt:1911
 #, no-wrap
 msgid "images/icons/ShowPhotos.png"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1893
+#: ./user-manual.txt:1918
 msgid ""
 "Photographs that have been added to a dive can be shown on the profile by "
 "selecting the *Show-photo* button. The position of a photo on the profile "
@@ -3555,7 +3606,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1922
+#: ./user-manual.txt:1947
 msgid ""
 "The profile can also include the dive computer reported *ceiling* (more "
 "precisely, the deepest deco stop that the dive computer calculated for each "
@@ -3585,13 +3636,13 @@ msgid ""
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: ./user-manual.txt:1923
+#: ./user-manual.txt:1948
 #, no-wrap
 msgid "images/icons/cceiling.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1928
+#: ./user-manual.txt:1953
 msgid ""
 "If the dive computer itself calculates a ceiling and makes it available to "
 "_Subsurface_ during upload of dives, this can be shown as a red area by "
@@ -3599,13 +3650,13 @@ msgid ""
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: ./user-manual.txt:1929
+#: ./user-manual.txt:1954
 #, no-wrap
 msgid "images/icons/ceiling1.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1934
+#: ./user-manual.txt:1959
 msgid ""
 "If the *Calculated ceiling* button on the Profile Panel is clicked, then a "
 "ceiling, calculated by _Subsurface_, is shown in green if it exists for a "
@@ -3614,13 +3665,13 @@ msgid ""
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: ./user-manual.txt:1935
+#: ./user-manual.txt:1960
 #, no-wrap
 msgid "images/icons/ceiling2.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1939
+#: ./user-manual.txt:1964
 msgid ""
 "If, in addition, the *show all tissues* button on the Profile Panel is "
 "clicked, the ceiling is shown for the tissue compartments following the "
@@ -3628,32 +3679,32 @@ msgid ""
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: ./user-manual.txt:1940
+#: ./user-manual.txt:1965
 #, no-wrap
 msgid "images/icons/ceiling3.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1944
+#: ./user-manual.txt:1969
 msgid ""
 "If, in addition, the *3m increments* button on the Profile Panel is clicked, "
 "then the ceiling is indicated in 3 m increments (*C* in figure below)."
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:1945
+#: ./user-manual.txt:1970
 #, no-wrap
 msgid "images/Ceilings2.jpg"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: ./user-manual.txt:1947
+#: ./user-manual.txt:1972
 #, no-wrap
 msgid "images/icons/ShowCylindersButton.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1953
+#: ./user-manual.txt:1978
 msgid ""
 "By selecting this icon, the different cylinders used during a dive can be "
 "represented as a coloured bar at the bottom of the *Dive Profile*. In "
@@ -3665,19 +3716,19 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:1954
+#: ./user-manual.txt:1979
 #, no-wrap
 msgid "images/ShowCylinders_f20.jpg"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: ./user-manual.txt:1957
+#: ./user-manual.txt:1982
 #, no-wrap
 msgid "images/tissues.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1969
+#: ./user-manual.txt:1994
 msgid ""
 "Display inert gas tissue pressures relative to ambient inert gas pressure "
 "(horizontal grey line).  Tissue pressures are calculated using the Bühlmann "
@@ -3696,13 +3747,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:1970
+#: ./user-manual.txt:1995
 #, no-wrap
 msgid "images/tissuesGraph.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1978
+#: ./user-manual.txt:2003
 msgid ""
 "Gradient Factor settings strongly affect the calculated ceilings and their "
 "depths.  For more information about Gradient factors, see the section on "
@@ -3715,7 +3766,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1980
+#: ./user-manual.txt:2005
 #, no-wrap
 msgid ""
 " ** http://www.tek-dive.com/portal/upload/M-Values.pdf[Understanding "
@@ -3723,7 +3774,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1982
+#: ./user-manual.txt:2007
 #, no-wrap
 msgid ""
 " ** "
@@ -3732,13 +3783,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:1984
+#: ./user-manual.txt:2009
 #, no-wrap
 msgid "The Dive Profile context menu"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2002
+#: ./user-manual.txt:2027
 msgid ""
 "The context menu for the Dive Profile is accessed by right-clicking while "
 "the mouse cursor is over the Dive Profile panel. The menu allows the "
@@ -3759,13 +3810,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:2003
+#: ./user-manual.txt:2029
 #, no-wrap
 msgid "The *Information Box*"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2013
+#: ./user-manual.txt:2039
 msgid ""
 "The Information box displays a large range of information pertaining to the "
 "dive profile. Normally the Information Box is located to the top left of the "
@@ -3778,13 +3829,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:2014
+#: ./user-manual.txt:2040
 #, no-wrap
 msgid "images/InfoBox2.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2031
+#: ./user-manual.txt:2057
 msgid ""
 "The moment the mouse points inside the *Dive Profile* panel, the information "
 "box expands and shows many data items. In this situation, the data reflect "
@@ -3805,20 +3856,20 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2034
+#: ./user-manual.txt:2060
 msgid ""
 "The user has control over the display of several statistics, represented as "
 "four buttons on the left of the profile panel. These are:"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: ./user-manual.txt:2035
+#: ./user-manual.txt:2061
 #, no-wrap
 msgid "images/icons/MOD.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2042
+#: ./user-manual.txt:2068
 msgid ""
 "Clicking this button causes the Information Box to display the *Maximum "
 "Operating Depth (MOD)* of the dive, given the gas mixture used. MOD is "
@@ -3828,13 +3879,13 @@ msgid ""
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: ./user-manual.txt:2043
+#: ./user-manual.txt:2069
 #, no-wrap
 msgid "images/icons/NDL.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2052
+#: ./user-manual.txt:2078
 msgid ""
 "Clicking this button causes the Information Box to display the *No-deco "
 "Limit (NDL)* or the *Total Time to Surface (TTS)*. NDL is the time duration "
@@ -3847,13 +3898,13 @@ msgid ""
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: ./user-manual.txt:2053
+#: ./user-manual.txt:2079
 #, no-wrap
 msgid "images/icons/SAC.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2062
+#: ./user-manual.txt:2088
 msgid ""
 "Clicking this button causes the Information Box to display the *Surface Air "
 "Consumption (SAC)*.  SAC is an indication of the surface-normalised "
@@ -3866,13 +3917,13 @@ msgid ""
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: ./user-manual.txt:2063
+#: ./user-manual.txt:2089
 #, no-wrap
 msgid "images/icons/EAD.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2078
+#: ./user-manual.txt:2104
 msgid ""
 "Clicking this button displays the *Equivalent Air Depth (EAD)* for nitrox "
 "dives as well as the *Equivalent Narcotic Depth (END)* for trimix "
@@ -3889,20 +3940,20 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2080
+#: ./user-manual.txt:2106
 msgid ""
 "Figure (*B*) above shows an information box with a nearly complete set of "
 "data."
 msgstr ""
 
 #. type: Title ====
-#: ./user-manual.txt:2082
+#: ./user-manual.txt:2108
 #, no-wrap
 msgid "The Gas Pressure Bar Graph"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2089
+#: ./user-manual.txt:2115
 msgid ""
 "On the left of the *Information Box* is a vertical bar graph indicating the "
 "pressures of the nitrogen (and other inert gases, e.g. helium, if "
@@ -3913,13 +3964,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:2090
+#: ./user-manual.txt:2116
 #, no-wrap
 msgid "images/GasPressureBarGraph.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2096
+#: ./user-manual.txt:2122
 msgid ""
 "The light green area indicates the total gas, with the top margin of the "
 "light green area indicating the total gas pressure inhaled by the diver and "
@@ -3929,7 +3980,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2102
+#: ./user-manual.txt:2128
 msgid ""
 "The horizontal black line underneath the light green margin indicates the "
 "equilibrium pressure of the inert gases inhaled by the diver, usually "
@@ -3940,7 +3991,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2106
+#: ./user-manual.txt:2132
 msgid ""
 "The dark green area at the bottom of the graph represents the pressures of "
 "inert gas in each of the 16 tissue compartments, following the Bühlmann "
@@ -3948,7 +3999,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2111
+#: ./user-manual.txt:2137
 msgid ""
 "The top black horizontal line indicates the gradient factor that applies to "
 "the depth of the diver at the particular point on the *Dive Profile*. The "
@@ -3958,7 +4009,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2115
+#: ./user-manual.txt:2141
 msgid ""
 "The bottom margin of the red area in the graph indicates the Bühlman-derived "
 "M-value, that is the pressure value of inert gases at which bubble formation "
@@ -3966,7 +4017,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2118
+#: ./user-manual.txt:2144
 msgid ""
 "These five values are indicated on the left in the graph above. The way the "
 "Gas Pressure Bar Graph changes during a dive is indicated on the right hand "
@@ -3974,7 +4025,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2121
+#: ./user-manual.txt:2147
 msgid ""
 "Graph *A* indicates the situation at the start of a dive with diver at the "
 "surface. The pressures in all the tissue compartments are still at the "
@@ -3982,7 +4033,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2124
+#: ./user-manual.txt:2150
 msgid ""
 "Graph *B* indicates the situation after a descent to 30 meters. Few of the "
 "tissue compartments have had time to respond to the descent, their gas "
@@ -3990,7 +4041,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2129
+#: ./user-manual.txt:2155
 msgid ""
 "Graph *C* represents the pressures after 30 minutes at 30 m. The fast "
 "compartments have attained equilibrium (i.e. they have reached the hight of "
@@ -4000,7 +4051,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2135
+#: ./user-manual.txt:2161
 msgid ""
 "Graph *D* shows the pressures after ascent to a depth of 4.5 meters. Since, "
 "during ascent, the total inhaled gas pressure has decreased strongly from 4 "
@@ -4011,7 +4062,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2140
+#: ./user-manual.txt:2166
 msgid ""
 "Graph *E* indicates the situation after remaining at 4.5 meters for 10 "
 "minutes. The fast compartments have decreased in pressure. As expected, the "
@@ -4021,19 +4072,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ==
-#: ./user-manual.txt:2143
+#: ./user-manual.txt:2169
 #, no-wrap
 msgid "Organising the logbook (Manipulating groups of dives)"
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:2145
+#: ./user-manual.txt:2171
 #, no-wrap
 msgid "The Dive List context menu"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2150
+#: ./user-manual.txt:2176
 msgid ""
 "Many actions within _Subsurface_ are dependent on a context menu used mostly "
 "to manipulate groups of dives. The context menu is found by selecting a dive "
@@ -4041,30 +4092,30 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:2151
+#: ./user-manual.txt:2177
 #, no-wrap
 msgid "images/ContextMenu.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2154
+#: ./user-manual.txt:2180
 msgid "The context menu is used in many manipulations described below."
 msgstr ""
 
 #. type: Title ====
-#: ./user-manual.txt:2155
+#: ./user-manual.txt:2181
 #, no-wrap
 msgid "Customising the information showed in the *Dive List* panel"
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:2157
+#: ./user-manual.txt:2183
 #, no-wrap
 msgid "images/DiveListOptions.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2165
+#: ./user-manual.txt:2191
 msgid ""
 "The default information in the *Dive List* includes, for each dive, "
 "Dive_number, Date, Rating, Dive_depth, Dive_duration and Dive_location. This "
@@ -4078,13 +4129,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: ./user-manual.txt:2166
+#: ./user-manual.txt:2192
 #, no-wrap
 msgid "Selecting dives from a particular dive site"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2172
+#: ./user-manual.txt:2198
 msgid ""
 "Many divers have long dive lists and it may be difficult to locate all the "
 "dives at a particular site.  By pressing _Ctl-F_ on the keyboard, a text box "
@@ -4094,13 +4145,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:2174
+#: ./user-manual.txt:2200
 #, no-wrap
 msgid "Renumbering the dives"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2186
+#: ./user-manual.txt:2212
 msgid ""
 "Dives are normally numbered incrementally from non-recent dives (low "
 "sequence numbers) to recent dives (having the highest sequence numbers). The "
@@ -4116,13 +4167,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:2188
+#: ./user-manual.txt:2214
 #, no-wrap
 msgid "Grouping dives into trips and manipulating trips"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2196
+#: ./user-manual.txt:2222
 msgid ""
 "For regular divers, the dive list can rapidly become very long. _Subsurface_ "
 "can group dives into _trips_. It performs this by grouping dives that have "
@@ -4134,13 +4185,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:2197
+#: ./user-manual.txt:2223
 #, no-wrap
 msgid "images/Group2.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2203
+#: ./user-manual.txt:2229
 msgid ""
 "Grouping into trips allows a rapid way of accessing individual dives without "
 "having to scan a long lists of dives. In order to group the dives in a dive "
@@ -4149,13 +4200,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: ./user-manual.txt:2204
+#: ./user-manual.txt:2230
 #, no-wrap
 msgid "Editing the title and associated information for a particular trip"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2217
+#: ./user-manual.txt:2243
 msgid ""
 "Normally, in the dive list, minimal information is included in the trip "
 "title.  More information about a trip can be added by selecting its trip "
@@ -4170,13 +4221,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: ./user-manual.txt:2218
+#: ./user-manual.txt:2244
 #, no-wrap
 msgid "Viewing the dives during a particular trip"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2223
+#: ./user-manual.txt:2249
 msgid ""
 "Once the dives have been grouped into trips, users can expand one or more "
 "trips by clicking the arrow-head on the left of each trip title. This "
@@ -4185,13 +4236,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: ./user-manual.txt:2224
+#: ./user-manual.txt:2250
 #, no-wrap
 msgid "Collapsing or expanding dive information for different trips"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2230
+#: ./user-manual.txt:2256
 msgid ""
 "If a user right-clicks after selecting a particular trip in the dive list, "
 "the resulting context menu allows several possibilities to expand or "
@@ -4200,13 +4251,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: ./user-manual.txt:2231
+#: ./user-manual.txt:2257
 #, no-wrap
 msgid "Merging dives from more than one trip into a single trip"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2236
+#: ./user-manual.txt:2262
 msgid ""
 "By right-clicking on a selected trip title in the *Dive List* panel, a "
 "context menu shows up that allows the merging of trips by either merging of "
@@ -4214,13 +4265,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: ./user-manual.txt:2237
+#: ./user-manual.txt:2263
 #, no-wrap
 msgid "Splitting a single trip into more than one trip"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2247
+#: ./user-manual.txt:2273
 msgid ""
 "If a trip includes five dives, the user can split this trip into two trips "
 "(trip 1: top 3 dives; trip 2: bottom 2 dives) by selecting and "
@@ -4232,25 +4283,25 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:2248
+#: ./user-manual.txt:2274
 #, no-wrap
 msgid "images/SplitDive3a.jpg"
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:2250
+#: ./user-manual.txt:2276
 #, no-wrap
 msgid "Manipulating single dives"
 msgstr ""
 
 #. type: Title ====
-#: ./user-manual.txt:2252
+#: ./user-manual.txt:2278
 #, no-wrap
 msgid "Delete a dive from the dive log"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2259
+#: ./user-manual.txt:2285
 msgid ""
 "Dives can be permanently deleted from the dive log by selecting and "
 "right-clicking them to bring up the context menu, and then selecting *Delete "
@@ -4260,13 +4311,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: ./user-manual.txt:2260
+#: ./user-manual.txt:2286
 #, no-wrap
 msgid "Unlink a dive from a trip"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2267
+#: ./user-manual.txt:2293
 msgid ""
 "Users can unlink dives from the trip to which they belong. In order to do "
 "this, select and right-click the relevant dives to bring up the context "
@@ -4275,13 +4326,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: ./user-manual.txt:2268
+#: ./user-manual.txt:2294
 #, no-wrap
 msgid "Add a dive to the trip immediately above"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2275
+#: ./user-manual.txt:2301
 msgid ""
 "Selected dives can be moved from the trip to which they belong and placed "
 "within the trip immediately above the currently active trip. To do this, "
@@ -4290,13 +4341,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: ./user-manual.txt:2276
+#: ./user-manual.txt:2302
 #, no-wrap
 msgid "Shift the start time of dive(s)"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2287
+#: ./user-manual.txt:2313
 msgid ""
 "Sometimes it is necessary to adjust the start time of a dive. This may apply "
 "to situations where dives are performed in different time zones or when the "
@@ -4309,13 +4360,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: ./user-manual.txt:2288
+#: ./user-manual.txt:2314
 #, no-wrap
 msgid "Merge dives into a single dive"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2298
+#: ./user-manual.txt:2324
 msgid ""
 "Sometimes a dive is briefly interrupted, e.g. if a diver returns to the "
 "surface for a few minutes, resulting in two or more dives being recorded by "
@@ -4329,19 +4380,19 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:2299
+#: ./user-manual.txt:2325
 #, no-wrap
 msgid "images/MergedDive.png"
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:2302
+#: ./user-manual.txt:2328
 #, no-wrap
 msgid "Filtering the dive list"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2308
+#: ./user-manual.txt:2334
 msgid ""
 "The dives in the *Dive List* panel can be filtered, that is, one can select "
 "only some of the dives based on their attributes, e.g. dive tags, dive site, "
@@ -4351,7 +4402,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2317
+#: ./user-manual.txt:2343
 msgid ""
 "To open the filter, select _Log -> Filter divelist_ from the main menu. This "
 "opens the _Filter Panel_ at the top of the _Subsurface_ window. Three icons "
@@ -4365,13 +4416,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:2319
+#: ./user-manual.txt:2344
 #, no-wrap
 msgid "images/Filterpanel.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2329
+#: ./user-manual.txt:2353
 msgid ""
 "Four filter criteria may be used to filter the dive list: dive tags, person "
 "(buddy / dive master), dive site and dive suit, each of which is represented "
@@ -4384,7 +4435,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2337
+#: ./user-manual.txt:2361
 msgid ""
 "To activate filtering of the dive list, the check box of at least one item "
 "in one of the four check lists needs to be checked. The dive list is then "
@@ -4397,38 +4448,132 @@ msgid ""
 msgstr ""
 
 #. type: Title ==
-#: ./user-manual.txt:2339
+#: ./user-manual.txt:2363
 #, no-wrap
 msgid "Exporting the dive log or parts of the dive log"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2345
+#: ./user-manual.txt:2366
+msgid "There are two routes for the export of dive information from Subsurface:"
+msgstr ""
+
+#. type: Plain text
+#: ./user-manual.txt:2368
+msgid "Export dive information to _Facebook_"
+msgstr ""
+
+#. type: Plain text
+#: ./user-manual.txt:2370
+msgid ""
+"xref:S_Export_other[Export dive information to other destinations or "
+"formats]"
+msgstr ""
+
+#. type: Title ===
+#: ./user-manual.txt:2372
+#, no-wrap
+msgid "Exporting dive information to _Facebook_"
+msgstr ""
+
+#. type: Plain text
+#: ./user-manual.txt:2381
+msgid ""
+"Export of dives to _Facebook_ is handled differently from other types of "
+"export. This is because export to _Facebook_ needs a connection to "
+"_Facebook_, requiring a _Facebook_ userID and password.  If, from the Main "
+"Menu, one selects _File -> Preferences -> Facebook_, a login screen is "
+"presented (see image *A* to the left, below).  Provide your _Facebook_ "
+"userID and password.  Once successful login to _Facebook_ has been achieved, "
+"the panel in image *B*, below is presented. This panel has a button that "
+"needs to be selected in order to close the _Facebook_ connection."
+msgstr ""
+
+#. type: Target for macro image
+#: ./user-manual.txt:2382
+#, no-wrap
+msgid "images/facebook1_f20.jpg"
+msgstr ""
+
+#. type: Plain text
+#: ./user-manual.txt:2395
 msgid ""
-"The export function can be reached by selecting _File -> Export_, which "
-"brings up the Export dialog. This dialog always gives two options: save ALL "
-"dives, or save only the dives selected in *Dive List* panel of "
-"_Subsurface_. Click the appropriate radio button (see images below)."
+"Having established a login to _Facebook_, transfer of a dive profile to "
+"one's _Facebook_ timeline is easy.  A _Facebook_ icon appears in the *Dive "
+"Notes* panel of _Subsurface_ (See image *A* below). Ensure that the dive "
+"that you want to transfer to the timeline is depicted in the _Subsurface_ "
+"*Dive Profile* panel. Select the _Facebook_ icon, and a dialogue is shown, "
+"determining the amount of additional information transferred with the dive "
+"profile (see image *B*, below). In order to transfer a dive profile to "
+"_Facebook_, the name of a _Facebook_ album needs to be provided. The "
+"checkboxes on the lefthand side allow one to determine how much additional "
+"information should be transferred with the dive profile. This information is "
+"shown in the text box on the right hand side of the panel (see image *B*, "
+"below). You can easily edit the message that will be posted right there in "
+"the text box. Having specified the additional information and verified the "
+"text you want to post, select the _OK_ button which triggers the transfer to "
+"_Facebook_. After a while, an acknowledgement dialogue appears, indicating "
+"successful transfer to _Facebook_."
+msgstr ""
+
+#. type: Plain text
+#: ./user-manual.txt:2402
+msgid ""
+"Both the Album created and the post to your time line will be marked as "
+"private. In order for friends to be able to see the post you have to change "
+"its permissions from a regular Facebook login either in a browser or a "
+"Facebook app. While this is an extra step the developers felt that this was "
+"the better solution to avoid having unwanted posts in your public timeline."
+msgstr ""
+
+#. type: Target for macro image
+#: ./user-manual.txt:2403
+#, no-wrap
+msgid "images/facebook2_f20.jpg"
+msgstr ""
+
+#. type: Plain text
+#: ./user-manual.txt:2406
+msgid ""
+"If required, then close the _Facebook_ connection by either closing "
+"_Subsurface_ or by selecting _File -> Preferences -> Facebook_ from the Main "
+"Menu, and clicking the appropriate button on the Facebook Preferences panel."
+msgstr ""
+
+#. type: Title ===
+#: ./user-manual.txt:2408
+#, no-wrap
+msgid "Export dive information  to other destinations or formats"
+msgstr ""
+
+#. type: Plain text
+#: ./user-manual.txt:2413
+msgid ""
+"For non-_Facebook exports_, the export function can be reached by selecting "
+"_File -> Export_, which brings up the Export dialog. This dialog always "
+"gives two options: save ALL dives, or save only the dives selected in *Dive "
+"List* panel of _Subsurface_. Click the appropriate radio button (see images "
+"below)."
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:2346
+#: ./user-manual.txt:2414
 #, no-wrap
 msgid "images/Export_f20.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2349
+#: ./user-manual.txt:2417
 msgid "A dive log or part of it can be saved in three formats:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2351
+#: ./user-manual.txt:2419
 msgid "_Subsurface XML_ format. This is the native format used by _Subsurface_."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2355
+#: ./user-manual.txt:2423
 msgid ""
 "Universal Dive Data Format (_UDDF_). Refer to _http://uddf.org_ for more "
 "information.  UDDF is a generic format that enables communication among many "
@@ -4436,7 +4581,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2359
+#: ./user-manual.txt:2427
 msgid ""
 "_Divelogs.de_, an Internet-based dive log repository. In order to upload to "
 "_Divelogs.de_, one needs a user-ID as well as a password for "
@@ -4445,7 +4590,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2363
+#: ./user-manual.txt:2431
 msgid ""
 "_DiveShare_ is also a dive log repostory on the Internet focusing on the "
 "recreational dives. In order to upload dives one has to provide a used ID, "
@@ -4453,7 +4598,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2368
+#: ./user-manual.txt:2436
 msgid ""
 "_CSV dive details_, that includes the most critical information of the dive "
 "profile. Included information of a dive is: dive number, date, time, buddy, "
@@ -4462,7 +4607,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2371
+#: ./user-manual.txt:2439
 msgid ""
 "_CSV dive profile_, that includes a large amount of detail for each dive, "
 "including the depth profile, temperature and pressure information of each "
@@ -4470,7 +4615,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2383
+#: ./user-manual.txt:2451
 msgid ""
 "_HTML_ format, in which the dive(s) are stored in HTML files, readable with "
 "an Internet browser. Most modern web browsers are supported, but JavaScript "
@@ -4485,7 +4630,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2388
+#: ./user-manual.txt:2456
 msgid ""
 "_Worldmap_ format, an HTML file with a world map upon which each dive and "
 "some information about it are indicated. This map is not editable. However, "
@@ -4494,13 +4639,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:2389
+#: ./user-manual.txt:2457
 #, no-wrap
 msgid "images/mapview_f20.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2396
+#: ./user-manual.txt:2464
 msgid ""
 "_Image depths_, which creates a text file that contains the file names of "
 "all photos or images attached to any of the selected dives in the _Dive "
@@ -4509,12 +4654,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2398
+#: ./user-manual.txt:2466
 msgid "_General Settings_, under the HTML tab, provides the following options:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2406
+#: ./user-manual.txt:2474
 #, no-wrap
 msgid ""
 "** Subsurface Numbers: if this option is checked, the dive(s) are exported "
@@ -4531,27 +4676,27 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2409
+#: ./user-manual.txt:2477
 msgid ""
 "Under _Style Options_ some style-related options are available like font "
 "size and theme."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2412
+#: ./user-manual.txt:2480
 msgid ""
 "Export to other formats can be achieved through third party facilities, for "
 "instance _www.divelogs.de_."
 msgstr ""
 
 #. type: Title ==
-#: ./user-manual.txt:2414
+#: ./user-manual.txt:2482
 #, no-wrap
 msgid "Keeping a _Subsurface_ dive log in the Cloud"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2427
+#: ./user-manual.txt:2495
 msgid ""
 "For each diver, dive log information is highly important. Not only is it a "
 "record of diving activities for one's own pleasure, but it is important "
@@ -4568,7 +4713,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2432
+#: ./user-manual.txt:2500
 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 "
@@ -4576,13 +4721,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:2433
+#: ./user-manual.txt:2501
 #, no-wrap
 msgid "images/Cloud.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2442
+#: ./user-manual.txt:2510
 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, "
@@ -4595,7 +4740,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2449
+#: ./user-manual.txt:2517
 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 "
@@ -4605,7 +4750,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2455
+#: ./user-manual.txt:2523
 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 "
@@ -4616,20 +4761,20 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2458
+#: ./user-manual.txt:2526
 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:2461
+#: ./user-manual.txt:2529
 #, no-wrap
 msgid "Printing a dive log"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2465
+#: ./user-manual.txt:2533
 msgid ""
 "_Subsurface_ provides a simple interface to print a whole dive log or only a "
 "few selected dives, including dive profiles and other contextual "
@@ -4637,12 +4782,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2467
+#: ./user-manual.txt:2535
 msgid "Before printing, two decisions are required:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2470
+#: ./user-manual.txt:2538
 msgid ""
 "Should the whole dive log be printed or only part of it? If only part of the "
 "dive log is required, then the user must select the required dives from the "
@@ -4650,7 +4795,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2472
+#: ./user-manual.txt:2540
 msgid ""
 "What gas partial pressure information is required on the dive profile? Users "
 "should select the appropriate toggle-buttons on the button bar to the left "
@@ -4658,7 +4803,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2476
+#: ./user-manual.txt:2544
 msgid ""
 "Now the print options should be selected to match the user's needs. To do "
 "this, user should select _File -> Print_ from the Main menu. The following "
@@ -4666,49 +4811,49 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:2477
+#: ./user-manual.txt:2545
 #, no-wrap
 msgid "images/PrintDiveLog.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2480
+#: ./user-manual.txt:2548
 msgid "Under _Print type_ users need to select one of three options:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2482
+#: ./user-manual.txt:2550
 msgid "Print the complete Dive List: to do this, _Table Print_ should be selected."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2484
+#: ./user-manual.txt:2552
 msgid ""
 "Print the selected dives (dive profiles and all other information) at 6 "
 "dives per printed page: to do this, users should select _6 dives per page_."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2486
+#: ./user-manual.txt:2554
 msgid ""
 "Print the selected dives (dive profiles and all other information) at 2 "
 "dives per printed page: to do this, users should select _2 dives per page_."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2488
+#: ./user-manual.txt:2556
 msgid ""
 "Print the selected dives (dive profiles and all other information) at 1 dive "
 "per printed page: to do this, users should select _1 dive per page_."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2490
+#: ./user-manual.txt:2558
 msgid "Under _Print options_ users need to select:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2494
+#: ./user-manual.txt:2562
 msgid ""
 "Printing only the dives that have been selected from the dive list prior to "
 "activating the print dialogue, achieved by checking the box _Print only "
@@ -4716,12 +4861,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2495
+#: ./user-manual.txt:2563
 msgid "Printing in colour, achieved by checking the box with _Print in colour_."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2502
+#: ./user-manual.txt:2570
 msgid ""
 "The _Ordering_ affects the layout of the page (or part of it) for each "
 "dive.  The dive profile could be printed at the top of each dive, with the "
@@ -4732,7 +4877,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2506
+#: ./user-manual.txt:2574
 msgid ""
 "Users can _Preview_ the printed page by selecting the _Preview_ button on "
 "the dialogue. After preview, changes to the options in the print dialogue "
@@ -4740,7 +4885,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2516
+#: ./user-manual.txt:2584
 msgid ""
 "Next, select the _Print_ button in the dialogue. This activates the regular "
 "print dialogue used by the user operating system (image [*B*] in the middle, "
@@ -4752,71 +4897,159 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:2517
+#: ./user-manual.txt:2585
 #, no-wrap
 msgid "images/Printpreview.jpg"
 msgstr ""
 
 #. type: Title ==
-#: ./user-manual.txt:2521
+#: ./user-manual.txt:2589
 #, no-wrap
-msgid "Setting user _Preferences_ for _Subsurface_"
+msgid "Configuring a dive computer"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2529
+#: ./user-manual.txt:2597
 msgid ""
-"There are several settings within _Subsurface_ that the user can "
-"specify. These are found when selecting _File -> Preferences_. The settings "
-"are performed in five groups: *Defaults*, *Units*, *Graph*, *Language* and "
-"*Network*. All five sections operate on the same principles: the user must "
-"specify the settings that are to be changed, then these changes are saved "
-"using the *Apply* button. After applying all the new settings users can then "
-"leave the settings panel by selecting *OK*."
-msgstr ""
-
-#. type: Title ===
-#: ./user-manual.txt:2530
-#, no-wrap
-msgid "Defaults"
+"_Subsurface_ enables one to configure a dive computer. Currently the "
+"Heinrichs-Weikamp (OSTC 2, OSTC 3) and Suunto Vyper (Stinger, Mosquito, D3, "
+"Vyper, Vytec, Cobra, Gekko and Zoop) family of dive computers are "
+"supported. A large number of settings of these dive computers can be read "
+"and changed to different values. As a first step, ensure that the "
+"appropriate hardware driver is installed for the dive computer and that the "
+"device name of the dive computer is known.  See "
+"<<_appendix_a_operating_system_specific_information_for_importing_dive_information_from_a_dive_computer,APPENDIX "
+"A>> for information on how to do this."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2533
-msgid "There are several settings in the *Defaults* panel:"
+#: ./user-manual.txt:2602
+msgid ""
+"Once the dive computer is connected to the _Subsurface_ computer, select "
+"_File -> Configure dive computer_ from the _Main Menu_. Provide the "
+"appropriate device name in the text box at the top of the configuration "
+"panel that opens and select the appropriate dive computer model from the "
+"panel on the lefthand (see image below)."
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:2534
+#: ./user-manual.txt:2603
 #, no-wrap
-msgid "images/Pref1.jpg"
+msgid "images/Configure_dc_f20.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2538
-#, no-wrap
+#: ./user-manual.txt:2606
 msgid ""
-"  ** *Lists and tables*: Here one can specify the font type and font size of "
-"the\n"
-"     *Dive Table* panel. By decreasing the font size of the *Dive Table*, "
-"users can see more dives on a screen.\n"
+"Using the appropriate buttons on the configuration panel, the following "
+"actions can be performed:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2543
+#: ./user-manual.txt:2609
 #, no-wrap
 msgid ""
-"  ** *Dives*: For the _Default Dive File_ one need to specify the directory "
-"and\n"
-"     file name of one's\n"
-"     electronic dive log book. This is a file with filename extension "
-".xml. When\n"
-"     launched, _Subsurface_ will automatically load the specified dive log "
-"book.\n"
+"*Retrieve available details*. This loads the existing configuration from the "
+"dive computer\n"
+"to _Subsurface_, showing this in the configuration panel.\n"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2548
+#: ./user-manual.txt:2611
+#, no-wrap
+msgid ""
+"*Save changes to device*. This changes the configuration of the\n"
+"dive computer to correspond to the information shown in the configuration "
+"panel.\n"
+msgstr ""
+
+#. type: Plain text
+#: ./user-manual.txt:2613
+#, no-wrap
+msgid ""
+"*Backup*. This saves the configuration data to a file. _Subsurface_ asks "
+"for\n"
+"a file location and file name for the saved information.\n"
+msgstr ""
+
+#. type: Plain text
+#: ./user-manual.txt:2615
+#, no-wrap
+msgid ""
+"*Restore backup*. This loads the information from a backup file and displays "
+"it\n"
+"in the configuration panel.\n"
+msgstr ""
+
+#. type: Plain text
+#: ./user-manual.txt:2617
+#, no-wrap
+msgid ""
+"*Update firmware*. If new firmware is available for the dive computer, this "
+"is\n"
+"loaded into the dive computer.\n"
+msgstr ""
+
+#. type: Title ==
+#: ./user-manual.txt:2620
+#, no-wrap
+msgid "Setting user _Preferences_ for _Subsurface_"
+msgstr ""
+
+#. type: Plain text
+#: ./user-manual.txt:2628
+msgid ""
+"There are several settings within _Subsurface_ that the user can "
+"specify. These are found when selecting _File -> Preferences_. The settings "
+"are performed in five groups: *Defaults*, *Units*, *Graph*, *Language* and "
+"*Network*. All five sections operate on the same principles: the user must "
+"specify the settings that are to be changed, then these changes are saved "
+"using the *Apply* button. After applying all the new settings users can then "
+"leave the settings panel by selecting *OK*."
+msgstr ""
+
+#. type: Title ===
+#: ./user-manual.txt:2629
+#, no-wrap
+msgid "Defaults"
+msgstr ""
+
+#. type: Plain text
+#: ./user-manual.txt:2632
+msgid "There are several settings in the *Defaults* panel:"
+msgstr ""
+
+#. type: Target for macro image
+#: ./user-manual.txt:2633
+#, no-wrap
+msgid "images/Pref1_f20.jpg"
+msgstr ""
+
+#. type: Plain text
+#: ./user-manual.txt:2637
+#, no-wrap
+msgid ""
+"  ** *Lists and tables*: Here one can specify the font type and font size of "
+"the\n"
+"     *Dive Table* panel. By decreasing the font size of the *Dive Table*, "
+"users can see more dives on a screen.\n"
+msgstr ""
+
+#. type: Plain text
+#: ./user-manual.txt:2642
+#, no-wrap
+msgid ""
+"  ** *Dives*: For the _Default Dive File_ one need to specify the directory "
+"and\n"
+"     file name of one's\n"
+"     electronic dive log book. This is a file with filename extension "
+".xml. When\n"
+"     launched, _Subsurface_ will automatically load the specified dive log "
+"book.\n"
+msgstr ""
+
+#. type: Plain text
+#: ./user-manual.txt:2647
 #, no-wrap
 msgid ""
 "  ** *Display invalid*:  Dives can be marked as invalid (when a user wishes "
@@ -4829,7 +5062,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2551
+#: ./user-manual.txt:2650
 #, no-wrap
 msgid ""
 "  ** *Default cylinder*: Here users can specify the default cylinder listed "
@@ -4838,7 +5071,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2559
+#: ./user-manual.txt:2658
 #, no-wrap
 msgid ""
 "  ** *Animations*: Some actions in showing the dive profile are performed "
@@ -4856,7 +5089,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2564
+#: ./user-manual.txt:2663
 #, no-wrap
 msgid ""
 "  ** *Subsurface web service*: When one subscribes to the "
@@ -4869,7 +5102,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2567
+#: ./user-manual.txt:2666
 #, no-wrap
 msgid ""
 "  ** *Clear all settings*: As indicated in the button below this heading, "
@@ -4878,19 +5111,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:2568
+#: ./user-manual.txt:2667
 #, no-wrap
 msgid "Units"
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:2569
+#: ./user-manual.txt:2668
 #, no-wrap
-msgid "images/Pref2.jpg"
+msgid "images/Pref2_f20.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2576
+#: ./user-manual.txt:2675
 msgid ""
 "Here user can choose between metric and imperial units of depth, pressure, "
 "volume, temperature and mass. By selecting the Metric or Imperial radio "
@@ -4901,24 +5134,24 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:2577
+#: ./user-manual.txt:2676
 #, no-wrap
 msgid "Graph"
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:2579
+#: ./user-manual.txt:2678
 #, no-wrap
 msgid "images/Pref3_f20.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2583
+#: ./user-manual.txt:2682
 msgid "This panel allows two type of selections:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2591
+#: ./user-manual.txt:2690
 #, no-wrap
 msgid ""
 "*Show*: Here users can specify the amount of information shown as part of\n"
@@ -4935,7 +5168,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2596
+#: ./user-manual.txt:2695
 #, no-wrap
 msgid ""
 "** _Draw dive computer reported ceiling red_: This checkbox allows exactly "
@@ -4949,7 +5182,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2598
+#: ./user-manual.txt:2697
 #, no-wrap
 msgid ""
 "** _Show unused cylinders in Equipment Tab_: This checkbox allows display of "
@@ -4960,7 +5193,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2601
+#: ./user-manual.txt:2700
 #, no-wrap
 msgid ""
 "** _Show average depth_: Activating this checkbox causes _Subsurface_ to "
@@ -4969,13 +5202,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2603
+#: ./user-manual.txt:2702
 #, no-wrap
 msgid "*Misc*:\n"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2615
+#: ./user-manual.txt:2714
 #, no-wrap
 msgid ""
 "** Gradient Factors:* Here users can set the _gradient factors_ used while "
@@ -5002,7 +5235,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2617
+#: ./user-manual.txt:2716
 #, no-wrap
 msgid ""
 " *** http://www.tek-dive.com/portal/upload/M-Values.pdf[Understanding "
@@ -5010,7 +5243,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2619
+#: ./user-manual.txt:2718
 #, no-wrap
 msgid ""
 " *** "
@@ -5019,7 +5252,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2623
+#: ./user-manual.txt:2722
 #, no-wrap
 msgid ""
 " ** _CCR: Show setpoints when viewing pO2:_ With this checkbox ativated, the "
@@ -5031,7 +5264,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2627
+#: ./user-manual.txt:2726
 #, no-wrap
 msgid ""
 " ** _CCR: Show individual O~2~ sensor values when viewing pO~2~:_ Show the "
@@ -5042,13 +5275,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2629
+#: ./user-manual.txt:2728
 #, no-wrap
 msgid "*Configuring dive planning using rebreather equipment:*\n"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2631
+#: ./user-manual.txt:2730
 #, no-wrap
 msgid ""
 "** _Default CCR setpoint for dive planning:_ Specify the O~2~ setpoint for "
@@ -5056,15 +5289,17 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2633
+#: ./user-manual.txt:2734
 #, no-wrap
 msgid ""
 "CCR dive plan. This determines the pO~2~ that will be maintained\n"
-"during a particular dive.\n"
+"during a particular dive. This is the setpoint that is used at the start\n"
+"of any CCR dive. Setpoint changes during the dive can be added via the\n"
+"profile context menu.\n"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2635
+#: ./user-manual.txt:2736
 #, no-wrap
 msgid ""
 "** _pSCR O~2~ metabolism rate:_ For a semiclosed rebreather (pSCR) system, "
@@ -5072,15 +5307,16 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2636
+#: ./user-manual.txt:2738
 #, no-wrap
 msgid ""
 "volume of oxygen used by a diver each minute. Set this value for pSCR dive "
-"planning.\n"
+"planning\n"
+"and decompression calculations.\n"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2638
+#: ./user-manual.txt:2740
 #, no-wrap
 msgid ""
 "** _pSCR ratio:_ For pSCR equipment the dump ratio is the ratio of gas "
@@ -5088,7 +5324,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2640
+#: ./user-manual.txt:2742
 #, no-wrap
 msgid ""
 "environment to that of the gas recirculated to the diver. Set this value for "
@@ -5097,24 +5333,24 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:2642
+#: ./user-manual.txt:2744
 #, no-wrap
 msgid "Language"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2644
+#: ./user-manual.txt:2746
 msgid "Choose a language that _Subsurface_ will use."
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:2645
+#: ./user-manual.txt:2747
 #, no-wrap
-msgid "images/Pref4.jpg"
+msgid "images/Pref4_f20.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2655
+#: ./user-manual.txt:2757
 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 "
@@ -5127,26 +5363,26 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:2656
+#: ./user-manual.txt:2758
 #, no-wrap
 msgid "Network"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2658
+#: ./user-manual.txt:2760
 msgid ""
 "This panel facilitates communication between _Subsurface_ and data sources "
 "on the Internet."
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:2659
+#: ./user-manual.txt:2761
 #, no-wrap
-msgid "images/Pref5.jpg"
+msgid "images/Pref5_f20.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2672
+#: ./user-manual.txt:2774
 msgid ""
 "This is important, for instance, when _Subsurface_ needs to communicate with "
 "Internet services such as the <<S_Companion,_Subsurface Companion app_>> or "
@@ -5162,14 +5398,43 @@ msgid ""
 "server to access the Internet."
 msgstr ""
 
+#. type: Title ===
+#: ./user-manual.txt:2775
+#, no-wrap
+msgid "Facebook Accesss"
+msgstr ""
+
+#. type: Plain text
+#: ./user-manual.txt:2778
+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:2779
+#, no-wrap
+msgid "images/Pref6_f20.jpg"
+msgstr ""
+
+#. type: Plain text
+#: ./user-manual.txt:2787
+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 "
+"down Subsurface. At this point the checkbox labelled \"Keep connection to "
+"Subsurface\", on the login screen has no effect.  See the section "
+"xref:S_facebook[Exporting dive profiles to Facebook] for more information."
+msgstr ""
+
 #. type: Title ==
-#: ./user-manual.txt:2674
+#: ./user-manual.txt:2789
 #, no-wrap
 msgid "The _Subsurface_ dive planner"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2679
+#: ./user-manual.txt:2794
 msgid ""
 "Dive planning is an advanced feature of _Subsurface_, accessible by "
 "selecting _Log -> Plan Dive_ from the main menu. It allows calculation of "
@@ -5178,7 +5443,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block *
-#: ./user-manual.txt:2687
+#: ./user-manual.txt:2802
 msgid ""
 "The _Subsurface_ dive planner IS CURRENTLY EXPERIMENTAL and assumes the user "
 "is already familiar with the _Subsurface_ user interface. It is explicitly "
@@ -5186,19 +5451,19 @@ msgid ""
 msgstr ""
 
 #. type: delimited block *
-#: ./user-manual.txt:2690
+#: ./user-manual.txt:2805
 msgid ""
 "The user is conversant with dive planning and has the necessary training to "
 "perform dive planning."
 msgstr ""
 
 #. type: delimited block *
-#: ./user-manual.txt:2691
+#: ./user-manual.txt:2806
 msgid "The user plans dives within his/her certification limits."
 msgstr ""
 
 #. type: delimited block *
-#: ./user-manual.txt:2694
+#: ./user-manual.txt:2809
 msgid ""
 "Dive planning makes large assumptions about the characteristics of the "
 "_average person_ and cannot compensate for individual physiology or health "
@@ -5206,32 +5471,32 @@ msgid ""
 msgstr ""
 
 #. type: delimited block *
-#: ./user-manual.txt:2695
+#: ./user-manual.txt:2810
 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:2696
+#: ./user-manual.txt:2811
 msgid "The user is familiar with the user interface of _Subsurface_."
 msgstr ""
 
 #. type: delimited block *
-#: ./user-manual.txt:2698
+#: ./user-manual.txt:2813
 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:2700
+#: ./user-manual.txt:2815
 #, no-wrap
 msgid "The _Subsurface_ dive planner screen"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2705
+#: ./user-manual.txt:2820
 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 "
@@ -5241,7 +5506,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2709
+#: ./user-manual.txt:2824
 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 "
@@ -5250,7 +5515,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2713
+#: ./user-manual.txt:2828
 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 "
@@ -5259,44 +5524,45 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:2714
+#: ./user-manual.txt:2829
 #, no-wrap
-msgid "images/PlannerWindow1.jpg"
+msgid "images/PlannerWindow1_f20.jpg"
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:2717
+#: ./user-manual.txt:2832
 #, no-wrap
-msgid "Initiating dive planning"
+msgid "Open circuit dives as an example of dive planning"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2721
+#: ./user-manual.txt:2835
 msgid ""
-"The dive planner comprises two parts: *constructing a dive plan* and "
-"*evaluating* that dive plan. To perform dive planning, perform these steps:"
+"Towards the left bottom of the planner (circled in blue in the image below) "
+"is a dropbox with three options. Select the appropriate one of these:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2725
+#: ./user-manual.txt:2838
+#, no-wrap
 msgid ""
-"Clear the existing dive log by creating a new planning log. This is achieved "
-"by selecting _File -> New logbook_ from the main menu. This way, dive plans "
-"are kept separate from the existing dive log of completed dives."
+"** Open Circuit (the default)\n"
+"** CCR\n"
+"** pSCR\n"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2730
+#: ./user-manual.txt:2843
 msgid ""
-"In the top left-hand area of the screen, ensure that the constant dive "
-"parameters are appropriate. These are: Start date and time of the dive, "
+"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 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 "
 "an atmospheric pressure of 1.013 bar."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2739
+#: ./user-manual.txt:2852
 msgid ""
 "In the table labelled _Available Gases_, add the information of the "
 "cylinders to be used as well as the gas composition within that "
@@ -5304,31 +5570,27 @@ msgid ""
 "cylinder data for dive logs>>. Choose the cylinder type by double clicking "
 "the cylinder type and using the dropdown list, then specify the work "
 "pressure of this cylinder. By leaving the oxygen concentration (O2%) filed "
-"empty, the dive gas is assumed to be 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."
+"empty, the cylinder is assumed to contain air. Otherwise enter the oxygen "
+"and/or helium concentration in the boxes provided in this dialogue. Add "
+"additional cylinders by using the \"+\" icon to the top righthand of the "
+"dialogue."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2742
+#: ./user-manual.txt:2855
 msgid ""
 "The dialogue indicating _Dive Planner Points_ is usually not used at this "
 "stage of the dive planning."
 msgstr ""
 
-#. type: Title ===
-#: ./user-manual.txt:2743
-#, no-wrap
-msgid "Managing nitrogen, oxygen and gas consumption"
-msgstr ""
-
 #. type: Plain text
-#: ./user-manual.txt:2746
-msgid "The planning is performed in three stages:"
+#: ./user-manual.txt:2857
+#, no-wrap
+msgid "*The planning is performed in three stages*\n"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2756
+#: ./user-manual.txt:2867
 #, no-wrap
 msgid ""
 "*a) Nitrogen management*: This is performed by specifying the rates for "
@@ -5340,9 +5602,8 @@ msgid ""
 "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 specifications in the "
-"_Preferences_. Gradient Factor settings strongly affect the calculated "
-"ceilings and their depths.\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 "
@@ -5351,42 +5612,43 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2761
-#, no-wrap
+#: ./user-manual.txt:2869
+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:2870
 msgid ""
-" *** link:http://www.tek-dive.com/portal/upload/M-Values.pdf[Understanding "
-"M-values by Erik Baker, _Immersed_ Vol. 3, No. 3.]\n"
-" *** "
 "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"
-" *** "
+"factors for dummies, by Kevin Watts]"
+msgstr ""
+
+#. type: Plain text
+#: ./user-manual.txt:2872
+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.\n"
-"An excellent non-technical review.\n"
+"1-905492-07-3.  An excellent non-technical review."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2769
-#, no-wrap
+#: ./user-manual.txt:2880
 msgid ""
-" ** The ascent rate is critical for nitrogen off-gassing at the end of the "
-"dive and is specified\n"
-"for several depth ranges, utilising the average (or mean) depth as a "
-"yardstick. The mean depth\n"
-"of the dive plan is indicated on the dive profile in the green panel of the "
-"dive planner. Ascent rates\n"
-"at deeper levels are often in the range of 8-12 m/min, while ascent rates "
-"near the surface are\n"
-"often in the range of 4-9 m/min. The descent rate is also specified. If the "
-"option _Drop to first depth_\n"
-"is activated, then the descent phase of the planned dive will be at the "
-"maximal descent rate specified\n"
-"in the _Rates_ section of the dive setup.\n"
+"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 "
+"_Drop to first depth_ is activated, then the descent phase of the planned "
+"dive will be at the maximal descent rate specified in the _Rates_ section of "
+"the dive setup."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2779
+#: ./user-manual.txt:2890
 #, no-wrap
 msgid ""
 "*b) Oxygen management*: In the *Gas Options* part of the dive specification, "
@@ -5402,16 +5664,17 @@ msgid ""
 "edited in the\n"
 "_Available Gases_ dialog. Normally the planner decides on switching to a new "
 "gas when, during\n"
-"ascent, the partial pressure of the new gas has decreased to 1.6 bar.\n"
+"ascent, the partial pressure of the new gas has increased to 1.6 bar.\n"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2794
+#: ./user-manual.txt:2904
 #, no-wrap
 msgid ""
-"*c) Gas management*: One needs keep within the limits of the amount of gas "
-"contained in the dive\n"
-"cylinder(s), allowing for an appropriate margin for safe return to the "
+"*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"
+"cylinder(s), allowing for an appropriate margin for a safe return to the "
 "surface, possibly\n"
 "sharing with a buddy. Under the _Gas Options_ heading, specify the best (but "
 "conservative) estimate\n"
@@ -5420,13 +5683,13 @@ msgid ""
 "SAC during the\n"
 "bottom part of the dive (_bottom SAC_) as well as during the decompression "
 "or safety stops of the\n"
-"dive (_deco SAC_). Values of 20-30 l/min are common. For good gas "
+"dive (_deco SAC_). Values of 15-30 l/min are common. For good gas "
 "management, a thumbsuck guess\n"
 "is not sufficient and one needs to\n"
 "monitor one's gas consumption on a regular basis, dependent on different "
 "dive conditions and/or equipment.\n"
-"The planner will calculate the total volume of gas used during the dive and "
-"will issue a warning\n"
+"The planner calculates the total volume of gas used during the dive and "
+"issues a warning\n"
 "if one exceeds the total amount of gas available. Good practice demands that "
 "one does not dive to\n"
 "the limit of the gas supply but that an appropriate reserve is kept for "
@@ -5436,42 +5699,44 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2805
+#: ./user-manual.txt:2916
 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 the planning. The mechanics of doing this is similar to "
 "hand-entering a dive profile in the dive log part of _Subsurface_. Upon "
 "activating the planner, a default dive of depth 15 m for 40 min is offered "
-"in the green design surface to the top right hand of the screen. The white "
+"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.  If any of the management limits (for "
-"nitrogen, oxygen or gas) is exceeded, the surface above the dive profile "
-"changes from BLUE to RED."
+"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."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2818
+#: ./user-manual.txt:2928
 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_ "
 "value in each row of that table corresponds to one of the gas mixtures "
-"specified in the table with _Available Gases_ immediately above the Dive "
-"Planner Points. Add new waypoints until the main features of the dive have "
-"been completed, e.g. the bottom time segment and deep stops (if these are "
-"implemented). Leave the remaining waypoints on the ascent to "
-"_Subsurface_. In most cases _Subsurface_ computes additional way points in "
-"order to fulfil decompression requirements for that dive. A waypoint can be "
-"moved by selecting that waypoint and by using the arrow keys.  The waypoints "
-"listed in the _Dive Planner Points_ dialogue can be edited by hand in order "
-"to obtain a precise presentation of the dive plan. In fact, one can create "
-"the whole dive profile by editing the _Dive Planner Points_ dialog."
+"specified in the _Available Gases_ table.  Add new waypoints until the main "
+"features of the dive have been completed, e.g. the bottom time segment and "
+"deep stops (if these are implemented). Leave the remaining waypoints on the "
+"ascent to _Subsurface_. In most cases _Subsurface_ computes additional way "
+"points in order to fulfil decompression requirements for that dive. A "
+"waypoint can be moved by selecting that waypoint and by using the arrow "
+"keys.  The waypoints listed in the _Dive Planner Points_ dialogue can be "
+"edited by hand in order to obtain a precise presentation of the dive "
+"plan. In fact, one can create the whole dive profile by editing the _Dive "
+"Planner Points_ dialog."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2826
+#: ./user-manual.txt:2936
 msgid ""
 "Indicate any changes in gas cylinder used by indicating gas changes as "
 "explained in the section <<S_CreateProfile,hand-creating a dive "
@@ -5484,7 +5749,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2835
+#: ./user-manual.txt:2945
 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 "
@@ -5497,34 +5762,34 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2838
+#: ./user-manual.txt:2948
 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:2839
+#: ./user-manual.txt:2949
 #, no-wrap
-msgid "images/DivePlanner2.jpg"
+msgid "images/DivePlanner2_f20.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2844
+#: ./user-manual.txt:2954
 msgid ""
 "Once the above has been completed, one can save it by clicking the _Save_ "
-"button towards the bottom left of the green design panel. The saved dive "
-"plan will appear in the *Dive List* panel of _Subsurface_."
+"button towards the top middle of the planner. The saved dive plan will "
+"appear in the *Dive List* panel of _Subsurface_."
 msgstr ""
 
-#. type: Title ===
-#: ./user-manual.txt:2845
+#. type: Plain text
+#: ./user-manual.txt:2956
 #, no-wrap
-msgid "The dive plan details"
+msgid "*The dive plan details*\n"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2854
+#: ./user-manual.txt:2964
 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 "
@@ -5537,7 +5802,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2859
+#: ./user-manual.txt:2969
 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 "
@@ -5547,13 +5812,118 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:2861
+#: ./user-manual.txt:2970
+#, no-wrap
+msgid "Planning CCR dives"
+msgstr ""
+
+#. type: Plain text
+#: ./user-manual.txt:2974
+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:2978
+#, no-wrap
+msgid ""
+"*Available gases*: In the _Available gases_ table, enter the cylinder "
+"information for the\n"
+"diluent cylinder and for any bail-out cylinders. Do NOT enter the "
+"information for the oxygen\n"
+"cylinder since it is implied when the _CCR_ dropdown selection is made.\n"
+msgstr ""
+
+#. type: Plain text
+#: ./user-manual.txt:2986
+#, 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"
+"use the default setpoint value. Then, different setpoints can be specified "
+"for dive segments\n"
+"in the _Dive planner points_ table. A zero setpoint\n"
+"means the diver bails out to open circuit mode for that segment. The "
+"decompression is always calculated\n"
+"using the setpoint of the last manually entered segment. So, to plan a bail "
+"out ascent for a\n"
+"CCR dive, add a one-minute dive segment to the end with a setpoint value of "
+"0. The decompression\n"
+"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.\n"
+msgstr ""
+
+#. type: Plain text
+#: ./user-manual.txt:2988
+msgid "The dive profile for a CCR dive may look something like the image below."
+msgstr ""
+
+#. type: Target for macro image
+#: ./user-manual.txt:2989
+#, no-wrap
+msgid "images/Planner_CCR1_f20.jpg"
+msgstr ""
+
+#. type: Plain text
+#: ./user-manual.txt:2993
+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:2994
+#, no-wrap
+msgid "Planning pSCR dives"
+msgstr ""
+
+#. type: Plain text
+#: ./user-manual.txt:3009
+#, no-wrap
+msgid ""
+"To plan a dive using a passive semi-closed rebreather (pSCR), select _pSCR_ "
+"rather than\n"
+"_Open circuit_ in the dropdown list.\n"
+"The parameters of the pSCR diver can be set by selecting  _File ->   "
+"Preferences ->   Graph_\n"
+"from the main menu, where the gas consumption calculation takes into account "
+"the pSCR dump\n"
+"ratio (default 10:1) as well as the metabolism rate. The calculation also "
+"takes the oxygen drop\n"
+"accross the mouthpiece of the rebreather into account. If the\n"
+"pO~2~ drops below what is considered a save value, a warning apears in the "
+"_Dive plan\n"
+"details_. A typical pSCR configuration is with a single cylinder and one or "
+"more bail-out\n"
+"cylinders. Therefore the setup of the _Available gases_ and the _Dive "
+"planner points_ tables\n"
+"are very similar to that of a CCR dive plan, described above. However, no "
+"oxygen setpoints\n"
+"are specified for pSCR dives. Below is a dive plan for a pSCR dive. The dive "
+"is comparable\n"
+"to that of the CCR dive above, but note the longer ascent duration due to "
+"the lower oxygen\n"
+"in the loop due to the oxygen drop accross the mouthpiece of the pSCR "
+"equipment.\n"
+msgstr ""
+
+#. type: Target for macro image
+#: ./user-manual.txt:3010
+#, no-wrap
+msgid "images/Planner_pSCR1_f20.jpg"
+msgstr ""
+
+#. type: Title ===
+#: ./user-manual.txt:3014
 #, no-wrap
 msgid "Modifying an existing dive plan"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2868
+#: ./user-manual.txt:3021
 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 "
@@ -5564,7 +5934,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2874
+#: ./user-manual.txt:3027
 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 "
@@ -5574,13 +5944,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:2875
+#: ./user-manual.txt:3028
 #, no-wrap
 msgid "Planning for repetitive dives"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2882
+#: ./user-manual.txt:3035
 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 "
@@ -5589,7 +5959,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2888
+#: ./user-manual.txt:3041
 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 "
@@ -5599,7 +5969,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2893
+#: ./user-manual.txt:3046
 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 "
@@ -5609,13 +5979,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:2894
+#: ./user-manual.txt:3047
 #, no-wrap
 msgid "Printing the dive plan"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2899
+#: ./user-manual.txt:3052
 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 "
@@ -5623,7 +5993,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2909
+#: ./user-manual.txt:3062
 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 "
@@ -5639,101 +6009,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ==
-#: ./user-manual.txt:2911
-#, no-wrap
-msgid "Configuring a dive computer"
-msgstr ""
-
-#. type: Plain text
-#: ./user-manual.txt:2919
-msgid ""
-"_Subsurface_ enables one to configure a dive computer. Currently the "
-"Heinrichs-Weikamp (OSTC 2, OSTC 3) and Suunto Vyper (Stinger, Mosquito, D3, "
-"Vyper, Vytec, Cobra, Gekko and Zoop) family of dive computers are "
-"supported. A large number of settings of these dive computers can be read "
-"and changed to different values. As a first step, ensure that the "
-"appropriate hardware driver is installed for the dive computer and that the "
-"device name of the dive computer is known.  See "
-"<<_appendix_a_operating_system_specific_information_for_importing_dive_information_from_a_dive_computer,APPENDIX "
-"A>> for information on how to do this."
-msgstr ""
-
-#. type: Plain text
-#: ./user-manual.txt:2924
-msgid ""
-"Once the dive computer is connected to the _Subsurface_ computer, select "
-"_File -> Configure dive computer_ from the _Main Menu_. Provide the "
-"appropriate device name in the text box at the top of the configuration "
-"panel that opens and select the appropriate dive computer model from the "
-"panel on the lefthand (see image below)."
-msgstr ""
-
-#. type: Target for macro image
-#: ./user-manual.txt:2925
-#, no-wrap
-msgid "images/Configure_dc_f20.jpg"
-msgstr ""
-
-#. type: Plain text
-#: ./user-manual.txt:2928
-msgid ""
-"Using the appropriate buttons on the configuration panel, the following "
-"actions can be performed:"
-msgstr ""
-
-#. type: Plain text
-#: ./user-manual.txt:2931
-#, no-wrap
-msgid ""
-"*Retrieve available details*. This loads the existing configuration from the "
-"dive computer\n"
-"to _Subsurface_, showing this in the configuration panel.\n"
-msgstr ""
-
-#. type: Plain text
-#: ./user-manual.txt:2933
-#, no-wrap
-msgid ""
-"*Save changes to device*. This changes the configuration of the\n"
-"dive computer to correspond to the information shown in the configuration "
-"panel.\n"
-msgstr ""
-
-#. type: Plain text
-#: ./user-manual.txt:2935
-#, no-wrap
-msgid ""
-"*Backup*. This saves the configuration data to a file. _Subsurface_ asks "
-"for\n"
-"a file location and file name for the saved information.\n"
-msgstr ""
-
-#. type: Plain text
-#: ./user-manual.txt:2937
-#, no-wrap
-msgid ""
-"*Restore backup*. This loads the information from a backup file and displays "
-"it\n"
-"in the configuration panel.\n"
-msgstr ""
-
-#. type: Plain text
-#: ./user-manual.txt:2939
-#, no-wrap
-msgid ""
-"*Update firmware*. If new firmware is available for the dive computer, this "
-"is\n"
-"loaded into the dive computer.\n"
-msgstr ""
-
-#. type: Title ==
-#: ./user-manual.txt:2940
+#: ./user-manual.txt:3063
 #, no-wrap
 msgid "Description of the Subsurface Main Menu items"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2945
+#: ./user-manual.txt:3068
 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 "
@@ -5741,259 +6023,259 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:2946
+#: ./user-manual.txt:3069
 #, no-wrap
 msgid "File"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2949
+#: ./user-manual.txt:3072
 msgid ""
 "<<S_NewLogbook,_New Logbook_>> - Close the currently open dive logbook and "
 "clear all dive information."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2951
+#: ./user-manual.txt:3074
 msgid ""
 "_Open logbook_ - This opens the file manager in order to select a dive "
 "logbook to open."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2952
+#: ./user-manual.txt:3075
 msgid "_Save_ - Save the dive logbook that is currently open."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2953
+#: ./user-manual.txt:3076
 msgid "_Save as_ - Save the current logbook under a different file name."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2954
+#: ./user-manual.txt:3077
 msgid "_Close_ - Close the dive logbook that is currently open."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2956
+#: ./user-manual.txt:3079
 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:2957
+#: ./user-manual.txt:3080
 msgid "<<S_PrintDivelog,_Print_>> - Print the currently open logbook."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2958
+#: ./user-manual.txt:3081
 msgid "<<S_Preferences,_Preferences_>> - Set the _Subsurface_ preferences."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2959
+#: ./user-manual.txt:3082
 msgid ""
 "<<S_Configure,_Configure dive computer_>> - Edit the configuration of a dive "
 "computer."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2960
+#: ./user-manual.txt:3083
 msgid "_Quit_ - Quit _Subsurface_."
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:2961
+#: ./user-manual.txt:3084
 #, no-wrap
 msgid "Import"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2964
+#: ./user-manual.txt:3087
 msgid ""
 "<<S_ImportDiveComputer,_Import from dive computer_>> - Import dive "
 "information from a dive computer."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2966
+#: ./user-manual.txt:3089
 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:2968
+#: ./user-manual.txt:3091
 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:2970
+#: ./user-manual.txt:3093
 msgid ""
 "<<S_ImportingDivelogsDe,_Import from Divelogs.de_>> - Import dive "
 "information from _www.Divelogs.de_."
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:2971
+#: ./user-manual.txt:3094
 #, no-wrap
 msgid "Log"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2973
+#: ./user-manual.txt:3096
 msgid ""
 "<<S_EnterData,_Add Dive_>> - Manually add a new dive to the *Dive List* "
 "panel."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2974
+#: ./user-manual.txt:3097
 msgid "<<S_DivePlanner,_Plan Dive_>> - This feature allows the planning of dives."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2975
+#: ./user-manual.txt:3098
 msgid ""
 "<<S_Replan,_Re-plan dive_>> - Edit a dive plan that has been saved into the "
 "*Dive List*."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2977
+#: ./user-manual.txt:3100
 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:2979
+#: ./user-manual.txt:3102
 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:2981
+#: ./user-manual.txt:3104
 msgid ""
 "<<S_Renumber,_Renumber_>> - Renumber the dives listed in the *Dive List* "
 "panel."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2983
+#: ./user-manual.txt:3106
 msgid ""
 "<<S_Group,_Auto Group_>> - Group the dives in the *Dive List* panel into "
 "dive trips."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2984
+#: ./user-manual.txt:3107
 msgid ""
 "<<S_DeviceNames,_Edit Device Names_>> - Edit the names of dive computers to "
 "facilitate your logs."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2985
+#: ./user-manual.txt:3108
 msgid ""
 "<<S_Filter,_Filter divelist_>> - Select only some dives, based on specific "
 "tags or dive criteria."
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:2986
+#: ./user-manual.txt:3109
 #, no-wrap
 msgid "View"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2989
+#: ./user-manual.txt:3112
 msgid ""
 "<<S_ViewPanels,_All_>> - View the four main _Subsurface_ panels "
 "simmultaneously."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2990
+#: ./user-manual.txt:3113
 msgid "<<S_ViewPanels,_Dive List_>> - View only the *Dive List* panel."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2991
+#: ./user-manual.txt:3114
 msgid "<<S_ViewPanels,_Profile_>> - View only the *Dive Profile* panel."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2992
+#: ./user-manual.txt:3115
 msgid "<<S_ViewPanels,_Info_>> - View only the *Dive Notes* panel."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2993
+#: ./user-manual.txt:3116
 msgid "<<S_ViewPanels,_Globe_>> - View only the *World Map* panel."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2995
+#: ./user-manual.txt:3118
 msgid ""
 "_Yearly Statistics_ - Display summary statistics about dives during this and "
 "past years."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2996
+#: ./user-manual.txt:3119
 msgid "_Prev DC_ - Switch to previous dive computer."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2997
+#: ./user-manual.txt:3120
 msgid "_Next DC_ - Switch to next dive computer."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2998
+#: ./user-manual.txt:3121
 msgid "_Full Screen_ - Toggles Full Screen mode."
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:2999
+#: ./user-manual.txt:3122
 #, no-wrap
 msgid "Help"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3002
+#: ./user-manual.txt:3125
 msgid ""
 "_About Subsurface_ - Show a panel with the version number of _Subsurface_ as "
 "well as licensing information."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3004
+#: ./user-manual.txt:3127
 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:3005
+#: ./user-manual.txt:3128
 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:3006
+#: ./user-manual.txt:3129
 msgid "_User manual_ - Open a window showing this user manual."
 msgstr ""
 
 #. type: Title ==
-#: ./user-manual.txt:3009
+#: ./user-manual.txt:3132
 #, no-wrap
 msgid ""
 "APPENDIX A: Operating system specific information for importing dive "
@@ -6001,19 +6283,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:3011
+#: ./user-manual.txt:3134
 #, 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:3012
+#: ./user-manual.txt:3135
 #, no-wrap
 msgid "images/icons/drivers.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3017
+#: ./user-manual.txt:3140
 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 "
@@ -6021,7 +6303,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3023
+#: ./user-manual.txt:3146
 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 "
@@ -6030,7 +6312,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3027
+#: ./user-manual.txt:3150
 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 "
@@ -6038,7 +6320,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3034
+#: ./user-manual.txt:3157
 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 "
@@ -6049,19 +6331,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:3036
+#: ./user-manual.txt:3159
 #, 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:3037
+#: ./user-manual.txt:3160
 #, no-wrap
 msgid "images/icons/usb.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3045
+#: ./user-manual.txt:3168
 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 "
@@ -6072,67 +6354,67 @@ msgid ""
 msgstr ""
 
 #. type: Block title
-#: ./user-manual.txt:3046 ./user-manual.txt:3129
+#: ./user-manual.txt:3169 ./user-manual.txt:3252
 #, no-wrap
 msgid "On Windows:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3050
+#: ./user-manual.txt:3173
 msgid ""
 "Simply try COM1, COM2, etc. The drop down list should contain all connected "
 "COM devices."
 msgstr ""
 
 #. type: Block title
-#: ./user-manual.txt:3051 ./user-manual.txt:3144
+#: ./user-manual.txt:3174 ./user-manual.txt:3267
 #, no-wrap
 msgid "On MacOS:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3054
+#: ./user-manual.txt:3177
 msgid "The drop down box should find all connected dive computers."
 msgstr ""
 
 #. type: Block title
-#: ./user-manual.txt:3055
+#: ./user-manual.txt:3178
 #, no-wrap
 msgid "On Linux:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3058
+#: ./user-manual.txt:3181
 msgid "There is a definitive way to find the port:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3060
+#: ./user-manual.txt:3183
 msgid "Disconnect the USB cable from the dive computer"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3061
+#: ./user-manual.txt:3184
 msgid "Open a terminal"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3062 ./user-manual.txt:3064
+#: ./user-manual.txt:3185 ./user-manual.txt:3187
 msgid "Type the command: 'dmesg' and press enter"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3063
+#: ./user-manual.txt:3186
 msgid "Plug in the USB cable of the dive computer"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3066
+#: ./user-manual.txt:3189
 msgid "A message similar to this one should appear:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3082
+#: ./user-manual.txt:3205
 #, no-wrap
 msgid ""
 "\tusb 2-1.1: new full speed USB device number 14 using ehci_hcd\n"
@@ -6153,7 +6435,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3087
+#: ./user-manual.txt:3210
 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 "
@@ -6161,12 +6443,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3089
+#: ./user-manual.txt:3212
 msgid "Ensuring that the user has write permission to the USB serial port:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3095
+#: ./user-manual.txt:3218
 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 "
@@ -6175,14 +6457,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3099
+#: ./user-manual.txt:3222
 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:3104
+#: ./user-manual.txt:3227
 #, no-wrap
 msgid ""
 "Type: +id johnB+     This lists all the groups that johnB belongs to and\n"
@@ -6194,7 +6476,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3106
+#: ./user-manual.txt:3229
 #, no-wrap
 msgid ""
 "Under some circumstances this change takes only effect (eg. on Ubuntu) "
@@ -6203,7 +6485,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3111
+#: ./user-manual.txt:3234
 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 "
@@ -6211,19 +6493,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:3113
+#: ./user-manual.txt:3236
 #, no-wrap
 msgid "Setting up bluetooth enabled devices"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: ./user-manual.txt:3114
+#: ./user-manual.txt:3237
 #, no-wrap
 msgid "images/icons/bluetooth.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3120
+#: ./user-manual.txt:3243
 msgid ""
 "For dive computers communicating through bluetooth like the Heinrichs "
 "Weikamp Frog or the Shearwater Predator and Petrel there is a different "
@@ -6232,7 +6514,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3122
+#: ./user-manual.txt:3245
 #, no-wrap
 msgid ""
 "*For the dive computer, after enabling Bluetooth, ensure it is in Upload "
@@ -6240,7 +6522,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3126
+#: ./user-manual.txt:3249
 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 "
@@ -6248,13 +6530,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3128
+#: ./user-manual.txt:3251
 #, no-wrap
 msgid "*Pair the _Subsurface_ computer with the dive computer.*\n"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3137
+#: ./user-manual.txt:3260
 msgid ""
 "Bluetooth is most likely already enabled. For pairing with the dive computer "
 "choose _Control Panel -> Bluetooth Devices -> Add Wireless Device_.  This "
@@ -6265,21 +6547,21 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3140
+#: ./user-manual.txt:3263
 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:3143
+#: ./user-manual.txt:3266
 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:3150
+#: ./user-manual.txt:3273
 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 "
@@ -6288,20 +6570,20 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3153
+#: ./user-manual.txt:3276
 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: Block title
-#: ./user-manual.txt:3154
+#: ./user-manual.txt:3277
 #, no-wrap
 msgid "On Linux"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3162
+#: ./user-manual.txt:3285
 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 "
@@ -6313,7 +6595,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3169
+#: ./user-manual.txt:3292
 msgid ""
 "In the rare cases where the above is not true, then depending on your "
 "system, try +initd+ or +systemd+. This might be different and also involve "
@@ -6324,12 +6606,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3171
+#: ./user-manual.txt:3294
 msgid "One may also use a manual approach by using such commands:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3176
+#: ./user-manual.txt:3299
 msgid ""
 "+hciconfig+ shows the Bluetooth devices available on your computer (not dive "
 "computer), most likely one will see a hci0, if not try +hcitool -a+ to see "
@@ -6337,14 +6619,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3180
+#: ./user-manual.txt:3303
 msgid ""
 "+hcitool scanning+ gets a list of bluetooth enabled client devices, look for "
 "the dive computer and remember the MAC address are shown there"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3184
+#: ./user-manual.txt:3307
 msgid ""
 "+bluez-simple-agent hci0 10:00:E8:C4:BE:C4+ pairs the dive computer with the "
 "bluetooth stack of the _Subsurface_ computer, copy/paste the MAC address "
@@ -6352,14 +6634,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3187
+#: ./user-manual.txt:3310
 msgid ""
 "Unfortunately on Linux binding to a communication device has to be done "
 "manually by running:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3193
+#: ./user-manual.txt:3316
 msgid ""
 "+rfcomm bind /dev/rfcomm0 10:00:E8:C4:BE:C4+ binds the dive computer to a "
 "communication device in the desktop computer, in case rfcomm is already "
@@ -6368,34 +6650,32 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3196
+#: ./user-manual.txt:3319
 msgid ""
 "For downloading dives in _Subsurface_ specify the device name connected to "
 "the MAC address in the last step above, e.g. _/dev/rfcomm0_."
 msgstr ""
 
 #. type: Title ==
-#: ./user-manual.txt:3198
+#: ./user-manual.txt:3322
 #, no-wrap
-msgid ""
-"APPENDIX B: Dive Computer specific information for importing dive "
-"information."
+msgid "APPENDIX B: Dive Computer specific information for importing dive data."
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:3201
+#: ./user-manual.txt:3325
 #, no-wrap
-msgid "Import from a Uemis Zurich"
+msgid "Importing from Uemis Zurich"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: ./user-manual.txt:3203
+#: ./user-manual.txt:3327
 #, no-wrap
 msgid "images/icons/iumis.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3219
+#: ./user-manual.txt:3343
 msgid ""
 "_Subsurface_ downloads the information stored on the SDA (the built-in file "
 "system of the Uemis) including information about dive spots and "
@@ -6412,7 +6692,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3234
+#: ./user-manual.txt:3358
 msgid ""
 "After selecting the above device name, download the dives from the Uemis "
 "Zurich. One technical issue with the Uemis Zurich download implementation "
@@ -6429,19 +6709,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:3236
+#: ./user-manual.txt:3360
 #, no-wrap
-msgid "Importing dives from the Uwatec Galileo"
+msgid "Importing from Uwatec Galileo"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: ./user-manual.txt:3238
+#: ./user-manual.txt:3362
 #, no-wrap
 msgid "images/icons/Galileo.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3253
+#: ./user-manual.txt:3377
 msgid ""
 "The Uwatec Galileo dive computers use infra red (IrDA) communication between "
 "the dive computer and Subsurface. The Uwatec hardware uses a USB dongle "
@@ -6457,14 +6737,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3256
+#: ./user-manual.txt:3380
 msgid ""
 "After executing this command, Subsurface will recognise the Galileo dive "
 "computer and download dive information."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3260
+#: ./user-manual.txt:3384
 msgid ""
 "Under Windows, a similar situation exists. Drivers for the MCS7780 are "
 "available from some Internet web sites e.g.  "
@@ -6472,26 +6752,26 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3263
+#: ./user-manual.txt:3387
 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:3265
+#: ./user-manual.txt:3389
 #, no-wrap
-msgid "Importing dives from Heinrichs Weikamp DR5"
+msgid "Importing from Heinrichs Weikamp DR5"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: ./user-manual.txt:3267
+#: ./user-manual.txt:3391
 #, no-wrap
 msgid "images/icons/HW_DR5.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3277
+#: ./user-manual.txt:3401
 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.  "
@@ -6504,19 +6784,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:3280
+#: ./user-manual.txt:3404
 #, no-wrap
-msgid "Importing dives from xDEEP BLACK"
+msgid "Importing from xDEEP BLACK"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: ./user-manual.txt:3282
+#: ./user-manual.txt:3406
 #, no-wrap
 msgid "images/icons/HW_xdeepblack.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3291
+#: ./user-manual.txt:3415
 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 "
@@ -6530,19 +6810,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:3293
+#: ./user-manual.txt:3417
 #, no-wrap
-msgid "Import from Shearwater Predator using Bluetooth"
+msgid "Importing from Shearwater Predator using Bluetooth"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: ./user-manual.txt:3295
+#: ./user-manual.txt:3419
 #, no-wrap
 msgid "images/icons/predator.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3303
+#: ./user-manual.txt:3427
 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 "
@@ -6553,36 +6833,36 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3306
+#: ./user-manual.txt:3430
 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:3307
+#: ./user-manual.txt:3431
 msgid "switch to different Bluetooth drivers for the same hardware"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3308
+#: ./user-manual.txt:3432
 msgid "switch off WiFi while using Bluetooth"
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:3310
+#: ./user-manual.txt:3434
 #, no-wrap
-msgid "Importing dive logs from the Poseidon MkVI Discovery"
+msgid "Importing from Poseidon MkVI Discovery"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: ./user-manual.txt:3312
+#: ./user-manual.txt:3436
 #, no-wrap
 msgid "images/MkVI.jpeg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3320
+#: ./user-manual.txt:3444
 msgid ""
 "Download of dive logs from the MkVI is performed using a custom "
 "communications adapter and the _Poseidon PC Configuration Software_, "
@@ -6594,45 +6874,45 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3323
+#: ./user-manual.txt:3447
 msgid ""
 "Setup configuration for the dive and key dive parameters (file with a .txt "
 "extension)"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3324
+#: ./user-manual.txt:3448
 msgid "Dive log details (file with a .csv extension)"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3326
+#: ./user-manual.txt:3450
 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:3328
+#: ./user-manual.txt:3452
 msgid ""
 "_Subsurface_ accesses the .txt and the .csv files to obtain dive log "
 "information."
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:3330
+#: ./user-manual.txt:3454
 #, no-wrap
-msgid "Importing dive logs from the APD Inspiration CCR"
+msgid "Importing from APD Inspiration CCR"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: ./user-manual.txt:3332
+#: ./user-manual.txt:3456
 #, no-wrap
 msgid "images/APDComputer.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3340
+#: ./user-manual.txt:3464
 msgid ""
 "The dive logs of an APD Inspiration or similar CCR dive computer are "
 "downloaded using a communications adapter and _AP Communicator_, obtained "
@@ -6644,82 +6924,82 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3342
+#: ./user-manual.txt:3466
 msgid "Open a dive within the _AP Log Viewer_."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3343
+#: ./user-manual.txt:3467
 msgid "Select the tab at the top of the screen, entitled \"_Data_\"."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3344
+#: ./user-manual.txt:3468
 msgid ""
 "If the raw dive log data show on the screen, click on \"_Copy to "
 "Clipboard_\"."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3345
+#: ./user-manual.txt:3469
 msgid "Open a text editor, e.g. Notepad (Windows), TextWrangler (Mac)."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3347
+#: ./user-manual.txt:3471
 msgid ""
 "Copy the contents of the clipboard into the text editor and save the text "
 "file with a filename extension of .CSV"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3348
+#: ./user-manual.txt:3472
 msgid ""
 "Within _Subsurface_, select _Import -> Import log files_ to open the "
 "xref:Unified_import[universal import dialogue]."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3349
+#: ./user-manual.txt:3473
 msgid ""
 "In the dropdown list towards the bottom right of the dialogue, select \"_CSV "
 "files_\"."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3351
+#: ./user-manual.txt:3475
 msgid ""
 "On the list of file names select the .CSV file that has been created "
 "above. An import dialogue opens."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3353
+#: ./user-manual.txt:3477
 msgid ""
 "In the dropdown list on the middle right labeled '_Pre-configured "
 "imports_\", select _APD Log Viewer_."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3354
+#: ./user-manual.txt:3478
 msgid ""
 "Ensure the other settings for the ADP dive log are appropriate, then select "
 "_OK_."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3356
+#: ./user-manual.txt:3480
 msgid "The APD dive log will appear within _Subsurface_."
 msgstr ""
 
 #. type: Title ==
-#: ./user-manual.txt:3358
+#: ./user-manual.txt:3482
 #, no-wrap
 msgid "APPENDIX C: Exporting Dive log information from external dive log software."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3367
+#: ./user-manual.txt:3491
 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, "
@@ -6729,22 +7009,22 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3369
+#: ./user-manual.txt:3493
 msgid "Export the foreign dive log data to format that is accessible from"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3370
+#: ./user-manual.txt:3494
 msgid "_Subsurface_."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3371
+#: ./user-manual.txt:3495
 msgid "Import the accessible dive log data into _Subsurface_."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3375
+#: ./user-manual.txt:3499
 msgid ""
 "This appendix provides some information about approaches to export dive log "
 "data from foreign dive log software. The procedures below mostly apply to "
@@ -6752,19 +7032,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:3377
+#: ./user-manual.txt:3501
 #, no-wrap
-msgid "Exporting dives from *Suunto Divemanager (DM3, DM4 or DM5)*"
+msgid "Exporting from *Suunto Divemanager (DM3, DM4 or DM5)*"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: ./user-manual.txt:3378
+#: ./user-manual.txt:3502
 #, no-wrap
 msgid "images/icons/suuntologo.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3385
+#: ./user-manual.txt:3509
 msgid ""
 "DiveManager is a MS Windows application for Suunto dive computers.  "
 "Divemanager 3 (DM3) is an older version of the Suunto software. More recent "
@@ -6774,67 +7054,67 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3387
+#: ./user-manual.txt:3511
 #, no-wrap
 msgid "*Divemanager 3 (DM3):*\n"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3389
+#: ./user-manual.txt:3513
 msgid "Start 'Suunto Divemanager 3' and log in with the name containing the logs"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3390
+#: ./user-manual.txt:3514
 msgid "Do not start the import wizard to import dives from the dive computer."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3392
+#: ./user-manual.txt:3516
 msgid ""
 "In the navigation tree on the left side of the program-window, select the "
 "appropriate dives."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3393
+#: ./user-manual.txt:3517
 msgid "Within the list of dives, select the dives you would like to import later:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3394
+#: ./user-manual.txt:3518
 msgid "To select certain dives: hold 'ctrl' and click the dive"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3395
+#: ./user-manual.txt:3519
 msgid "To select all dives: Select the first dive, hold down shift and"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3396
+#: ./user-manual.txt:3520
 msgid "select the last dive"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3397
+#: ./user-manual.txt:3521
 msgid "With the dives marked, use the program menu _File -> Export_"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3398
+#: ./user-manual.txt:3522
 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:3399
+#: ./user-manual.txt:3523
 msgid "Click the browse button next to the field Export Path"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3401
+#: ./user-manual.txt:3525
 #, no-wrap
 msgid ""
 "** A file-manager like window pops up\n"
@@ -6842,13 +7122,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3402
+#: ./user-manual.txt:3526
 #, no-wrap
 msgid "Divelog.SDE file\n"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3404
+#: ./user-manual.txt:3528
 #, no-wrap
 msgid ""
 "** Optionally change the name of the file for saving\n"
@@ -6856,25 +7136,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3405
+#: ./user-manual.txt:3529
 #, no-wrap
 msgid "Back in the Export pop-up, press the button 'Export'\n"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3406
+#: ./user-manual.txt:3530
 #, no-wrap
 msgid "The dives are now exported to the file Divelog.SDE.\n"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3408
+#: ./user-manual.txt:3532
 #, no-wrap
 msgid "*Divemanager 4 (DM4) and Divemanager 5 (DM5):*\n"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3413
+#: ./user-manual.txt:3537
 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 "
@@ -6883,75 +7163,75 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3415
+#: ./user-manual.txt:3539
 msgid "Locating the Suunto DM4 (or DM5) database:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3417 ./user-manual.txt:3426
+#: ./user-manual.txt:3541 ./user-manual.txt:3550
 msgid "Start Suunto DM4/DM5"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3418
+#: ./user-manual.txt:3542
 msgid "Select 'Help -> About'"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3419
+#: ./user-manual.txt:3543
 msgid "Click 'Copy' after text 'Copy log folder path to clipboard'"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3420
+#: ./user-manual.txt:3544
 msgid "Now open Windows Explorer"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3421
+#: ./user-manual.txt:3545
 msgid "Paste the address to the path box at the top of the File Explorer"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3422
+#: ./user-manual.txt:3546
 msgid "The database is called DM4.db or DM5.db"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3424
+#: ./user-manual.txt:3548
 msgid "Making a backup copy of the Suunto DM4/DM5 database:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3427
+#: ./user-manual.txt:3551
 msgid "Select 'File - Create backup'"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3429
+#: ./user-manual.txt:3553
 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:3430
+#: ./user-manual.txt:3554
 msgid "Click 'Save'"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3431
+#: ./user-manual.txt:3555
 msgid "The dives are now exported to the file DM4.bak (or DM5.bak)"
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:3433
+#: ./user-manual.txt:3557
 #, no-wrap
 msgid "Exporting from Atomic Logbook"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3442
+#: ./user-manual.txt:3566
 msgid ""
 "Atomic Logbook is a Windows software by Atomic Aquatics. It allows "
 "downloading of dive information from Cobalt and Cobalt 2 dive computers.  "
@@ -6961,19 +7241,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:3444
+#: ./user-manual.txt:3568
 #, no-wrap
 msgid "Exporting from Mares Dive Organiser V2.1"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: ./user-manual.txt:3447
+#: ./user-manual.txt:3571
 #, no-wrap
 msgid "images/icons/mareslogo.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3455
+#: ./user-manual.txt:3579
 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 "
@@ -6984,7 +7264,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3460
+#: ./user-manual.txt:3584
 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 "
@@ -6992,36 +7272,36 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3463
+#: ./user-manual.txt:3587
 msgid ""
 "Rename the file to DiveOrganiserxxxxx.zip. Inside the zipped directory is a "
 "file _DiveOrganiser.sdf_."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3464
+#: ./user-manual.txt:3588
 msgid "Extract the _.sdf_ file from the zipped folder to your Desktop."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3465
+#: ./user-manual.txt:3589
 msgid "The password for accessing the .zip file is _mares_."
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:3467
+#: ./user-manual.txt:3591
 #, no-wrap
-msgid "Exporting dives from *DivingLog 5.0*"
+msgid "Exporting from *DivingLog 5.0*"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: ./user-manual.txt:3469
+#: ./user-manual.txt:3593
 #, no-wrap
 msgid "images/icons/divingloglogo.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3478
+#: ./user-manual.txt:3602
 msgid ""
 "Unfortunately DivingLog XML files give us no indication on the preferences "
 "set on one's system. So in order for _Subsurface_ to be able to successfully "
@@ -7032,33 +7312,32 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3480
+#: ./user-manual.txt:3604
 msgid "In DivingLog open the 'File -> Export -> XML' menu"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3481
+#: ./user-manual.txt:3605
 msgid "Select the dives to export"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3482
+#: ./user-manual.txt:3606
 msgid "Click on the export button and select the filename"
 msgstr ""
 
 #. type: Title ==
-#: ./user-manual.txt:3484
+#: ./user-manual.txt:3608
 #, no-wrap
 msgid "APPENDIX D: Exporting a spreadsheet to CSV format"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3494
+#: ./user-manual.txt:3617
 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 "
-"imported into _Subsurface_ (xref:S_ImportingManualCSV[Importing dives "
-"from_manually kept CSV file]), after the spreadsheet is converted in a .CSV "
+"imported into _Subsurface_ after the spreadsheet is converted in a .CSV "
 "file.  This section explains the procedure to convert a diving logbook "
 "stored in a spreadsheet to a .CSV file that will later be imported from "
 "_Subsurface_.  Creating a .CSV is a straightforward task, although the "
@@ -7067,7 +7346,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3500
+#: ./user-manual.txt:3623
 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 "
@@ -7078,40 +7357,40 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3502
+#: ./user-manual.txt:3625
 msgid "Date: use one of the following formats: yyyy-mm-dd, dd.mm.yyyy, mm/dd/yyyy"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3503
+#: ./user-manual.txt:3626
 msgid "Duration: the format should be minutes:seconds."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3504
+#: ./user-manual.txt:3627
 msgid ""
 "Unit system: only one unit system shold be used (i.e., no mixture between "
 "imperial and metric units)"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3505
+#: ./user-manual.txt:3628
 msgid "Tags and buddies: values should be separated using a comma."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3506
+#: ./user-manual.txt:3629
 msgid "GPS position: users must use decimal degrees, e.g. 30.22496 30.821798"
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:3507
+#: ./user-manual.txt:3630
 #, no-wrap
 msgid "_LibreOffice Calc_ and _OpenOffice Calc_"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3511
+#: ./user-manual.txt:3634
 msgid ""
 "These are open source spreadsheet applications forming parts of larger open "
 "source office suite applications. The user interaction with _LibreOffice_ "
@@ -7122,13 +7401,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:3512
+#: ./user-manual.txt:3635
 #, no-wrap
 msgid "images/LOffice_spreadsheetdata.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3515
+#: ./user-manual.txt:3638
 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 "
@@ -7136,13 +7415,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:3516
+#: ./user-manual.txt:3639
 #, no-wrap
 msgid "images/LOffice_save_as_options.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3519
+#: ./user-manual.txt:3642
 msgid ""
 "After selecting _Save_, select the appropriate field delimiter (choose _Tab_ "
 "to prevent conflicts with the comma when using this as a decimal point), "
@@ -7150,27 +7429,27 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:3520
+#: ./user-manual.txt:3643
 #, no-wrap
 msgid "images/LOffice_field_options.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3523
+#: ./user-manual.txt:3646
 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:S_ImportingManualCSV[Importing dives from manually kept CSV files]."
+"xref:S_ImportingCSVDives[Importing CSV dives]."
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:3524
+#: ./user-manual.txt:3647
 #, no-wrap
 msgid "Microsoft _Excel_"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3530
+#: ./user-manual.txt:3653
 msgid ""
 "The field delimiter (called \"_list separator_\" in Microsoft manuals) is "
 "not accessible from within _Excel_ and needs to be set through the "
@@ -7181,19 +7460,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3532
+#: ./user-manual.txt:3655
 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:3533
+#: ./user-manual.txt:3656
 msgid "Open the _Regional and Language Options_ dialog box."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3536
+#: ./user-manual.txt:3659
 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 "
@@ -7201,48 +7480,48 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3537
+#: ./user-manual.txt:3660
 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:3538
+#: ./user-manual.txt:3661
 msgid "Click _OK_ twice."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3540
+#: ./user-manual.txt:3663
 msgid "Below is an image of the _Control Panel_:"
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:3541
+#: ./user-manual.txt:3664
 #, no-wrap
 msgid "images/Win_SaveCSV2.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3544
+#: ./user-manual.txt:3667
 msgid "To export the dive log in CSV format:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3546
+#: ./user-manual.txt:3669
 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:3547
+#: ./user-manual.txt:3670
 #, no-wrap
 msgid "images/Win_SaveCSV1.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3550
+#: ./user-manual.txt:3673
 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 "
@@ -7252,34 +7531,34 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:3551
+#: ./user-manual.txt:3674
 #, no-wrap
 msgid "images/Win_SaveCSV3.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3554
+#: ./user-manual.txt:3677
 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 "
 "text editor, and then import the dive data as explained on the section "
-"xref:S_ImportingManualCSV[Importing dives from manually kept CSV files]."
+"xref:S_ImportingCSVDives[Importing CSV dives]."
 msgstr ""
 
 #. type: Title ==
-#: ./user-manual.txt:3555
+#: ./user-manual.txt:3678
 #, no-wrap
 msgid "APPENDIX E: FAQs."
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:3557
+#: ./user-manual.txt:3680
 #, no-wrap
 msgid "Subsurface appears to miscalculate gas consumption and SAC"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3561
+#: ./user-manual.txt:3684
 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_ "
@@ -7287,7 +7566,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3567
+#: ./user-manual.txt:3690
 msgid ""
 "'Answer': Not really. What happens is that _Subsurface_ actually calculates "
 "gas consumption differently - and better - than you expect.  In particular, "
@@ -7297,7 +7576,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3573
+#: ./user-manual.txt:3696
 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 "
@@ -7307,12 +7586,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3575
+#: ./user-manual.txt:3698
 msgid "+consumption = (amount_of_air_at_beginning - amount_of_air_at_end)+"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3581
+#: ./user-manual.txt:3704
 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 "
@@ -7323,12 +7602,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3583
+#: ./user-manual.txt:3706
 msgid "+12.2*((220-100)/1.013)+"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3588
+#: ./user-manual.txt:3711
 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 "
@@ -7338,7 +7617,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3594
+#: ./user-manual.txt:3717
 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 "
@@ -7349,7 +7628,7 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:3595
+#: ./user-manual.txt:3718
 #, no-wrap
 msgid ""
 "Some dive profiles have time discrepancies with the recorded samples from my "
@@ -7357,7 +7636,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3599
+#: ./user-manual.txt:3722
 msgid ""
 "_Subsurface_ ends up ignoring surface time for many things (average depth, "
 "divetime, SAC, etc).  'Question': Why do dive durations in my dive computer "
@@ -7365,7 +7644,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3607
+#: ./user-manual.txt:3730
 msgid ""
 "'Answer': For example, if you end up doing a weight check (deep enough to "
 "trigger the \"dive started\")  but then come back up and wait five minutes "
diff --git a/Documentation/fr/po/subsurface-manual.fr.po b/Documentation/fr/po/subsurface-manual.fr.po
index 16de7b0..af4a9e9 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-01-29 16:16+0100\n"
-"PO-Revision-Date: 2015-01-29 16:16+0100\n"
+"POT-Creation-Date: 2015-02-03 15:45+0100\n"
+"PO-Revision-Date: 2015-02-03 15:11+0100\n"
 "Last-Translator: Guillaume GARDET <guillaume.gardet at opensuse.org>\n"
 "Language-Team: French <opensuse-fr at opensuse.org>\n"
 "Language: fr\n"
@@ -657,9 +657,9 @@ msgstr ""
 #: user-manual.txt:267
 msgid ""
 "The coordinates can be obtained from the _Subsurface_ Companion app if the "
-"user has an Android device with GPS and if the coordinates of the dive site "
-"were stored using that device.  xref:S_Companion[Click here for more "
-"information]"
+"user has an Android or iPhone device with GPS and if the coordinates of the "
+"dive site were stored using that device.  xref:S_Companion[Click here for "
+"more information]"
 msgstr ""
 
 #. type: Plain text
@@ -1058,7 +1058,7 @@ msgid ""
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:486 user-manual.txt:2681
+#: user-manual.txt:486 user-manual.txt:2796
 #, no-wrap
 msgid "images/icons/warning2.png"
 msgstr "images/icons/warning2.png"
@@ -1268,7 +1268,7 @@ msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
 #: user-manual.txt:616 user-manual.txt:1161 user-manual.txt:1227
-#: user-manual.txt:1279 user-manual.txt:1355
+#: user-manual.txt:1280 user-manual.txt:1356
 #, no-wrap
 msgid "images/icons/important.png"
 msgstr "images/icons/important.png"
@@ -1482,9 +1482,9 @@ msgstr ""
 #: user-manual.txt:747
 msgid ""
 "The user can obtain the coordinates from the _Subsurface_ Companion app if "
-"an Android device with GPS was used and if the coordinates of the dive site "
-"were stored using that device.  xref:S_Companion[Click here for more "
-"information]"
+"an Android or iPhone device with GPS was used and if the coordinates of the "
+"dive site were stored using that device.  xref:S_Companion[Click here for "
+"more information]"
 msgstr ""
 
 #. type: Plain text
@@ -2269,28 +2269,28 @@ msgid "Importing GPS coordinates with the _Subsurface Companion App_ for mobile
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1248
+#: user-manual.txt:1249
 msgid ""
-"Using the *Subsurface Companion App* on an Android device with a GPS, the "
-"coordinates for the diving location can be automatically passed to the "
-"_Subsurface_ dive log. The Companion App stores the dive locations on a "
-"dedicated Internet-based file server. _Subsurface_, in turn, can collect the "
-"localities from the file server."
+"Using the *Subsurface Companion App* on an _Android device_ with a GPS or "
+"xref:S_iphone[_iPhone_], the coordinates for the diving location can be "
+"automatically passed to the _Subsurface_ dive log. The Companion App stores "
+"the dive locations on a dedicated Internet-based file server. _Subsurface_, "
+"in turn, can collect the localities from the file server."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1250
+#: user-manual.txt:1251
 msgid "To do this:"
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:1251
+#: user-manual.txt:1252
 #, no-wrap
 msgid "Create a Companion App account"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1256
+#: user-manual.txt:1257
 msgid ""
 "Register on the http://api.hohndel.org/login/[_Subsurface companion web "
 "page_].  A confirmation email with instructions and a personal *DIVERID* "
@@ -2299,7 +2299,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1261
+#: user-manual.txt:1262
 msgid ""
 "Download the app from https://play.google.com/store/apps/details?id=org."
 "subsurface[Google Play Store] or from http://f-droid.org/repository/browse/?"
@@ -2307,18 +2307,18 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:1262
+#: user-manual.txt:1263
 #, no-wrap
-msgid "Using the Subsurface companion app on a smartphone"
+msgid "Using the Subsurface companion app on an Android smartphone"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1265
+#: user-manual.txt:1266
 msgid "On first use the app has three options:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1271
+#: user-manual.txt:1272
 msgid ""
 "_Create a new account._ Equivalent to registering in _Subsurface_ companion "
 "page using an Internet browser. One can request a *DIVERID* using this "
@@ -2328,14 +2328,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1274
+#: user-manual.txt:1275
 msgid ""
 "_Retrieve an account._ If users forgot their *DIVERID* they will receive an "
 "email to recover the number."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1278
+#: user-manual.txt:1279
 msgid ""
 "_Use an existing account._ Users are prompted for their *DIVERID*. The app "
 "saves this *DIVERID* and does not ask for it again unless one uses the "
@@ -2343,7 +2343,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1286
+#: user-manual.txt:1287
 msgid ""
 "In the _Subsurface_ main program, the *DIVERID* should also be entered on "
 "the Default Preferences panel, obtained by selecting _File -> Preferences -> "
@@ -2352,13 +2352,13 @@ msgid ""
 msgstr ""
 
 #. type: Title =====
-#: user-manual.txt:1287
+#: user-manual.txt:1288
 #, no-wrap
 msgid "Creating new dive locations"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1292
+#: user-manual.txt:1293
 msgid ""
 "Now one is ready to get a dive position and send it to the server. The "
 "Android display will look like the left hand image (*A*) below, but without "
@@ -2366,21 +2366,21 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1295
+#: user-manual.txt:1296
 msgid ""
 "Touch the \"+\" icon on the top right to add a new dive site, a menu will be "
 "showed with 3 options:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1298
+#: user-manual.txt:1299
 msgid ""
 "Current: A prompt for a place name (or a request to activate the GPS if it "
 "is turned off) will be displayed, after which the current location is saved."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1307
+#: user-manual.txt:1308
 msgid ""
 "Use Map: This option allows the user to fix a position by searching a world "
 "map. A world map is shown (see *B* below) on which one should indicate the "
@@ -2393,13 +2393,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:1308
+#: user-manual.txt:1309
 #, no-wrap
 msgid "images/Companion_5.jpg"
 msgstr "images/Companion_5.jpg"
 
 #. type: Plain text
-#: user-manual.txt:1316
+#: user-manual.txt:1317
 msgid ""
 "Import local GPX file: The android device searches for .gpx files and "
 "located archives will be shown. The selected .gpx file is opened and the "
@@ -2409,13 +2409,13 @@ msgid ""
 msgstr ""
 
 #. type: Title =====
-#: user-manual.txt:1317
+#: user-manual.txt:1318
 #, no-wrap
 msgid "Dive lists of dive locations"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1325
+#: user-manual.txt:1326
 msgid ""
 "The main screen shows a list of dive locations, each with a name, date and "
 "time (see *A* below). Some locations may have an arrow-up icon over the "
@@ -2426,7 +2426,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1333
+#: user-manual.txt:1334
 msgid ""
 "Dive locations in this list can be viewed in two ways: a list of locations "
 "or a map indicating the dive locations. The display mode (List or Map) is "
@@ -2438,13 +2438,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:1334
+#: user-manual.txt:1335
 #, no-wrap
 msgid "images/Companion_4.jpg"
 msgstr "images/Companion_4.jpg"
 
 #. type: Plain text
-#: user-manual.txt:1340
+#: user-manual.txt:1341
 msgid ""
 "When one clicks on a dive (*not* selecting the check box), the name given to "
 "it, date/time and GPS coordinates will be shown, with two options at the top "
@@ -2452,32 +2452,32 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1342
+#: user-manual.txt:1343
 msgid ""
 "Edit (pencil): Change the text name or other characteristics of the dive "
 "location."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1344
+#: user-manual.txt:1345
 msgid "Maps: Display a map showing the dive location."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1347
+#: user-manual.txt:1348
 msgid ""
 "After editing and saving a dive location (see *C* above), one needs to "
 "upload it to the web service, as explained below."
 msgstr ""
 
 #. type: Title =====
-#: user-manual.txt:1348
+#: user-manual.txt:1349
 #, no-wrap
 msgid "Uploading dive locations"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1354
+#: user-manual.txt:1355
 msgid ""
 "There are several ways to send locations to the server.  The easiest is by "
 "simply selecting the locations (See *A* below) and then touching the right "
@@ -2485,51 +2485,51 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1359
+#: user-manual.txt:1360
 msgid ""
 "Users must be careful, as the trash icon on the right means exactly what it "
 "should; it deletes the selected dive location(s)."
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:1360
+#: user-manual.txt:1361
 #, no-wrap
 msgid "images/Companion_1.jpg"
 msgstr "images/Companion_1.jpg"
 
 #. type: Plain text
-#: user-manual.txt:1365
+#: user-manual.txt:1366
 msgid ""
 "After a dive trip using the Companion App, all dive locations are ready to "
 "be downloaded to a _Subsurface_ dive log (see below)."
 msgstr ""
 
 #. type: Title =====
-#: user-manual.txt:1367
+#: user-manual.txt:1368
 #, no-wrap
 msgid "Settings on the Companion app"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1370
+#: user-manual.txt:1371
 msgid ""
 "Selecting the _Settings_ menu option results in the right hand image above "
 "(*B*)."
 msgstr ""
 
 #. type: Title =====
-#: user-manual.txt:1371
+#: user-manual.txt:1372
 #, no-wrap
 msgid "Server and account"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1374
+#: user-manual.txt:1375
 msgid "_Web-service URL._ This is predefined (http://api.hohndel.org/)"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1378
+#: user-manual.txt:1379
 msgid ""
 "_User ID._ The DIVERID obtained by registering as described above. The "
 "easiest way to obtain it is simply to copy and paste from the confirmation "
@@ -2537,33 +2537,33 @@ msgid ""
 msgstr ""
 
 #. type: Title =====
-#: user-manual.txt:1379
+#: user-manual.txt:1380
 #, no-wrap
 msgid "Synchronisation"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1383
+#: user-manual.txt:1384
 msgid ""
 "_Synchronize on startup._ If selected, dive locations in the Android device "
 "and those on the web service synchronise each time the app is started."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1386
+#: user-manual.txt:1387
 msgid ""
 "_Upload new dives._ If selected, each time the user adds a dive location it "
 "is automatically sent to the server."
 msgstr ""
 
 #. type: Title =====
-#: user-manual.txt:1387
+#: user-manual.txt:1388
 #, no-wrap
 msgid "Background service"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1390
+#: user-manual.txt:1391
 msgid ""
 "Instead of entering a unique dive location, users can leave the service "
 "running in the background of their Android device, allowing the continuous "
@@ -2571,35 +2571,35 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1393
+#: user-manual.txt:1394
 msgid "The settings below define the behaviour of the service:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1396
+#: user-manual.txt:1397
 msgid ""
 "_Min duration._ In minutes. The app will try to get a location every X "
 "minutes until stopped by the user."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1398
+#: user-manual.txt:1399
 msgid "_Min distance._ In meters. Minimum distance between two locations."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1400
+#: user-manual.txt:1401
 msgid "_Name template._ The name the app will use when saving the locations."
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:1401 user-manual.txt:1477 user-manual.txt:1762
+#: user-manual.txt:1402 user-manual.txt:1499 user-manual.txt:1786
 #, no-wrap
 msgid "images/icons/info.jpg"
 msgstr "images/icons/info.jpg"
 
 #. type: Plain text
-#: user-manual.txt:1411
+#: user-manual.txt:1412
 msgid ""
 "_How does the background service work?_ Assuming the user sets 5 minutes and "
 "50 meters in the settings above, the app will start by recording a location "
@@ -2612,59 +2612,59 @@ msgid ""
 msgstr ""
 
 #. type: Title =====
-#: user-manual.txt:1412
+#: user-manual.txt:1413
 #, no-wrap
 msgid "Other"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1416
+#: user-manual.txt:1417
 msgid ""
 "_Mailing List._ The mail box for _Subsurface_. Users can send an email to "
 "the Subsurface mailing list."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1418
+#: user-manual.txt:1419
 msgid "_Subsurface website._ A link to the URL of Subsurface web"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1420
+#: user-manual.txt:1421
 msgid "_Version._ Displays the current version of the Companion App."
 msgstr ""
 
 #. type: Title =====
-#: user-manual.txt:1421
+#: user-manual.txt:1422
 #, no-wrap
 msgid "Search"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1424
+#: user-manual.txt:1425
 msgid "Search the saved dive locations by name or by date and time."
 msgstr ""
 
 #. type: Title =====
-#: user-manual.txt:1425
+#: user-manual.txt:1426
 #, no-wrap
 msgid "Start service"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1428
+#: user-manual.txt:1429
 msgid ""
 "Initiates the _background service_ following the previously defined settings."
 msgstr ""
 
 #. type: Title =====
-#: user-manual.txt:1429
+#: user-manual.txt:1430
 #, no-wrap
 msgid "Disconnect"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1437
+#: user-manual.txt:1438
 msgid ""
 "This is a badly named option that disconnects the app from the server by "
 "resetting the user ID in the app, showing the first screen where an account "
@@ -2674,25 +2674,69 @@ msgid ""
 msgstr ""
 
 #. type: Title =====
-#: user-manual.txt:1438
+#: user-manual.txt:1439
 #, no-wrap
 msgid "Send all locations"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1441
+#: user-manual.txt:1442
 msgid ""
 "This option sends all locations stored in the Android device to the server."
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:1443
+#: user-manual.txt:1444
+#, no-wrap
+msgid "Using the Subsurface companion app on an _iPhone_ to record dive locations"
+msgstr ""
+
+#. type: Plain text
+#: user-manual.txt:1449
+msgid ""
+"The iPhone interface is quite simple. One needs to type the user ID "
+"(obtained during registration) into the space reserved for it, then select "
+"\"Dive in\" (see left part of the image below) and start collecting dive "
+"location information."
+msgstr ""
+
+#. type: Target for macro image
+#: user-manual.txt:1450
+#, no-wrap
+msgid "images/iphone.jpg"
+msgstr "images/iphone.jpg"
+
+#. type: Plain text
+#: user-manual.txt:1457
+msgid ""
+"Dives can be added automatically or manually. In manual mode, a dive "
+"location or waypoint is added to the GPS input stream. In automatic mode, a "
+"continuous path of GPS locations is created from which, much later, after "
+"import, subsurface can select the appropriate GPS locations based on the "
+"times of dives. The default mode for the _iphone_ is automatic. When one "
+"adds a dive, the location service is started automatically and a red bar "
+"appears at the bottom of the screen. After the dive one can click on the red "
+"bar to end the location service. While the location service is running one "
+"can only add dives using the manual mechanism."
+msgstr ""
+
+#. type: Plain text
+#: user-manual.txt:1463
+msgid ""
+"One can edit the site name afterwards by selecting the dive from the dive "
+"list and clicking on the site name. There are no other editable fields. The "
+"dive list is automatically uploaded from the iphone to the webservice and "
+"there is not an option to trigger upload manually."
+msgstr ""
+
+#. type: Title ====
+#: user-manual.txt:1465
 #, no-wrap
 msgid "Downloading dive locations to the _Subsurface_ divelog"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1452
+#: user-manual.txt:1474
 msgid ""
 "Download dive(s) from a dive computer or enter them manually into "
 "_Subsurface_ before obtaining the GPS coordinates from the server. The "
@@ -2704,13 +2748,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:1453
+#: user-manual.txt:1475
 #, no-wrap
 msgid "images/DownloadGPS.jpg"
 msgstr "images/DownloadGPS.jpg"
 
 #. type: Plain text
-#: user-manual.txt:1461
+#: user-manual.txt:1483
 msgid ""
 "Note that the _Apply_ button is now active. By clicking on it, users can "
 "update the locations of the newly entered or uploaded dives in _Subsurface_ "
@@ -2721,7 +2765,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1468
+#: user-manual.txt:1490
 msgid ""
 "Since _Subsurface_ matches GPS locations from the Android device and dive "
 "information from the dive computer based on date-time data, automatic "
@@ -2733,7 +2777,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1476
+#: user-manual.txt:1498
 msgid ""
 "Similar date-times may not always be possible and there may be many reasons "
 "for this (e.g. time zones), or _Subsurface_ may be unable to decide which is "
@@ -2747,12 +2791,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1480
+#: user-manual.txt:1502
 msgid "TIPS:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1487
+#: user-manual.txt:1509
 msgid ""
 "_Background service_, being a very powerful tool, may fill the location list "
 "with many unnecessary locations not corresponding to the exact dive point "
@@ -2765,7 +2809,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1491
+#: user-manual.txt:1513
 msgid ""
 "It may also make sense to give informative names to the locations sent to "
 "the web server, or at least to use an informative name in the _Name "
@@ -2774,13 +2818,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:1493
+#: user-manual.txt:1515
 #, no-wrap
 msgid "Adding photographs to dives"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1499
+#: user-manual.txt:1521
 msgid ""
 "Many (if not most) divers take a camera with them and take photographs "
 "during a dive. One would like to associate each photograph with a specific "
@@ -2789,39 +2833,39 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:1500
+#: user-manual.txt:1522
 #, no-wrap
 msgid "Loading photos and getting synchronisation between dive computer and camera"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1504
+#: user-manual.txt:1526
 msgid ""
 "Left-lick on a dive or on a group of dives on the dive list. Then right-"
 "click on this dive or group of dives and choose the option _Load Images_:"
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:1505
+#: user-manual.txt:1527
 #, no-wrap
 msgid "images/LoadImage1_f20.jpg"
 msgstr "images/LoadImage1_f20.jpg"
 
 #. type: Plain text
-#: user-manual.txt:1509
+#: user-manual.txt:1531
 msgid ""
 "The system file browser appears. Select the folder and photographs that need "
 "to be loaded into _Subsurface_ and click the _Open_ button."
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:1510
+#: user-manual.txt:1532
 #, no-wrap
 msgid "images/LoadImage2_f20.jpg"
 msgstr "images/LoadImage2_f20.jpg"
 
 #. type: Plain text
-#: user-manual.txt:1519
+#: user-manual.txt:1541
 msgid ""
 "This brings one to the time synchronisation dialog, shown below. The "
 "critical problem is that the time synchronisation is not perfect between the "
@@ -2832,12 +2876,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1521
+#: user-manual.txt:1543
 msgid "_Subsurface_ achieves this synchronisation in two ways:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1533
+#: user-manual.txt:1555
 #, no-wrap
 msgid ""
 "*Manually*: If the user wrote down the exact camera time at the start of a dive, the\n"
@@ -2854,13 +2898,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:1534
+#: user-manual.txt:1556
 #, no-wrap
 msgid "images/LoadImage3b_f20.jpg"
 msgstr "images/LoadImage3b_f20.jpg"
 
 #. type: Plain text
-#: user-manual.txt:1552
+#: user-manual.txt:1574
 #, no-wrap
 msgid ""
 "*By photograph*: There is a very slick way of achieving synchronisation. If one takes a\n"
@@ -2881,7 +2925,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1555
+#: user-manual.txt:1577
 msgid ""
 "If the timestamp of a photograph is long before or after the dive, it is not "
 "placed on the dive profile. If the timestamp of the photo is within 30 "
@@ -2889,62 +2933,62 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:1556
+#: user-manual.txt:1578
 #, no-wrap
 msgid "Viewing the photos"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1560
+#: user-manual.txt:1582
 msgid ""
 "In order to view the photos added to a dive, activate the _show-photos_ "
 "button in the tool bar to the left of the dive profile:"
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:1561
+#: user-manual.txt:1583
 #, no-wrap
 msgid "images/icons/ShowPhotos_f20.png"
 msgstr "images/icons/ShowPhotos_f20.png"
 
 #. type: Plain text
-#: user-manual.txt:1564
+#: user-manual.txt:1586
 msgid "After the images have been loaded, they appear in two places:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1566
+#: user-manual.txt:1588
 msgid "the _Photos_ tab of the *Dive Notes* panel."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1568
+#: user-manual.txt:1590
 msgid ""
 "as tiny icons (stubs) on the dive profile at the appropriate positions "
 "reflecting the time each photograph was taken. See below:"
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:1569
+#: user-manual.txt:1591
 #, no-wrap
 msgid "images/LoadImage4_f20.jpg"
 msgstr "images/LoadImage4_f20.jpg"
 
 #. type: Plain text
-#: user-manual.txt:1573
+#: user-manual.txt:1595
 msgid ""
 "If one hovers with the mouse over any of the photo icons, then a thumbnail "
 "photo is shown of the appropriate photo. See the image below:"
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:1574
+#: user-manual.txt:1596
 #, no-wrap
 msgid "images/LoadImage5_f20.jpg"
 msgstr "images/LoadImage5_f20.jpg"
 
 #. type: Plain text
-#: user-manual.txt:1583
+#: user-manual.txt:1605
 msgid ""
 "Clicking on the thumbnail brings up a full size photo overlaid on the "
 "_Subsurface_ window. This allows good viewing of the photographs that have "
@@ -2956,19 +3000,19 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:1584
+#: user-manual.txt:1606
 #, no-wrap
 msgid "images/LoadImage6_f20.jpg"
 msgstr "images/LoadImage6_f20.jpg"
 
 #. type: Title ====
-#: user-manual.txt:1586
+#: user-manual.txt:1608
 #, no-wrap
 msgid "The _Photos_ tab"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1597
+#: user-manual.txt:1619
 msgid ""
 "Photographs associated with a dive are shown as thumbnails in the _Photos_ "
 "tab of the _Dive Notes_ panel. Photos taken in rapid succession during a "
@@ -2984,13 +3028,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:1598
+#: user-manual.txt:1620
 #, no-wrap
 msgid "Photos on an external hard disk"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1609
+#: user-manual.txt:1631
 msgid ""
 "Most underwater photographers store their photos on an external drive. If "
 "such a drive can be mapped (almost always the case) the photos can be "
@@ -3008,26 +3052,26 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:1611
+#: user-manual.txt:1633
 #, no-wrap
 msgid "Logging special types of dives"
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:1613
+#: user-manual.txt:1635
 #, no-wrap
 msgid "Sidemount dives"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1617
+#: user-manual.txt:1639
 msgid ""
 "_Subsurface_ easily handles dives involving more than one cylinder. "
 "Sidemount dive logging involves three steps:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1626
+#: user-manual.txt:1648
 #, no-wrap
 msgid ""
 "*During the dive, recording cylinder switch events*. Since sidemount diving normally involves two\n"
@@ -3041,7 +3085,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1629
+#: user-manual.txt:1651
 #, no-wrap
 msgid ""
 "*Within _Subsurface_ describe the cylinders used during the dive*. The diver needs to provide the\n"
@@ -3050,7 +3094,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1639
+#: user-manual.txt:1661
 #, no-wrap
 msgid ""
 "*Indicate cylinder change events on the _Subsurface_ dive profile*. Once the dive log has been imported\n"
@@ -3066,32 +3110,32 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:1640
+#: user-manual.txt:1662
 #, no-wrap
 msgid "images/sidemount1.jpg"
 msgstr "images/sidemount1.jpg"
 
 #. type: Plain text
-#: user-manual.txt:1643
+#: user-manual.txt:1665
 msgid ""
 "This section gives an example of the versatility of _Subsurface_ as a give "
 "logging tool."
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:1645
+#: user-manual.txt:1667
 #, no-wrap
 msgid "Closed circuit rebreather (CCR) dives"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:1647
+#: user-manual.txt:1669
 #, no-wrap
 msgid "images/APD.jpg"
 msgstr "images/APD.jpg"
 
 #. type: Plain text
-#: user-manual.txt:1652
+#: user-manual.txt:1674
 msgid ""
 "Closed system rebreathers use advanced technology to recirculate gas that "
 "has been breathed while doing two things to maintain a breathable oxygen "
@@ -3099,12 +3143,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1653
+#: user-manual.txt:1675
 msgid "remove carbon dioxide from the gas that has been exhaled"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1662
+#: user-manual.txt:1684
 msgid ""
 "regulate the oxygen concentration to remain within safe diving limits.  "
 "Currently, within _Subsurface_, the Poseidon MkVI Discovery is the best "
@@ -3118,13 +3162,13 @@ msgid ""
 msgstr ""
 
 #. type: Title =====
-#: user-manual.txt:1663
+#: user-manual.txt:1685
 #, no-wrap
 msgid "Import a CCR dive"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1676
+#: user-manual.txt:1698
 msgid ""
 "See the section dealing with xref:S_ImportingAlienDiveLogs[Importing dive "
 "information from other digital sources]. From the main menu of _Subsurface_, "
@@ -3141,13 +3185,13 @@ msgid ""
 msgstr ""
 
 #. type: Title =====
-#: user-manual.txt:1677
+#: user-manual.txt:1699
 #, no-wrap
 msgid "Displayed information for a CCR dive"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1687
+#: user-manual.txt:1709
 msgid ""
 "_Partial pressures of gases_: The graph of oxygen partial pressure shows the "
 "information from the oxygen sensors of the CCR equipment. In contrast to "
@@ -3156,17 +3200,17 @@ msgid ""
 "pO~2~, 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~2~ is NOT the mean oxygen partial pressure as "
-"given by the CCR equipment, but a value xalculated by _Subsurface_ as "
+"given by the CCR equipment, but a value calculated by _Subsurface_ as "
 "follows:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1689
+#: user-manual.txt:1711
 msgid "For TWO O~2~ sensors the mean value of the two sensors are given."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1693
+#: user-manual.txt:1715
 msgid ""
 "For THREE-sensor systems (e.g. APD), the mean value is also used. However "
 "differences of more than 0,1 bar in the simultaneous readings of different "
@@ -3175,12 +3219,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1695
+#: user-manual.txt:1717
+msgid ""
+"If no sensor data is available, the pO~2~ value is assumed to be equal to "
+"the setpoint."
+msgstr ""
+
+#. type: Plain text
+#: user-manual.txt:1719
 msgid "The mean pO~2~ of the sensors is indicated with a green line,"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1703
+#: user-manual.txt:1727
 msgid ""
 "The oxygen setpoint values as well as the readings from the individual "
 "oxygen sensors can be shown. The display of additional CCR information is "
@@ -3192,13 +3243,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:1704
+#: user-manual.txt:1728
 #, no-wrap
 msgid "images/CCR_preferences_f20.jpg"
 msgstr "images/CCR_preferences_f20.jpg"
 
 #. type: Plain text
-#: user-manual.txt:1711
+#: user-manual.txt:1735
 msgid ""
 "Checking any of the check boxes allows the display of additional oxygen-"
 "related information whenever the pO~2~ toolbar button on the _Profile_ panel "
@@ -3209,13 +3260,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:1712
+#: user-manual.txt:1736
 #, no-wrap
 msgid "images/CCR_setpoint_f20.jpg"
 msgstr "images/CCR_setpoint_f20.jpg"
 
 #. type: Plain text
-#: user-manual.txt:1716
+#: user-manual.txt:1740
 msgid ""
 "The second checkbox allows the display of the data from each individual "
 "oxygen sensor of the CCR equipment. The data for each sensor is colour-coded "
@@ -3223,22 +3274,22 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1718
+#: user-manual.txt:1742
 msgid "Sensor 1: grey"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1719
+#: user-manual.txt:1743
 msgid "Sensor 2: blue"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1720
+#: user-manual.txt:1744
 msgid "Sensor 3: brown"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1724
+#: user-manual.txt:1748
 msgid ""
 "The mean oxygen pO~2~ is indicated by the green line. This allows the direct "
 "comparison of data from each of the oxygen sensors, useful for detecting "
@@ -3246,13 +3297,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:1725
+#: user-manual.txt:1749
 #, no-wrap
 msgid "images/CCR_sensor_data_f20.jpg"
 msgstr "images/CCR_sensor_data_f20.jpg"
 
 #. type: Plain text
-#: user-manual.txt:1730
+#: user-manual.txt:1754
 msgid ""
 "The setpoint data can be overlaid on the oxygen sensor data by activating "
 "both of the above check boxes. Partial pressures for nitrogen (and helium, "
@@ -3260,7 +3311,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1734
+#: user-manual.txt:1758
 msgid ""
 "_Events_: Several events are logged, e.g. switching the mouthpiece to open "
 "circuit.  These events are indicated by yellow triangles and, if one hovers "
@@ -3269,7 +3320,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1742
+#: user-manual.txt:1766
 msgid ""
 "_Cylinder pressures_: Some CCR dive computers like the Poseidon MkVI record "
 "the pressures of the oxygen and diluent cylinders. The pressures of these "
@@ -3282,21 +3333,21 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:1743
+#: user-manual.txt:1767
 #, no-wrap
 msgid "images/CCR_dive_profile_f20.jpg"
 msgstr "images/CCR_dive_profile_f20.jpg"
 
 #. type: Plain text
-#: user-manual.txt:1748
+#: user-manual.txt:1772
 msgid ""
 "_Equipment-specific information_: Equipment-specific information gathered by "
-"_Subsurface_ is shown in the xref:S_ExtraTab[Extra data tab]. This may "
+"_Subsurface_ is shown in the xref:S_ExtraDataTab[Extra data tab]. This may "
 "include setup information or metadata about the dive."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1751
+#: user-manual.txt:1775
 msgid ""
 "More equipment-specific information for downloading CCR dive logs for "
 "Poseidon MkVI and APD equipment can be found in xref:S_PoseidonMkVI[Appendix "
@@ -3304,19 +3355,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ==
-#: user-manual.txt:1752
+#: user-manual.txt:1776
 #, no-wrap
 msgid "Obtaining more information about dives entered into the logbook"
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:1754
+#: user-manual.txt:1778
 #, no-wrap
 msgid "The *Dive Info* tab (for individual dives)"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1761
+#: user-manual.txt:1785
 msgid ""
 "The Dive Info tab gives some summary information about a particular dive "
 "that has been selected in the *Dive List*. Useful information here includes "
@@ -3326,7 +3377,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1768
+#: user-manual.txt:1792
 msgid ""
 "Gas consumption and SAC calculations: _Subsurface_ calculates SAC and Gas "
 "consumption taking in account gas incompressibility, particularly at tank "
@@ -3335,13 +3386,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:1769
+#: user-manual.txt:1794
 #, no-wrap
 msgid "The *Extra Data* tab (usually for individual dives)"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1777
+#: user-manual.txt:1802
 msgid ""
 "When using a dive computer, it often reports several data items that cannot "
 "easily be presented in a standardised way because the nature of the "
@@ -3353,19 +3404,19 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:1778
+#: user-manual.txt:1803
 #, no-wrap
 msgid "images/ExtraDataTab_f20.jpg"
 msgstr "images/ExtraDataTab_f20.jpg"
 
 #. type: Title ===
-#: user-manual.txt:1780
+#: user-manual.txt:1805
 #, no-wrap
 msgid "The *Stats* tab (for groups of dives)"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1791
+#: user-manual.txt:1816
 msgid ""
 "The Stats tab gives summary statistics for more than one dive, assuming that "
 "more than one dive has been selected in the *Dive List* using the standard "
@@ -3378,19 +3429,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:1793
+#: user-manual.txt:1818
 #, no-wrap
 msgid "The *Dive Profile*"
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:1795
+#: user-manual.txt:1820
 #, no-wrap
 msgid "images/Profile2.jpg"
 msgstr "images/Profile2.jpg"
 
 #. type: Plain text
-#: user-manual.txt:1806
+#: user-manual.txt:1831
 msgid ""
 "Of all the panels in _Subsurface_, the Dive Profile contains the most "
 "detailed information about each dive. The Dive Profile has a *button bar* on "
@@ -3403,7 +3454,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block |
-#: user-manual.txt:1813
+#: user-manual.txt:1838
 #, no-wrap
 msgid ""
 "|*Colour*|*Descent speed (m/min)*|*Ascent speed (m/min)*\n"
@@ -3413,9 +3464,15 @@ msgid ""
 "|Light green|1.5 - 9|1.5 - 4\n"
 "|Dark green|< 1.5|< 1.5\n"
 msgstr ""
+"|*Couleur*|*Vitesse de descente (m/min)*|*Vitesse de remontée (m/min)*\n"
+"|Rouge|> 30|> 18\n"
+"|Orange|18 - 30|9 - 18\n"
+"|Jaune|9 - 18|4 - 9\n"
+"|Vert clair|1.5 - 9|1.5 - 4\n"
+"|Vert foncé|< 1.5|< 1.5\n"
 
 #. type: Plain text
-#: user-manual.txt:1818
+#: user-manual.txt:1843
 msgid ""
 "The profile also includes depth readings for the peaks and troughs in the "
 "graph.  Thus, users should see the depth of the deepest point and other "
@@ -3423,13 +3480,13 @@ msgid ""
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:1819
+#: user-manual.txt:1844
 #, no-wrap
 msgid "images/icons/scale.jpg"
 msgstr "images/icons/scale.jpg"
 
 #. type: Plain text
-#: user-manual.txt:1824
+#: user-manual.txt:1849
 msgid ""
 "In some cases the dive profile does not fill the whole area of the *Dive "
 "Profile* panel. Clicking the *Scale* button in the toolbar on the left of "
@@ -3438,7 +3495,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1827
+#: user-manual.txt:1852
 #, no-wrap
 msgid ""
 "*Water temperature* is displayed with its own blue line with temperature values\n"
@@ -3446,7 +3503,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1834
+#: user-manual.txt:1859
 msgid ""
 "The dive profile can include graphs of the *partial pressures* of O2, N2, "
 "and He during the dive (see figure above) as well as a calculated and dive "
@@ -3457,13 +3514,13 @@ msgid ""
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:1835
+#: user-manual.txt:1860
 #, no-wrap
 msgid "images/icons/O2.jpg"
 msgstr "images/icons/O2.jpg"
 
 #. type: Plain text
-#: user-manual.txt:1839
+#: user-manual.txt:1864
 msgid ""
 "Clicking this button allows display of the partial pressure of *oxygen* "
 "during the dive. This is depicted below the dive depth and water temperature "
@@ -3471,26 +3528,26 @@ msgid ""
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:1840
+#: user-manual.txt:1865
 #, no-wrap
 msgid "images/icons/N2.jpg"
 msgstr "images/icons/N2.jpg"
 
 #. type: Plain text
-#: user-manual.txt:1843
+#: user-manual.txt:1868
 msgid ""
 "Clicking this button allows display of the partial pressure of *nitrogen* "
 "during the dive."
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:1844
+#: user-manual.txt:1869
 #, no-wrap
 msgid "images/icons/He.jpg"
 msgstr "images/icons/He.jpg"
 
 #. type: Plain text
-#: user-manual.txt:1848
+#: user-manual.txt:1873
 msgid ""
 "Clicking this button allows display of the partial pressure of *helium* "
 "during the dive.  This is only of importance to divers using Trimix, "
@@ -3498,7 +3555,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1861
+#: user-manual.txt:1886
 msgid ""
 "The *air consumption* graph displays the tank pressure and its change during "
 "the dive. The air consumption takes depth into account so that even when "
@@ -3513,13 +3570,13 @@ msgid ""
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:1862
+#: user-manual.txt:1887
 #, no-wrap
 msgid "images/icons/Heartbutton.png"
 msgstr "images/icons/Heartbutton.png"
 
 #. type: Plain text
-#: user-manual.txt:1866
+#: user-manual.txt:1891
 msgid ""
 "Clicking on the heart rate button will allow the display of heart rate "
 "information during the dive if the dive computer was attached to a heart "
@@ -3527,7 +3584,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1874
+#: user-manual.txt:1899
 #, no-wrap
 msgid ""
 "It is possible to *zoom* into the profile graph. This is done either by using\n"
@@ -3540,19 +3597,19 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:1875
+#: user-manual.txt:1900
 #, no-wrap
 msgid "images/MeasuringBar.png"
 msgstr "images/MeasuringBar.png"
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:1877
+#: user-manual.txt:1902
 #, no-wrap
 msgid "images/icons/ruler.jpg"
 msgstr "images/icons/ruler.jpg"
 
 #. type: Plain text
-#: user-manual.txt:1885
+#: user-manual.txt:1910
 msgid ""
 "Measurements of *depth or time differences* can be achieved by using the "
 "*ruler button* on the left of the dive profile panel.  The measurement is "
@@ -3562,13 +3619,13 @@ msgid ""
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:1886
+#: user-manual.txt:1911
 #, no-wrap
 msgid "images/icons/ShowPhotos.png"
 msgstr "images/icons/ShowPhotos.png"
 
 #. type: Plain text
-#: user-manual.txt:1893
+#: user-manual.txt:1918
 msgid ""
 "Photographs that have been added to a dive can be shown on the profile by "
 "selecting the *Show-photo* button. The position of a photo on the profile "
@@ -3577,7 +3634,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1922
+#: user-manual.txt:1947
 msgid ""
 "The profile can also include the dive computer reported *ceiling* (more "
 "precisely, the deepest deco stop that the dive computer calculated for each "
@@ -3607,13 +3664,13 @@ msgid ""
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:1923
+#: user-manual.txt:1948
 #, no-wrap
 msgid "images/icons/cceiling.jpg"
 msgstr "images/icons/cceiling.jpg"
 
 #. type: Plain text
-#: user-manual.txt:1928
+#: user-manual.txt:1953
 msgid ""
 "If the dive computer itself calculates a ceiling and makes it available to "
 "_Subsurface_ during upload of dives, this can be shown as a red area by "
@@ -3621,13 +3678,13 @@ msgid ""
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:1929
+#: user-manual.txt:1954
 #, no-wrap
 msgid "images/icons/ceiling1.jpg"
 msgstr "images/icons/ceiling1.jpg"
 
 #. type: Plain text
-#: user-manual.txt:1934
+#: user-manual.txt:1959
 msgid ""
 "If the *Calculated ceiling* button on the Profile Panel is clicked, then a "
 "ceiling, calculated by _Subsurface_, is shown in green if it exists for a "
@@ -3636,13 +3693,13 @@ msgid ""
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:1935
+#: user-manual.txt:1960
 #, no-wrap
 msgid "images/icons/ceiling2.jpg"
 msgstr "images/icons/ceiling2.jpg"
 
 #. type: Plain text
-#: user-manual.txt:1939
+#: user-manual.txt:1964
 msgid ""
 "If, in addition, the *show all tissues* button on the Profile Panel is "
 "clicked, the ceiling is shown for the tissue compartments following the "
@@ -3650,32 +3707,32 @@ msgid ""
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:1940
+#: user-manual.txt:1965
 #, no-wrap
 msgid "images/icons/ceiling3.jpg"
 msgstr "images/icons/ceiling3.jpg"
 
 #. type: Plain text
-#: user-manual.txt:1944
+#: user-manual.txt:1969
 msgid ""
 "If, in addition, the *3m increments* button on the Profile Panel is clicked, "
 "then the ceiling is indicated in 3 m increments (*C* in figure below)."
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:1945
+#: user-manual.txt:1970
 #, no-wrap
 msgid "images/Ceilings2.jpg"
 msgstr "images/Ceilings2.jpg"
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:1947
+#: user-manual.txt:1972
 #, no-wrap
 msgid "images/icons/ShowCylindersButton.jpg"
 msgstr "images/icons/ShowCylindersButton.jpg"
 
 #. type: Plain text
-#: user-manual.txt:1953
+#: user-manual.txt:1978
 msgid ""
 "By selecting this icon, the different cylinders used during a dive can be "
 "represented as a coloured bar at the bottom of the *Dive Profile*. In "
@@ -3687,19 +3744,19 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:1954
+#: user-manual.txt:1979
 #, no-wrap
 msgid "images/ShowCylinders_f20.jpg"
 msgstr "images/ShowCylinders_f20.jpg"
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:1957
+#: user-manual.txt:1982
 #, no-wrap
 msgid "images/tissues.jpg"
 msgstr "images/tissues.jpg"
 
 #. type: Plain text
-#: user-manual.txt:1969
+#: user-manual.txt:1994
 msgid ""
 "Display inert gas tissue pressures relative to ambient inert gas pressure "
 "(horizontal grey line).  Tissue pressures are calculated using the Bühlmann "
@@ -3718,13 +3775,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:1970
+#: user-manual.txt:1995
 #, no-wrap
 msgid "images/tissuesGraph.jpg"
 msgstr "images/tissuesGraph.jpg"
 
 #. type: Plain text
-#: user-manual.txt:1978
+#: user-manual.txt:2003
 msgid ""
 "Gradient Factor settings strongly affect the calculated ceilings and their "
 "depths.  For more information about Gradient factors, see the section on "
@@ -3737,25 +3794,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1980
+#: user-manual.txt:2005
 #, 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:1982
+#: user-manual.txt:2007
 #, no-wrap
 msgid " ** link:http://www.rebreatherworld.com/general-and-new-to-rebreather-articles/5037-gradient-factors-for-dummies.html[Gradient factors for dummies, by Kevin Watts]\n"
 msgstr " ** link:http://www.rebreatherworld.com/general-and-new-to-rebreather-articles/5037-gradient-factors-for-dummies.html[Gradient factors for dummies, by Kevin Watts]\n"
 
 #. type: Title ===
-#: user-manual.txt:1984
+#: user-manual.txt:2009
 #, no-wrap
 msgid "The Dive Profile context menu"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2002
+#: user-manual.txt:2027
 msgid ""
 "The context menu for the Dive Profile is accessed by right-clicking while "
 "the mouse cursor is over the Dive Profile panel. The menu allows the "
@@ -3776,13 +3833,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:2003
+#: user-manual.txt:2029
 #, no-wrap
 msgid "The *Information Box*"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2013
+#: user-manual.txt:2039
 msgid ""
 "The Information box displays a large range of information pertaining to the "
 "dive profile. Normally the Information Box is located to the top left of the "
@@ -3795,13 +3852,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2014
+#: user-manual.txt:2040
 #, no-wrap
 msgid "images/InfoBox2.jpg"
 msgstr "images/InfoBox2.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2031
+#: user-manual.txt:2057
 msgid ""
 "The moment the mouse points inside the *Dive Profile* panel, the information "
 "box expands and shows many data items. In this situation, the data reflect "
@@ -3822,20 +3879,20 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2034
+#: user-manual.txt:2060
 msgid ""
 "The user has control over the display of several statistics, represented as "
 "four buttons on the left of the profile panel. These are:"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:2035
+#: user-manual.txt:2061
 #, no-wrap
 msgid "images/icons/MOD.jpg"
 msgstr "images/icons/MOD.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2042
+#: user-manual.txt:2068
 msgid ""
 "Clicking this button causes the Information Box to display the *Maximum "
 "Operating Depth (MOD)* of the dive, given the gas mixture used. MOD is "
@@ -3845,13 +3902,13 @@ msgid ""
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:2043
+#: user-manual.txt:2069
 #, no-wrap
 msgid "images/icons/NDL.jpg"
 msgstr "images/icons/NDL.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2052
+#: user-manual.txt:2078
 msgid ""
 "Clicking this button causes the Information Box to display the *No-deco "
 "Limit (NDL)* or the *Total Time to Surface (TTS)*. NDL is the time duration "
@@ -3864,13 +3921,13 @@ msgid ""
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:2053
+#: user-manual.txt:2079
 #, no-wrap
 msgid "images/icons/SAC.jpg"
 msgstr "images/icons/SAC.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2062
+#: user-manual.txt:2088
 msgid ""
 "Clicking this button causes the Information Box to display the *Surface Air "
 "Consumption (SAC)*.  SAC is an indication of the surface-normalised "
@@ -3883,13 +3940,13 @@ msgid ""
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:2063
+#: user-manual.txt:2089
 #, no-wrap
 msgid "images/icons/EAD.jpg"
 msgstr "images/icons/EAD.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2078
+#: user-manual.txt:2104
 msgid ""
 "Clicking this button displays the *Equivalent Air Depth (EAD)* for nitrox "
 "dives as well as the *Equivalent Narcotic Depth (END)* for trimix dives. "
@@ -3905,20 +3962,20 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2080
+#: user-manual.txt:2106
 msgid ""
 "Figure (*B*) above shows an information box with a nearly complete set of "
 "data."
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:2082
+#: user-manual.txt:2108
 #, no-wrap
 msgid "The Gas Pressure Bar Graph"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2089
+#: user-manual.txt:2115
 msgid ""
 "On the left of the *Information Box* is a vertical bar graph indicating the "
 "pressures of the nitrogen (and other inert gases, e.g. helium, if "
@@ -3929,13 +3986,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2090
+#: user-manual.txt:2116
 #, no-wrap
 msgid "images/GasPressureBarGraph.jpg"
 msgstr "images/GasPressureBarGraph.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2096
+#: user-manual.txt:2122
 msgid ""
 "The light green area indicates the total gas, with the top margin of the "
 "light green area indicating the total gas pressure inhaled by the diver and "
@@ -3945,7 +4002,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2102
+#: user-manual.txt:2128
 msgid ""
 "The horizontal black line underneath the light green margin indicates the "
 "equilibrium pressure of the inert gases inhaled by the diver, usually "
@@ -3956,7 +4013,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2106
+#: user-manual.txt:2132
 msgid ""
 "The dark green area at the bottom of the graph represents the pressures of "
 "inert gas in each of the 16 tissue compartments, following the Bühlmann "
@@ -3964,7 +4021,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2111
+#: user-manual.txt:2137
 msgid ""
 "The top black horizontal line indicates the gradient factor that applies to "
 "the depth of the diver at the particular point on the *Dive Profile*. The "
@@ -3973,7 +4030,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2115
+#: user-manual.txt:2141
 msgid ""
 "The bottom margin of the red area in the graph indicates the Bühlman-derived "
 "M-value, that is the pressure value of inert gases at which bubble formation "
@@ -3981,7 +4038,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2118
+#: user-manual.txt:2144
 msgid ""
 "These five values are indicated on the left in the graph above. The way the "
 "Gas Pressure Bar Graph changes during a dive is indicated on the right hand "
@@ -3989,7 +4046,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2121
+#: user-manual.txt:2147
 msgid ""
 "Graph *A* indicates the situation at the start of a dive with diver at the "
 "surface. The pressures in all the tissue compartments are still at the "
@@ -3997,7 +4054,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2124
+#: user-manual.txt:2150
 msgid ""
 "Graph *B* indicates the situation after a descent to 30 meters. Few of the "
 "tissue compartments have had time to respond to the descent, their gas "
@@ -4005,7 +4062,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2129
+#: user-manual.txt:2155
 msgid ""
 "Graph *C* represents the pressures after 30 minutes at 30 m. The fast "
 "compartments have attained equilibrium (i.e. they have reached the hight of "
@@ -4015,7 +4072,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2135
+#: user-manual.txt:2161
 msgid ""
 "Graph *D* shows the pressures after ascent to a depth of 4.5 meters. Since, "
 "during ascent, the total inhaled gas pressure has decreased strongly from 4 "
@@ -4026,7 +4083,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2140
+#: user-manual.txt:2166
 msgid ""
 "Graph *E* indicates the situation after remaining at 4.5 meters for 10 "
 "minutes. The fast compartments have decreased in pressure. As expected, the "
@@ -4036,19 +4093,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ==
-#: user-manual.txt:2143
+#: user-manual.txt:2169
 #, no-wrap
 msgid "Organising the logbook (Manipulating groups of dives)"
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:2145
+#: user-manual.txt:2171
 #, no-wrap
 msgid "The Dive List context menu"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2150
+#: user-manual.txt:2176
 msgid ""
 "Many actions within _Subsurface_ are dependent on a context menu used mostly "
 "to manipulate groups of dives. The context menu is found by selecting a dive "
@@ -4056,30 +4113,30 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2151
+#: user-manual.txt:2177
 #, no-wrap
 msgid "images/ContextMenu.jpg"
 msgstr "images/ContextMenu.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2154
+#: user-manual.txt:2180
 msgid "The context menu is used in many manipulations described below."
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:2155
+#: user-manual.txt:2181
 #, no-wrap
 msgid "Customising the information showed in the *Dive List* panel"
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2157
+#: user-manual.txt:2183
 #, no-wrap
 msgid "images/DiveListOptions.jpg"
 msgstr "images/DiveListOptions.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2165
+#: user-manual.txt:2191
 msgid ""
 "The default information in the *Dive List* includes, for each dive, "
 "Dive_number, Date, Rating, Dive_depth, Dive_duration and Dive_location. This "
@@ -4093,13 +4150,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:2166
+#: user-manual.txt:2192
 #, no-wrap
 msgid "Selecting dives from a particular dive site"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2172
+#: user-manual.txt:2198
 msgid ""
 "Many divers have long dive lists and it may be difficult to locate all the "
 "dives at a particular site.  By pressing _Ctl-F_ on the keyboard, a text box "
@@ -4109,13 +4166,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:2174
+#: user-manual.txt:2200
 #, no-wrap
 msgid "Renumbering the dives"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2186
+#: user-manual.txt:2212
 msgid ""
 "Dives are normally numbered incrementally from non-recent dives (low "
 "sequence numbers) to recent dives (having the highest sequence numbers). The "
@@ -4131,13 +4188,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:2188
+#: user-manual.txt:2214
 #, no-wrap
 msgid "Grouping dives into trips and manipulating trips"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2196
+#: user-manual.txt:2222
 msgid ""
 "For regular divers, the dive list can rapidly become very long. _Subsurface_ "
 "can group dives into _trips_. It performs this by grouping dives that have "
@@ -4149,13 +4206,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2197
+#: user-manual.txt:2223
 #, no-wrap
 msgid "images/Group2.jpg"
 msgstr "images/Group2.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2203
+#: user-manual.txt:2229
 msgid ""
 "Grouping into trips allows a rapid way of accessing individual dives without "
 "having to scan a long lists of dives. In order to group the dives in a dive "
@@ -4164,13 +4221,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:2204
+#: user-manual.txt:2230
 #, no-wrap
 msgid "Editing the title and associated information for a particular trip"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2217
+#: user-manual.txt:2243
 msgid ""
 "Normally, in the dive list, minimal information is included in the trip "
 "title.  More information about a trip can be added by selecting its trip "
@@ -4185,13 +4242,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:2218
+#: user-manual.txt:2244
 #, no-wrap
 msgid "Viewing the dives during a particular trip"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2223
+#: user-manual.txt:2249
 msgid ""
 "Once the dives have been grouped into trips, users can expand one or more "
 "trips by clicking the arrow-head on the left of each trip title. This "
@@ -4200,13 +4257,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:2224
+#: user-manual.txt:2250
 #, no-wrap
 msgid "Collapsing or expanding dive information for different trips"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2230
+#: user-manual.txt:2256
 msgid ""
 "If a user right-clicks after selecting a particular trip in the dive list, "
 "the resulting context menu allows several possibilities to expand or "
@@ -4215,13 +4272,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:2231
+#: user-manual.txt:2257
 #, no-wrap
 msgid "Merging dives from more than one trip into a single trip"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2236
+#: user-manual.txt:2262
 msgid ""
 "By right-clicking on a selected trip title in the *Dive List* panel, a "
 "context menu shows up that allows the merging of trips by either merging of "
@@ -4229,13 +4286,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:2237
+#: user-manual.txt:2263
 #, no-wrap
 msgid "Splitting a single trip into more than one trip"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2247
+#: user-manual.txt:2273
 msgid ""
 "If a trip includes five dives, the user can split this trip into two trips "
 "(trip 1: top 3 dives; trip 2: bottom 2 dives) by selecting and right-"
@@ -4247,25 +4304,25 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2248
+#: user-manual.txt:2274
 #, no-wrap
 msgid "images/SplitDive3a.jpg"
 msgstr "images/SplitDive3a.jpg"
 
 #. type: Title ===
-#: user-manual.txt:2250
+#: user-manual.txt:2276
 #, no-wrap
 msgid "Manipulating single dives"
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:2252
+#: user-manual.txt:2278
 #, no-wrap
 msgid "Delete a dive from the dive log"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2259
+#: user-manual.txt:2285
 msgid ""
 "Dives can be permanently deleted from the dive log by selecting and right-"
 "clicking them to bring up the context menu, and then selecting *Delete "
@@ -4275,13 +4332,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:2260
+#: user-manual.txt:2286
 #, no-wrap
 msgid "Unlink a dive from a trip"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2267
+#: user-manual.txt:2293
 msgid ""
 "Users can unlink dives from the trip to which they belong. In order to do "
 "this, select and right-click the relevant dives to bring up the context "
@@ -4290,13 +4347,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:2268
+#: user-manual.txt:2294
 #, no-wrap
 msgid "Add a dive to the trip immediately above"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2275
+#: user-manual.txt:2301
 msgid ""
 "Selected dives can be moved from the trip to which they belong and placed "
 "within the trip immediately above the currently active trip. To do this, "
@@ -4305,13 +4362,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:2276
+#: user-manual.txt:2302
 #, no-wrap
 msgid "Shift the start time of dive(s)"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2287
+#: user-manual.txt:2313
 msgid ""
 "Sometimes it is necessary to adjust the start time of a dive. This may apply "
 "to situations where dives are performed in different time zones or when the "
@@ -4324,13 +4381,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:2288
+#: user-manual.txt:2314
 #, no-wrap
 msgid "Merge dives into a single dive"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2298
+#: user-manual.txt:2324
 msgid ""
 "Sometimes a dive is briefly interrupted, e.g. if a diver returns to the "
 "surface for a few minutes, resulting in two or more dives being recorded by "
@@ -4344,19 +4401,19 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2299
+#: user-manual.txt:2325
 #, no-wrap
 msgid "images/MergedDive.png"
 msgstr "images/MergedDive.png"
 
 #. type: Title ===
-#: user-manual.txt:2302
+#: user-manual.txt:2328
 #, no-wrap
 msgid "Filtering the dive list"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2308
+#: user-manual.txt:2334
 msgid ""
 "The dives in the *Dive List* panel can be filtered, that is, one can select "
 "only some of the dives based on their attributes, e.g. dive tags, dive site, "
@@ -4366,7 +4423,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2317
+#: user-manual.txt:2343
 msgid ""
 "To open the filter, select _Log -> Filter divelist_ from the main menu. This "
 "opens the _Filter Panel_ at the top of the _Subsurface_ window. Three icons "
@@ -4380,13 +4437,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2319
+#: user-manual.txt:2344
 #, no-wrap
 msgid "images/Filterpanel.jpg"
 msgstr "images/Filterpanel.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2329
+#: user-manual.txt:2353
 msgid ""
 "Four filter criteria may be used to filter the dive list: dive tags, person "
 "(buddy / dive master), dive site and dive suit, each of which is represented "
@@ -4399,7 +4456,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2337
+#: user-manual.txt:2361
 msgid ""
 "To activate filtering of the dive list, the check box of at least one item "
 "in one of the four check lists needs to be checked. The dive list is then "
@@ -4412,39 +4469,144 @@ msgid ""
 msgstr ""
 
 #. type: Title ==
-#: user-manual.txt:2339
+#: user-manual.txt:2363
 #, no-wrap
 msgid "Exporting the dive log or parts of the dive log"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2345
+#: user-manual.txt:2366
+msgid ""
+"There are two routes for the export of dive information from Subsurface:"
+msgstr ""
+
+#. type: Plain text
+#: user-manual.txt:2368
+msgid "Export dive information to _Facebook_"
+msgstr "Exporter les informations de plongée vers _Facebook_"
+
+#. type: Plain text
+#: user-manual.txt:2370
+msgid ""
+"xref:S_Export_other[Export dive information to other destinations or formats]"
+msgstr ""
+"xref:S_Export_other[Exporter des informations de plongée vers d'autres "
+"destinations ou formats]"
+
+#. type: Title ===
+#: user-manual.txt:2372
+#, no-wrap
+msgid "Exporting dive information to _Facebook_"
+msgstr "Export des informations de plongée vers _Facebook_"
+
+#. type: Plain text
+#: user-manual.txt:2381
+msgid ""
+"Export of dives to _Facebook_ is handled differently from other types of "
+"export. This is because export to _Facebook_ needs a connection to "
+"_Facebook_, requiring a _Facebook_ userID and password.  If, from the Main "
+"Menu, one selects _File -> Preferences -> Facebook_, a login screen is "
+"presented (see image *A* to the left, below).  Provide your _Facebook_ "
+"userID and password.  Once successful login to _Facebook_ has been achieved, "
+"the panel in image *B*, below is presented. This panel has a button that "
+"needs to be selected in order to close the _Facebook_ connection."
+msgstr ""
+"L'export des plongées vers _Facebook_ est géré différemment des autres types "
+"d'export. Cela est du au fait que l'export vers _Facebook_ nécessite une "
+"connexion vers _Facebook_, nécessitant un identifiant et un mot de passe. À "
+"partir du menu principal, si vous sélectionnez _Fichier -> Préférences -> "
+"Facebook_, un écran de connexion est présenté (voir l'image *A* sur la "
+"gauche, ci dessous). Entrez vos identifiant et mot de passe _Facebook_. Une "
+"fois connecté à _Facebook_, le panneau de l'image *B* ci dessous est "
+"présenté. Ce panneau a un bouton qui doit être sélectionné pour fermer la "
+"connexion _Facebook_."
+
+#. type: Target for macro image
+#: user-manual.txt:2382
+#, no-wrap
+msgid "images/facebook1_f20.jpg"
+msgstr "images/facebook1_f20.jpg"
+
+#. type: Plain text
+#: user-manual.txt:2395
+msgid ""
+"Having established a login to _Facebook_, transfer of a dive profile to "
+"one's _Facebook_ timeline is easy.  A _Facebook_ icon appears in the *Dive "
+"Notes* panel of _Subsurface_ (See image *A* below). Ensure that the dive "
+"that you want to transfer to the timeline is depicted in the _Subsurface_ "
+"*Dive Profile* panel. Select the _Facebook_ icon, and a dialogue is shown, "
+"determining the amount of additional information transferred with the dive "
+"profile (see image *B*, below). In order to transfer a dive profile to "
+"_Facebook_, the name of a _Facebook_ album needs to be provided. The "
+"checkboxes on the lefthand side allow one to determine how much additional "
+"information should be transferred with the dive profile. This information is "
+"shown in the text box on the right hand side of the panel (see image *B*, "
+"below). You can easily edit the message that will be posted right there in "
+"the text box. Having specified the additional information and verified the "
+"text you want to post, select the _OK_ button which triggers the transfer to "
+"_Facebook_. After a while, an acknowledgement dialogue appears, indicating "
+"successful transfer to _Facebook_."
+msgstr ""
+
+#. type: Plain text
+#: user-manual.txt:2402
+msgid ""
+"Both the Album created and the post to your time line will be marked as "
+"private. In order for friends to be able to see the post you have to change "
+"its permissions from a regular Facebook login either in a browser or a "
+"Facebook app. While this is an extra step the developers felt that this was "
+"the better solution to avoid having unwanted posts in your public timeline."
+msgstr ""
+
+#. type: Target for macro image
+#: user-manual.txt:2403
+#, no-wrap
+msgid "images/facebook2_f20.jpg"
+msgstr "images/facebook2_f20.jpg"
+
+#. type: Plain text
+#: user-manual.txt:2406
+msgid ""
+"If required, then close the _Facebook_ connection by either closing "
+"_Subsurface_ or by selecting _File -> Preferences -> Facebook_ from the Main "
+"Menu, and clicking the appropriate button on the Facebook Preferences panel."
+msgstr ""
+
+#. type: Title ===
+#: user-manual.txt:2408
+#, no-wrap
+msgid "Export dive information  to other destinations or formats"
+msgstr ""
+
+#. type: Plain text
+#: user-manual.txt:2413
 msgid ""
-"The export function can be reached by selecting _File -> Export_, which "
-"brings up the Export dialog. This dialog always gives two options: save ALL "
-"dives, or save only the dives selected in *Dive List* panel of _Subsurface_. "
-"Click the appropriate radio button (see images below)."
+"For non-_Facebook exports_, the export function can be reached by selecting "
+"_File -> Export_, which brings up the Export dialog. This dialog always "
+"gives two options: save ALL dives, or save only the dives selected in *Dive "
+"List* panel of _Subsurface_. Click the appropriate radio button (see images "
+"below)."
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2346
+#: user-manual.txt:2414
 #, no-wrap
 msgid "images/Export_f20.jpg"
 msgstr "images/Export_f20.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2349
+#: user-manual.txt:2417
 msgid "A dive log or part of it can be saved in three formats:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2351
+#: user-manual.txt:2419
 msgid ""
 "_Subsurface XML_ format. This is the native format used by _Subsurface_."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2355
+#: user-manual.txt:2423
 msgid ""
 "Universal Dive Data Format (_UDDF_). Refer to _http://uddf.org_ for more "
 "information.  UDDF is a generic format that enables communication among many "
@@ -4452,7 +4614,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2359
+#: user-manual.txt:2427
 msgid ""
 "_Divelogs.de_, an Internet-based dive log repository. In order to upload to "
 "_Divelogs.de_, one needs a user-ID as well as a password for _Divelogs.de_. "
@@ -4461,7 +4623,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2363
+#: user-manual.txt:2431
 msgid ""
 "_DiveShare_ is also a dive log repostory on the Internet focusing on the "
 "recreational dives. In order to upload dives one has to provide a used ID, "
@@ -4469,7 +4631,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2368
+#: user-manual.txt:2436
 msgid ""
 "_CSV dive details_, that includes the most critical information of the dive "
 "profile. Included information of a dive is: dive number, date, time, buddy, "
@@ -4478,7 +4640,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2371
+#: user-manual.txt:2439
 msgid ""
 "_CSV dive profile_, that includes a large amount of detail for each dive, "
 "including the depth profile, temperature and pressure information of each "
@@ -4486,7 +4648,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2383
+#: user-manual.txt:2451
 msgid ""
 "_HTML_ format, in which the dive(s) are stored in HTML files, readable with "
 "an Internet browser. Most modern web browsers are supported, but JavaScript "
@@ -4501,7 +4663,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2388
+#: user-manual.txt:2456
 msgid ""
 "_Worldmap_ format, an HTML file with a world map upon which each dive and "
 "some information about it are indicated. This map is not editable. However, "
@@ -4510,13 +4672,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2389
+#: user-manual.txt:2457
 #, no-wrap
 msgid "images/mapview_f20.jpg"
 msgstr "images/mapview_f20.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2396
+#: user-manual.txt:2464
 msgid ""
 "_Image depths_, which creates a text file that contains the file names of "
 "all photos or images attached to any of the selected dives in the _Dive "
@@ -4525,12 +4687,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2398
+#: user-manual.txt:2466
 msgid "_General Settings_, under the HTML tab, provides the following options:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2406
+#: user-manual.txt:2474
 #, no-wrap
 msgid ""
 "** Subsurface Numbers: if this option is checked, the dive(s) are exported with the\n"
@@ -4543,27 +4705,27 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2409
+#: user-manual.txt:2477
 msgid ""
 "Under _Style Options_ some style-related options are available like font "
 "size and theme."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2412
+#: user-manual.txt:2480
 msgid ""
 "Export to other formats can be achieved through third party facilities, for "
 "instance _www.divelogs.de_."
 msgstr ""
 
 #. type: Title ==
-#: user-manual.txt:2414
+#: user-manual.txt:2482
 #, no-wrap
 msgid "Keeping a _Subsurface_ dive log in the Cloud"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2427
+#: user-manual.txt:2495
 msgid ""
 "For each diver, dive log information is highly important. Not only is it a "
 "record of diving activities for one's own pleasure, but it is important "
@@ -4580,7 +4742,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2432
+#: user-manual.txt:2500
 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 "
@@ -4588,13 +4750,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2433
+#: user-manual.txt:2501
 #, no-wrap
 msgid "images/Cloud.jpg"
 msgstr "images/Cloud.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2442
+#: user-manual.txt:2510
 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, "
@@ -4607,7 +4769,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2449
+#: user-manual.txt:2517
 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. "
@@ -4617,7 +4779,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2455
+#: user-manual.txt:2523
 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 "
@@ -4628,32 +4790,32 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2458
+#: user-manual.txt:2526
 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:2461
+#: user-manual.txt:2529
 #, no-wrap
 msgid "Printing a dive log"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2465
+#: user-manual.txt:2533
 msgid ""
 "_Subsurface_ provides a simple interface to print a whole dive log or only a "
 "few selected dives, including dive profiles and other contextual information."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2467
+#: user-manual.txt:2535
 msgid "Before printing, two decisions are required:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2470
+#: user-manual.txt:2538
 msgid ""
 "Should the whole dive log be printed or only part of it? If only part of the "
 "dive log is required, then the user must select the required dives from the "
@@ -4661,7 +4823,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2472
+#: user-manual.txt:2540
 msgid ""
 "What gas partial pressure information is required on the dive profile? Users "
 "should select the appropriate toggle-buttons on the button bar to the left "
@@ -4669,7 +4831,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2476
+#: user-manual.txt:2544
 msgid ""
 "Now the print options should be selected to match the user's needs. To do "
 "this, user should select _File -> Print_ from the Main menu. The following "
@@ -4677,50 +4839,50 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2477
+#: user-manual.txt:2545
 #, no-wrap
 msgid "images/PrintDiveLog.jpg"
 msgstr "images/PrintDiveLog.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2480
+#: user-manual.txt:2548
 msgid "Under _Print type_ users need to select one of three options:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2482
+#: user-manual.txt:2550
 msgid ""
 "Print the complete Dive List: to do this, _Table Print_ should be selected."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2484
+#: user-manual.txt:2552
 msgid ""
 "Print the selected dives (dive profiles and all other information) at 6 "
 "dives per printed page: to do this, users should select _6 dives per page_."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2486
+#: user-manual.txt:2554
 msgid ""
 "Print the selected dives (dive profiles and all other information) at 2 "
 "dives per printed page: to do this, users should select _2 dives per page_."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2488
+#: user-manual.txt:2556
 msgid ""
 "Print the selected dives (dive profiles and all other information) at 1 dive "
 "per printed page: to do this, users should select _1 dive per page_."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2490
+#: user-manual.txt:2558
 msgid "Under _Print options_ users need to select:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2494
+#: user-manual.txt:2562
 msgid ""
 "Printing only the dives that have been selected from the dive list prior to "
 "activating the print dialogue, achieved by checking the box _Print only "
@@ -4728,13 +4890,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2495
+#: user-manual.txt:2563
 msgid ""
 "Printing in colour, achieved by checking the box with _Print in colour_."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2502
+#: user-manual.txt:2570
 msgid ""
 "The _Ordering_ affects the layout of the page (or part of it) for each "
 "dive.  The dive profile could be printed at the top of each dive, with the "
@@ -4745,7 +4907,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2506
+#: user-manual.txt:2574
 msgid ""
 "Users can _Preview_ the printed page by selecting the _Preview_ button on "
 "the dialogue. After preview, changes to the options in the print dialogue "
@@ -4753,7 +4915,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2516
+#: user-manual.txt:2584
 msgid ""
 "Next, select the _Print_ button in the dialogue. This activates the regular "
 "print dialogue used by the user operating system (image [*B*] in the middle, "
@@ -4765,56 +4927,165 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2517
+#: user-manual.txt:2585
 #, no-wrap
 msgid "images/Printpreview.jpg"
 msgstr "images/Printpreview.jpg"
 
 #. type: Title ==
-#: user-manual.txt:2521
+#: user-manual.txt:2589
 #, no-wrap
-msgid "Setting user _Preferences_ for _Subsurface_"
-msgstr ""
+msgid "Configuring a dive computer"
+msgstr "Configurer un ordinateur de plongée"
 
 #. type: Plain text
-#: user-manual.txt:2529
+#: user-manual.txt:2597
 msgid ""
-"There are several settings within _Subsurface_ that the user can specify. "
-"These are found when selecting _File -> Preferences_. The settings are "
-"performed in five groups: *Defaults*, *Units*, *Graph*, *Language* and "
-"*Network*. All five sections operate on the same principles: the user must "
-"specify the settings that are to be changed, then these changes are saved "
-"using the *Apply* button. After applying all the new settings users can then "
-"leave the settings panel by selecting *OK*."
-msgstr ""
-
-#. type: Title ===
-#: user-manual.txt:2530
-#, no-wrap
-msgid "Defaults"
+"_Subsurface_ enables one to configure a dive computer. Currently the "
+"Heinrichs-Weikamp (OSTC 2, OSTC 3) and Suunto Vyper (Stinger, Mosquito, D3, "
+"Vyper, Vytec, Cobra, Gekko and Zoop) family of dive computers are supported. "
+"A large number of settings of these dive computers can be read and changed "
+"to different values. As a first step, ensure that the appropriate hardware "
+"driver is installed for the dive computer and that the device name of the "
+"dive computer is known.  See "
+"<<_appendix_a_operating_system_specific_information_for_importing_dive_information_from_a_dive_computer,"
+"APPENDIX A>> for information on how to do this."
 msgstr ""
+"_Subsurface_ 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 "
+"<<_appendix_a_operating_system_specific_information_for_importing_dive_information_from_a_dive_computer,"
+"APPENDIX A>> pour plus d'informations sur la manière de procéder."
 
 #. type: Plain text
-#: user-manual.txt:2533
-msgid "There are several settings in the *Defaults* panel:"
+#: user-manual.txt:2602
+msgid ""
+"Once the dive computer is connected to the _Subsurface_ computer, select "
+"_File -> Configure dive computer_ from the _Main Menu_. Provide the "
+"appropriate device name in the text box at the top of the configuration "
+"panel that opens and select the appropriate dive computer model from the "
+"panel on the lefthand (see image below)."
 msgstr ""
+"Une fois que l'ordinateur de plongée est connecté à _Subsurface_, "
+"sélectionner _Fichier -> Configurer l'ordinateur de plongée_, à 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)."
 
 #. type: Target for macro image
-#: user-manual.txt:2534
+#: user-manual.txt:2603
 #, no-wrap
-msgid "images/Pref1.jpg"
-msgstr "images/Pref1.jpg"
+msgid "images/Configure_dc_f20.jpg"
+msgstr "images/Configure_dc_f20.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2538
-#, no-wrap
+#: user-manual.txt:2606
 msgid ""
-"  ** *Lists and tables*: Here one can specify the font type and font size of the\n"
-"     *Dive Table* panel. By decreasing the font size of the *Dive Table*, users can see more dives on a screen.\n"
+"Using the appropriate buttons on the configuration panel, the following "
+"actions can be performed:"
+msgstr ""
+"En utilisant les boutons appropriés du panneau de configuration, les actions "
+"suivantes peuvent être réalisées :"
+
+#. type: Plain text
+#: user-manual.txt:2609
+#, no-wrap
+msgid ""
+"*Retrieve available details*. This loads the existing configuration from the dive computer\n"
+"to _Subsurface_, showing this in the configuration panel.\n"
+msgstr ""
+"*Récupérer les détails disponibles*. Cela charge la configuration existante à partir de l'ordinateur de plongée\n"
+"dans _Subsurface_, en l'affichant dans le panneau de configuration.\n"
+
+#. type: Plain text
+#: user-manual.txt:2611
+#, no-wrap
+msgid ""
+"*Save changes to device*. This changes the configuration of the\n"
+"dive computer to correspond to the information shown in the configuration panel.\n"
+msgstr ""
+"*Enregistrer les modifications sur le périphérique*. Cela change la configuration de l'ordinateur\n"
+"de plongée pour correspondre aux informations affichées dans le panneau de configuration.\n"
+
+#. type: Plain text
+#: user-manual.txt:2613
+#, no-wrap
+msgid ""
+"*Backup*. This saves the configuration data to a file. _Subsurface_ asks for\n"
+"a file location and file name for the saved information.\n"
+msgstr ""
+"*Sauvegarder*. Cela enregistre la configuration dans un fichier. _Subsurface_ demande\n"
+"l'emplacement et le nom du fichier pour enregistrer les informations.\n"
+
+#. type: Plain text
+#: user-manual.txt:2615
+#, no-wrap
+msgid ""
+"*Restore backup*. This loads the information from a backup file and displays it\n"
+"in the configuration panel.\n"
+msgstr ""
+"*Restaurer une sauvegarde*. Cela charge les informations à partir d'un fichier de sauvegarde et l'affiche\n"
+"dans le panneau de configuration.\n"
+
+#. type: Plain text
+#: user-manual.txt:2617
+#, no-wrap
+msgid ""
+"*Update firmware*. If new firmware is available for the dive computer, this is\n"
+"loaded into the dive computer.\n"
+msgstr ""
+"*Mettre à jour le firmware*. Si un nouveau firmware est disponible pour l'ordinateur de plongée,\n"
+"il sera chargé dans l'ordinateur de plongée.\n"
+
+#. type: Title ==
+#: user-manual.txt:2620
+#, no-wrap
+msgid "Setting user _Preferences_ for _Subsurface_"
+msgstr ""
+
+#. type: Plain text
+#: user-manual.txt:2628
+msgid ""
+"There are several settings within _Subsurface_ that the user can specify. "
+"These are found when selecting _File -> Preferences_. The settings are "
+"performed in five groups: *Defaults*, *Units*, *Graph*, *Language* and "
+"*Network*. All five sections operate on the same principles: the user must "
+"specify the settings that are to be changed, then these changes are saved "
+"using the *Apply* button. After applying all the new settings users can then "
+"leave the settings panel by selecting *OK*."
+msgstr ""
+
+#. type: Title ===
+#: user-manual.txt:2629
+#, no-wrap
+msgid "Defaults"
+msgstr ""
+
+#. type: Plain text
+#: user-manual.txt:2632
+msgid "There are several settings in the *Defaults* panel:"
+msgstr ""
+
+#. type: Target for macro image
+#: user-manual.txt:2633
+#, no-wrap
+msgid "images/Pref1_f20.jpg"
+msgstr "images/Pref1_f20.jpg"
+
+#. type: Plain text
+#: user-manual.txt:2637
+#, no-wrap
+msgid ""
+"  ** *Lists and tables*: Here one can specify the font type and font size of the\n"
+"     *Dive Table* panel. By decreasing the font size of the *Dive Table*, users can see more dives on a screen.\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2543
+#: user-manual.txt:2642
 #, no-wrap
 msgid ""
 "  ** *Dives*: For the _Default Dive File_ one need to specify the directory and\n"
@@ -4824,7 +5095,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2548
+#: user-manual.txt:2647
 #, no-wrap
 msgid ""
 "  ** *Display invalid*:  Dives can be marked as invalid (when a user wishes to hide\n"
@@ -4834,7 +5105,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2551
+#: user-manual.txt:2650
 #, no-wrap
 msgid ""
 "  ** *Default cylinder*: Here users can specify the default cylinder listed in\n"
@@ -4842,7 +5113,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2559
+#: user-manual.txt:2658
 #, no-wrap
 msgid ""
 "  ** *Animations*: Some actions in showing the dive profile are performed using\n"
@@ -4855,7 +5126,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2564
+#: user-manual.txt:2663
 #, no-wrap
 msgid ""
 "  ** *Subsurface web service*: When one subscribes to the <<S_Companion,Subsurface web service>>, a very\n"
@@ -4865,7 +5136,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2567
+#: user-manual.txt:2666
 #, no-wrap
 msgid ""
 "  ** *Clear all settings*: As indicated in the button below this heading, all settings are\n"
@@ -4873,19 +5144,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:2568
+#: user-manual.txt:2667
 #, no-wrap
 msgid "Units"
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2569
+#: user-manual.txt:2668
 #, no-wrap
-msgid "images/Pref2.jpg"
-msgstr "images/Pref2.jpg"
+msgid "images/Pref2_f20.jpg"
+msgstr "images/Pref2_f20.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2576
+#: user-manual.txt:2675
 msgid ""
 "Here user can choose between metric and imperial units of depth, pressure, "
 "volume, temperature and mass. By selecting the Metric or Imperial radio "
@@ -4896,24 +5167,24 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:2577
+#: user-manual.txt:2676
 #, no-wrap
 msgid "Graph"
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2579
+#: user-manual.txt:2678
 #, no-wrap
 msgid "images/Pref3_f20.jpg"
 msgstr "images/Pref3_f20.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2583
+#: user-manual.txt:2682
 msgid "This panel allows two type of selections:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2591
+#: user-manual.txt:2690
 #, no-wrap
 msgid ""
 "*Show*: Here users can specify the amount of information shown as part of\n"
@@ -4926,7 +5197,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2596
+#: user-manual.txt:2695
 #, no-wrap
 msgid ""
 "** _Draw dive computer reported ceiling red_: This checkbox allows exactly what it says.\n"
@@ -4936,13 +5207,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2598
+#: user-manual.txt:2697
 #, 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:2601
+#: user-manual.txt:2700
 #, no-wrap
 msgid ""
 "** _Show average depth_: Activating this checkbox causes _Subsurface_ to draw a red line across\n"
@@ -4950,13 +5221,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2603
+#: user-manual.txt:2702
 #, no-wrap
 msgid "*Misc*:\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2615
+#: user-manual.txt:2714
 #, no-wrap
 msgid ""
 "** Gradient Factors:* Here users can set the _gradient factors_ used while diving. GF_Low is\n"
@@ -4973,19 +5244,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2617
+#: user-manual.txt:2716
 #, 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:2619
+#: user-manual.txt:2718
 #, 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:2623
+#: user-manual.txt:2722
 #, no-wrap
 msgid ""
 " ** _CCR: Show setpoints when viewing pO2:_ With this checkbox ativated, the pO~2~\n"
@@ -4994,7 +5265,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2627
+#: user-manual.txt:2726
 #, no-wrap
 msgid ""
 " ** _CCR: Show individual O~2~ sensor values when viewing pO~2~:_ Show the pO~2~\n"
@@ -5003,45 +5274,49 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2629
+#: user-manual.txt:2728
 #, no-wrap
 msgid "*Configuring dive planning using rebreather equipment:*\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2631
+#: user-manual.txt:2730
 #, no-wrap
 msgid "** _Default CCR setpoint for dive planning:_ Specify the O~2~ setpoint for a\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2633
+#: user-manual.txt:2734
 #, no-wrap
 msgid ""
 "CCR dive plan. This determines the pO~2~ that will be maintained\n"
-"during a particular dive.\n"
+"during a particular dive. This is the setpoint that is used at the start\n"
+"of any CCR dive. Setpoint changes during the dive can be added via the\n"
+"profile context menu.\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2635
+#: user-manual.txt:2736
 #, 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:2636
+#: user-manual.txt:2738
 #, no-wrap
-msgid "volume of oxygen used by a diver each minute. Set this value for pSCR dive planning.\n"
+msgid ""
+"volume of oxygen used by a diver each minute. Set this value for pSCR dive planning\n"
+"and decompression calculations.\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2638
+#: user-manual.txt:2740
 #, 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:2640
+#: user-manual.txt:2742
 #, no-wrap
 msgid ""
 "environment to that of the gas recirculated to the diver. Set this value for a\n"
@@ -5049,24 +5324,24 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:2642
+#: user-manual.txt:2744
 #, no-wrap
 msgid "Language"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2644
+#: user-manual.txt:2746
 msgid "Choose a language that _Subsurface_ will use."
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2645
+#: user-manual.txt:2747
 #, no-wrap
-msgid "images/Pref4.jpg"
-msgstr "images/Pref4.jpg"
+msgid "images/Pref4_f20.jpg"
+msgstr "images/Pref4_f20.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2655
+#: user-manual.txt:2757
 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 "
@@ -5079,26 +5354,26 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:2656
+#: user-manual.txt:2758
 #, no-wrap
 msgid "Network"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2658
+#: user-manual.txt:2760
 msgid ""
 "This panel facilitates communication between _Subsurface_ and data sources "
 "on the Internet."
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2659
+#: user-manual.txt:2761
 #, no-wrap
-msgid "images/Pref5.jpg"
-msgstr "images/Pref5.jpg"
+msgid "images/Pref5_f20.jpg"
+msgstr "images/Pref5_f20.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2672
+#: user-manual.txt:2774
 msgid ""
 "This is important, for instance, when _Subsurface_ needs to communicate with "
 "Internet services such as the <<S_Companion,_Subsurface Companion app_>> or "
@@ -5114,14 +5389,43 @@ msgid ""
 "server to access the Internet."
 msgstr ""
 
+#. type: Title ===
+#: user-manual.txt:2775
+#, no-wrap
+msgid "Facebook Accesss"
+msgstr ""
+
+#. type: Plain text
+#: user-manual.txt:2778
+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:2779
+#, no-wrap
+msgid "images/Pref6_f20.jpg"
+msgstr "images/Pref6_f20.jpg"
+
+#. type: Plain text
+#: user-manual.txt:2787
+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 "
+"down Subsurface. At this point the checkbox labelled \"Keep connection to "
+"Subsurface\", on the login screen has no effect.  See the section xref:"
+"S_facebook[Exporting dive profiles to Facebook] for more information."
+msgstr ""
+
 #. type: Title ==
-#: user-manual.txt:2674
+#: user-manual.txt:2789
 #, no-wrap
 msgid "The _Subsurface_ dive planner"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2679
+#: user-manual.txt:2794
 msgid ""
 "Dive planning is an advanced feature of _Subsurface_, accessible by "
 "selecting _Log -> Plan Dive_ from the main menu. It allows calculation of "
@@ -5130,7 +5434,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:2687
+#: user-manual.txt:2802
 msgid ""
 "The _Subsurface_ dive planner IS CURRENTLY EXPERIMENTAL and assumes the user "
 "is already familiar with the _Subsurface_ user interface. It is explicitly "
@@ -5138,19 +5442,19 @@ msgid ""
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:2690
+#: user-manual.txt:2805
 msgid ""
 "The user is conversant with dive planning and has the necessary training to "
 "perform dive planning."
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:2691
+#: user-manual.txt:2806
 msgid "The user plans dives within his/her certification limits."
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:2694
+#: user-manual.txt:2809
 msgid ""
 "Dive planning makes large assumptions about the characteristics of the "
 "_average person_ and cannot compensate for individual physiology or health "
@@ -5158,32 +5462,32 @@ msgid ""
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:2695
+#: user-manual.txt:2810
 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:2696
+#: user-manual.txt:2811
 msgid "The user is familiar with the user interface of _Subsurface_."
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:2698
+#: user-manual.txt:2813
 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:2700
+#: user-manual.txt:2815
 #, no-wrap
 msgid "The _Subsurface_ dive planner screen"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2705
+#: user-manual.txt:2820
 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 "
@@ -5193,7 +5497,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2709
+#: user-manual.txt:2824
 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 "
@@ -5202,7 +5506,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2713
+#: user-manual.txt:2828
 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 "
@@ -5211,44 +5515,45 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2714
+#: user-manual.txt:2829
 #, no-wrap
-msgid "images/PlannerWindow1.jpg"
-msgstr "images/PlannerWindow1.jpg"
+msgid "images/PlannerWindow1_f20.jpg"
+msgstr "images/PlannerWindow1_f20.jpg"
 
 #. type: Title ===
-#: user-manual.txt:2717
+#: user-manual.txt:2832
 #, no-wrap
-msgid "Initiating dive planning"
+msgid "Open circuit dives as an example of dive planning"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2721
+#: user-manual.txt:2835
 msgid ""
-"The dive planner comprises two parts: *constructing a dive plan* and "
-"*evaluating* that dive plan. To perform dive planning, perform these steps:"
+"Towards the left bottom of the planner (circled in blue in the image below) "
+"is a dropbox with three options. Select the appropriate one of these:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2725
+#: user-manual.txt:2838
+#, no-wrap
 msgid ""
-"Clear the existing dive log by creating a new planning log. This is achieved "
-"by selecting _File -> New logbook_ from the main menu. This way, dive plans "
-"are kept separate from the existing dive log of completed dives."
+"** Open Circuit (the default)\n"
+"** CCR\n"
+"** pSCR\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2730
+#: user-manual.txt:2843
 msgid ""
-"In the top left-hand area of the screen, ensure that the constant dive "
-"parameters are appropriate. These are: Start date and time of the dive, "
+"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 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 "
 "an atmospheric pressure of 1.013 bar."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2739
+#: user-manual.txt:2852
 msgid ""
 "In the table labelled _Available Gases_, add the information of the "
 "cylinders to be used as well as the gas composition within that cylinder. "
@@ -5256,31 +5561,26 @@ msgid ""
 "data for dive logs>>. Choose the cylinder type by double clicking the "
 "cylinder type and using the dropdown list, then specify the work pressure of "
 "this cylinder. By leaving the oxygen concentration (O2%) filed empty, the "
-"dive gas is assumed to be air. Otherwise enter the oxygen and/or helium "
+"cylinder is assumed to contain air. Otherwise enter the oxygen and/or helium "
 "concentration in the boxes provided in this dialogue. Add additional "
 "cylinders by using the \"+\" icon to the top righthand of the dialogue."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2742
+#: user-manual.txt:2855
 msgid ""
 "The dialogue indicating _Dive Planner Points_ is usually not used at this "
 "stage of the dive planning."
 msgstr ""
 
-#. type: Title ===
-#: user-manual.txt:2743
-#, no-wrap
-msgid "Managing nitrogen, oxygen and gas consumption"
-msgstr ""
-
 #. type: Plain text
-#: user-manual.txt:2746
-msgid "The planning is performed in three stages:"
+#: user-manual.txt:2857
+#, no-wrap
+msgid "*The planning is performed in three stages*\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2756
+#: user-manual.txt:2867
 #, no-wrap
 msgid ""
 "*a) Nitrogen management*: This is performed by specifying the rates for descent and ascent,\n"
@@ -5288,41 +5588,61 @@ msgid ""
 "to the bottom left of the planning screen. 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 specifications in the _Preferences_. Gradient Factor settings strongly affect the calculated ceilings and their depths.\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:2761
-#, no-wrap
+#: user-manual.txt:2869
 msgid ""
-" *** link:http://www.tek-dive.com/portal/upload/M-Values.pdf[Understanding M-values by Erik Baker, _Immersed_ Vol. 3, No. 3.]\n"
-" *** 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"
-" *** 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.\n"
-"An excellent non-technical review.\n"
+"link:http://www.tek-dive.com/portal/upload/M-Values.pdf[Understanding M-"
+"values by Erik Baker, _Immersed_ Vol. 3, No. 3.]"
 msgstr ""
-" *** link:http://www.tek-dive.com/portal/upload/M-Values.pdf[Understanding M-values by Erik Baker, _Immersed_ Vol. 3, No. 3.]\n"
-" *** 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"
-" *** 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.\n"
-"An excellent non-technical review.\n"
+"link:http://www.tek-dive.com/portal/upload/M-Values.pdf[Understanding M-"
+"values by Erik Baker, _Immersed_ Vol. 3, No. 3.]"
 
 #. type: Plain text
-#: user-manual.txt:2769
-#, no-wrap
+#: user-manual.txt:2870
 msgid ""
-" ** The ascent rate is critical for nitrogen off-gassing at the end of the dive and is specified\n"
-"for several depth ranges, utilising the average (or mean) depth as a yardstick. The mean depth\n"
-"of the dive plan is indicated on the dive profile in the green panel of the dive planner. Ascent rates\n"
-"at deeper levels are often in the range of 8-12 m/min, while ascent rates near the surface are\n"
-"often in the range of 4-9 m/min. The descent rate is also specified. If the option _Drop to first depth_\n"
-"is activated, then the descent phase of the planned dive will be at the maximal descent rate specified\n"
-"in the _Rates_ section of the dive setup.\n"
+"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 ""
+"link:http://www.rebreatherworld.com/general-and-new-to-rebreather-"
+"articles/5037-gradient-factors-for-dummies.html[Gradient factors for "
+"dummies, by Kevin Watts]"
 
 #. type: Plain text
-#: user-manual.txt:2779
+#: user-manual.txt:2872
+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."
+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."
+
+#. type: Plain text
+#: user-manual.txt:2880
+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) "
+"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 "
+"_Drop to first depth_ is activated, then the descent phase of the planned "
+"dive will be at the maximal descent rate specified in the _Rates_ section of "
+"the dive setup."
+msgstr ""
+
+#. type: Plain text
+#: user-manual.txt:2890
 #, no-wrap
 msgid ""
 "*b) Oxygen management*: In the *Gas Options* part of the dive specification, the maximum partial\n"
@@ -5332,64 +5652,66 @@ msgid ""
 "used values are 1.4 bar for the bottom part of the dive and 1.6 bar for any decompression\n"
 "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\n"
 "_Available Gases_ dialog. Normally the planner decides on switching to a new gas when, during\n"
-"ascent, the partial pressure of the new gas has decreased to 1.6 bar.\n"
+"ascent, the partial pressure of the new gas has increased to 1.6 bar.\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2794
+#: user-manual.txt:2904
 #, no-wrap
 msgid ""
-"*c) Gas management*: One needs keep within the limits of the amount of gas contained in the dive\n"
-"cylinder(s), allowing for an appropriate margin for safe return to the surface, possibly\n"
+"*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"
+"cylinder(s), allowing for an appropriate margin for a safe return to the surface, possibly\n"
 "sharing with a buddy. Under the _Gas Options_ heading, specify the best (but conservative) estimate\n"
 "of your surface-equivalent air consumption (SAC, also termed RMV) in\n"
 "litres/min (for the time being, only SI units are supported).  Specify the SAC during the\n"
 "bottom part of the dive (_bottom SAC_) as well as during the decompression or safety stops of the\n"
-"dive (_deco SAC_). Values of 20-30 l/min are common. For good gas management, a thumbsuck guess\n"
+"dive (_deco SAC_). Values of 15-30 l/min are common. For good gas management, a thumbsuck guess\n"
 "is not sufficient and one needs to\n"
 "monitor one's gas consumption on a regular basis, dependent on different dive conditions and/or equipment.\n"
-"The planner will calculate the total volume of gas used during the dive and will issue a warning\n"
+"The planner calculates the total volume of gas used during the dive and issues a warning\n"
 "if one exceeds the total amount of gas available. Good practice demands that one does not dive to\n"
 "the limit of the gas supply but that an appropriate reserve is kept for unforeseen circumstances.\n"
 "For technical diving, this reserve can be up to 66% of the total available gas.\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2805
+#: user-manual.txt:2916
 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 "
 "the planning. The mechanics of doing this is similar to hand-entering a dive "
 "profile in the dive log part of _Subsurface_. Upon activating the planner, a "
-"default dive of depth 15 m for 40 min is offered in the green design surface "
+"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.  If any of the management limits (for nitrogen, oxygen or gas) is "
-"exceeded, the surface above the dive profile changes from BLUE to RED."
+"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."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2818
+#: user-manual.txt:2928
 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_ "
 "value in each row of that table corresponds to one of the gas mixtures "
-"specified in the table with _Available Gases_ immediately above the Dive "
-"Planner Points. Add new waypoints until the main features of the dive have "
-"been completed, e.g. the bottom time segment and deep stops (if these are "
-"implemented). Leave the remaining waypoints on the ascent to _Subsurface_. "
-"In most cases _Subsurface_ computes additional way points in order to fulfil "
-"decompression requirements for that dive. A waypoint can be moved by "
-"selecting that waypoint and by using the arrow keys.  The waypoints listed "
-"in the _Dive Planner Points_ dialogue can be edited by hand in order to "
-"obtain a precise presentation of the dive plan. In fact, one can create the "
-"whole dive profile by editing the _Dive Planner Points_ dialog."
+"specified in the _Available Gases_ table.  Add new waypoints until the main "
+"features of the dive have been completed, e.g. the bottom time segment and "
+"deep stops (if these are implemented). Leave the remaining waypoints on the "
+"ascent to _Subsurface_. In most cases _Subsurface_ computes additional way "
+"points in order to fulfil decompression requirements for that dive. A "
+"waypoint can be moved by selecting that waypoint and by using the arrow "
+"keys.  The waypoints listed in the _Dive Planner Points_ dialogue can be "
+"edited by hand in order to obtain a precise presentation of the dive plan. "
+"In fact, one can create the whole dive profile by editing the _Dive Planner "
+"Points_ dialog."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2826
+#: user-manual.txt:2936
 msgid ""
 "Indicate any changes in gas cylinder used by indicating gas changes as "
 "explained in the section <<S_CreateProfile,hand-creating a dive profile>>. "
@@ -5401,7 +5723,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2835
+#: user-manual.txt:2945
 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 "
@@ -5414,34 +5736,34 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2838
+#: user-manual.txt:2948
 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:2839
+#: user-manual.txt:2949
 #, no-wrap
-msgid "images/DivePlanner2.jpg"
-msgstr "images/DivePlanner2.jpg"
+msgid "images/DivePlanner2_f20.jpg"
+msgstr "images/DivePlanner2_f20.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2844
+#: user-manual.txt:2954
 msgid ""
 "Once the above has been completed, one can save it by clicking the _Save_ "
-"button towards the bottom left of the green design panel. The saved dive "
-"plan will appear in the *Dive List* panel of _Subsurface_."
+"button towards the top middle of the planner. The saved dive plan will "
+"appear in the *Dive List* panel of _Subsurface_."
 msgstr ""
 
-#. type: Title ===
-#: user-manual.txt:2845
+#. type: Plain text
+#: user-manual.txt:2956
 #, no-wrap
-msgid "The dive plan details"
+msgid "*The dive plan details*\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2854
+#: user-manual.txt:2964
 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 "
@@ -5454,7 +5776,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2859
+#: user-manual.txt:2969
 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 "
@@ -5464,13 +5786,98 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:2861
+#: user-manual.txt:2970
+#, no-wrap
+msgid "Planning CCR dives"
+msgstr ""
+
+#. type: Plain text
+#: user-manual.txt:2974
+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:2978
+#, no-wrap
+msgid ""
+"*Available gases*: In the _Available gases_ table, enter the cylinder information for the\n"
+"diluent cylinder and for any bail-out cylinders. Do NOT enter the information for the oxygen\n"
+"cylinder since it is implied when the _CCR_ dropdown selection is made.\n"
+msgstr ""
+
+#. type: Plain text
+#: user-manual.txt:2986
+#, 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"
+"use the default setpoint value. Then, different setpoints can be specified for dive segments\n"
+"in the _Dive planner points_ table. A zero setpoint\n"
+"means the diver bails out to open circuit mode for that segment. The decompression is always calculated\n"
+"using the setpoint of the last manually entered segment. So, to plan a bail out ascent for a\n"
+"CCR dive, add a one-minute dive segment to the end with a setpoint value of 0. The decompression\n"
+"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.\n"
+msgstr ""
+
+#. type: Plain text
+#: user-manual.txt:2988
+msgid ""
+"The dive profile for a CCR dive may look something like the image below."
+msgstr ""
+
+#. type: Target for macro image
+#: user-manual.txt:2989
+#, no-wrap
+msgid "images/Planner_CCR1_f20.jpg"
+msgstr "images/Planner_CCR1_f20.jpg"
+
+#. type: Plain text
+#: user-manual.txt:2993
+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:2994
+#, no-wrap
+msgid "Planning pSCR dives"
+msgstr ""
+
+#. type: Plain text
+#: user-manual.txt:3009
+#, no-wrap
+msgid ""
+"To plan a dive using a passive semi-closed rebreather (pSCR), select _pSCR_ rather than\n"
+"_Open circuit_ in the dropdown list.\n"
+"The parameters of the pSCR diver can be set by selecting  _File ->   Preferences ->   Graph_\n"
+"from the main menu, where the gas consumption calculation takes into account the pSCR dump\n"
+"ratio (default 10:1) as well as the metabolism rate. The calculation also takes the oxygen drop\n"
+"accross the mouthpiece of the rebreather into account. If the\n"
+"pO~2~ drops below what is considered a save value, a warning apears in the _Dive plan\n"
+"details_. A typical pSCR configuration is with a single cylinder and one or more bail-out\n"
+"cylinders. Therefore the setup of the _Available gases_ and the _Dive planner points_ tables\n"
+"are very similar to that of a CCR dive plan, described above. However, no oxygen setpoints\n"
+"are specified for pSCR dives. Below is a dive plan for a pSCR dive. The dive is comparable\n"
+"to that of the CCR dive above, but note the longer ascent duration due to the lower oxygen\n"
+"in the loop due to the oxygen drop accross the mouthpiece of the pSCR equipment.\n"
+msgstr ""
+
+#. type: Target for macro image
+#: user-manual.txt:3010
+#, no-wrap
+msgid "images/Planner_pSCR1_f20.jpg"
+msgstr "images/Planner_pSCR1_f20.jpg"
+
+#. type: Title ===
+#: user-manual.txt:3014
 #, no-wrap
 msgid "Modifying an existing dive plan"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2868
+#: user-manual.txt:3021
 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 "
@@ -5481,7 +5888,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2874
+#: user-manual.txt:3027
 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 "
@@ -5491,13 +5898,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:2875
+#: user-manual.txt:3028
 #, no-wrap
 msgid "Planning for repetitive dives"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2882
+#: user-manual.txt:3035
 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 "
@@ -5506,7 +5913,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2888
+#: user-manual.txt:3041
 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 "
@@ -5516,7 +5923,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2893
+#: user-manual.txt:3046
 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 "
@@ -5526,13 +5933,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:2894
+#: user-manual.txt:3047
 #, no-wrap
 msgid "Printing the dive plan"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2899
+#: user-manual.txt:3052
 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 "
@@ -5540,7 +5947,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2909
+#: user-manual.txt:3062
 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 "
@@ -5556,122 +5963,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ==
-#: user-manual.txt:2911
-#, no-wrap
-msgid "Configuring a dive computer"
-msgstr "Configurer un ordinateur de plongée"
-
-#. type: Plain text
-#: user-manual.txt:2919
-msgid ""
-"_Subsurface_ enables one to configure a dive computer. Currently the "
-"Heinrichs-Weikamp (OSTC 2, OSTC 3) and Suunto Vyper (Stinger, Mosquito, D3, "
-"Vyper, Vytec, Cobra, Gekko and Zoop) family of dive computers are supported. "
-"A large number of settings of these dive computers can be read and changed "
-"to different values. As a first step, ensure that the appropriate hardware "
-"driver is installed for the dive computer and that the device name of the "
-"dive computer is known.  See "
-"<<_appendix_a_operating_system_specific_information_for_importing_dive_information_from_a_dive_computer,"
-"APPENDIX A>> for information on how to do this."
-msgstr ""
-"_Subsurface_ 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 "
-"<<_appendix_a_operating_system_specific_information_for_importing_dive_information_from_a_dive_computer,"
-"APPENDIX A>> pour plus d'informations sur la manière de procéder."
-
-#. type: Plain text
-#: user-manual.txt:2924
-msgid ""
-"Once the dive computer is connected to the _Subsurface_ computer, select "
-"_File -> Configure dive computer_ from the _Main Menu_. Provide the "
-"appropriate device name in the text box at the top of the configuration "
-"panel that opens and select the appropriate dive computer model from the "
-"panel on the lefthand (see image below)."
-msgstr ""
-"Une fois que l'ordinateur de plongée est connecté à _Subsurface_, "
-"sélectionner _Fichier -> Configurer l'ordinateur de plongée_, à 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)."
-
-#. type: Target for macro image
-#: user-manual.txt:2925
-#, no-wrap
-msgid "images/Configure_dc_f20.jpg"
-msgstr "images/Configure_dc_f20.jpg"
-
-#. type: Plain text
-#: user-manual.txt:2928
-msgid ""
-"Using the appropriate buttons on the configuration panel, the following "
-"actions can be performed:"
-msgstr ""
-"En utilisant les boutons appropriés du panneau de configuration, les actions "
-"suivantes peuvent être réalisées :"
-
-#. type: Plain text
-#: user-manual.txt:2931
-#, no-wrap
-msgid ""
-"*Retrieve available details*. This loads the existing configuration from the dive computer\n"
-"to _Subsurface_, showing this in the configuration panel.\n"
-msgstr ""
-"*Récupérer les détails disponibles*. Cela charge la configuration existante à partir de l'ordinateur de plongée\n"
-"dans _Subsurface_, en l'affichant dans le panneau de configuration.\n"
-
-#. type: Plain text
-#: user-manual.txt:2933
-#, no-wrap
-msgid ""
-"*Save changes to device*. This changes the configuration of the\n"
-"dive computer to correspond to the information shown in the configuration panel.\n"
-msgstr ""
-"*Enregistrer les modifications sur le périphérique*. Cela change la configuration de l'ordinateur\n"
-"de plongée pour correspondre aux informations affichées dans le panneau de configuration.\n"
-
-#. type: Plain text
-#: user-manual.txt:2935
-#, no-wrap
-msgid ""
-"*Backup*. This saves the configuration data to a file. _Subsurface_ asks for\n"
-"a file location and file name for the saved information.\n"
-msgstr ""
-"*Sauvegarder*. Cela enregistre la configuration dans un fichier. _Subsurface_ demande\n"
-"l'emplacement et le nom du fichier pour enregistrer les informations.\n"
-
-#. type: Plain text
-#: user-manual.txt:2937
-#, no-wrap
-msgid ""
-"*Restore backup*. This loads the information from a backup file and displays it\n"
-"in the configuration panel.\n"
-msgstr ""
-"*Restaurer une sauvegarde*. Cela charge les informations à partir d'un fichier de sauvegarde et l'affiche\n"
-"dans le panneau de configuration.\n"
-
-#. type: Plain text
-#: user-manual.txt:2939
-#, no-wrap
-msgid ""
-"*Update firmware*. If new firmware is available for the dive computer, this is\n"
-"loaded into the dive computer.\n"
-msgstr ""
-"*Mettre à jour le firmware*. Si un nouveau firmware est disponible pour l'ordinateur de plongée,\n"
-"il sera chargé dans l'ordinateur de plongée.\n"
-
-#. type: Title ==
-#: user-manual.txt:2940
+#: user-manual.txt:3063
 #, 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:2945
+#: user-manual.txt:3068
 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 "
@@ -5682,13 +5980,13 @@ msgstr ""
 "des sections de ce manuel traitant des opérations relatives."
 
 #. type: Title ===
-#: user-manual.txt:2946
+#: user-manual.txt:3069
 #, no-wrap
 msgid "File"
 msgstr "Fichier"
 
 #. type: Plain text
-#: user-manual.txt:2949
+#: user-manual.txt:3072
 msgid ""
 "<<S_NewLogbook,_New Logbook_>> - Close the currently open dive logbook and "
 "clear all dive information."
@@ -5697,7 +5995,7 @@ msgstr ""
 "actuellement ouvert et supprime toutes les informations de plongées."
 
 #. type: Plain text
-#: user-manual.txt:2951
+#: user-manual.txt:3074
 msgid ""
 "_Open logbook_ - This opens the file manager in order to select a dive "
 "logbook to open."
@@ -5706,24 +6004,24 @@ msgstr ""
 "carnet de plongée à ouvrir."
 
 #. type: Plain text
-#: user-manual.txt:2952
+#: user-manual.txt:3075
 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:2953
+#: user-manual.txt:3076
 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:2954
+#: user-manual.txt:3077
 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:2956
+#: user-manual.txt:3079
 msgid ""
 "<<S_ExportLog,_Export_>> - Export the currently open dive logbook (or the "
 "selected dives in the logbook) to one of several formats."
@@ -5733,20 +6031,20 @@ msgstr ""
 "formats."
 
 #. type: Plain text
-#: user-manual.txt:2957
+#: user-manual.txt:3080
 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:2958
+#: user-manual.txt:3081
 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:2959
+#: user-manual.txt:3082
 msgid ""
 "<<S_Configure,_Configure dive computer_>> - Edit the configuration of a dive "
 "computer."
@@ -5755,18 +6053,18 @@ msgstr ""
 "configuration d'un ordinateur de plongée."
 
 #. type: Plain text
-#: user-manual.txt:2960
+#: user-manual.txt:3083
 msgid "_Quit_ - Quit _Subsurface_."
 msgstr "_Quitter_ - Quitter _Subsurface_."
 
 #. type: Title ===
-#: user-manual.txt:2961
+#: user-manual.txt:3084
 #, no-wrap
 msgid "Import"
 msgstr "Importer"
 
 #. type: Plain text
-#: user-manual.txt:2964
+#: user-manual.txt:3087
 msgid ""
 "<<S_ImportDiveComputer,_Import from dive computer_>> - Import dive "
 "information from a dive computer."
@@ -5775,7 +6073,7 @@ msgstr ""
 "Importer des informations de plongées à partir de l'ordinateur de plongée."
 
 #. type: Plain text
-#: user-manual.txt:2966
+#: user-manual.txt:3089
 msgid ""
 "<<Unified_import,_Import Log Files_>> - Import dive information from a file "
 "in in a _Subsurface_-compatible format."
@@ -5785,7 +6083,7 @@ msgstr ""
 "_Subsurface_."
 
 #. type: Plain text
-#: user-manual.txt:2968
+#: user-manual.txt:3091
 msgid ""
 "<<S_Companion,_Import GPS data from Subsurface web service_>> - Load GPS "
 "coordinates from the _Subsurface_ mobile phone app."
@@ -5795,7 +6093,7 @@ msgstr ""
 "(téléphones et tablettes)."
 
 #. type: Plain text
-#: user-manual.txt:2970
+#: user-manual.txt:3093
 msgid ""
 "<<S_ImportingDivelogsDe,_Import from Divelogs.de_>> - Import dive "
 "information from _www.Divelogs.de_."
@@ -5804,13 +6102,13 @@ msgstr ""
 "informations de plongées à partir de _www.Divelogs.de_."
 
 #. type: Title ===
-#: user-manual.txt:2971
+#: user-manual.txt:3094
 #, no-wrap
 msgid "Log"
 msgstr "Journal (log)"
 
 #. type: Plain text
-#: user-manual.txt:2973
+#: user-manual.txt:3096
 msgid ""
 "<<S_EnterData,_Add Dive_>> - Manually add a new dive to the *Dive List* "
 "panel."
@@ -5819,7 +6117,7 @@ msgstr ""
 "plongée au panneau de la *liste des plongées*."
 
 #. type: Plain text
-#: user-manual.txt:2974
+#: user-manual.txt:3097
 msgid ""
 "<<S_DivePlanner,_Plan Dive_>> - This feature allows the planning of dives."
 msgstr ""
@@ -5827,7 +6125,7 @@ msgstr ""
 "planifier des plongées."
 
 #. type: Plain text
-#: user-manual.txt:2975
+#: user-manual.txt:3098
 msgid ""
 "<<S_Replan,_Re-plan dive_>> - Edit a dive plan that has been saved into the "
 "*Dive List*."
@@ -5836,7 +6134,7 @@ msgstr ""
 "a été enregistrée dans la *liste des plongées*."
 
 #. type: Plain text
-#: user-manual.txt:2977
+#: user-manual.txt:3100
 msgid ""
 "<<S_CopyComponents,_Copy dive components_>> - By selecting this option, one "
 "can copy information from several fields of a dive log onto the clipboard."
@@ -5846,7 +6144,7 @@ msgstr ""
 "champs d'un journal de plongée vers le presse-papier."
 
 #. type: Plain text
-#: user-manual.txt:2979
+#: user-manual.txt:3102
 msgid ""
 "_Paste dive components_ - Paste, into the selected dives in the *Dive List*, "
 "the information copied using the _Copy dive components_ option."
@@ -5856,7 +6154,7 @@ msgstr ""
 "préalable avec l'option _Copier les composants de la plongée_."
 
 #. type: Plain text
-#: user-manual.txt:2981
+#: user-manual.txt:3104
 msgid ""
 "<<S_Renumber,_Renumber_>> - Renumber the dives listed in the *Dive List* "
 "panel."
@@ -5865,7 +6163,7 @@ msgstr ""
 "le panneau de la *liste des plongées*."
 
 #. type: Plain text
-#: user-manual.txt:2983
+#: user-manual.txt:3106
 msgid ""
 "<<S_Group,_Auto Group_>> - Group the dives in the *Dive List* panel into "
 "dive trips."
@@ -5874,7 +6172,7 @@ msgstr ""
 "*liste des plongées* dans des voyages de plongées."
 
 #. type: Plain text
-#: user-manual.txt:2984
+#: user-manual.txt:3107
 msgid ""
 "<<S_DeviceNames,_Edit Device Names_>> - Edit the names of dive computers to "
 "facilitate your logs."
@@ -5883,7 +6181,7 @@ msgstr ""
 "les noms des ordinateurs de plongée pour faciliter vos journaux (logs)."
 
 #. type: Plain text
-#: user-manual.txt:2985
+#: user-manual.txt:3108
 msgid ""
 "<<S_Filter,_Filter divelist_>> - Select only some dives, based on specific "
 "tags or dive criteria."
@@ -5892,13 +6190,13 @@ msgstr ""
 "certaines plongées, à partir de tags ou de critères de plongées."
 
 #. type: Title ===
-#: user-manual.txt:2986
+#: user-manual.txt:3109
 #, no-wrap
 msgid "View"
 msgstr "Vue"
 
 #. type: Plain text
-#: user-manual.txt:2989
+#: user-manual.txt:3112
 msgid ""
 "<<S_ViewPanels,_All_>> - View the four main _Subsurface_ panels "
 "simmultaneously."
@@ -5907,35 +6205,35 @@ msgstr ""
 "_Subsurface_ simultanément."
 
 #. type: Plain text
-#: user-manual.txt:2990
+#: user-manual.txt:3113
 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:2991
+#: user-manual.txt:3114
 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:2992
+#: user-manual.txt:3115
 msgid "<<S_ViewPanels,_Info_>> - View only the *Dive Notes* panel."
 msgstr ""
 "<<S_ViewPanels,_Info_>> - Affiche uniquement le panneau des *notes de "
 "plongée*."
 
 #. type: Plain text
-#: user-manual.txt:2993
+#: user-manual.txt:3116
 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:2995
+#: user-manual.txt:3118
 msgid ""
 "_Yearly Statistics_ - Display summary statistics about dives during this and "
 "past years."
@@ -5944,28 +6242,28 @@ msgstr ""
 "plongées effectuées."
 
 #. type: Plain text
-#: user-manual.txt:2996
+#: user-manual.txt:3119
 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:2997
+#: user-manual.txt:3120
 msgid "_Next DC_ - Switch to next dive computer."
 msgstr "_Ordinateur suivant_  - Passer à l'ordinateur de plongée suivant."
 
 #. type: Plain text
-#: user-manual.txt:2998
+#: user-manual.txt:3121
 msgid "_Full Screen_ - Toggles Full Screen mode."
 msgstr "_Plein écran_  - Passer en mode plein écran."
 
 #. type: Title ===
-#: user-manual.txt:2999
+#: user-manual.txt:3122
 #, no-wrap
 msgid "Help"
 msgstr "Aide"
 
 #. type: Plain text
-#: user-manual.txt:3002
+#: user-manual.txt:3125
 msgid ""
 "_About Subsurface_ - Show a panel with the version number of _Subsurface_ as "
 "well as licensing information."
@@ -5974,7 +6272,7 @@ msgstr ""
 "_Subsurface_ ainsi que les informations de licence."
 
 #. type: Plain text
-#: user-manual.txt:3004
+#: user-manual.txt:3127
 msgid ""
 "_Check for updates_ - Find out whether a newer version of Subsurface is "
 "available on the http://subsurface-divelog.org/[_Subsurface_ web site]."
@@ -5984,38 +6282,38 @@ msgstr ""
 "_Subsurface_ ]."
 
 #. type: Plain text
-#: user-manual.txt:3005
+#: user-manual.txt:3128
 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:3006
+#: user-manual.txt:3129
 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:3009
+#: user-manual.txt:3132
 #, no-wrap
 msgid "APPENDIX A: Operating system specific information for importing dive information from a dive computer."
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:3011
+#: user-manual.txt:3134
 #, 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:3012
+#: user-manual.txt:3135
 #, no-wrap
 msgid "images/icons/drivers.jpg"
 msgstr "images/icons/drivers.jpg"
 
 #. type: Plain text
-#: user-manual.txt:3017
+#: user-manual.txt:3140
 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 "
@@ -6023,7 +6321,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3023
+#: user-manual.txt:3146
 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 "
@@ -6032,7 +6330,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3027
+#: user-manual.txt:3150
 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 "
@@ -6040,7 +6338,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3034
+#: user-manual.txt:3157
 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 "
@@ -6051,19 +6349,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:3036
+#: user-manual.txt:3159
 #, 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:3037
+#: user-manual.txt:3160
 #, no-wrap
 msgid "images/icons/usb.jpg"
 msgstr "images/icons/usb.jpg"
 
 #. type: Plain text
-#: user-manual.txt:3045
+#: user-manual.txt:3168
 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 "
@@ -6074,13 +6372,13 @@ msgid ""
 msgstr ""
 
 #. type: Block title
-#: user-manual.txt:3046 user-manual.txt:3129
+#: user-manual.txt:3169 user-manual.txt:3252
 #, no-wrap
 msgid "On Windows:"
 msgstr "Sur Windows :"
 
 #. type: Plain text
-#: user-manual.txt:3050
+#: user-manual.txt:3173
 msgid ""
 "Simply try COM1, COM2, etc. The drop down list should contain all connected "
 "COM devices."
@@ -6089,56 +6387,56 @@ msgstr ""
 "tous les périphériques COM connectés."
 
 #. type: Block title
-#: user-manual.txt:3051 user-manual.txt:3144
+#: user-manual.txt:3174 user-manual.txt:3267
 #, no-wrap
 msgid "On MacOS:"
 msgstr "Sur MacOS :"
 
 #. type: Plain text
-#: user-manual.txt:3054
+#: user-manual.txt:3177
 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:3055
+#: user-manual.txt:3178
 #, no-wrap
 msgid "On Linux:"
 msgstr "Sur Linux :"
 
 #. type: Plain text
-#: user-manual.txt:3058
+#: user-manual.txt:3181
 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:3060
+#: user-manual.txt:3183
 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:3061
+#: user-manual.txt:3184
 msgid "Open a terminal"
 msgstr "Ouvrir un terminal"
 
 #. type: Plain text
-#: user-manual.txt:3062 user-manual.txt:3064
+#: user-manual.txt:3185 user-manual.txt:3187
 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:3063
+#: user-manual.txt:3186
 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:3066
+#: user-manual.txt:3189
 msgid "A message similar to this one should appear:"
 msgstr "Un message similaire à celui-ci devrait apparaitre :"
 
 #. type: Plain text
-#: user-manual.txt:3082
+#: user-manual.txt:3205
 #, no-wrap
 msgid ""
 "\tusb 2-1.1: new full speed USB device number 14 using ehci_hcd\n"
@@ -6174,7 +6472,7 @@ msgstr ""
 "\tftdi_sio: v1.6.0:USB FTDI Serial Converters Driver\n"
 
 #. type: Plain text
-#: user-manual.txt:3087
+#: user-manual.txt:3210
 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 "
@@ -6186,12 +6484,12 @@ msgstr ""
 "que Subsurface utilise le bon port USB."
 
 #. type: Plain text
-#: user-manual.txt:3089
+#: user-manual.txt:3212
 msgid "Ensuring that the user has write permission to the USB serial port:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3095
+#: user-manual.txt:3218
 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 "
@@ -6200,14 +6498,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3099
+#: user-manual.txt:3222
 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:3104
+#: user-manual.txt:3227
 #, no-wrap
 msgid ""
 "Type: +id johnB+     This lists all the groups that johnB belongs to and\n"
@@ -6218,7 +6516,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3106
+#: user-manual.txt:3229
 #, no-wrap
 msgid ""
 "Under some circumstances this change takes only effect (eg. on Ubuntu) after\n"
@@ -6226,7 +6524,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3111
+#: user-manual.txt:3234
 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 "
@@ -6234,19 +6532,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:3113
+#: user-manual.txt:3236
 #, no-wrap
 msgid "Setting up bluetooth enabled devices"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:3114
+#: user-manual.txt:3237
 #, no-wrap
 msgid "images/icons/bluetooth.jpg"
 msgstr "images/icons/bluetooth.jpg"
 
 #. type: Plain text
-#: user-manual.txt:3120
+#: user-manual.txt:3243
 msgid ""
 "For dive computers communicating through bluetooth like the Heinrichs "
 "Weikamp Frog or the Shearwater Predator and Petrel there is a different "
@@ -6255,13 +6553,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3122
+#: user-manual.txt:3245
 #, no-wrap
 msgid "*For the dive computer, after enabling Bluetooth, ensure it is in Upload mode.*\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3126
+#: user-manual.txt:3249
 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 "
@@ -6269,13 +6567,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3128
+#: user-manual.txt:3251
 #, no-wrap
 msgid "*Pair the _Subsurface_ computer with the dive computer.*\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3137
+#: user-manual.txt:3260
 msgid ""
 "Bluetooth is most likely already enabled. For pairing with the dive computer "
 "choose _Control Panel -> Bluetooth Devices -> Add Wireless Device_.  This "
@@ -6286,21 +6584,21 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3140
+#: user-manual.txt:3263
 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:3143
+#: user-manual.txt:3266
 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:3150
+#: user-manual.txt:3273
 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. "
@@ -6309,20 +6607,20 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3153
+#: user-manual.txt:3276
 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: Block title
-#: user-manual.txt:3154
+#: user-manual.txt:3277
 #, no-wrap
 msgid "On Linux"
 msgstr "Sur Linux"
 
 #. type: Plain text
-#: user-manual.txt:3162
+#: user-manual.txt:3285
 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 "
@@ -6334,7 +6632,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3169
+#: user-manual.txt:3292
 msgid ""
 "In the rare cases where the above is not true, then depending on your "
 "system, try +initd+ or +systemd+. This might be different and also involve "
@@ -6345,12 +6643,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3171
+#: user-manual.txt:3294
 msgid "One may also use a manual approach by using such commands:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3176
+#: user-manual.txt:3299
 msgid ""
 "+hciconfig+ shows the Bluetooth devices available on your computer (not dive "
 "computer), most likely one will see a hci0, if not try +hcitool -a+ to see "
@@ -6358,14 +6656,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3180
+#: user-manual.txt:3303
 msgid ""
 "+hcitool scanning+ gets a list of bluetooth enabled client devices, look for "
 "the dive computer and remember the MAC address are shown there"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3184
+#: user-manual.txt:3307
 msgid ""
 "+bluez-simple-agent hci0 10:00:E8:C4:BE:C4+ pairs the dive computer with the "
 "bluetooth stack of the _Subsurface_ computer, copy/paste the MAC address "
@@ -6373,14 +6671,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3187
+#: user-manual.txt:3310
 msgid ""
 "Unfortunately on Linux binding to a communication device has to be done "
 "manually by running:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3193
+#: user-manual.txt:3316
 msgid ""
 "+rfcomm bind /dev/rfcomm0 10:00:E8:C4:BE:C4+ binds the dive computer to a "
 "communication device in the desktop computer, in case rfcomm is already "
@@ -6389,32 +6687,32 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3196
+#: user-manual.txt:3319
 msgid ""
 "For downloading dives in _Subsurface_ specify the device name connected to "
 "the MAC address in the last step above, e.g. _/dev/rfcomm0_."
 msgstr ""
 
 #. type: Title ==
-#: user-manual.txt:3198
+#: user-manual.txt:3322
 #, no-wrap
-msgid "APPENDIX B: Dive Computer specific information for importing dive information."
+msgid "APPENDIX B: Dive Computer specific information for importing dive data."
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:3201
+#: user-manual.txt:3325
 #, no-wrap
-msgid "Import from a Uemis Zurich"
+msgid "Importing from Uemis Zurich"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:3203
+#: user-manual.txt:3327
 #, no-wrap
 msgid "images/icons/iumis.jpg"
 msgstr "images/icons/iumis.jpg"
 
 #. type: Plain text
-#: user-manual.txt:3219
+#: user-manual.txt:3343
 msgid ""
 "_Subsurface_ downloads the information stored on the SDA (the built-in file "
 "system of the Uemis) including information about dive spots and equipment. "
@@ -6430,7 +6728,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3234
+#: user-manual.txt:3358
 msgid ""
 "After selecting the above device name, download the dives from the Uemis "
 "Zurich. One technical issue with the Uemis Zurich download implementation "
@@ -6447,19 +6745,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:3236
+#: user-manual.txt:3360
 #, no-wrap
-msgid "Importing dives from the Uwatec Galileo"
+msgid "Importing from Uwatec Galileo"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:3238
+#: user-manual.txt:3362
 #, no-wrap
 msgid "images/icons/Galileo.jpg"
 msgstr "images/icons/Galileo.jpg"
 
 #. type: Plain text
-#: user-manual.txt:3253
+#: user-manual.txt:3377
 msgid ""
 "The Uwatec Galileo dive computers use infra red (IrDA) communication between "
 "the dive computer and Subsurface. The Uwatec hardware uses a USB dongle "
@@ -6475,14 +6773,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3256
+#: user-manual.txt:3380
 msgid ""
 "After executing this command, Subsurface will recognise the Galileo dive "
 "computer and download dive information."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3260
+#: user-manual.txt:3384
 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/"
@@ -6490,26 +6788,26 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3263
+#: user-manual.txt:3387
 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:3265
+#: user-manual.txt:3389
 #, no-wrap
-msgid "Importing dives from Heinrichs Weikamp DR5"
+msgid "Importing from Heinrichs Weikamp DR5"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:3267
+#: user-manual.txt:3391
 #, no-wrap
 msgid "images/icons/HW_DR5.jpg"
 msgstr "images/icons/HW_DR5.jpg"
 
 #. type: Plain text
-#: user-manual.txt:3277
+#: user-manual.txt:3401
 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.  "
@@ -6522,19 +6820,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:3280
+#: user-manual.txt:3404
 #, no-wrap
-msgid "Importing dives from xDEEP BLACK"
+msgid "Importing from xDEEP BLACK"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:3282
+#: user-manual.txt:3406
 #, no-wrap
 msgid "images/icons/HW_xdeepblack.jpg"
 msgstr "images/icons/HW_xdeepblack.jpg"
 
 #. type: Plain text
-#: user-manual.txt:3291
+#: user-manual.txt:3415
 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 "
@@ -6548,19 +6846,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:3293
+#: user-manual.txt:3417
 #, no-wrap
-msgid "Import from Shearwater Predator using Bluetooth"
+msgid "Importing from Shearwater Predator using Bluetooth"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:3295
+#: user-manual.txt:3419
 #, no-wrap
 msgid "images/icons/predator.jpg"
 msgstr "images/icons/predator.jpg"
 
 #. type: Plain text
-#: user-manual.txt:3303
+#: user-manual.txt:3427
 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 "
@@ -6571,36 +6869,36 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3306
+#: user-manual.txt:3430
 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:3307
+#: user-manual.txt:3431
 msgid "switch to different Bluetooth drivers for the same hardware"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3308
+#: user-manual.txt:3432
 msgid "switch off WiFi while using Bluetooth"
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:3310
+#: user-manual.txt:3434
 #, no-wrap
-msgid "Importing dive logs from the Poseidon MkVI Discovery"
+msgid "Importing from Poseidon MkVI Discovery"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:3312
+#: user-manual.txt:3436
 #, no-wrap
 msgid "images/MkVI.jpeg"
 msgstr "images/MkVI.jpeg"
 
 #. type: Plain text
-#: user-manual.txt:3320
+#: user-manual.txt:3444
 msgid ""
 "Download of dive logs from the MkVI is performed using a custom "
 "communications adapter and the _Poseidon PC Configuration Software_, "
@@ -6612,45 +6910,45 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3323
+#: user-manual.txt:3447
 msgid ""
 "Setup configuration for the dive and key dive parameters (file with a .txt "
 "extension)"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3324
+#: user-manual.txt:3448
 msgid "Dive log details (file with a .csv extension)"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3326
+#: user-manual.txt:3450
 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:3328
+#: user-manual.txt:3452
 msgid ""
 "_Subsurface_ accesses the .txt and the .csv files to obtain dive log "
 "information."
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:3330
+#: user-manual.txt:3454
 #, no-wrap
-msgid "Importing dive logs from the APD Inspiration CCR"
+msgid "Importing from APD Inspiration CCR"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:3332
+#: user-manual.txt:3456
 #, no-wrap
 msgid "images/APDComputer.jpg"
 msgstr "images/APDComputer.jpg"
 
 #. type: Plain text
-#: user-manual.txt:3340
+#: user-manual.txt:3464
 msgid ""
 "The dive logs of an APD Inspiration or similar CCR dive computer are "
 "downloaded using a communications adapter and _AP Communicator_, obtained "
@@ -6662,82 +6960,82 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3342
+#: user-manual.txt:3466
 msgid "Open a dive within the _AP Log Viewer_."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3343
+#: user-manual.txt:3467
 msgid "Select the tab at the top of the screen, entitled \"_Data_\"."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3344
+#: user-manual.txt:3468
 msgid ""
 "If the raw dive log data show on the screen, click on \"_Copy to Clipboard_"
 "\"."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3345
+#: user-manual.txt:3469
 msgid "Open a text editor, e.g. Notepad (Windows), TextWrangler (Mac)."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3347
+#: user-manual.txt:3471
 msgid ""
 "Copy the contents of the clipboard into the text editor and save the text "
 "file with a filename extension of .CSV"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3348
+#: user-manual.txt:3472
 msgid ""
 "Within _Subsurface_, select _Import -> Import log files_ to open the xref:"
 "Unified_import[universal import dialogue]."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3349
+#: user-manual.txt:3473
 msgid ""
 "In the dropdown list towards the bottom right of the dialogue, select \"_CSV "
 "files_\"."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3351
+#: user-manual.txt:3475
 msgid ""
 "On the list of file names select the .CSV file that has been created above. "
 "An import dialogue opens."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3353
+#: user-manual.txt:3477
 msgid ""
 "In the dropdown list on the middle right labeled '_Pre-configured imports_"
 "\", select _APD Log Viewer_."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3354
+#: user-manual.txt:3478
 msgid ""
 "Ensure the other settings for the ADP dive log are appropriate, then select "
 "_OK_."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3356
+#: user-manual.txt:3480
 msgid "The APD dive log will appear within _Subsurface_."
 msgstr ""
 
 #. type: Title ==
-#: user-manual.txt:3358
+#: user-manual.txt:3482
 #, no-wrap
 msgid "APPENDIX C: Exporting Dive log information from external dive log software."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3367
+#: user-manual.txt:3491
 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, "
@@ -6747,22 +7045,22 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3369
+#: user-manual.txt:3493
 msgid "Export the foreign dive log data to format that is accessible from"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3370
+#: user-manual.txt:3494
 msgid "_Subsurface_."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3371
+#: user-manual.txt:3495
 msgid "Import the accessible dive log data into _Subsurface_."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3375
+#: user-manual.txt:3499
 msgid ""
 "This appendix provides some information about approaches to export dive log "
 "data from foreign dive log software. The procedures below mostly apply to "
@@ -6770,19 +7068,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:3377
+#: user-manual.txt:3501
 #, no-wrap
-msgid "Exporting dives from *Suunto Divemanager (DM3, DM4 or DM5)*"
+msgid "Exporting from *Suunto Divemanager (DM3, DM4 or DM5)*"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:3378
+#: user-manual.txt:3502
 #, no-wrap
 msgid "images/icons/suuntologo.jpg"
 msgstr "images/icons/suuntologo.jpg"
 
 #. type: Plain text
-#: user-manual.txt:3385
+#: user-manual.txt:3509
 msgid ""
 "DiveManager is a MS Windows application for Suunto dive computers.  "
 "Divemanager 3 (DM3) is an older version of the Suunto software. More recent "
@@ -6792,69 +7090,69 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3387
+#: user-manual.txt:3511
 #, no-wrap
 msgid "*Divemanager 3 (DM3):*\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3389
+#: user-manual.txt:3513
 msgid ""
 "Start 'Suunto Divemanager 3' and log in with the name containing the logs"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3390
+#: user-manual.txt:3514
 msgid "Do not start the import wizard to import dives from the dive computer."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3392
+#: user-manual.txt:3516
 msgid ""
 "In the navigation tree on the left side of the program-window, select the "
 "appropriate dives."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3393
+#: user-manual.txt:3517
 msgid ""
 "Within the list of dives, select the dives you would like to import later:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3394
+#: user-manual.txt:3518
 msgid "To select certain dives: hold 'ctrl' and click the dive"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3395
+#: user-manual.txt:3519
 msgid "To select all dives: Select the first dive, hold down shift and"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3396
+#: user-manual.txt:3520
 msgid "select the last dive"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3397
+#: user-manual.txt:3521
 msgid "With the dives marked, use the program menu _File -> Export_"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3398
+#: user-manual.txt:3522
 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:3399
+#: user-manual.txt:3523
 msgid "Click the browse button next to the field Export Path"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3401
+#: user-manual.txt:3525
 #, no-wrap
 msgid ""
 "** A file-manager like window pops up\n"
@@ -6862,13 +7160,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3402
+#: user-manual.txt:3526
 #, no-wrap
 msgid "Divelog.SDE file\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3404
+#: user-manual.txt:3528
 #, no-wrap
 msgid ""
 "** Optionally change the name of the file for saving\n"
@@ -6876,25 +7174,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3405
+#: user-manual.txt:3529
 #, no-wrap
 msgid "Back in the Export pop-up, press the button 'Export'\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3406
+#: user-manual.txt:3530
 #, no-wrap
 msgid "The dives are now exported to the file Divelog.SDE.\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3408
+#: user-manual.txt:3532
 #, no-wrap
 msgid "*Divemanager 4 (DM4) and Divemanager 5 (DM5):*\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3413
+#: user-manual.txt:3537
 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 "
@@ -6903,75 +7201,75 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3415
+#: user-manual.txt:3539
 msgid "Locating the Suunto DM4 (or DM5) database:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3417 user-manual.txt:3426
+#: user-manual.txt:3541 user-manual.txt:3550
 msgid "Start Suunto DM4/DM5"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3418
+#: user-manual.txt:3542
 msgid "Select 'Help -> About'"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3419
+#: user-manual.txt:3543
 msgid "Click 'Copy' after text 'Copy log folder path to clipboard'"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3420
+#: user-manual.txt:3544
 msgid "Now open Windows Explorer"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3421
+#: user-manual.txt:3545
 msgid "Paste the address to the path box at the top of the File Explorer"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3422
+#: user-manual.txt:3546
 msgid "The database is called DM4.db or DM5.db"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3424
+#: user-manual.txt:3548
 msgid "Making a backup copy of the Suunto DM4/DM5 database:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3427
+#: user-manual.txt:3551
 msgid "Select 'File - Create backup'"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3429
+#: user-manual.txt:3553
 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:3430
+#: user-manual.txt:3554
 msgid "Click 'Save'"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3431
+#: user-manual.txt:3555
 msgid "The dives are now exported to the file DM4.bak (or DM5.bak)"
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:3433
+#: user-manual.txt:3557
 #, no-wrap
 msgid "Exporting from Atomic Logbook"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3442
+#: user-manual.txt:3566
 msgid ""
 "Atomic Logbook is a Windows software by Atomic Aquatics. It allows "
 "downloading of dive information from Cobalt and Cobalt 2 dive computers.  "
@@ -6981,19 +7279,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:3444
+#: user-manual.txt:3568
 #, no-wrap
 msgid "Exporting from Mares Dive Organiser V2.1"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:3447
+#: user-manual.txt:3571
 #, no-wrap
 msgid "images/icons/mareslogo.jpg"
 msgstr "images/icons/mareslogo.jpg"
 
 #. type: Plain text
-#: user-manual.txt:3455
+#: user-manual.txt:3579
 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 "
@@ -7004,7 +7302,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3460
+#: user-manual.txt:3584
 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 "
@@ -7012,36 +7310,36 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3463
+#: user-manual.txt:3587
 msgid ""
 "Rename the file to DiveOrganiserxxxxx.zip. Inside the zipped directory is a "
 "file _DiveOrganiser.sdf_."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3464
+#: user-manual.txt:3588
 msgid "Extract the _.sdf_ file from the zipped folder to your Desktop."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3465
+#: user-manual.txt:3589
 msgid "The password for accessing the .zip file is _mares_."
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:3467
+#: user-manual.txt:3591
 #, no-wrap
-msgid "Exporting dives from *DivingLog 5.0*"
+msgid "Exporting from *DivingLog 5.0*"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:3469
+#: user-manual.txt:3593
 #, no-wrap
 msgid "images/icons/divingloglogo.jpg"
 msgstr "images/icons/divingloglogo.jpg"
 
 #. type: Plain text
-#: user-manual.txt:3478
+#: user-manual.txt:3602
 msgid ""
 "Unfortunately DivingLog XML files give us no indication on the preferences "
 "set on one's system. So in order for _Subsurface_ to be able to successfully "
@@ -7052,33 +7350,32 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3480
+#: user-manual.txt:3604
 msgid "In DivingLog open the 'File -> Export -> XML' menu"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3481
+#: user-manual.txt:3605
 msgid "Select the dives to export"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3482
+#: user-manual.txt:3606
 msgid "Click on the export button and select the filename"
 msgstr ""
 
 #. type: Title ==
-#: user-manual.txt:3484
+#: user-manual.txt:3608
 #, no-wrap
 msgid "APPENDIX D: Exporting a spreadsheet to CSV format"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3494
+#: user-manual.txt:3617
 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 "
-"imported into _Subsurface_ (xref:S_ImportingManualCSV[Importing dives "
-"from_manually kept CSV file]), after the spreadsheet is converted in a .CSV "
+"imported into _Subsurface_ after the spreadsheet is converted in a .CSV "
 "file.  This section explains the procedure to convert a diving logbook "
 "stored in a spreadsheet to a .CSV file that will later be imported from "
 "_Subsurface_.  Creating a .CSV is a straightforward task, although the "
@@ -7087,7 +7384,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3500
+#: user-manual.txt:3623
 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 "
@@ -7098,41 +7395,41 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3502
+#: user-manual.txt:3625
 msgid ""
 "Date: use one of the following formats: yyyy-mm-dd, dd.mm.yyyy, mm/dd/yyyy"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3503
+#: user-manual.txt:3626
 msgid "Duration: the format should be minutes:seconds."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3504
+#: user-manual.txt:3627
 msgid ""
 "Unit system: only one unit system shold be used (i.e., no mixture between "
 "imperial and metric units)"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3505
+#: user-manual.txt:3628
 msgid "Tags and buddies: values should be separated using a comma."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3506
+#: user-manual.txt:3629
 msgid "GPS position: users must use decimal degrees, e.g. 30.22496 30.821798"
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:3507
+#: user-manual.txt:3630
 #, no-wrap
 msgid "_LibreOffice Calc_ and _OpenOffice Calc_"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3511
+#: user-manual.txt:3634
 msgid ""
 "These are open source spreadsheet applications forming parts of larger open "
 "source office suite applications. The user interaction with _LibreOffice_ "
@@ -7143,13 +7440,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:3512
+#: user-manual.txt:3635
 #, no-wrap
 msgid "images/LOffice_spreadsheetdata.jpg"
 msgstr "images/LOffice_spreadsheetdata.jpg"
 
 #. type: Plain text
-#: user-manual.txt:3515
+#: user-manual.txt:3638
 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 "
@@ -7157,13 +7454,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:3516
+#: user-manual.txt:3639
 #, no-wrap
 msgid "images/LOffice_save_as_options.jpg"
 msgstr "images/LOffice_save_as_options.jpg"
 
 #. type: Plain text
-#: user-manual.txt:3519
+#: user-manual.txt:3642
 msgid ""
 "After selecting _Save_, select the appropriate field delimiter (choose _Tab_ "
 "to prevent conflicts with the comma when using this as a decimal point), "
@@ -7171,27 +7468,27 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:3520
+#: user-manual.txt:3643
 #, no-wrap
 msgid "images/LOffice_field_options.jpg"
 msgstr "images/LOffice_field_options.jpg"
 
 #. type: Plain text
-#: user-manual.txt:3523
+#: user-manual.txt:3646
 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:"
-"S_ImportingManualCSV[Importing dives from manually kept CSV files]."
+"S_ImportingCSVDives[Importing CSV dives]."
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:3524
+#: user-manual.txt:3647
 #, no-wrap
 msgid "Microsoft _Excel_"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3530
+#: user-manual.txt:3653
 msgid ""
 "The field delimiter (called \"_list separator_\" in Microsoft manuals) is "
 "not accessible from within _Excel_ and needs to be set through the "
@@ -7202,19 +7499,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3532
+#: user-manual.txt:3655
 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:3533
+#: user-manual.txt:3656
 msgid "Open the _Regional and Language Options_ dialog box."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3536
+#: user-manual.txt:3659
 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 "
@@ -7222,48 +7519,48 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3537
+#: user-manual.txt:3660
 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:3538
+#: user-manual.txt:3661
 msgid "Click _OK_ twice."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3540
+#: user-manual.txt:3663
 msgid "Below is an image of the _Control Panel_:"
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:3541
+#: user-manual.txt:3664
 #, no-wrap
 msgid "images/Win_SaveCSV2.jpg"
 msgstr "images/Win_SaveCSV2.jpg"
 
 #. type: Plain text
-#: user-manual.txt:3544
+#: user-manual.txt:3667
 msgid "To export the dive log in CSV format:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3546
+#: user-manual.txt:3669
 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:3547
+#: user-manual.txt:3670
 #, no-wrap
 msgid "images/Win_SaveCSV1.jpg"
 msgstr "images/Win_SaveCSV1.jpg"
 
 #. type: Plain text
-#: user-manual.txt:3550
+#: user-manual.txt:3673
 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 "
@@ -7273,34 +7570,34 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:3551
+#: user-manual.txt:3674
 #, no-wrap
 msgid "images/Win_SaveCSV3.jpg"
 msgstr "images/Win_SaveCSV3.jpg"
 
 #. type: Plain text
-#: user-manual.txt:3554
+#: user-manual.txt:3677
 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 "
 "text editor, and then import the dive data as explained on the section xref:"
-"S_ImportingManualCSV[Importing dives from manually kept CSV files]."
+"S_ImportingCSVDives[Importing CSV dives]."
 msgstr ""
 
 #. type: Title ==
-#: user-manual.txt:3555
+#: user-manual.txt:3678
 #, no-wrap
 msgid "APPENDIX E: FAQs."
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:3557
+#: user-manual.txt:3680
 #, no-wrap
 msgid "Subsurface appears to miscalculate gas consumption and SAC"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3561
+#: user-manual.txt:3684
 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_ "
@@ -7308,7 +7605,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3567
+#: user-manual.txt:3690
 msgid ""
 "'Answer': Not really. What happens is that _Subsurface_ actually calculates "
 "gas consumption differently - and better - than you expect.  In particular, "
@@ -7318,7 +7615,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3573
+#: user-manual.txt:3696
 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 "
@@ -7328,12 +7625,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3575
+#: user-manual.txt:3698
 msgid "+consumption = (amount_of_air_at_beginning - amount_of_air_at_end)+"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3581
+#: user-manual.txt:3704
 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 "
@@ -7344,12 +7641,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3583
+#: user-manual.txt:3706
 msgid "+12.2*((220-100)/1.013)+"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3588
+#: user-manual.txt:3711
 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 "
@@ -7359,7 +7656,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3594
+#: user-manual.txt:3717
 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 "
@@ -7370,13 +7667,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:3595
+#: user-manual.txt:3718
 #, no-wrap
 msgid "Some dive profiles have time discrepancies with the recorded samples from my dive computer..."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3599
+#: user-manual.txt:3722
 msgid ""
 "_Subsurface_ ends up ignoring surface time for many things (average depth, "
 "divetime, SAC, etc).  'Question': Why do dive durations in my dive computer "
@@ -7384,7 +7681,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3607
+#: user-manual.txt:3730
 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 "
@@ -7396,3 +7693,15 @@ msgid ""
 "at the surface. And then you don't want that to count as some kind of long "
 "dive”."
 msgstr ""
+
+#~ msgid "images/Pref1.jpg"
+#~ msgstr "images/Pref1.jpg"
+
+#~ msgid "images/Pref2.jpg"
+#~ msgstr "images/Pref2.jpg"
+
+#~ msgid "images/Pref4.jpg"
+#~ msgstr "images/Pref4.jpg"
+
+#~ msgid "images/Pref5.jpg"
+#~ msgstr "images/Pref5.jpg"
diff --git a/Documentation/user-manual_fr.txt b/Documentation/user-manual_fr.txt
index 915b3d8..d9597e1 100644
--- a/Documentation/user-manual_fr.txt
+++ b/Documentation/user-manual_fr.txt
@@ -278,9 +278,9 @@ a. One can find the coordinates on the world map in the bottom right hand part
    disappears and the coordinates are stored.
 
 b. The coordinates can be obtained from the _Subsurface_ Companion app if the
-   user has an Android device with GPS and if the coordinates of the dive site
-   were stored using that device.  xref:S_Companion[Click here for more
-   information]
+   user has an Android or iPhone device with GPS and if the coordinates of the
+   dive site were stored using that device.  xref:S_Companion[Click here for
+   more information]
 
 c. The coordinates can be entered by hand if they are known, using one of four
    formats with latitude followed by longitude:
@@ -734,9 +734,9 @@ a. The user can find the coordinates on the world map in the bottom right hand
    appropriate place, the green bar disappears and the coordinates are stored.
 
 b. The user can obtain the coordinates from the _Subsurface_ Companion app if
-   an Android device with GPS was used and if the coordinates of the dive site
-   were stored using that device.  xref:S_Companion[Click here for more
-   information]
+   an Android or iPhone device with GPS was used and if the coordinates of the
+   dive site were stored using that device.  xref:S_Companion[Click here for
+   more information]
 
 c. The coordinates can be entered by hand if they are known, using one of four
    formats with latitude followed by longitude:
@@ -1240,11 +1240,11 @@ smaller file to make sure everything works.
 [[S_Companion]]
 === Importing GPS coordinates with the _Subsurface Companion App_ for mobile phones
 
-Using the *Subsurface Companion App* on an Android device with a GPS, the
-coordinates for the diving location can be automatically passed to the
-_Subsurface_ dive log. The Companion App stores the dive locations on a
-dedicated Internet-based file server. _Subsurface_, in turn, can collect the
-localities from the file server.
+Using the *Subsurface Companion App* on an _Android device_ with a GPS or
+xref:S_iphone[_iPhone_], the coordinates for the diving location can be
+automatically passed to the _Subsurface_ dive log. The Companion App stores
+the dive locations on a dedicated Internet-based file server. _Subsurface_,
+in turn, can collect the localities from the file server.
 
 To do this:
 
@@ -1260,7 +1260,7 @@ To do this:
   Store] or from
   http://f-droid.org/repository/browse/?fdfilter=subsurface&fdid=org.subsurface[F-Droid].
 
-==== Using the Subsurface companion app on a smartphone
+==== Using the Subsurface companion app on an Android smartphone
 
 On first use the app has three options:
 
@@ -1442,6 +1442,31 @@ download the dive locations of another registered diver.
 
 This option sends all locations stored in the Android device to the server.
 
+[[S_iphone]]
+==== Using the Subsurface companion app on an _iPhone_ to record dive locations
+
+The iPhone interface is quite simple. One needs to type the user ID
+(obtained during registration) into the space reserved for it, then select
+"Dive in" (see left part of the image below) and start collecting dive
+location information.
+
+image::images/iphone.jpg["FIGURE: Using iPhone companion application", align="center", width=640]
+
+Dives can be added automatically or manually. In manual mode, a dive
+location or waypoint is added to the GPS input stream. In automatic mode, a
+continuous path of GPS locations is created from which, much later, after
+import, subsurface can select the appropriate GPS locations based on the
+times of dives. The default mode for the _iphone_ is automatic. When one
+adds a dive, the location service is started automatically and a red bar
+appears at the bottom of the screen. After the dive one can click on the red
+bar to end the location service. While the location service is running one
+can only add dives using the manual mechanism.
+
+One can edit the site name afterwards by selecting the dive from the dive
+list and clicking on the site name. There are no other editable fields. The
+dive list is automatically uploaded from the iphone to the webservice and
+there is not an option to trigger upload manually.
+
 
 ==== Downloading dive locations to the _Subsurface_ divelog
 
@@ -1702,7 +1727,7 @@ composition and dive depth), CCR equipment provide actual measurements of
 pO~2~, 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~2~ is NOT the mean oxygen partial pressure as
-given by the CCR equipment, but a value xalculated by _Subsurface_ as
+given by the CCR equipment, but a value calculated by _Subsurface_ as
 follows:
 
 - For TWO O~2~ sensors the mean value of the two sensors are given.
@@ -1712,6 +1737,9 @@ follows:
   sensors are treated as spurious. If one of the three sensors provides
   spurious data, it is ignored.
 
+- If no sensor data is available, the pO~2~ value is assumed to be equal to
+  the setpoint.
+
 The mean pO~2~ of the sensors is indicated with a green line,
 
 The oxygen setpoint values as well as the readings from the individual
@@ -1768,7 +1796,7 @@ readings of the two oxygen sensors.
 image::images/CCR_dive_profile_f20.jpg["FIGURE: CCR dive profile", align="center"]
 
 _Equipment-specific information_: Equipment-specific information gathered by
-_Subsurface_ is shown in the xref:S_ExtraTab[Extra data tab]. This may
+_Subsurface_ is shown in the xref:S_ExtraDataTab[Extra data tab]. This may
 include setup information or metadata about the dive.
 
 More equipment-specific information for downloading CCR dive logs for
@@ -1792,6 +1820,7 @@ consumption taking in account gas incompressibility, particularly at tank
 pressures above 200 bar, making them more accurate.  Users should refer to
 xref:SAC_CALCULATION[Appendix D] for more information.
 
+[[S_ExtraDataTab]]
 === The *Extra Data* tab (usually for individual dives)
 
 When using a dive computer, it often reports several data items that cannot
@@ -1829,12 +1858,12 @@ 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:
 |====================
-|*Colour*|*Descent speed (m/min)*|*Ascent speed (m/min)*
-|Red|> 30|> 18
+|*Couleur*|*Vitesse de descente (m/min)*|*Vitesse de remontée (m/min)*
+|Rouge|> 30|> 18
 |Orange|18 - 30|9 - 18
-|Yellow|9 - 18|4 - 9
-|Light green|1.5 - 9|1.5 - 4
-|Dark green|< 1.5|< 1.5
+|Jaune|9 - 18|4 - 9
+|Vert clair|1.5 - 9|1.5 - 4
+|Vert foncé|< 1.5|< 1.5
 |=====================
 
 The profile also includes depth readings for the peaks and troughs in the
@@ -2036,6 +2065,7 @@ menu appears, adding options to allow deletion of the marker or to allow all
 markers of that type to be hidden. Hidden events can be restored to view by
 selecting Unhide all events from the context menu.
 
+[[S_InfoBox]]
 === The *Information Box*
 
 The Information box displays a large range of information pertaining to the
@@ -2369,10 +2399,8 @@ clicking the icon that minimised the panel. The filter may also be reset and
 closed by selecting the button with the flag.  An example of the _Filter
 Panel_ is shown in the figure below.
 
-
 image::images/Filterpanel.jpg["Figure: Filter panel", align="center"]
 
-
 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
@@ -2394,10 +2422,64 @@ both of these tags.
 [[S_ExportLog]]
 == Exporting the dive log or parts of the dive log
 
-The export function can be reached by selecting _File -> Export_, which
-brings up the Export dialog. This dialog always gives two options: save ALL
-dives, or save only the dives selected in *Dive List* panel of
-_Subsurface_. Click the appropriate radio button (see images below).
+There are two routes for the export of dive information from Subsurface:
+
+- Exporter les informations de plongée vers _Facebook_
+
+- xref:S_Export_other[Exporter des informations de plongée vers d'autres
+  destinations ou formats]
+
+[[S_facebook]]
+=== Export des informations de plongée vers _Facebook_
+
+L'export des plongées vers _Facebook_ est géré différemment des autres types
+d'export. Cela est du au fait que l'export vers _Facebook_ nécessite une
+connexion vers _Facebook_, nécessitant un identifiant et un mot de passe. À
+partir du menu principal, si vous sélectionnez _Fichier -> Préférences ->
+Facebook_, un écran de connexion est présenté (voir l'image *A* sur la
+gauche, ci dessous). Entrez vos identifiant et mot de passe _Facebook_. Une
+fois connecté à _Facebook_, le panneau de l'image *B* ci dessous est
+présenté. Ce panneau a un bouton qui doit être sélectionné pour fermer la
+connexion _Facebook_.
+
+image::images/facebook1_f20.jpg["Figure: Facebook login", align="center"]
+
+Having established a login to _Facebook_, transfer of a dive profile to
+one's _Facebook_ timeline is easy.  A _Facebook_ icon appears in the *Dive
+Notes* panel of _Subsurface_ (See image *A* below). Ensure that the dive
+that you want to transfer to the timeline is depicted in the _Subsurface_
+*Dive Profile* panel. Select the _Facebook_ icon, and a dialogue is shown,
+determining the amount of additional information transferred with the dive
+profile (see image *B*, below). In order to transfer a dive profile to
+_Facebook_, the name of a _Facebook_ album needs to be provided. The
+checkboxes on the lefthand side allow one to determine how much additional
+information should be transferred with the dive profile. This information is
+shown in the text box on the right hand side of the panel (see image *B*,
+below). You can easily edit the message that will be posted right there in
+the text box. Having specified the additional information and verified the
+text you want to post, select the _OK_ button which triggers the transfer to
+_Facebook_. After a while, an acknowledgement dialogue appears, indicating
+successful transfer to _Facebook_.
+
+Both the Album created and the post to your time line will be marked as
+private. In order for friends to be able to see the post you have to change
+its permissions from a regular Facebook login either in a browser or a
+Facebook app. While this is an extra step the developers felt that this was
+the better solution to avoid having unwanted posts in your public timeline.
+
+image::images/facebook2_f20.jpg["Figure: Facebook login", align="center"]
+
+If required, then close the _Facebook_ connection by either closing
+_Subsurface_ or by selecting _File -> Preferences -> Facebook_ from the Main
+Menu, and clicking the appropriate button on the Facebook Preferences panel.
+
+[[S_Export_other]]
+=== Export dive information  to other destinations or formats
+For non-_Facebook exports_, the export function can be reached by selecting
+_File -> Export_, which brings up the Export dialog. This dialog always
+gives two options: save ALL dives, or save only the dives selected in *Dive
+List* panel of _Subsurface_. Click the appropriate radio button (see images
+below).
 
 image::images/Export_f20.jpg["Figure: Export dialog", align="center"]
 
@@ -2575,6 +2657,42 @@ example of the output for one particular page.
 image::images/Printpreview.jpg["FIGURE: Print preview page", align="center"]
 
 
+[[S_Configure]]
+== Configurer un ordinateur de plongée
+
+_Subsurface_ 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
+<<_appendix_a_operating_system_specific_information_for_importing_dive_information_from_a_dive_computer,APPENDIX
+A>> pour plus d'informations sur la manière de procéder.
+
+Une fois que l'ordinateur de plongée est connecté à _Subsurface_,
+sélectionner _Fichier -> Configurer l'ordinateur de plongée_, à 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).
+
+image::images/Configure_dc_f20.jpg["FIGURE: Configure dive computer", align="center"]
+
+En utilisant les boutons appropriés du panneau de configuration, les actions
+suivantes peuvent être réalisées :
+
+ - *Récupérer les détails disponibles*. Cela charge la configuration existante à partir de l'ordinateur de plongée
+   dans _Subsurface_, en l'affichant dans le panneau de configuration.
+ - *Enregistrer les modifications sur le périphérique*. Cela change la configuration de l'ordinateur
+   de plongée pour correspondre aux informations affichées dans le panneau de configuration.
+ - *Sauvegarder*. Cela enregistre la configuration dans un fichier. _Subsurface_ demande
+   l'emplacement et le nom du fichier pour enregistrer les informations.
+ - *Restaurer une sauvegarde*. Cela charge les informations à partir d'un fichier de sauvegarde et l'affiche
+   dans le panneau de configuration.
+ - *Mettre à jour le firmware*. Si un nouveau firmware est disponible pour l'ordinateur de plongée,
+   il sera chargé dans l'ordinateur de plongée.
+
+
 [[S_Preferences]]
 == Setting user _Preferences_ for _Subsurface_
 
@@ -2590,7 +2708,7 @@ leave the settings panel by selecting *OK*.
 
 There are several settings in the *Defaults* panel:
 
-image::images/Pref1.jpg["FIGURE: Preferences defaults page", align="center"]
+image::images/Pref1_f20.jpg["FIGURE: Preferences defaults page", align="center"]
 
   ** *Lists and tables*: Here one can specify the font type and font size of the
      *Dive Table* panel. By decreasing the font size of the *Dive Table*, users can see more dives on a screen.
@@ -2625,7 +2743,7 @@ image::images/Pref1.jpg["FIGURE: Preferences defaults page", align="center"]
      cleared and set to default values.
 
 === Units
-image::images/Pref2.jpg["FIGURE: Preferences Units page", align="center"]
+image::images/Pref2_f20.jpg["FIGURE: Preferences Units page", align="center"]
 
 Here user can choose between metric and imperial units of depth, pressure,
 volume, temperature and mass. By selecting the Metric or Imperial radio
@@ -2689,10 +2807,13 @@ the dive profile:
 
  ** _Default CCR setpoint for dive planning:_ Specify the O~2~ setpoint for a
     CCR dive plan. This determines the pO~2~ that will be maintained
-    during a particular dive.
+    during a particular dive. This is the setpoint that is used at the start
+    of any CCR dive. Setpoint changes during the dive can be added via the
+    profile context menu.
 
  ** _pSCR O~2~ metabolism rate:_ For a semiclosed rebreather (pSCR) system, this is the
-    volume of oxygen used by a diver each minute. Set this value for pSCR dive planning.
+    volume of oxygen used by a diver each minute. Set this value for pSCR dive planning
+    and decompression calculations.
 
  ** _pSCR ratio:_ For pSCR equipment the dump ratio is the ratio of gas released to the
     environment to that of the gas recirculated to the diver. Set this value for a
@@ -2702,7 +2823,7 @@ the dive profile:
 === Language
 Choose a language that _Subsurface_ will use.
 
-image::images/Pref4.jpg["FIGURE: Preferences Language page", align="center"]
+image::images/Pref4_f20.jpg["FIGURE: Preferences Language page", align="center"]
 
 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
@@ -2717,7 +2838,7 @@ requires a restart of _Subsurface_ to take effect.
 This panel facilitates communication between _Subsurface_ and data sources
 on the Internet.
 
-image::images/Pref5.jpg["FIGURE: Preferences Network page", align="center"]
+image::images/Pref5_f20.jpg["FIGURE: Preferences Network page", align="center"]
 
 This is important, for instance, when _Subsurface_ needs to communicate with
 Internet services such as the <<S_Companion,_Subsurface Companion app_>> or
@@ -2732,6 +2853,18 @@ authentication, the appropriate userID and password also needs to be
 provided so that _Subsurface_ can automatically pass through the proxy
 server to access the Internet.
 
+=== Facebook Accesss
+This panel allows one to log into a Facebook account in order to transfer
+information from Subsurface to Facefook.
+
+image::images/Pref6_f20.jpg["FIGURE: Facebook login panel", align="center"]
+
+If one provides a valid Facebook userID and password, a connection to
+Facebook is created. The connection to Facebook is closed when one closes
+down Subsurface. At this point the checkbox labelled "Keep connection to
+Subsurface", on the login screen has no effect.  See the section
+xref:S_facebook[Exporting dive profiles to Facebook] for more information.
+
 [[S_DivePlanner]]
 == The _Subsurface_ dive planner
 Dive planning is an advanced feature of _Subsurface_, accessible by
@@ -2778,20 +2911,19 @@ Details_. 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.
 
-image::images/PlannerWindow1.jpg["FIGURE: Dive planner startup window", align="center"]
-
+image::images/PlannerWindow1_f20.jpg["FIGURE: Dive planner startup window", align="center"]
 
-=== Initiating dive planning
 
-The dive planner comprises two parts: *constructing a dive plan* and
-*evaluating* that dive plan. To perform dive planning, perform these steps:
+=== Open circuit dives as an example of dive planning
 
-- Clear the existing dive log by creating a new planning log. This is achieved
-  by selecting _File -> New logbook_ from the main menu. This way, dive plans
-  are kept separate from the existing dive log of completed dives.
+-  Towards the left bottom of the planner (circled in blue in the image below)
+   is a dropbox with three options. Select the appropriate one of these:
+ ** Open Circuit (the default)
+ ** CCR
+ ** pSCR
 
-- In the top left-hand area of the screen, ensure that the constant dive
-  parameters are appropriate. These are: Start date and time of the dive,
+- 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 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
   an atmospheric pressure of 1.013 bar.
@@ -2802,39 +2934,43 @@ The dive planner comprises two parts: *constructing a dive plan* and
   cylinder data for dive logs>>. Choose the cylinder type by double clicking
   the cylinder type and using the dropdown list, then specify the work
   pressure of this cylinder. By leaving the oxygen concentration (O2%) filed
-  empty, the dive gas is assumed to be 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.
+  empty, the cylinder is assumed to contain air. Otherwise enter the oxygen
+  and/or helium concentration in the boxes provided in this dialogue. Add
+  additional cylinders by using the "+" icon to the top righthand of the
+  dialogue.
 
 - The dialogue indicating _Dive Planner Points_ is usually not used at this
   stage of the dive planning.
 
-=== Managing nitrogen, oxygen and gas consumption
-
-The planning is performed in three stages:
+*The planning is performed 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_
 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 specifications in the _Preferences_. Gradient Factor settings strongly affect the calculated ceilings and their depths.
+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].
 For more information external to this manual see:
 
- *** link:http://www.tek-dive.com/portal/upload/M-Values.pdf[Understanding M-values by Erik Baker, _Immersed_ Vol. 3, No. 3.]
- *** link:http://www.rebreatherworld.com/general-and-new-to-rebreather-articles/5037-gradient-factors-for-dummies.html[Gradient 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.
-
- ** 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 on the dive profile in the green panel of the dive planner. 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 _Drop to first depth_
-is activated, then the descent phase of the planned dive will be at the maximal descent rate specified
-in the _Rates_ section of the dive setup.
+ * link:http://www.tek-dive.com/portal/upload/M-Values.pdf[Understanding
+   M-values by Erik Baker, _Immersed_ Vol. 3, No. 3.]
+ * link:http://www.rebreatherworld.com/general-and-new-to-rebreather-articles/5037-gradient-factors-for-dummies.html[Gradient
+   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.
+
+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
+_Drop to first depth_ is activated, then the descent phase of the planned
+dive will be at the maximal descent rate specified in the _Rates_ section of
+the dive setup.
 
 
 *b) Oxygen management*: In the *Gas Options* part of the dive specification, the maximum partial
@@ -2844,19 +2980,18 @@ 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
 _Available Gases_ dialog. Normally the planner decides on switching to a new gas when, during
-ascent, the partial pressure of the new gas has decreased to 1.6 bar.
+ascent, the partial pressure of the new gas has increased to 1.6 bar.
 
-
-*c) Gas management*: One needs keep within the limits of the amount of gas contained in the dive
-cylinder(s), allowing for an appropriate margin for safe return to the surface, possibly
+*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
+cylinder(s), allowing for an appropriate margin for a safe return to the surface, possibly
 sharing with a buddy. Under the _Gas Options_ 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 (_bottom SAC_) as well as during the decompression or safety stops of the
-dive (_deco SAC_). Values of 20-30 l/min are common. For good gas management, a thumbsuck guess
+dive (_deco SAC_). 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 will calculate the total volume of gas used during the dive and will issue a warning
+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.
@@ -2866,27 +3001,29 @@ dive. _Subsurface_ 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 _Subsurface_. Upon
 activating the planner, a default dive of depth 15 m for 40 min is offered
-in the green design surface to the top right hand of the screen. The white
+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.  If any of the management limits (for
-nitrogen, oxygen or gas) is exceeded, the surface above the dive profile
-changes from BLUE to RED.
+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.
 
 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_
 value in each row of that table corresponds to one of the gas mixtures
-specified in the table with _Available Gases_ immediately above the Dive
-Planner Points. Add new waypoints until the main features of the dive have
-been completed, e.g. the bottom time segment and deep stops (if these are
-implemented). Leave the remaining waypoints on the ascent to
-_Subsurface_. In most cases _Subsurface_ computes additional way points in
-order to fulfil decompression requirements for that dive. A waypoint can be
-moved by selecting that waypoint and by using the arrow keys.  The waypoints
-listed in the _Dive Planner Points_ dialogue can be edited by hand in order
-to obtain a precise presentation of the dive plan. In fact, one can create
-the whole dive profile by editing the _Dive Planner Points_ dialog.
+specified in the _Available Gases_ table.  Add new waypoints until the main
+features of the dive have been completed, e.g. the bottom time segment and
+deep stops (if these are implemented). Leave the remaining waypoints on the
+ascent to _Subsurface_. In most cases _Subsurface_ computes additional way
+points in order to fulfil decompression requirements for that dive. A
+waypoint can be moved by selecting that waypoint and by using the arrow
+keys.  The waypoints listed in the _Dive Planner Points_ dialogue can be
+edited by hand in order to obtain a precise presentation of the dive
+plan. In fact, one can create the whole dive profile by editing the _Dive
+Planner Points_ dialog.
 
 Indicate any changes in gas cylinder used by indicating gas changes as
 explained in the section <<S_CreateProfile,hand-creating a dive
@@ -2909,13 +3046,13 @@ considers gas changes in OC mode.
 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.
 
-image::images/DivePlanner2.jpg["FIGURE: Planning a dive: setup", align="center"]
+image::images/DivePlanner2_f20.jpg["FIGURE: Planning a dive: setup", align="center"]
 
 Once the above has been completed, one can save it by clicking the _Save_
-button towards the bottom left of the green design panel. The saved dive
-plan will appear in the *Dive List* panel of _Subsurface_.
+button towards the top middle of the planner. The saved dive plan will
+appear in the *Dive List* panel of _Subsurface_.
 
-=== The dive plan details
+*The dive plan details*
 
 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
@@ -2932,6 +3069,49 @@ INCLUDES the transition time to get to that level. However, if the _Display
 transition in deco_ option is checked, the transitions are shown separately
 from the segment durations at a particular level.
 
+=== Planning CCR dives
+
+To plan a dive using a closed circuit rebreather, select the _CCR_ option in
+the dropdown list, circled in blue in the image below.
+
+*Available gases*: In the _Available gases_ 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 _CCR_ dropdown selection is made.
+
+*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
+use the default setpoint value. Then, different setpoints can be specified for dive segments
+in the _Dive planner points_ 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.
+
+The dive profile for a CCR dive may look something like the image below.
+
+image::images/Planner_CCR1_f20.jpg["FIGURE: Planning a CCR dive: setup", align="center"]
+
+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.
+
+=== Planning pSCR dives
+
+To plan a dive using a passive semi-closed rebreather (pSCR), select _pSCR_ rather than
+_Open circuit_ in the dropdown list.
+The parameters of the pSCR diver can be set by selecting  _File ->   Preferences ->   Graph_
+from the main menu, where the gas consumption calculation takes into account the pSCR dump
+ratio (default 10:1) as well as the metabolism rate. The calculation also takes the oxygen drop
+accross the mouthpiece of the rebreather into account. If the
+pO~2~ drops below what is considered a save value, a warning apears in the _Dive plan
+details_. A typical pSCR configuration is with a single cylinder and one or more bail-out
+cylinders. Therefore the setup of the _Available gases_ and the _Dive planner points_ tables
+are very similar to that of a CCR dive plan, described above. However, no oxygen setpoints
+are specified for pSCR dives. Below is a dive plan for a pSCR dive. The dive is comparable
+to that of the CCR dive above, but note the longer ascent duration due to the lower oxygen
+in the loop due to the oxygen drop accross the mouthpiece of the pSCR equipment.
+
+image::images/Planner_pSCR1_f20.jpg["FIGURE: Planning a pSCR dive: setup", align="center"]
+
+
 [[S_Replan]]
 === Modifying an existing dive plan
 
@@ -2985,41 +3165,6 @@ process. The only way to print the dive plan is to use the _File -> Print_
 facility on the main menu in the same way as for dive logs or by copy and
 paste to a word processor.
 
-[[S_Configure]]
-== Configurer un ordinateur de plongée
-
-_Subsurface_ 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
-<<_appendix_a_operating_system_specific_information_for_importing_dive_information_from_a_dive_computer,APPENDIX
-A>> pour plus d'informations sur la manière de procéder.
-
-Une fois que l'ordinateur de plongée est connecté à _Subsurface_,
-sélectionner _Fichier -> Configurer l'ordinateur de plongée_, à 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).
-
-image::images/Configure_dc_f20.jpg["FIGURE: Configure dive computer", align="center"]
-
-En utilisant les boutons appropriés du panneau de configuration, les actions
-suivantes peuvent être réalisées :
-
- - *Récupérer les détails disponibles*. Cela charge la configuration existante à partir de l'ordinateur de plongée
-   dans _Subsurface_, en l'affichant dans le panneau de configuration.
- - *Enregistrer les modifications sur le périphérique*. Cela change la configuration de l'ordinateur
-   de plongée pour correspondre aux informations affichées dans le panneau de configuration.
- - *Sauvegarder*. Cela enregistre la configuration dans un fichier. _Subsurface_ demande
-   l'emplacement et le nom du fichier pour enregistrer les informations.
- - *Restaurer une sauvegarde*. Cela charge les informations à partir d'un fichier de sauvegarde et l'affiche
-   dans le panneau de configuration.
- - *Mettre à jour le firmware*. Si un nouveau firmware est disponible pour l'ordinateur de plongée,
-   il sera chargé dans l'ordinateur de plongée.
-
 == Description des éléments du menu principal de Subsurface
 
 Cette section décrit les fonctions et les opérations des éléments du menu
@@ -3290,11 +3435,12 @@ manually by running:
 For downloading dives in _Subsurface_ specify the device name connected to
 the MAC address in the last step above, e.g. _/dev/rfcomm0_.
 
+[[_appendix_b_dive_computer_specific_information_for_importing_dive_information]]
 
-== APPENDIX B: Dive Computer specific information for importing dive information.
+== APPENDIX B: Dive Computer specific information for importing dive data.
 
 [[S_ImportUemis]]
-=== Import from a Uemis Zurich
+=== Importing from Uemis Zurich
 
 [icon="images/icons/iumis.jpg"]
 [NOTE]
@@ -3325,7 +3471,7 @@ 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.
 
 [[S_ImportingGalileo]]
-=== Importing dives from the Uwatec Galileo
+=== Importing from Uwatec Galileo
 
 [icon="images/icons/Galileo.jpg"]
 [NOTE]
@@ -3352,7 +3498,7 @@ For the Apple Mac, IrDA communication via the MCS7780 link is not available
 for OSX 10.6 or higher.
 
 [[S_ImportingDR5]]
-=== Importing dives from Heinrichs Weikamp DR5
+=== Importing from Heinrichs Weikamp DR5
 
 [icon="images/icons/HW_DR5.jpg"]
 [NOTE]
@@ -3367,7 +3513,7 @@ the DR5.
 
 
 [[S_ImportingXDeep]]
-=== Importing dives from xDEEP BLACK
+=== Importing from xDEEP BLACK
 
 [icon="images/icons/HW_xdeepblack.jpg"]
 [NOTE]
@@ -3382,7 +3528,7 @@ by _Subsurface_ will most likely differ from the one displayed on the xDEEP
 BLACK.
 
 
-=== Import from Shearwater Predator using Bluetooth
+=== Importing from Shearwater Predator using Bluetooth
 
 [icon="images/icons/predator.jpg"]
 [NOTE]
@@ -3399,7 +3545,7 @@ sometimes by one of these steps:
  * switch off WiFi while using Bluetooth
 
 [[S_PoseidonMkVI]]
-=== Importing dive logs from the Poseidon MkVI Discovery
+=== Importing from Poseidon MkVI Discovery
 
 [icon="images/MkVI.jpeg"]
 [NOTE]
@@ -3421,7 +3567,7 @@ _Subsurface_ accesses the .txt and the .csv files to obtain dive log
 information.
 
 
-=== Importing dive logs from the APD Inspiration CCR
+=== Importing from APD Inspiration CCR
 
 [icon="images/APDComputer.jpg"]
 [NOTE]
@@ -3470,7 +3616,7 @@ data from foreign dive log software. The procedures below mostly apply to
 Linux and/or Windows.
 
 [[S_ImportingDivesSuunto]]
-=== Exporting dives from *Suunto Divemanager (DM3, DM4 or DM5)*
+=== Exporting from *Suunto Divemanager (DM3, DM4 or DM5)*
 [icon="images/icons/suuntologo.jpg"]
 [NOTE]
 DiveManager is a MS Windows application for Suunto dive computers.
@@ -3559,7 +3705,7 @@ format which can be imported into _Subsurface_.
 4. The password for accessing the .zip file is _mares_.
 
 [[S_ImportingDivingLog]]
-=== Exporting dives from *DivingLog 5.0*
+=== Exporting from *DivingLog 5.0*
 
 [icon="images/icons/divingloglogo.jpg"]
 [NOTE]
@@ -3579,8 +3725,7 @@ clicking the 'Metric' button). Then do the following:
 
 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
-imported into _Subsurface_ (xref:S_ImportingManualCSV[Importing dives
-from_manually kept CSV file]), after the spreadsheet is converted in a .CSV
+imported into _Subsurface_ after the spreadsheet is converted in a .CSV
 file.  This section explains the procedure to convert a diving logbook
 stored in a spreadsheet to a .CSV file that will later be imported from
 _Subsurface_.  Creating a .CSV is a straightforward task, although the
@@ -3626,7 +3771,7 @@ image::images/LOffice_field_options.jpg["FIGURE: Field options", align="center"]
 
 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:S_ImportingManualCSV[Importing dives from manually kept CSV files].
+xref:S_ImportingCSVDives[Importing CSV dives].
 
 === Microsoft _Excel_
 
@@ -3669,7 +3814,7 @@ image::images/Win_SaveCSV3.jpg["FIGURE: Excel save CSV dialogue", align="center"
 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
 text editor, and then import the dive data as explained on the section
-xref:S_ImportingManualCSV[Importing dives from manually kept CSV files].
+xref:S_ImportingCSVDives[Importing CSV dives].
 
 == APPENDIX E: FAQs.
 
-- 
1.8.4.5



More information about the subsurface mailing list