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

Guillaume GARDET guillaume.gardet at free.fr
Thu Jul 21 02:09:07 PDT 2016


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

---
 Documentation/50-pot/subsurface-mobile-manual.pot  |  453 +--
 Documentation/50-pot/subsurface-user-manual.pot    | 2517 +++++++++--------
 Documentation/fr/po/subsurface-mobile-manual.fr.po |  472 ++--
 Documentation/fr/po/subsurface-user-manual.fr.po   | 2895 ++++++++++----------
 Documentation/mobile-manual_fr.html.git            |  273 +-
 Documentation/mobile-manual_fr.txt                 |  218 +-
 Documentation/user-manual_fr.html.git              |  561 ++--
 Documentation/user-manual_fr.txt                   |  513 ++--
 8 files changed, 4380 insertions(+), 3522 deletions(-)

diff --git a/Documentation/50-pot/subsurface-mobile-manual.pot b/Documentation/50-pot/subsurface-mobile-manual.pot
index 45a130b..38af456 100644
--- a/Documentation/50-pot/subsurface-mobile-manual.pot
+++ b/Documentation/50-pot/subsurface-mobile-manual.pot
@@ -8,45 +8,45 @@ msgid ""
 msgstr ""
 "Project-Id-Version: subsurface-manual VERSION\n"
 "Report-Msgid-Bugs-To: subsurface at subsurface-divelog.org\n"
-"POT-Creation-Date: 2016-03-12 13:31+0100\n"
+"POT-Creation-Date: 2016-07-21 10:32+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #.  :website: http://subsurface-divelog.org
 #. type: Target for macro image
-#: mobile-manual.txt:14
+#: mobile-manual.txt:12
 #, no-wrap
 msgid "mobile-images/banner.jpg"
 msgstr ""
 
 #. type: Plain text
-#: mobile-manual.txt:17
+#: mobile-manual.txt:15
 msgid "[big]#Subsurface-mobile for Android: USER MANUAL#"
 msgstr ""
 
 #. type: Plain text
-#: mobile-manual.txt:19
+#: mobile-manual.txt:17
 #, no-wrap
 msgid "*Manual author*: Willem Ferguson\n"
 msgstr ""
 
 #. type: Plain text
-#: mobile-manual.txt:21
+#: mobile-manual.txt:19
 msgid "toc::[]"
 msgstr ""
 
 #. type: Plain text
-#: mobile-manual.txt:23
+#: mobile-manual.txt:21
 msgid "[blue]#_Version 1.0, March 2016_#"
 msgstr ""
 
 #. type: Plain text
-#: mobile-manual.txt:31
+#: mobile-manual.txt:29
 msgid ""
 "Welcome as a user of _Subsurface_, advanced dive logging software with "
 "extensive infrastructure to describe, organize, interpret and print scuba "
@@ -58,13 +58,13 @@ msgid ""
 msgstr ""
 
 #. type: Title -
-#: mobile-manual.txt:33
+#: mobile-manual.txt:31
 #, no-wrap
 msgid "Introducing Subsurface-mobile"
 msgstr ""
 
 #. type: Plain text
-#: mobile-manual.txt:40
+#: mobile-manual.txt:38
 msgid ""
 "_Subsurface-mobile_ is an extension of _Subsurface_ on laptop and tabletop "
 "computers. It runs on Android smartphone and tablet devices and is a tool "
@@ -74,146 +74,163 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: mobile-manual.txt:43
+#: mobile-manual.txt:41
 msgid ""
-"A version of _Subsurface-mobile_ for iOS is under development but not yet "
-"ready for testing."
+"Because of the restrictions of iOS, _Subsurface-mobile_ for iOS does not "
+"have all the features of the same app for Android."
 msgstr ""
 
 #. type: Plain text
-#: mobile-manual.txt:53
+#: mobile-manual.txt:51
 msgid ""
 "While _Subsurface-mobile_ allows one to enter and save dive information "
 "using an Android device, users of _Subsurface-mobile_ typically use the "
-"mobile app as an extension of the laptop/desktop version of _Subsurface_.  "
-"This allows the storage of dive logs on the Internet and which can be shared "
-"by the Android version as well as the desktop version.  While the desktop "
-"version of _Subsurface_ shows much more detailed information for each dive, "
-"the mobile version allows one to have a more accessible dive log on a dive "
-"trip, useful for proving dive experience to dive shops or to review previous "
-"dives."
+"mobile app as an extension to the laptop/desktop version of _Subsurface_.  "
+"This allows the storage of dive logs on the Internet sharing them between "
+"the Android and the desktop versions.  While the desktop version of "
+"_Subsurface_ shows much more detailed information for each dive, the mobile "
+"version allows a more accessible dive log on a dive trip, useful for proving "
+"dive experience to dive shops or to review previous dives."
 msgstr ""
 
 #. type: Plain text
-#: mobile-manual.txt:55
+#: mobile-manual.txt:53
 msgid "_Subsurface-mobile_ allows one to:"
 msgstr ""
 
 #. type: Plain text
-#: mobile-manual.txt:57
+#: mobile-manual.txt:55
 msgid "Download existing dive log information from the Internet."
 msgstr ""
 
 #. type: Plain text
-#: mobile-manual.txt:58
-msgid "View this information on an Android device."
+#: mobile-manual.txt:56
+msgid "View this information on a mobile device."
 msgstr ""
 
 #. type: Plain text
-#: mobile-manual.txt:60
+#: mobile-manual.txt:58
 msgid ""
 "Edit many of the dive log data fields, e.g. divemaster, buddy, equipment or "
 "notes about a dive."
 msgstr ""
 
 #. type: Plain text
-#: mobile-manual.txt:61
-msgid "Create and add new dive records to one's dive log."
+#: mobile-manual.txt:59
+msgid "Manually create and add new dive records to one's dive log."
 msgstr ""
 
 #. type: Plain text
-#: mobile-manual.txt:62
+#: mobile-manual.txt:60
 msgid "Store the updated dive log on the Internet."
 msgstr ""
 
 #. type: Plain text
-#: mobile-manual.txt:63
+#: mobile-manual.txt:61
 msgid "Record, store and apply GPS positions of dives."
 msgstr ""
 
 #. type: Plain text
-#: mobile-manual.txt:65
+#: mobile-manual.txt:63
 msgid "View the localities of recorded GPS positions and of dives on a map."
 msgstr ""
 
 #. type: Plain text
-#: mobile-manual.txt:72
+#: mobile-manual.txt:70
 msgid ""
 "These items are discussed in greater detail in the following text.  What "
 "_Subsurface-mobile_ does not support (at this time) is downloading dive data "
-"directly from a dive computer. That still has to happen with _Subsurface_ on "
-"a desktop or laptop computer. We are investigating ways to support "
-"downloading from a subset of the supported dive computers on Android "
+"directly from a dive computer. That still needs to be done using "
+"_Subsurface_ on a desktop or laptop computer. We are investigating ways to "
+"support downloading from a subset of the supported dive computers on Android "
 "devices, but this is not yet ready for testing."
 msgstr ""
 
 #. type: Title ==
-#: mobile-manual.txt:73
+#: mobile-manual.txt:71
 #, no-wrap
 msgid "Installing _Subsurface-mobile_ on an Android device"
 msgstr ""
 
 #. type: Plain text
-#: mobile-manual.txt:77
+#: mobile-manual.txt:75
 msgid ""
 "Find _Subsurface-mobile_ in the _Google Play Store_. Search for "
 "_Subsurface-mobile_ and install it."
 msgstr ""
 
 #. type: Title ==
-#: mobile-manual.txt:78
+#: mobile-manual.txt:76
 #, no-wrap
 msgid "Using _Subsurface-mobile_ for the first time"
 msgstr ""
 
 #. type: Plain text
-#: mobile-manual.txt:84
+#: mobile-manual.txt:82
 msgid ""
 "Upon starting _Subsurface-mobile_ for the first time, a Subsurface splash "
 "screen is shown while the program loads. On some devices this may take "
 "several seconds. After loading, the _Cloud Credentials screen_ appears (see "
-"image below)."
+"image below on left)."
 msgstr ""
 
-#. type: Target for macro image
+#. type: Plain text
+#: mobile-manual.txt:84
+msgid ""
+"Select whether _Subsurface-mobile_ should access the Internet for dive log "
+"information."
+msgstr ""
+
+#. type: Title ===
 #: mobile-manual.txt:85
 #, no-wrap
-msgid "mobile-images/landingscreen.jpg"
+msgid "When NOT Using Internet access"
 msgstr ""
 
 #. type: Plain text
-#: mobile-manual.txt:93
-#, no-wrap
+#: mobile-manual.txt:89
 msgid ""
-"Since _Subsurface_ is largely dependent on a dive log saved on the "
-"Internet,\n"
-"provide a user-ID and password for access to the _Subsurface Cloud_. These\n"
-"credentials are obtained by opening the desktop version of _Subsurface_ "
-"and\n"
-"by clicking _File   ->  Preferences  -> Network_, explained in detail in "
-"the\n"
-"user manual for the _Subsurface_ desktop version. Once the account has\n"
-"been created and verified using the desktop version one can use "
-"_Subsurface-mobile_.\n"
+"If the striked-out cloud icon is selected, the app will not access the "
+"Internet to obtain dive log information. This means that dive log "
+"information is manually entered and stored on the mobile device only."
+msgstr ""
+
+#. type: Title ===
+#: mobile-manual.txt:90
+#, no-wrap
+msgid "Using Internet access"
 msgstr ""
 
 #. type: Plain text
-#: mobile-manual.txt:102
+#: mobile-manual.txt:93
 msgid ""
-"When entering a password, it is possible to check a checkbox that enables "
-"the text of the password to be shown. Checking the check box labelled "
-"\"Remember\" allows _Susburface-mobile_ to keep the credentials for "
-"subsequent logins (see image above).  Having entered the credentials, tap "
-"the disk icon at the bottom of the screen.  _Subsurface-mobile_ attempts to "
-"download the existing dive log from the_Subsurface_ cloud "
-"server. Appropriate messages are shown onscreen. Finally a list of dives are "
-"shown."
+"Since _Subsurface_ is largely dependent on a dive log saved on the Internet, "
+"provide a PIN for access to the _Subsurface Cloud_, obtained in one of two "
+"ways:"
 msgstr ""
 
-#. type: Title ==
-#: mobile-manual.txt:104
+#. type: Title ====
+#: mobile-manual.txt:94
 #, no-wrap
-msgid "Local copy of the dive log and synchronisation with Internet"
+msgid "Using the desktop version of _Subsurface_:"
+msgstr ""
+
+#. type: Plain text
+#: mobile-manual.txt:105
+#, no-wrap
+msgid ""
+"Open the desktop version of _Subsurface_ and\n"
+"click _File   ->  Preferences  -> Network_, explained in detail in the\n"
+"https://subsurface-divelog.org/documentation/subsurface-4-user-manual/#\\_create_a_cloud_storage_account[user\n"
+"manual for the _Subsurface_ desktop version]. Once the account has\n"
+"been created and verified using the desktop version,\n"
+"_Subsurface_ desktop alows one to download dive information from dive "
+"computers and store this\n"
+"on the cloud which can, in turn, be downloaded to "
+"_Subsurface-mobile_. _Subsurface-mobile_\n"
+"attempts to download the existing dive log from the _Subsurface_ cloud\n"
+"server. Appropriate messages are shown onscreen. Finally a list of dives is "
+"shown.\n"
 msgstr ""
 
 #. type: Plain text
@@ -223,37 +240,103 @@ msgid ""
 "_Subsurface-mobile_ keeps a local copy on the mobile device. This means "
 "that, if there is no Internet connection at a dive site, one can still "
 "access the local copy and view and manipulate dive information. If there is "
-"Internet connectivity, _Subsurface-mobile_ accesses the Internet-based dive "
-"log to verify that the local copy is still the same as the Internet-stored "
+"Internet connectivity, _Subsurface-mobile_ accesses the cloud-based dive log "
+"to verify that the local copy is still the same as the Internet-stored "
 "copy. If not, the local copy and the copy on the server are synchronised."
 msgstr ""
 
+#. type: Target for macro image
+#: mobile-manual.txt:116
+#, no-wrap
+msgid "mobile-images/Credentials.jpg"
+msgstr ""
+
+#. type: Title ====
+#: mobile-manual.txt:119
+#, no-wrap
+msgid "Using _Subsurface-mobile_:"
+msgstr ""
+
+#. type: Plain text
+#: mobile-manual.txt:127
+msgid ""
+"Enter an e-mail address and a password in the fields indicated on the "
+"screen.  The e-mail should be in lower case and the password should contain "
+"a combination of letters from the alphabet (upper and lower case) and/or "
+"numbers. When entering a password, it is possible to check a checkbox that "
+"enables the text of the password to be shown (image on left, above). At this "
+"stage, the red message \"Cannot connect to cloud storage\" appears on the "
+"screen.  This is normal because a valid PIN has not yet been provided (image "
+"on left, above)."
+msgstr ""
+
+#. type: Plain text
+#: mobile-manual.txt:130
+msgid ""
+"Tap the Disk (Save) icon at the bottom of the screen. A PIN is sent to the "
+"e-mail address provided."
+msgstr ""
+
+#. type: Plain text
+#: mobile-manual.txt:133
+msgid ""
+"Enter the PIN into the field indicated and tap the _Save_ icon again. The "
+"user information is stored on the cloud server and access to the cloud is "
+"enabled."
+msgstr ""
+
+#. type: Plain text
+#: mobile-manual.txt:136
+msgid ""
+"The dive list is initially empty. One can now start entering dives in the "
+"dive log or one can download existing dives from the cloud."
+msgstr ""
+
+#. type: Plain text
+#: mobile-manual.txt:142
+msgid ""
+"The text box to enter the PIN is shown whenever the e-mail address field is "
+"empty.  One can create a new cloud account by clearing the e-mail address "
+"and typing a new e-mail address, upon which a new PIN is sent to the "
+"newly-provided e-mail address.  On the other hand, one can change to a "
+"different existing cloud account by providing an e-mail address and password "
+"already registered with the cloud server (image on right, above)"
+msgstr ""
+
+#. type: Plain text
+#: mobile-manual.txt:145
+msgid ""
+"Once Internet access has been enabled, one can temporarily disable this "
+"service when using _Subsurface-mobile_ in areas with no Internet access, "
+"e.g. remote dive sites (see below)"
+msgstr ""
+
 #. type: Title ==
-#: mobile-manual.txt:115
+#: mobile-manual.txt:146
 #, no-wrap
 msgid "A Few Remarks About The User Interface"
 msgstr ""
 
 #. type: Plain text
-#: mobile-manual.txt:124
+#: mobile-manual.txt:155
 msgid ""
 "At the bottom of many Subsurface-mobile screens is a round button that "
 "provides for several actions and which allows the selection of the main "
 "affirmative action (see image above and image below).  On Android devices, "
 "use the Android Back button for \"cancel\", \"discard\" or \"back\" "
 "actions. For example, when editing dive information, tapping the action "
-"button saves the changes, the Android back button can be used to cancel the "
-"edit without saving changes."
+"button saves the changes while the Android back button can be used to cancel "
+"the edit without saving changes."
 msgstr ""
 
 #. type: Target for macro image
-#: mobile-manual.txt:125
+#: mobile-manual.txt:156
 #, no-wrap
 msgid "mobile-images/actionbutton.jpg"
 msgstr ""
 
 #. type: Plain text
-#: mobile-manual.txt:132
+#: mobile-manual.txt:163
 msgid ""
 "Instead of the more traditional \"hamburger\" menu button in the top left or "
 "right corner of the screen to open menus, _Subsurface-mobile_ uses a "
@@ -263,32 +346,30 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: mobile-manual.txt:135
+#: mobile-manual.txt:166
 msgid ""
-"Tap on the right-arrow symbol in the lower left corner of the screen (easy "
-"to reach for hand held devices)"
+"Tap the \"hamburger\" symbol in the lower left corner of the screen (easy to "
+"reach for hand held devices)"
 msgstr ""
 
 #. type: Plain text
-#: mobile-manual.txt:136
+#: mobile-manual.txt:167
 msgid "Swipe towards the right across the left edge of the screen"
 msgstr ""
 
 #. type: Plain text
-#: mobile-manual.txt:138
-msgid ""
-"Drag the action button visible on most screens with the main action to the "
-"right"
+#: mobile-manual.txt:169
+msgid "Drag the action button visible on most screens to the right"
 msgstr ""
 
 #. type: Target for macro image
-#: mobile-manual.txt:139
+#: mobile-manual.txt:170
 #, no-wrap
 msgid "mobile-images/menu.jpg"
 msgstr ""
 
 #. type: Plain text
-#: mobile-manual.txt:145
+#: mobile-manual.txt:176
 msgid ""
 "The images above indicate some of the important features of the menu "
 "system.  On the left is the main menu that is activated as described "
@@ -297,36 +378,14 @@ msgid ""
 "Dives_ option on the main menu."
 msgstr ""
 
-#. type: Plain text
-#: mobile-manual.txt:148
-msgid ""
-"Similarly, the context menu (currently only available on the dive details "
-"screen) can be opened one of these three ways:"
-msgstr ""
-
-#. type: Plain text
-#: mobile-manual.txt:150
-msgid "Tap on the left-arrow symbol in the lower right corner of the screen"
-msgstr ""
-
-#. type: Plain text
-#: mobile-manual.txt:151
-msgid "Swipe to the left across the right edge of the screen"
-msgstr ""
-
-#. type: Plain text
-#: mobile-manual.txt:152
-msgid "Drag the action button to the left"
-msgstr ""
-
 #. type: Title ==
-#: mobile-manual.txt:153
+#: mobile-manual.txt:177
 #, no-wrap
 msgid "Viewing the Dive List"
 msgstr ""
 
 #. type: Plain text
-#: mobile-manual.txt:161
+#: mobile-manual.txt:185
 msgid ""
 "Most of the actions of _Subsurface-mobile_ center around the dives on the "
 "dive list. While the dive list is loading from the cloud, a message appears "
@@ -338,26 +397,29 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: mobile-manual.txt:162
+#: mobile-manual.txt:186
 #, no-wrap
-msgid "mobile-images/divelist.jpg"
+msgid "mobile-images/DiveList.jpg"
 msgstr ""
 
 #. type: Plain text
-#: mobile-manual.txt:166
+#: mobile-manual.txt:193
 msgid ""
 "One can view other dives by swiping the _Details view_ to the right (for the "
-"previous dive) or to the left (following dive)."
+"previous dive) or to the left (following dive).  Using the Action Bar, it is "
+"also possible to delete the dive (tap the dustbin on the Action Bar) or to "
+"view the dive location on a map viewer (normally Google Maps; tap the GPS "
+"icon on the Action Bar.)."
 msgstr ""
 
 #. type: Title ==
-#: mobile-manual.txt:167
+#: mobile-manual.txt:194
 #, no-wrap
-msgid "Editing dive details."
+msgid "Editing dive details"
 msgstr ""
 
 #. type: Plain text
-#: mobile-manual.txt:177
+#: mobile-manual.txt:204
 msgid ""
 "At the bottom of the dive details screen the _Action Button_ contains a "
 "pencil (image on right, above).  Tapping the button brings up a panel with "
@@ -371,24 +433,24 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: mobile-manual.txt:178
+#: mobile-manual.txt:205
 #, no-wrap
-msgid "mobile-images/editdive.jpg"
+msgid "mobile-images/EditDive.jpg"
 msgstr ""
 
 #. type: Title ==
-#: mobile-manual.txt:180
+#: mobile-manual.txt:207
 #, no-wrap
 msgid "Adding a new dive to the dive list"
 msgstr ""
 
 #. type: Plain text
-#: mobile-manual.txt:191
+#: mobile-manual.txt:218
 msgid ""
-"It is also possible to add an additional dive to the existing dive list. On "
-"the main menu tap _Manage dives -> Add dive manually_. This opens a screen "
-"that is identical to the editing screen discussed above. When a dive is "
-"added manually, one cannot directly add a dive profile from a dive "
+"It is also possible to manually add an additional dive to the existing dive "
+"list. On the main menu tap _Manage dives -> Add dive manually_. This opens a "
+"screen that is identical to the editing screen discussed above. When a dive "
+"is added manually, one cannot directly add a dive profile from a dive "
 "computer. However, if one does not use a dive computer, the duration, depth "
 "and several other bits of information about the new dive can be entered. The "
 "_Action button_ at the bottom of the screen contains a disk symbol. Tap this "
@@ -398,99 +460,132 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: mobile-manual.txt:192
+#: mobile-manual.txt:219
 #, no-wrap
-msgid "mobile-images/createdive.jpg"
+msgid "mobile-images/ManuallyEnterDive.jpg"
 msgstr ""
 
 #. type: Title ==
-#: mobile-manual.txt:194
+#: mobile-manual.txt:221
 #, no-wrap
 msgid "Deleting a dive"
 msgstr ""
 
 #. type: Plain text
-#: mobile-manual.txt:201
+#: mobile-manual.txt:227
+msgid ""
+"The _Details View_ of a dive has an Action Bar, including a dustbin. If this "
+"is tapped, the dive shown in the _Details View_ is deleted. One has a brief "
+"opportunity to undo the delete by tapping the grey _Undo_ button in the "
+"message that appears at the bottom of the screen (see image below)."
+msgstr ""
+
+#. type: Target for macro image
+#: mobile-manual.txt:228
+#, no-wrap
+msgid "mobile-images/Delete_undo.jpg"
+msgstr ""
+
+#. type: Plain text
+#: mobile-manual.txt:235
 msgid ""
-"The _details view_ of a dive has a context menu on the right-hand side that "
-"can be activated as described above (e.g. by tapping the arrow icon at the "
-"bottom right of the screen or by dragging the _Action Button_ to the left).  "
-"The context menu has a single item: \"Delete dive\". If this option is "
-"tapped, the dive shown in the _Details View_ is deleted. One has a brief "
-"opportunity to undo the delete by tapping the _undo_ message that appears at "
-"the bottom of the screen. If the _undo_ message is not tapped, the dive is "
-"deleted."
+"One can also delete a dive from the dive list by long-pressing a specific "
+"dive until a red dustbin appears on the right-hand side (see image "
+"below). Tap the dustbin. The dive is deleted without asking any confirmation "
+"because _Subsurface-mobile_ assumes that the combination of a long tap on "
+"the dive with another tap on the red dustbin is an unambiguous instruction "
+"to delete the dive."
+msgstr ""
+
+#. type: Target for macro image
+#: mobile-manual.txt:236
+#, no-wrap
+msgid "mobile-images/RedDustbin.jpg"
 msgstr ""
 
 #. type: Title ==
-#: mobile-manual.txt:202
+#: mobile-manual.txt:238
 #, no-wrap
 msgid "Dive log management"
 msgstr ""
 
 #. type: Plain text
-#: mobile-manual.txt:212
-#, no-wrap
+#: mobile-manual.txt:248
 msgid ""
-"A central  part of _Subsurface-mobile_ is the ability to store the dive\n"
-"log using the _Subsurface_ cloud storage.\n"
-"This provides security against loss or damage to the dive information "
-"caintained in a local copy of\n"
-"the dive log and allows the desktop version of _Subsurface_ to\n"
-"access changes made using the mobile device. This ability is accessed\n"
-"throug the main menu (by dragging the Action Button to the right, or\n"
-"alternatively tap the right angle button at the bottom left of the "
-"screen).\n"
-" Tap the option _Manage dives_, enabling a number of options:\n"
+"A central part of _Subsurface-mobile_ is the ability to store the dive log "
+"using the _Subsurface_ cloud storage.  This provides security against loss "
+"or damage to the dive information contained in a local copy of the dive log "
+"and allows the desktop version of _Subsurface_ to access changes made using "
+"the mobile device. This ability is accessed through the main menu (by "
+"dragging the Action Button to the right, or alternatively tap the "
+"\"Hamburger\" icon at the bottom left of the screen).  Tap the option "
+"_Manage dives_, enabling a number of options:"
 msgstr ""
 
 #. type: Title ===
-#: mobile-manual.txt:213
+#: mobile-manual.txt:249
 #, no-wrap
 msgid "Add new dive manually"
 msgstr ""
 
 #. type: Plain text
-#: mobile-manual.txt:216
+#: mobile-manual.txt:252
 msgid "This is described above under the section dealing with the dive list."
 msgstr ""
 
 #. type: Title ===
-#: mobile-manual.txt:217
+#: mobile-manual.txt:253
 #, no-wrap
 msgid "Upload dive log to the _Subsurface_ cloud storage"
 msgstr ""
 
 #. type: Plain text
-#: mobile-manual.txt:223
+#: mobile-manual.txt:259
 msgid ""
 "One can upload the dives contained on the mobile device to the _Subsurface_ "
-"cloud storage by tapping the option _Upload to cloud_.  This synchronizes "
-"the local changes to the dive log with the cloud storage."
+"cloud storage by tapping the option _Manual sync with coud_.  This "
+"synchronizes the local changes to the dive log with the cloud storage."
 msgstr ""
 
 #. type: Title ===
-#: mobile-manual.txt:224
+#: mobile-manual.txt:260
 #, no-wrap
 msgid "Download dive log from the cloud storage"
 msgstr ""
 
 #. type: Plain text
-#: mobile-manual.txt:229
+#: mobile-manual.txt:265
 msgid ""
-"In the dive management subpanel, tap the option _Refresh_, causing the local "
-"divelog to be refreshed from the cloud so that the cloud and local versions "
-"are synchronised."
+"In the dive management subpanel, tap the option _Manual sync with cloud_, "
+"causing the local divelog to be refreshed from the cloud so that the cloud "
+"and local versions are synchronised."
 msgstr ""
 
 #. type: Title ===
-#: mobile-manual.txt:230
+#: mobile-manual.txt:266
+#, no-wrap
+msgid "Working offline"
+msgstr ""
+
+#. type: Plain text
+#: mobile-manual.txt:273
+msgid ""
+"Sometimes one wishes to use the app when an Internet connection is not "
+"available, for instance at remote dive sites. In such a case "
+"_Subsurface-mobile_ may unnecesarily search for an Internet connection, "
+"causing long delays in executing some functions. In the dive management "
+"menu, one can turn the Internet access on or off by tapping the _Offline "
+"mode_ or _Enable auto cloud sync_ options."
+msgstr ""
+
+#. type: Title ===
+#: mobile-manual.txt:274
 #, no-wrap
 msgid "Changing the login credentials on the _Subsurface_ cloud"
 msgstr ""
 
 #. type: Plain text
-#: mobile-manual.txt:236
+#: mobile-manual.txt:280
 msgid ""
 "It may be necessary to change one's login credentials, for instance if one's "
 "email address (initially used as a credential) has changed. To change the "
@@ -499,13 +594,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ==
-#: mobile-manual.txt:238
+#: mobile-manual.txt:282
 #, no-wrap
 msgid "Recording dive locations using GPS."
 msgstr ""
 
 #. type: Plain text
-#: mobile-manual.txt:244
+#: mobile-manual.txt:288
 msgid ""
 "The fact that most smartphones have GPS facilities allows one to record the "
 "locations of dives. One can take the smartphone on the dive boat during a "
@@ -515,13 +610,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: mobile-manual.txt:245
+#: mobile-manual.txt:289
 #, no-wrap
 msgid "Setting up the GPS"
 msgstr ""
 
 #. type: Plain text
-#: mobile-manual.txt:253
+#: mobile-manual.txt:297
 msgid ""
 "Open the main menu and tap _GPS -> Preferences_. Now specify the way in "
 "which GPS data need to be automatically collected (image on right, "
@@ -533,19 +628,19 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: mobile-manual.txt:254
+#: mobile-manual.txt:298
 #, no-wrap
 msgid "mobile-images/gpssetup.jpg"
 msgstr ""
 
 #. type: Title ===
-#: mobile-manual.txt:256
+#: mobile-manual.txt:300
 #, no-wrap
 msgid "Collecting GPS positions"
 msgstr ""
 
 #. type: Plain text
-#: mobile-manual.txt:265
+#: mobile-manual.txt:309
 msgid ""
 "Ensure that the GPS on the Android device has been activated. At the bottom "
 "of the GPS submenu is a check box _Run location service_ (image on left, "
@@ -556,13 +651,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: mobile-manual.txt:266
+#: mobile-manual.txt:310
 #, no-wrap
 msgid "Storing the GPS data on the _Subsurface_ cloud"
 msgstr ""
 
 #. type: Plain text
-#: mobile-manual.txt:273
+#: mobile-manual.txt:317
 msgid ""
 "Activate the main menu and select the _GPS_ option that brings up the "
 "submenu of GPS-related actions (image on left, above). Tap _Upload GPS data_ "
@@ -573,26 +668,26 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: mobile-manual.txt:274
+#: mobile-manual.txt:318
 #, no-wrap
 msgid "Downloading GPS data from the _Subsurface_ cloud"
 msgstr ""
 
 #. type: Plain text
-#: mobile-manual.txt:278
+#: mobile-manual.txt:322
 msgid ""
 "Download the GPS data that have been saved on the cloud by selecting "
 "_Download GPS Data_ from the GPS subpanel."
 msgstr ""
 
 #. type: Title ===
-#: mobile-manual.txt:279
+#: mobile-manual.txt:323
 #, no-wrap
 msgid "Viewing GPS data"
 msgstr ""
 
 #. type: Plain text
-#: mobile-manual.txt:290
+#: mobile-manual.txt:334
 msgid ""
 "From the GPS submenu (image on left, above) select _Show GPS fixes_. This "
 "brings up a list of GPS positions obtained using the location service (image "
@@ -607,26 +702,26 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: mobile-manual.txt:291
+#: mobile-manual.txt:335
 #, no-wrap
 msgid "mobile-images/gpsmanagement.jpg"
 msgstr ""
 
 #. type: Title ===
-#: mobile-manual.txt:293
+#: mobile-manual.txt:337
 #, no-wrap
 msgid "Applying GPS data to dives in the dive log"
 msgstr ""
 
 #. type: Plain text
-#: mobile-manual.txt:301
+#: mobile-manual.txt:345
 msgid ""
 "Assuming that all the dives have been entered into the dive log or have been "
 "downloaded from the _Subsurface_ cloud, one can apply the GPS positions to "
 "these dives. GPS positions can therefore only be applied to dives in the "
-"dive list.  From the GPS subpanel, tap _Apply GPS fixes_. The dive list "
+"dive list.  From the GPS subpanel, tap _GPS-tag dives_. The dive list "
 "contains the start and end times of each dive. Now, _Subsurface-mobile_ "
 "applies the first GPS position that falls within the dive period of each "
 "dive. This results in a GPS position for each dive that is saved as part of "
-"the dive list."
+"the dive log."
 msgstr ""
diff --git a/Documentation/50-pot/subsurface-user-manual.pot b/Documentation/50-pot/subsurface-user-manual.pot
index 5165de7..744eae3 100644
--- a/Documentation/50-pot/subsurface-user-manual.pot
+++ b/Documentation/50-pot/subsurface-user-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: 2016-03-12 13:31+0100\n"
+"POT-Creation-Date: 2016-07-21 10:32+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -160,32 +160,38 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:78
+#: user-manual.txt:79
 #, no-wrap
-msgid "images/usermanualfunctions.jpg"
+msgid "images/UserManualSearch.jpg"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:90
+#: user-manual.txt:91
 msgid ""
 "_PREVIOUS/NEXT LINK_. Move between links (underlined words that jump to "
 "specific sections in the user manual) by right-clicking on the text of the "
-"manual.  This brings up a context menu to previous links selected.  (see "
-"image above). For instance if a link has been selected, then the option to "
-"_Go Back_ shows the text at the last link selected (similar to the Previous "
-"Page button in a browser). Conversely the _Go Forward_ option jumps to the "
-"text seen before selecting the _Go Back_ option. The _Reload_ option reloads "
-"the complete user manual into the window."
+"manual.  This brings up a context menu to PREVIOUS links selected.  (see "
+"image below). For instance if a link has been selected, then the option to "
+"_Go Back_ shows the text at the previous link selected (similar to the "
+"Previous Page button in a browser). Conversely the _Go Forward_ option jumps "
+"to the text seen before selecting the _Go Back_ option. The _Reload_ option "
+"reloads the complete user manual into the window."
 msgstr ""
 
-#. type: Title -
+#. type: Target for macro image
 #: user-manual.txt:92
 #, no-wrap
+msgid "images/UserManualLinksBack.jpg"
+msgstr ""
+
+#. type: Title -
+#: user-manual.txt:97
+#, no-wrap
 msgid "The user survey"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:103
+#: user-manual.txt:108
 msgid ""
 "In order to develop _Subsurface_ to serve its users in the best possible "
 "way, it’s important to have user information. Upon launching _Subsurface_ "
@@ -201,13 +207,13 @@ msgid ""
 msgstr ""
 
 #. type: Title -
-#: user-manual.txt:106
+#: user-manual.txt:111
 #, no-wrap
 msgid "Start Using the Program"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:111
+#: user-manual.txt:116
 msgid ""
 "The _Subsurface_ window is usually divided into four panels with a *Main "
 "Menu* (File Import Log View Help) at the top of the window (for Windows and "
@@ -216,7 +222,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:117
+#: user-manual.txt:122
 msgid ""
 "The *Dive List* on the bottom left, showing all the dives in the user's dive "
 "log. A dive can be selected and highlighted on the dive list by clicking on "
@@ -225,14 +231,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:120
+#: user-manual.txt:125
 msgid ""
 "The *Dive Map* on the bottom right, showing the user's dive sites on a world "
 "map and centered on the site of the last dive selected in the *Dive List*."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:124
+#: user-manual.txt:129
 msgid ""
 "The *Info* on the top left, giving more detailed information on the dive "
 "selected in the *Dive List*, including some statistics for the selected dive "
@@ -240,14 +246,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:127
+#: user-manual.txt:132
 msgid ""
 "The *Dive Profile* on the top right, showing a graphical dive profile of the "
 "selected dive in the *Dive List*."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:131
+#: user-manual.txt:136
 msgid ""
 "The dividers between panels can be dragged to change the size of any of the "
 "panels. _Subsurface_ remembers the position of the dividers, so the next "
@@ -256,7 +262,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:139
+#: user-manual.txt:144
 msgid ""
 "If a single dive is selected in the *Dive List*, the dive location, detailed "
 "information and profile of the _selected dive_ are shown in the respective "
@@ -268,38 +274,38 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:142
+#: user-manual.txt:147
 #, no-wrap
 msgid "images/main_window_f22.jpg"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:146
+#: user-manual.txt:151
 msgid ""
 "The user decides which of the four panels are displayed by selecting the "
 "*View* option on the main menu. This feature has several choices of display:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:148
+#: user-manual.txt:153
 #, no-wrap
 msgid "*All*: show all four of the panels as in the screenshot above.\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:150
+#: user-manual.txt:155
 #, no-wrap
 msgid "*Divelist*: Show only the Dive List.\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:152
+#: user-manual.txt:157
 #, no-wrap
 msgid "*Profile*: Show only the Dive Profile of the selected dive.\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:155
+#: user-manual.txt:160
 #, no-wrap
 msgid ""
 "*Info*: Show only the Notes about the last selected dive and statistics "
@@ -308,13 +314,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:157
+#: user-manual.txt:162
 #, no-wrap
 msgid "*Globe*: Show only the world map, centered on the last selected dive.\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:163
+#: user-manual.txt:168
 msgid ""
 "Like other functions that can be accessed via the Main Menu, these options "
 "can also be triggered using keyboard shortcuts. The shortcuts for a "
@@ -325,7 +331,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:167
+#: user-manual.txt:172
 msgid ""
 "When the program is started for the first time, it shows no information at "
 "all, because it does not have any dive information available. In the "
@@ -334,13 +340,13 @@ msgid ""
 msgstr ""
 
 #. type: Title -
-#: user-manual.txt:170
+#: user-manual.txt:175
 #, no-wrap
 msgid "Creating a new logbook"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:175
+#: user-manual.txt:180
 msgid ""
 "Select _File -> New Logbook_ from the main menu. All existing dive data are "
 "cleared so new information can be added. If there are unsaved data in an "
@@ -349,49 +355,49 @@ msgid ""
 msgstr ""
 
 #. type: Title ==
-#: user-manual.txt:177
+#: user-manual.txt:182
 #, no-wrap
 msgid "Storing dive information in the logbook"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:180
+#: user-manual.txt:185
 msgid ""
 "Now that a new logbook is created, it is simple to add dive data it.  "
 "_Subsurface_ allows several ways of adding dive data to a logbook."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:181
+#: user-manual.txt:186
 msgid "If the user has a handwritten divelog, a spreadsheet or another form of"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:183
+#: user-manual.txt:188
 msgid ""
 "manually maintained divelog, dive data can be added to the logbook using one "
 "of these approaches:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:184
+#: user-manual.txt:189
 msgid "Enter dive information by hand. This is useful if the diver didn’t"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:186
+#: user-manual.txt:191
 msgid ""
 "use a dive computer and dives were recorded in a written logbook. See: "
 "xref:S_EnterData[Entering dive information by hand]"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:188
+#: user-manual.txt:193
 msgid "Import dive log information that has been maintained either as a spreadsheet"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:190
+#: user-manual.txt:195
 msgid ""
 "or as a CSV file. Refer to: xref:S_Appendix_D[APPENDIX D: Exporting a "
 "spreadsheet to CSV format] and to xref:S_ImportingCSVDives[Importing dives "
@@ -399,7 +405,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:193
+#: user-manual.txt:198
 msgid ""
 "If a dive is recorded using a dive computer, the depth profile and a large "
 "amount of additional information can be accessed.  These dives can be "
@@ -407,44 +413,44 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:194
+#: user-manual.txt:199
 msgid ""
 "The dive computer itself. See: xref:S_ImportDiveComputer[Importing new dive "
 "information from a Dive Computer] or"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:196
+#: user-manual.txt:201
 msgid "Proprietary software distributed by manufacturers of dive computers. Refer"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:197
+#: user-manual.txt:202
 msgid ""
 "to: xref:S_ImportingAlienDiveLogs[Importing dive information from other "
 "digital data sources or other data formats]."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:198
+#: user-manual.txt:203
 msgid "Spreadsheet or CSV files containing dive profiles."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:199
+#: user-manual.txt:204
 msgid ""
 "See: xref:S_ImportingCSVDives[Importing dives in CSV format from dive "
 "computers or other dive log software]"
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:202
+#: user-manual.txt:207
 #, no-wrap
 msgid "Entering dive information by hand"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:217
+#: user-manual.txt:222
 msgid ""
 "This is usually the approach for dives without a dive computer. The basic "
 "record of information within _Subsurface_ is a dive. The most important "
@@ -461,13 +467,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:218
+#: user-manual.txt:223
 #, no-wrap
 msgid "images/AddDive1_f22.jpg"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:222
+#: user-manual.txt:227
 msgid ""
 "When you edit a field in Notes or Equipment panels, _Subsurface_ enters "
 "*Editing Mode*, indicated by the message in the blue box at the top of the "
@@ -476,13 +482,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:223 user-manual.txt:782
+#: user-manual.txt:228 user-manual.txt:789
 #, no-wrap
 msgid "images/BlueEditBar_f22.jpg"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:231
+#: user-manual.txt:236
 msgid ""
 "The _Apply changes_ button should only be selected after all the parts of a "
 "dive have been entered.  When entering dives by hand, the _Info_, "
@@ -495,13 +501,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:233
+#: user-manual.txt:238
 #, no-wrap
 msgid "Creating a Dive Profile"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:240
+#: user-manual.txt:245
 msgid ""
 "The *Dive Profile* (a graphical representation of the depth of the dive as a "
 "function of time) is shown in the panel on the top right hand of the "
@@ -511,13 +517,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:241
+#: user-manual.txt:246
 #, no-wrap
 msgid "images/DiveProfile1_f20.jpg"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:259
+#: user-manual.txt:264
 msgid ""
 "_Modifying the dive profile_: When the cursor is moved around the dive "
 "profile, its position is shown by two right-angled red lines as seen below.  "
@@ -535,13 +541,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:260
+#: user-manual.txt:265
 #, no-wrap
 msgid "images/DiveProfile2_f20.jpg"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:272
+#: user-manual.txt:277
 msgid ""
 "_Specifying the gas composition:_ The gas composition used is indicated "
 "along the line segments of the dive profile. This defaults to the first gas "
@@ -555,13 +561,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:273
+#: user-manual.txt:278
 #, no-wrap
 msgid "images/DiveProfile3_f20.jpg"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:280
+#: user-manual.txt:285
 msgid ""
 "With the profile now defined, more details must be added to have a fuller "
 "record of the dive. To do this, the *Notes* and the *Equipment* tabs on the "
@@ -570,19 +576,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:281
+#: user-manual.txt:286
 #, no-wrap
 msgid "Importing new dive information from a Dive Computer"
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:283
+#: user-manual.txt:288
 #, no-wrap
 msgid "Connecting and importing data from a dive computer."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:293
+#: user-manual.txt:298
 msgid ""
 "The use of dive computers allows the collection of a large amount of "
 "information about each dive, e.g. a detailed record of depth, duration, "
@@ -594,13 +600,13 @@ msgid ""
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:294 user-manual.txt:654 user-manual.txt:3026
+#: user-manual.txt:299 user-manual.txt:661 user-manual.txt:3148
 #, no-wrap
 msgid "images/icons/warning2.png"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:304
+#: user-manual.txt:309
 msgid ""
 "Several dive computers consume more power when they are in PC-Communication "
 "mode. **This could drain the dive computer's battery**. We recommend the "
@@ -612,7 +618,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:320
+#: user-manual.txt:325
 msgid ""
 "To import dive information from a dive computer to a computer with "
 "_Subsurface_, the two pieces of equipment must communicate with one "
@@ -629,47 +635,47 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:322
+#: user-manual.txt:327
 msgid ""
 "After this, the dive computer can be hooked up to the user's PC using these "
 "steps:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:324
+#: user-manual.txt:329
 msgid "The interface cable should be connected to a free USB port (or the Infra-red"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:325
+#: user-manual.txt:330
 msgid "or Bluetooth connection set up as described later in this manual)"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:327
+#: user-manual.txt:332
 msgid "The dive computer should be placed into PC Communication mode."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:328
+#: user-manual.txt:333
 msgid "(Refer to the manual of the specific dive computer)"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:332
+#: user-manual.txt:337
 msgid ""
 "In _Subsurface_, from the Main Menu, select _Import -> Import From Dive "
 "Computer_.  Dialogue *A* in the figure below appears:"
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:334
+#: user-manual.txt:339
 #, no-wrap
 msgid "images/DC_import_f20.jpg"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:342
+#: user-manual.txt:347
 msgid ""
 "Dive computers tend to keep a certain number of dives in memory, even though "
 "these dives have already been imported to _Subsurface_. For that reason, if "
@@ -680,7 +686,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:349
+#: user-manual.txt:354
 msgid ""
 "The dialogue has two drop-down lists, *Vendor* and *Dive Computer*. On the "
 "*vendor* drop-down list select the make of the computer, e.g.  Suunto, "
@@ -690,7 +696,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:360
+#: user-manual.txt:365
 msgid ""
 "The *Device or Mount Point* drop-down list contains the USB or Bluetooth "
 "port name that _Subsurface_ needs in order to communicate with the dive "
@@ -704,7 +710,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:370
+#: user-manual.txt:375
 msgid ""
 "If all the dives on the dive computer need to be downloaded, check the "
 "checkbox _Force download of all dives_. Normally, _Subsurface_ only "
@@ -719,7 +725,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:376
+#: user-manual.txt:381
 msgid ""
 "If the checkbox _Always prefer downloaded dives_ has been checked and, "
 "during download, dives with identical date-times exist on the dive computer "
@@ -728,14 +734,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:379
+#: user-manual.txt:384
 msgid ""
 "The checkbox marked _Download into new trip_ ensures that, after upload, the "
 "downloaded dives are grouped together as a new trip(s) in the *Dive List*."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:383
+#: user-manual.txt:388
 msgid ""
 "Do *not* check the checkboxes labelled _Save libdivecomputer logfile_ and "
 "_Save libdivecomputer dumpfile_. These are only used as diagnostic tools "
@@ -743,7 +749,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:402
+#: user-manual.txt:407
 msgid ""
 "Then select the _Download_ button.  With communication established, you can "
 "see how the data are retrieved from the dive computer.  Depending on the "
@@ -765,14 +771,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:407
+#: user-manual.txt:412
 msgid ""
 "Then click the OK button.  The checked dives are transferred to the *Dive "
 "List*."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:411
+#: user-manual.txt:416
 msgid ""
 "If there is a problem in communicating with the dive computer, an error "
 "message will be shown, similar to this text: \"Unable to open /dev/ttyUSB0 "
@@ -780,36 +786,36 @@ msgid ""
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:415
+#: user-manual.txt:420
 #, no-wrap
 msgid "*PROBLEMS WITH DATA DOWNLOAD FROM A DIVE COMPUTER?*\n"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:415 user-manual.txt:521 user-manual.txt:565 user-manual.txt:578 user-manual.txt:1149 user-manual.txt:1215 user-manual.txt:1266 user-manual.txt:1342 user-manual.txt:1653
+#: user-manual.txt:420 user-manual.txt:527 user-manual.txt:571 user-manual.txt:584 user-manual.txt:1156 user-manual.txt:1222 user-manual.txt:1387 user-manual.txt:1463 user-manual.txt:1774
 #, no-wrap
 msgid "images/icons/important.png"
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:418
+#: user-manual.txt:423
 msgid "Check the following:"
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:421
+#: user-manual.txt:426
 msgid "Is the dive computer still in PC-communication or Upload mode?"
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:423
+#: user-manual.txt:428
 msgid ""
 "Is the dive computer’s battery fully charged? If not then charge or replace "
 "it."
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:427
+#: user-manual.txt:432
 msgid ""
 "Is the connecting cable faulty? Does the cable work using other software? "
 "Has it worked before, or is this the first time the cable is being used? Are "
@@ -817,7 +823,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:432
+#: user-manual.txt:437
 msgid ""
 "Consult "
 "xref:_appendix_a_operating_system_specific_information_for_importing_dive_information_from_a_dive_computer[Appendix "
@@ -825,7 +831,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:436
+#: user-manual.txt:441
 msgid ""
 "On Unix-like operating systems, does the user have write permission to the "
 "USB port? If not, consult "
@@ -834,7 +840,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:444
+#: user-manual.txt:449
 msgid ""
 "If the _Subsurface_ computer does not recognize the USB adaptor by showing "
 "an appropriate device name next to the Mount Point, then there is a "
@@ -846,7 +852,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:447
+#: user-manual.txt:452
 #, no-wrap
 msgid ""
 "\tSave libdivecomputer logfile\n"
@@ -854,7 +860,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:453
+#: user-manual.txt:458
 #, no-wrap
 msgid ""
 "*Important*: These check boxes are only used when problems are encountered\n"
@@ -867,7 +873,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:457
+#: user-manual.txt:462
 #, no-wrap
 msgid ""
 "*Important:* _After downloading with the above checkboxes\n"
@@ -876,7 +882,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:460
+#: user-manual.txt:465
 #, no-wrap
 msgid ""
 "\tsubsurface.log\n"
@@ -884,7 +890,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:466
+#: user-manual.txt:471
 msgid ""
 "These files should be send to the _Subsurface_ mail list: "
 "_subsurface at subsurface-divelog.org_ with a request for the files to be "
@@ -893,19 +899,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:469
+#: user-manual.txt:474
 #, no-wrap
 msgid "Connecting _Subsurface_ to a Bluetooth-enabled dive computer"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:470 user-manual.txt:3578
+#: user-manual.txt:475 user-manual.txt:3700
 #, no-wrap
 msgid "images/icons/bluetooth.jpg"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:477
+#: user-manual.txt:482
 msgid ""
 "Bluetooth is becoming a more common way of communication between dive "
 "computers and _Subsurface_, for or instance, the Shearwater Petrel Mk2 and "
@@ -915,29 +921,29 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:479
+#: user-manual.txt:484
 msgid "Be sure Bluetooth is activated on the host computer running _Subsurface_."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:480
+#: user-manual.txt:485
 msgid "Be sure _Subsurface_ sees the Bluetooth adapter on the host computer."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:481
+#: user-manual.txt:486
 msgid ""
 "Be sure the Bluetooth-enabled dive computer is Bluetooth-discoverable and in "
 "PC upload mode."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:482
+#: user-manual.txt:487
 msgid "Be sure _Subsurface_ is paired with the Bluetooth-enabled dive computer."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:486
+#: user-manual.txt:491
 msgid ""
 "Select the Download dialogue by selecting _Import -> Import from dive "
 "computer_ from the *Main Menu*. If you check the box labelled _\"Choose "
@@ -945,19 +951,19 @@ msgid ""
 msgstr ""
 
 #. type: Title =====
-#: user-manual.txt:486
+#: user-manual.txt:492
 #, no-wrap
 msgid "On Linux or MacOS:"
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:488
+#: user-manual.txt:494
 #, no-wrap
 msgid "images/DC_import_Bluetooth.jpg"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:519
+#: user-manual.txt:525
 msgid ""
 "On the _Linux_ or _MacOS_ platforms the name of the _Subsurface_ computer "
 "and its Bluetooth address are shown on the right hand side, On the left hand "
@@ -990,7 +996,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:526
+#: user-manual.txt:532
 msgid ""
 "Currently _Subsurface_ does not support Bluetooth pairing with dive "
 "computers that require a custom PIN code. In order to pair the devices, use "
@@ -998,12 +1004,12 @@ msgid ""
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:528
+#: user-manual.txt:534
 msgid "One way to achieve this is to use +bluetoothctl+:"
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:539
+#: user-manual.txt:545
 #, no-wrap
 msgid ""
 "\t$ bluetoothctl\n"
@@ -1019,7 +1025,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:545
+#: user-manual.txt:551
 msgid ""
 "After the devices are paired, press the _Save_ button of the dialogue.  This "
 "closes the Bluetooth dialogue. Now select _Download_ in the _Download from "
@@ -1028,19 +1034,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:546 user-manual.txt:3505 user-manual.txt:3593
+#: user-manual.txt:552 user-manual.txt:3627 user-manual.txt:3715
 #, no-wrap
 msgid "On Windows:"
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:547
+#: user-manual.txt:553
 #, no-wrap
 msgid "images/DC_import_Bluetooth_Windows.png"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:557
+#: user-manual.txt:563
 msgid ""
 "On _Windows_ platforms the _Local Bluetooth device details section_ on the "
 "right is not displayed as is the case on the Linux/Mac systems.  To start a "
@@ -1054,7 +1060,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:564
+#: user-manual.txt:570
 msgid ""
 "The pairing step is checked and done automatically during the download "
 "process. If the devices have never been paired the system will ask for your "
@@ -1065,7 +1071,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:572
+#: user-manual.txt:578
 msgid ""
 "Currently _Subsurface_ works only with local Bluetooth adapters which use "
 "Microsoft Bluetooth Stack. If the local device uses _Widcomm_, _Stonestreet "
@@ -1075,7 +1081,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:577
+#: user-manual.txt:583
 msgid ""
 "A log message on the bottom left of the _Remote Bluetooth device selection_ "
 "shows details about the current status of the Bluetooth agent. To select "
@@ -1085,7 +1091,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:587
+#: user-manual.txt:593
 #, no-wrap
 msgid ""
 "*IN CASE OF PROBLEMS*:  If the Bluetooth adapter from the _Subsurface_ "
@@ -1100,13 +1106,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:590
+#: user-manual.txt:596
 #, no-wrap
 msgid "Changing the name of a dive computer"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:606
+#: user-manual.txt:612
 msgid ""
 "It may be necessary to distinguish between different dive computers used to "
 "upload dive logs to _Subsurface_. For instance if a buddy’s dive computer is "
@@ -1125,13 +1131,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:608
+#: user-manual.txt:614
 #, no-wrap
 msgid "Updating the dive information imported from the dive computer."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:615
+#: user-manual.txt:621
 msgid ""
 "With the uploaded dives in the *Dive List*, the information from the dive "
 "computer is not complete and more details must be added to have a full "
@@ -1140,13 +1146,13 @@ msgid ""
 msgstr ""
 
 #. type: Title =====
-#: user-manual.txt:617
+#: user-manual.txt:623
 #, no-wrap
 msgid "Notes"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:622
+#: user-manual.txt:628
 msgid ""
 "To have a more complete dive record, the user needs to add additional "
 "information by hand. The procedure below is virtually identical for "
@@ -1154,7 +1160,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:632
+#: user-manual.txt:638
 msgid ""
 "In some cases, you must provide the date and time of the dive, for example "
 "when entering a dive by hand or when a dive computer doesn’t provide the "
@@ -1167,13 +1173,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:633
+#: user-manual.txt:639
 #, no-wrap
 msgid "images/AddDive3_f22.jpg"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:642
+#: user-manual.txt:648
 msgid ""
 "The right hand image, above, shows a *Notes tab* filled with dive "
 "information.  The *Time* field reflects the date and time of the dive. By "
@@ -1184,7 +1190,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:652
+#: user-manual.txt:658
 #, no-wrap
 msgid ""
 "*Air/water temperatures*: Air and water temperatures during the dive are "
@@ -1204,13 +1210,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:654
+#: user-manual.txt:661
 #, no-wrap
 msgid "*Location*:\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:662
+#: user-manual.txt:669
 msgid ""
 "Dive locations are managed as a *separate* part of the dive log.  The dive "
 "information in the *Notes* and *Equipment* tabs can therefore NOT be edited "
@@ -1222,7 +1228,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:680
+#: user-manual.txt:687
 msgid ""
 "Type in the name of the dive site, e.g. \"Tihany, Lake Balaton, Hungary\".  "
 "If several dives are made at the same location, the site information for the "
@@ -1242,13 +1248,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:681
+#: user-manual.txt:688
 #, no-wrap
 msgid "images/Locations1_f22.jpg"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:686
+#: user-manual.txt:693
 msgid ""
 "Doubleclick on the new dive site name. A panel appears to enter the "
 "coordinates and other information about the site (image *B*, above). The "
@@ -1257,7 +1263,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:692
+#: user-manual.txt:699
 msgid ""
 "Use the world map in the bottom right hand part of the _Subsurface_ "
 "window. The map displays an orange bar indicating \"No location data - Move "
@@ -1267,7 +1273,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:697
+#: user-manual.txt:704
 msgid ""
 "Use the _Subsurface_ Companion app if you have an Android or iPhone device "
 "with GPS and if the dive site coordinates were stored using it.  "
@@ -1275,14 +1281,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:699
+#: user-manual.txt:706
 msgid ""
 "Enter by hand if the coordinates are known, using one of four formats with "
 "latitude followed by longitude:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:704
+#: user-manual.txt:711
 msgid ""
 "ISO 6709 Annex D format e.g. 30°13'28.9\"N 30°49'1.5\"E Degrees and decimal "
 "minutes, e.g. N30° 13.49760' , E30° 49.30788' Degrees minutes seconds, "
@@ -1291,7 +1297,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:712
+#: user-manual.txt:719
 msgid ""
 "Southern hemisphere latitudes are given with a *S*, e.g. S30°, or with a "
 "negative value, e.g. -30.22496. Similarly western longitudes are given with "
@@ -1303,7 +1309,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:718
+#: user-manual.txt:725
 #, no-wrap
 msgid ""
 "*Important*: GPS coordinates of a dive site are linked to the location\n"
@@ -1314,7 +1320,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:728
+#: user-manual.txt:735
 #, no-wrap
 msgid ""
 "*Dive site name lookup:* If coordinates have been typed into the "
@@ -1332,7 +1338,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:733
+#: user-manual.txt:740
 msgid ""
 "Enter any other contextual information about the dive site (Description and "
 "Notes), then select _Apply Changes_ to save the geolocation for this dive "
@@ -1341,7 +1347,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:738
+#: user-manual.txt:745
 #, no-wrap
 msgid ""
 "*Dive mode*: This is a dropdown box allowing you to choose the type of "
@@ -1353,7 +1359,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:743
+#: user-manual.txt:750
 #, no-wrap
 msgid ""
 "*Divemaster*: The name of the divemaster or dive guide should be\n"
@@ -1363,7 +1369,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:748
+#: user-manual.txt:755
 #, no-wrap
 msgid ""
 "*Buddy*: In this field, enter the name(s) of the buddy or buddies\n"
@@ -1374,7 +1380,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:753
+#: user-manual.txt:760
 #, no-wrap
 msgid ""
 "*Suit*: Here the type of dive suit used can be entered.\n"
@@ -1385,7 +1391,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:756
+#: user-manual.txt:763
 #, no-wrap
 msgid ""
 "*Rating*: You can provide a subjective overall rating of the dive on a\n"
@@ -1393,7 +1399,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:760
+#: user-manual.txt:767
 #, no-wrap
 msgid ""
 "*Visibility*: You can provide a rating of visibility during the\n"
@@ -1402,7 +1408,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:768
+#: user-manual.txt:775
 #, no-wrap
 msgid ""
 "*Tags*: Tags that describe the type of dive done can be entered\n"
@@ -1416,13 +1422,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:770
+#: user-manual.txt:777
 #, no-wrap
 msgid "*Notes*: Any additional information for the dive can be entered here.\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:775
+#: user-manual.txt:782
 msgid ""
 "The _Apply changes_ and _Discard changes_ buttons are used to save all the "
 "information for tabs in the *Info* panel and in the *Dive Profile* "
@@ -1432,13 +1438,13 @@ msgid ""
 msgstr ""
 
 #. type: Title =====
-#: user-manual.txt:776
+#: user-manual.txt:783
 #, no-wrap
 msgid "Equipment"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:781
+#: user-manual.txt:788
 msgid ""
 "The Equipment tab lets you enter information about the type of cylinder and "
 "gas used, as well as the weights used for the dive. The message in the blue "
@@ -1446,7 +1452,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:788
+#: user-manual.txt:795
 msgid ""
 "shows the dive is being edited. This is a highly interactive part of "
 "_Subsurface_ and the information on cylinders and gases (entered here) "
@@ -1454,7 +1460,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:792
+#: user-manual.txt:799
 #, no-wrap
 msgid ""
 "*Cylinders*: The cylinder information is entered through a dialogue that "
@@ -1463,13 +1469,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:793
+#: user-manual.txt:800
 #, no-wrap
 msgid "images/DC_gas-dialogue1_f20.jpg"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:806
+#: user-manual.txt:813
 msgid ""
 "For hand-entered dives, this information needs to be typed in. For dive "
 "computers, _Subsurface_ often gets the gas used from the dive computer and "
@@ -1485,13 +1491,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:807
+#: user-manual.txt:814
 #, no-wrap
 msgid "images/DC_gas-dialogue2_f20.jpg"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:814
+#: user-manual.txt:821
 msgid ""
 "The drop-down list can then be used to select the cylinder type that was "
 "used for this dive, or just start typing in the box which shows the "
@@ -1501,7 +1507,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:818
+#: user-manual.txt:825
 msgid ""
 "Next, indicate the starting pressure and the ending pressure of the "
 "specified gas during the dive. The unit of pressure (metric/imperial)  "
@@ -1509,7 +1515,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:829
+#: user-manual.txt:836
 msgid ""
 "Finally, provide the gas mixture used. If air was used, the value of 21% can "
 "be entered or this field can be left blank. If nitrox or trimix were used, "
@@ -1523,13 +1529,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:830
+#: user-manual.txt:837
 #, no-wrap
 msgid "images/CylinderDataEntry3_f20.jpg"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:837
+#: user-manual.txt:844
 #, no-wrap
 msgid ""
 "*Weights*: Information about the weight system used can be entered\n"
@@ -1541,26 +1547,26 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:838
+#: user-manual.txt:845
 #, no-wrap
 msgid "images/WeightsDataEntry1_f20.jpg"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:842
+#: user-manual.txt:849
 msgid ""
 "By clicking on the _Type_ field, a drop-down list becomes accessible through "
 "a down-arrow:"
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:843
+#: user-manual.txt:850
 #, no-wrap
 msgid "images/WeightsDataEntry2_f20.jpg"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:857
+#: user-manual.txt:864
 msgid ""
 "This can be used to select the type of weight system used during the dive or "
 "just may start typing in the box to specify a different weighting mechanism "
@@ -1575,19 +1581,19 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:858
+#: user-manual.txt:865
 #, no-wrap
 msgid "images/WeightsDataEntry3_f20.jpg"
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:860
+#: user-manual.txt:867
 #, no-wrap
 msgid "Editing several selected dives simultaneously"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:876
+#: user-manual.txt:883
 msgid ""
 "_METHOD 1_: After uploading dives from a dive computer, the dive profiles of "
 "each is shown in the *Dive profile* tab, as well as a few items of "
@@ -1605,7 +1611,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:886
+#: user-manual.txt:893
 msgid ""
 "Simultaneous editing only works with fields that do not already contain "
 "information.  This means if some fields have been edited for a particular "
@@ -1620,7 +1626,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:895
+#: user-manual.txt:902
 msgid ""
 "_METHOD 2_:There is a different way of achieving the same goal. Select a "
 "dive with all the appropriate information typed into the *Notes* and "
@@ -1635,13 +1641,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:896
+#: user-manual.txt:903
 #, no-wrap
 msgid "Adding Bookmarks to a dive"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:901
+#: user-manual.txt:908
 msgid ""
 "Many divers wish to annotate dives with text that indicate particular "
 "events, e.g. \"Saw dolphins\", or \"Released surface buoy\". This is easily "
@@ -1649,7 +1655,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:905
+#: user-manual.txt:912
 msgid ""
 "Right-click at the appropriate point on the dive profile.  This brings up "
 "the dive profile context menu. Select _Add bookmark_. A red flag is placed "
@@ -1657,40 +1663,40 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:907
+#: user-manual.txt:914
 msgid ""
 "Right-click on the red flag. This brings up the context menu (see *B* "
 "below). Select _Edit name_."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:910
+#: user-manual.txt:917
 msgid ""
 "A text box is shown. Type the explanatory text for the bookmark (see *C* "
 "below). Select _OK_.  This saves the text associated with the bookmark."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:913
+#: user-manual.txt:920
 msgid ""
 "Hovering the mouse over the red bookmark, the appropriate text is shown at "
 "the bottom of the information box (see *D* below)."
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:914
+#: user-manual.txt:921
 #, no-wrap
 msgid "images/Bookmarks.jpg"
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:917
+#: user-manual.txt:924
 #, no-wrap
 msgid "Saving the updated dive information"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:928
+#: user-manual.txt:935
 msgid ""
 "The information entered in the *Notes* tab and the *Equipment* tab can be "
 "saved by using the two buttons on the top right hand of the *Notes* tab. If "
@@ -1703,7 +1709,7 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:929
+#: user-manual.txt:936
 #, no-wrap
 msgid ""
 "Importing dive information from other digital data sources or other data "
@@ -1711,7 +1717,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:954
+#: user-manual.txt:961
 msgid ""
 "If you’ve been diving for some time, it’s possible several dives were logged "
 "using other dive log software. These dive logs can probably be imported into "
@@ -1732,7 +1738,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:964
+#: user-manual.txt:971
 msgid ""
 "If the format of other software is supported natively on Subsurface, select "
 "either _Import -> Import log files_ or _File -> Open log file_. _Subsurface_ "
@@ -1746,13 +1752,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:964
+#: user-manual.txt:971
 #, no-wrap
 msgid "Using the universal import dialogue"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:970
+#: user-manual.txt:977
 msgid ""
 "Importing dives from other software is done through a universal interface "
 "activated by selecting _Import_ from the Main Menu, then clicking on _Import "
@@ -1760,13 +1766,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:971
+#: user-manual.txt:978
 #, no-wrap
 msgid "images/Import1_f20.jpg"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:976
+#: user-manual.txt:983
 msgid ""
 "Towards the bottom right is a dropdown selector with a default label of "
 "_Dive Log Files_ which accesses different types of direct imports available, "
@@ -1774,69 +1780,69 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:978
+#: user-manual.txt:985
 msgid ""
 "XML-formatted dive logs (DivingLog 5.0, MacDive and several other dive log "
 "systems)"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:979
+#: user-manual.txt:986
 msgid "Cochran dive logs"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:980
+#: user-manual.txt:987
 msgid "UDDF-formatted dive logs (e.g. Kenozoooid)"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:981
+#: user-manual.txt:988
 msgid "UDCF-formatted dive logs"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:982
+#: user-manual.txt:989
 msgid "Poseidon MkVI CCR logs"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:983
+#: user-manual.txt:990
 msgid "APD Inspiration/Evolution CCR logs"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:984
+#: user-manual.txt:991
 msgid "LiquiVision logs"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:985
+#: user-manual.txt:992
 msgid "divelog.de logs"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:986
+#: user-manual.txt:993
 msgid "OSTC Tools logs"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:987
+#: user-manual.txt:994
 msgid "JDiveLog"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:988
+#: user-manual.txt:995
 msgid "Suunto Dive Manager (DM3 and DM4)"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:989
+#: user-manual.txt:996
 msgid "CSV (text-based and spreadsheet-based) dive logs, including APD CCR logs"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:994
+#: user-manual.txt:1001
 msgid ""
 "Selecting the appropriate format and then the specific log file in the large "
 "window containing the file list on the right of the dialogue, opens the "
@@ -1846,13 +1852,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:995
+#: user-manual.txt:1002
 #, no-wrap
 msgid "Importing from  OSTCTools"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1004
+#: user-manual.txt:1011
 msgid ""
 "_OSTC Tools_ is a Microsoft-based suite of dive download and dive management "
 "tools for the OSTC family of dive computers. _OSTC Tools_ downloads dive "
@@ -1865,7 +1871,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1008
+#: user-manual.txt:1015
 msgid ""
 "All H&W devices supported by OSTCTools can be imported to _Subsurface_. This "
 "includes OSTC, OSTC Mk2, OSTC 2N/2C, OSTC3, OSTC Sport, and probably "
@@ -1873,7 +1879,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1013
+#: user-manual.txt:1020
 msgid ""
 "Please remember that OSTCTools is *not* a true diving log software, but "
 "rather a useful set of tools for analysis and management of OSTC "
@@ -1883,13 +1889,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:1015
+#: user-manual.txt:1022
 #, no-wrap
 msgid "Importing from Mares Dive Organizer V2.1"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1022
+#: user-manual.txt:1029
 msgid ""
 "Since Mares uses proprietary Windows software not compatible with "
 "multi-platform applications, these dive logs cannot be directly imported "
@@ -1899,7 +1905,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1027
+#: user-manual.txt:1034
 msgid ""
 "Export the dive log data from Mares Dive Organizer to your desktop, using a "
 "_.sdf_ file name extension. Refer to xref:Mares_Export[Appendix C] for more "
@@ -1907,7 +1913,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1033
+#: user-manual.txt:1040
 msgid ""
 "Data should then be imported into _www.divelogs.de_. You will first need to "
 "create a user account in _www.divelogs.de_.  Log into that web site, then "
@@ -1918,20 +1924,20 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1035
+#: user-manual.txt:1042
 msgid ""
 "Finally, import the dives from _divelogs.de_ to _Subsurface_, using the "
 "instructions below."
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:1038
+#: user-manual.txt:1045
 #, no-wrap
 msgid "Importing dives from *divelogs.de*"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1051
+#: user-manual.txt:1058
 msgid ""
 "Importing dive information from _divelogs.de_ is simple, using a single "
 "dialogue box. The _Import -> Import from Divelogs.de_ option should be "
@@ -1945,19 +1951,19 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:1052
+#: user-manual.txt:1059
 #, no-wrap
 msgid "images/Divelogs1.jpg"
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:1055
+#: user-manual.txt:1062
 #, no-wrap
 msgid "Importing data in CSV format"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1066
+#: user-manual.txt:1073
 msgid ""
 "A comma-separated file (.csv) can be used to import dive information either "
 "as dive profiles (as in the case of the APD Inspiration and Evolution closed "
@@ -1973,13 +1979,13 @@ msgid ""
 msgstr ""
 
 #. type: Title =====
-#: user-manual.txt:1068
+#: user-manual.txt:1075
 #, no-wrap
 msgid "Importing dives in CSV format from dive computers or other dive log software"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1073
+#: user-manual.txt:1080
 msgid ""
 "You can view a _CSV_ file by using an ordinary text editor. It’s normally "
 "organized into a single line that provides the headers (or _field names_ or "
@@ -1988,14 +1994,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1075
+#: user-manual.txt:1082
 msgid ""
 "There are two types of _CSV_ dive logs that can be imported into "
 "_Subsurface_:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1081
+#: user-manual.txt:1088
 msgid ""
 "_CSV dive details_: This dive log format contains similar information to "
 "that of a typical written dive log, e.g. dive date and time, dive depth, "
@@ -2006,7 +2012,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1090
+#: user-manual.txt:1097
 msgid ""
 "_CSV dive profile_: This dive log format includes much more information "
 "about a single dive. For instance there may be information at 30-second "
@@ -2020,14 +2026,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1093
+#: user-manual.txt:1100
 msgid ""
 "Before being able to import the _CSV_ data to _Subsurface_ *you needs to "
 "know a few things about the data being imported*:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1101
+#: user-manual.txt:1108
 msgid ""
 "Which character separates the different columns within a single line of "
 "data? This field separator should be either a comma (,) a semicolon (;) or a "
@@ -2039,7 +2045,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1105
+#: user-manual.txt:1112
 msgid ""
 "Which data columns need to be imported into _Subsurface_? Is it a _CSV dive "
 "details_ file or a _CSV dive profile_ file? Open the file using a text "
@@ -2048,12 +2054,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1107
+#: user-manual.txt:1114
 msgid "Is the numeric information (e.g. dive depth) in metric or in imperial units?"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1114
+#: user-manual.txt:1121
 msgid ""
 "With this information, importing the data into _Subsurface_ is "
 "straightforward. Select _Import -> Import Log Files_ from the main menu. In "
@@ -2063,13 +2069,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:1115
+#: user-manual.txt:1122
 #, no-wrap
 msgid "images/csv_import1_f20.jpg"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1126
+#: user-manual.txt:1133
 #, no-wrap
 msgid ""
 "At the top left, there is a dropdown list containing pre- configured\n"
@@ -2088,7 +2094,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1138
+#: user-manual.txt:1145
 msgid ""
 "Complete this by ensuring that all the data columns have the appropriate "
 "column headings. The top blue row of the data table contains the column "
@@ -2105,13 +2111,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:1139
+#: user-manual.txt:1146
 #, no-wrap
 msgid "images/csv_import2_f20.jpg"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1145
+#: user-manual.txt:1152
 msgid ""
 "Continue in this way to ensure all the column headings in the blue row of "
 "cells correspond to the headings listed in the top part of the dialogue.  "
@@ -2121,13 +2127,13 @@ msgid ""
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:1149
+#: user-manual.txt:1156
 #, no-wrap
 msgid "*A Diver's Introduction to _CSV_ Files*\n"
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:1163
+#: user-manual.txt:1170
 msgid ""
 "_CSV_ is an abbreviation for a data file format: _Comma-Separated "
 "Values_. It is a file format that lets you view or edit information using a "
@@ -2144,7 +2150,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:1172
+#: user-manual.txt:1179
 msgid ""
 "_CSV_ files can be created or edited with a normal text editor. The most "
 "important attribute of a _CSV_ file is the _field separator_, the character "
@@ -2160,7 +2166,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:1178
+#: user-manual.txt:1185
 #, no-wrap
 msgid ""
 "\tDive site,Dive date,Time,Dive_duration, Dive_depth,Dive buddy\n"
@@ -2171,14 +2177,14 @@ msgid ""
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:1180
+#: user-manual.txt:1187
 msgid ""
 "The above data are not easily read by a human. Here is the same information "
 "in TAB-delimited format:"
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:1186
+#: user-manual.txt:1193
 #, no-wrap
 msgid ""
 "\tDive site\tDive date\tTime\tDive_duration\tDive_depth\tDive buddy\n"
@@ -2189,7 +2195,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:1194
+#: user-manual.txt:1201
 msgid ""
 "It is clear why many people prefer the TAB-delimited format to the "
 "comma-delimited format. The disadvantage is that one cannot see the TAB "
@@ -2203,7 +2209,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:1205
+#: user-manual.txt:1212
 #, no-wrap
 msgid ""
 "\tDive Time (s)\tDepth (m)\tpO₂ - Setpoint (Bar) \tpO₂ - C1 Cell 1 "
@@ -2220,7 +2226,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:1211
+#: user-manual.txt:1218
 msgid ""
 "When a _CSV_ file is selected for import, _Subsurface_ displays the column "
 "headers as well as some of the data in the first few lines of the _CSV_ "
@@ -2231,7 +2237,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1225
+#: user-manual.txt:1232
 msgid ""
 "But, the _CSV_ import has a couple of caveats. Avoid some special characters "
 "like ampersand (&), less than (<), greater than (>) and double quotes (\") "
@@ -2244,7 +2250,270 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:1228
+#: user-manual.txt:1234
+#, no-wrap
+msgid "Importing Dive coordinates from a mobile device with GPS."
+msgstr ""
+
+#. type: Plain text
+#: user-manual.txt:1238
+msgid ""
+"A smartphone with built-in GPS facilities can be used to store the locations "
+"of dives.  This is performed by:"
+msgstr ""
+
+#. type: Plain text
+#: user-manual.txt:1241
+msgid ""
+"Taking the mobile device along on the dive boat / liveabord while "
+"automatically collecting dive site coordinate information."
+msgstr ""
+
+#. type: Plain text
+#: user-manual.txt:1243
+msgid ""
+"Uploading the coordinates from the mobile device to the _Subsurface_ "
+"Internet server."
+msgstr ""
+
+#. type: Plain text
+#: user-manual.txt:1246
+msgid ""
+"Syncronising the dives in the _Subsurface_ dive list with the coordinates "
+"stored on the _Subsurface_ Internet server."
+msgstr ""
+
+#. type: Plain text
+#: user-manual.txt:1248
+msgid "_Subsurface has two tools for achieving this:"
+msgstr ""
+
+#. type: Plain text
+#: user-manual.txt:1250
+msgid "The _Subsurface Companion App_ (Android and iOS)."
+msgstr ""
+
+#. type: Plain text
+#: user-manual.txt:1252
+msgid "The _Subsurface-mobile_ app (Android and iOS)"
+msgstr ""
+
+#. type: Plain text
+#: user-manual.txt:1261
+msgid ""
+"Both of these applications perform the collection of dive site coordinates "
+"and the synchronisation with dives in the _Subsurface_ dive list. However, "
+"the Companion App is not being further developed and has largely been "
+"replaced by the _Subsurface-mobile_ app. While the _Companion app_ serves "
+"exclusively to collect dive site coordinates and to make these available to "
+"the _Subsurface_ desktop version, _Subsurface-mobile_ performs many of the "
+"functions of the desktop version, including the management and viewing of "
+"dive information. Below, we describe how to perform the above three steps "
+"using each of the two mobile apps."
+msgstr ""
+
+#. type: Plain text
+#: user-manual.txt:1263
+msgid ""
+"For information on using the _Subsurface Companion App_, click "
+"xref:S_iCompanion[_here_]."
+msgstr ""
+
+#. type: Title ====
+#: user-manual.txt:1264
+#, no-wrap
+msgid "Storing and and using GPS locations using  _Subsurface-mobile_"
+msgstr ""
+
+#. type: Title =====
+#: user-manual.txt:1266
+#, no-wrap
+msgid "Install _Subsurface-mobile_"
+msgstr ""
+
+#. type: Plain text
+#: user-manual.txt:1272
+msgid ""
+"Find _Subsurface-mobile_ on Google Play and install it on an Android "
+"device. The app is free. The iOS version is currently "
+"experimental. _Subsurface-mobile_ has an extensive "
+"https://subsurface-divelog.org/documentation/subsurface-mobile-user-manual[user "
+"manual] accessible from within that app."
+msgstr ""
+
+#. type: Title =====
+#: user-manual.txt:1273
+#, no-wrap
+msgid "Create a _Subsurface-mobile_ account"
+msgstr ""
+
+#. type: Plain text
+#: user-manual.txt:1281
+msgid ""
+"This topic is discussed at length in the _Subsurface-mobile_ user manual. In "
+"the Credentials screen of _Subsurface-mobile_ provide an e-mail address and "
+"a user password that enables subsequent access. A PIN number is e-mailed "
+"from the _Subsurface_ Internet server to the e-mail address that has been "
+"provided.  Type the PIN into the appropriate text field in the Credentials "
+"screen (see image below).  The _Subsurface_ Internet server notifies the "
+"user that a new user has been registered."
+msgstr ""
+
+#. type: Plain text
+#: user-manual.txt:1284
+#, no-wrap
+msgid ""
+"*N.B.:* To successfully create a user account, the mobile device must have "
+"Internet connectivity,\n"
+"either through the cellular network or via wifi.\n"
+msgstr ""
+
+#. type: Target for macro image
+#: user-manual.txt:1285
+#, no-wrap
+msgid "images/MobileCredentials.jpg"
+msgstr ""
+
+#. type: Title =====
+#: user-manual.txt:1288
+#, no-wrap
+msgid "Configure auto-collecting of GPS coordinates"
+msgstr ""
+
+#. type: Plain text
+#: user-manual.txt:1294
+msgid ""
+"Activate the main menu of _Subsurface-mobile_ by selecting the \"hamburger\" "
+"menu button at the bottom left of the _Subsurface-mobile_ screen (see image "
+"above), then select _GPS_ -> _Preferences_ (see image below). The collection "
+"of GPS locations is done in the background and automatically, using two "
+"settings:"
+msgstr ""
+
+#. type: Plain text
+#: user-manual.txt:1296
+msgid ""
+"_Time threshold._ (minutes). The app will try to get a location every X "
+"minutes"
+msgstr ""
+
+#. type: Plain text
+#: user-manual.txt:1298
+msgid "_Distance threshold._ (meters). Minimum distance between two locations."
+msgstr ""
+
+#. type: Plain text
+#: user-manual.txt:1307
+#, no-wrap
+msgid ""
+"*How are GPS coordinates collected?* Assuming the diver sets 5 minutes and "
+"50\n"
+"meters in the settings above, the app will start by recording a location at "
+"the current\n"
+"location, followed by another one at every 5 minutes *or* every time one "
+"moves 50 m\n"
+"from previous location, whichever happens first.\n"
+"If subsequent locations are within a radius of 50 meters from the previous "
+"one,\n"
+"a new location is not saved. If the diver is not moving, only one location "
+"is\n"
+"saved, at least until the _Time-threshold_ period has elapsed.\n"
+"If the diver moves, a trace of the route is obtained by saving a location "
+"every 50 meters.\n"
+msgstr ""
+
+#. type: Title =====
+#: user-manual.txt:1308
+#, no-wrap
+msgid "Activate the automated recording of GPS locations"
+msgstr ""
+
+#. type: Plain text
+#: user-manual.txt:1313
+msgid ""
+"The _Subsurface-mobile_ main menu has a checkbox at the bottom left labled "
+"_Run location service_ (see image below). Checking the box starts the "
+"automated recording of GPS positions."
+msgstr ""
+
+#. type: Target for macro image
+#: user-manual.txt:1314
+#, no-wrap
+msgid "images/MobileMenu.jpg"
+msgstr ""
+
+#. type: Title =====
+#: user-manual.txt:1316
+#, no-wrap
+msgid "After the dive, stop the automated recording of GPS locations"
+msgstr ""
+
+#. type: Plain text
+#: user-manual.txt:1319
+msgid ""
+"Uncheck the check box at the bottom left of the _Subsurface-mobile_ main "
+"menu."
+msgstr ""
+
+#. type: Title =====
+#: user-manual.txt:1320
+#, no-wrap
+msgid "Upload the GPS locations onto the _Subsurface_ Internet server."
+msgstr ""
+
+#. type: Plain text
+#: user-manual.txt:1327
+#, no-wrap
+msgid ""
+"*N.B.:* Uploading the GPS locations to the Internet can only take place if "
+"the mobile\n"
+"device has reliable access to the Internet, either via a cellular network "
+"or\n"
+"via a wifi connection. If the Internet is not accessible from the dive "
+"site(s),\n"
+"then GPS uploading can only take place after the dive or after the dive "
+"trip,\n"
+"when an Internet connection has been re-established.\n"
+msgstr ""
+
+#. type: Plain text
+#: user-manual.txt:1331
+msgid ""
+"From the _Subsurface-mobile_ main menu, select _GPS_ -> _Upload GPS "
+"data_. The locations are uploaded. Check the indicator at the top of the "
+"mobile screen for internet activity, indicating the transfer of information."
+msgstr ""
+
+#. type: Title =====
+#: user-manual.txt:1332
+#, no-wrap
+msgid "Apply the stored GPS locations to dives on the _Subsurface_ dive list."
+msgstr ""
+
+#. type: Plain text
+#: user-manual.txt:1341
+msgid ""
+"_Subsurface_ collects the first GPS location recorded after the start of a "
+"dive (obtained within _Subsurface_ from either the dive computer or from the "
+"manually-entered dive information) and before the end of a dive. These "
+"coordinates are shown in the _Coordinates_ field of the dive site panel for "
+"each dive. Within the dive site panel, provide a name for the coordinates "
+"that have been assigned to the dive, following the instructions under the "
+"heading above xref:S_locations[_Location_ management]."
+msgstr ""
+
+#. type: Plain text
+#: user-manual.txt:1346
+msgid ""
+"The "
+"https://subsurface-divelog.org/documentation/subsurface-mobile-user-manual[user "
+"manual for _Subsurface-mobile_] (accessible from within that app)  contains "
+"detailed instructions for performing the collection of GPS data and for "
+"managing, uploading and synchronising this information."
+msgstr ""
+
+#. type: Title ====
+#: user-manual.txt:1349
 #, no-wrap
 msgid ""
 "Importing GPS coordinates with the _Subsurface Companion App_ for mobile "
@@ -2252,7 +2521,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1237
+#: user-manual.txt:1358
 #, no-wrap
 msgid ""
 "Using the *Subsurface Companion App* on an _Android device_   or\n"
@@ -2266,14 +2535,14 @@ msgid ""
 "To do this:\n"
 msgstr ""
 
-#. type: Title ====
-#: user-manual.txt:1238
+#. type: Title =====
+#: user-manual.txt:1359
 #, no-wrap
 msgid "Create a Companion App account"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1243
+#: user-manual.txt:1364
 msgid ""
 "Register on the http://api.hohndel.org/login/[_Subsurface companion web "
 "page_].  A confirmation email with instructions and a personal *DIVERID* "
@@ -2282,7 +2551,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1248
+#: user-manual.txt:1369
 msgid ""
 "Download the app from "
 "https://play.google.com/store/apps/details?id=org.subsurface[Google Play "
@@ -2290,19 +2559,19 @@ msgid ""
 "http://f-droid.org/repository/browse/?fdfilter=subsurface&fdid=org.subsurface[F-Droid]."
 msgstr ""
 
-#. type: Title ====
-#: user-manual.txt:1249
+#. type: Title =====
+#: user-manual.txt:1370
 #, no-wrap
 msgid "Using the Subsurface companion app on an Android smartphone"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1252
+#: user-manual.txt:1373
 msgid "On first use the app has three options:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1258
+#: user-manual.txt:1379
 msgid ""
 "_Create a new account._ Equivalent to registering in the _Subsurface_ "
 "companion page using an Internet browser. You can request a *DIVERID* using "
@@ -2312,14 +2581,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1261
+#: user-manual.txt:1382
 msgid ""
 "_Retrieve an account._ If users forget their *DIVERID* they will receive an "
 "email to recover the number."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1265
+#: user-manual.txt:1386
 msgid ""
 "_Use an existing account._ Users are prompted for their *DIVERID*. The app "
 "saves this *DIVERID* and doesn’t ask for it again unless you use the "
@@ -2327,7 +2596,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1273
+#: user-manual.txt:1394
 msgid ""
 "In the _Subsurface_ main program, the *DIVERID* should also be entered on "
 "the Default Preferences panel, by selecting _File -> Preferences -> "
@@ -2335,14 +2604,13 @@ msgid ""
 "synchronization between _Subsurface_ and the Companion App."
 msgstr ""
 
-#. type: Title =====
-#: user-manual.txt:1274
-#, no-wrap
-msgid "Creating new dive locations"
+#. type: Plain text
+#: user-manual.txt:1396
+msgid "====== Creating new dive locations"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1279
+#: user-manual.txt:1400
 msgid ""
 "Now you are ready to get a dive position and send it to the server. The "
 "Android display will look like the left hand image (*A*) below, but without "
@@ -2350,21 +2618,21 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1282
+#: user-manual.txt:1403
 msgid ""
 "Touch the \"+\" icon on the top right to add a new dive site, a menu shows "
 "with 3 options:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1285
+#: user-manual.txt:1406
 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:1294
+#: user-manual.txt:1415
 msgid ""
 "Use Map: This option lets you fix a position by searching a world map. A "
 "world map is shown (see *B* below) on which you can show the desired "
@@ -2377,13 +2645,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:1295
+#: user-manual.txt:1416
 #, no-wrap
 msgid "images/Companion_5.jpg"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1303
+#: user-manual.txt:1424
 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 "
@@ -2392,14 +2660,13 @@ msgid ""
 "web service and added to the list on the Android device."
 msgstr ""
 
-#. type: Title =====
-#: user-manual.txt:1304
-#, no-wrap
-msgid "Dive lists of dive locations"
+#. type: Plain text
+#: user-manual.txt:1426
+msgid "====== Dive lists of dive locations"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1312
+#: user-manual.txt:1433
 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 "
@@ -2410,7 +2677,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1320
+#: user-manual.txt:1441
 msgid ""
 "Dive locations in this list can be viewed in two ways: a list of locations "
 "or a map showing them. The display mode (List or Map) is changed by "
@@ -2422,13 +2689,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:1321
+#: user-manual.txt:1442
 #, no-wrap
 msgid "images/Companion_4.jpg"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1327
+#: user-manual.txt:1448
 msgid ""
 "When you select 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 "
@@ -2436,28 +2703,27 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1329
+#: user-manual.txt:1450
 msgid ""
 "Edit (pencil): Change the text name or other characteristics of the dive "
 "location."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1334
+#: user-manual.txt:1455
 msgid ""
 "Maps: Display a map showing the dive location.  After editing and saving a "
 "dive location (see *C* above), upload it to the web service, as explained "
 "below."
 msgstr ""
 
-#. type: Title =====
-#: user-manual.txt:1335
-#, no-wrap
-msgid "Uploading dive locations"
+#. type: Plain text
+#: user-manual.txt:1457
+msgid "====== Uploading dive locations"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1341
+#: user-manual.txt:1462
 msgid ""
 "There are several ways to send locations to the server.  The easiest is "
 "simply selecting the locations (See *A* below) and then touching the right "
@@ -2465,121 +2731,107 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1346
+#: user-manual.txt:1467
 msgid ""
 "Be careful! 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:1347
+#: user-manual.txt:1468
 #, no-wrap
 msgid "images/Companion_1.jpg"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1352
+#: user-manual.txt:1473
 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:1354
-#, no-wrap
-msgid "Settings on the Companion App"
+#. type: Plain text
+#: user-manual.txt:1476
+msgid "====== Settings on the Companion App"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1357
+#: user-manual.txt:1478
 msgid ""
 "Selecting the _Settings_ menu option results in the right hand image above "
 "(*B*)."
 msgstr ""
 
-#. type: Title =====
-#: user-manual.txt:1358
-#, no-wrap
-msgid "Server and account"
+#. type: Plain text
+#: user-manual.txt:1480
+msgid "====== Server and account"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1361
+#: user-manual.txt:1482
 msgid "_Web-service URL._ This is predefined (http://api.hohndel.org/)"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1364
+#: user-manual.txt:1486
 msgid ""
 "_User ID._ The DIVERID obtained by registering as described above. The "
 "easiest way to get it is to copy and paste from the confirmation email or "
-"just type it in."
-msgstr ""
-
-#. type: Title =====
-#: user-manual.txt:1364
-#, no-wrap
-msgid "Synchronisation"
+"just type it in.  ====== Synchronisation"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1368
+#: user-manual.txt:1489
 msgid ""
 "_Synchronize on startup_. If selected, dive locations in the Android device "
 "and those on the web service synchronize each time the app is started."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1371
+#: user-manual.txt:1492
 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:1372
-#, no-wrap
-msgid "Background service"
-msgstr ""
-
 #. type: Plain text
-#: user-manual.txt:1375
+#: user-manual.txt:1496
 msgid ""
-"Instead of entering an unique dive location, you can leave the service "
-"running in the background of your Android device, allowing a continuous "
-"collection of GPS locations."
+"====== Background service Instead of entering an unique dive location, one "
+"can leave the service running in the background of your Android device, "
+"allowing a continuous collection of GPS locations."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1377
+#: user-manual.txt:1498
 msgid "The settings below define the behavior of the service:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1380
+#: user-manual.txt:1501
 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:1382
+#: user-manual.txt:1503
 msgid "_Min distance._ In meters. Minimum distance between two locations."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1384
+#: user-manual.txt:1505
 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:1385 user-manual.txt:1486 user-manual.txt:1900
+#: user-manual.txt:1506 user-manual.txt:1607 user-manual.txt:2021
 #, no-wrap
 msgid "images/icons/info.jpg"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1395
+#: user-manual.txt:1516
 msgid ""
 "_How does the background service work?_ Assuming the diver sets 5 minutes "
 "and 50 meters in the settings above, the app will start by recording a "
@@ -2591,59 +2843,55 @@ msgid ""
 "location every 50 meters."
 msgstr ""
 
-#. type: Title =====
-#: user-manual.txt:1396
-#, no-wrap
-msgid "Other"
+#. type: Plain text
+#: user-manual.txt:1518
+msgid "====== Other"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1400
+#: user-manual.txt:1521
 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:1402
+#: user-manual.txt:1523
 msgid "_Subsurface website._ A link to the URL of Subsurface web"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1404
+#: user-manual.txt:1525
 msgid "_Version._ Displays the current version of the Companion App."
 msgstr ""
 
-#. type: Title =====
-#: user-manual.txt:1405
-#, no-wrap
-msgid "Search"
+#. type: Plain text
+#: user-manual.txt:1527
+msgid "====== Search"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1408
+#: user-manual.txt:1529
 msgid "Search the saved dive locations by name or by date and time."
 msgstr ""
 
-#. type: Title =====
-#: user-manual.txt:1409
-#, no-wrap
-msgid "Start service"
+#. type: Plain text
+#: user-manual.txt:1531
+msgid "====== Start service"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1412
+#: user-manual.txt:1533
 msgid "Starts the _background service_ following the previously defined settings."
 msgstr ""
 
-#. type: Title =====
-#: user-manual.txt:1413
-#, no-wrap
-msgid "Disconnect"
+#. type: Plain text
+#: user-manual.txt:1535
+msgid "====== Disconnect"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1421
+#: user-manual.txt:1542
 msgid ""
 "This is admittedly a badly named option that disconnects the app from the "
 "server.  It resets the user ID in the app, showing the first screen where an "
@@ -2652,25 +2900,24 @@ msgid ""
 "used to download the dive locations of another registered diver."
 msgstr ""
 
-#. type: Title =====
-#: user-manual.txt:1422
-#, no-wrap
-msgid "Send all locations"
+#. type: Plain text
+#: user-manual.txt:1544
+msgid "====== Send all locations"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1425
+#: user-manual.txt:1546
 msgid "This option sends all locations stored in the Android device to the server."
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:1427
+#: user-manual.txt:1548
 #, no-wrap
 msgid "Using the Subsurface companion app on an _iPhone_ to record dive locations"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1432
+#: user-manual.txt:1553
 msgid ""
 "The iPhone interface is quite simple. Type the user ID (obtained during "
 "registration) into the space reserved for it, then select \"Dive in\" (see "
@@ -2679,13 +2926,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:1433
+#: user-manual.txt:1554
 #, no-wrap
 msgid "images/iphone.jpg"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1444
+#: user-manual.txt:1565
 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 "
@@ -2699,7 +2946,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1450
+#: user-manual.txt:1571
 msgid ""
 "You 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 "
@@ -2707,14 +2954,14 @@ msgid ""
 "service. There isn’t an option to trigger upload manually."
 msgstr ""
 
-#. type: Title ====
-#: user-manual.txt:1452
+#. type: Title =====
+#: user-manual.txt:1573
 #, no-wrap
 msgid "Downloading dive locations to the _Subsurface_ divelog"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1461
+#: user-manual.txt:1582
 msgid ""
 "Download dive(s) from a dive computer or enter them manually into "
 "_Subsurface_ before obtaining the GPS coordinates from the server. The "
@@ -2726,13 +2973,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:1462
+#: user-manual.txt:1583
 #, no-wrap
 msgid "images/DownloadGPS.jpg"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1470
+#: user-manual.txt:1591
 msgid ""
 "Note that the _Apply_ button is now active. By clicking on it, you can "
 "update the locations of the newly entered or uploaded dives in "
@@ -2744,7 +2991,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1477
+#: user-manual.txt:1598
 msgid ""
 "Since _Subsurface_ matches GPS locations from the Android device and dive "
 "information from the dive computer based on date-time data, automatic "
@@ -2756,7 +3003,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1485
+#: user-manual.txt:1606
 msgid ""
 "Similar date-times may not always be possible and there may be many reasons "
 "for this (e.g. time zones).  _Subsurface_ may also be unable to decide which "
@@ -2769,12 +3016,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1489
+#: user-manual.txt:1610
 msgid "TIPS:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1492
+#: user-manual.txt:1613
 msgid ""
 "_Background service_ may fill the location list with unnecessary locations "
 "that don’t correspond to the exact dive point but do correspond to the "
@@ -2782,14 +3029,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1493
+#: user-manual.txt:1614
 msgid ""
 "Right now, these locations are difficult to delete from the server. In some "
 "situations it"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1496
+#: user-manual.txt:1617
 msgid ""
 "is better to clean up the list on the Android device before sending the dive "
 "points to the web server by simply deleting the inappropriate "
@@ -2798,7 +3045,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1499
+#: user-manual.txt:1620
 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 "
@@ -2807,13 +3054,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:1501
+#: user-manual.txt:1622
 #, no-wrap
 msgid "Adding photographs to dives"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1507
+#: user-manual.txt:1628
 msgid ""
 "Many (if not most) divers take a camera with them and take photographs "
 "during a dive. To match each photograph with a specific dive, _Subsurface_ "
@@ -2822,13 +3069,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:1508
+#: user-manual.txt:1629
 #, no-wrap
 msgid "Loading photos and synchronizing between dive computer and camera"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1512
+#: user-manual.txt:1633
 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 "
@@ -2836,26 +3083,26 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:1513
+#: user-manual.txt:1634
 #, no-wrap
 msgid "images/LoadImage1_f20.jpg"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1517
+#: user-manual.txt:1638
 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:1518
+#: user-manual.txt:1639
 #, no-wrap
 msgid "images/LoadImage2_f20.jpg"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1527
+#: user-manual.txt:1648
 msgid ""
 "This brings up the time synchronization dialog, shown below. But be aware "
 "that the time synchronization is not perfect between the dive computer used "
@@ -2866,12 +3113,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1529
+#: user-manual.txt:1650
 msgid "_Subsurface_ synchronizes in three ways:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1532
+#: user-manual.txt:1653
 #, no-wrap
 msgid ""
 "*Pro-actively*: Before the dive, ensure synchronization of the dive computer "
@@ -2881,7 +3128,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1543
+#: user-manual.txt:1664
 #, no-wrap
 msgid ""
 "*Manually*: If you wrote down the exact camera time at the start of a dive, "
@@ -2908,13 +3155,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:1544
+#: user-manual.txt:1665
 #, no-wrap
 msgid "images/LoadImage3b_f20.jpg"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1562
+#: user-manual.txt:1683
 #, no-wrap
 msgid ""
 "*By photograph*: There is a very slick way of synchronizing. If you take a\n"
@@ -2946,30 +3193,30 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1565
+#: user-manual.txt:1686
 msgid ""
 "If the timestamp of a photograph is more than 30 minutes before or after the "
 "dive, it is not placed on the dive profile."
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:1566
+#: user-manual.txt:1687
 #, no-wrap
 msgid "Viewing the photos"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1569
+#: user-manual.txt:1690
 msgid "After the images have been loaded, they appear in two places:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1571
+#: user-manual.txt:1692
 msgid "the _Photos_ tab of the *Notes* panel."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1575
+#: user-manual.txt:1696
 msgid ""
 "as tiny icons (stubs) on the dive profile at the appropriate positions "
 "reflecting the time each photograph was taken.  To view the photos on the "
@@ -2978,37 +3225,37 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:1576
+#: user-manual.txt:1697
 #, no-wrap
 msgid "images/icons/ShowPhotos_f20.png"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1579
+#: user-manual.txt:1700
 msgid "This results in a profile display as in the image below:"
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:1580
+#: user-manual.txt:1701
 #, no-wrap
 msgid "images/LoadImage4_f20.jpg"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1584
+#: user-manual.txt:1705
 msgid ""
 "If you hover the mouse over any of the photo icons, a thumbnail photo is "
 "shown of the appropriate photo. See the image below:"
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:1585
+#: user-manual.txt:1706
 #, no-wrap
 msgid "images/LoadImage5_f20.jpg"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1594
+#: user-manual.txt:1715
 msgid ""
 "Clicking on the thumbnail brings up a full size photo overlaid on the "
 "_Subsurface_ window. This allows good viewing of the added photographs. (see "
@@ -3019,19 +3266,19 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:1595
+#: user-manual.txt:1716
 #, no-wrap
 msgid "images/LoadImage6_f20.jpg"
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:1597
+#: user-manual.txt:1718
 #, no-wrap
 msgid "The _Photos_ tab"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1608
+#: user-manual.txt:1729
 msgid ""
 "Photographs associated with a dive are shown as thumbnails in the _Photos_ "
 "tab of the _Notes_ panel. Photos taken in rapid succession during a dive "
@@ -3047,13 +3294,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:1609
+#: user-manual.txt:1730
 #, no-wrap
 msgid "Photos on an external hard disk"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1619
+#: user-manual.txt:1740
 msgid ""
 "Most underwater photographers store photos on an external drive. If such a "
 "drive can be mapped by the operating system (almost always the case) the "
@@ -3070,13 +3317,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:1621
+#: user-manual.txt:1742
 #, no-wrap
 msgid "Moving photographs among directories, hard disks or computers"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1631
+#: user-manual.txt:1752
 #, no-wrap
 msgid ""
 "After a photograph has been loaded into _Subsurface_ and associated with a "
@@ -3098,7 +3345,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1635
+#: user-manual.txt:1756
 #, no-wrap
 msgid ""
 "When a photo is loaded into _Subsurface_, a fingerprint for the image is "
@@ -3110,26 +3357,26 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1638
+#: user-manual.txt:1759
 msgid ""
 "look through a particular directory (and all its subdirectories recursively) "
 "where photos have been moved to,"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1639
+#: user-manual.txt:1760
 msgid "calculate fingerprints for all photos in this directory, and"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1641
+#: user-manual.txt:1762
 msgid ""
 "if there is a match between a calculated fingerprint and the one originally "
 "calculated when a photo was"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1643
+#: user-manual.txt:1764
 msgid ""
 "loaded into _Subsurface_ (even if the original file name has changed), "
 "automatically update the directory information so that _Subsurface_ can find "
@@ -3137,7 +3384,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1648
+#: user-manual.txt:1769
 #, no-wrap
 msgid ""
 "This is done by selecting from the Main Menu: _File ->      Find moved "
@@ -3151,13 +3398,13 @@ msgid ""
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:1653
+#: user-manual.txt:1774
 #, no-wrap
 msgid "*Upgrading existing photo collections without fingerprints*\n"
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:1658
+#: user-manual.txt:1779
 msgid ""
 "_Subsurface_ automatically calculates fingerprints for all images that it "
 "can access.  When manipulating images, be sure all the images associated "
@@ -3165,40 +3412,40 @@ msgid ""
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:1660
+#: user-manual.txt:1781
 msgid ""
 "_Subsurface_ automatically checks and, if necessary, updates the "
 "fingerprints associated with a single dive if:"
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:1661
+#: user-manual.txt:1782
 msgid ""
 "The images associated with that dive are visible as thumbnails on the *Dive "
 "Profile*."
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:1662
+#: user-manual.txt:1783
 msgid ""
 "If you edit anything in the *Notes tab* panel and save the edits by "
 "selecting _Apply changes_."
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:1666
+#: user-manual.txt:1787
 #, no-wrap
 msgid "Logging special types of dives"
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:1669
+#: user-manual.txt:1790
 #, no-wrap
 msgid "Multicylinder dives"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1676
+#: user-manual.txt:1797
 msgid ""
 "_Subsurface_ easily handles dives involving more than one "
 "cylinder. Multi-cylinder diving usually happens (a) if a diver doesn’t have "
@@ -3210,7 +3457,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1680
+#: user-manual.txt:1801
 #, no-wrap
 msgid ""
 "*Describe the cylinders used during the dive* This is performed in the "
@@ -3221,7 +3468,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1685
+#: user-manual.txt:1806
 #, no-wrap
 msgid ""
 "*Record the times at which the switch from one cylinder to another was "
@@ -3234,7 +3481,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1693
+#: user-manual.txt:1814
 #, no-wrap
 msgid ""
 "*Record the cylinder changes on the dive profile*: If the latter option\n"
@@ -3251,7 +3498,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1697
+#: user-manual.txt:1818
 msgid ""
 "When this is complete, _Subsurface_ indicates the appropriate use of "
 "cylinders in the dive profile.  Below is a multi-cylinder dive, starting off "
@@ -3260,19 +3507,19 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:1698
+#: user-manual.txt:1819
 #, no-wrap
 msgid "images/multicylinder_dive.jpg"
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:1700
+#: user-manual.txt:1821
 #, no-wrap
 msgid "Sidemount dives"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1706
+#: user-manual.txt:1827
 msgid ""
 "Sidemount diving is just another form of multi-cylinder diving, often with "
 "both or all cylinders having the same gas mixture. Although it’s a popular "
@@ -3282,7 +3529,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1715
+#: user-manual.txt:1836
 #, no-wrap
 msgid ""
 "*During the dive, record cylinder switch events*. Since sidemount diving "
@@ -3304,7 +3551,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1718
+#: user-manual.txt:1839
 #, no-wrap
 msgid ""
 "*Within _Subsurface_ describe the cylinders used during the dive*. The diver "
@@ -3315,7 +3562,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1728
+#: user-manual.txt:1849
 #, no-wrap
 msgid ""
 "*Indicate cylinder change events on the _Subsurface_ dive profile*. Once the "
@@ -3340,32 +3587,32 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:1729
+#: user-manual.txt:1850
 #, no-wrap
 msgid "images/sidemount1.jpg"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1732
+#: user-manual.txt:1853
 msgid ""
 "This section gives an example of the versatility of _Subsurface_ as a dive "
 "logging tool."
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:1735
+#: user-manual.txt:1856
 #, no-wrap
 msgid "Semi-closed circuit rebreather (SCR) dives"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:1737
+#: user-manual.txt:1858
 #, no-wrap
 msgid "images/halcyon_RB80.jpg"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1747
+#: user-manual.txt:1868
 msgid ""
 "Passive semi-closed rebreathers (pSCR) are a technical advance in diving "
 "equipment that recirculates the breathing gas a diver uses, while removing "
@@ -3381,19 +3628,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1749
+#: user-manual.txt:1870
 msgid ""
 "To log pSCR dives, no special procedures are required. Use the normal steps "
 "outlined above:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1751
+#: user-manual.txt:1872
 msgid "Select pSCR in the _Dive Mode_ dropdown list on the *Info* panel."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1755
+#: user-manual.txt:1876
 msgid ""
 "pSCR diving often involves gas changes, requiring an additional cylinder.  "
 "Define all the appropriate cylinders as described above and indicate the "
@@ -3402,7 +3649,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1760
+#: user-manual.txt:1881
 msgid ""
 "If a pSCR _Dive Mode_ has been selected, the dive ceiling for that is "
 "adjusted for the oxygen drop across the mouthpiece, which often requires "
@@ -3412,25 +3659,25 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:1761
+#: user-manual.txt:1882
 #, no-wrap
 msgid "images/pSCR_profile.jpg"
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:1766
+#: user-manual.txt:1887
 #, no-wrap
 msgid "Closed circuit rebreather (CCR) dives"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:1768
+#: user-manual.txt:1889
 #, no-wrap
 msgid "images/APD.jpg"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1773
+#: user-manual.txt:1894
 msgid ""
 "Closed system rebreathers use advanced technology to recirculate gas that "
 "has been breathed. They also do two things to maintain a breathable oxygen "
@@ -3438,12 +3685,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1774
+#: user-manual.txt:1895
 msgid "remove carbon dioxide from the exhaled gas"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1783
+#: user-manual.txt:1904
 msgid ""
 "regulate the oxygen concentration to remain within safe diving limits.  The "
 "CCR interface of _Subsurface_ is currently experimental and under active "
@@ -3458,13 +3705,13 @@ msgid ""
 msgstr ""
 
 #. type: Title =====
-#: user-manual.txt:1784
+#: user-manual.txt:1905
 #, no-wrap
 msgid "Import a CCR dive"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1798
+#: user-manual.txt:1919
 msgid ""
 "See the section dealing with xref:S_ImportingAlienDiveLogs[Importing dive "
 "information from other digital sources]. From the main menu of _Subsurface_, "
@@ -3483,13 +3730,13 @@ msgid ""
 msgstr ""
 
 #. type: Title =====
-#: user-manual.txt:1799
+#: user-manual.txt:1920
 #, no-wrap
 msgid "Displayed information for a CCR dive"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1809
+#: user-manual.txt:1930
 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 "
@@ -3503,12 +3750,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1811
+#: user-manual.txt:1932
 msgid "For TWO O~2~ sensors the mean value of the two sensors are given."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1815
+#: user-manual.txt:1936
 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 "
@@ -3517,19 +3764,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1817
+#: user-manual.txt:1938
 msgid ""
 "If no sensor data are available, the pO~2~ value is assumed to be equal to "
 "the setpoint."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1819
+#: user-manual.txt:1940
 msgid "The mean pO~2~ of the sensors is indicated with a green line,"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1827
+#: user-manual.txt:1948
 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 "
@@ -3541,13 +3788,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:1828
+#: user-manual.txt:1949
 #, no-wrap
 msgid "images/CCR_preferences_f20.jpg"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1835
+#: user-manual.txt:1956
 msgid ""
 "Checking any of these boxes allows the display of additional oxygen-related "
 "information whenever the pO~2~ toolbar button on the _Profile_ panel is "
@@ -3558,13 +3805,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:1836
+#: user-manual.txt:1957
 #, no-wrap
 msgid "images/CCR_setpoint_f20.jpg"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1840
+#: user-manual.txt:1961
 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 "
@@ -3572,22 +3819,22 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1842
+#: user-manual.txt:1963
 msgid "Sensor 1: grey"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1843
+#: user-manual.txt:1964
 msgid "Sensor 2: blue"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1844
+#: user-manual.txt:1965
 msgid "Sensor 3: brown"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1848
+#: user-manual.txt:1969
 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 "
@@ -3595,13 +3842,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:1849
+#: user-manual.txt:1970
 #, no-wrap
 msgid "images/CCR_sensor_data_f20.jpg"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1854
+#: user-manual.txt:1975
 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, "
@@ -3609,7 +3856,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1858
+#: user-manual.txt:1979
 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 "
@@ -3618,7 +3865,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1866
+#: user-manual.txt:1987
 msgid ""
 "_Cylinder pressures_: Some CCR dive computers like the Poseidon MkVI record "
 "the pressures of the oxygen and diluent cylinders. The pressures of these "
@@ -3631,13 +3878,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:1867
+#: user-manual.txt:1988
 #, no-wrap
 msgid "images/CCR_dive_profile_f22.jpg"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1872
+#: user-manual.txt:1993
 msgid ""
 "_Equipment-specific information_: Equipment-specific information gathered by "
 "_Subsurface_ is shown in the xref:S_ExtraDataTab[Extra data tab]. This may "
@@ -3645,7 +3892,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1878
+#: user-manual.txt:1999
 msgid ""
 "The deco ceiling calculated by Subsurface is not very accurate because the "
 "precise pressure of nitrogen in the loop can usually not be determined from "
@@ -3657,13 +3904,13 @@ msgid ""
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:1879 user-manual.txt:2058
+#: user-manual.txt:2000 user-manual.txt:2180
 #, no-wrap
 msgid "images/icons/cceiling.jpg"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1884
+#: user-manual.txt:2005
 msgid ""
 "The default color of the computer-generated deco ceiling is white. This can "
 "be set to red by checking the appropriate check box after selecting _File -> "
@@ -3672,13 +3919,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:1885
+#: user-manual.txt:2006
 #, no-wrap
 msgid "images/CCR_dive_ceilingF22.jpg"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1889
+#: user-manual.txt:2010
 msgid ""
 "More equipment-specific information for downloading CCR dive logs for "
 "Poseidon MkVI and APD equipment can be found in "
@@ -3687,19 +3934,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ==
-#: user-manual.txt:1890
+#: user-manual.txt:2011
 #, no-wrap
 msgid "Obtaining more information about dives entered into the logbook"
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:1892
+#: user-manual.txt:2013
 #, no-wrap
 msgid "The *Info* tab (for individual dives)"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1899
+#: user-manual.txt:2020
 msgid ""
 "The Info tab gives some summary information about a particular dive that has "
 "been selected in the *Dive List*. Useful information here includes the "
@@ -3709,7 +3956,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1906
+#: user-manual.txt:2027
 msgid ""
 "Gas consumption and SAC calculations: _Subsurface_ calculates SAC and Gas "
 "consumption taking in account gas incompressibility, particularly at tank "
@@ -3718,13 +3965,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:1908
+#: user-manual.txt:2029
 #, no-wrap
 msgid "The *Extra Data* tab (usually for individual dives)"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1916
+#: user-manual.txt:2037
 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 "
@@ -3736,19 +3983,19 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:1917
+#: user-manual.txt:2038
 #, no-wrap
 msgid "images/ExtraDataTab_f20.jpg"
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:1919
+#: user-manual.txt:2040
 #, no-wrap
 msgid "The *Stats* tab (for groups of dives)"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1930
+#: user-manual.txt:2051
 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 "
@@ -3761,19 +4008,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:1932
+#: user-manual.txt:2053
 #, no-wrap
 msgid "The *Dive Profile*"
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:1934
+#: user-manual.txt:2055
 #, no-wrap
 msgid "images/Profile2.jpg"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1945
+#: user-manual.txt:2066
 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 "
@@ -3786,7 +4033,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block |
-#: user-manual.txt:1952
+#: user-manual.txt:2073
 #, no-wrap
 msgid ""
 "|*Color*|*Descent speed (m/min)*|*Ascent speed (m/min)*\n"
@@ -3798,7 +4045,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1957
+#: user-manual.txt:2078
 msgid ""
 "The profile also includes depth readings for the peaks and troughs in the "
 "graph.  So users should see the depth of the deepest point and other "
@@ -3807,13 +4054,13 @@ msgid ""
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:1958
+#: user-manual.txt:2079
 #, no-wrap
 msgid "images/icons/scale.jpg"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1963
+#: user-manual.txt:2084
 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 "
@@ -3822,7 +4069,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1966
+#: user-manual.txt:2087
 #, no-wrap
 msgid ""
 "*Water temperature* is displayed with its own blue line with temperature "
@@ -3831,7 +4078,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1973
+#: user-manual.txt:2094
 msgid ""
 "The dive profile can include graphs of the *partial pressures* of O~2~, "
 "N~2~, and He during the dive (see figure above) as well as a calculated and "
@@ -3842,13 +4089,13 @@ msgid ""
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:1974
+#: user-manual.txt:2095
 #, no-wrap
 msgid "images/icons/O2.jpg"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1978
+#: user-manual.txt:2099
 msgid ""
 "Clicking this button allows display of the partial pressure of *oxygen* "
 "during the dive. This is shown below the dive depth and water temperature "
@@ -3856,26 +4103,26 @@ msgid ""
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:1979
+#: user-manual.txt:2100
 #, no-wrap
 msgid "images/icons/N2.jpg"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1982
+#: user-manual.txt:2103
 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:1983
+#: user-manual.txt:2104
 #, no-wrap
 msgid "images/icons/He.jpg"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1987
+#: user-manual.txt:2108
 msgid ""
 "Clicking this button allows display of the partial pressure of *helium* "
 "during the dive.  This is only important to divers using Trimix, Helitrox or "
@@ -3883,7 +4130,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2000
+#: user-manual.txt:2121
 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 "
@@ -3898,13 +4145,13 @@ msgid ""
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:2001
+#: user-manual.txt:2122
 #, no-wrap
 msgid "images/icons/Heartbutton.png"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2005
+#: user-manual.txt:2126
 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 "
@@ -3912,7 +4159,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2012
+#: user-manual.txt:2133
 #, no-wrap
 msgid ""
 "It is possible to *zoom* into the profile graph. This is done either by "
@@ -3926,19 +4173,19 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2012
+#: user-manual.txt:2134
 #, no-wrap
 msgid "images/MeasuringBar.png"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:2014
+#: user-manual.txt:2136
 #, no-wrap
 msgid "images/icons/ruler.jpg"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2022
+#: user-manual.txt:2144
 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 "
@@ -3948,13 +4195,13 @@ msgid ""
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:2023
+#: user-manual.txt:2145
 #, no-wrap
 msgid "images/icons/ShowPhotos.png"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2030
+#: user-manual.txt:2152
 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 "
@@ -3963,7 +4210,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2057
+#: user-manual.txt:2179
 msgid ""
 "The profile can also include the dive computer reported *ceiling* (more "
 "precisely, the deepest deco stop that the dive computer calculated for each "
@@ -3992,7 +4239,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2063
+#: user-manual.txt:2185
 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 "
@@ -4000,13 +4247,13 @@ msgid ""
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:2064
+#: user-manual.txt:2186
 #, no-wrap
 msgid "images/icons/ceiling1.jpg"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2069
+#: user-manual.txt:2191
 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 "
@@ -4015,13 +4262,13 @@ msgid ""
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:2070
+#: user-manual.txt:2192
 #, no-wrap
 msgid "images/icons/ceiling2.jpg"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2074
+#: user-manual.txt:2196
 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 "
@@ -4029,32 +4276,32 @@ msgid ""
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:2075
+#: user-manual.txt:2197
 #, no-wrap
 msgid "images/icons/ceiling3.jpg"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2079
+#: user-manual.txt:2201
 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:2080
+#: user-manual.txt:2202
 #, no-wrap
 msgid "images/Ceilings2.jpg"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:2082
+#: user-manual.txt:2204
 #, no-wrap
 msgid "images/icons/ShowCylindersButton.jpg"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2088
+#: user-manual.txt:2210
 msgid ""
 "By selecting this icon, the different cylinders used during a dive can be "
 "represented as a colored bar at the bottom of the *Dive Profile*. In general "
@@ -4065,19 +4312,19 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2089
+#: user-manual.txt:2211
 #, no-wrap
 msgid "images/ShowCylinders_f20.jpg"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:2092
+#: user-manual.txt:2214
 #, no-wrap
-msgid "images/tissues.jpg"
+msgid "images/icons/tissues.jpg"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2105
+#: user-manual.txt:2227
 msgid ""
 "Display inert gas tissue pressures relative to ambient inert gas pressure "
 "(horizontal grey line).  Tissue pressures are calculated using the Bühlmann "
@@ -4095,13 +4342,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2106
+#: user-manual.txt:2228
 #, no-wrap
 msgid "images/tissuesGraph.jpg"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2114
+#: user-manual.txt:2236
 msgid ""
 "Gradient Factor settings strongly affect the calculated ceilings and their "
 "depths.  For more information about Gradient factors, see the section on "
@@ -4114,7 +4361,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2116
+#: user-manual.txt:2238
 #, no-wrap
 msgid ""
 " ** http://www.tek-dive.com/portal/upload/M-Values.pdf[Understanding "
@@ -4122,7 +4369,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2118
+#: user-manual.txt:2240
 #, no-wrap
 msgid ""
 " ** "
@@ -4131,13 +4378,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:2120
+#: user-manual.txt:2242
 #, no-wrap
 msgid "The Dive Profile context menu"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2139
+#: user-manual.txt:2261
 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 lets you create "
@@ -4158,13 +4405,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:2141
+#: user-manual.txt:2263
 #, no-wrap
 msgid "The *Information Box*"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2150
+#: user-manual.txt:2272
 msgid ""
 "The Information box displays a large range of information about the dive "
 "profile. Normally the Information Box is located to the top left of the "
@@ -4177,13 +4424,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2151
+#: user-manual.txt:2273
 #, no-wrap
 msgid "images/InfoBox2.jpg"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2168
+#: user-manual.txt:2290
 msgid ""
 "When the mouse points inside the *Dive Profile* panel, the information box "
 "expands and shows many data items. In this situation, the data reflect the "
@@ -4203,20 +4450,20 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2171
+#: user-manual.txt:2293
 msgid ""
 "The user has control over the display of some statistics, shown as four "
 "buttons on the left of the profile panel. These are:"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:2172
+#: user-manual.txt:2294
 #, no-wrap
 msgid "images/icons/MOD.jpg"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2181
+#: user-manual.txt:2303
 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 "
@@ -4228,13 +4475,13 @@ msgid ""
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:2182
+#: user-manual.txt:2304
 #, no-wrap
 msgid "images/icons/NDL.jpg"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2194
+#: user-manual.txt:2316
 msgid ""
 "Clicking this button causes the Information Box to display either the "
 "*No-deco Limit (NDL)* or the *Total Time to Surface (TTS)*. NDL is the time "
@@ -4251,13 +4498,13 @@ msgid ""
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:2195
+#: user-manual.txt:2317
 #, no-wrap
 msgid "images/icons/SAC.jpg"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2204
+#: user-manual.txt:2326
 msgid ""
 "Clicking this button causes the Information Box to display the *Surface Air "
 "Consumption (SAC)*.  SAC is an indication of the surface-normalized "
@@ -4270,13 +4517,13 @@ msgid ""
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:2205
+#: user-manual.txt:2327
 #, no-wrap
 msgid "images/icons/EAD.jpg"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2220
+#: user-manual.txt:2342
 msgid ""
 "Clicking this button displays the *Equivalent Air Depth (EAD)* for nitrox "
 "dives as well as the *Equivalent Narcotic Depth (END)* for trimix "
@@ -4292,20 +4539,20 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2222
+#: user-manual.txt:2344
 msgid ""
 "Figure (*B*) above shows an information box with a nearly complete set of "
 "data."
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:2224
+#: user-manual.txt:2346
 #, no-wrap
 msgid "The Gas Pressure Bar Graph"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2231
+#: user-manual.txt:2353
 msgid ""
 "On the left of the *Information Box* is a vertical bar graph showing the "
 "pressures of the nitrogen (and other inert gases, e.g. helium, if "
@@ -4316,13 +4563,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2232
+#: user-manual.txt:2354
 #, no-wrap
 msgid "images/GasPressureBarGraph.jpg"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2238
+#: user-manual.txt:2360
 msgid ""
 "The light green area indicates the total gas, with the top margin of the "
 "light green area showing the total gas pressure inhaled by the diver and "
@@ -4332,7 +4579,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2244
+#: user-manual.txt:2366
 msgid ""
 "The horizontal black line underneath the light green margin indicates the "
 "equilibrium pressure of the inert gases inhaled by the diver, usually "
@@ -4343,7 +4590,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2248
+#: user-manual.txt:2370
 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 "
@@ -4351,7 +4598,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2253
+#: user-manual.txt:2375
 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 "
@@ -4361,7 +4608,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2257
+#: user-manual.txt:2379
 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 "
@@ -4369,7 +4616,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2260
+#: user-manual.txt:2382
 msgid ""
 "These five values are shown on the left in the graph above. The way the Gas "
 "Pressure Bar Graph changes during a dive can be seen on the right hand side "
@@ -4377,7 +4624,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2263
+#: user-manual.txt:2385
 msgid ""
 "Graph *A* indicates the start of a dive with the diver at the surface. The "
 "pressures in all the tissue compartments are still at the equilibrium "
@@ -4385,7 +4632,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2266
+#: user-manual.txt:2388
 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, so their gas "
@@ -4393,7 +4640,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2271
+#: user-manual.txt:2393
 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 "
@@ -4403,7 +4650,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2277
+#: user-manual.txt:2399
 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 "
@@ -4414,7 +4661,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2282
+#: user-manual.txt:2404
 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 "
@@ -4424,19 +4671,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ==
-#: user-manual.txt:2285
+#: user-manual.txt:2407
 #, no-wrap
 msgid "Organizing the logbook (Manipulating groups of dives)"
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:2287
+#: user-manual.txt:2409
 #, no-wrap
 msgid "The Dive List context menu"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2291
+#: user-manual.txt:2413
 msgid ""
 "Several actions on either a single dive, or a group of dives, can be "
 "performed using the Dive List Context Menu.  It is found by selecting either "
@@ -4445,30 +4692,30 @@ msgstr ""
 
 #.  TODO: NEEDS REPLACEMENT
 #. type: Target for macro image
-#: user-manual.txt:2293
+#: user-manual.txt:2415
 #, no-wrap
 msgid "images/ContextMenu.jpg"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2296
+#: user-manual.txt:2418
 msgid "The context menu is used in many functions described below."
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:2297
+#: user-manual.txt:2419
 #, no-wrap
 msgid "Customizing the columns showed in the *Dive List* panel"
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2299
+#: user-manual.txt:2421
 #, no-wrap
 msgid "images/DiveListOptions.jpg"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2307
+#: user-manual.txt:2429
 msgid ""
 "The default information in the *Dive List* includes, for each dive, "
 "Dive_number, Date, Rating, Dive_depth, Dive_duration and Dive_location. This "
@@ -4482,13 +4729,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:2309
+#: user-manual.txt:2431
 #, no-wrap
 msgid "Renumbering the dives"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2321
+#: user-manual.txt:2443
 msgid ""
 "Dives are normally numbered incrementally from non-recent dives (low "
 "sequence numbers) to recent dives (higher sequence numbers).  Numbering of "
@@ -4502,7 +4749,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2326
+#: user-manual.txt:2448
 msgid ""
 "You can also renumber a few selected dives in the dive list. Select the "
 "dives that need renumbering. Right-click on the selected list and use the "
@@ -4511,13 +4758,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:2328
+#: user-manual.txt:2450
 #, no-wrap
 msgid "Grouping dives into trips and manipulating trips"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2336
+#: user-manual.txt:2458
 msgid ""
 "For regular divers, the dive list can rapidly become very long. _Subsurface_ "
 "can group dives into _trips_. It does this by grouping dives that have "
@@ -4528,13 +4775,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2337
+#: user-manual.txt:2459
 #, no-wrap
 msgid "images/Group2.jpg"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2343
+#: user-manual.txt:2465
 msgid ""
 "Grouping into trips allows a rapid way of accessing individual dives without "
 "having to scan a long lists of dives. To group the dives in a dive list, "
@@ -4543,13 +4790,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:2344
+#: user-manual.txt:2466
 #, no-wrap
 msgid "Editing the title and associated information for a particular trip"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2357
+#: user-manual.txt:2479
 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 "
@@ -4563,13 +4810,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:2358
+#: user-manual.txt:2480
 #, no-wrap
 msgid "Viewing the dives during a particular trip"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2363
+#: user-manual.txt:2485
 msgid ""
 "Once the dives have been grouped into trips, you can expand one or more "
 "trips by clicking the arrow-head on the left of each trip title. This "
@@ -4577,13 +4824,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:2364
+#: user-manual.txt:2486
 #, no-wrap
 msgid "Collapsing or expanding dive information for different trips"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2369
+#: user-manual.txt:2491
 msgid ""
 "After selecting a particular trip in the dive list, the context menu allows "
 "several options to expand or collapse dives within trips. This includes "
@@ -4591,13 +4838,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:2370
+#: user-manual.txt:2492
 #, no-wrap
 msgid "Merging dives from more than one trip into a single trip"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2375
+#: user-manual.txt:2497
 msgid ""
 "After selecting a trip title, the context menu allows the merging of trips "
 "by either merging the selected trip with the trip below or with the trip "
@@ -4605,13 +4852,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:2376
+#: user-manual.txt:2498
 #, no-wrap
 msgid "Splitting a single trip into more than one trip"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2385
+#: user-manual.txt:2507
 msgid ""
 "If a trip includes ten dives, you can split this trip into two trips (trip "
 "1: top 4 dives; trip 2: bottom 6 dives) by selecting and right-clicking the "
@@ -4622,25 +4869,25 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2386
+#: user-manual.txt:2508
 #, no-wrap
 msgid "images/SplitDive3a.jpg"
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:2388
+#: user-manual.txt:2510
 #, no-wrap
 msgid "Manipulating single dives"
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:2390
+#: user-manual.txt:2512
 #, no-wrap
 msgid "Delete a dive from the dive log"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2397
+#: user-manual.txt:2519
 msgid ""
 "Dives can be permanently deleted from the dive log by selecting and "
 "right-clicking them to bring up the context menu, then selecting *Delete "
@@ -4650,13 +4897,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:2398
+#: user-manual.txt:2520
 #, no-wrap
 msgid "Unlink a dive from a trip"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2405
+#: user-manual.txt:2527
 msgid ""
 "You can unlink dives from the trip to which they belong. To do this, select "
 "and right-click the relevant dives to bring up the context menu. Then select "
@@ -4666,13 +4913,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:2406
+#: user-manual.txt:2528
 #, no-wrap
 msgid "Add a dive to the trip immediately above"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2411
+#: user-manual.txt:2533
 msgid ""
 "Selected dives can be moved from the trip to which they belong and placed "
 "within a separate trip. To do this, select and right-click the dive(s) to "
@@ -4680,13 +4927,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:2412
+#: user-manual.txt:2534
 #, no-wrap
 msgid "Shift the start time of dive(s)"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2422
+#: user-manual.txt:2544
 msgid ""
 "Sometimes it’s necessary to adjust the start time of a dive. This may apply "
 "to situations where dives are done in different time zones or when the dive "
@@ -4698,13 +4945,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:2423
+#: user-manual.txt:2545
 #, no-wrap
 msgid "Merge dives into a single dive"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2433
+#: user-manual.txt:2555
 msgid ""
 "Sometimes a dive is briefly interrupted, for example, if a diver returns to "
 "the surface for a few minutes. That results in two or more dives being "
@@ -4718,19 +4965,19 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2434
+#: user-manual.txt:2556
 #, no-wrap
 msgid "images/MergedDive.png"
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:2436
+#: user-manual.txt:2558
 #, no-wrap
 msgid "Undo dive manipulations"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2442
+#: user-manual.txt:2564
 msgid ""
 "Important actions on dives or trips, described above, can be undone or "
 "redone.  This includes: _delete dives_, _merge dives_, _renumber dives_ and "
@@ -4740,13 +4987,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:2445
+#: user-manual.txt:2567
 #, no-wrap
 msgid "Filtering the dive list"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2451
+#: user-manual.txt:2573
 msgid ""
 "The dives in the *Dive List* panel can be filtered, so you can select only "
 "some of the dives based on their attributes, e.g. dive tags, dive site, dive "
@@ -4756,7 +5003,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2459
+#: user-manual.txt:2581
 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 "
@@ -4770,13 +5017,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2460
+#: user-manual.txt:2582
 #, no-wrap
 msgid "images/Filterpanel.jpg"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2469
+#: user-manual.txt:2591
 msgid ""
 "Four filter criteria may be used to filter the dive list: dive tags, person "
 "(buddy / divemaster), dive site and dive suit.  Each of these is represented "
@@ -4789,7 +5036,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2477
+#: user-manual.txt:2599
 msgid ""
 "To activate filtering of the dive list, check at least one check box in one "
 "of the four check lists. The dive list is then shortened to include only the "
@@ -4801,36 +5048,36 @@ msgid ""
 msgstr ""
 
 #. type: Title ==
-#: user-manual.txt:2479
+#: user-manual.txt:2601
 #, no-wrap
 msgid "Exporting the dive log or parts of the dive log"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2482
+#: user-manual.txt:2604
 msgid "There are two ways to export dive information from Subsurface:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2484
+#: user-manual.txt:2606
 msgid "Export dive information to _Facebook_"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2486
+#: user-manual.txt:2608
 msgid ""
 "xref:S_Export_other[Export dive information to other destinations or "
 "formats]"
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:2488
+#: user-manual.txt:2610
 #, no-wrap
 msgid "Exporting dive information to _Facebook_"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2497
+#: user-manual.txt:2619
 msgid ""
 "Export of dives to _Facebook_ is handled differently from other types of "
 "export because a connection to _Facebook_ is required, needing a _Facebook_ "
@@ -4842,13 +5089,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2498
+#: user-manual.txt:2620
 #, no-wrap
 msgid "images/facebook1_f20.jpg"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2503
+#: user-manual.txt:2625
 msgid ""
 "From the _Subsurface_ window it’s easy to determine whether _Subsurface_ has "
 "a valid connection to _Facebook_ From the *Main Menu*, select _Share on -> "
@@ -4858,7 +5105,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2514
+#: user-manual.txt:2636
 msgid ""
 "Having established a login to _Facebook_, transferring a dive profileto a "
 "_Facebook_ timeline is easy.  Be sure the dive to be transferred to the "
@@ -4878,7 +5125,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2519
+#: user-manual.txt:2641
 msgid ""
 "Both the album created and the post to your timeline will be marked as "
 "private. In order for friends to be able to see it, change its permissions "
@@ -4886,13 +5133,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2520
+#: user-manual.txt:2642
 #, no-wrap
 msgid "images/facebook2_f20.jpg"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2524
+#: user-manual.txt:2646
 msgid ""
 "If required, then close the _Facebook_ connection by either closing "
 "_Subsurface_ or by selecting _File -> Preferences -> Facebook_ from the Main "
@@ -4900,13 +5147,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:2526
+#: user-manual.txt:2648
 #, no-wrap
 msgid "Export dive information to other destinations or formats"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2531
+#: user-manual.txt:2653
 msgid ""
 "For non-_Facebook exports_, the export function can be found by selecting "
 "_File -> Export_, which brings up the Export dialog. This dialog always "
@@ -4916,23 +5163,23 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2532
+#: user-manual.txt:2654
 #, no-wrap
 msgid "images/Export_f20.jpg"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2535
+#: user-manual.txt:2657
 msgid "A dive log or part of it can be saved in three formats:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2537
+#: user-manual.txt:2659
 msgid "_Subsurface XML_ format. This is the native format used by _Subsurface_."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2541
+#: user-manual.txt:2663
 msgid ""
 "Universal Dive Data Format (_UDDF_). Refer to _http://uddf.org_ for more "
 "information.  UDDF is a generic format that enables communication among many "
@@ -4940,7 +5187,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2545
+#: user-manual.txt:2667
 msgid ""
 "_Divelogs.de_, an Internet-based dive log repository. In order to upload to "
 "_Divelogs.de_, you need a user-ID as well as a password for "
@@ -4949,7 +5196,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2549
+#: user-manual.txt:2671
 msgid ""
 "_DiveShare_ is also a dive log repository on the Internet focusing on "
 "recreational dives. To upload dives, you need a user ID, so registration "
@@ -4957,7 +5204,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2554
+#: user-manual.txt:2676
 msgid ""
 "_CSV dive details_, that includes the most critical information of the dive "
 "profile. Included information of a dive is: dive number, date, time, buddy, "
@@ -4966,7 +5213,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2557
+#: user-manual.txt:2679
 msgid ""
 "_CSV dive profile_, that includes a large amount of detail for each dive, "
 "including the depth profile, temperature and pressure information of each "
@@ -4974,7 +5221,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2570
+#: user-manual.txt:2692
 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 "
@@ -4991,7 +5238,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2575
+#: user-manual.txt:2697
 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. If you "
@@ -5000,13 +5247,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2576
+#: user-manual.txt:2698
 #, no-wrap
 msgid "images/mapview_f20.jpg"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2583
+#: user-manual.txt:2705
 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 "
@@ -5015,12 +5262,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2585
+#: user-manual.txt:2707
 msgid "_General Settings_, under the HTML tab, provides the following options:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2593
+#: user-manual.txt:2715
 #, no-wrap
 msgid ""
 "** Subsurface Numbers: if this option is checked, the dive(s) are exported "
@@ -5038,27 +5285,27 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2596
+#: user-manual.txt:2718
 msgid ""
 "Under _Style Options_ some style-related options are available like font "
 "size and theme."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2599
+#: user-manual.txt:2721
 msgid ""
 "Export to other formats can be done through third party facilities, for "
 "instance _www.divelogs.de_."
 msgstr ""
 
 #. type: Title ==
-#: user-manual.txt:2601
+#: user-manual.txt:2723
 #, no-wrap
 msgid "Keeping a _Subsurface_ dive log in the Cloud"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2611
+#: user-manual.txt:2733
 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’s important "
@@ -5072,7 +5319,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2617
+#: user-manual.txt:2739
 msgid ""
 "_Subsurface_ includes access to a transparently integrated cloud storage "
 "back end that is available to all Subsurface users. Storing and retrieving a "
@@ -5083,13 +5330,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:2618
+#: user-manual.txt:2740
 #, no-wrap
 msgid "Create a cloud storage account"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2635
+#: user-manual.txt:2757
 #, no-wrap
 msgid ""
 "** Open the *Network Preferences* by selecting _File_ -> _Preferences_ -> "
@@ -5117,13 +5364,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:2636
+#: user-manual.txt:2758
 #, no-wrap
 msgid "Using _Subsurface cloud storage_"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2646
+#: user-manual.txt:2768
 #, no-wrap
 msgid ""
 "** Once the cloud storage has been initialized, two new items appear in "
@@ -5142,7 +5389,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2651
+#: user-manual.txt:2773
 #, no-wrap
 msgid ""
 "** _Subsurface_ keeps a local copy of the data and the cloud facility "
@@ -5155,13 +5402,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:2653
+#: user-manual.txt:2775
 #, no-wrap
 msgid "Web access to _Subsurface cloud storage_"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2663
+#: user-manual.txt:2785
 msgid ""
 "One of the nice side benefits of using _Subsurface cloud storage_ is that "
 "you can also access your dive data from any web browser. Simply open "
@@ -5174,13 +5421,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:2664
+#: user-manual.txt:2786
 #, no-wrap
 msgid "Other cloud services"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2674
+#: user-manual.txt:2796
 msgid ""
 "If you prefers not to use the integrated cloud storage of dive logs (and "
 "don't need the web access), it’s simple to store dive logs in the cloud "
@@ -5191,13 +5438,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2675
+#: user-manual.txt:2797
 #, no-wrap
 msgid "images/Cloud.jpg"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2684
+#: user-manual.txt:2806
 msgid ""
 "The _Dropbox_ program creates a copy of the _Dropbox_ Internet Cloud content "
 "on your desktop computer. When the computer is connected to the Internet, "
@@ -5210,7 +5457,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2691
+#: user-manual.txt:2813
 msgid ""
 "In this way a dive log in your _Dropbox_ folder can be accessed seamlessly "
 "from the Internet and can be accessed anywhere with Internet "
@@ -5220,7 +5467,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2697
+#: user-manual.txt:2819
 msgid ""
 "Alternatively you can use _Dropbox_ as a way back up your dive log. To Store "
 "a dive log on _Dropbox_, select _File -> Save as_ from the _Subsurface_ main "
@@ -5231,20 +5478,20 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2700
+#: user-manual.txt:2822
 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:2703
+#: user-manual.txt:2825
 #, no-wrap
 msgid "Printing a dive log"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2707
+#: user-manual.txt:2829
 #, no-wrap
 msgid ""
 "_Subsurface_ provides a simple and flexible way to print a whole dive log or "
@@ -5254,19 +5501,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2709
+#: user-manual.txt:2831
 msgid "Some decisions need to be made before printing:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2712
+#: user-manual.txt:2834
 msgid ""
 "Should the whole dive log be printed or only part of it? If only part is "
 "required, select the required dives from the *Dive List* panel."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2714
+#: user-manual.txt:2836
 msgid ""
 "If the dive profiles are printed, what gas partial pressure information "
 "should be shown? Select the appropriate toggle-buttons on the button bar to "
@@ -5274,7 +5521,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2717
+#: user-manual.txt:2839
 msgid ""
 "If _File -> Print_ is selected from the Main menu, the dialogue below (image "
 "*A*) appears. Three specifications are needed to get the desired information "
@@ -5282,35 +5529,35 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2718 user-manual.txt:4162
+#: user-manual.txt:2840 user-manual.txt:4284
 #, no-wrap
 msgid "images/Print1_f22.jpg"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2721
+#: user-manual.txt:2843
 msgid "Under _Print type_ select one of two options:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2723
+#: user-manual.txt:2845
 msgid ""
 "_Dive list print_: Print dives from the *Dive List* panel with profiles and "
 "other information."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2724
+#: user-manual.txt:2846
 msgid "_Statistics print_: Print yearly statistics of the dives."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2726
+#: user-manual.txt:2848
 msgid "Under _Print options_ select:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2731
+#: user-manual.txt:2853
 msgid ""
 "Printing only the dives selected from the dive list before activating the "
 "print dialogue by checking the box _Print only selected dives_. If this "
@@ -5318,73 +5565,73 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2733
+#: user-manual.txt:2855
 msgid ""
 "Printing in color, done by checking the box with _Print in color. If this "
 "check box is not checked, printing is in black and white."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2736
+#: user-manual.txt:2858
 msgid ""
 "Under _Template_ select a template to be used as the page layout. There are "
 "several choices.  (see image *B*, above)."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2738
+#: user-manual.txt:2860
 msgid "_Table_: This prints a summary table of all dives selected (see below)."
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2739
+#: user-manual.txt:2861
 #, no-wrap
 msgid "images/Print_summarylist_f22.jpg"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2742
+#: user-manual.txt:2864
 msgid ""
 "_Flow layout_: Print the text associated with each dive without printing the "
 "dive profiles"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2743
+#: user-manual.txt:2865
 msgid "of each dive (see below):"
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2744
+#: user-manual.txt:2866
 #, no-wrap
 msgid "images/Print_flow_layout_f22.jpg"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2747
+#: user-manual.txt:2869
 msgid ""
 "_One Dive_: Print one dive per page, also showing the dive profile (see "
 "below)"
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2748
+#: user-manual.txt:2870
 #, no-wrap
 msgid "images/print2_f22.jpg"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2752
+#: user-manual.txt:2874
 msgid "_Two Dives_: Print two dives per page, also showing the dive profiles."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2753
+#: user-manual.txt:2875
 msgid "_Six Dives_: Print six dives per page, also showing the dive profiles."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2757
+#: user-manual.txt:2879
 msgid ""
 "You can _Preview_ the printed page by selecting the _Preview_ button on the "
 "dialogue (see image *A* at the start of this section). After preview, you "
@@ -5393,7 +5640,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2761
+#: user-manual.txt:2883
 msgid ""
 "Next, select the _Print_ button (see image *A* at the start of this "
 "section). This activates the regular print dialogue used by the operating "
@@ -5402,13 +5649,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2762
+#: user-manual.txt:2884
 #, no-wrap
 msgid "images/Print_print_f22.jpg"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2767
+#: user-manual.txt:2889
 msgid ""
 "Set the print resolution of the printer to an appropriate value by changing "
 "the printer _Properties_. Finally, select the _Print_ button to print the "
@@ -5417,19 +5664,19 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2768
+#: user-manual.txt:2890
 #, no-wrap
 msgid "images/Printpreview.jpg"
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:2770
+#: user-manual.txt:2892
 #, no-wrap
 msgid "Writing a custom print template (advanced)"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2776
+#: user-manual.txt:2898
 msgid ""
 "Writing a custom template is an effective way to produce highly customized "
 "printouts. Subsurface uses HTML templates to render printing. You can create "
@@ -5440,13 +5687,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ==
-#: user-manual.txt:2778
+#: user-manual.txt:2900
 #, no-wrap
 msgid "Configuring a dive computer"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2787
+#: user-manual.txt:2909
 msgid ""
 "_Subsurface_ lets you configure a dive computer. Currently the "
 "Heinrichs-Weikamp (OSTC 2, OSTC 3) and Suunto Vyper (Stinger, Mosquito, D3, "
@@ -5461,7 +5708,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2792
+#: user-manual.txt:2914
 msgid ""
 "Once the dive computer is connected to the _Subsurface_ computer, select "
 "_File -> Configure dive computer_ from the _Main Menu_. Provide the "
@@ -5471,20 +5718,20 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2793
+#: user-manual.txt:2915
 #, no-wrap
 msgid "images/Configure_dc_f20.jpg"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2796
+#: user-manual.txt:2918
 msgid ""
 "Using the appropriate buttons on the configuration panel, the following "
 "actions can be done:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2799
+#: user-manual.txt:2921
 #, no-wrap
 msgid ""
 "*Retrieve available details*. This loads the existing configuration from the "
@@ -5493,7 +5740,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2801
+#: user-manual.txt:2923
 #, no-wrap
 msgid ""
 "*Save changes to device*. This changes the configuration of the\n"
@@ -5502,7 +5749,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2803
+#: user-manual.txt:2925
 #, no-wrap
 msgid ""
 "*Backup*. This saves the configuration data to a file. _Subsurface_ asks "
@@ -5511,7 +5758,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2805
+#: user-manual.txt:2927
 #, no-wrap
 msgid ""
 "*Restore backup*. This loads the information from a backup file and displays "
@@ -5520,7 +5767,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2807
+#: user-manual.txt:2929
 #, no-wrap
 msgid ""
 "*Update firmware*. If new firmware is available for the dive computer, this "
@@ -5529,13 +5776,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ==
-#: user-manual.txt:2810
+#: user-manual.txt:2932
 #, no-wrap
 msgid "Setting user _Preferences_ for _Subsurface_"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2819
+#: user-manual.txt:2941
 msgid ""
 "There are several user-definable settings within _Subsurface_, found by "
 "selecting _File -> Preferences_. The settings are in seven groups: "
@@ -5548,24 +5795,24 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:2820
+#: user-manual.txt:2942
 #, no-wrap
 msgid "Defaults"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2823
+#: user-manual.txt:2945
 msgid "There are several settings in the *Defaults* panel:"
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2824
+#: user-manual.txt:2946
 #, no-wrap
 msgid "images/Pref1_f20.jpg"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2828
+#: user-manual.txt:2950
 #, no-wrap
 msgid ""
 "  ** *Lists and tables*: Here you can specify the font type and font size of "
@@ -5575,7 +5822,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2833
+#: user-manual.txt:2955
 #, no-wrap
 msgid ""
 "  ** *Dives*: For the _Default Dive File_ you need to specify the directory "
@@ -5588,7 +5835,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2834
+#: user-manual.txt:2956
 #, no-wrap
 msgid ""
 "_No default file_: When checked, _Subsurface_ does not automatically load a "
@@ -5596,7 +5843,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2836
+#: user-manual.txt:2958
 #, no-wrap
 msgid ""
 "_Local default file_: When checked, _Subsurface_ automatically loads a dive "
@@ -5605,7 +5852,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2838
+#: user-manual.txt:2960
 #, no-wrap
 msgid ""
 "_Cloud storage default file_: When checked, _Subsurface automatically loads "
@@ -5615,7 +5862,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2840
+#: user-manual.txt:2962
 #, no-wrap
 msgid ""
 "** *Display invalid*:  Dives can be marked as invalid (when a user wishes to "
@@ -5623,7 +5870,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2843
+#: user-manual.txt:2965
 #, no-wrap
 msgid ""
 "dives that he/she doesn't consider valid dives, e.g. pool dives, but still "
@@ -5634,19 +5881,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2845
+#: user-manual.txt:2967
 #, no-wrap
 msgid "** *Default cylinder*: Specify the default cylinder listed in\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2846
+#: user-manual.txt:2968
 #, no-wrap
 msgid "the *Equipment* tab of the *Notes* panel.\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2848
+#: user-manual.txt:2970
 #, no-wrap
 msgid ""
 "** *Animations*: Some actions in showing the dive profile are performed "
@@ -5654,7 +5901,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2854
+#: user-manual.txt:2976
 #, no-wrap
 msgid ""
 "animations. For instance, the axis values for depth and time change from "
@@ -5670,7 +5917,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2856
+#: user-manual.txt:2978
 #, no-wrap
 msgid ""
 "** *Clear all settings*: As indicated in the button below this heading, all "
@@ -5678,25 +5925,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2857
+#: user-manual.txt:2979
 #, no-wrap
 msgid "cleared and set to default values.\n"
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:2858
+#: user-manual.txt:2980
 #, no-wrap
 msgid "Units"
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2859
+#: user-manual.txt:2981
 #, no-wrap
 msgid "images/Pref2_f20.jpg"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2866
+#: user-manual.txt:2988
 msgid ""
 "Here you can choose between metric and imperial units of depth, pressure, "
 "volume, temperature and mass. By selecting the Metric or Imperial radio "
@@ -5707,7 +5954,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2872
+#: user-manual.txt:2994
 msgid ""
 "Regardless of the above settings, dive time measurements can be either in "
 "seconds or minutes.  Choose the appropriate option. GPS coordinates can be "
@@ -5716,24 +5963,24 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:2873
+#: user-manual.txt:2995
 #, no-wrap
 msgid "Graph"
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2875
+#: user-manual.txt:2997
 #, no-wrap
 msgid "images/Pref3_f20.jpg"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2879
+#: user-manual.txt:3001
 msgid "This panel allows two type of selections:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2901
+#: user-manual.txt:3023
 #, no-wrap
 msgid ""
 "*Show*: Here you can specify the amount of information shown as part of\n"
@@ -5776,13 +6023,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2903
+#: user-manual.txt:3025
 #, no-wrap
 msgid "*Misc*:\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2916
+#: user-manual.txt:3038
 #, no-wrap
 msgid ""
 "** Gradient Factors (GFLow and GFHigh):* Set the _gradient factors_ used "
@@ -5809,7 +6056,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2918
+#: user-manual.txt:3040
 #, no-wrap
 msgid ""
 " *** http://www.tek-dive.com/portal/upload/M-Values.pdf[Understanding "
@@ -5817,7 +6064,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2920
+#: user-manual.txt:3042
 #, no-wrap
 msgid ""
 " *** "
@@ -5826,7 +6073,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2924
+#: user-manual.txt:3046
 #, no-wrap
 msgid ""
 " ** _CCR: Show setpoints when viewing pO2:_ With this checkbox activated, "
@@ -5838,7 +6085,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2928
+#: user-manual.txt:3050
 #, no-wrap
 msgid ""
 " ** _CCR: Show individual O~2~ sensor values when viewing pO~2~:_ Show the "
@@ -5849,13 +6096,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2930
+#: user-manual.txt:3052
 #, no-wrap
 msgid "*Configuring dive planning using rebreather equipment:*\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2932
+#: user-manual.txt:3054
 #, no-wrap
 msgid ""
 "** _Default CCR setpoint for dive planning:_ Specify the O~2~ setpoint for "
@@ -5863,7 +6110,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2935
+#: user-manual.txt:3057
 #, no-wrap
 msgid ""
 "CCR dive plan. This determines the pO~2~  maintained\n"
@@ -5873,7 +6120,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2937
+#: user-manual.txt:3059
 #, no-wrap
 msgid ""
 "** _pSCR O~2~ metabolism rate:_ For a semi-closed rebreather (pSCR) system, "
@@ -5881,7 +6128,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2939
+#: user-manual.txt:3061
 #, no-wrap
 msgid ""
 "volume of oxygen used by a diver during a minute. Set this value for pSCR "
@@ -5890,7 +6137,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2941
+#: user-manual.txt:3063
 #, no-wrap
 msgid ""
 "** _pSCR ratio:_ For pSCR equipment the dump ratio is the ratio of gas "
@@ -5898,7 +6145,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2943
+#: user-manual.txt:3065
 #, no-wrap
 msgid ""
 "environment to that of the gas recirculated to the diver. Set this value for "
@@ -5907,24 +6154,24 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:2945
+#: user-manual.txt:3067
 #, no-wrap
 msgid "Language"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2947
+#: user-manual.txt:3069
 msgid "Choose a language that _Subsurface_ will use."
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2948
+#: user-manual.txt:3070
 #, no-wrap
 msgid "images/Pref4_f20.jpg"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2958
+#: user-manual.txt:3080
 msgid ""
 "A checkbox lets you use the _System Default_ language which in most cases "
 "will be the correct setting; with this _Subsurface_ simply runs in the same "
@@ -5936,13 +6183,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:2959
+#: user-manual.txt:3081
 #, no-wrap
 msgid "Network"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2966
+#: user-manual.txt:3088
 msgid ""
 "This panel facilitates communication between _Subsurface_ and data sources "
 "on the Internet.  This is important, for instance, when _Subsurface_ needs "
@@ -5954,18 +6201,18 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2967
+#: user-manual.txt:3089
 #, no-wrap
 msgid "images/Pref5_f20.jpg"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2970
+#: user-manual.txt:3092
 msgid "This dialogue has three sections:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2978
+#: user-manual.txt:3100
 #, no-wrap
 msgid ""
 "** _Proxy type_:\n"
@@ -5982,7 +6229,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2983
+#: user-manual.txt:3105
 #, no-wrap
 msgid ""
 "** _Subsurface cloud storage_: To store your dive log in the cloud, a valid "
@@ -5995,7 +6242,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2984
+#: user-manual.txt:3106
 #, no-wrap
 msgid ""
 "_Sync to cloud in the background_: This option allows saving of dive "
@@ -6003,13 +6250,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2985
+#: user-manual.txt:3107
 #, no-wrap
 msgid "while you do other things within _Subsurface_.\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2986
+#: user-manual.txt:3108
 #, no-wrap
 msgid ""
 "_Save password locally_: This allows local storage of the cloud storage "
@@ -6017,13 +6264,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2987
+#: user-manual.txt:3109
 #, no-wrap
 msgid "information is saved in raw text form, not encoded in any way.\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2991
+#: user-manual.txt:3113
 #, no-wrap
 msgid ""
 "** _Subsurface web service_: When you subscribe to the "
@@ -6035,26 +6282,26 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:2994
+#: user-manual.txt:3116
 #, no-wrap
 msgid "Facebook Access"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2997
+#: user-manual.txt:3119
 msgid ""
 "This panel lets you log into a Facebook account in order to transfer "
 "information from Subsurface to Facebook."
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2998
+#: user-manual.txt:3120
 #, no-wrap
 msgid "images/Pref6_f20.jpg"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3006
+#: user-manual.txt:3128
 msgid ""
 "If you provide a valid Facebook userID and password, a connection to "
 "Facebook is created. That connection is closed when one closing down "
@@ -6064,13 +6311,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:3007
+#: user-manual.txt:3129
 #, no-wrap
 msgid "Georeference"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3015
+#: user-manual.txt:3137
 msgid ""
 "_Subsurface_ provides a geo-lookup service (that is, given the coordinates "
 "of a dive site) derived from a click on the *Dive Map panel* at the bottom "
@@ -6083,19 +6330,19 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:3016
+#: user-manual.txt:3138
 #, no-wrap
 msgid "images/Pref7_f20.jpg"
 msgstr ""
 
 #. type: Title ==
-#: user-manual.txt:3019
+#: user-manual.txt:3141
 #, no-wrap
 msgid "The _Subsurface_ dive planner"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3024
+#: user-manual.txt:3146
 msgid ""
 "Dive planning is an advanced feature of _Subsurface_, accessed by selecting "
 "_Log -> Plan Dive_ from the main menu. It allows calculation of nitrogen "
@@ -6104,7 +6351,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:3032
+#: user-manual.txt:3154
 msgid ""
 "The _Subsurface_ dive planner IS CURRENTLY EXPERIMENTAL and assumes the user "
 "is already familiar with the _Subsurface_ user interface. It is explicitly "
@@ -6112,19 +6359,19 @@ msgid ""
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:3035
+#: user-manual.txt:3157
 msgid ""
 "The user is conversant with dive planning and has the necessary training to "
 "perform dive planning."
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:3036
+#: user-manual.txt:3158
 msgid "The user plans dives within his/her certification limits."
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:3039
+#: user-manual.txt:3161
 msgid ""
 "Dive planning makes large assumptions about the characteristics of the "
 "_average person_ and cannot compensate for individual physiology or health "
@@ -6132,32 +6379,32 @@ msgid ""
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:3040
+#: user-manual.txt:3162
 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:3041
+#: user-manual.txt:3163
 msgid "The user is familiar with the user interface of _Subsurface_."
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:3043
+#: user-manual.txt:3165
 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:3045
+#: user-manual.txt:3167
 #, no-wrap
 msgid "The _Subsurface_ dive planner screen"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3050
+#: user-manual.txt:3172
 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 "
@@ -6166,7 +6413,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3054
+#: user-manual.txt:3176
 msgid ""
 "At the top right hand is a green *design panel* on which the profile of the "
 "dive can be manipulated directly by dragging and clicking as explained "
@@ -6175,7 +6422,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3058
+#: user-manual.txt:3180
 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 "
@@ -6184,26 +6431,26 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:3059
+#: user-manual.txt:3181
 #, no-wrap
 msgid "images/PlannerWindow1_f20.jpg"
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:3062
+#: user-manual.txt:3184
 #, no-wrap
 msgid "Open circuit dives"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3065
+#: user-manual.txt:3187
 msgid ""
 "Towards the center bottom of the planner (circled in blue in the image "
 "above) is a dropbox with three options. Select the appropriate one of these:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3068
+#: user-manual.txt:3190
 #, no-wrap
 msgid ""
 "** Open Circuit (the default)\n"
@@ -6212,12 +6459,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3070
+#: user-manual.txt:3192
 msgid "Choose the Open Circuit option."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3074
+#: user-manual.txt:3196
 msgid ""
 "In the top left-hand area of the planning screen, be sure the constant dive "
 "parameters are appropriate. These are: Start date and time of the intended "
@@ -6227,7 +6474,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3083
+#: user-manual.txt:3205
 msgid ""
 "In the table labelled _Available Gases_, add the information of the "
 "cylinders to be used as well as the gas composition within that "
@@ -6242,12 +6489,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3085
+#: user-manual.txt:3207
 msgid "The profile of the planned dive can be created in two ways:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3090
+#: user-manual.txt:3212
 msgid ""
 "Drag the waypoints (the small white circles) on the existing dive profile to "
 "represent the dive. Additional waypoints can be created by double-clicking "
@@ -6257,7 +6504,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3098
+#: user-manual.txt:3220
 msgid ""
 "The most efficient way to create a dive profile is to enter the appropriate "
 "values into the table marked _Dive planner points_. The first line of the "
@@ -6271,13 +6518,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:3099
+#: user-manual.txt:3221
 #, no-wrap
 msgid "Recreational dives"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3116
+#: user-manual.txt:3238
 #, no-wrap
 msgid ""
 "Recreational mode is what comes closest to planning a dive based on the "
@@ -6308,21 +6555,21 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3119
+#: user-manual.txt:3241
 msgid ""
 "Ensure the date and time is set to that of the intended dive. This allows "
 "calculation of the nitrogen load incurred during previous dives."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3122
+#: user-manual.txt:3244
 msgid ""
 "Immediately under the heading _Planning_ are two checkboxes _Recreational_ "
 "and _Safety Stop_.  Check these two boxes."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3126
+#: user-manual.txt:3248
 msgid ""
 "Then define the cylinder size, the gas mixture (air or % oxygen) and the "
 "starting cylinder pressure in the top left-hand section of the planner under "
@@ -6330,7 +6577,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3131
+#: user-manual.txt:3253
 msgid ""
 "The planner calculates whether the specified cylinder contains enough "
 "air/gas to complete the planned dive. In order for this to be accurate, "
@@ -6340,7 +6587,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3140
+#: user-manual.txt:3262
 msgid ""
 "Define the amount of gas the cylinder must have at the end of the bottom "
 "section of the dive just before ascent. A value of 50 bar is often used. The "
@@ -6357,7 +6604,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3148
+#: user-manual.txt:3270
 msgid ""
 "Define the depth of the dive by dragging the waypoints (white dots) on the "
 "dive profile or (even better) defining the appropriate depths using the "
@@ -6370,14 +6617,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3151
+#: user-manual.txt:3273
 msgid ""
 "The ascent speed can be changed. The default ascent speeds are those "
 "considered safe for recreational divers."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3159
+#: user-manual.txt:3281
 msgid ""
 "The dive profile in the planner shows the maximum dive time within no-deco "
 "limits using the Bühlmann ZH-L16 algorithm and the gas and depth settings "
@@ -6393,7 +6640,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3163
+#: user-manual.txt:3285
 msgid ""
 "Below is an image of a dive plan for a recreational dive at 30 "
 "meters. Although the no-deco limit (NDL) is 23 minutes, the duration of the "
@@ -6403,26 +6650,26 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:3164
+#: user-manual.txt:3286
 #, no-wrap
 msgid "images/rec_diveplan.jpg"
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:3166
+#: user-manual.txt:3288
 #, no-wrap
 msgid "Non-recreational open circuit dives, including decompression"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3170
+#: user-manual.txt:3292
 msgid ""
 "Non-recreational dive planning involves exceeding the no-deco limits and/or "
 "using multiple breathing gases.  These dives are planned in three stages:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3182
+#: user-manual.txt:3304
 #, no-wrap
 msgid ""
 "*a) Nitrogen management*: This is done by specifying the rates for descent "
@@ -6448,7 +6695,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3187
+#: user-manual.txt:3309
 msgid ""
 "If the VPM-B model is selected, the Conservatism_level needs to be specified "
 "on a scale of 0 (least conservative) to 4 (most conservative).  This model "
@@ -6459,26 +6706,26 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3189
+#: user-manual.txt:3311
 msgid "For more information external to this manual see:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3191
+#: user-manual.txt:3313
 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:3192
+#: user-manual.txt:3314
 msgid ""
 "link:http://www.rebreatherworld.com/general-and-new-to-rebreather-articles/5037-gradient-factors-for-dummies.html[Gradient "
 "factors for dummies, by Kevin Watts]"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3194
+#: user-manual.txt:3316
 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: "
@@ -6487,7 +6734,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3202
+#: user-manual.txt:3324
 msgid ""
 "The ascent rate is critical for nitrogen off-gassing at the end of the dive "
 "and is specified for several depth ranges, using the average (or mean) depth "
@@ -6501,7 +6748,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3211
+#: user-manual.txt:3333
 #, no-wrap
 msgid ""
 "*b) Oxygen management*: In the *Gas Options* part of the dive specification, "
@@ -6521,7 +6768,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3228
+#: user-manual.txt:3350
 #, no-wrap
 msgid ""
 "*c) Gas management*: With open-circuit dives this is a primary\n"
@@ -6552,7 +6799,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3240
+#: user-manual.txt:3362
 msgid ""
 "Now you can start the detailed time-depth planning of the dive. _Subsurface_ "
 "offers an unique graphical interface for doing planning. Themechanics are "
@@ -6570,7 +6817,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3252
+#: user-manual.txt:3374
 msgid ""
 "Each waypoint on the dive profile creates a _Dive Planner Point_ in the "
 "table on the left of the dive planner panel. Be sure the _Used Gas_ value in "
@@ -6587,7 +6834,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3260
+#: user-manual.txt:3382
 msgid ""
 "Show any changes in gas cylinder used by indicating gas changes as explained "
 "in the section <<S_CreateProfile,hand-creating a dive profile>>. These "
@@ -6599,7 +6846,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3269
+#: user-manual.txt:3391
 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 "
@@ -6612,20 +6859,20 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3272
+#: user-manual.txt:3394
 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:3273
+#: user-manual.txt:3395
 #, no-wrap
 msgid "images/DivePlanner2_f20.jpg"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3278
+#: user-manual.txt:3400
 msgid ""
 "Once the above steps have been completed, save by clicking the _Save_ button "
 "towards the top middle of the planner. The saved dive plan will appear in "
@@ -6633,13 +6880,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3280
+#: user-manual.txt:3402
 #, no-wrap
 msgid "*The dive plan details*\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3288
+#: user-manual.txt:3410
 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 "
@@ -6652,7 +6899,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3293
+#: user-manual.txt:3415
 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 "
@@ -6662,13 +6909,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:3294
+#: user-manual.txt:3416
 #, no-wrap
 msgid "Planning pSCR dives"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3309
+#: user-manual.txt:3431
 #, no-wrap
 msgid ""
 "To plan a dive using a passive semi-closed rebreather (pSCR), select _pSCR_ "
@@ -6698,26 +6945,26 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:3310
+#: user-manual.txt:3432
 #, no-wrap
 msgid "images/Planner_pSCR1_f20.jpg"
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:3313
+#: user-manual.txt:3435
 #, no-wrap
 msgid "Planning CCR dives"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3317
+#: user-manual.txt:3439
 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:3321
+#: user-manual.txt:3443
 #, no-wrap
 msgid ""
 "*Available gases*: In the _Available gases_ table, enter the cylinder "
@@ -6728,7 +6975,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3331
+#: user-manual.txt:3453
 #, no-wrap
 msgid ""
 "*Entering setpoints*: Specify a default setpoint in the Preferences tab, by "
@@ -6750,31 +6997,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3333
+#: user-manual.txt:3455
 msgid "The dive profile for a CCR dive may look something like the image below."
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:3334
+#: user-manual.txt:3456
 #, no-wrap
 msgid "images/Planner_CCR1_f20.jpg"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3338
+#: user-manual.txt:3460
 msgid ""
 "Note that, in the _Dive plan details_, the gas consumption for a CCR segment "
 "is not calculated, so gas consumptions of 0 liters are the norm."
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:3340
+#: user-manual.txt:3462
 #, no-wrap
 msgid "Modifying an existing dive plan"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3347
+#: user-manual.txt:3469
 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 no way to "
@@ -6785,7 +7032,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3353
+#: user-manual.txt:3475
 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 "
@@ -6795,13 +7042,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:3354
+#: user-manual.txt:3476
 #, no-wrap
 msgid "Planning for repetitive dives"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3361
+#: user-manual.txt:3483
 msgid ""
 "Repetitive dives can easily be planned if the dates and start times of the "
 "repetitive dive set are specified appropriately in the top left-hand _Start "
@@ -6810,7 +7057,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3367
+#: user-manual.txt:3489
 msgid ""
 "If you have just completed a long/deep dive and are planning another dive, "
 "then highlight, in the *Dive List*, the dive that has just been done then "
@@ -6820,7 +7067,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3372
+#: user-manual.txt:3494
 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 you "
@@ -6830,13 +7077,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:3373
+#: user-manual.txt:3495
 #, no-wrap
 msgid "Printing the dive plan"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3378
+#: user-manual.txt:3500
 msgid ""
 "Selecting the _Print_ button in the planner allows printing of the _Dive "
 "Plan Details_ for wet notes. You can also cut and paste the _Dive Plan "
@@ -6844,7 +7091,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3388
+#: user-manual.txt:3510
 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 "
@@ -6860,13 +7107,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ==
-#: user-manual.txt:3389
+#: user-manual.txt:3511
 #, no-wrap
 msgid "Description of the Subsurface Main Menu items"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3394
+#: user-manual.txt:3516
 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 "
@@ -6874,293 +7121,293 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:3395
+#: user-manual.txt:3517
 #, no-wrap
 msgid "File"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3398
+#: user-manual.txt:3520
 msgid ""
 "<<S_NewLogbook,_New Logbook_>> - Close the currently open dive logbook and "
 "clear all dive information."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3400
+#: user-manual.txt:3522
 msgid "_Open logbook_ - Open the file manager to select a dive logbook to open."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3401
+#: user-manual.txt:3523
 msgid ""
 "_Open cloud storage_ - Open the dive log previously saved in "
 "<<S_Cloud_storage,_Cloud storage_>>."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3402
+#: user-manual.txt:3524
 msgid "_Save_ - Save the dive logbook currently open."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3403
+#: user-manual.txt:3525
 msgid ""
 "_Save to cloud storage_ - Save the current dive log to "
 "<<S_Cloud_storage,_Cloud storage_>>."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3404
+#: user-manual.txt:3526
 msgid "_Save as_ - Save the current logbook under a different file name."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3405
+#: user-manual.txt:3527
 msgid "_Close_ - Close the dive logbook currently open."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3407
+#: user-manual.txt:3529
 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:3408
+#: user-manual.txt:3530
 msgid "<<S_PrintDivelog,_Print_>> - Print the currently open logbook."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3409
+#: user-manual.txt:3531
 msgid "<<S_Preferences,_Preferences_>> - Set the _Subsurface_ preferences."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3410
+#: user-manual.txt:3532
 msgid ""
 "<<S_FindMovedImages, _Find moved images_>> - If photos taken during dives "
 "have been moved to"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3411
+#: user-manual.txt:3533
 msgid ""
 "a different disk or directory, locate them and link them to the appropriate "
 "dives."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3412
+#: user-manual.txt:3534
 msgid ""
 "<<S_Configure,_Configure dive computer_>> - Edit the configuration of a dive "
 "computer."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3413
+#: user-manual.txt:3535
 msgid "_Quit_ - Quit _Subsurface_."
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:3414
+#: user-manual.txt:3536
 #, no-wrap
 msgid "Import"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3417
+#: user-manual.txt:3539
 msgid ""
 "<<S_ImportDiveComputer,_Import from dive computer_>> - Import dive "
 "information from a dive computer."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3419
+#: user-manual.txt:3541
 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:3421
+#: user-manual.txt:3543
 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:3423
+#: user-manual.txt:3545
 msgid ""
 "<<S_ImportingDivelogsDe,_Import from Divelogs.de_>> - Import dive "
 "information from _www.Divelogs.de_."
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:3424
+#: user-manual.txt:3546
 #, no-wrap
 msgid "Log"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3426
+#: user-manual.txt:3548
 msgid ""
 "<<S_EnterData,_Add Dive_>> - Manually add a new dive to the *Dive List* "
 "panel."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3427
+#: user-manual.txt:3549
 msgid ""
 "_Edit dive_ - Edit a dive where the profile was entered by hand and not from "
 "a dive computer."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3428
+#: user-manual.txt:3550
 msgid "<<S_DivePlanner,_Plan Dive_>> - Plan dives."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3429
+#: user-manual.txt:3551
 msgid ""
 "<<S_Replan,_Edit dive in planner_>> - Edit a dive plan that has been saved "
 "into the *Dive List*."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3431
+#: user-manual.txt:3553
 msgid ""
 "<<S_CopyComponents,_Copy dive components_>> - Copy information from several "
 "fields of a dive log onto the clipboard."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3433
+#: user-manual.txt:3555
 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:3435
+#: user-manual.txt:3557
 msgid ""
 "<<S_Renumber,_Renumber_>> - Renumber the dives listed in the *Dive List* "
 "panel."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3437
+#: user-manual.txt:3559
 msgid ""
 "<<S_Group,_Auto Group_>> - Group the dives in the *Dive List* panel into "
 "dive trips."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3438
+#: user-manual.txt:3560
 msgid ""
 "<<S_DeviceNames,_Edit Device Names_>> - Edit the names of dive computers to "
 "coordinate your logs."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3439
+#: user-manual.txt:3561
 msgid ""
 "<<S_Filter,_Filter divelist_>> - Select only some dives, based on specific "
 "tags or dive criteria."
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:3440
+#: user-manual.txt:3562
 #, no-wrap
 msgid "View"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3443
+#: user-manual.txt:3565
 msgid "<<S_ViewPanels,_All_>> - View the four main _Subsurface_ panels all at once."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3444
+#: user-manual.txt:3566
 msgid "<<S_ViewPanels,_Dive List_>> - View only the *Dive List* panel."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3445
+#: user-manual.txt:3567
 msgid "<<S_ViewPanels,_Profile_>> - View only the *Dive Profile* panel."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3446
+#: user-manual.txt:3568
 msgid "<<S_ViewPanels,_Info_>> - View only the *Notes* panel."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3447
+#: user-manual.txt:3569
 msgid "<<S_ViewPanels,_Globe_>> - View only the *World Map* panel."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3449
+#: user-manual.txt:3571
 msgid ""
 "_Yearly Statistics_ - Display summary statistics about dives during this and "
 "past years."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3450
+#: user-manual.txt:3572
 msgid ""
 "_Prev DC_ - Switch to data from previous dive computer, if a single dive was "
 "logged from more than one."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3451
+#: user-manual.txt:3573
 msgid "_Next DC_ - Switch to next dive computer."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3452
+#: user-manual.txt:3574
 msgid "_Full Screen_ - Toggles Full Screen mode."
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:3453
+#: user-manual.txt:3575
 #, no-wrap
 msgid "Share on"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3455
+#: user-manual.txt:3577
 msgid ""
 "<<S_Facebook,_Facebook_>> - Share the currently selected dive on your "
 "Facebook timeline."
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:3457
+#: user-manual.txt:3579
 #, no-wrap
 msgid "Help"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3460
+#: user-manual.txt:3582
 msgid ""
 "_About Subsurface_ - Show a panel with the version number of _Subsurface_ as "
 "well as licensing information."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3462
+#: user-manual.txt:3584
 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:3464
+#: user-manual.txt:3586
 msgid ""
 "<<S_UserSurvey,_User survey_>> - Help to make _Subsurface_ even better by "
 "taking part in our user survey or by completing another survey if your "
@@ -7168,12 +7415,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3465
+#: user-manual.txt:3587
 msgid "_User manual_ - Open a window showing this user manual."
 msgstr ""
 
 #. type: Title ==
-#: user-manual.txt:3468
+#: user-manual.txt:3590
 #, no-wrap
 msgid ""
 "APPENDIX A: Operating system specific information for importing dive "
@@ -7181,19 +7428,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:3470
+#: user-manual.txt:3592
 #, 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:3471
+#: user-manual.txt:3593
 #, no-wrap
 msgid "images/icons/drivers.jpg"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3476
+#: user-manual.txt:3598
 msgid ""
 "The operating system of the desktop computer needs the appropriate drivers "
 "in order to communicate with the dive computer, the way the dive computer "
@@ -7201,7 +7448,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3482
+#: user-manual.txt:3604
 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 "
@@ -7210,7 +7457,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3486
+#: user-manual.txt:3608
 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 "
@@ -7218,7 +7465,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3493
+#: user-manual.txt:3615
 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 "
@@ -7229,19 +7476,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:3495
+#: user-manual.txt:3617
 #, 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:3496
+#: user-manual.txt:3618
 #, no-wrap
 msgid "images/icons/usb.jpg"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3504
+#: user-manual.txt:3626
 msgid ""
 "When connecting a dive computer by using a USB connector, usually "
 "_Subsurface_ will either propose a drop down list with the correct device "
@@ -7251,61 +7498,61 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3509
+#: user-manual.txt:3631
 msgid ""
 "Simply try COM1, COM2, etc. The drop down list should contain all connected "
 "COM devices."
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:3510 user-manual.txt:3608
+#: user-manual.txt:3632 user-manual.txt:3730
 #, no-wrap
 msgid "On MacOS:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3513
+#: user-manual.txt:3635
 msgid "The drop down box should find all connected dive computers."
 msgstr ""
 
 #. type: Block title
-#: user-manual.txt:3514
+#: user-manual.txt:3636
 #, no-wrap
 msgid "On Linux:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3517
+#: user-manual.txt:3639
 msgid "There is a definitive way to find the port:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3519
+#: user-manual.txt:3641
 msgid "Disconnect the USB cable from the dive computer"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3520
+#: user-manual.txt:3642
 msgid "Open a terminal"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3521 user-manual.txt:3523
+#: user-manual.txt:3643 user-manual.txt:3645
 msgid "Type the command: 'dmesg' and press enter"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3522
+#: user-manual.txt:3644
 msgid "Plug in the USB cable of the dive computer"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3525
+#: user-manual.txt:3647
 msgid "A message similar to this one should appear:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3541
+#: user-manual.txt:3663
 #, no-wrap
 msgid ""
 "\tusb 2-1.1: new full speed USB device number 14 using ehci_hcd\n"
@@ -7326,7 +7573,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3546
+#: user-manual.txt:3668
 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 "
@@ -7334,12 +7581,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3548
+#: user-manual.txt:3670
 msgid "Ensuring the user has write permission to the USB serial port:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3558
+#: user-manual.txt:3680
 msgid ""
 "On Unix-like operating systems the USB ports can only be accessed by users "
 "who are members special group that can be e.g.  +dialout+ or +uucp+. This "
@@ -7351,14 +7598,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3562
+#: user-manual.txt:3684
 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:3567
+#: user-manual.txt:3689
 #, no-wrap
 msgid ""
 "Type: +id johnB+     This lists all the groups that johnB belongs to and\n"
@@ -7370,7 +7617,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3569
+#: user-manual.txt:3691
 #, no-wrap
 msgid ""
 "Under some circumstances this change takes only effect (eg. on Ubuntu) "
@@ -7379,7 +7626,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3574
+#: user-manual.txt:3696
 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 "
@@ -7387,13 +7634,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:3577
+#: user-manual.txt:3699
 #, no-wrap
 msgid "Manually setting up Bluetooth enabled devices"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3584
+#: user-manual.txt:3706
 msgid ""
 "For dive computers communicating through Bluetooth like the Heinrichs "
 "Weikamp Frog or the Shearwater Predator, Petrel and Nerd there is a "
@@ -7402,7 +7649,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3586
+#: user-manual.txt:3708
 #, no-wrap
 msgid ""
 "*For the dive computer, after enabling Bluetooth, be sure it is in Upload "
@@ -7410,7 +7657,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3590
+#: user-manual.txt:3712
 msgid ""
 "For Bluetooth pairing of the dive computer, refer to the manufacturer's user "
 "guide. When using a Shearwater Predator/Petrel/Nerd, select _Dive Log -> "
@@ -7418,13 +7665,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3592
+#: user-manual.txt:3714
 #, no-wrap
 msgid "*Pair the _Subsurface_ computer with the dive computer.*\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3601
+#: user-manual.txt:3723
 msgid ""
 "Bluetooth is most likely already enabled. For pairing with the dive computer "
 "choose _Control Panel -> Bluetooth Devices -> Add Wireless Device_.  This "
@@ -7436,21 +7683,21 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3604
+#: user-manual.txt:3726
 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:3607
+#: user-manual.txt:3729
 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:3614
+#: user-manual.txt:3736
 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 "
@@ -7459,20 +7706,20 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3617
+#: user-manual.txt:3739
 msgid ""
 "Once the pairing is complete, the correct device is shown in the 'Device or "
 "Mount Point' drop-down in the _Subsurface_ *Import* dialog."
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:3618
+#: user-manual.txt:3740
 #, no-wrap
 msgid "On Linux"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3626
+#: user-manual.txt:3748
 msgid ""
 "Be sure Bluetooth is enabled on the _Subsurface_ computer.  On most common "
 "distributions this should be true out of the box and pairing should be "
@@ -7484,7 +7731,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3630
+#: user-manual.txt:3752
 msgid ""
 "Setting up a connection to download dives from your Bluetooth-enabled "
 "device, such as the _Shearwater Petrel_, is not yet an automated process and "
@@ -7493,23 +7740,23 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3632
+#: user-manual.txt:3754
 msgid "Enable the Bluetooth controller and pair your dive computer"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3633
+#: user-manual.txt:3755
 msgid "Establish an RFCOMM connection"
 msgstr ""
 
 #. type: Title =====
-#: user-manual.txt:3634 user-manual.txt:3774
+#: user-manual.txt:3756 user-manual.txt:3896
 #, no-wrap
 msgid "Download the dives with Subsurface"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3640
+#: user-manual.txt:3762
 msgid ""
 "Ensure the dive computer is in upload mode. On the _Shearwater Petrel_, "
 "_Petrel 2_ and _Nerd_ cycle through the menu, select 'Dive Log', then "
@@ -7520,7 +7767,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3645
+#: user-manual.txt:3767
 msgid ""
 "To establish the connection, establish root access through +sudo+ or +su+.  "
 "The correct permission is required to download the dives in the computer. On "
@@ -7530,23 +7777,23 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3647
+#: user-manual.txt:3769
 msgid "+sudo usermod -a -G dialout username+"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3649
+#: user-manual.txt:3771
 msgid "Then log out and log in for the change to take effect."
 msgstr ""
 
 #. type: Title =====
-#: user-manual.txt:3650
+#: user-manual.txt:3772
 #, no-wrap
 msgid "Enabling the Bluetooth controller and pairing your dive computer"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3656
+#: user-manual.txt:3778
 msgid ""
 "Attempt to set up the Bluetooth controller and pair your dive computer using "
 "the graphical environment of the operating system. After setting the dive "
@@ -7557,7 +7804,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3659
+#: user-manual.txt:3781
 msgid ""
 "If the graphical method doesn't work, pair the device from the command "
 "line. Open a terminal and use +hciconfig+ to check the Bluetooth controller "
@@ -7565,7 +7812,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3666
+#: user-manual.txt:3788
 #, no-wrap
 msgid ""
 "\t$ hciconfig\n"
@@ -7577,7 +7824,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3671
+#: user-manual.txt:3793
 msgid ""
 "This indicates a Bluetooth controller with MAC address 01:23:45:67:89:AB, "
 "connected as hci0.  Its status is 'DOWN', i.e. not powered.  Additional "
@@ -7587,7 +7834,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3679
+#: user-manual.txt:3801
 #, no-wrap
 msgid ""
 "\tsudo hciconfig hci0 up auth+  (enter password when prompted)\n"
@@ -7600,25 +7847,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3681
+#: user-manual.txt:3803
 msgid "Check that the status now includes +'UP', 'RUNNING' AND 'AUTH'+."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3683
+#: user-manual.txt:3805
 msgid ""
 "If there are multiple controllers running, it's easiest to off the unused "
 "controller(s). For example, for +hci1+:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3685
+#: user-manual.txt:3807
 #, no-wrap
 msgid "\tsudo hciconfig hci1 down\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3688
+#: user-manual.txt:3810
 msgid ""
 "Next step is to 'trust' and 'pair' the dive computer. On distros with Bluez "
 "5, such as Fedora 22, one can use a tool called +blutootctl+, which will "
@@ -7626,7 +7873,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3709
+#: user-manual.txt:3831
 #, no-wrap
 msgid ""
 "\tbluetoothctl\n"
@@ -7655,14 +7902,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3712
+#: user-manual.txt:3834
 msgid ""
 "If asked for a password, enter 0000. It's ok if the last line says "
 "'Connected: no'. The important part is the line above, +Pairing successful+."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3715
+#: user-manual.txt:3837
 msgid ""
 "If the system has Bluez version 4 (e.g. Ubuntu 12.04 through to 15.04), "
 "there is probably not a +bluetoothctl+, but a script called "
@@ -7670,7 +7917,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3720
+#: user-manual.txt:3842
 #, no-wrap
 msgid ""
 "\thcitool -i hci0 scanning\n"
@@ -7680,82 +7927,82 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3722
+#: user-manual.txt:3844
 msgid "Once ther dive computer is pired, set up the RFCOMM connection"
 msgstr ""
 
 #. type: Title =====
-#: user-manual.txt:3723
+#: user-manual.txt:3845
 #, no-wrap
 msgid "Establishing the RFCOMM connection"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3726
+#: user-manual.txt:3848
 msgid "The command to establish an RFCOMM connection is:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3728
+#: user-manual.txt:3850
 msgid "+sudo rfcomm -i <controller> connect <dev> <bdaddr> [channel]+"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3730
+#: user-manual.txt:3852
 msgid "+<controller>+ is the Bluetooth controller, +hci0+."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3731
+#: user-manual.txt:3853
 msgid "+<dev>+ is the RFCOMM device file, +rfcomm0+"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3732
+#: user-manual.txt:3854
 msgid "+<bdaddr>+ is the dive computer's MAC address, +00:11:22:33:44:55+"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3733
+#: user-manual.txt:3855
 msgid "+[channel]+ is the dive computer's Bluetooth channel we need to connect to."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3736
+#: user-manual.txt:3858
 msgid ""
 "If one omits it, channel 1 is assumed.  Based on a limited number of user "
 "reports, the appropriate channel for the dive computer is probably:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3738
+#: user-manual.txt:3860
 msgid "_Shearwater Petrel 1_: channel 1"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3739
+#: user-manual.txt:3861
 msgid "_Shearwater Petrel 2_: channel 5"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3740
+#: user-manual.txt:3862
 msgid "_Shearwater Nerd_: channel 5"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3741
+#: user-manual.txt:3863
 msgid "_Heinrichs-Weikamp OSTC Sport_: channel 1"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3743
+#: user-manual.txt:3865
 msgid ""
 "E.g. to connect a _Shearwater Petrel 2_, set the dive computer to upload "
 "mode and enter:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3745
+#: user-manual.txt:3867
 #, no-wrap
 msgid ""
 "\tsudo rfcomm -i hci0 connect rfcomm0 00:11:22:33:44:55 5 (enter a password, "
@@ -7763,12 +8010,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3747
+#: user-manual.txt:3869
 msgid "This gives the response:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3750
+#: user-manual.txt:3872
 #, no-wrap
 msgid ""
 "\tConnected /dev/rfcomm0 to 00:11:22:33:44:55 on channel 5\n"
@@ -7776,14 +8023,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3752
+#: user-manual.txt:3874
 msgid ""
 "To connect a _Shearwater Petrel 1+ or + HW OSTC Sport+, set the dive "
 "computer to upload mode and enter:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3756
+#: user-manual.txt:3878
 #, no-wrap
 msgid ""
 "\tsudo rfcomm -i hci0 connect rfcomm0 00:11:22:33:44:55   (enter a password, "
@@ -7793,7 +8040,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3760
+#: user-manual.txt:3882
 msgid ""
 "If the specific channel the dive computer needs is not known, or the channel "
 "in the list above doesn't work, the command +sdptool records+ should help "
@@ -7802,7 +8049,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3770
+#: user-manual.txt:3892
 #, no-wrap
 msgid ""
 "\tsdptool -i hci0 records 00:11:22:33:44:55\n"
@@ -7817,7 +8064,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3773
+#: user-manual.txt:3895
 msgid ""
 "For a Bluetooth dive computer not in the list above, or if the channel "
 "listed is not correct, please let the Subsurface developers know on the user "
@@ -7825,7 +8072,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3776
+#: user-manual.txt:3898
 msgid ""
 "After establishing the RFCOMM connection and while the dive computer's "
 "upload mode countdown is still running, go to_Subsurface_, select "
@@ -7835,25 +8082,25 @@ msgid ""
 msgstr ""
 
 #. type: Title ==
-#: user-manual.txt:3782
+#: user-manual.txt:3904
 #, no-wrap
 msgid "APPENDIX B: Dive Computer specific information for importing dive data."
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:3785
+#: user-manual.txt:3907
 #, no-wrap
 msgid "Importing from Uemis Zurich"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:3787
+#: user-manual.txt:3909
 #, no-wrap
 msgid "images/icons/iumis.jpg"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3803
+#: user-manual.txt:3925
 msgid ""
 "_Subsurface_ downloads the information stored on the SDA (the built-in file "
 "system of the Uemis) including information about dive spots and "
@@ -7870,7 +8117,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3818
+#: user-manual.txt:3940
 msgid ""
 "After selecting the above device name, download the dives from the Uemis "
 "Zurich. One technical issue with the Uemis Zurich download implementation "
@@ -7887,19 +8134,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:3820
+#: user-manual.txt:3942
 #, no-wrap
 msgid "Importing from Uwatec Galileo"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:3822
+#: user-manual.txt:3944
 #, no-wrap
 msgid "images/icons/Galileo.jpg"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3837
+#: user-manual.txt:3959
 msgid ""
 "The Uwatec Galileo dive computers use infra red (IrDA) communication between "
 "the dive computer and Subsurface. The Uwatec hardware uses a USB dongle "
@@ -7915,14 +8162,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3840
+#: user-manual.txt:3962
 msgid ""
 "After executing this command, Subsurface will recognize the Galileo dive "
 "computer and download dive information."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3846
+#: user-manual.txt:3968
 msgid ""
 "Under Windows, a similar situation exists. Drivers for the MCS7780 are "
 "available from some Internet web sites e.g.  "
@@ -7933,26 +8180,26 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3849
+#: user-manual.txt:3971
 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:3851
+#: user-manual.txt:3973
 #, no-wrap
 msgid "Importing from Heinrichs Weikamp DR5"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:3853
+#: user-manual.txt:3975
 #, no-wrap
 msgid "images/icons/HW_DR5.jpg"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3863
+#: user-manual.txt:3985
 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.  "
@@ -7965,19 +8212,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:3866
+#: user-manual.txt:3988
 #, no-wrap
 msgid "Importing from xDEEP BLACK"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:3868
+#: user-manual.txt:3990
 #, no-wrap
 msgid "images/icons/HW_xdeepblack.jpg"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3877
+#: user-manual.txt:3999
 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 "
@@ -7991,19 +8238,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:3879
+#: user-manual.txt:4001
 #, no-wrap
 msgid "Importing from Shearwater Predator/Petrel/Nerd using Bluetooth"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:3881
+#: user-manual.txt:4003
 #, no-wrap
 msgid "images/icons/predator.jpg"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3884
+#: user-manual.txt:4006
 msgid ""
 "Specific instructions for downloading dives using Bluetooth are given in the "
 "section above, <<S_Bluetooth,_Connecting Subsurface to a Bluetooth-enabled "
@@ -8011,19 +8258,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:3886
+#: user-manual.txt:4008
 #, no-wrap
 msgid "Importing from Poseidon MkVI Discovery"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:3888
+#: user-manual.txt:4010
 #, no-wrap
 msgid "images/MkVI.jpeg"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3896
+#: user-manual.txt:4018
 msgid ""
 "Download of dive logs from the MkVI is performed using a custom "
 "communications adapter and the _Poseidon PC Configuration Software_, "
@@ -8035,45 +8282,45 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3899
+#: user-manual.txt:4021
 msgid ""
 "Setup configuration for the dive and key dive parameters (file with a .txt "
 "extension)"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3900
+#: user-manual.txt:4022
 msgid "Dive log details (file with a .csv extension)"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3902
+#: user-manual.txt:4024
 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:3904
+#: user-manual.txt:4026
 msgid ""
 "_Subsurface_ accesses the .txt and the .csv files to get dive log "
 "information."
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:3906
+#: user-manual.txt:4028
 #, no-wrap
 msgid "Importing from APD Inspiration/Evolution CCR"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:3908
+#: user-manual.txt:4030
 #, no-wrap
 msgid "images/APDComputer.jpg"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3916
+#: user-manual.txt:4038
 msgid ""
 "The dive logs of an APD Inspiration or similar CCR dive computer are "
 "downloaded using a communications adapter and _AP Communicator_, obtained "
@@ -8085,55 +8332,55 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3918
+#: user-manual.txt:4040
 msgid "Download the dive using _AP Communicator_."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3919
+#: user-manual.txt:4041
 msgid "Open a dive within the _AP Log Viewer_."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3920
+#: user-manual.txt:4042
 msgid "Select the tab at the top of the screen, entitled \"_Data_\"."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3921
+#: user-manual.txt:4043
 msgid ""
 "With the raw dive log data show on the screen, click on \"_Copy to "
 "Clipboard_\"."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3922
+#: user-manual.txt:4044
 msgid "Open a text editor, e.g. Notepad (Windows) or TextWrangler (Mac)."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3924
+#: user-manual.txt:4046
 msgid ""
 "Copy the contents of the clipboard into the text editor and save the text "
 "file with a filename extension of _.apd_"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3925
+#: user-manual.txt:4047
 msgid ""
 "Within _Subsurface_, select _Import -> Import log files_ to open the "
 "xref:Unified_import[universal import dialogue]."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3926
+#: user-manual.txt:4048
 msgid ""
 "In the dropdown list towards the bottom right of the dialogue (labeled "
 "'Filter:'), select \"APD log viewer\"."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3930
+#: user-manual.txt:4052
 #, no-wrap
 msgid ""
 "On the list of file names select the _.apd_ file  created. An import\n"
@@ -8143,13 +8390,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:3931
+#: user-manual.txt:4053
 #, no-wrap
 msgid "images/APD_CSVimportF22.jpg"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3939
+#: user-manual.txt:4061
 msgid ""
 "The top left hand dropdown box in the import panel lets you select the APD "
 "dive computer for which the dive log needs to be imported. The default it is "
@@ -8161,12 +8408,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3940
+#: user-manual.txt:4062
 msgid "Click the _Ok_ button at the bottom of the import panel."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3945
+#: user-manual.txt:4067
 msgid ""
 "The APD dive log will appear within _Subsurface_. The dive computer- "
 "generated ceiling provided by the Inspiration can be viewed by selecting the "
@@ -8176,13 +8423,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ==
-#: user-manual.txt:3946
+#: user-manual.txt:4068
 #, no-wrap
 msgid "APPENDIX C: Exporting Dive log information from external dive log software."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3955
+#: user-manual.txt:4077
 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, "
@@ -8192,22 +8439,22 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3957
+#: user-manual.txt:4079
 msgid "Export the foreign dive log data to format that is accessible from"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3958
+#: user-manual.txt:4080
 msgid "_Subsurface_."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3959
+#: user-manual.txt:4081
 msgid "Import the accessible dive log data into _Subsurface_."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3963
+#: user-manual.txt:4085
 msgid ""
 "This appendix provides some information about approaches to export dive log "
 "data from foreign dive log software. The procedures below mostly apply to "
@@ -8215,19 +8462,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:3965
+#: user-manual.txt:4087
 #, no-wrap
 msgid "Exporting from *Suunto Divemanager (DM3, DM4 or DM5)*"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:3966
+#: user-manual.txt:4088
 #, no-wrap
 msgid "images/icons/suuntologo.jpg"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3973
+#: user-manual.txt:4095
 msgid ""
 "DiveManager is a MS Windows application for Suunto dive computers.  "
 "Divemanager 3 (DM3) is an older version of the Suunto software. More recent "
@@ -8237,64 +8484,64 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3975
+#: user-manual.txt:4097
 #, no-wrap
 msgid "*Divemanager 3 (DM3):*\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3977
+#: user-manual.txt:4099
 msgid "Start 'Suunto Divemanager 3' and log in with the name containing the logs"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3978
+#: user-manual.txt:4100
 msgid "Do not start the import wizard to import dives from the dive computer."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3980
+#: user-manual.txt:4102
 msgid ""
 "In the navigation tree on the left side of the program-window, select the "
 "appropriate dives."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3981
+#: user-manual.txt:4103
 msgid "Within the list of dives, select the dives you would like to import later:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3982
+#: user-manual.txt:4104
 msgid "To select certain dives: hold 'ctrl' and click the dive"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3984
+#: user-manual.txt:4106
 msgid ""
 "To select all dives: Select the first dive, hold down shift and select the "
 "last dive"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3985
+#: user-manual.txt:4107
 msgid "With the dives marked, use the program menu _File -> Export_"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3986
+#: user-manual.txt:4108
 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:3987
+#: user-manual.txt:4109
 msgid "Click the browse button next to the field Export Path"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3989
+#: user-manual.txt:4111
 #, no-wrap
 msgid ""
 "** A file-manager like window pops up\n"
@@ -8302,13 +8549,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3990
+#: user-manual.txt:4112
 #, no-wrap
 msgid "Divelog.SDE file\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3992
+#: user-manual.txt:4114
 #, no-wrap
 msgid ""
 "** Optionally change the name of the file for saving\n"
@@ -8316,25 +8563,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3993
+#: user-manual.txt:4115
 #, no-wrap
 msgid "Back in the Export pop-up, press the button 'Export'\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3994
+#: user-manual.txt:4116
 #, no-wrap
 msgid "The dives are now exported to the file Divelog.SDE.\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3996
+#: user-manual.txt:4118
 #, no-wrap
 msgid "*Divemanager 4 (DM4) and Divemanager 5 (DM5):*\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4001
+#: user-manual.txt:4123
 msgid ""
 "DM4 and DM5 use identical mechanisms for exporting dive logs.  To export a "
 "divelog from Divemanager you need to locate the DM4/DM5 database where the "
@@ -8343,81 +8590,81 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4003
+#: user-manual.txt:4125
 msgid "Locating the Suunto DM4 (or DM5) database:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4005 user-manual.txt:4014
+#: user-manual.txt:4127 user-manual.txt:4136
 msgid "Start Suunto DM4/DM5"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4006
+#: user-manual.txt:4128
 msgid "Select 'Help -> About'"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4007
+#: user-manual.txt:4129
 msgid "Click 'Copy' after text 'Copy log folder path to clipboard'"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4008
+#: user-manual.txt:4130
 msgid "Open Windows Explorer"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4009
+#: user-manual.txt:4131
 msgid "Paste the address to the path box at the top of the File Explorer"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4010
+#: user-manual.txt:4132
 msgid "The database is called DM4.db or DM5.db"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4012
+#: user-manual.txt:4134
 msgid "Making a backup copy of the Suunto DM4/DM5 database:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4015
+#: user-manual.txt:4137
 msgid "Select 'File - Create backup'"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4017
+#: user-manual.txt:4139
 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:4018
+#: user-manual.txt:4140
 msgid "Click 'Save'"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4019
+#: user-manual.txt:4141
 msgid "The dives are now exported to the file DM4.bak (or DM5.bak)"
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:4021
+#: user-manual.txt:4143
 #, no-wrap
 msgid "Exporting from Atomic Logbook"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:4024
+#: user-manual.txt:4146
 #, no-wrap
 msgid "images/icons/atomiclogo.jpg"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4031
+#: user-manual.txt:4153
 msgid ""
 "Atomic Logbook is a Windows software by Atomic Aquatics. It allows "
 "downloading of dive information from Cobalt and Cobalt 2 dive computers.  "
@@ -8427,19 +8674,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:4033
+#: user-manual.txt:4155
 #, no-wrap
 msgid "Exporting from Mares Dive Organiser V2.1"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:4036
+#: user-manual.txt:4158
 #, no-wrap
 msgid "images/icons/mareslogo.jpg"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4044
+#: user-manual.txt:4166
 msgid ""
 "Mares Dive Organizer is a Windows application. The dive log is kept as a "
 "Microsoft SQL Compact Edition database with a '.sdf' filename extension. The "
@@ -8450,7 +8697,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4049
+#: user-manual.txt:4171
 msgid ""
 "Within Dive Organizer, select _Database -> Backup_ from the main menu and "
 "back up the database to the desk top.  This creates a zipped file "
@@ -8458,36 +8705,36 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4052
+#: user-manual.txt:4174
 msgid ""
 "Rename the file to DiveOrganizerxxxxx.zip. Inside the zipped directory is a "
 "file _DiveOrganizer.sdf_."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4053
+#: user-manual.txt:4175
 msgid "Extract the _.sdf_ file from the zipped folder to your Desktop."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4054
+#: user-manual.txt:4176
 msgid "The password for accessing the .zip file is _mares_."
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:4056
+#: user-manual.txt:4178
 #, no-wrap
 msgid "Exporting from *DivingLog 5.0 and 6.0*"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:4058
+#: user-manual.txt:4180
 #, no-wrap
 msgid "images/icons/divingloglogo.jpg"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4065
+#: user-manual.txt:4187
 msgid ""
 "The best way to bring your logs from DivingLog to Subsurface is to convert "
 "the whole database. This is because other export formats do not include all "
@@ -8497,37 +8744,37 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4067
+#: user-manual.txt:4189
 msgid "To transfer all files from DivingLog to Subsurface:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4069
+#: user-manual.txt:4191
 msgid "In DivingLog open the 'File -> Export -> SQLite' menu"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4070
+#: user-manual.txt:4192
 msgid "Select 'Settings' button"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4071
+#: user-manual.txt:4193
 msgid "Set the 'RTF2Plaintext' to 'true'"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4072
+#: user-manual.txt:4194
 msgid "Close the Settings dialog"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4073
+#: user-manual.txt:4195
 msgid "Click 'Export' button and select the filename"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4077
+#: user-manual.txt:4199
 msgid ""
 "Once this is done, open the saved database file with Subsurface and the "
 "dives are automatically converted to Subsurface’s own format. Last step to "
@@ -8535,13 +8782,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ==
-#: user-manual.txt:4078
+#: user-manual.txt:4200
 #, no-wrap
 msgid "APPENDIX D: Exporting a spreadsheet to CSV format"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4088
+#: user-manual.txt:4210
 msgid ""
 "Many divers keep a dive log in some form of digital file, commonly a "
 "spreadsheet with various fields of information. These logs can be easily "
@@ -8553,7 +8800,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4094
+#: user-manual.txt:4216
 msgid ""
 "Organize the diving data in the spreadsheet, so the first row contains the "
 "names (or titles) of each column and the information for each dive is stored "
@@ -8563,40 +8810,40 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4096
+#: user-manual.txt:4218
 msgid "Date: use one of the following formats: yyyy-mm-dd, dd.mm.yyyy, mm/dd/yyyy"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4097
+#: user-manual.txt:4219
 msgid "Duration: the format should be minutes:seconds."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4098
+#: user-manual.txt:4220
 msgid ""
 "Unit system: only one unit system should be used (no mix of imperial and "
 "metric units)"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4099
+#: user-manual.txt:4221
 msgid "Tags and buddies: values should be separated using a comma."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4100
+#: user-manual.txt:4222
 msgid "GPS position: use decimal degrees, e.g. 30.22496 30.821798"
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:4100
+#: user-manual.txt:4222
 #, no-wrap
 msgid "_LibreOffice Calc_ and _OpenOffice Calc_"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4104
+#: user-manual.txt:4226
 msgid ""
 "These are open source spreadsheet applications forming parts of larger open "
 "source office suite applications. The user interaction with _LibreOffice_ "
@@ -8607,13 +8854,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:4105
+#: user-manual.txt:4227
 #, no-wrap
 msgid "images/LOffice_spreadsheetdata.jpg"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4108
+#: user-manual.txt:4230
 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 "
@@ -8621,13 +8868,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:4109
+#: user-manual.txt:4231
 #, no-wrap
 msgid "images/LOffice_save_as_options.jpg"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4112
+#: user-manual.txt:4234
 msgid ""
 "After selecting _Save_, select the appropriate field delimiter (choose _Tab_ "
 "to prevent conflicts with the comma when using this as a decimal point), "
@@ -8635,13 +8882,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:4113
+#: user-manual.txt:4235
 #, no-wrap
 msgid "images/LOffice_field_options.jpg"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4116
+#: user-manual.txt:4238
 msgid ""
 "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_ImportingCSVDives[Importing "
@@ -8649,13 +8896,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:4117
+#: user-manual.txt:4239
 #, no-wrap
 msgid "Microsoft _Excel_"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4123
+#: user-manual.txt:4245
 msgid ""
 "The field delimiter (called \"_list separator_\" in Microsoft manuals) is "
 "not accessible from within _Excel_ and needs to be set through the "
@@ -8666,19 +8913,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4125
+#: user-manual.txt:4247
 msgid ""
 "In Microsoft Windows, click the *Start* button, then select _Control Panel_ "
 "from the list on the right-hand side."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4126
+#: user-manual.txt:4248
 msgid "Open the _Regional and Language Options_ dialog box."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4129
+#: user-manual.txt:4251
 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 "
@@ -8686,48 +8933,48 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4130
+#: user-manual.txt:4252
 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:4131
+#: user-manual.txt:4253
 msgid "Click _OK_ twice."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4133
+#: user-manual.txt:4255
 msgid "Below is an image of the _Control Panel_:"
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:4134
+#: user-manual.txt:4256
 #, no-wrap
 msgid "images/Win_SaveCSV2.jpg"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4137
+#: user-manual.txt:4259
 msgid "To export the dive log in CSV format:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4139
+#: user-manual.txt:4261
 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:4140
+#: user-manual.txt:4262
 #, no-wrap
 msgid "images/Win_SaveCSV1.jpg"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4146
+#: user-manual.txt:4268
 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 "
@@ -8737,13 +8984,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:4147
+#: user-manual.txt:4269
 #, no-wrap
 msgid "images/Win_SaveCSV3.jpg"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4153
+#: user-manual.txt:4275
 msgid ""
 "Select the _Save_ button. The CSV-formatted file is saved into the folder "
 "that was selected. You can double check the .CSV file by opening it with a "
@@ -8752,13 +8999,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ==
-#: user-manual.txt:4154
+#: user-manual.txt:4276
 #, no-wrap
 msgid "APPENDIX E: Writing a custom print template"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4159
+#: user-manual.txt:4281
 msgid ""
 "_Subsurface_ has a way to create or modify templates for printing dive logs "
 "to produce customized printouts of them. Templates written in HTML, as well "
@@ -8767,12 +9014,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4161
+#: user-manual.txt:4283
 msgid "Templates are accessed using the print dialogue (see image *B* below)."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4169
+#: user-manual.txt:4291
 msgid ""
 "The buttons under the _Template_ dropdown box lets you _Edit_, _Delete_, "
 "_Import_ and _Export_ templates (see image *A* above). New or modified "
@@ -8784,18 +9031,18 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4171
+#: user-manual.txt:4293
 msgid "The Edit Panel has three tabs:"
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:4172
+#: user-manual.txt:4294
 #, no-wrap
 msgid "images/Template1_f22.jpg"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4176
+#: user-manual.txt:4298
 msgid ""
 "The _Style_ tab (image *A* above) controls the font, line spacing and color "
 "template used for printing the dive log.  The style attributes are "
@@ -8803,7 +9050,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4180
+#: user-manual.txt:4302
 msgid ""
 "The _Colors_ tab (image *B* above) allows editing the colors used for "
 "printing the dive log. The colors are highly customizable: the _Edit_ "
@@ -8812,7 +9059,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4189
+#: user-manual.txt:4311
 msgid ""
 "The _Template_ tab of the Edit Panel (see image below) allows creating a "
 "template using HTML as well as a few Grantlee programming "
@@ -8828,13 +9075,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:4190
+#: user-manual.txt:4312
 #, no-wrap
 msgid "images/Template2_f22.jpg"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4195
+#: user-manual.txt:4317
 msgid ""
 "You can adapt any of the existing templates and save it to the dive log "
 "directory. The standard templates (e.g. One dive, Six dives, Table) can be "
@@ -8843,33 +9090,33 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4197
+#: user-manual.txt:4319
 msgid ""
 "To write a custom template, the following elements must exist so the "
 "template will be correctly handled and rendered."
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:4198
+#: user-manual.txt:4320
 #, no-wrap
 msgid "Main dive loop"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4200
+#: user-manual.txt:4322
 msgid ""
 "_Subsurface_ exports a dive list called (*dives*) to the _Grantlee_ back "
 "end. It is possible to iterate over the list as follows:"
 msgstr ""
 
 #. type: Block title
-#: user-manual.txt:4200 user-manual.txt:4265 user-manual.txt:4282
+#: user-manual.txt:4322 user-manual.txt:4387 user-manual.txt:4404
 #, no-wrap
 msgid "template.html"
 msgstr ""
 
 #. type: delimited block .
-#: user-manual.txt:4205
+#: user-manual.txt:4327
 #, no-wrap
 msgid ""
 "\t{% for dive in dives %}\n"
@@ -8878,13 +9125,13 @@ msgid ""
 msgstr ""
 
 #. type: Block title
-#: user-manual.txt:4207 user-manual.txt:4270 user-manual.txt:4289
+#: user-manual.txt:4329 user-manual.txt:4392 user-manual.txt:4411
 #, no-wrap
 msgid "output.html"
 msgstr ""
 
 #. type: delimited block .
-#: user-manual.txt:4212
+#: user-manual.txt:4334
 #, no-wrap
 msgid ""
 "\t<h1> 1 </h1>\n"
@@ -8893,25 +9140,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4215
+#: user-manual.txt:4337
 msgid ""
 "Additional information about _Grantlee_ can be found at "
 "http://www.grantlee.org/apidox/for_themers.html[here]"
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:4216
+#: user-manual.txt:4338
 #, no-wrap
 msgid "Grantlee exported variables"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4218
+#: user-manual.txt:4340
 msgid "Only a subset of the dive data is exported:"
 msgstr ""
 
 #. type: delimited block |
-#: user-manual.txt:4247
+#: user-manual.txt:4369
 #, no-wrap
 msgid ""
 "|*Name*|*Description*\n"
@@ -8945,7 +9192,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4251
+#: user-manual.txt:4373
 msgid ""
 "_Subsurface_ also exports *template_options* data. This data must be used as "
 "_CSS_ values to provide a dynamically editable template. The exported data "
@@ -8953,7 +9200,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block |
-#: user-manual.txt:4263
+#: user-manual.txt:4385
 #, no-wrap
 msgid ""
 "|*Name*|*Description*\n"
@@ -8972,26 +9219,26 @@ msgid ""
 msgstr ""
 
 #. type: delimited block .
-#: user-manual.txt:4268
+#: user-manual.txt:4390
 #, no-wrap
 msgid "\tborder-width: {{ template_options.borderwidth }}px;\n"
 msgstr ""
 
 #. type: delimited block .
-#: user-manual.txt:4273
+#: user-manual.txt:4395
 #, no-wrap
 msgid "\tborder-width: 3px;\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4276
+#: user-manual.txt:4398
 msgid ""
 "Another variable that _Subsurface_ exports is *print_options*. This variable "
 "contains a single member:"
 msgstr ""
 
 #. type: delimited block |
-#: user-manual.txt:4279
+#: user-manual.txt:4401
 #, no-wrap
 msgid ""
 "|*Name*|*Description*\n"
@@ -9000,7 +9247,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block .
-#: user-manual.txt:4287
+#: user-manual.txt:4409
 #, no-wrap
 msgid ""
 "\tbody {\n"
@@ -9009,7 +9256,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block .
-#: user-manual.txt:4294
+#: user-manual.txt:4416
 #, no-wrap
 msgid ""
 "\tbody {\n"
@@ -9018,13 +9265,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:4296
+#: user-manual.txt:4418
 #, no-wrap
 msgid "Defined CSS selectors"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4299
+#: user-manual.txt:4421
 msgid ""
 "As the dive profile is placed after rendering, _Subsurface_ uses special "
 "_CSS_ selectors to searche in the HTML output. The _CSS_ selectors in the "
@@ -9032,7 +9279,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block |
-#: user-manual.txt:4306
+#: user-manual.txt:4428
 #, no-wrap
 msgid ""
 "|*Selector*|*Type*|*Description*\n"
@@ -9045,20 +9292,20 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4309
+#: user-manual.txt:4431
 msgid ""
 "Rendering dive profiles is not supported for flow layout templates (when "
 "data-numberofdives = 0)."
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:4310
+#: user-manual.txt:4432
 #, no-wrap
 msgid "Special attributes"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4314
+#: user-manual.txt:4436
 msgid ""
 "There are two ways of rendering- either rendering a specific number of dives "
 "in each page or make _Subsurface_ try to fit as many dives as possible into "
@@ -9066,55 +9313,55 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4316
+#: user-manual.txt:4438
 msgid ""
 "The *data-numberofdives* data attribute is added to the body tag to set the "
 "rendering mode."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4318
+#: user-manual.txt:4440
 msgid "render 6 dives per page:"
 msgstr ""
 
 #. type: delimited block .
-#: user-manual.txt:4321
+#: user-manual.txt:4443
 #, no-wrap
 msgid "\t<body data-numberofdives = 6>\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4324
+#: user-manual.txt:4446
 msgid "render as much dives as possible:"
 msgstr ""
 
 #. type: delimited block .
-#: user-manual.txt:4327
+#: user-manual.txt:4449
 #, no-wrap
 msgid "\t<body data-numberofdives = 0>\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4330
+#: user-manual.txt:4452
 msgid ""
 "All CSS units should be in relative lengths only, to support printing on any "
 "page size."
 msgstr ""
 
 #. type: Title ==
-#: user-manual.txt:4331
+#: user-manual.txt:4453
 #, no-wrap
 msgid "APPENDIX F: FAQs."
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:4333
+#: user-manual.txt:4455
 #, no-wrap
 msgid "Subsurface appears to miscalculate gas consumption and SAC"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4337
+#: user-manual.txt:4459
 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_ "
@@ -9122,7 +9369,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4343
+#: user-manual.txt:4465
 msgid ""
 "'Answer': Not really. What happens is that _Subsurface_ actually calculates "
 "gas consumption differently - and better - than you expect.  In particular, "
@@ -9132,7 +9379,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4349
+#: user-manual.txt:4471
 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 "
@@ -9142,12 +9389,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4351
+#: user-manual.txt:4473
 msgid "+consumption = (amount_of_air_at_beginning - amount_of_air_at_end)+"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4357
+#: user-manual.txt:4479
 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 "
@@ -9158,12 +9405,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4359
+#: user-manual.txt:4481
 msgid "+12.2*((220-100)/1.013)+"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4364
+#: user-manual.txt:4486
 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 "
@@ -9173,7 +9420,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4370
+#: user-manual.txt:4492
 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 "
@@ -9184,7 +9431,7 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:4371
+#: user-manual.txt:4493
 #, no-wrap
 msgid ""
 "Some dive profiles have time discrepancies with the recorded samples from my "
@@ -9192,7 +9439,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4375
+#: user-manual.txt:4497
 msgid ""
 "_Subsurface_ ends up ignoring surface time for many things (average depth, "
 "divetime, SAC, etc).  'Question': Why do dive durations in my dive computer "
@@ -9200,7 +9447,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4383
+#: user-manual.txt:4505
 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 "
@@ -9214,13 +9461,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:4384
+#: user-manual.txt:4506
 #, no-wrap
 msgid "Some dive profiles are missing from the download"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4398
+#: user-manual.txt:4520
 msgid ""
 "'Question': I cannot download all my dives, only the most recent ones, even "
 "though my dive computer's manual states that it records history of e.g. 999 "
@@ -9235,7 +9482,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4402
+#: user-manual.txt:4524
 msgid ""
 "If you have downloaded your dives to different dive logging software before "
 "they were overwritten, there is a good chance that Subsurface can import "
diff --git a/Documentation/fr/po/subsurface-mobile-manual.fr.po b/Documentation/fr/po/subsurface-mobile-manual.fr.po
index 527a15a..4293e1e 100644
--- a/Documentation/fr/po/subsurface-mobile-manual.fr.po
+++ b/Documentation/fr/po/subsurface-mobile-manual.fr.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: subsurface-manual VERSION\n"
 "Report-Msgid-Bugs-To: subsurface at subsurface-divelog.org\n"
-"POT-Creation-Date: 2016-03-12 13:31+0100\n"
-"PO-Revision-Date: 2016-03-12 13:57+0100\n"
+"POT-Creation-Date: 2016-07-21 10:32+0200\n"
+"PO-Revision-Date: 2016-07-21 11:03+0200\n"
 "Last-Translator: Guillaume GARDET <guillaume.gardet at opensuse.org>\n"
 "Language-Team: French <opensuse-fr at opensuse.org>\n"
 "Language: fr\n"
@@ -20,34 +20,34 @@ msgstr ""
 
 #.  :website: http://subsurface-divelog.org
 #. type: Target for macro image
-#: mobile-manual.txt:14
+#: mobile-manual.txt:12
 #, no-wrap
 msgid "mobile-images/banner.jpg"
 msgstr "mobile-images/banner.jpg"
 
 #. type: Plain text
-#: mobile-manual.txt:17
+#: mobile-manual.txt:15
 msgid "[big]#Subsurface-mobile for Android: USER MANUAL#"
 msgstr "[big]#Subsurface-mobile pour Android: MANUEL UTILISATEUR#"
 
 #. type: Plain text
-#: mobile-manual.txt:19
+#: mobile-manual.txt:17
 #, no-wrap
 msgid "*Manual author*: Willem Ferguson\n"
-msgstr ""
+msgstr "*Auteur du manuel* : Willem Ferguson\n"
 
 #. type: Plain text
-#: mobile-manual.txt:21
+#: mobile-manual.txt:19
 msgid "toc::[]"
 msgstr "toc::[]"
 
 #. type: Plain text
-#: mobile-manual.txt:23
+#: mobile-manual.txt:21
 msgid "[blue]#_Version 1.0, March 2016_#"
 msgstr "[blue]#_Version 1.0, Mars 2016_#"
 
 #. type: Plain text
-#: mobile-manual.txt:31
+#: mobile-manual.txt:29
 msgid ""
 "Welcome as a user of _Subsurface_, advanced dive logging software with "
 "extensive infrastructure to describe, organize, interpret and print scuba "
@@ -59,13 +59,13 @@ msgid ""
 msgstr ""
 
 #. type: Title -
-#: mobile-manual.txt:33
+#: mobile-manual.txt:31
 #, no-wrap
 msgid "Introducing Subsurface-mobile"
-msgstr ""
+msgstr "Présentation de Subsurface-mobile"
 
 #. type: Plain text
-#: mobile-manual.txt:40
+#: mobile-manual.txt:38
 msgid ""
 "_Subsurface-mobile_ is an extension of _Subsurface_ on laptop and tabletop "
 "computers. It runs on Android smartphone and tablet devices and is a tool "
@@ -73,144 +73,169 @@ msgid ""
 "computer is not useful. _Subsurface-mobile_ also allows the gathering of GPS "
 "locations where dives are performed."
 msgstr ""
+"_Subsurface-mobile_ est une extension de _Subsurface_ sur ordinateurs. Il "
+"fonctionne sur les smartphones et les tablettes Android et c'est un outil "
+"pour visualiser et partager des informations de plongées sur des sites de "
+"plongées où un ordinateur n'est pas utile. _Subsurface-mobile_ permet "
+"également de collecter des positions GPS où sont effectuées les plongées."
 
 #. type: Plain text
-#: mobile-manual.txt:43
+#: mobile-manual.txt:41
 msgid ""
-"A version of _Subsurface-mobile_ for iOS is under development but not yet "
-"ready for testing."
+"Because of the restrictions of iOS, _Subsurface-mobile_ for iOS does not "
+"have all the features of the same app for Android."
 msgstr ""
+"À cause des limitations d'iOS, _Subsurface-mobile_ pour iOS n'inclut pas "
+"toutes les fonctionnalités présentes dans la version Android."
 
 #. type: Plain text
-#: mobile-manual.txt:53
+#: mobile-manual.txt:51
 msgid ""
 "While _Subsurface-mobile_ allows one to enter and save dive information "
 "using an Android device, users of _Subsurface-mobile_ typically use the "
-"mobile app as an extension of the laptop/desktop version of _Subsurface_.  "
-"This allows the storage of dive logs on the Internet and which can be shared "
-"by the Android version as well as the desktop version.  While the desktop "
-"version of _Subsurface_ shows much more detailed information for each dive, "
-"the mobile version allows one to have a more accessible dive log on a dive "
-"trip, useful for proving dive experience to dive shops or to review previous "
-"dives."
+"mobile app as an extension to the laptop/desktop version of _Subsurface_.  "
+"This allows the storage of dive logs on the Internet sharing them between "
+"the Android and the desktop versions.  While the desktop version of "
+"_Subsurface_ shows much more detailed information for each dive, the mobile "
+"version allows a more accessible dive log on a dive trip, useful for proving "
+"dive experience to dive shops or to review previous dives."
 msgstr ""
 
 #. type: Plain text
-#: mobile-manual.txt:55
+#: mobile-manual.txt:53
 msgid "_Subsurface-mobile_ allows one to:"
 msgstr ""
 
 #. type: Plain text
-#: mobile-manual.txt:57
+#: mobile-manual.txt:55
 msgid "Download existing dive log information from the Internet."
 msgstr ""
 
 #. type: Plain text
-#: mobile-manual.txt:58
-msgid "View this information on an Android device."
+#: mobile-manual.txt:56
+msgid "View this information on a mobile device."
 msgstr ""
 
 #. type: Plain text
-#: mobile-manual.txt:60
+#: mobile-manual.txt:58
 msgid ""
 "Edit many of the dive log data fields, e.g. divemaster, buddy, equipment or "
 "notes about a dive."
 msgstr ""
 
 #. type: Plain text
-#: mobile-manual.txt:61
-msgid "Create and add new dive records to one's dive log."
+#: mobile-manual.txt:59
+msgid "Manually create and add new dive records to one's dive log."
 msgstr ""
 
 #. type: Plain text
-#: mobile-manual.txt:62
+#: mobile-manual.txt:60
 msgid "Store the updated dive log on the Internet."
 msgstr ""
 
 #. type: Plain text
-#: mobile-manual.txt:63
+#: mobile-manual.txt:61
 msgid "Record, store and apply GPS positions of dives."
 msgstr ""
 
 #. type: Plain text
-#: mobile-manual.txt:65
+#: mobile-manual.txt:63
 msgid "View the localities of recorded GPS positions and of dives on a map."
 msgstr ""
 
 #. type: Plain text
-#: mobile-manual.txt:72
+#: mobile-manual.txt:70
 msgid ""
 "These items are discussed in greater detail in the following text.  What "
 "_Subsurface-mobile_ does not support (at this time) is downloading dive data "
-"directly from a dive computer. That still has to happen with _Subsurface_ on "
-"a desktop or laptop computer. We are investigating ways to support "
-"downloading from a subset of the supported dive computers on Android "
+"directly from a dive computer. That still needs to be done using "
+"_Subsurface_ on a desktop or laptop computer. We are investigating ways to "
+"support downloading from a subset of the supported dive computers on Android "
 "devices, but this is not yet ready for testing."
 msgstr ""
 
 #. type: Title ==
-#: mobile-manual.txt:73
+#: mobile-manual.txt:71
 #, no-wrap
 msgid "Installing _Subsurface-mobile_ on an Android device"
 msgstr ""
 
 #. type: Plain text
-#: mobile-manual.txt:77
+#: mobile-manual.txt:75
 msgid ""
 "Find _Subsurface-mobile_ in the _Google Play Store_. Search for _Subsurface-"
 "mobile_ and install it."
 msgstr ""
 
 #. type: Title ==
-#: mobile-manual.txt:78
+#: mobile-manual.txt:76
 #, no-wrap
 msgid "Using _Subsurface-mobile_ for the first time"
 msgstr ""
 
 #. type: Plain text
-#: mobile-manual.txt:84
+#: mobile-manual.txt:82
 msgid ""
 "Upon starting _Subsurface-mobile_ for the first time, a Subsurface splash "
 "screen is shown while the program loads. On some devices this may take "
 "several seconds. After loading, the _Cloud Credentials screen_ appears (see "
-"image below)."
+"image below on left)."
 msgstr ""
 
-#. type: Target for macro image
+#. type: Plain text
+#: mobile-manual.txt:84
+msgid ""
+"Select whether _Subsurface-mobile_ should access the Internet for dive log "
+"information."
+msgstr ""
+
+#. type: Title ===
 #: mobile-manual.txt:85
 #, no-wrap
-msgid "mobile-images/landingscreen.jpg"
+msgid "When NOT Using Internet access"
 msgstr ""
 
 #. type: Plain text
-#: mobile-manual.txt:93
-#, no-wrap
+#: mobile-manual.txt:89
 msgid ""
-"Since _Subsurface_ is largely dependent on a dive log saved on the Internet,\n"
-"provide a user-ID and password for access to the _Subsurface Cloud_. These\n"
-"credentials are obtained by opening the desktop version of _Subsurface_ and\n"
-"by clicking _File   ->  Preferences  -> Network_, explained in detail in the\n"
-"user manual for the _Subsurface_ desktop version. Once the account has\n"
-"been created and verified using the desktop version one can use "
-"_Subsurface-mobile_.\n"
+"If the striked-out cloud icon is selected, the app will not access the "
+"Internet to obtain dive log information. This means that dive log "
+"information is manually entered and stored on the mobile device only."
+msgstr ""
+
+#. type: Title ===
+#: mobile-manual.txt:90
+#, no-wrap
+msgid "Using Internet access"
 msgstr ""
 
 #. type: Plain text
-#: mobile-manual.txt:102
+#: mobile-manual.txt:93
 msgid ""
-"When entering a password, it is possible to check a checkbox that enables "
-"the text of the password to be shown. Checking the check box labelled "
-"\"Remember\" allows _Susburface-mobile_ to keep the credentials for "
-"subsequent logins (see image above).  Having entered the credentials, tap "
-"the disk icon at the bottom of the screen.  _Subsurface-mobile_ attempts to "
-"download the existing dive log from the_Subsurface_ cloud server. "
-"Appropriate messages are shown onscreen. Finally a list of dives are shown."
+"Since _Subsurface_ is largely dependent on a dive log saved on the Internet, "
+"provide a PIN for access to the _Subsurface Cloud_, obtained in one of two "
+"ways:"
 msgstr ""
 
-#. type: Title ==
-#: mobile-manual.txt:104
+#. type: Title ====
+#: mobile-manual.txt:94
 #, no-wrap
-msgid "Local copy of the dive log and synchronisation with Internet"
+msgid "Using the desktop version of _Subsurface_:"
+msgstr ""
+
+#. type: Plain text
+#: mobile-manual.txt:105
+#, no-wrap
+msgid ""
+"Open the desktop version of _Subsurface_ and\n"
+"click _File   ->  Preferences  -> Network_, explained in detail in the\n"
+"https://subsurface-divelog.org/documentation/subsurface-4-user-manual/#\\_create_a_cloud_storage_account[user\n"
+"manual for the _Subsurface_ desktop version]. Once the account has\n"
+"been created and verified using the desktop version,\n"
+"_Subsurface_ desktop alows one to download dive information from dive computers and store this\n"
+"on the cloud which can, in turn, be downloaded to _Subsurface-mobile_. _Subsurface-mobile_\n"
+"attempts to download the existing dive log from the _Subsurface_ cloud\n"
+"server. Appropriate messages are shown onscreen. Finally a list of dives is shown.\n"
 msgstr ""
 
 #. type: Plain text
@@ -220,37 +245,103 @@ msgid ""
 "mobile_ keeps a local copy on the mobile device. This means that, if there "
 "is no Internet connection at a dive site, one can still access the local "
 "copy and view and manipulate dive information. If there is Internet "
-"connectivity, _Subsurface-mobile_ accesses the Internet-based dive log to "
+"connectivity, _Subsurface-mobile_ accesses the cloud-based dive log to "
 "verify that the local copy is still the same as the Internet-stored copy. If "
 "not, the local copy and the copy on the server are synchronised."
 msgstr ""
 
+#. type: Target for macro image
+#: mobile-manual.txt:116
+#, no-wrap
+msgid "mobile-images/Credentials.jpg"
+msgstr "mobile-images/Credentials.jpg"
+
+#. type: Title ====
+#: mobile-manual.txt:119
+#, no-wrap
+msgid "Using _Subsurface-mobile_:"
+msgstr ""
+
+#. type: Plain text
+#: mobile-manual.txt:127
+msgid ""
+"Enter an e-mail address and a password in the fields indicated on the "
+"screen.  The e-mail should be in lower case and the password should contain "
+"a combination of letters from the alphabet (upper and lower case) and/or "
+"numbers. When entering a password, it is possible to check a checkbox that "
+"enables the text of the password to be shown (image on left, above). At this "
+"stage, the red message \"Cannot connect to cloud storage\" appears on the "
+"screen.  This is normal because a valid PIN has not yet been provided (image "
+"on left, above)."
+msgstr ""
+
+#. type: Plain text
+#: mobile-manual.txt:130
+msgid ""
+"Tap the Disk (Save) icon at the bottom of the screen. A PIN is sent to the e-"
+"mail address provided."
+msgstr ""
+
+#. type: Plain text
+#: mobile-manual.txt:133
+msgid ""
+"Enter the PIN into the field indicated and tap the _Save_ icon again. The "
+"user information is stored on the cloud server and access to the cloud is "
+"enabled."
+msgstr ""
+
+#. type: Plain text
+#: mobile-manual.txt:136
+msgid ""
+"The dive list is initially empty. One can now start entering dives in the "
+"dive log or one can download existing dives from the cloud."
+msgstr ""
+
+#. type: Plain text
+#: mobile-manual.txt:142
+msgid ""
+"The text box to enter the PIN is shown whenever the e-mail address field is "
+"empty.  One can create a new cloud account by clearing the e-mail address "
+"and typing a new e-mail address, upon which a new PIN is sent to the newly-"
+"provided e-mail address.  On the other hand, one can change to a different "
+"existing cloud account by providing an e-mail address and password already "
+"registered with the cloud server (image on right, above)"
+msgstr ""
+
+#. type: Plain text
+#: mobile-manual.txt:145
+msgid ""
+"Once Internet access has been enabled, one can temporarily disable this "
+"service when using _Subsurface-mobile_ in areas with no Internet access, e."
+"g. remote dive sites (see below)"
+msgstr ""
+
 #. type: Title ==
-#: mobile-manual.txt:115
+#: mobile-manual.txt:146
 #, no-wrap
 msgid "A Few Remarks About The User Interface"
 msgstr ""
 
 #. type: Plain text
-#: mobile-manual.txt:124
+#: mobile-manual.txt:155
 msgid ""
 "At the bottom of many Subsurface-mobile screens is a round button that "
 "provides for several actions and which allows the selection of the main "
 "affirmative action (see image above and image below).  On Android devices, "
 "use the Android Back button for \"cancel\", \"discard\" or \"back\" actions. "
 "For example, when editing dive information, tapping the action button saves "
-"the changes, the Android back button can be used to cancel the edit without "
-"saving changes."
+"the changes while the Android back button can be used to cancel the edit "
+"without saving changes."
 msgstr ""
 
 #. type: Target for macro image
-#: mobile-manual.txt:125
+#: mobile-manual.txt:156
 #, no-wrap
 msgid "mobile-images/actionbutton.jpg"
-msgstr ""
+msgstr "mobile-images/actionbutton.jpg"
 
 #. type: Plain text
-#: mobile-manual.txt:132
+#: mobile-manual.txt:163
 msgid ""
 "Instead of the more traditional \"hamburger\" menu button in the top left or "
 "right corner of the screen to open menus, _Subsurface-mobile_ uses a "
@@ -260,32 +351,30 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: mobile-manual.txt:135
+#: mobile-manual.txt:166
 msgid ""
-"Tap on the right-arrow symbol in the lower left corner of the screen (easy "
-"to reach for hand held devices)"
+"Tap the \"hamburger\" symbol in the lower left corner of the screen (easy to "
+"reach for hand held devices)"
 msgstr ""
 
 #. type: Plain text
-#: mobile-manual.txt:136
+#: mobile-manual.txt:167
 msgid "Swipe towards the right across the left edge of the screen"
 msgstr ""
 
 #. type: Plain text
-#: mobile-manual.txt:138
-msgid ""
-"Drag the action button visible on most screens with the main action to the "
-"right"
+#: mobile-manual.txt:169
+msgid "Drag the action button visible on most screens to the right"
 msgstr ""
 
 #. type: Target for macro image
-#: mobile-manual.txt:139
+#: mobile-manual.txt:170
 #, no-wrap
 msgid "mobile-images/menu.jpg"
-msgstr ""
+msgstr "mobile-images/menu.jpg"
 
 #. type: Plain text
-#: mobile-manual.txt:145
+#: mobile-manual.txt:176
 msgid ""
 "The images above indicate some of the important features of the menu "
 "system.  On the left is the main menu that is activated as described above. "
@@ -294,36 +383,14 @@ msgid ""
 "Dives_ option on the main menu."
 msgstr ""
 
-#. type: Plain text
-#: mobile-manual.txt:148
-msgid ""
-"Similarly, the context menu (currently only available on the dive details "
-"screen) can be opened one of these three ways:"
-msgstr ""
-
-#. type: Plain text
-#: mobile-manual.txt:150
-msgid "Tap on the left-arrow symbol in the lower right corner of the screen"
-msgstr ""
-
-#. type: Plain text
-#: mobile-manual.txt:151
-msgid "Swipe to the left across the right edge of the screen"
-msgstr ""
-
-#. type: Plain text
-#: mobile-manual.txt:152
-msgid "Drag the action button to the left"
-msgstr ""
-
 #. type: Title ==
-#: mobile-manual.txt:153
+#: mobile-manual.txt:177
 #, no-wrap
 msgid "Viewing the Dive List"
 msgstr ""
 
 #. type: Plain text
-#: mobile-manual.txt:161
+#: mobile-manual.txt:185
 msgid ""
 "Most of the actions of _Subsurface-mobile_ center around the dives on the "
 "dive list. While the dive list is loading from the cloud, a message appears "
@@ -335,26 +402,29 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: mobile-manual.txt:162
+#: mobile-manual.txt:186
 #, no-wrap
-msgid "mobile-images/divelist.jpg"
-msgstr ""
+msgid "mobile-images/DiveList.jpg"
+msgstr "mobile-images/DiveList.jpg"
 
 #. type: Plain text
-#: mobile-manual.txt:166
+#: mobile-manual.txt:193
 msgid ""
 "One can view other dives by swiping the _Details view_ to the right (for the "
-"previous dive) or to the left (following dive)."
+"previous dive) or to the left (following dive).  Using the Action Bar, it is "
+"also possible to delete the dive (tap the dustbin on the Action Bar) or to "
+"view the dive location on a map viewer (normally Google Maps; tap the GPS "
+"icon on the Action Bar.)."
 msgstr ""
 
 #. type: Title ==
-#: mobile-manual.txt:167
+#: mobile-manual.txt:194
 #, no-wrap
-msgid "Editing dive details."
+msgid "Editing dive details"
 msgstr ""
 
 #. type: Plain text
-#: mobile-manual.txt:177
+#: mobile-manual.txt:204
 msgid ""
 "At the bottom of the dive details screen the _Action Button_ contains a "
 "pencil (image on right, above).  Tapping the button brings up a panel with "
@@ -368,26 +438,26 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: mobile-manual.txt:178
+#: mobile-manual.txt:205
 #, no-wrap
-msgid "mobile-images/editdive.jpg"
-msgstr ""
+msgid "mobile-images/EditDive.jpg"
+msgstr "mobile-images/EditDive.jpg"
 
 #. type: Title ==
-#: mobile-manual.txt:180
+#: mobile-manual.txt:207
 #, no-wrap
 msgid "Adding a new dive to the dive list"
 msgstr ""
 
 #. type: Plain text
-#: mobile-manual.txt:191
+#: mobile-manual.txt:218
 msgid ""
-"It is also possible to add an additional dive to the existing dive list. On "
-"the main menu tap _Manage dives -> Add dive manually_. This opens a screen "
-"that is identical to the editing screen discussed above. When a dive is "
-"added manually, one cannot directly add a dive profile from a dive computer. "
-"However, if one does not use a dive computer, the duration, depth and "
-"several other bits of information about the new dive can be entered. The "
+"It is also possible to manually add an additional dive to the existing dive "
+"list. On the main menu tap _Manage dives -> Add dive manually_. This opens a "
+"screen that is identical to the editing screen discussed above. When a dive "
+"is added manually, one cannot directly add a dive profile from a dive "
+"computer. However, if one does not use a dive computer, the duration, depth "
+"and several other bits of information about the new dive can be entered. The "
 "_Action button_ at the bottom of the screen contains a disk symbol. Tap this "
 "to save the new dive. To cancel any edits, tap the Android Back Button.  The "
 "left-hand image below shows a screenshot of a dive being created and the "
@@ -395,98 +465,132 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: mobile-manual.txt:192
+#: mobile-manual.txt:219
 #, no-wrap
-msgid "mobile-images/createdive.jpg"
-msgstr ""
+msgid "mobile-images/ManuallyEnterDive.jpg"
+msgstr "mobile-images/ManuallyEnterDive.jpg"
 
 #. type: Title ==
-#: mobile-manual.txt:194
+#: mobile-manual.txt:221
 #, no-wrap
 msgid "Deleting a dive"
 msgstr ""
 
 #. type: Plain text
-#: mobile-manual.txt:201
+#: mobile-manual.txt:227
 msgid ""
-"The _details view_ of a dive has a context menu on the right-hand side that "
-"can be activated as described above (e.g. by tapping the arrow icon at the "
-"bottom right of the screen or by dragging the _Action Button_ to the left).  "
-"The context menu has a single item: \"Delete dive\". If this option is "
-"tapped, the dive shown in the _Details View_ is deleted. One has a brief "
-"opportunity to undo the delete by tapping the _undo_ message that appears at "
-"the bottom of the screen. If the _undo_ message is not tapped, the dive is "
-"deleted."
+"The _Details View_ of a dive has an Action Bar, including a dustbin. If this "
+"is tapped, the dive shown in the _Details View_ is deleted. One has a brief "
+"opportunity to undo the delete by tapping the grey _Undo_ button in the "
+"message that appears at the bottom of the screen (see image below)."
 msgstr ""
 
+#. type: Target for macro image
+#: mobile-manual.txt:228
+#, no-wrap
+msgid "mobile-images/Delete_undo.jpg"
+msgstr "mobile-images/Delete_undo.jpg"
+
+#. type: Plain text
+#: mobile-manual.txt:235
+msgid ""
+"One can also delete a dive from the dive list by long-pressing a specific "
+"dive until a red dustbin appears on the right-hand side (see image below). "
+"Tap the dustbin. The dive is deleted without asking any confirmation because "
+"_Subsurface-mobile_ assumes that the combination of a long tap on the dive "
+"with another tap on the red dustbin is an unambiguous instruction to delete "
+"the dive."
+msgstr ""
+
+#. type: Target for macro image
+#: mobile-manual.txt:236
+#, no-wrap
+msgid "mobile-images/RedDustbin.jpg"
+msgstr "mobile-images/RedDustbin.jpg"
+
 #. type: Title ==
-#: mobile-manual.txt:202
+#: mobile-manual.txt:238
 #, no-wrap
 msgid "Dive log management"
 msgstr ""
 
 #. type: Plain text
-#: mobile-manual.txt:212
-#, no-wrap
+#: mobile-manual.txt:248
 msgid ""
-"A central  part of _Subsurface-mobile_ is the ability to store the dive\n"
-"log using the _Subsurface_ cloud storage.\n"
-"This provides security against loss or damage to the dive information "
-"caintained in a local copy of\n"
-"the dive log and allows the desktop version of _Subsurface_ to\n"
-"access changes made using the mobile device. This ability is accessed\n"
-"throug the main menu (by dragging the Action Button to the right, or\n"
-"alternatively tap the right angle button at the bottom left of the screen).\n"
-" Tap the option _Manage dives_, enabling a number of options:\n"
+"A central part of _Subsurface-mobile_ is the ability to store the dive log "
+"using the _Subsurface_ cloud storage.  This provides security against loss "
+"or damage to the dive information contained in a local copy of the dive log "
+"and allows the desktop version of _Subsurface_ to access changes made using "
+"the mobile device. This ability is accessed through the main menu (by "
+"dragging the Action Button to the right, or alternatively tap the \"Hamburger"
+"\" icon at the bottom left of the screen).  Tap the option _Manage dives_, "
+"enabling a number of options:"
 msgstr ""
 
 #. type: Title ===
-#: mobile-manual.txt:213
+#: mobile-manual.txt:249
 #, no-wrap
 msgid "Add new dive manually"
 msgstr ""
 
 #. type: Plain text
-#: mobile-manual.txt:216
+#: mobile-manual.txt:252
 msgid "This is described above under the section dealing with the dive list."
 msgstr ""
 
 #. type: Title ===
-#: mobile-manual.txt:217
+#: mobile-manual.txt:253
 #, no-wrap
 msgid "Upload dive log to the _Subsurface_ cloud storage"
 msgstr ""
 
 #. type: Plain text
-#: mobile-manual.txt:223
+#: mobile-manual.txt:259
 msgid ""
 "One can upload the dives contained on the mobile device to the _Subsurface_ "
-"cloud storage by tapping the option _Upload to cloud_.  This synchronizes "
-"the local changes to the dive log with the cloud storage."
+"cloud storage by tapping the option _Manual sync with coud_.  This "
+"synchronizes the local changes to the dive log with the cloud storage."
 msgstr ""
 
 #. type: Title ===
-#: mobile-manual.txt:224
+#: mobile-manual.txt:260
 #, no-wrap
 msgid "Download dive log from the cloud storage"
 msgstr ""
 
 #. type: Plain text
-#: mobile-manual.txt:229
+#: mobile-manual.txt:265
+msgid ""
+"In the dive management subpanel, tap the option _Manual sync with cloud_, "
+"causing the local divelog to be refreshed from the cloud so that the cloud "
+"and local versions are synchronised."
+msgstr ""
+
+#. type: Title ===
+#: mobile-manual.txt:266
+#, no-wrap
+msgid "Working offline"
+msgstr ""
+
+#. type: Plain text
+#: mobile-manual.txt:273
 msgid ""
-"In the dive management subpanel, tap the option _Refresh_, causing the local "
-"divelog to be refreshed from the cloud so that the cloud and local versions "
-"are synchronised."
+"Sometimes one wishes to use the app when an Internet connection is not "
+"available, for instance at remote dive sites. In such a case _Subsurface-"
+"mobile_ may unnecesarily search for an Internet connection, causing long "
+"delays in executing some functions. In the dive management menu, one can "
+"turn the Internet access on or off by tapping the _Offline mode_ or _Enable "
+"auto cloud sync_ options."
 msgstr ""
 
 #. type: Title ===
-#: mobile-manual.txt:230
+#: mobile-manual.txt:274
 #, no-wrap
 msgid "Changing the login credentials on the _Subsurface_ cloud"
 msgstr ""
 
 #. type: Plain text
-#: mobile-manual.txt:236
+#: mobile-manual.txt:280
 msgid ""
 "It may be necessary to change one's login credentials, for instance if one's "
 "email address (initially used as a credential) has changed. To change the "
@@ -495,13 +599,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ==
-#: mobile-manual.txt:238
+#: mobile-manual.txt:282
 #, no-wrap
 msgid "Recording dive locations using GPS."
 msgstr ""
 
 #. type: Plain text
-#: mobile-manual.txt:244
+#: mobile-manual.txt:288
 msgid ""
 "The fact that most smartphones have GPS facilities allows one to record the "
 "locations of dives. One can take the smartphone on the dive boat during a "
@@ -511,13 +615,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: mobile-manual.txt:245
+#: mobile-manual.txt:289
 #, no-wrap
 msgid "Setting up the GPS"
 msgstr ""
 
 #. type: Plain text
-#: mobile-manual.txt:253
+#: mobile-manual.txt:297
 msgid ""
 "Open the main menu and tap _GPS -> Preferences_. Now specify the way in "
 "which GPS data need to be automatically collected (image on right, below). "
@@ -529,19 +633,19 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: mobile-manual.txt:254
+#: mobile-manual.txt:298
 #, no-wrap
 msgid "mobile-images/gpssetup.jpg"
-msgstr ""
+msgstr "mobile-images/gpssetup.jpg"
 
 #. type: Title ===
-#: mobile-manual.txt:256
+#: mobile-manual.txt:300
 #, no-wrap
 msgid "Collecting GPS positions"
 msgstr ""
 
 #. type: Plain text
-#: mobile-manual.txt:265
+#: mobile-manual.txt:309
 msgid ""
 "Ensure that the GPS on the Android device has been activated. At the bottom "
 "of the GPS submenu is a check box _Run location service_ (image on left, "
@@ -552,13 +656,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: mobile-manual.txt:266
+#: mobile-manual.txt:310
 #, no-wrap
 msgid "Storing the GPS data on the _Subsurface_ cloud"
 msgstr ""
 
 #. type: Plain text
-#: mobile-manual.txt:273
+#: mobile-manual.txt:317
 msgid ""
 "Activate the main menu and select the _GPS_ option that brings up the "
 "submenu of GPS-related actions (image on left, above). Tap _Upload GPS data_ "
@@ -569,26 +673,26 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: mobile-manual.txt:274
+#: mobile-manual.txt:318
 #, no-wrap
 msgid "Downloading GPS data from the _Subsurface_ cloud"
 msgstr ""
 
 #. type: Plain text
-#: mobile-manual.txt:278
+#: mobile-manual.txt:322
 msgid ""
 "Download the GPS data that have been saved on the cloud by selecting "
 "_Download GPS Data_ from the GPS subpanel."
 msgstr ""
 
 #. type: Title ===
-#: mobile-manual.txt:279
+#: mobile-manual.txt:323
 #, no-wrap
 msgid "Viewing GPS data"
 msgstr ""
 
 #. type: Plain text
-#: mobile-manual.txt:290
+#: mobile-manual.txt:334
 msgid ""
 "From the GPS submenu (image on left, above) select _Show GPS fixes_. This "
 "brings up a list of GPS positions obtained using the location service (image "
@@ -603,26 +707,26 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: mobile-manual.txt:291
+#: mobile-manual.txt:335
 #, no-wrap
 msgid "mobile-images/gpsmanagement.jpg"
-msgstr ""
+msgstr "mobile-images/gpsmanagement.jpg"
 
 #. type: Title ===
-#: mobile-manual.txt:293
+#: mobile-manual.txt:337
 #, no-wrap
 msgid "Applying GPS data to dives in the dive log"
 msgstr ""
 
 #. type: Plain text
-#: mobile-manual.txt:301
+#: mobile-manual.txt:345
 msgid ""
 "Assuming that all the dives have been entered into the dive log or have been "
 "downloaded from the _Subsurface_ cloud, one can apply the GPS positions to "
 "these dives. GPS positions can therefore only be applied to dives in the "
-"dive list.  From the GPS subpanel, tap _Apply GPS fixes_. The dive list "
+"dive list.  From the GPS subpanel, tap _GPS-tag dives_. The dive list "
 "contains the start and end times of each dive. Now, _Subsurface-mobile_ "
 "applies the first GPS position that falls within the dive period of each "
 "dive. This results in a GPS position for each dive that is saved as part of "
-"the dive list."
+"the dive log."
 msgstr ""
diff --git a/Documentation/fr/po/subsurface-user-manual.fr.po b/Documentation/fr/po/subsurface-user-manual.fr.po
index 19365e0..25bbc1a 100644
--- a/Documentation/fr/po/subsurface-user-manual.fr.po
+++ b/Documentation/fr/po/subsurface-user-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: 2016-03-12 13:31+0100\n"
-"PO-Revision-Date: 2016-03-12 13:55+0100\n"
+"POT-Creation-Date: 2016-07-21 10:32+0200\n"
+"PO-Revision-Date: 2016-07-21 10:57+0200\n"
 "Last-Translator: Guillaume GARDET <guillaume.gardet at opensuse.org>\n"
 "Language-Team: French <opensuse-fr at opensuse.org>\n"
 "Language: fr\n"
@@ -200,46 +200,38 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:78
+#: user-manual.txt:79
 #, no-wrap
-msgid "images/usermanualfunctions.jpg"
-msgstr "images/usermanualfunctions.jpg"
+msgid "images/UserManualSearch.jpg"
+msgstr "images/UserManualSearch.jpg"
 
 #. type: Plain text
-#: user-manual.txt:90
+#: user-manual.txt:91
 msgid ""
 "_PREVIOUS/NEXT LINK_. Move between links (underlined words that jump to "
 "specific sections in the user manual) by right-clicking on the text of the "
-"manual.  This brings up a context menu to previous links selected.  (see "
-"image above). For instance if a link has been selected, then the option to "
-"_Go Back_ shows the text at the last link selected (similar to the Previous "
-"Page button in a browser). Conversely the _Go Forward_ option jumps to the "
-"text seen before selecting the _Go Back_ option. The _Reload_ option reloads "
-"the complete user manual into the window."
+"manual.  This brings up a context menu to PREVIOUS links selected.  (see "
+"image below). For instance if a link has been selected, then the option to "
+"_Go Back_ shows the text at the previous link selected (similar to the "
+"Previous Page button in a browser). Conversely the _Go Forward_ option jumps "
+"to the text seen before selecting the _Go Back_ option. The _Reload_ option "
+"reloads the complete user manual into the window."
 msgstr ""
 
-#. type: Title -
+#. type: Target for macro image
 #: user-manual.txt:92
 #, no-wrap
+msgid "images/UserManualLinksBack.jpg"
+msgstr "images/UserManualLinksBack.jpg"
+
+#. type: Title -
+#: user-manual.txt:97
+#, no-wrap
 msgid "The user survey"
 msgstr "Le sondage utilisateur"
 
 #. type: Plain text
-#: user-manual.txt:103
-#, fuzzy
-#| msgid ""
-#| "In order to develop _Subsurface_ in a way that serves its users in the "
-#| "best possible way, it is important to have some user information. Upon "
-#| "launching _Subsurface_ after using this software for a week or so, a one-"
-#| "box user survey pops up. It is entirely optional and the user controls "
-#| "what, if any, data are sent to the _Subsurface_ development team. Any "
-#| "data that the user chooses to send is extremely useful, and will only be "
-#| "used to steer future development and to customise the software to fit the "
-#| "needs of the _Subsurface_ users. If one completes the survey, or clicks "
-#| "the option not to be asked again, that should be the last communication "
-#| "of this nature one receives.  However, if one's diving and/or subsurface "
-#| "habits change and one wishes to provide another survey, this can be done "
-#| "by launching _Subsurface_ with the _--survey_ option on the command line."
+#: user-manual.txt:108
 msgid ""
 "In order to develop _Subsurface_ to serve its users in the best possible "
 "way, it’s important to have user information. Upon launching _Subsurface_ "
@@ -253,30 +245,29 @@ msgid ""
 "subsurface habits change and you wish to fill in another survey, just launch "
 "_Subsurface_ with the _--survey_ option on the command line."
 msgstr ""
-"Dans le but de développer _Subsurface_ d'une manière qui serve ses "
-"utilisateurs de la meilleur manière qu'il soit, il est important d'avoir des "
-"informations sur les utilisateurs. À l'ouverture de _Subsurface_ après avoir "
-"utilisé le logiciel pendant une semaine environ, une fenêtre de sondage "
-"apparait. Cela est complètement optionnel et l'utilisateur contrôle quelles "
-"informations sont envoyées ou non à l'équipe de développement de "
-"_Subsurface_. Toutes les données que l'utilisateur choisit d'envoyer sont "
-"extrêmement utiles et ne seront utilisées que pour les futures "
-"développements et modifications du logiciel pour coller au mieux aux besoins "
-"des utilisateurs de _Subsurface_. Si vous complétez le sondage ou cliquez "
-"sur l'option pour ne plus être sondé, cela devrait être la dernière "
-"communication de ce type que vous recevrez. Cependant, si vos habitudes de "
-"plongées ou d'utilisation de Subsurface changent, vous pouvez envoyer un "
-"nouveau sondage en démarrant _Subsurface_ avec l'option  _--survey_ sur la "
-"ligne de commande."
+"Dans le but de développer _Subsurface_ pour servir ses utilisateurs de la "
+"meilleur manière qu'il soit, il est important d'avoir des informations sur "
+"les utilisateurs. À l'ouverture de _Subsurface_ après avoir utilisé le "
+"logiciel pendant une semaine environ, une fenêtre de sondage apparait. Cela "
+"est complètement optionnel et l'utilisateur contrôle quelles informations "
+"sont envoyées ou non à l'équipe de développement de _Subsurface_. Toutes les "
+"données que l'utilisateur envoie sont utiles et ne seront utilisées que pour "
+"les futurs développements et modifications du logiciel pour coller au mieux "
+"aux besoins des utilisateurs de _Subsurface_. Si vous complétez le sondage "
+"ou cliquez sur l'option pour ne plus être sondé, cela devrait être la "
+"dernière communication de ce type que vous recevrez. Cependant, si vos "
+"habitudes de plongées ou d'utilisation de Subsurface changent, vous pouvez "
+"envoyer un nouveau sondage en démarrant _Subsurface_ avec l'option  _--"
+"survey_ sur la ligne de commande."
 
 #. type: Title -
-#: user-manual.txt:106
+#: user-manual.txt:111
 #, no-wrap
 msgid "Start Using the Program"
 msgstr "Commencer à utiliser le programme"
 
 #. type: Plain text
-#: user-manual.txt:111
+#: user-manual.txt:116
 msgid ""
 "The _Subsurface_ window is usually divided into four panels with a *Main "
 "Menu* (File Import Log View Help) at the top of the window (for Windows and "
@@ -289,34 +280,22 @@ msgstr ""
 "quatre panneaux sont :"
 
 #. type: Plain text
-#: user-manual.txt:117
-#, fuzzy
-#| msgid ""
-#| "The *Dive List* to the bottom left containing a list of all the dives in "
-#| "the user's dive log. A dive can be selected and highlighted on the dive "
-#| "list by clicking on it. In most situations the up/down keys can be used "
-#| "to switch between dives. The *Dive List* is an important tool for "
-#| "manipulating a dive log."
+#: user-manual.txt:122
 msgid ""
 "The *Dive List* on the bottom left, showing all the dives in the user's dive "
 "log. A dive can be selected and highlighted on the dive list by clicking on "
 "it. In most situations the up/down keys can be used to switch between dives. "
 "The *Dive List* is an important tool for manipulating a dive log."
 msgstr ""
-"La *liste des plongées* en bas à gauche, contenant une liste de toutes les "
-"plongées du journal (carnet) de plongées de l'utilisateur. Une plongée peut "
-"être sélectionnée et mise en surbrillance dans la liste en cliquant dessus. "
-"Dans la plupart des cas, les touches haut/bas peuvent être utilisée pour "
-"passer d'une plongée à l'autre. La *liste des plongées* est un outil "
-"important pour manipuler un journal (carnet) de plongée."
+"La *liste des plongées* en bas à gauche, affichant toutes les plongées du "
+"journal (carnet) de plongées de l'utilisateur. Une plongée peut être "
+"sélectionnée et mise en surbrillance dans la liste en cliquant dessus. Dans "
+"la plupart des cas, les touches haut/bas peuvent être utilisée pour passer "
+"d'une plongée à l'autre. La *liste des plongées* est un outil important pour "
+"manipuler un journal (carnet) de plongée."
 
 #. type: Plain text
-#: user-manual.txt:120
-#, fuzzy
-#| msgid ""
-#| "The *Dive Map* to the bottom right, showing the user's dive sites on a "
-#| "world map and centred on the site of the last dive selected in the *Dive "
-#| "List*."
+#: user-manual.txt:125
 msgid ""
 "The *Dive Map* on the bottom right, showing the user's dive sites on a world "
 "map and centered on the site of the last dive selected in the *Dive List*."
@@ -326,12 +305,7 @@ msgstr ""
 "plongée sélectionnée dans la *liste des plongées*."
 
 #. type: Plain text
-#: user-manual.txt:124
-#, fuzzy
-#| msgid ""
-#| "The *Info* to the top left, giving more detailed information on the dive "
-#| "selected in the *Dive List*, including some statistics for the selected "
-#| "dive or for all highlighted dive(s)."
+#: user-manual.txt:129
 msgid ""
 "The *Info* on the top left, giving more detailed information on the dive "
 "selected in the *Dive List*, including some statistics for the selected dive "
@@ -343,11 +317,7 @@ msgstr ""
 "en surbrillance."
 
 #. type: Plain text
-#: user-manual.txt:127
-#, fuzzy
-#| msgid ""
-#| "The *Dive Profile* to the top right, showing a graphical dive profile of "
-#| "the selected dive in the *Dive List*."
+#: user-manual.txt:132
 msgid ""
 "The *Dive Profile* on the top right, showing a graphical dive profile of the "
 "selected dive in the *Dive List*."
@@ -356,13 +326,7 @@ msgstr ""
 "graphique de la plongée sélectionnée dans la *liste des plongées*."
 
 #. type: Plain text
-#: user-manual.txt:131
-#, fuzzy
-#| msgid ""
-#| "The dividers between panels can be dragged in order to change the size of "
-#| "any of the panels. _Subsurface_ remembers the position of the dividers, "
-#| "so the next time _Subsurface_ starts it uses the positions of the "
-#| "dividers from when the program was last used."
+#: user-manual.txt:136
 msgid ""
 "The dividers between panels can be dragged to change the size of any of the "
 "panels. _Subsurface_ remembers the position of the dividers, so the next "
@@ -375,16 +339,7 @@ msgstr ""
 "positions."
 
 #. type: Plain text
-#: user-manual.txt:139
-#, fuzzy
-#| msgid ""
-#| "If a single dive is selected in the *Dive List*, the dive location, "
-#| "detailed information and profile of the _selected dive_ are shown in the "
-#| "respective panels. On the other hand, if several dives are selected, the "
-#| "last highlighted dive is the _selected dive_, but summary data of all "
-#| "_highlighted dives_ are shown in the *Stats* tab of the *Info* panel "
-#| "(maximum, minimum and average depths, durations, water temperatures and "
-#| "SAC; total time and number of dives selected)."
+#: user-manual.txt:144
 msgid ""
 "If a single dive is selected in the *Dive List*, the dive location, detailed "
 "information and profile of the _selected dive_ are shown in the respective "
@@ -396,55 +351,50 @@ msgid ""
 msgstr ""
 "Si une unique plongée est sélectionnée dans la *liste des plongées*, "
 "l'emplacement de la plongée, les informations détaillées et le profil de la "
-"_plongée sélectionnée_ sont affichées dans les panneaux respectifs. D'autre "
-"part, si plusieurs plongées sont sélectionnées, la dernière mise en "
-"surbrillance est la _plongée sélectionnée_, mais les données de _toutes les "
-"plongées mises en surbrillances_ sont affichées dans l'onglet *Stats* du "
-"panneau *informations* (profondeur maximale, minimale et moyenne, les "
-"durées, les températures de l'eau et le SAC (air consommé); temps total et "
-"nombre de plongées sélectionnées)."
+"_plongée sélectionnée_ sont affichées dans les panneaux respectifs. Si "
+"plusieurs plongées sont sélectionnées, la dernière mise en surbrillance est "
+"la _plongée sélectionnée_, mais les données de _toutes les plongées mises en "
+"surbrillances_ sont affichées dans l'onglet *Stats* du panneau "
+"*informations* (profondeur maximale, minimale et moyenne, les durées, les "
+"températures de l'eau et le SAC (air consommé); temps total et nombre de "
+"plongées sélectionnées)."
 
 #. type: Target for macro image
-#: user-manual.txt:142
+#: user-manual.txt:147
 #, no-wrap
 msgid "images/main_window_f22.jpg"
 msgstr "images/main_window_f22.jpg"
 
 #. type: Plain text
-#: user-manual.txt:146
-#, fuzzy
-#| msgid ""
-#| "The user can determine which of the four panels are displayed by "
-#| "selecting the *View* option on the main menu. This feature gives the user "
-#| "several choices of display:"
+#: user-manual.txt:151
 msgid ""
 "The user decides which of the four panels are displayed by selecting the "
 "*View* option on the main menu. This feature has several choices of display:"
 msgstr ""
-"L'utilisateur peut déterminer si lesquels des quatre panneaux sont affichés "
-"en sélectionnant l'option *Vue* dans le menu principal. Cette fonctionnalité "
+"L'utilisateur décide quels panneaux sont affichés, parmi les 4, en "
+"sélectionnant l'option *Vue* dans le menu principal. Cette fonctionnalité "
 "permet plusieurs choix d'affichage :"
 
 #. type: Plain text
-#: user-manual.txt:148
+#: user-manual.txt:153
 #, no-wrap
 msgid "*All*: show all four of the panels as in the screenshot above.\n"
 msgstr "*Tout* : affiche les quatre panneaux tels que sur la capture d'écran ci-dessus.\n"
 
 #. type: Plain text
-#: user-manual.txt:150
+#: user-manual.txt:155
 #, no-wrap
 msgid "*Divelist*: Show only the Dive List.\n"
 msgstr "*Liste des plongées* : affiche uniquement la liste des plongées.\n"
 
 #. type: Plain text
-#: user-manual.txt:152
+#: user-manual.txt:157
 #, no-wrap
 msgid "*Profile*: Show only the Dive Profile of the selected dive.\n"
 msgstr "*Profil* : affiche uniquement le profile de plongée de la plongée sélectionnée.\n"
 
 #. type: Plain text
-#: user-manual.txt:155
+#: user-manual.txt:160
 #, no-wrap
 msgid ""
 "*Info*: Show only the Notes about the last selected dive and statistics for\n"
@@ -454,22 +404,13 @@ msgstr ""
 "toutes les plongées mises en surbrillance.\n"
 
 #. type: Plain text
-#: user-manual.txt:157
-#, fuzzy, no-wrap
-#| msgid "*Globe*: Show only the world map, centred on the last selected dive.\n"
+#: user-manual.txt:162
+#, no-wrap
 msgid "*Globe*: Show only the world map, centered on the last selected dive.\n"
 msgstr "*Globe* : affiche uniquement la carte mondiale, centrée sur la dernière plongée sélectionnée.\n"
 
 #. type: Plain text
-#: user-manual.txt:163
-#, fuzzy
-#| msgid ""
-#| "Like many other functions that can be accessed via the Main Menu, these "
-#| "options can be triggered using keyboard shortcuts. The shortcuts for a "
-#| "particular system are shown with an underline in the main menu entries. "
-#| "Since different Operating Systems and the user chosen language may cause "
-#| "_Subsurface_ to use different shortcut keys they are not listed here in "
-#| "the user manual."
+#: user-manual.txt:168
 msgid ""
 "Like other functions that can be accessed via the Main Menu, these options "
 "can also be triggered using keyboard shortcuts. The shortcuts for a "
@@ -478,45 +419,33 @@ msgid ""
 "_Subsurface_ to use different shortcut keys, they are not listed in this "
 "user manual."
 msgstr ""
-"Comme la plupart des autre fonctions qui peuvent être accédée via le menu "
-"principal, ces options peuvent être utilisées par des raccourcis clavier. "
-"Les raccourcis pour un système particulier sont affichés avec un souligné "
-"des les entrées de menu. À cause des différents systèmes d'exploitation et "
-"des divers langues, _Subsurface_ peut utiliser différentes touches de "
-"raccourcis et ne sont donc pas détaillées ici."
+"Comme d'autres fonctions qui peuvent être accédée via le menu principal, ces "
+"options peuvent aussi être utilisées par des raccourcis clavier. Les "
+"raccourcis pour un système particulier sont affichés avec un souligné des "
+"les entrées de menu. À cause des différents systèmes d'exploitation et des "
+"divers langues, _Subsurface_ peut utiliser différentes touches de raccourcis "
+"et ne sont donc pas détaillées ici."
 
 #. type: Plain text
-#: user-manual.txt:167
-#, fuzzy
-#| msgid ""
-#| "When the program is started for the first time, it shows no information "
-#| "at all.  This is because the program doesn't have any dive information "
-#| "available. In the following sections, the procedures to create a new "
-#| "logbook will be described."
+#: user-manual.txt:172
 msgid ""
 "When the program is started for the first time, it shows no information at "
 "all, because it does not have any dive information available. In the "
 "following sections, the procedures to create a new logbook will be explained."
 msgstr ""
 "Lorsque le programme est lancé pour la première fois, il n'affiche aucune "
-"information. Ceci parce que le programme n'a aucune information de plongée "
-"disponible. Dans les sections suivantes, le procédure pour créer a nouveau "
-"carnet de plongée sera détaillée."
+"information, parce qu'il n'a aucune information de plongée disponible. Dans "
+"les sections suivantes, le procédure pour créer a nouveau carnet de plongée "
+"sera détaillée."
 
 #. type: Title -
-#: user-manual.txt:170
+#: user-manual.txt:175
 #, no-wrap
 msgid "Creating a new logbook"
 msgstr "Créer un nouveau carnet de plongée"
 
 #. type: Plain text
-#: user-manual.txt:175
-#, fuzzy
-#| msgid ""
-#| "Select _File -> New Logbook_ from the main menu. All existing dive data "
-#| "are cleared so that new information can be added. If there are unsaved "
-#| "data in an open logbook, the user is asked whether the open logbook "
-#| "should be saved before a new logbook is created."
+#: user-manual.txt:180
 msgid ""
 "Select _File -> New Logbook_ from the main menu. All existing dive data are "
 "cleared so new information can be added. If there are unsaved data in an "
@@ -530,35 +459,30 @@ msgstr ""
 "faut les enregistrer ou non avant de créer le nouveau carnet."
 
 #. type: Title ==
-#: user-manual.txt:177
+#: user-manual.txt:182
 #, no-wrap
 msgid "Storing dive information in the logbook"
 msgstr "Enregistrement des informations de plongée dans le carnet"
 
 #. type: Plain text
-#: user-manual.txt:180
-#, fuzzy
-#| msgid ""
-#| "Now that a new logbook was created, it is simple to add dive data to it.  "
-#| "_Subsurface_ allows several ways of adding dive data to a logbook, "
-#| "detailed in the following sections."
+#: user-manual.txt:185
 msgid ""
 "Now that a new logbook is created, it is simple to add dive data it.  "
 "_Subsurface_ allows several ways of adding dive data to a logbook."
 msgstr ""
 "Maintenant qu'un nouveau carnet de plongée a été créé, il est simple de lui "
-"ajouter des données. _Subsurface_ permet plusieurs façons pour ajouter des "
-"données de plongée au carnet. Plus de détails dans les sections suivantes."
+"ajouter des données. _Subsurface_ comporte plusieurs façons pour ajouter des "
+"données de plongée au carnet."
 
 #. type: Plain text
-#: user-manual.txt:181
+#: user-manual.txt:186
 msgid "If the user has a handwritten divelog, a spreadsheet or another form of"
 msgstr ""
 "Si l'utilisateur possède un carnet manuscrit, un tableur ou une autre forme "
 "de "
 
 #. type: Plain text
-#: user-manual.txt:183
+#: user-manual.txt:188
 msgid ""
 "manually maintained divelog, dive data can be added to the logbook using one "
 "of these approaches:"
@@ -567,16 +491,14 @@ msgstr ""
 "au carnet en utilisant une des approches suivantes :"
 
 #. type: Plain text
-#: user-manual.txt:184
-#, fuzzy
-#| msgid "Enter dive information by hand. This is useful if the diver did not"
+#: user-manual.txt:189
 msgid "Enter dive information by hand. This is useful if the diver didn’t"
 msgstr ""
 "Entrer les informations de plongée à la main. Cela est utile si le plongeur "
 "n'a pas"
 
 #. type: Plain text
-#: user-manual.txt:186
+#: user-manual.txt:191
 msgid ""
 "use a dive computer and dives were recorded in a written logbook. See: xref:"
 "S_EnterData[Entering dive information by hand]"
@@ -586,7 +508,7 @@ msgstr ""
 "à la main]"
 
 #. type: Plain text
-#: user-manual.txt:188
+#: user-manual.txt:193
 msgid ""
 "Import dive log information that has been maintained either as a spreadsheet"
 msgstr ""
@@ -594,7 +516,7 @@ msgstr ""
 "tableur"
 
 #. type: Plain text
-#: user-manual.txt:190
+#: user-manual.txt:195
 msgid ""
 "or as a CSV file. Refer to: xref:S_Appendix_D[APPENDIX D: Exporting a "
 "spreadsheet to CSV format] and to xref:S_ImportingCSVDives[Importing dives "
@@ -605,21 +527,18 @@ msgstr ""
 "S_ImportingCSVDives[Importer des plongées au format CSV]."
 
 #. type: Plain text
-#: user-manual.txt:193
-#, fuzzy
-#| msgid ""
-#| "dive and a large amount of additional information can be accessed. These "
-#| "dives can be imported from:"
+#: user-manual.txt:198
 msgid ""
 "If a dive is recorded using a dive computer, the depth profile and a large "
 "amount of additional information can be accessed.  These dives can be "
 "imported from:"
 msgstr ""
-"plongée et de nombreuses informations supplémentaires peuvent être "
-"utilisées. Ces plongées peuvent être importées à partir de :"
+"Si une plongée est enregistrée par un ordinateur de plongée, le profil de "
+"profondeur et de nombreuses informations supplémentaires peuvent être "
+"obtenues. Ces plongées peuvent être importées à partir de :"
 
 #. type: Plain text
-#: user-manual.txt:194
+#: user-manual.txt:199
 msgid ""
 "The dive computer itself. See: xref:S_ImportDiveComputer[Importing new dive "
 "information from a Dive Computer] or"
@@ -628,7 +547,7 @@ msgstr ""
 "de nouvelles informations de plongée à partir de l'ordinateur de plongée] ou"
 
 #. type: Plain text
-#: user-manual.txt:196
+#: user-manual.txt:201
 msgid ""
 "Proprietary software distributed by manufacturers of dive computers. Refer"
 msgstr ""
@@ -636,7 +555,7 @@ msgstr ""
 "Voir"
 
 #. type: Plain text
-#: user-manual.txt:197
+#: user-manual.txt:202
 msgid ""
 "to: xref:S_ImportingAlienDiveLogs[Importing dive information from other "
 "digital data sources or other data formats]."
@@ -645,16 +564,12 @@ msgstr ""
 "sources de données numériques ou d'autres formats de données]."
 
 #. type: Plain text
-#: user-manual.txt:198
-#, fuzzy
-#| msgid "Import from spreadsheet or CSV files containing dive profiles."
+#: user-manual.txt:203
 msgid "Spreadsheet or CSV files containing dive profiles."
-msgstr ""
-"Importer à partir d'un tableur ou de fichiers CSV contenant les profils de "
-"plongées."
+msgstr "Tableur ou de fichiers CSV contenant les profils de plongées."
 
 #. type: Plain text
-#: user-manual.txt:199
+#: user-manual.txt:204
 msgid ""
 "See: xref:S_ImportingCSVDives[Importing dives in CSV format from dive "
 "computers or other dive log software]"
@@ -663,13 +578,13 @@ msgstr ""
 "des ordinateurs de plongées ou d'autres logiciels de carnet de plongée]"
 
 #. type: Title ===
-#: user-manual.txt:202
+#: user-manual.txt:207
 #, no-wrap
 msgid "Entering dive information by hand"
 msgstr "Entrer les informations de plongée à la main"
 
 #. type: Plain text
-#: user-manual.txt:217
+#: user-manual.txt:222
 msgid ""
 "This is usually the approach for dives without a dive computer. The basic "
 "record of information within _Subsurface_ is a dive. The most important "
@@ -686,13 +601,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:218
+#: user-manual.txt:223
 #, no-wrap
 msgid "images/AddDive1_f22.jpg"
 msgstr "images/AddDive1_f22.jpg"
 
 #. type: Plain text
-#: user-manual.txt:222
+#: user-manual.txt:227
 msgid ""
 "When you edit a field in Notes or Equipment panels, _Subsurface_ enters "
 "*Editing Mode*, indicated by the message in the blue box at the top of the "
@@ -701,13 +616,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:223 user-manual.txt:782
+#: user-manual.txt:228 user-manual.txt:789
 #, no-wrap
 msgid "images/BlueEditBar_f22.jpg"
 msgstr "images/BlueEditBar_f22.jpg"
 
 #. type: Plain text
-#: user-manual.txt:231
+#: user-manual.txt:236
 msgid ""
 "The _Apply changes_ button should only be selected after all the parts of a "
 "dive have been entered.  When entering dives by hand, the _Info_, "
@@ -720,13 +635,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:233
+#: user-manual.txt:238
 #, no-wrap
 msgid "Creating a Dive Profile"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:240
+#: user-manual.txt:245
 msgid ""
 "The *Dive Profile* (a graphical representation of the depth of the dive as a "
 "function of time) is shown in the panel on the top right hand of the "
@@ -736,13 +651,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:241
+#: user-manual.txt:246
 #, no-wrap
 msgid "images/DiveProfile1_f20.jpg"
 msgstr "images/DiveProfile1_f20.jpg"
 
 #. type: Plain text
-#: user-manual.txt:259
+#: user-manual.txt:264
 msgid ""
 "_Modifying the dive profile_: When the cursor is moved around the dive "
 "profile, its position is shown by two right-angled red lines as seen below.  "
@@ -760,13 +675,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:260
+#: user-manual.txt:265
 #, no-wrap
 msgid "images/DiveProfile2_f20.jpg"
 msgstr "images/DiveProfile2_f20.jpg"
 
 #. type: Plain text
-#: user-manual.txt:272
+#: user-manual.txt:277
 msgid ""
 "_Specifying the gas composition:_ The gas composition used is indicated "
 "along the line segments of the dive profile. This defaults to the first gas "
@@ -780,13 +695,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:273
+#: user-manual.txt:278
 #, no-wrap
 msgid "images/DiveProfile3_f20.jpg"
 msgstr "images/DiveProfile3_f20.jpg"
 
 #. type: Plain text
-#: user-manual.txt:280
+#: user-manual.txt:285
 msgid ""
 "With the profile now defined, more details must be added to have a fuller "
 "record of the dive. To do this, the *Notes* and the *Equipment* tabs on the "
@@ -795,19 +710,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:281
+#: user-manual.txt:286
 #, no-wrap
 msgid "Importing new dive information from a Dive Computer"
 msgstr "Importer de nouvelles informations de plongée à partir de l'ordinateur de plongée"
 
 #. type: Title ====
-#: user-manual.txt:283
+#: user-manual.txt:288
 #, no-wrap
 msgid "Connecting and importing data from a dive computer."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:293
+#: user-manual.txt:298
 msgid ""
 "The use of dive computers allows the collection of a large amount of "
 "information about each dive, e.g. a detailed record of depth, duration, "
@@ -819,13 +734,13 @@ msgid ""
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:294 user-manual.txt:654 user-manual.txt:3026
+#: user-manual.txt:299 user-manual.txt:661 user-manual.txt:3148
 #, no-wrap
 msgid "images/icons/warning2.png"
 msgstr "images/icons/warning2.png"
 
 #. type: Plain text
-#: user-manual.txt:304
+#: user-manual.txt:309
 msgid ""
 "Several dive computers consume more power when they are in PC-Communication "
 "mode. **This could drain the dive computer's battery**. We recommend the "
@@ -837,7 +752,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:320
+#: user-manual.txt:325
 msgid ""
 "To import dive information from a dive computer to a computer with "
 "_Subsurface_, the two pieces of equipment must communicate with one "
@@ -853,48 +768,48 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:322
+#: user-manual.txt:327
 msgid ""
 "After this, the dive computer can be hooked up to the user's PC using these "
 "steps:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:324
+#: user-manual.txt:329
 msgid ""
 "The interface cable should be connected to a free USB port (or the Infra-red"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:325
+#: user-manual.txt:330
 msgid "or Bluetooth connection set up as described later in this manual)"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:327
+#: user-manual.txt:332
 msgid "The dive computer should be placed into PC Communication mode."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:328
+#: user-manual.txt:333
 msgid "(Refer to the manual of the specific dive computer)"
 msgstr "(Se reporter au manuel de l'ordinateur de plongée)"
 
 #. type: Plain text
-#: user-manual.txt:332
+#: user-manual.txt:337
 msgid ""
 "In _Subsurface_, from the Main Menu, select _Import -> Import From Dive "
 "Computer_.  Dialogue *A* in the figure below appears:"
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:334
+#: user-manual.txt:339
 #, no-wrap
 msgid "images/DC_import_f20.jpg"
 msgstr "images/DC_import_f20.jpg"
 
 #. type: Plain text
-#: user-manual.txt:342
+#: user-manual.txt:347
 msgid ""
 "Dive computers tend to keep a certain number of dives in memory, even though "
 "these dives have already been imported to _Subsurface_. For that reason, if "
@@ -905,7 +820,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:349
+#: user-manual.txt:354
 msgid ""
 "The dialogue has two drop-down lists, *Vendor* and *Dive Computer*. On the "
 "*vendor* drop-down list select the make of the computer, e.g.  Suunto, "
@@ -915,7 +830,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:360
+#: user-manual.txt:365
 msgid ""
 "The *Device or Mount Point* drop-down list contains the USB or Bluetooth "
 "port name that _Subsurface_ needs in order to communicate with the dive "
@@ -929,7 +844,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:370
+#: user-manual.txt:375
 msgid ""
 "If all the dives on the dive computer need to be downloaded, check the "
 "checkbox _Force download of all dives_. Normally, _Subsurface_ only "
@@ -944,7 +859,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:376
+#: user-manual.txt:381
 msgid ""
 "If the checkbox _Always prefer downloaded dives_ has been checked and, "
 "during download, dives with identical date-times exist on the dive computer "
@@ -953,14 +868,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:379
+#: user-manual.txt:384
 msgid ""
 "The checkbox marked _Download into new trip_ ensures that, after upload, the "
 "downloaded dives are grouped together as a new trip(s) in the *Dive List*."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:383
+#: user-manual.txt:388
 msgid ""
 "Do *not* check the checkboxes labelled _Save libdivecomputer logfile_ and "
 "_Save libdivecomputer dumpfile_. These are only used as diagnostic tools "
@@ -968,7 +883,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:402
+#: user-manual.txt:407
 msgid ""
 "Then select the _Download_ button.  With communication established, you can "
 "see how the data are retrieved from the dive computer.  Depending on the "
@@ -990,14 +905,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:407
+#: user-manual.txt:412
 msgid ""
 "Then click the OK button.  The checked dives are transferred to the *Dive "
 "List*."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:411
+#: user-manual.txt:416
 msgid ""
 "If there is a problem in communicating with the dive computer, an error "
 "message will be shown, similar to this text: \"Unable to open /dev/ttyUSB0 "
@@ -1005,38 +920,38 @@ msgid ""
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:415
+#: user-manual.txt:420
 #, no-wrap
 msgid "*PROBLEMS WITH DATA DOWNLOAD FROM A DIVE COMPUTER?*\n"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:415 user-manual.txt:521 user-manual.txt:565
-#: user-manual.txt:578 user-manual.txt:1149 user-manual.txt:1215
-#: user-manual.txt:1266 user-manual.txt:1342 user-manual.txt:1653
+#: user-manual.txt:420 user-manual.txt:527 user-manual.txt:571
+#: user-manual.txt:584 user-manual.txt:1156 user-manual.txt:1222
+#: user-manual.txt:1387 user-manual.txt:1463 user-manual.txt:1774
 #, no-wrap
 msgid "images/icons/important.png"
 msgstr "images/icons/important.png"
 
 #. type: delimited block *
-#: user-manual.txt:418
+#: user-manual.txt:423
 msgid "Check the following:"
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:421
+#: user-manual.txt:426
 msgid "Is the dive computer still in PC-communication or Upload mode?"
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:423
+#: user-manual.txt:428
 msgid ""
 "Is the dive computer’s battery fully charged? If not then charge or replace "
 "it."
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:427
+#: user-manual.txt:432
 msgid ""
 "Is the connecting cable faulty? Does the cable work using other software? "
 "Has it worked before, or is this the first time the cable is being used? Are "
@@ -1044,7 +959,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:432
+#: user-manual.txt:437
 msgid ""
 "Consult xref:"
 "_appendix_a_operating_system_specific_information_for_importing_dive_information_from_a_dive_computer[Appendix "
@@ -1052,7 +967,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:436
+#: user-manual.txt:441
 msgid ""
 "On Unix-like operating systems, does the user have write permission to the "
 "USB port? If not, consult xref:"
@@ -1061,7 +976,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:444
+#: user-manual.txt:449
 msgid ""
 "If the _Subsurface_ computer does not recognize the USB adaptor by showing "
 "an appropriate device name next to the Mount Point, then there is a "
@@ -1073,7 +988,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:447
+#: user-manual.txt:452
 #, no-wrap
 msgid ""
 "\tSave libdivecomputer logfile\n"
@@ -1081,7 +996,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:453
+#: user-manual.txt:458
 #, no-wrap
 msgid ""
 "*Important*: These check boxes are only used when problems are encountered\n"
@@ -1092,7 +1007,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:457
+#: user-manual.txt:462
 #, no-wrap
 msgid ""
 "*Important:* _After downloading with the above checkboxes\n"
@@ -1101,7 +1016,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:460
+#: user-manual.txt:465
 #, no-wrap
 msgid ""
 "\tsubsurface.log\n"
@@ -1109,7 +1024,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:466
+#: user-manual.txt:471
 msgid ""
 "These files should be send to the _Subsurface_ mail list: "
 "_subsurface at subsurface-divelog.org_ with a request for the files to be "
@@ -1118,19 +1033,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:469
+#: user-manual.txt:474
 #, no-wrap
 msgid "Connecting _Subsurface_ to a Bluetooth-enabled dive computer"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:470 user-manual.txt:3578
+#: user-manual.txt:475 user-manual.txt:3700
 #, no-wrap
 msgid "images/icons/bluetooth.jpg"
 msgstr "images/icons/bluetooth.jpg"
 
 #. type: Plain text
-#: user-manual.txt:477
+#: user-manual.txt:482
 msgid ""
 "Bluetooth is becoming a more common way of communication between dive "
 "computers and _Subsurface_, for or instance, the Shearwater Petrel Mk2 and "
@@ -1140,31 +1055,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:479
+#: user-manual.txt:484
 msgid ""
 "Be sure Bluetooth is activated on the host computer running _Subsurface_."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:480
+#: user-manual.txt:485
 msgid "Be sure _Subsurface_ sees the Bluetooth adapter on the host computer."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:481
+#: user-manual.txt:486
 msgid ""
 "Be sure the Bluetooth-enabled dive computer is Bluetooth-discoverable and in "
 "PC upload mode."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:482
+#: user-manual.txt:487
 msgid ""
 "Be sure _Subsurface_ is paired with the Bluetooth-enabled dive computer."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:486
+#: user-manual.txt:491
 msgid ""
 "Select the Download dialogue by selecting _Import -> Import from dive "
 "computer_ from the *Main Menu*. If you check the box labelled _\"Choose "
@@ -1172,19 +1087,19 @@ msgid ""
 msgstr ""
 
 #. type: Title =====
-#: user-manual.txt:486
+#: user-manual.txt:492
 #, no-wrap
 msgid "On Linux or MacOS:"
 msgstr "Sur Linux ou MacOS :"
 
 #. type: Target for macro image
-#: user-manual.txt:488
+#: user-manual.txt:494
 #, no-wrap
 msgid "images/DC_import_Bluetooth.jpg"
 msgstr "images/DC_import_Bluetooth.jpg"
 
 #. type: Plain text
-#: user-manual.txt:519
+#: user-manual.txt:525
 msgid ""
 "On the _Linux_ or _MacOS_ platforms the name of the _Subsurface_ computer "
 "and its Bluetooth address are shown on the right hand side, On the left hand "
@@ -1217,7 +1132,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:526
+#: user-manual.txt:532
 msgid ""
 "Currently _Subsurface_ does not support Bluetooth pairing with dive "
 "computers that require a custom PIN code. In order to pair the devices, use "
@@ -1225,12 +1140,12 @@ msgid ""
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:528
+#: user-manual.txt:534
 msgid "One way to achieve this is to use +bluetoothctl+:"
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:539
+#: user-manual.txt:545
 #, no-wrap
 msgid ""
 "\t$ bluetoothctl\n"
@@ -1246,7 +1161,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:545
+#: user-manual.txt:551
 msgid ""
 "After the devices are paired, press the _Save_ button of the dialogue.  This "
 "closes the Bluetooth dialogue. Now select _Download_ in the _Download from "
@@ -1255,19 +1170,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:546 user-manual.txt:3505 user-manual.txt:3593
+#: user-manual.txt:552 user-manual.txt:3627 user-manual.txt:3715
 #, no-wrap
 msgid "On Windows:"
 msgstr "Sur Windows :"
 
 #. type: Target for macro image
-#: user-manual.txt:547
+#: user-manual.txt:553
 #, no-wrap
 msgid "images/DC_import_Bluetooth_Windows.png"
 msgstr "images/DC_import_Bluetooth_Windows.png"
 
 #. type: Plain text
-#: user-manual.txt:557
+#: user-manual.txt:563
 msgid ""
 "On _Windows_ platforms the _Local Bluetooth device details section_ on the "
 "right is not displayed as is the case on the Linux/Mac systems.  To start a "
@@ -1281,7 +1196,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:564
+#: user-manual.txt:570
 msgid ""
 "The pairing step is checked and done automatically during the download "
 "process. If the devices have never been paired the system will ask for your "
@@ -1292,7 +1207,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:572
+#: user-manual.txt:578
 msgid ""
 "Currently _Subsurface_ works only with local Bluetooth adapters which use "
 "Microsoft Bluetooth Stack. If the local device uses _Widcomm_, _Stonestreet "
@@ -1302,7 +1217,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:577
+#: user-manual.txt:583
 msgid ""
 "A log message on the bottom left of the _Remote Bluetooth device selection_ "
 "shows details about the current status of the Bluetooth agent. To select "
@@ -1312,7 +1227,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:587
+#: user-manual.txt:593
 #, no-wrap
 msgid ""
 "*IN CASE OF PROBLEMS*:  If the Bluetooth adapter from the _Subsurface_ computer\n"
@@ -1324,13 +1239,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:590
+#: user-manual.txt:596
 #, no-wrap
 msgid "Changing the name of a dive computer"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:606
+#: user-manual.txt:612
 msgid ""
 "It may be necessary to distinguish between different dive computers used to "
 "upload dive logs to _Subsurface_. For instance if a buddy’s dive computer is "
@@ -1349,13 +1264,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:608
+#: user-manual.txt:614
 #, no-wrap
 msgid "Updating the dive information imported from the dive computer."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:615
+#: user-manual.txt:621
 msgid ""
 "With the uploaded dives in the *Dive List*, the information from the dive "
 "computer is not complete and more details must be added to have a full "
@@ -1364,13 +1279,13 @@ msgid ""
 msgstr ""
 
 #. type: Title =====
-#: user-manual.txt:617
+#: user-manual.txt:623
 #, no-wrap
 msgid "Notes"
 msgstr "Notes"
 
 #. type: Plain text
-#: user-manual.txt:622
+#: user-manual.txt:628
 msgid ""
 "To have a more complete dive record, the user needs to add additional "
 "information by hand. The procedure below is virtually identical for hand-"
@@ -1378,7 +1293,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:632
+#: user-manual.txt:638
 msgid ""
 "In some cases, you must provide the date and time of the dive, for example "
 "when entering a dive by hand or when a dive computer doesn’t provide the "
@@ -1391,13 +1306,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:633
+#: user-manual.txt:639
 #, no-wrap
 msgid "images/AddDive3_f22.jpg"
 msgstr "images/AddDive3_f22.jpg"
 
 #. type: Plain text
-#: user-manual.txt:642
+#: user-manual.txt:648
 msgid ""
 "The right hand image, above, shows a *Notes tab* filled with dive "
 "information.  The *Time* field reflects the date and time of the dive. By "
@@ -1408,7 +1323,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:652
+#: user-manual.txt:658
 #, no-wrap
 msgid ""
 "*Air/water temperatures*: Air and water temperatures during the dive are shown\n"
@@ -1423,13 +1338,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:654
+#: user-manual.txt:661
 #, no-wrap
 msgid "*Location*:\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:662
+#: user-manual.txt:669
 msgid ""
 "Dive locations are managed as a *separate* part of the dive log.  The dive "
 "information in the *Notes* and *Equipment* tabs can therefore NOT be edited "
@@ -1441,7 +1356,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:680
+#: user-manual.txt:687
 msgid ""
 "Type in the name of the dive site, e.g. \"Tihany, Lake Balaton, Hungary\".  "
 "If several dives are made at the same location, the site information for the "
@@ -1461,13 +1376,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:681
+#: user-manual.txt:688
 #, no-wrap
 msgid "images/Locations1_f22.jpg"
 msgstr "images/Locations1_f22.jpg"
 
 #. type: Plain text
-#: user-manual.txt:686
+#: user-manual.txt:693
 msgid ""
 "Doubleclick on the new dive site name. A panel appears to enter the "
 "coordinates and other information about the site (image *B*, above). The "
@@ -1476,7 +1391,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:692
+#: user-manual.txt:699
 msgid ""
 "Use the world map in the bottom right hand part of the _Subsurface_ window. "
 "The map displays an orange bar indicating \"No location data - Move the map "
@@ -1485,7 +1400,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:697
+#: user-manual.txt:704
 msgid ""
 "Use the _Subsurface_ Companion app if you have an Android or iPhone device "
 "with GPS and if the dive site coordinates were stored using it.  xref:"
@@ -1493,14 +1408,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:699
+#: user-manual.txt:706
 msgid ""
 "Enter by hand if the coordinates are known, using one of four formats with "
 "latitude followed by longitude:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:704
+#: user-manual.txt:711
 msgid ""
 "ISO 6709 Annex D format e.g. 30°13'28.9\"N 30°49'1.5\"E Degrees and decimal "
 "minutes, e.g. N30° 13.49760' , E30° 49.30788' Degrees minutes seconds, e.g. "
@@ -1508,7 +1423,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:712
+#: user-manual.txt:719
 msgid ""
 "Southern hemisphere latitudes are given with a *S*, e.g. S30°, or with a "
 "negative value, e.g. -30.22496. Similarly western longitudes are given with "
@@ -1520,7 +1435,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:718
+#: user-manual.txt:725
 #, no-wrap
 msgid ""
 "*Important*: GPS coordinates of a dive site are linked to the location\n"
@@ -1531,7 +1446,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:728
+#: user-manual.txt:735
 #, no-wrap
 msgid ""
 "*Dive site name lookup:* If coordinates have been typed into the appropriate\n"
@@ -1546,7 +1461,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:733
+#: user-manual.txt:740
 msgid ""
 "Enter any other contextual information about the dive site (Description and "
 "Notes), then select _Apply Changes_ to save the geolocation for this dive "
@@ -1555,7 +1470,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:738
+#: user-manual.txt:745
 #, no-wrap
 msgid ""
 "*Dive mode*: This is a dropdown box allowing you to choose the type of dive\n"
@@ -1565,7 +1480,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:743
+#: user-manual.txt:750
 #, no-wrap
 msgid ""
 "*Divemaster*: The name of the divemaster or dive guide should be\n"
@@ -1575,7 +1490,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:748
+#: user-manual.txt:755
 #, no-wrap
 msgid ""
 "*Buddy*: In this field, enter the name(s) of the buddy or buddies\n"
@@ -1585,7 +1500,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:753
+#: user-manual.txt:760
 #, no-wrap
 msgid ""
 "*Suit*: Here the type of dive suit used can be entered.\n"
@@ -1595,7 +1510,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:756
+#: user-manual.txt:763
 #, no-wrap
 msgid ""
 "*Rating*: You can provide a subjective overall rating of the dive on a\n"
@@ -1603,7 +1518,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:760
+#: user-manual.txt:767
 #, no-wrap
 msgid ""
 "*Visibility*: You can provide a rating of visibility during the\n"
@@ -1612,7 +1527,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:768
+#: user-manual.txt:775
 #, no-wrap
 msgid ""
 "*Tags*: Tags that describe the type of dive done can be entered\n"
@@ -1625,13 +1540,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:770
+#: user-manual.txt:777
 #, no-wrap
 msgid "*Notes*: Any additional information for the dive can be entered here.\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:775
+#: user-manual.txt:782
 msgid ""
 "The _Apply changes_ and _Discard changes_ buttons are used to save all the "
 "information for tabs in the *Info* panel and in the *Dive Profile* panel. "
@@ -1641,13 +1556,13 @@ msgid ""
 msgstr ""
 
 #. type: Title =====
-#: user-manual.txt:776
+#: user-manual.txt:783
 #, no-wrap
 msgid "Equipment"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:781
+#: user-manual.txt:788
 msgid ""
 "The Equipment tab lets you enter information about the type of cylinder and "
 "gas used, as well as the weights used for the dive. The message in the blue "
@@ -1655,7 +1570,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:788
+#: user-manual.txt:795
 msgid ""
 "shows the dive is being edited. This is a highly interactive part of "
 "_Subsurface_ and the information on cylinders and gases (entered here) "
@@ -1663,7 +1578,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:792
+#: user-manual.txt:799
 #, no-wrap
 msgid ""
 "*Cylinders*: The cylinder information is entered through a dialogue that looks\n"
@@ -1671,13 +1586,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:793
+#: user-manual.txt:800
 #, no-wrap
 msgid "images/DC_gas-dialogue1_f20.jpg"
 msgstr "images/DC_gas-dialogue1_f20.jpg"
 
 #. type: Plain text
-#: user-manual.txt:806
+#: user-manual.txt:813
 msgid ""
 "For hand-entered dives, this information needs to be typed in. For dive "
 "computers, _Subsurface_ often gets the gas used from the dive computer and "
@@ -1693,13 +1608,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:807
+#: user-manual.txt:814
 #, no-wrap
 msgid "images/DC_gas-dialogue2_f20.jpg"
 msgstr "images/DC_gas-dialogue2_f20.jpg"
 
 #. type: Plain text
-#: user-manual.txt:814
+#: user-manual.txt:821
 msgid ""
 "The drop-down list can then be used to select the cylinder type that was "
 "used for this dive, or just start typing in the box which shows the "
@@ -1709,7 +1624,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:818
+#: user-manual.txt:825
 msgid ""
 "Next, indicate the starting pressure and the ending pressure of the "
 "specified gas during the dive. The unit of pressure (metric/imperial)  "
@@ -1717,7 +1632,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:829
+#: user-manual.txt:836
 msgid ""
 "Finally, provide the gas mixture used. If air was used, the value of 21% can "
 "be entered or this field can be left blank. If nitrox or trimix were used, "
@@ -1731,13 +1646,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:830
+#: user-manual.txt:837
 #, no-wrap
 msgid "images/CylinderDataEntry3_f20.jpg"
 msgstr "images/CylinderDataEntry3_f20.jpg"
 
 #. type: Plain text
-#: user-manual.txt:837
+#: user-manual.txt:844
 #, no-wrap
 msgid ""
 "*Weights*: Information about the weight system used can be entered\n"
@@ -1748,26 +1663,26 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:838
+#: user-manual.txt:845
 #, no-wrap
 msgid "images/WeightsDataEntry1_f20.jpg"
 msgstr "images/WeightsDataEntry1_f20.jpg"
 
 #. type: Plain text
-#: user-manual.txt:842
+#: user-manual.txt:849
 msgid ""
 "By clicking on the _Type_ field, a drop-down list becomes accessible through "
 "a down-arrow:"
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:843
+#: user-manual.txt:850
 #, no-wrap
 msgid "images/WeightsDataEntry2_f20.jpg"
 msgstr "images/WeightsDataEntry2_f20.jpg"
 
 #. type: Plain text
-#: user-manual.txt:857
+#: user-manual.txt:864
 msgid ""
 "This can be used to select the type of weight system used during the dive or "
 "just may start typing in the box to specify a different weighting mechanism "
@@ -1782,19 +1697,19 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:858
+#: user-manual.txt:865
 #, no-wrap
 msgid "images/WeightsDataEntry3_f20.jpg"
 msgstr "images/WeightsDataEntry3_f20.jpg"
 
 #. type: Title ====
-#: user-manual.txt:860
+#: user-manual.txt:867
 #, no-wrap
 msgid "Editing several selected dives simultaneously"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:876
+#: user-manual.txt:883
 msgid ""
 "_METHOD 1_: After uploading dives from a dive computer, the dive profiles of "
 "each is shown in the *Dive profile* tab, as well as a few items of "
@@ -1812,7 +1727,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:886
+#: user-manual.txt:893
 msgid ""
 "Simultaneous editing only works with fields that do not already contain "
 "information.  This means if some fields have been edited for a particular "
@@ -1827,7 +1742,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:895
+#: user-manual.txt:902
 msgid ""
 "_METHOD 2_:There is a different way of achieving the same goal. Select a "
 "dive with all the appropriate information typed into the *Notes* and "
@@ -1842,13 +1757,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:896
+#: user-manual.txt:903
 #, no-wrap
 msgid "Adding Bookmarks to a dive"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:901
+#: user-manual.txt:908
 msgid ""
 "Many divers wish to annotate dives with text that indicate particular "
 "events, e.g. \"Saw dolphins\", or \"Released surface buoy\". This is easily "
@@ -1856,7 +1771,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:905
+#: user-manual.txt:912
 msgid ""
 "Right-click at the appropriate point on the dive profile.  This brings up "
 "the dive profile context menu. Select _Add bookmark_. A red flag is placed "
@@ -1864,40 +1779,40 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:907
+#: user-manual.txt:914
 msgid ""
 "Right-click on the red flag. This brings up the context menu (see *B* "
 "below). Select _Edit name_."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:910
+#: user-manual.txt:917
 msgid ""
 "A text box is shown. Type the explanatory text for the bookmark (see *C* "
 "below). Select _OK_.  This saves the text associated with the bookmark."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:913
+#: user-manual.txt:920
 msgid ""
 "Hovering the mouse over the red bookmark, the appropriate text is shown at "
 "the bottom of the information box (see *D* below)."
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:914
+#: user-manual.txt:921
 #, no-wrap
 msgid "images/Bookmarks.jpg"
 msgstr "images/Bookmarks.jpg"
 
 #. type: Title ====
-#: user-manual.txt:917
+#: user-manual.txt:924
 #, no-wrap
 msgid "Saving the updated dive information"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:928
+#: user-manual.txt:935
 msgid ""
 "The information entered in the *Notes* tab and the *Equipment* tab can be "
 "saved by using the two buttons on the top right hand of the *Notes* tab. If "
@@ -1910,13 +1825,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:929
+#: user-manual.txt:936
 #, no-wrap
 msgid "Importing dive information from other digital data sources or other data formats"
 msgstr "Importer les informations à partir d'autres sources de données numériques ou d'autres formats de données"
 
 #. type: Plain text
-#: user-manual.txt:954
+#: user-manual.txt:961
 msgid ""
 "If you’ve been diving for some time, it’s possible several dives were logged "
 "using other dive log software. These dive logs can probably be imported into "
@@ -1937,7 +1852,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:964
+#: user-manual.txt:971
 msgid ""
 "If the format of other software is supported natively on Subsurface, select "
 "either _Import -> Import log files_ or _File -> Open log file_. _Subsurface_ "
@@ -1951,13 +1866,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:964
+#: user-manual.txt:971
 #, no-wrap
 msgid "Using the universal import dialogue"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:970
+#: user-manual.txt:977
 msgid ""
 "Importing dives from other software is done through a universal interface "
 "activated by selecting _Import_ from the Main Menu, then clicking on _Import "
@@ -1965,13 +1880,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:971
+#: user-manual.txt:978
 #, no-wrap
 msgid "images/Import1_f20.jpg"
 msgstr "images/Import1_f20.jpg"
 
 #. type: Plain text
-#: user-manual.txt:976
+#: user-manual.txt:983
 msgid ""
 "Towards the bottom right is a dropdown selector with a default label of "
 "_Dive Log Files_ which accesses different types of direct imports available, "
@@ -1979,70 +1894,70 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:978
+#: user-manual.txt:985
 msgid ""
 "XML-formatted dive logs (DivingLog 5.0, MacDive and several other dive log "
 "systems)"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:979
+#: user-manual.txt:986
 msgid "Cochran dive logs"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:980
+#: user-manual.txt:987
 msgid "UDDF-formatted dive logs (e.g. Kenozoooid)"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:981
+#: user-manual.txt:988
 msgid "UDCF-formatted dive logs"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:982
+#: user-manual.txt:989
 msgid "Poseidon MkVI CCR logs"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:983
+#: user-manual.txt:990
 msgid "APD Inspiration/Evolution CCR logs"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:984
+#: user-manual.txt:991
 msgid "LiquiVision logs"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:985
+#: user-manual.txt:992
 msgid "divelog.de logs"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:986
+#: user-manual.txt:993
 msgid "OSTC Tools logs"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:987
+#: user-manual.txt:994
 msgid "JDiveLog"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:988
+#: user-manual.txt:995
 msgid "Suunto Dive Manager (DM3 and DM4)"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:989
+#: user-manual.txt:996
 msgid ""
 "CSV (text-based and spreadsheet-based) dive logs, including APD CCR logs"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:994
+#: user-manual.txt:1001
 msgid ""
 "Selecting the appropriate format and then the specific log file in the large "
 "window containing the file list on the right of the dialogue, opens the "
@@ -2052,13 +1967,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:995
+#: user-manual.txt:1002
 #, no-wrap
 msgid "Importing from  OSTCTools"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1004
+#: user-manual.txt:1011
 msgid ""
 "_OSTC Tools_ is a Microsoft-based suite of dive download and dive management "
 "tools for the OSTC family of dive computers. _OSTC Tools_ downloads dive "
@@ -2071,7 +1986,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1008
+#: user-manual.txt:1015
 msgid ""
 "All H&W devices supported by OSTCTools can be imported to _Subsurface_. This "
 "includes OSTC, OSTC Mk2, OSTC 2N/2C, OSTC3, OSTC Sport, and probably "
@@ -2079,7 +1994,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1013
+#: user-manual.txt:1020
 msgid ""
 "Please remember that OSTCTools is *not* a true diving log software, but "
 "rather a useful set of tools for analysis and management of OSTC devices. "
@@ -2089,13 +2004,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:1015
+#: user-manual.txt:1022
 #, no-wrap
 msgid "Importing from Mares Dive Organizer V2.1"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1022
+#: user-manual.txt:1029
 msgid ""
 "Since Mares uses proprietary Windows software not compatible with multi-"
 "platform applications, these dive logs cannot be directly imported into "
@@ -2105,7 +2020,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1027
+#: user-manual.txt:1034
 msgid ""
 "Export the dive log data from Mares Dive Organizer to your desktop, using a "
 "_.sdf_ file name extension. Refer to xref:Mares_Export[Appendix C] for more "
@@ -2113,7 +2028,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1033
+#: user-manual.txt:1040
 msgid ""
 "Data should then be imported into _www.divelogs.de_. You will first need to "
 "create a user account in _www.divelogs.de_.  Log into that web site, then "
@@ -2124,20 +2039,20 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1035
+#: user-manual.txt:1042
 msgid ""
 "Finally, import the dives from _divelogs.de_ to _Subsurface_, using the "
 "instructions below."
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:1038
+#: user-manual.txt:1045
 #, no-wrap
 msgid "Importing dives from *divelogs.de*"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1051
+#: user-manual.txt:1058
 msgid ""
 "Importing dive information from _divelogs.de_ is simple, using a single "
 "dialogue box. The _Import -> Import from Divelogs.de_ option should be "
@@ -2151,19 +2066,19 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:1052
+#: user-manual.txt:1059
 #, no-wrap
 msgid "images/Divelogs1.jpg"
 msgstr "images/Divelogs1.jpg"
 
 #. type: Title ====
-#: user-manual.txt:1055
+#: user-manual.txt:1062
 #, no-wrap
 msgid "Importing data in CSV format"
 msgstr "Importer des données au format CSV"
 
 #. type: Plain text
-#: user-manual.txt:1066
+#: user-manual.txt:1073
 msgid ""
 "A comma-separated file (.csv) can be used to import dive information either "
 "as dive profiles (as in the case of the APD Inspiration and Evolution closed "
@@ -2179,13 +2094,13 @@ msgid ""
 msgstr ""
 
 #. type: Title =====
-#: user-manual.txt:1068
+#: user-manual.txt:1075
 #, no-wrap
 msgid "Importing dives in CSV format from dive computers or other dive log software"
 msgstr "Importer les plongées au format CSV à partir des ordinateurs de plongées ou d'autres logiciels de carnet de plongée"
 
 #. type: Plain text
-#: user-manual.txt:1073
+#: user-manual.txt:1080
 msgid ""
 "You can view a _CSV_ file by using an ordinary text editor. It’s normally "
 "organized into a single line that provides the headers (or _field names_ or "
@@ -2194,14 +2109,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1075
+#: user-manual.txt:1082
 msgid ""
 "There are two types of _CSV_ dive logs that can be imported into "
 "_Subsurface_:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1081
+#: user-manual.txt:1088
 msgid ""
 "_CSV dive details_: This dive log format contains similar information to "
 "that of a typical written dive log, e.g. dive date and time, dive depth, "
@@ -2212,7 +2127,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1090
+#: user-manual.txt:1097
 msgid ""
 "_CSV dive profile_: This dive log format includes much more information "
 "about a single dive. For instance there may be information at 30-second "
@@ -2226,14 +2141,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1093
+#: user-manual.txt:1100
 msgid ""
 "Before being able to import the _CSV_ data to _Subsurface_ *you needs to "
 "know a few things about the data being imported*:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1101
+#: user-manual.txt:1108
 msgid ""
 "Which character separates the different columns within a single line of "
 "data? This field separator should be either a comma (,) a semicolon (;) or a "
@@ -2245,7 +2160,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1105
+#: user-manual.txt:1112
 msgid ""
 "Which data columns need to be imported into _Subsurface_? Is it a _CSV dive "
 "details_ file or a _CSV dive profile_ file? Open the file using a text "
@@ -2254,13 +2169,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1107
+#: user-manual.txt:1114
 msgid ""
 "Is the numeric information (e.g. dive depth) in metric or in imperial units?"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1114
+#: user-manual.txt:1121
 msgid ""
 "With this information, importing the data into _Subsurface_ is "
 "straightforward. Select _Import -> Import Log Files_ from the main menu. In "
@@ -2270,13 +2185,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:1115
+#: user-manual.txt:1122
 #, no-wrap
 msgid "images/csv_import1_f20.jpg"
 msgstr "images/csv_import1_f20.jpg"
 
 #. type: Plain text
-#: user-manual.txt:1126
+#: user-manual.txt:1133
 #, no-wrap
 msgid ""
 "At the top left, there is a dropdown list containing pre- configured\n"
@@ -2291,7 +2206,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1138
+#: user-manual.txt:1145
 msgid ""
 "Complete this by ensuring that all the data columns have the appropriate "
 "column headings. The top blue row of the data table contains the column "
@@ -2308,13 +2223,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:1139
+#: user-manual.txt:1146
 #, no-wrap
 msgid "images/csv_import2_f20.jpg"
 msgstr "images/csv_import2_f20.jpg"
 
 #. type: Plain text
-#: user-manual.txt:1145
+#: user-manual.txt:1152
 msgid ""
 "Continue in this way to ensure all the column headings in the blue row of "
 "cells correspond to the headings listed in the top part of the dialogue.  "
@@ -2323,13 +2238,13 @@ msgid ""
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:1149
+#: user-manual.txt:1156
 #, no-wrap
 msgid "*A Diver's Introduction to _CSV_ Files*\n"
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:1163
+#: user-manual.txt:1170
 msgid ""
 "_CSV_ is an abbreviation for a data file format: _Comma-Separated Values_. "
 "It is a file format that lets you view or edit information using a text "
@@ -2346,7 +2261,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:1172
+#: user-manual.txt:1179
 msgid ""
 "_CSV_ files can be created or edited with a normal text editor. The most "
 "important attribute of a _CSV_ file is the _field separator_, the character "
@@ -2362,7 +2277,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:1178
+#: user-manual.txt:1185
 #, no-wrap
 msgid ""
 "\tDive site,Dive date,Time,Dive_duration, Dive_depth,Dive buddy\n"
@@ -2373,14 +2288,14 @@ msgid ""
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:1180
+#: user-manual.txt:1187
 msgid ""
 "The above data are not easily read by a human. Here is the same information "
 "in TAB-delimited format:"
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:1186
+#: user-manual.txt:1193
 #, no-wrap
 msgid ""
 "\tDive site\tDive date\tTime\tDive_duration\tDive_depth\tDive buddy\n"
@@ -2391,7 +2306,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:1194
+#: user-manual.txt:1201
 msgid ""
 "It is clear why many people prefer the TAB-delimited format to the comma-"
 "delimited format. The disadvantage is that one cannot see the TAB "
@@ -2405,7 +2320,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:1205
+#: user-manual.txt:1212
 #, no-wrap
 msgid ""
 "\tDive Time (s)\tDepth (m)\tpO₂ - Setpoint (Bar) \tpO₂ - C1 Cell 1 (Bar)\tAmbient temp. (Celsius)\n"
@@ -2421,7 +2336,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:1211
+#: user-manual.txt:1218
 msgid ""
 "When a _CSV_ file is selected for import, _Subsurface_ displays the column "
 "headers as well as some of the data in the first few lines of the _CSV_ "
@@ -2432,7 +2347,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1225
+#: user-manual.txt:1232
 msgid ""
 "But, the _CSV_ import has a couple of caveats. Avoid some special characters "
 "like ampersand (&), less than (<), greater than (>) and double quotes (\") "
@@ -2445,13 +2360,263 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:1228
+#: user-manual.txt:1234
+#, no-wrap
+msgid "Importing Dive coordinates from a mobile device with GPS."
+msgstr ""
+
+#. type: Plain text
+#: user-manual.txt:1238
+msgid ""
+"A smartphone with built-in GPS facilities can be used to store the locations "
+"of dives.  This is performed by:"
+msgstr ""
+
+#. type: Plain text
+#: user-manual.txt:1241
+msgid ""
+"Taking the mobile device along on the dive boat / liveabord while "
+"automatically collecting dive site coordinate information."
+msgstr ""
+
+#. type: Plain text
+#: user-manual.txt:1243
+msgid ""
+"Uploading the coordinates from the mobile device to the _Subsurface_ "
+"Internet server."
+msgstr ""
+
+#. type: Plain text
+#: user-manual.txt:1246
+msgid ""
+"Syncronising the dives in the _Subsurface_ dive list with the coordinates "
+"stored on the _Subsurface_ Internet server."
+msgstr ""
+
+#. type: Plain text
+#: user-manual.txt:1248
+msgid "_Subsurface has two tools for achieving this:"
+msgstr ""
+
+#. type: Plain text
+#: user-manual.txt:1250
+msgid "The _Subsurface Companion App_ (Android and iOS)."
+msgstr ""
+
+#. type: Plain text
+#: user-manual.txt:1252
+msgid "The _Subsurface-mobile_ app (Android and iOS)"
+msgstr ""
+
+#. type: Plain text
+#: user-manual.txt:1261
+msgid ""
+"Both of these applications perform the collection of dive site coordinates "
+"and the synchronisation with dives in the _Subsurface_ dive list. However, "
+"the Companion App is not being further developed and has largely been "
+"replaced by the _Subsurface-mobile_ app. While the _Companion app_ serves "
+"exclusively to collect dive site coordinates and to make these available to "
+"the _Subsurface_ desktop version, _Subsurface-mobile_ performs many of the "
+"functions of the desktop version, including the management and viewing of "
+"dive information. Below, we describe how to perform the above three steps "
+"using each of the two mobile apps."
+msgstr ""
+
+#. type: Plain text
+#: user-manual.txt:1263
+msgid ""
+"For information on using the _Subsurface Companion App_, click xref:"
+"S_iCompanion[_here_]."
+msgstr ""
+
+#. type: Title ====
+#: user-manual.txt:1264
+#, no-wrap
+msgid "Storing and and using GPS locations using  _Subsurface-mobile_"
+msgstr ""
+
+#. type: Title =====
+#: user-manual.txt:1266
+#, no-wrap
+msgid "Install _Subsurface-mobile_"
+msgstr ""
+
+#. type: Plain text
+#: user-manual.txt:1272
+msgid ""
+"Find _Subsurface-mobile_ on Google Play and install it on an Android device. "
+"The app is free. The iOS version is currently experimental. _Subsurface-"
+"mobile_ has an extensive https://subsurface-divelog.org/documentation/"
+"subsurface-mobile-user-manual[user manual] accessible from within that app."
+msgstr ""
+
+#. type: Title =====
+#: user-manual.txt:1273
+#, no-wrap
+msgid "Create a _Subsurface-mobile_ account"
+msgstr ""
+
+#. type: Plain text
+#: user-manual.txt:1281
+msgid ""
+"This topic is discussed at length in the _Subsurface-mobile_ user manual. In "
+"the Credentials screen of _Subsurface-mobile_ provide an e-mail address and "
+"a user password that enables subsequent access. A PIN number is e-mailed "
+"from the _Subsurface_ Internet server to the e-mail address that has been "
+"provided.  Type the PIN into the appropriate text field in the Credentials "
+"screen (see image below).  The _Subsurface_ Internet server notifies the "
+"user that a new user has been registered."
+msgstr ""
+
+#. type: Plain text
+#: user-manual.txt:1284
+#, no-wrap
+msgid ""
+"*N.B.:* To successfully create a user account, the mobile device must have Internet connectivity,\n"
+"either through the cellular network or via wifi.\n"
+msgstr ""
+
+#. type: Target for macro image
+#: user-manual.txt:1285
+#, no-wrap
+msgid "images/MobileCredentials.jpg"
+msgstr "images/MobileCredentials.jpg"
+
+#. type: Title =====
+#: user-manual.txt:1288
+#, no-wrap
+msgid "Configure auto-collecting of GPS coordinates"
+msgstr ""
+
+#. type: Plain text
+#: user-manual.txt:1294
+msgid ""
+"Activate the main menu of _Subsurface-mobile_ by selecting the \"hamburger\" "
+"menu button at the bottom left of the _Subsurface-mobile_ screen (see image "
+"above), then select _GPS_ -> _Preferences_ (see image below). The collection "
+"of GPS locations is done in the background and automatically, using two "
+"settings:"
+msgstr ""
+
+#. type: Plain text
+#: user-manual.txt:1296
+msgid ""
+"_Time threshold._ (minutes). The app will try to get a location every X "
+"minutes"
+msgstr ""
+
+#. type: Plain text
+#: user-manual.txt:1298
+msgid "_Distance threshold._ (meters). Minimum distance between two locations."
+msgstr ""
+
+#. type: Plain text
+#: user-manual.txt:1307
+#, no-wrap
+msgid ""
+"*How are GPS coordinates collected?* Assuming the diver sets 5 minutes and 50\n"
+"meters in the settings above, the app will start by recording a location at the current\n"
+"location, followed by another one at every 5 minutes *or* every time one moves 50 m\n"
+"from previous location, whichever happens first.\n"
+"If subsequent locations are within a radius of 50 meters from the previous one,\n"
+"a new location is not saved. If the diver is not moving, only one location is\n"
+"saved, at least until the _Time-threshold_ period has elapsed.\n"
+"If the diver moves, a trace of the route is obtained by saving a location every 50 meters.\n"
+msgstr ""
+
+#. type: Title =====
+#: user-manual.txt:1308
+#, no-wrap
+msgid "Activate the automated recording of GPS locations"
+msgstr ""
+
+#. type: Plain text
+#: user-manual.txt:1313
+msgid ""
+"The _Subsurface-mobile_ main menu has a checkbox at the bottom left labled "
+"_Run location service_ (see image below). Checking the box starts the "
+"automated recording of GPS positions."
+msgstr ""
+
+#. type: Target for macro image
+#: user-manual.txt:1314
+#, no-wrap
+msgid "images/MobileMenu.jpg"
+msgstr "images/MobileMenu.jpg"
+
+#. type: Title =====
+#: user-manual.txt:1316
+#, no-wrap
+msgid "After the dive, stop the automated recording of GPS locations"
+msgstr ""
+
+#. type: Plain text
+#: user-manual.txt:1319
+msgid ""
+"Uncheck the check box at the bottom left of the _Subsurface-mobile_ main "
+"menu."
+msgstr ""
+
+#. type: Title =====
+#: user-manual.txt:1320
+#, no-wrap
+msgid "Upload the GPS locations onto the _Subsurface_ Internet server."
+msgstr ""
+
+#. type: Plain text
+#: user-manual.txt:1327
+#, no-wrap
+msgid ""
+"*N.B.:* Uploading the GPS locations to the Internet can only take place if the mobile\n"
+"device has reliable access to the Internet, either via a cellular network or\n"
+"via a wifi connection. If the Internet is not accessible from the dive site(s),\n"
+"then GPS uploading can only take place after the dive or after the dive trip,\n"
+"when an Internet connection has been re-established.\n"
+msgstr ""
+
+#. type: Plain text
+#: user-manual.txt:1331
+msgid ""
+"From the _Subsurface-mobile_ main menu, select _GPS_ -> _Upload GPS data_. "
+"The locations are uploaded. Check the indicator at the top of the mobile "
+"screen for internet activity, indicating the transfer of information."
+msgstr ""
+
+#. type: Title =====
+#: user-manual.txt:1332
+#, no-wrap
+msgid "Apply the stored GPS locations to dives on the _Subsurface_ dive list."
+msgstr ""
+
+#. type: Plain text
+#: user-manual.txt:1341
+msgid ""
+"_Subsurface_ collects the first GPS location recorded after the start of a "
+"dive (obtained within _Subsurface_ from either the dive computer or from the "
+"manually-entered dive information) and before the end of a dive. These "
+"coordinates are shown in the _Coordinates_ field of the dive site panel for "
+"each dive. Within the dive site panel, provide a name for the coordinates "
+"that have been assigned to the dive, following the instructions under the "
+"heading above xref:S_locations[_Location_ management]."
+msgstr ""
+
+#. type: Plain text
+#: user-manual.txt:1346
+msgid ""
+"The https://subsurface-divelog.org/documentation/subsurface-mobile-user-"
+"manual[user manual for _Subsurface-mobile_] (accessible from within that "
+"app)  contains detailed instructions for performing the collection of GPS "
+"data and for managing, uploading and synchronising this information."
+msgstr ""
+
+#. type: Title ====
+#: user-manual.txt:1349
 #, no-wrap
 msgid "Importing GPS coordinates with the _Subsurface Companion App_ for mobile phones"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1237
+#: user-manual.txt:1358
 #, no-wrap
 msgid ""
 "Using the *Subsurface Companion App* on an _Android device_   or\n"
@@ -2463,14 +2628,14 @@ msgid ""
 "To do this:\n"
 msgstr ""
 
-#. type: Title ====
-#: user-manual.txt:1238
+#. type: Title =====
+#: user-manual.txt:1359
 #, no-wrap
 msgid "Create a Companion App account"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1243
+#: user-manual.txt:1364
 msgid ""
 "Register on the http://api.hohndel.org/login/[_Subsurface companion web "
 "page_].  A confirmation email with instructions and a personal *DIVERID* "
@@ -2479,26 +2644,26 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1248
+#: user-manual.txt:1369
 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/?"
 "fdfilter=subsurface&fdid=org.subsurface[F-Droid]."
 msgstr ""
 
-#. type: Title ====
-#: user-manual.txt:1249
+#. type: Title =====
+#: user-manual.txt:1370
 #, no-wrap
 msgid "Using the Subsurface companion app on an Android smartphone"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1252
+#: user-manual.txt:1373
 msgid "On first use the app has three options:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1258
+#: user-manual.txt:1379
 msgid ""
 "_Create a new account._ Equivalent to registering in the _Subsurface_ "
 "companion page using an Internet browser. You can request a *DIVERID* using "
@@ -2508,14 +2673,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1261
+#: user-manual.txt:1382
 msgid ""
 "_Retrieve an account._ If users forget their *DIVERID* they will receive an "
 "email to recover the number."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1265
+#: user-manual.txt:1386
 msgid ""
 "_Use an existing account._ Users are prompted for their *DIVERID*. The app "
 "saves this *DIVERID* and doesn’t ask for it again unless you use the "
@@ -2523,7 +2688,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1273
+#: user-manual.txt:1394
 msgid ""
 "In the _Subsurface_ main program, the *DIVERID* should also be entered on "
 "the Default Preferences panel, by selecting _File -> Preferences -> "
@@ -2531,14 +2696,13 @@ msgid ""
 "synchronization between _Subsurface_ and the Companion App."
 msgstr ""
 
-#. type: Title =====
-#: user-manual.txt:1274
-#, no-wrap
-msgid "Creating new dive locations"
+#. type: Plain text
+#: user-manual.txt:1396
+msgid "====== Creating new dive locations"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1279
+#: user-manual.txt:1400
 msgid ""
 "Now you are 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 "
@@ -2546,21 +2710,21 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1282
+#: user-manual.txt:1403
 msgid ""
 "Touch the \"+\" icon on the top right to add a new dive site, a menu shows "
 "with 3 options:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1285
+#: user-manual.txt:1406
 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:1294
+#: user-manual.txt:1415
 msgid ""
 "Use Map: This option lets you fix a position by searching a world map. A "
 "world map is shown (see *B* below) on which you can show the desired "
@@ -2573,13 +2737,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:1295
+#: user-manual.txt:1416
 #, no-wrap
 msgid "images/Companion_5.jpg"
 msgstr "images/Companion_5.jpg"
 
 #. type: Plain text
-#: user-manual.txt:1303
+#: user-manual.txt:1424
 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 "
@@ -2588,14 +2752,13 @@ msgid ""
 "web service and added to the list on the Android device."
 msgstr ""
 
-#. type: Title =====
-#: user-manual.txt:1304
-#, no-wrap
-msgid "Dive lists of dive locations"
+#. type: Plain text
+#: user-manual.txt:1426
+msgid "====== Dive lists of dive locations"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1312
+#: user-manual.txt:1433
 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 "
@@ -2606,7 +2769,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1320
+#: user-manual.txt:1441
 msgid ""
 "Dive locations in this list can be viewed in two ways: a list of locations "
 "or a map showing them. The display mode (List or Map) is changed by "
@@ -2618,13 +2781,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:1321
+#: user-manual.txt:1442
 #, no-wrap
 msgid "images/Companion_4.jpg"
 msgstr "images/Companion_4.jpg"
 
 #. type: Plain text
-#: user-manual.txt:1327
+#: user-manual.txt:1448
 msgid ""
 "When you select 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 "
@@ -2632,28 +2795,27 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1329
+#: user-manual.txt:1450
 msgid ""
 "Edit (pencil): Change the text name or other characteristics of the dive "
 "location."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1334
+#: user-manual.txt:1455
 msgid ""
 "Maps: Display a map showing the dive location.  After editing and saving a "
 "dive location (see *C* above), upload it to the web service, as explained "
 "below."
 msgstr ""
 
-#. type: Title =====
-#: user-manual.txt:1335
-#, no-wrap
-msgid "Uploading dive locations"
+#. type: Plain text
+#: user-manual.txt:1457
+msgid "====== Uploading dive locations"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1341
+#: user-manual.txt:1462
 msgid ""
 "There are several ways to send locations to the server.  The easiest is "
 "simply selecting the locations (See *A* below) and then touching the right "
@@ -2661,121 +2823,107 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1346
+#: user-manual.txt:1467
 msgid ""
 "Be careful! 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:1347
+#: user-manual.txt:1468
 #, no-wrap
 msgid "images/Companion_1.jpg"
 msgstr "images/Companion_1.jpg"
 
 #. type: Plain text
-#: user-manual.txt:1352
+#: user-manual.txt:1473
 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:1354
-#, no-wrap
-msgid "Settings on the Companion App"
+#. type: Plain text
+#: user-manual.txt:1476
+msgid "====== Settings on the Companion App"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1357
+#: user-manual.txt:1478
 msgid ""
 "Selecting the _Settings_ menu option results in the right hand image above "
 "(*B*)."
 msgstr ""
 
-#. type: Title =====
-#: user-manual.txt:1358
-#, no-wrap
-msgid "Server and account"
+#. type: Plain text
+#: user-manual.txt:1480
+msgid "====== Server and account"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1361
+#: user-manual.txt:1482
 msgid "_Web-service URL._ This is predefined (http://api.hohndel.org/)"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1364
+#: user-manual.txt:1486
 msgid ""
 "_User ID._ The DIVERID obtained by registering as described above. The "
 "easiest way to get it is to copy and paste from the confirmation email or "
-"just type it in."
-msgstr ""
-
-#. type: Title =====
-#: user-manual.txt:1364
-#, no-wrap
-msgid "Synchronisation"
+"just type it in.  ====== Synchronisation"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1368
+#: user-manual.txt:1489
 msgid ""
 "_Synchronize on startup_. If selected, dive locations in the Android device "
 "and those on the web service synchronize each time the app is started."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1371
+#: user-manual.txt:1492
 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:1372
-#, no-wrap
-msgid "Background service"
-msgstr ""
-
 #. type: Plain text
-#: user-manual.txt:1375
+#: user-manual.txt:1496
 msgid ""
-"Instead of entering an unique dive location, you can leave the service "
-"running in the background of your Android device, allowing a continuous "
-"collection of GPS locations."
+"====== Background service Instead of entering an unique dive location, one "
+"can leave the service running in the background of your Android device, "
+"allowing a continuous collection of GPS locations."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1377
+#: user-manual.txt:1498
 msgid "The settings below define the behavior of the service:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1380
+#: user-manual.txt:1501
 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:1382
+#: user-manual.txt:1503
 msgid "_Min distance._ In meters. Minimum distance between two locations."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1384
+#: user-manual.txt:1505
 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:1385 user-manual.txt:1486 user-manual.txt:1900
+#: user-manual.txt:1506 user-manual.txt:1607 user-manual.txt:2021
 #, no-wrap
 msgid "images/icons/info.jpg"
 msgstr "images/icons/info.jpg"
 
 #. type: Plain text
-#: user-manual.txt:1395
+#: user-manual.txt:1516
 msgid ""
 "_How does the background service work?_ Assuming the diver sets 5 minutes "
 "and 50 meters in the settings above, the app will start by recording a "
@@ -2787,60 +2935,56 @@ msgid ""
 "location every 50 meters."
 msgstr ""
 
-#. type: Title =====
-#: user-manual.txt:1396
-#, no-wrap
-msgid "Other"
+#. type: Plain text
+#: user-manual.txt:1518
+msgid "====== Other"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1400
+#: user-manual.txt:1521
 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:1402
+#: user-manual.txt:1523
 msgid "_Subsurface website._ A link to the URL of Subsurface web"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1404
+#: user-manual.txt:1525
 msgid "_Version._ Displays the current version of the Companion App."
 msgstr ""
 
-#. type: Title =====
-#: user-manual.txt:1405
-#, no-wrap
-msgid "Search"
+#. type: Plain text
+#: user-manual.txt:1527
+msgid "====== Search"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1408
+#: user-manual.txt:1529
 msgid "Search the saved dive locations by name or by date and time."
 msgstr ""
 
-#. type: Title =====
-#: user-manual.txt:1409
-#, no-wrap
-msgid "Start service"
+#. type: Plain text
+#: user-manual.txt:1531
+msgid "====== Start service"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1412
+#: user-manual.txt:1533
 msgid ""
 "Starts the _background service_ following the previously defined settings."
 msgstr ""
 
-#. type: Title =====
-#: user-manual.txt:1413
-#, no-wrap
-msgid "Disconnect"
+#. type: Plain text
+#: user-manual.txt:1535
+msgid "====== Disconnect"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1421
+#: user-manual.txt:1542
 msgid ""
 "This is admittedly a badly named option that disconnects the app from the "
 "server.  It resets the user ID in the app, showing the first screen where an "
@@ -2849,26 +2993,25 @@ msgid ""
 "used to download the dive locations of another registered diver."
 msgstr ""
 
-#. type: Title =====
-#: user-manual.txt:1422
-#, no-wrap
-msgid "Send all locations"
+#. type: Plain text
+#: user-manual.txt:1544
+msgid "====== Send all locations"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1425
+#: user-manual.txt:1546
 msgid ""
 "This option sends all locations stored in the Android device to the server."
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:1427
+#: user-manual.txt:1548
 #, no-wrap
 msgid "Using the Subsurface companion app on an _iPhone_ to record dive locations"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1432
+#: user-manual.txt:1553
 msgid ""
 "The iPhone interface is quite simple. Type the user ID (obtained during "
 "registration) into the space reserved for it, then select \"Dive in\" (see "
@@ -2876,13 +3019,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:1433
+#: user-manual.txt:1554
 #, no-wrap
 msgid "images/iphone.jpg"
 msgstr "images/iphone.jpg"
 
 #. type: Plain text
-#: user-manual.txt:1444
+#: user-manual.txt:1565
 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 "
@@ -2896,7 +3039,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1450
+#: user-manual.txt:1571
 msgid ""
 "You 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 "
@@ -2904,14 +3047,14 @@ msgid ""
 "There isn’t an option to trigger upload manually."
 msgstr ""
 
-#. type: Title ====
-#: user-manual.txt:1452
+#. type: Title =====
+#: user-manual.txt:1573
 #, no-wrap
 msgid "Downloading dive locations to the _Subsurface_ divelog"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1461
+#: user-manual.txt:1582
 msgid ""
 "Download dive(s) from a dive computer or enter them manually into "
 "_Subsurface_ before obtaining the GPS coordinates from the server. The "
@@ -2923,13 +3066,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:1462
+#: user-manual.txt:1583
 #, no-wrap
 msgid "images/DownloadGPS.jpg"
 msgstr "images/DownloadGPS.jpg"
 
 #. type: Plain text
-#: user-manual.txt:1470
+#: user-manual.txt:1591
 msgid ""
 "Note that the _Apply_ button is now active. By clicking on it, you can "
 "update the locations of the newly entered or uploaded dives in _Subsurface_. "
@@ -2940,7 +3083,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1477
+#: user-manual.txt:1598
 msgid ""
 "Since _Subsurface_ matches GPS locations from the Android device and dive "
 "information from the dive computer based on date-time data, automatic "
@@ -2952,7 +3095,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1485
+#: user-manual.txt:1606
 msgid ""
 "Similar date-times may not always be possible and there may be many reasons "
 "for this (e.g. time zones).  _Subsurface_ may also be unable to decide which "
@@ -2965,12 +3108,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1489
+#: user-manual.txt:1610
 msgid "TIPS:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1492
+#: user-manual.txt:1613
 msgid ""
 "_Background service_ may fill the location list with unnecessary locations "
 "that don’t correspond to the exact dive point but do correspond to the "
@@ -2978,14 +3121,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1493
+#: user-manual.txt:1614
 msgid ""
 "Right now, these locations are difficult to delete from the server. In some "
 "situations it"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1496
+#: user-manual.txt:1617
 msgid ""
 "is better to clean up the list on the Android device before sending the dive "
 "points to the web server by simply deleting the inappropriate locations. "
@@ -2994,7 +3137,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1499
+#: user-manual.txt:1620
 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 "
@@ -3003,13 +3146,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:1501
+#: user-manual.txt:1622
 #, no-wrap
 msgid "Adding photographs to dives"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1507
+#: user-manual.txt:1628
 msgid ""
 "Many (if not most) divers take a camera with them and take photographs "
 "during a dive. To match each photograph with a specific dive, _Subsurface_ "
@@ -3018,39 +3161,39 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:1508
+#: user-manual.txt:1629
 #, no-wrap
 msgid "Loading photos and synchronizing between dive computer and camera"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1512
+#: user-manual.txt:1633
 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:1513
+#: user-manual.txt:1634
 #, no-wrap
 msgid "images/LoadImage1_f20.jpg"
 msgstr "images/LoadImage1_f20.jpg"
 
 #. type: Plain text
-#: user-manual.txt:1517
+#: user-manual.txt:1638
 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:1518
+#: user-manual.txt:1639
 #, no-wrap
 msgid "images/LoadImage2_f20.jpg"
 msgstr "images/LoadImage2_f20.jpg"
 
 #. type: Plain text
-#: user-manual.txt:1527
+#: user-manual.txt:1648
 msgid ""
 "This brings up the time synchronization dialog, shown below. But be aware "
 "that the time synchronization is not perfect between the dive computer used "
@@ -3061,12 +3204,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1529
+#: user-manual.txt:1650
 msgid "_Subsurface_ synchronizes in three ways:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1532
+#: user-manual.txt:1653
 #, no-wrap
 msgid ""
 "*Pro-actively*: Before the dive, ensure synchronization of the dive computer time settings with\n"
@@ -3074,7 +3217,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1543
+#: user-manual.txt:1664
 #, no-wrap
 msgid ""
 "*Manually*: If you wrote down the exact camera time at the start of a dive, the\n"
@@ -3091,13 +3234,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:1544
+#: user-manual.txt:1665
 #, no-wrap
 msgid "images/LoadImage3b_f20.jpg"
 msgstr "images/LoadImage3b_f20.jpg"
 
 #. type: Plain text
-#: user-manual.txt:1562
+#: user-manual.txt:1683
 #, no-wrap
 msgid ""
 "*By photograph*: There is a very slick way of synchronizing. If you take a\n"
@@ -3118,30 +3261,30 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1565
+#: user-manual.txt:1686
 msgid ""
 "If the timestamp of a photograph is more than 30 minutes before or after the "
 "dive, it is not placed on the dive profile."
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:1566
+#: user-manual.txt:1687
 #, no-wrap
 msgid "Viewing the photos"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1569
+#: user-manual.txt:1690
 msgid "After the images have been loaded, they appear in two places:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1571
+#: user-manual.txt:1692
 msgid "the _Photos_ tab of the *Notes* panel."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1575
+#: user-manual.txt:1696
 msgid ""
 "as tiny icons (stubs) on the dive profile at the appropriate positions "
 "reflecting the time each photograph was taken.  To view the photos on the "
@@ -3150,37 +3293,37 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:1576
+#: user-manual.txt:1697
 #, no-wrap
 msgid "images/icons/ShowPhotos_f20.png"
 msgstr "images/icons/ShowPhotos_f20.png"
 
 #. type: Plain text
-#: user-manual.txt:1579
+#: user-manual.txt:1700
 msgid "This results in a profile display as in the image below:"
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:1580
+#: user-manual.txt:1701
 #, no-wrap
 msgid "images/LoadImage4_f20.jpg"
 msgstr "images/LoadImage4_f20.jpg"
 
 #. type: Plain text
-#: user-manual.txt:1584
+#: user-manual.txt:1705
 msgid ""
 "If you hover the mouse over any of the photo icons, a thumbnail photo is "
 "shown of the appropriate photo. See the image below:"
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:1585
+#: user-manual.txt:1706
 #, no-wrap
 msgid "images/LoadImage5_f20.jpg"
 msgstr "images/LoadImage5_f20.jpg"
 
 #. type: Plain text
-#: user-manual.txt:1594
+#: user-manual.txt:1715
 msgid ""
 "Clicking on the thumbnail brings up a full size photo overlaid on the "
 "_Subsurface_ window. This allows good viewing of the added photographs. (see "
@@ -3191,19 +3334,19 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:1595
+#: user-manual.txt:1716
 #, no-wrap
 msgid "images/LoadImage6_f20.jpg"
 msgstr "images/LoadImage6_f20.jpg"
 
 #. type: Title ====
-#: user-manual.txt:1597
+#: user-manual.txt:1718
 #, no-wrap
 msgid "The _Photos_ tab"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1608
+#: user-manual.txt:1729
 msgid ""
 "Photographs associated with a dive are shown as thumbnails in the _Photos_ "
 "tab of the _Notes_ panel. Photos taken in rapid succession during a dive "
@@ -3219,13 +3362,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:1609
+#: user-manual.txt:1730
 #, no-wrap
 msgid "Photos on an external hard disk"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1619
+#: user-manual.txt:1740
 msgid ""
 "Most underwater photographers store photos on an external drive. If such a "
 "drive can be mapped by the operating system (almost always the case) the "
@@ -3242,13 +3385,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:1621
+#: user-manual.txt:1742
 #, no-wrap
 msgid "Moving photographs among directories, hard disks or computers"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1631
+#: user-manual.txt:1752
 #, no-wrap
 msgid ""
 "After a photograph has been loaded into _Subsurface_ and associated with a specific dive, the directory\n"
@@ -3262,7 +3405,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1635
+#: user-manual.txt:1756
 #, no-wrap
 msgid ""
 "When a photo is loaded into _Subsurface_, a fingerprint for the image is calculated and stored with the\n"
@@ -3271,26 +3414,26 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1638
+#: user-manual.txt:1759
 msgid ""
 "look through a particular directory (and all its subdirectories recursively) "
 "where photos have been moved to,"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1639
+#: user-manual.txt:1760
 msgid "calculate fingerprints for all photos in this directory, and"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1641
+#: user-manual.txt:1762
 msgid ""
 "if there is a match between a calculated fingerprint and the one originally "
 "calculated when a photo was"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1643
+#: user-manual.txt:1764
 msgid ""
 "loaded into _Subsurface_ (even if the original file name has changed), "
 "automatically update the directory information so that _Subsurface_ can find "
@@ -3298,7 +3441,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1648
+#: user-manual.txt:1769
 #, no-wrap
 msgid ""
 "This is done by selecting from the Main Menu: _File ->      Find moved images_. This brings up a window within\n"
@@ -3308,13 +3451,13 @@ msgid ""
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:1653
+#: user-manual.txt:1774
 #, no-wrap
 msgid "*Upgrading existing photo collections without fingerprints*\n"
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:1658
+#: user-manual.txt:1779
 msgid ""
 "_Subsurface_ automatically calculates fingerprints for all images that it "
 "can access.  When manipulating images, be sure all the images associated "
@@ -3322,40 +3465,40 @@ msgid ""
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:1660
+#: user-manual.txt:1781
 msgid ""
 "_Subsurface_ automatically checks and, if necessary, updates the "
 "fingerprints associated with a single dive if:"
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:1661
+#: user-manual.txt:1782
 msgid ""
 "The images associated with that dive are visible as thumbnails on the *Dive "
 "Profile*."
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:1662
+#: user-manual.txt:1783
 msgid ""
 "If you edit anything in the *Notes tab* panel and save the edits by "
 "selecting _Apply changes_."
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:1666
+#: user-manual.txt:1787
 #, no-wrap
 msgid "Logging special types of dives"
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:1669
+#: user-manual.txt:1790
 #, no-wrap
 msgid "Multicylinder dives"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1676
+#: user-manual.txt:1797
 msgid ""
 "_Subsurface_ easily handles dives involving more than one cylinder. Multi-"
 "cylinder diving usually happens (a) if a diver doesn’t have enough gas for "
@@ -3367,7 +3510,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1680
+#: user-manual.txt:1801
 #, no-wrap
 msgid ""
 "*Describe the cylinders used during the dive* This is performed in the *Equipment tab* of\n"
@@ -3376,7 +3519,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1685
+#: user-manual.txt:1806
 #, no-wrap
 msgid ""
 "*Record the times at which the switch from one cylinder to another was done:* This is information\n"
@@ -3386,7 +3529,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1693
+#: user-manual.txt:1814
 #, no-wrap
 msgid ""
 "*Record the cylinder changes on the dive profile*: If the latter option\n"
@@ -3399,7 +3542,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1697
+#: user-manual.txt:1818
 msgid ""
 "When this is complete, _Subsurface_ indicates the appropriate use of "
 "cylinders in the dive profile.  Below is a multi-cylinder dive, starting off "
@@ -3408,19 +3551,19 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:1698
+#: user-manual.txt:1819
 #, no-wrap
 msgid "images/multicylinder_dive.jpg"
 msgstr "images/multicylinder_dive.jpg"
 
 #. type: Title ====
-#: user-manual.txt:1700
+#: user-manual.txt:1821
 #, no-wrap
 msgid "Sidemount dives"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1706
+#: user-manual.txt:1827
 msgid ""
 "Sidemount diving is just another form of multi-cylinder diving, often with "
 "both or all cylinders having the same gas mixture. Although it’s a popular "
@@ -3430,7 +3573,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1715
+#: user-manual.txt:1836
 #, no-wrap
 msgid ""
 "*During the dive, record cylinder switch events*. Since sidemount diving normally involves two\n"
@@ -3444,7 +3587,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1718
+#: user-manual.txt:1839
 #, no-wrap
 msgid ""
 "*Within _Subsurface_ describe the cylinders used during the dive*. The diver needs to provide the\n"
@@ -3453,7 +3596,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1728
+#: user-manual.txt:1849
 #, no-wrap
 msgid ""
 "*Indicate cylinder change events on the _Subsurface_ dive profile*. Once the dive log has been imported\n"
@@ -3469,32 +3612,32 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:1729
+#: user-manual.txt:1850
 #, no-wrap
 msgid "images/sidemount1.jpg"
 msgstr "images/sidemount1.jpg"
 
 #. type: Plain text
-#: user-manual.txt:1732
+#: user-manual.txt:1853
 msgid ""
 "This section gives an example of the versatility of _Subsurface_ as a dive "
 "logging tool."
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:1735
+#: user-manual.txt:1856
 #, no-wrap
 msgid "Semi-closed circuit rebreather (SCR) dives"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:1737
+#: user-manual.txt:1858
 #, no-wrap
 msgid "images/halcyon_RB80.jpg"
 msgstr "images/halcyon_RB80.jpg"
 
 #. type: Plain text
-#: user-manual.txt:1747
+#: user-manual.txt:1868
 msgid ""
 "Passive semi-closed rebreathers (pSCR) are a technical advance in diving "
 "equipment that recirculates the breathing gas a diver uses, while removing "
@@ -3510,19 +3653,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1749
+#: user-manual.txt:1870
 msgid ""
 "To log pSCR dives, no special procedures are required. Use the normal steps "
 "outlined above:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1751
+#: user-manual.txt:1872
 msgid "Select pSCR in the _Dive Mode_ dropdown list on the *Info* panel."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1755
+#: user-manual.txt:1876
 msgid ""
 "pSCR diving often involves gas changes, requiring an additional cylinder.  "
 "Define all the appropriate cylinders as described above and indicate the "
@@ -3531,7 +3674,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1760
+#: user-manual.txt:1881
 msgid ""
 "If a pSCR _Dive Mode_ has been selected, the dive ceiling for that is "
 "adjusted for the oxygen drop across the mouthpiece, which often requires "
@@ -3541,25 +3684,25 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:1761
+#: user-manual.txt:1882
 #, no-wrap
 msgid "images/pSCR_profile.jpg"
 msgstr "images/pSCR_profile.jpg"
 
 #. type: Title ====
-#: user-manual.txt:1766
+#: user-manual.txt:1887
 #, no-wrap
 msgid "Closed circuit rebreather (CCR) dives"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:1768
+#: user-manual.txt:1889
 #, no-wrap
 msgid "images/APD.jpg"
 msgstr "images/APD.jpg"
 
 #. type: Plain text
-#: user-manual.txt:1773
+#: user-manual.txt:1894
 msgid ""
 "Closed system rebreathers use advanced technology to recirculate gas that "
 "has been breathed. They also do two things to maintain a breathable oxygen "
@@ -3567,12 +3710,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1774
+#: user-manual.txt:1895
 msgid "remove carbon dioxide from the exhaled gas"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1783
+#: user-manual.txt:1904
 msgid ""
 "regulate the oxygen concentration to remain within safe diving limits.  The "
 "CCR interface of _Subsurface_ is currently experimental and under active "
@@ -3586,13 +3729,13 @@ msgid ""
 msgstr ""
 
 #. type: Title =====
-#: user-manual.txt:1784
+#: user-manual.txt:1905
 #, no-wrap
 msgid "Import a CCR dive"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1798
+#: user-manual.txt:1919
 msgid ""
 "See the section dealing with xref:S_ImportingAlienDiveLogs[Importing dive "
 "information from other digital sources]. From the main menu of _Subsurface_, "
@@ -3610,13 +3753,13 @@ msgid ""
 msgstr ""
 
 #. type: Title =====
-#: user-manual.txt:1799
+#: user-manual.txt:1920
 #, no-wrap
 msgid "Displayed information for a CCR dive"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1809
+#: user-manual.txt:1930
 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 "
@@ -3630,12 +3773,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1811
+#: user-manual.txt:1932
 msgid "For TWO O~2~ sensors the mean value of the two sensors are given."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1815
+#: user-manual.txt:1936
 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 "
@@ -3644,19 +3787,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1817
+#: user-manual.txt:1938
 msgid ""
 "If no sensor data are available, the pO~2~ value is assumed to be equal to "
 "the setpoint."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1819
+#: user-manual.txt:1940
 msgid "The mean pO~2~ of the sensors is indicated with a green line,"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1827
+#: user-manual.txt:1948
 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 "
@@ -3668,13 +3811,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:1828
+#: user-manual.txt:1949
 #, no-wrap
 msgid "images/CCR_preferences_f20.jpg"
 msgstr "images/CCR_preferences_f20.jpg"
 
 #. type: Plain text
-#: user-manual.txt:1835
+#: user-manual.txt:1956
 msgid ""
 "Checking any of these boxes allows the display of additional oxygen-related "
 "information whenever the pO~2~ toolbar button on the _Profile_ panel is "
@@ -3685,13 +3828,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:1836
+#: user-manual.txt:1957
 #, no-wrap
 msgid "images/CCR_setpoint_f20.jpg"
 msgstr "images/CCR_setpoint_f20.jpg"
 
 #. type: Plain text
-#: user-manual.txt:1840
+#: user-manual.txt:1961
 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 "
@@ -3699,22 +3842,22 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1842
+#: user-manual.txt:1963
 msgid "Sensor 1: grey"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1843
+#: user-manual.txt:1964
 msgid "Sensor 2: blue"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1844
+#: user-manual.txt:1965
 msgid "Sensor 3: brown"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1848
+#: user-manual.txt:1969
 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 "
@@ -3722,13 +3865,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:1849
+#: user-manual.txt:1970
 #, no-wrap
 msgid "images/CCR_sensor_data_f20.jpg"
 msgstr "images/CCR_sensor_data_f20.jpg"
 
 #. type: Plain text
-#: user-manual.txt:1854
+#: user-manual.txt:1975
 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, "
@@ -3736,7 +3879,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1858
+#: user-manual.txt:1979
 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 "
@@ -3745,7 +3888,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1866
+#: user-manual.txt:1987
 msgid ""
 "_Cylinder pressures_: Some CCR dive computers like the Poseidon MkVI record "
 "the pressures of the oxygen and diluent cylinders. The pressures of these "
@@ -3758,13 +3901,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:1867
+#: user-manual.txt:1988
 #, no-wrap
 msgid "images/CCR_dive_profile_f22.jpg"
 msgstr "images/CCR_dive_profile_f22.jpg"
 
 #. type: Plain text
-#: user-manual.txt:1872
+#: user-manual.txt:1993
 msgid ""
 "_Equipment-specific information_: Equipment-specific information gathered by "
 "_Subsurface_ is shown in the xref:S_ExtraDataTab[Extra data tab]. This may "
@@ -3772,7 +3915,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1878
+#: user-manual.txt:1999
 msgid ""
 "The deco ceiling calculated by Subsurface is not very accurate because the "
 "precise pressure of nitrogen in the loop can usually not be determined from "
@@ -3784,13 +3927,13 @@ msgid ""
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:1879 user-manual.txt:2058
+#: user-manual.txt:2000 user-manual.txt:2180
 #, no-wrap
 msgid "images/icons/cceiling.jpg"
 msgstr "images/icons/cceiling.jpg"
 
 #. type: Plain text
-#: user-manual.txt:1884
+#: user-manual.txt:2005
 msgid ""
 "The default color of the computer-generated deco ceiling is white. This can "
 "be set to red by checking the appropriate check box after selecting _File -> "
@@ -3799,13 +3942,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:1885
+#: user-manual.txt:2006
 #, no-wrap
 msgid "images/CCR_dive_ceilingF22.jpg"
 msgstr "images/CCR_dive_ceilingF22.jpg"
 
 #. type: Plain text
-#: user-manual.txt:1889
+#: user-manual.txt:2010
 msgid ""
 "More equipment-specific information for downloading CCR dive logs for "
 "Poseidon MkVI and APD equipment can be found in xref:"
@@ -3814,19 +3957,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ==
-#: user-manual.txt:1890
+#: user-manual.txt:2011
 #, no-wrap
 msgid "Obtaining more information about dives entered into the logbook"
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:1892
+#: user-manual.txt:2013
 #, no-wrap
 msgid "The *Info* tab (for individual dives)"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1899
+#: user-manual.txt:2020
 msgid ""
 "The Info tab gives some summary information about a particular dive that has "
 "been selected in the *Dive List*. Useful information here includes the "
@@ -3836,7 +3979,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1906
+#: user-manual.txt:2027
 msgid ""
 "Gas consumption and SAC calculations: _Subsurface_ calculates SAC and Gas "
 "consumption taking in account gas incompressibility, particularly at tank "
@@ -3845,13 +3988,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:1908
+#: user-manual.txt:2029
 #, no-wrap
 msgid "The *Extra Data* tab (usually for individual dives)"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1916
+#: user-manual.txt:2037
 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 "
@@ -3863,19 +4006,19 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:1917
+#: user-manual.txt:2038
 #, no-wrap
 msgid "images/ExtraDataTab_f20.jpg"
 msgstr "images/ExtraDataTab_f20.jpg"
 
 #. type: Title ===
-#: user-manual.txt:1919
+#: user-manual.txt:2040
 #, no-wrap
 msgid "The *Stats* tab (for groups of dives)"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1930
+#: user-manual.txt:2051
 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 "
@@ -3888,19 +4031,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:1932
+#: user-manual.txt:2053
 #, no-wrap
 msgid "The *Dive Profile*"
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:1934
+#: user-manual.txt:2055
 #, no-wrap
 msgid "images/Profile2.jpg"
 msgstr "images/Profile2.jpg"
 
 #. type: Plain text
-#: user-manual.txt:1945
+#: user-manual.txt:2066
 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 "
@@ -3913,15 +4056,8 @@ msgid ""
 msgstr ""
 
 #. type: delimited block |
-#: user-manual.txt:1952
-#, fuzzy, no-wrap
-#| msgid ""
-#| "|*Colour*|*Descent speed (m/min)*|*Ascent speed (m/min)*\n"
-#| "|Red|> 30|> 18\n"
-#| "|Orange|18 - 30|9 - 18\n"
-#| "|Yellow|9 - 18|4 - 9\n"
-#| "|Light green|1.5 - 9|1.5 - 4\n"
-#| "|Dark green|< 1.5|< 1.5\n"
+#: user-manual.txt:2073
+#, no-wrap
 msgid ""
 "|*Color*|*Descent speed (m/min)*|*Ascent speed (m/min)*\n"
 "|Red|> 30|> 18\n"
@@ -3938,7 +4074,7 @@ msgstr ""
 "|Vert foncé|< 1.5|< 1.5\n"
 
 #. type: Plain text
-#: user-manual.txt:1957
+#: user-manual.txt:2078
 msgid ""
 "The profile also includes depth readings for the peaks and troughs in the "
 "graph.  So users should see the depth of the deepest point and other peaks. "
@@ -3947,13 +4083,13 @@ msgid ""
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:1958
+#: user-manual.txt:2079
 #, no-wrap
 msgid "images/icons/scale.jpg"
 msgstr "images/icons/scale.jpg"
 
 #. type: Plain text
-#: user-manual.txt:1963
+#: user-manual.txt:2084
 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 "
@@ -3962,7 +4098,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1966
+#: user-manual.txt:2087
 #, no-wrap
 msgid ""
 "*Water temperature* is displayed with its own blue line with temperature values\n"
@@ -3970,7 +4106,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1973
+#: user-manual.txt:2094
 msgid ""
 "The dive profile can include graphs of the *partial pressures* of O~2~, "
 "N~2~, and He during the dive (see figure above) as well as a calculated and "
@@ -3981,13 +4117,13 @@ msgid ""
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:1974
+#: user-manual.txt:2095
 #, no-wrap
 msgid "images/icons/O2.jpg"
 msgstr "images/icons/O2.jpg"
 
 #. type: Plain text
-#: user-manual.txt:1978
+#: user-manual.txt:2099
 msgid ""
 "Clicking this button allows display of the partial pressure of *oxygen* "
 "during the dive. This is shown below the dive depth and water temperature "
@@ -3995,26 +4131,26 @@ msgid ""
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:1979
+#: user-manual.txt:2100
 #, no-wrap
 msgid "images/icons/N2.jpg"
 msgstr "images/icons/N2.jpg"
 
 #. type: Plain text
-#: user-manual.txt:1982
+#: user-manual.txt:2103
 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:1983
+#: user-manual.txt:2104
 #, no-wrap
 msgid "images/icons/He.jpg"
 msgstr "images/icons/He.jpg"
 
 #. type: Plain text
-#: user-manual.txt:1987
+#: user-manual.txt:2108
 msgid ""
 "Clicking this button allows display of the partial pressure of *helium* "
 "during the dive.  This is only important to divers using Trimix, Helitrox or "
@@ -4022,7 +4158,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2000
+#: user-manual.txt:2121
 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 "
@@ -4037,13 +4173,13 @@ msgid ""
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:2001
+#: user-manual.txt:2122
 #, no-wrap
 msgid "images/icons/Heartbutton.png"
 msgstr "images/icons/Heartbutton.png"
 
 #. type: Plain text
-#: user-manual.txt:2005
+#: user-manual.txt:2126
 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 "
@@ -4051,7 +4187,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2012
+#: user-manual.txt:2133
 #, no-wrap
 msgid ""
 "It is possible to *zoom* into the profile graph. This is done either by using\n"
@@ -4063,19 +4199,19 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2012
+#: user-manual.txt:2134
 #, no-wrap
 msgid "images/MeasuringBar.png"
 msgstr "images/MeasuringBar.png"
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:2014
+#: user-manual.txt:2136
 #, no-wrap
 msgid "images/icons/ruler.jpg"
 msgstr "images/icons/ruler.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2022
+#: user-manual.txt:2144
 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 "
@@ -4085,13 +4221,13 @@ msgid ""
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:2023
+#: user-manual.txt:2145
 #, no-wrap
 msgid "images/icons/ShowPhotos.png"
 msgstr "images/icons/ShowPhotos.png"
 
 #. type: Plain text
-#: user-manual.txt:2030
+#: user-manual.txt:2152
 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 "
@@ -4100,7 +4236,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2057
+#: user-manual.txt:2179
 msgid ""
 "The profile can also include the dive computer reported *ceiling* (more "
 "precisely, the deepest deco stop that the dive computer calculated for each "
@@ -4129,7 +4265,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2063
+#: user-manual.txt:2185
 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 "
@@ -4137,13 +4273,13 @@ msgid ""
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:2064
+#: user-manual.txt:2186
 #, no-wrap
 msgid "images/icons/ceiling1.jpg"
 msgstr "images/icons/ceiling1.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2069
+#: user-manual.txt:2191
 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 "
@@ -4152,13 +4288,13 @@ msgid ""
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:2070
+#: user-manual.txt:2192
 #, no-wrap
 msgid "images/icons/ceiling2.jpg"
 msgstr "images/icons/ceiling2.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2074
+#: user-manual.txt:2196
 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 "
@@ -4166,32 +4302,32 @@ msgid ""
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:2075
+#: user-manual.txt:2197
 #, no-wrap
 msgid "images/icons/ceiling3.jpg"
 msgstr "images/icons/ceiling3.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2079
+#: user-manual.txt:2201
 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:2080
+#: user-manual.txt:2202
 #, no-wrap
 msgid "images/Ceilings2.jpg"
 msgstr "images/Ceilings2.jpg"
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:2082
+#: user-manual.txt:2204
 #, no-wrap
 msgid "images/icons/ShowCylindersButton.jpg"
 msgstr "images/icons/ShowCylindersButton.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2088
+#: user-manual.txt:2210
 msgid ""
 "By selecting this icon, the different cylinders used during a dive can be "
 "represented as a colored bar at the bottom of the *Dive Profile*. In general "
@@ -4202,19 +4338,19 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2089
+#: user-manual.txt:2211
 #, no-wrap
 msgid "images/ShowCylinders_f20.jpg"
 msgstr "images/ShowCylinders_f20.jpg"
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:2092
+#: user-manual.txt:2214
 #, no-wrap
-msgid "images/tissues.jpg"
-msgstr "images/tissues.jpg"
+msgid "images/icons/tissues.jpg"
+msgstr "images/icons/tissues.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2105
+#: user-manual.txt:2227
 msgid ""
 "Display inert gas tissue pressures relative to ambient inert gas pressure "
 "(horizontal grey line).  Tissue pressures are calculated using the Bühlmann "
@@ -4232,13 +4368,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2106
+#: user-manual.txt:2228
 #, no-wrap
 msgid "images/tissuesGraph.jpg"
 msgstr "images/tissuesGraph.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2114
+#: user-manual.txt:2236
 msgid ""
 "Gradient Factor settings strongly affect the calculated ceilings and their "
 "depths.  For more information about Gradient factors, see the section on "
@@ -4251,25 +4387,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2116
+#: user-manual.txt:2238
 #, 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:2118
+#: user-manual.txt:2240
 #, 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:2120
+#: user-manual.txt:2242
 #, no-wrap
 msgid "The Dive Profile context menu"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2139
+#: user-manual.txt:2261
 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 lets you create "
@@ -4290,13 +4426,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:2141
+#: user-manual.txt:2263
 #, no-wrap
 msgid "The *Information Box*"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2150
+#: user-manual.txt:2272
 msgid ""
 "The Information box displays a large range of information about the dive "
 "profile. Normally the Information Box is located to the top left of the "
@@ -4309,13 +4445,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2151
+#: user-manual.txt:2273
 #, no-wrap
 msgid "images/InfoBox2.jpg"
 msgstr "images/InfoBox2.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2168
+#: user-manual.txt:2290
 msgid ""
 "When the mouse points inside the *Dive Profile* panel, the information box "
 "expands and shows many data items. In this situation, the data reflect the "
@@ -4335,20 +4471,20 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2171
+#: user-manual.txt:2293
 msgid ""
 "The user has control over the display of some statistics, shown as four "
 "buttons on the left of the profile panel. These are:"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:2172
+#: user-manual.txt:2294
 #, no-wrap
 msgid "images/icons/MOD.jpg"
 msgstr "images/icons/MOD.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2181
+#: user-manual.txt:2303
 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 "
@@ -4360,13 +4496,13 @@ msgid ""
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:2182
+#: user-manual.txt:2304
 #, no-wrap
 msgid "images/icons/NDL.jpg"
 msgstr "images/icons/NDL.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2194
+#: user-manual.txt:2316
 msgid ""
 "Clicking this button causes the Information Box to display either the *No-"
 "deco Limit (NDL)* or the *Total Time to Surface (TTS)*. NDL is the time "
@@ -4383,13 +4519,13 @@ msgid ""
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:2195
+#: user-manual.txt:2317
 #, no-wrap
 msgid "images/icons/SAC.jpg"
 msgstr "images/icons/SAC.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2204
+#: user-manual.txt:2326
 msgid ""
 "Clicking this button causes the Information Box to display the *Surface Air "
 "Consumption (SAC)*.  SAC is an indication of the surface-normalized "
@@ -4402,13 +4538,13 @@ msgid ""
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:2205
+#: user-manual.txt:2327
 #, no-wrap
 msgid "images/icons/EAD.jpg"
 msgstr "images/icons/EAD.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2220
+#: user-manual.txt:2342
 msgid ""
 "Clicking this button displays the *Equivalent Air Depth (EAD)* for nitrox "
 "dives as well as the *Equivalent Narcotic Depth (END)* for trimix dives. "
@@ -4424,20 +4560,20 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2222
+#: user-manual.txt:2344
 msgid ""
 "Figure (*B*) above shows an information box with a nearly complete set of "
 "data."
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:2224
+#: user-manual.txt:2346
 #, no-wrap
 msgid "The Gas Pressure Bar Graph"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2231
+#: user-manual.txt:2353
 msgid ""
 "On the left of the *Information Box* is a vertical bar graph showing the "
 "pressures of the nitrogen (and other inert gases, e.g. helium, if "
@@ -4448,13 +4584,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2232
+#: user-manual.txt:2354
 #, no-wrap
 msgid "images/GasPressureBarGraph.jpg"
 msgstr "images/GasPressureBarGraph.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2238
+#: user-manual.txt:2360
 msgid ""
 "The light green area indicates the total gas, with the top margin of the "
 "light green area showing the total gas pressure inhaled by the diver and "
@@ -4464,7 +4600,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2244
+#: user-manual.txt:2366
 msgid ""
 "The horizontal black line underneath the light green margin indicates the "
 "equilibrium pressure of the inert gases inhaled by the diver, usually "
@@ -4475,7 +4611,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2248
+#: user-manual.txt:2370
 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 "
@@ -4483,7 +4619,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2253
+#: user-manual.txt:2375
 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 "
@@ -4492,7 +4628,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2257
+#: user-manual.txt:2379
 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 "
@@ -4500,7 +4636,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2260
+#: user-manual.txt:2382
 msgid ""
 "These five values are shown on the left in the graph above. The way the Gas "
 "Pressure Bar Graph changes during a dive can be seen on the right hand side "
@@ -4508,7 +4644,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2263
+#: user-manual.txt:2385
 msgid ""
 "Graph *A* indicates the start of a dive with the diver at the surface. The "
 "pressures in all the tissue compartments are still at the equilibrium "
@@ -4516,7 +4652,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2266
+#: user-manual.txt:2388
 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, so their gas "
@@ -4524,7 +4660,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2271
+#: user-manual.txt:2393
 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 "
@@ -4534,7 +4670,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2277
+#: user-manual.txt:2399
 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 "
@@ -4545,7 +4681,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2282
+#: user-manual.txt:2404
 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 "
@@ -4555,19 +4691,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ==
-#: user-manual.txt:2285
+#: user-manual.txt:2407
 #, no-wrap
 msgid "Organizing the logbook (Manipulating groups of dives)"
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:2287
+#: user-manual.txt:2409
 #, no-wrap
 msgid "The Dive List context menu"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2291
+#: user-manual.txt:2413
 msgid ""
 "Several actions on either a single dive, or a group of dives, can be "
 "performed using the Dive List Context Menu.  It is found by selecting either "
@@ -4576,30 +4712,30 @@ msgstr ""
 
 #.  TODO: NEEDS REPLACEMENT
 #. type: Target for macro image
-#: user-manual.txt:2293
+#: user-manual.txt:2415
 #, no-wrap
 msgid "images/ContextMenu.jpg"
 msgstr "images/ContextMenu.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2296
+#: user-manual.txt:2418
 msgid "The context menu is used in many functions described below."
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:2297
+#: user-manual.txt:2419
 #, no-wrap
 msgid "Customizing the columns showed in the *Dive List* panel"
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2299
+#: user-manual.txt:2421
 #, no-wrap
 msgid "images/DiveListOptions.jpg"
 msgstr "images/DiveListOptions.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2307
+#: user-manual.txt:2429
 msgid ""
 "The default information in the *Dive List* includes, for each dive, "
 "Dive_number, Date, Rating, Dive_depth, Dive_duration and Dive_location. This "
@@ -4613,13 +4749,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:2309
+#: user-manual.txt:2431
 #, no-wrap
 msgid "Renumbering the dives"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2321
+#: user-manual.txt:2443
 msgid ""
 "Dives are normally numbered incrementally from non-recent dives (low "
 "sequence numbers) to recent dives (higher sequence numbers).  Numbering of "
@@ -4633,7 +4769,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2326
+#: user-manual.txt:2448
 msgid ""
 "You can also renumber a few selected dives in the dive list. Select the "
 "dives that need renumbering. Right-click on the selected list and use the "
@@ -4642,13 +4778,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:2328
+#: user-manual.txt:2450
 #, no-wrap
 msgid "Grouping dives into trips and manipulating trips"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2336
+#: user-manual.txt:2458
 msgid ""
 "For regular divers, the dive list can rapidly become very long. _Subsurface_ "
 "can group dives into _trips_. It does this by grouping dives that have date/"
@@ -4659,13 +4795,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2337
+#: user-manual.txt:2459
 #, no-wrap
 msgid "images/Group2.jpg"
 msgstr "images/Group2.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2343
+#: user-manual.txt:2465
 msgid ""
 "Grouping into trips allows a rapid way of accessing individual dives without "
 "having to scan a long lists of dives. To group the dives in a dive list, "
@@ -4674,13 +4810,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:2344
+#: user-manual.txt:2466
 #, no-wrap
 msgid "Editing the title and associated information for a particular trip"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2357
+#: user-manual.txt:2479
 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 "
@@ -4694,13 +4830,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:2358
+#: user-manual.txt:2480
 #, no-wrap
 msgid "Viewing the dives during a particular trip"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2363
+#: user-manual.txt:2485
 msgid ""
 "Once the dives have been grouped into trips, you can expand one or more "
 "trips by clicking the arrow-head on the left of each trip title. This "
@@ -4708,13 +4844,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:2364
+#: user-manual.txt:2486
 #, no-wrap
 msgid "Collapsing or expanding dive information for different trips"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2369
+#: user-manual.txt:2491
 msgid ""
 "After selecting a particular trip in the dive list, the context menu allows "
 "several options to expand or collapse dives within trips. This includes "
@@ -4722,13 +4858,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:2370
+#: user-manual.txt:2492
 #, no-wrap
 msgid "Merging dives from more than one trip into a single trip"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2375
+#: user-manual.txt:2497
 msgid ""
 "After selecting a trip title, the context menu allows the merging of trips "
 "by either merging the selected trip with the trip below or with the trip "
@@ -4736,13 +4872,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:2376
+#: user-manual.txt:2498
 #, no-wrap
 msgid "Splitting a single trip into more than one trip"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2385
+#: user-manual.txt:2507
 msgid ""
 "If a trip includes ten dives, you can split this trip into two trips (trip "
 "1: top 4 dives; trip 2: bottom 6 dives) by selecting and right-clicking the "
@@ -4753,25 +4889,25 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2386
+#: user-manual.txt:2508
 #, no-wrap
 msgid "images/SplitDive3a.jpg"
 msgstr "images/SplitDive3a.jpg"
 
 #. type: Title ===
-#: user-manual.txt:2388
+#: user-manual.txt:2510
 #, no-wrap
 msgid "Manipulating single dives"
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:2390
+#: user-manual.txt:2512
 #, no-wrap
 msgid "Delete a dive from the dive log"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2397
+#: user-manual.txt:2519
 msgid ""
 "Dives can be permanently deleted from the dive log by selecting and right-"
 "clicking them to bring up the context menu, then selecting *Delete dive(s)*. "
@@ -4780,13 +4916,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:2398
+#: user-manual.txt:2520
 #, no-wrap
 msgid "Unlink a dive from a trip"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2405
+#: user-manual.txt:2527
 msgid ""
 "You can unlink dives from the trip to which they belong. To do this, select "
 "and right-click the relevant dives to bring up the context menu. Then select "
@@ -4796,13 +4932,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:2406
+#: user-manual.txt:2528
 #, no-wrap
 msgid "Add a dive to the trip immediately above"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2411
+#: user-manual.txt:2533
 msgid ""
 "Selected dives can be moved from the trip to which they belong and placed "
 "within a separate trip. To do this, select and right-click the dive(s) to "
@@ -4810,13 +4946,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:2412
+#: user-manual.txt:2534
 #, no-wrap
 msgid "Shift the start time of dive(s)"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2422
+#: user-manual.txt:2544
 msgid ""
 "Sometimes it’s necessary to adjust the start time of a dive. This may apply "
 "to situations where dives are done in different time zones or when the dive "
@@ -4828,13 +4964,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:2423
+#: user-manual.txt:2545
 #, no-wrap
 msgid "Merge dives into a single dive"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2433
+#: user-manual.txt:2555
 msgid ""
 "Sometimes a dive is briefly interrupted, for example, if a diver returns to "
 "the surface for a few minutes. That results in two or more dives being "
@@ -4848,19 +4984,19 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2434
+#: user-manual.txt:2556
 #, no-wrap
 msgid "images/MergedDive.png"
 msgstr "images/MergedDive.png"
 
 #. type: Title ====
-#: user-manual.txt:2436
+#: user-manual.txt:2558
 #, no-wrap
 msgid "Undo dive manipulations"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2442
+#: user-manual.txt:2564
 msgid ""
 "Important actions on dives or trips, described above, can be undone or "
 "redone.  This includes: _delete dives_, _merge dives_, _renumber dives_ and "
@@ -4870,13 +5006,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:2445
+#: user-manual.txt:2567
 #, no-wrap
 msgid "Filtering the dive list"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2451
+#: user-manual.txt:2573
 msgid ""
 "The dives in the *Dive List* panel can be filtered, so you can select only "
 "some of the dives based on their attributes, e.g. dive tags, dive site, dive "
@@ -4886,7 +5022,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2459
+#: user-manual.txt:2581
 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 "
@@ -4900,13 +5036,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2460
+#: user-manual.txt:2582
 #, no-wrap
 msgid "images/Filterpanel.jpg"
 msgstr "images/Filterpanel.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2469
+#: user-manual.txt:2591
 msgid ""
 "Four filter criteria may be used to filter the dive list: dive tags, person "
 "(buddy / divemaster), dive site and dive suit.  Each of these is represented "
@@ -4919,7 +5055,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2477
+#: user-manual.txt:2599
 msgid ""
 "To activate filtering of the dive list, check at least one check box in one "
 "of the four check lists. The dive list is then shortened to include only the "
@@ -4931,23 +5067,23 @@ msgid ""
 msgstr ""
 
 #. type: Title ==
-#: user-manual.txt:2479
+#: user-manual.txt:2601
 #, no-wrap
 msgid "Exporting the dive log or parts of the dive log"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2482
+#: user-manual.txt:2604
 msgid "There are two ways to export dive information from Subsurface:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2484
+#: user-manual.txt:2606
 msgid "Export dive information to _Facebook_"
 msgstr "Exporter les informations de plongée vers _Facebook_"
 
 #. type: Plain text
-#: user-manual.txt:2486
+#: user-manual.txt:2608
 msgid ""
 "xref:S_Export_other[Export dive information to other destinations or formats]"
 msgstr ""
@@ -4955,23 +5091,13 @@ msgstr ""
 "destinations ou formats]"
 
 #. type: Title ===
-#: user-manual.txt:2488
+#: user-manual.txt:2610
 #, no-wrap
 msgid "Exporting dive information to _Facebook_"
 msgstr "Export des informations de plongée vers _Facebook_"
 
 #. type: Plain text
-#: user-manual.txt:2497
-#, fuzzy
-#| msgid ""
-#| "Export of dives to _Facebook_ is handled differently from other types of "
-#| "export because a connection to _Facebook_ is required, needing a "
-#| "_Facebook_ userID and password.  If, from the *Main Menu*, one selects "
-#| "_File -> Preferences -> Facebook_, a login screen is presented (image *A* "
-#| "to the left, below).  Provide a _Facebook_ userID and password.  Once a "
-#| "successful login to _Facebook_ has been achieved, the panel in image *B*, "
-#| "below is presented, including a _Disconnect from Facebook_ button to "
-#| "close the _Facebook_ connection."
+#: user-manual.txt:2619
 msgid ""
 "Export of dives to _Facebook_ is handled differently from other types of "
 "export because a connection to _Facebook_ is required, needing a _Facebook_ "
@@ -4984,20 +5110,20 @@ msgstr ""
 "L'export des plongées vers _Facebook_ est géré différemment des autres types "
 "d'export car une connexion vers _Facebook_ est nécessaire, 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é (image *A* sur la gauche, ci dessous). Entrez l'identifiant et le "
+"sélectionnez _Fichier -> Préférences -> Facebook_, un écran de connexion "
+"s'affiche (image *A* sur la gauche, ci dessous). Entrez l'identifiant et le "
 "mot de passe _Facebook_. Une fois connecté à _Facebook_, le panneau de "
-"l'image *B* ci dessous est présenté, avec un bouton _Déconnecter de "
-"Facebook_ pour fermer la connexion _Facebook_."
+"l'image *B* ci dessous est affiché, avec un bouton _Déconnecter de Facebook_ "
+"pour fermer la connexion _Facebook_."
 
 #. type: Target for macro image
-#: user-manual.txt:2498
+#: user-manual.txt:2620
 #, no-wrap
 msgid "images/facebook1_f20.jpg"
 msgstr "images/facebook1_f20.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2503
+#: user-manual.txt:2625
 msgid ""
 "From the _Subsurface_ window it’s easy to determine whether _Subsurface_ has "
 "a valid connection to _Facebook_ From the *Main Menu*, select _Share on -> "
@@ -5007,24 +5133,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2514
-#, fuzzy
-#| msgid ""
-#| "Having established a login to _Facebook_, transfer of a dive profile to "
-#| "one's _Facebook_ timeline is easy.  Ensure that the dive to be transfered "
-#| "to the timeline is depicted in the _Subsurface_ *Dive Profile* panel. If, "
-#| "from the *Main Menu*, one selects _Share on -> Facebook_ (see image *A* "
-#| "below), a dialogue is shown, determining the amount of additional "
-#| "information transferred with the dive profile (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 (image *B*, below). One can easily edit the "
-#| "message that will be posted with the dive profile. Having specified the "
-#| "additional information and verified the text, select the _OK_ button that "
-#| "triggers the transfer to _Facebook_. After a while, an acknowledgement "
-#| "dialogue appears, indicating successful transfer to _Facebook_."
+#: user-manual.txt:2636
 msgid ""
 "Having established a login to _Facebook_, transferring a dive profileto a "
 "_Facebook_ timeline is easy.  Be sure the dive to be transferred to the "
@@ -5059,34 +5168,25 @@ msgstr ""
 "moment, une fenêtre apparait indiquant le succès du transfert."
 
 #. type: Plain text
-#: user-manual.txt:2519
-#, fuzzy
-#| msgid ""
-#| "Both the album created and the post to one's timeline will be marked as "
-#| "private. In order for friends to be able to see the post, change its "
-#| "permissions from a regular Facebook login either in a browser or a "
-#| "Facebook app. While this is an extra step this is the better solution to "
-#| "avoid having unwanted posts in one's public timeline."
+#: user-manual.txt:2641
 msgid ""
 "Both the album created and the post to your timeline will be marked as "
 "private. In order for friends to be able to see it, change its permissions "
 "from a regular Facebook login either in a browser or a Facebook app."
 msgstr ""
 "À la fois l'album créé et la publication sur votre ligne temporelle seront "
-"marquées comme privés. Pour que vos amis puissent voir la publication, "
-"modifier les permissions à partir d'une connexion Facebook standard depuis "
-"un navigateur ou l'application Facebook. Malgré que cela soit une étape "
-"supplémentaire, c'est la meilleure solution pour éviter d'avoir des "
-"publications non désirées sur votre ligne temporelle publique."
+"marquées comme privés. Pour que vos amis puissent la voir, modifier les "
+"permissions à partir d'une connexion Facebook standard depuis un navigateur "
+"ou l'application Facebook."
 
 #. type: Target for macro image
-#: user-manual.txt:2520
+#: user-manual.txt:2642
 #, no-wrap
 msgid "images/facebook2_f20.jpg"
 msgstr "images/facebook2_f20.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2524
+#: user-manual.txt:2646
 msgid ""
 "If required, then close the _Facebook_ connection by either closing "
 "_Subsurface_ or by selecting _File -> Preferences -> Facebook_ from the Main "
@@ -5098,14 +5198,13 @@ msgstr ""
 "préférences Facebook."
 
 #. type: Title ===
-#: user-manual.txt:2526
-#, fuzzy, no-wrap
-#| msgid "xref:S_Export_other[Export dive information to other destinations or formats]"
+#: user-manual.txt:2648
+#, no-wrap
 msgid "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]"
+msgstr "Exporter des informations de plongée vers d'autres destinations ou formats"
 
 #. type: Plain text
-#: user-manual.txt:2531
+#: user-manual.txt:2653
 msgid ""
 "For non-_Facebook exports_, the export function can be found by selecting "
 "_File -> Export_, which brings up the Export dialog. This dialog always "
@@ -5115,24 +5214,24 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2532
+#: user-manual.txt:2654
 #, no-wrap
 msgid "images/Export_f20.jpg"
 msgstr "images/Export_f20.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2535
+#: user-manual.txt:2657
 msgid "A dive log or part of it can be saved in three formats:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2537
+#: user-manual.txt:2659
 msgid ""
 "_Subsurface XML_ format. This is the native format used by _Subsurface_."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2541
+#: user-manual.txt:2663
 msgid ""
 "Universal Dive Data Format (_UDDF_). Refer to _http://uddf.org_ for more "
 "information.  UDDF is a generic format that enables communication among many "
@@ -5140,7 +5239,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2545
+#: user-manual.txt:2667
 msgid ""
 "_Divelogs.de_, an Internet-based dive log repository. In order to upload to "
 "_Divelogs.de_, you need a user-ID as well as a password for _Divelogs.de_. "
@@ -5149,7 +5248,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2549
+#: user-manual.txt:2671
 msgid ""
 "_DiveShare_ is also a dive log repository on the Internet focusing on "
 "recreational dives. To upload dives, you need a user ID, so registration "
@@ -5157,7 +5256,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2554
+#: user-manual.txt:2676
 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, "
@@ -5166,7 +5265,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2557
+#: user-manual.txt:2679
 msgid ""
 "_CSV dive profile_, that includes a large amount of detail for each dive, "
 "including the depth profile, temperature and pressure information of each "
@@ -5174,7 +5273,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2570
+#: user-manual.txt:2692
 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 "
@@ -5191,7 +5290,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2575
+#: user-manual.txt:2697
 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. If you "
@@ -5200,13 +5299,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2576
+#: user-manual.txt:2698
 #, no-wrap
 msgid "images/mapview_f20.jpg"
 msgstr "images/mapview_f20.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2583
+#: user-manual.txt:2705
 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 "
@@ -5215,12 +5314,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2585
+#: user-manual.txt:2707
 msgid "_General Settings_, under the HTML tab, provides the following options:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2593
+#: user-manual.txt:2715
 #, no-wrap
 msgid ""
 "** Subsurface Numbers: if this option is checked, the dive(s) are exported with the\n"
@@ -5233,27 +5332,27 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2596
+#: user-manual.txt:2718
 msgid ""
 "Under _Style Options_ some style-related options are available like font "
 "size and theme."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2599
+#: user-manual.txt:2721
 msgid ""
 "Export to other formats can be done through third party facilities, for "
 "instance _www.divelogs.de_."
 msgstr ""
 
 #. type: Title ==
-#: user-manual.txt:2601
+#: user-manual.txt:2723
 #, no-wrap
 msgid "Keeping a _Subsurface_ dive log in the Cloud"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2611
+#: user-manual.txt:2733
 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’s important "
@@ -5267,7 +5366,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2617
+#: user-manual.txt:2739
 msgid ""
 "_Subsurface_ includes access to a transparently integrated cloud storage "
 "back end that is available to all Subsurface users. Storing and retrieving a "
@@ -5277,13 +5376,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:2618
+#: user-manual.txt:2740
 #, no-wrap
 msgid "Create a cloud storage account"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2635
+#: user-manual.txt:2757
 #, no-wrap
 msgid ""
 "** Open the *Network Preferences* by selecting _File_ -> _Preferences_ -> _Network_.\n"
@@ -5304,13 +5403,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:2636
+#: user-manual.txt:2758
 #, no-wrap
 msgid "Using _Subsurface cloud storage_"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2646
+#: user-manual.txt:2768
 #, no-wrap
 msgid ""
 "** Once the cloud storage has been initialized, two new items appear in the\n"
@@ -5324,7 +5423,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2651
+#: user-manual.txt:2773
 #, no-wrap
 msgid ""
 "** _Subsurface_ keeps a local copy of the data and the cloud facility remains fully\n"
@@ -5334,13 +5433,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:2653
+#: user-manual.txt:2775
 #, no-wrap
 msgid "Web access to _Subsurface cloud storage_"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2663
+#: user-manual.txt:2785
 msgid ""
 "One of the nice side benefits of using _Subsurface cloud storage_ is that "
 "you can also access your dive data from any web browser. Simply open https://"
@@ -5353,13 +5452,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:2664
+#: user-manual.txt:2786
 #, no-wrap
 msgid "Other cloud services"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2674
+#: user-manual.txt:2796
 msgid ""
 "If you prefers not to use the integrated cloud storage of dive logs (and "
 "don't need the web access), it’s simple to store dive logs in the cloud "
@@ -5370,13 +5469,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2675
+#: user-manual.txt:2797
 #, no-wrap
 msgid "images/Cloud.jpg"
 msgstr "images/Cloud.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2684
+#: user-manual.txt:2806
 msgid ""
 "The _Dropbox_ program creates a copy of the _Dropbox_ Internet Cloud content "
 "on your desktop computer. When the computer is connected to the Internet, "
@@ -5389,7 +5488,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2691
+#: user-manual.txt:2813
 msgid ""
 "In this way a dive log in your _Dropbox_ folder can be accessed seamlessly "
 "from the Internet and can be accessed anywhere with Internet access. "
@@ -5399,7 +5498,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2697
+#: user-manual.txt:2819
 msgid ""
 "Alternatively you can use _Dropbox_ as a way back up your dive log. To Store "
 "a dive log on _Dropbox_, select _File -> Save as_ from the _Subsurface_ main "
@@ -5410,20 +5509,20 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2700
+#: user-manual.txt:2822
 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:2703
+#: user-manual.txt:2825
 #, no-wrap
 msgid "Printing a dive log"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2707
+#: user-manual.txt:2829
 #, no-wrap
 msgid ""
 "_Subsurface_ provides a simple and flexible way to print a whole dive log or only a few selected dives.\n"
@@ -5431,19 +5530,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2709
+#: user-manual.txt:2831
 msgid "Some decisions need to be made before printing:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2712
+#: user-manual.txt:2834
 msgid ""
 "Should the whole dive log be printed or only part of it? If only part is "
 "required, select the required dives from the *Dive List* panel."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2714
+#: user-manual.txt:2836
 msgid ""
 "If the dive profiles are printed, what gas partial pressure information "
 "should be shown? Select the appropriate toggle-buttons on the button bar to "
@@ -5451,7 +5550,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2717
+#: user-manual.txt:2839
 msgid ""
 "If _File -> Print_ is selected from the Main menu, the dialogue below (image "
 "*A*) appears. Three specifications are needed to get the desired information "
@@ -5459,35 +5558,35 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2718 user-manual.txt:4162
+#: user-manual.txt:2840 user-manual.txt:4284
 #, no-wrap
 msgid "images/Print1_f22.jpg"
 msgstr "images/Print1_f22.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2721
+#: user-manual.txt:2843
 msgid "Under _Print type_ select one of two options:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2723
+#: user-manual.txt:2845
 msgid ""
 "_Dive list print_: Print dives from the *Dive List* panel with profiles and "
 "other information."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2724
+#: user-manual.txt:2846
 msgid "_Statistics print_: Print yearly statistics of the dives."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2726
+#: user-manual.txt:2848
 msgid "Under _Print options_ select:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2731
+#: user-manual.txt:2853
 msgid ""
 "Printing only the dives selected from the dive list before activating the "
 "print dialogue by checking the box _Print only selected dives_. If this "
@@ -5495,73 +5594,73 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2733
+#: user-manual.txt:2855
 msgid ""
 "Printing in color, done by checking the box with _Print in color. If this "
 "check box is not checked, printing is in black and white."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2736
+#: user-manual.txt:2858
 msgid ""
 "Under _Template_ select a template to be used as the page layout. There are "
 "several choices.  (see image *B*, above)."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2738
+#: user-manual.txt:2860
 msgid "_Table_: This prints a summary table of all dives selected (see below)."
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2739
+#: user-manual.txt:2861
 #, no-wrap
 msgid "images/Print_summarylist_f22.jpg"
 msgstr "images/Print_summarylist_f22.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2742
+#: user-manual.txt:2864
 msgid ""
 "_Flow layout_: Print the text associated with each dive without printing the "
 "dive profiles"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2743
+#: user-manual.txt:2865
 msgid "of each dive (see below):"
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2744
+#: user-manual.txt:2866
 #, no-wrap
 msgid "images/Print_flow_layout_f22.jpg"
 msgstr "images/Print_flow_layout_f22.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2747
+#: user-manual.txt:2869
 msgid ""
 "_One Dive_: Print one dive per page, also showing the dive profile (see "
 "below)"
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2748
+#: user-manual.txt:2870
 #, no-wrap
 msgid "images/print2_f22.jpg"
 msgstr "images/print2_f22.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2752
+#: user-manual.txt:2874
 msgid "_Two Dives_: Print two dives per page, also showing the dive profiles."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2753
+#: user-manual.txt:2875
 msgid "_Six Dives_: Print six dives per page, also showing the dive profiles."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2757
+#: user-manual.txt:2879
 msgid ""
 "You can _Preview_ the printed page by selecting the _Preview_ button on the "
 "dialogue (see image *A* at the start of this section). After preview, you "
@@ -5570,7 +5669,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2761
+#: user-manual.txt:2883
 msgid ""
 "Next, select the _Print_ button (see image *A* at the start of this "
 "section). This activates the regular print dialogue used by the operating "
@@ -5579,13 +5678,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2762
+#: user-manual.txt:2884
 #, no-wrap
 msgid "images/Print_print_f22.jpg"
 msgstr "images/Print_print_f22.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2767
+#: user-manual.txt:2889
 msgid ""
 "Set the print resolution of the printer to an appropriate value by changing "
 "the printer _Properties_. Finally, select the _Print_ button to print the "
@@ -5594,19 +5693,19 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2768
+#: user-manual.txt:2890
 #, no-wrap
 msgid "images/Printpreview.jpg"
 msgstr "images/Printpreview.jpg"
 
 #. type: Title ===
-#: user-manual.txt:2770
+#: user-manual.txt:2892
 #, no-wrap
 msgid "Writing a custom print template (advanced)"
 msgstr "Créer un modèle d'impression personnalisé (avancé)"
 
 #. type: Plain text
-#: user-manual.txt:2776
+#: user-manual.txt:2898
 msgid ""
 "Writing a custom template is an effective way to produce highly customized "
 "printouts. Subsurface uses HTML templates to render printing. You can create "
@@ -5617,25 +5716,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ==
-#: user-manual.txt:2778
+#: user-manual.txt:2900
 #, no-wrap
 msgid "Configuring a dive computer"
 msgstr "Configurer un ordinateur de plongée"
 
 #. type: Plain text
-#: user-manual.txt:2787
-#, fuzzy
-#| 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 (also "
-#| "required for downloading dives) 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."
+#: user-manual.txt:2909
 msgid ""
 "_Subsurface_ lets you configure a dive computer. Currently the Heinrichs-"
 "Weikamp (OSTC 2, OSTC 3) and Suunto Vyper (Stinger, Mosquito, D3, Vyper, "
@@ -5648,19 +5735,19 @@ msgid ""
 "_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 "
+"_Subsurface_ vous permet de configurer un 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. Pour s'assurer que les pilotes pour votre "
 "ordinateur de plongée sont installés (également nécessaire pour télécharger "
 "les plongées) 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_operating_system_specific_information_for_importing_dive_information_from_a_dive_computer, "
 "ANNEXE A>> pour plus d'informations sur la manière de procéder."
 
 #. type: Plain text
-#: user-manual.txt:2792
+#: user-manual.txt:2914
 msgid ""
 "Once the dive computer is connected to the _Subsurface_ computer, select "
 "_File -> Configure dive computer_ from the _Main Menu_. Provide the "
@@ -5675,26 +5762,22 @@ msgstr ""
 "plongée à partir du panneau à gauche (voir l'image ci-dessous)."
 
 #. type: Target for macro image
-#: user-manual.txt:2793
+#: user-manual.txt:2915
 #, no-wrap
 msgid "images/Configure_dc_f20.jpg"
 msgstr "images/Configure_dc_f20.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2796
-#, fuzzy
-#| msgid ""
-#| "Using the appropriate buttons on the configuration panel, the following "
-#| "actions can be performed:"
+#: user-manual.txt:2918
 msgid ""
 "Using the appropriate buttons on the configuration panel, the following "
 "actions can be done:"
 msgstr ""
 "En utilisant les boutons appropriés du panneau de configuration, les actions "
-"suivantes peuvent être réalisées :"
+"suivantes peuvent être effectuées :"
 
 #. type: Plain text
-#: user-manual.txt:2799
+#: user-manual.txt:2921
 #, no-wrap
 msgid ""
 "*Retrieve available details*. This loads the existing configuration from the dive computer\n"
@@ -5704,7 +5787,7 @@ msgstr ""
 "dans _Subsurface_, en l'affichant dans le panneau de configuration.\n"
 
 #. type: Plain text
-#: user-manual.txt:2801
+#: user-manual.txt:2923
 #, no-wrap
 msgid ""
 "*Save changes to device*. This changes the configuration of the\n"
@@ -5714,7 +5797,7 @@ msgstr ""
 "de plongée pour correspondre aux informations affichées dans le panneau de configuration.\n"
 
 #. type: Plain text
-#: user-manual.txt:2803
+#: user-manual.txt:2925
 #, no-wrap
 msgid ""
 "*Backup*. This saves the configuration data to a file. _Subsurface_ asks for\n"
@@ -5724,7 +5807,7 @@ msgstr ""
 "l'emplacement et le nom du fichier pour enregistrer les informations.\n"
 
 #. type: Plain text
-#: user-manual.txt:2805
+#: user-manual.txt:2927
 #, no-wrap
 msgid ""
 "*Restore backup*. This loads the information from a backup file and displays it\n"
@@ -5734,7 +5817,7 @@ msgstr ""
 "dans le panneau de configuration.\n"
 
 #. type: Plain text
-#: user-manual.txt:2807
+#: user-manual.txt:2929
 #, no-wrap
 msgid ""
 "*Update firmware*. If new firmware is available for the dive computer, this is\n"
@@ -5744,13 +5827,13 @@ msgstr ""
 "il sera chargé dans l'ordinateur de plongée.\n"
 
 #. type: Title ==
-#: user-manual.txt:2810
+#: user-manual.txt:2932
 #, no-wrap
 msgid "Setting user _Preferences_ for _Subsurface_"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2819
+#: user-manual.txt:2941
 msgid ""
 "There are several user-definable settings within _Subsurface_, found by "
 "selecting _File -> Preferences_. The settings are in seven groups: "
@@ -5763,24 +5846,24 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:2820
+#: user-manual.txt:2942
 #, no-wrap
 msgid "Defaults"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2823
+#: user-manual.txt:2945
 msgid "There are several settings in the *Defaults* panel:"
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2824
+#: user-manual.txt:2946
 #, no-wrap
 msgid "images/Pref1_f20.jpg"
 msgstr "images/Pref1_f20.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2828
+#: user-manual.txt:2950
 #, no-wrap
 msgid ""
 "  ** *Lists and tables*: Here you can specify the font type and font size of the\n"
@@ -5788,7 +5871,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2833
+#: user-manual.txt:2955
 #, no-wrap
 msgid ""
 "  ** *Dives*: For the _Default Dive File_ you need to specify the directory and\n"
@@ -5798,13 +5881,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2834
+#: user-manual.txt:2956
 #, no-wrap
 msgid "_No default file_: When checked, _Subsurface_ does not automatically load a dive log at startup.\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2836
+#: user-manual.txt:2958
 #, no-wrap
 msgid ""
 "_Local default file_: When checked, _Subsurface_ automatically loads a dive log from the local hard disk\n"
@@ -5812,7 +5895,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2838
+#: user-manual.txt:2960
 #, no-wrap
 msgid ""
 "_Cloud storage default file_: When checked, _Subsurface automatically loads the dive log from the cloud\n"
@@ -5820,13 +5903,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2840
+#: user-manual.txt:2962
 #, no-wrap
 msgid "** *Display invalid*:  Dives can be marked as invalid (when a user wishes to hide\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2843
+#: user-manual.txt:2965
 #, no-wrap
 msgid ""
 "dives that he/she doesn't consider valid dives, e.g. pool dives, but still want to\n"
@@ -5835,25 +5918,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2845
+#: user-manual.txt:2967
 #, no-wrap
 msgid "** *Default cylinder*: Specify the default cylinder listed in\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2846
+#: user-manual.txt:2968
 #, no-wrap
 msgid "the *Equipment* tab of the *Notes* panel.\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2848
+#: user-manual.txt:2970
 #, no-wrap
 msgid "** *Animations*: Some actions in showing the dive profile are performed using\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2854
+#: user-manual.txt:2976
 #, no-wrap
 msgid ""
 "animations. For instance, the axis values for depth and time change from dive to\n"
@@ -5865,31 +5948,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2856
+#: user-manual.txt:2978
 #, no-wrap
 msgid "** *Clear all settings*: As indicated in the button below this heading, all settings are\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2857
+#: user-manual.txt:2979
 #, no-wrap
 msgid "cleared and set to default values.\n"
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:2858
+#: user-manual.txt:2980
 #, no-wrap
 msgid "Units"
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2859
+#: user-manual.txt:2981
 #, no-wrap
 msgid "images/Pref2_f20.jpg"
 msgstr "images/Pref2_f20.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2866
+#: user-manual.txt:2988
 msgid ""
 "Here you can choose between metric and imperial units of depth, pressure, "
 "volume, temperature and mass. By selecting the Metric or Imperial radio "
@@ -5900,7 +5983,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2872
+#: user-manual.txt:2994
 msgid ""
 "Regardless of the above settings, dive time measurements can be either in "
 "seconds or minutes.  Choose the appropriate option. GPS coordinates can be "
@@ -5909,24 +5992,24 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:2873
+#: user-manual.txt:2995
 #, no-wrap
 msgid "Graph"
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2875
+#: user-manual.txt:2997
 #, no-wrap
 msgid "images/Pref3_f20.jpg"
 msgstr "images/Pref3_f20.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2879
+#: user-manual.txt:3001
 msgid "This panel allows two type of selections:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2901
+#: user-manual.txt:3023
 #, no-wrap
 msgid ""
 "*Show*: Here you can specify the amount of information shown as part of\n"
@@ -5953,13 +6036,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2903
+#: user-manual.txt:3025
 #, no-wrap
 msgid "*Misc*:\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2916
+#: user-manual.txt:3038
 #, no-wrap
 msgid ""
 "** Gradient Factors (GFLow and GFHigh):* Set the _gradient factors_ used while diving. GF_Low is\n"
@@ -5976,19 +6059,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2918
+#: user-manual.txt:3040
 #, 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:2920
+#: user-manual.txt:3042
 #, 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:2924
+#: user-manual.txt:3046
 #, no-wrap
 msgid ""
 " ** _CCR: Show setpoints when viewing pO2:_ With this checkbox activated, the pO~2~\n"
@@ -5997,7 +6080,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2928
+#: user-manual.txt:3050
 #, no-wrap
 msgid ""
 " ** _CCR: Show individual O~2~ sensor values when viewing pO~2~:_ Show the pO~2~\n"
@@ -6006,19 +6089,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2930
+#: user-manual.txt:3052
 #, no-wrap
 msgid "*Configuring dive planning using rebreather equipment:*\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2932
+#: user-manual.txt:3054
 #, no-wrap
 msgid "** _Default CCR setpoint for dive planning:_ Specify the O~2~ setpoint for a\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2935
+#: user-manual.txt:3057
 #, no-wrap
 msgid ""
 "CCR dive plan. This determines the pO~2~  maintained\n"
@@ -6027,13 +6110,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2937
+#: user-manual.txt:3059
 #, no-wrap
 msgid "** _pSCR O~2~ metabolism rate:_ For a semi-closed rebreather (pSCR) system, this is the\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2939
+#: user-manual.txt:3061
 #, no-wrap
 msgid ""
 "volume of oxygen used by a diver during a minute. Set this value for pSCR dive planning\n"
@@ -6041,13 +6124,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2941
+#: user-manual.txt:3063
 #, 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:2943
+#: user-manual.txt:3065
 #, no-wrap
 msgid ""
 "environment to that of the gas recirculated to the diver. Set this value for a\n"
@@ -6055,24 +6138,24 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:2945
+#: user-manual.txt:3067
 #, no-wrap
 msgid "Language"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2947
+#: user-manual.txt:3069
 msgid "Choose a language that _Subsurface_ will use."
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2948
+#: user-manual.txt:3070
 #, no-wrap
 msgid "images/Pref4_f20.jpg"
 msgstr "images/Pref4_f20.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2958
+#: user-manual.txt:3080
 msgid ""
 "A checkbox lets you use the _System Default_ language which in most cases "
 "will be the correct setting; with this _Subsurface_ simply runs in the same "
@@ -6084,13 +6167,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:2959
+#: user-manual.txt:3081
 #, no-wrap
 msgid "Network"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2966
+#: user-manual.txt:3088
 msgid ""
 "This panel facilitates communication between _Subsurface_ and data sources "
 "on the Internet.  This is important, for instance, when _Subsurface_ needs "
@@ -6101,18 +6184,18 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2967
+#: user-manual.txt:3089
 #, no-wrap
 msgid "images/Pref5_f20.jpg"
 msgstr "images/Pref5_f20.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2970
+#: user-manual.txt:3092
 msgid "This dialogue has three sections:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2978
+#: user-manual.txt:3100
 #, no-wrap
 msgid ""
 "** _Proxy type_:\n"
@@ -6125,7 +6208,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2983
+#: user-manual.txt:3105
 #, no-wrap
 msgid ""
 "** _Subsurface cloud storage_: To store your dive log in the cloud, a valid email address\n"
@@ -6135,31 +6218,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2984
+#: user-manual.txt:3106
 #, no-wrap
 msgid "_Sync to cloud in the background_: This option allows saving of dive information to the cloud storage\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2985
+#: user-manual.txt:3107
 #, no-wrap
 msgid "while you do other things within _Subsurface_.\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2986
+#: user-manual.txt:3108
 #, no-wrap
 msgid "_Save password locally_: This allows local storage of the cloud storage password. Note that this\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2987
+#: user-manual.txt:3109
 #, no-wrap
 msgid "information is saved in raw text form, not encoded in any way.\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2991
+#: user-manual.txt:3113
 #, no-wrap
 msgid ""
 "** _Subsurface web service_: When you subscribe to the <<S_Companion,Subsurface web service>>, a very\n"
@@ -6168,18 +6251,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:2994
-#, fuzzy, no-wrap
-#| msgid "Facebook Accesss"
+#: user-manual.txt:3116
+#, no-wrap
 msgid "Facebook Access"
 msgstr "Accès Facebook"
 
 #. type: Plain text
-#: user-manual.txt:2997
-#, fuzzy
-#| msgid ""
-#| "This panel allows one to log into a Facebook account in order to transfer "
-#| "information from Subsurface to Facefook."
+#: user-manual.txt:3119
 msgid ""
 "This panel lets you log into a Facebook account in order to transfer "
 "information from Subsurface to Facebook."
@@ -6188,20 +6266,13 @@ msgstr ""
 "transférer des informations de Subsurface vers Facebook."
 
 #. type: Target for macro image
-#: user-manual.txt:2998
+#: user-manual.txt:3120
 #, no-wrap
 msgid "images/Pref6_f20.jpg"
 msgstr "images/Pref6_f20.jpg"
 
 #. type: Plain text
-#: user-manual.txt:3006
-#, fuzzy
-#| 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. Currently the checkbox labelled \"Keep me logged in to "
-#| "Subsurface\", on the login screen has no effect.  See the section xref:"
-#| "S_facebook[Exporting dive profiles to Facebook] for more information."
+#: user-manual.txt:3128
 msgid ""
 "If you provide a valid Facebook userID and password, a connection to "
 "Facebook is created. That connection is closed when one closing down "
@@ -6217,13 +6288,13 @@ msgstr ""
 "vers Facebook] pour plus d'informations."
 
 #. type: Title ===
-#: user-manual.txt:3007
+#: user-manual.txt:3129
 #, no-wrap
 msgid "Georeference"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3015
+#: user-manual.txt:3137
 msgid ""
 "_Subsurface_ provides a geo-lookup service (that is, given the coordinates "
 "of a dive site) derived from a click on the *Dive Map panel* at the bottom "
@@ -6236,19 +6307,19 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:3016
+#: user-manual.txt:3138
 #, no-wrap
 msgid "images/Pref7_f20.jpg"
 msgstr "images/Pref7_f20.jpg"
 
 #. type: Title ==
-#: user-manual.txt:3019
+#: user-manual.txt:3141
 #, no-wrap
 msgid "The _Subsurface_ dive planner"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3024
+#: user-manual.txt:3146
 msgid ""
 "Dive planning is an advanced feature of _Subsurface_, accessed by selecting "
 "_Log -> Plan Dive_ from the main menu. It allows calculation of nitrogen "
@@ -6257,7 +6328,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:3032
+#: user-manual.txt:3154
 msgid ""
 "The _Subsurface_ dive planner IS CURRENTLY EXPERIMENTAL and assumes the user "
 "is already familiar with the _Subsurface_ user interface. It is explicitly "
@@ -6265,19 +6336,19 @@ msgid ""
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:3035
+#: user-manual.txt:3157
 msgid ""
 "The user is conversant with dive planning and has the necessary training to "
 "perform dive planning."
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:3036
+#: user-manual.txt:3158
 msgid "The user plans dives within his/her certification limits."
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:3039
+#: user-manual.txt:3161
 msgid ""
 "Dive planning makes large assumptions about the characteristics of the "
 "_average person_ and cannot compensate for individual physiology or health "
@@ -6285,32 +6356,32 @@ msgid ""
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:3040
+#: user-manual.txt:3162
 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:3041
+#: user-manual.txt:3163
 msgid "The user is familiar with the user interface of _Subsurface_."
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:3043
+#: user-manual.txt:3165
 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:3045
+#: user-manual.txt:3167
 #, no-wrap
 msgid "The _Subsurface_ dive planner screen"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3050
+#: user-manual.txt:3172
 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 "
@@ -6319,7 +6390,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3054
+#: user-manual.txt:3176
 msgid ""
 "At the top right hand is a green *design panel* on which the profile of the "
 "dive can be manipulated directly by dragging and clicking as explained "
@@ -6328,7 +6399,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3058
+#: user-manual.txt:3180
 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 "
@@ -6337,26 +6408,26 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:3059
+#: user-manual.txt:3181
 #, no-wrap
 msgid "images/PlannerWindow1_f20.jpg"
 msgstr "images/PlannerWindow1_f20.jpg"
 
 #. type: Title ===
-#: user-manual.txt:3062
+#: user-manual.txt:3184
 #, no-wrap
 msgid "Open circuit dives"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3065
+#: user-manual.txt:3187
 msgid ""
 "Towards the center bottom of the planner (circled in blue in the image "
 "above) is a dropbox with three options. Select the appropriate one of these:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3068
+#: user-manual.txt:3190
 #, no-wrap
 msgid ""
 "** Open Circuit (the default)\n"
@@ -6365,12 +6436,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3070
+#: user-manual.txt:3192
 msgid "Choose the Open Circuit option."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3074
+#: user-manual.txt:3196
 msgid ""
 "In the top left-hand area of the planning screen, be sure the constant dive "
 "parameters are appropriate. These are: Start date and time of the intended "
@@ -6380,7 +6451,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3083
+#: user-manual.txt:3205
 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. "
@@ -6395,12 +6466,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3085
+#: user-manual.txt:3207
 msgid "The profile of the planned dive can be created in two ways:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3090
+#: user-manual.txt:3212
 msgid ""
 "Drag the waypoints (the small white circles) on the existing dive profile to "
 "represent the dive. Additional waypoints can be created by double-clicking "
@@ -6410,7 +6481,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3098
+#: user-manual.txt:3220
 msgid ""
 "The most efficient way to create a dive profile is to enter the appropriate "
 "values into the table marked _Dive planner points_. The first line of the "
@@ -6424,13 +6495,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:3099
+#: user-manual.txt:3221
 #, no-wrap
 msgid "Recreational dives"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3116
+#: user-manual.txt:3238
 #, no-wrap
 msgid ""
 "Recreational mode is what comes closest to planning a dive based on the non-decompression limit (NDL).\n"
@@ -6451,21 +6522,21 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3119
+#: user-manual.txt:3241
 msgid ""
 "Ensure the date and time is set to that of the intended dive. This allows "
 "calculation of the nitrogen load incurred during previous dives."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3122
+#: user-manual.txt:3244
 msgid ""
 "Immediately under the heading _Planning_ are two checkboxes _Recreational_ "
 "and _Safety Stop_.  Check these two boxes."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3126
+#: user-manual.txt:3248
 msgid ""
 "Then define the cylinder size, the gas mixture (air or % oxygen) and the "
 "starting cylinder pressure in the top left-hand section of the planner under "
@@ -6473,7 +6544,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3131
+#: user-manual.txt:3253
 msgid ""
 "The planner calculates whether the specified cylinder contains enough air/"
 "gas to complete the planned dive. In order for this to be accurate, under "
@@ -6483,7 +6554,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3140
+#: user-manual.txt:3262
 msgid ""
 "Define the amount of gas the cylinder must have at the end of the bottom "
 "section of the dive just before ascent. A value of 50 bar is often used. The "
@@ -6500,7 +6571,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3148
+#: user-manual.txt:3270
 msgid ""
 "Define the depth of the dive by dragging the waypoints (white dots) on the "
 "dive profile or (even better) defining the appropriate depths using the "
@@ -6513,14 +6584,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3151
+#: user-manual.txt:3273
 msgid ""
 "The ascent speed can be changed. The default ascent speeds are those "
 "considered safe for recreational divers."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3159
+#: user-manual.txt:3281
 msgid ""
 "The dive profile in the planner shows the maximum dive time within no-deco "
 "limits using the Bühlmann ZH-L16 algorithm and the gas and depth settings "
@@ -6536,7 +6607,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3163
+#: user-manual.txt:3285
 msgid ""
 "Below is an image of a dive plan for a recreational dive at 30 meters. "
 "Although the no-deco limit (NDL) is 23 minutes, the duration of the dive is "
@@ -6546,26 +6617,26 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:3164
+#: user-manual.txt:3286
 #, no-wrap
 msgid "images/rec_diveplan.jpg"
 msgstr "images/rec_diveplan.jpg"
 
 #. type: Title ====
-#: user-manual.txt:3166
+#: user-manual.txt:3288
 #, no-wrap
 msgid "Non-recreational open circuit dives, including decompression"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3170
+#: user-manual.txt:3292
 msgid ""
 "Non-recreational dive planning involves exceeding the no-deco limits and/or "
 "using multiple breathing gases.  These dives are planned in three stages:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3182
+#: user-manual.txt:3304
 #, no-wrap
 msgid ""
 "*a) Nitrogen management*: This is done by specifying the rates for descent and ascent,\n"
@@ -6582,7 +6653,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3187
+#: user-manual.txt:3309
 msgid ""
 "If the VPM-B model is selected, the Conservatism_level needs to be specified "
 "on a scale of 0 (least conservative) to 4 (most conservative).  This model "
@@ -6593,12 +6664,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3189
+#: user-manual.txt:3311
 msgid "For more information external to this manual see:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3191
+#: user-manual.txt:3313
 msgid ""
 "link:http://www.tek-dive.com/portal/upload/M-Values.pdf[Understanding M-"
 "values by Erik Baker, _Immersed_ Vol. 3, No. 3.]"
@@ -6607,7 +6678,7 @@ msgstr ""
 "values by Erik Baker, _Immersed_ Vol. 3, No. 3.]"
 
 #. type: Plain text
-#: user-manual.txt:3192
+#: user-manual.txt:3314
 msgid ""
 "link:http://www.rebreatherworld.com/general-and-new-to-rebreather-"
 "articles/5037-gradient-factors-for-dummies.html[Gradient factors for "
@@ -6618,7 +6689,7 @@ msgstr ""
 "dummies, by Kevin Watts]"
 
 #. type: Plain text
-#: user-manual.txt:3194
+#: user-manual.txt:3316
 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"
@@ -6633,7 +6704,7 @@ msgstr ""
 "traite à la fois des modèles de décompression Bühlmann et VPM-B."
 
 #. type: Plain text
-#: user-manual.txt:3202
+#: user-manual.txt:3324
 msgid ""
 "The ascent rate is critical for nitrogen off-gassing at the end of the dive "
 "and is specified for several depth ranges, using the average (or mean) depth "
@@ -6647,7 +6718,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3211
+#: user-manual.txt:3333
 #, no-wrap
 msgid ""
 "*b) Oxygen management*: In the *Gas Options* part of the dive specification, the maximum partial\n"
@@ -6661,7 +6732,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3228
+#: user-manual.txt:3350
 #, no-wrap
 msgid ""
 "*c) Gas management*: With open-circuit dives this is a primary\n"
@@ -6683,7 +6754,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3240
+#: user-manual.txt:3362
 msgid ""
 "Now you can start the detailed time-depth planning of the dive. _Subsurface_ "
 "offers an unique graphical interface for doing planning. Themechanics are "
@@ -6701,7 +6772,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3252
+#: user-manual.txt:3374
 msgid ""
 "Each waypoint on the dive profile creates a _Dive Planner Point_ in the "
 "table on the left of the dive planner panel. Be sure the _Used Gas_ value in "
@@ -6718,7 +6789,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3260
+#: user-manual.txt:3382
 msgid ""
 "Show any changes in gas cylinder used by indicating gas changes as explained "
 "in the section <<S_CreateProfile,hand-creating a dive profile>>. These "
@@ -6730,7 +6801,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3269
+#: user-manual.txt:3391
 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 "
@@ -6743,20 +6814,20 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3272
+#: user-manual.txt:3394
 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:3273
+#: user-manual.txt:3395
 #, no-wrap
 msgid "images/DivePlanner2_f20.jpg"
 msgstr "images/DivePlanner2_f20.jpg"
 
 #. type: Plain text
-#: user-manual.txt:3278
+#: user-manual.txt:3400
 msgid ""
 "Once the above steps have been completed, save by clicking the _Save_ button "
 "towards the top middle of the planner. The saved dive plan will appear in "
@@ -6764,13 +6835,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3280
+#: user-manual.txt:3402
 #, no-wrap
 msgid "*The dive plan details*\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3288
+#: user-manual.txt:3410
 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 "
@@ -6783,7 +6854,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3293
+#: user-manual.txt:3415
 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 "
@@ -6793,13 +6864,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:3294
+#: user-manual.txt:3416
 #, no-wrap
 msgid "Planning pSCR dives"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3309
+#: user-manual.txt:3431
 #, no-wrap
 msgid ""
 "To plan a dive using a passive semi-closed rebreather (pSCR), select _pSCR_ rather than\n"
@@ -6818,26 +6889,26 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:3310
+#: user-manual.txt:3432
 #, no-wrap
 msgid "images/Planner_pSCR1_f20.jpg"
 msgstr "images/Planner_pSCR1_f20.jpg"
 
 #. type: Title ===
-#: user-manual.txt:3313
+#: user-manual.txt:3435
 #, no-wrap
 msgid "Planning CCR dives"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3317
+#: user-manual.txt:3439
 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:3321
+#: user-manual.txt:3443
 #, no-wrap
 msgid ""
 "*Available gases*: In the _Available gases_ table, enter the cylinder information for the\n"
@@ -6846,7 +6917,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3331
+#: user-manual.txt:3453
 #, no-wrap
 msgid ""
 "*Entering setpoints*: Specify a default setpoint in the Preferences tab, by selecting _File ->  Preferences ->  Graph_ from\n"
@@ -6861,32 +6932,32 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3333
+#: user-manual.txt:3455
 msgid ""
 "The dive profile for a CCR dive may look something like the image below."
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:3334
+#: user-manual.txt:3456
 #, no-wrap
 msgid "images/Planner_CCR1_f20.jpg"
 msgstr "images/Planner_CCR1_f20.jpg"
 
 #. type: Plain text
-#: user-manual.txt:3338
+#: user-manual.txt:3460
 msgid ""
 "Note that, in the _Dive plan details_, the gas consumption for a CCR segment "
 "is not calculated, so gas consumptions of 0 liters are the norm."
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:3340
+#: user-manual.txt:3462
 #, no-wrap
 msgid "Modifying an existing dive plan"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3347
+#: user-manual.txt:3469
 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 no way to "
@@ -6897,7 +6968,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3353
+#: user-manual.txt:3475
 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 "
@@ -6907,13 +6978,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:3354
+#: user-manual.txt:3476
 #, no-wrap
 msgid "Planning for repetitive dives"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3361
+#: user-manual.txt:3483
 msgid ""
 "Repetitive dives can easily be planned if the dates and start times of the "
 "repetitive dive set are specified appropriately in the top left-hand _Start "
@@ -6922,7 +6993,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3367
+#: user-manual.txt:3489
 msgid ""
 "If you have just completed a long/deep dive and are planning another dive, "
 "then highlight, in the *Dive List*, the dive that has just been done then "
@@ -6932,7 +7003,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3372
+#: user-manual.txt:3494
 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 you "
@@ -6942,13 +7013,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:3373
+#: user-manual.txt:3495
 #, no-wrap
 msgid "Printing the dive plan"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3378
+#: user-manual.txt:3500
 msgid ""
 "Selecting the _Print_ button in the planner allows printing of the _Dive "
 "Plan Details_ for wet notes. You can also cut and paste the _Dive Plan "
@@ -6956,7 +7027,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3388
+#: user-manual.txt:3510
 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 "
@@ -6972,13 +7043,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ==
-#: user-manual.txt:3389
+#: user-manual.txt:3511
 #, 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:3394
+#: user-manual.txt:3516
 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 "
@@ -6989,13 +7060,13 @@ msgstr ""
 "des sections de ce manuel traitant des opérations relatives."
 
 #. type: Title ===
-#: user-manual.txt:3395
+#: user-manual.txt:3517
 #, no-wrap
 msgid "File"
 msgstr "Fichier"
 
 #. type: Plain text
-#: user-manual.txt:3398
+#: user-manual.txt:3520
 msgid ""
 "<<S_NewLogbook,_New Logbook_>> - Close the currently open dive logbook and "
 "clear all dive information."
@@ -7004,54 +7075,45 @@ msgstr ""
 "actuellement ouvert et supprime toutes les informations de plongées."
 
 #. type: Plain text
-#: user-manual.txt:3400
-#, fuzzy
-#| msgid ""
-#| "_Open logbook_ - This opens the file manager in order to select a dive "
-#| "logbook to open."
+#: user-manual.txt:3522
 msgid ""
 "_Open logbook_ - Open the file manager to select a dive logbook to open."
 msgstr ""
-"_Ouvrir un carnet de plongée_ - Cela ouvre une fenêtre pour sélectionner le "
+"_Ouvrir un carnet de plongée_ - Ouvre une fenêtre pour sélectionner le "
 "carnet de plongée à ouvrir."
 
 #. type: Plain text
-#: user-manual.txt:3401
+#: user-manual.txt:3523
 msgid ""
 "_Open cloud storage_ - Open the dive log previously saved in "
 "<<S_Cloud_storage,_Cloud storage_>>."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3402
-#, fuzzy
-#| msgid "_Save_ - Save the dive logbook that is currently open."
+#: user-manual.txt:3524
 msgid "_Save_ - Save the dive logbook currently open."
-msgstr ""
-"_Sauvegarder_ - Enregistrer le carnet de plongée qui est actuellement ouvert."
+msgstr "_Sauvegarder_ - Enregistrer le carnet de plongée actuellement ouvert."
 
 #. type: Plain text
-#: user-manual.txt:3403
+#: user-manual.txt:3525
 msgid ""
 "_Save to cloud storage_ - Save the current dive log to <<S_Cloud_storage,"
 "_Cloud storage_>>."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3404
+#: user-manual.txt:3526
 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:3405
-#, fuzzy
-#| msgid "_Close_ - Close the dive logbook that is currently open."
+#: user-manual.txt:3527
 msgid "_Close_ - Close the dive logbook currently open."
 msgstr "_Fermer_ - Fermer le carnet de plongée actuellement ouvert."
 
 #. type: Plain text
-#: user-manual.txt:3407
+#: user-manual.txt:3529
 msgid ""
 "<<S_ExportLog,_Export_>> - Export the currently open dive logbook (or the "
 "selected dives in the logbook) to one of several formats."
@@ -7061,34 +7123,34 @@ msgstr ""
 "formats."
 
 #. type: Plain text
-#: user-manual.txt:3408
+#: user-manual.txt:3530
 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:3409
+#: user-manual.txt:3531
 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:3410
+#: user-manual.txt:3532
 msgid ""
 "<<S_FindMovedImages, _Find moved images_>> - If photos taken during dives "
 "have been moved to"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3411
+#: user-manual.txt:3533
 msgid ""
 "a different disk or directory, locate them and link them to the appropriate "
 "dives."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3412
+#: user-manual.txt:3534
 msgid ""
 "<<S_Configure,_Configure dive computer_>> - Edit the configuration of a dive "
 "computer."
@@ -7097,18 +7159,18 @@ msgstr ""
 "configuration d'un ordinateur de plongée."
 
 #. type: Plain text
-#: user-manual.txt:3413
+#: user-manual.txt:3535
 msgid "_Quit_ - Quit _Subsurface_."
 msgstr "_Quitter_ - Quitter _Subsurface_."
 
 #. type: Title ===
-#: user-manual.txt:3414
+#: user-manual.txt:3536
 #, no-wrap
 msgid "Import"
 msgstr "Importer"
 
 #. type: Plain text
-#: user-manual.txt:3417
+#: user-manual.txt:3539
 msgid ""
 "<<S_ImportDiveComputer,_Import from dive computer_>> - Import dive "
 "information from a dive computer."
@@ -7117,7 +7179,7 @@ msgstr ""
 "Importer des informations de plongées à partir de l'ordinateur de plongée."
 
 #. type: Plain text
-#: user-manual.txt:3419
+#: user-manual.txt:3541
 msgid ""
 "<<Unified_import,_Import Log Files_>> - Import dive information from a file "
 "in in a _Subsurface_-compatible format."
@@ -7127,7 +7189,7 @@ msgstr ""
 "_Subsurface_."
 
 #. type: Plain text
-#: user-manual.txt:3421
+#: user-manual.txt:3543
 msgid ""
 "<<S_Companion,_Import GPS data from Subsurface web service_>> - Load GPS "
 "coordinates from the _Subsurface_ mobile phone app."
@@ -7137,7 +7199,7 @@ msgstr ""
 "(téléphones et tablettes)."
 
 #. type: Plain text
-#: user-manual.txt:3423
+#: user-manual.txt:3545
 msgid ""
 "<<S_ImportingDivelogsDe,_Import from Divelogs.de_>> - Import dive "
 "information from _www.Divelogs.de_."
@@ -7146,13 +7208,13 @@ msgstr ""
 "informations de plongées à partir de _www.Divelogs.de_."
 
 #. type: Title ===
-#: user-manual.txt:3424
+#: user-manual.txt:3546
 #, no-wrap
 msgid "Log"
 msgstr "Journal (log)"
 
 #. type: Plain text
-#: user-manual.txt:3426
+#: user-manual.txt:3548
 msgid ""
 "<<S_EnterData,_Add Dive_>> - Manually add a new dive to the *Dive List* "
 "panel."
@@ -7161,19 +7223,19 @@ msgstr ""
 "plongée au panneau de la *liste des plongées*."
 
 #. type: Plain text
-#: user-manual.txt:3427
+#: user-manual.txt:3549
 msgid ""
 "_Edit dive_ - Edit a dive where the profile was entered by hand and not from "
 "a dive computer."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3428
+#: user-manual.txt:3550
 msgid "<<S_DivePlanner,_Plan Dive_>> - Plan dives."
 msgstr "<<S_DivePlanner,_Planifier une plongée_>> - Planifier des plongées."
 
 #. type: Plain text
-#: user-manual.txt:3429
+#: user-manual.txt:3551
 msgid ""
 "<<S_Replan,_Edit dive in planner_>> - Edit a dive plan that has been saved "
 "into the *Dive List*."
@@ -7182,7 +7244,7 @@ msgstr ""
 "plongée planifiée qui a été enregistrée dans la *liste des plongées*."
 
 #. type: Plain text
-#: user-manual.txt:3431
+#: user-manual.txt:3553
 msgid ""
 "<<S_CopyComponents,_Copy dive components_>> - Copy information from several "
 "fields of a dive log onto the clipboard."
@@ -7192,7 +7254,7 @@ msgstr ""
 "papier."
 
 #. type: Plain text
-#: user-manual.txt:3433
+#: user-manual.txt:3555
 msgid ""
 "_Paste dive components_ - Paste, into the selected dives in the *Dive List*, "
 "the information copied using the _Copy dive components_ option."
@@ -7202,7 +7264,7 @@ msgstr ""
 "préalable avec l'option _Copier les composants de la plongée_."
 
 #. type: Plain text
-#: user-manual.txt:3435
+#: user-manual.txt:3557
 msgid ""
 "<<S_Renumber,_Renumber_>> - Renumber the dives listed in the *Dive List* "
 "panel."
@@ -7211,7 +7273,7 @@ msgstr ""
 "le panneau de la *liste des plongées*."
 
 #. type: Plain text
-#: user-manual.txt:3437
+#: user-manual.txt:3559
 msgid ""
 "<<S_Group,_Auto Group_>> - Group the dives in the *Dive List* panel into "
 "dive trips."
@@ -7220,7 +7282,7 @@ msgstr ""
 "*liste des plongées* dans des voyages de plongées."
 
 #. type: Plain text
-#: user-manual.txt:3438
+#: user-manual.txt:3560
 msgid ""
 "<<S_DeviceNames,_Edit Device Names_>> - Edit the names of dive computers to "
 "coordinate your logs."
@@ -7229,7 +7291,7 @@ msgstr ""
 "les noms des ordinateurs de plongée pour coordonner vos journaux (logs)."
 
 #. type: Plain text
-#: user-manual.txt:3439
+#: user-manual.txt:3561
 msgid ""
 "<<S_Filter,_Filter divelist_>> - Select only some dives, based on specific "
 "tags or dive criteria."
@@ -7238,13 +7300,13 @@ msgstr ""
 "certaines plongées, à partir de tags ou de critères de plongées."
 
 #. type: Title ===
-#: user-manual.txt:3440
+#: user-manual.txt:3562
 #, no-wrap
 msgid "View"
 msgstr "Vue"
 
 #. type: Plain text
-#: user-manual.txt:3443
+#: user-manual.txt:3565
 msgid ""
 "<<S_ViewPanels,_All_>> - View the four main _Subsurface_ panels all at once."
 msgstr ""
@@ -7252,33 +7314,33 @@ msgstr ""
 "_Subsurface_ simultanément."
 
 #. type: Plain text
-#: user-manual.txt:3444
+#: user-manual.txt:3566
 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:3445
+#: user-manual.txt:3567
 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:3446
+#: user-manual.txt:3568
 msgid "<<S_ViewPanels,_Info_>> - View only the *Notes* panel."
 msgstr "<<S_ViewPanels,_Info_>> - Affiche uniquement le panneau des *notes*."
 
 #. type: Plain text
-#: user-manual.txt:3447
+#: user-manual.txt:3569
 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:3449
+#: user-manual.txt:3571
 msgid ""
 "_Yearly Statistics_ - Display summary statistics about dives during this and "
 "past years."
@@ -7287,30 +7349,30 @@ msgstr ""
 "plongées effectuées."
 
 #. type: Plain text
-#: user-manual.txt:3450
+#: user-manual.txt:3572
 msgid ""
 "_Prev DC_ - Switch to data from previous dive computer, if a single dive was "
 "logged from more than one."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3451
+#: user-manual.txt:3573
 msgid "_Next DC_ - Switch to next dive computer."
 msgstr "_Ordinateur suivant_  - Passer à l'ordinateur de plongée suivant."
 
 #. type: Plain text
-#: user-manual.txt:3452
+#: user-manual.txt:3574
 msgid "_Full Screen_ - Toggles Full Screen mode."
 msgstr "_Plein écran_  - Passer en mode plein écran."
 
 #. type: Title ===
-#: user-manual.txt:3453
+#: user-manual.txt:3575
 #, no-wrap
 msgid "Share on"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3455
+#: user-manual.txt:3577
 msgid ""
 "<<S_Facebook,_Facebook_>> - Share the currently selected dive on your "
 "Facebook timeline."
@@ -7319,13 +7381,13 @@ msgstr ""
 "Facebook."
 
 #. type: Title ===
-#: user-manual.txt:3457
+#: user-manual.txt:3579
 #, no-wrap
 msgid "Help"
 msgstr "Aide"
 
 #. type: Plain text
-#: user-manual.txt:3460
+#: user-manual.txt:3582
 msgid ""
 "_About Subsurface_ - Show a panel with the version number of _Subsurface_ as "
 "well as licensing information."
@@ -7334,7 +7396,7 @@ msgstr ""
 "_Subsurface_ ainsi que les informations de licence."
 
 #. type: Plain text
-#: user-manual.txt:3462
+#: user-manual.txt:3584
 msgid ""
 "_Check for updates_ - Find out whether a newer version of Subsurface is "
 "available on the http://subsurface-divelog.org/[_Subsurface_ web site]."
@@ -7344,7 +7406,7 @@ msgstr ""
 "_Subsurface_ ]."
 
 #. type: Plain text
-#: user-manual.txt:3464
+#: user-manual.txt:3586
 msgid ""
 "<<S_UserSurvey,_User survey_>> - Help to make _Subsurface_ even better by "
 "taking part in our user survey or by completing another survey if your "
@@ -7355,36 +7417,31 @@ msgstr ""
 "sondage, si vos habitudes de plongées ont changées."
 
 #. type: Plain text
-#: user-manual.txt:3465
+#: user-manual.txt:3587
 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:3468
+#: user-manual.txt:3590
 #, no-wrap
 msgid "APPENDIX A: Operating system specific information for importing dive information from a dive computer."
 msgstr "ANNEXE A : informations spécifiques au système d'exploitation utilisé pour importer les informations de plongées depuis un ordinateur de plongée."
 
 #. type: Title ===
-#: user-manual.txt:3470
+#: user-manual.txt:3592
 #, no-wrap
 msgid "Make sure that the OS has the required drivers installed"
 msgstr "Assurez-vous que les pilotes (drivers) nécessaires sont installés"
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:3471
+#: user-manual.txt:3593
 #, no-wrap
 msgid "images/icons/drivers.jpg"
 msgstr "images/icons/drivers.jpg"
 
 #. type: Plain text
-#: user-manual.txt:3476
-#, fuzzy
-#| 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 computer prefers (e.g. Bluetooth, USB, infra-red)."
+#: user-manual.txt:3598
 msgid ""
 "The operating system of the desktop computer needs the appropriate drivers "
 "in order to communicate with the dive computer, the way the dive computer "
@@ -7395,7 +7452,7 @@ msgstr ""
 "l'ordinateur de plongée (Bluetooth, USB, infra-rouge)."
 
 #. type: Plain text
-#: user-manual.txt:3482
+#: user-manual.txt:3604
 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 "
@@ -7409,7 +7466,7 @@ msgstr ""
 "particulièrement pour certaines technologies telles que l'infra-rouge."
 
 #. type: Plain text
-#: user-manual.txt:3486
+#: user-manual.txt:3608
 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 "
@@ -7420,7 +7477,7 @@ msgstr ""
 "port USB de son ordinateur de bureau."
 
 #. type: Plain text
-#: user-manual.txt:3493
+#: user-manual.txt:3615
 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 "
@@ -7438,27 +7495,19 @@ msgstr ""
 "documents et logiciels Silicon Labs]."
 
 #. type: Title ===
-#: user-manual.txt:3495
+#: user-manual.txt:3617
 #, no-wrap
 msgid "How to Find the Device Name for USB devices and set its write permission"
 msgstr "Comment trouver le nom du périphérique branché sur USB et paramétrer les permissions en écriture"
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:3496
+#: user-manual.txt:3618
 #, no-wrap
 msgid "images/icons/usb.jpg"
 msgstr "images/icons/usb.jpg"
 
 #. type: Plain text
-#: user-manual.txt:3504
-#, fuzzy
-#| 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 device name (or mount point for the Uemis Zurich), or it will "
-#| "disable the device select drop down if no device name is needed at all. "
-#| "In the rare cases where this doesn't work, here are some suggestions of "
-#| "ways to find out what the device name is:"
+#: user-manual.txt:3626
 msgid ""
 "When connecting a dive computer by using a USB connector, usually "
 "_Subsurface_ will either propose a drop down list with the correct device "
@@ -7466,15 +7515,15 @@ msgid ""
 "select drop down if no device name is needed at all. In the rare cases where "
 "this doesn't work, here are some ways to find out what the device name is:"
 msgstr ""
-"Lorsqu'un utilisateur connecte un ordinateur de plongée en utilisant l'USB, "
-"généralement _Subsurface_ proposera soit une liste déroulante contenant le "
-"bon nom (ou le point de montage pour un Uemis Zurich) ou la liste sera "
+"Lors de la connexion d'un ordinateur de plongée en utilisant l'USB, "
+"_Subsurface_ proposera généralement soit une liste déroulante avec le bon "
+"nom (ou le point de montage pour un Uemis Zurich) ou la liste sera "
 "désactivée si aucun nom de périphérique n'est nécessaire. Dans les rares cas "
-"où cela ne fonctionnerait pas, voici quelques suggestions pour trouver le "
-"nom de votre périphérique ;"
+"où cela ne fonctionnerait pas, voici quelques méthodes pour trouver le nom "
+"de votre périphérique ;"
 
 #. type: Plain text
-#: user-manual.txt:3509
+#: user-manual.txt:3631
 msgid ""
 "Simply try COM1, COM2, etc. The drop down list should contain all connected "
 "COM devices."
@@ -7483,56 +7532,56 @@ msgstr ""
 "tous les périphériques COM connectés."
 
 #. type: Title ====
-#: user-manual.txt:3510 user-manual.txt:3608
+#: user-manual.txt:3632 user-manual.txt:3730
 #, no-wrap
 msgid "On MacOS:"
 msgstr "Sur MacOS :"
 
 #. type: Plain text
-#: user-manual.txt:3513
+#: user-manual.txt:3635
 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:3514
+#: user-manual.txt:3636
 #, no-wrap
 msgid "On Linux:"
 msgstr "Sur Linux :"
 
 #. type: Plain text
-#: user-manual.txt:3517
+#: user-manual.txt:3639
 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:3519
+#: user-manual.txt:3641
 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:3520
+#: user-manual.txt:3642
 msgid "Open a terminal"
 msgstr "Ouvrir un terminal"
 
 #. type: Plain text
-#: user-manual.txt:3521 user-manual.txt:3523
+#: user-manual.txt:3643 user-manual.txt:3645
 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:3522
+#: user-manual.txt:3644
 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:3525
+#: user-manual.txt:3647
 msgid "A message similar to this one should appear:"
 msgstr "Un message similaire à celui-ci devrait apparaitre :"
 
 #. type: Plain text
-#: user-manual.txt:3541
+#: user-manual.txt:3663
 #, no-wrap
 msgid ""
 "\tusb 2-1.1: new full speed USB device number 14 using ehci_hcd\n"
@@ -7568,7 +7617,7 @@ msgstr ""
 "\tftdi_sio: v1.6.0:USB FTDI Serial Converters Driver\n"
 
 #. type: Plain text
-#: user-manual.txt:3546
+#: user-manual.txt:3668
 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 "
@@ -7580,22 +7629,14 @@ msgstr ""
 "que Subsurface utilise le bon port USB."
 
 #. type: Plain text
-#: user-manual.txt:3548
-#, fuzzy
-#| msgid "Ensuring that the user has write permission to the USB serial port:"
+#: user-manual.txt:3670
 msgid "Ensuring the user has write permission to the USB serial port:"
 msgstr ""
 "S'assurer que l'utilisateur possède les droits d'écriture sur le port série "
 "USB :"
 
 #. type: Plain text
-#: user-manual.txt:3558
-#, fuzzy
-#| 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 member of that group and will not be able to use the USB port. "
-#| "Let us assume one's username is 'johnB'."
+#: user-manual.txt:3680
 msgid ""
 "On Unix-like operating systems the USB ports can only be accessed by users "
 "who are members special group that can be e.g.  +dialout+ or +uucp+. This "
@@ -7606,12 +7647,16 @@ msgid ""
 "the USB port. Let us assume one's username is 'johnB'."
 msgstr ""
 "Sur les systèmes similaires à Unix, les ports USB ne peuvent être accédés "
-"que par des utilisateurs membres du groupe +dialout+. Si vous n'êtes pas "
-"root, vous n'êtes peut-être pas membre de ce groupe et ne pouvez donc pas "
-"utiliser le port USB. Si votre nom d'utilisateur est 'johnB' :"
+"que par des utilisateurs membres d'un groupe spécial qui peut être +dialout+ "
+"ou +uucp+. Cela peut être vérifié en listant les permissions associées au "
+"périphérique, par exemple via +ls - l /dev/ttyUSB0+. Notez que le numéro "
+"dans le nom de fichier dépend du nombre de périphériques USB que vous avez "
+"branchés et peut être ajusté au besoin.Si vous n'êtes pas root, vous n'êtes "
+"peut-être pas membre de ce groupe et ne pouvez donc pas utiliser le port "
+"USB. Admettons que votre nom d'utilisateur est 'johnB'."
 
 #. type: Plain text
-#: user-manual.txt:3562
+#: user-manual.txt:3684
 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."
@@ -7621,7 +7666,7 @@ msgstr ""
 "+dialout+."
 
 #. type: Plain text
-#: user-manual.txt:3567
+#: user-manual.txt:3689
 #, no-wrap
 msgid ""
 "Type: +id johnB+     This lists all the groups that johnB belongs to and\n"
@@ -7637,7 +7682,7 @@ msgstr ""
 "parmi les différents IDs.\n"
 
 #. type: Plain text
-#: user-manual.txt:3569
+#: user-manual.txt:3691
 #, no-wrap
 msgid ""
 "Under some circumstances this change takes only effect (eg. on Ubuntu) after\n"
@@ -7647,7 +7692,7 @@ msgstr ""
 "puis reconnexion sur l'ordinateur (sous Ubuntu, par exemple).\n"
 
 #. type: Plain text
-#: user-manual.txt:3574
+#: user-manual.txt:3696
 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 "
@@ -7658,13 +7703,13 @@ msgstr ""
 "vous devriez pouvoir importer vos plongées."
 
 #. type: Title ===
-#: user-manual.txt:3577
+#: user-manual.txt:3699
 #, no-wrap
 msgid "Manually setting up Bluetooth enabled devices"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3584
+#: user-manual.txt:3706
 msgid ""
 "For dive computers communicating through Bluetooth like the Heinrichs "
 "Weikamp Frog or the Shearwater Predator, Petrel and Nerd there is a "
@@ -7673,13 +7718,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3586
+#: user-manual.txt:3708
 #, no-wrap
 msgid "*For the dive computer, after enabling Bluetooth, be sure it is in Upload mode.*\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3590
+#: user-manual.txt:3712
 msgid ""
 "For Bluetooth pairing of the dive computer, refer to the manufacturer's user "
 "guide. When using a Shearwater Predator/Petrel/Nerd, select _Dive Log -> "
@@ -7687,13 +7732,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3592
+#: user-manual.txt:3714
 #, no-wrap
 msgid "*Pair the _Subsurface_ computer with the dive computer.*\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3601
+#: user-manual.txt:3723
 msgid ""
 "Bluetooth is most likely already enabled. For pairing with the dive computer "
 "choose _Control Panel -> Bluetooth Devices -> Add Wireless Device_.  This "
@@ -7705,21 +7750,21 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3604
+#: user-manual.txt:3726
 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:3607
+#: user-manual.txt:3729
 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:3614
+#: user-manual.txt:3736
 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. "
@@ -7728,20 +7773,20 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3617
+#: user-manual.txt:3739
 msgid ""
 "Once the pairing is complete, the correct device is shown in the 'Device or "
 "Mount Point' drop-down in the _Subsurface_ *Import* dialog."
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:3618
+#: user-manual.txt:3740
 #, no-wrap
 msgid "On Linux"
 msgstr "Sur Linux"
 
 #. type: Plain text
-#: user-manual.txt:3626
+#: user-manual.txt:3748
 msgid ""
 "Be sure Bluetooth is enabled on the _Subsurface_ computer.  On most common "
 "distributions this should be true out of the box and pairing should be "
@@ -7753,7 +7798,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3630
+#: user-manual.txt:3752
 msgid ""
 "Setting up a connection to download dives from your Bluetooth-enabled "
 "device, such as the _Shearwater Petrel_, is not yet an automated process and "
@@ -7762,23 +7807,23 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3632
+#: user-manual.txt:3754
 msgid "Enable the Bluetooth controller and pair your dive computer"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3633
+#: user-manual.txt:3755
 msgid "Establish an RFCOMM connection"
 msgstr ""
 
 #. type: Title =====
-#: user-manual.txt:3634 user-manual.txt:3774
+#: user-manual.txt:3756 user-manual.txt:3896
 #, no-wrap
 msgid "Download the dives with Subsurface"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3640
+#: user-manual.txt:3762
 msgid ""
 "Ensure the dive computer is in upload mode. On the _Shearwater Petrel_, "
 "_Petrel 2_ and _Nerd_ cycle through the menu, select 'Dive Log', then "
@@ -7789,7 +7834,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3645
+#: user-manual.txt:3767
 msgid ""
 "To establish the connection, establish root access through +sudo+ or +su+.  "
 "The correct permission is required to download the dives in the computer. On "
@@ -7799,23 +7844,23 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3647
+#: user-manual.txt:3769
 msgid "+sudo usermod -a -G dialout username+"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3649
+#: user-manual.txt:3771
 msgid "Then log out and log in for the change to take effect."
 msgstr ""
 
 #. type: Title =====
-#: user-manual.txt:3650
+#: user-manual.txt:3772
 #, no-wrap
 msgid "Enabling the Bluetooth controller and pairing your dive computer"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3656
+#: user-manual.txt:3778
 msgid ""
 "Attempt to set up the Bluetooth controller and pair your dive computer using "
 "the graphical environment of the operating system. After setting the dive "
@@ -7826,14 +7871,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3659
+#: user-manual.txt:3781
 msgid ""
 "If the graphical method doesn't work, pair the device from the command line. "
 "Open a terminal and use +hciconfig+ to check the Bluetooth controller status"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3666
+#: user-manual.txt:3788
 #, no-wrap
 msgid ""
 "\t$ hciconfig\n"
@@ -7845,7 +7890,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3671
+#: user-manual.txt:3793
 msgid ""
 "This indicates a Bluetooth controller with MAC address 01:23:45:67:89:AB, "
 "connected as hci0.  Its status is 'DOWN', i.e. not powered.  Additional "
@@ -7855,7 +7900,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3679
+#: user-manual.txt:3801
 #, no-wrap
 msgid ""
 "\tsudo hciconfig hci0 up auth+  (enter password when prompted)\n"
@@ -7868,25 +7913,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3681
+#: user-manual.txt:3803
 msgid "Check that the status now includes +'UP', 'RUNNING' AND 'AUTH'+."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3683
+#: user-manual.txt:3805
 msgid ""
 "If there are multiple controllers running, it's easiest to off the unused "
 "controller(s). For example, for +hci1+:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3685
+#: user-manual.txt:3807
 #, no-wrap
 msgid "\tsudo hciconfig hci1 down\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3688
+#: user-manual.txt:3810
 msgid ""
 "Next step is to 'trust' and 'pair' the dive computer. On distros with Bluez "
 "5, such as Fedora 22, one can use a tool called +blutootctl+, which will "
@@ -7894,7 +7939,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3709
+#: user-manual.txt:3831
 #, no-wrap
 msgid ""
 "\tbluetoothctl\n"
@@ -7920,14 +7965,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3712
+#: user-manual.txt:3834
 msgid ""
 "If asked for a password, enter 0000. It's ok if the last line says "
 "'Connected: no'. The important part is the line above, +Pairing successful+."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3715
+#: user-manual.txt:3837
 msgid ""
 "If the system has Bluez version 4 (e.g. Ubuntu 12.04 through to 15.04), "
 "there is probably not a +bluetoothctl+, but a script called +bluez-simple-"
@@ -7935,7 +7980,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3720
+#: user-manual.txt:3842
 #, no-wrap
 msgid ""
 "\thcitool -i hci0 scanning\n"
@@ -7945,94 +7990,94 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3722
+#: user-manual.txt:3844
 msgid "Once ther dive computer is pired, set up the RFCOMM connection"
 msgstr ""
 
 #. type: Title =====
-#: user-manual.txt:3723
+#: user-manual.txt:3845
 #, no-wrap
 msgid "Establishing the RFCOMM connection"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3726
+#: user-manual.txt:3848
 msgid "The command to establish an RFCOMM connection is:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3728
+#: user-manual.txt:3850
 msgid "+sudo rfcomm -i <controller> connect <dev> <bdaddr> [channel]+"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3730
+#: user-manual.txt:3852
 msgid "+<controller>+ is the Bluetooth controller, +hci0+."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3731
+#: user-manual.txt:3853
 msgid "+<dev>+ is the RFCOMM device file, +rfcomm0+"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3732
+#: user-manual.txt:3854
 msgid "+<bdaddr>+ is the dive computer's MAC address, +00:11:22:33:44:55+"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3733
+#: user-manual.txt:3855
 msgid ""
 "+[channel]+ is the dive computer's Bluetooth channel we need to connect to."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3736
+#: user-manual.txt:3858
 msgid ""
 "If one omits it, channel 1 is assumed.  Based on a limited number of user "
 "reports, the appropriate channel for the dive computer is probably:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3738
+#: user-manual.txt:3860
 msgid "_Shearwater Petrel 1_: channel 1"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3739
+#: user-manual.txt:3861
 msgid "_Shearwater Petrel 2_: channel 5"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3740
+#: user-manual.txt:3862
 msgid "_Shearwater Nerd_: channel 5"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3741
+#: user-manual.txt:3863
 msgid "_Heinrichs-Weikamp OSTC Sport_: channel 1"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3743
+#: user-manual.txt:3865
 msgid ""
 "E.g. to connect a _Shearwater Petrel 2_, set the dive computer to upload "
 "mode and enter:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3745
+#: user-manual.txt:3867
 #, no-wrap
 msgid "\tsudo rfcomm -i hci0 connect rfcomm0 00:11:22:33:44:55 5 (enter a password, probably 0000, when prompted)\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3747
+#: user-manual.txt:3869
 msgid "This gives the response:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3750
+#: user-manual.txt:3872
 #, no-wrap
 msgid ""
 "\tConnected /dev/rfcomm0 to 00:11:22:33:44:55 on channel 5\n"
@@ -8040,14 +8085,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3752
+#: user-manual.txt:3874
 msgid ""
 "To connect a _Shearwater Petrel 1+ or + HW OSTC Sport+, set the dive "
 "computer to upload mode and enter:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3756
+#: user-manual.txt:3878
 #, no-wrap
 msgid ""
 "\tsudo rfcomm -i hci0 connect rfcomm0 00:11:22:33:44:55   (enter a password, probably 0000, when prompted)\n"
@@ -8056,7 +8101,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3760
+#: user-manual.txt:3882
 msgid ""
 "If the specific channel the dive computer needs is not known, or the channel "
 "in the list above doesn't work, the command +sdptool records+ should help "
@@ -8065,7 +8110,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3770
+#: user-manual.txt:3892
 #, no-wrap
 msgid ""
 "\tsdptool -i hci0 records 00:11:22:33:44:55\n"
@@ -8080,7 +8125,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3773
+#: user-manual.txt:3895
 msgid ""
 "For a Bluetooth dive computer not in the list above, or if the channel "
 "listed is not correct, please let the Subsurface developers know on the user "
@@ -8088,7 +8133,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3776
+#: user-manual.txt:3898
 msgid ""
 "After establishing the RFCOMM connection and while the dive computer's "
 "upload mode countdown is still running, go to_Subsurface_, select _Import-"
@@ -8098,25 +8143,25 @@ msgid ""
 msgstr ""
 
 #. type: Title ==
-#: user-manual.txt:3782
+#: user-manual.txt:3904
 #, no-wrap
 msgid "APPENDIX B: Dive Computer specific information for importing dive data."
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:3785
+#: user-manual.txt:3907
 #, no-wrap
 msgid "Importing from Uemis Zurich"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:3787
+#: user-manual.txt:3909
 #, no-wrap
 msgid "images/icons/iumis.jpg"
 msgstr "images/icons/iumis.jpg"
 
 #. type: Plain text
-#: user-manual.txt:3803
+#: user-manual.txt:3925
 msgid ""
 "_Subsurface_ downloads the information stored on the SDA (the built-in file "
 "system of the Uemis) including information about dive spots and equipment. "
@@ -8132,7 +8177,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3818
+#: user-manual.txt:3940
 msgid ""
 "After selecting the above device name, download the dives from the Uemis "
 "Zurich. One technical issue with the Uemis Zurich download implementation "
@@ -8149,19 +8194,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:3820
+#: user-manual.txt:3942
 #, no-wrap
 msgid "Importing from Uwatec Galileo"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:3822
+#: user-manual.txt:3944
 #, no-wrap
 msgid "images/icons/Galileo.jpg"
 msgstr "images/icons/Galileo.jpg"
 
 #. type: Plain text
-#: user-manual.txt:3837
+#: user-manual.txt:3959
 msgid ""
 "The Uwatec Galileo dive computers use infra red (IrDA) communication between "
 "the dive computer and Subsurface. The Uwatec hardware uses a USB dongle "
@@ -8177,14 +8222,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3840
+#: user-manual.txt:3962
 msgid ""
 "After executing this command, Subsurface will recognize the Galileo dive "
 "computer and download dive information."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3846
+#: user-manual.txt:3968
 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/"
@@ -8194,26 +8239,26 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3849
+#: user-manual.txt:3971
 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:3851
+#: user-manual.txt:3973
 #, no-wrap
 msgid "Importing from Heinrichs Weikamp DR5"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:3853
+#: user-manual.txt:3975
 #, no-wrap
 msgid "images/icons/HW_DR5.jpg"
 msgstr "images/icons/HW_DR5.jpg"
 
 #. type: Plain text
-#: user-manual.txt:3863
+#: user-manual.txt:3985
 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.  "
@@ -8226,19 +8271,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:3866
+#: user-manual.txt:3988
 #, no-wrap
 msgid "Importing from xDEEP BLACK"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:3868
+#: user-manual.txt:3990
 #, no-wrap
 msgid "images/icons/HW_xdeepblack.jpg"
 msgstr "images/icons/HW_xdeepblack.jpg"
 
 #. type: Plain text
-#: user-manual.txt:3877
+#: user-manual.txt:3999
 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 "
@@ -8252,19 +8297,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:3879
+#: user-manual.txt:4001
 #, no-wrap
 msgid "Importing from Shearwater Predator/Petrel/Nerd using Bluetooth"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:3881
+#: user-manual.txt:4003
 #, no-wrap
 msgid "images/icons/predator.jpg"
 msgstr "images/icons/predator.jpg"
 
 #. type: Plain text
-#: user-manual.txt:3884
+#: user-manual.txt:4006
 msgid ""
 "Specific instructions for downloading dives using Bluetooth are given in the "
 "section above, <<S_Bluetooth,_Connecting Subsurface to a Bluetooth-enabled "
@@ -8272,19 +8317,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:3886
+#: user-manual.txt:4008
 #, no-wrap
 msgid "Importing from Poseidon MkVI Discovery"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:3888
+#: user-manual.txt:4010
 #, no-wrap
 msgid "images/MkVI.jpeg"
 msgstr "images/MkVI.jpeg"
 
 #. type: Plain text
-#: user-manual.txt:3896
+#: user-manual.txt:4018
 msgid ""
 "Download of dive logs from the MkVI is performed using a custom "
 "communications adapter and the _Poseidon PC Configuration Software_, "
@@ -8296,45 +8341,45 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3899
+#: user-manual.txt:4021
 msgid ""
 "Setup configuration for the dive and key dive parameters (file with a .txt "
 "extension)"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3900
+#: user-manual.txt:4022
 msgid "Dive log details (file with a .csv extension)"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3902
+#: user-manual.txt:4024
 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:3904
+#: user-manual.txt:4026
 msgid ""
 "_Subsurface_ accesses the .txt and the .csv files to get dive log "
 "information."
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:3906
+#: user-manual.txt:4028
 #, no-wrap
 msgid "Importing from APD Inspiration/Evolution CCR"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:3908
+#: user-manual.txt:4030
 #, no-wrap
 msgid "images/APDComputer.jpg"
 msgstr "images/APDComputer.jpg"
 
 #. type: Plain text
-#: user-manual.txt:3916
+#: user-manual.txt:4038
 msgid ""
 "The dive logs of an APD Inspiration or similar CCR dive computer are "
 "downloaded using a communications adapter and _AP Communicator_, obtained "
@@ -8346,55 +8391,55 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3918
+#: user-manual.txt:4040
 msgid "Download the dive using _AP Communicator_."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3919
+#: user-manual.txt:4041
 msgid "Open a dive within the _AP Log Viewer_."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3920
+#: user-manual.txt:4042
 msgid "Select the tab at the top of the screen, entitled \"_Data_\"."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3921
+#: user-manual.txt:4043
 msgid ""
 "With the raw dive log data show on the screen, click on \"_Copy to Clipboard_"
 "\"."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3922
+#: user-manual.txt:4044
 msgid "Open a text editor, e.g. Notepad (Windows) or TextWrangler (Mac)."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3924
+#: user-manual.txt:4046
 msgid ""
 "Copy the contents of the clipboard into the text editor and save the text "
 "file with a filename extension of _.apd_"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3925
+#: user-manual.txt:4047
 msgid ""
 "Within _Subsurface_, select _Import -> Import log files_ to open the xref:"
 "Unified_import[universal import dialogue]."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3926
+#: user-manual.txt:4048
 msgid ""
 "In the dropdown list towards the bottom right of the dialogue (labeled "
 "'Filter:'), select \"APD log viewer\"."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3930
+#: user-manual.txt:4052
 #, no-wrap
 msgid ""
 "On the list of file names select the _.apd_ file  created. An import\n"
@@ -8404,13 +8449,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:3931
+#: user-manual.txt:4053
 #, no-wrap
 msgid "images/APD_CSVimportF22.jpg"
 msgstr "images/APD_CSVimportF22.jpg"
 
 #. type: Plain text
-#: user-manual.txt:3939
+#: user-manual.txt:4061
 msgid ""
 "The top left hand dropdown box in the import panel lets you select the APD "
 "dive computer for which the dive log needs to be imported. The default it is "
@@ -8422,12 +8467,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3940
+#: user-manual.txt:4062
 msgid "Click the _Ok_ button at the bottom of the import panel."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3945
+#: user-manual.txt:4067
 msgid ""
 "The APD dive log will appear within _Subsurface_. The dive computer- "
 "generated ceiling provided by the Inspiration can be viewed by selecting the "
@@ -8437,13 +8482,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ==
-#: user-manual.txt:3946
+#: user-manual.txt:4068
 #, no-wrap
 msgid "APPENDIX C: Exporting Dive log information from external dive log software."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3955
+#: user-manual.txt:4077
 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, "
@@ -8453,22 +8498,22 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3957
+#: user-manual.txt:4079
 msgid "Export the foreign dive log data to format that is accessible from"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3958
+#: user-manual.txt:4080
 msgid "_Subsurface_."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3959
+#: user-manual.txt:4081
 msgid "Import the accessible dive log data into _Subsurface_."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3963
+#: user-manual.txt:4085
 msgid ""
 "This appendix provides some information about approaches to export dive log "
 "data from foreign dive log software. The procedures below mostly apply to "
@@ -8476,19 +8521,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:3965
+#: user-manual.txt:4087
 #, no-wrap
 msgid "Exporting from *Suunto Divemanager (DM3, DM4 or DM5)*"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:3966
+#: user-manual.txt:4088
 #, no-wrap
 msgid "images/icons/suuntologo.jpg"
 msgstr "images/icons/suuntologo.jpg"
 
 #. type: Plain text
-#: user-manual.txt:3973
+#: user-manual.txt:4095
 msgid ""
 "DiveManager is a MS Windows application for Suunto dive computers.  "
 "Divemanager 3 (DM3) is an older version of the Suunto software. More recent "
@@ -8498,66 +8543,66 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3975
+#: user-manual.txt:4097
 #, no-wrap
 msgid "*Divemanager 3 (DM3):*\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3977
+#: user-manual.txt:4099
 msgid ""
 "Start 'Suunto Divemanager 3' and log in with the name containing the logs"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3978
+#: user-manual.txt:4100
 msgid "Do not start the import wizard to import dives from the dive computer."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3980
+#: user-manual.txt:4102
 msgid ""
 "In the navigation tree on the left side of the program-window, select the "
 "appropriate dives."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3981
+#: user-manual.txt:4103
 msgid ""
 "Within the list of dives, select the dives you would like to import later:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3982
+#: user-manual.txt:4104
 msgid "To select certain dives: hold 'ctrl' and click the dive"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3984
+#: user-manual.txt:4106
 msgid ""
 "To select all dives: Select the first dive, hold down shift and select the "
 "last dive"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3985
+#: user-manual.txt:4107
 msgid "With the dives marked, use the program menu _File -> Export_"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3986
+#: user-manual.txt:4108
 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:3987
+#: user-manual.txt:4109
 msgid "Click the browse button next to the field Export Path"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3989
+#: user-manual.txt:4111
 #, no-wrap
 msgid ""
 "** A file-manager like window pops up\n"
@@ -8565,13 +8610,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3990
+#: user-manual.txt:4112
 #, no-wrap
 msgid "Divelog.SDE file\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3992
+#: user-manual.txt:4114
 #, no-wrap
 msgid ""
 "** Optionally change the name of the file for saving\n"
@@ -8579,25 +8624,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3993
+#: user-manual.txt:4115
 #, no-wrap
 msgid "Back in the Export pop-up, press the button 'Export'\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3994
+#: user-manual.txt:4116
 #, no-wrap
 msgid "The dives are now exported to the file Divelog.SDE.\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3996
+#: user-manual.txt:4118
 #, no-wrap
 msgid "*Divemanager 4 (DM4) and Divemanager 5 (DM5):*\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4001
+#: user-manual.txt:4123
 msgid ""
 "DM4 and DM5 use identical mechanisms for exporting dive logs.  To export a "
 "divelog from Divemanager you need to locate the DM4/DM5 database where the "
@@ -8606,81 +8651,81 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4003
+#: user-manual.txt:4125
 msgid "Locating the Suunto DM4 (or DM5) database:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4005 user-manual.txt:4014
+#: user-manual.txt:4127 user-manual.txt:4136
 msgid "Start Suunto DM4/DM5"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4006
+#: user-manual.txt:4128
 msgid "Select 'Help -> About'"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4007
+#: user-manual.txt:4129
 msgid "Click 'Copy' after text 'Copy log folder path to clipboard'"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4008
+#: user-manual.txt:4130
 msgid "Open Windows Explorer"
 msgstr "Ouvrir l'explorateur Windows"
 
 #. type: Plain text
-#: user-manual.txt:4009
+#: user-manual.txt:4131
 msgid "Paste the address to the path box at the top of the File Explorer"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4010
+#: user-manual.txt:4132
 msgid "The database is called DM4.db or DM5.db"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4012
+#: user-manual.txt:4134
 msgid "Making a backup copy of the Suunto DM4/DM5 database:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4015
+#: user-manual.txt:4137
 msgid "Select 'File - Create backup'"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4017
+#: user-manual.txt:4139
 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:4018
+#: user-manual.txt:4140
 msgid "Click 'Save'"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4019
+#: user-manual.txt:4141
 msgid "The dives are now exported to the file DM4.bak (or DM5.bak)"
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:4021
+#: user-manual.txt:4143
 #, no-wrap
 msgid "Exporting from Atomic Logbook"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:4024
+#: user-manual.txt:4146
 #, no-wrap
 msgid "images/icons/atomiclogo.jpg"
 msgstr "images/icons/atomiclogo.jpg"
 
 #. type: Plain text
-#: user-manual.txt:4031
+#: user-manual.txt:4153
 msgid ""
 "Atomic Logbook is a Windows software by Atomic Aquatics. It allows "
 "downloading of dive information from Cobalt and Cobalt 2 dive computers.  "
@@ -8690,19 +8735,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:4033
+#: user-manual.txt:4155
 #, no-wrap
 msgid "Exporting from Mares Dive Organiser V2.1"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:4036
+#: user-manual.txt:4158
 #, no-wrap
 msgid "images/icons/mareslogo.jpg"
 msgstr "images/icons/mareslogo.jpg"
 
 #. type: Plain text
-#: user-manual.txt:4044
+#: user-manual.txt:4166
 msgid ""
 "Mares Dive Organizer is a Windows application. The dive log is kept as a "
 "Microsoft SQL Compact Edition database with a '.sdf' filename extension. The "
@@ -8713,7 +8758,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4049
+#: user-manual.txt:4171
 msgid ""
 "Within Dive Organizer, select _Database -> Backup_ from the main menu and "
 "back up the database to the desk top.  This creates a zipped file "
@@ -8721,36 +8766,36 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4052
+#: user-manual.txt:4174
 msgid ""
 "Rename the file to DiveOrganizerxxxxx.zip. Inside the zipped directory is a "
 "file _DiveOrganizer.sdf_."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4053
+#: user-manual.txt:4175
 msgid "Extract the _.sdf_ file from the zipped folder to your Desktop."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4054
+#: user-manual.txt:4176
 msgid "The password for accessing the .zip file is _mares_."
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:4056
+#: user-manual.txt:4178
 #, no-wrap
 msgid "Exporting from *DivingLog 5.0 and 6.0*"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:4058
+#: user-manual.txt:4180
 #, no-wrap
 msgid "images/icons/divingloglogo.jpg"
 msgstr "images/icons/divingloglogo.jpg"
 
 #. type: Plain text
-#: user-manual.txt:4065
+#: user-manual.txt:4187
 msgid ""
 "The best way to bring your logs from DivingLog to Subsurface is to convert "
 "the whole database. This is because other export formats do not include all "
@@ -8760,37 +8805,37 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4067
+#: user-manual.txt:4189
 msgid "To transfer all files from DivingLog to Subsurface:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4069
+#: user-manual.txt:4191
 msgid "In DivingLog open the 'File -> Export -> SQLite' menu"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4070
+#: user-manual.txt:4192
 msgid "Select 'Settings' button"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4071
+#: user-manual.txt:4193
 msgid "Set the 'RTF2Plaintext' to 'true'"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4072
+#: user-manual.txt:4194
 msgid "Close the Settings dialog"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4073
+#: user-manual.txt:4195
 msgid "Click 'Export' button and select the filename"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4077
+#: user-manual.txt:4199
 msgid ""
 "Once this is done, open the saved database file with Subsurface and the "
 "dives are automatically converted to Subsurface’s own format. Last step to "
@@ -8798,23 +8843,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ==
-#: user-manual.txt:4078
+#: user-manual.txt:4200
 #, no-wrap
 msgid "APPENDIX D: Exporting a spreadsheet to CSV format"
 msgstr "ANNEXE D : Exporter un tableur vers le format CSV"
 
 #. type: Plain text
-#: user-manual.txt:4088
-#, fuzzy
-#| 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_ 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 "
-#| "procedure is somewhat different according to which spreadsheet program is "
-#| "used."
+#: user-manual.txt:4210
 msgid ""
 "Many divers keep a dive log in some form of digital file, commonly a "
 "spreadsheet with various fields of information. These logs can be easily "
@@ -8830,19 +8865,11 @@ msgstr ""
 "tableur a été converti en fichier CSV. Cette section explique la procedure "
 "pour convertir un carnet de plongée enregistrée sous forme de tableur vers "
 "un fichier CSV qui pourra ensuite être importé dans _Subsurface_. Créer un "
-"fichier CSV est une tache simple malgré que la procédure soit différente "
-"selon le tableur utilisé."
+"fichier CSV est simple malgré que la procédure soit différente selon le "
+"tableur utilisé."
 
 #. type: Plain text
-#: user-manual.txt:4094
-#, fuzzy
-#| 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 "
-#| "information for each dive is stored in a single row.  _Subsurface_ "
-#| "supports many data items (Dive #, Date, Time, Duration, Location, GPS, "
-#| "Max Depth, Mean Depth, Buddy, Notes, Weight and Tags).  The user can "
-#| "organize dive data following a few simple rules:"
+#: user-manual.txt:4216
 msgid ""
 "Organize the diving data in the spreadsheet, so the first row contains the "
 "names (or titles) of each column and the information for each dive is stored "
@@ -8850,28 +8877,27 @@ msgid ""
 "Time, Duration, Location, GPS, Max Depth, Mean Depth, Buddy, Notes, Weight "
 "and Tags).  Organize dive data following a few simple rules:"
 msgstr ""
-"La première étape est d'organiser les données de plongées dans le tableur "
-"pour que la première ligne contienne le nom (ou le titre) de chaque colonne "
-"et que les informations de chaque plongée soient contenues sur une seule "
-"ligne. _Subsurface_ supporte de nombreux éléments (Dive #, Date, Time, "
-"Duration, Location, GPS, Max Depth, Mean Depth, Buddy, Notes, Weight et "
-"Tags). L'utilisateur peut organiser les données de plongées selon quelques "
-"règles simples :"
+"Organiser les données de plongées dans le tableur pour que la première ligne "
+"contienne le nom (ou le titre) de chaque colonne et que les informations de "
+"chaque plongée soient contenues sur une seule ligne. _Subsurface_ supporte "
+"de nombreux éléments (Dive #, Date, Time, Duration, Location, GPS, Max "
+"Depth, Mean Depth, Buddy, Notes, Weight et Tags).  Organiser les données de "
+"plongées selon quelques règles simples :"
 
 #. type: Plain text
-#: user-manual.txt:4096
+#: user-manual.txt:4218
 msgid ""
 "Date: use one of the following formats: yyyy-mm-dd, dd.mm.yyyy, mm/dd/yyyy"
 msgstr ""
 "Date : utiliser un des formats suivants : aaaa-mm-jj, jj.mm.aaaa, mm/jj/aaaa"
 
 #. type: Plain text
-#: user-manual.txt:4097
+#: user-manual.txt:4219
 msgid "Duration: the format should be minutes:seconds."
 msgstr "Durée : le format est minutes:secondes."
 
 #. type: Plain text
-#: user-manual.txt:4098
+#: user-manual.txt:4220
 msgid ""
 "Unit system: only one unit system should be used (no mix of imperial and "
 "metric units)"
@@ -8880,25 +8906,25 @@ msgstr ""
 "entre les unités impériales et métriques)"
 
 #. type: Plain text
-#: user-manual.txt:4099
+#: user-manual.txt:4221
 msgid "Tags and buddies: values should be separated using a comma."
 msgstr ""
 "Étiquettes et équipiers : les valeurs doivent être séparées par des virgules."
 
 #. type: Plain text
-#: user-manual.txt:4100
+#: user-manual.txt:4222
 msgid "GPS position: use decimal degrees, e.g. 30.22496 30.821798"
 msgstr ""
 "Position GPS : utilisez les degrés décimaux, par exemple : 30.22496 30.821798"
 
 #. type: Title ===
-#: user-manual.txt:4100
+#: user-manual.txt:4222
 #, no-wrap
 msgid "_LibreOffice Calc_ and _OpenOffice Calc_"
 msgstr "_LibreOffice Calc_ et _OpenOffice Calc_"
 
 #. type: Plain text
-#: user-manual.txt:4104
+#: user-manual.txt:4226
 msgid ""
 "These are open source spreadsheet applications forming parts of larger open "
 "source office suite applications. The user interaction with _LibreOffice_ "
@@ -8909,13 +8935,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:4105
+#: user-manual.txt:4227
 #, no-wrap
 msgid "images/LOffice_spreadsheetdata.jpg"
 msgstr "images/LOffice_spreadsheetdata.jpg"
 
 #. type: Plain text
-#: user-manual.txt:4108
+#: user-manual.txt:4230
 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 "
@@ -8923,13 +8949,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:4109
+#: user-manual.txt:4231
 #, no-wrap
 msgid "images/LOffice_save_as_options.jpg"
 msgstr "images/LOffice_save_as_options.jpg"
 
 #. type: Plain text
-#: user-manual.txt:4112
+#: user-manual.txt:4234
 msgid ""
 "After selecting _Save_, select the appropriate field delimiter (choose _Tab_ "
 "to prevent conflicts with the comma when using this as a decimal point), "
@@ -8937,13 +8963,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:4113
+#: user-manual.txt:4235
 #, no-wrap
 msgid "images/LOffice_field_options.jpg"
 msgstr "images/LOffice_field_options.jpg"
 
 #. type: Plain text
-#: user-manual.txt:4116
+#: user-manual.txt:4238
 msgid ""
 "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_ImportingCSVDives[Importing "
@@ -8951,13 +8977,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:4117
+#: user-manual.txt:4239
 #, no-wrap
 msgid "Microsoft _Excel_"
 msgstr "Microsoft _Excel_"
 
 #. type: Plain text
-#: user-manual.txt:4123
+#: user-manual.txt:4245
 msgid ""
 "The field delimiter (called \"_list separator_\" in Microsoft manuals) is "
 "not accessible from within _Excel_ and needs to be set through the "
@@ -8968,19 +8994,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4125
+#: user-manual.txt:4247
 msgid ""
 "In Microsoft Windows, click the *Start* button, then select _Control Panel_ "
 "from the list on the right-hand side."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4126
+#: user-manual.txt:4248
 msgid "Open the _Regional and Language Options_ dialog box."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4129
+#: user-manual.txt:4251
 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 "
@@ -8988,48 +9014,48 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4130
+#: user-manual.txt:4252
 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:4131
+#: user-manual.txt:4253
 msgid "Click _OK_ twice."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4133
+#: user-manual.txt:4255
 msgid "Below is an image of the _Control Panel_:"
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:4134
+#: user-manual.txt:4256
 #, no-wrap
 msgid "images/Win_SaveCSV2.jpg"
 msgstr "images/Win_SaveCSV2.jpg"
 
 #. type: Plain text
-#: user-manual.txt:4137
+#: user-manual.txt:4259
 msgid "To export the dive log in CSV format:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4139
+#: user-manual.txt:4261
 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:4140
+#: user-manual.txt:4262
 #, no-wrap
 msgid "images/Win_SaveCSV1.jpg"
 msgstr "images/Win_SaveCSV1.jpg"
 
 #. type: Plain text
-#: user-manual.txt:4146
+#: user-manual.txt:4268
 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 "
@@ -9039,13 +9065,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:4147
+#: user-manual.txt:4269
 #, no-wrap
 msgid "images/Win_SaveCSV3.jpg"
 msgstr "images/Win_SaveCSV3.jpg"
 
 #. type: Plain text
-#: user-manual.txt:4153
+#: user-manual.txt:4275
 msgid ""
 "Select the _Save_ button. The CSV-formatted file is saved into the folder "
 "that was selected. You can double check the .CSV file by opening it with a "
@@ -9054,13 +9080,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ==
-#: user-manual.txt:4154
+#: user-manual.txt:4276
 #, no-wrap
 msgid "APPENDIX E: Writing a custom print template"
 msgstr "ANNEXE E : Créer un modèle d'impression personnalisé"
 
 #. type: Plain text
-#: user-manual.txt:4159
+#: user-manual.txt:4281
 msgid ""
 "_Subsurface_ has a way to create or modify templates for printing dive logs "
 "to produce customized printouts of them. Templates written in HTML, as well "
@@ -9069,12 +9095,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4161
+#: user-manual.txt:4283
 msgid "Templates are accessed using the print dialogue (see image *B* below)."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4169
+#: user-manual.txt:4291
 msgid ""
 "The buttons under the _Template_ dropdown box lets you _Edit_, _Delete_, "
 "_Import_ and _Export_ templates (see image *A* above). New or modified "
@@ -9086,18 +9112,18 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4171
+#: user-manual.txt:4293
 msgid "The Edit Panel has three tabs:"
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:4172
+#: user-manual.txt:4294
 #, no-wrap
 msgid "images/Template1_f22.jpg"
 msgstr "images/Template1_f22.jpg"
 
 #. type: Plain text
-#: user-manual.txt:4176
+#: user-manual.txt:4298
 msgid ""
 "The _Style_ tab (image *A* above) controls the font, line spacing and color "
 "template used for printing the dive log.  The style attributes are editable. "
@@ -9105,7 +9131,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4180
+#: user-manual.txt:4302
 msgid ""
 "The _Colors_ tab (image *B* above) allows editing the colors used for "
 "printing the dive log. The colors are highly customizable: the _Edit_ "
@@ -9114,7 +9140,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4189
+#: user-manual.txt:4311
 msgid ""
 "The _Template_ tab of the Edit Panel (see image below) allows creating a "
 "template using HTML as well as a few Grantlee programming primitives. "
@@ -9130,13 +9156,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:4190
+#: user-manual.txt:4312
 #, no-wrap
 msgid "images/Template2_f22.jpg"
 msgstr "images/Template2_f22.jpg"
 
 #. type: Plain text
-#: user-manual.txt:4195
+#: user-manual.txt:4317
 msgid ""
 "You can adapt any of the existing templates and save it to the dive log "
 "directory. The standard templates (e.g. One dive, Six dives, Table) can be "
@@ -9145,33 +9171,33 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4197
+#: user-manual.txt:4319
 msgid ""
 "To write a custom template, the following elements must exist so the "
 "template will be correctly handled and rendered."
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:4198
+#: user-manual.txt:4320
 #, no-wrap
 msgid "Main dive loop"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4200
+#: user-manual.txt:4322
 msgid ""
 "_Subsurface_ exports a dive list called (*dives*) to the _Grantlee_ back "
 "end. It is possible to iterate over the list as follows:"
 msgstr ""
 
 #. type: Block title
-#: user-manual.txt:4200 user-manual.txt:4265 user-manual.txt:4282
+#: user-manual.txt:4322 user-manual.txt:4387 user-manual.txt:4404
 #, no-wrap
 msgid "template.html"
 msgstr ""
 
 #. type: delimited block .
-#: user-manual.txt:4205
+#: user-manual.txt:4327
 #, no-wrap
 msgid ""
 "\t{% for dive in dives %}\n"
@@ -9180,13 +9206,13 @@ msgid ""
 msgstr ""
 
 #. type: Block title
-#: user-manual.txt:4207 user-manual.txt:4270 user-manual.txt:4289
+#: user-manual.txt:4329 user-manual.txt:4392 user-manual.txt:4411
 #, no-wrap
 msgid "output.html"
 msgstr ""
 
 #. type: delimited block .
-#: user-manual.txt:4212
+#: user-manual.txt:4334
 #, no-wrap
 msgid ""
 "\t<h1> 1 </h1>\n"
@@ -9195,25 +9221,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4215
+#: user-manual.txt:4337
 msgid ""
 "Additional information about _Grantlee_ can be found at http://www.grantlee."
 "org/apidox/for_themers.html[here]"
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:4216
+#: user-manual.txt:4338
 #, no-wrap
 msgid "Grantlee exported variables"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4218
+#: user-manual.txt:4340
 msgid "Only a subset of the dive data is exported:"
 msgstr ""
 
 #. type: delimited block |
-#: user-manual.txt:4247
+#: user-manual.txt:4369
 #, no-wrap
 msgid ""
 "|*Name*|*Description*\n"
@@ -9247,7 +9273,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4251
+#: user-manual.txt:4373
 msgid ""
 "_Subsurface_ also exports *template_options* data. This data must be used as "
 "_CSS_ values to provide a dynamically editable template. The exported data "
@@ -9255,7 +9281,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block |
-#: user-manual.txt:4263
+#: user-manual.txt:4385
 #, no-wrap
 msgid ""
 "|*Name*|*Description*\n"
@@ -9272,26 +9298,26 @@ msgid ""
 msgstr ""
 
 #. type: delimited block .
-#: user-manual.txt:4268
+#: user-manual.txt:4390
 #, no-wrap
 msgid "\tborder-width: {{ template_options.borderwidth }}px;\n"
 msgstr ""
 
 #. type: delimited block .
-#: user-manual.txt:4273
+#: user-manual.txt:4395
 #, no-wrap
 msgid "\tborder-width: 3px;\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4276
+#: user-manual.txt:4398
 msgid ""
 "Another variable that _Subsurface_ exports is *print_options*. This variable "
 "contains a single member:"
 msgstr ""
 
 #. type: delimited block |
-#: user-manual.txt:4279
+#: user-manual.txt:4401
 #, no-wrap
 msgid ""
 "|*Name*|*Description*\n"
@@ -9299,7 +9325,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block .
-#: user-manual.txt:4287
+#: user-manual.txt:4409
 #, no-wrap
 msgid ""
 "\tbody {\n"
@@ -9308,7 +9334,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block .
-#: user-manual.txt:4294
+#: user-manual.txt:4416
 #, no-wrap
 msgid ""
 "\tbody {\n"
@@ -9317,13 +9343,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:4296
+#: user-manual.txt:4418
 #, no-wrap
 msgid "Defined CSS selectors"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4299
+#: user-manual.txt:4421
 msgid ""
 "As the dive profile is placed after rendering, _Subsurface_ uses special "
 "_CSS_ selectors to searche in the HTML output. The _CSS_ selectors in the "
@@ -9331,7 +9357,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block |
-#: user-manual.txt:4306
+#: user-manual.txt:4428
 #, no-wrap
 msgid ""
 "|*Selector*|*Type*|*Description*\n"
@@ -9342,20 +9368,20 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4309
+#: user-manual.txt:4431
 msgid ""
 "Rendering dive profiles is not supported for flow layout templates (when "
 "data-numberofdives = 0)."
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:4310
+#: user-manual.txt:4432
 #, no-wrap
 msgid "Special attributes"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4314
+#: user-manual.txt:4436
 msgid ""
 "There are two ways of rendering- either rendering a specific number of dives "
 "in each page or make _Subsurface_ try to fit as many dives as possible into "
@@ -9363,55 +9389,55 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4316
+#: user-manual.txt:4438
 msgid ""
 "The *data-numberofdives* data attribute is added to the body tag to set the "
 "rendering mode."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4318
+#: user-manual.txt:4440
 msgid "render 6 dives per page:"
 msgstr ""
 
 #. type: delimited block .
-#: user-manual.txt:4321
+#: user-manual.txt:4443
 #, no-wrap
 msgid "\t<body data-numberofdives = 6>\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4324
+#: user-manual.txt:4446
 msgid "render as much dives as possible:"
 msgstr ""
 
 #. type: delimited block .
-#: user-manual.txt:4327
+#: user-manual.txt:4449
 #, no-wrap
 msgid "\t<body data-numberofdives = 0>\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4330
+#: user-manual.txt:4452
 msgid ""
 "All CSS units should be in relative lengths only, to support printing on any "
 "page size."
 msgstr ""
 
 #. type: Title ==
-#: user-manual.txt:4331
+#: user-manual.txt:4453
 #, no-wrap
 msgid "APPENDIX F: FAQs."
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:4333
+#: user-manual.txt:4455
 #, no-wrap
 msgid "Subsurface appears to miscalculate gas consumption and SAC"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4337
+#: user-manual.txt:4459
 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_ "
@@ -9419,7 +9445,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4343
+#: user-manual.txt:4465
 msgid ""
 "'Answer': Not really. What happens is that _Subsurface_ actually calculates "
 "gas consumption differently - and better - than you expect.  In particular, "
@@ -9429,7 +9455,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4349
+#: user-manual.txt:4471
 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 "
@@ -9439,12 +9465,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4351
+#: user-manual.txt:4473
 msgid "+consumption = (amount_of_air_at_beginning - amount_of_air_at_end)+"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4357
+#: user-manual.txt:4479
 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 "
@@ -9455,12 +9481,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4359
+#: user-manual.txt:4481
 msgid "+12.2*((220-100)/1.013)+"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4364
+#: user-manual.txt:4486
 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 "
@@ -9470,7 +9496,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4370
+#: user-manual.txt:4492
 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 "
@@ -9481,13 +9507,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:4371
+#: user-manual.txt:4493
 #, no-wrap
 msgid "Some dive profiles have time discrepancies with the recorded samples from my dive computer..."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4375
+#: user-manual.txt:4497
 msgid ""
 "_Subsurface_ ends up ignoring surface time for many things (average depth, "
 "divetime, SAC, etc).  'Question': Why do dive durations in my dive computer "
@@ -9495,7 +9521,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4383
+#: user-manual.txt:4505
 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 "
@@ -9509,13 +9535,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:4384
+#: user-manual.txt:4506
 #, no-wrap
 msgid "Some dive profiles are missing from the download"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4398
+#: user-manual.txt:4520
 msgid ""
 "'Question': I cannot download all my dives, only the most recent ones, even "
 "though my dive computer's manual states that it records history of e.g. 999 "
@@ -9530,7 +9556,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4402
+#: user-manual.txt:4524
 msgid ""
 "If you have downloaded your dives to different dive logging software before "
 "they were overwritten, there is a good chance that Subsurface can import "
@@ -9538,6 +9564,9 @@ msgid ""
 "salvaged after being overwritten by new dives."
 msgstr ""
 
+#~ msgid "images/tissues.jpg"
+#~ msgstr "images/tissues.jpg"
+
 #~ msgid ""
 #~ "Do you need a way of storing or backing up your dive log on the Internet, "
 #~ "allowing you to view your dive log from anywhere, using an Internet "
diff --git a/Documentation/mobile-manual_fr.html.git b/Documentation/mobile-manual_fr.html.git
index 77551be..be9c4bd 100644
--- a/Documentation/mobile-manual_fr.html.git
+++ b/Documentation/mobile-manual_fr.html.git
@@ -408,7 +408,7 @@ asciidoc.install(3);
 </div>
 </div>
 <div class="paragraph"><p><span class="big">Subsurface-mobile pour Android: MANUEL UTILISATEUR</span></p></div>
-<div class="paragraph"><p><strong>Manual author</strong>: Willem Ferguson</p></div>
+<div class="paragraph"><p><strong>Auteur du manuel</strong> : Willem Ferguson</p></div>
 <div id="toc">
   <div id="toctitle">Table of Contents</div>
   <noscript><p><b>JavaScript must be enabled in your browser to display the table of contents.</b></p></noscript>
@@ -422,24 +422,23 @@ software solutions, including compatibility with Windows, Mac-OS/X, Linux
 <em>Subsurface</em> is open-source software that allows downloading dive
 information from most dive computers.</p></div>
 <div class="sect1">
-<h2 id="_introducing_subsurface_mobile">1. Introducing Subsurface-mobile</h2>
+<h2 id="_présentation_de_subsurface_mobile">1. Présentation de Subsurface-mobile</h2>
 <div class="sectionbody">
-<div class="paragraph"><p><em>Subsurface-mobile</em> is an extension of <em>Subsurface</em> on laptop and tabletop
-computers. It runs on Android smartphone and tablet devices and is a tool
-for viewing or sharing dive information at dive sites where a larger
-computer is not useful. <em>Subsurface-mobile</em> also allows the gathering of GPS
-locations where dives are performed.</p></div>
-<div class="paragraph"><p>A version of <em>Subsurface-mobile</em> for iOS is under development but not yet
-ready for testing.</p></div>
+<div class="paragraph"><p><em>Subsurface-mobile</em> est une extension de <em>Subsurface</em> sur ordinateurs. Il
+fonctionne sur les smartphones et les tablettes Android et c’est un outil
+pour visualiser et partager des informations de plongées sur des sites de
+plongées où un ordinateur n’est pas utile. <em>Subsurface-mobile</em> permet
+également de collecter des positions GPS où sont effectuées les plongées.</p></div>
+<div class="paragraph"><p>À cause des limitations d’iOS, <em>Subsurface-mobile</em> pour iOS n’inclut pas
+toutes les fonctionnalités présentes dans la version Android.</p></div>
 <div class="paragraph"><p>While <em>Subsurface-mobile</em> allows one to enter and save dive information
 using an Android device, users of <em>Subsurface-mobile</em> typically use the
-mobile app as an extension of the laptop/desktop version of <em>Subsurface</em>.
-This allows the storage of dive logs on the Internet and which can be shared
-by the Android version as well as the desktop version.  While the desktop
-version of <em>Subsurface</em> shows much more detailed information for each dive,
-the mobile version allows one to have a more accessible dive log on a dive
-trip, useful for proving dive experience to dive shops or to review previous
-dives.</p></div>
+mobile app as an extension to the laptop/desktop version of <em>Subsurface</em>.
+This allows the storage of dive logs on the Internet sharing them between
+the Android and the desktop versions.  While the desktop version of
+<em>Subsurface</em> shows much more detailed information for each dive, the mobile
+version allows a more accessible dive log on a dive trip, useful for proving
+dive experience to dive shops or to review previous dives.</p></div>
 <div class="paragraph"><p><em>Subsurface-mobile</em> allows one to:</p></div>
 <div class="ulist"><ul>
 <li>
@@ -449,7 +448,7 @@ Download existing dive log information from the Internet.
 </li>
 <li>
 <p>
-View this information on an Android device.
+View this information on a mobile device.
 </p>
 </li>
 <li>
@@ -460,7 +459,7 @@ Edit many of the dive log data fields, e.g. divemaster, buddy, equipment or
 </li>
 <li>
 <p>
-Create and add new dive records to one’s dive log.
+Manually create and add new dive records to one’s dive log.
 </p>
 </li>
 <li>
@@ -481,9 +480,9 @@ View the localities of recorded GPS positions and of dives on a map.
 </ul></div>
 <div class="paragraph"><p>These items are discussed in greater detail in the following text.  What
 <em>Subsurface-mobile</em> does not support (at this time) is downloading dive data
-directly from a dive computer. That still has to happen with <em>Subsurface</em> on
-a desktop or laptop computer. We are investigating ways to support
-downloading from a subset of the supported dive computers on Android
+directly from a dive computer. That still needs to be done using
+<em>Subsurface</em> on a desktop or laptop computer. We are investigating ways to
+support downloading from a subset of the supported dive computers on Android
 devices, but this is not yet ready for testing.</p></div>
 </div>
 </div>
@@ -500,48 +499,83 @@ devices, but this is not yet ready for testing.</p></div>
 <div class="paragraph"><p>Upon starting <em>Subsurface-mobile</em> for the first time, a Subsurface splash
 screen is shown while the program loads. On some devices this may take
 several seconds. After loading, the <em>Cloud Credentials screen</em> appears (see
-image below).</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="mobile-images/landingscreen.jpg" alt="FIGURE: Mobile landing screen" />
-</div>
+image below on left).</p></div>
+<div class="paragraph"><p>Select whether <em>Subsurface-mobile</em> should access the Internet for dive log
+information.</p></div>
+<div class="sect2">
+<h3 id="_when_not_using_internet_access">3.1. When NOT Using Internet access</h3>
+<div class="paragraph"><p>If the striked-out cloud icon is selected, the app will not access the
+Internet to obtain dive log information. This means that dive log
+information is manually entered and stored on the mobile device only.</p></div>
 </div>
+<div class="sect2">
+<h3 id="_using_internet_access">3.2. Using Internet access</h3>
 <div class="paragraph"><p>Since <em>Subsurface</em> is largely dependent on a dive log saved on the Internet,
-provide a user-ID and password for access to the <em>Subsurface Cloud</em>. These
-credentials are obtained by opening the desktop version of <em>Subsurface</em> and
-by clicking <em>File   →  Preferences  → Network</em>, explained in detail in the
-user manual for the <em>Subsurface</em> desktop version. Once the account has
-been created and verified using the desktop version one can use <em>Subsurface-mobile</em>.</p></div>
-<div class="paragraph"><p>When entering a password, it is possible to check a checkbox that enables
-the text of the password to be shown. Checking the check box labelled
-"Remember" allows <em>Susburface-mobile</em> to keep the credentials for subsequent
-logins (see image above).  Having entered the credentials, tap the disk icon
-at the bottom of the screen.  <em>Subsurface-mobile</em> attempts to download the
-existing dive log from the_Subsurface_ cloud server. Appropriate messages
-are shown onscreen. Finally a list of dives are shown.</p></div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_local_copy_of_the_dive_log_and_synchronisation_with_internet">4. Local copy of the dive log and synchronisation with Internet</h2>
-<div class="sectionbody">
+provide a PIN for access to the <em>Subsurface Cloud</em>, obtained in one of two
+ways:</p></div>
+<div class="sect3">
+<h4 id="_using_the_desktop_version_of_em_subsurface_em">3.2.1. Using the desktop version of <em>Subsurface</em>:</h4>
+<div class="paragraph"><p>Open the desktop version of <em>Subsurface</em> and
+click <em>File   →  Preferences  → Network</em>, explained in detail in the
+<a href="https://subsurface-divelog.org/documentation/subsurface-4-user-manual/#_create_a_cloud_storage_account">user
+manual for the <em>Subsurface</em> desktop version</a>. Once the account has
+been created and verified using the desktop version,
+<em>Subsurface</em> desktop alows one to download dive information from dive computers and store this
+on the cloud which can, in turn, be downloaded to <em>Subsurface-mobile</em>. <em>Subsurface-mobile</em>
+attempts to download the existing dive log from the <em>Subsurface</em> cloud
+server. Appropriate messages are shown onscreen. Finally a list of dives is shown.</p></div>
 <div class="paragraph"><p>Once the dive list has been downloaded from the Internet,
 <em>Subsurface-mobile</em> keeps a local copy on the mobile device. This means
 that, if there is no Internet connection at a dive site, one can still
 access the local copy and view and manipulate dive information. If there is
-Internet connectivity, <em>Subsurface-mobile</em> accesses the Internet-based dive
-log to verify that the local copy is still the same as the Internet-stored
+Internet connectivity, <em>Subsurface-mobile</em> accesses the cloud-based dive log
+to verify that the local copy is still the same as the Internet-stored
 copy. If not, the local copy and the copy on the server are synchronised.</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="mobile-images/Credentials.jpg" alt="FIGURE: Mobile landing screen" />
+</div>
+</div>
+</div>
+<div class="sect3">
+<h4 id="_using_em_subsurface_mobile_em">3.2.2. Using <em>Subsurface-mobile</em>:</h4>
+<div class="paragraph"><p>Enter an e-mail address and a password in the fields indicated on the
+screen.  The e-mail should be in lower case and the password should contain
+a combination of letters from the alphabet (upper and lower case) and/or
+numbers. When entering a password, it is possible to check a checkbox that
+enables the text of the password to be shown (image on left, above). At this
+stage, the red message "Cannot connect to cloud storage" appears on the
+screen.  This is normal because a valid PIN has not yet been provided (image
+on left, above).</p></div>
+<div class="paragraph"><p>Tap the Disk (Save) icon at the bottom of the screen. A PIN is sent to the
+e-mail address provided.</p></div>
+<div class="paragraph"><p>Enter the PIN into the field indicated and tap the <em>Save</em> icon again. The
+user information is stored on the cloud server and access to the cloud is
+enabled.</p></div>
+<div class="paragraph"><p>The dive list is initially empty. One can now start entering dives in the
+dive log or one can download existing dives from the cloud.</p></div>
+<div class="paragraph"><p>The text box to enter the PIN is shown whenever the e-mail address field is
+empty.  One can create a new cloud account by clearing the e-mail address
+and typing a new e-mail address, upon which a new PIN is sent to the
+newly-provided e-mail address.  On the other hand, one can change to a
+different existing cloud account by providing an e-mail address and password
+already registered with the cloud server (image on right, above)</p></div>
+<div class="paragraph"><p>Once Internet access has been enabled, one can temporarily disable this
+service when using <em>Subsurface-mobile</em> in areas with no Internet access,
+e.g. remote dive sites (see below)</p></div>
+</div>
+</div>
 </div>
 </div>
 <div class="sect1">
-<h2 id="_a_few_remarks_about_the_user_interface">5. A Few Remarks About The User Interface</h2>
+<h2 id="_a_few_remarks_about_the_user_interface">4. A Few Remarks About The User Interface</h2>
 <div class="sectionbody">
 <div class="paragraph"><p>At the bottom of many Subsurface-mobile screens is a round button that
 provides for several actions and which allows the selection of the main
 affirmative action (see image above and image below).  On Android devices,
 use the Android Back button for "cancel", "discard" or "back" actions. For
 example, when editing dive information, tapping the action button saves the
-changes, the Android back button can be used to cancel the edit without
+changes while the Android back button can be used to cancel the edit without
 saving changes.</p></div>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
@@ -556,8 +590,8 @@ options:</p></div>
 <div class="ulist"><ul>
 <li>
 <p>
-Tap on the right-arrow symbol in the lower left corner of the screen (easy
-  to reach for hand held devices)
+Tap the "hamburger" symbol in the lower left corner of the screen (easy to
+  reach for hand held devices)
 </p>
 </li>
 <li>
@@ -567,8 +601,7 @@ Swipe towards the right across the left edge of the screen
 </li>
 <li>
 <p>
-Drag the action button visible on most screens with the main action to the
-  right
+Drag the action button visible on most screens to the right
 </p>
 </li>
 </ul></div>
@@ -582,29 +615,10 @@ system.  On the left is the main menu that is activated as described
 above. In the middle is the menu that opens if one taps the <em>GPS</em> option on
 the main menu. On the right is the menu that opens if one taps the <em>Manage
 Dives</em> option on the main menu.</p></div>
-<div class="paragraph"><p>Similarly, the context menu (currently only available on the dive details
-screen) can be opened one of these three ways:</p></div>
-<div class="ulist"><ul>
-<li>
-<p>
-Tap on the left-arrow symbol in the lower right corner of the screen
-</p>
-</li>
-<li>
-<p>
-Swipe to the left across the right edge of the screen
-</p>
-</li>
-<li>
-<p>
-Drag the action button to the left
-</p>
-</li>
-</ul></div>
 </div>
 </div>
 <div class="sect1">
-<h2 id="_viewing_the_dive_list">6. Viewing the Dive List</h2>
+<h2 id="_viewing_the_dive_list">5. Viewing the Dive List</h2>
 <div class="sectionbody">
 <div class="paragraph"><p>Most of the actions of <em>Subsurface-mobile</em> center around the dives on the
 dive list. While the dive list is loading from the cloud, a message appears
@@ -615,15 +629,18 @@ that dive (see image on right below).  This includes the dive profile as
 well as additional information and notes.</p></div>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
-<img src="mobile-images/divelist.jpg" alt="FIGURE: Dive list screen" />
+<img src="mobile-images/DiveList.jpg" alt="FIGURE: Dive list screen" />
 </div>
 </div>
 <div class="paragraph"><p>One can view other dives by swiping the <em>Details view</em> to the right (for the
-previous dive) or to the left (following dive).</p></div>
+previous dive) or to the left (following dive).  Using the Action Bar, it is
+also possible to delete the dive (tap the dustbin on the Action Bar) or to
+view the dive location on a map viewer (normally Google Maps; tap the GPS
+icon on the Action Bar.).</p></div>
 </div>
 </div>
 <div class="sect1">
-<h2 id="_editing_dive_details">7. Editing dive details.</h2>
+<h2 id="_editing_dive_details">6. Editing dive details</h2>
 <div class="sectionbody">
 <div class="paragraph"><p>At the bottom of the dive details screen the <em>Action Button</em> contains a
 pencil (image on right, above).  Tapping the button brings up a panel with
@@ -636,18 +653,18 @@ data, the dive list screen is updated and shown. To cancel any edits, tap
 the Android Back Button.</p></div>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
-<img src="mobile-images/editdive.jpg" alt="FIGURE: Dive edit screen" />
+<img src="mobile-images/EditDive.jpg" alt="FIGURE: Dive edit screen" />
 </div>
 </div>
 </div>
 </div>
 <div class="sect1">
-<h2 id="_adding_a_new_dive_to_the_dive_list">8. Adding a new dive to the dive list</h2>
+<h2 id="_adding_a_new_dive_to_the_dive_list">7. Adding a new dive to the dive list</h2>
 <div class="sectionbody">
-<div class="paragraph"><p>It is also possible to add an additional dive to the existing dive list. On
-the main menu tap <em>Manage dives → Add dive manually</em>. This opens a screen
-that is identical to the editing screen discussed above. When a dive is
-added manually, one cannot directly add a dive profile from a dive
+<div class="paragraph"><p>It is also possible to manually add an additional dive to the existing dive
+list. On the main menu tap <em>Manage dives → Add dive manually</em>. This opens a
+screen that is identical to the editing screen discussed above. When a dive
+is added manually, one cannot directly add a dive profile from a dive
 computer. However, if one does not use a dive computer, the duration, depth
 and several other bits of information about the new dive can be entered. The
 <em>Action button</em> at the bottom of the screen contains a disk symbol. Tap this
@@ -656,52 +673,74 @@ left-hand image below shows a screenshot of a dive being created and the
 right-hand image shows the same dive in <em>Details View</em>.</p></div>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
-<img src="mobile-images/createdive.jpg" alt="FIGURE: Dive edit screen" />
+<img src="mobile-images/ManuallyEnterDive.jpg" alt="FIGURE: Manual dive entry screen" />
 </div>
 </div>
 </div>
 </div>
 <div class="sect1">
-<h2 id="_deleting_a_dive">9. Deleting a dive</h2>
+<h2 id="_deleting_a_dive">8. Deleting a dive</h2>
 <div class="sectionbody">
-<div class="paragraph"><p>The <em>details view</em> of a dive has a context menu on the right-hand side that
-can be activated as described above (e.g. by tapping the arrow icon at the
-bottom right of the screen or by dragging the <em>Action Button</em> to the left).
-The context menu has a single item: "Delete dive". If this option is tapped,
-the dive shown in the <em>Details View</em> is deleted. One has a brief opportunity
-to undo the delete by tapping the <em>undo</em> message that appears at the bottom
-of the screen. If the <em>undo</em> message is not tapped, the dive is deleted.</p></div>
+<div class="paragraph"><p>The <em>Details View</em> of a dive has an Action Bar, including a dustbin. If this
+is tapped, the dive shown in the <em>Details View</em> is deleted. One has a brief
+opportunity to undo the delete by tapping the grey <em>Undo</em> button in the
+message that appears at the bottom of the screen (see image below).</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="mobile-images/Delete_undo.jpg" alt="FIGURE: Undo delete dive" />
+</div>
+</div>
+<div class="paragraph"><p>One can also delete a dive from the dive list by long-pressing a specific
+dive until a red dustbin appears on the right-hand side (see image
+below). Tap the dustbin. The dive is deleted without asking any confirmation
+because <em>Subsurface-mobile</em> assumes that the combination of a long tap on
+the dive with another tap on the red dustbin is an unambiguous instruction
+to delete the dive.</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="mobile-images/RedDustbin.jpg" alt="FIGURE: delete dive from list" />
+</div>
+</div>
 </div>
 </div>
 <div class="sect1">
-<h2 id="_dive_log_management">10. Dive log management</h2>
+<h2 id="_dive_log_management">9. Dive log management</h2>
 <div class="sectionbody">
-<div class="paragraph"><p>A central  part of <em>Subsurface-mobile</em> is the ability to store the dive
-log using the <em>Subsurface</em> cloud storage.
-This provides security against loss or damage to the dive information caintained in a local copy of
-the dive log and allows the desktop version of <em>Subsurface</em> to
-access changes made using the mobile device. This ability is accessed
-throug the main menu (by dragging the Action Button to the right, or
-alternatively tap the right angle button at the bottom left of the screen).
- Tap the option <em>Manage dives</em>, enabling a number of options:</p></div>
+<div class="paragraph"><p>A central part of <em>Subsurface-mobile</em> is the ability to store the dive log
+using the <em>Subsurface</em> cloud storage.  This provides security against loss
+or damage to the dive information contained in a local copy of the dive log
+and allows the desktop version of <em>Subsurface</em> to access changes made using
+the mobile device. This ability is accessed through the main menu (by
+dragging the Action Button to the right, or alternatively tap the
+"Hamburger" icon at the bottom left of the screen).  Tap the option <em>Manage
+dives</em>, enabling a number of options:</p></div>
 <div class="sect2">
-<h3 id="_add_new_dive_manually">10.1. Add new dive manually</h3>
+<h3 id="_add_new_dive_manually">9.1. Add new dive manually</h3>
 <div class="paragraph"><p>This is described above under the section dealing with the dive list.</p></div>
 </div>
 <div class="sect2">
-<h3 id="_upload_dive_log_to_the_em_subsurface_em_cloud_storage">10.2. Upload dive log to the <em>Subsurface</em> cloud storage</h3>
+<h3 id="_upload_dive_log_to_the_em_subsurface_em_cloud_storage">9.2. Upload dive log to the <em>Subsurface</em> cloud storage</h3>
 <div class="paragraph"><p>One can upload the dives contained on the mobile device to the <em>Subsurface</em>
-cloud storage by tapping the option <em>Upload to cloud</em>.  This synchronizes
-the local changes to the dive log with the cloud storage.</p></div>
+cloud storage by tapping the option <em>Manual sync with coud</em>.  This
+synchronizes the local changes to the dive log with the cloud storage.</p></div>
+</div>
+<div class="sect2">
+<h3 id="_download_dive_log_from_the_cloud_storage">9.3. Download dive log from the cloud storage</h3>
+<div class="paragraph"><p>In the dive management subpanel, tap the option <em>Manual sync with cloud</em>,
+causing the local divelog to be refreshed from the cloud so that the cloud
+and local versions are synchronised.</p></div>
 </div>
 <div class="sect2">
-<h3 id="_download_dive_log_from_the_cloud_storage">10.3. Download dive log from the cloud storage</h3>
-<div class="paragraph"><p>In the dive management subpanel, tap the option <em>Refresh</em>, causing the local
-divelog to be refreshed from the cloud so that the cloud and local versions
-are synchronised.</p></div>
+<h3 id="_working_offline">9.4. Working offline</h3>
+<div class="paragraph"><p>Sometimes one wishes to use the app when an Internet connection is not
+available, for instance at remote dive sites. In such a case
+<em>Subsurface-mobile</em> may unnecesarily search for an Internet connection,
+causing long delays in executing some functions. In the dive management
+menu, one can turn the Internet access on or off by tapping the <em>Offline
+mode</em> or <em>Enable auto cloud sync</em> options.</p></div>
 </div>
 <div class="sect2">
-<h3 id="_changing_the_login_credentials_on_the_em_subsurface_em_cloud">10.4. Changing the login credentials on the <em>Subsurface</em> cloud</h3>
+<h3 id="_changing_the_login_credentials_on_the_em_subsurface_em_cloud">9.5. Changing the login credentials on the <em>Subsurface</em> cloud</h3>
 <div class="paragraph"><p>It may be necessary to change one’s login credentials, for instance if one’s
 email address (initially used as a credential) has changed. To change the
 credentials, open the main menu and tap <em>Cloud credentials</em>. This opens the
@@ -710,7 +749,7 @@ setup screen for specifying new credentials.</p></div>
 </div>
 </div>
 <div class="sect1">
-<h2 id="_recording_dive_locations_using_gps">11. Recording dive locations using GPS.</h2>
+<h2 id="_recording_dive_locations_using_gps">10. Recording dive locations using GPS.</h2>
 <div class="sectionbody">
 <div class="paragraph"><p>The fact that most smartphones have GPS facilities allows one to record the
 locations of dives. One can take the smartphone on the dive boat during a
@@ -718,7 +757,7 @@ dive and locations will be automatically recorded at regular intervals.
 These locations can then be applied to dives in the dive list. Here is how
 it’s done:</p></div>
 <div class="sect2">
-<h3 id="_setting_up_the_gps">11.1. Setting up the GPS</h3>
+<h3 id="_setting_up_the_gps">10.1. Setting up the GPS</h3>
 <div class="paragraph"><p>Open the main menu and tap <em>GPS → Preferences</em>. Now specify the way in
 which GPS data need to be automatically collected (image on right,
 below). One can specify that data are collected at regular intervals,
@@ -733,7 +772,7 @@ button. The program is now ready to collect GPS positions.</p></div>
 </div>
 </div>
 <div class="sect2">
-<h3 id="_collecting_gps_positions">11.2. Collecting GPS positions</h3>
+<h3 id="_collecting_gps_positions">10.2. Collecting GPS positions</h3>
 <div class="paragraph"><p>Ensure that the GPS on the Android device has been activated. At the bottom
 of the GPS submenu is a check box <em>Run location service</em> (image on left,
 above).  Check this box and <em>Subsurface-mobile</em> starts to collect GPS
@@ -742,7 +781,7 @@ above. After the dive one can deactivate the collection of GPS data by
 de-activating the same check box at the bottom of the main menu.</p></div>
 </div>
 <div class="sect2">
-<h3 id="_storing_the_gps_data_on_the_em_subsurface_em_cloud">11.3. Storing the GPS data on the <em>Subsurface</em> cloud</h3>
+<h3 id="_storing_the_gps_data_on_the_em_subsurface_em_cloud">10.3. Storing the GPS data on the <em>Subsurface</em> cloud</h3>
 <div class="paragraph"><p>Activate the main menu and select the <em>GPS</em> option that brings up the
 submenu of GPS-related actions (image on left, above). Tap <em>Upload GPS data</em>
 that saves the GPS data on the <em>Subsurface</em> cloud server. These GPS data are
@@ -751,12 +790,12 @@ kept on the Android device, independent of whether they have been uploaded
 or not.</p></div>
 </div>
 <div class="sect2">
-<h3 id="_downloading_gps_data_from_the_em_subsurface_em_cloud">11.4. Downloading GPS data from the <em>Subsurface</em> cloud</h3>
+<h3 id="_downloading_gps_data_from_the_em_subsurface_em_cloud">10.4. Downloading GPS data from the <em>Subsurface</em> cloud</h3>
 <div class="paragraph"><p>Download the GPS data that have been saved on the cloud by selecting
 <em>Download GPS Data</em> from the GPS subpanel.</p></div>
 </div>
 <div class="sect2">
-<h3 id="_viewing_gps_data">11.5. Viewing GPS data</h3>
+<h3 id="_viewing_gps_data">10.5. Viewing GPS data</h3>
 <div class="paragraph"><p>From the GPS submenu (image on left, above) select <em>Show GPS fixes</em>. This
 brings up a list of GPS positions obtained using the location service (image
 on left, below). Two actions are possible for each of the locations, enabled
@@ -774,15 +813,15 @@ drawing the GPS record to the right, again using the handle.</p></div>
 </div>
 </div>
 <div class="sect2">
-<h3 id="_applying_gps_data_to_dives_in_the_dive_log">11.6. Applying GPS data to dives in the dive log</h3>
+<h3 id="_applying_gps_data_to_dives_in_the_dive_log">10.6. Applying GPS data to dives in the dive log</h3>
 <div class="paragraph"><p>Assuming that all the dives have been entered into the dive log or have been
 downloaded from the <em>Subsurface</em> cloud, one can apply the GPS positions to
 these dives. GPS positions can therefore only be applied to dives in the
-dive list.  From the GPS subpanel, tap <em>Apply GPS fixes</em>. The dive list
+dive list.  From the GPS subpanel, tap <em>GPS-tag dives</em>. The dive list
 contains the start and end times of each dive. Now, <em>Subsurface-mobile</em>
 applies the first GPS position that falls within the dive period of each
 dive. This results in a GPS position for each dive that is saved as part of
-the dive list.</p></div>
+the dive log.</p></div>
 </div>
 </div>
 </div>
@@ -790,7 +829,7 @@ the dive list.</p></div>
 <div id="footnotes"><hr /></div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2016-03-12 13:57:29 CET
+Last updated 2016-07-21 11:03:44 CEST
 </div>
 </div>
 </body>
diff --git a/Documentation/mobile-manual_fr.txt b/Documentation/mobile-manual_fr.txt
index c8b75b0..fca3f66 100644
--- a/Documentation/mobile-manual_fr.txt
+++ b/Documentation/mobile-manual_fr.txt
@@ -7,7 +7,7 @@ image::mobile-images/banner.jpg["Banner", align="center"]
 
 [big]#Subsurface-mobile pour Android: MANUEL UTILISATEUR#
 
-*Manual author*: Willem Ferguson
+*Auteur du manuel* : Willem Ferguson
 
 toc::[]
 
@@ -21,44 +21,43 @@ software solutions, including compatibility with Windows, Mac-OS/X, Linux
 _Subsurface_ is open-source software that allows downloading dive
 information from most dive computers.
 
-Introducing Subsurface-mobile
------------------------------
+Présentation de Subsurface-mobile
+---------------------------------
 
-_Subsurface-mobile_ is an extension of _Subsurface_ on laptop and tabletop
-computers. It runs on Android smartphone and tablet devices and is a tool
-for viewing or sharing dive information at dive sites where a larger
-computer is not useful. _Subsurface-mobile_ also allows the gathering of GPS
-locations where dives are performed.
+_Subsurface-mobile_ est une extension de _Subsurface_ sur ordinateurs. Il
+fonctionne sur les smartphones et les tablettes Android et c'est un outil
+pour visualiser et partager des informations de plongées sur des sites de
+plongées où un ordinateur n'est pas utile. _Subsurface-mobile_ permet
+également de collecter des positions GPS où sont effectuées les plongées.
 
-A version of _Subsurface-mobile_ for iOS is under development but not yet
-ready for testing.
+À cause des limitations d'iOS, _Subsurface-mobile_ pour iOS n'inclut pas
+toutes les fonctionnalités présentes dans la version Android.
 
 While _Subsurface-mobile_ allows one to enter and save dive information
 using an Android device, users of _Subsurface-mobile_ typically use the
-mobile app as an extension of the laptop/desktop version of _Subsurface_.
-This allows the storage of dive logs on the Internet and which can be shared
-by the Android version as well as the desktop version.  While the desktop
-version of _Subsurface_ shows much more detailed information for each dive,
-the mobile version allows one to have a more accessible dive log on a dive
-trip, useful for proving dive experience to dive shops or to review previous
-dives.
+mobile app as an extension to the laptop/desktop version of _Subsurface_.
+This allows the storage of dive logs on the Internet sharing them between
+the Android and the desktop versions.  While the desktop version of
+_Subsurface_ shows much more detailed information for each dive, the mobile
+version allows a more accessible dive log on a dive trip, useful for proving
+dive experience to dive shops or to review previous dives.
 
 _Subsurface-mobile_ allows one to:
 
 - Download existing dive log information from the Internet.
-- View this information on an Android device.
+- View this information on a mobile device.
 - Edit many of the dive log data fields, e.g. divemaster, buddy, equipment or
   notes about a dive.
-- Create and add new dive records to one's dive log.
+- Manually create and add new dive records to one's dive log.
 - Store the updated dive log on the Internet.
 - Record, store and apply GPS positions of dives.
 - View the localities of recorded GPS positions and of dives on a map.
 
 These items are discussed in greater detail in the following text.  What
 _Subsurface-mobile_ does not support (at this time) is downloading dive data
-directly from a dive computer. That still has to happen with _Subsurface_ on
-a desktop or laptop computer. We are investigating ways to support
-downloading from a subset of the supported dive computers on Android
+directly from a dive computer. That still needs to be done using
+_Subsurface_ on a desktop or laptop computer. We are investigating ways to
+support downloading from a subset of the supported dive computers on Android
 devices, but this is not yet ready for testing.
 
 == Installing _Subsurface-mobile_ on an Android device
@@ -71,36 +70,77 @@ _Subsurface-mobile_ and install it.
 Upon starting _Subsurface-mobile_ for the first time, a Subsurface splash
 screen is shown while the program loads. On some devices this may take
 several seconds. After loading, the _Cloud Credentials screen_ appears (see
-image below).
+image below on left).
 
-image::mobile-images/landingscreen.jpg["FIGURE: Mobile landing screen", align="center"]
+Select whether _Subsurface-mobile_ should access the Internet for dive log
+information.
 
-Since _Subsurface_ is largely dependent on a dive log saved on the Internet,
-provide a user-ID and password for access to the _Subsurface Cloud_. These
-credentials are obtained by opening the desktop version of _Subsurface_ and
-by clicking _File   ->  Preferences  -> Network_, explained in detail in the
-user manual for the _Subsurface_ desktop version. Once the account has
-been created and verified using the desktop version one can use _Subsurface-mobile_.
+=== When NOT Using Internet access
+If the striked-out cloud icon is selected, the app will not access the
+Internet to obtain dive log information. This means that dive log
+information is manually entered and stored on the mobile device only.
 
-When entering a password, it is possible to check a checkbox that enables
-the text of the password to be shown. Checking the check box labelled
-"Remember" allows _Susburface-mobile_ to keep the credentials for subsequent
-logins (see image above).  Having entered the credentials, tap the disk icon
-at the bottom of the screen.  _Subsurface-mobile_ attempts to download the
-existing dive log from the_Subsurface_ cloud server. Appropriate messages
-are shown onscreen. Finally a list of dives are shown.
+=== Using Internet access
+Since _Subsurface_ is largely dependent on a dive log saved on the Internet,
+provide a PIN for access to the _Subsurface Cloud_, obtained in one of two
+ways:
 
+==== Using the desktop version of _Subsurface_:
 
-== Local copy of the dive log and synchronisation with Internet
+Open the desktop version of _Subsurface_ and
+click _File   ->  Preferences  -> Network_, explained in detail in the
+https://subsurface-divelog.org/documentation/subsurface-4-user-manual/#\_create_a_cloud_storage_account[user
+manual for the _Subsurface_ desktop version]. Once the account has
+been created and verified using the desktop version,
+_Subsurface_ desktop alows one to download dive information from dive computers and store this
+on the cloud which can, in turn, be downloaded to _Subsurface-mobile_. _Subsurface-mobile_
+attempts to download the existing dive log from the _Subsurface_ cloud
+server. Appropriate messages are shown onscreen. Finally a list of dives is shown.
 
 Once the dive list has been downloaded from the Internet,
 _Subsurface-mobile_ keeps a local copy on the mobile device. This means
 that, if there is no Internet connection at a dive site, one can still
 access the local copy and view and manipulate dive information. If there is
-Internet connectivity, _Subsurface-mobile_ accesses the Internet-based dive
-log to verify that the local copy is still the same as the Internet-stored
+Internet connectivity, _Subsurface-mobile_ accesses the cloud-based dive log
+to verify that the local copy is still the same as the Internet-stored
 copy. If not, the local copy and the copy on the server are synchronised.
 
+
+image::mobile-images/Credentials.jpg["FIGURE: Mobile landing screen", align="center"]
+
+
+==== Using _Subsurface-mobile_:
+
+Enter an e-mail address and a password in the fields indicated on the
+screen.  The e-mail should be in lower case and the password should contain
+a combination of letters from the alphabet (upper and lower case) and/or
+numbers. When entering a password, it is possible to check a checkbox that
+enables the text of the password to be shown (image on left, above). At this
+stage, the red message "Cannot connect to cloud storage" appears on the
+screen.  This is normal because a valid PIN has not yet been provided (image
+on left, above).
+
+Tap the Disk (Save) icon at the bottom of the screen. A PIN is sent to the
+e-mail address provided.
+
+Enter the PIN into the field indicated and tap the _Save_ icon again. The
+user information is stored on the cloud server and access to the cloud is
+enabled.
+
+The dive list is initially empty. One can now start entering dives in the
+dive log or one can download existing dives from the cloud.
+
+The text box to enter the PIN is shown whenever the e-mail address field is
+empty.  One can create a new cloud account by clearing the e-mail address
+and typing a new e-mail address, upon which a new PIN is sent to the
+newly-provided e-mail address.  On the other hand, one can change to a
+different existing cloud account by providing an e-mail address and password
+already registered with the cloud server (image on right, above)
+
+Once Internet access has been enabled, one can temporarily disable this
+service when using _Subsurface-mobile_ in areas with no Internet access,
+e.g. remote dive sites (see below)
+
 == A Few Remarks About The User Interface
 
 At the bottom of many Subsurface-mobile screens is a round button that
@@ -108,7 +148,7 @@ provides for several actions and which allows the selection of the main
 affirmative action (see image above and image below).  On Android devices,
 use the Android Back button for "cancel", "discard" or "back" actions. For
 example, when editing dive information, tapping the action button saves the
-changes, the Android back button can be used to cancel the edit without
+changes while the Android back button can be used to cancel the edit without
 saving changes.
 
 image::mobile-images/actionbutton.jpg["FIGURE: Action Button", align="center"]
@@ -119,11 +159,10 @@ different user interaction philosophy based on the Kirigami framework
 developed by the Plasma developers. To open the main menu one has three
 options:
 
-- Tap on the right-arrow symbol in the lower left corner of the screen (easy
-  to reach for hand held devices)
+- Tap the "hamburger" symbol in the lower left corner of the screen (easy to
+  reach for hand held devices)
 - Swipe towards the right across the left edge of the screen
-- Drag the action button visible on most screens with the main action to the
-  right
+- Drag the action button visible on most screens to the right
 
 image::mobile-images/menu.jpg["FIGURE: Dive management subpanel", align="center"]
 
@@ -133,13 +172,6 @@ above. In the middle is the menu that opens if one taps the _GPS_ option on
 the main menu. On the right is the menu that opens if one taps the _Manage
 Dives_ option on the main menu.
 
-Similarly, the context menu (currently only available on the dive details
-screen) can be opened one of these three ways:
-
-- Tap on the left-arrow symbol in the lower right corner of the screen
-- Swipe to the left across the right edge of the screen
-- Drag the action button to the left
-
 == Viewing the Dive List
 
 Most of the actions of _Subsurface-mobile_ center around the dives on the
@@ -150,12 +182,15 @@ down.  Tapping a dive on the list brings up a display of _Details View_ for
 that dive (see image on right below).  This includes the dive profile as
 well as additional information and notes.
 
-image::mobile-images/divelist.jpg["FIGURE: Dive list screen", align="center"]
+image::mobile-images/DiveList.jpg["FIGURE: Dive list screen", align="center"]
 
 One can view other dives by swiping the _Details view_ to the right (for the
-previous dive) or to the left (following dive).
+previous dive) or to the left (following dive).  Using the Action Bar, it is
+also possible to delete the dive (tap the dustbin on the Action Bar) or to
+view the dive location on a map viewer (normally Google Maps; tap the GPS
+icon on the Action Bar.).
 
-== Editing dive details.
+== Editing dive details
 
 At the bottom of the dive details screen the _Action Button_ contains a
 pencil (image on right, above).  Tapping the button brings up a panel with
@@ -167,14 +202,14 @@ _Save_ action button. Tap this to save the new information. Having saved the
 data, the dive list screen is updated and shown. To cancel any edits, tap
 the Android Back Button.
 
-image::mobile-images/editdive.jpg["FIGURE: Dive edit screen", align="center"]
+image::mobile-images/EditDive.jpg["FIGURE: Dive edit screen", align="center"]
 
 == Adding a new dive to the dive list
 
-It is also possible to add an additional dive to the existing dive list. On
-the main menu tap _Manage dives -> Add dive manually_. This opens a screen
-that is identical to the editing screen discussed above. When a dive is
-added manually, one cannot directly add a dive profile from a dive
+It is also possible to manually add an additional dive to the existing dive
+list. On the main menu tap _Manage dives -> Add dive manually_. This opens a
+screen that is identical to the editing screen discussed above. When a dive
+is added manually, one cannot directly add a dive profile from a dive
 computer. However, if one does not use a dive computer, the duration, depth
 and several other bits of information about the new dive can be entered. The
 _Action button_ at the bottom of the screen contains a disk symbol. Tap this
@@ -182,28 +217,36 @@ to save the new dive. To cancel any edits, tap the Android Back Button.  The
 left-hand image below shows a screenshot of a dive being created and the
 right-hand image shows the same dive in _Details View_.
 
-image::mobile-images/createdive.jpg["FIGURE: Dive edit screen", align="center"]
+image::mobile-images/ManuallyEnterDive.jpg["FIGURE: Manual dive entry screen", align="center"]
 
 == Deleting a dive
 
-The _details view_ of a dive has a context menu on the right-hand side that
-can be activated as described above (e.g. by tapping the arrow icon at the
-bottom right of the screen or by dragging the _Action Button_ to the left).
-The context menu has a single item: "Delete dive". If this option is tapped,
-the dive shown in the _Details View_ is deleted. One has a brief opportunity
-to undo the delete by tapping the _undo_ message that appears at the bottom
-of the screen. If the _undo_ message is not tapped, the dive is deleted.
+The _Details View_ of a dive has an Action Bar, including a dustbin. If this
+is tapped, the dive shown in the _Details View_ is deleted. One has a brief
+opportunity to undo the delete by tapping the grey _Undo_ button in the
+message that appears at the bottom of the screen (see image below).
+
+image::mobile-images/Delete_undo.jpg["FIGURE: Undo delete dive", align="center"]
+
+One can also delete a dive from the dive list by long-pressing a specific
+dive until a red dustbin appears on the right-hand side (see image
+below). Tap the dustbin. The dive is deleted without asking any confirmation
+because _Subsurface-mobile_ assumes that the combination of a long tap on
+the dive with another tap on the red dustbin is an unambiguous instruction
+to delete the dive.
+
+image::mobile-images/RedDustbin.jpg["FIGURE: delete dive from list", align="center"]
 
 == Dive log management
 
-A central  part of _Subsurface-mobile_ is the ability to store the dive
-log using the _Subsurface_ cloud storage.
-This provides security against loss or damage to the dive information caintained in a local copy of
-the dive log and allows the desktop version of _Subsurface_ to
-access changes made using the mobile device. This ability is accessed
-throug the main menu (by dragging the Action Button to the right, or
-alternatively tap the right angle button at the bottom left of the screen).
- Tap the option _Manage dives_, enabling a number of options:
+A central part of _Subsurface-mobile_ is the ability to store the dive log
+using the _Subsurface_ cloud storage.  This provides security against loss
+or damage to the dive information contained in a local copy of the dive log
+and allows the desktop version of _Subsurface_ to access changes made using
+the mobile device. This ability is accessed through the main menu (by
+dragging the Action Button to the right, or alternatively tap the
+"Hamburger" icon at the bottom left of the screen).  Tap the option _Manage
+dives_, enabling a number of options:
 
 === Add new dive manually
 
@@ -212,14 +255,23 @@ This is described above under the section dealing with the dive list.
 === Upload dive log to the _Subsurface_ cloud storage
 
 One can upload the dives contained on the mobile device to the _Subsurface_
-cloud storage by tapping the option _Upload to cloud_.  This synchronizes
-the local changes to the dive log with the cloud storage.
+cloud storage by tapping the option _Manual sync with coud_.  This
+synchronizes the local changes to the dive log with the cloud storage.
 
 === Download dive log from the cloud storage
 
-In the dive management subpanel, tap the option _Refresh_, causing the local
-divelog to be refreshed from the cloud so that the cloud and local versions
-are synchronised.
+In the dive management subpanel, tap the option _Manual sync with cloud_,
+causing the local divelog to be refreshed from the cloud so that the cloud
+and local versions are synchronised.
+
+=== Working offline
+
+Sometimes one wishes to use the app when an Internet connection is not
+available, for instance at remote dive sites. In such a case
+_Subsurface-mobile_ may unnecesarily search for an Internet connection,
+causing long delays in executing some functions. In the dive management
+menu, one can turn the Internet access on or off by tapping the _Offline
+mode_ or _Enable auto cloud sync_ options.
 
 === Changing the login credentials on the _Subsurface_ cloud
 
@@ -292,8 +344,8 @@ image::mobile-images/gpsmanagement.jpg["FIGURE: GPS management", align="center"]
 Assuming that all the dives have been entered into the dive log or have been
 downloaded from the _Subsurface_ cloud, one can apply the GPS positions to
 these dives. GPS positions can therefore only be applied to dives in the
-dive list.  From the GPS subpanel, tap _Apply GPS fixes_. The dive list
+dive list.  From the GPS subpanel, tap _GPS-tag dives_. The dive list
 contains the start and end times of each dive. Now, _Subsurface-mobile_
 applies the first GPS position that falls within the dive period of each
 dive. This results in a GPS position for each dive that is saved as part of
-the dive list.
+the dive log.
diff --git a/Documentation/user-manual_fr.html.git b/Documentation/user-manual_fr.html.git
index 128f628..0101e23 100644
--- a/Documentation/user-manual_fr.html.git
+++ b/Documentation/user-manual_fr.html.git
@@ -525,34 +525,44 @@ keyboard. A text box appears at the bottom right-hand of the window (see
 image below).  For instance, typing the word "<em>weights</em>" into the search
 text box, searches throughout the user manual. To the right of the search
 text box are two arrows pointing up and down. These find the previous and
-the next occurrence of the search term.
-<span class="image">
-<img src=":images/usermanualfunctions.jpg" alt="User manual functions" />
-</span></p></div>
+the next occurrence of the search term.</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/UserManualSearch.jpg" alt="User manual functions" />
+</div>
+</div>
 <div class="paragraph"><p><em>PREVIOUS/NEXT LINK</em>. Move between links (underlined words that jump to
 specific sections in the user manual) by right-clicking on the text of the
-manual.  This brings up a context menu to previous links selected.  (see
-image above). For instance if a link has been selected, then the option to
-<em>Go Back</em> shows the text at the last link selected (similar to the Previous
-Page button in a browser). Conversely the <em>Go Forward</em> option jumps to the
-text seen before selecting the <em>Go Back</em> option. The <em>Reload</em> option reloads
-the complete user manual into the window.</p></div>
+manual.  This brings up a context menu to PREVIOUS links selected.  (see
+image below). For instance if a link has been selected, then the option to
+<em>Go Back</em> shows the text at the previous link selected (similar to the
+Previous Page button in a browser). Conversely the <em>Go Forward</em> option jumps
+to the text seen before selecting the <em>Go Back</em> option. The <em>Reload</em> option
+reloads the complete user manual into the window.</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/UserManualLinksBack.jpg" alt="User manual functions" />
+</div>
+</div>
 </div>
 </div>
 <div class="sect1">
 <h2 id="S_UserSurvey">2. Le sondage utilisateur</h2>
 <div class="sectionbody">
-<div class="paragraph"><p>In order to develop <em>Subsurface</em> to serve its users in the best possible
-way, it’s important to have user information. Upon launching <em>Subsurface</em>
-and using the software for a week or so, a one-box user survey pops up. It
-is entirely optional and the user controls what, if any, data are sent to
-the <em>Subsurface</em> development team. All data the user sends is useful, and
-will only be used to steer future development and to customize the software
-to fit the needs of the <em>Subsurface</em> users. If you complete the survey, or
-click the option not to be asked again, that should be the last
-communication of this type you receive.  However, if your diving and/or
-subsurface habits change and you wish to fill in another survey, just launch
-<em>Subsurface</em> with the <em>--survey</em> option on the command line.</p></div>
+<div class="paragraph"><p>Dans le but de développer <em>Subsurface</em> pour servir ses utilisateurs de la
+meilleur manière qu’il soit, il est important d’avoir des informations sur
+les utilisateurs. À l’ouverture de <em>Subsurface</em> après avoir utilisé le
+logiciel pendant une semaine environ, une fenêtre de sondage apparait. Cela
+est complètement optionnel et l’utilisateur contrôle quelles informations
+sont envoyées ou non à l'équipe de développement de <em>Subsurface</em>. Toutes les
+données que l’utilisateur envoie sont utiles et ne seront utilisées que pour
+les futurs développements et modifications du logiciel pour coller au mieux
+aux besoins des utilisateurs de <em>Subsurface</em>. Si vous complétez le sondage
+ou cliquez sur l’option pour ne plus être sondé, cela devrait être la
+dernière communication de ce type que vous recevrez. Cependant, si vos
+habitudes de plongées ou d’utilisation de Subsurface changent, vous pouvez
+envoyer un nouveau sondage en démarrant <em>Subsurface</em> avec l’option
+<em>--survey</em> sur la ligne de commande.</p></div>
 </div>
 </div>
 <div class="sect1">
@@ -562,72 +572,82 @@ subsurface habits change and you wish to fill in another survey, just launch
 principal</strong> (Fichier Importer Journal Vue Aide) en haut de la fenêtre (pour
 Windows et Linux) ou en haut de l'écran (pour Mac et Ubuntu Unity). Les
 quatre panneaux sont :</p></div>
-<div class="paragraph"><p>The <strong>Dive List</strong> on the bottom left, showing all the dives in the user’s dive
-log. A dive can be selected and highlighted on the dive list by clicking on
-it. In most situations the up/down keys can be used to switch between
-dives. The <strong>Dive List</strong> is an important tool for manipulating a dive log.</p></div>
-<div class="paragraph"><p>The <strong>Dive Map</strong> on the bottom right, showing the user’s dive sites on a world
-map and centered on the site of the last dive selected in the <strong>Dive List</strong>.</p></div>
-<div class="paragraph"><p>The <strong>Info</strong> on the top left, giving more detailed information on the dive
-selected in the <strong>Dive List</strong>, including some statistics for the selected dive
-or for all highlighted dive(s).</p></div>
-<div class="paragraph"><p>The <strong>Dive Profile</strong> on the top right, showing a graphical dive profile of the
-selected dive in the <strong>Dive List</strong>.</p></div>
-<div class="paragraph"><p>The dividers between panels can be dragged to change the size of any of the
-panels. <em>Subsurface</em> remembers the position of the dividers, so the next
-time <em>Subsurface</em> starts it uses the positions of the dividers from the last
-time the program was used.</p></div>
-<div class="paragraph"><p>If a single dive is selected in the <strong>Dive List</strong>, the dive location, detailed
-information and profile of the <em>selected dive</em> are shown in the respective
-panels. If several dives are selected, the last highlighted dive is the
-<em>selected dive</em>, but summary data of all <em>highlighted dives</em> is shown in the
-<strong>Stats</strong> tab of the <strong>Info</strong> panel (maximum, minimum and average depths,
-durations, water temperatures and SAC; total time and number of dives
-selected).</p></div>
+<div class="paragraph"><p>La <strong>liste des plongées</strong> en bas à gauche, affichant toutes les plongées du
+journal (carnet) de plongées de l’utilisateur. Une plongée peut être
+sélectionnée et mise en surbrillance dans la liste en cliquant dessus. Dans
+la plupart des cas, les touches haut/bas peuvent être utilisée pour passer
+d’une plongée à l’autre. La <strong>liste des plongées</strong> est un outil important pour
+manipuler un journal (carnet) de plongée.</p></div>
+<div class="paragraph"><p>La <strong>carte de plongée</strong> en bas à droite, affiche les sites de plongées de
+l’utilisateur, sur une carte mondiale et centrée sur le site de la dernière
+plongée sélectionnée dans la <strong>liste des plongées</strong>.</p></div>
+<div class="paragraph"><p>Les <strong>informations</strong> en haut à gauche, fournissent des informations détaillées
+sur la plongée sélectionnée dans la <strong>liste des plongées</strong>, dont des
+statistiques pour la plongée sélectionnée ou pour toutes les plongées mises
+en surbrillance.</p></div>
+<div class="paragraph"><p>Le <strong>profil de plongée</strong> en haut à droite, affiche un profil de plongée
+graphique de la plongée sélectionnée dans la <strong>liste des plongées</strong>.</p></div>
+<div class="paragraph"><p>Les séparateurs entre ces panneaux peuvent être déplacés pour modifier la
+taille de chaque panneau. <em>Subsurface</em> mémorise la position de ces
+séparateurs, pour qu’au prochain lancement <em>Subsurface</em> utilise ces
+positions.</p></div>
+<div class="paragraph"><p>Si une unique plongée est sélectionnée dans la <strong>liste des plongées</strong>,
+l’emplacement de la plongée, les informations détaillées et le profil de la
+<em>plongée sélectionnée</em> sont affichées dans les panneaux respectifs. Si
+plusieurs plongées sont sélectionnées, la dernière mise en surbrillance est
+la <em>plongée sélectionnée</em>, mais les données de <em>toutes les plongées mises en
+surbrillances</em> sont affichées dans l’onglet <strong>Stats</strong> du panneau
+<strong>informations</strong> (profondeur maximale, minimale et moyenne, les durées, les
+températures de l’eau et le SAC (air consommé); temps total et nombre de
+plongées sélectionnées).</p></div>
 <div class="imageblock" id="S_ViewPanels" style="text-align:center;">
 <div class="content">
 <img src="images/main_window_f22.jpg" alt="The Main Window" />
 </div>
 </div>
-<div class="paragraph"><p>The user decides which of the four panels are displayed by selecting the
-<strong>View</strong> option on the main menu. This feature has several choices of display:</p></div>
+<div class="paragraph"><p>L’utilisateur décide quels panneaux sont affichés, parmi les 4, en
+sélectionnant l’option <strong>Vue</strong> dans le menu principal. Cette fonctionnalité
+permet plusieurs choix d’affichage :</p></div>
 <div class="paragraph"><p><strong>Tout</strong> : affiche les quatre panneaux tels que sur la capture d'écran ci-dessus.</p></div>
 <div class="paragraph"><p><strong>Liste des plongées</strong> : affiche uniquement la liste des plongées.</p></div>
 <div class="paragraph"><p><strong>Profil</strong> : affiche uniquement le profile de plongée de la plongée sélectionnée.</p></div>
 <div class="paragraph"><p><strong>Info</strong> : affiche uniquement les notes de plongées de la dernière plongée sélectionnée et les statistiques pour
 toutes les plongées mises en surbrillance.</p></div>
-<div class="paragraph"><p><strong>Globe</strong>: Show only the world map, centered on the last selected dive.</p></div>
-<div class="paragraph"><p>Like other functions that can be accessed via the Main Menu, these options
-can also be triggered using keyboard shortcuts. The shortcuts for a
-particular system are shown with an underline in the main menu
-entries. Since different Operating Systems and the user’s chosen language
-may cause <em>Subsurface</em> to use different shortcut keys, they are not listed
-in this user manual.</p></div>
-<div class="paragraph"><p>When the program is started for the first time, it shows no information at
-all, because it does not have any dive information available. In the
-following sections, the procedures to create a new logbook will be
-explained.</p></div>
+<div class="paragraph"><p><strong>Globe</strong> : affiche uniquement la carte mondiale, centrée sur la dernière plongée sélectionnée.</p></div>
+<div class="paragraph"><p>Comme d’autres fonctions qui peuvent être accédée via le menu principal, ces
+options peuvent aussi être utilisées par des raccourcis clavier. Les
+raccourcis pour un système particulier sont affichés avec un souligné des
+les entrées de menu. À cause des différents systèmes d’exploitation et des
+divers langues, <em>Subsurface</em> peut utiliser différentes touches de raccourcis
+et ne sont donc pas détaillées ici.</p></div>
+<div class="paragraph"><p>Lorsque le programme est lancé pour la première fois, il n’affiche aucune
+information, parce qu’il n’a aucune information de plongée disponible. Dans
+les sections suivantes, le procédure pour créer a nouveau carnet de plongée
+sera détaillée.</p></div>
 </div>
 </div>
 <div class="sect1">
 <h2 id="S_NewLogbook">4. Créer un nouveau carnet de plongée</h2>
 <div class="sectionbody">
-<div class="paragraph"><p>Select <em>File → New Logbook</em> from the main menu. All existing dive data are
-cleared so new information can be added. If there are unsaved data in an
-open logbook, the user is asked whether the open logbook should be saved
-before a new logbook is created.</p></div>
+<div class="paragraph"><p>Sélectionner <em>Fichier → Nouveau carnet de plongée</em> à partir du menu
+principal. Toutes les données de plongées sont effacées pour que de
+nouvelles puissent être ajoutées. S’il existe des données non encore
+enregistrées dans le carnet ouvert, l’utilisateur devra sélectionner s’il
+faut les enregistrer ou non avant de créer le nouveau carnet.</p></div>
 </div>
 </div>
 <div class="sect1">
 <h2 id="S_GetInformation">5. Enregistrement des informations de plongée dans le carnet</h2>
 <div class="sectionbody">
-<div class="paragraph"><p>Now that a new logbook is created, it is simple to add dive data it.
-<em>Subsurface</em> allows several ways of adding dive data to a logbook.
+<div class="paragraph"><p>Maintenant qu’un nouveau carnet de plongée a été créé, il est simple de lui
+ajouter des données. <em>Subsurface</em> comporte plusieurs façons pour ajouter des
+données de plongée au carnet.
 1) Si l’utilisateur possède un carnet manuscrit, un tableur ou une autre forme
    de
  carnet maintenu manuellement, les données de plongée peuvent être ajoutées
  au carnet en utilisant une des approches suivantes :
- - Enter dive information by hand. This is useful if the diver didn’t
+ - Entrer les informations de plongée à la main. Cela est utile si le plongeur
+   n’a pas
  utilisé d’ordinateur de plongée et que les plongées sont inscrites dans un
  carnet manuscrit. Voir  <a href="#S_EnterData">Entrer les informations de plongée
  à la main</a></p></div>
@@ -639,9 +659,9 @@ Importer les informations de plongée qui ont été maintenues soit dans un
  soit dans un fichier CSV. Se reporter à : <a href="#S_Appendix_D">ANNEXE D :
  Exporter un tableur vers le format CSV</a> et à
  <a href="#S_ImportingCSVDives">Importer des plongées au format CSV</a>.
-If a dive is recorded using a dive computer, the depth profile and a large
-amount of additional information can be accessed.  These dives can be
-imported from:
+Si une plongée est enregistrée par un ordinateur de plongée, le profil de
+profondeur et de nombreuses informations supplémentaires peuvent être
+obtenues. Ces plongées peuvent être importées à partir de :
 </p>
 </li>
 <li>
@@ -660,7 +680,7 @@ Logiciels propriétaires fournis par les fabricants d’ordinateurs de
 </li>
 <li>
 <p>
-Spreadsheet or CSV files containing dive profiles.
+Tableur ou de fichiers CSV contenant les profils de plongées.
  Voir : <a href="#S_ImportingCSVDives">Importer les plongées au format CSV à partir
  des ordinateurs de plongées ou d’autres logiciels de carnet de plongée</a>
 </p>
@@ -1022,8 +1042,9 @@ Be sure <em>Subsurface</em> is paired with the Bluetooth-enabled dive computer.
 </ul></div>
 <div class="paragraph"><p>Select the Download dialogue by selecting <em>Import → Import from dive
 computer</em> from the <strong>Main Menu</strong>. If you check the box labelled <em>"Choose
-Bluetooth download mode"</em>, the dialogue below appears.
-===== Sur Linux ou MacOS :</p></div>
+Bluetooth download mode"</em>, the dialogue below appears.</p></div>
+<div class="sect4">
+<h5 id="_sur_linux_ou_macos">Sur Linux ou MacOS :</h5>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
 <img src="images/DC_import_Bluetooth.jpg" alt="FIGURE: Download Bluetooth" />
@@ -1088,6 +1109,7 @@ Request PIN code
 closes the Bluetooth dialogue. Now select <em>Download</em> in the <em>Download from
 dive computer</em> dialogue which should still be open. The downloaded dives are
 shown on the righthand side of the download dialogue.</p></div>
+</div>
 <div class="sect4">
 <h5 id="_sur_windows">Sur Windows :</h5>
 <div class="imageblock" style="text-align:center;">
@@ -1198,7 +1220,7 @@ If editing is required, only a value is required, the units of temperature will
 automatically supplied by
 <em>Subsurface</em> (following the <em>Preferences</em>, metric or imperial units will
 be used).</p></div>
-<div class="paragraph"><p><strong>Location</strong>:</p></div>
+<div class="paragraph" id="S_locations"><p><strong>Location</strong>:</p></div>
 <div class="admonitionblock">
 <table><tr>
 <td class="icon">
@@ -1896,7 +1918,140 @@ smaller file to make sure everything works.</td>
 </div>
 </div>
 <div class="sect2">
-<h3 id="S_Companion">5.4. Importing GPS coordinates with the <em>Subsurface Companion App</em> for mobile phones</h3>
+<h3 id="_importing_dive_coordinates_from_a_mobile_device_with_gps">5.4. Importing Dive coordinates from a mobile device with GPS.</h3>
+<div class="paragraph"><p>A smartphone with built-in GPS facilities can be used to store the locations
+of dives.  This is performed by:</p></div>
+<div class="paragraph"><p>Taking the mobile device along on the dive boat / liveabord while
+automatically collecting dive site coordinate information.</p></div>
+<div class="paragraph"><p>2) Uploading the coordinates from the mobile device to the <em>Subsurface</em>
+   Internet server.</p></div>
+<div class="paragraph"><p>Syncronising the dives in the <em>Subsurface</em> dive list with the coordinates
+stored on the <em>Subsurface</em> Internet server.</p></div>
+<div class="paragraph"><p>_Subsurface has two tools for achieving this:</p></div>
+<div class="ulist"><ul>
+<li>
+<p>
+The <em>Subsurface Companion App</em> (Android and iOS).
+</p>
+</li>
+<li>
+<p>
+The <em>Subsurface-mobile</em> app (Android and iOS)
+</p>
+</li>
+</ul></div>
+<div class="paragraph"><p>Both of these applications perform the collection of dive site coordinates
+and the synchronisation with dives in the <em>Subsurface</em> dive list. However,
+the Companion App is not being further developed and has largely been
+replaced by the <em>Subsurface-mobile</em> app. While the <em>Companion app</em> serves
+exclusively to collect dive site coordinates and to make these available to
+the <em>Subsurface</em> desktop version, <em>Subsurface-mobile</em> performs many of the
+functions of the desktop version, including the management and viewing of
+dive information. Below, we describe how to perform the above three steps
+using each of the two mobile apps.</p></div>
+<div class="paragraph"><p>For information on using the <em>Subsurface Companion App</em>, click
+<a href="#S_iCompanion"><em>here</em></a>.</p></div>
+<div class="sect3">
+<h4 id="_storing_and_and_using_gps_locations_using_em_subsurface_mobile_em">5.4.1. Storing and and using GPS locations using  <em>Subsurface-mobile</em></h4>
+<div class="sect4">
+<h5 id="_install_em_subsurface_mobile_em">Install <em>Subsurface-mobile</em></h5>
+<div class="paragraph"><p>Find <em>Subsurface-mobile</em> on Google Play and install it on an Android
+device. The app is free. The iOS version is currently
+experimental. <em>Subsurface-mobile</em> has an extensive
+<a href="https://subsurface-divelog.org/documentation/subsurface-mobile-user-manual">user
+manual</a> accessible from within that app.</p></div>
+</div>
+<div class="sect4">
+<h5 id="_create_a_em_subsurface_mobile_em_account">Create a <em>Subsurface-mobile</em> account</h5>
+<div class="paragraph"><p>This topic is discussed at length in the <em>Subsurface-mobile</em> user manual. In
+the Credentials screen of <em>Subsurface-mobile</em> provide an e-mail address and
+a user password that enables subsequent access. A PIN number is e-mailed
+from the <em>Subsurface</em> Internet server to the e-mail address that has been
+provided.  Type the PIN into the appropriate text field in the Credentials
+screen (see image below).  The <em>Subsurface</em> Internet server notifies the
+user that a new user has been registered.</p></div>
+<div class="paragraph"><p><strong>N.B.:</strong> To successfully create a user account, the mobile device must have Internet connectivity,
+either through the cellular network or via wifi.</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/MobileCredentials.jpg" alt="FIGURE: Subsurface-mobile, credentials screen" />
+</div>
+</div>
+</div>
+<div class="sect4">
+<h5 id="_configure_auto_collecting_of_gps_coordinates">Configure auto-collecting of GPS coordinates</h5>
+<div class="paragraph"><p>Activate the main menu of <em>Subsurface-mobile</em> by selecting the "hamburger"
+menu button at the bottom left of the <em>Subsurface-mobile</em> screen (see image
+above), then select <em>GPS</em> → <em>Preferences</em> (see image below). The collection
+of GPS locations is done in the background and automatically, using two
+settings:</p></div>
+<div class="ulist"><ul>
+<li>
+<p>
+<em>Time threshold.</em> (minutes). The app will try to get a location every X
+  minutes
+</p>
+</li>
+<li>
+<p>
+<em>Distance threshold.</em> (meters). Minimum distance between two locations.
+</p>
+</li>
+</ul></div>
+<div class="paragraph"><p><strong>How are GPS coordinates collected?</strong> Assuming the diver sets 5 minutes and 50
+meters in the settings above, the app will start by recording a location at the current
+location, followed by another one at every 5 minutes <strong>or</strong> every time one moves 50 m
+from previous location, whichever happens first.
+If subsequent locations are within a radius of 50 meters from the previous one,
+a new location is not saved. If the diver is not moving, only one location is
+saved, at least until the <em>Time-threshold</em> period has elapsed.
+If the diver moves, a trace of the route is obtained by saving a location every 50 meters.</p></div>
+</div>
+<div class="sect4">
+<h5 id="_activate_the_automated_recording_of_gps_locations">Activate the automated recording of GPS locations</h5>
+<div class="paragraph"><p>The <em>Subsurface-mobile</em> main menu has a checkbox at the bottom left labled
+<em>Run location service</em> (see image below). Checking the box starts the
+automated recording of GPS positions.</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/MobileMenu.jpg" alt="FIGURE: Subsurface-mobile main menu" />
+</div>
+</div>
+</div>
+<div class="sect4">
+<h5 id="_after_the_dive_stop_the_automated_recording_of_gps_locations">After the dive, stop the automated recording of GPS locations</h5>
+<div class="paragraph"><p>Uncheck the check box at the bottom left of the <em>Subsurface-mobile</em> main
+menu.</p></div>
+</div>
+<div class="sect4">
+<h5 id="_upload_the_gps_locations_onto_the_em_subsurface_em_internet_server">Upload the GPS locations onto the <em>Subsurface</em> Internet server.</h5>
+<div class="paragraph"><p><strong>N.B.:</strong> Uploading the GPS locations to the Internet can only take place if the mobile
+device has reliable access to the Internet, either via a cellular network or
+via a wifi connection. If the Internet is not accessible from the dive site(s),
+then GPS uploading can only take place after the dive or after the dive trip,
+when an Internet connection has been re-established.</p></div>
+<div class="paragraph"><p>From the <em>Subsurface-mobile</em> main menu, select <em>GPS</em> → <em>Upload GPS
+data</em>. The locations are uploaded. Check the indicator at the top of the
+mobile screen for internet activity, indicating the transfer of information.</p></div>
+</div>
+<div class="sect4">
+<h5 id="_apply_the_stored_gps_locations_to_dives_on_the_em_subsurface_em_dive_list">Apply the stored GPS locations to dives on the <em>Subsurface</em> dive list.</h5>
+<div class="paragraph"><p><em>Subsurface</em> collects the first GPS location recorded after the start of a
+dive (obtained within <em>Subsurface</em> from either the dive computer or from the
+manually-entered dive information) and before the end of a dive. These
+coordinates are shown in the <em>Coordinates</em> field of the dive site panel for
+each dive. Within the dive site panel, provide a name for the coordinates
+that have been assigned to the dive, following the instructions under the
+heading above <a href="#S_locations"><em>Location</em> management</a>.</p></div>
+<div class="paragraph"><p>The
+<a href="https://subsurface-divelog.org/documentation/subsurface-mobile-user-manual">user
+manual for <em>Subsurface-mobile</em></a> (accessible from within that app)  contains
+detailed instructions for performing the collection of GPS data and for
+managing, uploading and synchronising this information.</p></div>
+</div>
+</div>
+<div class="sect3">
+<h4 id="S_iCompanion">5.4.2. Importing GPS coordinates with the <em>Subsurface Companion App</em> for mobile phones</h4>
 <div class="paragraph"><p>Using the <strong>Subsurface Companion App</strong> on an <em>Android device</em>   or
 <a href="#S_iphone"><em>iPhone</em></a> with GPS, the coordinates
 for the diving
@@ -1904,8 +2059,8 @@ location can be automatically passed to the <em>Subsurface</em> dive log. The Co
 stores dive locations on a dedicated Internet server. <em>Subsurface</em> can collect
 the locations from the server.
 To do this:</p></div>
-<div class="sect3">
-<h4 id="_create_a_companion_app_account">5.4.1. Create a Companion App account</h4>
+<div class="sect4">
+<h5 id="_create_a_companion_app_account">Create a Companion App account</h5>
 <div class="ulist"><ul>
 <li>
 <p>
@@ -1925,8 +2080,8 @@ Download the app from
 </li>
 </ul></div>
 </div>
-<div class="sect3">
-<h4 id="_using_the_subsurface_companion_app_on_an_android_smartphone">5.4.2. Using the Subsurface companion app on an Android smartphone</h4>
+<div class="sect4">
+<h5 id="_using_the_subsurface_companion_app_on_an_android_smartphone">Using the Subsurface companion app on an Android smartphone</h5>
 <div class="paragraph"><p>On first use the app has three options:</p></div>
 <div class="ulist"><ul>
 <li>
@@ -1963,8 +2118,7 @@ Defaults</em> from the main menu in <em>Subsurface</em> itself.  This helps
 synchronization between <em>Subsurface</em> and the Companion App.</td>
 </tr></table>
 </div>
-<div class="sect4">
-<h5 id="_creating_new_dive_locations">Creating new dive locations</h5>
+<div class="paragraph"><p>====== Creating new dive locations</p></div>
 <div class="paragraph"><p>Now you are ready to get a dive position and send it to the server. The
 Android display will look like the left hand image (<strong>A</strong>) below, but without
 any dives.</p></div>
@@ -2006,9 +2160,7 @@ Import local GPX file: The android device searches for .gpx files and
 </p>
 </li>
 </ul></div>
-</div>
-<div class="sect4">
-<h5 id="_dive_lists_of_dive_locations">Dive lists of dive locations</h5>
+<div class="paragraph"><p>====== Dive lists of dive locations</p></div>
 <div class="paragraph"><p>The main screen shows a list of dive locations, each with a name, date and
 time (see <strong>A</strong> below). Some locations may have an arrow-up icon over the
 selection box to the left showing they need to be uploaded to the
@@ -2041,9 +2193,7 @@ Edit (pencil): Change the text name or other characteristics of the dive
 <div class="paragraph"><p>Maps: Display a map showing the dive location.  After editing and saving a
 dive location (see <strong>C</strong> above), upload it to the web service, as explained
 below.</p></div>
-</div>
-<div class="sect4">
-<h5 id="_uploading_dive_locations">Uploading dive locations</h5>
+<div class="paragraph"><p>====== Uploading dive locations</p></div>
 <div class="paragraph"><p>There are several ways to send locations to the server.  The easiest is
 simply selecting the locations (See <strong>A</strong> below) and then touching the right
 arrow at the top right of the screen.</p></div>
@@ -2063,28 +2213,21 @@ deletes the selected dive location(s).</td>
 </div>
 <div class="paragraph"><p>After a dive trip using the Companion App, all dive locations are ready to
 be downloaded to a <em>Subsurface</em> dive log (see below).</p></div>
-</div>
-<div class="sect4">
-<h5 id="_settings_on_the_companion_app">Settings on the Companion App</h5>
+<div class="paragraph"><p>====== Settings on the Companion App</p></div>
 <div class="paragraph"><p>Selecting the <em>Settings</em> menu option results in the right hand image above
 (<strong>B</strong>).</p></div>
-</div>
-<div class="sect4">
-<h5 id="_server_and_account">Server and account</h5>
+<div class="paragraph"><p>====== Server and account</p></div>
 <div class="ulist"><ul>
 <li>
 <p>
 <em>Web-service URL.</em> This is predefined (<a href="http://api.hohndel.org/">http://api.hohndel.org/</a>)
 </p>
 </li>
-<li>
-<p>
-<em>User ID.</em> The DIVERID obtained by registering as described above. The
-  easiest way to get it is to copy and paste from the confirmation email or
-  just type it in.
-===== Synchronisation
-</p>
-</li>
+</ul></div>
+<div class="paragraph"><p><em>User ID.</em> The DIVERID obtained by registering as described above. The
+easiest way to get it is to copy and paste from the confirmation email or
+just type it in.  ====== Synchronisation</p></div>
+<div class="ulist"><ul>
 <li>
 <p>
 <em>Synchronize on startup</em>. If selected, dive locations in the Android device
@@ -2098,12 +2241,9 @@ be downloaded to a <em>Subsurface</em> dive log (see below).</p></div>
 </p>
 </li>
 </ul></div>
-</div>
-<div class="sect4">
-<h5 id="_background_service">Background service</h5>
-<div class="paragraph"><p>Instead of entering an unique dive location, you can leave the service
-running in the background of your Android device, allowing a continuous
-collection of GPS locations.</p></div>
+<div class="paragraph"><p>====== Background service Instead of entering an unique dive location, one
+can leave the service running in the background of your Android device,
+allowing a continuous collection of GPS locations.</p></div>
 <div class="paragraph"><p>The settings below define the behavior of the service:</p></div>
 <div class="ulist"><ul>
 <li>
@@ -2138,9 +2278,7 @@ saved.  If the diver is moving, a trace of the route is obtained by saving a
 location every 50 meters.</td>
 </tr></table>
 </div>
-</div>
-<div class="sect4">
-<h5 id="_other">Other</h5>
+<div class="paragraph"><p>====== Other</p></div>
 <div class="paragraph"><p><em>Mailing List.</em> The mail box for <em>Subsurface</em>. Users can send an email to
 the Subsurface mailing list.</p></div>
 <div class="ulist"><ul>
@@ -2155,25 +2293,17 @@ the Subsurface mailing list.</p></div>
 </p>
 </li>
 </ul></div>
-</div>
-<div class="sect4">
-<h5 id="_search">Search</h5>
+<div class="paragraph"><p>====== Search</p></div>
 <div class="paragraph"><p>Search the saved dive locations by name or by date and time.</p></div>
-</div>
-<div class="sect4">
-<h5 id="_start_service">Start service</h5>
+<div class="paragraph"><p>====== Start service</p></div>
 <div class="paragraph"><p>Starts the <em>background service</em> following the previously defined settings.</p></div>
-</div>
-<div class="sect4">
-<h5 id="_disconnect">Disconnect</h5>
+<div class="paragraph"><p>====== Disconnect</p></div>
 <div class="paragraph"><p>This is admittedly a badly named option that disconnects the app from the
 server.  It resets the user ID in the app, showing the first screen where an
 account can be created, retrieve the ID for an existing account or use the
 users own ID. The disconnect option is useful if your Android device was
 used to download the dive locations of another registered diver.</p></div>
-</div>
-<div class="sect4">
-<h5 id="_send_all_locations">Send all locations</h5>
+<div class="paragraph"><p>====== Send all locations</p></div>
 <div class="paragraph"><p>This option sends all locations stored in the Android device to the server.</p></div>
 </div>
 </div>
@@ -2201,9 +2331,8 @@ dives manually.</p></div>
 list and clicking on the site name. There are no other editable fields. The
 dive list is automatically uploaded from the iPhone to the web
 service. There isn’t an option to trigger upload manually.</p></div>
-</div>
-<div class="sect3">
-<h4 id="_downloading_dive_locations_to_the_em_subsurface_em_divelog">5.4.4. Downloading dive locations to the <em>Subsurface</em> divelog</h4>
+<div class="sect4">
+<h5 id="_downloading_dive_locations_to_the_em_subsurface_em_divelog">Downloading dive locations to the <em>Subsurface</em> divelog</h5>
 <div class="paragraph"><p>Download dive(s) from a dive computer or enter them manually into
 <em>Subsurface</em> before obtaining the GPS coordinates from the server. The
 download dialog can be reached via <em>Ctrl+G</em> or from the <em>Subsurface</em> Main
@@ -2271,6 +2400,7 @@ It may also make sense to give informative names to the locations sent to
 </ul></div>
 </div>
 </div>
+</div>
 <div class="sect2">
 <h3 id="S_LoadImage">5.5. Adding photographs to dives</h3>
 <div class="paragraph"><p>Many (if not most) divers take a camera with them and take photographs
@@ -2880,12 +3010,12 @@ cellspacing="0" cellpadding="4">
 <col width="33%" />
 <tbody>
 <tr>
-<td align="left" valign="top"><p class="table"><strong>Color</strong></p></td>
-<td align="left" valign="top"><p class="table"><strong>Descent speed (m/min)</strong></p></td>
-<td align="left" valign="top"><p class="table"><strong>Ascent speed (m/min)</strong></p></td>
+<td align="left" valign="top"><p class="table"><strong>Couleur</strong></p></td>
+<td align="left" valign="top"><p class="table"><strong>Vitesse de descente (m/min)</strong></p></td>
+<td align="left" valign="top"><p class="table"><strong>Vitesse de remontée (m/min)</strong></p></td>
 </tr>
 <tr>
-<td align="left" valign="top"><p class="table">Red</p></td>
+<td align="left" valign="top"><p class="table">Rouge</p></td>
 <td align="left" valign="top"><p class="table">> 30</p></td>
 <td align="left" valign="top"><p class="table">> 18</p></td>
 </tr>
@@ -2895,17 +3025,17 @@ cellspacing="0" cellpadding="4">
 <td align="left" valign="top"><p class="table">9 - 18</p></td>
 </tr>
 <tr>
-<td align="left" valign="top"><p class="table">Yellow</p></td>
+<td align="left" valign="top"><p class="table">Jaune</p></td>
 <td align="left" valign="top"><p class="table">9 - 18</p></td>
 <td align="left" valign="top"><p class="table">4 - 9</p></td>
 </tr>
 <tr>
-<td align="left" valign="top"><p class="table">Light green</p></td>
+<td align="left" valign="top"><p class="table">Vert clair</p></td>
 <td align="left" valign="top"><p class="table">1.5 - 9</p></td>
 <td align="left" valign="top"><p class="table">1.5 - 4</p></td>
 </tr>
 <tr>
-<td align="left" valign="top"><p class="table">Dark green</p></td>
+<td align="left" valign="top"><p class="table">Vert foncé</p></td>
 <td align="left" valign="top"><p class="table">< 1.5</p></td>
 <td align="left" valign="top"><p class="table">< 1.5</p></td>
 </tr>
@@ -2989,10 +3119,12 @@ the scroll wheel / scroll gesture of your mouse or trackpad. By default
 <em>Subsurface</em> always shows a profile area large enough for at least 30 minutes
 and 30m
  (100ft) – this way short or shallow dives are easily recognizable;
-something free divers won’t care about.
-<span class="image">
-<img src=":images/MeasuringBar.png" alt="FIGURE: Measuring Bar" />
-</span></p></div>
+something free divers won’t care about.</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/MeasuringBar.png" alt="FIGURE: Measuring Bar" />
+</div>
+</div>
 <div class="admonitionblock">
 <table><tr>
 <td class="icon">
@@ -3106,7 +3238,7 @@ after 23 minutes. Cylinders with air are shown as a light blue bar.</td>
 <div class="admonitionblock">
 <table><tr>
 <td class="icon">
-<img src="images/tissues.jpg" alt="Note" />
+<img src="images/icons/tissues.jpg" alt="Note" />
 </td>
 <td class="content">Display inert gas tissue pressures relative to ambient inert gas pressure
 (horizontal grey line).  Tissue pressures are calculated using the Bühlmann
@@ -3604,13 +3736,14 @@ Exporter les informations de plongée vers <em>Facebook</em>
 </ul></div>
 <div class="sect2">
 <h3 id="S_facebook">8.1. Export des informations de plongée vers <em>Facebook</em></h3>
-<div class="paragraph"><p>Export of dives to <em>Facebook</em> is handled differently from other types of
-export because a connection to <em>Facebook</em> is required, needing a <em>Facebook</em>
-userID and password.  If, from the <strong>Main Menu</strong>, you select <em>File →
-Preferences → Facebook</em>, a login screen comes up.  (image <strong>A</strong> to the left,
-below).  Provide a <em>Facebook</em> userID and password.  Once logged into to
-<em>Facebook</em> , the panel in image <strong>B</strong>, below is shown, including a <em>Disconnect
-from Facebook</em> button to close the <em>Facebook</em> connection.</p></div>
+<div class="paragraph"><p>L’export des plongées vers <em>Facebook</em> est géré différemment des autres types
+d’export car une connexion vers <em>Facebook</em> est nécessaire, nécessitant un
+identifiant et un mot de passe. À partir du menu principal, si vous
+sélectionnez <em>Fichier → Préférences → Facebook</em>, un écran de connexion
+s’affiche (image <strong>A</strong> sur la gauche, ci dessous). Entrez l’identifiant et le
+mot de passe <em>Facebook</em>. Une fois connecté à <em>Facebook</em>, le panneau de
+l’image <strong>B</strong> ci dessous est affiché, avec un bouton <em>Déconnecter de Facebook</em>
+pour fermer la connexion <em>Facebook</em>.</p></div>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
 <img src="images/facebook1_f20.jpg" alt="Figure: Facebook login" />
@@ -3621,24 +3754,25 @@ a valid connection to <em>Facebook</em> From the <strong>Main Menu</strong>, sel
 Facebook</em> (image <strong>A</strong>, below). Normally, the <em>Facebook</em> option is greyed
 out. But if there is a connection to <em>Facebook</em>, this option is active
 (i.e. in black color and can be selected).</p></div>
-<div class="paragraph"><p>Having established a login to <em>Facebook</em>, transferring a dive profileto a
-<em>Facebook</em> timeline is easy.  Be sure the dive to be transferred to the
-timeline is shown in the <em>Subsurface</em> <strong>Dive Profile</strong> panel. If, from the
-<strong>Main Menu</strong>, you select <em>Share on → Facebook</em> (see image <strong>A</strong> below), a
-dialogue box is shown, determining the amount of additional information
-transferred along with the dive profile (image <strong>B</strong>, below). To transfer a
-dive profile to <em>Facebook</em>, the name of a <em>Facebook</em> album is needed. The
-checkboxes on the left hand side let you decide 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 (image <strong>B</strong>,
-below). You can easily edit the message that will be posted with the dive
-profile.  After specifying the additional information and verifying the
-text, select the <em>OK</em> button that triggers the transfer to <em>Facebook</em>. After
-the transfer is done, an acknowledgement dialogue appears, indicating it was
-successful.</p></div>
-<div class="paragraph"><p>Both the album created and the post to your timeline will be marked as
-private. In order for friends to be able to see it, change its permissions
-from a regular Facebook login either in a browser or a Facebook app.</p></div>
+<div class="paragraph"><p>Une fois qu’une connexion à <em>Facebook</em> est établie, transférer un profil de
+plongée vers <em>Facebook</em> est facile. Assurez-vous que la plongée à transférer
+est affichée dans le panneau <strong>Profil de plongée</strong> de <em>Subsurface</em>. Si, à
+partir du <strong>menu principal</strong>, vous sélectionnez <em>Partager sur → Facebook</em>,
+une fenêtre s’affiche, pour déterminer quelles informations seront
+transférées avec le profil de plongée (voir l’image <strong>B</strong> ci-dessous). Pour
+transférer un profil de plongée vers <em>Facebook</em>, le nom d’un album
+<em>Facebook</em> doit être fourni. Les cases à cocher sur la partie gauche
+permettent de sélectionner des informations supplémentaires à transférer
+avec le profil de plongée. Ces informations sont affichées dans le champs de
+texte sur la partie droite du panneau. (image <strong>B</strong> ci dessous). Vous pouvez
+facilement modifier le message qui sera envoyé avec le profil de
+plongée. Une fois les informations supplémentaires ajoutées et vérifiées,
+sélectionner le bouton <em>OK</em> qui lance le transfert vers <em>Facebook</em>. Après un
+moment, une fenêtre apparait indiquant le succès du transfert.</p></div>
+<div class="paragraph"><p>À la fois l’album créé et la publication sur votre ligne temporelle seront
+marquées comme privés. Pour que vos amis puissent la voir, modifier les
+permissions à partir d’une connexion Facebook standard depuis un navigateur
+ou l’application Facebook.</p></div>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
 <img src="images/facebook2_f20.jpg" alt="Figure: Facebook login" />
@@ -3650,7 +3784,7 @@ principal et en cliquant sur le bouton approprié dans le panneau des
 préférences Facebook.</p></div>
 </div>
 <div class="sect2">
-<h3 id="S_Export_other">8.2. Export dive information to other destinations or formats</h3>
+<h3 id="S_Export_other">8.2. Exporter des informations de plongée vers d’autres destinations ou formats</h3>
 <div class="paragraph"><p>For non-<em>Facebook exports</em>, the export function can be found by selecting
 <em>File → Export</em>, which brings up the Export dialog. This dialog always
 gives two options: save ALL dives, or save only the dives selected in <strong>Dive
@@ -4079,15 +4213,15 @@ information on how to write or modify a template.</p></div>
 <div class="sect1">
 <h2 id="S_Configure">11. Configurer un ordinateur de plongée</h2>
 <div class="sectionbody">
-<div class="paragraph"><p><em>Subsurface</em> lets you 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. To begin, be sure the appropriate hardware
-driver is installed for the dive computer (also required for downloading
-dives) and the device name of the dive computer is known.  See
-<a href="#_appendix_a_operating_system_specific_information_for_importing_dive _information_from_a_dive_computer">APPENDIX A</a> for information on how to do
-this.</p></div>
+<div class="paragraph"><p><em>Subsurface</em> vous permet de configurer un 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. Pour s’assurer que
+les pilotes pour votre ordinateur de plongée sont installés (également
+nécessaire pour télécharger les plongées) et que le nom de périphérique de
+l’ordinateur de plongée est connu. Voir
+<a href="#_appendix_a_operating_system_specific_information_for_importing_dive_information_from_a_dive_computer">ANNEXE A</a> pour plus d’informations sur la manière de procéder.</p></div>
 <div class="paragraph"><p>Une fois que l’ordinateur de plongée est connecté à <em>Subsurface</em>,
 sélectionner <em>Fichier → Configurer l’ordinateur de plongée</em>, à partir du
 menu principal. Fournir le nom du périphérique dans le champ en haut du
@@ -4098,8 +4232,8 @@ plongée à partir du panneau à gauche (voir l’image ci-dessous).</p></di
 <img src="images/Configure_dc_f20.jpg" alt="FIGURE: Configure dive computer" />
 </div>
 </div>
-<div class="paragraph"><p>Using the appropriate buttons on the configuration panel, the following
-actions can be done:</p></div>
+<div class="paragraph"><p>En utilisant les boutons appropriés du panneau de configuration, les actions
+suivantes peuvent être effectuées :</p></div>
 <div class="ulist"><ul>
 <li>
 <p>
@@ -4422,19 +4556,20 @@ from one’s ISP.
 </ul></div>
 </div>
 <div class="sect2">
-<h3 id="S_Facebook">12.6. Facebook Access</h3>
-<div class="paragraph"><p>This panel lets you log into a Facebook account in order to transfer
-information from Subsurface to Facebook.</p></div>
+<h3 id="S_Facebook">12.6. Accès Facebook</h3>
+<div class="paragraph"><p>Ce panneau vous permet de vous connecter à votre compte Facebook pour
+transférer des informations de Subsurface vers Facebook.</p></div>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
 <img src="images/Pref6_f20.jpg" alt="FIGURE: Facebook login panel" />
 </div>
 </div>
-<div class="paragraph"><p>If you provide a valid Facebook userID and password, a connection to
-Facebook is created. That connection is closed when one closing down
-Subsurface. Currently the checkbox labelled "Keep me logged in to
-Subsurface", on the login screen has no effect.  See the section
-<a href="#S_facebook">Exporting dive profiles to Facebook</a> for more information.</p></div>
+<div class="paragraph"><p>Si un identifiant Facebook et un mot de passe valides ont été fournis, une
+connexion vers Facebook est créée. Cette connexion est fermée lorsque
+Subsurface est fermé. Pour le moment, la case à cocher nommée "Conserver ma
+connexion à Subsurface", sur l'écran de connexion, n’a aucun
+effet. Reportez-vous à la section <a href="#S_facebook">Export des profils de
+plongée vers Facebook</a> pour plus d’informations.</p></div>
 </div>
 <div class="sect2">
 <h3 id="_georeference">12.7. Georeference</h3>
@@ -4966,7 +5101,8 @@ des sections de ce manuel traitant des opérations relatives.</p></div>
 </li>
 <li>
 <p>
-<em>Open logbook</em> - Open the file manager to select a dive logbook to open.
+<em>Ouvrir un carnet de plongée</em> - Ouvre une fenêtre pour sélectionner le
+  carnet de plongée à ouvrir.
 </p>
 </li>
 <li>
@@ -4977,7 +5113,7 @@ des sections de ce manuel traitant des opérations relatives.</p></div>
 </li>
 <li>
 <p>
-<em>Save</em> - Save the dive logbook currently open.
+<em>Sauvegarder</em> - Enregistrer le carnet de plongée actuellement ouvert.
 </p>
 </li>
 <li>
@@ -4993,7 +5129,7 @@ des sections de ce manuel traitant des opérations relatives.</p></div>
 </li>
 <li>
 <p>
-<em>Close</em> - Close the dive logbook currently open.
+<em>Fermer</em> - Fermer le carnet de plongée actuellement ouvert.
 </p>
 </li>
 <li>
@@ -5241,9 +5377,9 @@ des sections de ce manuel traitant des opérations relatives.</p></div>
 <td class="icon">
 <img src="images/icons/drivers.jpg" alt="Note" />
 </td>
-<td class="content">The operating system of the desktop computer needs the appropriate drivers
-in order to communicate with the dive computer, the way the dive computer
-prefers (e.g. Bluetooth, USB, infra-red).</td>
+<td class="content">Le système d’exploitation de l’ordinateur nécessite les bons pilotes pour
+communiquer avec l’ordinateur de plongée de la façon utilisée par
+l’ordinateur de plongée (Bluetooth, USB, infra-rouge).</td>
 </tr></table>
 </div>
 <div class="ulist"><ul>
@@ -5279,11 +5415,12 @@ de documents et logiciels Silicon Labs</a>.</p></div>
 <td class="icon">
 <img src="images/icons/usb.jpg" alt="Note" />
 </td>
-<td class="content">When connecting a dive computer by using a USB connector, usually
-<em>Subsurface</em> will either propose a drop down list with the correct device
-name (or mount point for the Uemis Zurich), or it will disable the device
-select drop down if no device name is needed at all. In the rare cases where
-this doesn’t work, here are some ways to find out what the device name is:</td>
+<td class="content">Lors de la connexion d’un ordinateur de plongée en utilisant l’USB,
+<em>Subsurface</em> proposera généralement soit une liste déroulante avec le bon
+nom (ou le point de montage pour un Uemis Zurich) ou la liste sera
+désactivée si aucun nom de périphérique n’est nécessaire. Dans les rares cas
+où cela ne fonctionnerait pas, voici quelques méthodes pour trouver le nom
+de votre périphérique ;</td>
 </tr></table>
 </div>
 <div class="paragraph"><div class="title">Sur Windows :</div><p>Essayez simplement COM1, COM2, etc. La liste déroulante devrait contenir
@@ -5341,14 +5478,16 @@ ftdi_sio: v1.6.0:USB FTDI Serial Converters Driver</code></pre>
 détecté et connecté sur <code>ttyUSB3</code>. Cette information peut à présent être
 utilisée pour les paramètres d’importation en tant que <code>/dev/ttyUSB3</code> pour
 que Subsurface utilise le bon port USB.</p></div>
-<div class="paragraph"><p>Ensuring the user has write permission to the USB serial port:</p></div>
-<div class="paragraph"><p>On Unix-like operating systems the USB ports can only be accessed by users
-who are members special group that can be e.g.  <code>dialout</code> or <code>uucp</code>. This
-can be verified by listing the appropriate device permissions e.g. by <code>ls -l
-/dev/ttyUSB0</code>. Note that the number in the file name depends on how many USB
-devices you have connected, and must be adjusted appropriately.  If one is
-not root, one may not be a member of that group and won’t be able to use the
-USB port. Let us assume one’s username is <em>johnB</em>.</p></div>
+<div class="paragraph"><p>S’assurer que l’utilisateur possède les droits d'écriture sur le port série
+USB :</p></div>
+<div class="paragraph"><p>Sur les systèmes similaires à Unix, les ports USB ne peuvent être accédés
+que par des utilisateurs membres d’un groupe spécial qui peut être <code>dialout</code>
+ou <code>uucp</code>. Cela peut être vérifié en listant les permissions associées au
+périphérique, par exemple via <code>ls - l /dev/ttyUSB0</code>. Notez que le numéro
+dans le nom de fichier dépend du nombre de périphériques USB que vous avez
+branchés et peut être ajusté au besoin.Si vous n'êtes pas root, vous n'êtes
+peut-être pas membre de ce groupe et ne pouvez donc pas utiliser le port
+USB. Admettons que votre nom d’utilisateur est <em>johnB</em>.</p></div>
 <div class="paragraph"><p>En tant que root, tapez : usermod -a -G dialout johnB+ (utilisateurs
 d’Ubuntu : <code>sudo usermod -a -G dialout johnB</code>)  Cela ajoute johnB au groupe
 <code>dialout</code>.
@@ -6196,18 +6335,20 @@ do is save the log file in Subsurface.</p></div>
 <div class="sect1">
 <h2 id="_annexe_d_exporter_un_tableur_vers_le_format_csv">18. ANNEXE D : Exporter un tableur vers le format CSV</h2>
 <div class="sectionbody">
-<div class="paragraph" id="S_Appendix_D"><p>Many divers keep a dive log in some form of digital file, commonly a
-spreadsheet with various fields of information. These logs can be easily
-imported into <em>Subsurface</em> 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 to
-<em>Subsurface</em>.  Creating a .CSV is straightforward, although the procedure is
-somewhat different according to which spreadsheet program is used.</p></div>
-<div class="paragraph"><p>Organize the diving data in the spreadsheet, so the first row contains the
-names (or titles) of each column and the information for each dive is stored
-in a single row.  <em>Subsurface</em> supports many data items (Dive number, Date,
-Time, Duration, Location, GPS, Max Depth, Mean Depth, Buddy, Notes, Weight
-and Tags).  Organize dive data following a few simple rules:</p></div>
+<div class="paragraph" id="S_Appendix_D"><p>De nombreux plongeurs conservent un carnet de plongée sous forme de fichier
+numérique, souvent un tableur avec différents champs et informations. Ces
+données peuvent facilement être importées dans <em>Subsurface</em> après que le
+tableur a été converti en fichier CSV. Cette section explique la procedure
+pour convertir un carnet de plongée enregistrée sous forme de tableur vers
+un fichier CSV qui pourra ensuite être importé dans <em>Subsurface</em>. Créer un
+fichier CSV est simple malgré que la procédure soit différente selon le
+tableur utilisé.</p></div>
+<div class="paragraph"><p>Organiser les données de plongées dans le tableur pour que la première ligne
+contienne le nom (ou le titre) de chaque colonne et que les informations de
+chaque plongée soient contenues sur une seule ligne. <em>Subsurface</em> supporte
+de nombreux éléments (Dive #, Date, Time, Duration, Location, GPS, Max
+Depth, Mean Depth, Buddy, Notes, Weight et Tags).  Organiser les données de
+plongées selon quelques règles simples :</p></div>
 <div class="olist arabic"><ol class="arabic">
 <li>
 <p>
@@ -6810,7 +6951,7 @@ salvaged after being overwritten by new dives.</p></div>
 <div id="footnotes"><hr /></div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2016-03-12 13:57:29 CET
+Last updated 2016-07-21 11:03:44 CEST
 </div>
 </div>
 </body>
diff --git a/Documentation/user-manual_fr.txt b/Documentation/user-manual_fr.txt
index 12c8865..fa9841b 100644
--- a/Documentation/user-manual_fr.txt
+++ b/Documentation/user-manual_fr.txt
@@ -57,7 +57,7 @@ des instructions de compilation du logiciel et (si besoin) de ses
 dépendances, merci de consulter le fichier INSTALL inclus dans les sources
 logicielles.
 
-*Public* : Plongeurs loisirs, apnéistes, plongeurs Tek et plongeurs
+*Public* : Plongeurs loisirs, apnéistes, plongeurs Tek et plongeurs 
 professionnels
 
 toc::[]
@@ -75,31 +75,39 @@ image below).  For instance, typing the word "_weights_" into the search
 text box, searches throughout the user manual. To the right of the search
 text box are two arrows pointing up and down. These find the previous and
 the next occurrence of the search term.
-image::images/usermanualfunctions.jpg["User manual functions", align="center"]
+
+image::images/UserManualSearch.jpg["User manual functions", align="center"]
 
 
 _PREVIOUS/NEXT LINK_. Move between links (underlined words that jump to
 specific sections in the user manual) by right-clicking on the text of the
-manual.  This brings up a context menu to previous links selected.  (see
-image above). For instance if a link has been selected, then the option to
-_Go Back_ shows the text at the last link selected (similar to the Previous
-Page button in a browser). Conversely the _Go Forward_ option jumps to the
-text seen before selecting the _Go Back_ option. The _Reload_ option reloads
-the complete user manual into the window.
+manual.  This brings up a context menu to PREVIOUS links selected.  (see
+image below). For instance if a link has been selected, then the option to
+_Go Back_ shows the text at the previous link selected (similar to the
+Previous Page button in a browser). Conversely the _Go Forward_ option jumps
+to the text seen before selecting the _Go Back_ option. The _Reload_ option
+reloads the complete user manual into the window.
+
+image::images/UserManualLinksBack.jpg["User manual functions", align="center"]
+
+
 [[S_UserSurvey]]
 Le sondage utilisateur
 ----------------------
-In order to develop _Subsurface_ to serve its users in the best possible
-way, it’s important to have user information. Upon launching _Subsurface_
-and using the software for a week or so, a one-box user survey pops up. It
-is entirely optional and the user controls what, if any, data are sent to
-the _Subsurface_ development team. All data the user sends is useful, and
-will only be used to steer future development and to customize the software
-to fit the needs of the _Subsurface_ users. If you complete the survey, or
-click the option not to be asked again, that should be the last
-communication of this type you receive.  However, if your diving and/or
-subsurface habits change and you wish to fill in another survey, just launch
-_Subsurface_ with the _--survey_ option on the command line.
+Dans le but de développer _Subsurface_ pour servir ses utilisateurs de la
+meilleur manière qu'il soit, il est important d'avoir des informations sur
+les utilisateurs. À l'ouverture de _Subsurface_ après avoir utilisé le
+logiciel pendant une semaine environ, une fenêtre de sondage apparait. Cela
+est complètement optionnel et l'utilisateur contrôle quelles informations
+sont envoyées ou non à l'équipe de développement de _Subsurface_. Toutes les
+données que l'utilisateur envoie sont utiles et ne seront utilisées que pour
+les futurs développements et modifications du logiciel pour coller au mieux
+aux besoins des utilisateurs de _Subsurface_. Si vous complétez le sondage
+ou cliquez sur l'option pour ne plus être sondé, cela devrait être la
+dernière communication de ce type que vous recevrez. Cependant, si vos
+habitudes de plongées ou d'utilisation de Subsurface changent, vous pouvez
+envoyer un nouveau sondage en démarrant _Subsurface_ avec l'option
+_--survey_ sur la ligne de commande.
 
 [[S_StartUsing]]
 Commencer à utiliser le programme
@@ -110,40 +118,47 @@ principal* (Fichier Importer Journal Vue Aide) en haut de la fenêtre (pour
 Windows et Linux) ou en haut de l'écran (pour Mac et Ubuntu Unity). Les
 quatre panneaux sont :
 
-The *Dive List* on the bottom left, showing all the dives in the user's dive
-log. A dive can be selected and highlighted on the dive list by clicking on
-it. In most situations the up/down keys can be used to switch between
-dives. The *Dive List* is an important tool for manipulating a dive log.
-
-The *Dive Map* on the bottom right, showing the user's dive sites on a world
-map and centered on the site of the last dive selected in the *Dive List*.
-
-The *Info* on the top left, giving more detailed information on the dive
-selected in the *Dive List*, including some statistics for the selected dive
-or for all highlighted dive(s).
-
-The *Dive Profile* on the top right, showing a graphical dive profile of the
-selected dive in the *Dive List*.
-
-The dividers between panels can be dragged to change the size of any of the
-panels. _Subsurface_ remembers the position of the dividers, so the next
-time _Subsurface_ starts it uses the positions of the dividers from the last
-time the program was used.
-
-If a single dive is selected in the *Dive List*, the dive location, detailed
-information and profile of the _selected dive_ are shown in the respective
-panels. If several dives are selected, the last highlighted dive is the
-_selected dive_, but summary data of all _highlighted dives_ is shown in the
-*Stats* tab of the *Info* panel (maximum, minimum and average depths,
-durations, water temperatures and SAC; total time and number of dives
-selected).
+La *liste des plongées* en bas à gauche, affichant toutes les plongées du
+journal (carnet) de plongées de l'utilisateur. Une plongée peut être
+sélectionnée et mise en surbrillance dans la liste en cliquant dessus. Dans
+la plupart des cas, les touches haut/bas peuvent être utilisée pour passer
+d'une plongée à l'autre. La *liste des plongées* est un outil important pour
+manipuler un journal (carnet) de plongée.
+
+La *carte de plongée* en bas à droite, affiche les sites de plongées de
+l'utilisateur, sur une carte mondiale et centrée sur le site de la dernière
+plongée sélectionnée dans la *liste des plongées*.
+
+Les *informations* en haut à gauche, fournissent des informations détaillées
+sur la plongée sélectionnée dans la *liste des plongées*, dont des
+statistiques pour la plongée sélectionnée ou pour toutes les plongées mises
+en surbrillance.
+
+Le *profil de plongée* en haut à droite, affiche un profil de plongée
+graphique de la plongée sélectionnée dans la *liste des plongées*.
+
+Les séparateurs entre ces panneaux peuvent être déplacés pour modifier la
+taille de chaque panneau. _Subsurface_ mémorise la position de ces
+séparateurs, pour qu'au prochain lancement _Subsurface_ utilise ces
+positions.
+
+Si une unique plongée est sélectionnée dans la *liste des plongées*,
+l'emplacement de la plongée, les informations détaillées et le profil de la
+_plongée sélectionnée_ sont affichées dans les panneaux respectifs. Si
+plusieurs plongées sont sélectionnées, la dernière mise en surbrillance est
+la _plongée sélectionnée_, mais les données de _toutes les plongées mises en
+surbrillances_ sont affichées dans l'onglet *Stats* du panneau
+*informations* (profondeur maximale, minimale et moyenne, les durées, les
+températures de l'eau et le SAC (air consommé); temps total et nombre de
+plongées sélectionnées).
 
 [[S_ViewPanels]]
 
 image::images/main_window_f22.jpg["The Main Window", align="center"]
 
-The user decides which of the four panels are displayed by selecting the
-*View* option on the main menu. This feature has several choices of display:
+L'utilisateur décide quels panneaux sont affichés, parmi les 4, en
+sélectionnant l'option *Vue* dans le menu principal. Cette fonctionnalité
+permet plusieurs choix d'affichage :
 
 *Tout* : affiche les quatre panneaux tels que sur la capture d'écran ci-dessus.
 
@@ -154,37 +169,40 @@ The user decides which of the four panels are displayed by selecting the
 *Info* : affiche uniquement les notes de plongées de la dernière plongée sélectionnée et les statistiques pour
 toutes les plongées mises en surbrillance.
 
-*Globe*: Show only the world map, centered on the last selected dive.
+*Globe* : affiche uniquement la carte mondiale, centrée sur la dernière plongée sélectionnée.
 
-Like other functions that can be accessed via the Main Menu, these options
-can also be triggered using keyboard shortcuts. The shortcuts for a
-particular system are shown with an underline in the main menu
-entries. Since different Operating Systems and the user’s chosen language
-may cause _Subsurface_ to use different shortcut keys, they are not listed
-in this user manual.
+Comme d'autres fonctions qui peuvent être accédée via le menu principal, ces
+options peuvent aussi être utilisées par des raccourcis clavier. Les
+raccourcis pour un système particulier sont affichés avec un souligné des
+les entrées de menu. À cause des différents systèmes d'exploitation et des
+divers langues, _Subsurface_ peut utiliser différentes touches de raccourcis
+et ne sont donc pas détaillées ici.
 
-When the program is started for the first time, it shows no information at
-all, because it does not have any dive information available. In the
-following sections, the procedures to create a new logbook will be
-explained.
+Lorsque le programme est lancé pour la première fois, il n'affiche aucune
+information, parce qu'il n'a aucune information de plongée disponible. Dans
+les sections suivantes, le procédure pour créer a nouveau carnet de plongée
+sera détaillée.
 
 [[S_NewLogbook]]
 Créer un nouveau carnet de plongée
 ----------------------------------
-Select _File -> New Logbook_ from the main menu. All existing dive data are
-cleared so new information can be added. If there are unsaved data in an
-open logbook, the user is asked whether the open logbook should be saved
-before a new logbook is created.
+Sélectionner _Fichier -> Nouveau carnet de plongée_ à partir du menu
+principal. Toutes les données de plongées sont effacées pour que de
+nouvelles puissent être ajoutées. S'il existe des données non encore
+enregistrées dans le carnet ouvert, l'utilisateur devra sélectionner s'il
+faut les enregistrer ou non avant de créer le nouveau carnet.
 
 [[S_GetInformation]]
 == Enregistrement des informations de plongée dans le carnet
-Now that a new logbook is created, it is simple to add dive data it.
-_Subsurface_ allows several ways of adding dive data to a logbook.
+Maintenant qu'un nouveau carnet de plongée a été créé, il est simple de lui
+ajouter des données. _Subsurface_ comporte plusieurs façons pour ajouter des
+données de plongée au carnet.
 1) Si l'utilisateur possède un carnet manuscrit, un tableur ou une autre forme
-   de
+   de 
  carnet maintenu manuellement, les données de plongée peuvent être ajoutées
  au carnet en utilisant une des approches suivantes :
- - Enter dive information by hand. This is useful if the diver didn’t
+ - Entrer les informations de plongée à la main. Cela est utile si le plongeur
+   n'a pas
  utilisé d'ordinateur de plongée et que les plongées sont inscrites dans un
  carnet manuscrit. Voir  xref:S_EnterData[Entrer les informations de plongée
  à la main]
@@ -194,9 +212,9 @@ _Subsurface_ allows several ways of adding dive data to a logbook.
  soit dans un fichier CSV. Se reporter à : xref:S_Appendix_D[ANNEXE D :
  Exporter un tableur vers le format CSV] et à
  xref:S_ImportingCSVDives[Importer des plongées au format CSV].
-If a dive is recorded using a dive computer, the depth profile and a large
-amount of additional information can be accessed.  These dives can be
-imported from:
+Si une plongée est enregistrée par un ordinateur de plongée, le profil de
+profondeur et de nombreuses informations supplémentaires peuvent être
+obtenues. Ces plongées peuvent être importées à partir de :
  - L'ordinateur de plongée lui-même. Voir : xref:S_ImportDiveComputer[Importer
    de nouvelles informations de plongée à partir de l'ordinateur de plongée] ou
 
@@ -204,7 +222,7 @@ imported from:
    plongée. Voir
  xref:S_ImportingAlienDiveLogs[Importer les informations à partir d'autres
  sources de données numériques ou d'autres formats de données].
- - Spreadsheet or CSV files containing dive profiles.
+ - Tableur ou de fichiers CSV contenant les profils de plongées.
  Voir : xref:S_ImportingCSVDives[Importer les plongées au format CSV à partir
  des ordinateurs de plongées ou d'autres logiciels de carnet de plongée]
 
@@ -482,6 +500,7 @@ requires four steps:
 Select the Download dialogue by selecting _Import -> Import from dive
 computer_ from the *Main Menu*. If you check the box labelled _"Choose
 Bluetooth download mode"_, the dialogue below appears.
+
 ===== Sur Linux ou MacOS :
 
 image::images/DC_import_Bluetooth.jpg["FIGURE: Download Bluetooth", align="center"]
@@ -647,6 +666,7 @@ automatically supplied by
 _Subsurface_ (following the _Preferences_, metric or imperial units will
 be used).
 
+[[S_locations]]
 *Location*:
 [icon="images/icons/warning2.png"]
 [WARNING]
@@ -1231,8 +1251,131 @@ used. When encountering problems with _CSV_ imports, first try with a
 smaller file to make sure everything works.
 
 
-[[S_Companion]]
-=== Importing GPS coordinates with the _Subsurface Companion App_ for mobile phones
+=== Importing Dive coordinates from a mobile device with GPS.
+
+A smartphone with built-in GPS facilities can be used to store the locations
+of dives.  This is performed by:
+
+Taking the mobile device along on the dive boat / liveabord while
+automatically collecting dive site coordinate information.
+
+2) Uploading the coordinates from the mobile device to the _Subsurface_
+   Internet server.
+
+Syncronising the dives in the _Subsurface_ dive list with the coordinates
+stored on the _Subsurface_ Internet server.
+
+_Subsurface has two tools for achieving this:
+
+- The _Subsurface Companion App_ (Android and iOS).
+
+- The _Subsurface-mobile_ app (Android and iOS)
+
+Both of these applications perform the collection of dive site coordinates
+and the synchronisation with dives in the _Subsurface_ dive list. However,
+the Companion App is not being further developed and has largely been
+replaced by the _Subsurface-mobile_ app. While the _Companion app_ serves
+exclusively to collect dive site coordinates and to make these available to
+the _Subsurface_ desktop version, _Subsurface-mobile_ performs many of the
+functions of the desktop version, including the management and viewing of
+dive information. Below, we describe how to perform the above three steps
+using each of the two mobile apps.
+
+For information on using the _Subsurface Companion App_, click
+xref:S_iCompanion[_here_].
+
+==== Storing and and using GPS locations using  _Subsurface-mobile_
+
+===== Install _Subsurface-mobile_
+
+Find _Subsurface-mobile_ on Google Play and install it on an Android
+device. The app is free. The iOS version is currently
+experimental. _Subsurface-mobile_ has an extensive
+https://subsurface-divelog.org/documentation/subsurface-mobile-user-manual[user
+manual] accessible from within that app.
+
+===== Create a _Subsurface-mobile_ account
+
+This topic is discussed at length in the _Subsurface-mobile_ user manual. In
+the Credentials screen of _Subsurface-mobile_ provide an e-mail address and
+a user password that enables subsequent access. A PIN number is e-mailed
+from the _Subsurface_ Internet server to the e-mail address that has been
+provided.  Type the PIN into the appropriate text field in the Credentials
+screen (see image below).  The _Subsurface_ Internet server notifies the
+user that a new user has been registered.
+
+*N.B.:* To successfully create a user account, the mobile device must have Internet connectivity,
+either through the cellular network or via wifi.
+
+image::images/MobileCredentials.jpg["FIGURE: Subsurface-mobile, credentials screen", align="center"]
+
+
+===== Configure auto-collecting of GPS coordinates
+
+Activate the main menu of _Subsurface-mobile_ by selecting the "hamburger"
+menu button at the bottom left of the _Subsurface-mobile_ screen (see image
+above), then select _GPS_ -> _Preferences_ (see image below). The collection
+of GPS locations is done in the background and automatically, using two
+settings:
+
+- _Time threshold._ (minutes). The app will try to get a location every X
+  minutes
+
+- _Distance threshold._ (meters). Minimum distance between two locations.
+
+*How are GPS coordinates collected?* Assuming the diver sets 5 minutes and 50
+meters in the settings above, the app will start by recording a location at the current
+location, followed by another one at every 5 minutes *or* every time one moves 50 m
+from previous location, whichever happens first.
+If subsequent locations are within a radius of 50 meters from the previous one,
+a new location is not saved. If the diver is not moving, only one location is
+saved, at least until the _Time-threshold_ period has elapsed.
+If the diver moves, a trace of the route is obtained by saving a location every 50 meters.
+
+===== Activate the automated recording of GPS locations
+
+The _Subsurface-mobile_ main menu has a checkbox at the bottom left labled
+_Run location service_ (see image below). Checking the box starts the
+automated recording of GPS positions.
+
+image::images/MobileMenu.jpg["FIGURE: Subsurface-mobile main menu", align="center"]
+
+===== After the dive, stop the automated recording of GPS locations
+
+Uncheck the check box at the bottom left of the _Subsurface-mobile_ main
+menu.
+
+===== Upload the GPS locations onto the _Subsurface_ Internet server.
+
+*N.B.:* Uploading the GPS locations to the Internet can only take place if the mobile
+device has reliable access to the Internet, either via a cellular network or
+via a wifi connection. If the Internet is not accessible from the dive site(s),
+then GPS uploading can only take place after the dive or after the dive trip,
+when an Internet connection has been re-established.
+
+From the _Subsurface-mobile_ main menu, select _GPS_ -> _Upload GPS
+data_. The locations are uploaded. Check the indicator at the top of the
+mobile screen for internet activity, indicating the transfer of information.
+
+===== Apply the stored GPS locations to dives on the _Subsurface_ dive list.
+
+_Subsurface_ collects the first GPS location recorded after the start of a
+dive (obtained within _Subsurface_ from either the dive computer or from the
+manually-entered dive information) and before the end of a dive. These
+coordinates are shown in the _Coordinates_ field of the dive site panel for
+each dive. Within the dive site panel, provide a name for the coordinates
+that have been assigned to the dive, following the instructions under the
+heading above xref:S_locations[_Location_ management].
+
+The
+https://subsurface-divelog.org/documentation/subsurface-mobile-user-manual[user
+manual for _Subsurface-mobile_] (accessible from within that app)  contains
+detailed instructions for performing the collection of GPS data and for
+managing, uploading and synchronising this information.
+
+
+[[S_iCompanion]]
+==== Importing GPS coordinates with the _Subsurface Companion App_ for mobile phones
 
 Using the *Subsurface Companion App* on an _Android device_   or
 xref:S_iphone[_iPhone_] with GPS, the coordinates
@@ -1242,7 +1385,7 @@ stores dive locations on a dedicated Internet server. _Subsurface_ can collect
 the locations from the server.
 To do this:
 
-==== Create a Companion App account
+===== Create a Companion App account
 
 - Register on the http://api.hohndel.org/login/[_Subsurface companion web
   page_].  A confirmation email with instructions and a personal *DIVERID*
@@ -1254,7 +1397,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 an Android smartphone
+===== Using the Subsurface companion app on an Android smartphone
 
 On first use the app has three options:
 
@@ -1278,7 +1421,7 @@ the Default Preferences panel, by selecting _File -> Preferences ->
 Defaults_ from the main menu in _Subsurface_ itself.  This helps
 synchronization between _Subsurface_ and the Companion App.
 
-===== Creating new dive locations
+====== Creating new dive locations
 
 Now you are 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
@@ -1308,7 +1451,7 @@ image::images/Companion_5.jpg["FIGURE: Companion App, add location using map", a
   the tab in the upper right, after which the locations will be sent to the
   web service and added to the list on the Android device.
 
-===== Dive lists of dive locations
+====== Dive lists of dive locations
 
 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
@@ -1339,7 +1482,7 @@ Maps: Display a map showing the dive location.  After editing and saving a
 dive location (see *C* above), upload it to the web service, as explained
 below.
 
-===== Uploading dive locations
+====== Uploading dive locations
 
 There are several ways to send locations to the server.  The easiest is
 simply selecting the locations (See *A* below) and then touching the right
@@ -1357,19 +1500,18 @@ After a dive trip using the Companion App, all dive locations are ready to
 be downloaded to a _Subsurface_ dive log (see below).
 
 
-===== Settings on the Companion App
+====== Settings on the Companion App
 
 Selecting the _Settings_ menu option results in the right hand image above
 (*B*).
 
-===== Server and account
+====== Server and account
 
 - _Web-service URL._ This is predefined (http://api.hohndel.org/)
 
-- _User ID._ The DIVERID obtained by registering as described above. The
-  easiest way to get it is to copy and paste from the confirmation email or
-  just type it in.
-===== Synchronisation
+_User ID._ The DIVERID obtained by registering as described above. The
+easiest way to get it is to copy and paste from the confirmation email or
+just type it in.  ====== Synchronisation
 
 - _Synchronize on startup_. If selected, dive locations in the Android device
   and those on the web service synchronize each time the app is started.
@@ -1377,10 +1519,9 @@ Selecting the _Settings_ menu option results in the right hand image above
 - _Upload new dives._ If selected, each time the user adds a dive location it
   is automatically sent to the server.
 
-===== Background service
-Instead of entering an unique dive location, you can leave the service
-running in the background of your Android device, allowing a continuous
-collection of GPS locations.
+====== Background service Instead of entering an unique dive location, one
+can leave the service running in the background of your Android device,
+allowing a continuous collection of GPS locations.
 
 The settings below define the behavior of the service:
 
@@ -1402,7 +1543,7 @@ location is not saved. If the diver is not moving, only one location is
 saved.  If the diver is moving, a trace of the route is obtained by saving a
 location every 50 meters.
 
-===== Other
+====== Other
 
 _Mailing List._ The mail box for _Subsurface_. Users can send an email to
 the Subsurface mailing list.
@@ -1411,15 +1552,15 @@ the Subsurface mailing list.
 
 - _Version._ Displays the current version of the Companion App.
 
-===== Search
+====== Search
 
 Search the saved dive locations by name or by date and time.
 
-===== Start service
+====== Start service
 
 Starts the _background service_ following the previously defined settings.
 
-===== Disconnect
+====== Disconnect
 
 This is admittedly a badly named option that disconnects the app from the
 server.  It resets the user ID in the app, showing the first screen where an
@@ -1427,7 +1568,7 @@ account can be created, retrieve the ID for an existing account or use the
 users own ID. The disconnect option is useful if your Android device was
 used to download the dive locations of another registered diver.
 
-===== Send all locations
+====== Send all locations
 
 This option sends all locations stored in the Android device to the server.
 
@@ -1457,7 +1598,7 @@ dive list is automatically uploaded from the iPhone to the web
 service. There isn’t an option to trigger upload manually.
 
 
-==== Downloading dive locations to the _Subsurface_ divelog
+===== Downloading dive locations to the _Subsurface_ divelog
 
 Download dive(s) from a dive computer or enter them manually into
 _Subsurface_ before obtaining the GPS coordinates from the server. The
@@ -1993,12 +2134,12 @@ 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 colors:
 |====================
-|*Color*|*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
@@ -2063,6 +2204,7 @@ _Subsurface_ always shows a profile area large enough for at least 30 minutes
 and 30m
  (100ft) – this way short or shallow dives are easily recognizable;
 something free divers won’t care about.
+
 image::images/MeasuringBar.png["FIGURE: Measuring Bar", align="center"]
 
 [icon="images/icons/ruler.jpg"]
@@ -2144,7 +2286,7 @@ after 23 minutes. Cylinders with air are shown as a light blue bar.
 image::images/ShowCylinders_f20.jpg["Figure: Cylinder use graph", align="center"]
 
 
-[icon="images/tissues.jpg"]
+[icon="images/icons/tissues.jpg"]
 
 [NOTE]
 Display inert gas tissue pressures relative to ambient inert gas pressure
@@ -2561,13 +2703,14 @@ There are two ways to export dive information from Subsurface:
 [[S_facebook]]
 === Export des informations de plongée vers _Facebook_
 
-Export of dives to _Facebook_ is handled differently from other types of
-export because a connection to _Facebook_ is required, needing a _Facebook_
-userID and password.  If, from the *Main Menu*, you select _File ->
-Preferences -> Facebook_, a login screen comes up.  (image *A* to the left,
-below).  Provide a _Facebook_ userID and password.  Once logged into to
-_Facebook_ , the panel in image *B*, below is shown, including a _Disconnect
-from Facebook_ button to close the _Facebook_ connection.
+L'export des plongées vers _Facebook_ est géré différemment des autres types
+d'export car une connexion vers _Facebook_ est nécessaire, 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
+s'affiche (image *A* sur la gauche, ci dessous). Entrez l'identifiant et le
+mot de passe _Facebook_. Une fois connecté à _Facebook_, le panneau de
+l'image *B* ci dessous est affiché, avec un bouton _Déconnecter de Facebook_
+pour fermer la connexion _Facebook_.
 
 image::images/facebook1_f20.jpg["Figure: Facebook login", align="center"]
 
@@ -2577,25 +2720,26 @@ Facebook_ (image *A*, below). Normally, the _Facebook_ option is greyed
 out. But if there is a connection to _Facebook_, this option is active
 (i.e. in black color and can be selected).
 
-Having established a login to _Facebook_, transferring a dive profileto a
-_Facebook_ timeline is easy.  Be sure the dive to be transferred to the
-timeline is shown in the _Subsurface_ *Dive Profile* panel. If, from the
-*Main Menu*, you select _Share on -> Facebook_ (see image *A* below), a
-dialogue box is shown, determining the amount of additional information
-transferred along with the dive profile (image *B*, below). To transfer a
-dive profile to _Facebook_, the name of a _Facebook_ album is needed. The
-checkboxes on the left hand side let you decide 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 (image *B*,
-below). You can easily edit the message that will be posted with the dive
-profile.  After specifying the additional information and verifying the
-text, select the _OK_ button that triggers the transfer to _Facebook_. After
-the transfer is done, an acknowledgement dialogue appears, indicating it was
-successful.
-
-Both the album created and the post to your timeline will be marked as
-private. In order for friends to be able to see it, change its permissions
-from a regular Facebook login either in a browser or a Facebook app.
+Une fois qu'une connexion à _Facebook_ est établie, transférer un profil de
+plongée vers _Facebook_ est facile. Assurez-vous que la plongée à transférer
+est affichée dans le panneau *Profil de plongée* de _Subsurface_. Si, à
+partir du *menu principal*, vous sélectionnez _Partager sur -> Facebook_,
+une fenêtre s'affiche, pour déterminer quelles informations seront
+transférées avec le profil de plongée (voir l'image *B* ci-dessous). Pour
+transférer un profil de plongée vers _Facebook_, le nom d'un album
+_Facebook_ doit être fourni. Les cases à cocher sur la partie gauche
+permettent de sélectionner des informations supplémentaires à transférer
+avec le profil de plongée. Ces informations sont affichées dans le champs de
+texte sur la partie droite du panneau. (image *B* ci dessous). Vous pouvez
+facilement modifier le message qui sera envoyé avec le profil de
+plongée. Une fois les informations supplémentaires ajoutées et vérifiées,
+sélectionner le bouton _OK_ qui lance le transfert vers _Facebook_. Après un
+moment, une fenêtre apparait indiquant le succès du transfert.
+
+À la fois l'album créé et la publication sur votre ligne temporelle seront
+marquées comme privés. Pour que vos amis puissent la voir, modifier les
+permissions à partir d'une connexion Facebook standard depuis un navigateur
+ou l'application Facebook.
 
 image::images/facebook2_f20.jpg["Figure: Facebook login", align="center"]
 
@@ -2605,7 +2749,7 @@ principal et en cliquant sur le bouton approprié dans le panneau des
 préférences Facebook.
 
 [[S_Export_other]]
-=== Export dive information to other destinations or formats
+=== Exporter des informations de plongée vers d'autres destinations ou formats
 For non-_Facebook exports_, the export function can be found 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
@@ -2871,16 +3015,16 @@ information on how to write or modify a template.
 [[S_Configure]]
 == Configurer un ordinateur de plongée
 
-_Subsurface_ lets you 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. To begin, be sure the appropriate hardware
-driver is installed for the dive computer (also required for downloading
-dives) and 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.
+_Subsurface_ vous permet de configurer un 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. Pour s'assurer que
+les pilotes pour votre ordinateur de plongée sont installés (également
+nécessaire pour télécharger les plongées) 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,
+ANNEXE 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
@@ -2890,8 +3034,8 @@ plongée à partir du panneau à gauche (voir l'image ci-dessous).
 
 image::images/Configure_dc_f20.jpg["FIGURE: Configure dive computer", align="center"]
 
-Using the appropriate buttons on the configuration panel, the following
-actions can be done:
+En utilisant les boutons appropriés du panneau de configuration, les actions
+suivantes peuvent être effectué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.
@@ -3091,17 +3235,18 @@ from one's ISP.
 
 
 [[S_Facebook]]
-=== Facebook Access
-This panel lets you log into a Facebook account in order to transfer
-information from Subsurface to Facebook.
+=== Accès Facebook
+Ce panneau vous permet de vous connecter à votre compte Facebook pour
+transférer des informations de Subsurface vers Facebook.
 
 image::images/Pref6_f20.jpg["FIGURE: Facebook login panel", align="center"]
 
-If you provide a valid Facebook userID and password, a connection to
-Facebook is created. That connection is closed when one closing down
-Subsurface. Currently the checkbox labelled "Keep me logged in to
-Subsurface", on the login screen has no effect.  See the section
-xref:S_facebook[Exporting dive profiles to Facebook] for more information.
+Si un identifiant Facebook et un mot de passe valides ont été fournis, une
+connexion vers Facebook est créée. Cette connexion est fermée lorsque
+Subsurface est fermé. Pour le moment, la case à cocher nommée "Conserver ma
+connexion à Subsurface", sur l'écran de connexion, n'a aucun
+effet. Reportez-vous à la section xref:S_facebook[Export des profils de
+plongée vers Facebook] pour plus d'informations.
 
 === Georeference
 
@@ -3533,14 +3678,15 @@ des sections de ce manuel traitant des opérations relatives.
 === Fichier
 - <<S_NewLogbook,_Nouveau carnet de plongée_>> - Fermer le carnet de plongée
   actuellement ouvert et supprime toutes les informations de plongées.
-- _Open logbook_ - Open the file manager to select a dive logbook to open.
+- _Ouvrir un carnet de plongée_ - Ouvre une fenêtre pour sélectionner le
+  carnet de plongée à ouvrir.
 - _Open cloud storage_ - Open the dive log previously saved in
   <<S_Cloud_storage,_Cloud storage_>>.
-- _Save_ - Save the dive logbook currently open.
+- _Sauvegarder_ - Enregistrer le carnet de plongée actuellement ouvert.
 - _Save to cloud storage_ - Save the current dive log to
   <<S_Cloud_storage,_Cloud storage_>>.
 - _Enregsitrer sous_ - Enregistrer le carnet actuel sous un nom différent.
-- _Close_ - Close the dive logbook currently open.
+- _Fermer_ - Fermer le carnet de plongée actuellement ouvert.
 - <<S_ExportLog,_Exporter_>> - Exporter le carnet de plongée actuellement
   ouvert (ou les plongées sélectionnées dans le carnet) vers un des nombreux
   formats.
@@ -3630,9 +3776,9 @@ des sections de ce manuel traitant des opérations relatives.
 === Assurez-vous que les pilotes (drivers) nécessaires sont installés
 [icon="images/icons/drivers.jpg"]
 [NOTE]
-The operating system of the desktop computer needs the appropriate drivers
-in order to communicate with the dive computer, the way the dive computer
-prefers (e.g. Bluetooth, USB, infra-red).
+Le système d'exploitation de l'ordinateur nécessite les bons pilotes pour
+communiquer avec l'ordinateur de plongée de la façon utilisée par
+l'ordinateur de plongée (Bluetooth, USB, infra-rouge).
 
 	* Sous Linux, les utilisateurs doivent avoir le bon module noyau de chargé. La
 	  plupart des distributions Linux le font automatiquement, de telle sorte que
@@ -3656,11 +3802,12 @@ de documents et logiciels Silicon Labs].
 === Comment trouver le nom du périphérique branché sur USB et paramétrer les permissions en écriture
 [icon="images/icons/usb.jpg"]
 [NOTE]
-When connecting a dive computer by using a USB connector, usually
-_Subsurface_ will either propose a drop down list with the correct device
-name (or mount point for the Uemis Zurich), or it will disable the device
-select drop down if no device name is needed at all. In the rare cases where
-this doesn't work, here are some ways to find out what the device name is:
+Lors de la connexion d'un ordinateur de plongée en utilisant l'USB,
+_Subsurface_ proposera généralement soit une liste déroulante avec le bon
+nom (ou le point de montage pour un Uemis Zurich) ou la liste sera
+désactivée si aucun nom de périphérique n'est nécessaire. Dans les rares cas
+où cela ne fonctionnerait pas, voici quelques méthodes pour trouver le nom
+de votre périphérique ;
 
 .Sur Windows :
 
@@ -3705,22 +3852,24 @@ détecté et connecté sur +ttyUSB3+. Cette information peut à présent être
 utilisée pour les paramètres d'importation en tant que +/dev/ttyUSB3+ pour
 que Subsurface utilise le bon port USB.
 
-Ensuring the user has write permission to the USB serial port:
+S'assurer que l'utilisateur possède les droits d'écriture sur le port série
+USB :
 
-On Unix-like operating systems the USB ports can only be accessed by users
-who are members special group that can be e.g.  +dialout+ or +uucp+. This
-can be verified by listing the appropriate device permissions e.g. by +ls -l
-/dev/ttyUSB0+. Note that the number in the file name depends on how many USB
-devices you have connected, and must be adjusted appropriately.  If one is
-not root, one may not be a member of that group and won't be able to use the
-USB port. Let us assume one's username is 'johnB'.
+Sur les systèmes similaires à Unix, les ports USB ne peuvent être accédés
+que par des utilisateurs membres d'un groupe spécial qui peut être +dialout+
+ou +uucp+. Cela peut être vérifié en listant les permissions associées au
+périphérique, par exemple via +ls - l /dev/ttyUSB0+. Notez que le numéro
+dans le nom de fichier dépend du nombre de périphériques USB que vous avez
+branchés et peut être ajusté au besoin.Si vous n'êtes pas root, vous n'êtes
+peut-être pas membre de ce groupe et ne pouvez donc pas utiliser le port
+USB. Admettons que votre nom d'utilisateur est 'johnB'.
 
 En tant que root, tapez : usermod -a -G dialout johnB+ (utilisateurs
 d'Ubuntu : +sudo usermod -a -G dialout johnB+)  Cela ajoute johnB au groupe
 +dialout+.
 Tapez : +id johnB+     Cela liste tous les groupes auquel johnB appartient et
-vérifiez que
-l'appartenance au groupe est bien effectif. Le groupe +dialout+ devrait
+vérifiez que 
+l'appartenance au groupe est bien effectif. Le groupe +dialout+ devrait 
 être listé
 parmi les différents IDs.
 Sous certaines circonstances, les modifications ne prennent effet qu'après une déconnexion
@@ -4259,19 +4408,21 @@ do is save the log file in Subsurface.
 == ANNEXE D : Exporter un tableur vers le format CSV
 [[S_Appendix_D]]
 
-Many divers keep a dive log in some form of digital file, commonly a
-spreadsheet with various fields of information. These logs can be easily
-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 to
-_Subsurface_.  Creating a .CSV is straightforward, although the procedure is
-somewhat different according to which spreadsheet program is used.
-
-Organize the diving data in the spreadsheet, so the first row contains the
-names (or titles) of each column and the information for each dive is stored
-in a single row.  _Subsurface_ supports many data items (Dive number, Date,
-Time, Duration, Location, GPS, Max Depth, Mean Depth, Buddy, Notes, Weight
-and Tags).  Organize dive data following a few simple rules:
+De nombreux plongeurs conservent un carnet de plongée sous forme de fichier
+numérique, souvent un tableur avec différents champs et informations. Ces
+données peuvent facilement être importées dans _Subsurface_ après que le
+tableur a été converti en fichier CSV. Cette section explique la procedure
+pour convertir un carnet de plongée enregistrée sous forme de tableur vers
+un fichier CSV qui pourra ensuite être importé dans _Subsurface_. Créer un
+fichier CSV est simple malgré que la procédure soit différente selon le
+tableur utilisé.
+
+Organiser les données de plongées dans le tableur pour que la première ligne
+contienne le nom (ou le titre) de chaque colonne et que les informations de
+chaque plongée soient contenues sur une seule ligne. _Subsurface_ supporte
+de nombreux éléments (Dive #, Date, Time, Duration, Location, GPS, Max
+Depth, Mean Depth, Buddy, Notes, Weight et Tags).  Organiser les données de
+plongées selon quelques règles simples :
 
 1. Date : utiliser un des formats suivants : aaaa-mm-jj, jj.mm.aaaa, mm/jj/aaaa
 2. Durée : le format est minutes:secondes.
-- 
1.8.4.5



More information about the subsurface mailing list