Documentation: add mobile user manual to POT/PO management and update french translation of user-manual and mobile-manual

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

10 files changed, 12742 insertions, 10512 deletions

diff --git a/Documentation/50-pot/subsurface-mobile-manual.pot b/Documentation/50-pot/subsurface-mobile-manual.pot
new file mode 100644
index 000000000..45a130b64
--- /dev/null
+++ b/Documentation/50-pot/subsurface-mobile-manual.pot
@@ -0,0 +1,632 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the subsurface-manual package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: subsurface-manual VERSION\n"
+"Report-Msgid-Bugs-To: subsurface@subsurface-divelog.org\n"
+"POT-Creation-Date: 2016-03-12 13:31+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#.  :website: http://subsurface-divelog.org
+#. type: Target for macro image
+#: mobile-manual.txt:14
+#, no-wrap
+msgid "mobile-images/banner.jpg"
+msgstr ""
+
+#. type: Plain text
+#: mobile-manual.txt:17
+msgid "[big]#Subsurface-mobile for Android: USER MANUAL#"
+msgstr ""
+
+#. type: Plain text
+#: mobile-manual.txt:19
+#, no-wrap
+msgid "*Manual author*: Willem Ferguson\n"
+msgstr ""
+
+#. type: Plain text
+#: mobile-manual.txt:21
+msgid "toc::[]"
+msgstr ""
+
+#. type: Plain text
+#: mobile-manual.txt:23
+msgid "[blue]#_Version 1.0, March 2016_#"
+msgstr ""
+
+#. type: Plain text
+#: mobile-manual.txt:31
+msgid ""
+"Welcome as a user of _Subsurface_, advanced dive logging software with "
+"extensive infrastructure to describe, organize, interpret and print scuba "
+"and free dives. _Subsurface_ offers many advantages over other similar "
+"software solutions, including compatibility with Windows, Mac-OS/X, Linux "
+"(many distributions) and Android (iOS under development). In addition, "
+"_Subsurface_ is open-source software that allows downloading dive "
+"information from most dive computers."
+msgstr ""
+
+#. type: Title -
+#: mobile-manual.txt:33
+#, no-wrap
+msgid "Introducing Subsurface-mobile"
+msgstr ""
+
+#. type: Plain text
+#: mobile-manual.txt:40
+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 "
+"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."
+msgstr ""
+
+#. type: Plain text
+#: mobile-manual.txt:43
+msgid ""
+"A version of _Subsurface-mobile_ for iOS is under development but not yet "
+"ready for testing."
+msgstr ""
+
+#. type: Plain text
+#: mobile-manual.txt:53
+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."
+msgstr ""
+
+#. type: Plain text
+#: mobile-manual.txt:55
+msgid "_Subsurface-mobile_ allows one to:"
+msgstr ""
+
+#. type: Plain text
+#: mobile-manual.txt:57
+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."
+msgstr ""
+
+#. type: Plain text
+#: mobile-manual.txt:60
+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."
+msgstr ""
+
+#. type: Plain text
+#: mobile-manual.txt:62
+msgid "Store the updated dive log on the Internet."
+msgstr ""
+
+#. type: Plain text
+#: mobile-manual.txt:63
+msgid "Record, store and apply GPS positions of dives."
+msgstr ""
+
+#. type: Plain text
+#: mobile-manual.txt:65
+msgid "View the localities of recorded GPS positions and of dives on a map."
+msgstr ""
+
+#. type: Plain text
+#: mobile-manual.txt:72
+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 "
+"devices, but this is not yet ready for testing."
+msgstr ""
+
+#. type: Title ==
+#: mobile-manual.txt:73
+#, no-wrap
+msgid "Installing _Subsurface-mobile_ on an Android device"
+msgstr ""
+
+#. type: Plain text
+#: mobile-manual.txt:77
+msgid ""
+"Find _Subsurface-mobile_ in the _Google Play Store_. Search for "
+"_Subsurface-mobile_ and install it."
+msgstr ""
+
+#. type: Title ==
+#: mobile-manual.txt:78
+#, no-wrap
+msgid "Using _Subsurface-mobile_ for the first time"
+msgstr ""
+
+#. type: Plain text
+#: mobile-manual.txt:84
+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)."
+msgstr ""
+
+#. type: Target for macro image
+#: mobile-manual.txt:85
+#, no-wrap
+msgid "mobile-images/landingscreen.jpg"
+msgstr ""
+
+#. type: Plain text
+#: mobile-manual.txt:93
+#, no-wrap
+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"
+msgstr ""
+
+#. type: Plain text
+#: mobile-manual.txt:102
+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."
+msgstr ""
+
+#. type: Title ==
+#: mobile-manual.txt:104
+#, no-wrap
+msgid "Local copy of the dive log and synchronisation with Internet"
+msgstr ""
+
+#. type: Plain text
+#: mobile-manual.txt:114
+msgid ""
+"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 "
+"copy. If not, the local copy and the copy on the server are synchronised."
+msgstr ""
+
+#. type: Title ==
+#: mobile-manual.txt:115
+#, no-wrap
+msgid "A Few Remarks About The User Interface"
+msgstr ""
+
+#. type: Plain text
+#: mobile-manual.txt:124
+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."
+msgstr ""
+
+#. type: Target for macro image
+#: mobile-manual.txt:125
+#, no-wrap
+msgid "mobile-images/actionbutton.jpg"
+msgstr ""
+
+#. type: Plain text
+#: mobile-manual.txt:132
+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 "
+"different user interaction philosophy based on the Kirigami framework "
+"developed by the Plasma developers. To open the main menu one has three "
+"options:"
+msgstr ""
+
+#. type: Plain text
+#: mobile-manual.txt:135
+msgid ""
+"Tap on the right-arrow symbol in the lower left corner of the screen (easy "
+"to reach for hand held devices)"
+msgstr ""
+
+#. type: Plain text
+#: mobile-manual.txt:136
+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"
+msgstr ""
+
+#. type: Target for macro image
+#: mobile-manual.txt:139
+#, no-wrap
+msgid "mobile-images/menu.jpg"
+msgstr ""
+
+#. type: Plain text
+#: mobile-manual.txt:145
+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. 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."
+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
+#, no-wrap
+msgid "Viewing the Dive List"
+msgstr ""
+
+#. type: Plain text
+#: mobile-manual.txt:161
+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 "
+"at the bottom of the screen, indicating that the cloud is being accessed "
+"(see image on left, below). Once the list is loaded one can scroll up and "
+"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."
+msgstr ""
+
+#. type: Target for macro image
+#: mobile-manual.txt:162
+#, no-wrap
+msgid "mobile-images/divelist.jpg"
+msgstr ""
+
+#. type: Plain text
+#: mobile-manual.txt:166
+msgid ""
+"One can view other dives by swiping the _Details view_ to the right (for the "
+"previous dive) or to the left (following dive)."
+msgstr ""
+
+#. type: Title ==
+#: mobile-manual.txt:167
+#, no-wrap
+msgid "Editing dive details."
+msgstr ""
+
+#. type: Plain text
+#: mobile-manual.txt:177
+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 "
+"edit boxes that allows one to change the existing dive information, "
+"e.g. adding text to the dive notes or changing the names or values of some "
+"of the information (see image below).  It may be necessary to scroll the "
+"window to access all the information.  At the bottom of the edit screen is a "
+"_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."
+msgstr ""
+
+#. type: Target for macro image
+#: mobile-manual.txt:178
+#, no-wrap
+msgid "mobile-images/editdive.jpg"
+msgstr ""
+
+#. type: Title ==
+#: mobile-manual.txt:180
+#, no-wrap
+msgid "Adding a new dive to the dive list"
+msgstr ""
+
+#. type: Plain text
+#: mobile-manual.txt:191
+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 "
+"_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 "
+"right-hand image shows the same dive in _Details View_."
+msgstr ""
+
+#. type: Target for macro image
+#: mobile-manual.txt:192
+#, no-wrap
+msgid "mobile-images/createdive.jpg"
+msgstr ""
+
+#. type: Title ==
+#: mobile-manual.txt:194
+#, no-wrap
+msgid "Deleting a dive"
+msgstr ""
+
+#. type: Plain text
+#: mobile-manual.txt:201
+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."
+msgstr ""
+
+#. type: Title ==
+#: mobile-manual.txt:202
+#, no-wrap
+msgid "Dive log management"
+msgstr ""
+
+#. type: Plain text
+#: mobile-manual.txt:212
+#, no-wrap
+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"
+msgstr ""
+
+#. type: Title ===
+#: mobile-manual.txt:213
+#, no-wrap
+msgid "Add new dive manually"
+msgstr ""
+
+#. type: Plain text
+#: mobile-manual.txt:216
+msgid "This is described above under the section dealing with the dive list."
+msgstr ""
+
+#. type: Title ===
+#: mobile-manual.txt:217
+#, no-wrap
+msgid "Upload dive log to the _Subsurface_ cloud storage"
+msgstr ""
+
+#. type: Plain text
+#: mobile-manual.txt:223
+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."
+msgstr ""
+
+#. type: Title ===
+#: mobile-manual.txt:224
+#, no-wrap
+msgid "Download dive log from the cloud storage"
+msgstr ""
+
+#. type: Plain text
+#: mobile-manual.txt:229
+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."
+msgstr ""
+
+#. type: Title ===
+#: mobile-manual.txt:230
+#, no-wrap
+msgid "Changing the login credentials on the _Subsurface_ cloud"
+msgstr ""
+
+#. type: Plain text
+#: mobile-manual.txt:236
+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 "
+"credentials, open the main menu and tap _Cloud credentials_. This opens the "
+"setup screen for specifying new credentials."
+msgstr ""
+
+#. type: Title ==
+#: mobile-manual.txt:238
+#, no-wrap
+msgid "Recording dive locations using GPS."
+msgstr ""
+
+#. type: Plain text
+#: mobile-manual.txt:244
+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 "
+"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:"
+msgstr ""
+
+#. type: Title ===
+#: mobile-manual.txt:245
+#, no-wrap
+msgid "Setting up the GPS"
+msgstr ""
+
+#. type: Plain text
+#: mobile-manual.txt:253
+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). One can specify that data are collected at regular intervals, "
+"e.g. every 10 minutes, or at regular distances, e.g. after the boat has "
+"moved more than 200m, or a combination of both of the above "
+"approaches. Provide the appropriate information and tap the _Save_ action "
+"button. The program is now ready to collect GPS positions."
+msgstr ""
+
+#. type: Target for macro image
+#: mobile-manual.txt:254
+#, no-wrap
+msgid "mobile-images/gpssetup.jpg"
+msgstr ""
+
+#. type: Title ===
+#: mobile-manual.txt:256
+#, no-wrap
+msgid "Collecting GPS positions"
+msgstr ""
+
+#. type: Plain text
+#: mobile-manual.txt:265
+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, "
+"above).  Check this box and _Subsurface-mobile_ starts to collect GPS "
+"locations automatically, following the preferences specified as described "
+"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."
+msgstr ""
+
+#. type: Title ===
+#: mobile-manual.txt:266
+#, no-wrap
+msgid "Storing the GPS data on the _Subsurface_ cloud"
+msgstr ""
+
+#. type: Plain text
+#: mobile-manual.txt:273
+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_ "
+"that saves the GPS data on the _Subsurface_ cloud server. These GPS data are "
+"saved *separately* from the other dive log data. All collected GPS data are "
+"kept on the Android device, independent of whether they have been uploaded "
+"or not."
+msgstr ""
+
+#. type: Title ===
+#: mobile-manual.txt:274
+#, no-wrap
+msgid "Downloading GPS data from the _Subsurface_ cloud"
+msgstr ""
+
+#. type: Plain text
+#: mobile-manual.txt:278
+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
+#, no-wrap
+msgid "Viewing GPS data"
+msgstr ""
+
+#. type: Plain text
+#: mobile-manual.txt:290
+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 "
+"on left, below). Two actions are possible for each of the locations, enabled "
+"if one taps the handle (the three horisontal stripes on the right, see image "
+"on left, below) and then drags the specific item to the left (image on "
+"right, below). This exposes two options. Tapping the dustbin deletes this "
+"particular GPS location. Tapping the teardrop-shaped icon (actually a Google "
+"Maps pin) opens up Google Maps with a pin indicating the exact map position "
+"of the GPS record being viewed. The two above options can be hidden by "
+"drawing the GPS record to the right, again using the handle."
+msgstr ""
+
+#. type: Target for macro image
+#: mobile-manual.txt:291
+#, no-wrap
+msgid "mobile-images/gpsmanagement.jpg"
+msgstr ""
+
+#. type: Title ===
+#: mobile-manual.txt:293
+#, no-wrap
+msgid "Applying GPS data to dives in the dive log"
+msgstr ""
+
+#. type: Plain text
+#: mobile-manual.txt:301
+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 "
+"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."
+msgstr ""
diff --git a/Documentation/50-pot/subsurface-manual.pot b/Documentation/50-pot/subsurface-user-manual.pot
index 934925a38..5165de7ae 100644
--- a/Documentation/50-pot/subsurface-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@subsurface-divelog.org\n"
-"POT-Creation-Date: 2015-10-29 10:38+0100\n"
+"POT-Creation-Date: 2016-03-12 13:31+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -19,18 +19,18 @@ msgstr ""
 
 #.  :website: http://subsurface-divelog.org
 #. type: Target for macro image
-#: ./user-manual.txt:14
+#: user-manual.txt:14
 #, no-wrap
 msgid "images/Subsurface4Banner.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:17
+#: user-manual.txt:17
 msgid "[big]#USER MANUAL#"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:20
+#: user-manual.txt:20
 #, no-wrap
 msgid ""
 "*Manual authors*: Willem Ferguson, Jacco van Koll, Dirk Hohndel, Reinout "
@@ -40,72 +40,67 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:22
+#: user-manual.txt:22
 msgid "[blue]#_Version 4.5, October 2015_#"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:28
+#: user-manual.txt:28
 msgid ""
 "Welcome as a user of _Subsurface_, an advanced dive logging program with "
-"extensive infrastructure to describe, organise, interpret and print scuba "
+"extensive infrastructure to describe, organize, interpret and print scuba "
 "and free dives. _Subsurface_ offers many advantages over other similar "
 "software solutions:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:31
+#: user-manual.txt:31
 msgid ""
 "Do you need a flexible way of logging dives using recreational equipment, "
-"even not using a dive computer?"
+"even without a dive computer?"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:37
+#: user-manual.txt:37
 msgid ""
 "Do you use two different dive computer brands, each with its own proprietary "
 "software for downloading dive logs? Do you dive with rebreathers as well as "
 "open circuit or recreational equipment? Do you use a Reefnet Sensus "
-"time-depth recorder in conjunction with a dive computer? _Subsurface_ offers "
-"a standard interface for downloading dive logs from all these different "
-"pieces of equipment and to store and analyse the dive logs within a unified "
+"time-depth recorder along with a dive computer? _Subsurface_ offers a "
+"standard interface for downloading dive logs from all of these different "
+"pieces of equipment, storing and analyzing the dive logs within a unified "
 "system."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:40
+#: user-manual.txt:40
 msgid ""
 "Do you use more than one operating system? _Subsurface_ is fully compatible "
-"with Mac, Linux and Windows, allowing you to access your dive log on each of "
-"your operating systems using a single application."
+"with Mac, Linux and Windows, letting you access your dive log on each "
+"operating system using a single application."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:43
+#: user-manual.txt:43
 msgid ""
-"Do you use Linux or Mac and your dive computer has only Windows-based "
+"Do you use Linux or Mac, but your dive computer has only Windows- based "
 "software for downloading dive information (e.g. Mares)? _Subsurface_ "
-"provides a way of downloading and analysing your dive logs on other "
+"provides a way of downloading and analyzing your dive logs on other "
 "operating systems."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:45
+#: user-manual.txt:45
 msgid ""
-"Do you need an intuitive graphical dive planner that integrates with and "
-"takes into account the dives that have already been logged?"
+"Do you need an intuitive graphical dive planner that integrates with, and "
+"takes into account, dives you’ve already logged?"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:47
+#: user-manual.txt:51
 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 browser?"
-msgstr ""
-
-#. type: Plain text
-#: ./user-manual.txt:52
-msgid ""
+"letting you view your dive log from anywhere using an Internet browser? "
 "_Subsurface_ binaries are available for Windows PCs (Win XP or later), Intel "
 "based Macs (OS/X) and many Linux distributions. _Subsurface_ can be built "
 "for many more hardware platforms and software environments where Qt and "
@@ -113,10 +108,10 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:61
+#: user-manual.txt:60
 msgid ""
-"The scope of this document is the use of the _Subsurface_ program. To "
-"install the software, consult the _Downloads_ page on the "
+"This manual explains how to use the _Subsurface_ program. To install the "
+"software, consult the _Downloads_ page on the "
 "http://subsurface-divelog.org/[_Subsurface_ web site].  Please discuss "
 "issues with this program by sending an email to "
 "mailto:subsurface@subsurface-divelog.org[our mailing list] and report bugs "
@@ -126,7 +121,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:64
+#: user-manual.txt:63
 #, no-wrap
 msgid ""
 "*Audience*: Recreational Scuba Divers, Free Divers, Tec Divers, "
@@ -135,18 +130,18 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:66
+#: user-manual.txt:65
 msgid "toc::[]"
 msgstr ""
 
 #. type: Title -
-#: ./user-manual.txt:69
+#: user-manual.txt:68
 #, no-wrap
 msgid "Using this manual"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:72
+#: user-manual.txt:71
 msgid ""
 "When opened from within _Subsurface_, this manual does not have external "
 "controls for paging or selecting previous pages. However, two facilities are "
@@ -154,69 +149,65 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:79
+#: user-manual.txt:78
 msgid ""
 "The _SEARCH_ function is activated by pressing control-F or command-F on the "
 "keyboard. A text box appears at the bottom right-hand of the window (see "
-"image below).  For instance, if one typed the word \"_weights_\" into the "
-"search text box, this word will be searched for throughout this user "
-"manual. To the right of the search text box are two arrows pointing upwards "
-"and downwards. Selecting these allow finding, respectively, the previous and "
-"the next occurence of the term being searched for."
+"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."
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:80
+#: user-manual.txt:78
 #, no-wrap
 msgid "images/usermanualfunctions.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:91
+#: user-manual.txt:90
 msgid ""
-"_PREVIOUS/NEXT LINK_. One can move between links (underlined words allowing "
-"one to jump to specific sections in this user manual) by right-clicking on "
-"the text of the manual.  This brings up a context menu for jumping to "
-"previous links selected while reading the manual (see image above). For "
-"instance if a link in the manual has been selected, then the option to _Go "
-"Back_ shows the text at the last link that was selected (similar to the "
-"Previous Page button in a browser). Conversely the _Go Forward_ option "
-"enables jumping to the text perused before selecting the _Go Back_ "
-"option. The _Reload_ option causes the complete user manual to be reloaded "
-"into the user manual window."
+"_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."
 msgstr ""
 
 #. type: Title -
-#: ./user-manual.txt:94
+#: user-manual.txt:92
 #, no-wrap
 msgid "The user survey"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:106
+#: user-manual.txt:103
 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."
+"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."
 msgstr ""
 
 #. type: Title -
-#: ./user-manual.txt:109
+#: user-manual.txt:106
 #, no-wrap
 msgid "Start Using the Program"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:114
+#: user-manual.txt:111
 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 "
@@ -225,92 +216,90 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:120
+#: user-manual.txt:117
 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."
+"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 ""
 
 #. type: Plain text
-#: ./user-manual.txt:124
+#: user-manual.txt:120
 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*."
+"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:128
+#: user-manual.txt:124
 msgid ""
-"The *Info* to the top left, giving more detailed information on the dive "
+"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)."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:131
+#: user-manual.txt:127
 msgid ""
-"The *Dive Profile* to the top right, showing a graphical dive profile of the "
+"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:136
+#: user-manual.txt:131
 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."
+"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."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:144
+#: user-manual.txt:139
 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)."
+"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)."
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:147
+#: user-manual.txt:142
 #, no-wrap
 msgid "images/main_window_f22.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:152
+#: user-manual.txt:146
 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:"
+"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:154
+#: user-manual.txt:148
 #, no-wrap
 msgid "*All*: show all four of the panels as in the screenshot above.\n"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:156
+#: user-manual.txt:150
 #, no-wrap
 msgid "*Divelist*: Show only the Dive List.\n"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:158
+#: user-manual.txt:152
 #, no-wrap
 msgid "*Profile*: Show only the Dive Profile of the selected dive.\n"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:161
+#: user-manual.txt:155
 #, no-wrap
 msgid ""
 "*Info*: Show only the Notes about the last selected dive and statistics "
@@ -319,91 +308,90 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:163
+#: user-manual.txt:157
 #, no-wrap
-msgid "*Globe*: Show only the world map, centred on the last selected dive.\n"
+msgid "*Globe*: Show only the world map, centered on the last selected dive.\n"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:169
+#: user-manual.txt:163
 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 "
+"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 chosen language may "
-"cause _Subsurface_ to use different shortcut keys they are not listed here "
-"in the user manual."
+"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."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:173
+#: user-manual.txt:167
 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."
+"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 ""
 
 #. type: Title -
-#: ./user-manual.txt:176
+#: user-manual.txt:170
 #, no-wrap
 msgid "Creating a new logbook"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:181
+#: user-manual.txt:175
 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 "
+"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."
 msgstr ""
 
 #. type: Title ==
-#: ./user-manual.txt:183
+#: user-manual.txt:177
 #, no-wrap
 msgid "Storing dive information in the logbook"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:188
+#: user-manual.txt:180
 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."
+"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:190
+#: user-manual.txt:181
 msgid "If the user has a handwritten divelog, a spreadsheet or another form of"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:192
+#: user-manual.txt:183
 msgid ""
 "manually maintained divelog, dive data can be added to the logbook using one "
 "of these approaches:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:194
-msgid "Enter dive information by hand. This is useful if the diver did not"
+#: user-manual.txt:184
+msgid "Enter dive information by hand. This is useful if the diver didn’t"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:196
+#: user-manual.txt:186
 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:198
+#: user-manual.txt:188
 msgid "Import dive log information that has been maintained either as a spreadsheet"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:200
+#: user-manual.txt:190
 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 "
@@ -411,294 +399,288 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:202
-msgid "If one has dives recorded using a dive computer, the depth profile of the"
-msgstr ""
-
-#. type: Plain text
-#: ./user-manual.txt:204
+#: user-manual.txt:193
 msgid ""
-"dive and a large amount of additional information can be accessed. These "
-"dives can be imported from:"
+"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 ""
 
 #. type: Plain text
-#: ./user-manual.txt:206
+#: user-manual.txt:194
 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:208
+#: user-manual.txt:196
 msgid "Proprietary software distributed by manufacturers of dive computers. Refer"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:209
+#: user-manual.txt:197
 msgid ""
 "to: xref:S_ImportingAlienDiveLogs[Importing dive information from other "
 "digital data sources or other data formats]."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:211
-msgid "Import from spreadsheet or CSV files containing dive profiles."
+#: user-manual.txt:198
+msgid "Spreadsheet or CSV files containing dive profiles."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:212
+#: user-manual.txt:199
 msgid ""
 "See: xref:S_ImportingCSVDives[Importing dives in CSV format from dive "
 "computers or other dive log software]"
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:215
+#: user-manual.txt:202
 #, no-wrap
 msgid "Entering dive information by hand"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:229
+#: user-manual.txt:217
 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 "
 "information in a simple dive logbook usually includes dive type, date, time, "
-"duration, depth, the names of your dive buddy and of the dive master or dive "
+"duration, depth, the names of your dive buddy and the dive master or dive "
 "guide, and some remarks about the dive. _Subsurface_ can store much more "
-"information than this for each dive. In order to add a dive to a dive log, "
-"select _Log -> Add Dive_ from the Main Menu. The program then shows three "
-"panels to enter information for a dive: two tabs in the *Info* panel "
-"(*Notes* and *Equipment*), as well as the *Dive Profile* panel that displays "
-"a graphical profile of each dive. These panels are respectively marked "
-"[red]#A#, [red]#B# and [red]#C# in the figure below. Each of these tabs will "
-"now be explained for data entry."
+"information for each dive.  To add a dive to a dive log, select _Log -> Add "
+"Dive_ from the Main Menu. The program then shows three panels on which to "
+"enter information for a dive: two tabs in the *Info* panel (*Notes* and "
+"*Equipment*), as well as the *Dive Profile* panel that displays a graphical "
+"profile of each dive. These panels are respectively marked [red]#A#, "
+"[red]#B# and [red]#C# in the figure below. Each of these tabs will now be "
+"explained for data entry."
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:230
+#: user-manual.txt:218
 #, no-wrap
 msgid "images/AddDive1_f22.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:235
+#: user-manual.txt:222
 msgid ""
-"When one edits a field in Notes or Equipment panels, _Subsurface_ enters "
+"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 "
 "*Notes* panel (see the image below). This message is displayed in all the "
 "panels under Notes and Equipment when in *Editing Mode*."
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:236 ./user-manual.txt:807
+#: user-manual.txt:223 user-manual.txt:782
 #, no-wrap
 msgid "images/BlueEditBar_f22.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:243
+#: user-manual.txt:231
 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_, "
 "_Equipment_ and _Profile_ tabs should be completed before saving the "
 "information. By selecting the _Apply changes_ button, a local copy of the "
-"information for this specific dive is saved in memory. When one closes "
-"Subsurface, the program will ask again, this time whether the complete dive "
-"log should be saved on disk or not."
+"information for this specific dive is saved in memory. The _Apply changes_ "
+"button should ONLY be selected after all parts of a dive have been "
+"entered. When you close Subsurface, the program will ask again, this time "
+"whether the complete dive log should be saved on disk or not."
 msgstr ""
 
 #. type: Title ====
-#: ./user-manual.txt:245
+#: user-manual.txt:233
 #, no-wrap
 msgid "Creating a Dive Profile"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:252
+#: user-manual.txt:240
 msgid ""
 "The *Dive Profile* (a graphical representation of the depth of the dive as a "
-"function of time) is indicated in the panel on the top right hand of the "
+"function of time) is shown in the panel on the top right hand of the "
 "_Subsurface_ window. When a dive is manually added to a logbook, "
 "_Subsurface_ presents a default dive profile that needs to be modified to "
-"best represent the dive being described:"
+"best represent the dive described:"
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:253
+#: user-manual.txt:241
 #, no-wrap
 msgid "images/DiveProfile1_f20.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:271
+#: user-manual.txt:259
 msgid ""
 "_Modifying the dive profile_: When the cursor is moved around the dive "
-"profile, its position is indicated by two right-angled red lines as shown "
-"below.  The time and depth represented by the cursor are indicated at the "
-"top of the black information box (@ and D). The units (metric/imperial) on "
-"the axes are determined by the *Preference* settings. The dive profile "
-"itself comprises several line segments demarcated by waypoints (white dots "
-"on the profile, as shown above). The default dive depth is 15 m.  If the "
-"dive depth was 20 m then the user needs to drag the appropriate waypoints "
-"downwards to represent 20 m. To add a waypoint, double-click on any line "
-"segment. To move an additional waypoint, drag it.  To remove this waypoint, "
-"right-click on it and choose \"Remove this point\" from the context "
-"menu. Drag the waypoints to represent an accurate time duration for the "
-"dive. Below is a dive profile for a dive to 20 m for 30 min, followed by a 5 "
-"minute safety stop at 5 m."
+"profile, its position is shown by two right-angled red lines as seen below.  "
+"The time and depth represented by the cursor are indicated at the top of the "
+"black information box (@ and D). The units (metric/imperial) on the axes are "
+"determined by the *Preference* settings. The dive profile itself comprises "
+"several line segments demarcated by waypoints (white dots on the profile, as "
+"shown above). The default dive depth is 15 m.  If the dive depth was 20 m "
+"then you need to drag the appropriate waypoints downward to 20 m. To add a "
+"waypoint, double-click on any line segment. To move an additional waypoint, "
+"drag it.  To remove a waypoint, right-click on it and choose \"Remove this "
+"point\" from the context menu. Drag the waypoints to represent an accurate "
+"time duration for the dive. Below is a dive profile for a dive to 20 m for "
+"30 min, followed by a 5 minute safety stop at 5 m."
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:272
+#: user-manual.txt:260
 #, no-wrap
 msgid "images/DiveProfile2_f20.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:284
+#: user-manual.txt:272
 msgid ""
-"_Specifying the gas composition:_ The gas composition used is clearly "
-"indicated along the line segments of the dive profile. This defaults to the "
-"first gas mixture specified in the *Equipment* tab, which was air in the "
-"case of the profile above. The gas mixtures of segments of the dive profile "
-"can be edited. This is done by right-clicking on the particular waypoint and "
-"selecting the appropriate gas from the context menu. Changing the gas for a "
-"waypoint affects the gas shown in the segment _to the left_ of that "
-"waypoint. Note that only the gases defined in the *Equipment* tab appear in "
-"the context menu (see image below)."
+"_Specifying the gas composition:_ The gas composition used is indicated "
+"along the line segments of the dive profile. This defaults to the first gas "
+"mixture specified in the *Equipment* tab, which was air in the case of the "
+"profile above. The gas mixtures of segments of the dive profile can be "
+"changed by right-clicking on the particular waypoint and selecting the "
+"appropriate gas from the context menu. Changing the gas for a waypoint "
+"affects the gas shown in the segment _to the left_ of that waypoint. Note "
+"that only the gases defined in the *Equipment* tab appear in the context "
+"menu (see image below)."
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:285
+#: user-manual.txt:273
 #, no-wrap
 msgid "images/DiveProfile3_f20.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:292
+#: user-manual.txt:280
 msgid ""
-"With the profile having been defined, more details must be added in order to "
-"have a fuller record of the dive. To do this, the *Notes* and the "
-"*Equipment* tabs on the top left hand of the _Subsurface_ window should be "
-"used. Click on xref:S_Notes_dc[*this link*] for instructions to use these "
-"tabs."
+"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 "
+"top left hand of the _Subsurface_ window should be used. Click on "
+"xref:S_Notes_dc[*this link*] for instructions on how to use these tabs."
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:294
+#: user-manual.txt:281
 #, no-wrap
 msgid "Importing new dive information from a Dive Computer"
 msgstr ""
 
 #. type: Title ====
-#: ./user-manual.txt:296
+#: user-manual.txt:283
 #, no-wrap
 msgid "Connecting and importing data from a dive computer."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:307
+#: user-manual.txt:293
 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, "
 "rates of ascent/descent and of gas partial pressures. _Subsurface_ can "
-"capture this information and present it as part of the dive information, "
-"using dive information from a wide range of dive computers. The latest list "
-"of supported dive computers can be found at: "
+"capture this information, using dive details from a wide range of dive "
+"computers. The latest list of supported dive computers can be found at: "
 "link:http://subsurface-divelog.org/documentation/supported-dive-computers/[ "
 "Supported dive computers]."
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: ./user-manual.txt:308 ./user-manual.txt:676 ./user-manual.txt:3061
+#: user-manual.txt:294 user-manual.txt:654 user-manual.txt:3026
 #, no-wrap
 msgid "images/icons/warning2.png"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:319
+#: user-manual.txt:304
 msgid ""
-"Several dive computers consume more power when they are in their "
-"PC-Communication mode. **This could drain the dive computer's battery**. We "
-"therefore recommend that the user checks if the dive computer is charged "
-"when connected to the USB port of a PC. For example, several Suunto and "
-"Mares dive computers do not recharge through the USB connection. Users "
-"should refer to the dive computer's manual if they are unsure whether the "
-"dive computer recharges its batteries while connected to the USB port."
+"Several dive computers consume more power when they are in PC-Communication "
+"mode. **This could drain the dive computer's battery**. We recommend the "
+"user checks to be sure the dive computer is charged when connected to the "
+"USB port of a PC. For example, several Suunto and Mares dive computers do "
+"not recharge through the USB connection. Users should refer to the dive "
+"computer's manual if they are unsure whether the dive computer recharges its "
+"batteries while connected to the USB port."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:335
+#: user-manual.txt:320
 msgid ""
 "To import dive information from a dive computer to a computer with "
-"_Subsurface_, it is necessary that the two pieces of equipment communicate "
-"with one another.  This involves setting up the communications port (or "
-"mount point) of the computer with _Subsurface_ that communicates with the "
-"dive computer. In order to set up this communication, one needs to find the "
-"appropriate information to instruct _Subsurface_ where and how to import the "
-"dive information.  "
+"_Subsurface_, the two pieces of equipment must communicate with one "
+"another.  This involves setting up the communications port (or mount point) "
+"of the computer with _Subsurface_ that communicates with the dive "
+"computer. To set up this communication, users need to find the appropriate "
+"information to instruct _Subsurface_ where and how to import the dive "
+"information.  "
 "xref:_appendix_a_operating_system_specific_information_for_importing_dive_information_from_a_dive_computer[Appendix "
-"A] provides the technical information to help the user achieving this for "
+"A] provides the technical information to help the user achieve this for "
 "different operating systems and "
 "xref:_appendix_b_dive_computer_specific_information_for_importing_dive_information[Appendix "
 "B] has dive computer specific information."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:338
+#: user-manual.txt:322
 msgid ""
-"After this, the dive computer can be hooked up to the user's PC, which can "
-"be achieved by following these steps:"
+"After this, the dive computer can be hooked up to the user's PC using these "
+"steps:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:340
+#: user-manual.txt:324
 msgid "The interface cable should be connected to a free USB port (or the Infra-red"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:341
+#: user-manual.txt:325
 msgid "or Bluetooth connection set up as described later in this manual)"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:343
+#: user-manual.txt:327
 msgid "The dive computer should be placed into PC Communication mode."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:344
+#: user-manual.txt:328
 msgid "(Refer to the manual of the specific dive computer)"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:348
+#: user-manual.txt:332
 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:350
+#: user-manual.txt:334
 #, no-wrap
 msgid "images/DC_import_f20.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:358
+#: user-manual.txt:342
 msgid ""
-"Dive computers tend to keep a certain number of dives in their memory, even "
-"though these dives have already been imported to _Subsurface_. For that "
-"reason, if the dive computer allows this, _Subsurface_ only imports dives "
-"that have not been uploaded before. This makes the download process faster "
-"on most dive computers and also saves battery power of the dive computer (at "
-"least for those not charging while connected via USB)."
+"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 "
+"the dive computer allows this, _Subsurface_ only imports dives that have not "
+"been uploaded before. This makes the download process faster on most dive "
+"computers and also saves battery power of the dive computer (at least for "
+"those not charging while connected via USB)."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:365
+#: user-manual.txt:349
 msgid ""
 "The dialogue has two drop-down lists, *Vendor* and *Dive Computer*. On the "
 "*vendor* drop-down list select the make of the computer, e.g.  Suunto, "
@@ -708,7 +690,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:376
+#: user-manual.txt:360
 msgid ""
 "The *Device or Mount Point* drop-down list contains the USB or Bluetooth "
 "port name that _Subsurface_ needs in order to communicate with the dive "
@@ -717,20 +699,19 @@ msgid ""
 "A] and "
 "xref:_appendix_b_dive_computer_specific_information_for_importing_dive_information[Appendix "
 "B] for technical details on how to find the appropriate port information for "
-"a particular dive computer and, in some cases, how to do the correct "
-"settings to the operating system of the computer on which _Subsurface_ is "
-"running."
+"a specific dive computer and, in some cases, how to do the correct settings "
+"to the operating system of the computer on which _Subsurface_ is running."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:386
+#: user-manual.txt:370
 msgid ""
 "If all the dives on the dive computer need to be downloaded, check the "
 "checkbox _Force download of all dives_. Normally, _Subsurface_ only "
 "downloads dives after the date-time of the last dive in the *Dive List* "
-"panel. If one or more of your dives in _Subsurface_ have been accidentally "
+"panel. If one or more of your dives in _Subsurface_ has been accidentally "
 "deleted or if there are older dives that still need to be downloaded from "
-"the dive computer, this checkbox needs to be activated. Some dive computers "
+"the dive computer, this box needs to be checked. Some dive computers "
 "(e.g. Mares Puck) do not provide a contents list to _Subsurface_ before the "
 "download in order to select only new dives.  Consequently, for these dive "
 "computers, all dives are downloaded irrespective of the status of this check "
@@ -738,60 +719,60 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:392
+#: user-manual.txt:376
 msgid ""
 "If the checkbox _Always prefer downloaded dives_ has been checked and, "
 "during download, dives with identical date-times exist on the dive computer "
 "and on the _Subsurface_ *Dive List* panel, the dive in the _Subsurface_ "
-"divelog will be overwritten by the dive record from the dive computer."
+"divelog will be overwritten by the dive record from the computer."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:395
+#: user-manual.txt:379
 msgid ""
 "The checkbox marked _Download into new trip_ ensures that, after upload, the "
 "downloaded dives are grouped together as a new trip(s) in the *Dive List*."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:399
+#: user-manual.txt:383
 msgid ""
 "Do *not* check the checkboxes labelled _Save libdivecomputer logfile_ and "
 "_Save libdivecomputer dumpfile_. These are only used as diagnostic tools "
-"when problems with downloads are experienced (see below)."
+"when there are problems with downloads(see below)."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:419
+#: user-manual.txt:402
 msgid ""
-"Then select the _Download_ button.  With communication established, one can "
+"Then select the _Download_ button.  With communication established, you can "
 "see how the data are retrieved from the dive computer.  Depending on the "
 "make of the dive computer and/or number of recorded dives, this could take "
 "some time. Be patient. The _Download_ dialogue shows a progress bar at the "
-"bottom of the dialogue (for some dive computers the progress information "
-"could be inaccurate as we cannot determine how much downloadable data there "
-"is until all data have been downloaded). After successful download, Dialogue "
-"*B* in the figure above appears.  After the dives have been downloaded, they "
-"appear in a tabular format on the right-hand side of the dialogue (see image "
-"*B*, above). Each dive comprises a row in the table, with the date, duration "
-"and depth shown. Next to each dive is a checkbox: check all the dives that "
-"need to be transferred to the *Dive List*. In the case of the image above, "
-"the last six dives are checked and will be transferred to the *Dive "
-"List*. Then click the _OK_ button at the bottom of the dialogue. All the "
-"imported dives appear in the *Dive List*, sorted by date and "
-"time. Disconnect and switch off the dive computer to conserve its battery "
-"power."
+"bottom of the dialogue.  Remember for some dive computers progress "
+"information could be inaccurate since the program doesn’t know how much "
+"downloadable data there is until the download is complete. After successful "
+"download, Dialogue *B* in the figure above appears.  After the dives have "
+"been downloaded, they appear in a tabular format on the right-hand side of "
+"the dialogue (see image *B*, above). Each dive comprises a row in the table, "
+"with the date, duration and depth shown. Next to each dive is a checkbox: "
+"check all the dives that need to be transferred to the *Dive List*. In the "
+"case of the image above, the last six dives are checked and will be "
+"transferred to the *Dive List*. Then click the _OK_ button at the bottom of "
+"the dialogue. All the imported dives appear in the *Dive List*, sorted by "
+"date and time. Disconnect and switch off the dive computer to conserve its "
+"battery power."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:424
+#: user-manual.txt:407
 msgid ""
-"After this has been completed, select the OK button.  The checked dives are "
-"transferred to the *Dive List*."
+"Then click the OK button.  The checked dives are transferred to the *Dive "
+"List*."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:428
+#: user-manual.txt:411
 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 "
@@ -799,52 +780,52 @@ msgid ""
 msgstr ""
 
 #. type: delimited block *
-#: ./user-manual.txt:432
+#: user-manual.txt:415
 #, no-wrap
 msgid "*PROBLEMS WITH DATA DOWNLOAD FROM A DIVE COMPUTER?*\n"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: ./user-manual.txt:432 ./user-manual.txt:542 ./user-manual.txt:586 ./user-manual.txt:599 ./user-manual.txt:1176 ./user-manual.txt:1242 ./user-manual.txt:1295 ./user-manual.txt:1371 ./user-manual.txt:1685
+#: 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
 #, no-wrap
 msgid "images/icons/important.png"
 msgstr ""
 
 #. type: delimited block *
-#: ./user-manual.txt:435
+#: user-manual.txt:418
 msgid "Check the following:"
 msgstr ""
 
 #. type: delimited block *
-#: ./user-manual.txt:438
+#: user-manual.txt:421
 msgid "Is the dive computer still in PC-communication or Upload mode?"
 msgstr ""
 
 #. type: delimited block *
-#: ./user-manual.txt:441
+#: user-manual.txt:423
 msgid ""
-"Is the battery of the dive computer fully charged? If not then the battery "
-"must be charged or replaced."
+"Is the dive computer’s battery fully charged? If not then charge or replace "
+"it."
 msgstr ""
 
 #. type: delimited block *
-#: ./user-manual.txt:445
+#: user-manual.txt:427
 msgid ""
-"Is the connecting cable faulty? Does the cable work perfectly using other "
-"software? Has it worked before, or is this the first time the cable is being "
-"used? Are the contacts on the dive computer and the cable clean?"
+"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 "
+"the contacts on the dive computer and the cable clean?"
 msgstr ""
 
 #. type: delimited block *
-#: ./user-manual.txt:450
+#: user-manual.txt:432
 msgid ""
 "Consult "
 "xref:_appendix_a_operating_system_specific_information_for_importing_dive_information_from_a_dive_computer[Appendix "
-"A] and make sure that the correct Mount Point was specified (see above)."
+"A] to be sure the correct Mount Point was specified (see above)."
 msgstr ""
 
 #. type: delimited block *
-#: ./user-manual.txt:454
+#: user-manual.txt:436
 msgid ""
 "On Unix-like operating systems, does the user have write permission to the "
 "USB port? If not, consult "
@@ -853,20 +834,19 @@ msgid ""
 msgstr ""
 
 #. type: delimited block *
-#: ./user-manual.txt:462
+#: user-manual.txt:444
 msgid ""
-"If the _Subsurface_ computer does not recognise the USB adaptor by showing "
+"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 "
-"possibility that the cable or USB adaptor is faulty. A faulty cable is the "
-"most common cause of communication failure between dive computer and "
-"_Subsurface_ computer. It is also possible that the _Subsurface_ computer "
-"cannot interpret the data. Perform a download for diagnostic purposes with "
-"the following two check boxes checked in the download dialogue discussed "
-"above:"
+"possibility the cable or USB adaptor is faulty. A faulty cable is the most "
+"common cause of communication failure between a dive computer and "
+"_Subsurface_ computer. It’s also possible the _Subsurface_ computer cannot "
+"interpret the data. Perform a download for diagnostic purposes with the "
+"following two boxes checked in the download dialogue discussed above:"
 msgstr ""
 
 #. type: delimited block *
-#: ./user-manual.txt:465
+#: user-manual.txt:447
 #, no-wrap
 msgid ""
 "\tSave libdivecomputer logfile\n"
@@ -874,20 +854,20 @@ msgid ""
 msgstr ""
 
 #. type: delimited block *
-#: ./user-manual.txt:471
+#: user-manual.txt:453
 #, no-wrap
 msgid ""
 "*Important*: These check boxes are only used when problems are encountered\n"
-"during the download process: under normal circumstances they should not be "
+"during the download process. Under normal circumstances they should not be "
 "checked.\n"
-"When checking these boxes, the user is prompted to select a folder to\n"
-"save the information to. The default folder is the one in which the "
+"When checking these boxes, the user is prompted to select a folder where the "
+"information will be saved. The default folder is the one in which the\n"
 "_Subsurface_\n"
 "dive log is kept.\n"
 msgstr ""
 
 #. type: delimited block *
-#: ./user-manual.txt:475
+#: user-manual.txt:457
 #, no-wrap
 msgid ""
 "*Important:* _After downloading with the above checkboxes\n"
@@ -896,7 +876,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block *
-#: ./user-manual.txt:478
+#: user-manual.txt:460
 #, no-wrap
 msgid ""
 "\tsubsurface.log\n"
@@ -904,133 +884,113 @@ msgid ""
 msgstr ""
 
 #. type: delimited block *
-#: ./user-manual.txt:484
+#: user-manual.txt:466
 msgid ""
 "These files should be send to the _Subsurface_ mail list: "
 "_subsurface@subsurface-divelog.org_ with a request for the files to be "
-"analysed. Provide the dive computer make and model as well as contextual "
+"analyzed. Provide the dive computer make and model as well as contextual "
 "information about the dives recorded on the dive computer."
 msgstr ""
 
 #. type: Title ====
-#: ./user-manual.txt:487
+#: user-manual.txt:469
 #, no-wrap
 msgid "Connecting _Subsurface_ to a Bluetooth-enabled dive computer"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: ./user-manual.txt:488 ./user-manual.txt:3606
+#: user-manual.txt:470 user-manual.txt:3578
 #, no-wrap
 msgid "images/icons/bluetooth.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:495
+#: user-manual.txt:477
 msgid ""
 "Bluetooth is becoming a more common way of communication between dive "
-"computers and _Subsurface_, for instance, the Shearwater Petrel Mk2 and the "
-"OSTC Mk3. _Subsurface_ provides a largely operating system independent "
+"computers and _Subsurface_, for or instance, the Shearwater Petrel Mk2 and "
+"the OSTC Mk3. _Subsurface_ provides a largely operating system independent "
 "Bluetooth interface. Setting up _Subsurface_ for Bluetooth communication "
 "requires four steps:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:497
-msgid ""
-"Ensure that Bluetooth is activated on the host computer running "
-"_Subsurface_."
+#: user-manual.txt:479
+msgid "Be sure Bluetooth is activated on the host computer running _Subsurface_."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:498
-msgid "Ensure that _Subsurface_ sees the Bluetooth adapter on the host computer."
+#: user-manual.txt:480
+msgid "Be sure _Subsurface_ sees the Bluetooth adapter on the host computer."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:499
+#: user-manual.txt:481
 msgid ""
-"Ensure the Bluetooth-enabled dive computer is Bluetooth-discoverable and in "
+"Be sure the Bluetooth-enabled dive computer is Bluetooth-discoverable and in "
 "PC upload mode."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:500
-msgid "Ensure that _Subsurface_ is paired with the Bluetooth-enabled dive computer."
+#: user-manual.txt:482
+msgid "Be sure _Subsurface_ is paired with the Bluetooth-enabled dive computer."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:504
+#: user-manual.txt:486
 msgid ""
 "Select the Download dialogue by selecting _Import -> Import from dive "
-"computer_ from the *Main Menu*. If one checks the check box labelled "
-"_\"Choose Bluetooth download mode\"_, the dialogue below appears."
+"computer_ from the *Main Menu*. If you check the box labelled _\"Choose "
+"Bluetooth download mode\"_, the dialogue below appears."
 msgstr ""
 
 #. type: Title =====
-#: ./user-manual.txt:505
+#: user-manual.txt:486
 #, no-wrap
 msgid "On Linux or MacOS:"
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:507
+#: user-manual.txt:488
 #, no-wrap
 msgid "images/DC_import_Bluetooth.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:515
+#: user-manual.txt:519
 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 lefthand "
+"and its Bluetooth address are shown on the right hand side, On the left hand "
 "side, if the computer has connected more than one local Bluetooth devices "
 "the user can use the list box to indicate which one needs to connect to "
 "_Subsurface_.  The power state (on/off) of the Bluetooth adapter is shown "
-"below the address and can be changed by checking the _Turn on/off_ check "
-"box."
-msgstr ""
-
-#. type: Plain text
-#: ./user-manual.txt:520
-msgid ""
-"If the Bluetooth address is not shown, then _Subsurface_ does not see the "
-"local Bluetooth device. Ensure that the Bluetooth driver is installed "
-"correctly on the _Subsurface_ computer and check if it can be used by other "
-"Bluetooth utilities like _bluetoothctl_ or _bluemoon_. This achieves the "
-"first two steps above."
-msgstr ""
-
-#. type: Plain text
-#: ./user-manual.txt:524
-msgid ""
-"Ensure that the Bluetooth-enabled dive computer is in PC-upload mode and "
-"that it is discoverable by other Bluetooth devices. Consult the manual of "
-"the dive computer to perform this. Now the third item in the list above has "
-"been achieved."
-msgstr ""
-
-#. type: Plain text
-#: ./user-manual.txt:540
-msgid ""
-"Select the _Scan_ button towards the bottom left of the dialogue "
-"above. After searching for a small amount of time, the dive computer should "
-"be listed (perhaps as one of a number of Bluetooth devices) in the main list "
-"box on the lefthand side of the dialogue (see image above). If this is not "
-"achieved, select the _Clear_ button and then scan again for Bluetooth "
-"devices using the _Scan_ button. After performing these actions _Subsurface_ "
-"should see the dive computer.  The label of the discovered dive computer "
-"contains the name of the device, its address and its pairing status. If the "
-"device is not paired and has a red background colour, a context menu can be "
-"opened by selecting the item with a right-click.  Select the the _Pair_ "
-"option and wait for the task to complete. If this dive computer is being "
-"paired to Subsurface for the first time, it is possible that Subsurface will "
-"request a Pass Code or PIN number. The most commonly-used Pass Code is 0000, "
-"and this works for the Shearwater Petrel. If necessary, consult the user "
-"manual of the dive computer being used."
+"below the address and can be changed by checking the _Turn on/off_ box.  If "
+"the Bluetooth address is not shown, then _Subsurface_ does not see the local "
+"Bluetooth device. Be sure the Bluetooth driver is installed correctly on the "
+"_Subsurface_ computer and check if it can be used by other Bluetooth "
+"utilities like _bluetoothctl_ or _bluemoon_. This finishes the first two "
+"steps above.  Be sure the Bluetooth-enabled dive computer is in PC-upload "
+"mode and it is discoverable by other Bluetooth devices. Consult the manual "
+"of the dive computer for more information. Now the third item in the list "
+"above has been finished.  Select the _Scan_ button towards the bottom left "
+"of the dialogue above. After searching, the dive computer should be listed "
+"(perhaps as one of a number of Bluetooth devices) in the main list box on "
+"the lefthand side of the dialogue (see image above). If this does not work, "
+"select the _Clear_ button, then scan again for Bluetooth devices using the "
+"_Scan_ button. After taking these actions _Subsurface_ should see the dive "
+"computer.  The label of the discovered dive computer contains the name of "
+"the device, its address and its pairing status. If the device is not paired "
+"and has a red background color, a context menu can be opened by selecting "
+"the item with a right-click.  Select the the _Pair_ option and wait for the "
+"task to complete. If this dive computer is being paired to Subsurface for "
+"the first time, it’s possible Subsurface will request a Pass Code or PIN "
+"number. The most commonly-used Pass Code is 0000, and this works for the "
+"Shearwater Petrel. If necessary, consult the user manual of the dive "
+"computer being used."
 msgstr ""
 
 #. type: delimited block *
-#: ./user-manual.txt:547
+#: user-manual.txt:526
 msgid ""
 "Currently _Subsurface_ does not support Bluetooth pairing with dive "
 "computers that require a custom PIN code. In order to pair the devices, use "
@@ -1038,12 +998,12 @@ msgid ""
 msgstr ""
 
 #. type: delimited block *
-#: ./user-manual.txt:549
+#: user-manual.txt:528
 msgid "One way to achieve this is to use +bluetoothctl+:"
 msgstr ""
 
 #. type: delimited block *
-#: ./user-manual.txt:560
+#: user-manual.txt:539
 #, no-wrap
 msgid ""
 "\t$ bluetoothctl\n"
@@ -1059,66 +1019,65 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:566
+#: user-manual.txt:545
 msgid ""
-"After the devices are paired the _Save_ button of the dialogue can be "
-"pressed.  This closes the Bluetooth dialogue. Now select _Download_ in the "
-"_Download from dive computer_ dialogue which should still be open. The "
-"downloaded dives are shown on the righthand side of the download dialogue."
+"After the devices are paired, press the _Save_ button of the dialogue.  This "
+"closes the Bluetooth dialogue. Now select _Download_ in the _Download from "
+"dive computer_ dialogue which should still be open. The downloaded dives are "
+"shown on the righthand side of the download dialogue."
 msgstr ""
 
 #. type: Title ====
-#: ./user-manual.txt:567 ./user-manual.txt:3537 ./user-manual.txt:3621
+#: user-manual.txt:546 user-manual.txt:3505 user-manual.txt:3593
 #, no-wrap
 msgid "On Windows:"
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:568
+#: user-manual.txt:547
 #, no-wrap
 msgid "images/DC_import_Bluetooth_Windows.png"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:578
+#: user-manual.txt:557
 msgid ""
 "On _Windows_ platforms the _Local Bluetooth device details section_ on the "
-"right is not displayed as is the case on the Linux/Mac implementations.  To "
-"successfully initiate a scan (by pressing the _Scan_ button)  check that the "
-"Bluetooth device on the _Subsurface_ computer is turned on by selecting the "
-"dive computer from the list of available Bluetooth devices (see image "
-"above). If the dive computer is accessed by Subsurface for the first time, "
-"it is possible that Subsurface will request a Pass Code/PIN number. Supply "
-"the Pass Code recommended in the user manual of the dive computer.  A Pass "
-"Code of 0000 is often appropriate."
+"right is not displayed as is the case on the Linux/Mac systems.  To start a "
+"scan (by pressing the _Scan_ button)  check that the Bluetooth device on the "
+"_Subsurface_ computer is turned on by selecting the dive computer from the "
+"list of available Bluetooth devices (see image above). If the dive computer "
+"is being accessed by Subsurface for the first time, it’s possible Subsurface "
+"will request a Pass Code or PIN number. Supply the Pass Code recommended in "
+"the user manual of the dive computer.  A Pass Code or PIN of 0000 is often "
+"the default."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:585
+#: user-manual.txt:564
 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 "
-"permissions and put a message on the right side of the screen: _Add a "
-"device, Tap to set up your DC device_. Always allow this pairing. After a "
-"discovered item is selected, select the _Save_ button.  Finally select the "
-"_Download_ button on the _Download_ dialogue and wait for the process to "
-"complete."
+"permission and put a message on the right side of the screen: _Add a device, "
+"Tap to set up your DC device_. Always allow this pairing. After a discovered "
+"item is selected, select the _Save_ button.  Finally select the _Download_ "
+"button on the _Download_ dialogue and wait for the process to complete."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:593
+#: user-manual.txt:572
 msgid ""
 "Currently _Subsurface_ works only with local Bluetooth adapters which use "
 "Microsoft Bluetooth Stack. If the local device uses _Widcomm_, _Stonestreet "
-"One Bluetopia Bluetooth_ or _BlueSoleil_ drivers it will definitely not "
-"work. However, Bluetooth hardware/dongles from these manufacturers "
-"(e.g. iSonic) that support the Microsoft Bluetooth Stack do work."
+"One Bluetopia Bluetooth_ or _BlueSoleil_ drivers it will not work. However, "
+"Bluetooth hardware/dongles from these manufacturers (e.g. iSonic) that "
+"support the Microsoft Bluetooth Stack do work."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:598
+#: user-manual.txt:577
 msgid ""
-"A log messageOn the bottom left of the _Remote Bluetooth device selection_ "
+"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 "
 "another dive computer for download using the \"Remote Bluetooth selection "
 "dialogue\" press the three-dots button from the _\"Choose Bluetooth download "
@@ -1126,7 +1085,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:608
+#: user-manual.txt:587
 #, no-wrap
 msgid ""
 "*IN CASE OF PROBLEMS*:  If the Bluetooth adapter from the _Subsurface_ "
@@ -1141,105 +1100,102 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: ./user-manual.txt:611
+#: user-manual.txt:590
 #, no-wrap
 msgid "Changing the name of a dive computer"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:627
+#: user-manual.txt:606
 msgid ""
 "It may be necessary to distinguish between different dive computers used to "
-"upload dive logs to _Subsurface_. For instance if one's partner's dive "
-"computer is the same make and model as one's own and dive logs are uploaded "
-"from both dive computers to the same _Subsurface_ computer, then one would "
-"perhaps like to call one dc \"Alice's Suunto D4\" and the other one \"Bob's "
-"Suunto D4\". Alternatively, consider a technical diver dives with two or "
-"more dive computers of the same model, the logs of both (or all) being "
-"uploaded.  In this case it might be prudent to call one of them \"Suunto D4 "
-"(1)\" and another one \"Suunto D4 (2)\". This is easily done in "
-"_Subsurface_.  On the *Main Menu*, select _Log -> Edit device names_. A "
-"dialog opens, indicating the current Model, ID and Nickname of the dive "
-"computers used for upload. Edit the Nickname field for the appropriate dive "
-"computer. After saving the Nickname, the dive logs show the nickname for "
-"that particular device instead of the model name, allowing easy "
-"identification of devices."
+"upload dive logs to _Subsurface_. For instance if a buddy’s dive computer is "
+"the same make and model as your own and dive logs are uploaded from both "
+"dive computers to the same _Subsurface_ computer, then you might like to "
+"call one \"Alice's Suunto D4\" and the other \"Bob's Suunto "
+"D4\". Alternatively, consider a technical diver who dives with two or more "
+"dive computers of the same model, the logs of both (or all) being uploaded.  "
+"In this case it might be prudent to call one of them \"Suunto D4 (1)\" and "
+"another \"Suunto D4 (2)\". This is easily done in _Subsurface_.  On the "
+"*Main Menu*, select _Log -> Edit device names_. A dialog box opens, showing "
+"the current Model, ID and Nickname of the dive computers used for "
+"upload. Edit the Nickname field for the appropriate dive computer. After "
+"saving the Nickname, the dive logs show the nickname for that particular "
+"device instead of the model name, allowing easy identification of devices."
 msgstr ""
 
 #. type: Title ====
-#: ./user-manual.txt:629
+#: user-manual.txt:608
 #, no-wrap
 msgid "Updating the dive information imported from the dive computer."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:636
+#: user-manual.txt:615
 msgid ""
 "With the uploaded dives in the *Dive List*, the information from the dive "
-"computer is not complete and more details must be added in order to have a "
-"fuller record of the dives. To do this, the *Notes* and the *Equipment* tabs "
-"on the top left hand of the _Subsurface_ window should be used."
+"computer is not complete and more details must be added to have a full "
+"record of the dives. To do this, the *Notes* and the *Equipment* tabs on the "
+"top left hand of the _Subsurface_ window should be used."
 msgstr ""
 
 #. type: Title =====
-#: ./user-manual.txt:638
+#: user-manual.txt:617
 #, no-wrap
 msgid "Notes"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:643
+#: user-manual.txt:622
 msgid ""
-"To have a more complete dive record the user needs to add additional "
+"To have a more complete dive record, the user needs to add additional "
 "information by hand. The procedure below is virtually identical for "
 "hand-entered dives and for dives downloaded from a dive computer."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:653
+#: user-manual.txt:632
 msgid ""
-"In some cases, one has to provide the date and time of the dive, e.g. when "
-"entering a dive by hand or when a dive computer does not provide the date "
-"and time of the dive.  (Usually the date and time of the dive, gas mixture "
-"and water temperature are shown as obtained from the dive computer)  If the "
-"contents of the *Notes tab* is changed or edited in any way, the message in "
-"a blue box at the top of the panel indicates that the dive is being "
-"edited. If one clicks on the *Notes* tab, the following fields are visible "
+"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 "
+"date and time of the dive.  (Usually the date and time of the dive, gas "
+"mixture and water temperature are shown as obtained from the dive computer)  "
+"If the contents of the *Notes tab* is changed or edited in any way, the "
+"message in a blue box at the top of the panel shows the dive is being "
+"edited. If you click on the *Notes* tab, the following fields are visible "
 "(left hand image, below):"
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:654
+#: user-manual.txt:633
 #, no-wrap
 msgid "images/AddDive3_f22.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:663
+#: user-manual.txt:642
 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 "
-"clicking the date, a calendar is displayed from which one can choose the "
+"clicking the date, a calendar is displayed from which you can choose the "
 "correct date. Press ESC to close the calendar.  The time values (hour and "
 "minutes) can also be edited directly by clicking on each of them in the text "
 "box and by over-typing the information displayed."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:674
+#: user-manual.txt:652
 #, no-wrap
 msgid ""
 "*Air/water temperatures*: Air and water temperatures during the dive are "
 "shown\n"
 "in text boxes to the right of the Start time. Many dive computers supply "
 "water\n"
-"temperature information and this box may therefore contain information.\n"
-"If air temperature is not provided by the dive computer, the first "
+"temperature information and this box may have information.\n"
+"If air temperature isn’t provided by the dive computer, the first "
 "temperature reading\n"
-"might be used for the air temperature. Generally this is close enough to the "
-"real air temperature as\n"
-"the change in the temperature sensor reading is quite slow to follow the "
-"changes in the environment.\n"
+"might be used for the air temperature. Generally this is close to the real "
+"air temperature.\n"
 "If editing is required, only a value is required, the units of temperature "
 "will be\n"
 "automatically supplied by\n"
@@ -1248,87 +1204,85 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:676
+#: user-manual.txt:654
 #, no-wrap
 msgid "*Location*:\n"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:684
+#: user-manual.txt:662
 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 "
+"information in the *Notes* and *Equipment* tabs can therefore NOT be edited "
 "at the same time as the dive site information. Save all the other dive "
 "information (e.g.  divemaster, buddy, protective gear, notes about the dive) "
-"by selecting _Apply changes_ on the *Notes* tab before editing the dive site "
-"information. Only then, supply a dive site name in the textbox labelled "
-"_Location_ on the *Notes* tab."
+"by selecting _Apply changes_ on the *Notes* tab BEFORE editing the dive site "
+"information. Then supply a dive site name in the textbox labelled _Location_ "
+"on the *Notes* tab."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:702
+#: user-manual.txt:680
 msgid ""
-"Type the name of the dive site, e.g. \"Tihany, Lake Balaton, Hungary\".  If "
-"several dives are performed at the same location, the dive site information "
-"for the first dive is re-used.  Existing dive location information can be "
-"edited at any time by selecting (on the *Dive List* panel) a dive performed "
-"at that site and by opening the location information by clicking the globe "
-"button on the right of the location name (see image on the right, "
-"above). When entering a dive location name, auto location of dive site names "
-"makes it easy to select an existing dive site name (i.e. when typing the "
-"name of a dive site, a dropdown list appears showing all sites with similar "
-"names). If the dive site has been used before, click on the already-existing "
-"name.  The dive site names in the dropdown list contain either a globe "
-"symbol (indicating existing dive sites in the _Subsurface_ database)  or a "
-"*+* symbol (indicating dive site names that appear consistent with the "
-"current dive site name but which have not been added to the dive site "
-"database).  Therefore, if the present dive site has not been used before, a "
-"message appears as follows (image *A* below):"
+"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 "
+"first dive is re-used.  Existing dive locations can be edited by selecting "
+"(on the *Dive List* panel) a dive done at that site and by opening the "
+"location information. Click the globe button on the right of the location "
+"name (see image on the right, above). When entering a dive location name, "
+"auto location of dive site names makes it easy to select an existing dive "
+"site name.  When typing the name of a dive site, a dropdown list appears "
+"showing all sites with similar names. If the dive site has been used before, "
+"click on the already-existing name.  The dive site names in the dropdown "
+"list contain either a globe symbol (indicating existing dive sites in the "
+"_Subsurface_ database)  or a *+* symbol (indicating dive site names that "
+"appear consistent with the current dive site name but which haven’t been "
+"added to the dive site database).  If the present dive site has not been "
+"used before, a message appears as follows (image *A* below):"
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:703
+#: user-manual.txt:681
 #, no-wrap
 msgid "images/Locations1_f22.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:708
+#: user-manual.txt:686
 msgid ""
 "Doubleclick on the new dive site name. A panel appears to enter the "
-"coordinates and other important information about the site (image *B*, "
-"above). The most important items are the coordinates of the site. There are "
-"three ways of specifying the coordinates:"
+"coordinates and other information about the site (image *B*, above). The "
+"most important items are the coordinates of the site. There are three ways "
+"to specify coordinates:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:715
+#: user-manual.txt:692
 msgid ""
-"One can find the coordinates on the world map in the bottom right hand part "
-"of the _Subsurface_ window. The map displays an orange bar indicating \"No "
-"location data - Move the map and double-click to set the dive "
-"location\". Upon a doubleclick at the appropriate place, the orange bar "
-"disappears and the coordinates are stored."
+"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 and double-click to set the dive location\". Doubleclick at the "
+"appropriate place, and the orange bar disappears and the coordinates are "
+"stored."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:720
+#: user-manual.txt:697
 msgid ""
-"The coordinates can be obtained from the _Subsurface_ Companion app if the "
-"user has an Android or iPhone device with GPS and if the coordinates of the "
-"dive site were stored using that device.  xref:S_Companion[Click here for "
-"more information]"
+"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:S_Companion[Click here for more information]"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:723
+#: user-manual.txt:699
 msgid ""
-"The coordinates can be entered by hand if they are known, using one of four "
-"formats with latitude followed by longitude:"
+"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:728
+#: user-manual.txt:704
 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, "
@@ -1337,37 +1291,36 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:736
+#: user-manual.txt:712
 msgid ""
 "Southern hemisphere latitudes are given with a *S*, e.g. S30°, or with a "
 "negative value, e.g. -30.22496. Similarly western longitudes are given with "
 "a *W*, e.g. W07°, or with a negative value, e.g. -7.34323. Some keyboards "
 "don't have the degree sign (°). It can be replaced by a *d* like this: N30d "
-"W20d.  If both a dive site name and coordinates have been provided, Save the "
+"W20d.  If both a dive site name and coordinates have been provided, save the "
 "dive site information by selecting the button _Apply changes_ at the top of "
 "the panel."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:742
+#: user-manual.txt:718
 #, no-wrap
 msgid ""
-"*Important*: GPS coordinates of a dive site are linked to the Location\n"
-"name - so *saving* a dive site with only coordinates and no dive site name\n"
-"causes unexpected behaviour (Subsurface will think that all of these\n"
+"*Important*: GPS coordinates of a dive site are linked to the location\n"
+"name - so *saving* a dive site with only coordinates and no name\n"
+"causes problems. (Subsurface will think all of these\n"
 "dives have the same location and try to keep their GPS coordinates the\n"
 "same).\n"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:752
+#: user-manual.txt:728
 #, no-wrap
 msgid ""
 "*Dive site name lookup:* If coordinates have been typed into the "
 "appropriate\n"
-"text box, one can perform an automated name lookup based on the "
-"coordinates.\n"
-"This is achieved when _Subsurface_ uses the Internet to find the name of the "
+"text box, you can do an automated name lookup based on the coordinates.\n"
+"This is done when _Subsurface_ uses the Internet to find the name of the "
 "dive site\n"
 "based on the coordinates that were typed. If a name has been found, it is\n"
 "automatically inserted into the tags box. The list box\n"
@@ -1375,138 +1328,133 @@ msgid ""
 "of the dive site panel contains the names of other dives sites used at the\n"
 "current location. For instance if the dive site is \"Blue Hole\" and there "
 "are several\n"
-"dive sites named \"Blue Hole\", all these sites are listed in this list "
-"box.\n"
+"sites named \"Blue Hole\", all of them are listed.\n"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:757
+#: user-manual.txt:733
 msgid ""
-"Enter any other textual information about the dive site (Description and "
+"Enter any other contextual information about the dive site (Description and "
 "Notes), then select _Apply Changes_ to save the geolocation for this dive "
-"site. At a later stage the dive site information can be edited by clicking "
-"the globe icon to the right of the dive site name in the *Notes tab*."
+"site.  The dive site information can later be edited by clicking the globe "
+"icon to the right of the dive site name in the *Notes tab*."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:762
+#: user-manual.txt:738
 #, no-wrap
 msgid ""
-"*Dive mode*: This is a dropdown box allowing one to choose the type of "
+"*Dive mode*: This is a dropdown box allowing you to choose the type of "
 "dive\n"
-"performed. The options are OC (Open Circuit SCUBA, the default seting, meant "
-"for most recreational dives),\n"
+"performed. The options are OC (Open Circuit SCUBA, the default setting, for "
+"most recreational dives),\n"
 "Freedive (dive without SCUBA equipment), CCR (Closed-circuit\n"
 "rebreather) and pSCR (Passive semi-closed rebreather).\n"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:767
+#: user-manual.txt:743
 #, no-wrap
 msgid ""
-"*Divemaster*: The name of the dive master or dive guide for this dive should "
-"be\n"
+"*Divemaster*: The name of the divemaster or dive guide should be\n"
 "entered in this field\n"
 "which offers auto selection based on the list of dive masters in\n"
 "the current logbook.\n"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:772
+#: user-manual.txt:748
 #, no-wrap
 msgid ""
-"*Buddy*: In this field, one enters the name(s) of the buddy / buddies\n"
-"(separated with commas) who accompanied him/her on the\n"
+"*Buddy*: In this field, enter the name(s) of the buddy or buddies\n"
+"(separated with commas) who were on the\n"
 "dive. Auto selection based on the list of buddies in the current logbook "
 "is\n"
 "offered.\n"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:777
+#: user-manual.txt:753
 #, no-wrap
 msgid ""
 "*Suit*: Here the type of dive suit used can be entered.\n"
 "Auto selection of the suit description is available.\n"
 "Some dry-suit users may choose to use this field to record what combination "
 "of\n"
-"suit and thermal undersuit was used.\n"
+"suit and thermal under suit was used.\n"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:780
+#: user-manual.txt:756
 #, no-wrap
 msgid ""
-"*Rating*: One can provide a subjective overall rating of the dive on a\n"
+"*Rating*: You can provide a subjective overall rating of the dive on a\n"
 "5-point scale by clicking the appropriate star on the rating scale.\n"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:784
+#: user-manual.txt:760
 #, no-wrap
 msgid ""
-"*Visibility*: Similarly, one can provide a rating of visibility during the\n"
+"*Visibility*: You can provide a rating of visibility during the\n"
 "dive on a\n"
 "5-point scale by clicking the appropriate star.\n"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:793
+#: user-manual.txt:768
 #, no-wrap
 msgid ""
-"*Tags*: Tags that describe the type of dive performed can be entered\n"
+"*Tags*: Tags that describe the type of dive done can be entered\n"
 "here (separated by commas). Examples of common tags are boat, drift, "
 "training,\n"
 "cave, etc.\n"
-"_Subsurface_ has many built-in tags. If the user starts typing a tag, the\n"
+"_Subsurface_ has many built-in tags. If you starts typing a tag, the\n"
 "program\n"
-"will list the tags that correspond to the typing. For instance, if the "
-"user\n"
-"typed\n"
-"+cav+, then the tags *cave* and *cavern* are shown for the user to choose "
-"from.\n"
+"will list the tags that correspond to the typing. For instance, by typing\n"
+"+cav+, the tags *cave* and *cavern* are shown to choose from.\n"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:795
+#: user-manual.txt:770
 #, no-wrap
 msgid "*Notes*: Any additional information for the dive can be entered here.\n"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:800
+#: user-manual.txt:775
 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, so "
-"there's no need to use them until *ALL* other information has been "
-"added. The image xref:S_Notes_dc[at the beginning of this section] shows an "
-"example of a *Notes tab* after completion of the dive information."
+"information for tabs in the *Info* panel and in the *Dive Profile* "
+"panel. Use them when *ALL* other information has been added. The image "
+"xref:S_Notes_dc[at the beginning of this section] shows an example of a "
+"*Notes tab* after completing the dive information."
 msgstr ""
 
 #. type: Title =====
-#: ./user-manual.txt:801
+#: user-manual.txt:776
 #, no-wrap
 msgid "Equipment"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:806
+#: user-manual.txt:781
 msgid ""
-"The Equipment tab allows one to enter information about the type of cylinder "
-"and gas used as well as the weights used for the dive. The message in a blue "
+"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 "
 "box at the top of the panel:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:813
+#: user-manual.txt:788
 msgid ""
-"indicates that the dive is being edited. This is a highly interactive part "
-"of _Subsurface_ and the information on cylinders and gases (entered here) "
-"determines the behaviour of the *Dive profile* (top right-hand panel)."
+"shows the dive is being edited. This is a highly interactive part of "
+"_Subsurface_ and the information on cylinders and gases (entered here) "
+"determines the behavior of the *Dive profile* (top right-hand panel)."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:817
+#: user-manual.txt:792
 #, no-wrap
 msgid ""
 "*Cylinders*: The cylinder information is entered through a dialogue that "
@@ -1515,51 +1463,45 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:818
+#: user-manual.txt:793
 #, no-wrap
 msgid "images/DC_gas-dialogue1_f20.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:827
+#: user-manual.txt:806
 msgid ""
 "For hand-entered dives, this information needs to be typed in. For dive "
-"computers, _Subsurface_ often obtains the gas used from the dive computer "
-"and automatically inserts the gas composition(% oxygen or % helium) in the "
-"table. The + button at the top right allows the user to add more cylinders "
-"for this dive. The dark dustbin icon on the left allows the deletion of "
-"information for a cylinder.  Note that it is not possible to delete a "
-"cylinder if it is used during the dive. A cylinder might be implicitly used "
-"in the dive, even without a gas change event."
-msgstr ""
-
-#. type: Plain text
-#: ./user-manual.txt:832
-msgid ""
-"The user should start by selecting a cylinder type on the left-hand side of "
-"the table.  To select a cylinder, the _Type_ box should be clicked. This "
-"brings up a list button that can be used to display a dropdown list of "
-"cylinders:"
+"computers, _Subsurface_ often gets the gas used from the dive computer and "
+"automatically inserts the gas composition(% oxygen or % helium) in the "
+"table. The + button at the top right lets you add more cylinders for this "
+"dive. The dark dust bin icon on the left lets you delete information for a "
+"cylinder.  Note that it is not possible to delete a cylinder if it is used "
+"during the dive. A cylinder might be implicitly used in the dive, even "
+"without a gas change event.  Start by selecting a cylinder type on the "
+"left-hand side of the table.  To select a cylinder, the _Type_ box should be "
+"clicked. This brings up a list button that can be used to display a dropdown "
+"list of cylinders:"
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:833
+#: user-manual.txt:807
 #, no-wrap
 msgid "images/DC_gas-dialogue2_f20.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:840
+#: user-manual.txt:814
 msgid ""
 "The drop-down list can then be used to select the cylinder type that was "
-"used for this dive or the user may start typing in the box which shows the "
+"used for this dive, or just start typing in the box which shows the "
 "available options for the entered characters. The *Size* of the cylinder as "
 "well as its working pressure (_Work.press_) will automatically be shown in "
 "the dialogue."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:844
+#: user-manual.txt:818
 msgid ""
 "Next, indicate the starting pressure and the ending pressure of the "
 "specified gas during the dive. The unit of pressure (metric/imperial)  "
@@ -1567,7 +1509,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:855
+#: user-manual.txt:829
 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, "
@@ -1576,109 +1518,109 @@ msgid ""
 "the cylinder, save the data either by pressing _ENTER_ on the keyboard or by "
 "clicking outside the cell containing the cursor. Information for any "
 "additional cylinders can be added by using the + button at the top right "
-"hand. Following is an example of a complete description for a dive using two "
-"cylinders (air and EAN50):"
+"hand. The following is an example of a complete description for a dive using "
+"two cylinders (air and EAN50):"
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:856
+#: user-manual.txt:830
 #, no-wrap
 msgid "images/CylinderDataEntry3_f20.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:863
+#: user-manual.txt:837
 #, no-wrap
 msgid ""
 "*Weights*: Information about the weight system used can be entered\n"
-"using a dialogue very similar to that of the cylinder information. If one\n"
-"clicks\n"
+"using a dialogue similar to that of the cylinder information. If you\n"
+"click\n"
 "the + button on the top right of the weights dialogue, the table looks "
 "like\n"
 "this:\n"
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:864
+#: user-manual.txt:838
 #, no-wrap
 msgid "images/WeightsDataEntry1_f20.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:868
+#: user-manual.txt:842
 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:869
+#: user-manual.txt:843
 #, no-wrap
 msgid "images/WeightsDataEntry2_f20.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:883
+#: user-manual.txt:857
 msgid ""
 "This can be used to select the type of weight system used during the dive or "
-"the user may start typing in the box to specify a different weighting "
-"mechanism that will be saved by _Subsurface_.  In the *Weight* field, type "
-"in the amount of weight used during the dive. After specifying the weight "
-"system, save the data by either pressing _ENTER_ on the keyboard or by "
-"clicking outside the cell with the cursor.  It is possible to enter "
-"information for more than one weight system by adding an additional system "
-"using the + button on the top right hand. Weight systems can be deleted "
-"using the dustbin icon on the left hand. Here is an example of information "
-"for a dive with two types of weights: integrated as well as a weight belt:"
+"just may start typing in the box to specify a different weighting mechanism "
+"that will be saved by _Subsurface_.  In the *Weight* field, type in the "
+"amount of weight used during the dive. After specifying the weight system, "
+"save the data by pressing _ENTER_ on the keyboard or by clicking outside the "
+"cell with the cursor.  It’s possible to enter information for more than one "
+"weight system by adding an additional system using the + button on the top "
+"right hand. Weight systems can be deleted using the dust bin icon on the "
+"left hand. Here is an example of information for a dive with two types of "
+"weights: integrated as well as a weight belt:"
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:884
+#: user-manual.txt:858
 #, no-wrap
 msgid "images/WeightsDataEntry3_f20.jpg"
 msgstr ""
 
 #. type: Title ====
-#: ./user-manual.txt:886
+#: user-manual.txt:860
 #, no-wrap
 msgid "Editing several selected dives simultaneously"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:901
+#: user-manual.txt:876
 msgid ""
 "_METHOD 1_: After uploading dives from a dive computer, the dive profiles of "
-"each uploaded dive is shown in the *Dive profile* tab, as well as a few "
-"items of information in the *Notes* tab (e.g. water temperature) and in the "
-"*Equipment* tab (e.g. gas pressures and gas composition). However the other "
-"fields remain empty.  It may be useful to simultaneously edit some of the "
-"fields in the *Notes* and *Equipment* tabs.  For instance, it is possible "
-"that a diver performed several dives during a single day, using identical "
-"equipment while diving at the same dive site or with the same dive master "
-"and/or buddy or tags. Instead of completing the information for each of "
-"these dives separately, one can select all the dives for that day in the "
-"*Dive List* and insert the same information in the *Notes* and *Equipment* "
-"fields that need identical information. This is achieved by editing the dive "
-"notes or the equipment for any one of the selected dives."
+"each is shown in the *Dive profile* tab, as well as a few items of "
+"information in the *Notes* tab (e.g. water temperature) and in the "
+"*Equipment* tab (e.g. gas pressures and gas composition). Other fields "
+"remain empty.  It may be useful to simultaneously edit some of the fields in "
+"the *Notes* and *Equipment* tabs.  For instance, it’s possible that a diver "
+"performed several dives during a single day, using identical equipment at "
+"the same dive site, or with the same divemaster and/or buddy or "
+"tags. Instead of completing the information for each dive separately, select "
+"all the dives for that day in the *Dive List* and insert the same "
+"information in the *Notes* and *Equipment* fields that need identical "
+"information. This is done by editing the dive notes or the equipment for any "
+"one of the selected dives."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:911
+#: user-manual.txt:886
 msgid ""
-"The simultaneous editing only works with fields that do not already contain "
-"information.  This means that, if some fields have been edited for a "
-"particular dive among the selected dives, these are not changed while "
-"editing the dives simultaneously. Technically, the rule for editing several "
-"dives simultaneously is: if the data field being edited contains _exactly "
-"the same information_ for all the dives that have been selected, the new, "
-"edited information is substituted for all the selected dives, otherwise only "
-"the edited dive is changed, even though several dives have been selected in "
-"the *Dive List*. This greatly speeds up the completion of the dive log after "
-"several similar dives."
+"Simultaneous editing only works with fields that do not already contain "
+"information.  This means if some fields have been edited for a particular "
+"dive among the selected dives, these are not changed while editing the dives "
+"simultaneously. Technically, the rule for editing several dives "
+"simultaneously is: if the data field being edited contains _exactly the same "
+"information_ for all the dives that have been selected, the new, edited "
+"information is substituted for all the selected dives. Otherwise only the "
+"edited dive is changed, even though several dives have been selected in the "
+"*Dive List*. This speeds up the completion of the dive log after several "
+"similar dives."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:920
+#: user-manual.txt:895
 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 "
@@ -1693,76 +1635,75 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: ./user-manual.txt:921
+#: user-manual.txt:896
 #, no-wrap
 msgid "Adding Bookmarks to a dive"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:926
+#: user-manual.txt:901
 msgid ""
-"Many divers wish to annotate their dives with text that indicate particular "
-"events during the dive, e.g. \"Saw dolphins\", or \"Released surface "
-"buoy\". This is easily done:"
+"Many divers wish to annotate dives with text that indicate particular "
+"events, e.g. \"Saw dolphins\", or \"Released surface buoy\". This is easily "
+"done:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:930
+#: user-manual.txt:905
 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 "
-"on the dive profile at the point that was initially selected (see *A* "
-"below)."
+"on the dive profile at that point (see *A* below)."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:932
+#: user-manual.txt:907
 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:935
+#: user-manual.txt:910
 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:938
+#: user-manual.txt:913
 msgid ""
-"If one hovers using the mouse over the red bookmark, the appropriate text is "
-"shown at the bottom of the information box (see *D* below)."
+"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:939
+#: user-manual.txt:914
 #, no-wrap
 msgid "images/Bookmarks.jpg"
 msgstr ""
 
 #. type: Title ====
-#: ./user-manual.txt:942
+#: user-manual.txt:917
 #, no-wrap
 msgid "Saving the updated dive information"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:953
+#: user-manual.txt:928
 msgid ""
 "The information entered in the *Notes* tab and the *Equipment* tab can be "
 "saved by using the two buttons on the top right hand of the *Notes* tab. If "
 "the _Apply changes_ button is clicked, the dive data are saved in the memory "
-"image of the dive. If the _Discard changes_ button is clicked, then the "
-"newly entered dive data are erased from the computer memory, although the "
-"dive profile is retained. When the user exits _Subsurface_ there is a final "
-"prompt to confirm that the new data should now be saved permanently on the "
+"image of the dive. If the _Discard changes_ button is clicked, the newly "
+"entered dive data are erased from the computer memory, although the dive "
+"profile is retained. When the user exits _Subsurface_ there is a final "
+"prompt to confirm the new data should now be saved permanently on the "
 "computer disk."
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:954
+#: user-manual.txt:929
 #, no-wrap
 msgid ""
 "Importing dive information from other digital data sources or other data "
@@ -1770,150 +1711,148 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:980
+#: user-manual.txt:954
 msgid ""
-"If a user has been diving for some time, it is possible that several dives "
-"were logged using other dive log software. This information does not need "
-"retyping because these dive logs can probably be imported into "
+"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 "
 "_Subsurface_. _Subsurface_ will import dive logs from a range of other dive "
-"log software. While some software is supported natively, for others the user "
-"has to export the logbook(s) to an intermediate format so that they can then "
-"be imported by _Subsurface_.  Currently, _Subsurface_ supports importing CSV "
+"log software. While some software is supported natively, for others you will "
+"need to export the logbook(s) to an intermediate format so they can then be "
+"imported by _Subsurface_.  Currently, _Subsurface_ supports importing CSV "
 "log files from several sources.  APD LogViewer, XP5, Sensus and Seabear "
 "files are preconfigured, but because the import is flexible, users can "
 "configure their own imports.  Manually kept log files (e.g. a spreadsheet) "
 "can also be imported by configuring the CSV import.  _Subsurface_ can also "
-"import UDDF and UDCF files used by some divelog software and some dive "
-"computers, like the Heinrichs & Weikamp DR5. Finally, for some divelog "
-"software like Mares Dive Organiser it is currently suggested to import the "
-"logbooks first into a webservice like _divelogs.de_ and then import them "
-"from there with _Subsurface_, as divelogs.de supports a few additional "
-"logbook formats that _Subsurface_ currently cannot parse."
-msgstr ""
-
-#. type: Plain text
-#: ./user-manual.txt:990
-msgid ""
-"If the format of other software is supported natively on Subsurface, it "
-"should be sufficient to select either _Import -> Import log files_ or _File "
-"-> Open log file_. _Subsurface_ supports the data formats of many dive "
-"computers, including Suunto and Shearwater. When importing dives, "
-"_Subsurface_ tries to detect multiple records for the same dive and merges "
-"the information as best as it can. If there are no time zone issues (or "
-"other reasons that would cause the beginning time of the dives to be "
-"significantly different) _Subsurface_ will not create duplicate "
-"entries. Below follows more specific information to achieve data import to "
-"_Subsurface_."
+"import UDDF and UDCF files used by some dive log software and some dive "
+"computers, like the Heinrichs & Weikamp DR5. Finally, for some dive log "
+"software like Mares Dive Organizer we currently recommend you import the "
+"logbooks first into a web service like _divelogs.de_ and then import from "
+"there with _Subsurface_. Divelogs.de supports a few additional logbook "
+"formats that _Subsurface_ currently cannot handle."
+msgstr ""
+
+#. type: Plain text
+#: user-manual.txt:964
+msgid ""
+"If the format of other software is supported natively on Subsurface, select "
+"either _Import -> Import log files_ or _File -> Open log file_. _Subsurface_ "
+"supports the data formats of many dive computers, including Suunto and "
+"Shearwater. When importing dives, _Subsurface_ tries to detect multiple "
+"records for the same dive and merges the information as best as it can. If "
+"there are no time zone issues (or other reasons that would cause the "
+"beginning time of the dives to be significantly different) _Subsurface_ will "
+"not create duplicate entries. Below is more specific information to import "
+"data to _Subsurface_."
 msgstr ""
 
 #. type: Title ====
-#: ./user-manual.txt:991
+#: user-manual.txt:964
 #, no-wrap
 msgid "Using the universal import dialogue"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:997
+#: user-manual.txt:970
 msgid ""
-"Importing dives from other software is performed through a universal "
-"interface activated by selecting _Import_ from the Main Menu, then clicking "
-"on _Import Log Files_. This brings up dialogue *A*, below."
+"Importing dives from other software is done through a universal interface "
+"activated by selecting _Import_ from the Main Menu, then clicking on _Import "
+"Log Files_. This brings up dialogue *A*, below."
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:998
+#: user-manual.txt:971
 #, no-wrap
 msgid "images/Import1_f20.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1003
+#: user-manual.txt:976
 msgid ""
 "Towards the bottom right is a dropdown selector with a default label of "
-"_Dive Log Files_ which gives access to the different types of direct imports "
-"available, as in dialogue *B*, above. Currently these are:"
+"_Dive Log Files_ which accesses different types of direct imports available, "
+"as in dialogue *B*, above. Currently these are:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1005
+#: user-manual.txt:978
 msgid ""
 "XML-formatted dive logs (DivingLog 5.0, MacDive and several other dive log "
 "systems)"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1006
+#: user-manual.txt:979
 msgid "Cochran dive logs"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1007
+#: user-manual.txt:980
 msgid "UDDF-formatted dive logs (e.g. Kenozoooid)"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1008
+#: user-manual.txt:981
 msgid "UDCF-formatted dive logs"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1009
+#: user-manual.txt:982
 msgid "Poseidon MkVI CCR logs"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1010
+#: user-manual.txt:983
 msgid "APD Inspiration/Evolution CCR logs"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1011
+#: user-manual.txt:984
 msgid "LiquiVision logs"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1012
+#: user-manual.txt:985
 msgid "divelog.de logs"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1013
+#: user-manual.txt:986
 msgid "OSTC Tools logs"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1014
+#: user-manual.txt:987
 msgid "JDiveLog"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1015
+#: user-manual.txt:988
 msgid "Suunto Dive Manager (DM3 and DM4)"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1016
+#: user-manual.txt:989
 msgid "CSV (text-based and spreadsheet-based) dive logs, including APD CCR logs"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1021
+#: user-manual.txt:994
 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 "
-"imported dive log in the _Subsurface_ *Dive List*. Some other formats, not "
+"window containing the file list on the right of the dialogue, opens the "
+"imported dive log in the _Subsurface_ *Dive List*. Some other formats not "
 "accessible through the Import dialogue are also supported, as explained "
 "below."
 msgstr ""
 
 #. type: Title ====
-#: ./user-manual.txt:1022
+#: user-manual.txt:995
 #, no-wrap
 msgid "Importing from  OSTCTools"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1031
+#: user-manual.txt:1004
 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 "
@@ -1926,104 +1865,105 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1035
+#: user-manual.txt:1008
 msgid ""
-"Actually, 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 although untested, Frog, OSTC2 and OSTC CR."
+"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 "
+"although untested, Frog, OSTC2 and OSTC CR."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1040
+#: user-manual.txt:1013
 msgid ""
-"Please, remember that OSTCTools is *not* a true diving log software, but a "
-"useful set of tools for analysis and management of OSTC devices. This way, "
-"only raw dive computer data will be performed with the import to "
-"_Subsurface_; one has to to manually complete the rest of data which may be "
-"important (buddies, equipment, notes, etc)."
+"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. Only raw dive computer data will be imported to _Subsurface_; you "
+"have to manually complete the rest of the data you want (buddies, equipment, "
+"notes, etc)."
 msgstr ""
 
 #. type: Title ====
-#: ./user-manual.txt:1042
+#: user-manual.txt:1015
 #, no-wrap
-msgid "Importing from Mares Dive Organiser V2.1"
+msgid "Importing from Mares Dive Organizer V2.1"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1049
+#: user-manual.txt:1022
 msgid ""
-"Since Mares utilise proprietary Windows software not compatible with "
+"Since Mares uses proprietary Windows software not compatible with "
 "multi-platform applications, these dive logs cannot be directly imported "
 "into _Subsurface_. Mares dive logs need to be imported using a three-step "
-"process, using _www.divelogs.de_ as a mechanism to extract the dive log "
+"process, using _www.divelogs.de_ as a gateway to extract the dive log "
 "information."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1054
+#: user-manual.txt:1027
 msgid ""
-"Export the dive log data from Mares Dive Organiser to the user's desktop, "
-"using a _.sdf_ file name extension. Refer to xref:Mares_Export[Appendix C] "
-"for more information."
+"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 "
+"information."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1060
+#: user-manual.txt:1033
 msgid ""
-"Data should then be imported into _www.divelogs.de_. One needs to create a "
-"user account in _www.divelogs.de_, log into that web site, then select "
-"_Import Logbook -> Dive Organiser_ from the menu on the left hand side.  The "
-"instructions must be carefully followed to transfer the dive information (in "
-"_.sdf_ format) from the Dive Organiser database to _www.divelogs.de_."
+"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 "
+"select _Import Logbook -> Dive Organizer from the menu on the left hand "
+"side.  The instructions must be carefully followed to transfer the dive "
+"information (in _.sdf_ format) from the Dive Organizer database to "
+"_www.divelogs.de_."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1062
+#: user-manual.txt:1035
 msgid ""
 "Finally, import the dives from _divelogs.de_ to _Subsurface_, using the "
 "instructions below."
 msgstr ""
 
 #. type: Title ====
-#: ./user-manual.txt:1065
+#: user-manual.txt:1038
 #, no-wrap
 msgid "Importing dives from *divelogs.de*"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1078
+#: user-manual.txt:1051
 msgid ""
-"The import of dive information from _divelogs.de_ is simple, using a single "
+"Importing dive information from _divelogs.de_ is simple, using a single "
 "dialogue box. The _Import -> Import from Divelogs.de_ option should be "
 "selected from the Main Menu. This brings up a dialogue box (see image *A* "
-"below). Enter a user-ID and password for _divelogs.de_ into the appropriate "
-"fields and then select the _Download_ button. Download from _divelogs.de_ "
-"starts immediately, displaying a progress bar in the dialogue box. At the "
-"end of the download, the success status is indicated (see image *B*, "
-"below). The _Apply_ button should then be selected, after which the imported "
-"dives appear in the _Subsurface_ *Dive List* panel."
+"below). Enter a user-ID and password for _divelogs.de_ and then select the "
+"_Download_ button. Download from _divelogs.de_ starts immediately, "
+"displaying a progress bar in the dialogue box. At the end of the download, "
+"the success status is shown (see image *B*, below). The _Apply_ button "
+"should then be selected, after which the imported dives appear in the "
+"_Subsurface_ *Dive List* panel."
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:1079
+#: user-manual.txt:1052
 #, no-wrap
 msgid "images/Divelogs1.jpg"
 msgstr ""
 
 #. type: Title ====
-#: ./user-manual.txt:1082
+#: user-manual.txt:1055
 #, no-wrap
 msgid "Importing data in CSV format"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1093
+#: user-manual.txt:1066
 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 "
 "circuit rebreathers) or as dive metadata (in case the user keeps dive data "
 "in a spreadsheet). The _CSV_ format is a universal simplified format that "
-"allows for easy information exchange between different computers or software "
+"allows easy information exchange between different computers or software "
 "packages. For an introduction to CSV-formatted files see xref:S_CSV_Intro[A "
 "Diver's Introduction To CSV Files]. _Subsurface_ dive logs can also be "
 "exported in _CSV_ format to other software that reads this format. See "
@@ -2033,61 +1973,61 @@ msgid ""
 msgstr ""
 
 #. type: Title =====
-#: ./user-manual.txt:1095
+#: user-manual.txt:1068
 #, no-wrap
 msgid "Importing dives in CSV format from dive computers or other dive log software"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1100
+#: user-manual.txt:1073
 msgid ""
-"One can view a _CSV_ file by using an ordinary text editor. It is normally "
-"organised into a single line that provides the headers (or _field names_ or "
+"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 "
 "_column headings_) of the data columns, followed by the data, one record per "
 "line."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1102
+#: user-manual.txt:1075
 msgid ""
 "There are two types of _CSV_ dive logs that can be imported into "
 "_Subsurface_:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1108
+#: user-manual.txt:1081
 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, "
-"dive duration, names of buddy and dive master and perhaps some information "
-"about cylinder pressures before and after the dive, as well as a comment or "
-"two about the dive. All the data for a single dive go on a single line of "
-"text, following the order of the column headings."
+"dive duration, names of buddy and divemaster and information about cylinder "
+"pressures before and after the dive, as well as comments about the dive. All "
+"the data for a single dive go on a single line of text, following the order "
+"of the column headings."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1117
+#: user-manual.txt:1090
 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 "
-"intervals, indicating depth, water temperature at that depth, and cylinder "
-"pressure at that moment in time. Each line contains the information for a "
-"single instant in time during the dive, 30 seconds after that of the "
-"previous instant. Many lines are required to complete the depth profile "
-"information for a single dive. This is a common export format used by "
-"closed-circuit rebreather (CCR) dive equipment and many software packages "
-"that handle dive computer data and/or dive logs."
+"intervals, indicating depth, water temperature, and cylinder pressure at "
+"that moment in time. Each line contains the information for a single instant "
+"in time during the dive, 30 seconds after that of the previous instant. Many "
+"lines are required to complete the depth profile information for a single "
+"dive. This is a common export format used by closed-circuit rebreather (CCR) "
+"dive equipment and many software packages that handle dive computer data "
+"and/or dive logs."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1120
+#: user-manual.txt:1093
 msgid ""
-"Before being able to import the _CSV_ data to _Subsurface_ *one needs to "
+"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:1128
+#: user-manual.txt:1101
 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 "
@@ -2099,7 +2039,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1132
+#: user-manual.txt:1105
 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 "
@@ -2108,14 +2048,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1134
+#: user-manual.txt:1107
 msgid "Is the numeric information (e.g. dive depth) in metric or in imperial units?"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1141
+#: user-manual.txt:1114
 msgid ""
-"Armed with this information, importing the data into _Subsurface_ is "
+"With this information, importing the data into _Subsurface_ is "
 "straightforward. Select _Import -> Import Log Files_ from the main menu. In "
 "the resulting file selection menu, select _CSV files_ (towards the bottom "
 "right). This shows all .CSV files in the selected directory. Select the file "
@@ -2123,84 +2063,88 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:1142
+#: user-manual.txt:1115
 #, no-wrap
 msgid "images/csv_import1_f20.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1153
+#: user-manual.txt:1126
+#, no-wrap
 msgid ""
-"Notice that, at the top left, there is a dropdown list containing "
-"pre-configured settings for some of the more common dive computers and "
-"software packages encountered by divers. If the _CSV_ file being imported "
-"originated from any of these pre-configured items, then select it. Otherwise "
-"use the _Manual Import_ option. The configuration panel also has dropdown "
-"lists for the specification of the appropriate field separator (Tab, comma "
-"or semicolon), the date format used in the _CSV_ file, the time units "
-"(seconds, minutes or minutes:seconds), as well as the unit system (metric or "
-"imperial). Selecting the appropriate options among these is critical for the "
-"successful import of the data."
+"At the top left, there is a dropdown list containing pre- configured\n"
+"settings for common dive computers and software packages.\n"
+" If the _CSV_ file being imported originated from any of\n"
+"these pre-configured items, select it. Otherwise use the _Manual Import_\n"
+"option. The configuration panel also has dropdown lists for the "
+"specification of the appropriate\n"
+"field separator (Tab, comma or semicolon), the date format used in the _CSV_ "
+"file,\n"
+"the time units (seconds, minutes or minutes:seconds), as well as the unit "
+"system\n"
+"(metric or imperial). Selecting the appropriate options among these is "
+"critical for\n"
+"the successful data import.\n"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1165
+#: user-manual.txt:1138
 msgid ""
-"The last remaining task is to ensure that all the data columns have the "
-"appropriate column headings. The top blue row of the data table contains the "
-"column headings found in the _CSV_ data file. The blue row of balloons "
-"immediately above these contains the names understood by _Subsurface_. These "
-"balloons can be moved using a drag-and-drop action. For instance, "
-"_Subsurface_ expects the column heading for Dive number (\" # \") to be "
-"\"Dive # \". If the column heading that _Subsurface_ expects is not in the "
-"blue row, then drag the appropriate balloon from the upper area and drop it "
-"in the appropriate blue cell at the top of the table. To indicate the "
-"correct column for \"Dive #\", drag the ballooned item labelled \"Dive # \" "
-"and drop it in the blue cell immediately above the white cell containing \" "
-"# \". This is depicted in the image below."
+"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 "
+"headings found in the _CSV_ data file. The blue row of balloons immediately "
+"above these contains the names understood by _Subsurface_. These balloons "
+"can be moved using a drag-and-drop action. For instance, _Subsurface_ "
+"expects the column heading for Dive number (\" # \") to be \"Dive # \". If "
+"the column heading that _Subsurface_ expects is not in the blue row, drag "
+"the appropriate balloon from the upper area and drop it in the appropriate "
+"blue cell at the top of the table. To indicate the correct column for \"Dive "
+"#\", drag the ballooned item labelled \"Dive # \" and drop it in the blue "
+"cell immediately above the white cell containing \" # \". This is depicted "
+"in the image below."
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:1166
+#: user-manual.txt:1139
 #, no-wrap
 msgid "images/csv_import2_f20.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1172
+#: user-manual.txt:1145
 msgid ""
-"Continue in this way to ensure that all the column headings in the blue row "
-"of cells correspond to the headings listed in the top part of the "
-"dialogue. Having completed this task, select the _OK_ button to the bottom "
-"right of the dialogue.  The data from the _CSV_ file are imported and shown "
-"in the *Dive List* panel."
+"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.  "
+"When finished, select the _OK_ button on the bottom right of the dialogue.  "
+"The data from the _CSV_ file are imported and shown in the *Dive List* "
+"panel."
 msgstr ""
 
 #. type: delimited block *
-#: ./user-manual.txt:1176
+#: user-manual.txt:1149
 #, no-wrap
 msgid "*A Diver's Introduction to _CSV_ Files*\n"
 msgstr ""
 
 #. type: delimited block *
-#: ./user-manual.txt:1190
+#: user-manual.txt:1163
 msgid ""
 "_CSV_ is an abbreviation for a data file format: _Comma-Separated "
-"Values_. It is a file format allowing someone to view or edit the "
-"information using a text editor such as Notepad (Windows), gedit (Linux) or "
-"TextWrangler (OS/X). The two main advantages of the _CSV_ format is that the "
-"data are easily editable as text without any proprietary software and "
-"ensuring all information is human-readable, not being obscured by any custom "
-"or proprietary attributes that proprietary software insert into files.  "
-"Because of its simplicity the _CSV_ format is used as an interchange format "
-"between many software packages, e.g. between spreadsheet, statistical, "
-"graphics, database and diving software. Within _Subsurface_, _CSV_ files can "
-"also be used to import information from other sources such as "
-"spreadsheet-based dive logs and even from some dive computers."
+"Values_. It is a file format that lets you view or edit information using a "
+"text editor like Notepad (Windows), gedit (Linux) or TextWrangler "
+"(OS/X). There are two main advantages of the _CSV_ format.  First, the data "
+"are easily editable as text without any proprietary software.  Second, all "
+"information is human-readable, not obscured by any custom or proprietary "
+"attributes that proprietary software inserts into files.  Because of its "
+"simplicity the _CSV_ format is used as an interchange format between many "
+"software packages, e.g. between spreadsheet, statistical, graphics, database "
+"and diving software. Within _Subsurface_, _CSV_ files can also be used to "
+"import information from other sources like spreadsheet-based dive logs and "
+"some dive computers."
 msgstr ""
 
 #. type: delimited block *
-#: ./user-manual.txt:1199
+#: user-manual.txt:1172
 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 "
@@ -2208,7 +2152,7 @@ msgid ""
 "frequently a comma, a colon, a SPACE character or a TAB character. When "
 "exporting data from spreadsheet software, the field separator needs to be "
 "specified in order to create the _CSV_ file. _CSV_ files are normally "
-"organised into a single line that provides the headers (or _field names_) of "
+"organized into a single line that provides the headers (or _field names_) of "
 "the data columns, followed by the data, one record per line. Note that each "
 "field name may comprise more than one word separated by spaces; for instance "
 "_Dive site_, below. Here is an example of dive information for four dives "
@@ -2216,7 +2160,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block *
-#: ./user-manual.txt:1205
+#: user-manual.txt:1178
 #, no-wrap
 msgid ""
 "\tDive site,Dive date,Time,Dive_duration, Dive_depth,Dive buddy\n"
@@ -2227,14 +2171,14 @@ msgid ""
 msgstr ""
 
 #. type: delimited block *
-#: ./user-manual.txt:1207
+#: user-manual.txt:1180
 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:1213
+#: user-manual.txt:1186
 #, no-wrap
 msgid ""
 "\tDive site\tDive date\tTime\tDive_duration\tDive_depth\tDive buddy\n"
@@ -2245,7 +2189,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block *
-#: ./user-manual.txt:1221
+#: user-manual.txt:1194
 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 "
@@ -2259,7 +2203,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block *
-#: ./user-manual.txt:1232
+#: user-manual.txt:1205
 #, no-wrap
 msgid ""
 "\tDive Time (s)\tDepth (m)\tpO₂ - Setpoint (Bar) \tpO₂ - C1 Cell 1 "
@@ -2276,31 +2220,31 @@ msgid ""
 msgstr ""
 
 #. type: delimited block *
-#: ./user-manual.txt:1238
+#: user-manual.txt:1211
 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_ "
-"file, making it much easier to work with _CSV_ files.  _CSV_ files can "
-"therefore be used in many contexts for importing data into a _Subsurface_ "
-"dive log.  Knowledge of a few basic things about the content of the _CSV_ "
-"file allows a smooth import of the dives into _Subsurface_."
+"file, making it much easier to work with _CSV_ files.  _CSV_ files can be "
+"used in many contexts for importing data into a _Subsurface_ dive log.  "
+"Knowing a few basic things about the content of the _CSV_ file helps with a "
+"smooth import of the dives into _Subsurface_."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1252
+#: user-manual.txt:1225
 msgid ""
-"The _CSV_ import has a couple of caveats. One should avoid some special "
-"characters like ampersand (&), less than (<), greater than (>) and double "
-"quotes (\") as part of the numbers or text within a cell. The file should "
-"use UTF-8 character set, if using non-ASCII characters. Also the size of the "
-"_CSV_ file might cause problems. Importing 100 dives at a time (_CSV dive "
+"But, the _CSV_ import has a couple of caveats. Avoid some special characters "
+"like ampersand (&), less than (<), greater than (>) and double quotes (\") "
+"as part of the numbers or text within a cell. The file should use UTF-8 "
+"character set, if using non-ASCII characters. Also the size of the _CSV_ "
+"file might cause problems. Importing 100 dives at a time (_CSV dive "
 "details_) works, but larger files might exceed the limits of the parser "
 "used. When encountering problems with _CSV_ imports, first try with a "
 "smaller file to make sure everything works."
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:1255
+#: user-manual.txt:1228
 #, no-wrap
 msgid ""
 "Importing GPS coordinates with the _Subsurface Companion App_ for mobile "
@@ -2308,40 +2252,37 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1264
+#: user-manual.txt:1237
 #, no-wrap
 msgid ""
 "Using the *Subsurface Companion App* on an _Android device_   or\n"
 "xref:S_iphone[_iPhone_] with GPS, the coordinates\n"
 "for the diving\n"
-"location can be automatically passed to the _Subsurface_\n"
-"dive log. The Companion App stores the dive locations on\n"
-"a dedicated Internet file server. _Subsurface_, in turn, can collect\n"
-"the localities from the file server.\n"
-msgstr ""
-
-#. type: Plain text
-#: ./user-manual.txt:1266
-msgid "To do this:"
+"location can be automatically passed to the _Subsurface_ dive log. The "
+"Companion App\n"
+"stores dive locations on a dedicated Internet server. _Subsurface_ can "
+"collect\n"
+"the locations from the server.\n"
+"To do this:\n"
 msgstr ""
 
 #. type: Title ====
-#: ./user-manual.txt:1267
+#: user-manual.txt:1238
 #, no-wrap
 msgid "Create a Companion App account"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1272
+#: user-manual.txt:1243
 msgid ""
 "Register on the http://api.hohndel.org/login/[_Subsurface companion web "
 "page_].  A confirmation email with instructions and a personal *DIVERID* "
-"will be sent, a long number that gives access to the file server and "
+"will be sent, a long number giving you access to the file server and "
 "Companion App capabilities."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1277
+#: user-manual.txt:1248
 msgid ""
 "Download the app from "
 "https://play.google.com/store/apps/details?id=org.subsurface[Google Play "
@@ -2350,510 +2291,514 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: ./user-manual.txt:1278
+#: user-manual.txt:1249
 #, no-wrap
 msgid "Using the Subsurface companion app on an Android smartphone"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1281
+#: user-manual.txt:1252
 msgid "On first use the app has three options:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1287
+#: user-manual.txt:1258
 msgid ""
-"_Create a new account._ Equivalent to registering in _Subsurface_ companion "
-"page using an Internet browser. One can request a *DIVERID* using this "
-"option, but this is supplied via email and followed up by interaction with "
-"the http://api.hohndel.org/login/[_Subsurface companion web page_] in order "
-"to activate the account."
+"_Create a new account._ Equivalent to registering in the _Subsurface_ "
+"companion page using an Internet browser. You can request a *DIVERID* using "
+"this option, but it’s supplied via email and followed up by interaction with "
+"the http://api.hohndel.org/login/[_Subsurface companion web page_] to "
+"activate the account."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1290
+#: user-manual.txt:1261
 msgid ""
-"_Retrieve an account._ If users forgot their *DIVERID* they will receive an "
+"_Retrieve an account._ If users forget their *DIVERID* they will receive an "
 "email to recover the number."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1294
+#: user-manual.txt:1265
 msgid ""
 "_Use an existing account._ Users are prompted for their *DIVERID*. The app "
-"saves this *DIVERID* and does not ask for it again unless one uses the "
+"saves this *DIVERID* and doesn’t ask for it again unless you use the "
 "_Disconnect_ menu option (see below)."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1302
+#: user-manual.txt:1273
 msgid ""
 "In the _Subsurface_ main program, the *DIVERID* should also be entered on "
-"the Default Preferences panel, obtained by selecting _File -> Preferences -> "
-"Defaults_ from the main menu in _Subsurface_ itself.  This facilitates "
-"synchronisation between _Subsurface_ and the Companion App."
+"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."
 msgstr ""
 
 #. type: Title =====
-#: ./user-manual.txt:1303
+#: user-manual.txt:1274
 #, no-wrap
 msgid "Creating new dive locations"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1308
+#: user-manual.txt:1279
 msgid ""
-"Now one is ready to get a dive position and send it to the server. The "
+"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 "
 "any dives."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1311
+#: user-manual.txt:1282
 msgid ""
-"Touch the \"+\" icon on the top right to add a new dive site, a menu will be "
-"showed with 3 options:"
+"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:1314
+#: user-manual.txt:1285
 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:1323
+#: user-manual.txt:1294
 msgid ""
-"Use Map: This option allows the user to fix a position by searching a world "
-"map. A world map is shown (see *B* below) on which one should indicate the "
-"desired position with a _long press_ on the touch sensitive screen (if the "
-"marked location is erroneous, simply indicate a new location)  and select "
-"the check symbol in the upper right. A dialog is shown allowing to enter the "
-"name of the dive location and the date-time of the dive (see *C* below). In "
-"order to import this dive location in _Subsurface_ it's advisable to set the "
-"time to agree with the time of that dive on the dive computer."
+"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 "
+"position with a _long press_ on the touch sensitive screen (if the marked "
+"location is wrong, simply choose a new location)  and select the check "
+"symbol in the upper right. A dialog is shown letting you enter the name of "
+"the dive location and the date and time of the dive (see *C* below). In "
+"order to import this dive location in _Subsurface_ you should set the time "
+"to agree with the time of that dive on the dive computer."
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:1324
+#: user-manual.txt:1295
 #, no-wrap
 msgid "images/Companion_5.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1332
+#: user-manual.txt:1303
 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 "
-"stored locations shown. Now one needs to select the appropriate locations, "
-"then select 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."
+"stored locations shown. Now select the appropriate locations, then select "
+"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."
 msgstr ""
 
 #. type: Title =====
-#: ./user-manual.txt:1333
+#: user-manual.txt:1304
 #, no-wrap
 msgid "Dive lists of dive locations"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1341
+#: user-manual.txt:1312
 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 "
-"selection box to the left indicating that they require upload to the "
-"server. One can select individual dive locations from the list. A selected "
+"selection box to the left showing they need to be uploaded to the "
+"server. You can select individual dive locations from the list. A selected "
 "location has a check mark in the selection box on the left. Group operations "
-"(such as _Delete_ or _Send_)  are performed on several locations that are "
-"selected."
+"(like _Delete_ or _Send_)  are performed on several selected locations."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1349
+#: user-manual.txt:1320
 msgid ""
 "Dive locations in this list can be viewed in two ways: a list of locations "
-"or a map indicating the dive locations. The display mode (List or Map) is "
-"changed by selecting _Dives_ at the top left of the screen (see *A* below) "
-"and then selecting the display mode. The display mode can be changed either "
-"from the list of locations or from the map (see *B* below). If one selects a "
-"location (on the list or on the map), an editing panel opens (see *C* below) "
-"where the dive description or other details may be changed."
+"or a map showing them. The display mode (List or Map) is changed by "
+"selecting _Dives_ at the top left of the screen (see *A* below) and then "
+"selecting the display mode. The display mode can be changed either from the "
+"list of locations or from the map (see *B* below). If you select a location "
+"(on the list or on the map), an editing panel opens (see *C* below) where "
+"the dive description or other details may be changed."
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:1350
+#: user-manual.txt:1321
 #, no-wrap
 msgid "images/Companion_4.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1356
+#: user-manual.txt:1327
 msgid ""
-"When one selects a dive (*not* selecting the check box), the name given to "
+"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 "
 "of the screen:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1358
+#: user-manual.txt:1329
 msgid ""
 "Edit (pencil): Change the text name or other characteristics of the dive "
 "location."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1360
-msgid "Maps: Display a map showing the dive location."
-msgstr ""
-
-#. type: Plain text
-#: ./user-manual.txt:1363
+#: user-manual.txt:1334
 msgid ""
-"After editing and saving a dive location (see *C* above), one needs to "
-"upload it to the web service, as explained below."
+"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:1364
+#: user-manual.txt:1335
 #, no-wrap
 msgid "Uploading dive locations"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1370
+#: user-manual.txt:1341
 msgid ""
-"There are several ways to send locations to the server.  The easiest is by "
+"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 "
 "arrow at the top right of the screen."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1375
+#: user-manual.txt:1346
 msgid ""
-"Users must be careful, as the trash icon on the right means exactly what it "
-"should; it deletes the selected dive location(s)."
+"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:1376
+#: user-manual.txt:1347
 #, no-wrap
 msgid "images/Companion_1.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1381
+#: user-manual.txt:1352
 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:1383
+#: user-manual.txt:1354
 #, no-wrap
 msgid "Settings on the Companion App"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1386
+#: user-manual.txt:1357
 msgid ""
 "Selecting the _Settings_ menu option results in the right hand image above "
 "(*B*)."
 msgstr ""
 
 #. type: Title =====
-#: ./user-manual.txt:1387
+#: user-manual.txt:1358
 #, no-wrap
 msgid "Server and account"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1390
+#: user-manual.txt:1361
 msgid "_Web-service URL._ This is predefined (http://api.hohndel.org/)"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1394
+#: user-manual.txt:1364
 msgid ""
 "_User ID._ The DIVERID obtained by registering as described above. The "
-"easiest way to obtain it is simply to copy and paste from the confirmation "
-"email but, of course, users can also type this information."
+"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:1395
+#: user-manual.txt:1364
 #, no-wrap
 msgid "Synchronisation"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1399
+#: user-manual.txt:1368
 msgid ""
 "_Synchronize on startup_. If selected, dive locations in the Android device "
-"and those on the web service synchronise each time the app is started."
+"and those on the web service synchronize each time the app is started."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1402
+#: user-manual.txt:1371
 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:1403
+#: user-manual.txt:1372
 #, no-wrap
 msgid "Background service"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1406
+#: user-manual.txt:1375
 msgid ""
-"Instead of entering a unique dive location, users can leave the service "
-"running in the background of their Android device, allowing the continuous "
+"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."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1409
-msgid "The settings below define the behaviour of the service:"
+#: user-manual.txt:1377
+msgid "The settings below define the behavior of the service:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1412
+#: user-manual.txt:1380
 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:1414
+#: user-manual.txt:1382
 msgid "_Min distance._ In meters. Minimum distance between two locations."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1416
+#: user-manual.txt:1384
 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:1417 ./user-manual.txt:1514 ./user-manual.txt:1932
+#: user-manual.txt:1385 user-manual.txt:1486 user-manual.txt:1900
 #, no-wrap
 msgid "images/icons/info.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1427
+#: user-manual.txt:1395
 msgid ""
-"_How does the background service work?_ Assuming the user sets 5 minutes and "
-"50 meters in the settings above, the app will start by recording a location "
-"at the current location, followed by another one at every 5 minutes *or* "
-"every time one moves 50 m from previous location.  If subsequent locations "
-"are within a radius of 50 meters from the previous one, a new location is "
-"not saved. If the user is not moving, only one location is saved, but if the "
-"user is moving, a trace of the route is obtained by saving a location every "
-"50 meters."
+"_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 "
+"location at the current location, followed by another one at every 5 minutes "
+"*or* every time one moves 50 m from previous location.  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.  If the diver is moving, a trace of the route is obtained by saving a "
+"location every 50 meters."
 msgstr ""
 
 #. type: Title =====
-#: ./user-manual.txt:1428
+#: user-manual.txt:1396
 #, no-wrap
 msgid "Other"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1432
+#: user-manual.txt:1400
 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:1434
+#: user-manual.txt:1402
 msgid "_Subsurface website._ A link to the URL of Subsurface web"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1436
+#: user-manual.txt:1404
 msgid "_Version._ Displays the current version of the Companion App."
 msgstr ""
 
 #. type: Title =====
-#: ./user-manual.txt:1437
+#: user-manual.txt:1405
 #, no-wrap
 msgid "Search"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1440
+#: user-manual.txt:1408
 msgid "Search the saved dive locations by name or by date and time."
 msgstr ""
 
 #. type: Title =====
-#: ./user-manual.txt:1441
+#: user-manual.txt:1409
 #, no-wrap
 msgid "Start service"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1444
-msgid ""
-"Initiates the _background service_ following the previously defined "
-"settings."
+#: user-manual.txt:1412
+msgid "Starts the _background service_ following the previously defined settings."
 msgstr ""
 
 #. type: Title =====
-#: ./user-manual.txt:1445
+#: user-manual.txt:1413
 #, no-wrap
 msgid "Disconnect"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1453
+#: user-manual.txt:1421
 msgid ""
-"This is a badly named option that disconnects the app from the server by "
-"resetting the user ID in the app, showing the first screen where an account "
-"can be created, retrieve the ID for an existing account or use the users own "
-"ID. The disconnect option is useful if a user's Android device was used to "
-"download the dive locations of another registered diver."
+"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."
 msgstr ""
 
 #. type: Title =====
-#: ./user-manual.txt:1454
+#: user-manual.txt:1422
 #, no-wrap
 msgid "Send all locations"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1457
+#: user-manual.txt:1425
 msgid "This option sends all locations stored in the Android device to the server."
 msgstr ""
 
 #. type: Title ====
-#: ./user-manual.txt:1459
+#: user-manual.txt:1427
 #, no-wrap
 msgid "Using the Subsurface companion app on an _iPhone_ to record dive locations"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1464
+#: user-manual.txt:1432
 msgid ""
-"The iPhone interface is quite simple. One needs to type the user ID "
-"(obtained during registration) into the space reserved for it, then select "
-"\"Dive in\" (see left part of the image below) and start collecting dive "
-"location information."
+"The iPhone interface is quite simple. Type the user ID (obtained during "
+"registration) into the space reserved for it, then select \"Dive in\" (see "
+"left part of the image below) and start collecting dive location "
+"information."
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:1465
+#: user-manual.txt:1433
 #, no-wrap
 msgid "images/iphone.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1472
+#: user-manual.txt:1444
 msgid ""
 "Dives can be added automatically or manually. In manual mode, a dive "
 "location or waypoint is added to the GPS input stream. In automatic mode, a "
-"continuous path of GPS locations is created from which, much later, after "
-"import, subsurface can select the appropriate GPS locations based on the "
-"times of dives. The default mode for the _iphone_ is automatic. When one "
-"adds a dive, the location service is started automatically and a red bar "
-"appears at the bottom of the screen. After the dive one can click on the red "
-"bar to end the location service. While the location service is running one "
-"can only add dives using the manual mechanism."
+"continuous path of GPS locations is created from which, after import, "
+"Subsurface can select the appropriate GPS locations based on the times of "
+"dives. The default mode for the _iphone_ is automatic. When adding a dive, "
+"the location service is started automatically and a red bar appears at the "
+"bottom of the screen. After the dive, click on the red bar to end the "
+"location service. While the location service is running you can only add "
+"dives manually."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1478
+#: user-manual.txt:1450
 msgid ""
-"One can edit the site name afterwards by selecting the dive from the dive "
+"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 "
-"dive list is automatically uploaded from the iPhone to the webservice and "
-"there is not an option to trigger upload manually."
+"dive list is automatically uploaded from the iPhone to the web "
+"service. There isn’t an option to trigger upload manually."
 msgstr ""
 
 #. type: Title ====
-#: ./user-manual.txt:1480
+#: user-manual.txt:1452
 #, no-wrap
 msgid "Downloading dive locations to the _Subsurface_ divelog"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1489
+#: user-manual.txt:1461
 msgid ""
 "Download dive(s) from a dive computer or enter them manually into "
 "_Subsurface_ before obtaining the GPS coordinates from the server. The "
 "download dialog can be reached via _Ctrl+G_ or from the _Subsurface_ Main "
 "Menu _Import -> Import GPS data from Subsurface Service_, resulting in the "
 "image on the left (*A*), below. On first use the DIVERID text box is "
-"blank. Provide a DIVERID, then select the _Download_ button to initiate the "
+"blank. Provide a DIVERID, then select the _Download_ button to start the "
 "download process, after which the screen on the right (*B*) below appears:"
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:1490
+#: user-manual.txt:1462
 #, no-wrap
 msgid "images/DownloadGPS.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1498
+#: user-manual.txt:1470
 msgid ""
-"Note that the _Apply_ button is now active. By clicking on it, users can "
-"update the locations of the newly entered or uploaded dives in _Subsurface_ "
-"which applies the coordinates and names entered on the app for all the new "
-"dives that match the date-times of the uploaded GPS localities. If one has "
-"entered the name of the dive location in _Subsurface_ before downloading the "
-"GPS coordinates, this name will take precedence over downloaded one."
+"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_. That applies the coordinates and names entered on the app to "
+"all the new dives that match the date-times of the uploaded GPS "
+"localities. If you have entered the name of the dive location in "
+"_Subsurface_ before downloading the GPS coordinates, this name will take "
+"precedence over downloaded one."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1505
+#: user-manual.txt:1477
 msgid ""
 "Since _Subsurface_ matches GPS locations from the Android device and dive "
 "information from the dive computer based on date-time data, automatic "
-"assignment of GPS data to dives is dependent on agreement of the date-time "
-"information between these two devices. Although _Subsurface_ has a wide "
-"range tolerance, it may be unable to identify the appropriate dive if there "
-"is a large difference between the time in the dive computer and that of the "
-"Android device, resulting in no updates."
+"assignment of GPS data to dives depends on agreeing date-time information "
+"between the two devices. Although _Subsurface_ has a wide range tolerance, "
+"it may not be able to identify the appropriate dive if there's a large "
+"difference between the time in the dive computer and that of the Android "
+"device.  That results in no updates."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1513
+#: user-manual.txt:1485
 msgid ""
 "Similar date-times may not always be possible and there may be many reasons "
-"for this (e.g. time zones), or _Subsurface_ may be unable to decide which is "
-"the correct position for a dive (e.g. on repetitive dives while running "
+"for this (e.g. time zones).  _Subsurface_ may also be unable to decide which "
+"is the correct position for a dive (e.g. on repetitive dives while running "
 "_background service_ there may be several locations that would be included "
 "in the time range that fit not only the first dive, but one or more "
-"subsequent dives as well).  A workaround for this situation to manually edit "
-"the date-time of a dive in the _Subsurface_ Dive List *before* downloading "
-"the GPS data and then to change the date-time back again *after* downloading "
-"GPS data."
+"subsequent dives as well).  A workaround to manually edit the date-time of a "
+"dive in the _Subsurface_ Dive List *before* downloading the GPS data and "
+"then to change the date-time back again *after* downloading GPS data."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1517
+#: user-manual.txt:1489
 msgid "TIPS:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1524
+#: user-manual.txt:1492
 msgid ""
-"_Background service_, being a very powerful tool, may fill the location list "
-"with many unnecessary locations not corresponding to the exact dive point "
-"but reflecting the boat's route.  Currently these locations are difficult to "
-"delete from the server. In some situations it is therefore prudent to clean "
-"up the list on the Android device before sending the dive points to the web "
-"server by simply deleting the inappropriate locations. This might be "
-"necessary, for instance, if one wants to keep the location list clear to see "
-"dives in the web service map display (see above)."
+"_Background service_ may fill the location list with unnecessary locations "
+"that don’t correspond to the exact dive point but do correspond to the "
+"boat's route."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1528
+#: user-manual.txt:1493
+msgid ""
+"Right now, these locations are difficult to delete from the server. In some "
+"situations it"
+msgstr ""
+
+#. type: Plain text
+#: user-manual.txt:1496
+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. This might be necessary, for instance, if you want to keep the "
+"location list clear to see dives in the web service map display (see above)."
+msgstr ""
+
+#. type: Plain text
+#: user-manual.txt:1499
 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 "
@@ -2862,28 +2807,28 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:1530
+#: user-manual.txt:1501
 #, no-wrap
 msgid "Adding photographs to dives"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1536
+#: user-manual.txt:1507
 msgid ""
 "Many (if not most) divers take a camera with them and take photographs "
-"during a dive. One would like to associate each photograph with a specific "
-"dive. _Subsurface_ allows one to load photos into a dive. Photos are "
-"superimposed on the dive profile, from where they can be viewed."
+"during a dive. To match each photograph with a specific dive, _Subsurface_ "
+"lets you load photos into a dive. Photos are superimposed on the dive "
+"profile, from where they can be viewed."
 msgstr ""
 
 #. type: Title ====
-#: ./user-manual.txt:1537
+#: user-manual.txt:1508
 #, no-wrap
-msgid "Loading photos and getting synchronisation between dive computer and camera"
+msgid "Loading photos and synchronizing between dive computer and camera"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1541
+#: user-manual.txt:1512
 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 "
@@ -2891,66 +2836,66 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:1542
+#: user-manual.txt:1513
 #, no-wrap
 msgid "images/LoadImage1_f20.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1546
+#: user-manual.txt:1517
 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:1547
+#: user-manual.txt:1518
 #, no-wrap
 msgid "images/LoadImage2_f20.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1556
+#: user-manual.txt:1527
 msgid ""
-"This brings up the time synchronisation dialog, shown below. The critical "
-"problem is that the time synchronisation is not perfect between the dive "
-"computer used during a dive, and the camera used during that same "
-"dive. These two devices often differ by several minutes. If _Subsurface_ can "
-"achieve synchronisation, then the exact times of photographs can be used to "
-"position photographs on the dive profile."
+"This brings up the time synchronization dialog, shown below. But be aware "
+"that the time synchronization is not perfect between the dive computer used "
+"during a dive, and the camera used during that same dive. These two devices "
+"often differ by several minutes. If _Subsurface_ can synchronize, then the "
+"exact times of photographs can be used to position photographs on the dive "
+"profile."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1558
-msgid "_Subsurface_ achieves this synchronisation in three ways:"
+#: user-manual.txt:1529
+msgid "_Subsurface_ synchronizes in three ways:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1561
+#: user-manual.txt:1532
 #, no-wrap
 msgid ""
-"*Pro-actively*: Before the dive, ensure synchronisation of the dive computer "
+"*Pro-actively*: Before the dive, ensure synchronization of the dive computer "
 "time settings with\n"
 "the time settings of the camera by changing the date-time settings on one or "
 "both of these devices.\n"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1572
+#: user-manual.txt:1543
 #, no-wrap
 msgid ""
-"*Manually*: If the user wrote down the exact camera time at the start of a "
-"dive, the\n"
-"difference in time between the two devices can be determined. Actually, as "
-"long as the device\n"
-"settings for time has not been changed in either device, one could write "
+"*Manually*: If you wrote down the exact camera time at the start of a dive, "
+"the\n"
+"difference in time between the two devices can be determined. As long as the "
+"device\n"
+"settings for time has not been changed in either device, you could write "
 "down the times of\n"
-"both devices after the dive or even at the end of the day. One can then "
+"both devices after the dive or even at the end of the day. You can then "
 "manually set the time\n"
 "difference in the _Time shift_ dialog. Towards the top of the dialog is a "
 "time setting tool\n"
-"immediately under the heading _Shift times of image(s) by_, evident in "
-"figure *A* below.\n"
+"immediately under the heading _Shift times of image(s) by_, shown in figure "
+"*A* below.\n"
 "If the camera time is 7 minutes later than that of the dive computer, set "
 "the time setting\n"
 "tool to a value of 00:07.  Select either the _earlier_ or _later_ radio "
@@ -2959,31 +2904,30 @@ msgid ""
 "need to be shifted\n"
 "7 minutes earlier (camera is 7 minutes ahead of dive computer). Ignore any "
 "\"AM\" or \"PM\" suffix\n"
-"in that tool. Click the _OK_ button and synchronisation is achieved.\n"
+"in that tool. Click the _OK_ button and synchronization is done.\n"
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:1573
+#: user-manual.txt:1544
 #, no-wrap
 msgid "images/LoadImage3b_f20.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1591
+#: user-manual.txt:1562
 #, no-wrap
 msgid ""
-"*By photograph*: There is a very slick way of achieving synchronisation. If "
-"one takes a\n"
+"*By photograph*: There is a very slick way of synchronizing. If you take a\n"
 "photograph of the face of the dive computer showing the time, then "
-"_Subsurface_ can obtain\n"
-"the exact time the photograph was taken, using the metadata that the camera "
+"_Subsurface_ can get\n"
+"the exact time the photograph was taken, using the metadata the camera "
 "stores within\n"
-"each photo. In order to do this, use the bottom half of the _Time shift_ "
-"dialog. If one uses\n"
+"each photo. To do this, use the bottom half of the _Time shift_ dialog. If "
+"you use\n"
 "the bottom part, the top part of the dialog is ignored. Click on\n"
-"the horizontal bar entitled \"_Select image of dive computer showing "
+"the horizontal bar called \"_Select image of dive computer showing "
 "time_. This brings up\n"
-"a file browser with which one can select the photograph of the dive computer "
+"a file browser letting you select the photograph of the dive computer "
 "time. Select the\n"
 "photograph using the file browser and click on _OK_. This photograph of the "
 "dive computer\n"
@@ -2991,164 +2935,162 @@ msgid ""
 "knows exactly\n"
 "when the photograph has been taken. Now set the date-time dialog to the left "
 "of the photo\n"
-"so that this tool reflects the date and time of the dive computer in the "
-"photo. When the\n"
+"so it reflects the date and time of the dive computer in the photo. When "
+"the\n"
 "date-time tool has been set, _Subsurface_ knows exactly what the time "
 "difference between\n"
-"camera and dive computer is, and synchronisation is achieved.\n"
+"camera and dive computer is, and it can synchronize.\n"
 "Image *B* above shows a photograph of the face of the dive computer and with "
 "the date-time tool set to the\n"
 "date-time.\n"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1594
+#: user-manual.txt:1565
 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:1595
+#: user-manual.txt:1566
 #, no-wrap
 msgid "Viewing the photos"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1598
+#: user-manual.txt:1569
 msgid "After the images have been loaded, they appear in two places:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1600
+#: user-manual.txt:1571
 msgid "the _Photos_ tab of the *Notes* panel."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1604
+#: user-manual.txt:1575
 msgid ""
 "as tiny icons (stubs) on the dive profile at the appropriate positions "
-"reflecting the time each photograph was taken.  In order to view the photos "
-"on the dive profile, activate the _show-photos_ button in the tool bar to "
-"the left of the dive profile:"
+"reflecting the time each photograph was taken.  To view the photos on the "
+"dive profile, activate the _show-photos_ button in the tool bar to the left "
+"of the dive profile:"
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:1605
+#: user-manual.txt:1576
 #, no-wrap
 msgid "images/icons/ShowPhotos_f20.png"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1608
+#: user-manual.txt:1579
 msgid "This results in a profile display as in the image below:"
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:1609
+#: user-manual.txt:1580
 #, no-wrap
 msgid "images/LoadImage4_f20.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1613
+#: user-manual.txt:1584
 msgid ""
-"If one hovers with the mouse over any of the photo icons, then a thumbnail "
-"photo is shown of the appropriate photo. See the image below:"
+"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:1614
+#: user-manual.txt:1585
 #, no-wrap
 msgid "images/LoadImage5_f20.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1623
+#: user-manual.txt:1594
 msgid ""
 "Clicking on the thumbnail brings up a full size photo overlaid on the "
-"_Subsurface_ window. This allows good viewing of the photographs that have "
-"been added (see the image below). Note that the thumbnail has a small "
-"dustbin icon in the bottom right hand corner (see image above). If one "
-"selects the dustbin, the image is removed from the dive. Therefore some care "
-"is required when clicking on a thumbnail. Images can also be deleted using "
-"the _Photos_ tab (see text below)."
+"_Subsurface_ window. This allows good viewing of the added photographs. (see "
+"the image below). Note that the thumbnail has a small dustbin icon in the "
+"bottom right hand corner (see image above). Selecting the dustbin removes "
+"the image from the dive. Be careful when clicking on a thumbnail. Images can "
+"also be deleted using the _Photos_ tab (see text below)."
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:1624
+#: user-manual.txt:1595
 #, no-wrap
 msgid "images/LoadImage6_f20.jpg"
 msgstr ""
 
 #. type: Title ====
-#: ./user-manual.txt:1626
+#: user-manual.txt:1597
 #, no-wrap
 msgid "The _Photos_ tab"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1637
+#: user-manual.txt:1608
 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 "
 "(therefore sometimes with large overlap on the dive profile) can easily be "
 "accessed in the _Photos_ tab. This tab serves as a tool for individually "
-"accessing the photos of a dive, while the stubs on the dive profile give an "
-"indication of when during a dive a photo was taken. By single-clicking on a "
-"thumbnail in the _Photos_ panel, a photo is selected. By double-clicking a "
-"thumbnail, the full-sized image is shown, overlaying the _Subsurface_ "
-"window. A photo can be deleted from the _Photos_ panel by selecting it "
-"(single-click) and then by pressing the _Del_ key on the keyboard. This "
-"removes the photo both from the _Photos_ tab as well as the dive profile."
+"accessing the photos of a dive, while the stubs on the dive profile show "
+"when during a dive a photo was taken. By single-clicking on a thumbnail in "
+"the _Photos_ panel, a photo is selected. By double-clicking a thumbnail, the "
+"full-sized image is shown, overlaying the _Subsurface_ window. A photo can "
+"be deleted from the _Photos_ panel by selecting it (single-click) and then "
+"by pressing the _Del_ key on the keyboard. This removes the photo BOTH from "
+"the _Photos_ tab as well as the dive profile."
 msgstr ""
 
 #. type: Title ====
-#: ./user-manual.txt:1638
+#: user-manual.txt:1609
 #, no-wrap
 msgid "Photos on an external hard disk"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1649
+#: user-manual.txt:1619
 msgid ""
-"Most underwater photographers store their photos on an external drive. If "
-"such a drive can be mapped by the operating system (almost always the case) "
-"the photos can be directly accessed by _Subsurface_. This facilitates the "
-"interaction between _Subsurface_ and an external repository of photos. When "
-"associating a dive profile with photos from an external drive, the normal "
-"procedure of selection and synchronisation (see text above) is used.  "
-"However, after the external drive has been disconnected, _Subsurface_ cannot "
-"access these photos any more.  If the display of photos is activated (using "
-"the toolbox to the left of the _Dive Profile_), the program only shows a "
-"small white dot where each photo should be on the dive profile.  In addition "
-"the _Photos_ tab only shows the file names of the photos. This is normal "
-"behaviour.  If, later, the external drive with the photos is connected "
-"again, the photos can be seen in the normal way."
+"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 "
+"photos can be directly accessed by _Subsurface_. This eases the interaction "
+"between _Subsurface_ and an external repository of photos. When associating "
+"a dive profile with photos from an external drive, the normal procedure of "
+"selection and synchronization (see text above) is used.  After the external "
+"drive has been disconnected, _Subsurface_ cannot access these photos any "
+"more.  If the display of photos is activated (using the toolbox to the left "
+"of the _Dive Profile_), the program only shows a small white dot where each "
+"photo should be on the dive profile.  In addition the _Photos_ tab only "
+"shows the file names of the photos.  If the external drive with the photos "
+"is re-connected, the photos can be seen in the normal way."
 msgstr ""
 
 #. type: Title ====
-#: ./user-manual.txt:1651
+#: user-manual.txt:1621
 #, no-wrap
 msgid "Moving photographs among directories, hard disks or computers"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1661
+#: user-manual.txt:1631
 #, no-wrap
 msgid ""
 "After a photograph has been loaded into _Subsurface_ and associated with a "
 "specific dive, the directory\n"
-" where the photo lies is stored, allowing _Subsurface_ to find the "
-"photograph when the dive is\n"
+" where the photo lies is stored, letting _Subsurface_ find the photograph "
+"when the dive is\n"
 " opened again. If the photo or the whole photo collection is moved to "
 "another drive or to a different\n"
-" machine, it is unlikely that the directory structure will remain identical "
-"to that of the original uploaded\n"
+" machine, the directory structure will be different to that of the original "
+"uploaded\n"
 " photo. When this happens, _Subsurface_ looks for the photos at their "
 "original location before they were moved,\n"
-" cannot find them and therefore cannot display them. Because, after moving "
-"photos, large numbers of photos\n"
+" cannot find them and cannot display them. Because after moving photos, "
+"large numbers of photos\n"
 " may need to be deleted and re-imported from the new location, _Subsurface_ "
 "has a mechanism that eases the\n"
 " process of updating the directory information for each photo: automatic "
@@ -3156,7 +3098,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1666
+#: user-manual.txt:1635
 #, no-wrap
 msgid ""
 "When a photo is loaded into _Subsurface_, a fingerprint for the image is "
@@ -3164,47 +3106,41 @@ msgid ""
 " other reference information for that photo. After moving a photo collection "
 "(that has already been loaded\n"
 " into _Subsurface_) to a different directory, disk or computer, _Subsurface_ "
-"can  perform the\n"
-" following steps:\n"
+"can:\n"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1668
+#: user-manual.txt:1638
 msgid ""
 "look through a particular directory (and all its subdirectories recursively) "
-"where photos have been moved"
+"where photos have been moved to,"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1669
-msgid "to,"
-msgstr ""
-
-#. type: Plain text
-#: ./user-manual.txt:1671
+#: user-manual.txt:1639
 msgid "calculate fingerprints for all photos in this directory, and"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1673
+#: user-manual.txt:1641
 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:1675
+#: user-manual.txt:1643
 msgid ""
-"loaded into _Subsurface_ (even if the original file name has changed), to "
+"loaded into _Subsurface_ (even if the original file name has changed), "
 "automatically update the directory information so that _Subsurface_ can find "
 "the photo in the new moved directory."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1680
+#: user-manual.txt:1648
 #, no-wrap
 msgid ""
-"This is achieved by selecting from the Main Menu: _File ->      Find moved "
+"This is done by selecting from the Main Menu: _File ->      Find moved "
 "images_. This brings up a window within\n"
 " which the NEW directory of the photos needs to be specified. Select the "
 "appropriate directory and click\n"
@@ -3215,83 +3151,82 @@ msgid ""
 msgstr ""
 
 #. type: delimited block *
-#: ./user-manual.txt:1685
+#: user-manual.txt:1653
 #, no-wrap
 msgid "*Upgrading existing photo collections without fingerprints*\n"
 msgstr ""
 
 #. type: delimited block *
-#: ./user-manual.txt:1690
+#: user-manual.txt:1658
 msgid ""
-"_Subsurface_ automatically calculates fingerprints for all images that can "
-"be accessed by _Subsurface_.  When manipulating images, ensure that all the "
-"images associated with the dive log can be accessed by _Subsurface_."
+"_Subsurface_ automatically calculates fingerprints for all images that it "
+"can access.  When manipulating images, be sure all the images associated "
+"with the dive log can be accessed by _Subsurface_."
 msgstr ""
 
 #. type: delimited block *
-#: ./user-manual.txt:1692
+#: user-manual.txt:1660
 msgid ""
 "_Subsurface_ automatically checks and, if necessary, updates the "
 "fingerprints associated with a single dive if:"
 msgstr ""
 
 #. type: delimited block *
-#: ./user-manual.txt:1693
+#: user-manual.txt:1661
 msgid ""
 "The images associated with that dive are visible as thumbnails on the *Dive "
 "Profile*."
 msgstr ""
 
 #. type: delimited block *
-#: ./user-manual.txt:1694
+#: user-manual.txt:1662
 msgid ""
-"One edits anything in the *Notes tab* panel and save the edits by selecting "
-"_Apply changes_."
+"If you edit anything in the *Notes tab* panel and save the edits by "
+"selecting _Apply changes_."
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:1698
+#: user-manual.txt:1666
 #, no-wrap
 msgid "Logging special types of dives"
 msgstr ""
 
 #. type: Title ====
-#: ./user-manual.txt:1701
+#: user-manual.txt:1669
 #, no-wrap
 msgid "Multicylinder dives"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1708
+#: user-manual.txt:1676
 msgid ""
 "_Subsurface_ easily handles dives involving more than one "
-"cylinder. Multi-cylinder diving usually happens (a) if a diver does not have "
-"enough gas for the complete dive in a single cylinder; (b) if the diver "
-"needs more than one gas mixture because of the depth or the decompression "
-"needs of the dive. For this reason multi-cylinder dives are often used by "
-"technical divers who dive deep or long. As far as _Subsurface_ is concerned, "
-"there are only two types of information that need to be provided:"
+"cylinder. Multi-cylinder diving usually happens (a) if a diver doesn’t have "
+"enough gas for the complete dive in a single cylinder; (b) if a diver needs "
+"more than one gas mixture because of the depth or the decompression needs of "
+"the dive. For this reason multi-cylinder dives are often used by technical "
+"divers who dive deep or long. As far as _Subsurface_ is concerned, there are "
+"only two types of information that need to be provided:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1712
+#: user-manual.txt:1680
 #, no-wrap
 msgid ""
 "*Describe the cylinders used during the dive* This is performed in the "
 "*Equipment tab* of\n"
 "the *Info* panel, as xref:cylinder_definitions[described above]. Enter the "
 "cylinders one by one,\n"
-"specifying the characteristics of the cylinder and the gas composition "
-"within each cylinder.\n"
+"specifying each’s characteristics and the gas composition within it.\n"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1717
+#: user-manual.txt:1685
 #, no-wrap
 msgid ""
-"*Record the times at which switches from one cylinder to another was done:* "
-"This is information\n"
-"provided by some dive computers (provided the diver indicated these changes "
+"*Record the times at which the switch from one cylinder to another was "
+"done:* This is information\n"
+"tracked by some dive computers (provided the diver indicated these changes "
 "to the dive computer\n"
 "by pressing specific buttons). If the dive computer does not provide the "
 "information, the diver has to\n"
@@ -3299,7 +3234,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1725
+#: user-manual.txt:1693
 #, no-wrap
 msgid ""
 "*Record the cylinder changes on the dive profile*: If the latter option\n"
@@ -3316,61 +3251,60 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1729
+#: user-manual.txt:1697
 msgid ""
-"Having performed these tasks, _Subsurface_ indicates the appropriate use of "
+"When this is complete, _Subsurface_ indicates the appropriate use of "
 "cylinders in the dive profile.  Below is a multi-cylinder dive, starting off "
-"with EAN28, then changing cylinders to EAN50 after 26 minutes to perform "
+"with EAN28, then changing cylinders to EAN50 after 26 minutes for "
 "decompression."
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:1730
+#: user-manual.txt:1698
 #, no-wrap
 msgid "images/multicylinder_dive.jpg"
 msgstr ""
 
 #. type: Title ====
-#: ./user-manual.txt:1732
+#: user-manual.txt:1700
 #, no-wrap
 msgid "Sidemount dives"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1738
+#: user-manual.txt:1706
 msgid ""
 "Sidemount diving is just another form of multi-cylinder diving, often with "
-"both or all cylinders having the same gas mixture. Although it is a popular "
-"configuration for cave divers, sidemount diving can be performed by "
-"recreational divers who have completed the appropriate training. Sidemount "
-"dive logging involves, exactly as with multi-cylinder dives, above, three "
-"steps:"
+"both or all cylinders having the same gas mixture. Although it’s a popular "
+"configuration for cave divers, Sidemount diving can be done by recreational "
+"divers who’ve completed the appropriate training. sidemount dive logging "
+"involves three steps, exactly as with multi-cylinder dives above:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1747
+#: user-manual.txt:1715
 #, no-wrap
 msgid ""
 "*During the dive, record cylinder switch events*. Since sidemount diving "
 "normally involves two\n"
 "cylinders with air or with the same gas mixture, _Subsurface_ distinguishes "
-"among these different\n"
+"between these different\n"
 "cylinders. In contrast, many dive computers that allow gas switching only "
-"distinguish among different\n"
-"_gases_ used, not among different _cylinders_ used. This means that when "
+"distinguish between different\n"
+"_gases_ used, not among different _cylinders_ used. This means when "
 "sidemount dives are downloaded\n"
-"from these dive computers, the events of switching between cylinders with "
-"the same gas are not downloaded. This may mean\n"
-"that one may have to keep a written log of cylinder switch times using a "
+"from these dive computers, the switching event between cylinders with the "
+"same gas is not downloaded. This may mean\n"
+"that a diver may have to keep a written log of cylinder switch times using a "
 "slate, or (if the dive computer\n"
-"has this facility) marking each cylinder switch with a bookmark that can be "
+"has the capability) marking each cylinder switch with a bookmark that can be "
 "retrieved later. Returning\n"
 "from a dive with the times of cylinder changes is the only tricky part of "
 "logging sidemount dives.\n"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1750
+#: user-manual.txt:1718
 #, no-wrap
 msgid ""
 "*Within _Subsurface_ describe the cylinders used during the dive*. The diver "
@@ -3381,85 +3315,85 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1760
+#: user-manual.txt:1728
 #, no-wrap
 msgid ""
 "*Indicate cylinder change events on the _Subsurface_ dive profile*. Once the "
 "dive log has been imported\n"
 "from a dive computer into _Subsurface_, the cylinder switch events need to "
-"be indicated on the dive profile.\n"
+"be shown on the dive profile.\n"
 "Cylinder changes are recorded by right-clicking at the appropriate point on "
-"the dive profile and then\n"
+"the dive profile, then\n"
 "selecting _Add gas change_. A list of the appropriate cylinders is shown "
 "with the\n"
 "currently used cylinder greyed out. In the image below Tank 1 is greyed out, "
 "leaving only Tank 2\n"
 "to be selected. Select the appropriate cylinder. The cylinder change is then "
-"indicated on the dive\n"
+"shown on the dive\n"
 "profile with a cylinder symbol. If the *Tank Bar* is activated using the "
 "toolbar to the left of the\n"
-"profile, then the cylinder change is also indicated on the Tank Bar (see "
-"image below). After all\n"
+"profile, then the cylinder change is also shown on the Tank Bar (see image "
+"below). After all\n"
 "the cylinder change events have been recorded on the dive profile, the "
 "correct cylinder pressures\n"
 "for both cylinders are shown on the dive profile, as in the image below.\n"
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:1761
+#: user-manual.txt:1729
 #, no-wrap
 msgid "images/sidemount1.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1764
+#: user-manual.txt:1732
 msgid ""
 "This section gives an example of the versatility of _Subsurface_ as a dive "
 "logging tool."
 msgstr ""
 
 #. type: Title ====
-#: ./user-manual.txt:1767
+#: user-manual.txt:1735
 #, no-wrap
 msgid "Semi-closed circuit rebreather (SCR) dives"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: ./user-manual.txt:1769
+#: user-manual.txt:1737
 #, no-wrap
 msgid "images/halcyon_RB80.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1779
+#: user-manual.txt:1747
 msgid ""
-"Passive semi-closed rebreathers (pSCR) comprise a technical advance in "
-"diving equipment that recirculates the breathing gas that a diver breathes, "
-"while removing carbon dioxide from the exhaled gas. While a small amount "
-"(typically a tenth) of the exhaled breathing gas is released into the water, "
-"a small amount of fresh gas is released from the back gas cylinder "
-"(typically containing nitrox).  A diver, using a single cylinder of "
-"breathing gas can therefore dive for much longer periods than using a "
-"recreational open-circuit configuration. With pSCR equipment, a very small "
-"amount of breathing gas is released every time the breather inhales. With "
-"active SCR (aSCR) equipment, in contrast, a small amount of breathing gas is "
-"released continuously from the back cylinder."
+"Passive semi-closed rebreathers (pSCR) are a technical advance in diving "
+"equipment that recirculates the breathing gas a diver uses, while removing "
+"carbon dioxide from the exhaled gas. While a small amount (typically a "
+"tenth) of the exhaled breathing gas is released into the water, a small "
+"amount of fresh gas is released from the back gas cylinder (typically "
+"containing nitrox).  A diver using a single cylinder of breathing gas can "
+"therefore dive for much longer periods than using a recreational "
+"open-circuit configuration. With pSCR equipment, a very small amount of "
+"breathing gas is released every time the diver inhales. With active SCR "
+"(aSCR) equipment, in contrast, a small amount of breathing gas is released "
+"continuously from the back cylinder."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1781
+#: user-manual.txt:1749
 msgid ""
-"To log pSCR dives, no special procedures are required, just the normal steps "
+"To log pSCR dives, no special procedures are required. Use the normal steps "
 "outlined above:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1783
+#: user-manual.txt:1751
 msgid "Select pSCR in the _Dive Mode_ dropdown list on the *Info* panel."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1787
+#: user-manual.txt:1755
 msgid ""
 "pSCR diving often involves gas changes, requiring an additional cylinder.  "
 "Define all the appropriate cylinders as described above and indicate the "
@@ -3468,48 +3402,48 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1792
+#: user-manual.txt:1760
 msgid ""
-"If a pSCR _Dive Mode_ has been selected, the dive ceiling for pSCR dives is "
-"adjusted for the oxygen drop across the mouthpiece which often requires "
+"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 "
 "longer decompression periods. Below is a dive profile of a pSCR dive using "
 "EAN36 on the back cylinder and oxygen for decompression. Note that this dive "
 "lasted over two hours."
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:1793
+#: user-manual.txt:1761
 #, no-wrap
 msgid "images/pSCR_profile.jpg"
 msgstr ""
 
 #. type: Title ====
-#: ./user-manual.txt:1798
+#: user-manual.txt:1766
 #, no-wrap
 msgid "Closed circuit rebreather (CCR) dives"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: ./user-manual.txt:1800
+#: user-manual.txt:1768
 #, no-wrap
 msgid "images/APD.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1805
+#: user-manual.txt:1773
 msgid ""
 "Closed system rebreathers use advanced technology to recirculate gas that "
-"has been breathed while doing two things to maintain a breathable oxygen "
+"has been breathed. They also do two things to maintain a breathable oxygen "
 "concentration:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1806
-msgid "remove carbon dioxide from the gas that has been exhaled"
+#: user-manual.txt:1774
+msgid "remove carbon dioxide from the exhaled gas"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1815
+#: user-manual.txt:1783
 msgid ""
 "regulate the oxygen concentration to remain within safe diving limits.  The "
 "CCR interface of _Subsurface_ is currently experimental and under active "
@@ -3519,18 +3453,18 @@ msgid ""
 "download of a log containing multiple dives. Rather, each dive is stored "
 "independently. This means that _Subsurface_ cannot download a dive log "
 "directly from a CCR dive computer, but that it imports CCR dive logs in the "
-"same way that it imports dive log data from other digital databases: one "
-"dive at a time."
+"same way it imports dive log data from other digital databases: one dive at "
+"a time."
 msgstr ""
 
 #. type: Title =====
-#: ./user-manual.txt:1816
+#: user-manual.txt:1784
 #, no-wrap
 msgid "Import a CCR dive"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1830
+#: user-manual.txt:1798
 msgid ""
 "See the section dealing with xref:S_ImportingAlienDiveLogs[Importing dive "
 "information from other digital sources]. From the main menu of _Subsurface_, "
@@ -3538,24 +3472,24 @@ msgid ""
 "xref:Unified_import[universal import dialogue]. As explained in that "
 "section, the bottom right hand of the import dialogue contains a dropdown "
 "list (labled _Filter:_) of appropriate devices that currently "
-"includes(Poseidon) MkVI or APD log viewer files (import for other CCR "
-"equipment is under active development). Having selected the appropriate CCR "
+"include(Poseidon) MkVI or APD log viewer files. Import for other CCR "
+"equipment is under active development. Having selected the appropriate CCR "
 "format and the directory where the original dive logs have been stored from "
-"the CCR dive computer, one can select a particular dive log file (in the "
-"case of the MkVI it is a file with a .txt extension). After selecting the "
-"appropriate dive log, activate the _Open_ button at the bottom right hand of "
-"the universal import dialogue.  The selected dive is imported to the "
-"_Subsurface_ dive list."
+"the CCR dive computer, select a particular dive log file (in the case of the "
+"MkVI it is a file with a .txt extension). After selecting the appropriate "
+"dive log, click the _Open_ button at the bottom right hand of the universal "
+"import dialogue.  The selected dive is imported to the _Subsurface_ dive "
+"list."
 msgstr ""
 
 #. type: Title =====
-#: ./user-manual.txt:1831
+#: user-manual.txt:1799
 #, no-wrap
 msgid "Displayed information for a CCR dive"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1841
+#: user-manual.txt:1809
 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 "
@@ -3569,68 +3503,68 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1843
+#: user-manual.txt:1811
 msgid "For TWO O~2~ sensors the mean value of the two sensors are given."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1847
+#: user-manual.txt:1815
 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 "
-"sensors are treated as spurious. If one of the three sensors provides "
-"spurious data, it is ignored."
+"sensors are treated as false. If one of the three sensors provides false "
+"data, it is ignored."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1849
+#: user-manual.txt:1817
 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:1851
+#: user-manual.txt:1819
 msgid "The mean pO~2~ of the sensors is indicated with a green line,"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1859
+#: user-manual.txt:1827
 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 "
-"turned on by checking the appropriate checkboxes in the _Preferences_ panel "
+"turned on by checking the appropriate boxes in the _Preferences_ panel "
 "(accessible by selecting xref:S_CCR_options[_File -> Preferences -> "
 "Graph_]). This part of the _Preferences_ panel is shown in the image below, "
 "representing two checkboxes that modify the display of pO~2~ when the "
-"appropriate toolbar button on the Dive Profile has been activated."
+"appropriate toolbar button on the Dive Profile has been checked."
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:1860
+#: user-manual.txt:1828
 #, no-wrap
 msgid "images/CCR_preferences_f20.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1867
+#: user-manual.txt:1835
 msgid ""
-"Checking any of these check boxes allows the display of additional "
-"oxygen-related information whenever the pO~2~ toolbar button on the "
-"_Profile_ panel is activated.  The first checkbox allows the display of "
-"setpoint information. This is a red line superimposed on the green oxygen "
-"partial pressure graph and allows a comparison of the mean measured oxygen "
-"partial pressure and the setpoint values, as shown below."
+"Checking any of these boxes allows the display of additional oxygen-related "
+"information whenever the pO~2~ toolbar button on the _Profile_ panel is "
+"activated.  The first checkbox allows the display of setpoint "
+"information. This is a red line superimposed on the green oxygen partial "
+"pressure graph and allows a comparison of the mean measured oxygen partial "
+"pressure and the setpoint values, as shown below."
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:1868
+#: user-manual.txt:1836
 #, no-wrap
 msgid "images/CCR_setpoint_f20.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1872
+#: user-manual.txt:1840
 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 "
@@ -3638,22 +3572,22 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1874
+#: user-manual.txt:1842
 msgid "Sensor 1: grey"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1875
+#: user-manual.txt:1843
 msgid "Sensor 2: blue"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1876
+#: user-manual.txt:1844
 msgid "Sensor 3: brown"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1880
+#: user-manual.txt:1848
 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 "
@@ -3661,13 +3595,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:1881
+#: user-manual.txt:1849
 #, no-wrap
 msgid "images/CCR_sensor_data_f20.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1886
+#: user-manual.txt:1854
 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, "
@@ -3675,7 +3609,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1890
+#: user-manual.txt:1858
 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 "
@@ -3684,7 +3618,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1898
+#: user-manual.txt:1866
 msgid ""
 "_Cylinder pressures_: Some CCR dive computers like the Poseidon MkVI record "
 "the pressures of the oxygen and diluent cylinders. The pressures of these "
@@ -3692,18 +3626,18 @@ msgid ""
 "addition, start and end pressures for both oxygen and diluent cylinders are "
 "shown in the _Equipment Tab_.  Below is a dive profile for a CCR dive, "
 "including an overlay of setpoint and oxygen sensor data, as well as the "
-"cylinder pressure data. In this case there is good agreement from the "
-"readings of the two oxygen sensors."
+"cylinder pressure data. In this case there is agreement from the readings of "
+"the two oxygen sensors."
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:1899
+#: user-manual.txt:1867
 #, no-wrap
 msgid "images/CCR_dive_profile_f22.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1904
+#: user-manual.txt:1872
 msgid ""
 "_Equipment-specific information_: Equipment-specific information gathered by "
 "_Subsurface_ is shown in the xref:S_ExtraDataTab[Extra data tab]. This may "
@@ -3711,7 +3645,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1910
+#: user-manual.txt:1878
 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 "
@@ -3723,28 +3657,28 @@ msgid ""
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: ./user-manual.txt:1911 ./user-manual.txt:2094
+#: user-manual.txt:1879 user-manual.txt:2058
 #, no-wrap
 msgid "images/icons/cceiling.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1916
+#: user-manual.txt:1884
 msgid ""
-"The default colour of the computer-generated deco ceiling is white. However, "
-"this can be set to red by checking the appropriate check box after selecting "
-"_File -> Preferences -> Graph_.  Below is a dive profile indicating the dive "
+"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 -> "
+"Preferences -> Graph_.  Below is a dive profile indicating the dive "
 "computer-generated deco ceiling:"
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:1917
+#: user-manual.txt:1885
 #, no-wrap
 msgid "images/CCR_dive_ceilingF22.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1921
+#: user-manual.txt:1889
 msgid ""
 "More equipment-specific information for downloading CCR dive logs for "
 "Poseidon MkVI and APD equipment can be found in "
@@ -3753,19 +3687,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ==
-#: ./user-manual.txt:1922
+#: user-manual.txt:1890
 #, no-wrap
 msgid "Obtaining more information about dives entered into the logbook"
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:1924
+#: user-manual.txt:1892
 #, no-wrap
 msgid "The *Info* tab (for individual dives)"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1931
+#: user-manual.txt:1899
 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 "
@@ -3775,7 +3709,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1938
+#: user-manual.txt:1906
 msgid ""
 "Gas consumption and SAC calculations: _Subsurface_ calculates SAC and Gas "
 "consumption taking in account gas incompressibility, particularly at tank "
@@ -3784,13 +3718,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:1940
+#: user-manual.txt:1908
 #, no-wrap
 msgid "The *Extra Data* tab (usually for individual dives)"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1948
+#: user-manual.txt:1916
 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 "
@@ -3802,60 +3736,60 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:1949
+#: user-manual.txt:1917
 #, no-wrap
 msgid "images/ExtraDataTab_f20.jpg"
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:1951
+#: user-manual.txt:1919
 #, no-wrap
 msgid "The *Stats* tab (for groups of dives)"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1962
+#: user-manual.txt:1930
 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 "
 "Ctrl-click or Shift-click of the mouse. If only one dive has been selected, "
-"figures pertaining to only that dive are given. This tab shows the number of "
-"dives selected, the total amount of dive time in these dives, as well as the "
+"figures for only that dive are given. This tab shows the number of dives "
+"selected, the total amount of dive time in these dives, as well as the "
 "minimum, maximum and mean for the dive duration, water temperature and "
 "surface air consumption (SAC). It also shows the depth of the shallowest and "
 "deepest dives of those selected."
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:1964
+#: user-manual.txt:1932
 #, no-wrap
 msgid "The *Dive Profile*"
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:1966
+#: user-manual.txt:1934
 #, no-wrap
 msgid "images/Profile2.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1977
+#: user-manual.txt:1945
 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 "
-"the left hand side that allows control over several display options. The "
+"the left hand side that lets you control several display options. The "
 "functions of these buttons are described below. The main item in the Dive "
-"Profile is the graph of dive depth as a function of time. In addition to the "
-"obvious information of the depth it also shows the ascent and descent rates "
-"compared to the recommended speed of going up or down in the water "
-"column. This information is given using different colours:"
+"Profile is the graph of dive depth as a function of time. In addition to "
+"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:"
 msgstr ""
 
 #. type: delimited block |
-#: ./user-manual.txt:1984
+#: user-manual.txt:1952
 #, no-wrap
 msgid ""
-"|*Colour*|*Descent speed (m/min)*|*Ascent speed (m/min)*\n"
+"|*Color*|*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"
@@ -3864,31 +3798,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1989
+#: user-manual.txt:1957
 msgid ""
 "The profile also includes depth readings for the peaks and troughs in the "
-"graph.  Thus, users should see the depth of the deepest point and other "
+"graph.  So users should see the depth of the deepest point and other "
 "peaks. Mean depth is plotted as a grey line, indicating mean dive depth up "
 "to a particular moment during the dive."
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: ./user-manual.txt:1990
+#: user-manual.txt:1958
 #, no-wrap
 msgid "images/icons/scale.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1995
+#: user-manual.txt:1963
 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 "
-"the dive profile frequently increases the size of the dive profile to fill "
-"the area of the panel efficiently."
+"the dive profile increases the size of the dive profile to fill the area of "
+"the panel."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:1998
+#: user-manual.txt:1966
 #, no-wrap
 msgid ""
 "*Water temperature* is displayed with its own blue line with temperature "
@@ -3897,80 +3831,80 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2005
+#: user-manual.txt:1973
 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 "
 "dive computer reported deco ceilings (only visible for deep, long, or "
 "repetitive dives).  Partial pressures of oxygen are indicated in green, "
-"those of nitrogen in black, and those of helium in dark red. These partial "
-"pressure graphs are shown below the profile data."
+"nitrogen in black, and helium in dark red. These partial pressure graphs are "
+"shown below the profile data."
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: ./user-manual.txt:2006
+#: user-manual.txt:1974
 #, no-wrap
 msgid "images/icons/O2.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2010
+#: user-manual.txt:1978
 msgid ""
 "Clicking this button allows display of the partial pressure of *oxygen* "
-"during the dive. This is depicted below the dive depth and water temperature "
+"during the dive. This is shown below the dive depth and water temperature "
 "graphs."
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: ./user-manual.txt:2011
+#: user-manual.txt:1979
 #, no-wrap
 msgid "images/icons/N2.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2014
+#: user-manual.txt:1982
 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:2015
+#: user-manual.txt:1983
 #, no-wrap
 msgid "images/icons/He.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2019
+#: user-manual.txt:1987
 msgid ""
 "Clicking this button allows display of the partial pressure of *helium* "
-"during the dive.  This is only of importance to divers using Trimix, "
-"Helitrox or similar breathing gasses."
+"during the dive.  This is only important to divers using Trimix, Helitrox or "
+"similar breathing gasses."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2032
+#: user-manual.txt:2000
 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 "
-"manually entering the start and end pressures the graph is not a straight "
-"line.  Similarly to the depth graph the slope of the tank pressure gives the "
-"user information about the momentary SAC rate (Surface Air Consumption) when "
-"using an air integrated dive computer.  Here the colour coding is not "
-"relative to some absolute values but relative to the average normalised air "
+"manually entering the start and end pressures the graph, is not a straight "
+"line.  Like the depth graph, the slope of the tank pressure gives you "
+"information about the momentary SAC rate (Surface Air Consumption) when "
+"using an air integrated dive computer.  Here the color coding is not "
+"relative to some absolute values but relative to the average normalized air "
 "consumption during the dive. So areas that are red or orange indicate times "
 "of increased normalized air consumption while dark green reflects times when "
 "the diver was using less gas than average."
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: ./user-manual.txt:2033
+#: user-manual.txt:2001
 #, no-wrap
 msgid "images/icons/Heartbutton.png"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2037
+#: user-manual.txt:2005
 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 "
@@ -3978,7 +3912,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2045
+#: user-manual.txt:2012
 #, no-wrap
 msgid ""
 "It is possible to *zoom* into the profile graph. This is done either by "
@@ -3987,80 +3921,78 @@ msgid ""
 "_Subsurface_ always shows a profile area large enough for at least 30 "
 "minutes\n"
 "and 30m\n"
-" (100ft) – this way short or shallow dives are intuitively recognizable;\n"
-"something\n"
-"that free divers clearly won’t care about.\n"
+" (100ft) – this way short or shallow dives are easily recognizable;\n"
+"something free divers won’t care about.\n"
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:2046
+#: user-manual.txt:2012
 #, no-wrap
 msgid "images/MeasuringBar.png"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: ./user-manual.txt:2048
+#: user-manual.txt:2014
 #, no-wrap
 msgid "images/icons/ruler.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2056
+#: user-manual.txt:2022
 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 "
-"done by dragging the red dots to the two points on the dive profile that the "
-"user wishes to measure. Information is then given in the horizontal white "
-"area underneath the two red dots."
+"done by dragging the red dots to the two points on the dive profile that you "
+"wish to measure. Information is then given in the horizontal white area "
+"underneath the two red dots."
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: ./user-manual.txt:2057
+#: user-manual.txt:2023
 #, no-wrap
 msgid "images/icons/ShowPhotos.png"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2064
+#: user-manual.txt:2030
 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 "
-"indicates the exact time when this photo was taken. If this button is not "
+"shows the exact time when this photo was taken. If this button is not "
 "active, the photos are hidden."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2093
+#: user-manual.txt:2057
 msgid ""
 "The profile can also include the dive computer reported *ceiling* (more "
 "precisely, the deepest deco stop that the dive computer calculated for each "
 "particular moment in time) as a red overlay on the dive profile. Ascent "
-"ceilings arise when a direct ascent to the surface increases the risk of a "
+"ceilings occur when a direct ascent to the surface increases the risk of a "
 "diver suffering from decompression sickness (DCS) and it is necessary to "
 "either ascend slower or to perform decompression stop(s) before ascending to "
 "the surface. Not all dive computers record this information and make it "
-"available for download; for example all of the Suunto dive computers fail to "
-"make this very useful data available to divelog software. _Subsurface_ also "
-"calculates ceilings independently, shown as a green overlay on the dive "
-"profile.  Because of the differences in algorithms used and amount of data "
-"available (and other factors taken into consideration at the time of the "
-"calculation) it is unlikely that ceilings from dive computers and from "
-"_Subsurface_ are the same, even if the same algorithm and _gradient factors_ "
-"(see below) are used.  It is also quite common that _Subsurface_ calculates "
-"a ceiling for non-decompression dives when the dive computer stayed in "
-"non-deco mode during the whole dive (represented by the [green]#dark green# "
-"section in the profile at the beginning of this section). This is caused by "
-"the fact that _Subsurface’s_ calculations describe the deco obligation at "
-"each moment during a dive, while dive computers usually take the upcoming "
-"ascent into account. During the ascent some excess nitrogen (and possibly "
-"helium) are already breathed off so even though the diver technically "
-"encountered a ceiling at depth, the dive still does not require an explicit "
-"deco stop. This feature allows dive computers to offer longer non-stop "
-"bottom times."
-msgstr ""
-
-#. type: Plain text
-#: ./user-manual.txt:2099
+"available for download; for example none of the Suunto dive computers make "
+"these data available to divelog software. _Subsurface_ also calculates "
+"ceilings independently, shown as a green overlay on the dive profile.  "
+"Because of the differences in algorithms used and amount of data available "
+"(and other factors taken into consideration at the time of the calculation) "
+"it’s unlikely that ceilings from dive computers and from _Subsurface_ are "
+"the same, even if the same algorithm and _gradient factors_ (see below) are "
+"used.  It’s also quite common that _Subsurface_ calculates a ceiling for "
+"non-decompression dives when the dive computer stayed in non-deco mode "
+"during the whole dive (represented by the [green]#dark green# section in the "
+"profile at the beginning of this section). This is because _Subsurface’s_ "
+"calculations describe the deco obligation at each moment during a dive, "
+"while dive computers usually take the upcoming ascent into account. During "
+"the ascent some excess nitrogen (and possibly helium) are already breathed "
+"off so even though the diver technically encountered a ceiling at depth, the "
+"dive still does not require a specific deco stop. This feature lets dive "
+"computers offer longer non-stop bottom times."
+msgstr ""
+
+#. type: Plain text
+#: user-manual.txt:2063
 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 "
@@ -4068,13 +4000,13 @@ msgid ""
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: ./user-manual.txt:2100
+#: user-manual.txt:2064
 #, no-wrap
 msgid "images/icons/ceiling1.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2105
+#: user-manual.txt:2069
 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 "
@@ -4083,13 +4015,13 @@ msgid ""
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: ./user-manual.txt:2106
+#: user-manual.txt:2070
 #, no-wrap
 msgid "images/icons/ceiling2.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2110
+#: user-manual.txt:2074
 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 "
@@ -4097,56 +4029,55 @@ msgid ""
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: ./user-manual.txt:2111
+#: user-manual.txt:2075
 #, no-wrap
 msgid "images/icons/ceiling3.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2115
+#: user-manual.txt:2079
 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:2116
+#: user-manual.txt:2080
 #, no-wrap
 msgid "images/Ceilings2.jpg"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: ./user-manual.txt:2118
+#: user-manual.txt:2082
 #, no-wrap
 msgid "images/icons/ShowCylindersButton.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2124
+#: user-manual.txt:2088
 msgid ""
 "By selecting this icon, the different cylinders used during a dive can be "
-"represented as a coloured bar at the bottom of the *Dive Profile*. In "
-"general oxygen is represented by a green bar, nitrogen with a yellow bar and "
-"helium with a red bar. The image below shows a dive which first uses a "
-"trimix cylinder (red and green), followed by a switch to a nitrox cylinder "
-"(yellow and green) after 23 minutes. Cylinders with air are shown as a light "
-"blue bar."
+"represented as a colored bar at the bottom of the *Dive Profile*. In general "
+"oxygen is represented by a green bar, nitrogen a yellow bar and helium a red "
+"bar. The image below shows a dive which first uses a trimix cylinder (red "
+"and green), followed by a switch to a nitrox cylinder (yellow and green) "
+"after 23 minutes. Cylinders with air are shown as a light blue bar."
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:2125
+#: user-manual.txt:2089
 #, no-wrap
 msgid "images/ShowCylinders_f20.jpg"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: ./user-manual.txt:2128
+#: user-manual.txt:2092
 #, no-wrap
 msgid "images/tissues.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2140
+#: user-manual.txt:2105
 msgid ""
 "Display inert gas tissue pressures relative to ambient inert gas pressure "
 "(horizontal grey line).  Tissue pressures are calculated using the Bühlmann "
@@ -4154,24 +4085,23 @@ msgid ""
 "tissues) to blue (slower tissues).  The black line, graphed above the "
 "ambient pressure, is the maximum allowable tissue supersaturation (pressure "
 "limit) derived from the gradient factors specified in the *Preferences*. For "
-"divers involved in planned decompression diving, efficient rates of "
-"offgasing are obtained with tissue pressures between the ambient inert gas "
-"pressure (grey line) and the pressure limit (black line). This display is a "
-"representation of the tissue pressures during the whole dive. In contrast, "
-"the xref:S_gas_pressure_graph[Gas Pressure Graph] in the *Information Box* "
-"on the *Dive Profile* is an instantaneous reflection of tissue pressures at "
-"the moment in time reflected by the position of the cursor on the dive "
-"profile."
+"divers doing planned decompression diving, efficient rates of offgassing are "
+"obtained with tissue pressures between the ambient inert gas pressure (grey "
+"line) and the pressure limit (black line). This display is a representation "
+"of the tissue pressures during the whole dive. In contrast, the "
+"xref:S_gas_pressure_graph[Gas Pressure Graph] in the *Information Box* on "
+"the *Dive Profile* is an instantaneous reflection of tissue pressures at the "
+"moment in time, at the position of the cursor on the dive profile."
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:2141
+#: user-manual.txt:2106
 #, no-wrap
 msgid "images/tissuesGraph.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2149
+#: user-manual.txt:2114
 msgid ""
 "Gradient Factor settings strongly affect the calculated ceilings and their "
 "depths.  For more information about Gradient factors, see the section on "
@@ -4184,7 +4114,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2151
+#: user-manual.txt:2116
 #, no-wrap
 msgid ""
 " ** http://www.tek-dive.com/portal/upload/M-Values.pdf[Understanding "
@@ -4192,7 +4122,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2153
+#: user-manual.txt:2118
 #, no-wrap
 msgid ""
 " ** "
@@ -4201,43 +4131,43 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:2155
+#: user-manual.txt:2120
 #, no-wrap
 msgid "The Dive Profile context menu"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2173
+#: user-manual.txt:2139
 msgid ""
 "The context menu for the Dive Profile is accessed by right-clicking while "
-"the mouse cursor is over the Dive Profile panel. The menu allows the "
-"creation of Bookmarks or Gas Change Event markers or manual CCR set-point "
-"changes other than the ones that might have been imported from a Dive "
-"Computer. Markers are placed against the depth profile line and with the "
-"time of the event set by where the mouse cursor was when the right mouse "
-"button was initially clicked to bring up the menu. Gas Change events involve "
-"a selection of which gas is being switched to, the list of choices being "
-"based on the available gases defined in the *Equipment* Tab. Set-point "
-"change events open a dialog allowing to choose the next set-point value. As "
-"in the planner, a set-point value of zero indicates the diver is breathing "
-"from an open circuit system while any non-zero value indicates the use of a "
-"closed circuit rebreather (CCR).  By right-clicking while over an existing "
-"marker a menu appears, adding options to allow deletion of the marker or to "
-"allow all markers of that type to be hidden. Hidden events can be restored "
-"to view by selecting Unhide all events from the context menu."
+"the mouse cursor is over the Dive Profile panel. The menu lets you create "
+"Bookmarks, Gas Change Event markers, or manual CCR set-point changes other "
+"than the ones that might have been imported from a Dive Computer. Markers "
+"are placed against the depth profile line, with the time of the event set by "
+"where the mouse cursor was when the right mouse button was first clicked to "
+"bring up the menu. Gas Change events involve a selection of which gas is "
+"being switched TO. The list of choices is based on the available gases "
+"defined in the *Equipment* Tab. Setpoint change events open a dialog letting "
+"you choose the next setpoint value. As in the planner, a setpoint value of "
+"zero shows the diver is breathing from an open circuit system while any "
+"non-zero value shows the use of a closed circuit rebreather (CCR).  By "
+"right-clicking while over an existing marker a menu appears, adding options "
+"to allow deletion of the marker, or to allow all markers of that type to be "
+"hidden. Hidden events can be restored to view by selecting Unhide all events "
+"from the context menu."
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:2175
+#: user-manual.txt:2141
 #, no-wrap
 msgid "The *Information Box*"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2185
+#: user-manual.txt:2150
 msgid ""
-"The Information box displays a large range of information pertaining to the "
-"dive profile. Normally the Information Box is located to the top left of the "
+"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 "
 "*Dive Profile* panel. If the mouse points outside of the *Dive Profile* "
 "panel, then only the top line of the Information Box is visible (see "
 "left-hand part of figure (*A*) below). The Information Box can be moved "
@@ -4247,47 +4177,46 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:2186
+#: user-manual.txt:2151
 #, no-wrap
 msgid "images/InfoBox2.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2203
+#: user-manual.txt:2168
 msgid ""
-"The moment the mouse points inside the *Dive Profile* panel, the information "
-"box expands and shows many data items. In this situation, the data reflect "
-"the time point along the dive profile indicated by the mouse cursor (see "
-"right-hand part of figure (*B*) above where the Information Box reflects the "
-"situation at the position of the cursor [arrow] in that image). Therefore, "
-"moving the cursor in the horizontal direction allows the Information Box to "
-"show information for any point along the dive profile.  In this mode, the "
-"Information Box gives extensive statistics about depth, gas and ceiling "
-"characteristics of the particular dive. These include: Time period into the "
-"dive (indicated by a @), depth, cylinder pressure (P), temperature, "
-"ascent/descent rate, surface air consumption (SAC), oxygen partial pressure, "
-"maximum operating depth, equivalent air depth (EAD), equivalent narcotic "
-"depth (END), equivalent air density depth (EADD), decompression requirements "
-"at that instant in time (Deco), time to surface (TTS), the calculated "
-"ceiling, as well as the calculated ceiling for several Bühlmann tissue "
-"compartments."
+"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 "
+"time point along the dive profile shown by the mouse cursor (see right-hand "
+"part of figure (*B*) above where the Information Box reflects the situation "
+"at the position of the cursor [arrow] in that image). Moving the cursor "
+"horizontally lets the Information Box show information for any point along "
+"the dive profile.  In this mode, the Information Box gives extensive "
+"statistics about depth, gas and ceiling characteristics of the particular "
+"dive. These include: Time period into the dive (indicated by a @), depth, "
+"cylinder pressure (P), temperature, ascent/descent rate, surface air "
+"consumption (SAC), oxygen partial pressure, maximum operating depth, "
+"equivalent air depth (EAD), equivalent narcotic depth (END), equivalent air "
+"density depth (EADD), decompression requirements at that instant in time "
+"(Deco), time to surface (TTS), the calculated ceiling, as well as the "
+"calculated ceiling for several Bühlmann tissue compartments."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2206
+#: user-manual.txt:2171
 msgid ""
-"The user has control over the display of several statistics, represented as "
-"four buttons on the left of the profile panel. These are:"
+"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:2207
+#: user-manual.txt:2172
 #, no-wrap
 msgid "images/icons/MOD.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2216
+#: user-manual.txt:2181
 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 "
@@ -4295,116 +4224,115 @@ msgid ""
 "oxygen) it is around 57 m if a maximum pO~2~ of 1.4 is specified in the "
 "*Preferences* section (select _File_ -> Preferences -> Graph_ and edit the "
 "text box _Max pO~2~ when showing MOD_.  Below the MOD there is a markedly "
-"increased risk of exposure to the dangers associated with oxygen toxicity."
+"increased risk of exposure to the dangers of oxygen toxicity."
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: ./user-manual.txt:2217
+#: user-manual.txt:2182
 #, no-wrap
 msgid "images/icons/NDL.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2229
+#: user-manual.txt:2194
 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 "
 "duration that a diver can continue with a dive, given the present depth, "
 "that does not require decompression (that is, before an ascent ceiling "
-"appears). Once one has exceeded the NDL and decompression is required (that "
-"is, there is an ascent ceiling above the diver, then TTS gives the number of "
-"minutes required before the diver can surface. TTS includes ascent time as "
-"well as decompression time. TTS is calculated assuming an ascent surface air "
-"consumption (SAC) for the gas currently used. Even if the profile contains "
-"several gas switches, TTS at a specific moment during the dive is calculated "
-"using the current gas.  For TTS longer than 2 hours, it is not accurately "
-"calculated and Subsurface only indicates _TTS > 2h_."
+"appears). Once a diver has exceeded the NDL and decompression is required "
+"(that is, there is an ascent ceiling above the diver) then TTS gives the "
+"number of minutes required before the diver can surface. TTS includes ascent "
+"time as well as decompression time. TTS is calculated assuming an ascent "
+"surface air consumption (SAC) for the gas currently used. Even if the "
+"profile contains several gas switches, TTS at a specific moment during the "
+"dive is calculated using the current gas.  TTS longer than 2 hours is not "
+"accurately calculated and Subsurface only indicates _TTS > 2h_."
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: ./user-manual.txt:2230
+#: user-manual.txt:2195
 #, no-wrap
 msgid "images/icons/SAC.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2239
+#: user-manual.txt:2204
 msgid ""
 "Clicking this button causes the Information Box to display the *Surface Air "
-"Consumption (SAC)*.  SAC is an indication of the surface-normalised "
+"Consumption (SAC)*.  SAC is an indication of the surface-normalized "
 "respiration rate of a diver. The value of SAC is less than the real "
 "respiration rate because a diver at 10m uses breathing gas at a rate roughly "
 "double that of the equivalent rate at the surface. SAC gives an indication "
-"of breathing gas consumption rate independent of the depth of the dive so "
-"that the respiratory rates of different dives can be compared. The units for "
-"SAC is litres/min or cub ft/min."
+"of breathing gas consumption rate independent of the depth of the dive, so "
+"the respiratory rates of different dives can be compared. The units for SAC "
+"is liters/min or cubic ft/min."
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: ./user-manual.txt:2240
+#: user-manual.txt:2205
 #, no-wrap
 msgid "images/icons/EAD.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2255
+#: user-manual.txt:2220
 msgid ""
 "Clicking this button displays the *Equivalent Air Depth (EAD)* for nitrox "
 "dives as well as the *Equivalent Narcotic Depth (END)* for trimix "
-"dives. These are numbers of importance to divers who use breathing gases "
-"other than air. Their values are dependent on the composition of the "
-"breathing gas.  The EAD is the depth of a hypothetical air dive that has the "
-"same partial pressure of nitrogen as the current depth of the nitrox dive at "
-"hand. A nitrox dive leads to the same decompression obligation as an air "
-"dive to the depth equalling the EAD. The END is the depth of a hypothetical "
-"air dive that has the same sum of partial pressures of the narcotic gases "
-"nitrogen and oxygen as the current trimix dive. A trimix diver can expect "
-"the same narcotic effect as a diver breathing air diving at a depth "
-"equalling the END."
+"dives. These are important to divers breathe gases other than air. Their "
+"values are dependent on the composition of the breathing gas.  The EAD is "
+"the depth of a hypothetical air dive that has the same partial pressure of "
+"nitrogen as the current depth of the nitrox dive at hand. A nitrox dive "
+"leads to the same decompression obligation as an air dive to the depth "
+"equalling the EAD. The END is the depth of a hypothetical air dive that has "
+"the same sum of partial pressures of the narcotic gases nitrogen and oxygen "
+"as the current trimix dive. A trimix diver can expect the same narcotic "
+"effect as a diver breathing air diving at a depth equalling the END."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2257
+#: user-manual.txt:2222
 msgid ""
 "Figure (*B*) above shows an information box with a nearly complete set of "
 "data."
 msgstr ""
 
 #. type: Title ====
-#: ./user-manual.txt:2259
+#: user-manual.txt:2224
 #, no-wrap
 msgid "The Gas Pressure Bar Graph"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2266
+#: user-manual.txt:2231
 msgid ""
-"On the left of the *Information Box* is a vertical bar graph indicating the "
+"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 "
 "applicable) that the diver was inhaling _at a particular instant during the "
-"dive_, indicated by the position of the cursor on the *Dive Profile*. The "
+"dive_. It is shown by the position of the cursor on the *Dive Profile*. The "
 "drawing on the left below indicates the meaning of the different parts of "
 "the Gas Pressure Bar Graph."
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:2267
+#: user-manual.txt:2232
 #, no-wrap
 msgid "images/GasPressureBarGraph.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2273
+#: user-manual.txt:2238
 msgid ""
 "The light green area indicates the total gas, with the top margin of the "
-"light green area indicating the total gas pressure inhaled by the diver and "
+"light green area showing the total gas pressure inhaled by the diver and "
 "measured from the bottom of the graph to the top of the light green "
 "area. This pressure has a _relative_ value in the graph and does not "
 "indicate absolute pressure."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2279
+#: user-manual.txt:2244
 msgid ""
 "The horizontal black line underneath the light green margin indicates the "
 "equilibrium pressure of the inert gases inhaled by the diver, usually "
@@ -4415,7 +4343,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2283
+#: user-manual.txt:2248
 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 "
@@ -4423,7 +4351,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2288
+#: user-manual.txt:2253
 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 "
@@ -4433,39 +4361,39 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2292
+#: user-manual.txt:2257
 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 "
+"M-value. That is the pressure value of inert gases at which bubble formation "
 "is expected to be severe, resulting in decompression sickness."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2295
+#: user-manual.txt:2260
 msgid ""
-"These five values are indicated on the left in the graph above. The way the "
-"Gas Pressure Bar Graph changes during a dive is indicated on the right hand "
-"side of the above figure for a diver using EAN32."
+"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 "
+"of the above figure for a diver using EAN32."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2298
+#: user-manual.txt:2263
 msgid ""
-"Graph *A* indicates the situation at the start of a dive with diver at the "
-"surface. The pressures in all the tissue compartments are still at the "
-"equilibrium pressure because no diving has taken place."
+"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 "
+"pressure because no diving has taken place."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2301
+#: user-manual.txt:2266
 msgid ""
 "Graph *B* indicates the situation after a descent to 30 meters. Few of the "
-"tissue compartments have had time to respond to the descent, their gas "
-"pressures being far below the equilibrium gas pressure."
+"tissue compartments have had time to respond to the descent, so their gas "
+"pressures are far below the equilibrium gas pressure."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2306
+#: user-manual.txt:2271
 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 "
@@ -4475,18 +4403,18 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2312
+#: user-manual.txt:2277
 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 "
+"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 "
 "bar to 1.45 bar, the pressures in the different tissue compartments now "
-"exceed that of the total gas pressure and approaches the gradient factor "
-"value (i.e.  the top black horizontal line). Further ascent will result in "
+"exceed that of the total gas pressure and approach the gradient factor value "
+"(i.e.  the top black horizontal line). Further ascent will result in "
 "exceeding the gradient factor value (GFHigh), endangering the diver."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2317
+#: user-manual.txt:2282
 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 "
@@ -4496,184 +4424,180 @@ msgid ""
 msgstr ""
 
 #. type: Title ==
-#: ./user-manual.txt:2320
+#: user-manual.txt:2285
 #, no-wrap
-msgid "Organising the logbook (Manipulating groups of dives)"
+msgid "Organizing the logbook (Manipulating groups of dives)"
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:2322
+#: user-manual.txt:2287
 #, no-wrap
 msgid "The Dive List context menu"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2326
+#: user-manual.txt:2291
 msgid ""
-"Several actions on either a single dive or a group of dives can be performed "
-"using the Dive List Context Menu, found by selecting either a single dive or "
-"a group of dives and then right-clicking."
+"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 "
+"a single dive or a group of dives and then right-clicking."
 msgstr ""
 
 #.  TODO: NEEDS REPLACEMENT
 #. type: Target for macro image
-#: ./user-manual.txt:2328
+#: user-manual.txt:2293
 #, no-wrap
 msgid "images/ContextMenu.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2331
-msgid "The context menu is used in many manipulations described below."
+#: user-manual.txt:2296
+msgid "The context menu is used in many functions described below."
 msgstr ""
 
 #. type: Title ====
-#: ./user-manual.txt:2332
+#: user-manual.txt:2297
 #, no-wrap
-msgid "Customising the columns showed in the *Dive List* panel"
+msgid "Customizing the columns showed in the *Dive List* panel"
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:2334
+#: user-manual.txt:2299
 #, no-wrap
 msgid "images/DiveListOptions.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2342
+#: user-manual.txt:2307
 msgid ""
 "The default information in the *Dive List* includes, for each dive, "
 "Dive_number, Date, Rating, Dive_depth, Dive_duration and Dive_location. This "
 "information can be controlled and changed by right-clicking on the header "
 "bar of the *Dive List*. For instance, a right-click on the 'Date' header "
 "brings up a list of items that can be shown in the dive list (see "
-"above). Select an item to be shown in the *Dive List* or to be deleted from "
-"the dive list (reflected by the check symbols) and the list is immediately "
+"above). Select an item to be shown in the *Dive List* or be deleted "
+"(reflected by the check symbols) and the list is immediately "
 "updated. Preferences for information shown in the *Dive List* are saved and "
 "used when _Subsurface_ is re-opened."
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:2344
+#: user-manual.txt:2309
 #, no-wrap
 msgid "Renumbering the dives"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2356
+#: user-manual.txt:2321
 msgid ""
 "Dives are normally numbered incrementally from non-recent dives (low "
-"sequence numbers) to recent dives (having the highest sequence numbers). The "
-"numbering of the dives is not always consistent. For instance, when "
-"non-recent dives are added to the dive list the numbering does not "
-"automatically follow on because of the dives that are more recent in "
-"date/time than the newly-added dive with an older date/time. Therefore, one "
-"may sometimes need to renumber the dives.  This is performed by selecting "
-"(from the Main Menu) _Log -> Renumber_. Users are given a choice with "
-"respect to the lowest sequence number to be used.  Completing this operation "
-"results in new sequence numbers (based on date/time)  for the dives in the "
-"*Dive List* panel."
+"sequence numbers) to recent dives (higher sequence numbers).  Numbering of "
+"dives is not always consistent. For instance, when non-recent dives are "
+"added, correct numbering does not automatically follow on because of the "
+"dives that are more recent in date/time than the newly-added dive with an "
+"older date/time. So you may need to renumber the dives.  Do this by "
+"selecting (from the Main Menu) _Log -> Renumber_. Users are given a choice "
+"of the lowest sequence number to be used.  This results in new sequence "
+"numbers (based on date/time)  for the dives in the *Dive List* panel."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2361
+#: user-manual.txt:2326
 msgid ""
-"One can also renumber a few selected dives in the dive list. Select the "
+"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 "
 "Dive List Context Menu to perform the renumbering. A popup window appears "
-"requiring the user to specify the starting number for the renumbering "
-"process."
+"letting the user specify the starting number for the process."
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:2363
+#: user-manual.txt:2328
 #, no-wrap
 msgid "Grouping dives into trips and manipulating trips"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2371
+#: user-manual.txt:2336
 msgid ""
 "For regular divers, the dive list can rapidly become very long. _Subsurface_ "
-"can group dives into _trips_. It performs this by grouping dives that have "
-"date/times not separated in time by more than two days, thus creating a "
-"single heading for each diving trip represented in the dive log. Below is an "
+"can group dives into _trips_. It does this by grouping dives that have "
+"date/times not separated in time by more than two days, so creating a single "
+"heading for each diving trip represented in the dive log. Below is an "
 "ungrouped dive list (*A*, on the left) as well as the corresponding grouped "
-"dive list comprising five dive trips (*B*, on the right):"
+"dive list of five dive trips (*B*, on the right):"
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:2372
+#: user-manual.txt:2337
 #, no-wrap
 msgid "images/Group2.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2378
+#: user-manual.txt:2343
 msgid ""
 "Grouping into trips allows a rapid way of accessing individual dives without "
-"having to scan a long lists of dives. In order to group the dives in a dive "
-"list, (from the Main Menu) select _Log -> Autogroup_. The *Dive List* panel "
-"now shows only the titles for the trips."
+"having to scan a long lists of dives. To group the dives in a dive list, "
+"(from the Main Menu) select _Log -> Autogroup_. The *Dive List* panel now "
+"shows only the titles for the trips."
 msgstr ""
 
 #. type: Title ====
-#: ./user-manual.txt:2379
+#: user-manual.txt:2344
 #, no-wrap
 msgid "Editing the title and associated information for a particular trip"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2392
+#: user-manual.txt:2357
 msgid ""
 "Normally, in the dive list, minimal information is included in the trip "
 "title.  More information about a trip can be added by selecting its trip "
 "title from the *Dive List*. This shows a *Trip Notes* tab in the *Notes* "
-"panel. Here one can add or edit information about the date/time, the trip "
+"panel. Here you can add or edit information about the date/time, the trip "
 "location and any other general comments about the trip as a whole (e.g. the "
-"dive company that was dived with, the general weather and surface conditions "
+"dive company that was used, the general weather and surface conditions "
 "during the trip, etc.).  After entering this information, select *Save* from "
 "the buttons at the top right of the *Trip Notes* tab. The trip title in the "
 "*Dive List* panel should now reflect the edited information."
 msgstr ""
 
 #. type: Title ====
-#: ./user-manual.txt:2393
+#: user-manual.txt:2358
 #, no-wrap
 msgid "Viewing the dives during a particular trip"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2398
+#: user-manual.txt:2363
 msgid ""
-"Once the dives have been grouped into trips, users can expand one or more "
+"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 "
-"expands the selected trip, revealing the individual dives performed during "
-"the trip."
+"expands the selected trip, revealing individual dives done during the trip."
 msgstr ""
 
 #. type: Title ====
-#: ./user-manual.txt:2399
+#: user-manual.txt:2364
 #, no-wrap
 msgid "Collapsing or expanding dive information for different trips"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2404
+#: user-manual.txt:2369
 msgid ""
 "After selecting a particular trip in the dive list, the context menu allows "
-"several possibilities to expand or collapse dives within trips. This "
-"includes expanding all trips and collapsing all trips."
+"several options to expand or collapse dives within trips. This includes "
+"expanding all trips and collapsing all trips."
 msgstr ""
 
 #. type: Title ====
-#: ./user-manual.txt:2405
+#: user-manual.txt:2370
 #, no-wrap
 msgid "Merging dives from more than one trip into a single trip"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2410
+#: user-manual.txt:2375
 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 "
@@ -4681,75 +4605,74 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: ./user-manual.txt:2411
+#: user-manual.txt:2376
 #, no-wrap
 msgid "Splitting a single trip into more than one trip"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2421
+#: user-manual.txt:2385
 msgid ""
-"If a trip includes ten dives, the user can split this trip into two trips "
-"(trip 1: top 4 dives; trip 2: bottom 6 dives) by selecting and "
-"right-clicking the top four dives. The resulting context menu allows the "
-"user to create a new trip by choosing the option *Create new trip "
-"above*. The top four dives are then grouped into a separate trip. The "
-"figures below shows the selection and context menu on the left (A) and the "
-"completed action on the right (B):"
+"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 "
+"top four dives. The resulting context menu lets the user create a new trip "
+"by choosing the option *Create new trip above*. The top four dives are then "
+"grouped into a separate trip. The figures below show the selection and "
+"context menu on the left (A) and the completed action on the right (B):"
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:2422
+#: user-manual.txt:2386
 #, no-wrap
 msgid "images/SplitDive3a.jpg"
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:2424
+#: user-manual.txt:2388
 #, no-wrap
 msgid "Manipulating single dives"
 msgstr ""
 
 #. type: Title ====
-#: ./user-manual.txt:2426
+#: user-manual.txt:2390
 #, no-wrap
 msgid "Delete a dive from the dive log"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2433
+#: user-manual.txt:2397
 msgid ""
 "Dives can be permanently deleted from the dive log by selecting and "
-"right-clicking them to bring up the context menu, and then selecting *Delete "
+"right-clicking them to bring up the context menu, then selecting *Delete "
 "dive(s)*. Typically this would apply to a case where a user wishes to delete "
 "workshop calibration dives of the dive computer or dives of extremely short "
 "duration."
 msgstr ""
 
 #. type: Title ====
-#: ./user-manual.txt:2434
+#: user-manual.txt:2398
 #, no-wrap
 msgid "Unlink a dive from a trip"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2441
+#: user-manual.txt:2405
 msgid ""
-"Users can unlink dives from the trip to which they belong. In order to do "
-"this, select and right-click the relevant dives to bring up the context "
-"menu. Then select the option *Remove dive(s)  from trip*. The dive(s) now "
-"appear immediately above or below the trip to which they belonged, depending "
-"on the date and time of the unlinked dive."
+"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 "
+"the option *Remove dive(s)  from trip*. The dive(s) now appear immediately "
+"above or below the trip to which they belonged, depending on the date and "
+"time of the unlinked dive."
 msgstr ""
 
 #. type: Title ====
-#: ./user-manual.txt:2442
+#: user-manual.txt:2406
 #, no-wrap
 msgid "Add a dive to the trip immediately above"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2447
+#: user-manual.txt:2411
 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 "
@@ -4757,37 +4680,36 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: ./user-manual.txt:2448
+#: user-manual.txt:2412
 #, no-wrap
 msgid "Shift the start time of dive(s)"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2459
+#: user-manual.txt:2422
 msgid ""
-"Sometimes it is necessary to adjust the start time of a dive. This may apply "
-"to situations where dives are performed in different time zones or when the "
-"dive computer has an erroneous time. In order to do this, select and "
-"right-click the dive(s) to be adjusted. This action brings up the context "
-"menu on which the *Shift times* option should be selected. User must then "
-"specify the time (in hours and minutes) by which the dives should be "
-"adjusted and click on the option indicating whether the time adjustment "
-"should be ealier or later."
+"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 "
+"computer has a wrong time. To do this, select and right-click the dive(s) to "
+"be adjusted. This brings up the context menu on which the *Shift times* "
+"option should be selected. You must then specify the time (in hours and "
+"minutes) by which the dives should be adjusted and click on the option of "
+"whether the time adjustment should be earlier or later."
 msgstr ""
 
 #. type: Title ====
-#: ./user-manual.txt:2460
+#: user-manual.txt:2423
 #, no-wrap
 msgid "Merge dives into a single dive"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2470
+#: user-manual.txt:2433
 msgid ""
-"Sometimes a dive is briefly interrupted, e.g. if a diver returns to the "
-"surface for a few minutes, resulting in two or more dives being recorded by "
-"the dive computer and appearing as different dives in the *Dive List* "
-"panel. Users can merge these dives onto a single dive by selecting the "
+"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 "
+"recorded by the dive computer and appearing as different dives in the *Dive "
+"List* panel. You can merge these dives onto a single dive by selecting the "
 "appropriate dives, right-clicking them to bring up the context menu and then "
 "selecting *Merge selected dives*. It may be necessary to edit the dive "
 "information in the *Notes* panel to reflect events or conditions that apply "
@@ -4796,19 +4718,19 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:2471
+#: user-manual.txt:2434
 #, no-wrap
 msgid "images/MergedDive.png"
 msgstr ""
 
 #. type: Title ====
-#: ./user-manual.txt:2473
+#: user-manual.txt:2436
 #, no-wrap
 msgid "Undo dive manipulations"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2479
+#: user-manual.txt:2442
 msgid ""
 "Important actions on dives or trips, described above, can be undone or "
 "redone.  This includes: _delete dives_, _merge dives_, _renumber dives_ and "
@@ -4818,162 +4740,159 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:2482
+#: user-manual.txt:2445
 #, no-wrap
 msgid "Filtering the dive list"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2488
+#: user-manual.txt:2451
 msgid ""
-"The dives in the *Dive List* panel can be filtered, that is, one can select "
-"only some of the dives based on their attributes, e.g. dive tags, dive site, "
-"dive master, buddy or protective clothing. For instance, filtering allows "
-"one to list the deep dives at a particular dive site, or otherwise the cave "
-"dives with a particular buddy."
+"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 "
+"master, buddy or protective clothing. For instance, filtering lets you list "
+"the deep dives at a particular dive site, or otherwise the cave dives with a "
+"particular buddy."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2496
+#: user-manual.txt:2459
 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 "
 "are located at the top right hand of the filter panel (see image below). The "
 "_Filter Panel_ can be reset (i.e. all current filters cleared) by selecting "
-"the *yellow angled arrow*. The _Filter Panel_ may also be minimised by "
-"selecting the *green up-arrow\". When minimised, only these three icons are "
-"shown.  The panel can be maximised by clicking the icon that minimised the "
-"panel. The filter may also be reset and closed by selecting the *red button* "
+"the *yellow angled arrow*. The _Filter Panel_ may also be minimized by "
+"selecting the *green up-arrow\". When minimized, only these three icons are "
+"shown.  The panel can be maximized by clicking the same icon that minimized "
+"it. The filter may also be reset and closed by selecting the *red button* "
 "with the white cross."
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:2497
+#: user-manual.txt:2460
 #, no-wrap
 msgid "images/Filterpanel.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2506
+#: user-manual.txt:2469
 msgid ""
 "Four filter criteria may be used to filter the dive list: dive tags, person "
-"(buddy / dive master), dive site and dive suit, each of which is represented "
+"(buddy / divemaster), dive site and dive suit.  Each of these is represented "
 "by a check list with check boxes. Above each check list is a second-level "
-"filter tool, allowing the listing of only some of the attributes within that "
-"check list. For instance, typing \"_ca_\" in the filter textbox above the "
-"tags check list results in the tags check list being reduced to \"_cave_\" "
-"and \"_cavern_\". Filtering of the check list enables the rapid finding of "
-"search terms for filtering the dive list."
+"filter tool, allowing the listing of only some attributes within that check "
+"list. For instance, typing \"_ca_\" in the filter text box above the tags "
+"check list, results in the list being reduced to \"_cave_\" and "
+"\"_cavern_\". Filtering the check list helps to rapidly find search terms "
+"for filtering the dive list."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2514
+#: user-manual.txt:2477
 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 "
 "dives that pertain to the criteria specified in the check lists.  The four "
-"check lists work as a filter with _AND_ operators, Subsurface filters "
-"therefore for _cave_ as a tag AND _Joe Smith_ as a buddy; but the filters "
+"check lists work as a filter with _AND_ operators. Subsurface filters "
+"therefore for _cave_ as a tag AND _Joe Smith_ as a buddy. But the filters "
 "within a category are inclusive - filtering for _cave_ and _boat_ shows "
 "those dives that have either one OR both of these tags."
 msgstr ""
 
 #. type: Title ==
-#: ./user-manual.txt:2516
+#: user-manual.txt:2479
 #, no-wrap
 msgid "Exporting the dive log or parts of the dive log"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2519
-msgid "There are two routes for the export of dive information from Subsurface:"
+#: user-manual.txt:2482
+msgid "There are two ways to export dive information from Subsurface:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2521
+#: user-manual.txt:2484
 msgid "Export dive information to _Facebook_"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2523
+#: user-manual.txt:2486
 msgid ""
 "xref:S_Export_other[Export dive information to other destinations or "
 "formats]"
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:2525
+#: user-manual.txt:2488
 #, no-wrap
 msgid "Exporting dive information to _Facebook_"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2534
+#: user-manual.txt:2497
 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."
+"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."
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:2535
+#: user-manual.txt:2498
 #, no-wrap
 msgid "images/facebook1_f20.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2540
+#: user-manual.txt:2503
 msgid ""
-"From the _Subsurface_ window it is easy to determine whether _Subsurface_ "
-"has a valid connection to _Facebook_ From the *Main Menu*, select _Share on "
-"-> Facebook_ (image *A*, below). Normally, the _Facebook_ option is greyed "
+"From the _Subsurface_ window it’s easy to determine whether _Subsurface_ has "
+"a valid connection to _Facebook_ From the *Main Menu*, select _Share on -> "
+"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 colour and can be selected)."
+"(i.e. in black color and can be selected)."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2550
+#: user-manual.txt:2514
 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_."
+"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."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2557
+#: user-manual.txt:2519
 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."
+"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 ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:2558
+#: user-manual.txt:2520
 #, no-wrap
 msgid "images/facebook2_f20.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2562
+#: user-manual.txt:2524
 msgid ""
 "If required, then close the _Facebook_ connection by either closing "
 "_Subsurface_ or by selecting _File -> Preferences -> Facebook_ from the Main "
@@ -4981,15 +4900,15 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:2564
+#: user-manual.txt:2526
 #, no-wrap
-msgid "Export dive information  to other destinations or formats"
+msgid "Export dive information to other destinations or formats"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2569
+#: user-manual.txt:2531
 msgid ""
-"For non-_Facebook exports_, the export function can be reached by selecting "
+"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 "
 "List* panel of _Subsurface_. Click the appropriate radio button (see images "
@@ -4997,23 +4916,23 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:2570
+#: user-manual.txt:2532
 #, no-wrap
 msgid "images/Export_f20.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2573
+#: user-manual.txt:2535
 msgid "A dive log or part of it can be saved in three formats:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2575
+#: user-manual.txt:2537
 msgid "_Subsurface XML_ format. This is the native format used by _Subsurface_."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2579
+#: user-manual.txt:2541
 msgid ""
 "Universal Dive Data Format (_UDDF_). Refer to _http://uddf.org_ for more "
 "information.  UDDF is a generic format that enables communication among many "
@@ -5021,24 +4940,24 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2583
+#: user-manual.txt:2545
 msgid ""
 "_Divelogs.de_, an Internet-based dive log repository. In order to upload to "
-"_Divelogs.de_, one needs a user-ID as well as a password for "
+"_Divelogs.de_, you need a user-ID as well as a password for "
 "_Divelogs.de_. Log into _http://en.divelogs.de_ and subscribe to this "
-"service in order to upload dive log data from _Subsurface_."
+"service to upload dive log data from _Subsurface_."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2587
+#: user-manual.txt:2549
 msgid ""
-"_DiveShare_ is also a dive log repository on the Internet focusing on the "
-"recreational dives. In order to upload dives one has to provide a used ID, "
-"so registration with _http://scubadiveshare.com_ is required."
+"_DiveShare_ is also a dive log repository on the Internet focusing on "
+"recreational dives. To upload dives, you need a user ID, so registration "
+"with _http://scubadiveshare.com_ is required."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2592
+#: user-manual.txt:2554
 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, "
@@ -5047,7 +4966,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2595
+#: user-manual.txt:2557
 msgid ""
 "_CSV dive profile_, that includes a large amount of detail for each dive, "
 "including the depth profile, temperature and pressure information of each "
@@ -5055,7 +4974,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2608
+#: user-manual.txt:2570
 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 "
@@ -5065,43 +4984,43 @@ msgid ""
 "pressure, gas pressures and MOD. The HTML export contains a search option to "
 "search the dive log. HTML export is specified on the second tab of the "
 "Export dialog (image *B* above). A typical use of this option is to export "
-"all one's dives to a smartphone or a tablet where it would serve as a very "
-"portable record of dives useful for dive companies that wish to verify the "
-"dive history of a diver, often doing away with the need to carry one's "
-"original logbook with one when doing dives with dive companies."
+"all one's dives to a smartphone or a tablet where it would serve as a "
+"portable record of dives. That is useful for dive companies that wish to "
+"verify the dive history of a diver, often doing away with the need to carry "
+"an original logbook when doing dives with dive companies."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2613
+#: user-manual.txt:2575
 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 one "
-"selects any of the dive sites on the map, a summary of the dive is available "
+"some information about it are indicated. This map is not editable. If you "
+"select any of the dive sites on the map, a summary of the dive is available "
 "in text, as shown in the image below."
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:2614
+#: user-manual.txt:2576
 #, no-wrap
 msgid "images/mapview_f20.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2621
+#: user-manual.txt:2583
 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 "
-"List_, together with the depth under water where of each of those photos "
-"were taken."
+"List_, together with the depth underwater where of each of those photos was "
+"taken."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2623
+#: user-manual.txt:2585
 msgid "_General Settings_, under the HTML tab, provides the following options:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2631
+#: user-manual.txt:2593
 #, no-wrap
 msgid ""
 "** Subsurface Numbers: if this option is checked, the dive(s) are exported "
@@ -5119,59 +5038,58 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2634
+#: user-manual.txt:2596
 msgid ""
 "Under _Style Options_ some style-related options are available like font "
 "size and theme."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2637
+#: user-manual.txt:2599
 msgid ""
-"Export to other formats can be achieved through third party facilities, for "
+"Export to other formats can be done through third party facilities, for "
 "instance _www.divelogs.de_."
 msgstr ""
 
 #. type: Title ==
-#: ./user-manual.txt:2639
+#: user-manual.txt:2601
 #, no-wrap
 msgid "Keeping a _Subsurface_ dive log in the Cloud"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2650
+#: user-manual.txt:2611
 msgid ""
 "For each diver, dive log information is highly important. Not only is it a "
-"record of diving activities for one's own pleasure, but it is important "
-"information required for admission to further training courses or "
-"(sometimes) even diving sites. The security of the dive log is therefore "
-"critical. In order to have a dive log that is resistant to failure of a home "
-"computer hard drive, loss or theft of equipment, the Cloud is an obvious "
-"solution. This also has the added benefit that one can access one's dive log "
-"from anywhere in the world without having to carry it with oneself. For this "
+"record of diving activities for one's own pleasure, but it’s important "
+"information required for admission to training courses or sometimes even "
+"diving sites. The security of the dive log is critical. To have a dive log "
+"that is resistant to failure of a home computer hard drive, loss or theft of "
+"equipment, the Cloud is an obvious solution. This also has the added benefit "
+"that you can access your dive log from anywhere in the world. For this "
 "reason, facilities such as _divelogs.de_ and _Diving Log_ offer to store "
 "dive log information on the Internet."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2656
+#: user-manual.txt:2617
 msgid ""
 "_Subsurface_ includes access to a transparently integrated cloud storage "
 "back end that is available to all Subsurface users. Storing and retrieving a "
 "dive log from the cloud is no more difficult than accessing the dives on the "
-"local hard disk.  The only requirement is that one should first register as "
+"local hard disk.  The only requirement is that you should first register as "
 "a user on the cloud.  To use _Subsurface cloud storage_ , follow these "
 "steps:"
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:2657
+#: user-manual.txt:2618
 #, no-wrap
 msgid "Create a cloud storage account"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2674
+#: user-manual.txt:2635
 #, no-wrap
 msgid ""
 "** Open the *Network Preferences* by selecting _File_ -> _Preferences_ -> "
@@ -5199,90 +5117,90 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:2675
+#: user-manual.txt:2636
 #, no-wrap
 msgid "Using _Subsurface cloud storage_"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2685
+#: user-manual.txt:2646
 #, no-wrap
 msgid ""
-"** Once the cloud storage has been initialised, two new items appear in "
+"** Once the cloud storage has been initialized, two new items appear in "
 "the\n"
 "   _File_ menu of the main menu system: _Open cloud storage_ and _Save to "
 "cloud storage_.\n"
-"These options allow the user to load and save data to the _Subsurface\n"
+"These options let you load and save data to the _Subsurface\n"
 "cloud storage_ server.\n"
-"** In the _Defaults Preferences_ tab, one can select to use the _Subsurface "
+"** In the _Defaults Preferences_ tab, you can select to use the _Subsurface "
 "cloud\n"
-"storage_ data as one's default data file by checking the check box marked "
-"_Cloud storage default file_.\n"
-" This means that the data from\n"
-"the _Subsurface cloud storage_ is loaded when _Subsurface_ starts ans saved "
-"there when one closes _Subsurface_.\n"
+"storage_ data as the default data file by checking the box marked _Cloud "
+"storage default file_.\n"
+" This means the data from\n"
+"the _Subsurface cloud storage_ is loaded when _Subsurface_ starts and saved "
+"there when _Subsurface_ closes.\n"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2690
+#: user-manual.txt:2651
 #, no-wrap
 msgid ""
 "** _Subsurface_ keeps a local copy of the data and the cloud facility "
 "remains fully\n"
 "functional even if used while disconnected to the Internet. _Subsurface_ "
-"simply synchronises the\n"
-"data with the cloud server the next time ithe program is used while the "
+"simply synchronizes the\n"
+"data with the cloud server the next time the program is used while the "
 "computer is\n"
 "connected to the Internet.\n"
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:2692
+#: user-manual.txt:2653
 #, no-wrap
 msgid "Web access to _Subsurface cloud storage_"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2702
+#: user-manual.txt:2663
 msgid ""
 "One of the nice side benefits of using _Subsurface cloud storage_ is that "
-"one can also access one's dive data from any web browser. Simply open "
+"you can also access your dive data from any web browser. Simply open "
 "https://cloud.subsurface-divelog.org[_https://cloud.subsurface-divelog.org_], "
 "log in with the same email and password, and you can see an HTML export of "
-"the last dive data that was synced to the _Subsurface cloud storage_. The "
-"dive information that is shown is only the contents of the recorded dive "
-"logs, NOT the calculated values shown in the *Profile* panel, including some "
-"cylinder pressures, deco ceilings and O~2~/He/N~2~ partial pressures."
+"the last dive data that was synced to _Subsurface cloud storage_. The dive "
+"information shown is only the contents of the recorded dive logs, NOT the "
+"calculated values shown in the *Profile* panel, including some cylinder "
+"pressures, deco ceilings and O~2~/He/N~2~ partial pressures."
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:2703
+#: user-manual.txt:2664
 #, no-wrap
 msgid "Other cloud services"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2713
+#: user-manual.txt:2674
 msgid ""
-"If one prefers not to use the integrated cloud storage of dive logs (and "
-"don't need the web access), it is also simple to store dive logs in the "
-"cloud using several of the existing facilities on the Internet.  For "
-"instance http://www.dropbox.com/[_Dropbox_] offers a free application that "
-"allows files on the Dropbox servers to be seen as a local folder on one's "
-"desktop computer."
+"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 "
+"using several of the existing facilities on the Internet.  For instance "
+"http://www.dropbox.com/[_Dropbox_] offers a free application that allows "
+"files on the Dropbox servers to be seen as a local folder on a desktop "
+"computer."
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:2714
+#: user-manual.txt:2675
 #, no-wrap
 msgid "images/Cloud.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2723
+#: user-manual.txt:2684
 msgid ""
 "The _Dropbox_ program creates a copy of the _Dropbox_ Internet Cloud content "
-"on one's desktop computer. When the computer is connected to the Internet, "
+"on your desktop computer. When the computer is connected to the Internet, "
 "the Internet content is automatically updated. Therefore both the _Open_ and "
 "_Save_ of dive logs are done using the local copy of the dive log in the "
 "local _Dropbox_ folder, so there's no need for a direct internet "
@@ -5292,206 +5210,205 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2730
+#: user-manual.txt:2691
 msgid ""
-"In this way a dive log in one's _Dropbox_ folder can be accessed seamlessly "
-"from the Internet and can be accessed from any place with Internet "
+"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. Currently there are no costs involved for this service. Dropbox "
 "(Windows, Mac and Linux) can be installed by accessing the "
 "http://www.dropbox.com/install[_Install Page on the Dropbox website_]"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2736
+#: user-manual.txt:2697
 msgid ""
-"Alternatively one can use _Dropbox_ as a mechanism to backup one's dive "
-"log. To Store a dive log on _Dropbox_, select _File -> Save as_ from the "
-"_Subsurface_ main menu, navigate to the _Dropbox_ folder and select the "
-"_Save_ button. To access the dive log in _Dropbox_, select _File -> Open "
-"Logbook_ from the _Subsurface_ main menu and navigate to the dive log file "
-"in the _Dropbox_ folder and select the _Open_ button."
+"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 "
+"menu, navigate to the _Dropbox_ folder and select the _Save_ button. To "
+"access the dive log in _Dropbox_, select _File -> Open Logbook_ from the "
+"_Subsurface_ main menu and navigate to the dive log file in the _Dropbox_ "
+"folder and select the _Open_ button."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2739
+#: user-manual.txt:2700
 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:2742
+#: user-manual.txt:2703
 #, no-wrap
 msgid "Printing a dive log"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2746
+#: user-manual.txt:2707
 #, no-wrap
 msgid ""
-"_Subsurface_ provides a simple and flexible interface to print a whole dive "
-"log or only a few selected dives.\n"
+"_Subsurface_ provides a simple and flexible way to print a whole dive log or "
+"only a few selected dives.\n"
 "  Pre-installed templates or a custom written template can be used to choose "
 "where the data are fitted into the page.\n"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2748
-msgid "Before printing, two decisions are required:"
+#: user-manual.txt:2709
+msgid "Some decisions need to be made before printing:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2751
+#: user-manual.txt:2712
 msgid ""
-"Should the whole dive log be printed or only part of it? If only part of the "
-"dive log is required, then select the required dives from the *Dive List* "
-"panel."
+"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:2753
+#: user-manual.txt:2714
 msgid ""
-"If the dive profiles needs printing, what gas partial pressure information "
+"If the dive profiles are printed, what gas partial pressure information "
 "should be shown? Select the appropriate toggle-buttons on the button bar to "
 "the left of the *Dive Profile* panel."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2756
+#: user-manual.txt:2717
 msgid ""
-"If _File -> Print_ is selected from the Main menu, the the dialogue below "
-"(image *A*) appears. Three specifications are needed to achieve the desired "
-"information and page layout:"
+"If _File -> Print_ is selected from the Main menu, the dialogue below (image "
+"*A*) appears. Three specifications are needed to get the desired information "
+"and page layout:"
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:2757 ./user-manual.txt:4185
+#: user-manual.txt:2718 user-manual.txt:4162
 #, no-wrap
 msgid "images/Print1_f22.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2760
+#: user-manual.txt:2721
 msgid "Under _Print type_ select one of two options:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2762
+#: user-manual.txt:2723
 msgid ""
 "_Dive list print_: Print dives from the *Dive List* panel with profiles and "
 "other information."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2763
+#: user-manual.txt:2724
 msgid "_Statistics print_: Print yearly statistics of the dives."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2765
+#: user-manual.txt:2726
 msgid "Under _Print options_ select:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2770
+#: user-manual.txt:2731
 msgid ""
-"Printing only the dives selected from the dive list prior to activating the "
+"Printing only the dives selected from the dive list before activating the "
 "print dialogue by checking the box _Print only selected dives_. If this "
-"check box is *not* checked all dives in the *Dive List* panel are printed."
+"check box is *not* checked ALL dives in the *Dive List* panel are printed."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2772
+#: user-manual.txt:2733
 msgid ""
-"Printing in colour, achieved by checking the box with _Print in colour_. If "
-"this check box is not checked, printing is in monochrome (grey scale)."
+"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:2775
+#: user-manual.txt:2736
 msgid ""
 "Under _Template_ select a template to be used as the page layout. There are "
-"several templates (see image *B*, above)."
+"several choices.  (see image *B*, above)."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2777
+#: user-manual.txt:2738
 msgid "_Table_: This prints a summary table of all dives selected (see below)."
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:2778
+#: user-manual.txt:2739
 #, no-wrap
 msgid "images/Print_summarylist_f22.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2781
+#: user-manual.txt:2742
 msgid ""
 "_Flow layout_: Print the text associated with each dive without printing the "
 "dive profiles"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2782
+#: user-manual.txt:2743
 msgid "of each dive (see below):"
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:2783
+#: user-manual.txt:2744
 #, no-wrap
 msgid "images/Print_flow_layout_f22.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2786
+#: user-manual.txt:2747
 msgid ""
 "_One Dive_: Print one dive per page, also showing the dive profile (see "
 "below)"
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:2787
+#: user-manual.txt:2748
 #, no-wrap
 msgid "images/print2_f22.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2791
+#: user-manual.txt:2752
 msgid "_Two Dives_: Print two dives per page, also showing the dive profiles."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2792
+#: user-manual.txt:2753
 msgid "_Six Dives_: Print six dives per page, also showing the dive profiles."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2796
+#: user-manual.txt:2757
 msgid ""
-"Users can _Preview_ the printed page by selecting the _Preview_ button on "
-"the dialogue (see image *A* at the start of this section). After preview, "
-"changes to the options in the print dialogue can be made, resulting in a "
-"layout that fits personal taste."
+"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 "
+"can change the options in the print dialogue, so the layout fits personal "
+"taste."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2800
+#: user-manual.txt:2761
 msgid ""
 "Next, select the _Print_ button (see image *A* at the start of this "
-"section). This activates the regular print dialogue used by the user "
-"operating system, allowing one to choose a printer and to set its properties "
-"(see image below):"
+"section). This activates the regular print dialogue used by the operating "
+"system, letting you choose a printer and set its properties (see image "
+"below):"
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:2801
+#: user-manual.txt:2762
 #, no-wrap
 msgid "images/Print_print_f22.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2806
+#: user-manual.txt:2767
 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 "
@@ -5500,22 +5417,22 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:2807
+#: user-manual.txt:2768
 #, no-wrap
 msgid "images/Printpreview.jpg"
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:2809
+#: user-manual.txt:2770
 #, no-wrap
 msgid "Writing a custom print template (advanced)"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2813
+#: user-manual.txt:2776
 msgid ""
 "Writing a custom template is an effective way to produce highly customized "
-"printouts. Subsurface uses HTML templates to render printing. One can create "
+"printouts. Subsurface uses HTML templates to render printing. You can create "
 "a template, export a new template, import an existing template and delete an "
 "existing template by using the appropriate buttons under the _Template_ "
 "dropdown list in the print dialogue. See <<S_APPENDIX_E,APPENDIX E>> for "
@@ -5523,28 +5440,28 @@ msgid ""
 msgstr ""
 
 #. type: Title ==
-#: ./user-manual.txt:2815
+#: user-manual.txt:2778
 #, no-wrap
 msgid "Configuring a dive computer"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2823
+#: user-manual.txt:2787
 msgid ""
-"_Subsurface_ enables one to configure a dive computer. Currently the "
+"_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. 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."
+"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."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2828
+#: user-manual.txt:2792
 msgid ""
 "Once the dive computer is connected to the _Subsurface_ computer, select "
 "_File -> Configure dive computer_ from the _Main Menu_. Provide the "
@@ -5554,20 +5471,20 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:2829
+#: user-manual.txt:2793
 #, no-wrap
 msgid "images/Configure_dc_f20.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2832
+#: user-manual.txt:2796
 msgid ""
 "Using the appropriate buttons on the configuration panel, the following "
-"actions can be performed:"
+"actions can be done:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2835
+#: user-manual.txt:2799
 #, no-wrap
 msgid ""
 "*Retrieve available details*. This loads the existing configuration from the "
@@ -5576,7 +5493,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2837
+#: user-manual.txt:2801
 #, no-wrap
 msgid ""
 "*Save changes to device*. This changes the configuration of the\n"
@@ -5585,7 +5502,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2839
+#: user-manual.txt:2803
 #, no-wrap
 msgid ""
 "*Backup*. This saves the configuration data to a file. _Subsurface_ asks "
@@ -5594,7 +5511,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2841
+#: user-manual.txt:2805
 #, no-wrap
 msgid ""
 "*Restore backup*. This loads the information from a backup file and displays "
@@ -5603,7 +5520,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2843
+#: user-manual.txt:2807
 #, no-wrap
 msgid ""
 "*Update firmware*. If new firmware is available for the dive computer, this "
@@ -5612,58 +5529,58 @@ msgid ""
 msgstr ""
 
 #. type: Title ==
-#: ./user-manual.txt:2846
+#: user-manual.txt:2810
 #, no-wrap
 msgid "Setting user _Preferences_ for _Subsurface_"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2856
+#: user-manual.txt:2819
 msgid ""
 "There are several user-definable settings within _Subsurface_, found by "
-"selecting _File -> Preferences_. The settings are performed in seven groups: "
+"selecting _File -> Preferences_. The settings are in seven groups: "
 "*Defaults*, *Units*, *Graph*, *Language* and *Network*, *Facebook* and "
-"*Georeference*, all of which operate on the same principles: the user must "
-"specify the settings that are to be changed, then these changes are saved "
-"using the *Apply* button. After applying all the new settings users can then "
-"leave the settings panel by selecting *OK*. If *Discard* is selected, "
-"changes to the preferences are not saved."
+"*Georeference*.  All operate on the same principles: the user must specify "
+"settings that are to be changed, then save them using the *Apply* "
+"button. After applying all the new settings users can then leave the "
+"settings panel by selecting *OK*. If *Discard* is selected, changes to the "
+"preferences are not saved."
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:2857
+#: user-manual.txt:2820
 #, no-wrap
 msgid "Defaults"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2860
+#: user-manual.txt:2823
 msgid "There are several settings in the *Defaults* panel:"
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:2861
+#: user-manual.txt:2824
 #, no-wrap
 msgid "images/Pref1_f20.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2865
+#: user-manual.txt:2828
 #, no-wrap
 msgid ""
-"  ** *Lists and tables*: Here one can specify the font type and font size of "
+"  ** *Lists and tables*: Here you can specify the font type and font size of "
 "the\n"
-"     *Dive Table* panel. By decreasing the font size of the *Dive Table*, "
-"users can see more dives on a screen.\n"
+"     *Dive Table* panel: By decreasing the font size of the *Dive Table*, "
+"you can see more dives on a screen.\n"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2870
+#: user-manual.txt:2833
 #, no-wrap
 msgid ""
-"  ** *Dives*: For the _Default Dive File_ one needs to specify the directory "
+"  ** *Dives*: For the _Default Dive File_ you need to specify the directory "
 "and\n"
-"     file name of one's\n"
+"     file name of your\n"
 "     electronic dive log book. This is a file with filename extension of "
 "either _.xml_ or _.ssrf_. When\n"
 "     launched, _Subsurface_ will automatically load the specified dive log "
@@ -5671,7 +5588,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2871
+#: user-manual.txt:2834
 #, no-wrap
 msgid ""
 "_No default file_: When checked, _Subsurface_ does not automatically load a "
@@ -5679,7 +5596,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2873
+#: user-manual.txt:2836
 #, no-wrap
 msgid ""
 "_Local default file_: When checked, _Subsurface_ automatically loads a dive "
@@ -5688,17 +5605,17 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2875
+#: user-manual.txt:2838
 #, no-wrap
 msgid ""
 "_Cloud storage default file_: When checked, _Subsurface automatically loads "
 "the dive log from the cloud\n"
-"device that was initialised using the *Preferences* _Network_ tab (see "
+"device that was initialized using the *Preferences* _Network_ tab (see "
 "below).\n"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2877
+#: user-manual.txt:2840
 #, no-wrap
 msgid ""
 "** *Display invalid*:  Dives can be marked as invalid (when a user wishes to "
@@ -5706,7 +5623,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2880
+#: user-manual.txt:2843
 #, no-wrap
 msgid ""
 "dives that he/she doesn't consider valid dives, e.g. pool dives, but still "
@@ -5717,19 +5634,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2882
+#: user-manual.txt:2845
 #, no-wrap
 msgid "** *Default cylinder*: Specify the default cylinder listed in\n"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2883
+#: user-manual.txt:2846
 #, no-wrap
 msgid "the *Equipment* tab of the *Notes* panel.\n"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2885
+#: user-manual.txt:2848
 #, no-wrap
 msgid ""
 "** *Animations*: Some actions in showing the dive profile are performed "
@@ -5737,7 +5654,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2891
+#: user-manual.txt:2854
 #, no-wrap
 msgid ""
 "animations. For instance, the axis values for depth and time change from "
@@ -5753,7 +5670,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2893
+#: user-manual.txt:2856
 #, no-wrap
 msgid ""
 "** *Clear all settings*: As indicated in the button below this heading, all "
@@ -5761,110 +5678,111 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2894
+#: user-manual.txt:2857
 #, no-wrap
 msgid "cleared and set to default values.\n"
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:2895
+#: user-manual.txt:2858
 #, no-wrap
 msgid "Units"
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:2896
+#: user-manual.txt:2859
 #, no-wrap
 msgid "images/Pref2_f20.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2903
+#: user-manual.txt:2866
 msgid ""
-"Here users can choose between metric and imperial units of depth, pressure, "
+"Here you can choose between metric and imperial units of depth, pressure, "
 "volume, temperature and mass. By selecting the Metric or Imperial radio "
-"button at the top, one can specify that all units are in the chosen "
-"measurement system.  Alternatively, if one selects the *Personalise* radio "
-"button, units can be selected independently, with some units in the metric "
-"system and others in imperial."
+"button at the top, you can specify that all units are in the chosen "
+"measurement system.  Alternatively, if you select the *Personalize* radio "
+"button, units can be selected independently, with some in the metric system "
+"and others in imperial."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2909
+#: user-manual.txt:2872
 msgid ""
-"Irrespective of the above settings, dive time measurements can be either in "
+"Regardless of the above settings, dive time measurements can be either in "
 "seconds or minutes.  Choose the appropriate option. GPS coordinates can be "
 "represented either as traditional coordinates (degrees, minutes, seconds) or "
 "as decimal degrees Choose the appropriate option."
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:2910
+#: user-manual.txt:2873
 #, no-wrap
 msgid "Graph"
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:2912
+#: user-manual.txt:2875
 #, no-wrap
 msgid "images/Pref3_f20.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2916
+#: user-manual.txt:2879
 msgid "This panel allows two type of selections:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2936
+#: user-manual.txt:2901
 #, no-wrap
 msgid ""
-"*Show*: Here users can specify the amount of information shown as part of\n"
+"*Show*: Here you can specify the amount of information shown as part of\n"
 "the dive profile:\n"
 "** Thresholds: _Subsurface_ can display the nitrogen, oxygen and the helium "
 "partial pressures during\n"
-"   the dive, enabled by using the toolbar on the left hand side of the *Dive "
+"   the dive, done by using the toolbar on the left hand side of the *Dive "
 "Profile*\n"
-"   panel. For each of these graphs users can specify a threshold value on "
-"the right-hand side of the\n"
+"   panel. For each of these graphs you can specify a threshold value on the "
+"right-hand side of the\n"
 "   Preferences panel. If any of the graphs go above the specified threshold "
 "level, the graph is\n"
-"   highlighted in red, indicating that the particular partial pressure "
-"threshold has been exceeded.\n"
+"   highlighted in red, indicating the particular partial pressure threshold "
+"has been exceeded.\n"
 "** _Max pO~2~ is used for calculating the MOD when displaying the maximum "
 "operative depth (MOD)\n"
 "   for a dive. Specify an appropriate partial pressure. A value of 1.4 is "
 "commonly used.\n"
-"** _Draw dive computer reported ceiling red_: This checkbox allows exactly "
+"** _Draw dive computer reported ceiling red_: This checkbox does exactly "
 "what it says. By default\n"
 "   the computer reported ceiling is shown in white.\n"
 "   Not all dive computers report ceiling values. If the dive computer does "
 "report it, it may differ\n"
 "   from the ceilings calculated by _Subsurface_ because of the different "
 "algorithms and\n"
-"   gradient factors, as well as the dynamic way that a\n"
-"   dive computer can calculate ceilings during a dive.\n"
+"   gradient factors, as well as the dynamic way a\n"
+"   dive computer calculates ceilings during a dive.\n"
 "** _Show unused cylinders in Equipment Tab_: This checkbox allows display of "
-"information about unused cylinders when viewing the *Equipment "
-"Tab*. Conversely, if this box is not checked, and if any cylinders entered "
-"using the *Equipment Tab* are not used (e.g. there was no gas switch to such "
-"a cylinder), then these cylinders are omitted from that list.\n"
+"information about unused cylinders when viewing the\n"
+"*Equipment Tab*. If this box is not checked, and if any cylinders entered "
+"using the *Equipment Tab* are not used (e.g. there\n"
+"was no gas switch to such a cylinder), then these cylinders are omitted from "
+"that list.\n"
 "**  _Show average depth_: If this box is checked, the *Dive Profile* panel "
-"contains a grey line that indicates\n"
-"    the mean depth of the dive up to any time instant during the "
+"contains a grey line that shows\n"
+"    the mean depth of the dive, up to any time instant during the "
 "dive. Normally this is a u-shaped line indicating the deepest mean depth "
-"just before the\n"
+"just before\n"
 "   ascent.\n"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2938
+#: user-manual.txt:2903
 #, no-wrap
 msgid "*Misc*:\n"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2951
+#: user-manual.txt:2916
 #, no-wrap
 msgid ""
 "** Gradient Factors (GFLow and GFHigh):* Set the _gradient factors_ used "
@@ -5873,9 +5791,9 @@ msgid ""
 "surface.\n"
 "   At intermediate depths gradient factors between GF_Low and GF_High are "
 "used.\n"
-"   Gradient factors add conservatism to the nitrogen exposure during a dive, "
-"in a\n"
-"   similar way that many dive computers have a conservatism setting. The "
+"   Gradient factors add conservatism to nitrogen exposure during a dive, in "
+"a\n"
+"   similar way that many dive computers have a conservative setting. The "
 "lower\n"
 "   the value of a gradient factor, the more conservative the calculations "
 "are with\n"
@@ -5891,7 +5809,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2953
+#: user-manual.txt:2918
 #, no-wrap
 msgid ""
 " *** http://www.tek-dive.com/portal/upload/M-Values.pdf[Understanding "
@@ -5899,7 +5817,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2955
+#: user-manual.txt:2920
 #, no-wrap
 msgid ""
 " *** "
@@ -5908,19 +5826,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2959
+#: user-manual.txt:2924
 #, no-wrap
 msgid ""
-" ** _CCR: Show setpoints when viewing pO2:_ With this checkbox ativated, the "
-"pO~2~\n"
-"    graph on the dive profile has an overlay in red which inticates the CCR "
+" ** _CCR: Show setpoints when viewing pO2:_ With this checkbox activated, "
+"the pO~2~\n"
+"    graph on the dive profile has an overlay in red which indicates the CCR "
 "setpoint\n"
 "    values. See the section on xref:S_CCR_dives[Closed Circuit Rebreather "
 "dives].\n"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2963
+#: user-manual.txt:2928
 #, no-wrap
 msgid ""
 " ** _CCR: Show individual O~2~ sensor values when viewing pO~2~:_ Show the "
@@ -5931,13 +5849,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2965
+#: user-manual.txt:2930
 #, no-wrap
 msgid "*Configuring dive planning using rebreather equipment:*\n"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2967
+#: user-manual.txt:2932
 #, no-wrap
 msgid ""
 "** _Default CCR setpoint for dive planning:_ Specify the O~2~ setpoint for "
@@ -5945,7 +5863,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2970
+#: user-manual.txt:2935
 #, no-wrap
 msgid ""
 "CCR dive plan. This determines the pO~2~  maintained\n"
@@ -5955,15 +5873,15 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2972
+#: user-manual.txt:2937
 #, no-wrap
 msgid ""
-"** _pSCR O~2~ metabolism rate:_ For a semiclosed rebreather (pSCR) system, "
+"** _pSCR O~2~ metabolism rate:_ For a semi-closed rebreather (pSCR) system, "
 "this is the\n"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2974
+#: user-manual.txt:2939
 #, no-wrap
 msgid ""
 "volume of oxygen used by a diver during a minute. Set this value for pSCR "
@@ -5972,7 +5890,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2976
+#: user-manual.txt:2941
 #, no-wrap
 msgid ""
 "** _pSCR ratio:_ For pSCR equipment the dump ratio is the ratio of gas "
@@ -5980,7 +5898,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2978
+#: user-manual.txt:2943
 #, no-wrap
 msgid ""
 "environment to that of the gas recirculated to the diver. Set this value for "
@@ -5989,66 +5907,65 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:2980
+#: user-manual.txt:2945
 #, no-wrap
 msgid "Language"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2982
+#: user-manual.txt:2947
 msgid "Choose a language that _Subsurface_ will use."
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:2983
+#: user-manual.txt:2948
 #, no-wrap
 msgid "images/Pref4_f20.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:2993
+#: user-manual.txt:2958
 msgid ""
-"A checkbox allows one to use the _System Default_ language which in most "
-"cases will be the correct setting; with this _Subsurface_ simply runs in the "
-"same language / country settings as the underlying operating system. If this "
-"is for some reason undesirable one can uncheck this checkbox and pick a "
-"language / country combination from the list of included localizations. The "
-"_Filter_ text box allows one to list similar languages. For instance there "
-"are several system variants of English or French. *This particular "
-"preference requires a restart of _Subsurface_ to take effect*."
+"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 "
+"language / country settings as the underlying operating system.  To change "
+"it, uncheck this checkbox and pick a language / country combination from the "
+"list of locations. The _Filter_ text box lists similar languages. For "
+"instance there are several system variants of English or French. *This "
+"particular preference requires a restart of _Subsurface_ to take effect*."
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:2994
+#: user-manual.txt:2959
 #, no-wrap
 msgid "Network"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3000
+#: user-manual.txt:2966
 msgid ""
 "This panel facilitates communication between _Subsurface_ and data sources "
 "on the Internet.  This is important, for instance, when _Subsurface_ needs "
-"to communicate with Internet services such as Cloud storage or the "
+"to communicate with web services such as Cloud storage or the "
 "<<S_Companion,_Subsurface Companion app_>>. These Internet requirements are "
-"determined by one's type of connection to the Internet and by the Internet "
-"Service Provider (ISP) used.  One's ISP should provide the appropriate "
+"determined by your type of connection to the Internet and by the Internet "
+"Service Provider (ISP) used.  Your ISP should provide the appropriate "
 "information."
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:3001
+#: user-manual.txt:2967
 #, no-wrap
 msgid "images/Pref5_f20.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3004
+#: user-manual.txt:2970
 msgid "This dialogue has three sections:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3012
+#: user-manual.txt:2978
 #, no-wrap
 msgid ""
 "** _Proxy type_:\n"
@@ -6065,20 +5982,20 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3017
+#: user-manual.txt:2983
 #, no-wrap
 msgid ""
-"** _Subsurface cloud storage_: To store one's dive log in the cloud, a valid "
+"** _Subsurface cloud storage_: To store your dive log in the cloud, a valid "
 "email address\n"
-"   and password are required. This allows _Subsurface_ to email security "
+"   and password are required. This lets _Subsurface_ email security "
 "information\n"
-"   regarding cloud storage to a user, and to set up the cloud storage "
+"   regarding cloud storage to you, and to set up cloud storage "
 "appropriately.\n"
 "   Two additional options are given:\n"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3018
+#: user-manual.txt:2984
 #, no-wrap
 msgid ""
 "_Sync to cloud in the background_: This option allows saving of dive "
@@ -6086,13 +6003,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3019
+#: user-manual.txt:2985
 #, no-wrap
-msgid "while the user performs other tasks within _Subsurface_.\n"
+msgid "while you do other things within _Subsurface_.\n"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3020
+#: user-manual.txt:2986
 #, no-wrap
 msgid ""
 "_Save password locally_: This allows local storage of the cloud storage "
@@ -6100,95 +6017,94 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3021
+#: user-manual.txt:2987
 #, no-wrap
 msgid "information is saved in raw text form, not encoded in any way.\n"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3026
+#: user-manual.txt:2991
 #, no-wrap
 msgid ""
-"** _Subsurface web service_: When one subscribes to the "
+"** _Subsurface web service_: When you subscribe to the "
 "<<S_Companion,Subsurface web service>>, a very\n"
 "     long and hard-to-remember userID is issued. This is the place to save "
 "that userID. By\n"
-"     checking the option _Save User ID locally?_, one ensures that a local "
-"copy of that userID\n"
-"     is saved.\n"
+"     checking the option _Save User ID locally?_, you ensure a local copy of "
+"that userID is saved.\n"
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:3029
+#: user-manual.txt:2994
 #, no-wrap
-msgid "Facebook Accesss"
+msgid "Facebook Access"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3032
+#: user-manual.txt:2997
 msgid ""
-"This panel allows one to log into a Facebook account in order to transfer "
-"information from Subsurface to Facefook."
+"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:3033
+#: user-manual.txt:2998
 #, no-wrap
 msgid "images/Pref6_f20.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3041
+#: user-manual.txt:3006
 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 "
+"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."
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:3042
+#: user-manual.txt:3007
 #, no-wrap
 msgid "Georeference"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3050
+#: user-manual.txt:3015
 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 "
+"of a dive site) derived from a click on the *Dive Map panel* at the bottom "
 "right of the _Subsurface_ window, or from a GPS instrument or from the "
-"_Subsurface_ Companion app), a lookup on the Internet is performed to find "
-"the name of the closest known location. Obviously this function only works "
-"if _Subsurface_ has an Internet connection. The preference of the dive site "
-"name can be configured, e.g. _Country/State/City_ or _City/State/Country_ "
-"(see image below)."
+"_Subsurface_ Companion app). A search on the Internet is done to find the "
+"name of the closest known location. This function only works if _Subsurface_ "
+"has an Internet connection. The preference of the dive site name can be "
+"configured, e.g. _Country/State/City_ or _City/State/Country_ (see image "
+"below)."
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:3051
+#: user-manual.txt:3016
 #, no-wrap
 msgid "images/Pref7_f20.jpg"
 msgstr ""
 
 #. type: Title ==
-#: ./user-manual.txt:3054
+#: user-manual.txt:3019
 #, no-wrap
 msgid "The _Subsurface_ dive planner"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3059
+#: user-manual.txt:3024
 msgid ""
-"Dive planning is an advanced feature of _Subsurface_, accessible by "
-"selecting _Log -> Plan Dive_ from the main menu. It allows calculation of "
-"nitrogen load during a dive by using the Bühlmann ZH-L16 algorithm with the "
-"addition of gradient factors as implemented by Erik Baker."
+"Dive planning is an advanced feature of _Subsurface_, accessed by selecting "
+"_Log -> Plan Dive_ from the main menu. It allows calculation of nitrogen "
+"load during a dive by using the Bühlmann ZH-L16 algorithm with the addition "
+"of gradient factors as implemented by Erik Baker."
 msgstr ""
 
 #. type: delimited block *
-#: ./user-manual.txt:3067
+#: user-manual.txt:3032
 msgid ""
 "The _Subsurface_ dive planner IS CURRENTLY EXPERIMENTAL and assumes the user "
 "is already familiar with the _Subsurface_ user interface. It is explicitly "
@@ -6196,19 +6112,19 @@ msgid ""
 msgstr ""
 
 #. type: delimited block *
-#: ./user-manual.txt:3070
+#: user-manual.txt:3035
 msgid ""
 "The user is conversant with dive planning and has the necessary training to "
 "perform dive planning."
 msgstr ""
 
 #. type: delimited block *
-#: ./user-manual.txt:3071
+#: user-manual.txt:3036
 msgid "The user plans dives within his/her certification limits."
 msgstr ""
 
 #. type: delimited block *
-#: ./user-manual.txt:3074
+#: user-manual.txt:3039
 msgid ""
 "Dive planning makes large assumptions about the characteristics of the "
 "_average person_ and cannot compensate for individual physiology or health "
@@ -6216,51 +6132,50 @@ msgid ""
 msgstr ""
 
 #. type: delimited block *
-#: ./user-manual.txt:3075
+#: user-manual.txt:3040
 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:3076
+#: user-manual.txt:3041
 msgid "The user is familiar with the user interface of _Subsurface_."
 msgstr ""
 
 #. type: delimited block *
-#: ./user-manual.txt:3078
+#: user-manual.txt:3043
 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:3080
+#: user-manual.txt:3045
 #, no-wrap
 msgid "The _Subsurface_ dive planner screen"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3085
+#: user-manual.txt:3050
 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 "
-"into the several sections on the left hand side of the screen.  The setup is "
-"divided into several sections: Available Gases, Rates, Planning, Gas Options "
-"and Notes."
+"into the sections on the left hand side of the screen.  They are: Available "
+"Gases, Rates, Planning, Gas Options and Notes."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3089
+#: user-manual.txt:3054
 msgid ""
-"At the top right hand is a green *design panel* upon which the profile of "
-"the dive can be manipulated directly by dragging and clicking as explained "
+"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 "
 "below. This feature makes the _Subsurface_ dive planner unique in ease of "
 "use."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3093
+#: user-manual.txt:3058
 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 "
@@ -6269,26 +6184,26 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:3094
+#: user-manual.txt:3059
 #, no-wrap
 msgid "images/PlannerWindow1_f20.jpg"
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:3097
+#: user-manual.txt:3062
 #, no-wrap
 msgid "Open circuit dives"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3100
+#: user-manual.txt:3065
 msgid ""
-"Towards the centre bottom of the planner (circled in blue in the image "
+"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:3103
+#: user-manual.txt:3068
 #, no-wrap
 msgid ""
 "** Open Circuit (the default)\n"
@@ -6297,22 +6212,22 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3105
+#: user-manual.txt:3070
 msgid "Choose the Open Circuit option."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3109
+#: user-manual.txt:3074
 msgid ""
-"In the top left-hand area of the planning screen, ensure that the constant "
-"dive parameters are appropriate. These are: Start date and time of the "
-"intended dive, Atmospheric Pressure and Altitude above sea level of the dive "
-"site. The atmospheric pressure can also be entered as an altitude in metres, "
+"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 "
+"dive, Atmospheric Pressure and Altitude above sea level of the dive "
+"site. The atmospheric pressure can also be entered as an altitude in meters, "
 "assuming a sea-level atmospheric pressure of 1.013 bar."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3118
+#: user-manual.txt:3083
 msgid ""
 "In the table labelled _Available Gases_, add the information of the "
 "cylinders to be used as well as the gas composition within that "
@@ -6327,22 +6242,22 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3120
+#: user-manual.txt:3085
 msgid "The profile of the planned dive can be created in two ways:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3125
+#: user-manual.txt:3090
 msgid ""
-"Drag the waypoints (the small white circles) on the existing dive profile in "
-"a way to represent the dive. Additional waypoints can be created by "
-"double-clicking the existing dive profile. Waypoints can be deleted by "
-"right-clicking a particular waypoint and selecting the _delete_ item from "
-"the resulting context menu."
+"Drag the waypoints (the small white circles) on the existing dive profile to "
+"represent the dive. Additional waypoints can be created by double-clicking "
+"the existing dive profile. Waypoints can be deleted by right-clicking a "
+"particular waypoint and selecting the _delete_ item from the resulting "
+"context menu."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3133
+#: user-manual.txt:3098
 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 "
@@ -6356,55 +6271,58 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: ./user-manual.txt:3134
+#: user-manual.txt:3099
 #, no-wrap
 msgid "Recreational dives"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3149
+#: user-manual.txt:3116
+#, no-wrap
 msgid ""
 "Recreational mode is what comes closest to planning a dive based on the "
-"non-decompression limit (NDL).  It computes the maximal time a diver can "
-"stay at the current depth without incurring any mandatory decompression "
+"non-decompression limit (NDL).\n"
+"It computes the maximum time a diver can stay at the current depth without "
+"needing mandatory decompression\n"
 "stops and without using more than the existing gas (minus a reserve). The "
-"planner automatically takes into account the nitrogen load incurred in "
-"previous dives. But conventional dive tables are also used in a way that can "
-"take into account previous dives. Why use a dive planner for recreational "
-"dives? Using recreational dive tables, the maximum depth of a dive is taken "
-"into account. However, few dives are undertaken at a constant depth "
-"corresponding to the maximum depth (i.e. a \"square\" dive profile). This "
-"means that dive tables overestimate the nitrogen load incurred during "
-"previous dives. The _Subsurface_ dive planner calculates nitrogen load "
-"according to the real dive profiles of all uploaded previous dives, in a "
-"similar way as dive computers calculate nitrogen load during a dive. This "
-"means that the diver gets 'credit' in terms of nitrogen loading for not "
-"remaining at maximum depth during previous dives, enabling planning of a "
-"longer subsequent dive. For the planner to work it is therefore crucial to "
-"upload all previous dives onto _Subsurface_ before performing dive planning."
-msgstr ""
-
-#. type: Plain text
-#: ./user-manual.txt:3151
-msgid "To plan a dive, the appropriate settings need to be defined."
+"planner automatically takes\n"
+"into account the nitrogen load incurred in previous dives. But conventional "
+"dive tables are also used in a\n"
+"way that can take into account previous dives. Why use a dive planner for "
+"recreational dives? Using\n"
+"recreational dive tables, the maximum depth of a dive is taken into "
+"account. But few dives are\n"
+"done at a constant depth corresponding to the maximum depth (i.e. a "
+"\"square\" dive profile). This means\n"
+"dive tables overestimate the nitrogen load incurred during previous "
+"dives. The _Subsurface_\n"
+"dive planner calculates nitrogen load according to the real dive profiles of "
+"all uploaded previous dives,\n"
+"in a similar way as dive computers calculate nitrogen load during a "
+"dive. This means that the diver gets 'credit,'\n"
+"in terms of nitrogen load, for not remaining at maximum depth during\n"
+"previous dives, so a longer subsequent dive can be planned.\n"
+" For the planner to work it's crucial to upload all previous dives\n"
+"onto _Subsurface_ before doing dive planning.\n"
+"To plan a dive, the appropriate settings need to be defined.\n"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3154
+#: user-manual.txt:3119
 msgid ""
-"Ensure that the date and time is set to that of the intended dive. This "
-"allows calculation of the nitrogen load incurred during previous dives."
+"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:3157
+#: user-manual.txt:3122
 msgid ""
 "Immediately under the heading _Planning_ are two checkboxes _Recreational_ "
 "and _Safety Stop_.  Check these two boxes."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3161
+#: user-manual.txt:3126
 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 "
@@ -6412,35 +6330,34 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3166
+#: user-manual.txt:3131
 msgid ""
 "The planner calculates whether the specified cylinder contains enough "
-"air/gas to complete the planned dive. In order for this to be realistic, "
+"air/gas to complete the planned dive. In order for this to be accurate, "
 "under _Gas options_, specify an appropriate surface air consumption (SAC) "
 "rate for _Bottom SAC_. Suitable values are between 15 l/min and 30 l/min, "
 "with novice divers or difficult dives requiring SAC rates closer to 30l/min."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3175
+#: user-manual.txt:3140
 msgid ""
-"Define the amount of gas that the cylinder must have at the end of the "
-"bottom section of the dive just before ascent. A value of 50 bar is often "
-"used. The reason for this reserve gas is to provide for the possible need to "
-"bring one's buddy to the surface using gas sharing. How much gas is used in "
-"sharing depends on the depth of the ascent. This can be a bit hard to "
-"estimate, so most agencies assume a fixed amount of gas, or actually of "
-"pressure e.g. 40 or 50 bar or 25% or 33% (rule of thirds). But _Subsurface_ "
-"can do better because it knows about the ascent and that is why we add the "
-"amount of gas during the ascent (i.e. the \"deco gas“).  Subsurface still "
-"uses a fixed pressure „reserve“ but that is supposed to be for the "
-"additional gas used around the realisation that there is a problem and one's "
-"pulse rate goes up when one starts to buddy breathe. This reserve amount is "
-"user configurable."
+"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 "
+"reason for this reserve gas is to provide for the possible need to bring a "
+"buddy to the surface using gas sharing. How much gas is used in sharing "
+"depends on the depth of the ascent. This can be difficult to estimate, so "
+"most agencies assume a fixed amount of gas, or actually of pressure e.g. 40 "
+"or 50 bar or 25% or 33% (rule of thirds). But _Subsurface_ can do better "
+"because it knows about the ascent and that is why we add the amount of gas "
+"during the ascent (i.e. the \"deco gas“).  Subsurface still uses a fixed "
+"pressure \"reserve\" but that's supposed to be for the additional gas used "
+"when there's a problem and your pulse rate goes up when you start to buddy "
+"breathe. This reserve amount is user configurable."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3183
+#: user-manual.txt:3148
 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 "
@@ -6453,18 +6370,18 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3186
+#: user-manual.txt:3151
 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:3194
+#: user-manual.txt:3159
 msgid ""
-"The dive profile in the planner indicates the maximum dive time within "
-"no-deco limits using the Bühlmann ZH-L16 algorithm and the gas and depth "
-"settings specified as described above. The _Subsurface_ planner allows rapid "
+"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 "
+"specified as described above. The _Subsurface_ planner allows rapid "
 "assessment of dive duration as a function of dive depth, given the nitrogen "
 "load incurred during previous dives. The dive plan includes estimates of the "
 "amount of air/gas used, depending on the cylinder settings specified under "
@@ -6476,40 +6393,40 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3198
+#: user-manual.txt:3163
 msgid ""
 "Below is an image of a dive plan for a recreational dive at 30 "
-"metres. Although the no-deco limit (NDL) is 23 minutes, the duration of the "
-"dive is limited by the amount of air in the cylinder, reflected by the "
-"information in the text box at the bottom right of the panel that requires "
-"sufficient air for buddy-sharing during the ascent."
+"meters. Although the no-deco limit (NDL) is 23 minutes, the duration of the "
+"dive is limited by the amount of air in the cylinder. That is shown in the "
+"text box at the bottom right of the panel, requiring sufficient air for "
+"buddy-sharing during ascent."
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:3199
+#: user-manual.txt:3164
 #, no-wrap
 msgid "images/rec_diveplan.jpg"
 msgstr ""
 
 #. type: Title ====
-#: ./user-manual.txt:3201
+#: user-manual.txt:3166
 #, no-wrap
 msgid "Non-recreational open circuit dives, including decompression"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3205
+#: user-manual.txt:3170
 msgid ""
 "Non-recreational dive planning involves exceeding the no-deco limits and/or "
-"using multiple breathing gases.  Such dives are planned in three stages:"
+"using multiple breathing gases.  These dives are planned in three stages:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3216
+#: user-manual.txt:3182
 #, no-wrap
 msgid ""
-"*a) Nitrogen management*: This is performed by specifying the rates for "
-"descent and ascent,\n"
+"*a) Nitrogen management*: This is done by specifying the rates for descent "
+"and ascent,\n"
 "as well as the deco model (GFLow, GFHigh or Conservatism level) under the "
 "headings _Rates_ and _Planning_\n"
 "to the bottom left of the planning screen. Two deco models are supported the "
@@ -6521,47 +6438,47 @@ msgid ""
 "panel of _Subsurface_ is used. If these are changed within the planner (see "
 "_Gas Options_ within\n"
 "the planner), the new values are\n"
-"used without changing the original values in the _Preferences_. Gradient "
-"Factor settings strongly affect the calculated ceilings and their depths.\n"
-"A very low GFLow value brings about decompression stops early on during the "
+"used without changing the original values in the _Preferences_.\n"
+"Gradient Factor settings strongly affect the calculated ceilings and their "
+"depths.\n"
+"A very low GFLow value brings on decompression stops early during the "
 "dive.\n"
 " ** For more information about Gradient factors, see the section on "
 "xref:S_GradientFactors[Gradient Factor Preference settings].\n"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3221
+#: user-manual.txt:3187
 msgid ""
 "If the VPM-B model is selected, the Conservatism_level needs to be specified "
 "on a scale of 0 (least conservative) to 4 (most conservative).  This model "
 "tends to give deco stops at deeper levels than the Bühlmann model and often "
 "results in slightly shorter dive durations than the Bühlmann model. When "
-"selecting one of these models, keep in mind that they are NOT exact "
-"physiological models but only mathematical models that appear to work in "
-"practice."
+"selecting one of these models, keep in mind they are NOT exact physiological "
+"models but only mathematical models that appear to work in practice."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3223
+#: user-manual.txt:3189
 msgid "For more information external to this manual see:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3225
+#: user-manual.txt:3191
 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:3226
+#: user-manual.txt:3192
 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:3228
+#: user-manual.txt:3194
 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: "
@@ -6570,21 +6487,21 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3236
+#: user-manual.txt:3202
 msgid ""
 "The ascent rate is critical for nitrogen off-gassing at the end of the dive "
-"and is specified for several depth ranges, utilising the average (or mean) "
-"depth as a yardstick. The mean depth of the dive plan is indicated by a "
-"light grey line on the dive profile. Ascent rates at deeper levels are often "
-"in the range of 8-12 m/min, while ascent rates near the surface are often in "
-"the range of 4-9 m/min. The descent rate is also specified. If the option "
-"_Drop to first depth_ is activated, then the descent phase of the planned "
-"dive will be at the maximal descent rate specified in the _Rates_ section of "
-"the dive setup."
+"and is specified for several depth ranges, using the average (or mean) depth "
+"as a yardstick. The mean depth of the dive plan is shown by a light grey "
+"line on the dive profile. Ascent rates at deeper levels are often in the "
+"range of 8-12 m/min, while ascent rates near the surface are often in the "
+"range of 4-9 m/min. The descent rate is also specified. If the option _Drop "
+"to first depth_ is activated, the descent phase of the planned dive will be "
+"at the maximal descent rate specified in the _Rates_ section of the dive "
+"setup."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3245
+#: user-manual.txt:3211
 #, no-wrap
 msgid ""
 "*b) Oxygen management*: In the *Gas Options* part of the dive specification, "
@@ -6604,88 +6521,85 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3259
+#: user-manual.txt:3228
 #, no-wrap
 msgid ""
-"*c) Gas management*: With open-circuit dives this is a primary "
-"consideration. One needs to keep within the limits of the amount of gas "
-"within the dive\n"
+"*c) Gas management*: With open-circuit dives this is a primary\n"
+"consideration. Divers need to keep within the limits of the amount of\n"
+"gas within the dive\n"
 "cylinder(s), allowing for an appropriate margin for a safe return to the "
 "surface, possibly\n"
 "sharing with a buddy. Under the _Gas Options_ heading, specify the best (but "
 "conservative) estimate\n"
 "of your surface-equivalent air consumption (SAC, also termed RMV) in\n"
-"litres/min (for the time being, only SI units are supported).  Specify the "
+"liters/min (for the time being, only SI units are supported).  Specify the "
 "SAC during the\n"
 "bottom part of the dive (_bottom SAC_) as well as during the decompression "
 "or safety stops of the\n"
 "dive (_deco SAC_). Values of 15-30 l/min are common. For good gas "
-"management, a thumbsuck guess\n"
-"is not sufficient and one needs to\n"
-"monitor one's gas consumption on a regular basis, dependent on different "
-"dive conditions and/or equipment.\n"
+"management, a guess\n"
+"is not sufficient and you needs to\n"
+"monitor gas consumption on a regular basis, dependent on different dive "
+"conditions and/or equipment.\n"
 "The planner calculates the total volume of gas used during the dive and "
 "issues a warning\n"
-"if one exceeds the total amount of gas available. Good practice demands that "
-"one does not dive to\n"
-"the limit of the gas supply but that an appropriate reserve is kept for "
-"unforeseen circumstances.\n"
+"if you exceeds the total amount of gas available. Good practice demands that "
+"divers not dive to\n"
+"the limit of the gas supply but that an appropriate reserve is kept\n"
+"for unforeseen circumstances.\n"
 "For technical diving, this reserve can be up to 66% of the total available "
 "gas.\n"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3271
+#: user-manual.txt:3240
 msgid ""
-"Now (at last) one can start the detailed time-depth planning of the "
-"dive. _Subsurface_ offers a unique graphical interface for performing this "
-"part of the planning. The mechanics of doing this is similar to "
-"hand-entering a dive profile in the dive log part of _Subsurface_. Upon "
-"activating the planner, a default dive of depth 15 m for 40 min is offered "
-"in the bue design surface to the top right hand of the screen. The white "
-"dots (waypoints) on the profile can be dragged with a mouse. Create more "
-"waypoints by double-clicking on the profile line and ensuring that the "
-"profile reflects the intended dive. Drag the waypoints to represent the "
-"depth and duration of the dive. It is NOT necessary to specify the ascent "
-"part of the dive since the planner calculates this, based on the settings "
-"that have been specified.  If any of the management limits (for nitrogen, "
-"oxygen or gas) is exceeded, the surface above the dive profile changes from "
-"BLUE to RED."
+"Now you can start the detailed time-depth planning of the dive. _Subsurface_ "
+"offers an unique graphical interface for doing planning. Themechanics are "
+"similar to hand-entering a dive profile in the dive log part of "
+"_Subsurface_. Upon activating the planner, a default dive of depth 15 m for "
+"40 min is offered in the blue design surface to the top right hand of the "
+"screen. The white dots (waypoints) on the profile can be dragged with a "
+"mouse. Create more waypoints by double-clicking on the profile line and "
+"ensuring the profile reflects the intended dive. Drag the waypoints to "
+"represent the depth and duration of the dive. It is NOT necessary to specify "
+"the ascent part of the dive since the planner calculates this, based on the "
+"settings that have been specified.  If any of the management limits (for "
+"nitrogen, oxygen or gas) are exceeded, the surface above the dive profile "
+"changes from BLUE to RED."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3283
+#: user-manual.txt:3252
 msgid ""
 "Each waypoint on the dive profile creates a _Dive Planner Point_ in the "
-"table on the left of the dive planner panel. Ensure that the _Used Gas_ "
-"value in each row of that table corresponds to one of the gas mixtures "
-"specified in the _Available Gases_ table.  Add new waypoints until the main "
-"features of the dive have been completed, e.g. the bottom time segment and "
-"deep stops (if these are implemented). Leave the remaining waypoints on the "
-"ascent to _Subsurface_. In most cases _Subsurface_ computes additional way "
-"points in order to fulfil decompression requirements for that dive. A "
-"waypoint can be moved by selecting that waypoint and by using the arrow "
-"keys.  The waypoints listed in the _Dive Planner Points_ dialogue can be "
-"edited by hand in order to obtain a precise presentation of the dive "
-"plan. In fact, one can create the whole dive profile by editing the _Dive "
-"Planner Points_ dialog."
+"table on the left of the dive planner panel. Be sure the _Used Gas_ value in "
+"each row of that table corresponds to one of the gas mixtures specified in "
+"the _Available Gases_ table.  Add new waypoints until the main features of "
+"the dive have been completed, e.g. the bottom time segment and deep stops "
+"(if these are implemented). Leave the remaining waypoints on the ascent to "
+"_Subsurface_. In most cases _Subsurface_ computes additional way points in "
+"order to fulfill decompression requirements for that dive. A waypoint can be "
+"moved by selecting it and by using the arrow keys.  The waypoints listed in "
+"the _Dive Planner Points_ dialogue can be edited by hand in order to get a "
+"precise presentation of the dive plan. In fact, you can create the whole "
+"dive profile by editing the _Dive Planner Points_ dialog."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3291
+#: user-manual.txt:3260
 msgid ""
-"Indicate any changes in gas cylinder used by indicating gas changes as "
-"explained in the section <<S_CreateProfile,hand-creating a dive "
-"profile>>. These changes should reflect the cylinders and gas compositions "
-"defined in the table with _Available Gases_.  If two or more gases are used, "
-"automatic gas switches will be suggested during the ascent to the "
-"surface. However, these changes can be deleted by right-clicking the gas "
-"change and by manually creating a gas change by right-clicking on the "
-"appropriate waypoint."
+"Show any changes in gas cylinder used by indicating gas changes as explained "
+"in the section <<S_CreateProfile,hand-creating a dive profile>>. These "
+"changes should reflect the cylinders and gas compositions defined in the "
+"table with _Available Gases_.  If two or more gases are used, automatic gas "
+"switches will be suggested during the ascent to the surface. These changes "
+"can be deleted by right-clicking the gas change and manually creating a gas "
+"change by right-clicking on the appropriate waypoint."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3300
+#: user-manual.txt:3269
 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 "
@@ -6698,34 +6612,34 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3303
+#: user-manual.txt:3272
 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:3304
+#: user-manual.txt:3273
 #, no-wrap
 msgid "images/DivePlanner2_f20.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3309
+#: user-manual.txt:3278
 msgid ""
-"Once the above has been completed, one can save it by clicking the _Save_ "
-"button towards the top middle of the planner. The saved dive plan will "
-"appear in the *Dive List* panel of _Subsurface_."
+"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 "
+"the *Dive List* panel of _Subsurface_."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3311
+#: user-manual.txt:3280
 #, no-wrap
 msgid "*The dive plan details*\n"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3319
+#: user-manual.txt:3288
 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 "
@@ -6738,7 +6652,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3324
+#: user-manual.txt:3293
 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 "
@@ -6748,13 +6662,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:3325
+#: user-manual.txt:3294
 #, no-wrap
 msgid "Planning pSCR dives"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3340
+#: user-manual.txt:3309
 #, no-wrap
 msgid ""
 "To plan a dive using a passive semi-closed rebreather (pSCR), select _pSCR_ "
@@ -6767,8 +6681,8 @@ msgid ""
 "ratio (default 10:1) as well as the metabolism rate. The calculation also "
 "takes the oxygen drop\n"
 "accross the mouthpiece of the rebreather into account. If the\n"
-"pO~2~ drops below what is considered a save value, a warning appears in the "
-"_Dive plan\n"
+"pO~2~ drops below what is considered safe, a warning appears in the _Dive "
+"plan\n"
 "details_. A typical pSCR configuration is with a single cylinder and one or "
 "more bail-out\n"
 "cylinders. Therefore the setup of the _Available gases_ and the _Dive "
@@ -6784,26 +6698,26 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:3341
+#: user-manual.txt:3310
 #, no-wrap
 msgid "images/Planner_pSCR1_f20.jpg"
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:3344
+#: user-manual.txt:3313
 #, no-wrap
 msgid "Planning CCR dives"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3348
+#: user-manual.txt:3317
 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:3352
+#: user-manual.txt:3321
 #, no-wrap
 msgid ""
 "*Available gases*: In the _Available gases_ table, enter the cylinder "
@@ -6814,7 +6728,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3362
+#: user-manual.txt:3331
 #, no-wrap
 msgid ""
 "*Entering setpoints*: Specify a default setpoint in the Preferences tab, by "
@@ -6824,56 +6738,56 @@ msgid ""
 "use the default setpoint value. Then, different setpoints can be specified "
 "for dive segments\n"
 "in the _Dive planner points_ table. A zero setpoint\n"
-"means the diver bails out to open circuit mode for that segment. The "
-"decompression is always calculated\n"
+"means the diver bails out to open circuit mode for that "
+"segment. Decompression is always calculated\n"
 "using the setpoint of the last manually entered segment. So, to plan a bail "
 "out ascent for a\n"
 "CCR dive, add a one-minute dive segment to the end with a setpoint value of "
 "0. The decompression\n"
 "algorithm does not switch deco-gases automatically while in CCR mode "
-"(i.e. when a positive setpoint is specified) but,\n"
-"of course, this is calculated for bail out ascents.\n"
+"(i.e. when a positive setpoint is specified) but\n"
+"this is calculated for bail out ascents.\n"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3364
+#: user-manual.txt:3333
 msgid "The dive profile for a CCR dive may look something like the image below."
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:3365
+#: user-manual.txt:3334
 #, no-wrap
 msgid "images/Planner_CCR1_f20.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3369
+#: user-manual.txt:3338
 msgid ""
 "Note that, in the _Dive plan details_, the gas consumption for a CCR segment "
-"is not calculated, so gas consumptions of 0 litres are the norm."
+"is not calculated, so gas consumptions of 0 liters are the norm."
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:3371
+#: user-manual.txt:3340
 #, no-wrap
 msgid "Modifying an existing dive plan"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3378
+#: user-manual.txt:3347
 msgid ""
 "Normally, when a dive plan has been saved, it is accessible from the *Dive "
-"List*, like any other dive log. Within the *Dive List* there is not a way to "
-"change a saved dive plan.  To perform changes to a dive plan, select it on "
-"the *Dive List*. Then, in the main menu, select _Log -> Re-plan dive_. This "
-"will open the selected dive plan within the dive planner, allowing changes "
-"to be made and saved as usual."
+"List*, like any other dive log. Within the *Dive List* there is no way to "
+"change a saved dive plan.  To change a dive plan, select it on the *Dive "
+"List*. Then, in the main menu, select _Log -> Re-plan dive_. This will open "
+"the selected dive plan within the dive planner, letting changes be made and "
+"saved as usual."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3384
+#: user-manual.txt:3353
 msgid ""
-"In addition there is the option \"Save new\". This keeps the original "
+"In addition, there is the option \"Save new\". This keeps the original "
 "planned dive and adds a (possibly modified) copy to the dive list. If that "
 "copy is saved with the same start time as the original, the two dives are "
 "considered two versions of the same dive and do not influence other each "
@@ -6881,56 +6795,56 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:3385
+#: user-manual.txt:3354
 #, no-wrap
 msgid "Planning for repetitive dives"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3392
+#: user-manual.txt:3361
 msgid ""
 "Repetitive dives can easily be planned if the dates and start times of the "
-"repetitive dive set is specified appropriately in the top left-hand _Start "
-"Time_ field. _Subsurface_ calculates the gas loading figures correctly and "
-"the effect of the first dive is evaluated on later dives."
+"repetitive dive set are specified appropriately in the top left-hand _Start "
+"Time_ field. _Subsurface_ calculates the gas loading figures and the affect "
+"of the first dive is evaluated on later dives."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3398
+#: user-manual.txt:3367
 msgid ""
-"If one has just completed a long/deep dive and is planning another dive, "
-"then highlight, in the *Dive List*, the dive that has just been completed "
-"and then activate the planner. Depending on the start time of the planned "
-"dive, the planner takes into account the gas loading incurred during the "
-"completed dive and allows planning within these limitations."
+"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 "
+"activate the planner. Depending on the start time of the planned dive, the "
+"planner takes into account the gas loading during the completed dive and "
+"plans accordingly."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3403
+#: user-manual.txt:3372
 msgid ""
 "If only a few standard configurations are used (e.g. in GUE), then a "
-"template dive can be created conforming to one of the configurations. If one "
-"now wishes to plan a dive using this configuration, just highlight the "
-"template dive in the *Dive List* and activate the planner: the planner takes "
-"into account the configuration in the highlighted dive."
+"template dive can be created conforming to one of the configurations. If you "
+"want to plan a dive using this configuration, highlight the template dive in "
+"the *Dive List* and activate the planner: the planner takes into account the "
+"configuration in the highlighted dive."
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:3404
+#: user-manual.txt:3373
 #, no-wrap
 msgid "Printing the dive plan"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3409
+#: user-manual.txt:3378
 msgid ""
 "Selecting the _Print_ button in the planner allows printing of the _Dive "
-"Plan Details_ for wet notes. Alternatively one can cut and paste the _Dive "
-"Plan Details_ for inclusion in a text file or word processing document."
+"Plan Details_ for wet notes. You can also cut and paste the _Dive Plan "
+"Details_ to include in a text file or word processing document."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3419
+#: user-manual.txt:3388
 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 "
@@ -6941,18 +6855,18 @@ msgid ""
 "it is represented in a way very similar to a dive log and the gas "
 "calculations cannot be accessed in the same way as during the planning "
 "process. The only way to print the dive plan is to use the _File -> Print_ "
-"facility on the main menu in the same way as for dive logs or by copy and "
+"function on the main menu in the same way as for dive logs or by copy and "
 "paste to a word processor."
 msgstr ""
 
 #. type: Title ==
-#: ./user-manual.txt:3420
+#: user-manual.txt:3389
 #, no-wrap
 msgid "Description of the Subsurface Main Menu items"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3425
+#: user-manual.txt:3394
 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 "
@@ -6960,302 +6874,293 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:3426
+#: user-manual.txt:3395
 #, no-wrap
 msgid "File"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3429
+#: user-manual.txt:3398
 msgid ""
 "<<S_NewLogbook,_New Logbook_>> - Close the currently open dive logbook and "
 "clear all dive information."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3431
-msgid ""
-"_Open logbook_ - This opens the file manager in order to select a dive "
-"logbook to open."
+#: user-manual.txt:3400
+msgid "_Open logbook_ - Open the file manager to select a dive logbook to open."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3432
+#: user-manual.txt:3401
 msgid ""
 "_Open cloud storage_ - Open the dive log previously saved in "
 "<<S_Cloud_storage,_Cloud storage_>>."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3433
-msgid "_Save_ - Save the dive logbook that is currently open."
+#: user-manual.txt:3402
+msgid "_Save_ - Save the dive logbook currently open."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3434
+#: user-manual.txt:3403
 msgid ""
 "_Save to cloud storage_ - Save the current dive log to "
 "<<S_Cloud_storage,_Cloud storage_>>."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3435
+#: user-manual.txt:3404
 msgid "_Save as_ - Save the current logbook under a different file name."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3436
-msgid "_Close_ - Close the dive logbook that is currently open."
+#: user-manual.txt:3405
+msgid "_Close_ - Close the dive logbook currently open."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3438
+#: user-manual.txt:3407
 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:3439
+#: user-manual.txt:3408
 msgid "<<S_PrintDivelog,_Print_>> - Print the currently open logbook."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3440
+#: user-manual.txt:3409
 msgid "<<S_Preferences,_Preferences_>> - Set the _Subsurface_ preferences."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3441
+#: user-manual.txt:3410
 msgid ""
 "<<S_FindMovedImages, _Find moved images_>> - If photos taken during dives "
 "have been moved to"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3442
+#: user-manual.txt:3411
 msgid ""
 "a different disk or directory, locate them and link them to the appropriate "
 "dives."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3443
+#: user-manual.txt:3412
 msgid ""
 "<<S_Configure,_Configure dive computer_>> - Edit the configuration of a dive "
 "computer."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3444
+#: user-manual.txt:3413
 msgid "_Quit_ - Quit _Subsurface_."
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:3445
+#: user-manual.txt:3414
 #, no-wrap
 msgid "Import"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3448
+#: user-manual.txt:3417
 msgid ""
 "<<S_ImportDiveComputer,_Import from dive computer_>> - Import dive "
 "information from a dive computer."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3450
+#: user-manual.txt:3419
 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:3452
+#: user-manual.txt:3421
 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:3454
+#: user-manual.txt:3423
 msgid ""
 "<<S_ImportingDivelogsDe,_Import from Divelogs.de_>> - Import dive "
 "information from _www.Divelogs.de_."
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:3455
+#: user-manual.txt:3424
 #, no-wrap
 msgid "Log"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3457
+#: user-manual.txt:3426
 msgid ""
 "<<S_EnterData,_Add Dive_>> - Manually add a new dive to the *Dive List* "
 "panel."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3458
+#: user-manual.txt:3427
 msgid ""
-"_Edit dive_ - Edit a dive of which the profile was entered by hande and not "
-"from a dive computer."
+"_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:3459
-msgid "<<S_DivePlanner,_Plan Dive_>> - This feature allows the planning of dives."
+#: user-manual.txt:3428
+msgid "<<S_DivePlanner,_Plan Dive_>> - Plan dives."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3460
+#: user-manual.txt:3429
 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:3462
+#: user-manual.txt:3431
 msgid ""
-"<<S_CopyComponents,_Copy dive components_>> - By selecting this option, one "
-"can copy information from several fields of a dive log onto the clipboard."
+"<<S_CopyComponents,_Copy dive components_>> - Copy information from several "
+"fields of a dive log onto the clipboard."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3464
+#: user-manual.txt:3433
 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:3466
+#: user-manual.txt:3435
 msgid ""
 "<<S_Renumber,_Renumber_>> - Renumber the dives listed in the *Dive List* "
 "panel."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3468
+#: user-manual.txt:3437
 msgid ""
 "<<S_Group,_Auto Group_>> - Group the dives in the *Dive List* panel into "
 "dive trips."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3469
+#: user-manual.txt:3438
 msgid ""
 "<<S_DeviceNames,_Edit Device Names_>> - Edit the names of dive computers to "
-"facilitate your logs."
+"coordinate your logs."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3470
+#: user-manual.txt:3439
 msgid ""
 "<<S_Filter,_Filter divelist_>> - Select only some dives, based on specific "
 "tags or dive criteria."
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:3471
+#: user-manual.txt:3440
 #, no-wrap
 msgid "View"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3474
-msgid ""
-"<<S_ViewPanels,_All_>> - View the four main _Subsurface_ panels "
-"simmultaneously."
+#: user-manual.txt:3443
+msgid "<<S_ViewPanels,_All_>> - View the four main _Subsurface_ panels all at once."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3475
+#: user-manual.txt:3444
 msgid "<<S_ViewPanels,_Dive List_>> - View only the *Dive List* panel."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3476
+#: user-manual.txt:3445
 msgid "<<S_ViewPanels,_Profile_>> - View only the *Dive Profile* panel."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3477
+#: user-manual.txt:3446
 msgid "<<S_ViewPanels,_Info_>> - View only the *Notes* panel."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3478
+#: user-manual.txt:3447
 msgid "<<S_ViewPanels,_Globe_>> - View only the *World Map* panel."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3480
+#: user-manual.txt:3449
 msgid ""
 "_Yearly Statistics_ - Display summary statistics about dives during this and "
 "past years."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3481
+#: user-manual.txt:3450
 msgid ""
-"_Prev DC_ - If a single dive was logged from more than one dive computer, "
-"switch to data from"
+"_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:3482
-msgid "previous dive computer."
-msgstr ""
-
-#. type: Plain text
-#: ./user-manual.txt:3483
+#: user-manual.txt:3451
 msgid "_Next DC_ - Switch to next dive computer."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3484
+#: user-manual.txt:3452
 msgid "_Full Screen_ - Toggles Full Screen mode."
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:3485
+#: user-manual.txt:3453
 #, no-wrap
 msgid "Share on"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3487
+#: user-manual.txt:3455
 msgid ""
 "<<S_Facebook,_Facebook_>> - Share the currently selected dive on your "
 "Facebook timeline."
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:3489
+#: user-manual.txt:3457
 #, no-wrap
 msgid "Help"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3492
+#: user-manual.txt:3460
 msgid ""
 "_About Subsurface_ - Show a panel with the version number of _Subsurface_ as "
 "well as licensing information."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3494
+#: user-manual.txt:3462
 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:3496
+#: user-manual.txt:3464
 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 "
@@ -7263,12 +7168,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3497
+#: user-manual.txt:3465
 msgid "_User manual_ - Open a window showing this user manual."
 msgstr ""
 
 #. type: Title ==
-#: ./user-manual.txt:3500
+#: user-manual.txt:3468
 #, no-wrap
 msgid ""
 "APPENDIX A: Operating system specific information for importing dive "
@@ -7276,27 +7181,27 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:3502
+#: user-manual.txt:3470
 #, 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:3503
+#: user-manual.txt:3471
 #, no-wrap
 msgid "images/icons/drivers.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3508
+#: user-manual.txt:3476
 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)."
+"in order to communicate with the dive computer, the way the dive computer "
+"prefers (e.g. Bluetooth, USB, infra-red)."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3514
+#: user-manual.txt:3482
 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 "
@@ -7305,7 +7210,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3518
+#: user-manual.txt:3486
 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 "
@@ -7313,7 +7218,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3525
+#: user-manual.txt:3493
 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 "
@@ -7324,84 +7229,83 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:3527
+#: user-manual.txt:3495
 #, 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:3528
+#: user-manual.txt:3496
 #, no-wrap
 msgid "images/icons/usb.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3536
+#: user-manual.txt:3504
 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:"
+"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:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3541
+#: user-manual.txt:3509
 msgid ""
 "Simply try COM1, COM2, etc. The drop down list should contain all connected "
 "COM devices."
 msgstr ""
 
 #. type: Title ====
-#: ./user-manual.txt:3542 ./user-manual.txt:3636
+#: user-manual.txt:3510 user-manual.txt:3608
 #, no-wrap
 msgid "On MacOS:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3545
+#: user-manual.txt:3513
 msgid "The drop down box should find all connected dive computers."
 msgstr ""
 
 #. type: Block title
-#: ./user-manual.txt:3546
+#: user-manual.txt:3514
 #, no-wrap
 msgid "On Linux:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3549
+#: user-manual.txt:3517
 msgid "There is a definitive way to find the port:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3551
+#: user-manual.txt:3519
 msgid "Disconnect the USB cable from the dive computer"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3552
+#: user-manual.txt:3520
 msgid "Open a terminal"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3553 ./user-manual.txt:3555
+#: user-manual.txt:3521 user-manual.txt:3523
 msgid "Type the command: 'dmesg' and press enter"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3554
+#: user-manual.txt:3522
 msgid "Plug in the USB cable of the dive computer"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3557
+#: user-manual.txt:3525
 msgid "A message similar to this one should appear:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3573
+#: user-manual.txt:3541
 #, no-wrap
 msgid ""
 "\tusb 2-1.1: new full speed USB device number 14 using ehci_hcd\n"
@@ -7422,7 +7326,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3578
+#: user-manual.txt:3546
 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 "
@@ -7430,28 +7334,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3580
-msgid "Ensuring that the user has write permission to the USB serial port:"
+#: user-manual.txt:3548
+msgid "Ensuring the user has write permission to the USB serial port:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3586
+#: user-manual.txt:3558
 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'."
+"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'."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3590
+#: user-manual.txt:3562
 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:3595
+#: user-manual.txt:3567
 #, no-wrap
 msgid ""
 "Type: +id johnB+     This lists all the groups that johnB belongs to and\n"
@@ -7463,7 +7370,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3597
+#: user-manual.txt:3569
 #, no-wrap
 msgid ""
 "Under some circumstances this change takes only effect (eg. on Ubuntu) "
@@ -7472,7 +7379,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3602
+#: user-manual.txt:3574
 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 "
@@ -7480,30 +7387,30 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:3605
+#: user-manual.txt:3577
 #, no-wrap
 msgid "Manually setting up Bluetooth enabled devices"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3612
+#: user-manual.txt:3584
 msgid ""
 "For dive computers communicating through Bluetooth like the Heinrichs "
 "Weikamp Frog or the Shearwater Predator, Petrel and Nerd there is a "
-"different procedure to get the devices name to communicate with "
+"different procedure to get the device’s name to communicate with "
 "_Subsurface_. Follow these steps:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3614
+#: user-manual.txt:3586
 #, no-wrap
 msgid ""
-"*For the dive computer, after enabling Bluetooth, ensure it is in Upload "
+"*For the dive computer, after enabling Bluetooth, be sure it is in Upload "
 "mode.*\n"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3618
+#: user-manual.txt:3590
 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 -> "
@@ -7511,13 +7418,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3620
+#: user-manual.txt:3592
 #, no-wrap
 msgid "*Pair the _Subsurface_ computer with the dive computer.*\n"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3629
+#: user-manual.txt:3601
 msgid ""
 "Bluetooth is most likely already enabled. For pairing with the dive computer "
 "choose _Control Panel -> Bluetooth Devices -> Add Wireless Device_.  This "
@@ -7529,21 +7436,21 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3632
+#: user-manual.txt:3604
 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:3635
+#: user-manual.txt:3607
 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:3642
+#: user-manual.txt:3614
 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 "
@@ -7552,33 +7459,32 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3645
+#: user-manual.txt:3617
 msgid ""
-"Once the pairing is completed the correct device is shown in the 'Device or "
+"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:3646
+#: user-manual.txt:3618
 #, no-wrap
 msgid "On Linux"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3654
+#: user-manual.txt:3626
 msgid ""
-"Ensure Bluetooth is enabled on the _Subsurface_ computer.  On most common "
+"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 "
-"straight forward. For instance, Gnome3 shows a Bluetooth icon on the right "
-"of the toolbar at the top of the screen.  Users have reported difficulties "
-"with some Bluetooth controllers.  If you have an onboard controller, try "
-"that first.  It is simplest if you remove any USB Bluetooth dongles.  If you "
-"have a USB dongle that came with your dive computer, try that before any "
-"others."
+"straightforward. For instance, Gnome3 shows a Bluetooth icon on the right of "
+"the toolbar at the top of the screen.  Users have reported difficulties with "
+"some Bluetooth controllers.  If you have an onboard controller, try that "
+"first.  It is simplest if you remove any USB Bluetooth dongles.  If you have "
+"a USB dongle that came with your dive computer, try that before any others."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3658
+#: user-manual.txt:3630
 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 "
@@ -7587,23 +7493,23 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3660
+#: user-manual.txt:3632
 msgid "Enable the Bluetooth controller and pair your dive computer"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3661
+#: user-manual.txt:3633
 msgid "Establish an RFCOMM connection"
 msgstr ""
 
 #. type: Title =====
-#: ./user-manual.txt:3662 ./user-manual.txt:3802
+#: user-manual.txt:3634 user-manual.txt:3774
 #, no-wrap
 msgid "Download the dives with Subsurface"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3668
+#: user-manual.txt:3640
 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 "
@@ -7614,7 +7520,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3673
+#: user-manual.txt:3645
 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 "
@@ -7624,23 +7530,23 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3675
+#: user-manual.txt:3647
 msgid "+sudo usermod -a -G dialout username+"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3677
+#: user-manual.txt:3649
 msgid "Then log out and log in for the change to take effect."
 msgstr ""
 
 #. type: Title =====
-#: ./user-manual.txt:3678
+#: user-manual.txt:3650
 #, no-wrap
 msgid "Enabling the Bluetooth controller and pairing your dive computer"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3684
+#: user-manual.txt:3656
 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 "
@@ -7651,15 +7557,15 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3687
+#: user-manual.txt:3659
 msgid ""
-"If the graphical method didn't work, pair the device from the command "
+"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:3694
+#: user-manual.txt:3666
 #, no-wrap
 msgid ""
 "\t$ hciconfig\n"
@@ -7671,7 +7577,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3699
+#: user-manual.txt:3671
 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 "
@@ -7681,7 +7587,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3707
+#: user-manual.txt:3679
 #, no-wrap
 msgid ""
 "\tsudo hciconfig hci0 up auth+  (enter password when prompted)\n"
@@ -7694,25 +7600,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3709
+#: user-manual.txt:3681
 msgid "Check that the status now includes +'UP', 'RUNNING' AND 'AUTH'+."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3711
+#: user-manual.txt:3683
 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:3713
+#: user-manual.txt:3685
 #, no-wrap
 msgid "\tsudo hciconfig hci1 down\n"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3716
+#: user-manual.txt:3688
 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 "
@@ -7720,7 +7626,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3737
+#: user-manual.txt:3709
 #, no-wrap
 msgid ""
 "\tbluetoothctl\n"
@@ -7749,14 +7655,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3740
+#: user-manual.txt:3712
 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:3743
+#: user-manual.txt:3715
 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 "
@@ -7764,7 +7670,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3748
+#: user-manual.txt:3720
 #, no-wrap
 msgid ""
 "\thcitool -i hci0 scanning\n"
@@ -7774,82 +7680,82 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3750
+#: user-manual.txt:3722
 msgid "Once ther dive computer is pired, set up the RFCOMM connection"
 msgstr ""
 
 #. type: Title =====
-#: ./user-manual.txt:3751
+#: user-manual.txt:3723
 #, no-wrap
 msgid "Establishing the RFCOMM connection"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3754
+#: user-manual.txt:3726
 msgid "The command to establish an RFCOMM connection is:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3756
+#: user-manual.txt:3728
 msgid "+sudo rfcomm -i <controller> connect <dev> <bdaddr> [channel]+"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3758
+#: user-manual.txt:3730
 msgid "+<controller>+ is the Bluetooth controller, +hci0+."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3759
+#: user-manual.txt:3731
 msgid "+<dev>+ is the RFCOMM device file, +rfcomm0+"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3760
+#: user-manual.txt:3732
 msgid "+<bdaddr>+ is the dive computer's MAC address, +00:11:22:33:44:55+"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3761
+#: user-manual.txt:3733
 msgid "+[channel]+ is the dive computer's Bluetooth channel we need to connect to."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3764
+#: user-manual.txt:3736
 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:3766
+#: user-manual.txt:3738
 msgid "_Shearwater Petrel 1_: channel 1"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3767
+#: user-manual.txt:3739
 msgid "_Shearwater Petrel 2_: channel 5"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3768
+#: user-manual.txt:3740
 msgid "_Shearwater Nerd_: channel 5"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3769
+#: user-manual.txt:3741
 msgid "_Heinrichs-Weikamp OSTC Sport_: channel 1"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3771
+#: user-manual.txt:3743
 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:3773
+#: user-manual.txt:3745
 #, no-wrap
 msgid ""
 "\tsudo rfcomm -i hci0 connect rfcomm0 00:11:22:33:44:55 5 (enter a password, "
@@ -7857,12 +7763,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3775
+#: user-manual.txt:3747
 msgid "This gives the response:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3778
+#: user-manual.txt:3750
 #, no-wrap
 msgid ""
 "\tConnected /dev/rfcomm0 to 00:11:22:33:44:55 on channel 5\n"
@@ -7870,14 +7776,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3780
+#: user-manual.txt:3752
 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:3784
+#: user-manual.txt:3756
 #, no-wrap
 msgid ""
 "\tsudo rfcomm -i hci0 connect rfcomm0 00:11:22:33:44:55   (enter a password, "
@@ -7887,7 +7793,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3788
+#: user-manual.txt:3760
 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 "
@@ -7896,7 +7802,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3798
+#: user-manual.txt:3770
 #, no-wrap
 msgid ""
 "\tsdptool -i hci0 records 00:11:22:33:44:55\n"
@@ -7911,7 +7817,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3801
+#: user-manual.txt:3773
 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 "
@@ -7919,7 +7825,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3804
+#: user-manual.txt:3776
 msgid ""
 "After establishing the RFCOMM connection and while the dive computer's "
 "upload mode countdown is still running, go to_Subsurface_, select "
@@ -7929,34 +7835,34 @@ msgid ""
 msgstr ""
 
 #. type: Title ==
-#: ./user-manual.txt:3810
+#: user-manual.txt:3782
 #, no-wrap
 msgid "APPENDIX B: Dive Computer specific information for importing dive data."
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:3813
+#: user-manual.txt:3785
 #, no-wrap
 msgid "Importing from Uemis Zurich"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: ./user-manual.txt:3815
+#: user-manual.txt:3787
 #, no-wrap
 msgid "images/icons/iumis.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3831
+#: user-manual.txt:3803
 msgid ""
 "_Subsurface_ downloads the information stored on the SDA (the built-in file "
 "system of the Uemis) including information about dive spots and "
 "equipment. Buddy information is not yet downloadable.  Things are very "
 "similar to a normal USB-connected dive computer (the Uemis is one of those "
 "that recharge when connected to the USB port).  The main difference is that "
-"one does not enter a device name, but instead the location where the "
-"UEMISSDA file system is mounted once connected to the dive computer. On "
-"Windows this is a drive letter ( often 'E:' or 'F:'), on a Mac this is "
+"you don’t enter a device name, but instead the location where the UEMISSDA "
+"file system is mounted once connected to the dive computer. On Windows this "
+"is a drive letter ( often 'E:' or 'F:'), on a Mac this is "
 "'/Volumes/UEMISSDA' and on Linux systems this differs depending on the "
 "distribution. On Fedora it usually is "
 "'/var/run/media/<your_username>/UEMISSDA'. In all cases _Subsurface_ should "
@@ -7964,36 +7870,36 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3846
+#: user-manual.txt:3818
 msgid ""
 "After selecting the above device name, download the dives from the Uemis "
 "Zurich. One technical issue with the Uemis Zurich download implementation "
-"(this is a Uemis firmware limitation, not a _Subsurface_ issue) is that one "
+"(this is a Uemis firmware limitation, not a _Subsurface_ issue) is that you "
 "cannot download more than about 40-50 dives without running out of memory on "
-"the SDA. This will usually only happen the very first time one downloads "
+"the SDA. This will usually only happen the very first time you download "
 "dives from the Uemis Zurich.  Normally when downloading at the end of a day "
 "or even after a dive trip, the capacity is sufficient. If _Subsurface_ "
-"displays an error that the dive computer ran out of space the solution is "
-"straight forward.  Disconnect the SDA, turn it off and on again, and "
+"displays an error that the dive computer ran out of space, the solution is "
+"straightforward.  Disconnect the SDA, turn it off and on again, and "
 "reconnect it. You can now retry (or start a new download session) and the "
-"download will continue where it stopped previously. One may have to do this "
+"download will continue where it stopped previously. You may have to do this "
 "more than once, depending on how many dives are stored on the dive computer."
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:3848
+#: user-manual.txt:3820
 #, no-wrap
 msgid "Importing from Uwatec Galileo"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: ./user-manual.txt:3850
+#: user-manual.txt:3822
 #, no-wrap
 msgid "images/icons/Galileo.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3865
+#: user-manual.txt:3837
 msgid ""
 "The Uwatec Galileo dive computers use infra red (IrDA) communication between "
 "the dive computer and Subsurface. The Uwatec hardware uses a USB dongle "
@@ -8009,44 +7915,44 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3868
+#: user-manual.txt:3840
 msgid ""
-"After executing this command, Subsurface will recognise the Galileo dive "
+"After executing this command, Subsurface will recognize the Galileo dive "
 "computer and download dive information."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3874
+#: user-manual.txt:3846
 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/Drv/MosChip/MCS7780/[www.drivers-download.com]. "
 "Windows-based IrDA drivers for the Uwatec can also be downloaded from the "
-"ScubaPro web site, drivers being located on the download page for the "
+"ScubaPro web site, with drivers located on the download page for the "
 "ScubaPro SmartTrak software."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3877
+#: user-manual.txt:3849
 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:3879
+#: user-manual.txt:3851
 #, no-wrap
 msgid "Importing from Heinrichs Weikamp DR5"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: ./user-manual.txt:3881
+#: user-manual.txt:3853
 #, no-wrap
 msgid "images/icons/HW_DR5.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3891
+#: user-manual.txt:3863
 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.  "
@@ -8059,19 +7965,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:3894
+#: user-manual.txt:3866
 #, no-wrap
 msgid "Importing from xDEEP BLACK"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: ./user-manual.txt:3896
+#: user-manual.txt:3868
 #, no-wrap
 msgid "images/icons/HW_xdeepblack.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3905
+#: user-manual.txt:3877
 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 "
@@ -8085,19 +7991,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:3907
+#: user-manual.txt:3879
 #, no-wrap
 msgid "Importing from Shearwater Predator/Petrel/Nerd using Bluetooth"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: ./user-manual.txt:3909
+#: user-manual.txt:3881
 #, no-wrap
 msgid "images/icons/predator.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3912
+#: user-manual.txt:3884
 msgid ""
 "Specific instructions for downloading dives using Bluetooth are given in the "
 "section above, <<S_Bluetooth,_Connecting Subsurface to a Bluetooth-enabled "
@@ -8105,69 +8011,69 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:3914
+#: user-manual.txt:3886
 #, no-wrap
 msgid "Importing from Poseidon MkVI Discovery"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: ./user-manual.txt:3916
+#: user-manual.txt:3888
 #, no-wrap
 msgid "images/MkVI.jpeg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3924
+#: user-manual.txt:3896
 msgid ""
 "Download of dive logs from the MkVI is performed using a custom "
 "communications adapter and the _Poseidon PC Configuration Software_, "
 "obtained when purchasing the MKVI equipment. The latter is a Windows "
 "application allowing configuration of equipment and storage of dive "
-"logs. Communication between dive computer and desktop computer utilises the "
+"logs. Communication between dive computer and desktop computer utilizes the "
 "IrDA infra-red protocol. Only data for one dive can be downloaded at a time, "
-"comprising three files:"
+"in three files:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3927
+#: user-manual.txt:3899
 msgid ""
 "Setup configuration for the dive and key dive parameters (file with a .txt "
 "extension)"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3928
+#: user-manual.txt:3900
 msgid "Dive log details (file with a .csv extension)"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3930
+#: user-manual.txt:3902
 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:3932
+#: user-manual.txt:3904
 msgid ""
-"_Subsurface_ accesses the .txt and the .csv files to obtain dive log "
+"_Subsurface_ accesses the .txt and the .csv files to get dive log "
 "information."
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:3934
+#: user-manual.txt:3906
 #, no-wrap
 msgid "Importing from APD Inspiration/Evolution CCR"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: ./user-manual.txt:3936
+#: user-manual.txt:3908
 #, no-wrap
 msgid "images/APDComputer.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3944
+#: user-manual.txt:3916
 msgid ""
 "The dive logs of an APD Inspiration or similar CCR dive computer are "
 "downloaded using a communications adapter and _AP Communicator_, obtained "
@@ -8179,103 +8085,104 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3946
+#: user-manual.txt:3918
 msgid "Download the dive using _AP Communicator_."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3947
+#: user-manual.txt:3919
 msgid "Open a dive within the _AP Log Viewer_."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3948
+#: user-manual.txt:3920
 msgid "Select the tab at the top of the screen, entitled \"_Data_\"."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3949
+#: user-manual.txt:3921
 msgid ""
 "With the raw dive log data show on the screen, click on \"_Copy to "
 "Clipboard_\"."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3950
+#: user-manual.txt:3922
 msgid "Open a text editor, e.g. Notepad (Windows) or TextWrangler (Mac)."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3952
+#: user-manual.txt:3924
 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:3953
+#: user-manual.txt:3925
 msgid ""
 "Within _Subsurface_, select _Import -> Import log files_ to open the "
 "xref:Unified_import[universal import dialogue]."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3954
+#: user-manual.txt:3926
 msgid ""
-"In the dropdown list towards the bottom right of the dialogue (labled "
+"In the dropdown list towards the bottom right of the dialogue (labeled "
 "'Filter:'), select \"APD log viewer\"."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3957
+#: user-manual.txt:3930
+#, no-wrap
 msgid ""
-"On the list of file names select the _.apd_ file that has been created "
-"above. An import dialogue opens indicating the default settings for the data "
-"in the _.apd_ file. If any changes are required, do this as for "
-"xref:S_ImportingCSVDives[CSV imports]."
+"On the list of file names select the _.apd_ file  created. An import\n"
+"dialogue opens showing the default settings for the data in the\n"
+"_.apd_ file. If changes are required,\n"
+"  do this as for xref:S_ImportingCSVDives[CSV imports].\n"
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:3958
+#: user-manual.txt:3931
 #, no-wrap
 msgid "images/APD_CSVimportF22.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3966
+#: user-manual.txt:3939
 msgid ""
-"The top left hand dropdown box in the import panel allows one to select the "
-"APD dive computer for which the dive log needs to be imported. The default "
-"it is DC1, _i.e._ the first of the two dive computers the APD uses. It is "
-"possible to sequentially import the data for both dive computers by first "
-"importing CD1 and then DC2.(*Hint*: The logs for the two dive computers are "
-"viewed by selecting _View -> Next DC_ from the Main Menu after the uploading "
-"has been completed)"
+"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 "
+"DC1, _i.e._ the first of the two dive computers the APD uses. It is possible "
+"to sequentially import the data for both dive computers by first importing "
+"CD1 and then DC2.(*Hint*: The logs for the two dive computers are viewed by "
+"selecting _View -> Next DC_ from the Main Menu after the uploading has been "
+"completed)"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3967
+#: user-manual.txt:3940
 msgid "Click the _Ok_ button at the bottom of the import panel."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3972
+#: user-manual.txt:3945
 msgid ""
-"The APD dive log will appear within _Subsurface_. The dive "
-"computer-generated ceiling generated by the Inspiration can be viewed by "
-"selecting the appropriate button on the left of the *Dive Profile*. Cylinder "
-"pressure data are not logged by the APD equipment but can be manually "
-"entered in the _Equipment_ Tab."
+"The APD dive log will appear within _Subsurface_. The dive computer- "
+"generated ceiling provided by the Inspiration can be viewed by selecting the "
+"appropriate button on the left of the *Dive Profile*. Cylinder pressure data "
+"are not logged by the APD equipment but can be manually entered in the "
+"_Equipment_ Tab."
 msgstr ""
 
 #. type: Title ==
-#: ./user-manual.txt:3973
+#: user-manual.txt:3946
 #, no-wrap
 msgid "APPENDIX C: Exporting Dive log information from external dive log software."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3982
+#: user-manual.txt:3955
 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, "
@@ -8285,22 +8192,22 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3984
+#: user-manual.txt:3957
 msgid "Export the foreign dive log data to format that is accessible from"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3985
+#: user-manual.txt:3958
 msgid "_Subsurface_."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3986
+#: user-manual.txt:3959
 msgid "Import the accessible dive log data into _Subsurface_."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:3990
+#: user-manual.txt:3963
 msgid ""
 "This appendix provides some information about approaches to export dive log "
 "data from foreign dive log software. The procedures below mostly apply to "
@@ -8308,19 +8215,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:3992
+#: user-manual.txt:3965
 #, no-wrap
 msgid "Exporting from *Suunto Divemanager (DM3, DM4 or DM5)*"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: ./user-manual.txt:3993
+#: user-manual.txt:3966
 #, no-wrap
 msgid "images/icons/suuntologo.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4000
+#: user-manual.txt:3973
 msgid ""
 "DiveManager is a MS Windows application for Suunto dive computers.  "
 "Divemanager 3 (DM3) is an older version of the Suunto software. More recent "
@@ -8330,64 +8237,64 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4002
+#: user-manual.txt:3975
 #, no-wrap
 msgid "*Divemanager 3 (DM3):*\n"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4004
+#: user-manual.txt:3977
 msgid "Start 'Suunto Divemanager 3' and log in with the name containing the logs"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4005
+#: user-manual.txt:3978
 msgid "Do not start the import wizard to import dives from the dive computer."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4007
+#: user-manual.txt:3980
 msgid ""
 "In the navigation tree on the left side of the program-window, select the "
 "appropriate dives."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4008
+#: user-manual.txt:3981
 msgid "Within the list of dives, select the dives you would like to import later:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4009
+#: user-manual.txt:3982
 msgid "To select certain dives: hold 'ctrl' and click the dive"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4011
+#: user-manual.txt:3984
 msgid ""
 "To select all dives: Select the first dive, hold down shift and select the "
 "last dive"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4012
+#: user-manual.txt:3985
 msgid "With the dives marked, use the program menu _File -> Export_"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4013
+#: user-manual.txt:3986
 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:4014
+#: user-manual.txt:3987
 msgid "Click the browse button next to the field Export Path"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4016
+#: user-manual.txt:3989
 #, no-wrap
 msgid ""
 "** A file-manager like window pops up\n"
@@ -8395,13 +8302,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4017
+#: user-manual.txt:3990
 #, no-wrap
 msgid "Divelog.SDE file\n"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4019
+#: user-manual.txt:3992
 #, no-wrap
 msgid ""
 "** Optionally change the name of the file for saving\n"
@@ -8409,108 +8316,108 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4020
+#: user-manual.txt:3993
 #, no-wrap
 msgid "Back in the Export pop-up, press the button 'Export'\n"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4021
+#: user-manual.txt:3994
 #, no-wrap
 msgid "The dives are now exported to the file Divelog.SDE.\n"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4023
+#: user-manual.txt:3996
 #, no-wrap
 msgid "*Divemanager 4 (DM4) and Divemanager 5 (DM5):*\n"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4028
+#: user-manual.txt:4001
 msgid ""
 "DM4 and DM5 use identical mechanisms for exporting dive logs.  To export a "
-"divelog from Divemanager one needs to locate the DM4/DM5 database where the "
-"dives are stored. the user can either look for the original database or make "
-"a backup of the dives. Both methods are described here."
+"divelog from Divemanager you need to locate the DM4/DM5 database where the "
+"dives are stored. You can either look for the original database or make a "
+"backup of the dives. Both methods are described here."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4030
+#: user-manual.txt:4003
 msgid "Locating the Suunto DM4 (or DM5) database:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4032 ./user-manual.txt:4041
+#: user-manual.txt:4005 user-manual.txt:4014
 msgid "Start Suunto DM4/DM5"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4033
+#: user-manual.txt:4006
 msgid "Select 'Help -> About'"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4034
+#: user-manual.txt:4007
 msgid "Click 'Copy' after text 'Copy log folder path to clipboard'"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4035
-msgid "Now open Windows Explorer"
+#: user-manual.txt:4008
+msgid "Open Windows Explorer"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4036
+#: user-manual.txt:4009
 msgid "Paste the address to the path box at the top of the File Explorer"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4037
+#: user-manual.txt:4010
 msgid "The database is called DM4.db or DM5.db"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4039
+#: user-manual.txt:4012
 msgid "Making a backup copy of the Suunto DM4/DM5 database:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4042
+#: user-manual.txt:4015
 msgid "Select 'File - Create backup'"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4044
+#: user-manual.txt:4017
 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:4045
+#: user-manual.txt:4018
 msgid "Click 'Save'"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4046
+#: user-manual.txt:4019
 msgid "The dives are now exported to the file DM4.bak (or DM5.bak)"
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:4048
+#: user-manual.txt:4021
 #, no-wrap
 msgid "Exporting from Atomic Logbook"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: ./user-manual.txt:4051
+#: user-manual.txt:4024
 #, no-wrap
 msgid "images/icons/atomiclogo.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4058
+#: user-manual.txt:4031
 msgid ""
 "Atomic Logbook is a Windows software by Atomic Aquatics. It allows "
 "downloading of dive information from Cobalt and Cobalt 2 dive computers.  "
@@ -8520,178 +8427,176 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:4060
+#: user-manual.txt:4033
 #, no-wrap
 msgid "Exporting from Mares Dive Organiser V2.1"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: ./user-manual.txt:4063
+#: user-manual.txt:4036
 #, no-wrap
 msgid "images/icons/mareslogo.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4071
+#: user-manual.txt:4044
 msgid ""
-"Mares Dive Organiser is a Windows application. The dive log is kept as a "
+"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 "
-"database includes all Dive Organiser-registered divers on the particular "
-"computer and all Mares dive computers used. The safest way to obtain a copy "
-"of the dive database is to export the information to another compatible "
-"format which can be imported into _Subsurface_."
+"database includes all Dive Organizer-registered divers on the particular "
+"computer and all Mares dive computers used. The safest way to get a copy of "
+"the dive database is to export the information to another compatible format "
+"which can then be imported into _Subsurface_."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4076
+#: user-manual.txt:4049
 msgid ""
-"Within Dive Organiser, select _Database -> Backup_ from the main menu and "
+"Within Dive Organizer, select _Database -> Backup_ from the main menu and "
 "back up the database to the desk top.  This creates a zipped file "
-"DiveOrganiserxxxxx.dbf."
+"DiveOrganizerxxxxx.dbf."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4079
+#: user-manual.txt:4052
 msgid ""
-"Rename the file to DiveOrganiserxxxxx.zip. Inside the zipped directory is a "
-"file _DiveOrganiser.sdf_."
+"Rename the file to DiveOrganizerxxxxx.zip. Inside the zipped directory is a "
+"file _DiveOrganizer.sdf_."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4080
+#: user-manual.txt:4053
 msgid "Extract the _.sdf_ file from the zipped folder to your Desktop."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4081
+#: user-manual.txt:4054
 msgid "The password for accessing the .zip file is _mares_."
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:4083
+#: user-manual.txt:4056
 #, no-wrap
 msgid "Exporting from *DivingLog 5.0 and 6.0*"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: ./user-manual.txt:4085
+#: user-manual.txt:4058
 #, no-wrap
 msgid "images/icons/divingloglogo.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4092
+#: user-manual.txt:4065
 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 "
-"the details, and we would lack e.g. gas switches and information of what "
-"units are used. With database import, all this information is included and "
-"readily available for us."
+"the details, and would lack, for example, gas switches and information of "
+"what units are used. With database import, all this information is included "
+"and readily available."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4094
-msgid "To transfer all files from DivingLog to Subsurface, do the following:"
+#: user-manual.txt:4067
+msgid "To transfer all files from DivingLog to Subsurface:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4096
+#: user-manual.txt:4069
 msgid "In DivingLog open the 'File -> Export -> SQLite' menu"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4097
+#: user-manual.txt:4070
 msgid "Select 'Settings' button"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4098
+#: user-manual.txt:4071
 msgid "Set the 'RTF2Plaintext' to 'true'"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4099
+#: user-manual.txt:4072
 msgid "Close the Settings dialog"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4100
+#: user-manual.txt:4073
 msgid "Click 'Export' button and select the filename"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4104
+#: user-manual.txt:4077
 msgid ""
 "Once this is done, open the saved database file with Subsurface and the "
-"dives are automatically converted to our own format. Last step to do is save "
-"the log file in Subsurface."
+"dives are automatically converted to Subsurface’s own format. Last step to "
+"do is save the log file in Subsurface."
 msgstr ""
 
 #. type: Title ==
-#: ./user-manual.txt:4105
+#: user-manual.txt:4078
 #, no-wrap
 msgid "APPENDIX D: Exporting a spreadsheet to CSV format"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4115
+#: user-manual.txt:4088
 msgid ""
-"Many divers keep a diving log in some form of a digital file, commonly a "
+"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 from "
-"_Subsurface_.  Creating a .CSV is a straightforward task, although the "
-"procedure is somewhat different according to which spreadsheet program is "
-"used."
+"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."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4121
+#: user-manual.txt:4094
 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:"
+"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:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4123
+#: user-manual.txt:4096
 msgid "Date: use one of the following formats: yyyy-mm-dd, dd.mm.yyyy, mm/dd/yyyy"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4124
+#: user-manual.txt:4097
 msgid "Duration: the format should be minutes:seconds."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4125
+#: user-manual.txt:4098
 msgid ""
-"Unit system: only one unit system should be used (i.e., no mixture between "
-"imperial and metric units)"
+"Unit system: only one unit system should be used (no mix of imperial and "
+"metric units)"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4126
+#: user-manual.txt:4099
 msgid "Tags and buddies: values should be separated using a comma."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4127
-msgid "GPS position: users must use decimal degrees, e.g. 30.22496 30.821798"
+#: user-manual.txt:4100
+msgid "GPS position: use decimal degrees, e.g. 30.22496 30.821798"
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:4128
+#: user-manual.txt:4100
 #, no-wrap
 msgid "_LibreOffice Calc_ and _OpenOffice Calc_"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4132
+#: user-manual.txt:4104
 msgid ""
 "These are open source spreadsheet applications forming parts of larger open "
 "source office suite applications. The user interaction with _LibreOffice_ "
@@ -8702,13 +8607,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:4133
+#: user-manual.txt:4105
 #, no-wrap
 msgid "images/LOffice_spreadsheetdata.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4136
+#: user-manual.txt:4108
 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 "
@@ -8716,13 +8621,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:4137
+#: user-manual.txt:4109
 #, no-wrap
 msgid "images/LOffice_save_as_options.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4140
+#: user-manual.txt:4112
 msgid ""
 "After selecting _Save_, select the appropriate field delimiter (choose _Tab_ "
 "to prevent conflicts with the comma when using this as a decimal point), "
@@ -8730,50 +8635,50 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:4141
+#: user-manual.txt:4113
 #, no-wrap
 msgid "images/LOffice_field_options.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4144
+#: user-manual.txt:4116
 msgid ""
-"One can double check the .CSV file by opening it with a text editor, and "
-"then import the dive data as explained on the section "
-"xref:S_ImportingCSVDives[Importing CSV dives]."
+"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 "
+"CSV dives]."
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:4145
+#: user-manual.txt:4117
 #, no-wrap
 msgid "Microsoft _Excel_"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4151
+#: user-manual.txt:4123
 msgid ""
 "The field delimiter (called \"_list separator_\" in Microsoft manuals) is "
 "not accessible from within _Excel_ and needs to be set through the "
 "_Microsoft Control Panel_. After changing the separator character, all "
-"software on the Windows machine use the new character as a separator.  One "
+"software on the Windows machine uses the new character as a separator.  You "
 "can change the character back to the default character by following the same "
 "procedure, outlined below."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4153
+#: user-manual.txt:4125
 msgid ""
-"In Microsoft Windows, click the *Start* button, and then select _Control "
-"Panel_ from the list on the right-hand side."
+"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:4154
+#: user-manual.txt:4126
 msgid "Open the _Regional and Language Options_ dialog box."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4157
+#: user-manual.txt:4129
 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 "
@@ -8781,190 +8686,190 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4158
+#: user-manual.txt:4130
 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:4159
+#: user-manual.txt:4131
 msgid "Click _OK_ twice."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4161
+#: user-manual.txt:4133
 msgid "Below is an image of the _Control Panel_:"
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:4162
+#: user-manual.txt:4134
 #, no-wrap
 msgid "images/Win_SaveCSV2.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4165
+#: user-manual.txt:4137
 msgid "To export the dive log in CSV format:"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4167
+#: user-manual.txt:4139
 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:4168
+#: user-manual.txt:4140
 #, no-wrap
 msgid "images/Win_SaveCSV1.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4171
+#: user-manual.txt:4146
 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 "
 "alternative format. From the dropdown list at the bottom of the dialogue, "
-"marked _Save as Type:_, select _CSV(Comma delimited) (*.CSV)_. Ensure that "
-"the appropriate folder has been selected to save the CSV file into."
+"marked _Save as Type:_, select _CSV(Comma delimited) (*.CSV)_. Be sure the "
+"appropriate folder has been selected to save the CSV file into."
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:4172
+#: user-manual.txt:4147
 #, no-wrap
 msgid "images/Win_SaveCSV3.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4175
+#: user-manual.txt:4153
 msgid ""
 "Select the _Save_ button. The CSV-formatted file is saved into the folder "
-"that was selected. One can double check the .CSV file by opening it with a "
-"text editor, and then import the dive data as explained on the section "
+"that was selected. You can double check the .CSV file by opening it with a "
+"text editor, then import the dive data as explained on the section "
 "xref:S_ImportingCSVDives[Importing CSV dives]."
 msgstr ""
 
 #. type: Title ==
-#: ./user-manual.txt:4177
+#: user-manual.txt:4154
 #, no-wrap
 msgid "APPENDIX E: Writing a custom print template"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4182
+#: user-manual.txt:4159
 msgid ""
-"_Subsurface_ provides a mechanism to create or modify templates for printing "
-"dive logs in order to produce customised printouts of dive logs. Templates, "
-"written in HTML as well as a simple Grantlee instruction set, are rendered "
-"to the print device by _Subsurface_."
+"_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 "
+"as a simple Grantlee instruction set, are rendered to the print device by "
+"_Subsurface_."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4184
+#: user-manual.txt:4161
 msgid "Templates are accessed using the print dialogue (see image *B* below)."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4192
+#: user-manual.txt:4169
 msgid ""
-"The buttons under the _Template_ dropdown box allows one to _Edit_, "
-"_Delete_, _Import_ and to _Export_ templates (see image *A* above). New or "
-"modified templates are stored as HTML files in the same directory as the "
-"dive log being processed. In order to create or modify a template, select "
-"one of the templates from the template dropdown list in the print dialogue "
-"(see image *B* above). Choose an existing template that resembles the final "
-"desired printout. Then select _Edit_."
+"The buttons under the _Template_ dropdown box lets you _Edit_, _Delete_, "
+"_Import_ and _Export_ templates (see image *A* above). New or modified "
+"templates are stored as HTML files in the same directory as the dive log "
+"being processed. In order to create or modify a template, select one of the "
+"templates from the template dropdown list in the print dialogue (see image "
+"*B* above). Choose an existing template that resembles the final desired "
+"printout. Then select _Edit_."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4194
-msgid "The Edit Panel comprises three tabs:"
+#: user-manual.txt:4171
+msgid "The Edit Panel has three tabs:"
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:4195
+#: user-manual.txt:4172
 #, no-wrap
 msgid "images/Template1_f22.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4199
+#: user-manual.txt:4176
 msgid ""
-"The _Style_ tab (image *A* above) controls the font, line spacing and colour "
+"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. Choose one of the four colour palets used for colour printing."
+"editable. Choose one of the four color palettes used for color printing."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4203
+#: user-manual.txt:4180
 msgid ""
-"The _Colors_ tab (image *B* above) allows editing the colours used for "
-"printing the dive log. The colours are highly customisable: the _Edit_ "
-"buttons in the _Colors_ tab allows choosing abritrary colours for different "
+"The _Colors_ tab (image *B* above) allows editing the colors used for "
+"printing the dive log. The colors are highly customizable: the _Edit_ "
+"buttons in the _Colors_ tab allows choosing arbitrary colors for different "
 "components of the dive log printout."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4212
+#: user-manual.txt:4189
 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. Grantlee provides the ability to create and format HTML code in "
-"a highly simple but efficient way (see below). The HTML of the template can "
-"be edited and saved. The saved template is stored in the same directory as "
-"the dive being processed. By default, a _Custom_ template is a skeleton with "
-"no specific print instructions. The informastion being printed needs to be "
-"specified and formatted in the by replacing the section marked with: \"<!-- "
+"primitives. Grantlee can create and format HTML code in a highly simple but "
+"efficient way (see below). The HTML of the template can be edited and "
+"saved. The saved template is stored in the same directory as the dive being "
+"processed. By default, a _Custom_ template is a skeleton with no specific "
+"print instructions. The information printed needs to be specified and "
+"formatted in the template by replacing the section marked with: \"<!-- "
 "Template must be filled -->\". Writing HTML code with Grantlee instructions "
-"allows unlimited freedom in determining what is printed an in which way it "
+"allows unlimited freedom in determining what is printed and in which way it "
 "should be rendered."
 msgstr ""
 
 #. type: Target for macro image
-#: ./user-manual.txt:4213
+#: user-manual.txt:4190
 #, no-wrap
 msgid "images/Template2_f22.jpg"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4217
+#: user-manual.txt:4195
 msgid ""
-"One can adapt any of the existing templates and save it to the dive log "
+"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 "
 "modified in this way. After completing the edits, use the _Export_ button in "
 "the print dialogue to save the new template using a new template name."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4219
+#: user-manual.txt:4197
 msgid ""
-"To write a custom template the following elements must exist so that the "
+"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:4220
+#: user-manual.txt:4198
 #, no-wrap
 msgid "Main dive loop"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4222
+#: user-manual.txt:4200
 msgid ""
-"_Subsurface_ exports a dive list called (*dives*) to the _Grantlee_ "
-"backend. It is possible to iterate over the list as follows:"
+"_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:4223 ./user-manual.txt:4277 ./user-manual.txt:4294
+#: user-manual.txt:4200 user-manual.txt:4265 user-manual.txt:4282
 #, no-wrap
 msgid "template.html"
 msgstr ""
 
 #. type: delimited block .
-#: ./user-manual.txt:4228
+#: user-manual.txt:4205
 #, no-wrap
 msgid ""
 "\t{% for dive in dives %}\n"
@@ -8973,13 +8878,13 @@ msgid ""
 msgstr ""
 
 #. type: Block title
-#: ./user-manual.txt:4230 ./user-manual.txt:4282 ./user-manual.txt:4301
+#: user-manual.txt:4207 user-manual.txt:4270 user-manual.txt:4289
 #, no-wrap
 msgid "output.html"
 msgstr ""
 
 #. type: delimited block .
-#: ./user-manual.txt:4235
+#: user-manual.txt:4212
 #, no-wrap
 msgid ""
 "\t<h1> 1 </h1>\n"
@@ -8988,48 +8893,59 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4238
+#: user-manual.txt:4215
 msgid ""
-"Additional information about _Grantlee_ can be found "
+"Additional information about _Grantlee_ can be found at "
 "http://www.grantlee.org/apidox/for_themers.html[here]"
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:4239
+#: user-manual.txt:4216
 #, no-wrap
 msgid "Grantlee exported variables"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4241
+#: user-manual.txt:4218
 msgid "Only a subset of the dive data is exported:"
 msgstr ""
 
 #. type: delimited block |
-#: ./user-manual.txt:4259
+#: user-manual.txt:4247
 #, no-wrap
 msgid ""
 "|*Name*|*Description*\n"
 "|number| (*int*) dive number\n"
 "|id| (*int*) unique dive ID, should be used to fetch the dive profile\n"
-"|date| (*string*) data of the dive\n"
+"|date| (*string*) date of the dive\n"
 "|time| (*string*) time of the dive\n"
 "|location| (*string*) location of the dive\n"
 "|duration| (*string*) duration of the dive\n"
 "|depth| (*string*) depth of the dive\n"
-"|divemaster| (*string*) divemaster data\n"
-"|buddy| (*string*) buddy data\n"
-"|airTemp| (*string*) air temperature of dive\n"
-"|waterTemp| (*string*) water temperature of dive\n"
+"|divemaster| (*string*) dive master for the dive\n"
+"|buddy| (*string*) buddy for the dive\n"
+"|airTemp| (*string*) air temperature of the dive\n"
+"|waterTemp| (*string*) water temperature of the dive\n"
 "|notes| (*string*) dive notes\n"
-"|rating| (*int*) dive rating ranges from 0 to 5\n"
-"|sac| (*string*) sac value\n"
-"|tags| (*string*) all dive tags concatenate together\n"
-"|gas| (*string*) used gas cylinder\n"
-msgstr ""
-
-#. type: Plain text
-#: ./user-manual.txt:4263
+"|rating| (*int*) dive rating which ranges from 0 to 5\n"
+"|sac| (*string*) SAC value for the dive\n"
+"|tags| (*string*) list of dive tags for the dive\n"
+"|gas| (*string*) list of gases used in the dive\n"
+"|suit| (*string*) the suit used for the dive\n"
+"|cylinders| (*string*) complete information of all used cylinders\n"
+"|cylinder0-7| (*string*) information about a specific cylinder\n"
+"|weights| (*string*) complete information of all used weight systems\n"
+"|weight0-5| (*string*) information about a specific weight system\n"
+"|maxcns| (*string*) maxCNS value for the dive\n"
+"|otu| (*string*) OTU value for the dive\n"
+"|sumWeight| (*string*) the summed weight of all used weight systems\n"
+"|startPressure| (*string*) the start pressure\n"
+"|endPressure| (*string*) the end pressure\n"
+"|firstGas| (*string*) first used gas\n"
+msgstr ""
+
+#. type: Plain text
+#: user-manual.txt:4251
 msgid ""
 "_Subsurface_ also exports *template_options* data. This data must be used as "
 "_CSS_ values to provide a dynamically editable template. The exported data "
@@ -9037,7 +8953,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block |
-#: ./user-manual.txt:4275
+#: user-manual.txt:4263
 #, no-wrap
 msgid ""
 "|*Name*|*Description*\n"
@@ -9056,26 +8972,26 @@ msgid ""
 msgstr ""
 
 #. type: delimited block .
-#: ./user-manual.txt:4280
+#: user-manual.txt:4268
 #, no-wrap
 msgid "\tborder-width: {{ template_options.borderwidth }}px;\n"
 msgstr ""
 
 #. type: delimited block .
-#: ./user-manual.txt:4285
+#: user-manual.txt:4273
 #, no-wrap
 msgid "\tborder-width: 3px;\n"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4288
+#: user-manual.txt:4276
 msgid ""
 "Another variable that _Subsurface_ exports is *print_options*. This variable "
 "contains a single member:"
 msgstr ""
 
 #. type: delimited block |
-#: ./user-manual.txt:4291
+#: user-manual.txt:4279
 #, no-wrap
 msgid ""
 "|*Name*|*Description*\n"
@@ -9084,7 +9000,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block .
-#: ./user-manual.txt:4299
+#: user-manual.txt:4287
 #, no-wrap
 msgid ""
 "\tbody {\n"
@@ -9093,7 +9009,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block .
-#: ./user-manual.txt:4306
+#: user-manual.txt:4294
 #, no-wrap
 msgid ""
 "\tbody {\n"
@@ -9102,103 +9018,103 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:4308
+#: user-manual.txt:4296
 #, no-wrap
 msgid "Defined CSS selectors"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4312
+#: user-manual.txt:4299
 msgid ""
-"As the dive profile is placed after rendering, _Subsurface_ uses a special "
-"_CSS_ selectors to do some searches in the HTML output. The _CSS_ selectors "
-"in the following table should be added."
+"As the dive profile is placed after rendering, _Subsurface_ uses special "
+"_CSS_ selectors to searche in the HTML output. The _CSS_ selectors in the "
+"following table should be added."
 msgstr ""
 
 #. type: delimited block |
-#: ./user-manual.txt:4319
+#: user-manual.txt:4306
 #, no-wrap
 msgid ""
 "|*Selector*|*Type*|*Description*\n"
 "|dive_{{ dive.id }} | id | is used to fetch the relevant dive profile\n"
-"|diveProfile | class | each div that will contain a dive profile should have "
-"this class selector in addition to the dive_{{ dive.id }} id selector\n"
-"|dontbreak | class | prevents the div with this class to be divided into two "
-"pages, this can be used\n"
+"|diveProfile | class | each dive that will contain a dive profile should "
+"have this class selector in addition to the dive_{{ dive.id }} id selector\n"
+"|dontbreak | class | prevents the dive with this class from being divided "
+"into two pages. This can be used\n"
 "in flow layout templates only (when data-numberofdives = 0)\n"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4322
+#: user-manual.txt:4309
 msgid ""
 "Rendering dive profiles is not supported for flow layout templates (when "
 "data-numberofdives = 0)."
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:4323
+#: user-manual.txt:4310
 #, no-wrap
 msgid "Special attributes"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4327
+#: user-manual.txt:4314
 msgid ""
 "There are two ways of rendering- either rendering a specific number of dives "
-"in each page or make _Subsurface_ try to fit as much dives as possible into "
+"in each page or make _Subsurface_ try to fit as many dives as possible into "
 "one page (_flow_ rendering)."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4329
+#: user-manual.txt:4316
 msgid ""
 "The *data-numberofdives* data attribute is added to the body tag to set the "
-"rendering mode"
+"rendering mode."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4331
+#: user-manual.txt:4318
 msgid "render 6 dives per page:"
 msgstr ""
 
 #. type: delimited block .
-#: ./user-manual.txt:4334
+#: user-manual.txt:4321
 #, no-wrap
 msgid "\t<body data-numberofdives = 6>\n"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4337
+#: user-manual.txt:4324
 msgid "render as much dives as possible:"
 msgstr ""
 
 #. type: delimited block .
-#: ./user-manual.txt:4340
+#: user-manual.txt:4327
 #, no-wrap
 msgid "\t<body data-numberofdives = 0>\n"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4343
+#: user-manual.txt:4330
 msgid ""
 "All CSS units should be in relative lengths only, to support printing on any "
 "page size."
 msgstr ""
 
 #. type: Title ==
-#: ./user-manual.txt:4344
+#: user-manual.txt:4331
 #, no-wrap
 msgid "APPENDIX F: FAQs."
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:4346
+#: user-manual.txt:4333
 #, no-wrap
 msgid "Subsurface appears to miscalculate gas consumption and SAC"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4350
+#: user-manual.txt:4337
 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_ "
@@ -9206,17 +9122,17 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4356
+#: user-manual.txt:4343
 msgid ""
 "'Answer': Not really. What happens is that _Subsurface_ actually calculates "
 "gas consumption differently - and better - than you expect.  In particular, "
-"it takes the incompressibility of the gas into account.  Traditionally, Gas "
+"it takes the incompressibility of the gas into account.  Traditionally, gas "
 "consumption and SAC should be: +consumption = tank size x (start pressure - "
 "end pressure)+"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4362
+#: user-manual.txt:4349
 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 "
@@ -9226,12 +9142,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4364
+#: user-manual.txt:4351
 msgid "+consumption = (amount_of_air_at_beginning - amount_of_air_at_end)+"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4370
+#: user-manual.txt:4357
 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 "
@@ -9242,12 +9158,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4372
+#: user-manual.txt:4359
 msgid "+12.2*((220-100)/1.013)+"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4377
+#: user-manual.txt:4364
 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 "
@@ -9257,7 +9173,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4383
+#: user-manual.txt:4370
 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 "
@@ -9268,7 +9184,7 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:4384
+#: user-manual.txt:4371
 #, no-wrap
 msgid ""
 "Some dive profiles have time discrepancies with the recorded samples from my "
@@ -9276,7 +9192,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4388
+#: user-manual.txt:4375
 msgid ""
 "_Subsurface_ ends up ignoring surface time for many things (average depth, "
 "divetime, SAC, etc).  'Question': Why do dive durations in my dive computer "
@@ -9284,7 +9200,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4396
+#: user-manual.txt:4383
 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 "
@@ -9298,37 +9214,31 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: ./user-manual.txt:4397
+#: user-manual.txt:4384
 #, no-wrap
 msgid "Some dive profiles are missing from the download"
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4403
+#: user-manual.txt:4398
 msgid ""
-"'Question': I cannot download all my dives, only the most recent ones even "
+"'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 "
-"dives."
-msgstr ""
-
-#. type: Plain text
-#: ./user-manual.txt:4412
-msgid ""
-"'Answer': Dive history is different than the dive profiles on the log.  The "
-"history only keeps track of the total number of dives and total amount of "
-"time spent below surface. The logs, on the other hand, store the dive "
-"profile, but they have limited amount of memory to do so. The exact amount "
-"of dive profiles that can be stored on the device depend on sample interval "
-"and duration of the dives. Once the memory is full the oldest dives get "
-"overwritten with new dives. Thus we are only able to download the last 13, "
-"30 or 199 dives."
+"dives? 'Answer': Dive history is different than the dive profiles on the "
+"log.  The history only keeps track of the total number of dives and total "
+"amount of time spent below surface. The logs, on the other hand, store the "
+"dive profile, but they have a limited amount of memory to do so. The exact "
+"amount of dive profiles that can be stored on the device depends on sample "
+"interval and duration of the dives. Once the memory is full the oldest dives "
+"get overwritten with new dives. Thus we are only able to download the last "
+"13, 30 or 199 dives."
 msgstr ""
 
 #. type: Plain text
-#: ./user-manual.txt:4416
+#: user-manual.txt:4402
 msgid ""
 "If you have downloaded your dives to different dive logging software before "
-"they were overwritten, there is a high chance that Subsurface can import "
+"they were overwritten, there is a good chance that Subsurface can import "
 "these. However, if the logs are only on your dive computer, they cannot be "
-"salvaged after being over written by new dives."
+"salvaged after being overwritten by new dives."
 msgstr ""
diff --git a/Documentation/fr/po/subsurface-mobile-manual.fr.po b/Documentation/fr/po/subsurface-mobile-manual.fr.po
new file mode 100644
index 000000000..527a15a40
--- /dev/null
+++ b/Documentation/fr/po/subsurface-mobile-manual.fr.po
@@ -0,0 +1,628 @@
+# French translations for subsurface-manual package
+# Copyright (C) 2016 Free Software Foundation, Inc.
+# This file is distributed under the same license as the subsurface-manual package.
+#
+# Guillaume GARDET <guillaume.gardet@free.fr>, 2016.
+msgid ""
+msgstr ""
+"Project-Id-Version: subsurface-manual VERSION\n"
+"Report-Msgid-Bugs-To: subsurface@subsurface-divelog.org\n"
+"POT-Creation-Date: 2016-03-12 13:31+0100\n"
+"PO-Revision-Date: 2016-03-12 13:57+0100\n"
+"Last-Translator: Guillaume GARDET <guillaume.gardet@opensuse.org>\n"
+"Language-Team: French <opensuse-fr@opensuse.org>\n"
+"Language: fr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Lokalize 1.5\n"
+
+#.  :website: http://subsurface-divelog.org
+#. type: Target for macro image
+#: mobile-manual.txt:14
+#, no-wrap
+msgid "mobile-images/banner.jpg"
+msgstr "mobile-images/banner.jpg"
+
+#. type: Plain text
+#: mobile-manual.txt:17
+msgid "[big]#Subsurface-mobile for Android: USER MANUAL#"
+msgstr "[big]#Subsurface-mobile pour Android: MANUEL UTILISATEUR#"
+
+#. type: Plain text
+#: mobile-manual.txt:19
+#, no-wrap
+msgid "*Manual author*: Willem Ferguson\n"
+msgstr ""
+
+#. type: Plain text
+#: mobile-manual.txt:21
+msgid "toc::[]"
+msgstr "toc::[]"
+
+#. type: Plain text
+#: mobile-manual.txt:23
+msgid "[blue]#_Version 1.0, March 2016_#"
+msgstr "[blue]#_Version 1.0, Mars 2016_#"
+
+#. type: Plain text
+#: mobile-manual.txt:31
+msgid ""
+"Welcome as a user of _Subsurface_, advanced dive logging software with "
+"extensive infrastructure to describe, organize, interpret and print scuba "
+"and free dives. _Subsurface_ offers many advantages over other similar "
+"software solutions, including compatibility with Windows, Mac-OS/X, Linux "
+"(many distributions) and Android (iOS under development). In addition, "
+"_Subsurface_ is open-source software that allows downloading dive "
+"information from most dive computers."
+msgstr ""
+
+#. type: Title -
+#: mobile-manual.txt:33
+#, no-wrap
+msgid "Introducing Subsurface-mobile"
+msgstr ""
+
+#. type: Plain text
+#: mobile-manual.txt:40
+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 "
+"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."
+msgstr ""
+
+#. type: Plain text
+#: mobile-manual.txt:43
+msgid ""
+"A version of _Subsurface-mobile_ for iOS is under development but not yet "
+"ready for testing."
+msgstr ""
+
+#. type: Plain text
+#: mobile-manual.txt:53
+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."
+msgstr ""
+
+#. type: Plain text
+#: mobile-manual.txt:55
+msgid "_Subsurface-mobile_ allows one to:"
+msgstr ""
+
+#. type: Plain text
+#: mobile-manual.txt:57
+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."
+msgstr ""
+
+#. type: Plain text
+#: mobile-manual.txt:60
+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."
+msgstr ""
+
+#. type: Plain text
+#: mobile-manual.txt:62
+msgid "Store the updated dive log on the Internet."
+msgstr ""
+
+#. type: Plain text
+#: mobile-manual.txt:63
+msgid "Record, store and apply GPS positions of dives."
+msgstr ""
+
+#. type: Plain text
+#: mobile-manual.txt:65
+msgid "View the localities of recorded GPS positions and of dives on a map."
+msgstr ""
+
+#. type: Plain text
+#: mobile-manual.txt:72
+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 "
+"devices, but this is not yet ready for testing."
+msgstr ""
+
+#. type: Title ==
+#: mobile-manual.txt:73
+#, no-wrap
+msgid "Installing _Subsurface-mobile_ on an Android device"
+msgstr ""
+
+#. type: Plain text
+#: mobile-manual.txt:77
+msgid ""
+"Find _Subsurface-mobile_ in the _Google Play Store_. Search for _Subsurface-"
+"mobile_ and install it."
+msgstr ""
+
+#. type: Title ==
+#: mobile-manual.txt:78
+#, no-wrap
+msgid "Using _Subsurface-mobile_ for the first time"
+msgstr ""
+
+#. type: Plain text
+#: mobile-manual.txt:84
+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)."
+msgstr ""
+
+#. type: Target for macro image
+#: mobile-manual.txt:85
+#, no-wrap
+msgid "mobile-images/landingscreen.jpg"
+msgstr ""
+
+#. type: Plain text
+#: mobile-manual.txt:93
+#, no-wrap
+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"
+msgstr ""
+
+#. type: Plain text
+#: mobile-manual.txt:102
+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."
+msgstr ""
+
+#. type: Title ==
+#: mobile-manual.txt:104
+#, no-wrap
+msgid "Local copy of the dive log and synchronisation with Internet"
+msgstr ""
+
+#. type: Plain text
+#: mobile-manual.txt:114
+msgid ""
+"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 copy. If "
+"not, the local copy and the copy on the server are synchronised."
+msgstr ""
+
+#. type: Title ==
+#: mobile-manual.txt:115
+#, no-wrap
+msgid "A Few Remarks About The User Interface"
+msgstr ""
+
+#. type: Plain text
+#: mobile-manual.txt:124
+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."
+msgstr ""
+
+#. type: Target for macro image
+#: mobile-manual.txt:125
+#, no-wrap
+msgid "mobile-images/actionbutton.jpg"
+msgstr ""
+
+#. type: Plain text
+#: mobile-manual.txt:132
+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 "
+"different user interaction philosophy based on the Kirigami framework "
+"developed by the Plasma developers. To open the main menu one has three "
+"options:"
+msgstr ""
+
+#. type: Plain text
+#: mobile-manual.txt:135
+msgid ""
+"Tap on the right-arrow symbol in the lower left corner of the screen (easy "
+"to reach for hand held devices)"
+msgstr ""
+
+#. type: Plain text
+#: mobile-manual.txt:136
+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"
+msgstr ""
+
+#. type: Target for macro image
+#: mobile-manual.txt:139
+#, no-wrap
+msgid "mobile-images/menu.jpg"
+msgstr ""
+
+#. type: Plain text
+#: mobile-manual.txt:145
+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. "
+"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."
+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
+#, no-wrap
+msgid "Viewing the Dive List"
+msgstr ""
+
+#. type: Plain text
+#: mobile-manual.txt:161
+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 "
+"at the bottom of the screen, indicating that the cloud is being accessed "
+"(see image on left, below). Once the list is loaded one can scroll up and "
+"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."
+msgstr ""
+
+#. type: Target for macro image
+#: mobile-manual.txt:162
+#, no-wrap
+msgid "mobile-images/divelist.jpg"
+msgstr ""
+
+#. type: Plain text
+#: mobile-manual.txt:166
+msgid ""
+"One can view other dives by swiping the _Details view_ to the right (for the "
+"previous dive) or to the left (following dive)."
+msgstr ""
+
+#. type: Title ==
+#: mobile-manual.txt:167
+#, no-wrap
+msgid "Editing dive details."
+msgstr ""
+
+#. type: Plain text
+#: mobile-manual.txt:177
+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 "
+"edit boxes that allows one to change the existing dive information, e.g. "
+"adding text to the dive notes or changing the names or values of some of the "
+"information (see image below).  It may be necessary to scroll the window to "
+"access all the information.  At the bottom of the edit screen is a _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."
+msgstr ""
+
+#. type: Target for macro image
+#: mobile-manual.txt:178
+#, no-wrap
+msgid "mobile-images/editdive.jpg"
+msgstr ""
+
+#. type: Title ==
+#: mobile-manual.txt:180
+#, no-wrap
+msgid "Adding a new dive to the dive list"
+msgstr ""
+
+#. type: Plain text
+#: mobile-manual.txt:191
+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 "
+"_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 "
+"right-hand image shows the same dive in _Details View_."
+msgstr ""
+
+#. type: Target for macro image
+#: mobile-manual.txt:192
+#, no-wrap
+msgid "mobile-images/createdive.jpg"
+msgstr ""
+
+#. type: Title ==
+#: mobile-manual.txt:194
+#, no-wrap
+msgid "Deleting a dive"
+msgstr ""
+
+#. type: Plain text
+#: mobile-manual.txt:201
+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."
+msgstr ""
+
+#. type: Title ==
+#: mobile-manual.txt:202
+#, no-wrap
+msgid "Dive log management"
+msgstr ""
+
+#. type: Plain text
+#: mobile-manual.txt:212
+#, no-wrap
+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"
+msgstr ""
+
+#. type: Title ===
+#: mobile-manual.txt:213
+#, no-wrap
+msgid "Add new dive manually"
+msgstr ""
+
+#. type: Plain text
+#: mobile-manual.txt:216
+msgid "This is described above under the section dealing with the dive list."
+msgstr ""
+
+#. type: Title ===
+#: mobile-manual.txt:217
+#, no-wrap
+msgid "Upload dive log to the _Subsurface_ cloud storage"
+msgstr ""
+
+#. type: Plain text
+#: mobile-manual.txt:223
+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."
+msgstr ""
+
+#. type: Title ===
+#: mobile-manual.txt:224
+#, no-wrap
+msgid "Download dive log from the cloud storage"
+msgstr ""
+
+#. type: Plain text
+#: mobile-manual.txt:229
+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."
+msgstr ""
+
+#. type: Title ===
+#: mobile-manual.txt:230
+#, no-wrap
+msgid "Changing the login credentials on the _Subsurface_ cloud"
+msgstr ""
+
+#. type: Plain text
+#: mobile-manual.txt:236
+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 "
+"credentials, open the main menu and tap _Cloud credentials_. This opens the "
+"setup screen for specifying new credentials."
+msgstr ""
+
+#. type: Title ==
+#: mobile-manual.txt:238
+#, no-wrap
+msgid "Recording dive locations using GPS."
+msgstr ""
+
+#. type: Plain text
+#: mobile-manual.txt:244
+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 "
+"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:"
+msgstr ""
+
+#. type: Title ===
+#: mobile-manual.txt:245
+#, no-wrap
+msgid "Setting up the GPS"
+msgstr ""
+
+#. type: Plain text
+#: mobile-manual.txt:253
+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). "
+"One can specify that data are collected at regular intervals, e.g. every 10 "
+"minutes, or at regular distances, e.g. after the boat has moved more than "
+"200m, or a combination of both of the above approaches. Provide the "
+"appropriate information and tap the _Save_ action button. The program is now "
+"ready to collect GPS positions."
+msgstr ""
+
+#. type: Target for macro image
+#: mobile-manual.txt:254
+#, no-wrap
+msgid "mobile-images/gpssetup.jpg"
+msgstr ""
+
+#. type: Title ===
+#: mobile-manual.txt:256
+#, no-wrap
+msgid "Collecting GPS positions"
+msgstr ""
+
+#. type: Plain text
+#: mobile-manual.txt:265
+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, "
+"above).  Check this box and _Subsurface-mobile_ starts to collect GPS "
+"locations automatically, following the preferences specified as described "
+"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."
+msgstr ""
+
+#. type: Title ===
+#: mobile-manual.txt:266
+#, no-wrap
+msgid "Storing the GPS data on the _Subsurface_ cloud"
+msgstr ""
+
+#. type: Plain text
+#: mobile-manual.txt:273
+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_ "
+"that saves the GPS data on the _Subsurface_ cloud server. These GPS data are "
+"saved *separately* from the other dive log data. All collected GPS data are "
+"kept on the Android device, independent of whether they have been uploaded "
+"or not."
+msgstr ""
+
+#. type: Title ===
+#: mobile-manual.txt:274
+#, no-wrap
+msgid "Downloading GPS data from the _Subsurface_ cloud"
+msgstr ""
+
+#. type: Plain text
+#: mobile-manual.txt:278
+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
+#, no-wrap
+msgid "Viewing GPS data"
+msgstr ""
+
+#. type: Plain text
+#: mobile-manual.txt:290
+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 "
+"on left, below). Two actions are possible for each of the locations, enabled "
+"if one taps the handle (the three horisontal stripes on the right, see image "
+"on left, below) and then drags the specific item to the left (image on "
+"right, below). This exposes two options. Tapping the dustbin deletes this "
+"particular GPS location. Tapping the teardrop-shaped icon (actually a Google "
+"Maps pin) opens up Google Maps with a pin indicating the exact map position "
+"of the GPS record being viewed. The two above options can be hidden by "
+"drawing the GPS record to the right, again using the handle."
+msgstr ""
+
+#. type: Target for macro image
+#: mobile-manual.txt:291
+#, no-wrap
+msgid "mobile-images/gpsmanagement.jpg"
+msgstr ""
+
+#. type: Title ===
+#: mobile-manual.txt:293
+#, no-wrap
+msgid "Applying GPS data to dives in the dive log"
+msgstr ""
+
+#. type: Plain text
+#: mobile-manual.txt:301
+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 "
+"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."
+msgstr ""
diff --git a/Documentation/fr/po/subsurface-manual.fr.po b/Documentation/fr/po/subsurface-user-manual.fr.po
index 8eb0409a2..19365e01c 100644
--- a/Documentation/fr/po/subsurface-manual.fr.po
+++ b/Documentation/fr/po/subsurface-user-manual.fr.po
@@ -2,13 +2,13 @@
 # Copyright (C) 2015 Free Software Foundation, Inc.
 # This file is distributed under the same license as the PACKAGE package.
 #
-# Guillaume GARDET <guillaume.gardet@free.fr>, 2015.
+# Guillaume GARDET <guillaume.gardet@free.fr>, 2015, 2016.
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: subsurface@subsurface-divelog.org\n"
-"POT-Creation-Date: 2015-10-29 10:38+0100\n"
-"PO-Revision-Date: 2015-10-29 10:38+0100\n"
+"POT-Creation-Date: 2016-03-12 13:31+0100\n"
+"PO-Revision-Date: 2016-03-12 13:55+0100\n"
 "Last-Translator: Guillaume GARDET <guillaume.gardet@opensuse.org>\n"
 "Language-Team: French <opensuse-fr@opensuse.org>\n"
 "Language: fr\n"
@@ -49,7 +49,7 @@ msgstr "[blue]#_Version 4.5, Octobre 2015_#"
 #: user-manual.txt:28
 msgid ""
 "Welcome as a user of _Subsurface_, an advanced dive logging program with "
-"extensive infrastructure to describe, organise, interpret and print scuba "
+"extensive infrastructure to describe, organize, interpret and print scuba "
 "and free dives. _Subsurface_ offers many advantages over other similar "
 "software solutions:"
 msgstr ""
@@ -63,7 +63,7 @@ msgstr ""
 #: user-manual.txt:31
 msgid ""
 "Do you need a flexible way of logging dives using recreational equipment, "
-"even not using a dive computer?"
+"even without a dive computer?"
 msgstr ""
 "Avez-vous besoin d'une façon d'enregistrer vos plongées utilisant des "
 "équipements loisirs, même sans utiliser d'ordinateur de plongée ?"
@@ -74,9 +74,9 @@ msgid ""
 "Do you use two different dive computer brands, each with its own proprietary "
 "software for downloading dive logs? Do you dive with rebreathers as well as "
 "open circuit or recreational equipment? Do you use a Reefnet Sensus time-"
-"depth recorder in conjunction with a dive computer? _Subsurface_ offers a "
-"standard interface for downloading dive logs from all these different pieces "
-"of equipment and to store and analyse the dive logs within a unified system."
+"depth recorder along with a dive computer? _Subsurface_ offers a standard "
+"interface for downloading dive logs from all of these different pieces of "
+"equipment, storing and analyzing the dive logs within a unified system."
 msgstr ""
 "Utilisez-vous deux marques différentes d'ordinateurs de plongée, chacun avec "
 "son propre logiciel propriétaire pour télécharger les enregistrements des "
@@ -84,15 +84,15 @@ msgstr ""
 "ou de loisir ? Utilisez-vous un enregistreur de profondeur et de durée "
 "Reefnet Sensus avec un ordinateur de plongée ? _Subsurface_ offre une "
 "interface standard pour télécharger les enregistrements des plongées à "
-"partir de tous ces équipements de plongée et pour enregistrer et analyser "
+"partir de tous ces équipements de plongée, en enregistrant et en analysant "
 "ces enregistrements dans un système unique."
 
 #. type: Plain text
 #: user-manual.txt:40
 msgid ""
 "Do you use more than one operating system? _Subsurface_ is fully compatible "
-"with Mac, Linux and Windows, allowing you to access your dive log on each of "
-"your operating systems using a single application."
+"with Mac, Linux and Windows, letting you access your dive log on each "
+"operating system using a single application."
 msgstr ""
 "Utilisez-vous plus d'un système d'exploitation ? _Subsurface_ est "
 "intégralement compatible avec Mac, Linux et Windows, ce qui vous permet "
@@ -102,12 +102,12 @@ msgstr ""
 #. type: Plain text
 #: user-manual.txt:43
 msgid ""
-"Do you use Linux or Mac and your dive computer has only Windows-based "
+"Do you use Linux or Mac, but your dive computer has only Windows- based "
 "software for downloading dive information (e.g. Mares)? _Subsurface_ "
-"provides a way of downloading and analysing your dive logs on other "
+"provides a way of downloading and analyzing your dive logs on other "
 "operating systems."
 msgstr ""
-"Utilisez-vous Linux ou Mac et votre ordinateur de plongée n'a que des "
+"Utilisez-vous Linux ou Mac mais votre ordinateur de plongée n'a que des "
 "logiciels pour Windows pour télécharger les informations de plongées (par "
 "exemple Mares) ? _Subsurface_ fournit un moyen de télécharger et d'analyser "
 "vos enregistrements de plongées sur d'autres systèmes d'exploitation."
@@ -115,47 +115,42 @@ msgstr ""
 #. type: Plain text
 #: user-manual.txt:45
 msgid ""
-"Do you need an intuitive graphical dive planner that integrates with and "
-"takes into account the dives that have already been logged?"
+"Do you need an intuitive graphical dive planner that integrates with, and "
+"takes into account, dives you’ve already logged?"
 msgstr ""
 "Avez-vous besoin d'un planificateur de plongée graphique intuitif qui "
 "intègre et prend en compte les plongées qui ont déjà été enregistrées ?"
 
 #. type: Plain text
-#: user-manual.txt:47
+#: user-manual.txt:51
 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 browser?"
-msgstr ""
-"Avez-vous besoin d'un moyen d'enregistrer ou de sauvegarder votre carnet de "
-"plongée sur Internet, Vous permettant de visualiser votre carnet depuis "
-"n'importe où, en utilisant un navigateur Internet ?"
-
-#. type: Plain text
-#: user-manual.txt:52
-msgid ""
+"letting you view your dive log from anywhere using an Internet browser? "
 "_Subsurface_ binaries are available for Windows PCs (Win XP or later), Intel "
 "based Macs (OS/X) and many Linux distributions. _Subsurface_ can be built "
 "for many more hardware platforms and software environments where Qt and "
 "libdivecomputer are available."
 msgstr ""
-"_Subsurface_ est disponible pour Windows (Win XP ou plus récent), les Macs "
-"basés sur processeurs Intel (OS/X) et de nombreuses distributions Linux. "
-"_Subsurface_ peut être compilé pour bien plus de plateformes matérielles et "
-"d'environnements logiciels où Qt et libdivecomputer sont disponibles."
+"Avez-vous besoin d'un moyen d'nregistrer et de sauvegarder vos plongées sur "
+"Internet, vous permettant de les voir depuis n'importe où en utilisant un "
+"navigateur Internet ? _Subsurface_ est disponible pour Windows (Win XP ou "
+"plus récent), les Macs basés sur processeurs Intel (OS/X) et de nombreuses "
+"distributions Linux. _Subsurface_ peut être compilé pour bien plus de "
+"plateformes matérielles et d'environnements logiciels où Qt et "
+"libdivecomputer sont disponibles."
 
 #. type: Plain text
-#: user-manual.txt:61
+#: user-manual.txt:60
 msgid ""
-"The scope of this document is the use of the _Subsurface_ program. To "
-"install the software, consult the _Downloads_ page on the http://subsurface-"
-"divelog.org/[_Subsurface_ web site].  Please discuss issues with this "
-"program by sending an email to mailto:subsurface@subsurface-divelog.org[our "
-"mailing list] and report bugs at http://trac.hohndel.org[our bugtracker].  "
-"For instructions on how to build the software and (if needed) its "
-"dependencies please consult the INSTALL file included with the source code."
+"This manual explains how to use the _Subsurface_ program. To install the "
+"software, consult the _Downloads_ page on the http://subsurface-divelog.org/"
+"[_Subsurface_ web site].  Please discuss issues with this program by sending "
+"an email to mailto:subsurface@subsurface-divelog.org[our mailing list] and "
+"report bugs at http://trac.hohndel.org[our bugtracker].  For instructions on "
+"how to build the software and (if needed) its dependencies please consult "
+"the INSTALL file included with the source code."
 msgstr ""
-"Le but de ce document est l'utilisation du programme Subsurface. Pour "
+"Ce manuel explique comment utiliser le programme _Subsurface_. Pour "
 "installer le logiciel, consultez la page _Téléchargement_ sur le http://"
 "subsurface-divelog.org/[site web de _Subsurface_]. En cas de problème, vous "
 "pouvez envoyer un e-mail sur mailto:subsurface@subsurface-divelog.org[notre "
@@ -165,7 +160,7 @@ msgstr ""
 "dans les sources logicielles."
 
 #. type: Plain text
-#: user-manual.txt:64
+#: user-manual.txt:63
 #, no-wrap
 msgid ""
 "*Audience*: Recreational Scuba Divers, Free Divers, Tec Divers, Professional\n"
@@ -175,18 +170,18 @@ msgstr ""
 "professionnels\n"
 
 #. type: Plain text
-#: user-manual.txt:66
+#: user-manual.txt:65
 msgid "toc::[]"
 msgstr "toc::[]"
 
 #. type: Title -
-#: user-manual.txt:69
+#: user-manual.txt:68
 #, no-wrap
 msgid "Using this manual"
 msgstr "Utilisation de ce manuel"
 
 #. type: Plain text
-#: user-manual.txt:72
+#: user-manual.txt:71
 msgid ""
 "When opened from within _Subsurface_, this manual does not have external "
 "controls for paging or selecting previous pages. However, two facilities are "
@@ -194,59 +189,69 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:79
+#: user-manual.txt:78
 msgid ""
 "The _SEARCH_ function is activated by pressing control-F or command-F on the "
 "keyboard. A text box appears at the bottom right-hand of the window (see "
-"image below).  For instance, if one typed the word \"_weights_\" into the "
-"search text box, this word will be searched for throughout this user manual. "
-"To the right of the search text box are two arrows pointing upwards and "
-"downwards. Selecting these allow finding, respectively, the previous and the "
-"next occurence of the term being searched for."
+"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."
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:80
+#: user-manual.txt:78
 #, no-wrap
 msgid "images/usermanualfunctions.jpg"
 msgstr "images/usermanualfunctions.jpg"
 
 #. type: Plain text
-#: user-manual.txt:91
+#: user-manual.txt:90
 msgid ""
-"_PREVIOUS/NEXT LINK_. One can move between links (underlined words allowing "
-"one to jump to specific sections in this user manual) by right-clicking on "
-"the text of the manual.  This brings up a context menu for jumping to "
-"previous links selected while reading the manual (see image above). For "
-"instance if a link in the manual has been selected, then the option to _Go "
-"Back_ shows the text at the last link that was selected (similar to the "
-"Previous Page button in a browser). Conversely the _Go Forward_ option "
-"enables jumping to the text perused before selecting the _Go Back_ option. "
-"The _Reload_ option causes the complete user manual to be reloaded into the "
-"user manual window."
+"_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."
 msgstr ""
 
 #. type: Title -
-#: user-manual.txt:94
+#: user-manual.txt:92
 #, no-wrap
 msgid "The user survey"
 msgstr "Le sondage utilisateur"
 
 #. type: Plain text
-#: user-manual.txt:106
-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: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."
+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_ "
+"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."
 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 "
@@ -265,13 +270,13 @@ msgstr ""
 "ligne de commande."
 
 #. type: Title -
-#: user-manual.txt:109
+#: user-manual.txt:106
 #, no-wrap
 msgid "Start Using the Program"
 msgstr "Commencer à utiliser le programme"
 
 #. type: Plain text
-#: user-manual.txt:114
+#: user-manual.txt:111
 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 "
@@ -284,13 +289,19 @@ msgstr ""
 "quatre panneaux sont :"
 
 #. type: Plain text
-#: user-manual.txt:120
+#: 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."
 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."
+"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 "
@@ -300,19 +311,29 @@ msgstr ""
 "important pour manipuler un journal (carnet) de plongée."
 
 #. type: Plain text
-#: user-manual.txt:124
+#: 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*."
 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*."
+"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 ""
 "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*."
 
 #. type: Plain text
-#: user-manual.txt:128
+#: 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)."
 msgid ""
-"The *Info* to the top left, giving more detailed information on the dive "
+"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)."
 msgstr ""
@@ -322,21 +343,31 @@ msgstr ""
 "en surbrillance."
 
 #. type: Plain text
-#: user-manual.txt:131
+#: 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*."
 msgid ""
-"The *Dive Profile* to the top right, showing a graphical dive profile of the "
+"The *Dive Profile* on the top right, showing a graphical dive profile of the "
 "selected dive in the *Dive List*."
 msgstr ""
 "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*."
 
 #. type: Plain text
-#: user-manual.txt:136
-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: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."
+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 "
+"time _Subsurface_ starts it uses the positions of the dividers from the last "
+"time the program was used."
 msgstr ""
 "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 "
@@ -344,15 +375,24 @@ msgstr ""
 "positions."
 
 #. type: Plain text
-#: user-manual.txt:144
+#: 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)."
 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)."
+"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)."
 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 "
@@ -365,42 +405,46 @@ msgstr ""
 "nombre de plongées sélectionnées)."
 
 #. type: Target for macro image
-#: user-manual.txt:147
+#: user-manual.txt:142
 #, no-wrap
 msgid "images/main_window_f22.jpg"
 msgstr "images/main_window_f22.jpg"
 
 #. type: Plain text
-#: user-manual.txt:152
+#: 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:"
 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:"
+"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é "
 "permet plusieurs choix d'affichage :"
 
 #. type: Plain text
-#: user-manual.txt:154
+#: user-manual.txt:148
 #, 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:156
+#: user-manual.txt:150
 #, 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:158
+#: user-manual.txt:152
 #, 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:161
+#: user-manual.txt:155
 #, no-wrap
 msgid ""
 "*Info*: Show only the Notes about the last selected dive and statistics for\n"
@@ -410,19 +454,28 @@ msgstr ""
 "toutes les plongées mises en surbrillance.\n"
 
 #. type: Plain text
-#: user-manual.txt:163
-#, no-wrap
-msgid "*Globe*: Show only the world map, centred on the last selected dive.\n"
+#: user-manual.txt:157
+#, fuzzy, no-wrap
+#| msgid "*Globe*: Show only the world map, centred on the last selected dive.\n"
+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:169
-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 "
+#: 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."
+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 "
 "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 "
+"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."
 msgstr ""
 "Comme la plupart des autre fonctions qui peuvent être accédée via le menu "
@@ -433,12 +486,17 @@ msgstr ""
 "raccourcis et ne sont donc pas détaillées ici."
 
 #. type: Plain text
-#: user-manual.txt:173
+#: 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."
 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."
+"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 "
@@ -446,17 +504,23 @@ msgstr ""
 "carnet de plongée sera détaillée."
 
 #. type: Title -
-#: user-manual.txt:176
+#: user-manual.txt:170
 #, no-wrap
 msgid "Creating a new logbook"
 msgstr "Créer un nouveau carnet de plongée"
 
 #. type: Plain text
-#: user-manual.txt:181
+#: 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."
 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 "
+"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."
 msgstr ""
 "Sélectionner _Fichier -> Nouveau carnet de plongée_ à partir du menu "
@@ -466,31 +530,35 @@ msgstr ""
 "faut les enregistrer ou non avant de créer le nouveau carnet."
 
 #. type: Title ==
-#: user-manual.txt:183
+#: user-manual.txt:177
 #, 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:188
+#: 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."
 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."
+"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."
 
 #. type: Plain text
-#: user-manual.txt:190
+#: user-manual.txt:181
 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:192
+#: user-manual.txt:183
 msgid ""
 "manually maintained divelog, dive data can be added to the logbook using one "
 "of these approaches:"
@@ -499,14 +567,16 @@ msgstr ""
 "au carnet en utilisant une des approches suivantes :"
 
 #. type: Plain text
-#: user-manual.txt:194
-msgid "Enter dive information by hand. This is useful if the diver did not"
+#: user-manual.txt:184
+#, fuzzy
+#| msgid "Enter dive information by hand. This is useful if the diver did not"
+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:196
+#: user-manual.txt:186
 msgid ""
 "use a dive computer and dives were recorded in a written logbook. See: xref:"
 "S_EnterData[Entering dive information by hand]"
@@ -516,7 +586,7 @@ msgstr ""
 "à la main]"
 
 #. type: Plain text
-#: user-manual.txt:198
+#: user-manual.txt:188
 msgid ""
 "Import dive log information that has been maintained either as a spreadsheet"
 msgstr ""
@@ -524,7 +594,7 @@ msgstr ""
 "tableur"
 
 #. type: Plain text
-#: user-manual.txt:200
+#: user-manual.txt:190
 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 "
@@ -535,24 +605,21 @@ msgstr ""
 "S_ImportingCSVDives[Importer des plongées au format CSV]."
 
 #. type: Plain text
-#: user-manual.txt:202
-msgid ""
-"If one has dives recorded using a dive computer, the depth profile of the"
-msgstr ""
-"Si les plongées ont été enregistrées en utilisant un ordinateur de plongée, "
-"le profil de profondeur de la"
-
-#. type: Plain text
-#: user-manual.txt:204
+#: user-manual.txt:193
+#, fuzzy
+#| msgid ""
+#| "dive and a large amount of additional information can be accessed. These "
+#| "dives can be imported from:"
 msgid ""
-"dive and a large amount of additional information can be accessed. These "
-"dives can be imported from:"
+"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 :"
 
 #. type: Plain text
-#: user-manual.txt:206
+#: user-manual.txt:194
 msgid ""
 "The dive computer itself. See: xref:S_ImportDiveComputer[Importing new dive "
 "information from a Dive Computer] or"
@@ -561,7 +628,7 @@ msgstr ""
 "de nouvelles informations de plongée à partir de l'ordinateur de plongée] ou"
 
 #. type: Plain text
-#: user-manual.txt:208
+#: user-manual.txt:196
 msgid ""
 "Proprietary software distributed by manufacturers of dive computers. Refer"
 msgstr ""
@@ -569,7 +636,7 @@ msgstr ""
 "Voir"
 
 #. type: Plain text
-#: user-manual.txt:209
+#: user-manual.txt:197
 msgid ""
 "to: xref:S_ImportingAlienDiveLogs[Importing dive information from other "
 "digital data sources or other data formats]."
@@ -578,14 +645,16 @@ msgstr ""
 "sources de données numériques ou d'autres formats de données]."
 
 #. type: Plain text
-#: user-manual.txt:211
-msgid "Import from spreadsheet or CSV files containing dive profiles."
+#: user-manual.txt:198
+#, fuzzy
+#| msgid "Import from spreadsheet or CSV files containing dive profiles."
+msgid "Spreadsheet or CSV files containing dive profiles."
 msgstr ""
 "Importer à partir d'un tableur ou de fichiers CSV contenant les profils de "
 "plongées."
 
 #. type: Plain text
-#: user-manual.txt:212
+#: user-manual.txt:199
 msgid ""
 "See: xref:S_ImportingCSVDives[Importing dives in CSV format from dive "
 "computers or other dive log software]"
@@ -594,251 +663,249 @@ msgstr ""
 "des ordinateurs de plongées ou d'autres logiciels de carnet de plongée]"
 
 #. type: Title ===
-#: user-manual.txt:215
+#: user-manual.txt:202
 #, no-wrap
 msgid "Entering dive information by hand"
 msgstr "Entrer les informations de plongée à la main"
 
 #. type: Plain text
-#: user-manual.txt:229
+#: user-manual.txt:217
 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 "
 "information in a simple dive logbook usually includes dive type, date, time, "
-"duration, depth, the names of your dive buddy and of the dive master or dive "
+"duration, depth, the names of your dive buddy and the dive master or dive "
 "guide, and some remarks about the dive. _Subsurface_ can store much more "
-"information than this for each dive. In order to add a dive to a dive log, "
-"select _Log -> Add Dive_ from the Main Menu. The program then shows three "
-"panels to enter information for a dive: two tabs in the *Info* panel "
-"(*Notes* and *Equipment*), as well as the *Dive Profile* panel that displays "
-"a graphical profile of each dive. These panels are respectively marked "
-"[red]#A#, [red]#B# and [red]#C# in the figure below. Each of these tabs will "
-"now be explained for data entry."
+"information for each dive.  To add a dive to a dive log, select _Log -> Add "
+"Dive_ from the Main Menu. The program then shows three panels on which to "
+"enter information for a dive: two tabs in the *Info* panel (*Notes* and "
+"*Equipment*), as well as the *Dive Profile* panel that displays a graphical "
+"profile of each dive. These panels are respectively marked [red]#A#, "
+"[red]#B# and [red]#C# in the figure below. Each of these tabs will now be "
+"explained for data entry."
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:230
+#: user-manual.txt:218
 #, no-wrap
 msgid "images/AddDive1_f22.jpg"
 msgstr "images/AddDive1_f22.jpg"
 
 #. type: Plain text
-#: user-manual.txt:235
+#: user-manual.txt:222
 msgid ""
-"When one edits a field in Notes or Equipment panels, _Subsurface_ enters "
+"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 "
 "*Notes* panel (see the image below). This message is displayed in all the "
 "panels under Notes and Equipment when in *Editing Mode*."
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:236 user-manual.txt:807
+#: user-manual.txt:223 user-manual.txt:782
 #, no-wrap
 msgid "images/BlueEditBar_f22.jpg"
 msgstr "images/BlueEditBar_f22.jpg"
 
 #. type: Plain text
-#: user-manual.txt:243
+#: user-manual.txt:231
 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_, "
 "_Equipment_ and _Profile_ tabs should be completed before saving the "
 "information. By selecting the _Apply changes_ button, a local copy of the "
-"information for this specific dive is saved in memory. When one closes "
-"Subsurface, the program will ask again, this time whether the complete dive "
-"log should be saved on disk or not."
+"information for this specific dive is saved in memory. The _Apply changes_ "
+"button should ONLY be selected after all parts of a dive have been entered. "
+"When you close Subsurface, the program will ask again, this time whether the "
+"complete dive log should be saved on disk or not."
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:245
+#: user-manual.txt:233
 #, no-wrap
 msgid "Creating a Dive Profile"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:252
+#: user-manual.txt:240
 msgid ""
 "The *Dive Profile* (a graphical representation of the depth of the dive as a "
-"function of time) is indicated in the panel on the top right hand of the "
+"function of time) is shown in the panel on the top right hand of the "
 "_Subsurface_ window. When a dive is manually added to a logbook, "
 "_Subsurface_ presents a default dive profile that needs to be modified to "
-"best represent the dive being described:"
+"best represent the dive described:"
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:253
+#: user-manual.txt:241
 #, no-wrap
 msgid "images/DiveProfile1_f20.jpg"
 msgstr "images/DiveProfile1_f20.jpg"
 
 #. type: Plain text
-#: user-manual.txt:271
+#: user-manual.txt:259
 msgid ""
 "_Modifying the dive profile_: When the cursor is moved around the dive "
-"profile, its position is indicated by two right-angled red lines as shown "
-"below.  The time and depth represented by the cursor are indicated at the "
-"top of the black information box (@ and D). The units (metric/imperial) on "
-"the axes are determined by the *Preference* settings. The dive profile "
-"itself comprises several line segments demarcated by waypoints (white dots "
-"on the profile, as shown above). The default dive depth is 15 m.  If the "
-"dive depth was 20 m then the user needs to drag the appropriate waypoints "
-"downwards to represent 20 m. To add a waypoint, double-click on any line "
-"segment. To move an additional waypoint, drag it.  To remove this waypoint, "
-"right-click on it and choose \"Remove this point\" from the context menu. "
-"Drag the waypoints to represent an accurate time duration for the dive. "
-"Below is a dive profile for a dive to 20 m for 30 min, followed by a 5 "
-"minute safety stop at 5 m."
+"profile, its position is shown by two right-angled red lines as seen below.  "
+"The time and depth represented by the cursor are indicated at the top of the "
+"black information box (@ and D). The units (metric/imperial) on the axes are "
+"determined by the *Preference* settings. The dive profile itself comprises "
+"several line segments demarcated by waypoints (white dots on the profile, as "
+"shown above). The default dive depth is 15 m.  If the dive depth was 20 m "
+"then you need to drag the appropriate waypoints downward to 20 m. To add a "
+"waypoint, double-click on any line segment. To move an additional waypoint, "
+"drag it.  To remove a waypoint, right-click on it and choose \"Remove this "
+"point\" from the context menu. Drag the waypoints to represent an accurate "
+"time duration for the dive. Below is a dive profile for a dive to 20 m for "
+"30 min, followed by a 5 minute safety stop at 5 m."
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:272
+#: user-manual.txt:260
 #, no-wrap
 msgid "images/DiveProfile2_f20.jpg"
 msgstr "images/DiveProfile2_f20.jpg"
 
 #. type: Plain text
-#: user-manual.txt:284
+#: user-manual.txt:272
 msgid ""
-"_Specifying the gas composition:_ The gas composition used is clearly "
-"indicated along the line segments of the dive profile. This defaults to the "
-"first gas mixture specified in the *Equipment* tab, which was air in the "
-"case of the profile above. The gas mixtures of segments of the dive profile "
-"can be edited. This is done by right-clicking on the particular waypoint and "
-"selecting the appropriate gas from the context menu. Changing the gas for a "
-"waypoint affects the gas shown in the segment _to the left_ of that "
-"waypoint. Note that only the gases defined in the *Equipment* tab appear in "
-"the context menu (see image below)."
+"_Specifying the gas composition:_ The gas composition used is indicated "
+"along the line segments of the dive profile. This defaults to the first gas "
+"mixture specified in the *Equipment* tab, which was air in the case of the "
+"profile above. The gas mixtures of segments of the dive profile can be "
+"changed by right-clicking on the particular waypoint and selecting the "
+"appropriate gas from the context menu. Changing the gas for a waypoint "
+"affects the gas shown in the segment _to the left_ of that waypoint. Note "
+"that only the gases defined in the *Equipment* tab appear in the context "
+"menu (see image below)."
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:285
+#: user-manual.txt:273
 #, no-wrap
 msgid "images/DiveProfile3_f20.jpg"
 msgstr "images/DiveProfile3_f20.jpg"
 
 #. type: Plain text
-#: user-manual.txt:292
+#: user-manual.txt:280
 msgid ""
-"With the profile having been defined, more details must be added in order to "
-"have a fuller record of the dive. To do this, the *Notes* and the "
-"*Equipment* tabs on the top left hand of the _Subsurface_ window should be "
-"used. Click on xref:S_Notes_dc[*this link*] for instructions to use these "
-"tabs."
+"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 "
+"top left hand of the _Subsurface_ window should be used. Click on xref:"
+"S_Notes_dc[*this link*] for instructions on how to use these tabs."
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:294
+#: user-manual.txt:281
 #, 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:296
+#: user-manual.txt:283
 #, no-wrap
 msgid "Connecting and importing data from a dive computer."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:307
+#: user-manual.txt:293
 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, "
 "rates of ascent/descent and of gas partial pressures. _Subsurface_ can "
-"capture this information and present it as part of the dive information, "
-"using dive information from a wide range of dive computers. The latest list "
-"of supported dive computers can be found at: link:http://subsurface-divelog."
-"org/documentation/supported-dive-computers/[ Supported dive computers]."
+"capture this information, using dive details from a wide range of dive "
+"computers. The latest list of supported dive computers can be found at: link:"
+"http://subsurface-divelog.org/documentation/supported-dive-computers/"
+"[ Supported dive computers]."
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:308 user-manual.txt:676 user-manual.txt:3061
+#: user-manual.txt:294 user-manual.txt:654 user-manual.txt:3026
 #, no-wrap
 msgid "images/icons/warning2.png"
 msgstr "images/icons/warning2.png"
 
 #. type: Plain text
-#: user-manual.txt:319
+#: user-manual.txt:304
 msgid ""
-"Several dive computers consume more power when they are in their PC-"
-"Communication mode. **This could drain the dive computer's battery**. We "
-"therefore recommend that the user checks if the dive computer is charged "
-"when connected to the USB port of a PC. For example, several Suunto and "
-"Mares dive computers do not recharge through the USB connection. Users "
-"should refer to the dive computer's manual if they are unsure whether the "
-"dive computer recharges its batteries while connected to the USB port."
+"Several dive computers consume more power when they are in PC-Communication "
+"mode. **This could drain the dive computer's battery**. We recommend the "
+"user checks to be sure the dive computer is charged when connected to the "
+"USB port of a PC. For example, several Suunto and Mares dive computers do "
+"not recharge through the USB connection. Users should refer to the dive "
+"computer's manual if they are unsure whether the dive computer recharges its "
+"batteries while connected to the USB port."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:335
+#: user-manual.txt:320
 msgid ""
 "To import dive information from a dive computer to a computer with "
-"_Subsurface_, it is necessary that the two pieces of equipment communicate "
-"with one another.  This involves setting up the communications port (or "
-"mount point) of the computer with _Subsurface_ that communicates with the "
-"dive computer. In order to set up this communication, one needs to find the "
-"appropriate information to instruct _Subsurface_ where and how to import the "
-"dive information.  xref:"
+"_Subsurface_, the two pieces of equipment must communicate with one "
+"another.  This involves setting up the communications port (or mount point) "
+"of the computer with _Subsurface_ that communicates with the dive computer. "
+"To set up this communication, users need to find the appropriate information "
+"to instruct _Subsurface_ where and how to import the dive information.  xref:"
 "_appendix_a_operating_system_specific_information_for_importing_dive_information_from_a_dive_computer[Appendix "
-"A] provides the technical information to help the user achieving this for "
+"A] provides the technical information to help the user achieve this for "
 "different operating systems and xref:"
 "_appendix_b_dive_computer_specific_information_for_importing_dive_information[Appendix "
 "B] has dive computer specific information."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:338
+#: user-manual.txt:322
 msgid ""
-"After this, the dive computer can be hooked up to the user's PC, which can "
-"be achieved by following these steps:"
+"After this, the dive computer can be hooked up to the user's PC using these "
+"steps:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:340
+#: user-manual.txt:324
 msgid ""
 "The interface cable should be connected to a free USB port (or the Infra-red"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:341
+#: user-manual.txt:325
 msgid "or Bluetooth connection set up as described later in this manual)"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:343
+#: user-manual.txt:327
 msgid "The dive computer should be placed into PC Communication mode."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:344
+#: user-manual.txt:328
 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:348
+#: user-manual.txt:332
 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:350
+#: user-manual.txt:334
 #, no-wrap
 msgid "images/DC_import_f20.jpg"
 msgstr "images/DC_import_f20.jpg"
 
 #. type: Plain text
-#: user-manual.txt:358
+#: user-manual.txt:342
 msgid ""
-"Dive computers tend to keep a certain number of dives in their memory, even "
-"though these dives have already been imported to _Subsurface_. For that "
-"reason, if the dive computer allows this, _Subsurface_ only imports dives "
-"that have not been uploaded before. This makes the download process faster "
-"on most dive computers and also saves battery power of the dive computer (at "
-"least for those not charging while connected via USB)."
+"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 "
+"the dive computer allows this, _Subsurface_ only imports dives that have not "
+"been uploaded before. This makes the download process faster on most dive "
+"computers and also saves battery power of the dive computer (at least for "
+"those not charging while connected via USB)."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:365
+#: user-manual.txt:349
 msgid ""
 "The dialogue has two drop-down lists, *Vendor* and *Dive Computer*. On the "
 "*vendor* drop-down list select the make of the computer, e.g.  Suunto, "
@@ -848,7 +915,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:376
+#: user-manual.txt:360
 msgid ""
 "The *Device or Mount Point* drop-down list contains the USB or Bluetooth "
 "port name that _Subsurface_ needs in order to communicate with the dive "
@@ -857,80 +924,80 @@ msgid ""
 "A] and xref:"
 "_appendix_b_dive_computer_specific_information_for_importing_dive_information[Appendix "
 "B] for technical details on how to find the appropriate port information for "
-"a particular dive computer and, in some cases, how to do the correct "
-"settings to the operating system of the computer on which _Subsurface_ is "
-"running."
+"a specific dive computer and, in some cases, how to do the correct settings "
+"to the operating system of the computer on which _Subsurface_ is running."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:386
+#: user-manual.txt:370
 msgid ""
 "If all the dives on the dive computer need to be downloaded, check the "
 "checkbox _Force download of all dives_. Normally, _Subsurface_ only "
 "downloads dives after the date-time of the last dive in the *Dive List* "
-"panel. If one or more of your dives in _Subsurface_ have been accidentally "
+"panel. If one or more of your dives in _Subsurface_ has been accidentally "
 "deleted or if there are older dives that still need to be downloaded from "
-"the dive computer, this checkbox needs to be activated. Some dive computers "
-"(e.g. Mares Puck) do not provide a contents list to _Subsurface_ before the "
+"the dive computer, this box needs to be checked. Some dive computers (e.g. "
+"Mares Puck) do not provide a contents list to _Subsurface_ before the "
 "download in order to select only new dives.  Consequently, for these dive "
 "computers, all dives are downloaded irrespective of the status of this check "
 "box."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:392
+#: user-manual.txt:376
 msgid ""
 "If the checkbox _Always prefer downloaded dives_ has been checked and, "
 "during download, dives with identical date-times exist on the dive computer "
 "and on the _Subsurface_ *Dive List* panel, the dive in the _Subsurface_ "
-"divelog will be overwritten by the dive record from the dive computer."
+"divelog will be overwritten by the dive record from the computer."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:395
+#: user-manual.txt:379
 msgid ""
 "The checkbox marked _Download into new trip_ ensures that, after upload, the "
 "downloaded dives are grouped together as a new trip(s) in the *Dive List*."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:399
+#: user-manual.txt:383
 msgid ""
 "Do *not* check the checkboxes labelled _Save libdivecomputer logfile_ and "
 "_Save libdivecomputer dumpfile_. These are only used as diagnostic tools "
-"when problems with downloads are experienced (see below)."
+"when there are problems with downloads(see below)."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:419
+#: user-manual.txt:402
 msgid ""
-"Then select the _Download_ button.  With communication established, one can "
+"Then select the _Download_ button.  With communication established, you can "
 "see how the data are retrieved from the dive computer.  Depending on the "
 "make of the dive computer and/or number of recorded dives, this could take "
 "some time. Be patient. The _Download_ dialogue shows a progress bar at the "
-"bottom of the dialogue (for some dive computers the progress information "
-"could be inaccurate as we cannot determine how much downloadable data there "
-"is until all data have been downloaded). After successful download, Dialogue "
-"*B* in the figure above appears.  After the dives have been downloaded, they "
-"appear in a tabular format on the right-hand side of the dialogue (see image "
-"*B*, above). Each dive comprises a row in the table, with the date, duration "
-"and depth shown. Next to each dive is a checkbox: check all the dives that "
-"need to be transferred to the *Dive List*. In the case of the image above, "
-"the last six dives are checked and will be transferred to the *Dive List*. "
-"Then click the _OK_ button at the bottom of the dialogue. All the imported "
-"dives appear in the *Dive List*, sorted by date and time. Disconnect and "
-"switch off the dive computer to conserve its battery power."
+"bottom of the dialogue.  Remember for some dive computers progress "
+"information could be inaccurate since the program doesn’t know how much "
+"downloadable data there is until the download is complete. After successful "
+"download, Dialogue *B* in the figure above appears.  After the dives have "
+"been downloaded, they appear in a tabular format on the right-hand side of "
+"the dialogue (see image *B*, above). Each dive comprises a row in the table, "
+"with the date, duration and depth shown. Next to each dive is a checkbox: "
+"check all the dives that need to be transferred to the *Dive List*. In the "
+"case of the image above, the last six dives are checked and will be "
+"transferred to the *Dive List*. Then click the _OK_ button at the bottom of "
+"the dialogue. All the imported dives appear in the *Dive List*, sorted by "
+"date and time. Disconnect and switch off the dive computer to conserve its "
+"battery power."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:424
+#: user-manual.txt:407
 msgid ""
-"After this has been completed, select the OK button.  The checked dives are "
-"transferred to the *Dive List*."
+"Then click the OK button.  The checked dives are transferred to the *Dive "
+"List*."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:428
+#: user-manual.txt:411
 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 "
@@ -938,54 +1005,54 @@ msgid ""
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:432
+#: user-manual.txt:415
 #, no-wrap
 msgid "*PROBLEMS WITH DATA DOWNLOAD FROM A DIVE COMPUTER?*\n"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:432 user-manual.txt:542 user-manual.txt:586
-#: user-manual.txt:599 user-manual.txt:1176 user-manual.txt:1242
-#: user-manual.txt:1295 user-manual.txt:1371 user-manual.txt:1685
+#: 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
 #, no-wrap
 msgid "images/icons/important.png"
 msgstr "images/icons/important.png"
 
 #. type: delimited block *
-#: user-manual.txt:435
+#: user-manual.txt:418
 msgid "Check the following:"
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:438
+#: user-manual.txt:421
 msgid "Is the dive computer still in PC-communication or Upload mode?"
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:441
+#: user-manual.txt:423
 msgid ""
-"Is the battery of the dive computer fully charged? If not then the battery "
-"must be charged or replaced."
+"Is the dive computer’s battery fully charged? If not then charge or replace "
+"it."
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:445
+#: user-manual.txt:427
 msgid ""
-"Is the connecting cable faulty? Does the cable work perfectly using other "
-"software? Has it worked before, or is this the first time the cable is being "
-"used? Are the contacts on the dive computer and the cable clean?"
+"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 "
+"the contacts on the dive computer and the cable clean?"
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:450
+#: user-manual.txt:432
 msgid ""
 "Consult xref:"
 "_appendix_a_operating_system_specific_information_for_importing_dive_information_from_a_dive_computer[Appendix "
-"A] and make sure that the correct Mount Point was specified (see above)."
+"A] to be sure the correct Mount Point was specified (see above)."
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:454
+#: user-manual.txt:436
 msgid ""
 "On Unix-like operating systems, does the user have write permission to the "
 "USB port? If not, consult xref:"
@@ -994,20 +1061,19 @@ msgid ""
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:462
+#: user-manual.txt:444
 msgid ""
-"If the _Subsurface_ computer does not recognise the USB adaptor by showing "
+"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 "
-"possibility that the cable or USB adaptor is faulty. A faulty cable is the "
-"most common cause of communication failure between dive computer and "
-"_Subsurface_ computer. It is also possible that the _Subsurface_ computer "
-"cannot interpret the data. Perform a download for diagnostic purposes with "
-"the following two check boxes checked in the download dialogue discussed "
-"above:"
+"possibility the cable or USB adaptor is faulty. A faulty cable is the most "
+"common cause of communication failure between a dive computer and "
+"_Subsurface_ computer. It’s also possible the _Subsurface_ computer cannot "
+"interpret the data. Perform a download for diagnostic purposes with the "
+"following two boxes checked in the download dialogue discussed above:"
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:465
+#: user-manual.txt:447
 #, no-wrap
 msgid ""
 "\tSave libdivecomputer logfile\n"
@@ -1015,18 +1081,18 @@ msgid ""
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:471
+#: user-manual.txt:453
 #, no-wrap
 msgid ""
 "*Important*: These check boxes are only used when problems are encountered\n"
-"during the download process: under normal circumstances they should not be checked.\n"
-"When checking these boxes, the user is prompted to select a folder to\n"
-"save the information to. The default folder is the one in which the _Subsurface_\n"
+"during the download process. Under normal circumstances they should not be checked.\n"
+"When checking these boxes, the user is prompted to select a folder where the information will be saved. The default folder is the one in which the\n"
+"_Subsurface_\n"
 "dive log is kept.\n"
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:475
+#: user-manual.txt:457
 #, no-wrap
 msgid ""
 "*Important:* _After downloading with the above checkboxes\n"
@@ -1035,7 +1101,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:478
+#: user-manual.txt:460
 #, no-wrap
 msgid ""
 "\tsubsurface.log\n"
@@ -1043,133 +1109,115 @@ msgid ""
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:484
+#: user-manual.txt:466
 msgid ""
 "These files should be send to the _Subsurface_ mail list: "
 "_subsurface@subsurface-divelog.org_ with a request for the files to be "
-"analysed. Provide the dive computer make and model as well as contextual "
+"analyzed. Provide the dive computer make and model as well as contextual "
 "information about the dives recorded on the dive computer."
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:487
+#: user-manual.txt:469
 #, no-wrap
 msgid "Connecting _Subsurface_ to a Bluetooth-enabled dive computer"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:488 user-manual.txt:3606
+#: user-manual.txt:470 user-manual.txt:3578
 #, no-wrap
 msgid "images/icons/bluetooth.jpg"
 msgstr "images/icons/bluetooth.jpg"
 
 #. type: Plain text
-#: user-manual.txt:495
+#: user-manual.txt:477
 msgid ""
 "Bluetooth is becoming a more common way of communication between dive "
-"computers and _Subsurface_, for instance, the Shearwater Petrel Mk2 and the "
-"OSTC Mk3. _Subsurface_ provides a largely operating system independent "
+"computers and _Subsurface_, for or instance, the Shearwater Petrel Mk2 and "
+"the OSTC Mk3. _Subsurface_ provides a largely operating system independent "
 "Bluetooth interface. Setting up _Subsurface_ for Bluetooth communication "
 "requires four steps:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:497
+#: user-manual.txt:479
 msgid ""
-"Ensure that Bluetooth is activated on the host computer running _Subsurface_."
+"Be sure Bluetooth is activated on the host computer running _Subsurface_."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:498
-msgid ""
-"Ensure that _Subsurface_ sees the Bluetooth adapter on the host computer."
+#: user-manual.txt:480
+msgid "Be sure _Subsurface_ sees the Bluetooth adapter on the host computer."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:499
+#: user-manual.txt:481
 msgid ""
-"Ensure the Bluetooth-enabled dive computer is Bluetooth-discoverable and in "
+"Be sure the Bluetooth-enabled dive computer is Bluetooth-discoverable and in "
 "PC upload mode."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:500
+#: user-manual.txt:482
 msgid ""
-"Ensure that _Subsurface_ is paired with the Bluetooth-enabled dive computer."
+"Be sure _Subsurface_ is paired with the Bluetooth-enabled dive computer."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:504
+#: user-manual.txt:486
 msgid ""
 "Select the Download dialogue by selecting _Import -> Import from dive "
-"computer_ from the *Main Menu*. If one checks the check box labelled _"
-"\"Choose Bluetooth download mode\"_, the dialogue below appears."
+"computer_ from the *Main Menu*. If you check the box labelled _\"Choose "
+"Bluetooth download mode\"_, the dialogue below appears."
 msgstr ""
 
 #. type: Title =====
-#: user-manual.txt:505
+#: user-manual.txt:486
 #, no-wrap
 msgid "On Linux or MacOS:"
 msgstr "Sur Linux ou MacOS :"
 
 #. type: Target for macro image
-#: user-manual.txt:507
+#: user-manual.txt:488
 #, no-wrap
 msgid "images/DC_import_Bluetooth.jpg"
 msgstr "images/DC_import_Bluetooth.jpg"
 
 #. type: Plain text
-#: user-manual.txt:515
+#: user-manual.txt:519
 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 lefthand "
+"and its Bluetooth address are shown on the right hand side, On the left hand "
 "side, if the computer has connected more than one local Bluetooth devices "
 "the user can use the list box to indicate which one needs to connect to "
 "_Subsurface_.  The power state (on/off) of the Bluetooth adapter is shown "
-"below the address and can be changed by checking the _Turn on/off_ check box."
-msgstr ""
-
-#. type: Plain text
-#: user-manual.txt:520
-msgid ""
-"If the Bluetooth address is not shown, then _Subsurface_ does not see the "
-"local Bluetooth device. Ensure that the Bluetooth driver is installed "
-"correctly on the _Subsurface_ computer and check if it can be used by other "
-"Bluetooth utilities like _bluetoothctl_ or _bluemoon_. This achieves the "
-"first two steps above."
-msgstr ""
-
-#. type: Plain text
-#: user-manual.txt:524
-msgid ""
-"Ensure that the Bluetooth-enabled dive computer is in PC-upload mode and "
-"that it is discoverable by other Bluetooth devices. Consult the manual of "
-"the dive computer to perform this. Now the third item in the list above has "
-"been achieved."
-msgstr ""
-
-#. type: Plain text
-#: user-manual.txt:540
-msgid ""
-"Select the _Scan_ button towards the bottom left of the dialogue above. "
-"After searching for a small amount of time, the dive computer should be "
-"listed (perhaps as one of a number of Bluetooth devices) in the main list "
-"box on the lefthand side of the dialogue (see image above). If this is not "
-"achieved, select the _Clear_ button and then scan again for Bluetooth "
-"devices using the _Scan_ button. After performing these actions _Subsurface_ "
-"should see the dive computer.  The label of the discovered dive computer "
-"contains the name of the device, its address and its pairing status. If the "
-"device is not paired and has a red background colour, a context menu can be "
-"opened by selecting the item with a right-click.  Select the the _Pair_ "
-"option and wait for the task to complete. If this dive computer is being "
-"paired to Subsurface for the first time, it is possible that Subsurface will "
-"request a Pass Code or PIN number. The most commonly-used Pass Code is 0000, "
-"and this works for the Shearwater Petrel. If necessary, consult the user "
-"manual of the dive computer being used."
+"below the address and can be changed by checking the _Turn on/off_ box.  If "
+"the Bluetooth address is not shown, then _Subsurface_ does not see the local "
+"Bluetooth device. Be sure the Bluetooth driver is installed correctly on the "
+"_Subsurface_ computer and check if it can be used by other Bluetooth "
+"utilities like _bluetoothctl_ or _bluemoon_. This finishes the first two "
+"steps above.  Be sure the Bluetooth-enabled dive computer is in PC-upload "
+"mode and it is discoverable by other Bluetooth devices. Consult the manual "
+"of the dive computer for more information. Now the third item in the list "
+"above has been finished.  Select the _Scan_ button towards the bottom left "
+"of the dialogue above. After searching, the dive computer should be listed "
+"(perhaps as one of a number of Bluetooth devices) in the main list box on "
+"the lefthand side of the dialogue (see image above). If this does not work, "
+"select the _Clear_ button, then scan again for Bluetooth devices using the "
+"_Scan_ button. After taking these actions _Subsurface_ should see the dive "
+"computer.  The label of the discovered dive computer contains the name of "
+"the device, its address and its pairing status. If the device is not paired "
+"and has a red background color, a context menu can be opened by selecting "
+"the item with a right-click.  Select the the _Pair_ option and wait for the "
+"task to complete. If this dive computer is being paired to Subsurface for "
+"the first time, it’s possible Subsurface will request a Pass Code or PIN "
+"number. The most commonly-used Pass Code is 0000, and this works for the "
+"Shearwater Petrel. If necessary, consult the user manual of the dive "
+"computer being used."
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:547
+#: user-manual.txt:526
 msgid ""
 "Currently _Subsurface_ does not support Bluetooth pairing with dive "
 "computers that require a custom PIN code. In order to pair the devices, use "
@@ -1177,12 +1225,12 @@ msgid ""
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:549
+#: user-manual.txt:528
 msgid "One way to achieve this is to use +bluetoothctl+:"
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:560
+#: user-manual.txt:539
 #, no-wrap
 msgid ""
 "\t$ bluetoothctl\n"
@@ -1198,66 +1246,65 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:566
+#: user-manual.txt:545
 msgid ""
-"After the devices are paired the _Save_ button of the dialogue can be "
-"pressed.  This closes the Bluetooth dialogue. Now select _Download_ in the "
-"_Download from dive computer_ dialogue which should still be open. The "
-"downloaded dives are shown on the righthand side of the download dialogue."
+"After the devices are paired, press the _Save_ button of the dialogue.  This "
+"closes the Bluetooth dialogue. Now select _Download_ in the _Download from "
+"dive computer_ dialogue which should still be open. The downloaded dives are "
+"shown on the righthand side of the download dialogue."
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:567 user-manual.txt:3537 user-manual.txt:3621
+#: user-manual.txt:546 user-manual.txt:3505 user-manual.txt:3593
 #, no-wrap
 msgid "On Windows:"
 msgstr "Sur Windows :"
 
 #. type: Target for macro image
-#: user-manual.txt:568
+#: user-manual.txt:547
 #, no-wrap
 msgid "images/DC_import_Bluetooth_Windows.png"
 msgstr "images/DC_import_Bluetooth_Windows.png"
 
 #. type: Plain text
-#: user-manual.txt:578
+#: user-manual.txt:557
 msgid ""
 "On _Windows_ platforms the _Local Bluetooth device details section_ on the "
-"right is not displayed as is the case on the Linux/Mac implementations.  To "
-"successfully initiate a scan (by pressing the _Scan_ button)  check that the "
-"Bluetooth device on the _Subsurface_ computer is turned on by selecting the "
-"dive computer from the list of available Bluetooth devices (see image "
-"above). If the dive computer is accessed by Subsurface for the first time, "
-"it is possible that Subsurface will request a Pass Code/PIN number. Supply "
-"the Pass Code recommended in the user manual of the dive computer.  A Pass "
-"Code of 0000 is often appropriate."
+"right is not displayed as is the case on the Linux/Mac systems.  To start a "
+"scan (by pressing the _Scan_ button)  check that the Bluetooth device on the "
+"_Subsurface_ computer is turned on by selecting the dive computer from the "
+"list of available Bluetooth devices (see image above). If the dive computer "
+"is being accessed by Subsurface for the first time, it’s possible Subsurface "
+"will request a Pass Code or PIN number. Supply the Pass Code recommended in "
+"the user manual of the dive computer.  A Pass Code or PIN of 0000 is often "
+"the default."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:585
+#: user-manual.txt:564
 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 "
-"permissions and put a message on the right side of the screen: _Add a "
-"device, Tap to set up your DC device_. Always allow this pairing. After a "
-"discovered item is selected, select the _Save_ button.  Finally select the "
-"_Download_ button on the _Download_ dialogue and wait for the process to "
-"complete."
+"permission and put a message on the right side of the screen: _Add a device, "
+"Tap to set up your DC device_. Always allow this pairing. After a discovered "
+"item is selected, select the _Save_ button.  Finally select the _Download_ "
+"button on the _Download_ dialogue and wait for the process to complete."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:593
+#: user-manual.txt:572
 msgid ""
 "Currently _Subsurface_ works only with local Bluetooth adapters which use "
 "Microsoft Bluetooth Stack. If the local device uses _Widcomm_, _Stonestreet "
-"One Bluetopia Bluetooth_ or _BlueSoleil_ drivers it will definitely not "
-"work. However, Bluetooth hardware/dongles from these manufacturers (e.g. "
-"iSonic) that support the Microsoft Bluetooth Stack do work."
+"One Bluetopia Bluetooth_ or _BlueSoleil_ drivers it will not work. However, "
+"Bluetooth hardware/dongles from these manufacturers (e.g. iSonic) that "
+"support the Microsoft Bluetooth Stack do work."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:598
+#: user-manual.txt:577
 msgid ""
-"A log messageOn the bottom left of the _Remote Bluetooth device selection_ "
+"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 "
 "another dive computer for download using the \"Remote Bluetooth selection "
 "dialogue\" press the three-dots button from the _\"Choose Bluetooth download "
@@ -1265,7 +1312,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:608
+#: user-manual.txt:587
 #, no-wrap
 msgid ""
 "*IN CASE OF PROBLEMS*:  If the Bluetooth adapter from the _Subsurface_ computer\n"
@@ -1277,100 +1324,98 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:611
+#: user-manual.txt:590
 #, no-wrap
 msgid "Changing the name of a dive computer"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:627
+#: user-manual.txt:606
 msgid ""
 "It may be necessary to distinguish between different dive computers used to "
-"upload dive logs to _Subsurface_. For instance if one's partner's dive "
-"computer is the same make and model as one's own and dive logs are uploaded "
-"from both dive computers to the same _Subsurface_ computer, then one would "
-"perhaps like to call one dc \"Alice's Suunto D4\" and the other one \"Bob's "
-"Suunto D4\". Alternatively, consider a technical diver dives with two or "
-"more dive computers of the same model, the logs of both (or all) being "
-"uploaded.  In this case it might be prudent to call one of them \"Suunto D4 "
-"(1)\" and another one \"Suunto D4 (2)\". This is easily done in "
-"_Subsurface_.  On the *Main Menu*, select _Log -> Edit device names_. A "
-"dialog opens, indicating the current Model, ID and Nickname of the dive "
-"computers used for upload. Edit the Nickname field for the appropriate dive "
-"computer. After saving the Nickname, the dive logs show the nickname for "
-"that particular device instead of the model name, allowing easy "
-"identification of devices."
+"upload dive logs to _Subsurface_. For instance if a buddy’s dive computer is "
+"the same make and model as your own and dive logs are uploaded from both "
+"dive computers to the same _Subsurface_ computer, then you might like to "
+"call one \"Alice's Suunto D4\" and the other \"Bob's Suunto D4\". "
+"Alternatively, consider a technical diver who dives with two or more dive "
+"computers of the same model, the logs of both (or all) being uploaded.  In "
+"this case it might be prudent to call one of them \"Suunto D4 (1)\" and "
+"another \"Suunto D4 (2)\". This is easily done in _Subsurface_.  On the "
+"*Main Menu*, select _Log -> Edit device names_. A dialog box opens, showing "
+"the current Model, ID and Nickname of the dive computers used for upload. "
+"Edit the Nickname field for the appropriate dive computer. After saving the "
+"Nickname, the dive logs show the nickname for that particular device instead "
+"of the model name, allowing easy identification of devices."
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:629
+#: user-manual.txt:608
 #, no-wrap
 msgid "Updating the dive information imported from the dive computer."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:636
+#: user-manual.txt:615
 msgid ""
 "With the uploaded dives in the *Dive List*, the information from the dive "
-"computer is not complete and more details must be added in order to have a "
-"fuller record of the dives. To do this, the *Notes* and the *Equipment* tabs "
-"on the top left hand of the _Subsurface_ window should be used."
+"computer is not complete and more details must be added to have a full "
+"record of the dives. To do this, the *Notes* and the *Equipment* tabs on the "
+"top left hand of the _Subsurface_ window should be used."
 msgstr ""
 
 #. type: Title =====
-#: user-manual.txt:638
+#: user-manual.txt:617
 #, no-wrap
 msgid "Notes"
 msgstr "Notes"
 
 #. type: Plain text
-#: user-manual.txt:643
+#: user-manual.txt:622
 msgid ""
-"To have a more complete dive record the user needs to add additional "
+"To have a more complete dive record, the user needs to add additional "
 "information by hand. The procedure below is virtually identical for hand-"
 "entered dives and for dives downloaded from a dive computer."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:653
+#: user-manual.txt:632
 msgid ""
-"In some cases, one has to provide the date and time of the dive, e.g. when "
-"entering a dive by hand or when a dive computer does not provide the date "
-"and time of the dive.  (Usually the date and time of the dive, gas mixture "
-"and water temperature are shown as obtained from the dive computer)  If the "
-"contents of the *Notes tab* is changed or edited in any way, the message in "
-"a blue box at the top of the panel indicates that the dive is being edited. "
-"If one clicks on the *Notes* tab, the following fields are visible (left "
-"hand image, below):"
+"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 "
+"date and time of the dive.  (Usually the date and time of the dive, gas "
+"mixture and water temperature are shown as obtained from the dive computer)  "
+"If the contents of the *Notes tab* is changed or edited in any way, the "
+"message in a blue box at the top of the panel shows the dive is being "
+"edited. If you click on the *Notes* tab, the following fields are visible "
+"(left hand image, below):"
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:654
+#: user-manual.txt:633
 #, no-wrap
 msgid "images/AddDive3_f22.jpg"
 msgstr "images/AddDive3_f22.jpg"
 
 #. type: Plain text
-#: user-manual.txt:663
+#: user-manual.txt:642
 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 "
-"clicking the date, a calendar is displayed from which one can choose the "
+"clicking the date, a calendar is displayed from which you can choose the "
 "correct date. Press ESC to close the calendar.  The time values (hour and "
 "minutes) can also be edited directly by clicking on each of them in the text "
 "box and by over-typing the information displayed."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:674
+#: user-manual.txt:652
 #, no-wrap
 msgid ""
 "*Air/water temperatures*: Air and water temperatures during the dive are shown\n"
 "in text boxes to the right of the Start time. Many dive computers supply water\n"
-"temperature information and this box may therefore contain information.\n"
-"If air temperature is not provided by the dive computer, the first temperature reading\n"
-"might be used for the air temperature. Generally this is close enough to the real air temperature as\n"
-"the change in the temperature sensor reading is quite slow to follow the changes in the environment.\n"
+"temperature information and this box may have information.\n"
+"If air temperature isn’t provided by the dive computer, the first temperature reading\n"
+"might be used for the air temperature. Generally this is close to the real air temperature.\n"
 "If editing is required, only a value is required, the units of temperature will be\n"
 "automatically supplied by\n"
 "_Subsurface_ (following the _Preferences_, metric or imperial units will\n"
@@ -1378,87 +1423,84 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:676
+#: user-manual.txt:654
 #, no-wrap
 msgid "*Location*:\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:684
+#: user-manual.txt:662
 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 "
+"information in the *Notes* and *Equipment* tabs can therefore NOT be edited "
 "at the same time as the dive site information. Save all the other dive "
 "information (e.g.  divemaster, buddy, protective gear, notes about the dive) "
-"by selecting _Apply changes_ on the *Notes* tab before editing the dive site "
-"information. Only then, supply a dive site name in the textbox labelled "
-"_Location_ on the *Notes* tab."
+"by selecting _Apply changes_ on the *Notes* tab BEFORE editing the dive site "
+"information. Then supply a dive site name in the textbox labelled _Location_ "
+"on the *Notes* tab."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:702
+#: user-manual.txt:680
 msgid ""
-"Type the name of the dive site, e.g. \"Tihany, Lake Balaton, Hungary\".  If "
-"several dives are performed at the same location, the dive site information "
-"for the first dive is re-used.  Existing dive location information can be "
-"edited at any time by selecting (on the *Dive List* panel) a dive performed "
-"at that site and by opening the location information by clicking the globe "
-"button on the right of the location name (see image on the right, above). "
-"When entering a dive location name, auto location of dive site names makes "
-"it easy to select an existing dive site name (i.e. when typing the name of a "
-"dive site, a dropdown list appears showing all sites with similar names). If "
-"the dive site has been used before, click on the already-existing name.  The "
-"dive site names in the dropdown list contain either a globe symbol "
-"(indicating existing dive sites in the _Subsurface_ database)  or a *+* "
-"symbol (indicating dive site names that appear consistent with the current "
-"dive site name but which have not been added to the dive site database).  "
-"Therefore, if the present dive site has not been used before, a message "
-"appears as follows (image *A* below):"
+"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 "
+"first dive is re-used.  Existing dive locations can be edited by selecting "
+"(on the *Dive List* panel) a dive done at that site and by opening the "
+"location information. Click the globe button on the right of the location "
+"name (see image on the right, above). When entering a dive location name, "
+"auto location of dive site names makes it easy to select an existing dive "
+"site name.  When typing the name of a dive site, a dropdown list appears "
+"showing all sites with similar names. If the dive site has been used before, "
+"click on the already-existing name.  The dive site names in the dropdown "
+"list contain either a globe symbol (indicating existing dive sites in the "
+"_Subsurface_ database)  or a *+* symbol (indicating dive site names that "
+"appear consistent with the current dive site name but which haven’t been "
+"added to the dive site database).  If the present dive site has not been "
+"used before, a message appears as follows (image *A* below):"
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:703
+#: user-manual.txt:681
 #, no-wrap
 msgid "images/Locations1_f22.jpg"
 msgstr "images/Locations1_f22.jpg"
 
 #. type: Plain text
-#: user-manual.txt:708
+#: user-manual.txt:686
 msgid ""
 "Doubleclick on the new dive site name. A panel appears to enter the "
-"coordinates and other important information about the site (image *B*, "
-"above). The most important items are the coordinates of the site. There are "
-"three ways of specifying the coordinates:"
+"coordinates and other information about the site (image *B*, above). The "
+"most important items are the coordinates of the site. There are three ways "
+"to specify coordinates:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:715
+#: user-manual.txt:692
 msgid ""
-"One can find the coordinates on the world map in the bottom right hand part "
-"of the _Subsurface_ window. The map displays an orange bar indicating \"No "
-"location data - Move the map and double-click to set the dive location\". "
-"Upon a doubleclick at the appropriate place, the orange bar disappears and "
-"the coordinates are stored."
+"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 "
+"and double-click to set the dive location\". Doubleclick at the appropriate "
+"place, and the orange bar disappears and the coordinates are stored."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:720
+#: user-manual.txt:697
 msgid ""
-"The coordinates can be obtained from the _Subsurface_ Companion app if the "
-"user has an Android or iPhone device with GPS and if the coordinates of the "
-"dive site were stored using that device.  xref:S_Companion[Click here for "
-"more information]"
+"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:"
+"S_Companion[Click here for more information]"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:723
+#: user-manual.txt:699
 msgid ""
-"The coordinates can be entered by hand if they are known, using one of four "
-"formats with latitude followed by longitude:"
+"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:728
+#: user-manual.txt:704
 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. "
@@ -1466,163 +1508,162 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:736
+#: user-manual.txt:712
 msgid ""
 "Southern hemisphere latitudes are given with a *S*, e.g. S30°, or with a "
 "negative value, e.g. -30.22496. Similarly western longitudes are given with "
 "a *W*, e.g. W07°, or with a negative value, e.g. -7.34323. Some keyboards "
 "don't have the degree sign (°). It can be replaced by a *d* like this: N30d "
-"W20d.  If both a dive site name and coordinates have been provided, Save the "
+"W20d.  If both a dive site name and coordinates have been provided, save the "
 "dive site information by selecting the button _Apply changes_ at the top of "
 "the panel."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:742
+#: user-manual.txt:718
 #, no-wrap
 msgid ""
-"*Important*: GPS coordinates of a dive site are linked to the Location\n"
-"name - so *saving* a dive site with only coordinates and no dive site name\n"
-"causes unexpected behaviour (Subsurface will think that all of these\n"
+"*Important*: GPS coordinates of a dive site are linked to the location\n"
+"name - so *saving* a dive site with only coordinates and no name\n"
+"causes problems. (Subsurface will think all of these\n"
 "dives have the same location and try to keep their GPS coordinates the\n"
 "same).\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:752
+#: user-manual.txt:728
 #, no-wrap
 msgid ""
 "*Dive site name lookup:* If coordinates have been typed into the appropriate\n"
-"text box, one can perform an automated name lookup based on the coordinates.\n"
-"This is achieved when _Subsurface_ uses the Internet to find the name of the dive site\n"
+"text box, you can do an automated name lookup based on the coordinates.\n"
+"This is done when _Subsurface_ uses the Internet to find the name of the dive site\n"
 "based on the coordinates that were typed. If a name has been found, it is\n"
 "automatically inserted into the tags box. The list box\n"
 "(Titled _Dive sites on same coordinates_\") at the bottom\n"
 "of the dive site panel contains the names of other dives sites used at the\n"
 "current location. For instance if the dive site is \"Blue Hole\" and there are several\n"
-"dive sites named \"Blue Hole\", all these sites are listed in this list box.\n"
+"sites named \"Blue Hole\", all of them are listed.\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:757
+#: user-manual.txt:733
 msgid ""
-"Enter any other textual information about the dive site (Description and "
+"Enter any other contextual information about the dive site (Description and "
 "Notes), then select _Apply Changes_ to save the geolocation for this dive "
-"site. At a later stage the dive site information can be edited by clicking "
-"the globe icon to the right of the dive site name in the *Notes tab*."
+"site.  The dive site information can later be edited by clicking the globe "
+"icon to the right of the dive site name in the *Notes tab*."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:762
+#: user-manual.txt:738
 #, no-wrap
 msgid ""
-"*Dive mode*: This is a dropdown box allowing one to choose the type of dive\n"
-"performed. The options are OC (Open Circuit SCUBA, the default seting, meant for most recreational dives),\n"
+"*Dive mode*: This is a dropdown box allowing you to choose the type of dive\n"
+"performed. The options are OC (Open Circuit SCUBA, the default setting, for most recreational dives),\n"
 "Freedive (dive without SCUBA equipment), CCR (Closed-circuit\n"
 "rebreather) and pSCR (Passive semi-closed rebreather).\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:767
+#: user-manual.txt:743
 #, no-wrap
 msgid ""
-"*Divemaster*: The name of the dive master or dive guide for this dive should be\n"
+"*Divemaster*: The name of the divemaster or dive guide should be\n"
 "entered in this field\n"
 "which offers auto selection based on the list of dive masters in\n"
 "the current logbook.\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:772
+#: user-manual.txt:748
 #, no-wrap
 msgid ""
-"*Buddy*: In this field, one enters the name(s) of the buddy / buddies\n"
-"(separated with commas) who accompanied him/her on the\n"
+"*Buddy*: In this field, enter the name(s) of the buddy or buddies\n"
+"(separated with commas) who were on the\n"
 "dive. Auto selection based on the list of buddies in the current logbook is\n"
 "offered.\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:777
+#: user-manual.txt:753
 #, no-wrap
 msgid ""
 "*Suit*: Here the type of dive suit used can be entered.\n"
 "Auto selection of the suit description is available.\n"
 "Some dry-suit users may choose to use this field to record what combination of\n"
-"suit and thermal undersuit was used.\n"
+"suit and thermal under suit was used.\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:780
+#: user-manual.txt:756
 #, no-wrap
 msgid ""
-"*Rating*: One can provide a subjective overall rating of the dive on a\n"
+"*Rating*: You can provide a subjective overall rating of the dive on a\n"
 "5-point scale by clicking the appropriate star on the rating scale.\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:784
+#: user-manual.txt:760
 #, no-wrap
 msgid ""
-"*Visibility*: Similarly, one can provide a rating of visibility during the\n"
+"*Visibility*: You can provide a rating of visibility during the\n"
 "dive on a\n"
 "5-point scale by clicking the appropriate star.\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:793
+#: user-manual.txt:768
 #, no-wrap
 msgid ""
-"*Tags*: Tags that describe the type of dive performed can be entered\n"
+"*Tags*: Tags that describe the type of dive done can be entered\n"
 "here (separated by commas). Examples of common tags are boat, drift, training,\n"
 "cave, etc.\n"
-"_Subsurface_ has many built-in tags. If the user starts typing a tag, the\n"
+"_Subsurface_ has many built-in tags. If you starts typing a tag, the\n"
 "program\n"
-"will list the tags that correspond to the typing. For instance, if the user\n"
-"typed\n"
-"+cav+, then the tags *cave* and *cavern* are shown for the user to choose from.\n"
+"will list the tags that correspond to the typing. For instance, by typing\n"
+"+cav+, the tags *cave* and *cavern* are shown to choose from.\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:795
+#: user-manual.txt:770
 #, no-wrap
 msgid "*Notes*: Any additional information for the dive can be entered here.\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:800
+#: user-manual.txt:775
 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, so "
-"there's no need to use them until *ALL* other information has been added. "
-"The image xref:S_Notes_dc[at the beginning of this section] shows an example "
-"of a *Notes tab* after completion of the dive information."
+"information for tabs in the *Info* panel and in the *Dive Profile* panel. "
+"Use them when *ALL* other information has been added. The image xref:"
+"S_Notes_dc[at the beginning of this section] shows an example of a *Notes "
+"tab* after completing the dive information."
 msgstr ""
 
 #. type: Title =====
-#: user-manual.txt:801
+#: user-manual.txt:776
 #, no-wrap
 msgid "Equipment"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:806
+#: user-manual.txt:781
 msgid ""
-"The Equipment tab allows one to enter information about the type of cylinder "
-"and gas used as well as the weights used for the dive. The message in a blue "
+"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 "
 "box at the top of the panel:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:813
+#: user-manual.txt:788
 msgid ""
-"indicates that the dive is being edited. This is a highly interactive part "
-"of _Subsurface_ and the information on cylinders and gases (entered here) "
-"determines the behaviour of the *Dive profile* (top right-hand panel)."
+"shows the dive is being edited. This is a highly interactive part of "
+"_Subsurface_ and the information on cylinders and gases (entered here) "
+"determines the behavior of the *Dive profile* (top right-hand panel)."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:817
+#: user-manual.txt:792
 #, no-wrap
 msgid ""
 "*Cylinders*: The cylinder information is entered through a dialogue that looks\n"
@@ -1630,51 +1671,45 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:818
+#: user-manual.txt:793
 #, no-wrap
 msgid "images/DC_gas-dialogue1_f20.jpg"
 msgstr "images/DC_gas-dialogue1_f20.jpg"
 
 #. type: Plain text
-#: user-manual.txt:827
+#: user-manual.txt:806
 msgid ""
 "For hand-entered dives, this information needs to be typed in. For dive "
-"computers, _Subsurface_ often obtains the gas used from the dive computer "
-"and automatically inserts the gas composition(% oxygen or % helium) in the "
-"table. The + button at the top right allows the user to add more cylinders "
-"for this dive. The dark dustbin icon on the left allows the deletion of "
-"information for a cylinder.  Note that it is not possible to delete a "
-"cylinder if it is used during the dive. A cylinder might be implicitly used "
-"in the dive, even without a gas change event."
-msgstr ""
-
-#. type: Plain text
-#: user-manual.txt:832
-msgid ""
-"The user should start by selecting a cylinder type on the left-hand side of "
-"the table.  To select a cylinder, the _Type_ box should be clicked. This "
-"brings up a list button that can be used to display a dropdown list of "
-"cylinders:"
+"computers, _Subsurface_ often gets the gas used from the dive computer and "
+"automatically inserts the gas composition(% oxygen or % helium) in the "
+"table. The + button at the top right lets you add more cylinders for this "
+"dive. The dark dust bin icon on the left lets you delete information for a "
+"cylinder.  Note that it is not possible to delete a cylinder if it is used "
+"during the dive. A cylinder might be implicitly used in the dive, even "
+"without a gas change event.  Start by selecting a cylinder type on the left-"
+"hand side of the table.  To select a cylinder, the _Type_ box should be "
+"clicked. This brings up a list button that can be used to display a dropdown "
+"list of cylinders:"
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:833
+#: user-manual.txt:807
 #, no-wrap
 msgid "images/DC_gas-dialogue2_f20.jpg"
 msgstr "images/DC_gas-dialogue2_f20.jpg"
 
 #. type: Plain text
-#: user-manual.txt:840
+#: user-manual.txt:814
 msgid ""
 "The drop-down list can then be used to select the cylinder type that was "
-"used for this dive or the user may start typing in the box which shows the "
+"used for this dive, or just start typing in the box which shows the "
 "available options for the entered characters. The *Size* of the cylinder as "
 "well as its working pressure (_Work.press_) will automatically be shown in "
 "the dialogue."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:844
+#: user-manual.txt:818
 msgid ""
 "Next, indicate the starting pressure and the ending pressure of the "
 "specified gas during the dive. The unit of pressure (metric/imperial)  "
@@ -1682,7 +1717,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:855
+#: user-manual.txt:829
 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, "
@@ -1691,108 +1726,108 @@ msgid ""
 "the cylinder, save the data either by pressing _ENTER_ on the keyboard or by "
 "clicking outside the cell containing the cursor. Information for any "
 "additional cylinders can be added by using the + button at the top right "
-"hand. Following is an example of a complete description for a dive using two "
-"cylinders (air and EAN50):"
+"hand. The following is an example of a complete description for a dive using "
+"two cylinders (air and EAN50):"
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:856
+#: user-manual.txt:830
 #, no-wrap
 msgid "images/CylinderDataEntry3_f20.jpg"
 msgstr "images/CylinderDataEntry3_f20.jpg"
 
 #. type: Plain text
-#: user-manual.txt:863
+#: user-manual.txt:837
 #, no-wrap
 msgid ""
 "*Weights*: Information about the weight system used can be entered\n"
-"using a dialogue very similar to that of the cylinder information. If one\n"
-"clicks\n"
+"using a dialogue similar to that of the cylinder information. If you\n"
+"click\n"
 "the + button on the top right of the weights dialogue, the table looks like\n"
 "this:\n"
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:864
+#: user-manual.txt:838
 #, no-wrap
 msgid "images/WeightsDataEntry1_f20.jpg"
 msgstr "images/WeightsDataEntry1_f20.jpg"
 
 #. type: Plain text
-#: user-manual.txt:868
+#: user-manual.txt:842
 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:869
+#: user-manual.txt:843
 #, no-wrap
 msgid "images/WeightsDataEntry2_f20.jpg"
 msgstr "images/WeightsDataEntry2_f20.jpg"
 
 #. type: Plain text
-#: user-manual.txt:883
+#: user-manual.txt:857
 msgid ""
 "This can be used to select the type of weight system used during the dive or "
-"the user may start typing in the box to specify a different weighting "
-"mechanism that will be saved by _Subsurface_.  In the *Weight* field, type "
-"in the amount of weight used during the dive. After specifying the weight "
-"system, save the data by either pressing _ENTER_ on the keyboard or by "
-"clicking outside the cell with the cursor.  It is possible to enter "
-"information for more than one weight system by adding an additional system "
-"using the + button on the top right hand. Weight systems can be deleted "
-"using the dustbin icon on the left hand. Here is an example of information "
-"for a dive with two types of weights: integrated as well as a weight belt:"
+"just may start typing in the box to specify a different weighting mechanism "
+"that will be saved by _Subsurface_.  In the *Weight* field, type in the "
+"amount of weight used during the dive. After specifying the weight system, "
+"save the data by pressing _ENTER_ on the keyboard or by clicking outside the "
+"cell with the cursor.  It’s possible to enter information for more than one "
+"weight system by adding an additional system using the + button on the top "
+"right hand. Weight systems can be deleted using the dust bin icon on the "
+"left hand. Here is an example of information for a dive with two types of "
+"weights: integrated as well as a weight belt:"
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:884
+#: user-manual.txt:858
 #, no-wrap
 msgid "images/WeightsDataEntry3_f20.jpg"
 msgstr "images/WeightsDataEntry3_f20.jpg"
 
 #. type: Title ====
-#: user-manual.txt:886
+#: user-manual.txt:860
 #, no-wrap
 msgid "Editing several selected dives simultaneously"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:901
+#: user-manual.txt:876
 msgid ""
 "_METHOD 1_: After uploading dives from a dive computer, the dive profiles of "
-"each uploaded dive is shown in the *Dive profile* tab, as well as a few "
-"items of information in the *Notes* tab (e.g. water temperature) and in the "
-"*Equipment* tab (e.g. gas pressures and gas composition). However the other "
-"fields remain empty.  It may be useful to simultaneously edit some of the "
-"fields in the *Notes* and *Equipment* tabs.  For instance, it is possible "
-"that a diver performed several dives during a single day, using identical "
-"equipment while diving at the same dive site or with the same dive master "
-"and/or buddy or tags. Instead of completing the information for each of "
-"these dives separately, one can select all the dives for that day in the "
-"*Dive List* and insert the same information in the *Notes* and *Equipment* "
-"fields that need identical information. This is achieved by editing the dive "
-"notes or the equipment for any one of the selected dives."
+"each is shown in the *Dive profile* tab, as well as a few items of "
+"information in the *Notes* tab (e.g. water temperature) and in the "
+"*Equipment* tab (e.g. gas pressures and gas composition). Other fields "
+"remain empty.  It may be useful to simultaneously edit some of the fields in "
+"the *Notes* and *Equipment* tabs.  For instance, it’s possible that a diver "
+"performed several dives during a single day, using identical equipment at "
+"the same dive site, or with the same divemaster and/or buddy or tags. "
+"Instead of completing the information for each dive separately, select all "
+"the dives for that day in the *Dive List* and insert the same information in "
+"the *Notes* and *Equipment* fields that need identical information. This is "
+"done by editing the dive notes or the equipment for any one of the selected "
+"dives."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:911
+#: user-manual.txt:886
 msgid ""
-"The simultaneous editing only works with fields that do not already contain "
-"information.  This means that, if some fields have been edited for a "
-"particular dive among the selected dives, these are not changed while "
-"editing the dives simultaneously. Technically, the rule for editing several "
-"dives simultaneously is: if the data field being edited contains _exactly "
-"the same information_ for all the dives that have been selected, the new, "
-"edited information is substituted for all the selected dives, otherwise only "
-"the edited dive is changed, even though several dives have been selected in "
-"the *Dive List*. This greatly speeds up the completion of the dive log after "
-"several similar dives."
+"Simultaneous editing only works with fields that do not already contain "
+"information.  This means if some fields have been edited for a particular "
+"dive among the selected dives, these are not changed while editing the dives "
+"simultaneously. Technically, the rule for editing several dives "
+"simultaneously is: if the data field being edited contains _exactly the same "
+"information_ for all the dives that have been selected, the new, edited "
+"information is substituted for all the selected dives. Otherwise only the "
+"edited dive is changed, even though several dives have been selected in the "
+"*Dive List*. This speeds up the completion of the dive log after several "
+"similar dives."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:920
+#: user-manual.txt:895
 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 "
@@ -1807,225 +1842,223 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:921
+#: user-manual.txt:896
 #, no-wrap
 msgid "Adding Bookmarks to a dive"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:926
+#: user-manual.txt:901
 msgid ""
-"Many divers wish to annotate their dives with text that indicate particular "
-"events during the dive, e.g. \"Saw dolphins\", or \"Released surface buoy\". "
-"This is easily done:"
+"Many divers wish to annotate dives with text that indicate particular "
+"events, e.g. \"Saw dolphins\", or \"Released surface buoy\". This is easily "
+"done:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:930
+#: user-manual.txt:905
 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 "
-"on the dive profile at the point that was initially selected (see *A* below)."
+"on the dive profile at that point (see *A* below)."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:932
+#: user-manual.txt:907
 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:935
+#: user-manual.txt:910
 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:938
+#: user-manual.txt:913
 msgid ""
-"If one hovers using the mouse over the red bookmark, the appropriate text is "
-"shown at the bottom of the information box (see *D* below)."
+"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:939
+#: user-manual.txt:914
 #, no-wrap
 msgid "images/Bookmarks.jpg"
 msgstr "images/Bookmarks.jpg"
 
 #. type: Title ====
-#: user-manual.txt:942
+#: user-manual.txt:917
 #, no-wrap
 msgid "Saving the updated dive information"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:953
+#: user-manual.txt:928
 msgid ""
 "The information entered in the *Notes* tab and the *Equipment* tab can be "
 "saved by using the two buttons on the top right hand of the *Notes* tab. If "
 "the _Apply changes_ button is clicked, the dive data are saved in the memory "
-"image of the dive. If the _Discard changes_ button is clicked, then the "
-"newly entered dive data are erased from the computer memory, although the "
-"dive profile is retained. When the user exits _Subsurface_ there is a final "
-"prompt to confirm that the new data should now be saved permanently on the "
+"image of the dive. If the _Discard changes_ button is clicked, the newly "
+"entered dive data are erased from the computer memory, although the dive "
+"profile is retained. When the user exits _Subsurface_ there is a final "
+"prompt to confirm the new data should now be saved permanently on the "
 "computer disk."
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:954
+#: user-manual.txt:929
 #, 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:980
+#: user-manual.txt:954
 msgid ""
-"If a user has been diving for some time, it is possible that several dives "
-"were logged using other dive log software. This information does not need "
-"retyping because these dive logs can probably be imported into _Subsurface_. "
-"_Subsurface_ will import dive logs from a range of other dive log software. "
-"While some software is supported natively, for others the user has to export "
-"the logbook(s) to an intermediate format so that they can then be imported "
-"by _Subsurface_.  Currently, _Subsurface_ supports importing CSV log files "
-"from several sources.  APD LogViewer, XP5, Sensus and Seabear files are "
-"preconfigured, but because the import is flexible, users can configure their "
-"own imports.  Manually kept log files (e.g. a spreadsheet) can also be "
-"imported by configuring the CSV import.  _Subsurface_ can also import UDDF "
-"and UDCF files used by some divelog software and some dive computers, like "
-"the Heinrichs & Weikamp DR5. Finally, for some divelog software like Mares "
-"Dive Organiser it is currently suggested to import the logbooks first into a "
-"webservice like _divelogs.de_ and then import them from there with "
-"_Subsurface_, as divelogs.de supports a few additional logbook formats that "
-"_Subsurface_ currently cannot parse."
-msgstr ""
-
-#. type: Plain text
-#: user-manual.txt:990
-msgid ""
-"If the format of other software is supported natively on Subsurface, it "
-"should be sufficient to select either _Import -> Import log files_ or _File -"
-"> Open log file_. _Subsurface_ supports the data formats of many dive "
-"computers, including Suunto and Shearwater. When importing dives, "
-"_Subsurface_ tries to detect multiple records for the same dive and merges "
-"the information as best as it can. If there are no time zone issues (or "
-"other reasons that would cause the beginning time of the dives to be "
-"significantly different) _Subsurface_ will not create duplicate entries. "
-"Below follows more specific information to achieve data import to "
-"_Subsurface_."
+"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 "
+"_Subsurface_. _Subsurface_ will import dive logs from a range of other dive "
+"log software. While some software is supported natively, for others you will "
+"need to export the logbook(s) to an intermediate format so they can then be "
+"imported by _Subsurface_.  Currently, _Subsurface_ supports importing CSV "
+"log files from several sources.  APD LogViewer, XP5, Sensus and Seabear "
+"files are preconfigured, but because the import is flexible, users can "
+"configure their own imports.  Manually kept log files (e.g. a spreadsheet) "
+"can also be imported by configuring the CSV import.  _Subsurface_ can also "
+"import UDDF and UDCF files used by some dive log software and some dive "
+"computers, like the Heinrichs & Weikamp DR5. Finally, for some dive log "
+"software like Mares Dive Organizer we currently recommend you import the "
+"logbooks first into a web service like _divelogs.de_ and then import from "
+"there with _Subsurface_. Divelogs.de supports a few additional logbook "
+"formats that _Subsurface_ currently cannot handle."
+msgstr ""
+
+#. type: Plain text
+#: user-manual.txt:964
+msgid ""
+"If the format of other software is supported natively on Subsurface, select "
+"either _Import -> Import log files_ or _File -> Open log file_. _Subsurface_ "
+"supports the data formats of many dive computers, including Suunto and "
+"Shearwater. When importing dives, _Subsurface_ tries to detect multiple "
+"records for the same dive and merges the information as best as it can. If "
+"there are no time zone issues (or other reasons that would cause the "
+"beginning time of the dives to be significantly different) _Subsurface_ will "
+"not create duplicate entries. Below is more specific information to import "
+"data to _Subsurface_."
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:991
+#: user-manual.txt:964
 #, no-wrap
 msgid "Using the universal import dialogue"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:997
+#: user-manual.txt:970
 msgid ""
-"Importing dives from other software is performed through a universal "
-"interface activated by selecting _Import_ from the Main Menu, then clicking "
-"on _Import Log Files_. This brings up dialogue *A*, below."
+"Importing dives from other software is done through a universal interface "
+"activated by selecting _Import_ from the Main Menu, then clicking on _Import "
+"Log Files_. This brings up dialogue *A*, below."
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:998
+#: user-manual.txt:971
 #, no-wrap
 msgid "images/Import1_f20.jpg"
 msgstr "images/Import1_f20.jpg"
 
 #. type: Plain text
-#: user-manual.txt:1003
+#: user-manual.txt:976
 msgid ""
 "Towards the bottom right is a dropdown selector with a default label of "
-"_Dive Log Files_ which gives access to the different types of direct imports "
-"available, as in dialogue *B*, above. Currently these are:"
+"_Dive Log Files_ which accesses different types of direct imports available, "
+"as in dialogue *B*, above. Currently these are:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1005
+#: user-manual.txt:978
 msgid ""
 "XML-formatted dive logs (DivingLog 5.0, MacDive and several other dive log "
 "systems)"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1006
+#: user-manual.txt:979
 msgid "Cochran dive logs"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1007
+#: user-manual.txt:980
 msgid "UDDF-formatted dive logs (e.g. Kenozoooid)"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1008
+#: user-manual.txt:981
 msgid "UDCF-formatted dive logs"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1009
+#: user-manual.txt:982
 msgid "Poseidon MkVI CCR logs"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1010
+#: user-manual.txt:983
 msgid "APD Inspiration/Evolution CCR logs"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1011
+#: user-manual.txt:984
 msgid "LiquiVision logs"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1012
+#: user-manual.txt:985
 msgid "divelog.de logs"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1013
+#: user-manual.txt:986
 msgid "OSTC Tools logs"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1014
+#: user-manual.txt:987
 msgid "JDiveLog"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1015
+#: user-manual.txt:988
 msgid "Suunto Dive Manager (DM3 and DM4)"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1016
+#: user-manual.txt:989
 msgid ""
 "CSV (text-based and spreadsheet-based) dive logs, including APD CCR logs"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1021
+#: user-manual.txt:994
 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 "
-"imported dive log in the _Subsurface_ *Dive List*. Some other formats, not "
+"window containing the file list on the right of the dialogue, opens the "
+"imported dive log in the _Subsurface_ *Dive List*. Some other formats not "
 "accessible through the Import dialogue are also supported, as explained "
 "below."
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:1022
+#: user-manual.txt:995
 #, no-wrap
 msgid "Importing from  OSTCTools"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1031
+#: user-manual.txt:1004
 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 "
@@ -2038,104 +2071,105 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1035
+#: user-manual.txt:1008
 msgid ""
-"Actually, 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 although untested, Frog, OSTC2 and OSTC CR."
+"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 "
+"although untested, Frog, OSTC2 and OSTC CR."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1040
+#: user-manual.txt:1013
 msgid ""
-"Please, remember that OSTCTools is *not* a true diving log software, but a "
-"useful set of tools for analysis and management of OSTC devices. This way, "
-"only raw dive computer data will be performed with the import to "
-"_Subsurface_; one has to to manually complete the rest of data which may be "
-"important (buddies, equipment, notes, etc)."
+"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. "
+"Only raw dive computer data will be imported to _Subsurface_; you have to "
+"manually complete the rest of the data you want (buddies, equipment, notes, "
+"etc)."
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:1042
+#: user-manual.txt:1015
 #, no-wrap
-msgid "Importing from Mares Dive Organiser V2.1"
+msgid "Importing from Mares Dive Organizer V2.1"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1049
+#: user-manual.txt:1022
 msgid ""
-"Since Mares utilise proprietary Windows software not compatible with multi-"
+"Since Mares uses proprietary Windows software not compatible with multi-"
 "platform applications, these dive logs cannot be directly imported into "
 "_Subsurface_. Mares dive logs need to be imported using a three-step "
-"process, using _www.divelogs.de_ as a mechanism to extract the dive log "
+"process, using _www.divelogs.de_ as a gateway to extract the dive log "
 "information."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1054
+#: user-manual.txt:1027
 msgid ""
-"Export the dive log data from Mares Dive Organiser to the user's desktop, "
-"using a _.sdf_ file name extension. Refer to xref:Mares_Export[Appendix C] "
-"for more information."
+"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 "
+"information."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1060
+#: user-manual.txt:1033
 msgid ""
-"Data should then be imported into _www.divelogs.de_. One needs to create a "
-"user account in _www.divelogs.de_, log into that web site, then select "
-"_Import Logbook -> Dive Organiser_ from the menu on the left hand side.  The "
-"instructions must be carefully followed to transfer the dive information (in "
-"_.sdf_ format) from the Dive Organiser database to _www.divelogs.de_."
+"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 "
+"select _Import Logbook -> Dive Organizer from the menu on the left hand "
+"side.  The instructions must be carefully followed to transfer the dive "
+"information (in _.sdf_ format) from the Dive Organizer database to _www."
+"divelogs.de_."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1062
+#: user-manual.txt:1035
 msgid ""
 "Finally, import the dives from _divelogs.de_ to _Subsurface_, using the "
 "instructions below."
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:1065
+#: user-manual.txt:1038
 #, no-wrap
 msgid "Importing dives from *divelogs.de*"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1078
+#: user-manual.txt:1051
 msgid ""
-"The import of dive information from _divelogs.de_ is simple, using a single "
+"Importing dive information from _divelogs.de_ is simple, using a single "
 "dialogue box. The _Import -> Import from Divelogs.de_ option should be "
 "selected from the Main Menu. This brings up a dialogue box (see image *A* "
-"below). Enter a user-ID and password for _divelogs.de_ into the appropriate "
-"fields and then select the _Download_ button. Download from _divelogs.de_ "
-"starts immediately, displaying a progress bar in the dialogue box. At the "
-"end of the download, the success status is indicated (see image *B*, below). "
-"The _Apply_ button should then be selected, after which the imported dives "
-"appear in the _Subsurface_ *Dive List* panel."
+"below). Enter a user-ID and password for _divelogs.de_ and then select the "
+"_Download_ button. Download from _divelogs.de_ starts immediately, "
+"displaying a progress bar in the dialogue box. At the end of the download, "
+"the success status is shown (see image *B*, below). The _Apply_ button "
+"should then be selected, after which the imported dives appear in the "
+"_Subsurface_ *Dive List* panel."
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:1079
+#: user-manual.txt:1052
 #, no-wrap
 msgid "images/Divelogs1.jpg"
 msgstr "images/Divelogs1.jpg"
 
 #. type: Title ====
-#: user-manual.txt:1082
+#: user-manual.txt:1055
 #, no-wrap
 msgid "Importing data in CSV format"
 msgstr "Importer des données au format CSV"
 
 #. type: Plain text
-#: user-manual.txt:1093
+#: user-manual.txt:1066
 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 "
 "circuit rebreathers) or as dive metadata (in case the user keeps dive data "
 "in a spreadsheet). The _CSV_ format is a universal simplified format that "
-"allows for easy information exchange between different computers or software "
+"allows easy information exchange between different computers or software "
 "packages. For an introduction to CSV-formatted files see xref:S_CSV_Intro[A "
 "Diver's Introduction To CSV Files]. _Subsurface_ dive logs can also be "
 "exported in _CSV_ format to other software that reads this format. See xref:"
@@ -2145,61 +2179,61 @@ msgid ""
 msgstr ""
 
 #. type: Title =====
-#: user-manual.txt:1095
+#: user-manual.txt:1068
 #, 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:1100
+#: user-manual.txt:1073
 msgid ""
-"One can view a _CSV_ file by using an ordinary text editor. It is normally "
-"organised into a single line that provides the headers (or _field names_ or "
+"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 "
 "_column headings_) of the data columns, followed by the data, one record per "
 "line."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1102
+#: user-manual.txt:1075
 msgid ""
 "There are two types of _CSV_ dive logs that can be imported into "
 "_Subsurface_:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1108
+#: user-manual.txt:1081
 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, "
-"dive duration, names of buddy and dive master and perhaps some information "
-"about cylinder pressures before and after the dive, as well as a comment or "
-"two about the dive. All the data for a single dive go on a single line of "
-"text, following the order of the column headings."
+"dive duration, names of buddy and divemaster and information about cylinder "
+"pressures before and after the dive, as well as comments about the dive. All "
+"the data for a single dive go on a single line of text, following the order "
+"of the column headings."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1117
+#: user-manual.txt:1090
 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 "
-"intervals, indicating depth, water temperature at that depth, and cylinder "
-"pressure at that moment in time. Each line contains the information for a "
-"single instant in time during the dive, 30 seconds after that of the "
-"previous instant. Many lines are required to complete the depth profile "
-"information for a single dive. This is a common export format used by closed-"
-"circuit rebreather (CCR) dive equipment and many software packages that "
-"handle dive computer data and/or dive logs."
+"intervals, indicating depth, water temperature, and cylinder pressure at "
+"that moment in time. Each line contains the information for a single instant "
+"in time during the dive, 30 seconds after that of the previous instant. Many "
+"lines are required to complete the depth profile information for a single "
+"dive. This is a common export format used by closed-circuit rebreather (CCR) "
+"dive equipment and many software packages that handle dive computer data and/"
+"or dive logs."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1120
+#: user-manual.txt:1093
 msgid ""
-"Before being able to import the _CSV_ data to _Subsurface_ *one needs to "
+"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:1128
+#: user-manual.txt:1101
 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 "
@@ -2211,7 +2245,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1132
+#: user-manual.txt:1105
 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 "
@@ -2220,15 +2254,15 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1134
+#: user-manual.txt:1107
 msgid ""
 "Is the numeric information (e.g. dive depth) in metric or in imperial units?"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1141
+#: user-manual.txt:1114
 msgid ""
-"Armed with this information, importing the data into _Subsurface_ is "
+"With this information, importing the data into _Subsurface_ is "
 "straightforward. Select _Import -> Import Log Files_ from the main menu. In "
 "the resulting file selection menu, select _CSV files_ (towards the bottom "
 "right). This shows all .CSV files in the selected directory. Select the file "
@@ -2236,84 +2270,83 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:1142
+#: user-manual.txt:1115
 #, no-wrap
 msgid "images/csv_import1_f20.jpg"
 msgstr "images/csv_import1_f20.jpg"
 
 #. type: Plain text
-#: user-manual.txt:1153
+#: user-manual.txt:1126
+#, no-wrap
 msgid ""
-"Notice that, at the top left, there is a dropdown list containing pre-"
-"configured settings for some of the more common dive computers and software "
-"packages encountered by divers. If the _CSV_ file being imported originated "
-"from any of these pre-configured items, then select it. Otherwise use the "
-"_Manual Import_ option. The configuration panel also has dropdown lists for "
-"the specification of the appropriate field separator (Tab, comma or "
-"semicolon), the date format used in the _CSV_ file, the time units (seconds, "
-"minutes or minutes:seconds), as well as the unit system (metric or "
-"imperial). Selecting the appropriate options among these is critical for the "
-"successful import of the data."
+"At the top left, there is a dropdown list containing pre- configured\n"
+"settings for common dive computers and software packages.\n"
+" If the _CSV_ file being imported originated from any of\n"
+"these pre-configured items, select it. Otherwise use the _Manual Import_\n"
+"option. The configuration panel also has dropdown lists for the specification of the appropriate\n"
+"field separator (Tab, comma or semicolon), the date format used in the _CSV_ file,\n"
+"the time units (seconds, minutes or minutes:seconds), as well as the unit system\n"
+"(metric or imperial). Selecting the appropriate options among these is critical for\n"
+"the successful data import.\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1165
+#: user-manual.txt:1138
 msgid ""
-"The last remaining task is to ensure that all the data columns have the "
-"appropriate column headings. The top blue row of the data table contains the "
-"column headings found in the _CSV_ data file. The blue row of balloons "
-"immediately above these contains the names understood by _Subsurface_. These "
-"balloons can be moved using a drag-and-drop action. For instance, "
-"_Subsurface_ expects the column heading for Dive number (\" # \") to be "
-"\"Dive # \". If the column heading that _Subsurface_ expects is not in the "
-"blue row, then drag the appropriate balloon from the upper area and drop it "
-"in the appropriate blue cell at the top of the table. To indicate the "
-"correct column for \"Dive #\", drag the ballooned item labelled \"Dive # \" "
-"and drop it in the blue cell immediately above the white cell containing \" "
-"# \". This is depicted in the image below."
+"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 "
+"headings found in the _CSV_ data file. The blue row of balloons immediately "
+"above these contains the names understood by _Subsurface_. These balloons "
+"can be moved using a drag-and-drop action. For instance, _Subsurface_ "
+"expects the column heading for Dive number (\" # \") to be \"Dive # \". If "
+"the column heading that _Subsurface_ expects is not in the blue row, drag "
+"the appropriate balloon from the upper area and drop it in the appropriate "
+"blue cell at the top of the table. To indicate the correct column for \"Dive "
+"#\", drag the ballooned item labelled \"Dive # \" and drop it in the blue "
+"cell immediately above the white cell containing \" # \". This is depicted "
+"in the image below."
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:1166
+#: user-manual.txt:1139
 #, no-wrap
 msgid "images/csv_import2_f20.jpg"
 msgstr "images/csv_import2_f20.jpg"
 
 #. type: Plain text
-#: user-manual.txt:1172
+#: user-manual.txt:1145
 msgid ""
-"Continue in this way to ensure that all the column headings in the blue row "
-"of cells correspond to the headings listed in the top part of the dialogue. "
-"Having completed this task, select the _OK_ button to the bottom right of "
-"the dialogue.  The data from the _CSV_ file are imported and shown in the "
-"*Dive List* panel."
+"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.  "
+"When finished, select the _OK_ button on the bottom right of the dialogue.  "
+"The data from the _CSV_ file are imported and shown in the *Dive List* panel."
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:1176
+#: user-manual.txt:1149
 #, no-wrap
 msgid "*A Diver's Introduction to _CSV_ Files*\n"
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:1190
+#: user-manual.txt:1163
 msgid ""
 "_CSV_ is an abbreviation for a data file format: _Comma-Separated Values_. "
-"It is a file format allowing someone to view or edit the information using a "
-"text editor such as Notepad (Windows), gedit (Linux) or TextWrangler (OS/X). "
-"The two main advantages of the _CSV_ format is that the data are easily "
-"editable as text without any proprietary software and ensuring all "
-"information is human-readable, not being obscured by any custom or "
-"proprietary attributes that proprietary software insert into files.  Because "
-"of its simplicity the _CSV_ format is used as an interchange format between "
-"many software packages, e.g. between spreadsheet, statistical, graphics, "
-"database and diving software. Within _Subsurface_, _CSV_ files can also be "
-"used to import information from other sources such as spreadsheet-based dive "
-"logs and even from some dive computers."
+"It is a file format that lets you view or edit information using a text "
+"editor like Notepad (Windows), gedit (Linux) or TextWrangler (OS/X). There "
+"are two main advantages of the _CSV_ format.  First, the data are easily "
+"editable as text without any proprietary software.  Second, all information "
+"is human-readable, not obscured by any custom or proprietary attributes that "
+"proprietary software inserts into files.  Because of its simplicity the "
+"_CSV_ format is used as an interchange format between many software "
+"packages, e.g. between spreadsheet, statistical, graphics, database and "
+"diving software. Within _Subsurface_, _CSV_ files can also be used to import "
+"information from other sources like spreadsheet-based dive logs and some "
+"dive computers."
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:1199
+#: user-manual.txt:1172
 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 "
@@ -2321,7 +2354,7 @@ msgid ""
 "frequently a comma, a colon, a SPACE character or a TAB character. When "
 "exporting data from spreadsheet software, the field separator needs to be "
 "specified in order to create the _CSV_ file. _CSV_ files are normally "
-"organised into a single line that provides the headers (or _field names_) of "
+"organized into a single line that provides the headers (or _field names_) of "
 "the data columns, followed by the data, one record per line. Note that each "
 "field name may comprise more than one word separated by spaces; for instance "
 "_Dive site_, below. Here is an example of dive information for four dives "
@@ -2329,7 +2362,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:1205
+#: user-manual.txt:1178
 #, no-wrap
 msgid ""
 "\tDive site,Dive date,Time,Dive_duration, Dive_depth,Dive buddy\n"
@@ -2340,14 +2373,14 @@ msgid ""
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:1207
+#: user-manual.txt:1180
 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:1213
+#: user-manual.txt:1186
 #, no-wrap
 msgid ""
 "\tDive site\tDive date\tTime\tDive_duration\tDive_depth\tDive buddy\n"
@@ -2358,7 +2391,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:1221
+#: user-manual.txt:1194
 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 "
@@ -2372,7 +2405,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:1232
+#: user-manual.txt:1205
 #, no-wrap
 msgid ""
 "\tDive Time (s)\tDepth (m)\tpO₂ - Setpoint (Bar) \tpO₂ - C1 Cell 1 (Bar)\tAmbient temp. (Celsius)\n"
@@ -2388,70 +2421,65 @@ msgid ""
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:1238
+#: user-manual.txt:1211
 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_ "
-"file, making it much easier to work with _CSV_ files.  _CSV_ files can "
-"therefore be used in many contexts for importing data into a _Subsurface_ "
-"dive log.  Knowledge of a few basic things about the content of the _CSV_ "
-"file allows a smooth import of the dives into _Subsurface_."
+"file, making it much easier to work with _CSV_ files.  _CSV_ files can be "
+"used in many contexts for importing data into a _Subsurface_ dive log.  "
+"Knowing a few basic things about the content of the _CSV_ file helps with a "
+"smooth import of the dives into _Subsurface_."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1252
+#: user-manual.txt:1225
 msgid ""
-"The _CSV_ import has a couple of caveats. One should avoid some special "
-"characters like ampersand (&), less than (<), greater than (>) and double "
-"quotes (\") as part of the numbers or text within a cell. The file should "
-"use UTF-8 character set, if using non-ASCII characters. Also the size of the "
-"_CSV_ file might cause problems. Importing 100 dives at a time (_CSV dive "
+"But, the _CSV_ import has a couple of caveats. Avoid some special characters "
+"like ampersand (&), less than (<), greater than (>) and double quotes (\") "
+"as part of the numbers or text within a cell. The file should use UTF-8 "
+"character set, if using non-ASCII characters. Also the size of the _CSV_ "
+"file might cause problems. Importing 100 dives at a time (_CSV dive "
 "details_) works, but larger files might exceed the limits of the parser "
 "used. When encountering problems with _CSV_ imports, first try with a "
 "smaller file to make sure everything works."
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:1255
+#: user-manual.txt:1228
 #, no-wrap
 msgid "Importing GPS coordinates with the _Subsurface Companion App_ for mobile phones"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1264
+#: user-manual.txt:1237
 #, no-wrap
 msgid ""
 "Using the *Subsurface Companion App* on an _Android device_   or\n"
 "xref:S_iphone[_iPhone_] with GPS, the coordinates\n"
 "for the diving\n"
-"location can be automatically passed to the _Subsurface_\n"
-"dive log. The Companion App stores the dive locations on\n"
-"a dedicated Internet file server. _Subsurface_, in turn, can collect\n"
-"the localities from the file server.\n"
-msgstr ""
-
-#. type: Plain text
-#: user-manual.txt:1266
-msgid "To do this:"
+"location can be automatically passed to the _Subsurface_ dive log. The Companion App\n"
+"stores dive locations on a dedicated Internet server. _Subsurface_ can collect\n"
+"the locations from the server.\n"
+"To do this:\n"
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:1267
+#: user-manual.txt:1238
 #, no-wrap
 msgid "Create a Companion App account"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1272
+#: user-manual.txt:1243
 msgid ""
 "Register on the http://api.hohndel.org/login/[_Subsurface companion web "
 "page_].  A confirmation email with instructions and a personal *DIVERID* "
-"will be sent, a long number that gives access to the file server and "
+"will be sent, a long number giving you access to the file server and "
 "Companion App capabilities."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1277
+#: user-manual.txt:1248
 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/?"
@@ -2459,509 +2487,514 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:1278
+#: user-manual.txt:1249
 #, no-wrap
 msgid "Using the Subsurface companion app on an Android smartphone"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1281
+#: user-manual.txt:1252
 msgid "On first use the app has three options:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1287
+#: user-manual.txt:1258
 msgid ""
-"_Create a new account._ Equivalent to registering in _Subsurface_ companion "
-"page using an Internet browser. One can request a *DIVERID* using this "
-"option, but this is supplied via email and followed up by interaction with "
-"the http://api.hohndel.org/login/[_Subsurface companion web page_] in order "
-"to activate the account."
+"_Create a new account._ Equivalent to registering in the _Subsurface_ "
+"companion page using an Internet browser. You can request a *DIVERID* using "
+"this option, but it’s supplied via email and followed up by interaction with "
+"the http://api.hohndel.org/login/[_Subsurface companion web page_] to "
+"activate the account."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1290
+#: user-manual.txt:1261
 msgid ""
-"_Retrieve an account._ If users forgot their *DIVERID* they will receive an "
+"_Retrieve an account._ If users forget their *DIVERID* they will receive an "
 "email to recover the number."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1294
+#: user-manual.txt:1265
 msgid ""
 "_Use an existing account._ Users are prompted for their *DIVERID*. The app "
-"saves this *DIVERID* and does not ask for it again unless one uses the "
+"saves this *DIVERID* and doesn’t ask for it again unless you use the "
 "_Disconnect_ menu option (see below)."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1302
+#: user-manual.txt:1273
 msgid ""
 "In the _Subsurface_ main program, the *DIVERID* should also be entered on "
-"the Default Preferences panel, obtained by selecting _File -> Preferences -> "
-"Defaults_ from the main menu in _Subsurface_ itself.  This facilitates "
-"synchronisation between _Subsurface_ and the Companion App."
+"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."
 msgstr ""
 
 #. type: Title =====
-#: user-manual.txt:1303
+#: user-manual.txt:1274
 #, no-wrap
 msgid "Creating new dive locations"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1308
+#: user-manual.txt:1279
 msgid ""
-"Now one is ready to get a dive position and send it to the server. The "
+"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 "
 "any dives."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1311
+#: user-manual.txt:1282
 msgid ""
-"Touch the \"+\" icon on the top right to add a new dive site, a menu will be "
-"showed with 3 options:"
+"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:1314
+#: user-manual.txt:1285
 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:1323
+#: user-manual.txt:1294
 msgid ""
-"Use Map: This option allows the user to fix a position by searching a world "
-"map. A world map is shown (see *B* below) on which one should indicate the "
-"desired position with a _long press_ on the touch sensitive screen (if the "
-"marked location is erroneous, simply indicate a new location)  and select "
-"the check symbol in the upper right. A dialog is shown allowing to enter the "
-"name of the dive location and the date-time of the dive (see *C* below). In "
-"order to import this dive location in _Subsurface_ it's advisable to set the "
-"time to agree with the time of that dive on the dive computer."
+"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 "
+"position with a _long press_ on the touch sensitive screen (if the marked "
+"location is wrong, simply choose a new location)  and select the check "
+"symbol in the upper right. A dialog is shown letting you enter the name of "
+"the dive location and the date and time of the dive (see *C* below). In "
+"order to import this dive location in _Subsurface_ you should set the time "
+"to agree with the time of that dive on the dive computer."
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:1324
+#: user-manual.txt:1295
 #, no-wrap
 msgid "images/Companion_5.jpg"
 msgstr "images/Companion_5.jpg"
 
 #. type: Plain text
-#: user-manual.txt:1332
+#: user-manual.txt:1303
 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 "
-"stored locations shown. Now one needs to select the appropriate locations, "
-"then select 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."
+"stored locations shown. Now select the appropriate locations, then select "
+"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."
 msgstr ""
 
 #. type: Title =====
-#: user-manual.txt:1333
+#: user-manual.txt:1304
 #, no-wrap
 msgid "Dive lists of dive locations"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1341
+#: user-manual.txt:1312
 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 "
-"selection box to the left indicating that they require upload to the server. "
-"One can select individual dive locations from the list. A selected location "
-"has a check mark in the selection box on the left. Group operations (such as "
-"_Delete_ or _Send_)  are performed on several locations that are selected."
+"selection box to the left showing they need to be uploaded to the server. "
+"You can select individual dive locations from the list. A selected location "
+"has a check mark in the selection box on the left. Group operations (like "
+"_Delete_ or _Send_)  are performed on several selected locations."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1349
+#: user-manual.txt:1320
 msgid ""
 "Dive locations in this list can be viewed in two ways: a list of locations "
-"or a map indicating the dive locations. The display mode (List or Map) is "
-"changed by selecting _Dives_ at the top left of the screen (see *A* below) "
-"and then selecting the display mode. The display mode can be changed either "
-"from the list of locations or from the map (see *B* below). If one selects a "
-"location (on the list or on the map), an editing panel opens (see *C* below) "
-"where the dive description or other details may be changed."
+"or a map showing them. The display mode (List or Map) is changed by "
+"selecting _Dives_ at the top left of the screen (see *A* below) and then "
+"selecting the display mode. The display mode can be changed either from the "
+"list of locations or from the map (see *B* below). If you select a location "
+"(on the list or on the map), an editing panel opens (see *C* below) where "
+"the dive description or other details may be changed."
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:1350
+#: user-manual.txt:1321
 #, no-wrap
 msgid "images/Companion_4.jpg"
 msgstr "images/Companion_4.jpg"
 
 #. type: Plain text
-#: user-manual.txt:1356
+#: user-manual.txt:1327
 msgid ""
-"When one selects a dive (*not* selecting the check box), the name given to "
+"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 "
 "of the screen:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1358
+#: user-manual.txt:1329
 msgid ""
 "Edit (pencil): Change the text name or other characteristics of the dive "
 "location."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1360
-msgid "Maps: Display a map showing the dive location."
-msgstr ""
-
-#. type: Plain text
-#: user-manual.txt:1363
+#: user-manual.txt:1334
 msgid ""
-"After editing and saving a dive location (see *C* above), one needs to "
-"upload it to the web service, as explained below."
+"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:1364
+#: user-manual.txt:1335
 #, no-wrap
 msgid "Uploading dive locations"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1370
+#: user-manual.txt:1341
 msgid ""
-"There are several ways to send locations to the server.  The easiest is by "
+"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 "
 "arrow at the top right of the screen."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1375
+#: user-manual.txt:1346
 msgid ""
-"Users must be careful, as the trash icon on the right means exactly what it "
-"should; it deletes the selected dive location(s)."
+"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:1376
+#: user-manual.txt:1347
 #, no-wrap
 msgid "images/Companion_1.jpg"
 msgstr "images/Companion_1.jpg"
 
 #. type: Plain text
-#: user-manual.txt:1381
+#: user-manual.txt:1352
 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:1383
+#: user-manual.txt:1354
 #, no-wrap
 msgid "Settings on the Companion App"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1386
+#: user-manual.txt:1357
 msgid ""
 "Selecting the _Settings_ menu option results in the right hand image above "
 "(*B*)."
 msgstr ""
 
 #. type: Title =====
-#: user-manual.txt:1387
+#: user-manual.txt:1358
 #, no-wrap
 msgid "Server and account"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1390
+#: user-manual.txt:1361
 msgid "_Web-service URL._ This is predefined (http://api.hohndel.org/)"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1394
+#: user-manual.txt:1364
 msgid ""
 "_User ID._ The DIVERID obtained by registering as described above. The "
-"easiest way to obtain it is simply to copy and paste from the confirmation "
-"email but, of course, users can also type this information."
+"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:1395
+#: user-manual.txt:1364
 #, no-wrap
 msgid "Synchronisation"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1399
+#: user-manual.txt:1368
 msgid ""
 "_Synchronize on startup_. If selected, dive locations in the Android device "
-"and those on the web service synchronise each time the app is started."
+"and those on the web service synchronize each time the app is started."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1402
+#: user-manual.txt:1371
 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:1403
+#: user-manual.txt:1372
 #, no-wrap
 msgid "Background service"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1406
+#: user-manual.txt:1375
 msgid ""
-"Instead of entering a unique dive location, users can leave the service "
-"running in the background of their Android device, allowing the continuous "
+"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."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1409
-msgid "The settings below define the behaviour of the service:"
+#: user-manual.txt:1377
+msgid "The settings below define the behavior of the service:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1412
+#: user-manual.txt:1380
 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:1414
+#: user-manual.txt:1382
 msgid "_Min distance._ In meters. Minimum distance between two locations."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1416
+#: user-manual.txt:1384
 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:1417 user-manual.txt:1514 user-manual.txt:1932
+#: user-manual.txt:1385 user-manual.txt:1486 user-manual.txt:1900
 #, no-wrap
 msgid "images/icons/info.jpg"
 msgstr "images/icons/info.jpg"
 
 #. type: Plain text
-#: user-manual.txt:1427
+#: user-manual.txt:1395
 msgid ""
-"_How does the background service work?_ Assuming the user sets 5 minutes and "
-"50 meters in the settings above, the app will start by recording a location "
-"at the current location, followed by another one at every 5 minutes *or* "
-"every time one moves 50 m from previous location.  If subsequent locations "
-"are within a radius of 50 meters from the previous one, a new location is "
-"not saved. If the user is not moving, only one location is saved, but if the "
-"user is moving, a trace of the route is obtained by saving a location every "
-"50 meters."
+"_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 "
+"location at the current location, followed by another one at every 5 minutes "
+"*or* every time one moves 50 m from previous location.  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.  If the diver is moving, a trace of the route is obtained by saving a "
+"location every 50 meters."
 msgstr ""
 
 #. type: Title =====
-#: user-manual.txt:1428
+#: user-manual.txt:1396
 #, no-wrap
 msgid "Other"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1432
+#: user-manual.txt:1400
 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:1434
+#: user-manual.txt:1402
 msgid "_Subsurface website._ A link to the URL of Subsurface web"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1436
+#: user-manual.txt:1404
 msgid "_Version._ Displays the current version of the Companion App."
 msgstr ""
 
 #. type: Title =====
-#: user-manual.txt:1437
+#: user-manual.txt:1405
 #, no-wrap
 msgid "Search"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1440
+#: user-manual.txt:1408
 msgid "Search the saved dive locations by name or by date and time."
 msgstr ""
 
 #. type: Title =====
-#: user-manual.txt:1441
+#: user-manual.txt:1409
 #, no-wrap
 msgid "Start service"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1444
+#: user-manual.txt:1412
 msgid ""
-"Initiates the _background service_ following the previously defined settings."
+"Starts the _background service_ following the previously defined settings."
 msgstr ""
 
 #. type: Title =====
-#: user-manual.txt:1445
+#: user-manual.txt:1413
 #, no-wrap
 msgid "Disconnect"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1453
+#: user-manual.txt:1421
 msgid ""
-"This is a badly named option that disconnects the app from the server by "
-"resetting the user ID in the app, showing the first screen where an account "
-"can be created, retrieve the ID for an existing account or use the users own "
-"ID. The disconnect option is useful if a user's Android device was used to "
-"download the dive locations of another registered diver."
+"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."
 msgstr ""
 
 #. type: Title =====
-#: user-manual.txt:1454
+#: user-manual.txt:1422
 #, no-wrap
 msgid "Send all locations"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1457
+#: user-manual.txt:1425
 msgid ""
 "This option sends all locations stored in the Android device to the server."
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:1459
+#: user-manual.txt:1427
 #, no-wrap
 msgid "Using the Subsurface companion app on an _iPhone_ to record dive locations"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1464
+#: user-manual.txt:1432
 msgid ""
-"The iPhone interface is quite simple. One needs to type the user ID "
-"(obtained during registration) into the space reserved for it, then select "
-"\"Dive in\" (see left part of the image below) and start collecting dive "
-"location information."
+"The iPhone interface is quite simple. Type the user ID (obtained during "
+"registration) into the space reserved for it, then select \"Dive in\" (see "
+"left part of the image below) and start collecting dive location information."
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:1465
+#: user-manual.txt:1433
 #, no-wrap
 msgid "images/iphone.jpg"
 msgstr "images/iphone.jpg"
 
 #. type: Plain text
-#: user-manual.txt:1472
+#: user-manual.txt:1444
 msgid ""
 "Dives can be added automatically or manually. In manual mode, a dive "
 "location or waypoint is added to the GPS input stream. In automatic mode, a "
-"continuous path of GPS locations is created from which, much later, after "
-"import, subsurface can select the appropriate GPS locations based on the "
-"times of dives. The default mode for the _iphone_ is automatic. When one "
-"adds a dive, the location service is started automatically and a red bar "
-"appears at the bottom of the screen. After the dive one can click on the red "
-"bar to end the location service. While the location service is running one "
-"can only add dives using the manual mechanism."
+"continuous path of GPS locations is created from which, after import, "
+"Subsurface can select the appropriate GPS locations based on the times of "
+"dives. The default mode for the _iphone_ is automatic. When adding a dive, "
+"the location service is started automatically and a red bar appears at the "
+"bottom of the screen. After the dive, click on the red bar to end the "
+"location service. While the location service is running you can only add "
+"dives manually."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1478
+#: user-manual.txt:1450
 msgid ""
-"One can edit the site name afterwards by selecting the dive from the dive "
+"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 "
-"dive list is automatically uploaded from the iPhone to the webservice and "
-"there is not an option to trigger upload manually."
+"dive list is automatically uploaded from the iPhone to the web service. "
+"There isn’t an option to trigger upload manually."
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:1480
+#: user-manual.txt:1452
 #, no-wrap
 msgid "Downloading dive locations to the _Subsurface_ divelog"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1489
+#: user-manual.txt:1461
 msgid ""
 "Download dive(s) from a dive computer or enter them manually into "
 "_Subsurface_ before obtaining the GPS coordinates from the server. The "
 "download dialog can be reached via _Ctrl+G_ or from the _Subsurface_ Main "
 "Menu _Import -> Import GPS data from Subsurface Service_, resulting in the "
 "image on the left (*A*), below. On first use the DIVERID text box is blank. "
-"Provide a DIVERID, then select the _Download_ button to initiate the "
-"download process, after which the screen on the right (*B*) below appears:"
+"Provide a DIVERID, then select the _Download_ button to start the download "
+"process, after which the screen on the right (*B*) below appears:"
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:1490
+#: user-manual.txt:1462
 #, no-wrap
 msgid "images/DownloadGPS.jpg"
 msgstr "images/DownloadGPS.jpg"
 
 #. type: Plain text
-#: user-manual.txt:1498
+#: user-manual.txt:1470
 msgid ""
-"Note that the _Apply_ button is now active. By clicking on it, users can "
-"update the locations of the newly entered or uploaded dives in _Subsurface_ "
-"which applies the coordinates and names entered on the app for all the new "
-"dives that match the date-times of the uploaded GPS localities. If one has "
+"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_. "
+"That applies the coordinates and names entered on the app to all the new "
+"dives that match the date-times of the uploaded GPS localities. If you have "
 "entered the name of the dive location in _Subsurface_ before downloading the "
 "GPS coordinates, this name will take precedence over downloaded one."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1505
+#: user-manual.txt:1477
 msgid ""
 "Since _Subsurface_ matches GPS locations from the Android device and dive "
 "information from the dive computer based on date-time data, automatic "
-"assignment of GPS data to dives is dependent on agreement of the date-time "
-"information between these two devices. Although _Subsurface_ has a wide "
-"range tolerance, it may be unable to identify the appropriate dive if there "
-"is a large difference between the time in the dive computer and that of the "
-"Android device, resulting in no updates."
+"assignment of GPS data to dives depends on agreeing date-time information "
+"between the two devices. Although _Subsurface_ has a wide range tolerance, "
+"it may not be able to identify the appropriate dive if there's a large "
+"difference between the time in the dive computer and that of the Android "
+"device.  That results in no updates."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1513
+#: user-manual.txt:1485
 msgid ""
 "Similar date-times may not always be possible and there may be many reasons "
-"for this (e.g. time zones), or _Subsurface_ may be unable to decide which is "
-"the correct position for a dive (e.g. on repetitive dives while running "
+"for this (e.g. time zones).  _Subsurface_ may also be unable to decide which "
+"is the correct position for a dive (e.g. on repetitive dives while running "
 "_background service_ there may be several locations that would be included "
 "in the time range that fit not only the first dive, but one or more "
-"subsequent dives as well).  A workaround for this situation to manually edit "
-"the date-time of a dive in the _Subsurface_ Dive List *before* downloading "
-"the GPS data and then to change the date-time back again *after* downloading "
-"GPS data."
+"subsequent dives as well).  A workaround to manually edit the date-time of a "
+"dive in the _Subsurface_ Dive List *before* downloading the GPS data and "
+"then to change the date-time back again *after* downloading GPS data."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1517
+#: user-manual.txt:1489
 msgid "TIPS:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1524
+#: user-manual.txt:1492
+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 "
+"boat's route."
+msgstr ""
+
+#. type: Plain text
+#: user-manual.txt:1493
+msgid ""
+"Right now, these locations are difficult to delete from the server. In some "
+"situations it"
+msgstr ""
+
+#. type: Plain text
+#: user-manual.txt:1496
 msgid ""
-"_Background service_, being a very powerful tool, may fill the location list "
-"with many unnecessary locations not corresponding to the exact dive point "
-"but reflecting the boat's route.  Currently these locations are difficult to "
-"delete from the server. In some situations it is therefore prudent to clean "
-"up the list on the Android device before sending the dive points to the web "
-"server by simply deleting the inappropriate locations. This might be "
-"necessary, for instance, if one wants to keep the location list clear to see "
-"dives in the web service map display (see above)."
+"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. "
+"This might be necessary, for instance, if you want to keep the location list "
+"clear to see dives in the web service map display (see above)."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1528
+#: user-manual.txt:1499
 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 "
@@ -2970,371 +3003,363 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:1530
+#: user-manual.txt:1501
 #, no-wrap
 msgid "Adding photographs to dives"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1536
+#: user-manual.txt:1507
 msgid ""
 "Many (if not most) divers take a camera with them and take photographs "
-"during a dive. One would like to associate each photograph with a specific "
-"dive. _Subsurface_ allows one to load photos into a dive. Photos are "
-"superimposed on the dive profile, from where they can be viewed."
+"during a dive. To match each photograph with a specific dive, _Subsurface_ "
+"lets you load photos into a dive. Photos are superimposed on the dive "
+"profile, from where they can be viewed."
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:1537
+#: user-manual.txt:1508
 #, no-wrap
-msgid "Loading photos and getting synchronisation between dive computer and camera"
+msgid "Loading photos and synchronizing between dive computer and camera"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1541
+#: user-manual.txt:1512
 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:1542
+#: user-manual.txt:1513
 #, no-wrap
 msgid "images/LoadImage1_f20.jpg"
 msgstr "images/LoadImage1_f20.jpg"
 
 #. type: Plain text
-#: user-manual.txt:1546
+#: user-manual.txt:1517
 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:1547
+#: user-manual.txt:1518
 #, no-wrap
 msgid "images/LoadImage2_f20.jpg"
 msgstr "images/LoadImage2_f20.jpg"
 
 #. type: Plain text
-#: user-manual.txt:1556
+#: user-manual.txt:1527
 msgid ""
-"This brings up the time synchronisation dialog, shown below. The critical "
-"problem is that the time synchronisation is not perfect between the dive "
-"computer used during a dive, and the camera used during that same dive. "
-"These two devices often differ by several minutes. If _Subsurface_ can "
-"achieve synchronisation, then the exact times of photographs can be used to "
-"position photographs on the dive profile."
+"This brings up the time synchronization dialog, shown below. But be aware "
+"that the time synchronization is not perfect between the dive computer used "
+"during a dive, and the camera used during that same dive. These two devices "
+"often differ by several minutes. If _Subsurface_ can synchronize, then the "
+"exact times of photographs can be used to position photographs on the dive "
+"profile."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1558
-msgid "_Subsurface_ achieves this synchronisation in three ways:"
+#: user-manual.txt:1529
+msgid "_Subsurface_ synchronizes in three ways:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1561
+#: user-manual.txt:1532
 #, no-wrap
 msgid ""
-"*Pro-actively*: Before the dive, ensure synchronisation of the dive computer time settings with\n"
+"*Pro-actively*: Before the dive, ensure synchronization of the dive computer time settings with\n"
 "the time settings of the camera by changing the date-time settings on one or both of these devices.\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1572
+#: user-manual.txt:1543
 #, no-wrap
 msgid ""
-"*Manually*: If the user wrote down the exact camera time at the start of a dive, the\n"
-"difference in time between the two devices can be determined. Actually, as long as the device\n"
-"settings for time has not been changed in either device, one could write down the times of\n"
-"both devices after the dive or even at the end of the day. One can then manually set the time\n"
+"*Manually*: If you wrote down the exact camera time at the start of a dive, the\n"
+"difference in time between the two devices can be determined. As long as the device\n"
+"settings for time has not been changed in either device, you could write down the times of\n"
+"both devices after the dive or even at the end of the day. You can then manually set the time\n"
 "difference in the _Time shift_ dialog. Towards the top of the dialog is a time setting tool\n"
-"immediately under the heading _Shift times of image(s) by_, evident in figure *A* below.\n"
+"immediately under the heading _Shift times of image(s) by_, shown in figure *A* below.\n"
 "If the camera time is 7 minutes later than that of the dive computer, set the time setting\n"
 "tool to a value of 00:07.  Select either the _earlier_ or _later_ radio button.\n"
 "In the above example, the _earlier_ option is appropriate, since the photos need to be shifted\n"
 "7 minutes earlier (camera is 7 minutes ahead of dive computer). Ignore any \"AM\" or \"PM\" suffix\n"
-"in that tool. Click the _OK_ button and synchronisation is achieved.\n"
+"in that tool. Click the _OK_ button and synchronization is done.\n"
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:1573
+#: user-manual.txt:1544
 #, no-wrap
 msgid "images/LoadImage3b_f20.jpg"
 msgstr "images/LoadImage3b_f20.jpg"
 
 #. type: Plain text
-#: user-manual.txt:1591
+#: user-manual.txt:1562
 #, no-wrap
 msgid ""
-"*By photograph*: There is a very slick way of achieving synchronisation. If one takes a\n"
-"photograph of the face of the dive computer showing the time, then _Subsurface_ can obtain\n"
-"the exact time the photograph was taken, using the metadata that the camera stores within\n"
-"each photo. In order to do this, use the bottom half of the _Time shift_ dialog. If one uses\n"
+"*By photograph*: There is a very slick way of synchronizing. If you take a\n"
+"photograph of the face of the dive computer showing the time, then _Subsurface_ can get\n"
+"the exact time the photograph was taken, using the metadata the camera stores within\n"
+"each photo. To do this, use the bottom half of the _Time shift_ dialog. If you use\n"
 "the bottom part, the top part of the dialog is ignored. Click on\n"
-"the horizontal bar entitled \"_Select image of dive computer showing time_. This brings up\n"
-"a file browser with which one can select the photograph of the dive computer time. Select the\n"
+"the horizontal bar called \"_Select image of dive computer showing time_. This brings up\n"
+"a file browser letting you select the photograph of the dive computer time. Select the\n"
 "photograph using the file browser and click on _OK_. This photograph of the dive computer\n"
 "appears in the bottom panel of the _Shift times_ dialog. Now _Subsurface_ knows exactly\n"
 "when the photograph has been taken. Now set the date-time dialog to the left of the photo\n"
-"so that this tool reflects the date and time of the dive computer in the photo. When the\n"
+"so it reflects the date and time of the dive computer in the photo. When the\n"
 "date-time tool has been set, _Subsurface_ knows exactly what the time difference between\n"
-"camera and dive computer is, and synchronisation is achieved.\n"
+"camera and dive computer is, and it can synchronize.\n"
 "Image *B* above shows a photograph of the face of the dive computer and with the date-time tool set to the\n"
 "date-time.\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1594
+#: user-manual.txt:1565
 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:1595
+#: user-manual.txt:1566
 #, no-wrap
 msgid "Viewing the photos"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1598
+#: user-manual.txt:1569
 msgid "After the images have been loaded, they appear in two places:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1600
+#: user-manual.txt:1571
 msgid "the _Photos_ tab of the *Notes* panel."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1604
+#: user-manual.txt:1575
 msgid ""
 "as tiny icons (stubs) on the dive profile at the appropriate positions "
-"reflecting the time each photograph was taken.  In order to view the photos "
-"on the dive profile, activate the _show-photos_ button in the tool bar to "
-"the left of the dive profile:"
+"reflecting the time each photograph was taken.  To view the photos on the "
+"dive profile, activate the _show-photos_ button in the tool bar to the left "
+"of the dive profile:"
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:1605
+#: user-manual.txt:1576
 #, no-wrap
 msgid "images/icons/ShowPhotos_f20.png"
 msgstr "images/icons/ShowPhotos_f20.png"
 
 #. type: Plain text
-#: user-manual.txt:1608
+#: user-manual.txt:1579
 msgid "This results in a profile display as in the image below:"
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:1609
+#: user-manual.txt:1580
 #, no-wrap
 msgid "images/LoadImage4_f20.jpg"
 msgstr "images/LoadImage4_f20.jpg"
 
 #. type: Plain text
-#: user-manual.txt:1613
+#: user-manual.txt:1584
 msgid ""
-"If one hovers with the mouse over any of the photo icons, then a thumbnail "
-"photo is shown of the appropriate photo. See the image below:"
+"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:1614
+#: user-manual.txt:1585
 #, no-wrap
 msgid "images/LoadImage5_f20.jpg"
 msgstr "images/LoadImage5_f20.jpg"
 
 #. type: Plain text
-#: user-manual.txt:1623
+#: user-manual.txt:1594
 msgid ""
 "Clicking on the thumbnail brings up a full size photo overlaid on the "
-"_Subsurface_ window. This allows good viewing of the photographs that have "
-"been added (see the image below). Note that the thumbnail has a small "
-"dustbin icon in the bottom right hand corner (see image above). If one "
-"selects the dustbin, the image is removed from the dive. Therefore some care "
-"is required when clicking on a thumbnail. Images can also be deleted using "
-"the _Photos_ tab (see text below)."
+"_Subsurface_ window. This allows good viewing of the added photographs. (see "
+"the image below). Note that the thumbnail has a small dustbin icon in the "
+"bottom right hand corner (see image above). Selecting the dustbin removes "
+"the image from the dive. Be careful when clicking on a thumbnail. Images can "
+"also be deleted using the _Photos_ tab (see text below)."
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:1624
+#: user-manual.txt:1595
 #, no-wrap
 msgid "images/LoadImage6_f20.jpg"
 msgstr "images/LoadImage6_f20.jpg"
 
 #. type: Title ====
-#: user-manual.txt:1626
+#: user-manual.txt:1597
 #, no-wrap
 msgid "The _Photos_ tab"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1637
+#: user-manual.txt:1608
 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 "
 "(therefore sometimes with large overlap on the dive profile) can easily be "
 "accessed in the _Photos_ tab. This tab serves as a tool for individually "
-"accessing the photos of a dive, while the stubs on the dive profile give an "
-"indication of when during a dive a photo was taken. By single-clicking on a "
-"thumbnail in the _Photos_ panel, a photo is selected. By double-clicking a "
-"thumbnail, the full-sized image is shown, overlaying the _Subsurface_ "
-"window. A photo can be deleted from the _Photos_ panel by selecting it "
-"(single-click) and then by pressing the _Del_ key on the keyboard. This "
-"removes the photo both from the _Photos_ tab as well as the dive profile."
+"accessing the photos of a dive, while the stubs on the dive profile show "
+"when during a dive a photo was taken. By single-clicking on a thumbnail in "
+"the _Photos_ panel, a photo is selected. By double-clicking a thumbnail, the "
+"full-sized image is shown, overlaying the _Subsurface_ window. A photo can "
+"be deleted from the _Photos_ panel by selecting it (single-click) and then "
+"by pressing the _Del_ key on the keyboard. This removes the photo BOTH from "
+"the _Photos_ tab as well as the dive profile."
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:1638
+#: user-manual.txt:1609
 #, no-wrap
 msgid "Photos on an external hard disk"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1649
+#: user-manual.txt:1619
 msgid ""
-"Most underwater photographers store their photos on an external drive. If "
-"such a drive can be mapped by the operating system (almost always the case) "
-"the photos can be directly accessed by _Subsurface_. This facilitates the "
-"interaction between _Subsurface_ and an external repository of photos. When "
-"associating a dive profile with photos from an external drive, the normal "
-"procedure of selection and synchronisation (see text above) is used.  "
-"However, after the external drive has been disconnected, _Subsurface_ cannot "
-"access these photos any more.  If the display of photos is activated (using "
-"the toolbox to the left of the _Dive Profile_), the program only shows a "
-"small white dot where each photo should be on the dive profile.  In addition "
-"the _Photos_ tab only shows the file names of the photos. This is normal "
-"behaviour.  If, later, the external drive with the photos is connected "
-"again, the photos can be seen in the normal way."
+"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 "
+"photos can be directly accessed by _Subsurface_. This eases the interaction "
+"between _Subsurface_ and an external repository of photos. When associating "
+"a dive profile with photos from an external drive, the normal procedure of "
+"selection and synchronization (see text above) is used.  After the external "
+"drive has been disconnected, _Subsurface_ cannot access these photos any "
+"more.  If the display of photos is activated (using the toolbox to the left "
+"of the _Dive Profile_), the program only shows a small white dot where each "
+"photo should be on the dive profile.  In addition the _Photos_ tab only "
+"shows the file names of the photos.  If the external drive with the photos "
+"is re-connected, the photos can be seen in the normal way."
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:1651
+#: user-manual.txt:1621
 #, no-wrap
 msgid "Moving photographs among directories, hard disks or computers"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1661
+#: user-manual.txt:1631
 #, no-wrap
 msgid ""
 "After a photograph has been loaded into _Subsurface_ and associated with a specific dive, the directory\n"
-" where the photo lies is stored, allowing _Subsurface_ to find the photograph when the dive is\n"
+" where the photo lies is stored, letting _Subsurface_ find the photograph when the dive is\n"
 " opened again. If the photo or the whole photo collection is moved to another drive or to a different\n"
-" machine, it is unlikely that the directory structure will remain identical to that of the original uploaded\n"
+" machine, the directory structure will be different to that of the original uploaded\n"
 " photo. When this happens, _Subsurface_ looks for the photos at their original location before they were moved,\n"
-" cannot find them and therefore cannot display them. Because, after moving photos, large numbers of photos\n"
+" cannot find them and cannot display them. Because after moving photos, large numbers of photos\n"
 " may need to be deleted and re-imported from the new location, _Subsurface_ has a mechanism that eases the\n"
 " process of updating the directory information for each photo: automatic updates using fingerprints.\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1666
+#: user-manual.txt:1635
 #, no-wrap
 msgid ""
 "When a photo is loaded into _Subsurface_, a fingerprint for the image is calculated and stored with the\n"
 " other reference information for that photo. After moving a photo collection (that has already been loaded\n"
-" into _Subsurface_) to a different directory, disk or computer, _Subsurface_ can  perform the\n"
-" following steps:\n"
+" into _Subsurface_) to a different directory, disk or computer, _Subsurface_ can:\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1668
+#: user-manual.txt:1638
 msgid ""
 "look through a particular directory (and all its subdirectories recursively) "
-"where photos have been moved"
+"where photos have been moved to,"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1669
-msgid "to,"
-msgstr ""
-
-#. type: Plain text
-#: user-manual.txt:1671
+#: user-manual.txt:1639
 msgid "calculate fingerprints for all photos in this directory, and"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1673
+#: user-manual.txt:1641
 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:1675
+#: user-manual.txt:1643
 msgid ""
-"loaded into _Subsurface_ (even if the original file name has changed), to "
+"loaded into _Subsurface_ (even if the original file name has changed), "
 "automatically update the directory information so that _Subsurface_ can find "
 "the photo in the new moved directory."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1680
+#: user-manual.txt:1648
 #, no-wrap
 msgid ""
-"This is achieved by selecting from the Main Menu: _File ->      Find moved images_. This brings up a window within\n"
+"This is done by selecting from the Main Menu: _File ->      Find moved images_. This brings up a window within\n"
 " which the NEW directory of the photos needs to be specified. Select the appropriate directory and click\n"
 " the _Scan_ button towards the bottom right of the panel. The process may require several minutes to\n"
 " complete, after which _Subsurface_ will show the appropriate photographs when a particular dive is opened.\n"
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:1685
+#: user-manual.txt:1653
 #, no-wrap
 msgid "*Upgrading existing photo collections without fingerprints*\n"
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:1690
+#: user-manual.txt:1658
 msgid ""
-"_Subsurface_ automatically calculates fingerprints for all images that can "
-"be accessed by _Subsurface_.  When manipulating images, ensure that all the "
-"images associated with the dive log can be accessed by _Subsurface_."
+"_Subsurface_ automatically calculates fingerprints for all images that it "
+"can access.  When manipulating images, be sure all the images associated "
+"with the dive log can be accessed by _Subsurface_."
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:1692
+#: user-manual.txt:1660
 msgid ""
 "_Subsurface_ automatically checks and, if necessary, updates the "
 "fingerprints associated with a single dive if:"
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:1693
+#: user-manual.txt:1661
 msgid ""
 "The images associated with that dive are visible as thumbnails on the *Dive "
 "Profile*."
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:1694
+#: user-manual.txt:1662
 msgid ""
-"One edits anything in the *Notes tab* panel and save the edits by selecting "
-"_Apply changes_."
+"If you edit anything in the *Notes tab* panel and save the edits by "
+"selecting _Apply changes_."
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:1698
+#: user-manual.txt:1666
 #, no-wrap
 msgid "Logging special types of dives"
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:1701
+#: user-manual.txt:1669
 #, no-wrap
 msgid "Multicylinder dives"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1708
+#: user-manual.txt:1676
 msgid ""
 "_Subsurface_ easily handles dives involving more than one cylinder. Multi-"
-"cylinder diving usually happens (a) if a diver does not have enough gas for "
-"the complete dive in a single cylinder; (b) if the diver needs more than one "
+"cylinder diving usually happens (a) if a diver doesn’t have enough gas for "
+"the complete dive in a single cylinder; (b) if a diver needs more than one "
 "gas mixture because of the depth or the decompression needs of the dive. For "
 "this reason multi-cylinder dives are often used by technical divers who dive "
 "deep or long. As far as _Subsurface_ is concerned, there are only two types "
@@ -3342,26 +3367,26 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1712
+#: user-manual.txt:1680
 #, no-wrap
 msgid ""
 "*Describe the cylinders used during the dive* This is performed in the *Equipment tab* of\n"
 "the *Info* panel, as xref:cylinder_definitions[described above]. Enter the cylinders one by one,\n"
-"specifying the characteristics of the cylinder and the gas composition within each cylinder.\n"
+"specifying each’s characteristics and the gas composition within it.\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1717
+#: user-manual.txt:1685
 #, no-wrap
 msgid ""
-"*Record the times at which switches from one cylinder to another was done:* This is information\n"
-"provided by some dive computers (provided the diver indicated these changes to the dive computer\n"
+"*Record the times at which the switch from one cylinder to another was done:* This is information\n"
+"tracked by some dive computers (provided the diver indicated these changes to the dive computer\n"
 "by pressing specific buttons). If the dive computer does not provide the information, the diver has to\n"
 "record these changes using a different method, e.g. writing it on a slate.\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1725
+#: user-manual.txt:1693
 #, no-wrap
 msgid ""
 "*Record the cylinder changes on the dive profile*: If the latter option\n"
@@ -3374,53 +3399,52 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1729
+#: user-manual.txt:1697
 msgid ""
-"Having performed these tasks, _Subsurface_ indicates the appropriate use of "
+"When this is complete, _Subsurface_ indicates the appropriate use of "
 "cylinders in the dive profile.  Below is a multi-cylinder dive, starting off "
-"with EAN28, then changing cylinders to EAN50 after 26 minutes to perform "
+"with EAN28, then changing cylinders to EAN50 after 26 minutes for "
 "decompression."
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:1730
+#: user-manual.txt:1698
 #, no-wrap
 msgid "images/multicylinder_dive.jpg"
 msgstr "images/multicylinder_dive.jpg"
 
 #. type: Title ====
-#: user-manual.txt:1732
+#: user-manual.txt:1700
 #, no-wrap
 msgid "Sidemount dives"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1738
+#: user-manual.txt:1706
 msgid ""
 "Sidemount diving is just another form of multi-cylinder diving, often with "
-"both or all cylinders having the same gas mixture. Although it is a popular "
-"configuration for cave divers, sidemount diving can be performed by "
-"recreational divers who have completed the appropriate training. Sidemount "
-"dive logging involves, exactly as with multi-cylinder dives, above, three "
-"steps:"
+"both or all cylinders having the same gas mixture. Although it’s a popular "
+"configuration for cave divers, Sidemount diving can be done by recreational "
+"divers who’ve completed the appropriate training. sidemount dive logging "
+"involves three steps, exactly as with multi-cylinder dives above:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1747
+#: user-manual.txt:1715
 #, no-wrap
 msgid ""
 "*During the dive, record cylinder switch events*. Since sidemount diving normally involves two\n"
-"cylinders with air or with the same gas mixture, _Subsurface_ distinguishes among these different\n"
-"cylinders. In contrast, many dive computers that allow gas switching only distinguish among different\n"
-"_gases_ used, not among different _cylinders_ used. This means that when sidemount dives are downloaded\n"
-"from these dive computers, the events of switching between cylinders with the same gas are not downloaded. This may mean\n"
-"that one may have to keep a written log of cylinder switch times using a slate, or (if the dive computer\n"
-"has this facility) marking each cylinder switch with a bookmark that can be retrieved later. Returning\n"
+"cylinders with air or with the same gas mixture, _Subsurface_ distinguishes between these different\n"
+"cylinders. In contrast, many dive computers that allow gas switching only distinguish between different\n"
+"_gases_ used, not among different _cylinders_ used. This means when sidemount dives are downloaded\n"
+"from these dive computers, the switching event between cylinders with the same gas is not downloaded. This may mean\n"
+"that a diver may have to keep a written log of cylinder switch times using a slate, or (if the dive computer\n"
+"has the capability) marking each cylinder switch with a bookmark that can be retrieved later. Returning\n"
 "from a dive with the times of cylinder changes is the only tricky part of logging sidemount dives.\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1750
+#: user-manual.txt:1718
 #, no-wrap
 msgid ""
 "*Within _Subsurface_ describe the cylinders used during the dive*. The diver needs to provide the\n"
@@ -3429,76 +3453,76 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1760
+#: user-manual.txt:1728
 #, no-wrap
 msgid ""
 "*Indicate cylinder change events on the _Subsurface_ dive profile*. Once the dive log has been imported\n"
-"from a dive computer into _Subsurface_, the cylinder switch events need to be indicated on the dive profile.\n"
-"Cylinder changes are recorded by right-clicking at the appropriate point on the dive profile and then\n"
+"from a dive computer into _Subsurface_, the cylinder switch events need to be shown on the dive profile.\n"
+"Cylinder changes are recorded by right-clicking at the appropriate point on the dive profile, then\n"
 "selecting _Add gas change_. A list of the appropriate cylinders is shown with the\n"
 "currently used cylinder greyed out. In the image below Tank 1 is greyed out, leaving only Tank 2\n"
-"to be selected. Select the appropriate cylinder. The cylinder change is then indicated on the dive\n"
+"to be selected. Select the appropriate cylinder. The cylinder change is then shown on the dive\n"
 "profile with a cylinder symbol. If the *Tank Bar* is activated using the toolbar to the left of the\n"
-"profile, then the cylinder change is also indicated on the Tank Bar (see image below). After all\n"
+"profile, then the cylinder change is also shown on the Tank Bar (see image below). After all\n"
 "the cylinder change events have been recorded on the dive profile, the correct cylinder pressures\n"
 "for both cylinders are shown on the dive profile, as in the image below.\n"
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:1761
+#: user-manual.txt:1729
 #, no-wrap
 msgid "images/sidemount1.jpg"
 msgstr "images/sidemount1.jpg"
 
 #. type: Plain text
-#: user-manual.txt:1764
+#: user-manual.txt:1732
 msgid ""
 "This section gives an example of the versatility of _Subsurface_ as a dive "
 "logging tool."
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:1767
+#: user-manual.txt:1735
 #, no-wrap
 msgid "Semi-closed circuit rebreather (SCR) dives"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:1769
+#: user-manual.txt:1737
 #, no-wrap
 msgid "images/halcyon_RB80.jpg"
 msgstr "images/halcyon_RB80.jpg"
 
 #. type: Plain text
-#: user-manual.txt:1779
+#: user-manual.txt:1747
 msgid ""
-"Passive semi-closed rebreathers (pSCR) comprise a technical advance in "
-"diving equipment that recirculates the breathing gas that a diver breathes, "
-"while removing carbon dioxide from the exhaled gas. While a small amount "
-"(typically a tenth) of the exhaled breathing gas is released into the water, "
-"a small amount of fresh gas is released from the back gas cylinder "
-"(typically containing nitrox).  A diver, using a single cylinder of "
-"breathing gas can therefore dive for much longer periods than using a "
-"recreational open-circuit configuration. With pSCR equipment, a very small "
-"amount of breathing gas is released every time the breather inhales. With "
-"active SCR (aSCR) equipment, in contrast, a small amount of breathing gas is "
-"released continuously from the back cylinder."
+"Passive semi-closed rebreathers (pSCR) are a technical advance in diving "
+"equipment that recirculates the breathing gas a diver uses, while removing "
+"carbon dioxide from the exhaled gas. While a small amount (typically a "
+"tenth) of the exhaled breathing gas is released into the water, a small "
+"amount of fresh gas is released from the back gas cylinder (typically "
+"containing nitrox).  A diver using a single cylinder of breathing gas can "
+"therefore dive for much longer periods than using a recreational open-"
+"circuit configuration. With pSCR equipment, a very small amount of breathing "
+"gas is released every time the diver inhales. With active SCR (aSCR) "
+"equipment, in contrast, a small amount of breathing gas is released "
+"continuously from the back cylinder."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1781
+#: user-manual.txt:1749
 msgid ""
-"To log pSCR dives, no special procedures are required, just the normal steps "
+"To log pSCR dives, no special procedures are required. Use the normal steps "
 "outlined above:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1783
+#: user-manual.txt:1751
 msgid "Select pSCR in the _Dive Mode_ dropdown list on the *Info* panel."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1787
+#: user-manual.txt:1755
 msgid ""
 "pSCR diving often involves gas changes, requiring an additional cylinder.  "
 "Define all the appropriate cylinders as described above and indicate the "
@@ -3507,48 +3531,48 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1792
+#: user-manual.txt:1760
 msgid ""
-"If a pSCR _Dive Mode_ has been selected, the dive ceiling for pSCR dives is "
-"adjusted for the oxygen drop across the mouthpiece which often requires "
+"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 "
 "longer decompression periods. Below is a dive profile of a pSCR dive using "
 "EAN36 on the back cylinder and oxygen for decompression. Note that this dive "
 "lasted over two hours."
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:1793
+#: user-manual.txt:1761
 #, no-wrap
 msgid "images/pSCR_profile.jpg"
 msgstr "images/pSCR_profile.jpg"
 
 #. type: Title ====
-#: user-manual.txt:1798
+#: user-manual.txt:1766
 #, no-wrap
 msgid "Closed circuit rebreather (CCR) dives"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:1800
+#: user-manual.txt:1768
 #, no-wrap
 msgid "images/APD.jpg"
 msgstr "images/APD.jpg"
 
 #. type: Plain text
-#: user-manual.txt:1805
+#: user-manual.txt:1773
 msgid ""
 "Closed system rebreathers use advanced technology to recirculate gas that "
-"has been breathed while doing two things to maintain a breathable oxygen "
+"has been breathed. They also do two things to maintain a breathable oxygen "
 "concentration:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1806
-msgid "remove carbon dioxide from the gas that has been exhaled"
+#: user-manual.txt:1774
+msgid "remove carbon dioxide from the exhaled gas"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1815
+#: user-manual.txt:1783
 msgid ""
 "regulate the oxygen concentration to remain within safe diving limits.  The "
 "CCR interface of _Subsurface_ is currently experimental and under active "
@@ -3557,42 +3581,42 @@ msgid ""
 "computer, a CCR system computer does not allow the download of a log "
 "containing multiple dives. Rather, each dive is stored independently. This "
 "means that _Subsurface_ cannot download a dive log directly from a CCR dive "
-"computer, but that it imports CCR dive logs in the same way that it imports "
-"dive log data from other digital databases: one dive at a time."
+"computer, but that it imports CCR dive logs in the same way it imports dive "
+"log data from other digital databases: one dive at a time."
 msgstr ""
 
 #. type: Title =====
-#: user-manual.txt:1816
+#: user-manual.txt:1784
 #, no-wrap
 msgid "Import a CCR dive"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1830
+#: user-manual.txt:1798
 msgid ""
 "See the section dealing with xref:S_ImportingAlienDiveLogs[Importing dive "
 "information from other digital sources]. From the main menu of _Subsurface_, "
 "select _Import -> Import log files_ to bring up the xref:"
 "Unified_import[universal import dialogue]. As explained in that section, the "
 "bottom right hand of the import dialogue contains a dropdown list (labled "
-"_Filter:_) of appropriate devices that currently includes(Poseidon) MkVI or "
-"APD log viewer files (import for other CCR equipment is under active "
-"development). Having selected the appropriate CCR format and the directory "
+"_Filter:_) of appropriate devices that currently include(Poseidon) MkVI or "
+"APD log viewer files. Import for other CCR equipment is under active "
+"development. Having selected the appropriate CCR format and the directory "
 "where the original dive logs have been stored from the CCR dive computer, "
-"one can select a particular dive log file (in the case of the MkVI it is a "
-"file with a .txt extension). After selecting the appropriate dive log, "
-"activate the _Open_ button at the bottom right hand of the universal import "
-"dialogue.  The selected dive is imported to the _Subsurface_ dive list."
+"select a particular dive log file (in the case of the MkVI it is a file with "
+"a .txt extension). After selecting the appropriate dive log, click the "
+"_Open_ button at the bottom right hand of the universal import dialogue.  "
+"The selected dive is imported to the _Subsurface_ dive list."
 msgstr ""
 
 #. type: Title =====
-#: user-manual.txt:1831
+#: user-manual.txt:1799
 #, no-wrap
 msgid "Displayed information for a CCR dive"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1841
+#: user-manual.txt:1809
 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 "
@@ -3606,68 +3630,68 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1843
+#: user-manual.txt:1811
 msgid "For TWO O~2~ sensors the mean value of the two sensors are given."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1847
+#: user-manual.txt:1815
 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 "
-"sensors are treated as spurious. If one of the three sensors provides "
-"spurious data, it is ignored."
+"sensors are treated as false. If one of the three sensors provides false "
+"data, it is ignored."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1849
+#: user-manual.txt:1817
 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:1851
+#: user-manual.txt:1819
 msgid "The mean pO~2~ of the sensors is indicated with a green line,"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1859
+#: user-manual.txt:1827
 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 "
-"turned on by checking the appropriate checkboxes in the _Preferences_ panel "
+"turned on by checking the appropriate boxes in the _Preferences_ panel "
 "(accessible by selecting xref:S_CCR_options[_File -> Preferences -> "
 "Graph_]). This part of the _Preferences_ panel is shown in the image below, "
 "representing two checkboxes that modify the display of pO~2~ when the "
-"appropriate toolbar button on the Dive Profile has been activated."
+"appropriate toolbar button on the Dive Profile has been checked."
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:1860
+#: user-manual.txt:1828
 #, no-wrap
 msgid "images/CCR_preferences_f20.jpg"
 msgstr "images/CCR_preferences_f20.jpg"
 
 #. type: Plain text
-#: user-manual.txt:1867
+#: user-manual.txt:1835
 msgid ""
-"Checking any of these check boxes allows the display of additional oxygen-"
-"related information whenever the pO~2~ toolbar button on the _Profile_ panel "
-"is activated.  The first checkbox allows the display of setpoint "
-"information. This is a red line superimposed on the green oxygen partial "
-"pressure graph and allows a comparison of the mean measured oxygen partial "
-"pressure and the setpoint values, as shown below."
+"Checking any of these boxes allows the display of additional oxygen-related "
+"information whenever the pO~2~ toolbar button on the _Profile_ panel is "
+"activated.  The first checkbox allows the display of setpoint information. "
+"This is a red line superimposed on the green oxygen partial pressure graph "
+"and allows a comparison of the mean measured oxygen partial pressure and the "
+"setpoint values, as shown below."
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:1868
+#: user-manual.txt:1836
 #, no-wrap
 msgid "images/CCR_setpoint_f20.jpg"
 msgstr "images/CCR_setpoint_f20.jpg"
 
 #. type: Plain text
-#: user-manual.txt:1872
+#: user-manual.txt:1840
 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 "
@@ -3675,22 +3699,22 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1874
+#: user-manual.txt:1842
 msgid "Sensor 1: grey"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1875
+#: user-manual.txt:1843
 msgid "Sensor 2: blue"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1876
+#: user-manual.txt:1844
 msgid "Sensor 3: brown"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1880
+#: user-manual.txt:1848
 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 "
@@ -3698,13 +3722,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:1881
+#: user-manual.txt:1849
 #, no-wrap
 msgid "images/CCR_sensor_data_f20.jpg"
 msgstr "images/CCR_sensor_data_f20.jpg"
 
 #. type: Plain text
-#: user-manual.txt:1886
+#: user-manual.txt:1854
 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, "
@@ -3712,7 +3736,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1890
+#: user-manual.txt:1858
 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 "
@@ -3721,7 +3745,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1898
+#: user-manual.txt:1866
 msgid ""
 "_Cylinder pressures_: Some CCR dive computers like the Poseidon MkVI record "
 "the pressures of the oxygen and diluent cylinders. The pressures of these "
@@ -3729,18 +3753,18 @@ msgid ""
 "addition, start and end pressures for both oxygen and diluent cylinders are "
 "shown in the _Equipment Tab_.  Below is a dive profile for a CCR dive, "
 "including an overlay of setpoint and oxygen sensor data, as well as the "
-"cylinder pressure data. In this case there is good agreement from the "
-"readings of the two oxygen sensors."
+"cylinder pressure data. In this case there is agreement from the readings of "
+"the two oxygen sensors."
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:1899
+#: user-manual.txt:1867
 #, no-wrap
 msgid "images/CCR_dive_profile_f22.jpg"
 msgstr "images/CCR_dive_profile_f22.jpg"
 
 #. type: Plain text
-#: user-manual.txt:1904
+#: user-manual.txt:1872
 msgid ""
 "_Equipment-specific information_: Equipment-specific information gathered by "
 "_Subsurface_ is shown in the xref:S_ExtraDataTab[Extra data tab]. This may "
@@ -3748,7 +3772,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1910
+#: user-manual.txt:1878
 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 "
@@ -3760,28 +3784,28 @@ msgid ""
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:1911 user-manual.txt:2094
+#: user-manual.txt:1879 user-manual.txt:2058
 #, no-wrap
 msgid "images/icons/cceiling.jpg"
 msgstr "images/icons/cceiling.jpg"
 
 #. type: Plain text
-#: user-manual.txt:1916
+#: user-manual.txt:1884
 msgid ""
-"The default colour of the computer-generated deco ceiling is white. However, "
-"this can be set to red by checking the appropriate check box after selecting "
-"_File -> Preferences -> Graph_.  Below is a dive profile indicating the dive "
-"computer-generated deco ceiling:"
+"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 -> "
+"Preferences -> Graph_.  Below is a dive profile indicating the dive computer-"
+"generated deco ceiling:"
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:1917
+#: user-manual.txt:1885
 #, no-wrap
 msgid "images/CCR_dive_ceilingF22.jpg"
 msgstr "images/CCR_dive_ceilingF22.jpg"
 
 #. type: Plain text
-#: user-manual.txt:1921
+#: user-manual.txt:1889
 msgid ""
 "More equipment-specific information for downloading CCR dive logs for "
 "Poseidon MkVI and APD equipment can be found in xref:"
@@ -3790,19 +3814,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ==
-#: user-manual.txt:1922
+#: user-manual.txt:1890
 #, no-wrap
 msgid "Obtaining more information about dives entered into the logbook"
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:1924
+#: user-manual.txt:1892
 #, no-wrap
 msgid "The *Info* tab (for individual dives)"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1931
+#: user-manual.txt:1899
 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 "
@@ -3812,7 +3836,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1938
+#: user-manual.txt:1906
 msgid ""
 "Gas consumption and SAC calculations: _Subsurface_ calculates SAC and Gas "
 "consumption taking in account gas incompressibility, particularly at tank "
@@ -3821,13 +3845,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:1940
+#: user-manual.txt:1908
 #, no-wrap
 msgid "The *Extra Data* tab (usually for individual dives)"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1948
+#: user-manual.txt:1916
 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 "
@@ -3839,60 +3863,67 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:1949
+#: user-manual.txt:1917
 #, no-wrap
 msgid "images/ExtraDataTab_f20.jpg"
 msgstr "images/ExtraDataTab_f20.jpg"
 
 #. type: Title ===
-#: user-manual.txt:1951
+#: user-manual.txt:1919
 #, no-wrap
 msgid "The *Stats* tab (for groups of dives)"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1962
+#: user-manual.txt:1930
 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 "
 "Ctrl-click or Shift-click of the mouse. If only one dive has been selected, "
-"figures pertaining to only that dive are given. This tab shows the number of "
-"dives selected, the total amount of dive time in these dives, as well as the "
+"figures for only that dive are given. This tab shows the number of dives "
+"selected, the total amount of dive time in these dives, as well as the "
 "minimum, maximum and mean for the dive duration, water temperature and "
 "surface air consumption (SAC). It also shows the depth of the shallowest and "
 "deepest dives of those selected."
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:1964
+#: user-manual.txt:1932
 #, no-wrap
 msgid "The *Dive Profile*"
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:1966
+#: user-manual.txt:1934
 #, no-wrap
 msgid "images/Profile2.jpg"
 msgstr "images/Profile2.jpg"
 
 #. type: Plain text
-#: user-manual.txt:1977
+#: user-manual.txt:1945
 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 "
-"the left hand side that allows control over several display options. The "
+"the left hand side that lets you control several display options. The "
 "functions of these buttons are described below. The main item in the Dive "
-"Profile is the graph of dive depth as a function of time. In addition to the "
-"obvious information of the depth it also shows the ascent and descent rates "
-"compared to the recommended speed of going up or down in the water column. "
-"This information is given using different colours:"
+"Profile is the graph of dive depth as a function of time. In addition to "
+"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:"
 msgstr ""
 
 #. type: delimited block |
-#: user-manual.txt:1984
-#, no-wrap
-msgid ""
-"|*Colour*|*Descent speed (m/min)*|*Ascent speed (m/min)*\n"
+#: 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"
+msgid ""
+"|*Color*|*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"
@@ -3907,31 +3938,31 @@ msgstr ""
 "|Vert foncé|< 1.5|< 1.5\n"
 
 #. type: Plain text
-#: user-manual.txt:1989
+#: user-manual.txt:1957
 msgid ""
 "The profile also includes depth readings for the peaks and troughs in the "
-"graph.  Thus, users should see the depth of the deepest point and other "
-"peaks. Mean depth is plotted as a grey line, indicating mean dive depth up "
-"to a particular moment during the dive."
+"graph.  So users should see the depth of the deepest point and other peaks. "
+"Mean depth is plotted as a grey line, indicating mean dive depth up to a "
+"particular moment during the dive."
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:1990
+#: user-manual.txt:1958
 #, no-wrap
 msgid "images/icons/scale.jpg"
 msgstr "images/icons/scale.jpg"
 
 #. type: Plain text
-#: user-manual.txt:1995
+#: user-manual.txt:1963
 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 "
-"the dive profile frequently increases the size of the dive profile to fill "
-"the area of the panel efficiently."
+"the dive profile increases the size of the dive profile to fill the area of "
+"the panel."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:1998
+#: user-manual.txt:1966
 #, no-wrap
 msgid ""
 "*Water temperature* is displayed with its own blue line with temperature values\n"
@@ -3939,80 +3970,80 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2005
+#: user-manual.txt:1973
 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 "
 "dive computer reported deco ceilings (only visible for deep, long, or "
 "repetitive dives).  Partial pressures of oxygen are indicated in green, "
-"those of nitrogen in black, and those of helium in dark red. These partial "
-"pressure graphs are shown below the profile data."
+"nitrogen in black, and helium in dark red. These partial pressure graphs are "
+"shown below the profile data."
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:2006
+#: user-manual.txt:1974
 #, no-wrap
 msgid "images/icons/O2.jpg"
 msgstr "images/icons/O2.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2010
+#: user-manual.txt:1978
 msgid ""
 "Clicking this button allows display of the partial pressure of *oxygen* "
-"during the dive. This is depicted below the dive depth and water temperature "
+"during the dive. This is shown below the dive depth and water temperature "
 "graphs."
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:2011
+#: user-manual.txt:1979
 #, no-wrap
 msgid "images/icons/N2.jpg"
 msgstr "images/icons/N2.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2014
+#: user-manual.txt:1982
 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:2015
+#: user-manual.txt:1983
 #, no-wrap
 msgid "images/icons/He.jpg"
 msgstr "images/icons/He.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2019
+#: user-manual.txt:1987
 msgid ""
 "Clicking this button allows display of the partial pressure of *helium* "
-"during the dive.  This is only of importance to divers using Trimix, "
-"Helitrox or similar breathing gasses."
+"during the dive.  This is only important to divers using Trimix, Helitrox or "
+"similar breathing gasses."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2032
+#: user-manual.txt:2000
 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 "
-"manually entering the start and end pressures the graph is not a straight "
-"line.  Similarly to the depth graph the slope of the tank pressure gives the "
-"user information about the momentary SAC rate (Surface Air Consumption) when "
-"using an air integrated dive computer.  Here the colour coding is not "
-"relative to some absolute values but relative to the average normalised air "
+"manually entering the start and end pressures the graph, is not a straight "
+"line.  Like the depth graph, the slope of the tank pressure gives you "
+"information about the momentary SAC rate (Surface Air Consumption) when "
+"using an air integrated dive computer.  Here the color coding is not "
+"relative to some absolute values but relative to the average normalized air "
 "consumption during the dive. So areas that are red or orange indicate times "
 "of increased normalized air consumption while dark green reflects times when "
 "the diver was using less gas than average."
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:2033
+#: user-manual.txt:2001
 #, no-wrap
 msgid "images/icons/Heartbutton.png"
 msgstr "images/icons/Heartbutton.png"
 
 #. type: Plain text
-#: user-manual.txt:2037
+#: user-manual.txt:2005
 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 "
@@ -4020,87 +4051,85 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2045
+#: user-manual.txt:2012
 #, no-wrap
 msgid ""
 "It is possible to *zoom* into the profile graph. This is done either by using\n"
 "the scroll wheel / scroll gesture of your mouse or trackpad. By default\n"
 "_Subsurface_ always shows a profile area large enough for at least 30 minutes\n"
 "and 30m\n"
-" (100ft) – this way short or shallow dives are intuitively recognizable;\n"
-"something\n"
-"that free divers clearly won’t care about.\n"
+" (100ft) – this way short or shallow dives are easily recognizable;\n"
+"something free divers won’t care about.\n"
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2046
+#: user-manual.txt:2012
 #, no-wrap
 msgid "images/MeasuringBar.png"
 msgstr "images/MeasuringBar.png"
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:2048
+#: user-manual.txt:2014
 #, no-wrap
 msgid "images/icons/ruler.jpg"
 msgstr "images/icons/ruler.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2056
+#: user-manual.txt:2022
 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 "
-"done by dragging the red dots to the two points on the dive profile that the "
-"user wishes to measure. Information is then given in the horizontal white "
-"area underneath the two red dots."
+"done by dragging the red dots to the two points on the dive profile that you "
+"wish to measure. Information is then given in the horizontal white area "
+"underneath the two red dots."
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:2057
+#: user-manual.txt:2023
 #, no-wrap
 msgid "images/icons/ShowPhotos.png"
 msgstr "images/icons/ShowPhotos.png"
 
 #. type: Plain text
-#: user-manual.txt:2064
+#: user-manual.txt:2030
 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 "
-"indicates the exact time when this photo was taken. If this button is not "
+"shows the exact time when this photo was taken. If this button is not "
 "active, the photos are hidden."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2093
+#: user-manual.txt:2057
 msgid ""
 "The profile can also include the dive computer reported *ceiling* (more "
 "precisely, the deepest deco stop that the dive computer calculated for each "
 "particular moment in time) as a red overlay on the dive profile. Ascent "
-"ceilings arise when a direct ascent to the surface increases the risk of a "
+"ceilings occur when a direct ascent to the surface increases the risk of a "
 "diver suffering from decompression sickness (DCS) and it is necessary to "
 "either ascend slower or to perform decompression stop(s) before ascending to "
 "the surface. Not all dive computers record this information and make it "
-"available for download; for example all of the Suunto dive computers fail to "
-"make this very useful data available to divelog software. _Subsurface_ also "
-"calculates ceilings independently, shown as a green overlay on the dive "
-"profile.  Because of the differences in algorithms used and amount of data "
-"available (and other factors taken into consideration at the time of the "
-"calculation) it is unlikely that ceilings from dive computers and from "
-"_Subsurface_ are the same, even if the same algorithm and _gradient factors_ "
-"(see below) are used.  It is also quite common that _Subsurface_ calculates "
-"a ceiling for non-decompression dives when the dive computer stayed in non-"
-"deco mode during the whole dive (represented by the [green]#dark green# "
-"section in the profile at the beginning of this section). This is caused by "
-"the fact that _Subsurface’s_ calculations describe the deco obligation at "
-"each moment during a dive, while dive computers usually take the upcoming "
-"ascent into account. During the ascent some excess nitrogen (and possibly "
-"helium) are already breathed off so even though the diver technically "
-"encountered a ceiling at depth, the dive still does not require an explicit "
-"deco stop. This feature allows dive computers to offer longer non-stop "
-"bottom times."
-msgstr ""
-
-#. type: Plain text
-#: user-manual.txt:2099
+"available for download; for example none of the Suunto dive computers make "
+"these data available to divelog software. _Subsurface_ also calculates "
+"ceilings independently, shown as a green overlay on the dive profile.  "
+"Because of the differences in algorithms used and amount of data available "
+"(and other factors taken into consideration at the time of the calculation) "
+"it’s unlikely that ceilings from dive computers and from _Subsurface_ are "
+"the same, even if the same algorithm and _gradient factors_ (see below) are "
+"used.  It’s also quite common that _Subsurface_ calculates a ceiling for non-"
+"decompression dives when the dive computer stayed in non-deco mode during "
+"the whole dive (represented by the [green]#dark green# section in the "
+"profile at the beginning of this section). This is because _Subsurface’s_ "
+"calculations describe the deco obligation at each moment during a dive, "
+"while dive computers usually take the upcoming ascent into account. During "
+"the ascent some excess nitrogen (and possibly helium) are already breathed "
+"off so even though the diver technically encountered a ceiling at depth, the "
+"dive still does not require a specific deco stop. This feature lets dive "
+"computers offer longer non-stop bottom times."
+msgstr ""
+
+#. type: Plain text
+#: user-manual.txt:2063
 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 "
@@ -4108,13 +4137,13 @@ msgid ""
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:2100
+#: user-manual.txt:2064
 #, no-wrap
 msgid "images/icons/ceiling1.jpg"
 msgstr "images/icons/ceiling1.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2105
+#: user-manual.txt:2069
 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 "
@@ -4123,13 +4152,13 @@ msgid ""
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:2106
+#: user-manual.txt:2070
 #, no-wrap
 msgid "images/icons/ceiling2.jpg"
 msgstr "images/icons/ceiling2.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2110
+#: user-manual.txt:2074
 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 "
@@ -4137,56 +4166,55 @@ msgid ""
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:2111
+#: user-manual.txt:2075
 #, no-wrap
 msgid "images/icons/ceiling3.jpg"
 msgstr "images/icons/ceiling3.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2115
+#: user-manual.txt:2079
 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:2116
+#: user-manual.txt:2080
 #, no-wrap
 msgid "images/Ceilings2.jpg"
 msgstr "images/Ceilings2.jpg"
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:2118
+#: user-manual.txt:2082
 #, no-wrap
 msgid "images/icons/ShowCylindersButton.jpg"
 msgstr "images/icons/ShowCylindersButton.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2124
+#: user-manual.txt:2088
 msgid ""
 "By selecting this icon, the different cylinders used during a dive can be "
-"represented as a coloured bar at the bottom of the *Dive Profile*. In "
-"general oxygen is represented by a green bar, nitrogen with a yellow bar and "
-"helium with a red bar. The image below shows a dive which first uses a "
-"trimix cylinder (red and green), followed by a switch to a nitrox cylinder "
-"(yellow and green) after 23 minutes. Cylinders with air are shown as a light "
-"blue bar."
+"represented as a colored bar at the bottom of the *Dive Profile*. In general "
+"oxygen is represented by a green bar, nitrogen a yellow bar and helium a red "
+"bar. The image below shows a dive which first uses a trimix cylinder (red "
+"and green), followed by a switch to a nitrox cylinder (yellow and green) "
+"after 23 minutes. Cylinders with air are shown as a light blue bar."
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2125
+#: user-manual.txt:2089
 #, no-wrap
 msgid "images/ShowCylinders_f20.jpg"
 msgstr "images/ShowCylinders_f20.jpg"
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:2128
+#: user-manual.txt:2092
 #, no-wrap
 msgid "images/tissues.jpg"
 msgstr "images/tissues.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2140
+#: user-manual.txt:2105
 msgid ""
 "Display inert gas tissue pressures relative to ambient inert gas pressure "
 "(horizontal grey line).  Tissue pressures are calculated using the Bühlmann "
@@ -4194,24 +4222,23 @@ msgid ""
 "tissues) to blue (slower tissues).  The black line, graphed above the "
 "ambient pressure, is the maximum allowable tissue supersaturation (pressure "
 "limit) derived from the gradient factors specified in the *Preferences*. For "
-"divers involved in planned decompression diving, efficient rates of "
-"offgasing are obtained with tissue pressures between the ambient inert gas "
-"pressure (grey line) and the pressure limit (black line). This display is a "
-"representation of the tissue pressures during the whole dive. In contrast, "
-"the xref:S_gas_pressure_graph[Gas Pressure Graph] in the *Information Box* "
-"on the *Dive Profile* is an instantaneous reflection of tissue pressures at "
-"the moment in time reflected by the position of the cursor on the dive "
-"profile."
+"divers doing planned decompression diving, efficient rates of offgassing are "
+"obtained with tissue pressures between the ambient inert gas pressure (grey "
+"line) and the pressure limit (black line). This display is a representation "
+"of the tissue pressures during the whole dive. In contrast, the xref:"
+"S_gas_pressure_graph[Gas Pressure Graph] in the *Information Box* on the "
+"*Dive Profile* is an instantaneous reflection of tissue pressures at the "
+"moment in time, at the position of the cursor on the dive profile."
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2141
+#: user-manual.txt:2106
 #, no-wrap
 msgid "images/tissuesGraph.jpg"
 msgstr "images/tissuesGraph.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2149
+#: user-manual.txt:2114
 msgid ""
 "Gradient Factor settings strongly affect the calculated ceilings and their "
 "depths.  For more information about Gradient factors, see the section on "
@@ -4224,55 +4251,55 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2151
+#: user-manual.txt:2116
 #, 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:2153
+#: user-manual.txt:2118
 #, 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:2155
+#: user-manual.txt:2120
 #, no-wrap
 msgid "The Dive Profile context menu"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2173
+#: user-manual.txt:2139
 msgid ""
 "The context menu for the Dive Profile is accessed by right-clicking while "
-"the mouse cursor is over the Dive Profile panel. The menu allows the "
-"creation of Bookmarks or Gas Change Event markers or manual CCR set-point "
-"changes other than the ones that might have been imported from a Dive "
-"Computer. Markers are placed against the depth profile line and with the "
-"time of the event set by where the mouse cursor was when the right mouse "
-"button was initially clicked to bring up the menu. Gas Change events involve "
-"a selection of which gas is being switched to, the list of choices being "
-"based on the available gases defined in the *Equipment* Tab. Set-point "
-"change events open a dialog allowing to choose the next set-point value. As "
-"in the planner, a set-point value of zero indicates the diver is breathing "
-"from an open circuit system while any non-zero value indicates the use of a "
-"closed circuit rebreather (CCR).  By right-clicking while over an existing "
-"marker a menu appears, adding options to allow deletion of the marker or to "
-"allow all markers of that type to be hidden. Hidden events can be restored "
-"to view by selecting Unhide all events from the context menu."
+"the mouse cursor is over the Dive Profile panel. The menu lets you create "
+"Bookmarks, Gas Change Event markers, or manual CCR set-point changes other "
+"than the ones that might have been imported from a Dive Computer. Markers "
+"are placed against the depth profile line, with the time of the event set by "
+"where the mouse cursor was when the right mouse button was first clicked to "
+"bring up the menu. Gas Change events involve a selection of which gas is "
+"being switched TO. The list of choices is based on the available gases "
+"defined in the *Equipment* Tab. Setpoint change events open a dialog letting "
+"you choose the next setpoint value. As in the planner, a setpoint value of "
+"zero shows the diver is breathing from an open circuit system while any non-"
+"zero value shows the use of a closed circuit rebreather (CCR).  By right-"
+"clicking while over an existing marker a menu appears, adding options to "
+"allow deletion of the marker, or to allow all markers of that type to be "
+"hidden. Hidden events can be restored to view by selecting Unhide all events "
+"from the context menu."
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:2175
+#: user-manual.txt:2141
 #, no-wrap
 msgid "The *Information Box*"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2185
+#: user-manual.txt:2150
 msgid ""
-"The Information box displays a large range of information pertaining to the "
-"dive profile. Normally the Information Box is located to the top left of the "
+"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 "
 "*Dive Profile* panel. If the mouse points outside of the *Dive Profile* "
 "panel, then only the top line of the Information Box is visible (see left-"
 "hand part of figure (*A*) below). The Information Box can be moved around in "
@@ -4282,47 +4309,46 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2186
+#: user-manual.txt:2151
 #, no-wrap
 msgid "images/InfoBox2.jpg"
 msgstr "images/InfoBox2.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2203
+#: user-manual.txt:2168
 msgid ""
-"The moment the mouse points inside the *Dive Profile* panel, the information "
-"box expands and shows many data items. In this situation, the data reflect "
-"the time point along the dive profile indicated by the mouse cursor (see "
-"right-hand part of figure (*B*) above where the Information Box reflects the "
-"situation at the position of the cursor [arrow] in that image). Therefore, "
-"moving the cursor in the horizontal direction allows the Information Box to "
-"show information for any point along the dive profile.  In this mode, the "
-"Information Box gives extensive statistics about depth, gas and ceiling "
-"characteristics of the particular dive. These include: Time period into the "
-"dive (indicated by a @), depth, cylinder pressure (P), temperature, ascent/"
-"descent rate, surface air consumption (SAC), oxygen partial pressure, "
-"maximum operating depth, equivalent air depth (EAD), equivalent narcotic "
-"depth (END), equivalent air density depth (EADD), decompression requirements "
-"at that instant in time (Deco), time to surface (TTS), the calculated "
-"ceiling, as well as the calculated ceiling for several Bühlmann tissue "
-"compartments."
+"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 "
+"time point along the dive profile shown by the mouse cursor (see right-hand "
+"part of figure (*B*) above where the Information Box reflects the situation "
+"at the position of the cursor [arrow] in that image). Moving the cursor "
+"horizontally lets the Information Box show information for any point along "
+"the dive profile.  In this mode, the Information Box gives extensive "
+"statistics about depth, gas and ceiling characteristics of the particular "
+"dive. These include: Time period into the dive (indicated by a @), depth, "
+"cylinder pressure (P), temperature, ascent/descent rate, surface air "
+"consumption (SAC), oxygen partial pressure, maximum operating depth, "
+"equivalent air depth (EAD), equivalent narcotic depth (END), equivalent air "
+"density depth (EADD), decompression requirements at that instant in time "
+"(Deco), time to surface (TTS), the calculated ceiling, as well as the "
+"calculated ceiling for several Bühlmann tissue compartments."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2206
+#: user-manual.txt:2171
 msgid ""
-"The user has control over the display of several statistics, represented as "
-"four buttons on the left of the profile panel. These are:"
+"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:2207
+#: user-manual.txt:2172
 #, no-wrap
 msgid "images/icons/MOD.jpg"
 msgstr "images/icons/MOD.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2216
+#: user-manual.txt:2181
 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 "
@@ -4330,115 +4356,115 @@ msgid ""
 "oxygen) it is around 57 m if a maximum pO~2~ of 1.4 is specified in the "
 "*Preferences* section (select _File_ -> Preferences -> Graph_ and edit the "
 "text box _Max pO~2~ when showing MOD_.  Below the MOD there is a markedly "
-"increased risk of exposure to the dangers associated with oxygen toxicity."
+"increased risk of exposure to the dangers of oxygen toxicity."
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:2217
+#: user-manual.txt:2182
 #, no-wrap
 msgid "images/icons/NDL.jpg"
 msgstr "images/icons/NDL.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2229
+#: user-manual.txt:2194
 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 "
 "duration that a diver can continue with a dive, given the present depth, "
 "that does not require decompression (that is, before an ascent ceiling "
-"appears). Once one has exceeded the NDL and decompression is required (that "
-"is, there is an ascent ceiling above the diver, then TTS gives the number of "
-"minutes required before the diver can surface. TTS includes ascent time as "
-"well as decompression time. TTS is calculated assuming an ascent surface air "
-"consumption (SAC) for the gas currently used. Even if the profile contains "
-"several gas switches, TTS at a specific moment during the dive is calculated "
-"using the current gas.  For TTS longer than 2 hours, it is not accurately "
-"calculated and Subsurface only indicates _TTS > 2h_."
+"appears). Once a diver has exceeded the NDL and decompression is required "
+"(that is, there is an ascent ceiling above the diver) then TTS gives the "
+"number of minutes required before the diver can surface. TTS includes ascent "
+"time as well as decompression time. TTS is calculated assuming an ascent "
+"surface air consumption (SAC) for the gas currently used. Even if the "
+"profile contains several gas switches, TTS at a specific moment during the "
+"dive is calculated using the current gas.  TTS longer than 2 hours is not "
+"accurately calculated and Subsurface only indicates _TTS > 2h_."
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:2230
+#: user-manual.txt:2195
 #, no-wrap
 msgid "images/icons/SAC.jpg"
 msgstr "images/icons/SAC.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2239
+#: user-manual.txt:2204
 msgid ""
 "Clicking this button causes the Information Box to display the *Surface Air "
-"Consumption (SAC)*.  SAC is an indication of the surface-normalised "
+"Consumption (SAC)*.  SAC is an indication of the surface-normalized "
 "respiration rate of a diver. The value of SAC is less than the real "
 "respiration rate because a diver at 10m uses breathing gas at a rate roughly "
 "double that of the equivalent rate at the surface. SAC gives an indication "
-"of breathing gas consumption rate independent of the depth of the dive so "
-"that the respiratory rates of different dives can be compared. The units for "
-"SAC is litres/min or cub ft/min."
+"of breathing gas consumption rate independent of the depth of the dive, so "
+"the respiratory rates of different dives can be compared. The units for SAC "
+"is liters/min or cubic ft/min."
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:2240
+#: user-manual.txt:2205
 #, no-wrap
 msgid "images/icons/EAD.jpg"
 msgstr "images/icons/EAD.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2255
+#: user-manual.txt:2220
 msgid ""
 "Clicking this button displays the *Equivalent Air Depth (EAD)* for nitrox "
 "dives as well as the *Equivalent Narcotic Depth (END)* for trimix dives. "
-"These are numbers of importance to divers who use breathing gases other than "
-"air. Their values are dependent on the composition of the breathing gas.  "
-"The EAD is the depth of a hypothetical air dive that has the same partial "
-"pressure of nitrogen as the current depth of the nitrox dive at hand. A "
-"nitrox dive leads to the same decompression obligation as an air dive to the "
-"depth equalling the EAD. The END is the depth of a hypothetical air dive "
-"that has the same sum of partial pressures of the narcotic gases nitrogen "
-"and oxygen as the current trimix dive. A trimix diver can expect the same "
-"narcotic effect as a diver breathing air diving at a depth equalling the END."
+"These are important to divers breathe gases other than air. Their values are "
+"dependent on the composition of the breathing gas.  The EAD is the depth of "
+"a hypothetical air dive that has the same partial pressure of nitrogen as "
+"the current depth of the nitrox dive at hand. A nitrox dive leads to the "
+"same decompression obligation as an air dive to the depth equalling the EAD. "
+"The END is the depth of a hypothetical air dive that has the same sum of "
+"partial pressures of the narcotic gases nitrogen and oxygen as the current "
+"trimix dive. A trimix diver can expect the same narcotic effect as a diver "
+"breathing air diving at a depth equalling the END."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2257
+#: user-manual.txt:2222
 msgid ""
 "Figure (*B*) above shows an information box with a nearly complete set of "
 "data."
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:2259
+#: user-manual.txt:2224
 #, no-wrap
 msgid "The Gas Pressure Bar Graph"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2266
+#: user-manual.txt:2231
 msgid ""
-"On the left of the *Information Box* is a vertical bar graph indicating the "
+"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 "
 "applicable) that the diver was inhaling _at a particular instant during the "
-"dive_, indicated by the position of the cursor on the *Dive Profile*. The "
+"dive_. It is shown by the position of the cursor on the *Dive Profile*. The "
 "drawing on the left below indicates the meaning of the different parts of "
 "the Gas Pressure Bar Graph."
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2267
+#: user-manual.txt:2232
 #, no-wrap
 msgid "images/GasPressureBarGraph.jpg"
 msgstr "images/GasPressureBarGraph.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2273
+#: user-manual.txt:2238
 msgid ""
 "The light green area indicates the total gas, with the top margin of the "
-"light green area indicating the total gas pressure inhaled by the diver and "
+"light green area showing the total gas pressure inhaled by the diver and "
 "measured from the bottom of the graph to the top of the light green area. "
 "This pressure has a _relative_ value in the graph and does not indicate "
 "absolute pressure."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2279
+#: user-manual.txt:2244
 msgid ""
 "The horizontal black line underneath the light green margin indicates the "
 "equilibrium pressure of the inert gases inhaled by the diver, usually "
@@ -4449,7 +4475,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2283
+#: user-manual.txt:2248
 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 "
@@ -4457,7 +4483,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2288
+#: user-manual.txt:2253
 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 "
@@ -4466,39 +4492,39 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2292
+#: user-manual.txt:2257
 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 "
+"M-value. That is the pressure value of inert gases at which bubble formation "
 "is expected to be severe, resulting in decompression sickness."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2295
+#: user-manual.txt:2260
 msgid ""
-"These five values are indicated on the left in the graph above. The way the "
-"Gas Pressure Bar Graph changes during a dive is indicated on the right hand "
-"side of the above figure for a diver using EAN32."
+"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 "
+"of the above figure for a diver using EAN32."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2298
+#: user-manual.txt:2263
 msgid ""
-"Graph *A* indicates the situation at the start of a dive with diver at the "
-"surface. The pressures in all the tissue compartments are still at the "
-"equilibrium pressure because no diving has taken place."
+"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 "
+"pressure because no diving has taken place."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2301
+#: user-manual.txt:2266
 msgid ""
 "Graph *B* indicates the situation after a descent to 30 meters. Few of the "
-"tissue compartments have had time to respond to the descent, their gas "
-"pressures being far below the equilibrium gas pressure."
+"tissue compartments have had time to respond to the descent, so their gas "
+"pressures are far below the equilibrium gas pressure."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2306
+#: user-manual.txt:2271
 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 "
@@ -4508,18 +4534,18 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2312
+#: user-manual.txt:2277
 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 "
+"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 "
 "bar to 1.45 bar, the pressures in the different tissue compartments now "
-"exceed that of the total gas pressure and approaches the gradient factor "
-"value (i.e.  the top black horizontal line). Further ascent will result in "
+"exceed that of the total gas pressure and approach the gradient factor value "
+"(i.e.  the top black horizontal line). Further ascent will result in "
 "exceeding the gradient factor value (GFHigh), endangering the diver."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2317
+#: user-manual.txt:2282
 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 "
@@ -4529,184 +4555,180 @@ msgid ""
 msgstr ""
 
 #. type: Title ==
-#: user-manual.txt:2320
+#: user-manual.txt:2285
 #, no-wrap
-msgid "Organising the logbook (Manipulating groups of dives)"
+msgid "Organizing the logbook (Manipulating groups of dives)"
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:2322
+#: user-manual.txt:2287
 #, no-wrap
 msgid "The Dive List context menu"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2326
+#: user-manual.txt:2291
 msgid ""
-"Several actions on either a single dive or a group of dives can be performed "
-"using the Dive List Context Menu, found by selecting either a single dive or "
-"a group of dives and then right-clicking."
+"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 "
+"a single dive or a group of dives and then right-clicking."
 msgstr ""
 
 #.  TODO: NEEDS REPLACEMENT
 #. type: Target for macro image
-#: user-manual.txt:2328
+#: user-manual.txt:2293
 #, no-wrap
 msgid "images/ContextMenu.jpg"
 msgstr "images/ContextMenu.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2331
-msgid "The context menu is used in many manipulations described below."
+#: user-manual.txt:2296
+msgid "The context menu is used in many functions described below."
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:2332
+#: user-manual.txt:2297
 #, no-wrap
-msgid "Customising the columns showed in the *Dive List* panel"
+msgid "Customizing the columns showed in the *Dive List* panel"
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2334
+#: user-manual.txt:2299
 #, no-wrap
 msgid "images/DiveListOptions.jpg"
 msgstr "images/DiveListOptions.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2342
+#: user-manual.txt:2307
 msgid ""
 "The default information in the *Dive List* includes, for each dive, "
 "Dive_number, Date, Rating, Dive_depth, Dive_duration and Dive_location. This "
 "information can be controlled and changed by right-clicking on the header "
 "bar of the *Dive List*. For instance, a right-click on the 'Date' header "
 "brings up a list of items that can be shown in the dive list (see above). "
-"Select an item to be shown in the *Dive List* or to be deleted from the dive "
-"list (reflected by the check symbols) and the list is immediately updated. "
-"Preferences for information shown in the *Dive List* are saved and used when "
-"_Subsurface_ is re-opened."
+"Select an item to be shown in the *Dive List* or be deleted (reflected by "
+"the check symbols) and the list is immediately updated. Preferences for "
+"information shown in the *Dive List* are saved and used when _Subsurface_ is "
+"re-opened."
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:2344
+#: user-manual.txt:2309
 #, no-wrap
 msgid "Renumbering the dives"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2356
+#: user-manual.txt:2321
 msgid ""
 "Dives are normally numbered incrementally from non-recent dives (low "
-"sequence numbers) to recent dives (having the highest sequence numbers). The "
-"numbering of the dives is not always consistent. For instance, when non-"
-"recent dives are added to the dive list the numbering does not automatically "
-"follow on because of the dives that are more recent in date/time than the "
-"newly-added dive with an older date/time. Therefore, one may sometimes need "
-"to renumber the dives.  This is performed by selecting (from the Main Menu) "
-"_Log -> Renumber_. Users are given a choice with respect to the lowest "
-"sequence number to be used.  Completing this operation results in new "
-"sequence numbers (based on date/time)  for the dives in the *Dive List* "
-"panel."
+"sequence numbers) to recent dives (higher sequence numbers).  Numbering of "
+"dives is not always consistent. For instance, when non-recent dives are "
+"added, correct numbering does not automatically follow on because of the "
+"dives that are more recent in date/time than the newly-added dive with an "
+"older date/time. So you may need to renumber the dives.  Do this by "
+"selecting (from the Main Menu) _Log -> Renumber_. Users are given a choice "
+"of the lowest sequence number to be used.  This results in new sequence "
+"numbers (based on date/time)  for the dives in the *Dive List* panel."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2361
+#: user-manual.txt:2326
 msgid ""
-"One can also renumber a few selected dives in the dive list. Select the "
+"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 "
 "Dive List Context Menu to perform the renumbering. A popup window appears "
-"requiring the user to specify the starting number for the renumbering "
-"process."
+"letting the user specify the starting number for the process."
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:2363
+#: user-manual.txt:2328
 #, no-wrap
 msgid "Grouping dives into trips and manipulating trips"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2371
+#: user-manual.txt:2336
 msgid ""
 "For regular divers, the dive list can rapidly become very long. _Subsurface_ "
-"can group dives into _trips_. It performs this by grouping dives that have "
-"date/times not separated in time by more than two days, thus creating a "
-"single heading for each diving trip represented in the dive log. Below is an "
+"can group dives into _trips_. It does this by grouping dives that have date/"
+"times not separated in time by more than two days, so creating a single "
+"heading for each diving trip represented in the dive log. Below is an "
 "ungrouped dive list (*A*, on the left) as well as the corresponding grouped "
-"dive list comprising five dive trips (*B*, on the right):"
+"dive list of five dive trips (*B*, on the right):"
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2372
+#: user-manual.txt:2337
 #, no-wrap
 msgid "images/Group2.jpg"
 msgstr "images/Group2.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2378
+#: user-manual.txt:2343
 msgid ""
 "Grouping into trips allows a rapid way of accessing individual dives without "
-"having to scan a long lists of dives. In order to group the dives in a dive "
-"list, (from the Main Menu) select _Log -> Autogroup_. The *Dive List* panel "
-"now shows only the titles for the trips."
+"having to scan a long lists of dives. To group the dives in a dive list, "
+"(from the Main Menu) select _Log -> Autogroup_. The *Dive List* panel now "
+"shows only the titles for the trips."
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:2379
+#: user-manual.txt:2344
 #, no-wrap
 msgid "Editing the title and associated information for a particular trip"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2392
+#: user-manual.txt:2357
 msgid ""
 "Normally, in the dive list, minimal information is included in the trip "
 "title.  More information about a trip can be added by selecting its trip "
 "title from the *Dive List*. This shows a *Trip Notes* tab in the *Notes* "
-"panel. Here one can add or edit information about the date/time, the trip "
+"panel. Here you can add or edit information about the date/time, the trip "
 "location and any other general comments about the trip as a whole (e.g. the "
-"dive company that was dived with, the general weather and surface conditions "
+"dive company that was used, the general weather and surface conditions "
 "during the trip, etc.).  After entering this information, select *Save* from "
 "the buttons at the top right of the *Trip Notes* tab. The trip title in the "
 "*Dive List* panel should now reflect the edited information."
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:2393
+#: user-manual.txt:2358
 #, no-wrap
 msgid "Viewing the dives during a particular trip"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2398
+#: user-manual.txt:2363
 msgid ""
-"Once the dives have been grouped into trips, users can expand one or more "
+"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 "
-"expands the selected trip, revealing the individual dives performed during "
-"the trip."
+"expands the selected trip, revealing individual dives done during the trip."
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:2399
+#: user-manual.txt:2364
 #, no-wrap
 msgid "Collapsing or expanding dive information for different trips"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2404
+#: user-manual.txt:2369
 msgid ""
 "After selecting a particular trip in the dive list, the context menu allows "
-"several possibilities to expand or collapse dives within trips. This "
-"includes expanding all trips and collapsing all trips."
+"several options to expand or collapse dives within trips. This includes "
+"expanding all trips and collapsing all trips."
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:2405
+#: user-manual.txt:2370
 #, no-wrap
 msgid "Merging dives from more than one trip into a single trip"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2410
+#: user-manual.txt:2375
 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 "
@@ -4714,75 +4736,73 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:2411
+#: user-manual.txt:2376
 #, no-wrap
 msgid "Splitting a single trip into more than one trip"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2421
+#: user-manual.txt:2385
 msgid ""
-"If a trip includes ten dives, the user can split this trip into two trips "
-"(trip 1: top 4 dives; trip 2: bottom 6 dives) by selecting and right-"
-"clicking the top four dives. The resulting context menu allows the user to "
-"create a new trip by choosing the option *Create new trip above*. The top "
-"four dives are then grouped into a separate trip. The figures below shows "
-"the selection and context menu on the left (A) and the completed action on "
-"the right (B):"
+"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 "
+"top four dives. The resulting context menu lets the user create a new trip "
+"by choosing the option *Create new trip above*. The top four dives are then "
+"grouped into a separate trip. The figures below show the selection and "
+"context menu on the left (A) and the completed action on the right (B):"
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2422
+#: user-manual.txt:2386
 #, no-wrap
 msgid "images/SplitDive3a.jpg"
 msgstr "images/SplitDive3a.jpg"
 
 #. type: Title ===
-#: user-manual.txt:2424
+#: user-manual.txt:2388
 #, no-wrap
 msgid "Manipulating single dives"
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:2426
+#: user-manual.txt:2390
 #, no-wrap
 msgid "Delete a dive from the dive log"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2433
+#: user-manual.txt:2397
 msgid ""
 "Dives can be permanently deleted from the dive log by selecting and right-"
-"clicking them to bring up the context menu, and then selecting *Delete "
-"dive(s)*. Typically this would apply to a case where a user wishes to delete "
-"workshop calibration dives of the dive computer or dives of extremely short "
-"duration."
+"clicking them to bring up the context menu, then selecting *Delete dive(s)*. "
+"Typically this would apply to a case where a user wishes to delete workshop "
+"calibration dives of the dive computer or dives of extremely short duration."
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:2434
+#: user-manual.txt:2398
 #, no-wrap
 msgid "Unlink a dive from a trip"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2441
+#: user-manual.txt:2405
 msgid ""
-"Users can unlink dives from the trip to which they belong. In order to do "
-"this, select and right-click the relevant dives to bring up the context "
-"menu. Then select the option *Remove dive(s)  from trip*. The dive(s) now "
-"appear immediately above or below the trip to which they belonged, depending "
-"on the date and time of the unlinked dive."
+"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 "
+"the option *Remove dive(s)  from trip*. The dive(s) now appear immediately "
+"above or below the trip to which they belonged, depending on the date and "
+"time of the unlinked dive."
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:2442
+#: user-manual.txt:2406
 #, no-wrap
 msgid "Add a dive to the trip immediately above"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2447
+#: user-manual.txt:2411
 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 "
@@ -4790,57 +4810,57 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:2448
+#: user-manual.txt:2412
 #, no-wrap
 msgid "Shift the start time of dive(s)"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2459
+#: user-manual.txt:2422
 msgid ""
-"Sometimes it is necessary to adjust the start time of a dive. This may apply "
-"to situations where dives are performed in different time zones or when the "
-"dive computer has an erroneous time. In order to do this, select and right-"
-"click the dive(s) to be adjusted. This action brings up the context menu on "
-"which the *Shift times* option should be selected. User must then specify "
-"the time (in hours and minutes) by which the dives should be adjusted and "
-"click on the option indicating whether the time adjustment should be ealier "
-"or later."
+"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 "
+"computer has a wrong time. To do this, select and right-click the dive(s) to "
+"be adjusted. This brings up the context menu on which the *Shift times* "
+"option should be selected. You must then specify the time (in hours and "
+"minutes) by which the dives should be adjusted and click on the option of "
+"whether the time adjustment should be earlier or later."
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:2460
+#: user-manual.txt:2423
 #, no-wrap
 msgid "Merge dives into a single dive"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2470
+#: user-manual.txt:2433
 msgid ""
-"Sometimes a dive is briefly interrupted, e.g. if a diver returns to the "
-"surface for a few minutes, resulting in two or more dives being recorded by "
-"the dive computer and appearing as different dives in the *Dive List* panel. "
-"Users can merge these dives onto a single dive by selecting the appropriate "
-"dives, right-clicking them to bring up the context menu and then selecting "
-"*Merge selected dives*. It may be necessary to edit the dive information in "
-"the *Notes* panel to reflect events or conditions that apply to the merged "
-"dive. The figure below shows the depth profile of two dives that were merged:"
+"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 "
+"recorded by the dive computer and appearing as different dives in the *Dive "
+"List* panel. You can merge these dives onto a single dive by selecting the "
+"appropriate dives, right-clicking them to bring up the context menu and then "
+"selecting *Merge selected dives*. It may be necessary to edit the dive "
+"information in the *Notes* panel to reflect events or conditions that apply "
+"to the merged dive. The figure below shows the depth profile of two dives "
+"that were merged:"
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2471
+#: user-manual.txt:2434
 #, no-wrap
 msgid "images/MergedDive.png"
 msgstr "images/MergedDive.png"
 
 #. type: Title ====
-#: user-manual.txt:2473
+#: user-manual.txt:2436
 #, no-wrap
 msgid "Undo dive manipulations"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2479
+#: user-manual.txt:2442
 msgid ""
 "Important actions on dives or trips, described above, can be undone or "
 "redone.  This includes: _delete dives_, _merge dives_, _renumber dives_ and "
@@ -4850,85 +4870,84 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:2482
+#: user-manual.txt:2445
 #, no-wrap
 msgid "Filtering the dive list"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2488
+#: user-manual.txt:2451
 msgid ""
-"The dives in the *Dive List* panel can be filtered, that is, one can select "
-"only some of the dives based on their attributes, e.g. dive tags, dive site, "
-"dive master, buddy or protective clothing. For instance, filtering allows "
-"one to list the deep dives at a particular dive site, or otherwise the cave "
-"dives with a particular buddy."
+"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 "
+"master, buddy or protective clothing. For instance, filtering lets you list "
+"the deep dives at a particular dive site, or otherwise the cave dives with a "
+"particular buddy."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2496
+#: user-manual.txt:2459
 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 "
 "are located at the top right hand of the filter panel (see image below). The "
 "_Filter Panel_ can be reset (i.e. all current filters cleared) by selecting "
-"the *yellow angled arrow*. The _Filter Panel_ may also be minimised by "
-"selecting the *green up-arrow\". When minimised, only these three icons are "
-"shown.  The panel can be maximised by clicking the icon that minimised the "
-"panel. The filter may also be reset and closed by selecting the *red button* "
+"the *yellow angled arrow*. The _Filter Panel_ may also be minimized by "
+"selecting the *green up-arrow\". When minimized, only these three icons are "
+"shown.  The panel can be maximized by clicking the same icon that minimized "
+"it. The filter may also be reset and closed by selecting the *red button* "
 "with the white cross."
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2497
+#: user-manual.txt:2460
 #, no-wrap
 msgid "images/Filterpanel.jpg"
 msgstr "images/Filterpanel.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2506
+#: user-manual.txt:2469
 msgid ""
 "Four filter criteria may be used to filter the dive list: dive tags, person "
-"(buddy / dive master), dive site and dive suit, each of which is represented "
+"(buddy / divemaster), dive site and dive suit.  Each of these is represented "
 "by a check list with check boxes. Above each check list is a second-level "
-"filter tool, allowing the listing of only some of the attributes within that "
-"check list. For instance, typing \"_ca_\" in the filter textbox above the "
-"tags check list results in the tags check list being reduced to \"_cave_\" "
-"and \"_cavern_\". Filtering of the check list enables the rapid finding of "
-"search terms for filtering the dive list."
+"filter tool, allowing the listing of only some attributes within that check "
+"list. For instance, typing \"_ca_\" in the filter text box above the tags "
+"check list, results in the list being reduced to \"_cave_\" and \"_cavern_"
+"\". Filtering the check list helps to rapidly find search terms for "
+"filtering the dive list."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2514
+#: user-manual.txt:2477
 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 "
 "dives that pertain to the criteria specified in the check lists.  The four "
-"check lists work as a filter with _AND_ operators, Subsurface filters "
-"therefore for _cave_ as a tag AND _Joe Smith_ as a buddy; but the filters "
+"check lists work as a filter with _AND_ operators. Subsurface filters "
+"therefore for _cave_ as a tag AND _Joe Smith_ as a buddy. But the filters "
 "within a category are inclusive - filtering for _cave_ and _boat_ shows "
 "those dives that have either one OR both of these tags."
 msgstr ""
 
 #. type: Title ==
-#: user-manual.txt:2516
+#: user-manual.txt:2479
 #, no-wrap
 msgid "Exporting the dive log or parts of the dive log"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2519
-msgid ""
-"There are two routes for the export of dive information from Subsurface:"
+#: user-manual.txt:2482
+msgid "There are two ways to export dive information from Subsurface:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2521
+#: user-manual.txt:2484
 msgid "Export dive information to _Facebook_"
 msgstr "Exporter les informations de plongée vers _Facebook_"
 
 #. type: Plain text
-#: user-manual.txt:2523
+#: user-manual.txt:2486
 msgid ""
 "xref:S_Export_other[Export dive information to other destinations or formats]"
 msgstr ""
@@ -4936,22 +4955,31 @@ msgstr ""
 "destinations ou formats]"
 
 #. type: Title ===
-#: user-manual.txt:2525
+#: user-manual.txt:2488
 #, no-wrap
 msgid "Exporting dive information to _Facebook_"
 msgstr "Export des informations de plongée vers _Facebook_"
 
 #. type: Plain text
-#: user-manual.txt:2534
+#: 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."
 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."
+"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."
 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 "
@@ -4963,39 +4991,56 @@ msgstr ""
 "Facebook_ pour fermer la connexion _Facebook_."
 
 #. type: Target for macro image
-#: user-manual.txt:2535
+#: user-manual.txt:2498
 #, no-wrap
 msgid "images/facebook1_f20.jpg"
 msgstr "images/facebook1_f20.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2540
+#: user-manual.txt:2503
 msgid ""
-"From the _Subsurface_ window it is easy to determine whether _Subsurface_ "
-"has a valid connection to _Facebook_ From the *Main Menu*, select _Share on -"
-"> 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 colour and can be selected)."
+"From the _Subsurface_ window it’s easy to determine whether _Subsurface_ has "
+"a valid connection to _Facebook_ From the *Main Menu*, select _Share on -> "
+"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)."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2550
-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: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_."
+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 "
+"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."
 msgstr ""
 "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 "
@@ -5014,13 +5059,18 @@ msgstr ""
 "moment, une fenêtre apparait indiquant le succès du transfert."
 
 #. type: Plain text
-#: user-manual.txt:2557
-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: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."
+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, "
@@ -5030,13 +5080,13 @@ msgstr ""
 "publications non désirées sur votre ligne temporelle publique."
 
 #. type: Target for macro image
-#: user-manual.txt:2558
+#: user-manual.txt:2520
 #, no-wrap
 msgid "images/facebook2_f20.jpg"
 msgstr "images/facebook2_f20.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2562
+#: user-manual.txt:2524
 msgid ""
 "If required, then close the _Facebook_ connection by either closing "
 "_Subsurface_ or by selecting _File -> Preferences -> Facebook_ from the Main "
@@ -5048,15 +5098,16 @@ msgstr ""
 "préférences Facebook."
 
 #. type: Title ===
-#: user-manual.txt:2564
-#, no-wrap
-msgid "Export dive information  to other destinations or formats"
-msgstr ""
+#: user-manual.txt:2526
+#, fuzzy, no-wrap
+#| msgid "xref:S_Export_other[Export dive information to other destinations or formats]"
+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]"
 
 #. type: Plain text
-#: user-manual.txt:2569
+#: user-manual.txt:2531
 msgid ""
-"For non-_Facebook exports_, the export function can be reached by selecting "
+"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 "
 "List* panel of _Subsurface_. Click the appropriate radio button (see images "
@@ -5064,24 +5115,24 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2570
+#: user-manual.txt:2532
 #, no-wrap
 msgid "images/Export_f20.jpg"
 msgstr "images/Export_f20.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2573
+#: user-manual.txt:2535
 msgid "A dive log or part of it can be saved in three formats:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2575
+#: user-manual.txt:2537
 msgid ""
 "_Subsurface XML_ format. This is the native format used by _Subsurface_."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2579
+#: user-manual.txt:2541
 msgid ""
 "Universal Dive Data Format (_UDDF_). Refer to _http://uddf.org_ for more "
 "information.  UDDF is a generic format that enables communication among many "
@@ -5089,24 +5140,24 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2583
+#: user-manual.txt:2545
 msgid ""
 "_Divelogs.de_, an Internet-based dive log repository. In order to upload to "
-"_Divelogs.de_, one needs a user-ID as well as a password for _Divelogs.de_. "
-"Log into _http://en.divelogs.de_ and subscribe to this service in order to "
-"upload dive log data from _Subsurface_."
+"_Divelogs.de_, you need a user-ID as well as a password for _Divelogs.de_. "
+"Log into _http://en.divelogs.de_ and subscribe to this service to upload "
+"dive log data from _Subsurface_."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2587
+#: user-manual.txt:2549
 msgid ""
-"_DiveShare_ is also a dive log repository on the Internet focusing on the "
-"recreational dives. In order to upload dives one has to provide a used ID, "
-"so registration with _http://scubadiveshare.com_ is required."
+"_DiveShare_ is also a dive log repository on the Internet focusing on "
+"recreational dives. To upload dives, you need a user ID, so registration "
+"with _http://scubadiveshare.com_ is required."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2592
+#: user-manual.txt:2554
 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, "
@@ -5115,7 +5166,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2595
+#: user-manual.txt:2557
 msgid ""
 "_CSV dive profile_, that includes a large amount of detail for each dive, "
 "including the depth profile, temperature and pressure information of each "
@@ -5123,7 +5174,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2608
+#: user-manual.txt:2570
 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 "
@@ -5133,43 +5184,43 @@ msgid ""
 "pressure, gas pressures and MOD. The HTML export contains a search option to "
 "search the dive log. HTML export is specified on the second tab of the "
 "Export dialog (image *B* above). A typical use of this option is to export "
-"all one's dives to a smartphone or a tablet where it would serve as a very "
-"portable record of dives useful for dive companies that wish to verify the "
-"dive history of a diver, often doing away with the need to carry one's "
-"original logbook with one when doing dives with dive companies."
+"all one's dives to a smartphone or a tablet where it would serve as a "
+"portable record of dives. That is useful for dive companies that wish to "
+"verify the dive history of a diver, often doing away with the need to carry "
+"an original logbook when doing dives with dive companies."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2613
+#: user-manual.txt:2575
 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 one "
-"selects any of the dive sites on the map, a summary of the dive is available "
+"some information about it are indicated. This map is not editable. If you "
+"select any of the dive sites on the map, a summary of the dive is available "
 "in text, as shown in the image below."
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2614
+#: user-manual.txt:2576
 #, no-wrap
 msgid "images/mapview_f20.jpg"
 msgstr "images/mapview_f20.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2621
+#: user-manual.txt:2583
 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 "
-"List_, together with the depth under water where of each of those photos "
-"were taken."
+"List_, together with the depth underwater where of each of those photos was "
+"taken."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2623
+#: user-manual.txt:2585
 msgid "_General Settings_, under the HTML tab, provides the following options:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2631
+#: user-manual.txt:2593
 #, no-wrap
 msgid ""
 "** Subsurface Numbers: if this option is checked, the dive(s) are exported with the\n"
@@ -5182,58 +5233,57 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2634
+#: user-manual.txt:2596
 msgid ""
 "Under _Style Options_ some style-related options are available like font "
 "size and theme."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2637
+#: user-manual.txt:2599
 msgid ""
-"Export to other formats can be achieved through third party facilities, for "
+"Export to other formats can be done through third party facilities, for "
 "instance _www.divelogs.de_."
 msgstr ""
 
 #. type: Title ==
-#: user-manual.txt:2639
+#: user-manual.txt:2601
 #, no-wrap
 msgid "Keeping a _Subsurface_ dive log in the Cloud"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2650
+#: user-manual.txt:2611
 msgid ""
 "For each diver, dive log information is highly important. Not only is it a "
-"record of diving activities for one's own pleasure, but it is important "
-"information required for admission to further training courses or "
-"(sometimes) even diving sites. The security of the dive log is therefore "
-"critical. In order to have a dive log that is resistant to failure of a home "
-"computer hard drive, loss or theft of equipment, the Cloud is an obvious "
-"solution. This also has the added benefit that one can access one's dive log "
-"from anywhere in the world without having to carry it with oneself. For this "
+"record of diving activities for one's own pleasure, but it’s important "
+"information required for admission to training courses or sometimes even "
+"diving sites. The security of the dive log is critical. To have a dive log "
+"that is resistant to failure of a home computer hard drive, loss or theft of "
+"equipment, the Cloud is an obvious solution. This also has the added benefit "
+"that you can access your dive log from anywhere in the world. For this "
 "reason, facilities such as _divelogs.de_ and _Diving Log_ offer to store "
 "dive log information on the Internet."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2656
+#: user-manual.txt:2617
 msgid ""
 "_Subsurface_ includes access to a transparently integrated cloud storage "
 "back end that is available to all Subsurface users. Storing and retrieving a "
 "dive log from the cloud is no more difficult than accessing the dives on the "
-"local hard disk.  The only requirement is that one should first register as "
+"local hard disk.  The only requirement is that you should first register as "
 "a user on the cloud.  To use _Subsurface cloud storage_ , follow these steps:"
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:2657
+#: user-manual.txt:2618
 #, no-wrap
 msgid "Create a cloud storage account"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2674
+#: user-manual.txt:2635
 #, no-wrap
 msgid ""
 "** Open the *Network Preferences* by selecting _File_ -> _Preferences_ -> _Network_.\n"
@@ -5254,83 +5304,82 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:2675
+#: user-manual.txt:2636
 #, no-wrap
 msgid "Using _Subsurface cloud storage_"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2685
+#: user-manual.txt:2646
 #, no-wrap
 msgid ""
-"** Once the cloud storage has been initialised, two new items appear in the\n"
+"** Once the cloud storage has been initialized, two new items appear in the\n"
 "   _File_ menu of the main menu system: _Open cloud storage_ and _Save to cloud storage_.\n"
-"These options allow the user to load and save data to the _Subsurface\n"
+"These options let you load and save data to the _Subsurface\n"
 "cloud storage_ server.\n"
-"** In the _Defaults Preferences_ tab, one can select to use the _Subsurface cloud\n"
-"storage_ data as one's default data file by checking the check box marked _Cloud storage default file_.\n"
-" This means that the data from\n"
-"the _Subsurface cloud storage_ is loaded when _Subsurface_ starts ans saved there when one closes _Subsurface_.\n"
+"** In the _Defaults Preferences_ tab, you can select to use the _Subsurface cloud\n"
+"storage_ data as the default data file by checking the box marked _Cloud storage default file_.\n"
+" This means the data from\n"
+"the _Subsurface cloud storage_ is loaded when _Subsurface_ starts and saved there when _Subsurface_ closes.\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2690
+#: user-manual.txt:2651
 #, no-wrap
 msgid ""
 "** _Subsurface_ keeps a local copy of the data and the cloud facility remains fully\n"
-"functional even if used while disconnected to the Internet. _Subsurface_ simply synchronises the\n"
-"data with the cloud server the next time ithe program is used while the computer is\n"
+"functional even if used while disconnected to the Internet. _Subsurface_ simply synchronizes the\n"
+"data with the cloud server the next time the program is used while the computer is\n"
 "connected to the Internet.\n"
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:2692
+#: user-manual.txt:2653
 #, no-wrap
 msgid "Web access to _Subsurface cloud storage_"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2702
+#: user-manual.txt:2663
 msgid ""
 "One of the nice side benefits of using _Subsurface cloud storage_ is that "
-"one can also access one's dive data from any web browser. Simply open "
-"https://cloud.subsurface-divelog.org[_https://cloud.subsurface-divelog."
-"org_], log in with the same email and password, and you can see an HTML "
-"export of the last dive data that was synced to the _Subsurface cloud "
-"storage_. The dive information that is shown is only the contents of the "
-"recorded dive logs, NOT the calculated values shown in the *Profile* panel, "
-"including some cylinder pressures, deco ceilings and O~2~/He/N~2~ partial "
-"pressures."
+"you can also access your dive data from any web browser. Simply open https://"
+"cloud.subsurface-divelog.org[_https://cloud.subsurface-divelog.org_], log in "
+"with the same email and password, and you can see an HTML export of the last "
+"dive data that was synced to _Subsurface cloud storage_. The dive "
+"information shown is only the contents of the recorded dive logs, NOT the "
+"calculated values shown in the *Profile* panel, including some cylinder "
+"pressures, deco ceilings and O~2~/He/N~2~ partial pressures."
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:2703
+#: user-manual.txt:2664
 #, no-wrap
 msgid "Other cloud services"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2713
+#: user-manual.txt:2674
 msgid ""
-"If one prefers not to use the integrated cloud storage of dive logs (and "
-"don't need the web access), it is also simple to store dive logs in the "
-"cloud using several of the existing facilities on the Internet.  For "
-"instance http://www.dropbox.com/[_Dropbox_] offers a free application that "
-"allows files on the Dropbox servers to be seen as a local folder on one's "
-"desktop computer."
+"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 "
+"using several of the existing facilities on the Internet.  For instance "
+"http://www.dropbox.com/[_Dropbox_] offers a free application that allows "
+"files on the Dropbox servers to be seen as a local folder on a desktop "
+"computer."
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2714
+#: user-manual.txt:2675
 #, no-wrap
 msgid "images/Cloud.jpg"
 msgstr "images/Cloud.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2723
+#: user-manual.txt:2684
 msgid ""
 "The _Dropbox_ program creates a copy of the _Dropbox_ Internet Cloud content "
-"on one's desktop computer. When the computer is connected to the Internet, "
+"on your desktop computer. When the computer is connected to the Internet, "
 "the Internet content is automatically updated. Therefore both the _Open_ and "
 "_Save_ of dive logs are done using the local copy of the dive log in the "
 "local _Dropbox_ folder, so there's no need for a direct internet connection. "
@@ -5340,204 +5389,203 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2730
+#: user-manual.txt:2691
 msgid ""
-"In this way a dive log in one's _Dropbox_ folder can be accessed seamlessly "
-"from the Internet and can be accessed from any place with Internet access. "
+"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. "
 "Currently there are no costs involved for this service. Dropbox (Windows, "
 "Mac and Linux) can be installed by accessing the http://www.dropbox.com/"
 "install[_Install Page on the Dropbox website_]"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2736
+#: user-manual.txt:2697
 msgid ""
-"Alternatively one can use _Dropbox_ as a mechanism to backup one's dive log. "
-"To Store a dive log on _Dropbox_, select _File -> Save as_ from the "
-"_Subsurface_ main menu, navigate to the _Dropbox_ folder and select the "
-"_Save_ button. To access the dive log in _Dropbox_, select _File -> Open "
-"Logbook_ from the _Subsurface_ main menu and navigate to the dive log file "
-"in the _Dropbox_ folder and select the _Open_ button."
+"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 "
+"menu, navigate to the _Dropbox_ folder and select the _Save_ button. To "
+"access the dive log in _Dropbox_, select _File -> Open Logbook_ from the "
+"_Subsurface_ main menu and navigate to the dive log file in the _Dropbox_ "
+"folder and select the _Open_ button."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2739
+#: user-manual.txt:2700
 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:2742
+#: user-manual.txt:2703
 #, no-wrap
 msgid "Printing a dive log"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2746
+#: user-manual.txt:2707
 #, no-wrap
 msgid ""
-"_Subsurface_ provides a simple and flexible interface to print a whole dive log or only a few selected dives.\n"
+"_Subsurface_ provides a simple and flexible way to print a whole dive log or only a few selected dives.\n"
 "  Pre-installed templates or a custom written template can be used to choose where the data are fitted into the page.\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2748
-msgid "Before printing, two decisions are required:"
+#: user-manual.txt:2709
+msgid "Some decisions need to be made before printing:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2751
+#: user-manual.txt:2712
 msgid ""
-"Should the whole dive log be printed or only part of it? If only part of the "
-"dive log is required, then select the required dives from the *Dive List* "
-"panel."
+"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:2753
+#: user-manual.txt:2714
 msgid ""
-"If the dive profiles needs printing, what gas partial pressure information "
+"If the dive profiles are printed, what gas partial pressure information "
 "should be shown? Select the appropriate toggle-buttons on the button bar to "
 "the left of the *Dive Profile* panel."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2756
+#: user-manual.txt:2717
 msgid ""
-"If _File -> Print_ is selected from the Main menu, the the dialogue below "
-"(image *A*) appears. Three specifications are needed to achieve the desired "
-"information and page layout:"
+"If _File -> Print_ is selected from the Main menu, the dialogue below (image "
+"*A*) appears. Three specifications are needed to get the desired information "
+"and page layout:"
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2757 user-manual.txt:4185
+#: user-manual.txt:2718 user-manual.txt:4162
 #, no-wrap
 msgid "images/Print1_f22.jpg"
 msgstr "images/Print1_f22.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2760
+#: user-manual.txt:2721
 msgid "Under _Print type_ select one of two options:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2762
+#: user-manual.txt:2723
 msgid ""
 "_Dive list print_: Print dives from the *Dive List* panel with profiles and "
 "other information."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2763
+#: user-manual.txt:2724
 msgid "_Statistics print_: Print yearly statistics of the dives."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2765
+#: user-manual.txt:2726
 msgid "Under _Print options_ select:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2770
+#: user-manual.txt:2731
 msgid ""
-"Printing only the dives selected from the dive list prior to activating the "
+"Printing only the dives selected from the dive list before activating the "
 "print dialogue by checking the box _Print only selected dives_. If this "
-"check box is *not* checked all dives in the *Dive List* panel are printed."
+"check box is *not* checked ALL dives in the *Dive List* panel are printed."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2772
+#: user-manual.txt:2733
 msgid ""
-"Printing in colour, achieved by checking the box with _Print in colour_. If "
-"this check box is not checked, printing is in monochrome (grey scale)."
+"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:2775
+#: user-manual.txt:2736
 msgid ""
 "Under _Template_ select a template to be used as the page layout. There are "
-"several templates (see image *B*, above)."
+"several choices.  (see image *B*, above)."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2777
+#: user-manual.txt:2738
 msgid "_Table_: This prints a summary table of all dives selected (see below)."
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2778
+#: user-manual.txt:2739
 #, no-wrap
 msgid "images/Print_summarylist_f22.jpg"
 msgstr "images/Print_summarylist_f22.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2781
+#: user-manual.txt:2742
 msgid ""
 "_Flow layout_: Print the text associated with each dive without printing the "
 "dive profiles"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2782
+#: user-manual.txt:2743
 msgid "of each dive (see below):"
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2783
+#: user-manual.txt:2744
 #, no-wrap
 msgid "images/Print_flow_layout_f22.jpg"
 msgstr "images/Print_flow_layout_f22.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2786
+#: user-manual.txt:2747
 msgid ""
 "_One Dive_: Print one dive per page, also showing the dive profile (see "
 "below)"
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2787
+#: user-manual.txt:2748
 #, no-wrap
 msgid "images/print2_f22.jpg"
 msgstr "images/print2_f22.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2791
+#: user-manual.txt:2752
 msgid "_Two Dives_: Print two dives per page, also showing the dive profiles."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2792
+#: user-manual.txt:2753
 msgid "_Six Dives_: Print six dives per page, also showing the dive profiles."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2796
+#: user-manual.txt:2757
 msgid ""
-"Users can _Preview_ the printed page by selecting the _Preview_ button on "
-"the dialogue (see image *A* at the start of this section). After preview, "
-"changes to the options in the print dialogue can be made, resulting in a "
-"layout that fits personal taste."
+"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 "
+"can change the options in the print dialogue, so the layout fits personal "
+"taste."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2800
+#: user-manual.txt:2761
 msgid ""
 "Next, select the _Print_ button (see image *A* at the start of this "
-"section). This activates the regular print dialogue used by the user "
-"operating system, allowing one to choose a printer and to set its properties "
-"(see image below):"
+"section). This activates the regular print dialogue used by the operating "
+"system, letting you choose a printer and set its properties (see image "
+"below):"
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2801
+#: user-manual.txt:2762
 #, no-wrap
 msgid "images/Print_print_f22.jpg"
 msgstr "images/Print_print_f22.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2806
+#: user-manual.txt:2767
 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 "
@@ -5546,22 +5594,22 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2807
+#: user-manual.txt:2768
 #, no-wrap
 msgid "images/Printpreview.jpg"
 msgstr "images/Printpreview.jpg"
 
 #. type: Title ===
-#: user-manual.txt:2809
+#: user-manual.txt:2770
 #, 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:2813
+#: user-manual.txt:2776
 msgid ""
 "Writing a custom template is an effective way to produce highly customized "
-"printouts. Subsurface uses HTML templates to render printing. One can create "
+"printouts. Subsurface uses HTML templates to render printing. You can create "
 "a template, export a new template, import an existing template and delete an "
 "existing template by using the appropriate buttons under the _Template_ "
 "dropdown list in the print dialogue. See <<S_APPENDIX_E,APPENDIX E>> for "
@@ -5569,23 +5617,36 @@ msgid ""
 msgstr ""
 
 #. type: Title ==
-#: user-manual.txt:2815
+#: user-manual.txt:2778
 #, no-wrap
 msgid "Configuring a dive computer"
 msgstr "Configurer un ordinateur de plongée"
 
 #. type: Plain text
-#: user-manual.txt:2823
-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: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."
+msgid ""
+"_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."
 msgstr ""
 "_Subsurface_ permet de configurer son ordinateur de plongée. Actuellement, "
 "les familles d'ordinateurs supportés sont Heinrichs-Weikamp (OSTC 2, OSTC 3) "
@@ -5599,7 +5660,7 @@ msgstr ""
 "ANNEXE A>> pour plus d'informations sur la manière de procéder."
 
 #. type: Plain text
-#: user-manual.txt:2828
+#: user-manual.txt:2792
 msgid ""
 "Once the dive computer is connected to the _Subsurface_ computer, select "
 "_File -> Configure dive computer_ from the _Main Menu_. Provide the "
@@ -5614,22 +5675,26 @@ msgstr ""
 "plongée à partir du panneau à gauche (voir l'image ci-dessous)."
 
 #. type: Target for macro image
-#: user-manual.txt:2829
+#: user-manual.txt:2793
 #, no-wrap
 msgid "images/Configure_dc_f20.jpg"
 msgstr "images/Configure_dc_f20.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2832
+#: user-manual.txt:2796
+#, fuzzy
+#| msgid ""
+#| "Using the appropriate buttons on the configuration panel, the following "
+#| "actions can be performed:"
 msgid ""
 "Using the appropriate buttons on the configuration panel, the following "
-"actions can be performed:"
+"actions can be done:"
 msgstr ""
 "En utilisant les boutons appropriés du panneau de configuration, les actions "
 "suivantes peuvent être réalisées :"
 
 #. type: Plain text
-#: user-manual.txt:2835
+#: user-manual.txt:2799
 #, no-wrap
 msgid ""
 "*Retrieve available details*. This loads the existing configuration from the dive computer\n"
@@ -5639,7 +5704,7 @@ msgstr ""
 "dans _Subsurface_, en l'affichant dans le panneau de configuration.\n"
 
 #. type: Plain text
-#: user-manual.txt:2837
+#: user-manual.txt:2801
 #, no-wrap
 msgid ""
 "*Save changes to device*. This changes the configuration of the\n"
@@ -5649,7 +5714,7 @@ msgstr ""
 "de plongée pour correspondre aux informations affichées dans le panneau de configuration.\n"
 
 #. type: Plain text
-#: user-manual.txt:2839
+#: user-manual.txt:2803
 #, no-wrap
 msgid ""
 "*Backup*. This saves the configuration data to a file. _Subsurface_ asks for\n"
@@ -5659,7 +5724,7 @@ msgstr ""
 "l'emplacement et le nom du fichier pour enregistrer les informations.\n"
 
 #. type: Plain text
-#: user-manual.txt:2841
+#: user-manual.txt:2805
 #, no-wrap
 msgid ""
 "*Restore backup*. This loads the information from a backup file and displays it\n"
@@ -5669,7 +5734,7 @@ msgstr ""
 "dans le panneau de configuration.\n"
 
 #. type: Plain text
-#: user-manual.txt:2843
+#: user-manual.txt:2807
 #, no-wrap
 msgid ""
 "*Update firmware*. If new firmware is available for the dive computer, this is\n"
@@ -5679,67 +5744,67 @@ msgstr ""
 "il sera chargé dans l'ordinateur de plongée.\n"
 
 #. type: Title ==
-#: user-manual.txt:2846
+#: user-manual.txt:2810
 #, no-wrap
 msgid "Setting user _Preferences_ for _Subsurface_"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2856
+#: user-manual.txt:2819
 msgid ""
 "There are several user-definable settings within _Subsurface_, found by "
-"selecting _File -> Preferences_. The settings are performed in seven groups: "
+"selecting _File -> Preferences_. The settings are in seven groups: "
 "*Defaults*, *Units*, *Graph*, *Language* and *Network*, *Facebook* and "
-"*Georeference*, all of which operate on the same principles: the user must "
-"specify the settings that are to be changed, then these changes are saved "
-"using the *Apply* button. After applying all the new settings users can then "
-"leave the settings panel by selecting *OK*. If *Discard* is selected, "
-"changes to the preferences are not saved."
+"*Georeference*.  All operate on the same principles: the user must specify "
+"settings that are to be changed, then save them using the *Apply* button. "
+"After applying all the new settings users can then leave the settings panel "
+"by selecting *OK*. If *Discard* is selected, changes to the preferences are "
+"not saved."
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:2857
+#: user-manual.txt:2820
 #, no-wrap
 msgid "Defaults"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2860
+#: user-manual.txt:2823
 msgid "There are several settings in the *Defaults* panel:"
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2861
+#: user-manual.txt:2824
 #, no-wrap
 msgid "images/Pref1_f20.jpg"
 msgstr "images/Pref1_f20.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2865
+#: user-manual.txt:2828
 #, no-wrap
 msgid ""
-"  ** *Lists and tables*: Here one can specify the font type and font size of the\n"
-"     *Dive Table* panel. By decreasing the font size of the *Dive Table*, users can see more dives on a screen.\n"
+"  ** *Lists and tables*: Here you can specify the font type and font size of the\n"
+"     *Dive Table* panel: By decreasing the font size of the *Dive Table*, you can see more dives on a screen.\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2870
+#: user-manual.txt:2833
 #, no-wrap
 msgid ""
-"  ** *Dives*: For the _Default Dive File_ one needs to specify the directory and\n"
-"     file name of one's\n"
+"  ** *Dives*: For the _Default Dive File_ you need to specify the directory and\n"
+"     file name of your\n"
 "     electronic dive log book. This is a file with filename extension of either _.xml_ or _.ssrf_. When\n"
 "     launched, _Subsurface_ will automatically load the specified dive log book. There are three options:\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2871
+#: user-manual.txt:2834
 #, 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:2873
+#: user-manual.txt:2836
 #, no-wrap
 msgid ""
 "_Local default file_: When checked, _Subsurface_ automatically loads a dive log from the local hard disk\n"
@@ -5747,21 +5812,21 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2875
+#: user-manual.txt:2838
 #, no-wrap
 msgid ""
 "_Cloud storage default file_: When checked, _Subsurface automatically loads the dive log from the cloud\n"
-"device that was initialised using the *Preferences* _Network_ tab (see below).\n"
+"device that was initialized using the *Preferences* _Network_ tab (see below).\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2877
+#: user-manual.txt:2840
 #, 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:2880
+#: user-manual.txt:2843
 #, no-wrap
 msgid ""
 "dives that he/she doesn't consider valid dives, e.g. pool dives, but still want to\n"
@@ -5770,25 +5835,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2882
+#: user-manual.txt:2845
 #, no-wrap
 msgid "** *Default cylinder*: Specify the default cylinder listed in\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2883
+#: user-manual.txt:2846
 #, no-wrap
 msgid "the *Equipment* tab of the *Notes* panel.\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2885
+#: user-manual.txt:2848
 #, no-wrap
 msgid "** *Animations*: Some actions in showing the dive profile are performed using\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2891
+#: user-manual.txt:2854
 #, no-wrap
 msgid ""
 "animations. For instance, the axis values for depth and time change from dive to\n"
@@ -5800,106 +5865,108 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2893
+#: user-manual.txt:2856
 #, 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:2894
+#: user-manual.txt:2857
 #, no-wrap
 msgid "cleared and set to default values.\n"
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:2895
+#: user-manual.txt:2858
 #, no-wrap
 msgid "Units"
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2896
+#: user-manual.txt:2859
 #, no-wrap
 msgid "images/Pref2_f20.jpg"
 msgstr "images/Pref2_f20.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2903
+#: user-manual.txt:2866
 msgid ""
-"Here users can choose between metric and imperial units of depth, pressure, "
+"Here you can choose between metric and imperial units of depth, pressure, "
 "volume, temperature and mass. By selecting the Metric or Imperial radio "
-"button at the top, one can specify that all units are in the chosen "
-"measurement system.  Alternatively, if one selects the *Personalise* radio "
-"button, units can be selected independently, with some units in the metric "
-"system and others in imperial."
+"button at the top, you can specify that all units are in the chosen "
+"measurement system.  Alternatively, if you select the *Personalize* radio "
+"button, units can be selected independently, with some in the metric system "
+"and others in imperial."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2909
+#: user-manual.txt:2872
 msgid ""
-"Irrespective of the above settings, dive time measurements can be either in "
+"Regardless of the above settings, dive time measurements can be either in "
 "seconds or minutes.  Choose the appropriate option. GPS coordinates can be "
 "represented either as traditional coordinates (degrees, minutes, seconds) or "
 "as decimal degrees Choose the appropriate option."
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:2910
+#: user-manual.txt:2873
 #, no-wrap
 msgid "Graph"
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2912
+#: user-manual.txt:2875
 #, no-wrap
 msgid "images/Pref3_f20.jpg"
 msgstr "images/Pref3_f20.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2916
+#: user-manual.txt:2879
 msgid "This panel allows two type of selections:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2936
+#: user-manual.txt:2901
 #, no-wrap
 msgid ""
-"*Show*: Here users can specify the amount of information shown as part of\n"
+"*Show*: Here you can specify the amount of information shown as part of\n"
 "the dive profile:\n"
 "** Thresholds: _Subsurface_ can display the nitrogen, oxygen and the helium partial pressures during\n"
-"   the dive, enabled by using the toolbar on the left hand side of the *Dive Profile*\n"
-"   panel. For each of these graphs users can specify a threshold value on the right-hand side of the\n"
+"   the dive, done by using the toolbar on the left hand side of the *Dive Profile*\n"
+"   panel. For each of these graphs you can specify a threshold value on the right-hand side of the\n"
 "   Preferences panel. If any of the graphs go above the specified threshold level, the graph is\n"
-"   highlighted in red, indicating that the particular partial pressure threshold has been exceeded.\n"
+"   highlighted in red, indicating the particular partial pressure threshold has been exceeded.\n"
 "** _Max pO~2~ is used for calculating the MOD when displaying the maximum operative depth (MOD)\n"
 "   for a dive. Specify an appropriate partial pressure. A value of 1.4 is commonly used.\n"
-"** _Draw dive computer reported ceiling red_: This checkbox allows exactly what it says. By default\n"
+"** _Draw dive computer reported ceiling red_: This checkbox does exactly what it says. By default\n"
 "   the computer reported ceiling is shown in white.\n"
 "   Not all dive computers report ceiling values. If the dive computer does report it, it may differ\n"
 "   from the ceilings calculated by _Subsurface_ because of the different algorithms and\n"
-"   gradient factors, as well as the dynamic way that a\n"
-"   dive computer can calculate ceilings during a dive.\n"
-"** _Show unused cylinders in Equipment Tab_: This checkbox allows display of information about unused cylinders when viewing the *Equipment Tab*. Conversely, if this box is not checked, and if any cylinders entered using the *Equipment Tab* are not used (e.g. there was no gas switch to such a cylinder), then these cylinders are omitted from that list.\n"
-"**  _Show average depth_: If this box is checked, the *Dive Profile* panel contains a grey line that indicates\n"
-"    the mean depth of the dive up to any time instant during the dive. Normally this is a u-shaped line indicating the deepest mean depth just before the\n"
+"   gradient factors, as well as the dynamic way a\n"
+"   dive computer calculates ceilings during a dive.\n"
+"** _Show unused cylinders in Equipment Tab_: This checkbox allows display of information about unused cylinders when viewing the\n"
+"*Equipment Tab*. If this box is not checked, and if any cylinders entered using the *Equipment Tab* are not used (e.g. there\n"
+"was no gas switch to such a cylinder), then these cylinders are omitted from that list.\n"
+"**  _Show average depth_: If this box is checked, the *Dive Profile* panel contains a grey line that shows\n"
+"    the mean depth of the dive, up to any time instant during the dive. Normally this is a u-shaped line indicating the deepest mean depth just before\n"
 "   ascent.\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2938
+#: user-manual.txt:2903
 #, no-wrap
 msgid "*Misc*:\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2951
+#: user-manual.txt:2916
 #, no-wrap
 msgid ""
 "** Gradient Factors (GFLow and GFHigh):* Set the _gradient factors_ used while diving. GF_Low is\n"
 "   the gradient factor at depth and GF_High is used just below the surface.\n"
 "   At intermediate depths gradient factors between GF_Low and GF_High are used.\n"
-"   Gradient factors add conservatism to the nitrogen exposure during a dive, in a\n"
-"   similar way that many dive computers have a conservatism setting. The lower\n"
+"   Gradient factors add conservatism to nitrogen exposure during a dive, in a\n"
+"   similar way that many dive computers have a conservative setting. The lower\n"
 "   the value of a gradient factor, the more conservative the calculations are with\n"
 "   respect to nitrogen loading and the deeper the ascent ceilings are. Gradient\n"
 "   factors of 20/60 are considered conservative and values of 70/90 are considered\n"
@@ -5909,28 +5976,28 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2953
+#: user-manual.txt:2918
 #, 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:2955
+#: user-manual.txt:2920
 #, 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:2959
+#: user-manual.txt:2924
 #, no-wrap
 msgid ""
-" ** _CCR: Show setpoints when viewing pO2:_ With this checkbox ativated, the pO~2~\n"
-"    graph on the dive profile has an overlay in red which inticates the CCR setpoint\n"
+" ** _CCR: Show setpoints when viewing pO2:_ With this checkbox activated, the pO~2~\n"
+"    graph on the dive profile has an overlay in red which indicates the CCR setpoint\n"
 "    values. See the section on xref:S_CCR_dives[Closed Circuit Rebreather dives].\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2963
+#: user-manual.txt:2928
 #, no-wrap
 msgid ""
 " ** _CCR: Show individual O~2~ sensor values when viewing pO~2~:_ Show the pO~2~\n"
@@ -5939,19 +6006,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2965
+#: user-manual.txt:2930
 #, no-wrap
 msgid "*Configuring dive planning using rebreather equipment:*\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2967
+#: user-manual.txt:2932
 #, no-wrap
 msgid "** _Default CCR setpoint for dive planning:_ Specify the O~2~ setpoint for a\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2970
+#: user-manual.txt:2935
 #, no-wrap
 msgid ""
 "CCR dive plan. This determines the pO~2~  maintained\n"
@@ -5960,13 +6027,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2972
+#: user-manual.txt:2937
 #, no-wrap
-msgid "** _pSCR O~2~ metabolism rate:_ For a semiclosed rebreather (pSCR) system, this is the\n"
+msgid "** _pSCR O~2~ metabolism rate:_ For a semi-closed rebreather (pSCR) system, this is the\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2974
+#: user-manual.txt:2939
 #, no-wrap
 msgid ""
 "volume of oxygen used by a diver during a minute. Set this value for pSCR dive planning\n"
@@ -5974,13 +6041,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2976
+#: user-manual.txt:2941
 #, 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:2978
+#: user-manual.txt:2943
 #, no-wrap
 msgid ""
 "environment to that of the gas recirculated to the diver. Set this value for a\n"
@@ -5988,66 +6055,64 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:2980
+#: user-manual.txt:2945
 #, no-wrap
 msgid "Language"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:2982
+#: user-manual.txt:2947
 msgid "Choose a language that _Subsurface_ will use."
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:2983
+#: user-manual.txt:2948
 #, no-wrap
 msgid "images/Pref4_f20.jpg"
 msgstr "images/Pref4_f20.jpg"
 
 #. type: Plain text
-#: user-manual.txt:2993
+#: user-manual.txt:2958
 msgid ""
-"A checkbox allows one to use the _System Default_ language which in most "
-"cases will be the correct setting; with this _Subsurface_ simply runs in the "
-"same language / country settings as the underlying operating system. If this "
-"is for some reason undesirable one can uncheck this checkbox and pick a "
-"language / country combination from the list of included localizations. The "
-"_Filter_ text box allows one to list similar languages. For instance there "
-"are several system variants of English or French. *This particular "
-"preference requires a restart of _Subsurface_ to take effect*."
+"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 "
+"language / country settings as the underlying operating system.  To change "
+"it, uncheck this checkbox and pick a language / country combination from the "
+"list of locations. The _Filter_ text box lists similar languages. For "
+"instance there are several system variants of English or French. *This "
+"particular preference requires a restart of _Subsurface_ to take effect*."
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:2994
+#: user-manual.txt:2959
 #, no-wrap
 msgid "Network"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3000
+#: user-manual.txt:2966
 msgid ""
 "This panel facilitates communication between _Subsurface_ and data sources "
 "on the Internet.  This is important, for instance, when _Subsurface_ needs "
-"to communicate with Internet services such as Cloud storage or the "
-"<<S_Companion,_Subsurface Companion app_>>. These Internet requirements are "
-"determined by one's type of connection to the Internet and by the Internet "
-"Service Provider (ISP) used.  One's ISP should provide the appropriate "
-"information."
+"to communicate with web services such as Cloud storage or the <<S_Companion,"
+"_Subsurface Companion app_>>. These Internet requirements are determined by "
+"your type of connection to the Internet and by the Internet Service Provider "
+"(ISP) used.  Your ISP should provide the appropriate information."
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:3001
+#: user-manual.txt:2967
 #, no-wrap
 msgid "images/Pref5_f20.jpg"
 msgstr "images/Pref5_f20.jpg"
 
 #. type: Plain text
-#: user-manual.txt:3004
+#: user-manual.txt:2970
 msgid "This dialogue has three sections:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3012
+#: user-manual.txt:2978
 #, no-wrap
 msgid ""
 "** _Proxy type_:\n"
@@ -6060,77 +6125,88 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3017
+#: user-manual.txt:2983
 #, no-wrap
 msgid ""
-"** _Subsurface cloud storage_: To store one's dive log in the cloud, a valid email address\n"
-"   and password are required. This allows _Subsurface_ to email security information\n"
-"   regarding cloud storage to a user, and to set up the cloud storage appropriately.\n"
+"** _Subsurface cloud storage_: To store your dive log in the cloud, a valid email address\n"
+"   and password are required. This lets _Subsurface_ email security information\n"
+"   regarding cloud storage to you, and to set up cloud storage appropriately.\n"
 "   Two additional options are given:\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3018
+#: user-manual.txt:2984
 #, 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:3019
+#: user-manual.txt:2985
 #, no-wrap
-msgid "while the user performs other tasks within _Subsurface_.\n"
+msgid "while you do other things within _Subsurface_.\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3020
+#: user-manual.txt:2986
 #, 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:3021
+#: user-manual.txt:2987
 #, no-wrap
 msgid "information is saved in raw text form, not encoded in any way.\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3026
+#: user-manual.txt:2991
 #, no-wrap
 msgid ""
-"** _Subsurface web service_: When one subscribes to the <<S_Companion,Subsurface web service>>, a very\n"
+"** _Subsurface web service_: When you subscribe to the <<S_Companion,Subsurface web service>>, a very\n"
 "     long and hard-to-remember userID is issued. This is the place to save that userID. By\n"
-"     checking the option _Save User ID locally?_, one ensures that a local copy of that userID\n"
-"     is saved.\n"
+"     checking the option _Save User ID locally?_, you ensure a local copy of that userID is saved.\n"
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:3029
-#, no-wrap
-msgid "Facebook Accesss"
+#: user-manual.txt:2994
+#, fuzzy, no-wrap
+#| msgid "Facebook Accesss"
+msgid "Facebook Access"
 msgstr "Accès Facebook"
 
 #. type: Plain text
-#: user-manual.txt:3032
+#: 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."
 msgid ""
-"This panel allows one to log into a Facebook account in order to transfer "
-"information from Subsurface to Facefook."
+"This panel lets you log into a Facebook account in order to transfer "
+"information from Subsurface to Facebook."
 msgstr ""
 "Ce panneau vous permet de vous connecter à votre compte Facebook pour "
 "transférer des informations de Subsurface vers Facebook."
 
 #. type: Target for macro image
-#: user-manual.txt:3033
+#: user-manual.txt:2998
 #, no-wrap
 msgid "images/Pref6_f20.jpg"
 msgstr "images/Pref6_f20.jpg"
 
 #. type: Plain text
-#: user-manual.txt:3041
+#: 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."
 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:"
+"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."
 msgstr ""
 "Si un identifiant Facebook et un mot de passe valides ont été fournis, une "
@@ -6141,47 +6217,47 @@ msgstr ""
 "vers Facebook] pour plus d'informations."
 
 #. type: Title ===
-#: user-manual.txt:3042
+#: user-manual.txt:3007
 #, no-wrap
 msgid "Georeference"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3050
+#: user-manual.txt:3015
 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 "
+"of a dive site) derived from a click on the *Dive Map panel* at the bottom "
 "right of the _Subsurface_ window, or from a GPS instrument or from the "
-"_Subsurface_ Companion app), a lookup on the Internet is performed to find "
-"the name of the closest known location. Obviously this function only works "
-"if _Subsurface_ has an Internet connection. The preference of the dive site "
-"name can be configured, e.g. _Country/State/City_ or _City/State/Country_ "
-"(see image below)."
+"_Subsurface_ Companion app). A search on the Internet is done to find the "
+"name of the closest known location. This function only works if _Subsurface_ "
+"has an Internet connection. The preference of the dive site name can be "
+"configured, e.g. _Country/State/City_ or _City/State/Country_ (see image "
+"below)."
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:3051
+#: user-manual.txt:3016
 #, no-wrap
 msgid "images/Pref7_f20.jpg"
 msgstr "images/Pref7_f20.jpg"
 
 #. type: Title ==
-#: user-manual.txt:3054
+#: user-manual.txt:3019
 #, no-wrap
 msgid "The _Subsurface_ dive planner"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3059
+#: user-manual.txt:3024
 msgid ""
-"Dive planning is an advanced feature of _Subsurface_, accessible by "
-"selecting _Log -> Plan Dive_ from the main menu. It allows calculation of "
-"nitrogen load during a dive by using the Bühlmann ZH-L16 algorithm with the "
-"addition of gradient factors as implemented by Erik Baker."
+"Dive planning is an advanced feature of _Subsurface_, accessed by selecting "
+"_Log -> Plan Dive_ from the main menu. It allows calculation of nitrogen "
+"load during a dive by using the Bühlmann ZH-L16 algorithm with the addition "
+"of gradient factors as implemented by Erik Baker."
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:3067
+#: user-manual.txt:3032
 msgid ""
 "The _Subsurface_ dive planner IS CURRENTLY EXPERIMENTAL and assumes the user "
 "is already familiar with the _Subsurface_ user interface. It is explicitly "
@@ -6189,19 +6265,19 @@ msgid ""
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:3070
+#: user-manual.txt:3035
 msgid ""
 "The user is conversant with dive planning and has the necessary training to "
 "perform dive planning."
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:3071
+#: user-manual.txt:3036
 msgid "The user plans dives within his/her certification limits."
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:3074
+#: user-manual.txt:3039
 msgid ""
 "Dive planning makes large assumptions about the characteristics of the "
 "_average person_ and cannot compensate for individual physiology or health "
@@ -6209,51 +6285,50 @@ msgid ""
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:3075
+#: user-manual.txt:3040
 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:3076
+#: user-manual.txt:3041
 msgid "The user is familiar with the user interface of _Subsurface_."
 msgstr ""
 
 #. type: delimited block *
-#: user-manual.txt:3078
+#: user-manual.txt:3043
 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:3080
+#: user-manual.txt:3045
 #, no-wrap
 msgid "The _Subsurface_ dive planner screen"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3085
+#: user-manual.txt:3050
 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 "
-"into the several sections on the left hand side of the screen.  The setup is "
-"divided into several sections: Available Gases, Rates, Planning, Gas Options "
-"and Notes."
+"into the sections on the left hand side of the screen.  They are: Available "
+"Gases, Rates, Planning, Gas Options and Notes."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3089
+#: user-manual.txt:3054
 msgid ""
-"At the top right hand is a green *design panel* upon which the profile of "
-"the dive can be manipulated directly by dragging and clicking as explained "
+"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 "
 "below. This feature makes the _Subsurface_ dive planner unique in ease of "
 "use."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3093
+#: user-manual.txt:3058
 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 "
@@ -6262,26 +6337,26 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:3094
+#: user-manual.txt:3059
 #, no-wrap
 msgid "images/PlannerWindow1_f20.jpg"
 msgstr "images/PlannerWindow1_f20.jpg"
 
 #. type: Title ===
-#: user-manual.txt:3097
+#: user-manual.txt:3062
 #, no-wrap
 msgid "Open circuit dives"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3100
+#: user-manual.txt:3065
 msgid ""
-"Towards the centre bottom of the planner (circled in blue in the image "
+"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:3103
+#: user-manual.txt:3068
 #, no-wrap
 msgid ""
 "** Open Circuit (the default)\n"
@@ -6290,22 +6365,22 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3105
+#: user-manual.txt:3070
 msgid "Choose the Open Circuit option."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3109
+#: user-manual.txt:3074
 msgid ""
-"In the top left-hand area of the planning screen, ensure that the constant "
-"dive parameters are appropriate. These are: Start date and time of the "
-"intended dive, Atmospheric Pressure and Altitude above sea level of the dive "
-"site. The atmospheric pressure can also be entered as an altitude in metres, "
+"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 "
+"dive, Atmospheric Pressure and Altitude above sea level of the dive site. "
+"The atmospheric pressure can also be entered as an altitude in meters, "
 "assuming a sea-level atmospheric pressure of 1.013 bar."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3118
+#: user-manual.txt:3083
 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. "
@@ -6320,22 +6395,22 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3120
+#: user-manual.txt:3085
 msgid "The profile of the planned dive can be created in two ways:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3125
+#: user-manual.txt:3090
 msgid ""
-"Drag the waypoints (the small white circles) on the existing dive profile in "
-"a way to represent the dive. Additional waypoints can be created by double-"
-"clicking the existing dive profile. Waypoints can be deleted by right-"
-"clicking a particular waypoint and selecting the _delete_ item from the "
-"resulting context menu."
+"Drag the waypoints (the small white circles) on the existing dive profile to "
+"represent the dive. Additional waypoints can be created by double-clicking "
+"the existing dive profile. Waypoints can be deleted by right-clicking a "
+"particular waypoint and selecting the _delete_ item from the resulting "
+"context menu."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3133
+#: user-manual.txt:3098
 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 "
@@ -6349,55 +6424,48 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: user-manual.txt:3134
+#: user-manual.txt:3099
 #, no-wrap
 msgid "Recreational dives"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3149
+#: user-manual.txt:3116
+#, no-wrap
 msgid ""
-"Recreational mode is what comes closest to planning a dive based on the non-"
-"decompression limit (NDL).  It computes the maximal time a diver can stay at "
-"the current depth without incurring any mandatory decompression stops and "
-"without using more than the existing gas (minus a reserve). The planner "
-"automatically takes into account the nitrogen load incurred in previous "
-"dives. But conventional dive tables are also used in a way that can take "
-"into account previous dives. Why use a dive planner for recreational dives? "
-"Using recreational dive tables, the maximum depth of a dive is taken into "
-"account. However, few dives are undertaken at a constant depth corresponding "
-"to the maximum depth (i.e. a \"square\" dive profile). This means that dive "
-"tables overestimate the nitrogen load incurred during previous dives. The "
-"_Subsurface_ dive planner calculates nitrogen load according to the real "
-"dive profiles of all uploaded previous dives, in a similar way as dive "
-"computers calculate nitrogen load during a dive. This means that the diver "
-"gets 'credit' in terms of nitrogen loading for not remaining at maximum "
-"depth during previous dives, enabling planning of a longer subsequent dive. "
-"For the planner to work it is therefore crucial to upload all previous dives "
-"onto _Subsurface_ before performing dive planning."
-msgstr ""
-
-#. type: Plain text
-#: user-manual.txt:3151
-msgid "To plan a dive, the appropriate settings need to be defined."
+"Recreational mode is what comes closest to planning a dive based on the non-decompression limit (NDL).\n"
+"It computes the maximum time a diver can stay at the current depth without needing mandatory decompression\n"
+"stops and without using more than the existing gas (minus a reserve). The planner automatically takes\n"
+"into account the nitrogen load incurred in previous dives. But conventional dive tables are also used in a\n"
+"way that can take into account previous dives. Why use a dive planner for recreational dives? Using\n"
+"recreational dive tables, the maximum depth of a dive is taken into account. But few dives are\n"
+"done at a constant depth corresponding to the maximum depth (i.e. a \"square\" dive profile). This means\n"
+"dive tables overestimate the nitrogen load incurred during previous dives. The _Subsurface_\n"
+"dive planner calculates nitrogen load according to the real dive profiles of all uploaded previous dives,\n"
+"in a similar way as dive computers calculate nitrogen load during a dive. This means that the diver gets 'credit,'\n"
+"in terms of nitrogen load, for not remaining at maximum depth during\n"
+"previous dives, so a longer subsequent dive can be planned.\n"
+" For the planner to work it's crucial to upload all previous dives\n"
+"onto _Subsurface_ before doing dive planning.\n"
+"To plan a dive, the appropriate settings need to be defined.\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3154
+#: user-manual.txt:3119
 msgid ""
-"Ensure that the date and time is set to that of the intended dive. This "
-"allows calculation of the nitrogen load incurred during previous dives."
+"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:3157
+#: user-manual.txt:3122
 msgid ""
 "Immediately under the heading _Planning_ are two checkboxes _Recreational_ "
 "and _Safety Stop_.  Check these two boxes."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3161
+#: user-manual.txt:3126
 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 "
@@ -6405,35 +6473,34 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3166
+#: user-manual.txt:3131
 msgid ""
 "The planner calculates whether the specified cylinder contains enough air/"
-"gas to complete the planned dive. In order for this to be realistic, under "
+"gas to complete the planned dive. In order for this to be accurate, under "
 "_Gas options_, specify an appropriate surface air consumption (SAC) rate for "
 "_Bottom SAC_. Suitable values are between 15 l/min and 30 l/min, with novice "
 "divers or difficult dives requiring SAC rates closer to 30l/min."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3175
+#: user-manual.txt:3140
 msgid ""
-"Define the amount of gas that the cylinder must have at the end of the "
-"bottom section of the dive just before ascent. A value of 50 bar is often "
-"used. The reason for this reserve gas is to provide for the possible need to "
-"bring one's buddy to the surface using gas sharing. How much gas is used in "
-"sharing depends on the depth of the ascent. This can be a bit hard to "
-"estimate, so most agencies assume a fixed amount of gas, or actually of "
-"pressure e.g. 40 or 50 bar or 25% or 33% (rule of thirds). But _Subsurface_ "
-"can do better because it knows about the ascent and that is why we add the "
-"amount of gas during the ascent (i.e. the \"deco gas“).  Subsurface still "
-"uses a fixed pressure „reserve“ but that is supposed to be for the "
-"additional gas used around the realisation that there is a problem and one's "
-"pulse rate goes up when one starts to buddy breathe. This reserve amount is "
-"user configurable."
+"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 "
+"reason for this reserve gas is to provide for the possible need to bring a "
+"buddy to the surface using gas sharing. How much gas is used in sharing "
+"depends on the depth of the ascent. This can be difficult to estimate, so "
+"most agencies assume a fixed amount of gas, or actually of pressure e.g. 40 "
+"or 50 bar or 25% or 33% (rule of thirds). But _Subsurface_ can do better "
+"because it knows about the ascent and that is why we add the amount of gas "
+"during the ascent (i.e. the \"deco gas“).  Subsurface still uses a fixed "
+"pressure \"reserve\" but that's supposed to be for the additional gas used "
+"when there's a problem and your pulse rate goes up when you start to buddy "
+"breathe. This reserve amount is user configurable."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3183
+#: user-manual.txt:3148
 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 "
@@ -6446,18 +6513,18 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3186
+#: user-manual.txt:3151
 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:3194
+#: user-manual.txt:3159
 msgid ""
-"The dive profile in the planner indicates the maximum dive time within no-"
-"deco limits using the Bühlmann ZH-L16 algorithm and the gas and depth "
-"settings specified as described above. The _Subsurface_ planner allows rapid "
+"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 "
+"specified as described above. The _Subsurface_ planner allows rapid "
 "assessment of dive duration as a function of dive depth, given the nitrogen "
 "load incurred during previous dives. The dive plan includes estimates of the "
 "amount of air/gas used, depending on the cylinder settings specified under "
@@ -6469,69 +6536,69 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3198
+#: user-manual.txt:3163
 msgid ""
-"Below is an image of a dive plan for a recreational dive at 30 metres. "
+"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 "
-"limited by the amount of air in the cylinder, reflected by the information "
-"in the text box at the bottom right of the panel that requires sufficient "
-"air for buddy-sharing during the ascent."
+"limited by the amount of air in the cylinder. That is shown in the text box "
+"at the bottom right of the panel, requiring sufficient air for buddy-sharing "
+"during ascent."
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:3199
+#: user-manual.txt:3164
 #, no-wrap
 msgid "images/rec_diveplan.jpg"
 msgstr "images/rec_diveplan.jpg"
 
 #. type: Title ====
-#: user-manual.txt:3201
+#: user-manual.txt:3166
 #, no-wrap
 msgid "Non-recreational open circuit dives, including decompression"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3205
+#: user-manual.txt:3170
 msgid ""
 "Non-recreational dive planning involves exceeding the no-deco limits and/or "
-"using multiple breathing gases.  Such dives are planned in three stages:"
+"using multiple breathing gases.  These dives are planned in three stages:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3216
+#: user-manual.txt:3182
 #, no-wrap
 msgid ""
-"*a) Nitrogen management*: This is performed by specifying the rates for descent and ascent,\n"
+"*a) Nitrogen management*: This is done by specifying the rates for descent and ascent,\n"
 "as well as the deco model (GFLow, GFHigh or Conservatism level) under the headings _Rates_ and _Planning_\n"
 "to the bottom left of the planning screen. Two deco models are supported the Bühlmann model and the VPM-B\n"
 "model. Select one of the two models. When selecting the Bühlmann model, the gradient factors (GF_high and GF_low\n"
 "need to be specified. Initially, the GFHigh and GFLow values in the _Preferences_\n"
 "panel of _Subsurface_ is used. If these are changed within the planner (see _Gas Options_ within\n"
 "the planner), the new values are\n"
-"used without changing the original values in the _Preferences_. Gradient Factor settings strongly affect the calculated ceilings and their depths.\n"
-"A very low GFLow value brings about decompression stops early on during the dive.\n"
+"used without changing the original values in the _Preferences_.\n"
+"Gradient Factor settings strongly affect the calculated ceilings and their depths.\n"
+"A very low GFLow value brings on decompression stops early during the dive.\n"
 " ** For more information about Gradient factors, see the section on xref:S_GradientFactors[Gradient Factor Preference settings].\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3221
+#: user-manual.txt:3187
 msgid ""
 "If the VPM-B model is selected, the Conservatism_level needs to be specified "
 "on a scale of 0 (least conservative) to 4 (most conservative).  This model "
 "tends to give deco stops at deeper levels than the Bühlmann model and often "
 "results in slightly shorter dive durations than the Bühlmann model. When "
-"selecting one of these models, keep in mind that they are NOT exact "
-"physiological models but only mathematical models that appear to work in "
-"practice."
+"selecting one of these models, keep in mind they are NOT exact physiological "
+"models but only mathematical models that appear to work in practice."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3223
+#: user-manual.txt:3189
 msgid "For more information external to this manual see:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3225
+#: user-manual.txt:3191
 msgid ""
 "link:http://www.tek-dive.com/portal/upload/M-Values.pdf[Understanding M-"
 "values by Erik Baker, _Immersed_ Vol. 3, No. 3.]"
@@ -6540,7 +6607,7 @@ msgstr ""
 "values by Erik Baker, _Immersed_ Vol. 3, No. 3.]"
 
 #. type: Plain text
-#: user-manual.txt:3226
+#: user-manual.txt:3192
 msgid ""
 "link:http://www.rebreatherworld.com/general-and-new-to-rebreather-"
 "articles/5037-gradient-factors-for-dummies.html[Gradient factors for "
@@ -6551,7 +6618,7 @@ msgstr ""
 "dummies, by Kevin Watts]"
 
 #. type: Plain text
-#: user-manual.txt:3228
+#: user-manual.txt:3194
 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"
@@ -6566,21 +6633,21 @@ msgstr ""
 "traite à la fois des modèles de décompression Bühlmann et VPM-B."
 
 #. type: Plain text
-#: user-manual.txt:3236
+#: user-manual.txt:3202
 msgid ""
 "The ascent rate is critical for nitrogen off-gassing at the end of the dive "
-"and is specified for several depth ranges, utilising the average (or mean) "
-"depth as a yardstick. The mean depth of the dive plan is indicated by a "
-"light grey line on the dive profile. Ascent rates at deeper levels are often "
-"in the range of 8-12 m/min, while ascent rates near the surface are often in "
-"the range of 4-9 m/min. The descent rate is also specified. If the option "
-"_Drop to first depth_ is activated, then the descent phase of the planned "
-"dive will be at the maximal descent rate specified in the _Rates_ section of "
-"the dive setup."
+"and is specified for several depth ranges, using the average (or mean) depth "
+"as a yardstick. The mean depth of the dive plan is shown by a light grey "
+"line on the dive profile. Ascent rates at deeper levels are often in the "
+"range of 8-12 m/min, while ascent rates near the surface are often in the "
+"range of 4-9 m/min. The descent rate is also specified. If the option _Drop "
+"to first depth_ is activated, the descent phase of the planned dive will be "
+"at the maximal descent rate specified in the _Rates_ section of the dive "
+"setup."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3245
+#: user-manual.txt:3211
 #, no-wrap
 msgid ""
 "*b) Oxygen management*: In the *Gas Options* part of the dive specification, the maximum partial\n"
@@ -6594,74 +6661,76 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3259
+#: user-manual.txt:3228
 #, no-wrap
 msgid ""
-"*c) Gas management*: With open-circuit dives this is a primary consideration. One needs to keep within the limits of the amount of gas within the dive\n"
+"*c) Gas management*: With open-circuit dives this is a primary\n"
+"consideration. Divers need to keep within the limits of the amount of\n"
+"gas within the dive\n"
 "cylinder(s), allowing for an appropriate margin for a safe return to the surface, possibly\n"
 "sharing with a buddy. Under the _Gas Options_ heading, specify the best (but conservative) estimate\n"
 "of your surface-equivalent air consumption (SAC, also termed RMV) in\n"
-"litres/min (for the time being, only SI units are supported).  Specify the SAC during the\n"
+"liters/min (for the time being, only SI units are supported).  Specify the SAC during the\n"
 "bottom part of the dive (_bottom SAC_) as well as during the decompression or safety stops of the\n"
-"dive (_deco SAC_). Values of 15-30 l/min are common. For good gas management, a thumbsuck guess\n"
-"is not sufficient and one needs to\n"
-"monitor one's gas consumption on a regular basis, dependent on different dive conditions and/or equipment.\n"
+"dive (_deco SAC_). Values of 15-30 l/min are common. For good gas management, a guess\n"
+"is not sufficient and you needs to\n"
+"monitor gas consumption on a regular basis, dependent on different dive conditions and/or equipment.\n"
 "The planner calculates the total volume of gas used during the dive and issues a warning\n"
-"if one exceeds the total amount of gas available. Good practice demands that one does not dive to\n"
-"the limit of the gas supply but that an appropriate reserve is kept for unforeseen circumstances.\n"
+"if you exceeds the total amount of gas available. Good practice demands that divers not dive to\n"
+"the limit of the gas supply but that an appropriate reserve is kept\n"
+"for unforeseen circumstances.\n"
 "For technical diving, this reserve can be up to 66% of the total available gas.\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3271
+#: user-manual.txt:3240
 msgid ""
-"Now (at last) one can start the detailed time-depth planning of the dive. "
-"_Subsurface_ offers a unique graphical interface for performing this part of "
-"the planning. The mechanics of doing this is similar to hand-entering a dive "
-"profile in the dive log part of _Subsurface_. Upon activating the planner, a "
-"default dive of depth 15 m for 40 min is offered in the bue design surface "
-"to the top right hand of the screen. The white dots (waypoints) on the "
-"profile can be dragged with a mouse. Create more waypoints by double-"
-"clicking on the profile line and ensuring that the profile reflects the "
-"intended dive. Drag the waypoints to represent the depth and duration of the "
-"dive. It is NOT necessary to specify the ascent part of the dive since the "
-"planner calculates this, based on the settings that have been specified.  If "
-"any of the management limits (for nitrogen, oxygen or gas) is exceeded, the "
-"surface above the dive profile changes from BLUE to RED."
+"Now you can start the detailed time-depth planning of the dive. _Subsurface_ "
+"offers an unique graphical interface for doing planning. Themechanics are "
+"similar to hand-entering a dive profile in the dive log part of "
+"_Subsurface_. Upon activating the planner, a default dive of depth 15 m for "
+"40 min is offered in the blue design surface to the top right hand of the "
+"screen. The white dots (waypoints) on the profile can be dragged with a "
+"mouse. Create more waypoints by double-clicking on the profile line and "
+"ensuring the profile reflects the intended dive. Drag the waypoints to "
+"represent the depth and duration of the dive. It is NOT necessary to specify "
+"the ascent part of the dive since the planner calculates this, based on the "
+"settings that have been specified.  If any of the management limits (for "
+"nitrogen, oxygen or gas) are exceeded, the surface above the dive profile "
+"changes from BLUE to RED."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3283
+#: user-manual.txt:3252
 msgid ""
 "Each waypoint on the dive profile creates a _Dive Planner Point_ in the "
-"table on the left of the dive planner panel. Ensure that the _Used Gas_ "
-"value in each row of that table corresponds to one of the gas mixtures "
-"specified in the _Available Gases_ table.  Add new waypoints until the main "
-"features of the dive have been completed, e.g. the bottom time segment and "
-"deep stops (if these are implemented). Leave the remaining waypoints on the "
-"ascent to _Subsurface_. In most cases _Subsurface_ computes additional way "
-"points in order to fulfil decompression requirements for that dive. A "
-"waypoint can be moved by selecting that waypoint and by using the arrow "
-"keys.  The waypoints listed in the _Dive Planner Points_ dialogue can be "
-"edited by hand in order to obtain a precise presentation of the dive plan. "
-"In fact, one can create the whole dive profile by editing the _Dive Planner "
-"Points_ dialog."
+"table on the left of the dive planner panel. Be sure the _Used Gas_ value in "
+"each row of that table corresponds to one of the gas mixtures specified in "
+"the _Available Gases_ table.  Add new waypoints until the main features of "
+"the dive have been completed, e.g. the bottom time segment and deep stops "
+"(if these are implemented). Leave the remaining waypoints on the ascent to "
+"_Subsurface_. In most cases _Subsurface_ computes additional way points in "
+"order to fulfill decompression requirements for that dive. A waypoint can be "
+"moved by selecting it and by using the arrow keys.  The waypoints listed in "
+"the _Dive Planner Points_ dialogue can be edited by hand in order to get a "
+"precise presentation of the dive plan. In fact, you can create the whole "
+"dive profile by editing the _Dive Planner Points_ dialog."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3291
+#: user-manual.txt:3260
 msgid ""
-"Indicate any changes in gas cylinder used by indicating gas changes as "
-"explained in the section <<S_CreateProfile,hand-creating a dive profile>>. "
-"These changes should reflect the cylinders and gas compositions defined in "
-"the table with _Available Gases_.  If two or more gases are used, automatic "
-"gas switches will be suggested during the ascent to the surface. However, "
-"these changes can be deleted by right-clicking the gas change and by "
-"manually creating a gas change by right-clicking on the appropriate waypoint."
+"Show any changes in gas cylinder used by indicating gas changes as explained "
+"in the section <<S_CreateProfile,hand-creating a dive profile>>. These "
+"changes should reflect the cylinders and gas compositions defined in the "
+"table with _Available Gases_.  If two or more gases are used, automatic gas "
+"switches will be suggested during the ascent to the surface. These changes "
+"can be deleted by right-clicking the gas change and manually creating a gas "
+"change by right-clicking on the appropriate waypoint."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3300
+#: user-manual.txt:3269
 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 "
@@ -6674,34 +6743,34 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3303
+#: user-manual.txt:3272
 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:3304
+#: user-manual.txt:3273
 #, no-wrap
 msgid "images/DivePlanner2_f20.jpg"
 msgstr "images/DivePlanner2_f20.jpg"
 
 #. type: Plain text
-#: user-manual.txt:3309
+#: user-manual.txt:3278
 msgid ""
-"Once the above has been completed, one can save it by clicking the _Save_ "
-"button towards the top middle of the planner. The saved dive plan will "
-"appear in the *Dive List* panel of _Subsurface_."
+"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 "
+"the *Dive List* panel of _Subsurface_."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3311
+#: user-manual.txt:3280
 #, no-wrap
 msgid "*The dive plan details*\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3319
+#: user-manual.txt:3288
 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 "
@@ -6714,7 +6783,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3324
+#: user-manual.txt:3293
 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 "
@@ -6724,13 +6793,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:3325
+#: user-manual.txt:3294
 #, no-wrap
 msgid "Planning pSCR dives"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3340
+#: user-manual.txt:3309
 #, no-wrap
 msgid ""
 "To plan a dive using a passive semi-closed rebreather (pSCR), select _pSCR_ rather than\n"
@@ -6739,7 +6808,7 @@ msgid ""
 "from the main menu, where the gas consumption calculation takes into account the pSCR dump\n"
 "ratio (default 10:1) as well as the metabolism rate. The calculation also takes the oxygen drop\n"
 "accross the mouthpiece of the rebreather into account. If the\n"
-"pO~2~ drops below what is considered a save value, a warning appears in the _Dive plan\n"
+"pO~2~ drops below what is considered safe, a warning appears in the _Dive plan\n"
 "details_. A typical pSCR configuration is with a single cylinder and one or more bail-out\n"
 "cylinders. Therefore the setup of the _Available gases_ and the _Dive planner points_ tables\n"
 "are very similar to that of a CCR dive plan, described below. However, no oxygen setpoints\n"
@@ -6749,26 +6818,26 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:3341
+#: user-manual.txt:3310
 #, no-wrap
 msgid "images/Planner_pSCR1_f20.jpg"
 msgstr "images/Planner_pSCR1_f20.jpg"
 
 #. type: Title ===
-#: user-manual.txt:3344
+#: user-manual.txt:3313
 #, no-wrap
 msgid "Planning CCR dives"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3348
+#: user-manual.txt:3317
 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:3352
+#: user-manual.txt:3321
 #, no-wrap
 msgid ""
 "*Available gases*: In the _Available gases_ table, enter the cylinder information for the\n"
@@ -6777,60 +6846,60 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3362
+#: user-manual.txt:3331
 #, no-wrap
 msgid ""
 "*Entering setpoints*: Specify a default setpoint in the Preferences tab, by selecting _File ->  Preferences ->  Graph_ from\n"
 "the main menu. All user-entered segments in the _Dive planner points_ table\n"
 "use the default setpoint value. Then, different setpoints can be specified for dive segments\n"
 "in the _Dive planner points_ table. A zero setpoint\n"
-"means the diver bails out to open circuit mode for that segment. The decompression is always calculated\n"
+"means the diver bails out to open circuit mode for that segment. Decompression is always calculated\n"
 "using the setpoint of the last manually entered segment. So, to plan a bail out ascent for a\n"
 "CCR dive, add a one-minute dive segment to the end with a setpoint value of 0. The decompression\n"
-"algorithm does not switch deco-gases automatically while in CCR mode (i.e. when a positive setpoint is specified) but,\n"
-"of course, this is calculated for bail out ascents.\n"
+"algorithm does not switch deco-gases automatically while in CCR mode (i.e. when a positive setpoint is specified) but\n"
+"this is calculated for bail out ascents.\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3364
+#: user-manual.txt:3333
 msgid ""
 "The dive profile for a CCR dive may look something like the image below."
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:3365
+#: user-manual.txt:3334
 #, no-wrap
 msgid "images/Planner_CCR1_f20.jpg"
 msgstr "images/Planner_CCR1_f20.jpg"
 
 #. type: Plain text
-#: user-manual.txt:3369
+#: user-manual.txt:3338
 msgid ""
 "Note that, in the _Dive plan details_, the gas consumption for a CCR segment "
-"is not calculated, so gas consumptions of 0 litres are the norm."
+"is not calculated, so gas consumptions of 0 liters are the norm."
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:3371
+#: user-manual.txt:3340
 #, no-wrap
 msgid "Modifying an existing dive plan"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3378
+#: user-manual.txt:3347
 msgid ""
 "Normally, when a dive plan has been saved, it is accessible from the *Dive "
-"List*, like any other dive log. Within the *Dive List* there is not a way to "
-"change a saved dive plan.  To perform changes to a dive plan, select it on "
-"the *Dive List*. Then, in the main menu, select _Log -> Re-plan dive_. This "
-"will open the selected dive plan within the dive planner, allowing changes "
-"to be made and saved as usual."
+"List*, like any other dive log. Within the *Dive List* there is no way to "
+"change a saved dive plan.  To change a dive plan, select it on the *Dive "
+"List*. Then, in the main menu, select _Log -> Re-plan dive_. This will open "
+"the selected dive plan within the dive planner, letting changes be made and "
+"saved as usual."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3384
+#: user-manual.txt:3353
 msgid ""
-"In addition there is the option \"Save new\". This keeps the original "
+"In addition, there is the option \"Save new\". This keeps the original "
 "planned dive and adds a (possibly modified) copy to the dive list. If that "
 "copy is saved with the same start time as the original, the two dives are "
 "considered two versions of the same dive and do not influence other each "
@@ -6838,56 +6907,56 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:3385
+#: user-manual.txt:3354
 #, no-wrap
 msgid "Planning for repetitive dives"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3392
+#: user-manual.txt:3361
 msgid ""
 "Repetitive dives can easily be planned if the dates and start times of the "
-"repetitive dive set is specified appropriately in the top left-hand _Start "
-"Time_ field. _Subsurface_ calculates the gas loading figures correctly and "
-"the effect of the first dive is evaluated on later dives."
+"repetitive dive set are specified appropriately in the top left-hand _Start "
+"Time_ field. _Subsurface_ calculates the gas loading figures and the affect "
+"of the first dive is evaluated on later dives."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3398
+#: user-manual.txt:3367
 msgid ""
-"If one has just completed a long/deep dive and is planning another dive, "
-"then highlight, in the *Dive List*, the dive that has just been completed "
-"and then activate the planner. Depending on the start time of the planned "
-"dive, the planner takes into account the gas loading incurred during the "
-"completed dive and allows planning within these limitations."
+"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 "
+"activate the planner. Depending on the start time of the planned dive, the "
+"planner takes into account the gas loading during the completed dive and "
+"plans accordingly."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3403
+#: user-manual.txt:3372
 msgid ""
 "If only a few standard configurations are used (e.g. in GUE), then a "
-"template dive can be created conforming to one of the configurations. If one "
-"now wishes to plan a dive using this configuration, just highlight the "
-"template dive in the *Dive List* and activate the planner: the planner takes "
-"into account the configuration in the highlighted dive."
+"template dive can be created conforming to one of the configurations. If you "
+"want to plan a dive using this configuration, highlight the template dive in "
+"the *Dive List* and activate the planner: the planner takes into account the "
+"configuration in the highlighted dive."
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:3404
+#: user-manual.txt:3373
 #, no-wrap
 msgid "Printing the dive plan"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3409
+#: user-manual.txt:3378
 msgid ""
 "Selecting the _Print_ button in the planner allows printing of the _Dive "
-"Plan Details_ for wet notes. Alternatively one can cut and paste the _Dive "
-"Plan Details_ for inclusion in a text file or word processing document."
+"Plan Details_ for wet notes. You can also cut and paste the _Dive Plan "
+"Details_ to include in a text file or word processing document."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3419
+#: user-manual.txt:3388
 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 "
@@ -6897,19 +6966,19 @@ msgid ""
 "panel of the dive planner. However, after the plan has been saved, it is "
 "represented in a way very similar to a dive log and the gas calculations "
 "cannot be accessed in the same way as during the planning process. The only "
-"way to print the dive plan is to use the _File -> Print_ facility on the "
+"way to print the dive plan is to use the _File -> Print_ function on the "
 "main menu in the same way as for dive logs or by copy and paste to a word "
 "processor."
 msgstr ""
 
 #. type: Title ==
-#: user-manual.txt:3420
+#: user-manual.txt:3389
 #, 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:3425
+#: user-manual.txt:3394
 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 "
@@ -6920,13 +6989,13 @@ msgstr ""
 "des sections de ce manuel traitant des opérations relatives."
 
 #. type: Title ===
-#: user-manual.txt:3426
+#: user-manual.txt:3395
 #, no-wrap
 msgid "File"
 msgstr "Fichier"
 
 #. type: Plain text
-#: user-manual.txt:3429
+#: user-manual.txt:3398
 msgid ""
 "<<S_NewLogbook,_New Logbook_>> - Close the currently open dive logbook and "
 "clear all dive information."
@@ -6935,47 +7004,54 @@ msgstr ""
 "actuellement ouvert et supprime toutes les informations de plongées."
 
 #. type: Plain text
-#: user-manual.txt:3431
+#: user-manual.txt:3400
+#, fuzzy
+#| msgid ""
+#| "_Open logbook_ - This opens the file manager in order to select a dive "
+#| "logbook to open."
 msgid ""
-"_Open logbook_ - This opens the file manager in order to select a dive "
-"logbook to open."
+"_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 "
 "carnet de plongée à ouvrir."
 
 #. type: Plain text
-#: user-manual.txt:3432
+#: user-manual.txt:3401
 msgid ""
 "_Open cloud storage_ - Open the dive log previously saved in "
 "<<S_Cloud_storage,_Cloud storage_>>."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3433
-msgid "_Save_ - Save the dive logbook that is currently open."
+#: user-manual.txt:3402
+#, fuzzy
+#| msgid "_Save_ - Save the dive logbook that is currently open."
+msgid "_Save_ - Save the dive logbook currently open."
 msgstr ""
 "_Sauvegarder_ - Enregistrer le carnet de plongée qui est actuellement ouvert."
 
 #. type: Plain text
-#: user-manual.txt:3434
+#: user-manual.txt:3403
 msgid ""
 "_Save to cloud storage_ - Save the current dive log to <<S_Cloud_storage,"
 "_Cloud storage_>>."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3435
+#: user-manual.txt:3404
 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:3436
-msgid "_Close_ - Close the dive logbook that is currently open."
+#: user-manual.txt:3405
+#, fuzzy
+#| msgid "_Close_ - Close the dive logbook that is currently open."
+msgid "_Close_ - Close the dive logbook currently open."
 msgstr "_Fermer_ - Fermer le carnet de plongée actuellement ouvert."
 
 #. type: Plain text
-#: user-manual.txt:3438
+#: user-manual.txt:3407
 msgid ""
 "<<S_ExportLog,_Export_>> - Export the currently open dive logbook (or the "
 "selected dives in the logbook) to one of several formats."
@@ -6985,34 +7061,34 @@ msgstr ""
 "formats."
 
 #. type: Plain text
-#: user-manual.txt:3439
+#: user-manual.txt:3408
 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:3440
+#: user-manual.txt:3409
 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:3441
+#: user-manual.txt:3410
 msgid ""
 "<<S_FindMovedImages, _Find moved images_>> - If photos taken during dives "
 "have been moved to"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3442
+#: user-manual.txt:3411
 msgid ""
 "a different disk or directory, locate them and link them to the appropriate "
 "dives."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3443
+#: user-manual.txt:3412
 msgid ""
 "<<S_Configure,_Configure dive computer_>> - Edit the configuration of a dive "
 "computer."
@@ -7021,18 +7097,18 @@ msgstr ""
 "configuration d'un ordinateur de plongée."
 
 #. type: Plain text
-#: user-manual.txt:3444
+#: user-manual.txt:3413
 msgid "_Quit_ - Quit _Subsurface_."
 msgstr "_Quitter_ - Quitter _Subsurface_."
 
 #. type: Title ===
-#: user-manual.txt:3445
+#: user-manual.txt:3414
 #, no-wrap
 msgid "Import"
 msgstr "Importer"
 
 #. type: Plain text
-#: user-manual.txt:3448
+#: user-manual.txt:3417
 msgid ""
 "<<S_ImportDiveComputer,_Import from dive computer_>> - Import dive "
 "information from a dive computer."
@@ -7041,7 +7117,7 @@ msgstr ""
 "Importer des informations de plongées à partir de l'ordinateur de plongée."
 
 #. type: Plain text
-#: user-manual.txt:3450
+#: user-manual.txt:3419
 msgid ""
 "<<Unified_import,_Import Log Files_>> - Import dive information from a file "
 "in in a _Subsurface_-compatible format."
@@ -7051,7 +7127,7 @@ msgstr ""
 "_Subsurface_."
 
 #. type: Plain text
-#: user-manual.txt:3452
+#: user-manual.txt:3421
 msgid ""
 "<<S_Companion,_Import GPS data from Subsurface web service_>> - Load GPS "
 "coordinates from the _Subsurface_ mobile phone app."
@@ -7061,7 +7137,7 @@ msgstr ""
 "(téléphones et tablettes)."
 
 #. type: Plain text
-#: user-manual.txt:3454
+#: user-manual.txt:3423
 msgid ""
 "<<S_ImportingDivelogsDe,_Import from Divelogs.de_>> - Import dive "
 "information from _www.Divelogs.de_."
@@ -7070,13 +7146,13 @@ msgstr ""
 "informations de plongées à partir de _www.Divelogs.de_."
 
 #. type: Title ===
-#: user-manual.txt:3455
+#: user-manual.txt:3424
 #, no-wrap
 msgid "Log"
 msgstr "Journal (log)"
 
 #. type: Plain text
-#: user-manual.txt:3457
+#: user-manual.txt:3426
 msgid ""
 "<<S_EnterData,_Add Dive_>> - Manually add a new dive to the *Dive List* "
 "panel."
@@ -7085,22 +7161,19 @@ msgstr ""
 "plongée au panneau de la *liste des plongées*."
 
 #. type: Plain text
-#: user-manual.txt:3458
+#: user-manual.txt:3427
 msgid ""
-"_Edit dive_ - Edit a dive of which the profile was entered by hande and not "
-"from a dive computer."
+"_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:3459
-msgid ""
-"<<S_DivePlanner,_Plan Dive_>> - This feature allows the planning of dives."
-msgstr ""
-"<<S_DivePlanner,_Planifier une plongée_>> - Cette fonctionnalité permet de "
-"planifier des plongées."
+#: user-manual.txt:3428
+msgid "<<S_DivePlanner,_Plan Dive_>> - Plan dives."
+msgstr "<<S_DivePlanner,_Planifier une plongée_>> - Planifier des plongées."
 
 #. type: Plain text
-#: user-manual.txt:3460
+#: user-manual.txt:3429
 msgid ""
 "<<S_Replan,_Edit dive in planner_>> - Edit a dive plan that has been saved "
 "into the *Dive List*."
@@ -7109,17 +7182,17 @@ msgstr ""
 "plongée planifiée qui a été enregistrée dans la *liste des plongées*."
 
 #. type: Plain text
-#: user-manual.txt:3462
+#: user-manual.txt:3431
 msgid ""
-"<<S_CopyComponents,_Copy dive components_>> - By selecting this option, one "
-"can copy information from several fields of a dive log onto the clipboard."
+"<<S_CopyComponents,_Copy dive components_>> - Copy information from several "
+"fields of a dive log onto the clipboard."
 msgstr ""
-"<<S_CopyComponents,_Copier les composants de la plongée_>> - En "
-"sélectionnant cette option, vous pouvez copier les informations de plusieurs "
-"champs d'un journal de plongée vers le presse-papier."
+"<<S_CopyComponents,_Copier les composants de la plongée_>> - Copier les "
+"informations de plusieurs champs d'un journal de plongée vers le presse-"
+"papier."
 
 #. type: Plain text
-#: user-manual.txt:3464
+#: user-manual.txt:3433
 msgid ""
 "_Paste dive components_ - Paste, into the selected dives in the *Dive List*, "
 "the information copied using the _Copy dive components_ option."
@@ -7129,7 +7202,7 @@ msgstr ""
 "préalable avec l'option _Copier les composants de la plongée_."
 
 #. type: Plain text
-#: user-manual.txt:3466
+#: user-manual.txt:3435
 msgid ""
 "<<S_Renumber,_Renumber_>> - Renumber the dives listed in the *Dive List* "
 "panel."
@@ -7138,7 +7211,7 @@ msgstr ""
 "le panneau de la *liste des plongées*."
 
 #. type: Plain text
-#: user-manual.txt:3468
+#: user-manual.txt:3437
 msgid ""
 "<<S_Group,_Auto Group_>> - Group the dives in the *Dive List* panel into "
 "dive trips."
@@ -7147,16 +7220,16 @@ msgstr ""
 "*liste des plongées* dans des voyages de plongées."
 
 #. type: Plain text
-#: user-manual.txt:3469
+#: user-manual.txt:3438
 msgid ""
 "<<S_DeviceNames,_Edit Device Names_>> - Edit the names of dive computers to "
-"facilitate your logs."
+"coordinate your logs."
 msgstr ""
 "<<S_DeviceNames,_Editer les noms des ordinateurs de plongée_>> - Modifier "
-"les noms des ordinateurs de plongée pour faciliter vos journaux (logs)."
+"les noms des ordinateurs de plongée pour coordonner vos journaux (logs)."
 
 #. type: Plain text
-#: user-manual.txt:3470
+#: user-manual.txt:3439
 msgid ""
 "<<S_Filter,_Filter divelist_>> - Select only some dives, based on specific "
 "tags or dive criteria."
@@ -7165,48 +7238,47 @@ msgstr ""
 "certaines plongées, à partir de tags ou de critères de plongées."
 
 #. type: Title ===
-#: user-manual.txt:3471
+#: user-manual.txt:3440
 #, no-wrap
 msgid "View"
 msgstr "Vue"
 
 #. type: Plain text
-#: user-manual.txt:3474
+#: user-manual.txt:3443
 msgid ""
-"<<S_ViewPanels,_All_>> - View the four main _Subsurface_ panels "
-"simmultaneously."
+"<<S_ViewPanels,_All_>> - View the four main _Subsurface_ panels all at once."
 msgstr ""
 "<<S_ViewPanels,_Tout_>> - Affiche les quatre panneaux principaux de "
 "_Subsurface_ simultanément."
 
 #. type: Plain text
-#: user-manual.txt:3475
+#: user-manual.txt:3444
 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:3476
+#: user-manual.txt:3445
 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:3477
+#: user-manual.txt:3446
 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:3478
+#: user-manual.txt:3447
 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:3480
+#: user-manual.txt:3449
 msgid ""
 "_Yearly Statistics_ - Display summary statistics about dives during this and "
 "past years."
@@ -7215,35 +7287,30 @@ msgstr ""
 "plongées effectuées."
 
 #. type: Plain text
-#: user-manual.txt:3481
+#: user-manual.txt:3450
 msgid ""
-"_Prev DC_ - If a single dive was logged from more than one dive computer, "
-"switch to data from"
+"_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:3482
-msgid "previous dive computer."
-msgstr "ordinateur de plongée précédent."
-
-#. type: Plain text
-#: user-manual.txt:3483
+#: user-manual.txt:3451
 msgid "_Next DC_ - Switch to next dive computer."
 msgstr "_Ordinateur suivant_  - Passer à l'ordinateur de plongée suivant."
 
 #. type: Plain text
-#: user-manual.txt:3484
+#: user-manual.txt:3452
 msgid "_Full Screen_ - Toggles Full Screen mode."
 msgstr "_Plein écran_  - Passer en mode plein écran."
 
 #. type: Title ===
-#: user-manual.txt:3485
+#: user-manual.txt:3453
 #, no-wrap
 msgid "Share on"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3487
+#: user-manual.txt:3455
 msgid ""
 "<<S_Facebook,_Facebook_>> - Share the currently selected dive on your "
 "Facebook timeline."
@@ -7252,13 +7319,13 @@ msgstr ""
 "Facebook."
 
 #. type: Title ===
-#: user-manual.txt:3489
+#: user-manual.txt:3457
 #, no-wrap
 msgid "Help"
 msgstr "Aide"
 
 #. type: Plain text
-#: user-manual.txt:3492
+#: user-manual.txt:3460
 msgid ""
 "_About Subsurface_ - Show a panel with the version number of _Subsurface_ as "
 "well as licensing information."
@@ -7267,7 +7334,7 @@ msgstr ""
 "_Subsurface_ ainsi que les informations de licence."
 
 #. type: Plain text
-#: user-manual.txt:3494
+#: user-manual.txt:3462
 msgid ""
 "_Check for updates_ - Find out whether a newer version of Subsurface is "
 "available on the http://subsurface-divelog.org/[_Subsurface_ web site]."
@@ -7277,7 +7344,7 @@ msgstr ""
 "_Subsurface_ ]."
 
 #. type: Plain text
-#: user-manual.txt:3496
+#: user-manual.txt:3464
 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 "
@@ -7288,42 +7355,47 @@ msgstr ""
 "sondage, si vos habitudes de plongées ont changées."
 
 #. type: Plain text
-#: user-manual.txt:3497
+#: user-manual.txt:3465
 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:3500
+#: user-manual.txt:3468
 #, 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:3502
+#: user-manual.txt:3470
 #, 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:3503
+#: user-manual.txt:3471
 #, no-wrap
 msgid "images/icons/drivers.jpg"
 msgstr "images/icons/drivers.jpg"
 
 #. type: Plain text
-#: user-manual.txt:3508
+#: 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)."
 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)."
+"in order to communicate with the dive computer, the way the dive computer "
+"prefers (e.g. Bluetooth, USB, infra-red)."
 msgstr ""
 "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)."
 
 #. type: Plain text
-#: user-manual.txt:3514
+#: user-manual.txt:3482
 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 "
@@ -7337,7 +7409,7 @@ msgstr ""
 "particulièrement pour certaines technologies telles que l'infra-rouge."
 
 #. type: Plain text
-#: user-manual.txt:3518
+#: user-manual.txt:3486
 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 "
@@ -7348,7 +7420,7 @@ msgstr ""
 "port USB de son ordinateur de bureau."
 
 #. type: Plain text
-#: user-manual.txt:3525
+#: user-manual.txt:3493
 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 "
@@ -7366,26 +7438,33 @@ msgstr ""
 "documents et logiciels Silicon Labs]."
 
 #. type: Title ===
-#: user-manual.txt:3527
+#: user-manual.txt:3495
 #, 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:3528
+#: user-manual.txt:3496
 #, no-wrap
 msgid "images/icons/usb.jpg"
 msgstr "images/icons/usb.jpg"
 
 #. type: Plain text
-#: user-manual.txt:3536
+#: 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:"
 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:"
+"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:"
 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 "
@@ -7395,7 +7474,7 @@ msgstr ""
 "nom de votre périphérique ;"
 
 #. type: Plain text
-#: user-manual.txt:3541
+#: user-manual.txt:3509
 msgid ""
 "Simply try COM1, COM2, etc. The drop down list should contain all connected "
 "COM devices."
@@ -7404,56 +7483,56 @@ msgstr ""
 "tous les périphériques COM connectés."
 
 #. type: Title ====
-#: user-manual.txt:3542 user-manual.txt:3636
+#: user-manual.txt:3510 user-manual.txt:3608
 #, no-wrap
 msgid "On MacOS:"
 msgstr "Sur MacOS :"
 
 #. type: Plain text
-#: user-manual.txt:3545
+#: user-manual.txt:3513
 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:3546
+#: user-manual.txt:3514
 #, no-wrap
 msgid "On Linux:"
 msgstr "Sur Linux :"
 
 #. type: Plain text
-#: user-manual.txt:3549
+#: user-manual.txt:3517
 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:3551
+#: user-manual.txt:3519
 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:3552
+#: user-manual.txt:3520
 msgid "Open a terminal"
 msgstr "Ouvrir un terminal"
 
 #. type: Plain text
-#: user-manual.txt:3553 user-manual.txt:3555
+#: user-manual.txt:3521 user-manual.txt:3523
 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:3554
+#: user-manual.txt:3522
 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:3557
+#: user-manual.txt:3525
 msgid "A message similar to this one should appear:"
 msgstr "Un message similaire à celui-ci devrait apparaitre :"
 
 #. type: Plain text
-#: user-manual.txt:3573
+#: user-manual.txt:3541
 #, no-wrap
 msgid ""
 "\tusb 2-1.1: new full speed USB device number 14 using ehci_hcd\n"
@@ -7489,7 +7568,7 @@ msgstr ""
 "\tftdi_sio: v1.6.0:USB FTDI Serial Converters Driver\n"
 
 #. type: Plain text
-#: user-manual.txt:3578
+#: user-manual.txt:3546
 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 "
@@ -7501,19 +7580,30 @@ msgstr ""
 "que Subsurface utilise le bon port USB."
 
 #. type: Plain text
-#: user-manual.txt:3580
-msgid "Ensuring that the user has write permission to the USB serial port:"
+#: user-manual.txt:3548
+#, fuzzy
+#| msgid "Ensuring that the user has write permission to the USB serial port:"
+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:3586
+#: 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'."
 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'."
+"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'."
 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 "
@@ -7521,7 +7611,7 @@ msgstr ""
 "utiliser le port USB. Si votre nom d'utilisateur est 'johnB' :"
 
 #. type: Plain text
-#: user-manual.txt:3590
+#: user-manual.txt:3562
 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."
@@ -7531,7 +7621,7 @@ msgstr ""
 "+dialout+."
 
 #. type: Plain text
-#: user-manual.txt:3595
+#: user-manual.txt:3567
 #, no-wrap
 msgid ""
 "Type: +id johnB+     This lists all the groups that johnB belongs to and\n"
@@ -7547,15 +7637,17 @@ msgstr ""
 "parmi les différents IDs.\n"
 
 #. type: Plain text
-#: user-manual.txt:3597
+#: user-manual.txt:3569
 #, no-wrap
 msgid ""
 "Under some circumstances this change takes only effect (eg. on Ubuntu) after\n"
 "one logs out and then logs in again.\n"
-msgstr "Sous certaines circonstances, les modifications ne prennent effet qu'après une déconnexionpuis reconnexion sur l'ordinateur (sous Ubuntu, par exemple)."
+msgstr ""
+"Sous certaines circonstances, les modifications ne prennent effet qu'après une déconnexion\n"
+"puis reconnexion sur l'ordinateur (sous Ubuntu, par exemple).\n"
 
 #. type: Plain text
-#: user-manual.txt:3602
+#: user-manual.txt:3574
 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 "
@@ -7566,28 +7658,28 @@ msgstr ""
 "vous devriez pouvoir importer vos plongées."
 
 #. type: Title ===
-#: user-manual.txt:3605
+#: user-manual.txt:3577
 #, no-wrap
 msgid "Manually setting up Bluetooth enabled devices"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3612
+#: user-manual.txt:3584
 msgid ""
 "For dive computers communicating through Bluetooth like the Heinrichs "
 "Weikamp Frog or the Shearwater Predator, Petrel and Nerd there is a "
-"different procedure to get the devices name to communicate with "
+"different procedure to get the device’s name to communicate with "
 "_Subsurface_. Follow these steps:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3614
+#: user-manual.txt:3586
 #, no-wrap
-msgid "*For the dive computer, after enabling Bluetooth, ensure it is in Upload mode.*\n"
+msgid "*For the dive computer, after enabling Bluetooth, be sure it is in Upload mode.*\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3618
+#: user-manual.txt:3590
 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 -> "
@@ -7595,13 +7687,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3620
+#: user-manual.txt:3592
 #, no-wrap
 msgid "*Pair the _Subsurface_ computer with the dive computer.*\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3629
+#: user-manual.txt:3601
 msgid ""
 "Bluetooth is most likely already enabled. For pairing with the dive computer "
 "choose _Control Panel -> Bluetooth Devices -> Add Wireless Device_.  This "
@@ -7613,21 +7705,21 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3632
+#: user-manual.txt:3604
 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:3635
+#: user-manual.txt:3607
 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:3642
+#: user-manual.txt:3614
 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. "
@@ -7636,33 +7728,32 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3645
+#: user-manual.txt:3617
 msgid ""
-"Once the pairing is completed the correct device is shown in the 'Device or "
+"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:3646
+#: user-manual.txt:3618
 #, no-wrap
 msgid "On Linux"
 msgstr "Sur Linux"
 
 #. type: Plain text
-#: user-manual.txt:3654
+#: user-manual.txt:3626
 msgid ""
-"Ensure Bluetooth is enabled on the _Subsurface_ computer.  On most common "
+"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 "
-"straight forward. For instance, Gnome3 shows a Bluetooth icon on the right "
-"of the toolbar at the top of the screen.  Users have reported difficulties "
-"with some Bluetooth controllers.  If you have an onboard controller, try "
-"that first.  It is simplest if you remove any USB Bluetooth dongles.  If you "
-"have a USB dongle that came with your dive computer, try that before any "
-"others."
+"straightforward. For instance, Gnome3 shows a Bluetooth icon on the right of "
+"the toolbar at the top of the screen.  Users have reported difficulties with "
+"some Bluetooth controllers.  If you have an onboard controller, try that "
+"first.  It is simplest if you remove any USB Bluetooth dongles.  If you have "
+"a USB dongle that came with your dive computer, try that before any others."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3658
+#: user-manual.txt:3630
 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 "
@@ -7671,23 +7762,23 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3660
+#: user-manual.txt:3632
 msgid "Enable the Bluetooth controller and pair your dive computer"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3661
+#: user-manual.txt:3633
 msgid "Establish an RFCOMM connection"
 msgstr ""
 
 #. type: Title =====
-#: user-manual.txt:3662 user-manual.txt:3802
+#: user-manual.txt:3634 user-manual.txt:3774
 #, no-wrap
 msgid "Download the dives with Subsurface"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3668
+#: user-manual.txt:3640
 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 "
@@ -7698,7 +7789,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3673
+#: user-manual.txt:3645
 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 "
@@ -7708,23 +7799,23 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3675
+#: user-manual.txt:3647
 msgid "+sudo usermod -a -G dialout username+"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3677
+#: user-manual.txt:3649
 msgid "Then log out and log in for the change to take effect."
 msgstr ""
 
 #. type: Title =====
-#: user-manual.txt:3678
+#: user-manual.txt:3650
 #, no-wrap
 msgid "Enabling the Bluetooth controller and pairing your dive computer"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3684
+#: user-manual.txt:3656
 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 "
@@ -7735,14 +7826,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3687
+#: user-manual.txt:3659
 msgid ""
-"If the graphical method didn't work, pair the device from the command line. "
+"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:3694
+#: user-manual.txt:3666
 #, no-wrap
 msgid ""
 "\t$ hciconfig\n"
@@ -7754,7 +7845,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3699
+#: user-manual.txt:3671
 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 "
@@ -7764,7 +7855,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3707
+#: user-manual.txt:3679
 #, no-wrap
 msgid ""
 "\tsudo hciconfig hci0 up auth+  (enter password when prompted)\n"
@@ -7777,25 +7868,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3709
+#: user-manual.txt:3681
 msgid "Check that the status now includes +'UP', 'RUNNING' AND 'AUTH'+."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3711
+#: user-manual.txt:3683
 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:3713
+#: user-manual.txt:3685
 #, no-wrap
 msgid "\tsudo hciconfig hci1 down\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3716
+#: user-manual.txt:3688
 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 "
@@ -7803,7 +7894,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3737
+#: user-manual.txt:3709
 #, no-wrap
 msgid ""
 "\tbluetoothctl\n"
@@ -7829,14 +7920,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3740
+#: user-manual.txt:3712
 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:3743
+#: user-manual.txt:3715
 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-"
@@ -7844,7 +7935,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3748
+#: user-manual.txt:3720
 #, no-wrap
 msgid ""
 "\thcitool -i hci0 scanning\n"
@@ -7854,94 +7945,94 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3750
+#: user-manual.txt:3722
 msgid "Once ther dive computer is pired, set up the RFCOMM connection"
 msgstr ""
 
 #. type: Title =====
-#: user-manual.txt:3751
+#: user-manual.txt:3723
 #, no-wrap
 msgid "Establishing the RFCOMM connection"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3754
+#: user-manual.txt:3726
 msgid "The command to establish an RFCOMM connection is:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3756
+#: user-manual.txt:3728
 msgid "+sudo rfcomm -i <controller> connect <dev> <bdaddr> [channel]+"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3758
+#: user-manual.txt:3730
 msgid "+<controller>+ is the Bluetooth controller, +hci0+."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3759
+#: user-manual.txt:3731
 msgid "+<dev>+ is the RFCOMM device file, +rfcomm0+"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3760
+#: user-manual.txt:3732
 msgid "+<bdaddr>+ is the dive computer's MAC address, +00:11:22:33:44:55+"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3761
+#: user-manual.txt:3733
 msgid ""
 "+[channel]+ is the dive computer's Bluetooth channel we need to connect to."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3764
+#: user-manual.txt:3736
 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:3766
+#: user-manual.txt:3738
 msgid "_Shearwater Petrel 1_: channel 1"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3767
+#: user-manual.txt:3739
 msgid "_Shearwater Petrel 2_: channel 5"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3768
+#: user-manual.txt:3740
 msgid "_Shearwater Nerd_: channel 5"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3769
+#: user-manual.txt:3741
 msgid "_Heinrichs-Weikamp OSTC Sport_: channel 1"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3771
+#: user-manual.txt:3743
 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:3773
+#: user-manual.txt:3745
 #, 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:3775
+#: user-manual.txt:3747
 msgid "This gives the response:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3778
+#: user-manual.txt:3750
 #, no-wrap
 msgid ""
 "\tConnected /dev/rfcomm0 to 00:11:22:33:44:55 on channel 5\n"
@@ -7949,14 +8040,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3780
+#: user-manual.txt:3752
 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:3784
+#: user-manual.txt:3756
 #, no-wrap
 msgid ""
 "\tsudo rfcomm -i hci0 connect rfcomm0 00:11:22:33:44:55   (enter a password, probably 0000, when prompted)\n"
@@ -7965,7 +8056,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3788
+#: user-manual.txt:3760
 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 "
@@ -7974,7 +8065,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3798
+#: user-manual.txt:3770
 #, no-wrap
 msgid ""
 "\tsdptool -i hci0 records 00:11:22:33:44:55\n"
@@ -7989,7 +8080,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3801
+#: user-manual.txt:3773
 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 "
@@ -7997,7 +8088,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3804
+#: user-manual.txt:3776
 msgid ""
 "After establishing the RFCOMM connection and while the dive computer's "
 "upload mode countdown is still running, go to_Subsurface_, select _Import-"
@@ -8007,31 +8098,31 @@ msgid ""
 msgstr ""
 
 #. type: Title ==
-#: user-manual.txt:3810
+#: user-manual.txt:3782
 #, no-wrap
 msgid "APPENDIX B: Dive Computer specific information for importing dive data."
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:3813
+#: user-manual.txt:3785
 #, no-wrap
 msgid "Importing from Uemis Zurich"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:3815
+#: user-manual.txt:3787
 #, no-wrap
 msgid "images/icons/iumis.jpg"
 msgstr "images/icons/iumis.jpg"
 
 #. type: Plain text
-#: user-manual.txt:3831
+#: user-manual.txt:3803
 msgid ""
 "_Subsurface_ downloads the information stored on the SDA (the built-in file "
 "system of the Uemis) including information about dive spots and equipment. "
 "Buddy information is not yet downloadable.  Things are very similar to a "
 "normal USB-connected dive computer (the Uemis is one of those that recharge "
-"when connected to the USB port).  The main difference is that one does not "
+"when connected to the USB port).  The main difference is that you don’t "
 "enter a device name, but instead the location where the UEMISSDA file system "
 "is mounted once connected to the dive computer. On Windows this is a drive "
 "letter ( often 'E:' or 'F:'), on a Mac this is '/Volumes/UEMISSDA' and on "
@@ -8041,36 +8132,36 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3846
+#: user-manual.txt:3818
 msgid ""
 "After selecting the above device name, download the dives from the Uemis "
 "Zurich. One technical issue with the Uemis Zurich download implementation "
-"(this is a Uemis firmware limitation, not a _Subsurface_ issue) is that one "
+"(this is a Uemis firmware limitation, not a _Subsurface_ issue) is that you "
 "cannot download more than about 40-50 dives without running out of memory on "
-"the SDA. This will usually only happen the very first time one downloads "
+"the SDA. This will usually only happen the very first time you download "
 "dives from the Uemis Zurich.  Normally when downloading at the end of a day "
 "or even after a dive trip, the capacity is sufficient. If _Subsurface_ "
-"displays an error that the dive computer ran out of space the solution is "
-"straight forward.  Disconnect the SDA, turn it off and on again, and "
+"displays an error that the dive computer ran out of space, the solution is "
+"straightforward.  Disconnect the SDA, turn it off and on again, and "
 "reconnect it. You can now retry (or start a new download session) and the "
-"download will continue where it stopped previously. One may have to do this "
+"download will continue where it stopped previously. You may have to do this "
 "more than once, depending on how many dives are stored on the dive computer."
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:3848
+#: user-manual.txt:3820
 #, no-wrap
 msgid "Importing from Uwatec Galileo"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:3850
+#: user-manual.txt:3822
 #, no-wrap
 msgid "images/icons/Galileo.jpg"
 msgstr "images/icons/Galileo.jpg"
 
 #. type: Plain text
-#: user-manual.txt:3865
+#: user-manual.txt:3837
 msgid ""
 "The Uwatec Galileo dive computers use infra red (IrDA) communication between "
 "the dive computer and Subsurface. The Uwatec hardware uses a USB dongle "
@@ -8086,43 +8177,43 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3868
+#: user-manual.txt:3840
 msgid ""
-"After executing this command, Subsurface will recognise the Galileo dive "
+"After executing this command, Subsurface will recognize the Galileo dive "
 "computer and download dive information."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3874
+#: user-manual.txt:3846
 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/"
 "Drv/MosChip/MCS7780/[www.drivers-download.com]. Windows-based IrDA drivers "
-"for the Uwatec can also be downloaded from the ScubaPro web site, drivers "
-"being located on the download page for the ScubaPro SmartTrak software."
+"for the Uwatec can also be downloaded from the ScubaPro web site, with "
+"drivers located on the download page for the ScubaPro SmartTrak software."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3877
+#: user-manual.txt:3849
 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:3879
+#: user-manual.txt:3851
 #, no-wrap
 msgid "Importing from Heinrichs Weikamp DR5"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:3881
+#: user-manual.txt:3853
 #, no-wrap
 msgid "images/icons/HW_DR5.jpg"
 msgstr "images/icons/HW_DR5.jpg"
 
 #. type: Plain text
-#: user-manual.txt:3891
+#: user-manual.txt:3863
 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.  "
@@ -8135,19 +8226,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:3894
+#: user-manual.txt:3866
 #, no-wrap
 msgid "Importing from xDEEP BLACK"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:3896
+#: user-manual.txt:3868
 #, no-wrap
 msgid "images/icons/HW_xdeepblack.jpg"
 msgstr "images/icons/HW_xdeepblack.jpg"
 
 #. type: Plain text
-#: user-manual.txt:3905
+#: user-manual.txt:3877
 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 "
@@ -8161,19 +8252,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:3907
+#: user-manual.txt:3879
 #, no-wrap
 msgid "Importing from Shearwater Predator/Petrel/Nerd using Bluetooth"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:3909
+#: user-manual.txt:3881
 #, no-wrap
 msgid "images/icons/predator.jpg"
 msgstr "images/icons/predator.jpg"
 
 #. type: Plain text
-#: user-manual.txt:3912
+#: user-manual.txt:3884
 msgid ""
 "Specific instructions for downloading dives using Bluetooth are given in the "
 "section above, <<S_Bluetooth,_Connecting Subsurface to a Bluetooth-enabled "
@@ -8181,69 +8272,69 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:3914
+#: user-manual.txt:3886
 #, no-wrap
 msgid "Importing from Poseidon MkVI Discovery"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:3916
+#: user-manual.txt:3888
 #, no-wrap
 msgid "images/MkVI.jpeg"
 msgstr "images/MkVI.jpeg"
 
 #. type: Plain text
-#: user-manual.txt:3924
+#: user-manual.txt:3896
 msgid ""
 "Download of dive logs from the MkVI is performed using a custom "
 "communications adapter and the _Poseidon PC Configuration Software_, "
 "obtained when purchasing the MKVI equipment. The latter is a Windows "
 "application allowing configuration of equipment and storage of dive logs. "
-"Communication between dive computer and desktop computer utilises the IrDA "
-"infra-red protocol. Only data for one dive can be downloaded at a time, "
-"comprising three files:"
+"Communication between dive computer and desktop computer utilizes the IrDA "
+"infra-red protocol. Only data for one dive can be downloaded at a time, in "
+"three files:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3927
+#: user-manual.txt:3899
 msgid ""
 "Setup configuration for the dive and key dive parameters (file with a .txt "
 "extension)"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3928
+#: user-manual.txt:3900
 msgid "Dive log details (file with a .csv extension)"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3930
+#: user-manual.txt:3902
 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:3932
+#: user-manual.txt:3904
 msgid ""
-"_Subsurface_ accesses the .txt and the .csv files to obtain dive log "
+"_Subsurface_ accesses the .txt and the .csv files to get dive log "
 "information."
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:3934
+#: user-manual.txt:3906
 #, no-wrap
 msgid "Importing from APD Inspiration/Evolution CCR"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:3936
+#: user-manual.txt:3908
 #, no-wrap
 msgid "images/APDComputer.jpg"
 msgstr "images/APDComputer.jpg"
 
 #. type: Plain text
-#: user-manual.txt:3944
+#: user-manual.txt:3916
 msgid ""
 "The dive logs of an APD Inspiration or similar CCR dive computer are "
 "downloaded using a communications adapter and _AP Communicator_, obtained "
@@ -8255,103 +8346,104 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3946
+#: user-manual.txt:3918
 msgid "Download the dive using _AP Communicator_."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3947
+#: user-manual.txt:3919
 msgid "Open a dive within the _AP Log Viewer_."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3948
+#: user-manual.txt:3920
 msgid "Select the tab at the top of the screen, entitled \"_Data_\"."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3949
+#: user-manual.txt:3921
 msgid ""
 "With the raw dive log data show on the screen, click on \"_Copy to Clipboard_"
 "\"."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3950
+#: user-manual.txt:3922
 msgid "Open a text editor, e.g. Notepad (Windows) or TextWrangler (Mac)."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3952
+#: user-manual.txt:3924
 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:3953
+#: user-manual.txt:3925
 msgid ""
 "Within _Subsurface_, select _Import -> Import log files_ to open the xref:"
 "Unified_import[universal import dialogue]."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3954
+#: user-manual.txt:3926
 msgid ""
-"In the dropdown list towards the bottom right of the dialogue (labled "
+"In the dropdown list towards the bottom right of the dialogue (labeled "
 "'Filter:'), select \"APD log viewer\"."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3957
+#: user-manual.txt:3930
+#, no-wrap
 msgid ""
-"On the list of file names select the _.apd_ file that has been created "
-"above. An import dialogue opens indicating the default settings for the data "
-"in the _.apd_ file. If any changes are required, do this as for xref:"
-"S_ImportingCSVDives[CSV imports]."
+"On the list of file names select the _.apd_ file  created. An import\n"
+"dialogue opens showing the default settings for the data in the\n"
+"_.apd_ file. If changes are required,\n"
+"  do this as for xref:S_ImportingCSVDives[CSV imports].\n"
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:3958
+#: user-manual.txt:3931
 #, no-wrap
 msgid "images/APD_CSVimportF22.jpg"
 msgstr "images/APD_CSVimportF22.jpg"
 
 #. type: Plain text
-#: user-manual.txt:3966
+#: user-manual.txt:3939
 msgid ""
-"The top left hand dropdown box in the import panel allows one to select the "
-"APD dive computer for which the dive log needs to be imported. The default "
-"it is DC1, _i.e._ the first of the two dive computers the APD uses. It is "
-"possible to sequentially import the data for both dive computers by first "
-"importing CD1 and then DC2.(*Hint*: The logs for the two dive computers are "
-"viewed by selecting _View -> Next DC_ from the Main Menu after the uploading "
-"has been completed)"
+"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 "
+"DC1, _i.e._ the first of the two dive computers the APD uses. It is possible "
+"to sequentially import the data for both dive computers by first importing "
+"CD1 and then DC2.(*Hint*: The logs for the two dive computers are viewed by "
+"selecting _View -> Next DC_ from the Main Menu after the uploading has been "
+"completed)"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3967
+#: user-manual.txt:3940
 msgid "Click the _Ok_ button at the bottom of the import panel."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3972
+#: user-manual.txt:3945
 msgid ""
-"The APD dive log will appear within _Subsurface_. The dive computer-"
-"generated ceiling generated by the Inspiration can be viewed by selecting "
-"the appropriate button on the left of the *Dive Profile*. Cylinder pressure "
-"data are not logged by the APD equipment but can be manually entered in the "
+"The APD dive log will appear within _Subsurface_. The dive computer- "
+"generated ceiling provided by the Inspiration can be viewed by selecting the "
+"appropriate button on the left of the *Dive Profile*. Cylinder pressure data "
+"are not logged by the APD equipment but can be manually entered in the "
 "_Equipment_ Tab."
 msgstr ""
 
 #. type: Title ==
-#: user-manual.txt:3973
+#: user-manual.txt:3946
 #, no-wrap
 msgid "APPENDIX C: Exporting Dive log information from external dive log software."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3982
+#: user-manual.txt:3955
 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, "
@@ -8361,22 +8453,22 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3984
+#: user-manual.txt:3957
 msgid "Export the foreign dive log data to format that is accessible from"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3985
+#: user-manual.txt:3958
 msgid "_Subsurface_."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3986
+#: user-manual.txt:3959
 msgid "Import the accessible dive log data into _Subsurface_."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:3990
+#: user-manual.txt:3963
 msgid ""
 "This appendix provides some information about approaches to export dive log "
 "data from foreign dive log software. The procedures below mostly apply to "
@@ -8384,19 +8476,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:3992
+#: user-manual.txt:3965
 #, no-wrap
 msgid "Exporting from *Suunto Divemanager (DM3, DM4 or DM5)*"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:3993
+#: user-manual.txt:3966
 #, no-wrap
 msgid "images/icons/suuntologo.jpg"
 msgstr "images/icons/suuntologo.jpg"
 
 #. type: Plain text
-#: user-manual.txt:4000
+#: user-manual.txt:3973
 msgid ""
 "DiveManager is a MS Windows application for Suunto dive computers.  "
 "Divemanager 3 (DM3) is an older version of the Suunto software. More recent "
@@ -8406,66 +8498,66 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4002
+#: user-manual.txt:3975
 #, no-wrap
 msgid "*Divemanager 3 (DM3):*\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4004
+#: user-manual.txt:3977
 msgid ""
 "Start 'Suunto Divemanager 3' and log in with the name containing the logs"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4005
+#: user-manual.txt:3978
 msgid "Do not start the import wizard to import dives from the dive computer."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4007
+#: user-manual.txt:3980
 msgid ""
 "In the navigation tree on the left side of the program-window, select the "
 "appropriate dives."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4008
+#: user-manual.txt:3981
 msgid ""
 "Within the list of dives, select the dives you would like to import later:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4009
+#: user-manual.txt:3982
 msgid "To select certain dives: hold 'ctrl' and click the dive"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4011
+#: user-manual.txt:3984
 msgid ""
 "To select all dives: Select the first dive, hold down shift and select the "
 "last dive"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4012
+#: user-manual.txt:3985
 msgid "With the dives marked, use the program menu _File -> Export_"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4013
+#: user-manual.txt:3986
 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:4014
+#: user-manual.txt:3987
 msgid "Click the browse button next to the field Export Path"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4016
+#: user-manual.txt:3989
 #, no-wrap
 msgid ""
 "** A file-manager like window pops up\n"
@@ -8473,13 +8565,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4017
+#: user-manual.txt:3990
 #, no-wrap
 msgid "Divelog.SDE file\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4019
+#: user-manual.txt:3992
 #, no-wrap
 msgid ""
 "** Optionally change the name of the file for saving\n"
@@ -8487,108 +8579,108 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4020
+#: user-manual.txt:3993
 #, no-wrap
 msgid "Back in the Export pop-up, press the button 'Export'\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4021
+#: user-manual.txt:3994
 #, no-wrap
 msgid "The dives are now exported to the file Divelog.SDE.\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4023
+#: user-manual.txt:3996
 #, no-wrap
 msgid "*Divemanager 4 (DM4) and Divemanager 5 (DM5):*\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4028
+#: user-manual.txt:4001
 msgid ""
 "DM4 and DM5 use identical mechanisms for exporting dive logs.  To export a "
-"divelog from Divemanager one needs to locate the DM4/DM5 database where the "
-"dives are stored. the user can either look for the original database or make "
-"a backup of the dives. Both methods are described here."
+"divelog from Divemanager you need to locate the DM4/DM5 database where the "
+"dives are stored. You can either look for the original database or make a "
+"backup of the dives. Both methods are described here."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4030
+#: user-manual.txt:4003
 msgid "Locating the Suunto DM4 (or DM5) database:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4032 user-manual.txt:4041
+#: user-manual.txt:4005 user-manual.txt:4014
 msgid "Start Suunto DM4/DM5"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4033
+#: user-manual.txt:4006
 msgid "Select 'Help -> About'"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4034
+#: user-manual.txt:4007
 msgid "Click 'Copy' after text 'Copy log folder path to clipboard'"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4035
-msgid "Now open Windows Explorer"
-msgstr ""
+#: user-manual.txt:4008
+msgid "Open Windows Explorer"
+msgstr "Ouvrir l'explorateur Windows"
 
 #. type: Plain text
-#: user-manual.txt:4036
+#: user-manual.txt:4009
 msgid "Paste the address to the path box at the top of the File Explorer"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4037
+#: user-manual.txt:4010
 msgid "The database is called DM4.db or DM5.db"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4039
+#: user-manual.txt:4012
 msgid "Making a backup copy of the Suunto DM4/DM5 database:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4042
+#: user-manual.txt:4015
 msgid "Select 'File - Create backup'"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4044
+#: user-manual.txt:4017
 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:4045
+#: user-manual.txt:4018
 msgid "Click 'Save'"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4046
+#: user-manual.txt:4019
 msgid "The dives are now exported to the file DM4.bak (or DM5.bak)"
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:4048
+#: user-manual.txt:4021
 #, no-wrap
 msgid "Exporting from Atomic Logbook"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:4051
+#: user-manual.txt:4024
 #, no-wrap
 msgid "images/icons/atomiclogo.jpg"
 msgstr "images/icons/atomiclogo.jpg"
 
 #. type: Plain text
-#: user-manual.txt:4058
+#: user-manual.txt:4031
 msgid ""
 "Atomic Logbook is a Windows software by Atomic Aquatics. It allows "
 "downloading of dive information from Cobalt and Cobalt 2 dive computers.  "
@@ -8598,130 +8690,139 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:4060
+#: user-manual.txt:4033
 #, no-wrap
 msgid "Exporting from Mares Dive Organiser V2.1"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:4063
+#: user-manual.txt:4036
 #, no-wrap
 msgid "images/icons/mareslogo.jpg"
 msgstr "images/icons/mareslogo.jpg"
 
 #. type: Plain text
-#: user-manual.txt:4071
+#: user-manual.txt:4044
 msgid ""
-"Mares Dive Organiser is a Windows application. The dive log is kept as a "
+"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 "
-"database includes all Dive Organiser-registered divers on the particular "
-"computer and all Mares dive computers used. The safest way to obtain a copy "
-"of the dive database is to export the information to another compatible "
-"format which can be imported into _Subsurface_."
+"database includes all Dive Organizer-registered divers on the particular "
+"computer and all Mares dive computers used. The safest way to get a copy of "
+"the dive database is to export the information to another compatible format "
+"which can then be imported into _Subsurface_."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4076
+#: user-manual.txt:4049
 msgid ""
-"Within Dive Organiser, select _Database -> Backup_ from the main menu and "
+"Within Dive Organizer, select _Database -> Backup_ from the main menu and "
 "back up the database to the desk top.  This creates a zipped file "
-"DiveOrganiserxxxxx.dbf."
+"DiveOrganizerxxxxx.dbf."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4079
+#: user-manual.txt:4052
 msgid ""
-"Rename the file to DiveOrganiserxxxxx.zip. Inside the zipped directory is a "
-"file _DiveOrganiser.sdf_."
+"Rename the file to DiveOrganizerxxxxx.zip. Inside the zipped directory is a "
+"file _DiveOrganizer.sdf_."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4080
+#: user-manual.txt:4053
 msgid "Extract the _.sdf_ file from the zipped folder to your Desktop."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4081
+#: user-manual.txt:4054
 msgid "The password for accessing the .zip file is _mares_."
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:4083
+#: user-manual.txt:4056
 #, no-wrap
 msgid "Exporting from *DivingLog 5.0 and 6.0*"
 msgstr ""
 
 #. type: Named 'icon' AttributeList argument for style 'icon'
-#: user-manual.txt:4085
+#: user-manual.txt:4058
 #, no-wrap
 msgid "images/icons/divingloglogo.jpg"
 msgstr "images/icons/divingloglogo.jpg"
 
 #. type: Plain text
-#: user-manual.txt:4092
+#: user-manual.txt:4065
 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 "
-"the details, and we would lack e.g. gas switches and information of what "
-"units are used. With database import, all this information is included and "
-"readily available for us."
+"the details, and would lack, for example, gas switches and information of "
+"what units are used. With database import, all this information is included "
+"and readily available."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4094
-msgid "To transfer all files from DivingLog to Subsurface, do the following:"
+#: user-manual.txt:4067
+msgid "To transfer all files from DivingLog to Subsurface:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4096
+#: user-manual.txt:4069
 msgid "In DivingLog open the 'File -> Export -> SQLite' menu"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4097
+#: user-manual.txt:4070
 msgid "Select 'Settings' button"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4098
+#: user-manual.txt:4071
 msgid "Set the 'RTF2Plaintext' to 'true'"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4099
+#: user-manual.txt:4072
 msgid "Close the Settings dialog"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4100
+#: user-manual.txt:4073
 msgid "Click 'Export' button and select the filename"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4104
+#: user-manual.txt:4077
 msgid ""
 "Once this is done, open the saved database file with Subsurface and the "
-"dives are automatically converted to our own format. Last step to do is save "
-"the log file in Subsurface."
+"dives are automatically converted to Subsurface’s own format. Last step to "
+"do is save the log file in Subsurface."
 msgstr ""
 
 #. type: Title ==
-#: user-manual.txt:4105
+#: user-manual.txt:4078
 #, 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:4115
+#: 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."
 msgid ""
-"Many divers keep a diving log in some form of a digital file, commonly a "
+"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 from "
-"_Subsurface_.  Creating a .CSV is a straightforward task, although the "
-"procedure is somewhat different according to which spreadsheet program is "
-"used."
+"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."
 msgstr ""
 "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 "
@@ -8733,14 +8834,21 @@ msgstr ""
 "selon le tableur utilisé."
 
 #. type: Plain text
-#: user-manual.txt:4121
-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: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:"
+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 "
+"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:"
 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 "
@@ -8751,47 +8859,46 @@ msgstr ""
 "règles simples :"
 
 #. type: Plain text
-#: user-manual.txt:4123
+#: user-manual.txt:4096
 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:4124
+#: user-manual.txt:4097
 msgid "Duration: the format should be minutes:seconds."
 msgstr "Durée : le format est minutes:secondes."
 
 #. type: Plain text
-#: user-manual.txt:4125
+#: user-manual.txt:4098
 msgid ""
-"Unit system: only one unit system should be used (i.e., no mixture between "
-"imperial and metric units)"
+"Unit system: only one unit system should be used (no mix of imperial and "
+"metric units)"
 msgstr ""
 "Système d'unité : un seul système d'unité doit être utilisé (pas de mélange "
 "entre les unités impériales et métriques)"
 
 #. type: Plain text
-#: user-manual.txt:4126
+#: user-manual.txt:4099
 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:4127
-msgid "GPS position: users must use decimal degrees, e.g. 30.22496 30.821798"
+#: user-manual.txt:4100
+msgid "GPS position: use decimal degrees, e.g. 30.22496 30.821798"
 msgstr ""
-"Position GPS : vous devez utiliser les degrés décimaux, par exemple : "
-"30.22496 30.821798"
+"Position GPS : utilisez les degrés décimaux, par exemple : 30.22496 30.821798"
 
 #. type: Title ===
-#: user-manual.txt:4128
+#: user-manual.txt:4100
 #, no-wrap
 msgid "_LibreOffice Calc_ and _OpenOffice Calc_"
 msgstr "_LibreOffice Calc_ et _OpenOffice Calc_"
 
 #. type: Plain text
-#: user-manual.txt:4132
+#: user-manual.txt:4104
 msgid ""
 "These are open source spreadsheet applications forming parts of larger open "
 "source office suite applications. The user interaction with _LibreOffice_ "
@@ -8802,13 +8909,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:4133
+#: user-manual.txt:4105
 #, no-wrap
 msgid "images/LOffice_spreadsheetdata.jpg"
 msgstr "images/LOffice_spreadsheetdata.jpg"
 
 #. type: Plain text
-#: user-manual.txt:4136
+#: user-manual.txt:4108
 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 "
@@ -8816,13 +8923,13 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:4137
+#: user-manual.txt:4109
 #, no-wrap
 msgid "images/LOffice_save_as_options.jpg"
 msgstr "images/LOffice_save_as_options.jpg"
 
 #. type: Plain text
-#: user-manual.txt:4140
+#: user-manual.txt:4112
 msgid ""
 "After selecting _Save_, select the appropriate field delimiter (choose _Tab_ "
 "to prevent conflicts with the comma when using this as a decimal point), "
@@ -8830,50 +8937,50 @@ msgid ""
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:4141
+#: user-manual.txt:4113
 #, no-wrap
 msgid "images/LOffice_field_options.jpg"
 msgstr "images/LOffice_field_options.jpg"
 
 #. type: Plain text
-#: user-manual.txt:4144
+#: user-manual.txt:4116
 msgid ""
-"One can double check the .CSV file by opening it with a text editor, and "
-"then import the dive data as explained on the section xref:"
-"S_ImportingCSVDives[Importing CSV dives]."
+"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 "
+"CSV dives]."
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:4145
+#: user-manual.txt:4117
 #, no-wrap
 msgid "Microsoft _Excel_"
 msgstr "Microsoft _Excel_"
 
 #. type: Plain text
-#: user-manual.txt:4151
+#: user-manual.txt:4123
 msgid ""
 "The field delimiter (called \"_list separator_\" in Microsoft manuals) is "
 "not accessible from within _Excel_ and needs to be set through the "
 "_Microsoft Control Panel_. After changing the separator character, all "
-"software on the Windows machine use the new character as a separator.  One "
+"software on the Windows machine uses the new character as a separator.  You "
 "can change the character back to the default character by following the same "
 "procedure, outlined below."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4153
+#: user-manual.txt:4125
 msgid ""
-"In Microsoft Windows, click the *Start* button, and then select _Control "
-"Panel_ from the list on the right-hand side."
+"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:4154
+#: user-manual.txt:4126
 msgid "Open the _Regional and Language Options_ dialog box."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4157
+#: user-manual.txt:4129
 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 "
@@ -8881,190 +8988,190 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4158
+#: user-manual.txt:4130
 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:4159
+#: user-manual.txt:4131
 msgid "Click _OK_ twice."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4161
+#: user-manual.txt:4133
 msgid "Below is an image of the _Control Panel_:"
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:4162
+#: user-manual.txt:4134
 #, no-wrap
 msgid "images/Win_SaveCSV2.jpg"
 msgstr "images/Win_SaveCSV2.jpg"
 
 #. type: Plain text
-#: user-manual.txt:4165
+#: user-manual.txt:4137
 msgid "To export the dive log in CSV format:"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4167
+#: user-manual.txt:4139
 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:4168
+#: user-manual.txt:4140
 #, no-wrap
 msgid "images/Win_SaveCSV1.jpg"
 msgstr "images/Win_SaveCSV1.jpg"
 
 #. type: Plain text
-#: user-manual.txt:4171
+#: user-manual.txt:4146
 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 "
 "alternative format. From the dropdown list at the bottom of the dialogue, "
-"marked _Save as Type:_, select _CSV(Comma delimited) (*.CSV)_. Ensure that "
-"the appropriate folder has been selected to save the CSV file into."
+"marked _Save as Type:_, select _CSV(Comma delimited) (*.CSV)_. Be sure the "
+"appropriate folder has been selected to save the CSV file into."
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:4172
+#: user-manual.txt:4147
 #, no-wrap
 msgid "images/Win_SaveCSV3.jpg"
 msgstr "images/Win_SaveCSV3.jpg"
 
 #. type: Plain text
-#: user-manual.txt:4175
+#: user-manual.txt:4153
 msgid ""
 "Select the _Save_ button. The CSV-formatted file is saved into the folder "
-"that was selected. One can double check the .CSV file by opening it with a "
-"text editor, and then import the dive data as explained on the section xref:"
+"that was selected. You can double check the .CSV file by opening it with a "
+"text editor, then import the dive data as explained on the section xref:"
 "S_ImportingCSVDives[Importing CSV dives]."
 msgstr ""
 
 #. type: Title ==
-#: user-manual.txt:4177
+#: user-manual.txt:4154
 #, 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:4182
+#: user-manual.txt:4159
 msgid ""
-"_Subsurface_ provides a mechanism to create or modify templates for printing "
-"dive logs in order to produce customised printouts of dive logs. Templates, "
-"written in HTML as well as a simple Grantlee instruction set, are rendered "
-"to the print device by _Subsurface_."
+"_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 "
+"as a simple Grantlee instruction set, are rendered to the print device by "
+"_Subsurface_."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4184
+#: user-manual.txt:4161
 msgid "Templates are accessed using the print dialogue (see image *B* below)."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4192
+#: user-manual.txt:4169
 msgid ""
-"The buttons under the _Template_ dropdown box allows one to _Edit_, "
-"_Delete_, _Import_ and to _Export_ templates (see image *A* above). New or "
-"modified templates are stored as HTML files in the same directory as the "
-"dive log being processed. In order to create or modify a template, select "
-"one of the templates from the template dropdown list in the print dialogue "
-"(see image *B* above). Choose an existing template that resembles the final "
-"desired printout. Then select _Edit_."
+"The buttons under the _Template_ dropdown box lets you _Edit_, _Delete_, "
+"_Import_ and _Export_ templates (see image *A* above). New or modified "
+"templates are stored as HTML files in the same directory as the dive log "
+"being processed. In order to create or modify a template, select one of the "
+"templates from the template dropdown list in the print dialogue (see image "
+"*B* above). Choose an existing template that resembles the final desired "
+"printout. Then select _Edit_."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4194
-msgid "The Edit Panel comprises three tabs:"
+#: user-manual.txt:4171
+msgid "The Edit Panel has three tabs:"
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:4195
+#: user-manual.txt:4172
 #, no-wrap
 msgid "images/Template1_f22.jpg"
 msgstr "images/Template1_f22.jpg"
 
 #. type: Plain text
-#: user-manual.txt:4199
+#: user-manual.txt:4176
 msgid ""
-"The _Style_ tab (image *A* above) controls the font, line spacing and colour "
+"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. "
-"Choose one of the four colour palets used for colour printing."
+"Choose one of the four color palettes used for color printing."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4203
+#: user-manual.txt:4180
 msgid ""
-"The _Colors_ tab (image *B* above) allows editing the colours used for "
-"printing the dive log. The colours are highly customisable: the _Edit_ "
-"buttons in the _Colors_ tab allows choosing abritrary colours for different "
+"The _Colors_ tab (image *B* above) allows editing the colors used for "
+"printing the dive log. The colors are highly customizable: the _Edit_ "
+"buttons in the _Colors_ tab allows choosing arbitrary colors for different "
 "components of the dive log printout."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4212
+#: user-manual.txt:4189
 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. "
-"Grantlee provides the ability to create and format HTML code in a highly "
-"simple but efficient way (see below). The HTML of the template can be edited "
-"and saved. The saved template is stored in the same directory as the dive "
-"being processed. By default, a _Custom_ template is a skeleton with no "
-"specific print instructions. The informastion being printed needs to be "
-"specified and formatted in the by replacing the section marked with: \"<!-- "
-"Template must be filled -->\". Writing HTML code with Grantlee instructions "
-"allows unlimited freedom in determining what is printed an in which way it "
-"should be rendered."
+"Grantlee can create and format HTML code in a highly simple but efficient "
+"way (see below). The HTML of the template can be edited and saved. The saved "
+"template is stored in the same directory as the dive being processed. By "
+"default, a _Custom_ template is a skeleton with no specific print "
+"instructions. The information printed needs to be specified and formatted in "
+"the template by replacing the section marked with: \"<!-- Template must be "
+"filled -->\". Writing HTML code with Grantlee instructions allows unlimited "
+"freedom in determining what is printed and in which way it should be "
+"rendered."
 msgstr ""
 
 #. type: Target for macro image
-#: user-manual.txt:4213
+#: user-manual.txt:4190
 #, no-wrap
 msgid "images/Template2_f22.jpg"
 msgstr "images/Template2_f22.jpg"
 
 #. type: Plain text
-#: user-manual.txt:4217
+#: user-manual.txt:4195
 msgid ""
-"One can adapt any of the existing templates and save it to the dive log "
+"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 "
 "modified in this way. After completing the edits, use the _Export_ button in "
 "the print dialogue to save the new template using a new template name."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4219
+#: user-manual.txt:4197
 msgid ""
-"To write a custom template the following elements must exist so that the "
+"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:4220
+#: user-manual.txt:4198
 #, no-wrap
 msgid "Main dive loop"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4222
+#: user-manual.txt:4200
 msgid ""
-"_Subsurface_ exports a dive list called (*dives*) to the _Grantlee_ backend. "
-"It is possible to iterate over the list as follows:"
+"_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:4223 user-manual.txt:4277 user-manual.txt:4294
+#: user-manual.txt:4200 user-manual.txt:4265 user-manual.txt:4282
 #, no-wrap
 msgid "template.html"
 msgstr ""
 
 #. type: delimited block .
-#: user-manual.txt:4228
+#: user-manual.txt:4205
 #, no-wrap
 msgid ""
 "\t{% for dive in dives %}\n"
@@ -9073,13 +9180,13 @@ msgid ""
 msgstr ""
 
 #. type: Block title
-#: user-manual.txt:4230 user-manual.txt:4282 user-manual.txt:4301
+#: user-manual.txt:4207 user-manual.txt:4270 user-manual.txt:4289
 #, no-wrap
 msgid "output.html"
 msgstr ""
 
 #. type: delimited block .
-#: user-manual.txt:4235
+#: user-manual.txt:4212
 #, no-wrap
 msgid ""
 "\t<h1> 1 </h1>\n"
@@ -9088,48 +9195,59 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4238
+#: user-manual.txt:4215
 msgid ""
-"Additional information about _Grantlee_ can be found http://www.grantlee.org/"
-"apidox/for_themers.html[here]"
+"Additional information about _Grantlee_ can be found at http://www.grantlee."
+"org/apidox/for_themers.html[here]"
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:4239
+#: user-manual.txt:4216
 #, no-wrap
 msgid "Grantlee exported variables"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4241
+#: user-manual.txt:4218
 msgid "Only a subset of the dive data is exported:"
 msgstr ""
 
 #. type: delimited block |
-#: user-manual.txt:4259
+#: user-manual.txt:4247
 #, no-wrap
 msgid ""
 "|*Name*|*Description*\n"
 "|number| (*int*) dive number\n"
 "|id| (*int*) unique dive ID, should be used to fetch the dive profile\n"
-"|date| (*string*) data of the dive\n"
+"|date| (*string*) date of the dive\n"
 "|time| (*string*) time of the dive\n"
 "|location| (*string*) location of the dive\n"
 "|duration| (*string*) duration of the dive\n"
 "|depth| (*string*) depth of the dive\n"
-"|divemaster| (*string*) divemaster data\n"
-"|buddy| (*string*) buddy data\n"
-"|airTemp| (*string*) air temperature of dive\n"
-"|waterTemp| (*string*) water temperature of dive\n"
+"|divemaster| (*string*) dive master for the dive\n"
+"|buddy| (*string*) buddy for the dive\n"
+"|airTemp| (*string*) air temperature of the dive\n"
+"|waterTemp| (*string*) water temperature of the dive\n"
 "|notes| (*string*) dive notes\n"
-"|rating| (*int*) dive rating ranges from 0 to 5\n"
-"|sac| (*string*) sac value\n"
-"|tags| (*string*) all dive tags concatenate together\n"
-"|gas| (*string*) used gas cylinder\n"
-msgstr ""
-
-#. type: Plain text
-#: user-manual.txt:4263
+"|rating| (*int*) dive rating which ranges from 0 to 5\n"
+"|sac| (*string*) SAC value for the dive\n"
+"|tags| (*string*) list of dive tags for the dive\n"
+"|gas| (*string*) list of gases used in the dive\n"
+"|suit| (*string*) the suit used for the dive\n"
+"|cylinders| (*string*) complete information of all used cylinders\n"
+"|cylinder0-7| (*string*) information about a specific cylinder\n"
+"|weights| (*string*) complete information of all used weight systems\n"
+"|weight0-5| (*string*) information about a specific weight system\n"
+"|maxcns| (*string*) maxCNS value for the dive\n"
+"|otu| (*string*) OTU value for the dive\n"
+"|sumWeight| (*string*) the summed weight of all used weight systems\n"
+"|startPressure| (*string*) the start pressure\n"
+"|endPressure| (*string*) the end pressure\n"
+"|firstGas| (*string*) first used gas\n"
+msgstr ""
+
+#. type: Plain text
+#: user-manual.txt:4251
 msgid ""
 "_Subsurface_ also exports *template_options* data. This data must be used as "
 "_CSS_ values to provide a dynamically editable template. The exported data "
@@ -9137,7 +9255,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block |
-#: user-manual.txt:4275
+#: user-manual.txt:4263
 #, no-wrap
 msgid ""
 "|*Name*|*Description*\n"
@@ -9154,26 +9272,26 @@ msgid ""
 msgstr ""
 
 #. type: delimited block .
-#: user-manual.txt:4280
+#: user-manual.txt:4268
 #, no-wrap
 msgid "\tborder-width: {{ template_options.borderwidth }}px;\n"
 msgstr ""
 
 #. type: delimited block .
-#: user-manual.txt:4285
+#: user-manual.txt:4273
 #, no-wrap
 msgid "\tborder-width: 3px;\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4288
+#: user-manual.txt:4276
 msgid ""
 "Another variable that _Subsurface_ exports is *print_options*. This variable "
 "contains a single member:"
 msgstr ""
 
 #. type: delimited block |
-#: user-manual.txt:4291
+#: user-manual.txt:4279
 #, no-wrap
 msgid ""
 "|*Name*|*Description*\n"
@@ -9181,7 +9299,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block .
-#: user-manual.txt:4299
+#: user-manual.txt:4287
 #, no-wrap
 msgid ""
 "\tbody {\n"
@@ -9190,7 +9308,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block .
-#: user-manual.txt:4306
+#: user-manual.txt:4294
 #, no-wrap
 msgid ""
 "\tbody {\n"
@@ -9199,101 +9317,101 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:4308
+#: user-manual.txt:4296
 #, no-wrap
 msgid "Defined CSS selectors"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4312
+#: user-manual.txt:4299
 msgid ""
-"As the dive profile is placed after rendering, _Subsurface_ uses a special "
-"_CSS_ selectors to do some searches in the HTML output. The _CSS_ selectors "
-"in the following table should be added."
+"As the dive profile is placed after rendering, _Subsurface_ uses special "
+"_CSS_ selectors to searche in the HTML output. The _CSS_ selectors in the "
+"following table should be added."
 msgstr ""
 
 #. type: delimited block |
-#: user-manual.txt:4319
+#: user-manual.txt:4306
 #, no-wrap
 msgid ""
 "|*Selector*|*Type*|*Description*\n"
 "|dive_{{ dive.id }} | id | is used to fetch the relevant dive profile\n"
-"|diveProfile | class | each div that will contain a dive profile should have this class selector in addition to the dive_{{ dive.id }} id selector\n"
-"|dontbreak | class | prevents the div with this class to be divided into two pages, this can be used\n"
+"|diveProfile | class | each dive that will contain a dive profile should have this class selector in addition to the dive_{{ dive.id }} id selector\n"
+"|dontbreak | class | prevents the dive with this class from being divided into two pages. This can be used\n"
 "in flow layout templates only (when data-numberofdives = 0)\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4322
+#: user-manual.txt:4309
 msgid ""
 "Rendering dive profiles is not supported for flow layout templates (when "
 "data-numberofdives = 0)."
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:4323
+#: user-manual.txt:4310
 #, no-wrap
 msgid "Special attributes"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4327
+#: user-manual.txt:4314
 msgid ""
 "There are two ways of rendering- either rendering a specific number of dives "
-"in each page or make _Subsurface_ try to fit as much dives as possible into "
+"in each page or make _Subsurface_ try to fit as many dives as possible into "
 "one page (_flow_ rendering)."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4329
+#: user-manual.txt:4316
 msgid ""
 "The *data-numberofdives* data attribute is added to the body tag to set the "
-"rendering mode"
+"rendering mode."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4331
+#: user-manual.txt:4318
 msgid "render 6 dives per page:"
 msgstr ""
 
 #. type: delimited block .
-#: user-manual.txt:4334
+#: user-manual.txt:4321
 #, no-wrap
 msgid "\t<body data-numberofdives = 6>\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4337
+#: user-manual.txt:4324
 msgid "render as much dives as possible:"
 msgstr ""
 
 #. type: delimited block .
-#: user-manual.txt:4340
+#: user-manual.txt:4327
 #, no-wrap
 msgid "\t<body data-numberofdives = 0>\n"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4343
+#: user-manual.txt:4330
 msgid ""
 "All CSS units should be in relative lengths only, to support printing on any "
 "page size."
 msgstr ""
 
 #. type: Title ==
-#: user-manual.txt:4344
+#: user-manual.txt:4331
 #, no-wrap
 msgid "APPENDIX F: FAQs."
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:4346
+#: user-manual.txt:4333
 #, no-wrap
 msgid "Subsurface appears to miscalculate gas consumption and SAC"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4350
+#: user-manual.txt:4337
 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_ "
@@ -9301,17 +9419,17 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4356
+#: user-manual.txt:4343
 msgid ""
 "'Answer': Not really. What happens is that _Subsurface_ actually calculates "
 "gas consumption differently - and better - than you expect.  In particular, "
-"it takes the incompressibility of the gas into account.  Traditionally, Gas "
+"it takes the incompressibility of the gas into account.  Traditionally, gas "
 "consumption and SAC should be: +consumption = tank size x (start pressure - "
 "end pressure)+"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4362
+#: user-manual.txt:4349
 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 "
@@ -9321,12 +9439,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4364
+#: user-manual.txt:4351
 msgid "+consumption = (amount_of_air_at_beginning - amount_of_air_at_end)+"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4370
+#: user-manual.txt:4357
 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 "
@@ -9337,12 +9455,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4372
+#: user-manual.txt:4359
 msgid "+12.2*((220-100)/1.013)+"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4377
+#: user-manual.txt:4364
 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 "
@@ -9352,7 +9470,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4383
+#: user-manual.txt:4370
 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 "
@@ -9363,13 +9481,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:4384
+#: user-manual.txt:4371
 #, no-wrap
 msgid "Some dive profiles have time discrepancies with the recorded samples from my dive computer..."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4388
+#: user-manual.txt:4375
 msgid ""
 "_Subsurface_ ends up ignoring surface time for many things (average depth, "
 "divetime, SAC, etc).  'Question': Why do dive durations in my dive computer "
@@ -9377,7 +9495,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4396
+#: user-manual.txt:4383
 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 "
@@ -9391,42 +9509,54 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: user-manual.txt:4397
+#: user-manual.txt:4384
 #, no-wrap
 msgid "Some dive profiles are missing from the download"
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4403
+#: user-manual.txt:4398
 msgid ""
-"'Question': I cannot download all my dives, only the most recent ones even "
+"'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 "
-"dives."
-msgstr ""
-
-#. type: Plain text
-#: user-manual.txt:4412
-msgid ""
-"'Answer': Dive history is different than the dive profiles on the log.  The "
-"history only keeps track of the total number of dives and total amount of "
-"time spent below surface. The logs, on the other hand, store the dive "
-"profile, but they have limited amount of memory to do so. The exact amount "
-"of dive profiles that can be stored on the device depend on sample interval "
-"and duration of the dives. Once the memory is full the oldest dives get "
-"overwritten with new dives. Thus we are only able to download the last 13, "
-"30 or 199 dives."
+"dives? 'Answer': Dive history is different than the dive profiles on the "
+"log.  The history only keeps track of the total number of dives and total "
+"amount of time spent below surface. The logs, on the other hand, store the "
+"dive profile, but they have a limited amount of memory to do so. The exact "
+"amount of dive profiles that can be stored on the device depends on sample "
+"interval and duration of the dives. Once the memory is full the oldest dives "
+"get overwritten with new dives. Thus we are only able to download the last "
+"13, 30 or 199 dives."
 msgstr ""
 
 #. type: Plain text
-#: user-manual.txt:4416
+#: user-manual.txt:4402
 msgid ""
 "If you have downloaded your dives to different dive logging software before "
-"they were overwritten, there is a high chance that Subsurface can import "
+"they were overwritten, there is a good chance that Subsurface can import "
 "these. However, if the logs are only on your dive computer, they cannot be "
-"salvaged after being over written by new dives."
+"salvaged after being overwritten by new dives."
 msgstr ""
 
 #~ 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 "
+#~ "browser?"
+#~ msgstr ""
+#~ "Avez-vous besoin d'un moyen d'enregistrer ou de sauvegarder votre carnet "
+#~ "de plongée sur Internet, Vous permettant de visualiser votre carnet "
+#~ "depuis n'importe où, en utilisant un navigateur Internet ?"
+
+#~ msgid ""
+#~ "If one has dives recorded using a dive computer, the depth profile of the"
+#~ msgstr ""
+#~ "Si les plongées ont été enregistrées en utilisant un ordinateur de "
+#~ "plongée, le profil de profondeur de la"
+
+#~ msgid "previous dive computer."
+#~ msgstr "ordinateur de plongée précédent."
+
+#~ msgid ""
 #~ "When opened from within _Subsurface_, this manual does not have external "
 #~ "controls. However, a _SEARCH_ function is important. This is activated by "
 #~ "pressing control-F or command-F on the keyboard. A text box appears at "
diff --git a/Documentation/make_POT.sh b/Documentation/make_POT.sh
index afe9cf895..bbf465790 100755
--- a/Documentation/make_POT.sh
+++ b/Documentation/make_POT.sh
@@ -3,20 +3,23 @@
 # Author(s): Guillaume GARDET <guillaume.gardet@free.fr>
 #
 # History:
+# 	- 2016-03-12: Generate 2 POT files: one for mobile-manual and another for user-manual
 #	- 2015-01-14:	Initial release
 #
 # Package deps:	- po4a (for po4a-gettextize)
 # 		- perl-Unicode-LineBreak
 
 # Some vars
-File_to_translate="./user-manual.txt"
+Files_to_translate="mobile-manual.txt user-manual.txt"
 POT_files_folder="./50-pot"
-POT_name="subsurface-manual.pot"
 
-#Generate a POT file from user-manual.txt file in current folder
-cmd="po4a-gettextize --msgid-bugs-address subsurface@subsurface-divelog.org \
-	--package-name subsurface-manual -o porefs=full,nowrap \
-	-f asciidoc -M UTF-8 -m $File_to_translate -p $POT_files_folder/$POT_name"
-echo "Generating POT file:"
-echo $cmd
-$cmd
+for File_to_translate in $Files_to_translate; do
+	POT_name=subsurface-$(basename $File_to_translate ".txt").pot
+	#Generate a POT file *.txt file in current folder
+	cmd="po4a-gettextize --msgid-bugs-address subsurface@subsurface-divelog.org \
+		--package-name subsurface-manual -o porefs=full,nowrap \
+		-f asciidoc -M UTF-8 -m $File_to_translate -p $POT_files_folder/$POT_name"
+	echo "Generating POT file:"
+	echo $cmd
+	$cmd
+done
\ No newline at end of file
diff --git a/Documentation/make_PO_to_ASCIIDOC.sh b/Documentation/make_PO_to_ASCIIDOC.sh
index 95fbf40ab..c619e0a4c 100755
--- a/Documentation/make_PO_to_ASCIIDOC.sh
+++ b/Documentation/make_PO_to_ASCIIDOC.sh
@@ -3,6 +3,7 @@
 # Author(s): Guillaume GARDET <guillaume.gardet@free.fr>
 #
 # History:
+# 	- 2016-03-12: Generate 2 PO files: one for mobile-manual and another for user-manual
 # 	- 2015-01-14:	Initial release
 #
 # Known bugs:
@@ -13,7 +14,7 @@
 # 		- gettext-tools (for msginit and msgmerge)
 
 # Some vars
-File_to_translate="./user-manual.txt"
+Files_to_translate="mobile-manual.txt user-manual.txt"
 POT_files_folder="./50-pot/"
 langs="fr" 	# Language list which uses POT/PO files for translation
 PO_filename_root="subsurface-manual"
@@ -35,23 +36,24 @@ for lang in $langs; do
 		git pull
 
 		for file in $(ls $POT_files_folder/*.pot); do
-			filename=$(basename ${file%.pot}).$lang.po
+			filename=$(basename $file ".pot").$lang.po
 			if [ ! -f $PO_folder/$filename ]; then
 				echo "** Initializing PO file for $lang"
 				mkdir -p $PO_folder
 				msginit -l $lang --input=$file --output-file=$PO_folder/$filename
 			fi;
 			echo "** Updating PO file for '$lang' from POT file"
-			msgmerge --previous --lang=$lang --update $PO_folder/$filename $POT_files_folder/*.pot
+			msgmerge --previous --lang=$lang --update $PO_folder/$filename $file
 		done
 	fi
 
 # Generate translated ASCIIDOC files
 	echo "* Generating ASCIIDOC files for '$lang'"
 
-	for file in $File_to_translate; do
-		Translated_file=$(basename ${File_to_translate%.txt})_$lang.txt
-		cmd="po4a-translate --keep $translation_limit -f asciidoc -M UTF-8 -m $File_to_translate -p $PO_folder/$PO_filename_root.$lang.po -l $Translated_file"
+	for file in $Files_to_translate; do
+		Translated_file=$(basename $file ".txt")_$lang.txt
+		PO_name=subsurface-$(basename $file ".txt").$lang.po
+		cmd="po4a-translate --keep $translation_limit -f asciidoc -M UTF-8 -m $file -p $PO_folder/$PO_name -l $Translated_file"
 		echo $cmd
 		$cmd
 	done
diff --git a/Documentation/mobile-manual_fr.html.git b/Documentation/mobile-manual_fr.html.git
new file mode 100644
index 000000000..77551be6d
--- /dev/null
+++ b/Documentation/mobile-manual_fr.html.git
@@ -0,0 +1,797 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
+    "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
+<meta name="generator" content="AsciiDoc 8.6.8" />
+<title></title>
+<style type="text/css">
+/*
+ * compact_subsurface.css, a special style sheet for Subsurface,
+ *  modified by Willem Ferguson and derived from:
+ *		compact.css, version 1.3 by Alex Efros <powerman@powerman.name>
+ * Licence: Public Domain
+ *
+ * Usage: asciidoc -a theme=compact_subsurface ...
+ */
+
+*   { padding: 0;  margin: 0; }
+img { border: 0; }
+
+/*** Layout ***/
+
+body                        { margin: 10px 20px; }
+#header br                  { display: none; }
+#revnumber                  { display: block; }
+#toc                        { margin: 1em 0; }
+.toclevel2                  { margin-left: 1em; }
+.toclevel3		    { margin-left: 2em; }
+#footer                     { margin-top: 2em; }
+
+#preamble .sectionbody,
+h2,
+h3,
+h4,
+h5                          { margin: 1em 0 0 0; }
+
+.admonitionblock,
+.listingblock,
+.sidebarblock,
+.exampleblock,
+.tableblock,
+.literalblock               { margin: 1em 0; }
+.admonitionblock td.icon    { padding-right: 0.5em; }
+.admonitionblock td.content { padding-left:  0.5em; }
+.listingblock .content      { padding: 0.5em; }
+.sidebarblock > .content    { padding: 0.5em; }
+.exampleblock > .content    { padding: 0 0.5em; }
+.tableblock caption         { padding: 0 0 0.5em 0; }
+.tableblock thead th,
+.tableblock tbody td,
+.tableblock tfoot td        { padding: 0 0.5em; }
+.quoteblock                 { padding: 0 2.0em; }
+
+.paragraph                  { margin: 1em 0 0 0; }
+.sidebarblock .paragraph:first-child,
+.exampleblock .paragraph:first-child,
+.admonitionblock .paragraph:first-child  { margin: 0; }
+
+   .ulist,    .olist,    .dlist,    .hdlist,    .qlist   { margin: 1em 0; }
+li .ulist, li .olist, li .dlist, li .hdlist, li .qlist,
+dd .ulist, dd .olist, dd .dlist, dd .hdlist, dd .qlist   { margin: 0; }
+ul                          { margin-left: 1.5em; }
+ol                          { margin-left: 2em; }
+dd                          { margin-left: 3em; }
+td.hdlist1                  { padding-right: 1em; }
+
+/*** Fonts ***/
+
+body                        { font-family: Verdana, sans-serif; }
+#header                     { font-family: Arial,   sans-serif; }
+#header h1                  { font-family: Arial,   sans-serif; }
+#footer                     { font-family: Georgia, serif;      }
+#email                      { font-size: 0.85em; }
+#revnumber                  { font-size: 0.75em; }
+#toc                        { font-size: 0.9em;  }
+#toctitle                   { font-weight: bold; }
+#footer                     { font-size: 0.8em; }
+
+h2, h3, h4, h5, .title      { font-family: Arial,   sans-serif; }
+h2                          { font-size: 1.5em; }
+.sectionbody                { font-size: 0.85em; }
+.sectionbody .sectionbody   { font-size: inherit; }
+h3                          { font-size: 159%; } /* 1.35em */
+h4                          { font-size: 141%; } /* 1.2em */
+h5                          { font-size: 118%; } /* 1em */
+.title                      { font-size: 106%;   /* 0.9em */
+			      font-weight: bold;
+			    }
+
+tt, .monospaced             { font-family: monospace; font-size: 106%; } /* 0.9em */
+dt, td.hdlist1, .qlist em   { font-family: Times New Roman, serif;
+			      font-size: 118%;   /* 1em */
+			      font-style: italic;
+			    }
+.tableblock tfoot td        { font-weight: bold; }
+
+/*** Colors and Backgrounds ***/
+
+h1                          { color: #527bbd; border-bottom: 2px solid silver; }
+#footer                     {                 border-top:    2px solid silver; }
+
+h2                          { color: #527bbd; border-bottom: 2px solid silver; }
+h3                          { color: #5D7EAE; border-bottom: 2px solid silver; }
+h3                          { display: inline-block; }
+h4,h5                       { color: #5D7EAE; }
+
+.admonitionblock td.content { border-left: 2px solid silver; }
+.listingblock .content      { background: #f4f4f4;   border: 1px solid silver; border-left: 5px solid #e0e0e0; }
+.sidebarblock > .content    { background: #ffffee;   border: 1px solid silver; border-left: 5px solid #e0e0e0; }
+.exampleblock > .content    {                   border-left: 2px solid silver; }
+.quoteblock                 {                   border-left: 5px solid #e0e0e0; }
+.tableblock table {
+    border-collapse: collapse;
+    border-width: 3px;
+    border-color: #527bbd;
+}
+.tableblock table[frame=hsides] { border-style: solid none; }
+.tableblock table[frame=border] { border-style: solid;      }
+.tableblock table[frame=void]   { border-style: none;       }
+.tableblock table[frame=vsides] { border-style: none solid; }
+.tableblock table[rules=all] tbody tr *,
+.tableblock table[rules=rows] tbody tr * {
+    border-top: 1px solid #527bbd;
+}
+.tableblock table[rules=all] tr *,
+.tableblock table[rules=cols] tr * {
+    border-left: 1px solid #527bbd;
+}
+.tableblock table tbody tr:first-child * {
+    border-top: 1px solid white; /* none don't work here... %-[] */
+}
+.tableblock table tr *:first-child {
+    border-left: none;
+}
+.tableblock table[frame] thead tr *,
+.tableblock table[frame] thead tr * {
+    border-top: 1px solid white;
+    border-bottom: 2px solid #527bbd;
+}
+.tableblock table tr td p.table,
+.tableblock table tr td p.table * {
+    border: 0px;
+}
+
+tt, .monospaced             { color: navy; }
+
+li                          { color: #a0a0a0; }
+li > *                      { color: black; }
+
+span.aqua { color: aqua; }
+span.black { color: black; }
+span.blue { color: blue; }
+span.fuchsia { color: fuchsia; }
+span.gray { color: gray; }
+span.green { color: green; }
+span.lime { color: lime; }
+span.maroon { color: maroon; }
+span.navy { color: navy; }
+span.olive { color: olive; }
+span.purple { color: purple; }
+span.red { color: red; }
+span.silver { color: silver; }
+span.teal { color: teal; }
+span.white { color: white; }
+span.yellow { color: yellow; }
+
+span.aqua-background { background: aqua; }
+span.black-background { background: black; }
+span.blue-background { background: blue; }
+span.fuchsia-background { background: fuchsia; }
+span.gray-background { background: gray; }
+span.green-background { background: green; }
+span.lime-background { background: lime; }
+span.maroon-background { background: maroon; }
+span.navy-background { background: navy; }
+span.olive-background { background: olive; }
+span.purple-background { background: purple; }
+span.red-background { background: red; }
+span.silver-background { background: silver; }
+span.teal-background { background: teal; }
+span.white-background { background: white; }
+span.yellow-background { background: yellow; }
+
+span.big { font-size: 2em; }
+span.small { font-size: 0.6em; }
+
+span.underline { text-decoration: underline; }
+span.overline { text-decoration: overline; }
+span.line-through { text-decoration: line-through; }
+
+/*** Misc ***/
+
+.admonitionblock td.icon    { vertical-align: top; }
+.attribution                { text-align: right; }
+
+ul                          { list-style-type: disc; }
+ol.arabic                   { list-style-type: decimal; }
+ol.loweralpha               { list-style-type: lower-alpha; }
+ol.upperalpha               { list-style-type: upper-alpha; }
+ol.lowerroman               { list-style-type: lower-roman; }
+ol.upperroman               { list-style-type: upper-roman; }
+.hdlist td                  { vertical-align: top; }
+
+
+</style>
+<script type="text/javascript">
+/*<![CDATA[*/
+var asciidoc = {  // Namespace.
+
+/////////////////////////////////////////////////////////////////////
+// Table Of Contents generator
+/////////////////////////////////////////////////////////////////////
+
+/* Author: Mihai Bazon, September 2002
+ * http://students.infoiasi.ro/~mishoo
+ *
+ * Table Of Content generator
+ * Version: 0.4
+ *
+ * Feel free to use this script under the terms of the GNU General Public
+ * License, as long as you do not remove or alter this notice.
+ */
+
+ /* modified by Troy D. Hanson, September 2006. License: GPL */
+ /* modified by Stuart Rackham, 2006, 2009. License: GPL */
+
+// toclevels = 1..4.
+toc: function (toclevels) {
+
+  function getText(el) {
+    var text = "";
+    for (var i = el.firstChild; i != null; i = i.nextSibling) {
+      if (i.nodeType == 3 /* Node.TEXT_NODE */) // IE doesn't speak constants.
+        text += i.data;
+      else if (i.firstChild != null)
+        text += getText(i);
+    }
+    return text;
+  }
+
+  function TocEntry(el, text, toclevel) {
+    this.element = el;
+    this.text = text;
+    this.toclevel = toclevel;
+  }
+
+  function tocEntries(el, toclevels) {
+    var result = new Array;
+    var re = new RegExp('[hH]([1-'+(toclevels+1)+'])');
+    // Function that scans the DOM tree for header elements (the DOM2
+    // nodeIterator API would be a better technique but not supported by all
+    // browsers).
+    var iterate = function (el) {
+      for (var i = el.firstChild; i != null; i = i.nextSibling) {
+        if (i.nodeType == 1 /* Node.ELEMENT_NODE */) {
+          var mo = re.exec(i.tagName);
+          if (mo && (i.getAttribute("class") || i.getAttribute("className")) != "float") {
+            result[result.length] = new TocEntry(i, getText(i), mo[1]-1);
+          }
+          iterate(i);
+        }
+      }
+    }
+    iterate(el);
+    return result;
+  }
+
+  var toc = document.getElementById("toc");
+  if (!toc) {
+    return;
+  }
+
+  // Delete existing TOC entries in case we're reloading the TOC.
+  var tocEntriesToRemove = [];
+  var i;
+  for (i = 0; i < toc.childNodes.length; i++) {
+    var entry = toc.childNodes[i];
+    if (entry.nodeName.toLowerCase() == 'div'
+     && entry.getAttribute("class")
+     && entry.getAttribute("class").match(/^toclevel/))
+      tocEntriesToRemove.push(entry);
+  }
+  for (i = 0; i < tocEntriesToRemove.length; i++) {
+    toc.removeChild(tocEntriesToRemove[i]);
+  }
+
+  // Rebuild TOC entries.
+  var entries = tocEntries(document.getElementById("content"), toclevels);
+  for (var i = 0; i < entries.length; ++i) {
+    var entry = entries[i];
+    if (entry.element.id == "")
+      entry.element.id = "_toc_" + i;
+    var a = document.createElement("a");
+    a.href = "#" + entry.element.id;
+    a.appendChild(document.createTextNode(entry.text));
+    var div = document.createElement("div");
+    div.appendChild(a);
+    div.className = "toclevel" + entry.toclevel;
+    toc.appendChild(div);
+  }
+  if (entries.length == 0)
+    toc.parentNode.removeChild(toc);
+},
+
+
+/////////////////////////////////////////////////////////////////////
+// Footnotes generator
+/////////////////////////////////////////////////////////////////////
+
+/* Based on footnote generation code from:
+ * http://www.brandspankingnew.net/archive/2005/07/format_footnote.html
+ */
+
+footnotes: function () {
+  // Delete existing footnote entries in case we're reloading the footnodes.
+  var i;
+  var noteholder = document.getElementById("footnotes");
+  if (!noteholder) {
+    return;
+  }
+  var entriesToRemove = [];
+  for (i = 0; i < noteholder.childNodes.length; i++) {
+    var entry = noteholder.childNodes[i];
+    if (entry.nodeName.toLowerCase() == 'div' && entry.getAttribute("class") == "footnote")
+      entriesToRemove.push(entry);
+  }
+  for (i = 0; i < entriesToRemove.length; i++) {
+    noteholder.removeChild(entriesToRemove[i]);
+  }
+
+  // Rebuild footnote entries.
+  var cont = document.getElementById("content");
+  var spans = cont.getElementsByTagName("span");
+  var refs = {};
+  var n = 0;
+  for (i=0; i<spans.length; i++) {
+    if (spans[i].className == "footnote") {
+      n++;
+      var note = spans[i].getAttribute("data-note");
+      if (!note) {
+        // Use [\s\S] in place of . so multi-line matches work.
+        // Because JavaScript has no s (dotall) regex flag.
+        note = spans[i].innerHTML.match(/\s*\[([\s\S]*)]\s*/)[1];
+        spans[i].innerHTML =
+          "[<a id='_footnoteref_" + n + "' href='#_footnote_" + n +
+          "' title='View footnote' class='footnote'>" + n + "</a>]";
+        spans[i].setAttribute("data-note", note);
+      }
+      noteholder.innerHTML +=
+        "<div class='footnote' id='_footnote_" + n + "'>" +
+        "<a href='#_footnoteref_" + n + "' title='Return to text'>" +
+        n + "</a>. " + note + "</div>";
+      var id =spans[i].getAttribute("id");
+      if (id != null) refs["#"+id] = n;
+    }
+  }
+  if (n == 0)
+    noteholder.parentNode.removeChild(noteholder);
+  else {
+    // Process footnoterefs.
+    for (i=0; i<spans.length; i++) {
+      if (spans[i].className == "footnoteref") {
+        var href = spans[i].getElementsByTagName("a")[0].getAttribute("href");
+        href = href.match(/#.*/)[0];  // Because IE return full URL.
+        n = refs[href];
+        spans[i].innerHTML =
+          "[<a href='#_footnote_" + n +
+          "' title='View footnote' class='footnote'>" + n + "</a>]";
+      }
+    }
+  }
+},
+
+install: function(toclevels) {
+  var timerId;
+
+  function reinstall() {
+    asciidoc.footnotes();
+    if (toclevels) {
+      asciidoc.toc(toclevels);
+    }
+  }
+
+  function reinstallAndRemoveTimer() {
+    clearInterval(timerId);
+    reinstall();
+  }
+
+  timerId = setInterval(reinstall, 500);
+  if (document.addEventListener)
+    document.addEventListener("DOMContentLoaded", reinstallAndRemoveTimer, false);
+  else
+    window.onload = reinstallAndRemoveTimer;
+}
+
+}
+asciidoc.install(3);
+/*]]>*/
+</script>
+</head>
+<body class="article">
+<div id="header">
+</div>
+<div id="content">
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="mobile-images/banner.jpg" alt="Banner" />
+</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 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>
+</div>
+<div class="paragraph"><p><span class="blue"><em>Version 1.0, Mars 2016</em></span></p></div>
+<div class="paragraph"><p>Welcome as a user of <em>Subsurface</em>, advanced dive logging software with
+extensive infrastructure to describe, organize, interpret and print scuba
+and free dives. <em>Subsurface</em> offers many advantages over other similar
+software solutions, including compatibility with Windows, Mac-OS/X, Linux
+(many distributions) and Android (iOS under development). In addition,
+<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>
+<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>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>
+<div class="paragraph"><p><em>Subsurface-mobile</em> allows one to:</p></div>
+<div class="ulist"><ul>
+<li>
+<p>
+Download existing dive log information from the Internet.
+</p>
+</li>
+<li>
+<p>
+View this information on an Android device.
+</p>
+</li>
+<li>
+<p>
+Edit many of the dive log data fields, e.g. divemaster, buddy, equipment or
+  notes about a dive.
+</p>
+</li>
+<li>
+<p>
+Create and add new dive records to one&#8217;s dive log.
+</p>
+</li>
+<li>
+<p>
+Store the updated dive log on the Internet.
+</p>
+</li>
+<li>
+<p>
+Record, store and apply GPS positions of dives.
+</p>
+</li>
+<li>
+<p>
+View the localities of recorded GPS positions and of dives on a map.
+</p>
+</li>
+</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
+devices, but this is not yet ready for testing.</p></div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_installing_em_subsurface_mobile_em_on_an_android_device">2. Installing <em>Subsurface-mobile</em> on an Android device</h2>
+<div class="sectionbody">
+<div class="paragraph"><p>Find <em>Subsurface-mobile</em> in the <em>Google Play Store</em>. Search for
+<em>Subsurface-mobile</em> and install it.</p></div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_using_em_subsurface_mobile_em_for_the_first_time">3. Using <em>Subsurface-mobile</em> for the first time</h2>
+<div class="sectionbody">
+<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>
+</div>
+<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   &#8594;  Preferences  &#8594; 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">
+<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
+copy. If not, the local copy and the copy on the server are synchronised.</p></div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_a_few_remarks_about_the_user_interface">5. 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
+saving changes.</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="mobile-images/actionbutton.jpg" alt="FIGURE: Action Button" />
+</div>
+</div>
+<div class="paragraph"><p>Instead of the more traditional "hamburger" menu button in the top left or
+right corner of the screen to open menus, <em>Subsurface-mobile</em> uses a
+different user interaction philosophy based on the Kirigami framework
+developed by the Plasma developers. To open the main menu one has three
+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)
+</p>
+</li>
+<li>
+<p>
+Swipe towards the right across the left edge of the screen
+</p>
+</li>
+<li>
+<p>
+Drag the action button visible on most screens with the main action to the
+  right
+</p>
+</li>
+</ul></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="mobile-images/menu.jpg" alt="FIGURE: Dive management subpanel" />
+</div>
+</div>
+<div class="paragraph"><p>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. 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>
+<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
+at the bottom of the screen, indicating that the cloud is being accessed
+(see image on left, below). Once the list is loaded one can scroll up and
+down.  Tapping a dive on the list brings up a display of <em>Details View</em> for
+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" />
+</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>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_editing_dive_details">7. 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
+edit boxes that allows one to change the existing dive information,
+e.g. adding text to the dive notes or changing the names or values of some
+of the information (see image below).  It may be necessary to scroll the
+window to access all the information.  At the bottom of the edit screen is a
+<em>Save</em> 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.</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<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>
+<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 &#8594; 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
+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 <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" />
+</div>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_deleting_a_dive">9. 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>
+</div>
+<div class="sect1">
+<h2 id="_dive_log_management">10. 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="sect2">
+<h3 id="_add_new_dive_manually">10.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>
+<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>
+</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>
+</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>
+<div class="paragraph"><p>It may be necessary to change one&#8217;s login credentials, for instance if one&#8217;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
+setup screen for specifying new credentials.</p></div>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_recording_dive_locations_using_gps">11. 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
+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&#8217;s done:</p></div>
+<div class="sect2">
+<h3 id="_setting_up_the_gps">11.1. Setting up the GPS</h3>
+<div class="paragraph"><p>Open the main menu and tap <em>GPS &#8594; 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,
+e.g. every 10 minutes, or at regular distances, e.g. after the boat has
+moved more than 200m, or a combination of both of the above
+approaches. Provide the appropriate information and tap the <em>Save</em> action
+button. The program is now ready to collect GPS positions.</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="mobile-images/gpssetup.jpg" alt="FIGURE: GPS setup screen" />
+</div>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_collecting_gps_positions">11.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
+locations automatically, following the preferences specified as described
+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>
+<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
+saved <strong>separately</strong> from the other dive log data. All collected GPS data are
+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>
+<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>
+<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
+if one taps the handle (the three horisontal stripes on the right, see image
+on left, below) and then drags the specific item to the left (image on
+right, below). This exposes two options. Tapping the dustbin deletes this
+particular GPS location. Tapping the teardrop-shaped icon (actually a Google
+Maps pin) opens up Google Maps with a pin indicating the exact map position
+of the GPS record being viewed. The two above options can be hidden by
+drawing the GPS record to the right, again using the handle.</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="mobile-images/gpsmanagement.jpg" alt="FIGURE: GPS management" />
+</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>
+<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
+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>
+</div>
+</div>
+</div>
+</div>
+<div id="footnotes"><hr /></div>
+<div id="footer">
+<div id="footer-text">
+Last updated 2016-03-12 13:57:29 CET
+</div>
+</div>
+</body>
+</html>
diff --git a/Documentation/mobile-manual_fr.txt b/Documentation/mobile-manual_fr.txt
new file mode 100644
index 000000000..c8b75b02a
--- /dev/null
+++ b/Documentation/mobile-manual_fr.txt
@@ -0,0 +1,299 @@
+:icons:
+:toc:
+:toc-placement: manual
+:numbered:
+
+image::mobile-images/banner.jpg["Banner", align="center"]
+
+[big]#Subsurface-mobile pour Android: MANUEL UTILISATEUR#
+
+*Manual author*: Willem Ferguson
+
+toc::[]
+
+[blue]#_Version 1.0, Mars 2016_#
+
+Welcome as a user of _Subsurface_, advanced dive logging software with
+extensive infrastructure to describe, organize, interpret and print scuba
+and free dives. _Subsurface_ offers many advantages over other similar
+software solutions, including compatibility with Windows, Mac-OS/X, Linux
+(many distributions) and Android (iOS under development). In addition,
+_Subsurface_ is open-source software that allows downloading dive
+information from most dive computers.
+
+Introducing 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.
+
+A version of _Subsurface-mobile_ for iOS is under development but not yet
+ready for testing.
+
+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.
+
+_Subsurface-mobile_ allows one to:
+
+- Download existing dive log information from the Internet.
+- View this information on an Android 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.
+- 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
+devices, but this is not yet ready for testing.
+
+== Installing _Subsurface-mobile_ on an Android device
+
+Find _Subsurface-mobile_ in the _Google Play Store_. Search for
+_Subsurface-mobile_ and install it.
+
+== Using _Subsurface-mobile_ for the first time
+
+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::mobile-images/landingscreen.jpg["FIGURE: Mobile landing screen", align="center"]
+
+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 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.
+
+
+== Local copy of the dive log and synchronisation with Internet
+
+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
+copy. If not, the local copy and the copy on the server are synchronised.
+
+== A Few Remarks About The User Interface
+
+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.
+
+image::mobile-images/actionbutton.jpg["FIGURE: Action Button", align="center"]
+
+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
+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)
+- 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
+
+image::mobile-images/menu.jpg["FIGURE: Dive management subpanel", align="center"]
+
+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. 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
+dive list. While the dive list is loading from the cloud, a message appears
+at the bottom of the screen, indicating that the cloud is being accessed
+(see image on left, below). Once the list is loaded one can scroll up and
+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"]
+
+One can view other dives by swiping the _Details view_ to the right (for the
+previous dive) or to the left (following dive).
+
+== 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
+edit boxes that allows one to change the existing dive information,
+e.g. adding text to the dive notes or changing the names or values of some
+of the information (see image below).  It may be necessary to scroll the
+window to access all the information.  At the bottom of the edit screen is a
+_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"]
+
+== 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
+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
+right-hand image shows the same dive in _Details View_.
+
+image::mobile-images/createdive.jpg["FIGURE: Dive edit 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.
+
+== 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:
+
+=== Add new dive manually
+
+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.
+
+=== 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.
+
+=== Changing the login credentials on the _Subsurface_ cloud
+
+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 _Cloud credentials_. This opens the
+setup screen for specifying new credentials.
+
+
+== Recording dive locations using GPS.
+
+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
+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:
+
+=== Setting up the GPS
+
+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). One can specify that data are collected at regular intervals,
+e.g. every 10 minutes, or at regular distances, e.g. after the boat has
+moved more than 200m, or a combination of both of the above
+approaches. Provide the appropriate information and tap the _Save_ action
+button. The program is now ready to collect GPS positions.
+
+image::mobile-images/gpssetup.jpg["FIGURE: GPS setup screen", align="center"]
+
+=== Collecting GPS positions
+
+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,
+above).  Check this box and _Subsurface-mobile_ starts to collect GPS
+locations automatically, following the preferences specified as described
+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.
+
+=== Storing the GPS data on the _Subsurface_ cloud
+
+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_
+that saves the GPS data on the _Subsurface_ cloud server. These GPS data are
+saved *separately* from the other dive log data. All collected GPS data are
+kept on the Android device, independent of whether they have been uploaded
+or not.
+
+=== Downloading GPS data from the _Subsurface_ cloud
+
+Download the GPS data that have been saved on the cloud by selecting
+_Download GPS Data_ from the GPS subpanel.
+
+=== Viewing GPS data
+
+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
+on left, below). Two actions are possible for each of the locations, enabled
+if one taps the handle (the three horisontal stripes on the right, see image
+on left, below) and then drags the specific item to the left (image on
+right, below). This exposes two options. Tapping the dustbin deletes this
+particular GPS location. Tapping the teardrop-shaped icon (actually a Google
+Maps pin) opens up Google Maps with a pin indicating the exact map position
+of the GPS record being viewed. The two above options can be hidden by
+drawing the GPS record to the right, again using the handle.
+
+image::mobile-images/gpsmanagement.jpg["FIGURE: GPS management", align="center"]
+
+=== Applying GPS data to dives in the dive log
+
+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
+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.
diff --git a/Documentation/user-manual_fr.html.git b/Documentation/user-manual_fr.html.git
index 205167523..f6bcf6fe6 100644
--- a/Documentation/user-manual_fr.html.git
+++ b/Documentation/user-manual_fr.html.git
@@ -1,12 +1,12 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"

     "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">

-<head>

-<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />

-<meta name="generator" content="AsciiDoc 8.6.9" />

-<title></title>

-<style type="text/css">

-/*

+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
+<meta name="generator" content="AsciiDoc 8.6.8" />
+<title></title>
+<style type="text/css">
+/*
  * compact_subsurface.css, a special style sheet for Subsurface,

  *  modified by Willem Ferguson and derived from:

  *		compact.css, version 1.3 by Alex Efros <powerman@powerman.name>

@@ -462,13 +462,13 @@ Avez-vous besoin d&#8217;une façon d&#8217;enregistrer vos plongées utilisant
 Utilisez-vous deux marques différentes d&#8217;ordinateurs de plongée, chacun avec

    son propre logiciel propriétaire pour télécharger les enregistrements des

    plongées ? Plongez-vous avec un recycleur ou un équipement en circuit ouvert

-   ou de loisir ? Utilisez-vous un enregistreur de profondeur et de durée

-   Reefnet Sensus avec un ordinateur de plongée ? <em>Subsurface</em> offre une

-   interface standard pour télécharger les enregistrements des plongées à

-   partir de tous ces équipements de plongée et pour enregistrer et analyser

-   ces enregistrements dans un système unique.

-</p>

-</li>

+   ou de loisir ? Utilisez-vous un enregistreur de profondeur et de durée
+   Reefnet Sensus avec un ordinateur de plongée ? <em>Subsurface</em> offre une
+   interface standard pour télécharger les enregistrements des plongées à
+   partir de tous ces équipements de plongée, en enregistrant et en analysant
+   ces enregistrements dans un système unique.
+</p>
+</li>
 <li>

 <p>

 Utilisez-vous plus d&#8217;un système d&#8217;exploitation ? <em>Subsurface</em> est

@@ -476,38 +476,33 @@ Utilisez-vous plus d&#8217;un système d&#8217;exploitation ? <em>Subsurface</em
    d&#8217;accéder à vos enregistrements de plongées sur chaque système

    d&#8217;exploitation en utilisant une application unique.

 </p>

-</li>

-<li>

-<p>

-Utilisez-vous Linux ou Mac et votre ordinateur de plongée n&#8217;a que des

-   logiciels pour Windows pour télécharger les informations de plongées (par

-   exemple Mares) ? <em>Subsurface</em> fournit un moyen de télécharger et d&#8217;analyser

-   vos enregistrements de plongées sur d&#8217;autres systèmes d&#8217;exploitation.

-</p>

-</li>

-<li>

-<p>

-Avez-vous besoin d&#8217;un planificateur de plongée graphique intuitif qui

-   intègre et prend en compte les plongées qui ont déjà été enregistrées ?

-</p>

-</li>

-<li>

-<p>

-Avez-vous besoin d&#8217;un moyen d&#8217;enregistrer ou de sauvegarder votre carnet de

-   plongée sur Internet, Vous permettant de visualiser votre carnet depuis

-   n&#8217;importe où, en utilisant un navigateur Internet ?

-</p>

-</li>

-</ul></div>

-<div class="paragraph"><p><em>Subsurface</em> est disponible pour Windows (Win XP ou plus récent), les Macs

-basés sur processeurs Intel (OS/X) et de nombreuses distributions

-Linux. <em>Subsurface</em> peut être compilé pour bien plus de plateformes

-matérielles et d&#8217;environnements logiciels où Qt et libdivecomputer sont

-disponibles.</p></div>

-<div class="paragraph"><p>Le but de ce document est l&#8217;utilisation du programme Subsurface. Pour

-installer le logiciel, consultez la page <em>Téléchargement</em> sur le

-<a href="http://subsurface-divelog.org/">site web de <em>Subsurface</em></a>. En cas de

-problème, vous pouvez envoyer un e-mail sur

+</li>
+<li>
+<p>
+Utilisez-vous Linux ou Mac mais votre ordinateur de plongée n&#8217;a que des
+   logiciels pour Windows pour télécharger les informations de plongées (par
+   exemple Mares) ? <em>Subsurface</em> fournit un moyen de télécharger et d&#8217;analyser
+   vos enregistrements de plongées sur d&#8217;autres systèmes d&#8217;exploitation.
+</p>

+</li>

+<li>

+<p>
+Avez-vous besoin d&#8217;un planificateur de plongée graphique intuitif qui
+   intègre et prend en compte les plongées qui ont déjà été enregistrées ?
+Avez-vous besoin d&#8217;un moyen d&#8217;nregistrer et de sauvegarder vos plongées sur
+Internet, vous permettant de les voir depuis n&#8217;importe où en utilisant un
+navigateur Internet ? <em>Subsurface</em> est disponible pour Windows (Win XP ou
+plus récent), les Macs basés sur processeurs Intel (OS/X) et de nombreuses
+distributions Linux. <em>Subsurface</em> peut être compilé pour bien plus de
+plateformes matérielles et d&#8217;environnements logiciels où Qt et
+libdivecomputer sont disponibles.
+</p>
+</li>
+</ul></div>
+<div class="paragraph"><p>Ce manuel explique comment utiliser le programme <em>Subsurface</em>. Pour
+installer le logiciel, consultez la page <em>Téléchargement</em> sur le
+<a href="http://subsurface-divelog.org/">site web de <em>Subsurface</em></a>. En cas de
+problème, vous pouvez envoyer un e-mail sur
 <a href="mailto:subsurface@subsurface-divelog.org">notre liste de diffusion</a> et

 rapportez les bogues sur <a href="http://trac.hohndel.org">notre bugtracker</a>.  Pour

 des instructions de compilation du logiciel et (si besoin) de ses

@@ -524,160 +519,134 @@ professionnels</p></div>
 <div class="sectionbody">

 <div class="paragraph"><p>When opened from within <em>Subsurface</em>, this manual does not have external

 controls for paging or selecting previous pages. However, two facilities are

-provided:</p></div>

-<div class="paragraph"><p>The <em>SEARCH</em> function is activated by pressing control-F or command-F on the

-keyboard. A text box appears at the bottom right-hand of the window (see

-image below).  For instance, if one typed the word "<em>weights</em>" into the

-search text box, this word will be searched for throughout this user

-manual. To the right of the search text box are two arrows pointing upwards

-and downwards. Selecting these allow finding, respectively, the previous and

-the next occurence of the term being searched for.</p></div>

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

-<div class="content">

-<img src="images/usermanualfunctions.jpg" alt="User manual functions" />

-</div>

-</div>

-<div class="paragraph"><p><em>PREVIOUS/NEXT LINK</em>. One can move between links (underlined words allowing

-one to jump to specific sections in this user manual) by right-clicking on

-the text of the manual.  This brings up a context menu for jumping to

-previous links selected while reading the manual (see image above). For

-instance if a link in the manual has been selected, then the option to <em>Go

-Back</em> shows the text at the last link that was selected (similar to the

-Previous Page button in a browser). Conversely the <em>Go Forward</em> option

-enables jumping to the text perused before selecting the <em>Go Back</em>

-option. The <em>Reload</em> option causes the complete user manual to be reloaded

-into the user manual window.</p></div>

-</div>

-</div>

-<div class="sect1">

-<h2 id="S_UserSurvey">2. Le sondage utilisateur</h2>

-<div class="sectionbody">

-<div class="paragraph"><p>Dans le but de développer <em>Subsurface</em> d&#8217;une manière qui serve ses

-utilisateurs de la meilleur manière qu&#8217;il soit, il est important d&#8217;avoir des

-informations sur les utilisateurs. À l&#8217;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&#8217;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&#8217;utilisateur choisit d&#8217;envoyer sont

-extrêmement utiles et ne seront utilisées que pour les futures

-développements et modifications du logiciel pour coller au mieux aux besoins

-des utilisateurs de <em>Subsurface</em>. Si vous complétez le sondage ou cliquez

-sur l&#8217;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&#8217;utilisation de Subsurface changent, vous pouvez envoyer un

-nouveau sondage en démarrant <em>Subsurface</em> avec l&#8217;option  <em>--survey</em> sur la

-ligne de commande.</p></div>

-</div>

-</div>

-<div class="sect1">

+provided:</p></div>
+<div class="paragraph"><p>The <em>SEARCH</em> function is activated by pressing control-F or command-F on the
+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>
+<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>
+</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>
+</div>
+<div class="sect1">
 <h2 id="S_StartUsing">3. Commencer à utiliser le programme</h2>

 <div class="sectionbody">

 <div class="paragraph"><p>La fenêtre <em>Subsurface</em> est généralement divisée en 4 panneaux avec un <strong>Menu

-principal</strong> (Fichier Importer Journal Vue Aide) en haut de la fenêtre (pour

-Windows et Linux) ou en haut de l'écran (pour Mac et Ubuntu Unity). Les

-quatre panneaux sont :</p></div>

-<div class="paragraph"><p>La <strong>liste des plongées</strong> en bas à gauche, contenant une liste de toutes les

-plongées du journal (carnet) de plongées de l&#8217;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&#8217;une plongée à l&#8217;autre. La <strong>liste des plongées</strong> est un outil

-important pour manipuler un journal (carnet) de plongée.</p></div>

-<div class="paragraph"><p>La <strong>carte de plongée</strong> en bas à droite, affiche les sites de plongées de

-l&#8217;utilisateur, sur une carte mondiale et centrée sur le site de la dernière

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

-<div class="paragraph"><p>Les <strong>informations</strong> en haut à gauche, fournissent des informations détaillées

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

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

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

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

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

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

-taille de chaque panneau. <em>Subsurface</em> mémorise la position de ces

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

-positions.</p></div>

-<div class="paragraph"><p>Si une unique plongée est sélectionnée dans la <strong>liste des plongées</strong>,

-l&#8217;emplacement de la plongée, les informations détaillées et le profil de la

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

-part, si 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&#8217;onglet <strong>Stats</strong> du

-panneau <strong>informations</strong> (profondeur maximale, minimale et moyenne, les

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

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

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

-<div class="content">

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

-</div>

-</div>

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

-en sélectionnant l&#8217;option <strong>Vue</strong> dans le menu principal. Cette fonctionnalité

-permet plusieurs choix d&#8217;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> : affiche uniquement la carte mondiale, centrée sur la dernière plongée sélectionnée.</p></div>

-<div class="paragraph"><p>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&#8217;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&#8217;affiche aucune

-information. Ceci parce que le programme n&#8217;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>Sélectionner <em>Fichier &#8594; 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&#8217;il existe des données non encore

-enregistrées dans le carnet ouvert, l&#8217;utilisateur devra sélectionner s&#8217;il

-faut les enregistrer ou non avant de créer le nouveau carnet.</p></div>

-</div>

-</div>

-<div class="sect1">

-<h2 id="S_GetInformation">5. Enregistrement des informations de plongée dans le carnet</h2>

-<div class="sectionbody">

-<div class="paragraph"><p>Maintenant qu&#8217;un nouveau carnet de plongée a été créé, il est simple de lui

-ajouter des données. <em>Subsurface</em> permet plusieurs façons pour ajouter des

-données de plongée au carnet. Plus de détails dans les sections suivantes.</p></div>

-<div class="paragraph"><p>1) Si l&#8217;utilisateur possède un carnet manuscrit, un tableur ou une autre forme

-   de

- carnet maintenu manuellement, les données de plongée peuvent être ajoutées

- au carnet en utilisant une des approches suivantes :</p></div>

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

-<li>

-<p>

-Entrer les informations de plongée à la main. Cela est utile si le plongeur

-   n&#8217;a pas

- utilisé d&#8217;ordinateur de plongée et que les plongées sont inscrites dans un

- carnet manuscrit. Voir  <a href="#S_EnterData">Entrer les informations de plongée

- à la main</a>

-</p>

-</li>

-<li>

-<p>

-Importer les informations de plongée qui ont été maintenues soit dans un

+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&#8217;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&#8217;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="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><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>
+</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 &#8594; 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>
+</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.
+1) Si l&#8217;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
+ utilisé d&#8217;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>
+<div class="ulist"><ul>
+<li>
+<p>
+Importer les informations de plongée qui ont été maintenues soit dans un
    tableur

- soit dans un fichier CSV. Se reporter à : <a href="#S_Appendix_D">ANNEXE D :

- Exporter un tableur vers le format CSV</a> et à

- <a href="#S_ImportingCSVDives">Importer des plongées au format CSV</a>.

-</p>

-</li>

-</ul></div>

-<div class="paragraph"><p>2) Si les plongées ont été enregistrées en utilisant un ordinateur de plongée,

-   le profil de profondeur de la

- plongée et de nombreuses informations supplémentaires peuvent être

- utilisées. Ces plongées peuvent être importées à partir de :</p></div>

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

-<li>

-<p>

-L&#8217;ordinateur de plongée lui-même. Voir : <a href="#S_ImportDiveComputer">Importer

+ 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:
+</p>
+</li>
+<li>
+<p>
+L&#8217;ordinateur de plongée lui-même. Voir : <a href="#S_ImportDiveComputer">Importer
    de nouvelles informations de plongée à partir de l&#8217;ordinateur de plongée</a> ou

 </p>

 </li>

@@ -688,146 +657,143 @@ Logiciels propriétaires fournis par les fabricants d&#8217;ordinateurs de
  <a href="#S_ImportingAlienDiveLogs">Importer les informations à partir d&#8217;autres

  sources de données numériques ou d&#8217;autres formats de données</a>.

 </p>

-</li>

-<li>

-<p>

-Importer à partir d&#8217;un tableur ou de fichiers CSV contenant les profils de

-   plongées.

- Voir : <a href="#S_ImportingCSVDives">Importer les plongées au format CSV à partir

- des ordinateurs de plongées ou d&#8217;autres logiciels de carnet de plongée</a>

-</p>

+</li>
+<li>
+<p>
+Spreadsheet or CSV files containing dive profiles.
+ Voir : <a href="#S_ImportingCSVDives">Importer les plongées au format CSV à partir
+ des ordinateurs de plongées ou d&#8217;autres logiciels de carnet de plongée</a>
+</p>
 </li>

 </ul></div>

 <div class="sect2">

 <h3 id="S_EnterData">5.1. Entrer les informations de plongée à la main</h3>

-<div class="paragraph"><p>This is usually the approach for dives without a dive computer. The basic

-record of information within <em>Subsurface</em> is a dive. The most important

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

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

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

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

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

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

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

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

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

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

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

-<div class="content">

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

-</div>

-</div>

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

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

-<strong>Notes</strong> panel (see the image below). This message is displayed in all the

-panels under Notes and Equipment when in <strong>Editing Mode</strong>.</p></div>

+<div class="paragraph"><p>This is usually the approach for dives without a dive computer. The basic
+record of information within <em>Subsurface</em> is a dive. The most important
+information in a simple dive logbook usually includes dive type, date, time,
+duration, depth, the names of your dive buddy and the dive master or dive
+guide, and some remarks about the dive. <em>Subsurface</em> can store much more
+information for each dive.  To add a dive to a dive log, select <em>Log &#8594; Add
+Dive</em> from the Main Menu. The program then shows three panels on which to
+enter information for a dive: two tabs in the <strong>Info</strong> panel (<strong>Notes</strong> and
+<strong>Equipment</strong>), as well as the <strong>Dive Profile</strong> panel that displays a graphical
+profile of each dive. These panels are respectively marked <span class="red">A</span>,
+<span class="red">B</span> and <span class="red">C</span> in the figure below. Each of these tabs will now be
+explained for data entry.</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/AddDive1_f22.jpg" alt="FIGURE: Add dive" />
+</div>
+</div>
+<div class="paragraph"><p>When you edit a field in Notes or Equipment panels, <em>Subsurface</em> enters
+<strong>Editing Mode</strong>, indicated by the message in the blue box at the top of the
+<strong>Notes</strong> panel (see the image below). This message is displayed in all the
+panels under Notes and Equipment when in <strong>Editing Mode</strong>.</p></div>
 <div class="imageblock" style="text-align:center;">

 <div class="content">

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

 </div>

 </div>

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

-dive have been entered.  When entering dives by hand, the <em>Info</em>,

-<em>Equipment</em> and <em>Profile</em> tabs should be completed before saving the

-information. By selecting the <em>Apply changes</em> button, a local copy of the

-information for this specific dive is saved in memory. When one closes

-Subsurface, the program will ask again, this time whether the complete dive

-log should be saved on disk or not.</p></div>

-<div class="sect3">

-<h4 id="S_CreateProfile">5.1.1. Creating a Dive Profile</h4>

-<div class="paragraph"><p>The <strong>Dive Profile</strong> (a graphical representation of the depth of the dive as a

-function of time) is indicated in the panel on the top right hand of the

-<em>Subsurface</em> window. When a dive is manually added to a logbook,

-<em>Subsurface</em> presents a default dive profile that needs to be modified to

-best represent the dive being described:</p></div>

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

-<div class="content">

-<img src="images/DiveProfile1_f20.jpg" alt="FIGURE: Initial dive profile" />

-</div>

-</div>

-<div class="paragraph"><p><em>Modifying the dive profile</em>: When the cursor is moved around the dive

-profile, its position is indicated by two right-angled red lines as shown

-below.  The time and depth represented by the cursor are indicated at the

-top of the black information box (@ and D). The units (metric/imperial) on

-the axes are determined by the <strong>Preference</strong> settings. The dive profile

-itself comprises several line segments demarcated by waypoints (white dots

-on the profile, as shown above). The default dive depth is 15 m.  If the

-dive depth was 20 m then the user needs to drag the appropriate waypoints

-downwards to represent 20 m. To add a waypoint, double-click on any line

-segment. To move an additional waypoint, drag it.  To remove this waypoint,

-right-click on it and choose "Remove this point" from the context menu. Drag

-the waypoints to represent an accurate time duration for the dive. Below is

-a dive profile for a dive to 20 m for 30 min, followed by a 5 minute safety

-stop at 5 m.</p></div>

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

-<div class="content">

-<img src="images/DiveProfile2_f20.jpg" alt="FIGURE: Edited dive profile" />

-</div>

-</div>

-<div class="paragraph"><p><em>Specifying the gas composition:</em> The gas composition used is clearly

-indicated along the line segments of the dive profile. This defaults to the

-first gas mixture specified in the <strong>Equipment</strong> tab, which was air in the

-case of the profile above. The gas mixtures of segments of the dive profile

-can be edited. This is done by right-clicking on the particular waypoint and

-selecting the appropriate gas from the context menu. Changing the gas for a

-waypoint affects the gas shown in the segment <em>to the left</em> of that

-waypoint. Note that only the gases defined in the <strong>Equipment</strong> tab appear in

-the context menu (see image below).</p></div>

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

-<div class="content">

-<img src="images/DiveProfile3_f20.jpg" alt="FIGURE: Gas composition context menu" />

-</div>

-</div>

-<div class="paragraph"><p>With the profile having been defined, more details must be added in order to

-have a fuller record of the dive. To do this, the <strong>Notes</strong> and the

-<strong>Equipment</strong> tabs on the top left hand of the <em>Subsurface</em> window should be

-used. Click on <a href="#S_Notes_dc"><strong>this link</strong></a> for instructions to use these

-tabs.</p></div>

-</div>

-</div>

-<div class="sect2">

+dive have been entered.  When entering dives by hand, the <em>Info</em>,
+<em>Equipment</em> and <em>Profile</em> tabs should be completed before saving the
+information. By selecting the <em>Apply changes</em> button, a local copy of the
+information for this specific dive is saved in memory. The <em>Apply changes</em>
+button should ONLY be selected after all parts of a dive have been
+entered. When you close Subsurface, the program will ask again, this time
+whether the complete dive log should be saved on disk or not.</p></div>
+<div class="sect3">
+<h4 id="S_CreateProfile">5.1.1. Creating a Dive Profile</h4>
+<div class="paragraph"><p>The <strong>Dive Profile</strong> (a graphical representation of the depth of the dive as a
+function of time) is shown in the panel on the top right hand of the
+<em>Subsurface</em> window. When a dive is manually added to a logbook,
+<em>Subsurface</em> presents a default dive profile that needs to be modified to
+best represent the dive described:</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/DiveProfile1_f20.jpg" alt="FIGURE: Initial dive profile" />
+</div>
+</div>
+<div class="paragraph"><p><em>Modifying the dive profile</em>: When the cursor is moved around the dive
+profile, its position is shown by two right-angled red lines as seen below.
+The time and depth represented by the cursor are indicated at the top of the
+black information box (@ and D). The units (metric/imperial) on the axes are
+determined by the <strong>Preference</strong> settings. The dive profile itself comprises
+several line segments demarcated by waypoints (white dots on the profile, as
+shown above). The default dive depth is 15 m.  If the dive depth was 20 m
+then you need to drag the appropriate waypoints downward to 20 m. To add a
+waypoint, double-click on any line segment. To move an additional waypoint,
+drag it.  To remove a waypoint, right-click on it and choose "Remove this
+point" from the context menu. Drag the waypoints to represent an accurate
+time duration for the dive. Below is a dive profile for a dive to 20 m for
+30 min, followed by a 5 minute safety stop at 5 m.</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/DiveProfile2_f20.jpg" alt="FIGURE: Edited dive profile" />
+</div>
+</div>
+<div class="paragraph"><p><em>Specifying the gas composition:</em> The gas composition used is indicated
+along the line segments of the dive profile. This defaults to the first gas
+mixture specified in the <strong>Equipment</strong> tab, which was air in the case of the
+profile above. The gas mixtures of segments of the dive profile can be
+changed by right-clicking on the particular waypoint and selecting the
+appropriate gas from the context menu. Changing the gas for a waypoint
+affects the gas shown in the segment <em>to the left</em> of that waypoint. Note
+that only the gases defined in the <strong>Equipment</strong> tab appear in the context
+menu (see image below).</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/DiveProfile3_f20.jpg" alt="FIGURE: Gas composition context menu" />
+</div>
+</div>
+<div class="paragraph"><p>With the profile now defined, more details must be added to have a fuller
+record of the dive. To do this, the <strong>Notes</strong> and the <strong>Equipment</strong> tabs on the
+top left hand of the <em>Subsurface</em> window should be used. Click on
+<a href="#S_Notes_dc"><strong>this link</strong></a> for instructions on how to use these tabs.</p></div>
+</div>
+</div>
+<div class="sect2">
 <h3 id="S_ImportDiveComputer">5.2. Importer de nouvelles informations de plongée à partir de l&#8217;ordinateur de plongée</h3>

 <div class="sect3">

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

-<div class="paragraph"><p>The use of dive computers allows the collection of a large amount of

-information about each dive, e.g. a detailed record of depth, duration,

-rates of ascent/descent and of gas partial pressures. <em>Subsurface</em> can

-capture this information and present it as part of the dive information,

-using dive information from a wide range of dive computers. The latest list

-of supported dive computers can be found at:

-<a href="http://subsurface-divelog.org/documentation/supported-dive-computers/">

-Supported dive computers</a>.</p></div>

-<div class="admonitionblock">

+<div class="paragraph"><p>The use of dive computers allows the collection of a large amount of
+information about each dive, e.g. a detailed record of depth, duration,
+rates of ascent/descent and of gas partial pressures. <em>Subsurface</em> can
+capture this information, using dive details from a wide range of dive
+computers. The latest list of supported dive computers can be found at:
+<a href="http://subsurface-divelog.org/documentation/supported-dive-computers/">
+Supported dive computers</a>.</p></div>
+<div class="admonitionblock">
 <table><tr>

-<td class="icon">

-<img src="images/icons/warning2.png" alt="Warning" />

-</td>

-<td class="content">Several dive computers consume more power when they are in their

-PC-Communication mode. <strong>This could drain the dive computer&#8217;s battery</strong>. We

-therefore recommend that the user checks if the dive computer is charged

-when connected to the USB port of a PC. For example, several Suunto and

-Mares dive computers do not recharge through the USB connection. Users

-should refer to the dive computer&#8217;s manual if they are unsure whether the

-dive computer recharges its batteries while connected to the USB port.</td>

-</tr></table>

-</div>

-<div class="paragraph"><p>To import dive information from a dive computer to a computer with

-<em>Subsurface</em>, it is necessary that the two pieces of equipment communicate

-with one another.  This involves setting up the communications port (or

-mount point) of the computer with <em>Subsurface</em> that communicates with the

-dive computer. In order to set up this communication, one needs to find the

-appropriate information to instruct <em>Subsurface</em> where and how to import the

-dive information.

-<a href="#_appendix_a_operating_system_specific_information_for_importing_dive_information_from_a_dive_computer">Appendix

-A</a> provides the technical information to help the user achieving this for

-different operating systems and

-<a href="#_appendix_b_dive_computer_specific_information_for_importing_dive_information">Appendix

-B</a> has dive computer specific information.</p></div>

-<div class="paragraph"><p>After this, the dive computer can be hooked up to the user&#8217;s PC, which can

-be achieved by following these steps:</p></div>

-<div class="olist arabic"><ol class="arabic">

-<li>

-<p>

+<td class="icon">
+<img src="images/icons/warning2.png" alt="Warning" />
+</td>
+<td class="content">Several dive computers consume more power when they are in PC-Communication
+mode. <strong>This could drain the dive computer&#8217;s battery</strong>. We recommend the
+user checks to be sure the dive computer is charged when connected to the
+USB port of a PC. For example, several Suunto and Mares dive computers do
+not recharge through the USB connection. Users should refer to the dive
+computer&#8217;s manual if they are unsure whether the dive computer recharges its
+batteries while connected to the USB port.</td>
+</tr></table>
+</div>
+<div class="paragraph"><p>To import dive information from a dive computer to a computer with
+<em>Subsurface</em>, the two pieces of equipment must communicate with one
+another.  This involves setting up the communications port (or mount point)
+of the computer with <em>Subsurface</em> that communicates with the dive
+computer. To set up this communication, users need to find the appropriate
+information to instruct <em>Subsurface</em> where and how to import the dive
+information.
+<a href="#_appendix_a_operating_system_specific_information_for_importing_dive_information_from_a_dive_computer">Appendix
+A</a> provides the technical information to help the user achieve this for
+different operating systems and
+<a href="#_appendix_b_dive_computer_specific_information_for_importing_dive_information">Appendix
+B</a> has dive computer specific information.</p></div>
+<div class="paragraph"><p>After this, the dive computer can be hooked up to the user&#8217;s PC using these
+steps:</p></div>
+<div class="olist arabic"><ol class="arabic">
+<li>
+<p>
 The interface cable should be connected to a free USB port (or the Infra-red

         or Bluetooth connection set up as described later in this manual)

 </p>

@@ -847,18 +813,18 @@ In <em>Subsurface</em>, from the Main Menu, select <em>Import &#8594; Import Fro
 </ol></div>

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

 <div class="content">

-<img src="images/DC_import_f20.jpg" alt="FIGURE: Download dialogue 1" />

-</div>

-</div>

-<div class="paragraph"><p>Dive computers tend to keep a certain number of dives in their memory, even

-though these dives have already been imported to <em>Subsurface</em>. For that

-reason, if the dive computer allows this, <em>Subsurface</em> only imports dives

-that have not been uploaded before. This makes the download process faster

-on most dive computers and also saves battery power of the dive computer (at

-least for those not charging while connected via USB).</p></div>

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

-<li>

-<p>

+<img src="images/DC_import_f20.jpg" alt="FIGURE: Download dialogue 1" />
+</div>
+</div>
+<div class="paragraph"><p>Dive computers tend to keep a certain number of dives in memory, even though
+these dives have already been imported to <em>Subsurface</em>. For that reason, if
+the dive computer allows this, <em>Subsurface</em> only imports dives that have not
+been uploaded before. This makes the download process faster on most dive
+computers and also saves battery power of the dive computer (at least for
+those not charging while connected via USB).</p></div>
+<div class="ulist"><ul>
+<li>
+<p>
 The dialogue has two drop-down lists, <strong>Vendor</strong> and <strong>Dive Computer</strong>. On the

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

    Oceanic, Uwatec, Mares. On the <strong>Dive Computer</strong> drop-down list, the model

@@ -872,76 +838,75 @@ The <strong>Device or Mount Point</strong> drop-down list contains the USB or Bl
    port name that <em>Subsurface</em> needs in order to communicate with the dive

    computer.  The appropriate port name must be selected. Consult

    <a href="#_appendix_a_operating_system_specific_information_for_importing_dive_information_from_a_dive_computer">Appendix

-   A</a> and

-   <a href="#_appendix_b_dive_computer_specific_information_for_importing_dive_information">Appendix

-   B</a> for technical details on how to find the appropriate port information for

-   a particular dive computer and, in some cases, how to do the correct

-   settings to the operating system of the computer on which <em>Subsurface</em> is

-   running.

-</p>

-</li>

-<li>

-<p>

-If all the dives on the dive computer need to be downloaded, check the

-   checkbox <em>Force download of all dives</em>. Normally, <em>Subsurface</em> only

-   downloads dives after the date-time of the last dive in the <strong>Dive List</strong>

-   panel. If one or more of your dives in <em>Subsurface</em> have been accidentally

-   deleted or if there are older dives that still need to be downloaded from

-   the dive computer, this checkbox needs to be activated. Some dive computers

-   (e.g. Mares Puck) do not provide a contents list to <em>Subsurface</em> before the

-   download in order to select only new dives.  Consequently, for these dive

-   computers, all dives are downloaded irrespective of the status of this check

+   A</a> and
+   <a href="#_appendix_b_dive_computer_specific_information_for_importing_dive_information">Appendix
+   B</a> for technical details on how to find the appropriate port information for
+   a specific dive computer and, in some cases, how to do the correct settings
+   to the operating system of the computer on which <em>Subsurface</em> is running.
+</p>
+</li>
+<li>
+<p>

+If all the dives on the dive computer need to be downloaded, check the
+   checkbox <em>Force download of all dives</em>. Normally, <em>Subsurface</em> only
+   downloads dives after the date-time of the last dive in the <strong>Dive List</strong>
+   panel. If one or more of your dives in <em>Subsurface</em> has been accidentally
+   deleted or if there are older dives that still need to be downloaded from
+   the dive computer, this box needs to be checked. Some dive computers
+   (e.g. Mares Puck) do not provide a contents list to <em>Subsurface</em> before the
+   download in order to select only new dives.  Consequently, for these dive
+   computers, all dives are downloaded irrespective of the status of this check
    box.

 </p>

 </li>

 <li>

 <p>

-If the checkbox <em>Always prefer downloaded dives</em> has been checked and,

-   during download, dives with identical date-times exist on the dive computer

-   and on the <em>Subsurface</em> <strong>Dive List</strong> panel, the dive in the <em>Subsurface</em>

-   divelog will be overwritten by the dive record from the dive computer.

-</p>

-</li>

-<li>

+If the checkbox <em>Always prefer downloaded dives</em> has been checked and,
+   during download, dives with identical date-times exist on the dive computer
+   and on the <em>Subsurface</em> <strong>Dive List</strong> panel, the dive in the <em>Subsurface</em>
+   divelog will be overwritten by the dive record from the computer.
+</p>
+</li>
+<li>
 <p>

 The checkbox marked <em>Download into new trip</em> ensures that, after upload, the

    downloaded dives are grouped together as a new trip(s) in the <strong>Dive List</strong>.

 </p>

 </li>

 <li>

-<p>

-Do <strong>not</strong> check the checkboxes labelled <em>Save libdivecomputer logfile</em> and

-   <em>Save libdivecomputer dumpfile</em>. These are only used as diagnostic tools

-   when problems with downloads are experienced (see below).

-</p>

-</li>

-<li>

-<p>

-Then select the <em>Download</em> button.  With communication established, one can

-   see how the data are retrieved from the dive computer.  Depending on the

-   make of the dive computer and/or number of recorded dives, this could take

-   some time. Be patient. The <em>Download</em> dialogue shows a progress bar at the

-   bottom of the dialogue (for some dive computers the progress information

-   could be inaccurate as we cannot determine how much downloadable data there

-   is until all data have been downloaded). After successful download, Dialogue

-   <strong>B</strong> in the figure above appears.  After the dives have been downloaded, they

-   appear in a tabular format on the right-hand side of the dialogue (see image

-   <strong>B</strong>, above). Each dive comprises a row in the table, with the date, duration

-   and depth shown. Next to each dive is a checkbox: check all the dives that

-   need to be transferred to the <strong>Dive List</strong>. In the case of the image above,

-   the last six dives are checked and will be transferred to the <strong>Dive

-   List</strong>. Then click the <em>OK</em> button at the bottom of the dialogue. All the

-   imported dives appear in the <strong>Dive List</strong>, sorted by date and

-   time. Disconnect and switch off the dive computer to conserve its battery

-   power.

-</p>

-</li>

-</ul></div>

-<div class="paragraph"><p>After this has been completed, select the OK button.  The checked dives are

-transferred to the <strong>Dive List</strong>.</p></div>

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

-<li>

-<p>

+<p>
+Do <strong>not</strong> check the checkboxes labelled <em>Save libdivecomputer logfile</em> and
+   <em>Save libdivecomputer dumpfile</em>. These are only used as diagnostic tools
+   when there are problems with downloads(see below).
+</p>
+</li>
+<li>
+<p>
+Then select the <em>Download</em> button.  With communication established, you can
+   see how the data are retrieved from the dive computer.  Depending on the
+   make of the dive computer and/or number of recorded dives, this could take
+   some time. Be patient. The <em>Download</em> dialogue shows a progress bar at the
+   bottom of the dialogue.  Remember for some dive computers progress
+   information could be inaccurate since the program doesn’t know how much
+   downloadable data there is until the download is complete. After successful
+   download, Dialogue <strong>B</strong> in the figure above appears.  After the dives have
+   been downloaded, they appear in a tabular format on the right-hand side of
+   the dialogue (see image <strong>B</strong>, above). Each dive comprises a row in the table,
+   with the date, duration and depth shown. Next to each dive is a checkbox:
+   check all the dives that need to be transferred to the <strong>Dive List</strong>. In the
+   case of the image above, the last six dives are checked and will be
+   transferred to the <strong>Dive List</strong>. Then click the <em>OK</em> button at the bottom of
+   the dialogue. All the imported dives appear in the <strong>Dive List</strong>, sorted by
+   date and time. Disconnect and switch off the dive computer to conserve its
+   battery power.
+</p>
+</li>
+</ul></div>
+<div class="paragraph"><p>Then click the OK button.  The checked dives are transferred to the <strong>Dive
+List</strong>.</p></div>
+<div class="ulist"><ul>
+<li>
+<p>
 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

    Mares (Puck Pro)". Refer to the text in the box below.

@@ -964,143 +929,137 @@ If there is a problem in communicating with the dive computer, an error
 <p>

 Is the dive computer still in PC-communication or Upload mode?

 </p>

-</li>

-<li>

-<p>

-Is the battery of the dive computer fully charged? If not then the battery

-   must be charged or replaced.

-</p>

-</li>

-<li>

-<p>

-Is the connecting cable faulty? Does the cable work perfectly using other

-   software? Has it worked before, or is this the first time the cable is being

-   used? Are the contacts on the dive computer and the cable clean?

-</p>

-</li>

-<li>

-<p>

-Consult

-   <a href="#_appendix_a_operating_system_specific_information_for_importing_dive_information_from_a_dive_computer">Appendix

-   A</a> and make sure that the correct Mount Point was specified (see above).

-</p>

-</li>

-<li>

+</li>
+<li>
+<p>
+Is the dive computer’s battery fully charged? If not then charge or replace
+   it.
+</p>
+</li>
+<li>
+<p>
+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
+   the contacts on the dive computer and the cable clean?
+</p>
+</li>
+<li>
+<p>
+Consult
+   <a href="#_appendix_a_operating_system_specific_information_for_importing_dive_information_from_a_dive_computer">Appendix
+   A</a> to be sure the correct Mount Point was specified (see above).
+</p>
+</li>
+<li>
 <p>

 On Unix-like operating systems, does the user have write permission to the

    USB port? If not, consult

    <a href="#_appendix_a_operating_system_specific_information_for_importing_dive_information_from_a_dive_computer">Appendix

    A</a>

-</p>

-</li>

-</ul></div>

-<div class="paragraph"><p>If the <em>Subsurface</em> computer does not recognise the USB adaptor by showing

-an appropriate device name next to the Mount Point, then there is a

-possibility that the cable or USB adaptor is faulty. A faulty cable is the

-most common cause of communication failure between dive computer and

-<em>Subsurface</em> computer. It is also possible that the <em>Subsurface</em> computer

-cannot interpret the data. Perform a download for diagnostic purposes with

-the following two check boxes checked in the download dialogue discussed

-above:</p></div>

-<div class="literalblock">

-<div class="content">

-<pre><code>Save libdivecomputer logfile

-Save libdivecomputer dumpfile</code></pre>

-</div></div>

-<div class="paragraph"><p><strong>Important</strong>: These check boxes are only used when problems are encountered

-during the download process: under normal circumstances they should not be checked.

-When checking these boxes, the user is prompted to select a folder to

-save the information to. The default folder is the one in which the <em>Subsurface</em>

-dive log is kept.</p></div>

-<div class="paragraph"><p><strong>Important:</strong> <em>After downloading with the above checkboxes

-checked, no dives are added to the

+</p>
+</li>
+</ul></div>
+<div class="paragraph"><p>If the <em>Subsurface</em> computer does not recognize the USB adaptor by showing
+an appropriate device name next to the Mount Point, then there is a
+possibility the cable or USB adaptor is faulty. A faulty cable is the most
+common cause of communication failure between a dive computer and
+<em>Subsurface</em> computer. It’s also possible the <em>Subsurface</em> computer cannot
+interpret the data. Perform a download for diagnostic purposes with the
+following two boxes checked in the download dialogue discussed above:</p></div>
+<div class="literalblock">
+<div class="content">
+<pre><code>Save libdivecomputer logfile
+Save libdivecomputer dumpfile</code></pre>
+</div></div>
+<div class="paragraph"><p><strong>Important</strong>: These check boxes are only used when problems are encountered
+during the download process. Under normal circumstances they should not be checked.
+When checking these boxes, the user is prompted to select a folder where the information will be saved. The default folder is the one in which the
+<em>Subsurface</em>
+dive log is kept.</p></div>
+<div class="paragraph"><p><strong>Important:</strong> <em>After downloading with the above checkboxes
+checked, no dives are added to the
 <strong>Dive List</strong> but two files are created in the folder selected above</em>:</p></div>

 <div class="literalblock">

 <div class="content">

 <pre><code>subsurface.log

 subsurface.bin</code></pre>

-</div></div>

-<div class="paragraph"><p>These files should be send to the <em>Subsurface</em> mail list:

-<em>subsurface@subsurface-divelog.org</em> with a request for the files to be

-analysed. Provide the dive computer make and model as well as contextual

-information about the dives recorded on the dive computer.</p></div>

-</div></div>

-</div>

-<div class="sect3">

-<h4 id="S_Bluetooth">5.2.2. Connecting <em>Subsurface</em> to a Bluetooth-enabled dive computer</h4>

-<div class="paragraph"><p>Bluetooth is becoming a more common way of communication between dive

-computers and <em>Subsurface</em>, for instance, the Shearwater Petrel Mk2 and the

-OSTC Mk3. <em>Subsurface</em> provides a largely operating system independent

-Bluetooth interface. Setting up <em>Subsurface</em> for Bluetooth communication

-requires four steps:</p></div>

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

-<li>

-<p>

-Ensure that Bluetooth is activated on the host computer running

-  <em>Subsurface</em>.

-</p>

-</li>

-<li>

-<p>

-Ensure that <em>Subsurface</em> sees the Bluetooth adapter on the host computer.

-</p>

-</li>

-<li>

-<p>

-Ensure the Bluetooth-enabled dive computer is Bluetooth-discoverable and in

-  PC upload mode.

-</p>

-</li>

-<li>

-<p>

-Ensure that <em>Subsurface</em> is paired with the Bluetooth-enabled dive computer.

-</p>

-</li>

-</ul></div>

-<div class="paragraph"><p>Select the Download dialogue by selecting <em>Import &#8594; Import from dive

-computer</em> from the <strong>Main Menu</strong>. If one checks the check box labelled

-<em>"Choose 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" />

-</div>

-</div>

-<div class="paragraph"><p>On the <em>Linux</em> or <em>MacOS</em> platforms the name of the <em>Subsurface</em> computer

-and its Bluetooth address are shown on the right-hand side, On the lefthand

-side, if the computer has connected more than one local Bluetooth devices

-the user can use the list box to indicate which one needs to connect to

-<em>Subsurface</em>.  The power state (on/off) of the Bluetooth adapter is shown

-below the address and can be changed by checking the <em>Turn on/off</em> check

-box.</p></div>

-<div class="paragraph"><p>If the Bluetooth address is not shown, then <em>Subsurface</em> does not see the

-local Bluetooth device. Ensure that the Bluetooth driver is installed

-correctly on the <em>Subsurface</em> computer and check if it can be used by other

-Bluetooth utilities like <em>bluetoothctl</em> or <em>bluemoon</em>. This achieves the

-first two steps above.</p></div>

-<div class="paragraph"><p>Ensure that the Bluetooth-enabled dive computer is in PC-upload mode and

-that it is discoverable by other Bluetooth devices. Consult the manual of

-the dive computer to perform this. Now the third item in the list above has

-been achieved.</p></div>

-<div class="paragraph"><p>Select the <em>Scan</em> button towards the bottom left of the dialogue

-above. After searching for a small amount of time, the dive computer should

-be listed (perhaps as one of a number of Bluetooth devices) in the main list

-box on the lefthand side of the dialogue (see image above). If this is not

-achieved, select the <em>Clear</em> button and then scan again for Bluetooth

-devices using the <em>Scan</em> button. After performing these actions <em>Subsurface</em>

-should see the dive computer.  The label of the discovered dive computer

-contains the name of the device, its address and its pairing status. If the

-device is not paired and has a red background colour, a context menu can be

-opened by selecting the item with a right-click.  Select the the <em>Pair</em>

-option and wait for the task to complete. If this dive computer is being

-paired to Subsurface for the first time, it is possible that Subsurface will

-request a Pass Code or PIN number. The most commonly-used Pass Code is 0000,

-and this works for the Shearwater Petrel. If necessary, consult the user

-manual of the dive computer being used.</p></div>

-<div class="sidebarblock">

-<div class="content">

-<div class="admonitionblock">

+</div></div>
+<div class="paragraph"><p>These files should be send to the <em>Subsurface</em> mail list:
+<em>subsurface@subsurface-divelog.org</em> with a request for the files to be
+analyzed. Provide the dive computer make and model as well as contextual
+information about the dives recorded on the dive computer.</p></div>
+</div></div>
+</div>
+<div class="sect3">
+<h4 id="S_Bluetooth">5.2.2. Connecting <em>Subsurface</em> to a Bluetooth-enabled dive computer</h4>
+<div class="paragraph"><p>Bluetooth is becoming a more common way of communication between dive
+computers and <em>Subsurface</em>, for or instance, the Shearwater Petrel Mk2 and
+the OSTC Mk3. <em>Subsurface</em> provides a largely operating system independent
+Bluetooth interface. Setting up <em>Subsurface</em> for Bluetooth communication
+requires four steps:</p></div>
+<div class="ulist"><ul>
+<li>
+<p>
+Be sure Bluetooth is activated on the host computer running <em>Subsurface</em>.
+</p>
+</li>
+<li>
+<p>
+Be sure <em>Subsurface</em> sees the Bluetooth adapter on the host computer.
+</p>
+</li>
+<li>
+<p>
+Be sure the Bluetooth-enabled dive computer is Bluetooth-discoverable and in
+  PC upload mode.
+</p>
+</li>
+<li>
+<p>
+Be sure <em>Subsurface</em> is paired with the Bluetooth-enabled dive computer.
+</p>
+</li>
+</ul></div>
+<div class="paragraph"><p>Select the Download dialogue by selecting <em>Import &#8594; 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>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/DC_import_Bluetooth.jpg" alt="FIGURE: Download Bluetooth" />
+</div>
+</div>
+<div class="paragraph"><p>On the <em>Linux</em> or <em>MacOS</em> platforms the name of the <em>Subsurface</em> computer
+and its Bluetooth address are shown on the right hand side, On the left hand
+side, if the computer has connected more than one local Bluetooth devices
+the user can use the list box to indicate which one needs to connect to
+<em>Subsurface</em>.  The power state (on/off) of the Bluetooth adapter is shown
+below the address and can be changed by checking the <em>Turn on/off</em> box.  If
+the Bluetooth address is not shown, then <em>Subsurface</em> does not see the local
+Bluetooth device. Be sure the Bluetooth driver is installed correctly on the
+<em>Subsurface</em> computer and check if it can be used by other Bluetooth
+utilities like <em>bluetoothctl</em> or <em>bluemoon</em>. This finishes the first two
+steps above.  Be sure the Bluetooth-enabled dive computer is in PC-upload
+mode and it is discoverable by other Bluetooth devices. Consult the manual
+of the dive computer for more information. Now the third item in the list
+above has been finished.  Select the <em>Scan</em> button towards the bottom left
+of the dialogue above. After searching, the dive computer should be listed
+(perhaps as one of a number of Bluetooth devices) in the main list box on
+the lefthand side of the dialogue (see image above). If this does not work,
+select the <em>Clear</em> button, then scan again for Bluetooth devices using the
+<em>Scan</em> button. After taking these actions <em>Subsurface</em> should see the dive
+computer.  The label of the discovered dive computer contains the name of
+the device, its address and its pairing status. If the device is not paired
+and has a red background color, a context menu can be opened by selecting
+the item with a right-click.  Select the the <em>Pair</em> option and wait for the
+task to complete. If this dive computer is being paired to Subsurface for
+the first time, it’s possible Subsurface will request a Pass Code or PIN
+number. The most commonly-used Pass Code is 0000, and this works for the
+Shearwater Petrel. If necessary, consult the user manual of the dive
+computer being used.</p></div>
+<div class="sidebarblock">
+<div class="content">
+<div class="admonitionblock">
 <table><tr>

 <td class="icon">

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

@@ -1122,53 +1081,51 @@ Default agent request successful
 Attempting to pair with 00:80:25:49:6C:E3

 [CHG] Device 00:80:25:49:6C:E3 Connected: yes

 Request PIN code

-[agent] Enter PIN code: 0000</code></pre>

-</div></div>

-</div></div>

-<div class="paragraph"><p>After the devices are paired the <em>Save</em> button of the dialogue can be

-pressed.  This 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;">

+[agent] Enter PIN code: 0000</code></pre>
+</div></div>
+</div></div>
+<div class="paragraph"><p>After the devices are paired, press the <em>Save</em> button of the dialogue.  This
+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 class="sect4">
+<h5 id="_sur_windows">Sur Windows :</h5>
+<div class="imageblock" style="text-align:center;">
 <div class="content">

 <img src="images/DC_import_Bluetooth_Windows.png" alt="FIGURE: Download Bluetooth on Windows" />

-</div>

-</div>

-<div class="paragraph"><p>On <em>Windows</em> platforms the <em>Local Bluetooth device details section</em> on the

-right is not displayed as is the case on the Linux/Mac implementations.  To

-successfully initiate a scan (by pressing the <em>Scan</em> button)  check that the

-Bluetooth device on the <em>Subsurface</em> computer is turned on by selecting the

-dive computer from the list of available Bluetooth devices (see image

-above). If the dive computer is accessed by Subsurface for the first time,

-it is possible that Subsurface will request a Pass Code/PIN number. Supply

-the Pass Code recommended in the user manual of the dive computer.  A Pass

-Code of 0000 is often appropriate.</p></div>

-<div class="paragraph"><p>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

-permissions and put a message on the right side of the screen: <em>Add a

-device, Tap to set up your DC device</em>. Always allow this pairing. After a

-discovered item is selected, select the <em>Save</em> button.  Finally select the

-<em>Download</em> button on the <em>Download</em> dialogue and wait for the process to

-complete.</p></div>

-<div class="admonitionblock">

-<table><tr>

-<td class="icon">

+</div>
+</div>
+<div class="paragraph"><p>On <em>Windows</em> platforms the <em>Local Bluetooth device details section</em> on the
+right is not displayed as is the case on the Linux/Mac systems.  To start a
+scan (by pressing the <em>Scan</em> button)  check that the Bluetooth device on the
+<em>Subsurface</em> computer is turned on by selecting the dive computer from the
+list of available Bluetooth devices (see image above). If the dive computer
+is being accessed by Subsurface for the first time, it’s possible Subsurface
+will request a Pass Code or PIN number. Supply the Pass Code recommended in
+the user manual of the dive computer.  A Pass Code or PIN of 0000 is often
+the default.</p></div>
+<div class="paragraph"><p>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
+permission and put a message on the right side of the screen: <em>Add a device,
+Tap to set up your DC device</em>. Always allow this pairing. After a discovered
+item is selected, select the <em>Save</em> button.  Finally select the <em>Download</em>
+button on the <em>Download</em> dialogue and wait for the process to complete.</p></div>
+<div class="admonitionblock">
+<table><tr>
+<td class="icon">
 <img src="images/icons/important.png" alt="Important" />

-</td>

-<td class="content">Currently <em>Subsurface</em> works only with local Bluetooth adapters which use

-Microsoft Bluetooth Stack. If the local device uses <em>Widcomm</em>, <em>Stonestreet

-One Bluetopia Bluetooth</em> or <em>BlueSoleil</em> drivers it will definitely not

-work. However, Bluetooth hardware/dongles from these manufacturers

-(e.g. iSonic) that support the Microsoft Bluetooth Stack do work.</td>

-</tr></table>

-</div>

-<div class="paragraph"><p>A log messageOn the bottom left of the <em>Remote Bluetooth device selection</em>

-shows details about the current status of the Bluetooth agent. To select

-another dive computer for download using the "Remote Bluetooth selection

-dialogue" press the three-dots button from the <em>"Choose Bluetooth download

+</td>
+<td class="content">Currently <em>Subsurface</em> works only with local Bluetooth adapters which use
+Microsoft Bluetooth Stack. If the local device uses <em>Widcomm</em>, <em>Stonestreet
+One Bluetopia Bluetooth</em> or <em>BlueSoleil</em> drivers it will not work. However,
+Bluetooth hardware/dongles from these manufacturers (e.g. iSonic) that
+support the Microsoft Bluetooth Stack do work.</td>
+</tr></table>
+</div>
+<div class="paragraph"><p>A log message on the bottom left of the <em>Remote Bluetooth device selection</em>
+shows details about the current status of the Bluetooth agent. To select
+another dive computer for download using the "Remote Bluetooth selection
+dialogue" press the three-dots button from the <em>"Choose Bluetooth download
 mode"</em> option.</p></div>

 <div class="admonitionblock">

 <table><tr>

@@ -1185,128 +1142,125 @@ with <em>Subsurface</em>.</td>
 </div>

 </div>

 </div>

-<div class="sect3">

-<h4 id="S_DeviceNames">5.2.3. Changing the name of a dive computer</h4>

-<div class="paragraph"><p>It may be necessary to distinguish between different dive computers used to

-upload dive logs to <em>Subsurface</em>. For instance if one&#8217;s partner&#8217;s dive

-computer is the same make and model as one&#8217;s own and dive logs are uploaded

-from both dive computers to the same <em>Subsurface</em> computer, then one would

-perhaps like to call one dc "Alice&#8217;s Suunto D4" and the other one "Bob&#8217;s

-Suunto D4". Alternatively, consider a technical diver dives with two or more

-dive computers of the same model, the logs of both (or all) being uploaded.

-In this case it might be prudent to call one of them "Suunto D4 (1)" and

-another one "Suunto D4 (2)". This is easily done in <em>Subsurface</em>.  On the

-<strong>Main Menu</strong>, select <em>Log &#8594; Edit device names</em>. A dialog opens, indicating

-the current Model, ID and Nickname of the dive computers used for

-upload. Edit the Nickname field for the appropriate dive computer. After

-saving the Nickname, the dive logs show the nickname for that particular

-device instead of the model name, allowing easy identification of devices.</p></div>

-</div>

-<div class="sect3">

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

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

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

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

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

-<div class="sect4">

-<h5 id="S_Notes_dc">Notes</h5>

-<div class="paragraph"><p>To have a more complete dive record the user needs to add additional

-information by hand. The procedure below is virtually identical for

-hand-entered dives and for dives downloaded from a dive computer.</p></div>

-<div class="paragraph"><p>In some cases, one has to provide the date and time of the dive, e.g. when

-entering a dive by hand or when a dive computer does not provide the date

-and time of the dive.  (Usually the date and time of the dive, gas mixture

-and water temperature are shown as obtained from the dive computer)  If the

-contents of the <strong>Notes tab</strong> is changed or edited in any way, the message in

-a blue box at the top of the panel indicates that the dive is being

-edited. If one clicks on the <strong>Notes</strong> tab, the following fields are visible

-(left hand image, below):</p></div>

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

-<div class="content">

+<div class="sect3">
+<h4 id="S_DeviceNames">5.2.3. Changing the name of a dive computer</h4>
+<div class="paragraph"><p>It may be necessary to distinguish between different dive computers used to
+upload dive logs to <em>Subsurface</em>. For instance if a buddy’s dive computer is
+the same make and model as your own and dive logs are uploaded from both
+dive computers to the same <em>Subsurface</em> computer, then you might like to
+call one "Alice&#8217;s Suunto D4" and the other "Bob&#8217;s Suunto D4". Alternatively,
+consider a technical diver who dives with two or more dive computers of the
+same model, the logs of both (or all) being uploaded.  In this case it might
+be prudent to call one of them "Suunto D4 (1)" and another "Suunto D4
+(2)". This is easily done in <em>Subsurface</em>.  On the <strong>Main Menu</strong>, select <em>Log
+&#8594; Edit device names</em>. A dialog box opens, showing the current Model, ID and
+Nickname of the dive computers used for upload. Edit the Nickname field for
+the appropriate dive computer. After saving the Nickname, the dive logs show
+the nickname for that particular device instead of the model name, allowing
+easy identification of devices.</p></div>
+</div>
+<div class="sect3">
+<h4 id="S_EditDiveInfo">5.2.4. Updating the dive information imported from the dive computer.</h4>
+<div class="paragraph"><p>With the uploaded dives in the <strong>Dive List</strong>, the information from the dive
+computer is not complete and more details must be added to have a full
+record of the dives. To do this, the <strong>Notes</strong> and the <strong>Equipment</strong> tabs on the
+top left hand of the <em>Subsurface</em> window should be used.</p></div>
+<div class="sect4">
+<h5 id="S_Notes_dc">Notes</h5>
+<div class="paragraph"><p>To have a more complete dive record, the user needs to add additional
+information by hand. The procedure below is virtually identical for
+hand-entered dives and for dives downloaded from a dive computer.</p></div>
+<div class="paragraph"><p>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
+date and time of the dive.  (Usually the date and time of the dive, gas
+mixture and water temperature are shown as obtained from the dive computer)
+If the contents of the <strong>Notes tab</strong> is changed or edited in any way, the
+message in a blue box at the top of the panel shows the dive is being
+edited. If you click on the <strong>Notes</strong> tab, the following fields are visible
+(left hand image, below):</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
 <img src="images/AddDive3_f22.jpg" alt="FIGURE: The Notes tab" />

 </div>

-</div>

-<div class="paragraph"><p>The right hand image, above, shows a <strong>Notes tab</strong> filled with dive

-information.  The <strong>Time</strong> field reflects the date and time of the dive. By

-clicking the date, a calendar is displayed from which one can choose the

-correct date. Press ESC to close the calendar.  The time values (hour and

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

-box and by over-typing the information displayed.</p></div>

-<div class="paragraph"><p><strong>Air/water temperatures</strong>: Air and water temperatures during the dive are shown

-in text boxes to the right of the Start time. Many dive computers supply water

-temperature information and this box may therefore contain information.

-If air temperature is not provided by the dive computer, the first temperature reading

-might be used for the air temperature. Generally this is close enough to the real air temperature as

-the change in the temperature sensor reading is quite slow to follow the changes in the environment.

-If editing is required, only a value is required, the units of temperature will be

-automatically supplied by

-<em>Subsurface</em> (following the <em>Preferences</em>, metric or imperial units will

+</div>
+<div class="paragraph"><p>The right hand image, above, shows a <strong>Notes tab</strong> filled with dive
+information.  The <strong>Time</strong> field reflects the date and time of the dive. By
+clicking the date, a calendar is displayed from which you can choose the
+correct date. Press ESC to close the calendar.  The time values (hour and
+minutes) can also be edited directly by clicking on each of them in the text
+box and by over-typing the information displayed.</p></div>
+<div class="paragraph"><p><strong>Air/water temperatures</strong>: Air and water temperatures during the dive are shown
+in text boxes to the right of the Start time. Many dive computers supply water
+temperature information and this box may have information.
+If air temperature isn’t provided by the dive computer, the first temperature reading
+might be used for the air temperature. Generally this is close to the real air temperature.
+If editing is required, only a value is required, the units of temperature will be
+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="admonitionblock">

 <table><tr>

 <td class="icon">

-<img src="images/icons/warning2.png" alt="Warning" />

-</td>

-<td class="content">Dive locations are managed as a <strong>separate</strong> part of the dive log.  The dive

-information in the <strong>Notes</strong> and <strong>Equipment</strong> tabs can therefore not be edited

-at the same time as the dive site information. Save all the other dive

-information (e.g.  divemaster, buddy, protective gear, notes about the dive)

-by selecting <em>Apply changes</em> on the <strong>Notes</strong> tab before editing the dive site

-information. Only then, supply a dive site name in the textbox labelled

-<em>Location</em> on the <strong>Notes</strong> tab.</td>

-</tr></table>

-</div>

-<div class="paragraph"><p>Type the name of the dive site, e.g. "Tihany, Lake Balaton, Hungary".  If

-several dives are performed at the same location, the dive site information

-for the first dive is re-used.  Existing dive location information can be

-edited at any time by selecting (on the <strong>Dive List</strong> panel) a dive performed

-at that site and by opening the location information by clicking the globe

-button on the right of the location name (see image on the right,

-above). When entering a dive location name, auto location of dive site names

-makes it easy to select an existing dive site name (i.e. when typing the

-name of a dive site, a dropdown list appears showing all sites with similar

-names). If the dive site has been used before, click on the already-existing

-name.  The dive site names in the dropdown list contain either a globe

-symbol (indicating existing dive sites in the <em>Subsurface</em> database)  or a

-<strong>+</strong> symbol (indicating dive site names that appear consistent with the

-current dive site name but which have not been added to the dive site

-database).  Therefore, if the present dive site has not been used before, a

-message appears as follows (image <strong>A</strong> below):</p></div>

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

-<div class="content">

-<img src="images/Locations1_f22.jpg" alt="FIGURE:Location description panel" />

-</div>

-</div>

-<div class="paragraph"><p>Doubleclick on the new dive site name. A panel appears to enter the

-coordinates and other important information about the site (image <strong>B</strong>,

-above). The most important items are the coordinates of the site. There are

-three ways of specifying the coordinates:</p></div>

-<div class="olist loweralpha"><ol class="loweralpha">

-<li>

-<p>

-One can find the coordinates on the world map in the bottom right hand part

-   of the <em>Subsurface</em> window. The map displays an orange bar indicating "No

-   location data - Move the map and double-click to set the dive

-   location". Upon a doubleclick at the appropriate place, the orange bar

-   disappears and the coordinates are stored.

-</p>

-</li>

-<li>

-<p>

-The coordinates can be obtained from the <em>Subsurface</em> Companion app if the

-   user has an Android or iPhone device with GPS and if the coordinates of the

-   dive site were stored using that device.  <a href="#S_Companion">Click here for

-   more information</a>

-</p>

-</li>

-<li>

-<p>

-The coordinates can be entered by hand if they are known, using one of four

-   formats with latitude followed by longitude:

-</p>

-<div class="literalblock">

-<div class="content">

+<img src="images/icons/warning2.png" alt="Warning" />
+</td>
+<td class="content">Dive locations are managed as a <strong>separate</strong> part of the dive log.  The dive
+information in the <strong>Notes</strong> and <strong>Equipment</strong> tabs can therefore NOT be edited
+at the same time as the dive site information. Save all the other dive
+information (e.g.  divemaster, buddy, protective gear, notes about the dive)
+by selecting <em>Apply changes</em> on the <strong>Notes</strong> tab BEFORE editing the dive site
+information. Then supply a dive site name in the textbox labelled <em>Location</em>
+on the <strong>Notes</strong> tab.</td>
+</tr></table>
+</div>
+<div class="paragraph"><p>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
+first dive is re-used.  Existing dive locations can be edited by selecting
+(on the <strong>Dive List</strong> panel) a dive done at that site and by opening the
+location information. Click the globe button on the right of the location
+name (see image on the right, above). When entering a dive location name,
+auto location of dive site names makes it easy to select an existing dive
+site name.  When typing the name of a dive site, a dropdown list appears
+showing all sites with similar names. If the dive site has been used before,
+click on the already-existing name.  The dive site names in the dropdown
+list contain either a globe symbol (indicating existing dive sites in the
+<em>Subsurface</em> database)  or a <strong>+</strong> symbol (indicating dive site names that
+appear consistent with the current dive site name but which haven’t been
+added to the dive site database).  If the present dive site has not been
+used before, a message appears as follows (image <strong>A</strong> below):</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/Locations1_f22.jpg" alt="FIGURE:Location description panel" />
+</div>
+</div>
+<div class="paragraph"><p>Doubleclick on the new dive site name. A panel appears to enter the
+coordinates and other information about the site (image <strong>B</strong>, above). The
+most important items are the coordinates of the site. There are three ways
+to specify coordinates:</p></div>
+<div class="olist loweralpha"><ol class="loweralpha">
+<li>
+<p>
+Use the world map in the bottom right hand part of the <em>Subsurface</em>
+   window. The map displays an orange bar indicating "No location data - Move
+   the map and double-click to set the dive location". Doubleclick at the
+   appropriate place, and the orange bar disappears and the coordinates are
+   stored.
+</p>
+</li>
+<li>
+<p>
+Use the <em>Subsurface</em> Companion app if you have an Android or iPhone device
+   with GPS and if the dive site coordinates were stored using it.
+   <a href="#S_Companion">Click here for more information</a>
+</p>
+</li>
+<li>
+<p>
+Enter by hand if the coordinates are known, using one of four formats with
+   latitude followed by longitude:
+</p>
+<div class="literalblock">
+<div class="content">
 <pre><code>ISO 6709 Annex D format e.g. 30°13'28.9"N 30°49'1.5"E Degrees and decimal

 minutes, e.g. N30° 13.49760' , E30° 49.30788' Degrees minutes seconds,

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

@@ -1315,108 +1269,106 @@ e.g. N30° 13' 29.8" , E30° 49' 1.5" Decimal degrees, e.g. 30.22496 ,
 </li>

 </ol></div>

 <div class="paragraph"><p>Southern hemisphere latitudes are given with a <strong>S</strong>, e.g. S30°, or with a

-negative value, e.g. -30.22496. Similarly western longitudes are given with

-a <strong>W</strong>, e.g. W07°, or with a negative value, e.g. -7.34323. Some keyboards

-don&#8217;t have the degree sign (°). It can be replaced by a <strong>d</strong> like this: N30d

-W20d.  If both a dive site name and coordinates have been provided, Save the

-dive site information by selecting the button <em>Apply changes</em> at the top of

-the panel.</p></div>

-<div class="paragraph"><p><strong>Important</strong>: GPS coordinates of a dive site are linked to the Location

-name - so <strong>saving</strong> a dive site with only coordinates and no dive site name

-causes unexpected behaviour (Subsurface will think that all of these

-dives have the same location and try to keep their GPS coordinates the

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

-<div class="paragraph"><p><strong>Dive site name lookup:</strong> If coordinates have been typed into the appropriate

-text box, one can perform an automated name lookup based on the coordinates.

-This is achieved when <em>Subsurface</em> uses the Internet to find the name of the dive site

-based on the coordinates that were typed. If a name has been found, it is

-automatically inserted into the tags box. The list box

-(Titled <em>Dive sites on same coordinates</em>") at the bottom

-of the dive site panel contains the names of other dives sites used at the

-current location. For instance if the dive site is "Blue Hole" and there are several

-dive sites named "Blue Hole", all these sites are listed in this list box.</p></div>

-<div class="paragraph"><p>Enter any other textual information about the dive site (Description and

-Notes), then select <em>Apply Changes</em> to save the geolocation for this dive

-site. At a later stage the dive site information can be edited by clicking

-the globe icon to the right of the dive site name in the <strong>Notes tab</strong>.</p></div>

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

-performed. The options are OC (Open Circuit SCUBA, the default seting, meant for most recreational dives),

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

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

-<div class="paragraph"><p><strong>Divemaster</strong>: The name of the dive master or dive guide for this dive should be

-entered in this field

-which offers auto selection based on the list of dive masters in

-the current logbook.</p></div>

-<div class="paragraph"><p><strong>Buddy</strong>: In this field, one enters the name(s) of the buddy / buddies

-(separated with commas) who accompanied him/her on the

-dive. Auto selection based on the list of buddies in the current logbook is

-offered.</p></div>

-<div class="paragraph"><p><strong>Suit</strong>: Here the type of dive suit used can be entered.

-Auto selection of the suit description is available.

-Some dry-suit users may choose to use this field to record what combination of

-suit and thermal undersuit was used.</p></div>

-<div class="paragraph"><p><strong>Rating</strong>: One can provide a subjective overall rating of the dive on a

-5-point scale by clicking the appropriate star on the rating scale.</p></div>

-<div class="paragraph"><p><strong>Visibility</strong>: Similarly, one can provide a rating of visibility during the

-dive on a

-5-point scale by clicking the appropriate star.</p></div>

-<div class="paragraph"><p><strong>Tags</strong>: Tags that describe the type of dive performed can be entered

-here (separated by commas). Examples of common tags are boat, drift, training,

-cave, etc.

-<em>Subsurface</em> has many built-in tags. If the user starts typing a tag, the

-program

-will list the tags that correspond to the typing. For instance, if the user

-typed

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

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

-<div class="paragraph"><p>The <em>Apply changes</em> and <em>Discard changes</em> buttons are used to save all the

-information for tabs in the <strong>Info</strong> panel and in the <strong>Dive Profile</strong> panel, so

-there&#8217;s no need to use them until <strong>ALL</strong> other information has been

-added. The image <a href="#S_Notes_dc">at the beginning of this section</a> shows an

-example of a <strong>Notes tab</strong> after completion of the dive information.</p></div>

-</div>

-<div class="sect4">

-<h5 id="_equipment">Equipment</h5>

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

-and gas used as well as the weights used for the dive. The message in a blue

-box at the top of the panel:</p></div>

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

-<div class="content">

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

-</div>

-</div>

-<div class="paragraph"><p>indicates that the dive is being edited. This is a highly interactive part

-of <em>Subsurface</em> and the information on cylinders and gases (entered here)

-determines the behaviour of the <strong>Dive profile</strong> (top right-hand panel).</p></div>

-<div class="paragraph" id="cylinder_definitions"><p><strong>Cylinders</strong>: The cylinder information is entered through a dialogue that looks

-like this:</p></div>

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

+negative value, e.g. -30.22496. Similarly western longitudes are given with
+a <strong>W</strong>, e.g. W07°, or with a negative value, e.g. -7.34323. Some keyboards
+don&#8217;t have the degree sign (°). It can be replaced by a <strong>d</strong> like this: N30d
+W20d.  If both a dive site name and coordinates have been provided, save the
+dive site information by selecting the button <em>Apply changes</em> at the top of
+the panel.</p></div>
+<div class="paragraph"><p><strong>Important</strong>: GPS coordinates of a dive site are linked to the location
+name - so <strong>saving</strong> a dive site with only coordinates and no name
+causes problems. (Subsurface will think all of these
+dives have the same location and try to keep their GPS coordinates the
+same).</p></div>
+<div class="paragraph"><p><strong>Dive site name lookup:</strong> If coordinates have been typed into the appropriate
+text box, you can do an automated name lookup based on the coordinates.
+This is done when <em>Subsurface</em> uses the Internet to find the name of the dive site
+based on the coordinates that were typed. If a name has been found, it is
+automatically inserted into the tags box. The list box
+(Titled <em>Dive sites on same coordinates</em>") at the bottom
+of the dive site panel contains the names of other dives sites used at the
+current location. For instance if the dive site is "Blue Hole" and there are several
+sites named "Blue Hole", all of them are listed.</p></div>
+<div class="paragraph"><p>Enter any other contextual information about the dive site (Description and
+Notes), then select <em>Apply Changes</em> to save the geolocation for this dive
+site.  The dive site information can later be edited by clicking the globe
+icon to the right of the dive site name in the <strong>Notes tab</strong>.</p></div>
+<div class="paragraph"><p><strong>Dive mode</strong>: This is a dropdown box allowing you to choose the type of dive
+performed. The options are OC (Open Circuit SCUBA, the default setting, for most recreational dives),
+Freedive (dive without SCUBA equipment), CCR (Closed-circuit
+rebreather) and pSCR (Passive semi-closed rebreather).</p></div>
+<div class="paragraph"><p><strong>Divemaster</strong>: The name of the divemaster or dive guide should be
+entered in this field
+which offers auto selection based on the list of dive masters in
+the current logbook.</p></div>
+<div class="paragraph"><p><strong>Buddy</strong>: In this field, enter the name(s) of the buddy or buddies
+(separated with commas) who were on the
+dive. Auto selection based on the list of buddies in the current logbook is
+offered.</p></div>
+<div class="paragraph"><p><strong>Suit</strong>: Here the type of dive suit used can be entered.
+Auto selection of the suit description is available.
+Some dry-suit users may choose to use this field to record what combination of
+suit and thermal under suit was used.</p></div>
+<div class="paragraph"><p><strong>Rating</strong>: You can provide a subjective overall rating of the dive on a
+5-point scale by clicking the appropriate star on the rating scale.</p></div>
+<div class="paragraph"><p><strong>Visibility</strong>: You can provide a rating of visibility during the
+dive on a
+5-point scale by clicking the appropriate star.</p></div>
+<div class="paragraph"><p><strong>Tags</strong>: Tags that describe the type of dive done can be entered
+here (separated by commas). Examples of common tags are boat, drift, training,
+cave, etc.
+<em>Subsurface</em> has many built-in tags. If you starts typing a tag, the
+program
+will list the tags that correspond to the typing. For instance, by typing
+<code>cav</code>, the tags <strong>cave</strong> and <strong>cavern</strong> are shown to choose from.</p></div>
+<div class="paragraph"><p><strong>Notes</strong>: Any additional information for the dive can be entered here.</p></div>
+<div class="paragraph"><p>The <em>Apply changes</em> and <em>Discard changes</em> buttons are used to save all the
+information for tabs in the <strong>Info</strong> panel and in the <strong>Dive Profile</strong>
+panel. Use them when <strong>ALL</strong> other information has been added. The image
+<a href="#S_Notes_dc">at the beginning of this section</a> shows an example of a
+<strong>Notes tab</strong> after completing the dive information.</p></div>
+</div>
+<div class="sect4">
+<h5 id="_equipment">Equipment</h5>
+<div class="paragraph"><p>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
+box at the top of the panel:</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/BlueEditBar_f22.jpg" alt="FIGURE: Blue edit bar" />
+</div>
+</div>
+<div class="paragraph"><p>shows the dive is being edited. This is a highly interactive part of
+<em>Subsurface</em> and the information on cylinders and gases (entered here)
+determines the behavior of the <strong>Dive profile</strong> (top right-hand panel).</p></div>
+<div class="paragraph" id="cylinder_definitions"><p><strong>Cylinders</strong>: The cylinder information is entered through a dialogue that looks
+like this:</p></div>
+<div class="imageblock" style="text-align:center;">
 <div class="content">

 <img src="images/DC_gas-dialogue1_f20.jpg" alt="FIGURE: Initial cylinder dialogue" />

-</div>

-</div>

-<div class="paragraph"><p>For hand-entered dives, this information needs to be typed in. For dive

-computers, <em>Subsurface</em> often obtains the gas used from the dive computer

-and automatically inserts the gas composition(% oxygen or % helium) in the

-table. The + button at the top right allows the user to add more cylinders

-for this dive. The dark dustbin icon on the left allows the deletion of

-information for a cylinder.  Note that it is not possible to delete a

-cylinder if it is used during the dive. A cylinder might be implicitly used

-in the dive, even without a gas change event.</p></div>

-<div class="paragraph"><p>The user should start by selecting a cylinder type on the left-hand side of

-the table.  To select a cylinder, the <em>Type</em> box should be clicked. This

-brings up a list button that can be used to display a dropdown list of

-cylinders:</p></div>

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

-<div class="content">

-<img src="images/DC_gas-dialogue2_f20.jpg" alt="FIGURE: The cylinder drop-down list button" />

-</div>

-</div>

-<div class="paragraph"><p>The drop-down list can then be used to select the cylinder type that was

-used for this dive or the user may start typing in the box which shows the

-available options for the entered characters. The <strong>Size</strong> of the cylinder as

-well as its working pressure (<em>Work.press</em>) will automatically be shown in

-the dialogue.</p></div>

+</div>
+</div>
+<div class="paragraph"><p>For hand-entered dives, this information needs to be typed in. For dive
+computers, <em>Subsurface</em> often gets the gas used from the dive computer and
+automatically inserts the gas composition(% oxygen or % helium) in the
+table. The + button at the top right lets you add more cylinders for this
+dive. The dark dust bin icon on the left lets you delete information for a
+cylinder.  Note that it is not possible to delete a cylinder if it is used
+during the dive. A cylinder might be implicitly used in the dive, even
+without a gas change event.  Start by selecting a cylinder type on the
+left-hand side of the table.  To select a cylinder, the <em>Type</em> box should be
+clicked. This brings up a list button that can be used to display a dropdown
+list of cylinders:</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/DC_gas-dialogue2_f20.jpg" alt="FIGURE: The cylinder drop-down list button" />
+</div>
+</div>
+<div class="paragraph"><p>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
+available options for the entered characters. The <strong>Size</strong> of the cylinder as
+well as its working pressure (<em>Work.press</em>) will automatically be shown in
+the dialogue.</p></div>
 <div class="paragraph"><p>Next, indicate the starting pressure and the ending pressure of the

 specified gas during the dive. The unit of pressure (metric/imperial)

 corresponds to the settings chosen in the <em>Preferences</em>.</p></div>

@@ -1424,22 +1376,22 @@ corresponds to the settings chosen in the <em>Preferences</em>.</p></div>
 be entered or this field can be left blank. If nitrox or trimix were used,

 their percentages of oxygen and/or helium should be entered.  Any

 inappropriate fields should be left empty. After typing the information for

-the cylinder, save the data either by pressing <em>ENTER</em> on the keyboard or by

-clicking outside the cell containing the cursor. Information for any

-additional cylinders can be added by using the + button at the top right

-hand. Following is an example of a complete description for a dive using two

-cylinders (air and EAN50):</p></div>

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

-<div class="content">

-<img src="images/CylinderDataEntry3_f20.jpg" alt="FIGURE: a completed cylinder dive information table" />

-</div>

-</div>

-<div class="paragraph"><p><strong>Weights</strong>: Information about the weight system used can be entered

-using a dialogue very similar to that of the cylinder information. If one

-clicks

-the + button on the top right of the weights dialogue, the table looks like

-this:</p></div>

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

+the cylinder, save the data either by pressing <em>ENTER</em> on the keyboard or by
+clicking outside the cell containing the cursor. Information for any
+additional cylinders can be added by using the + button at the top right
+hand. The following is an example of a complete description for a dive using
+two cylinders (air and EAN50):</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/CylinderDataEntry3_f20.jpg" alt="FIGURE: a completed cylinder dive information table" />
+</div>
+</div>
+<div class="paragraph"><p><strong>Weights</strong>: Information about the weight system used can be entered
+using a dialogue similar to that of the cylinder information. If you
+click
+the + button on the top right of the weights dialogue, the table looks like
+this:</p></div>
+<div class="imageblock" style="text-align:center;">
 <div class="content">

 <img src="images/WeightsDataEntry1_f20.jpg" alt="FIGURE:The Weights dialogue" />

 </div>

@@ -1449,53 +1401,53 @@ a down-arrow:</p></div>
 <div class="imageblock" style="text-align:center;">

 <div class="content">

 <img src="images/WeightsDataEntry2_f20.jpg" alt="FIGURE:Weights type drop-down list button" />

-</div>

-</div>

-<div class="paragraph"><p>This can be used to select the type of weight system used during the dive or

-the user may start typing in the box to specify a different weighting

-mechanism that will be saved by <em>Subsurface</em>.  In the <strong>Weight</strong> field, type

-in the amount of weight used during the dive. After specifying the weight

-system, save the data by either pressing <em>ENTER</em> on the keyboard or by

-clicking outside the cell with the cursor.  It is possible to enter

-information for more than one weight system by adding an additional system

-using the + button on the top right hand. Weight systems can be deleted

-using the dustbin icon on the left hand. Here is an example of information

-for a dive with two types of weights: integrated as well as a weight belt:</p></div>

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

-<div class="content">

-<img src="images/WeightsDataEntry3_f20.jpg" alt="FIGURE: A completed weights information table" />

-</div>

-</div>

-</div>

-</div>

-<div class="sect3">

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

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

-each uploaded dive is shown in the <strong>Dive profile</strong> tab, as well as a few

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

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

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

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

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

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

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

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

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

-fields that need identical information. This is achieved by editing the dive

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

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

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

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

-editing the dives simultaneously. Technically, the rule for editing several

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

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

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

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

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

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

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

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

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

+</div>
+</div>
+<div class="paragraph"><p>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
+that will be saved by <em>Subsurface</em>.  In the <strong>Weight</strong> field, type in the
+amount of weight used during the dive. After specifying the weight system,
+save the data by pressing <em>ENTER</em> on the keyboard or by clicking outside the
+cell with the cursor.  It’s possible to enter information for more than one
+weight system by adding an additional system using the + button on the top
+right hand. Weight systems can be deleted using the dust bin icon on the
+left hand. Here is an example of information for a dive with two types of
+weights: integrated as well as a weight belt:</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/WeightsDataEntry3_f20.jpg" alt="FIGURE: A completed weights information table" />
+</div>

+</div>

+</div>

+</div>

+<div class="sect3">
+<h4 id="_editing_several_selected_dives_simultaneously">5.2.5. Editing several selected dives simultaneously</h4>
+<div class="paragraph"><p><em>METHOD 1</em>: After uploading dives from a dive computer, the dive profiles of
+each is shown in the <strong>Dive profile</strong> tab, as well as a few items of
+information in the <strong>Notes</strong> tab (e.g. water temperature) and in the
+<strong>Equipment</strong> tab (e.g. gas pressures and gas composition). Other fields
+remain empty.  It may be useful to simultaneously edit some of the fields in
+the <strong>Notes</strong> and <strong>Equipment</strong> tabs.  For instance, it’s possible that a diver
+performed several dives during a single day, using identical equipment at
+the same dive site, or with the same divemaster and/or buddy or
+tags. Instead of completing the information for each dive separately, select
+all the dives for that day in the <strong>Dive List</strong> and insert the same
+information in the <strong>Notes</strong> and <strong>Equipment</strong> fields that need identical
+information. This is done by editing the dive notes or the equipment for any
+one of the selected dives.</p></div>
+<div class="paragraph"><p>Simultaneous editing only works with fields that do not already contain
+information.  This means if some fields have been edited for a particular
+dive among the selected dives, these are not changed while editing the dives
+simultaneously. Technically, the rule for editing several dives
+simultaneously is: if the data field being edited contains <em>exactly the same
+information</em> for all the dives that have been selected, the new, edited
+information is substituted for all the selected dives. Otherwise only the
+edited dive is changed, even though several dives have been selected in the
+<strong>Dive List</strong>. This speeds up the completion of the dive log after several
+similar dives.</p></div>
+<div class="paragraph" id="S_CopyComponents"><p><em>METHOD 2</em>:There is a different way of achieving the same goal. Select a
+dive with all the appropriate information typed into the <strong>Notes</strong> and
+<strong>Equipment</strong> tabs. Then, from the main menu, select <em>Log &#8594; Copy dive
 components</em>.  A box is presented with a selection of check boxes for most of

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

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

@@ -1503,22 +1455,21 @@ List</strong>, select the dives into which this information is to be pasted. The
 from the main menu, select <em>Log &#8594; Paste dive components</em>.  All the selected

 dives now contain the data initially selected in the original source dive

 log.</p></div>

-</div>

-<div class="sect3">

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

-<div class="paragraph"><p>Many divers wish to annotate their dives with text that indicate particular

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

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

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

-<li>

-<p>

-Right-click at the appropriate point on the dive profile.  This brings up

-   the dive profile context menu. Select <em>Add bookmark</em>. A red flag is placed

-   on the dive profile at the point that was initially selected (see <strong>A</strong>

-   below).

-</p>

-</li>

-<li>

+</div>
+<div class="sect3">
+<h4 id="_adding_bookmarks_to_a_dive">5.2.6. Adding Bookmarks to a dive</h4>
+<div class="paragraph"><p>Many divers wish to annotate dives with text that indicate particular
+events, e.g. "Saw dolphins", or "Released surface buoy". This is easily
+done:</p></div>
+<div class="ulist"><ul>
+<li>
+<p>
+Right-click at the appropriate point on the dive profile.  This brings up
+   the dive profile context menu. Select <em>Add bookmark</em>. A red flag is placed
+   on the dive profile at that point (see <strong>A</strong> below).
+</p>
+</li>
+<li>
 <p>

 Right-click on the red flag. This brings up the context menu (see <strong>B</strong>

    below). Select <em>Edit name</em>.

@@ -1529,14 +1480,14 @@ Right-click on the red flag. This brings up the context menu (see <strong>B</str
 A text box is shown. Type the explanatory text for the bookmark (see <strong>C</strong>

    below). Select <em>OK</em>.  This saves the text associated with the bookmark.

 </p>

-</li>

-<li>

-<p>

-If one hovers using the mouse over the red bookmark, the appropriate text is

-   shown at the bottom of the information box (see <strong>D</strong> below).

-</p>

-</li>

-</ul></div>

+</li>
+<li>
+<p>
+Hovering the mouse over the red bookmark, the appropriate text is shown at
+   the bottom of the information box (see <strong>D</strong> below).
+</p>
+</li>
+</ul></div>
 <div class="imageblock" style="text-align:center;">

 <div class="content">

 <img src="images/Bookmarks.jpg" alt="FIGURE: Bookmark dialog" />

@@ -1545,61 +1496,58 @@ If one hovers using the mouse over the red bookmark, the appropriate text is
 </div>

 <div class="sect3">

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

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

-saved by using the two buttons on the top right hand of the <strong>Notes</strong> tab. If

-the <em>Apply changes</em> button is clicked, the dive data are saved in the memory

-image of the dive. If the <em>Discard changes</em> button is clicked, then the

-newly entered dive data are erased from the computer memory, although the

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

-prompt to confirm that the new data should now be saved permanently on the

-computer disk.</p></div>

-</div>

-</div>

-<div class="sect2">

-<h3 id="_importer_les_informations_à_partir_d_8217_autres_sources_de_données_numériques_ou_d_8217_autres_formats_de_données">5.3. Importer les informations à partir d&#8217;autres sources de données numériques ou d&#8217;autres formats de données</h3>

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

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

-retyping because these dive logs can probably be imported into

-<em>Subsurface</em>. <em>Subsurface</em> will import dive logs from a range of other dive

-log software. While some software is supported natively, for others the user

-has to export the logbook(s) to an intermediate format so that they can then

-be imported by <em>Subsurface</em>.  Currently, <em>Subsurface</em> supports importing CSV

-log files from several sources.  APD LogViewer, XP5, Sensus and Seabear

-files are preconfigured, but because the import is flexible, users can

-configure their own imports.  Manually kept log files (e.g. a spreadsheet)

-can also be imported by configuring the CSV import.  <em>Subsurface</em> can also

-import UDDF and UDCF files used by some divelog software and some dive

-computers, like the Heinrichs &amp; Weikamp DR5. Finally, for some divelog

-software like Mares Dive Organiser it is currently suggested to import the

-logbooks first into a webservice like <em>divelogs.de</em> and then import them

-from there with <em>Subsurface</em>, as divelogs.de supports a few additional

-logbook formats that <em>Subsurface</em> currently cannot parse.</p></div>

-<div class="paragraph"><p>If the format of other software is supported natively on Subsurface, it

-should be sufficient to select either <em>Import &#8594; Import log files</em> or <em>File

-&#8594; Open log file</em>. <em>Subsurface</em> supports the data formats of many dive

-computers, including Suunto and Shearwater. When importing dives,

-<em>Subsurface</em> tries to detect multiple records for the same dive and merges

-the information as best as it can. If there are no time zone issues (or

-other reasons that would cause the beginning time of the dives to be

-significantly different) <em>Subsurface</em> will not create duplicate

-entries. Below follows more specific information to achieve data import to

-<em>Subsurface</em>.</p></div>

-<div class="sect3">

-<h4 id="_using_the_universal_import_dialogue">5.3.1. Using the universal import dialogue</h4>

-<div class="paragraph" id="Unified_import"><p>Importing dives from other software is performed through a universal

-interface activated by selecting <em>Import</em> from the Main Menu, then clicking

-on <em>Import Log Files</em>. This brings up dialogue <strong>A</strong>, below.</p></div>

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

-<div class="content">

-<img src="images/Import1_f20.jpg" alt="FIGURE: Import dialogue: step 1" />

-</div>

-</div>

-<div class="paragraph"><p>Towards the bottom right is a dropdown selector with a default label of

-<em>Dive Log Files</em> which gives access to the different types of direct imports

-available, as in dialogue <strong>B</strong>, above. Currently these are:</p></div>

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

-<li>

-<p>

+<div class="paragraph"><p>The information entered in the <strong>Notes</strong> tab and the <strong>Equipment</strong> tab can be
+saved by using the two buttons on the top right hand of the <strong>Notes</strong> tab. If
+the <em>Apply changes</em> button is clicked, the dive data are saved in the memory
+image of the dive. If the <em>Discard changes</em> button is clicked, the newly
+entered dive data are erased from the computer memory, although the dive
+profile is retained. When the user exits <em>Subsurface</em> there is a final
+prompt to confirm the new data should now be saved permanently on the
+computer disk.</p></div>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_importer_les_informations_à_partir_d_8217_autres_sources_de_données_numériques_ou_d_8217_autres_formats_de_données">5.3. Importer les informations à partir d&#8217;autres sources de données numériques ou d&#8217;autres formats de données</h3>
+<div class="paragraph" id="S_ImportingAlienDiveLogs"><p>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
+<em>Subsurface</em>. <em>Subsurface</em> will import dive logs from a range of other dive
+log software. While some software is supported natively, for others you will
+need to export the logbook(s) to an intermediate format so they can then be
+imported by <em>Subsurface</em>.  Currently, <em>Subsurface</em> supports importing CSV
+log files from several sources.  APD LogViewer, XP5, Sensus and Seabear
+files are preconfigured, but because the import is flexible, users can
+configure their own imports.  Manually kept log files (e.g. a spreadsheet)
+can also be imported by configuring the CSV import.  <em>Subsurface</em> can also
+import UDDF and UDCF files used by some dive log software and some dive
+computers, like the Heinrichs &amp; Weikamp DR5. Finally, for some dive log
+software like Mares Dive Organizer we currently recommend you import the
+logbooks first into a web service like <em>divelogs.de</em> and then import from
+there with <em>Subsurface</em>. Divelogs.de supports a few additional logbook
+formats that <em>Subsurface</em> currently cannot handle.</p></div>
+<div class="paragraph"><p>If the format of other software is supported natively on Subsurface, select
+either <em>Import &#8594; Import log files</em> or <em>File &#8594; Open log file</em>. <em>Subsurface</em>
+supports the data formats of many dive computers, including Suunto and
+Shearwater. When importing dives, <em>Subsurface</em> tries to detect multiple
+records for the same dive and merges the information as best as it can. If
+there are no time zone issues (or other reasons that would cause the
+beginning time of the dives to be significantly different) <em>Subsurface</em> will
+not create duplicate entries. Below is more specific information to import
+data to <em>Subsurface</em>.
+==== Using the universal import dialogue</p></div>
+<div class="paragraph" id="Unified_import"><p>Importing dives from other software is done through a universal interface
+activated by selecting <em>Import</em> from the Main Menu, then clicking on <em>Import
+Log Files</em>. This brings up dialogue <strong>A</strong>, below.</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/Import1_f20.jpg" alt="FIGURE: Import dialogue: step 1" />
+</div>
+</div>
+<div class="paragraph"><p>Towards the bottom right is a dropdown selector with a default label of
+<em>Dive Log Files</em> which accesses different types of direct imports available,
+as in dialogue <strong>B</strong>, above. Currently these are:</p></div>
+<div class="ulist"><ul>
+<li>
+<p>
 XML-formatted dive logs (DivingLog 5.0, MacDive and several other dive log

    systems)

 </p>

@@ -1658,132 +1606,132 @@ Suunto Dive Manager (DM3 and DM4)
 <p>

 CSV (text-based and spreadsheet-based) dive logs, including APD CCR logs

 </p>

-</li>

-</ul></div>

-<div class="paragraph"><p>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

-imported dive log in the <em>Subsurface</em> <strong>Dive List</strong>. Some other formats, not

-accessible through the Import dialogue are also supported, as explained

-below.</p></div>

-</div>

-<div class="sect3">

-<h4 id="_importing_from_ostctools">5.3.2. Importing from  OSTCTools</h4>

-<div class="paragraph"><p><em>OSTC Tools</em> is a Microsoft-based suite of dive download and dive management

-tools for the OSTC family of dive computers. <em>OSTC Tools</em> downloads dive

-data from the dive computer and stores it as a binary file with file

+</li>
+</ul></div>
+<div class="paragraph"><p>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
+imported dive log in the <em>Subsurface</em> <strong>Dive List</strong>. Some other formats not
+accessible through the Import dialogue are also supported, as explained
+below.</p></div>
+<div class="sect3">
+<h4 id="_importing_from_ostctools">5.3.1. Importing from  OSTCTools</h4>
+<div class="paragraph"><p><em>OSTC Tools</em> is a Microsoft-based suite of dive download and dive management
+tools for the OSTC family of dive computers. <em>OSTC Tools</em> downloads dive
+data from the dive computer and stores it as a binary file with file
 extension <em>.dive</em> . Subsurface can directly import these files when using

 the universal import dialogue. From the dropdown list at the bottom right

-select <em>OSTCTools Files (.dive .DIVE)</em>. This makes the <em>OSTC Tools</em> dive

-logs visible in the file list panel. Select one or more dive, then click the

-<em>Open</em> button. The OSTC dives are shown in the <strong>Dive List</strong> panel.</p></div>

-<div class="paragraph"><p>Actually, all H&amp;W devices supported by OSTCTools can be imported to

-<em>Subsurface</em>, this includes OSTC, OSTC Mk2, OSTC 2N/2C, OSTC3, OSTC Sport,

-and probably although untested, Frog, OSTC2 and OSTC CR.</p></div>

-<div class="paragraph"><p>Please, remember that OSTCTools is <strong>not</strong> a true diving log software, but a

-useful set of tools for analysis and management of OSTC devices. This way,

-only raw dive computer data will be performed with the import to

-<em>Subsurface</em>; one has to to manually complete the rest of data which may be

-important (buddies, equipment, notes, etc).</p></div>

-</div>

-<div class="sect3">

-<h4 id="_importing_from_mares_dive_organiser_v2_1">5.3.3. Importing from Mares Dive Organiser V2.1</h4>

-<div class="paragraph"><p>Since Mares utilise proprietary Windows software not compatible with

-multi-platform applications, these dive logs cannot be directly imported

-into <em>Subsurface</em>. Mares dive logs need to be imported using a three-step

-process, using <em>www.divelogs.de</em> as a mechanism to extract the dive log

-information.</p></div>

-<div class="olist arabic"><ol class="arabic">

-<li>

-<p>

-Export the dive log data from Mares Dive Organiser to the user&#8217;s desktop,

-   using a <em>.sdf</em> file name extension. Refer to <a href="#Mares_Export">Appendix C</a>

-   for more information.

-</p>

-</li>

-<li>

-<p>

-Data should then be imported into <em>www.divelogs.de</em>. One needs to create a

-   user account in <em>www.divelogs.de</em>, log into that web site, then select

-   <em>Import Logbook &#8594; Dive Organiser</em> from the menu on the left hand side.  The

-   instructions must be carefully followed to transfer the dive information (in

-   <em>.sdf</em> format) from the Dive Organiser database to <em>www.divelogs.de</em>.

-</p>

-</li>

-<li>

+select <em>OSTCTools Files (.dive .DIVE)</em>. This makes the <em>OSTC Tools</em> dive
+logs visible in the file list panel. Select one or more dive, then click the
+<em>Open</em> button. The OSTC dives are shown in the <strong>Dive List</strong> panel.</p></div>
+<div class="paragraph"><p>All H&amp;W devices supported by OSTCTools can be imported to <em>Subsurface</em>. This
+includes OSTC, OSTC Mk2, OSTC 2N/2C, OSTC3, OSTC Sport, and probably
+although untested, Frog, OSTC2 and OSTC CR.</p></div>
+<div class="paragraph"><p>Please remember that OSTCTools is <strong>not</strong> a true diving log software, but
+rather a useful set of tools for analysis and management of OSTC
+devices. Only raw dive computer data will be imported to <em>Subsurface</em>; you
+have to manually complete the rest of the data you want (buddies, equipment,
+notes, etc).</p></div>
+</div>
+<div class="sect3">
+<h4 id="_importing_from_mares_dive_organizer_v2_1">5.3.2. Importing from Mares Dive Organizer V2.1</h4>
+<div class="paragraph"><p>Since Mares uses proprietary Windows software not compatible with
+multi-platform applications, these dive logs cannot be directly imported
+into <em>Subsurface</em>. Mares dive logs need to be imported using a three-step
+process, using <em>www.divelogs.de</em> as a gateway to extract the dive log
+information.</p></div>
+<div class="olist arabic"><ol class="arabic">
+<li>
+<p>
+Export the dive log data from Mares Dive Organizer to your desktop, using a
+   <em>.sdf</em> file name extension. Refer to <a href="#Mares_Export">Appendix C</a> for more
+   information.
+</p>
+</li>
+<li>
+<p>
+Data should then be imported into <em>www.divelogs.de</em>. You will first need to
+   create a user account in <em>www.divelogs.de</em>.  Log into that web site, then
+   select <em>Import Logbook &#8594; Dive Organizer from the menu on the left hand
+   side.  The instructions must be carefully followed to transfer the dive
+   information (in _.sdf</em> format) from the Dive Organizer database to
+   <em>www.divelogs.de</em>.
+</p>
+</li>
+<li>
 <p>

 Finally, import the dives from <em>divelogs.de</em> to <em>Subsurface</em>, using the

    instructions below.

 </p>

 </li>

-</ol></div>

-</div>

-<div class="sect3">

-<h4 id="S_ImportingDivelogsDe">5.3.4. Importing dives from <strong>divelogs.de</strong></h4>

-<div class="paragraph"><p>The import of dive information from <em>divelogs.de</em> is simple, using a single

-dialogue box. The <em>Import &#8594; Import from Divelogs.de</em> option should be

-selected from the Main Menu. This brings up a dialogue box (see image <strong>A</strong>

-below). Enter a user-ID and password for <em>divelogs.de</em> into the appropriate

-fields and then select the <em>Download</em> button. Download from <em>divelogs.de</em>

-starts immediately, displaying a progress bar in the dialogue box. At the

-end of the download, the success status is indicated (see image <strong>B</strong>,

-below). The <em>Apply</em> button should then be selected, after which the imported

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

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

-<div class="content">

-<img src="images/Divelogs1.jpg" alt="FIGURE:Download from Divelogs.de" />

-</div>

-</div>

-</div>

-<div class="sect3">

-<h4 id="S_ImportingCSVData">5.3.5. Importer des données au format CSV</h4>

-<div class="paragraph"><p>A comma-separated file (.csv) can be used to import dive information either

-as dive profiles (as in the case of the APD Inspiration and Evolution closed

-circuit rebreathers) or as dive metadata (in case the user keeps dive data

-in a spreadsheet). The <em>CSV</em> format is a universal simplified format that

-allows for easy information exchange between different computers or software

-packages. For an introduction to CSV-formatted files see <a href="#S_CSV_Intro">A

-Diver&#8217;s Introduction To CSV Files</a>. <em>Subsurface</em> dive logs can also be

-exported in <em>CSV</em> format to other software that reads this format. See

+</ol></div>
+</div>
+<div class="sect3">
+<h4 id="S_ImportingDivelogsDe">5.3.3. Importing dives from <strong>divelogs.de</strong></h4>
+<div class="paragraph"><p>Importing dive information from <em>divelogs.de</em> is simple, using a single
+dialogue box. The <em>Import &#8594; Import from Divelogs.de</em> option should be
+selected from the Main Menu. This brings up a dialogue box (see image <strong>A</strong>
+below). Enter a user-ID and password for <em>divelogs.de</em> and then select the
+<em>Download</em> button. Download from <em>divelogs.de</em> starts immediately,
+displaying a progress bar in the dialogue box. At the end of the download,
+the success status is shown (see image <strong>B</strong>, below). The <em>Apply</em> button
+should then be selected, after which the imported dives appear in the
+<em>Subsurface</em> <strong>Dive List</strong> panel.</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/Divelogs1.jpg" alt="FIGURE:Download from Divelogs.de" />
+</div>

+</div>
+</div>
+<div class="sect3">
+<h4 id="S_ImportingCSVData">5.3.4. Importer des données au format CSV</h4>
+<div class="paragraph"><p>A comma-separated file (.csv) can be used to import dive information either
+as dive profiles (as in the case of the APD Inspiration and Evolution closed
+circuit rebreathers) or as dive metadata (in case the user keeps dive data
+in a spreadsheet). The <em>CSV</em> format is a universal simplified format that
+allows easy information exchange between different computers or software
+packages. For an introduction to CSV-formatted files see <a href="#S_CSV_Intro">A
+Diver&#8217;s Introduction To CSV Files</a>. <em>Subsurface</em> dive logs can also be
+exported in <em>CSV</em> format to other software that reads this format. See
 <a href="#S_Appendix_D">APPENDIX D: Exporting a spreadsheet to CSV format</a> for

 information that may be helpful for importing spreadsheet-based data into

-<em>Subsurface</em>.</p></div>

-<div class="sect4">

-<h5 id="S_ImportingCSVDives">Importer les plongées au format CSV à partir des ordinateurs de plongées ou d&#8217;autres logiciels de carnet de plongée</h5>

-<div class="paragraph"><p>One can view a <em>CSV</em> file by using an ordinary text editor. It is normally

-organised into a single line that provides the headers (or <em>field names</em> or

-<em>column headings</em>) of the data columns, followed by the data, one record per

-line.</p></div>

-<div class="paragraph"><p>There are two types of <em>CSV</em> dive logs that can be imported into

+<em>Subsurface</em>.</p></div>
+<div class="sect4">
+<h5 id="S_ImportingCSVDives">Importer les plongées au format CSV à partir des ordinateurs de plongées ou d&#8217;autres logiciels de carnet de plongée</h5>
+<div class="paragraph"><p>You can view a <em>CSV</em> file by using an ordinary text editor. It’s normally
+organized into a single line that provides the headers (or <em>field names</em> or
+<em>column headings</em>) of the data columns, followed by the data, one record per
+line.</p></div>
+<div class="paragraph"><p>There are two types of <em>CSV</em> dive logs that can be imported into
 <em>Subsurface</em>:</p></div>

 <div class="olist arabic"><ol class="arabic">

 <li>

-<p>

-<em>CSV dive details</em>: This dive log format contains similar information to

-   that of a typical written dive log, e.g. dive date and time, dive depth,

-   dive duration, names of buddy and dive master and perhaps some information

-   about cylinder pressures before and after the dive, as well as a comment or

-   two about the dive. All the data for a single dive go on a single line of

-   text, following the order of the column headings.

-</p>

-</li>

-<li>

-<p>

-<em>CSV dive profile</em>: This dive log format includes much more information

-   about a single dive. For instance there may be information at 30-second

-   intervals, indicating depth, water temperature at that depth, and cylinder

-   pressure at that moment in time. Each line contains the information for a

-   single instant in time during the dive, 30 seconds after that of the

-   previous instant. Many lines are required to complete the depth profile

-   information for a single dive. This is a common export format used by

-   closed-circuit rebreather (CCR) dive equipment and many software packages

-   that handle dive computer data and/or dive logs.

-</p>

-</li>

-</ol></div>

-<div class="paragraph"><p>Before being able to import the <em>CSV</em> data to <em>Subsurface</em> <strong>one needs to

-know a few things about the data being imported</strong>:</p></div>

-<div class="olist loweralpha"><ol class="loweralpha">

-<li>

+<p>
+<em>CSV dive details</em>: This dive log format contains similar information to
+   that of a typical written dive log, e.g. dive date and time, dive depth,
+   dive duration, names of buddy and divemaster and information about cylinder
+   pressures before and after the dive, as well as comments about the dive. All
+   the data for a single dive go on a single line of text, following the order
+   of the column headings.
+</p>
+</li>
+<li>
+<p>
+<em>CSV dive profile</em>: This dive log format includes much more information
+   about a single dive. For instance there may be information at 30-second
+   intervals, indicating depth, water temperature, and cylinder pressure at
+   that moment in time. Each line contains the information for a single instant
+   in time during the dive, 30 seconds after that of the previous instant. Many
+   lines are required to complete the depth profile information for a single
+   dive. This is a common export format used by closed-circuit rebreather (CCR)
+   dive equipment and many software packages that handle dive computer data
+   and/or dive logs.
+</p>
+</li>
+</ol></div>
+<div class="paragraph"><p>Before being able to import the <em>CSV</em> data to <em>Subsurface</em> <strong>you needs to
+know a few things about the data being imported</strong>:</p></div>
+<div class="olist loweralpha"><ol class="loweralpha">
+<li>
 <p>

 Which character separates the different columns within a single line of

    data? This field separator should be either a comma (,) a semicolon (;) or a

@@ -1805,83 +1753,82 @@ Which data columns need to be imported into <em>Subsurface</em>? Is it a <em>CSV
 <li>

 <p>

 Is the numeric information (e.g. dive depth) in metric or in imperial units?

-</p>

-</li>

-</ol></div>

-<div class="paragraph"><p>Armed with this information, importing the data into <em>Subsurface</em> is

-straightforward. Select <em>Import &#8594; Import Log Files</em> from the main menu. In

-the resulting file selection menu, select <em>CSV files</em> (towards the bottom

-right). This shows all .CSV files in the selected directory. Select the file

+</p>
+</li>
+</ol></div>
+<div class="paragraph"><p>With this information, importing the data into <em>Subsurface</em> is
+straightforward. Select <em>Import &#8594; Import Log Files</em> from the main menu. In
+the resulting file selection menu, select <em>CSV files</em> (towards the bottom
+right). This shows all .CSV files in the selected directory. Select the file
 that needs to be imported. A configuration panel appears as depicted below:</p></div>

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

 <div class="content">

-<img src="images/csv_import1_f20.jpg" alt="FIGURE: CSV download dialogue 1" />

-</div>

-</div>

-<div class="paragraph"><p>Notice that, at the top left, there is a dropdown list containing

-pre-configured settings for some of the more common dive computers and

-software packages encountered by divers. If the <em>CSV</em> file being imported

-originated from any of these pre-configured items, then select it. Otherwise

-use the <em>Manual Import</em> option. The configuration panel also has dropdown

-lists for the specification of the appropriate field separator (Tab, comma

-or semicolon), the date format used in the <em>CSV</em> file, the time units

-(seconds, minutes or minutes:seconds), as well as the unit system (metric or

-imperial). Selecting the appropriate options among these is critical for the

-successful import of the data.</p></div>

-<div class="paragraph"><p>The last remaining task is to ensure that all the data columns have the

-appropriate column headings. The top blue row of the data table contains the

-column headings found in the <em>CSV</em> data file. The blue row of balloons

-immediately above these contains the names understood by <em>Subsurface</em>. These

-balloons can be moved using a drag-and-drop action. For instance,

-<em>Subsurface</em> expects the column heading for Dive number (" # ") to be "Dive

-# ". If the column heading that <em>Subsurface</em> expects is not in the blue row,

-then drag the appropriate balloon from the upper area and drop it in the

-appropriate blue cell at the top of the table. To indicate the correct

-column for "Dive #", drag the ballooned item labelled "Dive # " and drop it

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

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

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

-<div class="content">

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

-</div>

-</div>

-<div class="paragraph"><p>Continue in this way to ensure that all the column headings in the blue row

-of cells correspond to the headings listed in the top part of the

-dialogue. Having completed this task, select the <em>OK</em> button to the bottom

-right of the dialogue.  The data from the <em>CSV</em> file are imported and shown

-in the <strong>Dive List</strong> panel.</p></div>

-<div class="sidebarblock" id="S_CSV_Intro">

-<div class="content">

-<div class="paragraph"><p><strong>A Diver&#8217;s Introduction to <em>CSV</em> Files</strong></p></div>

+<img src="images/csv_import1_f20.jpg" alt="FIGURE: CSV download dialogue 1" />
+</div>
+</div>
+<div class="paragraph"><p>At the top left, there is a dropdown list containing pre- configured
+settings for common dive computers and software packages.
+ If the <em>CSV</em> file being imported originated from any of
+these pre-configured items, select it. Otherwise use the <em>Manual Import</em>
+option. The configuration panel also has dropdown lists for the specification of the appropriate
+field separator (Tab, comma or semicolon), the date format used in the <em>CSV</em> file,
+the time units (seconds, minutes or minutes:seconds), as well as the unit system
+(metric or imperial). Selecting the appropriate options among these is critical for
+the successful data import.</p></div>
+<div class="paragraph"><p>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
+headings found in the <em>CSV</em> data file. The blue row of balloons immediately
+above these contains the names understood by <em>Subsurface</em>. These balloons
+can be moved using a drag-and-drop action. For instance, <em>Subsurface</em>
+expects the column heading for Dive number (" # ") to be "Dive # ". If the
+column heading that <em>Subsurface</em> expects is not in the blue row, drag the
+appropriate balloon from the upper area and drop it in the appropriate blue
+cell at the top of the table. To indicate the correct column for "Dive #",
+drag the ballooned item labelled "Dive # " and drop it in the blue cell
+immediately above the white cell containing " # ". This is depicted in the
+image below.</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/csv_import2_f20.jpg" alt="FIGURE: CSV download dialogue 2" />
+</div>
+</div>
+<div class="paragraph"><p>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.
+When finished, select the <em>OK</em> button on the bottom right of the dialogue.
+The data from the <em>CSV</em> file are imported and shown in the <strong>Dive List</strong>
+panel.</p></div>
+<div class="sidebarblock" id="S_CSV_Intro">
+<div class="content">
+<div class="paragraph"><p><strong>A Diver&#8217;s Introduction to <em>CSV</em> Files</strong></p></div>
 <div class="admonitionblock">

 <table><tr>

 <td class="icon">

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

-</td>

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

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

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

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

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

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

-or proprietary attributes that proprietary software insert into files.

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

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

-graphics, database and diving software. Within <em>Subsurface</em>, <em>CSV</em> files can

-also be used to import information from other sources such as

-spreadsheet-based dive logs and even from some dive computers.</td>

-</tr></table>

-</div>

-<div class="paragraph"><p><em>CSV</em> files can be created or edited with a normal text editor. The most

+<img src="images/icons/important.png" alt="Important" />
+</td>
+<td class="content"><em>CSV</em> is an abbreviation for a data file format: <em>Comma-Separated
+Values</em>. It is a file format that lets you view or edit information using a
+text editor like Notepad (Windows), gedit (Linux) or TextWrangler
+(OS/X). There are two main advantages of the <em>CSV</em> format.  First, the data
+are easily editable as text without any proprietary software.  Second, all
+information is human-readable, not obscured by any custom or proprietary
+attributes that proprietary software inserts into files.  Because of its
+simplicity the <em>CSV</em> format is used as an interchange format between many
+software packages, e.g. between spreadsheet, statistical, graphics, database
+and diving software. Within <em>Subsurface</em>, <em>CSV</em> files can also be used to
+import information from other sources like spreadsheet-based dive logs and
+some dive computers.</td>
+</tr></table>
+</div>
+<div class="paragraph"><p><em>CSV</em> files can be created or edited with a normal text editor. The most
 important attribute of a <em>CSV</em> file is the <em>field separator</em>, the character

 used to separate fields within a single line. The field separator is

-frequently a comma, a colon, a SPACE character or a TAB character. When

-exporting data from spreadsheet software, the field separator needs to be

-specified in order to create the <em>CSV</em> file. <em>CSV</em> files are normally

-organised into a single line that provides the headers (or <em>field names</em>) of

-the data columns, followed by the data, one record per line. Note that each

-field name may comprise more than one word separated by spaces; for instance

-<em>Dive site</em>, below. Here is an example of dive information for four dives

+frequently a comma, a colon, a SPACE character or a TAB character. When
+exporting data from spreadsheet software, the field separator needs to be
+specified in order to create the <em>CSV</em> file. <em>CSV</em> files are normally
+organized into a single line that provides the headers (or <em>field names</em>) of
+the data columns, followed by the data, one record per line. Note that each
+field name may comprise more than one word separated by spaces; for instance
+<em>Dive site</em>, below. Here is an example of dive information for four dives
 using a comma as a field separator:</p></div>

 <div class="literalblock">

 <div class="content">

@@ -1922,27 +1869,27 @@ computer:</p></div>
 20      1.6     0.70    0.71    12.6

 30      1.7     0.70    0.71    12.6

 40      1.8     0.70    0.68    12.5</code></pre>

-</div></div>

-<div class="paragraph"><p>When a <em>CSV</em> file is selected for import, <em>Subsurface</em> displays the column

-headers as well as some of the data in the first few lines of the <em>CSV</em>

-file, making it much easier to work with <em>CSV</em> files.  <em>CSV</em> files can

-therefore be used in many contexts for importing data into a <em>Subsurface</em>

-dive log.  Knowledge of a few basic things about the content of the <em>CSV</em>

-file allows a smooth import of the dives into <em>Subsurface</em>.</p></div>

-</div></div>

-<div class="admonitionblock">

-<table><tr>

-<td class="icon">

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

-</td>

-<td class="content">The <em>CSV</em> import has a couple of caveats. One should avoid some special

-characters like ampersand (&amp;), less than (&lt;), greater than (&gt;) and double

-quotes (") as part of the numbers or text within a cell. The file should use

-UTF-8 character set, if using non-ASCII characters. Also the size of the

-<em>CSV</em> file might cause problems. Importing 100 dives at a time (<em>CSV dive

-details</em>) works, but larger files might exceed the limits of the parser

-used. When encountering problems with <em>CSV</em> imports, first try with a

-smaller file to make sure everything works.</td>

+</div></div>
+<div class="paragraph"><p>When a <em>CSV</em> file is selected for import, <em>Subsurface</em> displays the column
+headers as well as some of the data in the first few lines of the <em>CSV</em>
+file, making it much easier to work with <em>CSV</em> files.  <em>CSV</em> files can be
+used in many contexts for importing data into a <em>Subsurface</em> dive log.
+Knowing a few basic things about the content of the <em>CSV</em> file helps with a
+smooth import of the dives into <em>Subsurface</em>.</p></div>
+</div></div>
+<div class="admonitionblock">
+<table><tr>
+<td class="icon">
+<img src="images/icons/important.png" alt="Important" />
+</td>
+<td class="content">But, the <em>CSV</em> import has a couple of caveats. Avoid some special characters
+like ampersand (&amp;), less than (&lt;), greater than (&gt;) and double quotes (") as
+part of the numbers or text within a cell. The file should use UTF-8
+character set, if using non-ASCII characters. Also the size of the <em>CSV</em>
+file might cause problems. Importing 100 dives at a time (<em>CSV dive
+details</em>) works, but larger files might exceed the limits of the parser
+used. When encountering problems with <em>CSV</em> imports, first try with a
+smaller file to make sure everything works.</td>
 </tr></table>

 </div>

 </div>

@@ -1950,25 +1897,24 @@ smaller file to make sure everything works.</td>
 </div>

 <div class="sect2">

 <h3 id="S_Companion">5.4. Importing GPS coordinates with the <em>Subsurface Companion App</em> for mobile phones</h3>

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

-location can be automatically passed to the <em>Subsurface</em>

-dive log. The Companion App stores the dive locations on

-a dedicated Internet file server. <em>Subsurface</em>, in turn, can collect

-the localities from the file server.</p></div>

-<div class="paragraph"><p>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="ulist"><ul>

-<li>

-<p>

-Register on the <a href="http://api.hohndel.org/login/"><em>Subsurface companion web

-  page</em></a>.  A confirmation email with instructions and a personal <strong>DIVERID</strong>

-  will be sent, a long number that gives access to the file server and

-  Companion App capabilities.

-</p>

-</li>

+<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
+location can be automatically passed to the <em>Subsurface</em> dive log. The Companion App
+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="ulist"><ul>
+<li>

+<p>
+Register on the <a href="http://api.hohndel.org/login/"><em>Subsurface companion web
+  page</em></a>.  A confirmation email with instructions and a personal <strong>DIVERID</strong>
+  will be sent, a long number giving you access to the file server and
+  Companion App capabilities.
+</p>
+</li>
 <li>

 <p>

 Download the app from

@@ -1982,68 +1928,68 @@ Download the app from
 <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="paragraph"><p>On first use the app has three options:</p></div>

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

-<li>

-<p>

-<em>Create a new account.</em> Equivalent to registering in <em>Subsurface</em> companion

-  page using an Internet browser. One can request a <strong>DIVERID</strong> using this

-  option, but this is supplied via email and followed up by interaction with

-  the <a href="http://api.hohndel.org/login/"><em>Subsurface companion web page</em></a> in order

-  to activate the account.

-</p>

-</li>

-<li>

-<p>

-<em>Retrieve an account.</em> If users forgot their <strong>DIVERID</strong> they will receive an

-  email to recover the number.

-</p>

-</li>

-<li>

-<p>

-<em>Use an existing account.</em> Users are prompted for their <strong>DIVERID</strong>. The app

-  saves this <strong>DIVERID</strong> and does not ask for it again unless one uses the

-  <em>Disconnect</em> menu option (see below).

-</p>

-</li>

+<div class="ulist"><ul>
+<li>
+<p>
+<em>Create a new account.</em> Equivalent to registering in the <em>Subsurface</em>
+  companion page using an Internet browser. You can request a <strong>DIVERID</strong> using
+  this option, but it’s supplied via email and followed up by interaction with
+  the <a href="http://api.hohndel.org/login/"><em>Subsurface companion web page</em></a> to
+  activate the account.
+</p>
+</li>
+<li>
+<p>
+<em>Retrieve an account.</em> If users forget their <strong>DIVERID</strong> they will receive an
+  email to recover the number.
+</p>
+</li>
+<li>
+<p>
+<em>Use an existing account.</em> Users are prompted for their <strong>DIVERID</strong>. The app
+  saves this <strong>DIVERID</strong> and doesn’t ask for it again unless you use the
+  <em>Disconnect</em> menu option (see below).
+</p>
+</li>
 </ul></div>

 <div class="admonitionblock">

 <table><tr>

 <td class="icon">

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

-</td>

-<td class="content">In the <em>Subsurface</em> main program, the <strong>DIVERID</strong> should also be entered on

-the Default Preferences panel, obtained by selecting <em>File &#8594; Preferences &#8594;

-Defaults</em> from the main menu in <em>Subsurface</em> itself.  This facilitates

-synchronisation 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>Now one is ready to get a dive position and send it to the server. The

-Android display will look like the left hand image (<strong>A</strong>) below, but without

-any dives.</p></div>

-<div class="paragraph"><p>Touch the "+" icon on the top right to add a new dive site, a menu will be

-showed with 3 options:</p></div>

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

-<li>

-<p>

+<img src="images/icons/important.png" alt="Important" />
+</td>
+<td class="content">In the <em>Subsurface</em> main program, the <strong>DIVERID</strong> should also be entered on
+the Default Preferences panel, by selecting <em>File &#8594; Preferences &#8594;
+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>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>
+<div class="paragraph"><p>Touch the "+" icon on the top right to add a new dive site, a menu shows
+with 3 options:</p></div>
+<div class="ulist"><ul>
+<li>
+<p>
 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.

 </p>

-</li>

-<li>

-<p>

-Use Map: This option allows the user to fix a position by searching a world

-  map. A world map is shown (see <strong>B</strong> below) on which one should indicate the

-  desired position with a <em>long press</em> on the touch sensitive screen (if the

-  marked location is erroneous, simply indicate a new location)  and select

-  the check symbol in the upper right. A dialog is shown allowing to enter the

-  name of the dive location and the date-time of the dive (see <strong>C</strong> below). In

-  order to import this dive location in <em>Subsurface</em> it&#8217;s advisable to set the

-  time to agree with the time of that dive on the dive computer.

-</p>

-</li>

-</ul></div>

+</li>
+<li>
+<p>
+Use Map: This option lets you fix a position by searching a world map. A
+  world map is shown (see <strong>B</strong> below) on which you can show the desired
+  position with a <em>long press</em> on the touch sensitive screen (if the marked
+  location is wrong, simply choose a new location)  and select the check
+  symbol in the upper right. A dialog is shown letting you enter the name of
+  the dive location and the date and time of the dive (see <strong>C</strong> below). In
+  order to import this dive location in <em>Subsurface</em> you should set the time
+  to agree with the time of that dive on the dive computer.
+</p>
+</li>
+</ul></div>
 <div class="imageblock" style="text-align:center;">

 <div class="content">

 <img src="images/Companion_5.jpg" alt="FIGURE: Companion App, add location using map" />

@@ -2051,71 +1997,66 @@ Use Map: This option allows the user to fix a position by searching a world
 </div>

 <div class="ulist"><ul>

 <li>

-<p>

-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

-  stored locations shown. Now one needs to select the appropriate locations,

-  then select 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.

-</p>

-</li>

-</ul></div>

+<p>
+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
+  stored locations shown. Now select the appropriate locations, then select
+  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.
+</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>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 indicating that they require upload to the

-server. One can select individual dive locations from the list. A selected

-location has a check mark in the selection box on the left. Group operations

-(such as <em>Delete</em> or <em>Send</em>)  are performed on several locations that are

-selected.</p></div>

-<div class="paragraph"><p>Dive locations in this list can be viewed in two ways: a list of locations

-or a map indicating the dive locations. The display mode (List or Map) is

-changed by selecting <em>Dives</em> at the top left of the screen (see <strong>A</strong> below)

-and then selecting the display mode. The display mode can be changed either

-from the list of locations or from the map (see <strong>B</strong> below). If one selects a

-location (on the list or on the map), an editing panel opens (see <strong>C</strong> below)

-where the dive description or other details may be changed.</p></div>

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

-<div class="content">

-<img src="images/Companion_4.jpg" alt="FIGURE: Companion App, add location using map" />

-</div>

-</div>

-<div class="paragraph"><p>When one selects a dive (<strong>not</strong> selecting the check box), the name given to

-it, date/time and GPS coordinates will be shown, with two options at the top

-of the screen:</p></div>

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

+<h5 id="_dive_lists_of_dive_locations">Dive lists of dive locations</h5>
+<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
+server. You can select individual dive locations from the list. A selected
+location has a check mark in the selection box on the left. Group operations
+(like <em>Delete</em> or <em>Send</em>)  are performed on several selected locations.</p></div>
+<div class="paragraph"><p>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
+selecting <em>Dives</em> at the top left of the screen (see <strong>A</strong> below) and then
+selecting the display mode. The display mode can be changed either from the
+list of locations or from the map (see <strong>B</strong> below). If you select a location
+(on the list or on the map), an editing panel opens (see <strong>C</strong> below) where
+the dive description or other details may be changed.</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/Companion_4.jpg" alt="FIGURE: Companion App, add location using map" />
+</div>
+</div>
+<div class="paragraph"><p>When you select a dive (<strong>not</strong> selecting the check box), the name given to
+it, date/time and GPS coordinates will be shown, with two options at the top
+of the screen:</p></div>
+<div class="ulist"><ul>
 <li>

 <p>

 Edit (pencil): Change the text name or other characteristics of the dive

-  location.

-</p>

-</li>

-<li>

-<p>

-Maps: Display a map showing the dive location.

-</p>

-</li>

-</ul></div>

-<div class="paragraph"><p>After editing and saving a dive location (see <strong>C</strong> above), one needs to

-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>There are several ways to send locations to the server.  The easiest is by

-simply selecting the locations (See <strong>A</strong> below) and then touching the right

-arrow at the top right of the screen.</p></div>

-<div class="admonitionblock">

+  location.
+</p>
+</li>
+</ul></div>
+<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>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>
+<div class="admonitionblock">
 <table><tr>

-<td class="icon">

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

-</td>

-<td class="content">Users must be careful, as the trash icon on the right means exactly what it

-should; it deletes the selected dive location(s).</td>

-</tr></table>

-</div>

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

+<td class="icon">
+<img src="images/icons/important.png" alt="Important" />
+</td>
+<td class="content">Be careful! The trash icon on the right means exactly what it should; it
+deletes the selected dive location(s).</td>
+</tr></table>
+</div>
+<div class="imageblock" style="text-align:center;">
 <div class="content">

 <img src="images/Companion_1.jpg" alt="FIGURE: Screen shots (A-B) of companion app" />

 </div>

@@ -2136,41 +2077,37 @@ be downloaded to a <em>Subsurface</em> dive log (see below).</p></div>
 <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 obtain it is simply to copy and paste from the confirmation

-  email but, of course, users can also type this information.

-</p>

-</li>

-</ul></div>

-</div>

-<div class="sect4">

-<h5 id="_synchronisation">Synchronisation</h5>

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

-<li>

-<p>

-<em>Synchronize on startup</em>. If selected, dive locations in the Android device

-  and those on the web service synchronise each time the app is started.

-</p>

-</li>

-<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>
+<li>
+<p>
+<em>Synchronize on startup</em>. If selected, dive locations in the Android device
+  and those on the web service synchronize each time the app is started.
+</p>
+</li>
+<li>
 <p>

 <em>Upload new dives.</em> If selected, each time the user adds a dive location it

   is automatically sent to the server.

 </p>

 </li>

 </ul></div>

-</div>

-<div class="sect4">

-<h5 id="_background_service">Background service</h5>

-<div class="paragraph"><p>Instead of entering a unique dive location, users can leave the service

-running in the background of their Android device, allowing the continuous

-collection of GPS locations.</p></div>

-<div class="paragraph"><p>The settings below define the behaviour of the service:</p></div>

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

-<li>

-<p>

+</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>The settings below define the behavior of the service:</p></div>
+<div class="ulist"><ul>
+<li>
+<p>
 <em>Min duration.</em> In minutes. The app will try to get a location every X

   minutes until stopped by the user.

 </p>

@@ -2188,20 +2125,20 @@ collection of GPS locations.</p></div>
 </ul></div>

 <div class="admonitionblock">

 <table><tr>

-<td class="icon">

-<img src="images/icons/info.jpg" alt="Tip" />

-</td>

-<td class="content"><em>How does the background service work?</em> Assuming the user 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.  If subsequent locations

-are within a radius of 50 meters from the previous one, a new location is

-not saved. If the user is not moving, only one location is saved, but if the

-user is moving, a trace of the route is obtained by saving a location every

-50 meters.</td>

-</tr></table>

-</div>

-</div>

+<td class="icon">
+<img src="images/icons/info.jpg" alt="Tip" />
+</td>
+<td class="content"><em>How does the background service work?</em> 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.  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.  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><em>Mailing List.</em> The mail box for <em>Subsurface</em>. Users can send an email to

@@ -2222,108 +2159,108 @@ the Subsurface mailing list.</p></div>
 <div class="sect4">

 <h5 id="_search">Search</h5>

 <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>Initiates 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>This is a badly named option that disconnects the app from the server by

-resetting the user ID in the app, showing the first screen where an account

-can be created, retrieve the ID for an existing account or use the users own

-ID. The disconnect option is useful if a user&#8217;s 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>
+<div class="sect4">
+<h5 id="_start_service">Start service</h5>
+<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>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>This option sends all locations stored in the Android device to the server.</p></div>

 </div>

-</div>

-<div class="sect3">

-<h4 id="S_iphone">5.4.3. Using the Subsurface companion app on an <em>iPhone</em> to record dive locations</h4>

-<div class="paragraph"><p>The iPhone interface is quite simple. One needs to type the user ID

-(obtained during registration) into the space reserved for it, then select

-"Dive in" (see left part of the image below) and start collecting dive

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

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

-<div class="content">

-<img src="images/iphone.jpg" alt="FIGURE: Using iPhone companion application" width="640" />

-</div>

-</div>

-<div class="paragraph"><p>Dives can be added automatically or manually. In manual mode, a dive

-location or waypoint is added to the GPS input stream. In automatic mode, a

-continuous path of GPS locations is created from which, much later, after

-import, subsurface can select the appropriate GPS locations based on the

-times of dives. The default mode for the <em>iphone</em> is automatic. When one

-adds a dive, the location service is started automatically and a red bar

-appears at the bottom of the screen. After the dive one can click on the red

-bar to end the location service. While the location service is running one

-can only add dives using the manual mechanism.</p></div>

-<div class="paragraph"><p>One can edit the site name afterwards by selecting the dive from the dive

-list and clicking on the site name. There are no other editable fields. The

-dive list is automatically uploaded from the iPhone to the webservice and

-there is not an option to trigger upload manually.</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>
+<div class="sect3">
+<h4 id="S_iphone">5.4.3. Using the Subsurface companion app on an <em>iPhone</em> to record dive locations</h4>
+<div class="paragraph"><p>The iPhone interface is quite simple. Type the user ID (obtained during
+registration) into the space reserved for it, then select "Dive in" (see
+left part of the image below) and start collecting dive location
+information.</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/iphone.jpg" alt="FIGURE: Using iPhone companion application" width="640" />
+</div>

+</div>
+<div class="paragraph"><p>Dives can be added automatically or manually. In manual mode, a dive
+location or waypoint is added to the GPS input stream. In automatic mode, a
+continuous path of GPS locations is created from which, after import,
+Subsurface can select the appropriate GPS locations based on the times of
+dives. The default mode for the <em>iphone</em> is automatic. When adding a dive,
+the location service is started automatically and a red bar appears at the
+bottom of the screen. After the dive, click on the red bar to end the
+location service. While the location service is running you can only add
+dives manually.</p></div>
+<div class="paragraph"><p>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
+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="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

-Menu <em>Import &#8594; Import GPS data from Subsurface Service</em>, resulting in the

-image on the left (<strong>A</strong>), below. On first use the DIVERID text box is

-blank. Provide a DIVERID, then select the <em>Download</em> button to initiate the

-download process, after which the screen on the right (<strong>B</strong>) below appears:</p></div>

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

-<div class="content">

-<img src="images/DownloadGPS.jpg" alt="FIGURE: Downloading Companion app GPS data" />

-</div>

-</div>

-<div class="paragraph"><p>Note that the <em>Apply</em> button is now active. By clicking on it, users can

-update the locations of the newly entered or uploaded dives in <em>Subsurface</em>

-which applies the coordinates and names entered on the app for all the new

-dives that match the date-times of the uploaded GPS localities. If one has

-entered the name of the dive location in <em>Subsurface</em> before downloading the

-GPS coordinates, this name will take precedence over downloaded one.</p></div>

-<div class="paragraph"><p>Since <em>Subsurface</em> matches GPS locations from the Android device and dive

-information from the dive computer based on date-time data, automatic

-assignment of GPS data to dives is dependent on agreement of the date-time

-information between these two devices. Although <em>Subsurface</em> has a wide

-range tolerance, it may be unable to identify the appropriate dive if there

-is a large difference between the time in the dive computer and that of the

-Android device, resulting in no updates.</p></div>

-<div class="paragraph"><p>Similar date-times may not always be possible and there may be many reasons

-for this (e.g. time zones), or <em>Subsurface</em> may be unable to decide which is

-the correct position for a dive (e.g. on repetitive dives while running

-<em>background service</em> there may be several locations that would be included

-in the time range that fit not only the first dive, but one or more

-subsequent dives as well).  A workaround for this situation to manually edit

-the date-time of a dive in the <em>Subsurface</em> Dive List <strong>before</strong> downloading

-the GPS data and then to change the date-time back again <strong>after</strong> downloading

-GPS data.</p></div>

-<div class="admonitionblock">

-<table><tr>

-<td class="icon">

+download dialog can be reached via <em>Ctrl+G</em> or from the <em>Subsurface</em> Main
+Menu <em>Import &#8594; Import GPS data from Subsurface Service</em>, resulting in the
+image on the left (<strong>A</strong>), below. On first use the DIVERID text box is
+blank. Provide a DIVERID, then select the <em>Download</em> button to start the
+download process, after which the screen on the right (<strong>B</strong>) below appears:</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/DownloadGPS.jpg" alt="FIGURE: Downloading Companion app GPS data" />
+</div>
+</div>
+<div class="paragraph"><p>Note that the <em>Apply</em> button is now active. By clicking on it, you can
+update the locations of the newly entered or uploaded dives in
+<em>Subsurface</em>. That applies the coordinates and names entered on the app to
+all the new dives that match the date-times of the uploaded GPS
+localities. If you have entered the name of the dive location in
+<em>Subsurface</em> before downloading the GPS coordinates, this name will take
+precedence over downloaded one.</p></div>
+<div class="paragraph"><p>Since <em>Subsurface</em> matches GPS locations from the Android device and dive
+information from the dive computer based on date-time data, automatic
+assignment of GPS data to dives depends on agreeing date-time information
+between the two devices. Although <em>Subsurface</em> has a wide range tolerance,
+it may not be able to identify the appropriate dive if there&#8217;s a large
+difference between the time in the dive computer and that of the Android
+device.  That results in no updates.</p></div>
+<div class="paragraph"><p>Similar date-times may not always be possible and there may be many reasons
+for this (e.g. time zones).  <em>Subsurface</em> may also be unable to decide which
+is the correct position for a dive (e.g. on repetitive dives while running
+<em>background service</em> there may be several locations that would be included
+in the time range that fit not only the first dive, but one or more
+subsequent dives as well).  A workaround to manually edit the date-time of a
+dive in the <em>Subsurface</em> Dive List <strong>before</strong> downloading the GPS data and
+then to change the date-time back again <strong>after</strong> downloading GPS data.</p></div>
+<div class="admonitionblock">
+<table><tr>
+<td class="icon">
 <img src="images/icons/info.jpg" alt="Note" />

 </td>

 <td class="content">TIPS:</td>

 </tr></table>

 </div>

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

-<li>

-<p>

-<em>Background service</em>, being a very powerful tool, may fill the location list

-  with many unnecessary locations not corresponding to the exact dive point

-  but reflecting the boat&#8217;s route.  Currently these locations are difficult to

-  delete from the server. In some situations it is therefore prudent to clean

-  up the list on the Android device before sending the dive points to the web

-  server by simply deleting the inappropriate locations. This might be

-  necessary, for instance, if one wants to keep the location list clear to see

-  dives in the web service map display (see above).

-</p>

-</li>

-<li>

+<div class="ulist"><ul>
+<li>
+<p>
+<em>Background service</em> may fill the location list with unnecessary locations
+  that don’t correspond to the exact dive point but do correspond to the
+  boat&#8217;s route.
+   Right now, these locations are difficult to delete from the server. In some
+   situations it
+  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. This might be necessary, for instance, if you want to keep the
+  location list clear to see dives in the web service map display (see above).
+</p>
+</li>
+<li>
 <p>

 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 <em>Name

@@ -2334,17 +2271,17 @@ It may also make sense to give informative names to the locations sent to
 </ul></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

-during a dive. One would like to associate each photograph with a specific

-dive. <em>Subsurface</em> allows one to load photos into a dive. Photos are

-superimposed on the dive profile, from where they can be viewed.</p></div>

-<div class="sect3">

-<h4 id="_loading_photos_and_getting_synchronisation_between_dive_computer_and_camera">5.5.1. Loading photos and getting synchronisation between dive computer and camera</h4>

-<div class="paragraph"><p>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 <em>Load

-Images</em>:</p></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
+during a dive. To match each photograph with a specific dive, <em>Subsurface</em>
+lets you load photos into a dive. Photos are superimposed on the dive
+profile, from where they can be viewed.</p></div>
+<div class="sect3">
+<h4 id="_loading_photos_and_synchronizing_between_dive_computer_and_camera">5.5.1. Loading photos and synchronizing between dive computer and camera</h4>
+<div class="paragraph"><p>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 <em>Load
+Images</em>:</p></div>
 <div class="imageblock" style="text-align:center;">

 <div class="content">

 <img src="images/LoadImage1_f20.jpg" alt="FIGURE: Load images option" />

@@ -2354,63 +2291,63 @@ Images</em>:</p></div>
 to be loaded into <em>Subsurface</em> and click the <em>Open</em> button.</p></div>

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

 <div class="content">

-<img src="images/LoadImage2_f20.jpg" alt="FIGURE: Load images option" />

-</div>

-</div>

-<div class="paragraph"><p>This brings up the time synchronisation dialog, shown below. The critical

-problem is that the time synchronisation is not perfect between the dive

-computer used during a dive, and the camera used during that same

-dive. These two devices often differ by several minutes. If <em>Subsurface</em> can

-achieve synchronisation, then the exact times of photographs can be used to

-position photographs on the dive profile.</p></div>

-<div class="paragraph"><p><em>Subsurface</em> achieves this synchronisation in three ways:</p></div>

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

-<li>

-<p>

-<strong>Pro-actively</strong>: Before the dive, ensure synchronisation of the dive computer time settings with

-  the time settings of the camera by changing the date-time settings on one or both of these devices.

-</p>

-</li>

-<li>

-<p>

-<strong>Manually</strong>: If the user wrote down the exact camera time at the start of a dive, the

-  difference in time between the two devices can be determined. Actually, as long as the device

-  settings for time has not been changed in either device, one could write down the times of

-  both devices after the dive or even at the end of the day. One can then manually set the time

-  difference in the <em>Time shift</em> dialog. Towards the top of the dialog is a time setting tool

-  immediately under the heading <em>Shift times of image(s) by</em>, evident in figure <strong>A</strong> below.

-  If the camera time is 7 minutes later than that of the dive computer, set the time setting

-  tool to a value of 00:07.  Select either the <em>earlier</em> or <em>later</em> radio button.

-  In the above example, the <em>earlier</em> option is appropriate, since the photos need to be shifted

-  7 minutes earlier (camera is 7 minutes ahead of dive computer). Ignore any "AM" or "PM" suffix

-  in that tool. Click the <em>OK</em> button and synchronisation is achieved.

-</p>

-</li>

-</ul></div>

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

-<div class="content">

-<img src="images/LoadImage3b_f20.jpg" alt="FIGURE: Synchronisation dialog" />

-</div>

-</div>

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

-<li>

-<p>

-<strong>By photograph</strong>: There is a very slick way of achieving synchronisation. If one takes a

-  photograph of the face of the dive computer showing the time, then <em>Subsurface</em> can obtain

-  the exact time the photograph was taken, using the metadata that the camera stores within

-  each photo. In order to do this, use the bottom half of the <em>Time shift</em> dialog. If one uses

-  the bottom part, the top part of the dialog is ignored. Click on

-  the horizontal bar entitled "<em>Select image of dive computer showing time</em>. This brings up

-  a file browser with which one can select the photograph of the dive computer time. Select the

-  photograph using the file browser and click on <em>OK</em>. This photograph of the dive computer

-  appears in the bottom panel of the <em>Shift times</em> dialog. Now <em>Subsurface</em> knows exactly

-  when the photograph has been taken. Now set the date-time dialog to the left of the photo

-  so that this tool reflects the date and time of the dive computer in the photo. When the

-  date-time tool has been set, <em>Subsurface</em> knows exactly what the time difference between

-  camera and dive computer is, and synchronisation is achieved.

-  Image <strong>B</strong> above shows a photograph of the face of the dive computer and with the date-time tool set to the

-  date-time.

-</p>

+<img src="images/LoadImage2_f20.jpg" alt="FIGURE: Load images option" />
+</div>
+</div>
+<div class="paragraph"><p>This brings up the time synchronization dialog, shown below. But be aware
+that the time synchronization is not perfect between the dive computer used
+during a dive, and the camera used during that same dive. These two devices
+often differ by several minutes. If <em>Subsurface</em> can synchronize, then the
+exact times of photographs can be used to position photographs on the dive
+profile.</p></div>
+<div class="paragraph"><p><em>Subsurface</em> synchronizes in three ways:</p></div>
+<div class="ulist"><ul>
+<li>
+<p>
+<strong>Pro-actively</strong>: Before the dive, ensure synchronization of the dive computer time settings with
+  the time settings of the camera by changing the date-time settings on one or both of these devices.
+</p>
+</li>
+<li>
+<p>
+<strong>Manually</strong>: If you wrote down the exact camera time at the start of a dive, the
+  difference in time between the two devices can be determined. As long as the device
+  settings for time has not been changed in either device, you could write down the times of
+  both devices after the dive or even at the end of the day. You can then manually set the time
+  difference in the <em>Time shift</em> dialog. Towards the top of the dialog is a time setting tool
+  immediately under the heading <em>Shift times of image(s) by</em>, shown in figure <strong>A</strong> below.
+  If the camera time is 7 minutes later than that of the dive computer, set the time setting
+  tool to a value of 00:07.  Select either the <em>earlier</em> or <em>later</em> radio button.
+  In the above example, the <em>earlier</em> option is appropriate, since the photos need to be shifted
+  7 minutes earlier (camera is 7 minutes ahead of dive computer). Ignore any "AM" or "PM" suffix
+  in that tool. Click the <em>OK</em> button and synchronization is done.
+</p>
+</li>
+</ul></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/LoadImage3b_f20.jpg" alt="FIGURE: Synchronization dialog" />
+</div>
+</div>
+<div class="ulist"><ul>
+<li>
+<p>
+<strong>By photograph</strong>: There is a very slick way of synchronizing. If you take a
+  photograph of the face of the dive computer showing the time, then <em>Subsurface</em> can get
+  the exact time the photograph was taken, using the metadata the camera stores within
+  each photo. To do this, use the bottom half of the <em>Time shift</em> dialog. If you use
+  the bottom part, the top part of the dialog is ignored. Click on
+  the horizontal bar called "<em>Select image of dive computer showing time</em>. This brings up
+  a file browser letting you select the photograph of the dive computer time. Select the
+  photograph using the file browser and click on <em>OK</em>. This photograph of the dive computer
+  appears in the bottom panel of the <em>Shift times</em> dialog. Now <em>Subsurface</em> knows exactly
+  when the photograph has been taken. Now set the date-time dialog to the left of the photo
+  so it reflects the date and time of the dive computer in the photo. When the
+  date-time tool has been set, <em>Subsurface</em> knows exactly what the time difference between
+  camera and dive computer is, and it can synchronize.
+  Image <strong>B</strong> above shows a photograph of the face of the dive computer and with the date-time tool set to the
+  date-time.
+</p>
 </li>

 </ul></div>

 <div class="paragraph"><p>If the timestamp of a photograph is more than 30 minutes before or after the

@@ -2425,15 +2362,15 @@ dive, it is not placed on the dive profile.</p></div>
 the <em>Photos</em> tab of the <strong>Notes</strong> panel.

 </p>

 </li>

-<li>

-<p>

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

-   reflecting the time each photograph was taken.  In order to view the photos

-   on the dive profile, activate the <em>show-photos</em> button in the tool bar to

-   the left of the dive profile:

-</p>

-</li>

-</ul></div>

+<li>
+<p>
+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
+   dive profile, activate the <em>show-photos</em> button in the tool bar to the left
+   of the dive profile:
+</p>
+</li>
+</ul></div>
 <div class="imageblock" style="text-align:left;">

 <div class="content">

 <img src="images/icons/ShowPhotos_f20.png" alt="FIGURE:Show photos toolbar button" />

@@ -2442,148 +2379,136 @@ as tiny icons (stubs) on the dive profile at the appropriate positions
 <div class="paragraph"><p>This results in a profile display as in the image below:</p></div>

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

 <div class="content">

-<img src="images/LoadImage4_f20.jpg" alt="FIGURE: Photos on dive profile" />

-</div>

-</div>

-<div class="paragraph"><p>If one hovers with the mouse over any of the photo icons, then a thumbnail

-photo is shown of the appropriate photo. See the image below:</p></div>

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

-<div class="content">

-<img src="images/LoadImage5_f20.jpg" alt="FIGURE:Thumbnail photo on dive profile" />

-</div>

-</div>

-<div class="paragraph"><p>Clicking on the thumbnail brings up a full size photo overlaid on the

-<em>Subsurface</em> window. This allows good viewing of the photographs that have

-been added (see the image below). Note that the thumbnail has a small

-dustbin icon in the bottom right hand corner (see image above). If one

-selects the dustbin, the image is removed from the dive. Therefore some care

-is required when clicking on a thumbnail. Images can also be deleted using

-the <em>Photos</em> tab (see text below).</p></div>

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

-<div class="content">

-<img src="images/LoadImage6_f20.jpg" alt="FIGURE: Full-screen photo on dive profile" />

+<img src="images/LoadImage4_f20.jpg" alt="FIGURE: Photos on dive profile" />
+</div>
+</div>
+<div class="paragraph"><p>If you hover the mouse over any of the photo icons, a thumbnail photo is
+shown of the appropriate photo. See the image below:</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/LoadImage5_f20.jpg" alt="FIGURE:Thumbnail photo on dive profile" />
+</div>
+</div>
+<div class="paragraph"><p>Clicking on the thumbnail brings up a full size photo overlaid on the
+<em>Subsurface</em> window. This allows good viewing of the added photographs. (see
+the image below). Note that the thumbnail has a small dustbin icon in the
+bottom right hand corner (see image above). Selecting the dustbin removes
+the image from the dive. Be careful when clicking on a thumbnail. Images can
+also be deleted using the <em>Photos</em> tab (see text below).</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/LoadImage6_f20.jpg" alt="FIGURE: Full-screen photo on dive profile" />
 </div>

 </div>

 </div>

 <div class="sect3">

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

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

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

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

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

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

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

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

-thumbnail, the full-sized image is shown, overlaying the <em>Subsurface</em>

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

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

-removes the photo both from the <em>Photos</em> tab as well as the dive profile.</p></div>

-</div>

-<div class="sect3">

-<h4 id="_photos_on_an_external_hard_disk">5.5.4. Photos on an external hard disk</h4>

-<div class="paragraph"><p>Most underwater photographers store their photos on an external drive. If

-such a drive can be mapped by the operating system (almost always the case)

-the photos can be directly accessed by <em>Subsurface</em>. This facilitates the

-interaction between <em>Subsurface</em> and an external repository of photos. When

-associating a dive profile with photos from an external drive, the normal

-procedure of selection and synchronisation (see text above) is used.

-However, after the external drive has been disconnected, <em>Subsurface</em> cannot

-access these photos any more.  If the display of photos is activated (using

-the toolbox to the left of the <em>Dive Profile</em>), the program only shows a

-small white dot where each photo should be on the dive profile.  In addition

-the <em>Photos</em> tab only shows the file names of the photos. This is normal

-behaviour.  If, later, the external drive with the photos is connected

-again, the photos can be seen in the normal way.</p></div>

-</div>

-<div class="sect3">

-<h4 id="S_FindMovedImages">5.5.5. Moving photographs among directories, hard disks or computers</h4>

-<div class="paragraph"><p>After a photograph has been loaded into <em>Subsurface</em> and associated with a specific dive, the directory

- where the photo lies is stored, allowing <em>Subsurface</em> to find the photograph when the dive is

- opened again. If the photo or the whole photo collection is moved to another drive or to a different

- machine, it is unlikely that the directory structure will remain identical to that of the original uploaded

- photo. When this happens, <em>Subsurface</em> looks for the photos at their original location before they were moved,

- cannot find them and therefore cannot display them. Because, after moving photos, large numbers of photos

- may need to be deleted and re-imported from the new location, <em>Subsurface</em> has a mechanism that eases the

- process of updating the directory information for each photo: automatic updates using fingerprints.</p></div>

-<div class="paragraph"><p>When a photo is loaded into <em>Subsurface</em>, a fingerprint for the image is calculated and stored with the

- other reference information for that photo. After moving a photo collection (that has already been loaded

- into <em>Subsurface</em>) to a different directory, disk or computer, <em>Subsurface</em> can  perform the

- following steps:</p></div>

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

-<li>

-<p>

-look through a particular directory (and all its subdirectories recursively)

-  where photos have been moved

- to,

-</p>

-</li>

-<li>

-<p>

-calculate fingerprints for all photos in this directory, and

-</p>

-</li>

-<li>

-<p>

-if there is a match between a calculated fingerprint and the one originally

-  calculated when a photo was

- loaded into <em>Subsurface</em> (even if the original file name has changed), to

- automatically update the directory information so that <em>Subsurface</em> can find

- the photo in the new moved directory.

-</p>

-</li>

-</ul></div>

-<div class="paragraph"><p>This is achieved by selecting from the Main Menu: <em>File &#8594;      Find moved images</em>. This brings up a window within

- which the NEW directory of the photos needs to be specified. Select the appropriate directory and click

- the <em>Scan</em> button towards the bottom right of the panel. The process may require several minutes to

- complete, after which <em>Subsurface</em> will show the appropriate photographs when a particular dive is opened.</p></div>

+tab of the <em>Notes</em> panel. Photos taken in rapid succession during a dive
+(therefore sometimes with large overlap on the dive profile) can easily be
+accessed in the <em>Photos</em> tab. This tab serves as a tool for individually
+accessing the photos of a dive, while the stubs on the dive profile show
+when during a dive a photo was taken. By single-clicking on a thumbnail in
+the <em>Photos</em> panel, a photo is selected. By double-clicking a thumbnail, the
+full-sized image is shown, overlaying the <em>Subsurface</em> window. A photo can
+be deleted from the <em>Photos</em> panel by selecting it (single-click) and then
+by pressing the <em>Del</em> key on the keyboard. This removes the photo BOTH from
+the <em>Photos</em> tab as well as the dive profile.</p></div>
+</div>
+<div class="sect3">
+<h4 id="_photos_on_an_external_hard_disk">5.5.4. Photos on an external hard disk</h4>
+<div class="paragraph"><p>Most underwater photographers store photos on an external drive. If such a
+drive can be mapped by the operating system (almost always the case) the
+photos can be directly accessed by <em>Subsurface</em>. This eases the interaction
+between <em>Subsurface</em> and an external repository of photos. When associating
+a dive profile with photos from an external drive, the normal procedure of
+selection and synchronization (see text above) is used.  After the external
+drive has been disconnected, <em>Subsurface</em> cannot access these photos any
+more.  If the display of photos is activated (using the toolbox to the left
+of the <em>Dive Profile</em>), the program only shows a small white dot where each
+photo should be on the dive profile.  In addition the <em>Photos</em> tab only
+shows the file names of the photos.  If the external drive with the photos
+is re-connected, the photos can be seen in the normal way.</p></div>
+</div>
+<div class="sect3">
+<h4 id="S_FindMovedImages">5.5.5. Moving photographs among directories, hard disks or computers</h4>
+<div class="paragraph"><p>After a photograph has been loaded into <em>Subsurface</em> and associated with a specific dive, the directory
+ where the photo lies is stored, letting <em>Subsurface</em> find the photograph when the dive is
+ opened again. If the photo or the whole photo collection is moved to another drive or to a different
+ machine, the directory structure will be different to that of the original uploaded
+ photo. When this happens, <em>Subsurface</em> looks for the photos at their original location before they were moved,
+ cannot find them and cannot display them. Because after moving photos, large numbers of photos
+ may need to be deleted and re-imported from the new location, <em>Subsurface</em> has a mechanism that eases the
+ process of updating the directory information for each photo: automatic updates using fingerprints.</p></div>
+<div class="paragraph"><p>When a photo is loaded into <em>Subsurface</em>, a fingerprint for the image is calculated and stored with the
+ other reference information for that photo. After moving a photo collection (that has already been loaded
+ into <em>Subsurface</em>) to a different directory, disk or computer, <em>Subsurface</em> can:</p></div>
+<div class="paragraph"><p>look through a particular directory (and all its subdirectories recursively)
+where photos have been moved to,
+- calculate fingerprints for all photos in this directory, and</p></div>
+<div class="ulist"><ul>
+<li>
+<p>
+if there is a match between a calculated fingerprint and the one originally
+  calculated when a photo was
+ loaded into <em>Subsurface</em> (even if the original file name has changed),
+ automatically update the directory information so that <em>Subsurface</em> can find
+ the photo in the new moved directory.
+</p>
+</li>
+</ul></div>
+<div class="paragraph"><p>This is done by selecting from the Main Menu: <em>File &#8594;      Find moved images</em>. This brings up a window within
+ which the NEW directory of the photos needs to be specified. Select the appropriate directory and click
+ the <em>Scan</em> button towards the bottom right of the panel. The process may require several minutes to
+ complete, after which <em>Subsurface</em> will show the appropriate photographs when a particular dive is opened.</p></div>
 <div class="sidebarblock" id="Image_fingerprint_upgrade">

 <div class="content">

 <div class="paragraph"><p><strong>Upgrading existing photo collections without fingerprints</strong></p></div>

 <div class="admonitionblock">

 <table><tr>

-<td class="icon">

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

-</td>

-<td class="content"><em>Subsurface</em> automatically calculates fingerprints for all images that can

-be accessed by <em>Subsurface</em>.  When manipulating images, ensure that all the

-images associated with the dive log can be accessed by <em>Subsurface</em>.</td>

-</tr></table>

-</div>

-<div class="paragraph"><p><em>Subsurface</em> automatically checks and, if necessary, updates the

-fingerprints associated with a single dive if:

-- The images associated with that dive are visible as thumbnails on the <strong>Dive

-  Profile</strong>.

-- One edits anything in the <strong>Notes tab</strong> panel and save the edits by selecting

-  <em>Apply changes</em>.</p></div>

-</div></div>

-</div>

-</div>

+<td class="icon">
+<img src="images/icons/important.png" alt="Important" />
+</td>
+<td class="content"><em>Subsurface</em> automatically calculates fingerprints for all images that it
+can access.  When manipulating images, be sure all the images associated
+with the dive log can be accessed by <em>Subsurface</em>.</td>
+</tr></table>
+</div>
+<div class="paragraph"><p><em>Subsurface</em> automatically checks and, if necessary, updates the
+fingerprints associated with a single dive if:
+- The images associated with that dive are visible as thumbnails on the <strong>Dive
+  Profile</strong>.
+- If you edit anything in the <strong>Notes tab</strong> panel and save the edits by
+  selecting <em>Apply changes</em>.</p></div>
+</div></div>
+</div>
+</div>
 <div class="sect2">

 <h3 id="_logging_special_types_of_dives">5.6. Logging special types of dives</h3>

-<div class="sect3">

-<h4 id="S_MulticylinderDives">5.6.1. Multicylinder dives</h4>

-<div class="paragraph"><p><em>Subsurface</em> easily handles dives involving more than one

-cylinder. Multi-cylinder diving usually happens (a) if a diver does not have

-enough gas for the complete dive in a single cylinder; (b) if the diver

-needs more than one gas mixture because of the depth or the decompression

-needs of the dive. For this reason multi-cylinder dives are often used by

-technical divers who dive deep or long. As far as <em>Subsurface</em> is concerned,

-there are only two types of information that need to be provided:</p></div>

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

-<li>

-<p>

-<strong>Describe the cylinders used during the dive</strong> This is performed in the <strong>Equipment tab</strong> of

-  the <strong>Info</strong> panel, as <a href="#cylinder_definitions">described above</a>. Enter the cylinders one by one,

-  specifying the characteristics of the cylinder and the gas composition within each cylinder.

-</p>

-</li>

-<li>

-<p>

-<strong>Record the times at which switches from one cylinder to another was done:</strong> This is information

-  provided by some dive computers (provided the diver indicated these changes to the dive computer

-  by pressing specific buttons). If the dive computer does not provide the information, the diver has to

-  record these changes using a different method, e.g. writing it on a slate.

-</p>

+<div class="sect3">
+<h4 id="S_MulticylinderDives">5.6.1. Multicylinder dives</h4>
+<div class="paragraph"><p><em>Subsurface</em> easily handles dives involving more than one
+cylinder. Multi-cylinder diving usually happens (a) if a diver doesn’t have
+enough gas for the complete dive in a single cylinder; (b) if a diver needs
+more than one gas mixture because of the depth or the decompression needs of
+the dive. For this reason multi-cylinder dives are often used by technical
+divers who dive deep or long. As far as <em>Subsurface</em> is concerned, there are
+only two types of information that need to be provided:</p></div>
+<div class="ulist"><ul>
+<li>
+<p>
+<strong>Describe the cylinders used during the dive</strong> This is performed in the <strong>Equipment tab</strong> of
+  the <strong>Info</strong> panel, as <a href="#cylinder_definitions">described above</a>. Enter the cylinders one by one,
+  specifying each’s characteristics and the gas composition within it.
+</p>
+</li>
+<li>
+<p>
+<strong>Record the times at which the switch from one cylinder to another was done:</strong> This is information
+  tracked by some dive computers (provided the diver indicated these changes to the dive computer
+  by pressing specific buttons). If the dive computer does not provide the information, the diver has to
+  record these changes using a different method, e.g. writing it on a slate.
+</p>
 </li>

 <li>

 <p>

@@ -2594,40 +2519,39 @@ there are only two types of information that need to be provided:</p></div>
   those defined during the first step, above (see image below). If the

   <strong>tank bar</strong> button in the toolbar has been activated, the cylinder switches are also indicated in the

   tank bar.

-</p>

-</li>

-</ul></div>

-<div class="paragraph"><p>Having performed these tasks, <em>Subsurface</em> indicates the appropriate use of

-cylinders in the dive profile.  Below is a multi-cylinder dive, starting off

-with EAN28, then changing cylinders to EAN50 after 26 minutes to perform

-decompression.</p></div>

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

-<div class="content">

+</p>
+</li>
+</ul></div>
+<div class="paragraph"><p>When this is complete, <em>Subsurface</em> indicates the appropriate use of
+cylinders in the dive profile.  Below is a multi-cylinder dive, starting off
+with EAN28, then changing cylinders to EAN50 after 26 minutes for
+decompression.</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
 <img src="images/multicylinder_dive.jpg" alt="FIGURE: Multicylinder profile" />

 </div>

 </div>

 </div>

-<div class="sect3">

-<h4 id="_sidemount_dives">5.6.2. Sidemount dives</h4>

-<div class="paragraph"><p>Sidemount diving is just another form of multi-cylinder diving, often with

-both or all cylinders having the same gas mixture. Although it is a popular

-configuration for cave divers, sidemount diving can be performed by

-recreational divers who have completed the appropriate training. Sidemount

-dive logging involves, exactly as with multi-cylinder dives, above, three

-steps:</p></div>

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

-<li>

-<p>

-<strong>During the dive, record cylinder switch events</strong>. Since sidemount diving normally involves two

-  cylinders with air or with the same gas mixture, <em>Subsurface</em> distinguishes among these different

-  cylinders. In contrast, many dive computers that allow gas switching only distinguish among different

-  <em>gases</em> used, not among different <em>cylinders</em> used. This means that when sidemount dives are downloaded

-  from these dive computers, the events of switching between cylinders with the same gas are not downloaded. This may mean

-  that one may have to keep a written log of cylinder switch times using a slate, or (if the dive computer

-  has this facility) marking each cylinder switch with a bookmark that can be retrieved later. Returning

-  from a dive with the times of cylinder changes is the only tricky part of logging sidemount dives.

-</p>

-</li>

+<div class="sect3">
+<h4 id="_sidemount_dives">5.6.2. Sidemount dives</h4>
+<div class="paragraph"><p>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
+configuration for cave divers, Sidemount diving can be done by recreational
+divers who’ve completed the appropriate training. sidemount dive logging
+involves three steps, exactly as with multi-cylinder dives above:</p></div>
+<div class="ulist"><ul>
+<li>
+<p>
+<strong>During the dive, record cylinder switch events</strong>. Since sidemount diving normally involves two
+  cylinders with air or with the same gas mixture, <em>Subsurface</em> distinguishes between these different
+  cylinders. In contrast, many dive computers that allow gas switching only distinguish between different
+  <em>gases</em> used, not among different <em>cylinders</em> used. This means when sidemount dives are downloaded
+  from these dive computers, the switching event between cylinders with the same gas is not downloaded. This may mean
+  that a diver may have to keep a written log of cylinder switch times using a slate, or (if the dive computer
+  has the capability) marking each cylinder switch with a bookmark that can be retrieved later. Returning
+  from a dive with the times of cylinder changes is the only tricky part of logging sidemount dives.
+</p>
+</li>
 <li>

 <p>

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

@@ -2635,19 +2559,19 @@ steps:</p></div>
   image below where two 12 litre cylinder were used).

 </p>

 </li>

-<li>

-<p>

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

-  from a dive computer into <em>Subsurface</em>, the cylinder switch events need to be indicated on the dive profile.

-  Cylinder changes are recorded by right-clicking at the appropriate point on the dive profile and then

-  selecting <em>Add gas change</em>. A list of the appropriate cylinders is shown with the

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

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

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

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

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

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

-</p>

+<li>
+<p>
+<strong>Indicate cylinder change events on the <em>Subsurface</em> dive profile</strong>. Once the dive log has been imported
+  from a dive computer into <em>Subsurface</em>, the cylinder switch events need to be shown on the dive profile.
+  Cylinder changes are recorded by right-clicking at the appropriate point on the dive profile, then
+  selecting <em>Add gas change</em>. A list of the appropriate cylinders is shown with the
+  currently used cylinder greyed out. In the image below Tank 1 is greyed out, leaving only Tank 2
+  to be selected. Select the appropriate cylinder. The cylinder change is then shown on the dive
+  profile with a cylinder symbol. If the <strong>Tank Bar</strong> is activated using the toolbar to the left of the
+  profile, then the cylinder change is also shown on the Tank Bar (see image below). After all
+  the cylinder change events have been recorded on the dive profile, the correct cylinder pressures
+  for both cylinders are shown on the dive profile, as in the image below.
+</p>
 </li>

 </ul></div>

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

@@ -2662,26 +2586,26 @@ logging tool.</p></div>
 <h4 id="S_sSCR_dives">5.6.3. Semi-closed circuit rebreather (SCR) dives</h4>

 <div class="admonitionblock">

 <table><tr>

-<td class="icon">

-<img src="images/halcyon_RB80.jpg" alt="Note" />

-</td>

-<td class="content">Passive semi-closed rebreathers (pSCR) comprise a technical advance in

-diving equipment that recirculates the breathing gas that a diver breathes,

-while removing carbon dioxide from the exhaled gas. While a small amount

-(typically a tenth) of the exhaled breathing gas is released into the water,

-a small amount of fresh gas is released from the back gas cylinder

-(typically containing nitrox).  A diver, using a single cylinder of

-breathing gas can therefore dive for much longer periods than using a

-recreational open-circuit configuration. With pSCR equipment, a very small

-amount of breathing gas is released every time the breather inhales. With

-active SCR (aSCR) equipment, in contrast, a small amount of breathing gas is

-released continuously from the back cylinder.</td>

-</tr></table>

-</div>

-<div class="paragraph"><p>To log pSCR dives, no special procedures are required, just the normal steps

-outlined above:</p></div>

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

-<li>

+<td class="icon">
+<img src="images/halcyon_RB80.jpg" alt="Note" />
+</td>
+<td class="content">Passive semi-closed rebreathers (pSCR) are a technical advance in diving
+equipment that recirculates the breathing gas a diver uses, while removing
+carbon dioxide from the exhaled gas. While a small amount (typically a
+tenth) of the exhaled breathing gas is released into the water, a small
+amount of fresh gas is released from the back gas cylinder (typically
+containing nitrox).  A diver using a single cylinder of breathing gas can
+therefore dive for much longer periods than using a recreational
+open-circuit configuration. With pSCR equipment, a very small amount of
+breathing gas is released every time the diver inhales. With active SCR
+(aSCR) equipment, in contrast, a small amount of breathing gas is released
+continuously from the back cylinder.</td>
+</tr></table>
+</div>
+<div class="paragraph"><p>To log pSCR dives, no special procedures are required. Use the normal steps
+outlined above:</p></div>
+<div class="ulist"><ul>
+<li>
 <p>

 Select pSCR in the <em>Dive Mode</em> dropdown list on the <strong>Info</strong> panel.

 </p>

@@ -2692,14 +2616,14 @@ pSCR diving often involves gas changes, requiring an additional cylinder.
   Define all the appropriate cylinders as described above and indicate the

   cylinder/gas changes as described above in the section on

   <a href="#S_MulticylinderDives">multicylinder dives</a>.

-</p>

-</li>

-</ul></div>

-<div class="paragraph"><p>If a pSCR <em>Dive Mode</em> has been selected, the dive ceiling for pSCR dives is

-adjusted for the oxygen drop across the mouthpiece which often requires

-longer decompression periods. Below is a dive profile of a pSCR dive using

-EAN36 on the back cylinder and oxygen for decompression. Note that this dive

-lasted over two hours.</p></div>

+</p>
+</li>
+</ul></div>
+<div class="paragraph"><p>If a pSCR <em>Dive Mode</em> has been selected, the dive ceiling for that is
+adjusted for the oxygen drop across the mouthpiece, which often requires
+longer decompression periods. Below is a dive profile of a pSCR dive using
+EAN36 on the back cylinder and oxygen for decompression. Note that this dive
+lasted over two hours.</p></div>
 <div class="imageblock" style="text-align:center;">

 <div class="content">

 <img src="images/pSCR_profile.jpg" alt="FIGURE: pSCR profile" />

@@ -2711,43 +2635,43 @@ lasted over two hours.</p></div>
 <div class="admonitionblock">

 <table><tr>

 <td class="icon">

-<img src="images/APD.jpg" alt="Note" />

-</td>

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

-has been breathed while doing two things to maintain a breathable oxygen

-concentration:

-a) remove carbon dioxide from the gas that has been exhaled

-regulate the oxygen concentration to remain within safe diving limits.  The

-CCR interface of <em>Subsurface</em> is currently experimental and under active

-development. Subsurface currently supports Poseidon MkVI and APD

+<img src="images/APD.jpg" alt="Note" />
+</td>
+<td class="content">Closed system rebreathers use advanced technology to recirculate gas that
+has been breathed. They also do two things to maintain a breathable oxygen
+concentration:
+a) remove carbon dioxide from the exhaled gas
+regulate the oxygen concentration to remain within safe diving limits.  The
+CCR interface of <em>Subsurface</em> is currently experimental and under active
+development. Subsurface currently supports Poseidon MkVI and APD
 Discovery/Evolution dive computers. In contrast to a conventional

 recreational dive computer, a CCR system computer does not allow the

-download of a log containing multiple dives. Rather, each dive is stored

-independently. This means that <em>Subsurface</em> cannot download a dive log

-directly from a CCR dive computer, but that it imports CCR dive logs in the

-same way that it imports dive log data from other digital databases: one

-dive at a time.</td>

-</tr></table>

-</div>

-<div class="sect4">

+download of a log containing multiple dives. Rather, each dive is stored
+independently. This means that <em>Subsurface</em> cannot download a dive log
+directly from a CCR dive computer, but that it imports CCR dive logs in the
+same way it imports dive log data from other digital databases: one dive at
+a time.</td>
+</tr></table>
+</div>
+<div class="sect4">
 <h5 id="_import_a_ccr_dive">Import a CCR dive</h5>

 <div class="paragraph"><p>See the section dealing with <a href="#S_ImportingAlienDiveLogs">Importing dive

 information from other digital sources</a>. From the main menu of <em>Subsurface</em>,

 select <em>Import &#8594; Import log files</em> to bring up the

-<a href="#Unified_import">universal import dialogue</a>. As explained in that

-section, the bottom right hand of the import dialogue contains a dropdown

-list (labled <em>Filter:</em>) of appropriate devices that currently

-includes(Poseidon) MkVI or APD log viewer files (import for other CCR

-equipment is under active development). Having selected the appropriate CCR

-format and the directory where the original dive logs have been stored from

-the CCR dive computer, one can select a particular dive log file (in the

-case of the MkVI it is a file with a .txt extension). After selecting the

-appropriate dive log, activate the <em>Open</em> button at the bottom right hand of

-the universal import dialogue.  The selected dive is imported to the

-<em>Subsurface</em> dive list.</p></div>

-</div>

-<div class="sect4">

-<h5 id="_displayed_information_for_a_ccr_dive">Displayed information for a CCR dive</h5>

+<a href="#Unified_import">universal import dialogue</a>. As explained in that
+section, the bottom right hand of the import dialogue contains a dropdown
+list (labled <em>Filter:</em>) of appropriate devices that currently
+include(Poseidon) MkVI or APD log viewer files. Import for other CCR
+equipment is under active development. Having selected the appropriate CCR
+format and the directory where the original dive logs have been stored from
+the CCR dive computer, select a particular dive log file (in the case of the
+MkVI it is a file with a .txt extension). After selecting the appropriate
+dive log, click the <em>Open</em> button at the bottom right hand of the universal
+import dialogue.  The selected dive is imported to the <em>Subsurface</em> dive
+list.</p></div>
+</div>
+<div class="sect4">
+<h5 id="_displayed_information_for_a_ccr_dive">Displayed information for a CCR dive</h5>
 <div class="paragraph"><p><em>Partial pressures of gases</em>: The graph of oxygen partial pressure shows the

 information from the oxygen sensors of the CCR equipment. In contrast to

 recreational equipment (where pO<sub>2</sub> values are calculated based on gas

@@ -2764,42 +2688,42 @@ For TWO O<sub>2</sub> sensors the mean value of the two sensors are given.
 </p>

 </li>

 <li>

-<p>

-For THREE-sensor systems (e.g. APD), the mean value is also used. However

-  differences of more than 0,1 bar in the simultaneous readings of different

-  sensors are treated as spurious. If one of the three sensors provides

-  spurious data, it is ignored.

-</p>

-</li>

-<li>

+<p>
+For THREE-sensor systems (e.g. APD), the mean value is also used. However
+  differences of more than 0,1 bar in the simultaneous readings of different
+  sensors are treated as false. If one of the three sensors provides false
+  data, it is ignored.
+</p>
+</li>
+<li>
 <p>

 If no sensor data are available, the pO<sub>2</sub> value is assumed to be equal to

   the setpoint.

 </p>

 </li>

 </ul></div>

-<div class="paragraph"><p>The mean pO<sub>2</sub> of the sensors is indicated with a green line,</p></div>

-<div class="paragraph"><p>The oxygen setpoint values as well as the readings from the individual

-oxygen sensors can be shown. The display of additional CCR information is

-turned on by checking the appropriate checkboxes in the <em>Preferences</em> panel

-(accessible by selecting <a href="#S_CCR_options"><em>File &#8594; Preferences &#8594;

-Graph</em></a>). This part of the <em>Preferences</em> panel is shown in the image below,

-representing two checkboxes that modify the display of pO<sub>2</sub> when the

-appropriate toolbar button on the Dive Profile has been activated.</p></div>

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

-<div class="content">

-<img src="images/CCR_preferences_f20.jpg" alt="FIGURE: CCR preferences panel" />

-</div>

-</div>

-<div class="paragraph"><p>Checking any of these check boxes allows the display of additional

-oxygen-related information whenever the pO<sub>2</sub> toolbar button on the

-<em>Profile</em> panel is activated.  The first checkbox allows the display of

-setpoint information. This is a red line superimposed on the green oxygen

-partial pressure graph and allows a comparison of the mean measured oxygen

-partial pressure and the setpoint values, as shown below.</p></div>

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

-<div class="content">

-<img src="images/CCR_setpoint_f20.jpg" alt="FIGURE: CCR setpoint and po2 graph" />

+<div class="paragraph"><p>The mean pO<sub>2</sub> of the sensors is indicated with a green line,</p></div>
+<div class="paragraph"><p>The oxygen setpoint values as well as the readings from the individual
+oxygen sensors can be shown. The display of additional CCR information is
+turned on by checking the appropriate boxes in the <em>Preferences</em> panel
+(accessible by selecting <a href="#S_CCR_options"><em>File &#8594; Preferences &#8594;
+Graph</em></a>). This part of the <em>Preferences</em> panel is shown in the image below,
+representing two checkboxes that modify the display of pO<sub>2</sub> when the
+appropriate toolbar button on the Dive Profile has been checked.</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/CCR_preferences_f20.jpg" alt="FIGURE: CCR preferences panel" />
+</div>
+</div>
+<div class="paragraph"><p>Checking any of these boxes allows the display of additional oxygen-related
+information whenever the pO<sub>2</sub> toolbar button on the <em>Profile</em> panel is
+activated.  The first checkbox allows the display of setpoint
+information. This is a red line superimposed on the green oxygen partial
+pressure graph and allows a comparison of the mean measured oxygen partial
+pressure and the setpoint values, as shown below.</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/CCR_setpoint_f20.jpg" alt="FIGURE: CCR setpoint and po2 graph" />
 </div>

 </div>

 <div class="paragraph"><p>The second checkbox allows the display of the data from each individual

@@ -2840,14 +2764,14 @@ the <a href="#S_InfoBox">Information Box</a>.</p></div>
 <div class="paragraph"><p><em>Cylinder pressures</em>: Some CCR dive computers like the Poseidon MkVI record

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

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

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

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

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

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

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

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

-<div class="content">

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

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

 </div>

 <div class="paragraph"><p><em>Equipment-specific information</em>: Equipment-specific information gathered by

@@ -2862,15 +2786,15 @@ ceiling is activated by clicking the appropriate button to the left of the
 dive profile:</p></div>

 <div class="imageblock">

 <div class="content">

-<img src="images/icons/cceiling.jpg" alt="DC ceiling icon" />

-</div>

-</div>

-<div class="paragraph"><p>The default colour of the computer-generated deco ceiling is white. However,

-this can be set to red by checking the appropriate check box after selecting

-<em>File &#8594; Preferences &#8594; Graph</em>.  Below is a dive profile indicating the dive

-computer-generated deco ceiling:</p></div>

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

-<div class="content">

+<img src="images/icons/cceiling.jpg" alt="DC ceiling icon" />
+</div>
+</div>
+<div class="paragraph"><p>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 <em>File &#8594;
+Preferences &#8594; Graph</em>.  Below is a dive profile indicating the dive
+computer-generated deco ceiling:</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
 <img src="images/CCR_dive_ceilingF22.jpg" alt="FIGURE: CCR computer-generated deco ceiling" />

 </div>

 </div>

@@ -2922,14 +2846,14 @@ extra data for a dive using a Poseidon rebreather.</p></div>
 </div>

 <div class="sect2">

 <h3 id="_the_strong_stats_strong_tab_for_groups_of_dives">6.3. The <strong>Stats</strong> tab (for groups of dives)</h3>

-<div class="paragraph"><p>The Stats tab gives summary statistics for more than one dive, assuming that

-more than one dive has been selected in the <strong>Dive List</strong> using the standard

-Ctrl-click or Shift-click of the mouse. If only one dive has been selected,

-figures pertaining to only that dive are given. This tab shows the number of

-dives selected, the total amount of dive time in these dives, as well as the

-minimum, maximum and mean for the dive duration, water temperature and

-surface air consumption (SAC). It also shows the depth of the shallowest and

-deepest dives of those selected.</p></div>

+<div class="paragraph"><p>The Stats tab gives summary statistics for more than one dive, assuming that
+more than one dive has been selected in the <strong>Dive List</strong> using the standard
+Ctrl-click or Shift-click of the mouse. If only one dive has been selected,
+figures for only that dive are given. This tab shows the number of dives
+selected, the total amount of dive time in these dives, as well as the
+minimum, maximum and mean for the dive duration, water temperature and
+surface air consumption (SAC). It also shows the depth of the shallowest and
+deepest dives of those selected.</p></div>
 </div>

 <div class="sect2">

 <h3 id="S_DiveProfile">6.4. The <strong>Dive Profile</strong></h3>

@@ -2937,90 +2861,90 @@ deepest dives of those selected.</p></div>
 <div class="content">

 <img src="images/Profile2.jpg" alt="Typical dive profile" />

 </div>

-</div>

-<div class="paragraph"><p>Of all the panels in <em>Subsurface</em>, the Dive Profile contains the most

-detailed information about each dive. The Dive Profile has a <strong>button bar</strong> on

-the left hand side that allows control over several display options. The

-functions of these buttons are described below. The main item in the Dive

-Profile is the graph of dive depth as a function of time. In addition to the

-obvious information of the depth it also shows the ascent and descent rates

-compared to the recommended speed of going up or down in the water

-column. This information is given using different colours:</p></div>

-<div class="tableblock">

-<table rules="all"

-width="100%"

+</div>
+<div class="paragraph"><p>Of all the panels in <em>Subsurface</em>, the Dive Profile contains the most
+detailed information about each dive. The Dive Profile has a <strong>button bar</strong> on
+the left hand side that lets you control several display options. The
+functions of these buttons are described below. The main item in the Dive
+Profile is the graph of dive depth as a function of time. In addition to
+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:</p></div>
+<div class="tableblock">
+<table rules="all"
+width="100%"
 frame="border"

 cellspacing="0" cellpadding="4">

 <col width="33%" />

 <col width="33%" />

-<col width="33%" />

-<tbody>

-<tr>

-<td align="left" valign="top"><p class="table"><strong>Couleur</strong></p></td>

-<td align="left" valign="top"><p class="table"><strong>Vitesse de descente (m/min)</strong></p></td>

-<td align="left" valign="top"><p class="table"><strong>Vitesse de remontée (m/min)</strong></p></td>

-</tr>

-<tr>

-<td align="left" valign="top"><p class="table">Rouge</p></td>

-<td align="left" valign="top"><p class="table">&gt; 30</p></td>

-<td align="left" valign="top"><p class="table">&gt; 18</p></td>

-</tr>

+<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>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">Red</p></td>
+<td align="left" valign="top"><p class="table">&gt; 30</p></td>
+<td align="left" valign="top"><p class="table">&gt; 18</p></td>
+</tr>
 <tr>

 <td align="left" valign="top"><p class="table">Orange</p></td>

 <td align="left" valign="top"><p class="table">18 - 30</p></td>

-<td align="left" valign="top"><p class="table">9 - 18</p></td>

-</tr>

-<tr>

-<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">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">Vert foncé</p></td>

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

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

-</tr>

+<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">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">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">&lt; 1.5</p></td>
+<td align="left" valign="top"><p class="table">&lt; 1.5</p></td>
+</tr>
 </tbody>

-</table>

-</div>

-<div class="paragraph"><p>The profile also includes depth readings for the peaks and troughs in the

-graph.  Thus, users should see the depth of the deepest point and other

-peaks. Mean depth is plotted as a grey line, indicating mean dive depth up

-to a particular moment during the dive.</p></div>

-<div class="admonitionblock">

+</table>
+</div>
+<div class="paragraph"><p>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. Mean depth is plotted as a grey line, indicating mean dive depth up
+to a particular moment during the dive.</p></div>
+<div class="admonitionblock">
 <table><tr>

 <td class="icon">

 <img src="images/icons/scale.jpg" alt="Note" />

-</td>

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

-Profile</strong> panel. Clicking the <strong>Scale</strong> button in the toolbar on the left of

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

-the area of the panel efficiently.</td>

-</tr></table>

-</div>

-<div class="paragraph"><p><strong>Water temperature</strong> is displayed with its own blue line with temperature values

+</td>
+<td class="content">In some cases the dive profile does not fill the whole area of the <strong>Dive
+Profile</strong> panel. Clicking the <strong>Scale</strong> button in the toolbar on the left of
+the dive profile increases the size of the dive profile to fill the area of
+the panel.</td>
+</tr></table>
+</div>
+<div class="paragraph"><p><strong>Water temperature</strong> is displayed with its own blue line with temperature values
 placed adjacent to significant changes.</p></div>

 <div class="paragraph"><p>The dive profile can include graphs of the <strong>partial pressures</strong> of O<sub>2</sub>,

-N<sub>2</sub>, and He during the dive (see figure above) as well as a calculated and

-dive computer reported deco ceilings (only visible for deep, long, or

-repetitive dives).  Partial pressures of oxygen are indicated in green,

-those of nitrogen in black, and those of helium in dark red. These partial

-pressure graphs are shown below the profile data.</p></div>

-<div class="admonitionblock">

-<table><tr>

-<td class="icon">

-<img src="images/icons/O2.jpg" alt="Note" />

-</td>

-<td class="content">Clicking this button allows display of the partial pressure of <strong>oxygen</strong>

-during the dive. This is depicted below the dive depth and water temperature

-graphs.</td>

-</tr></table>

-</div>

+N<sub>2</sub>, and He during the dive (see figure above) as well as a calculated and
+dive computer reported deco ceilings (only visible for deep, long, or
+repetitive dives).  Partial pressures of oxygen are indicated in green,
+nitrogen in black, and helium in dark red. These partial pressure graphs are
+shown below the profile data.</p></div>
+<div class="admonitionblock">
+<table><tr>
+<td class="icon">
+<img src="images/icons/O2.jpg" alt="Note" />
+</td>
+<td class="content">Clicking this button allows display of the partial pressure of <strong>oxygen</strong>
+during the dive. This is shown below the dive depth and water temperature
+graphs.</td>
+</tr></table>
+</div>
 <div class="admonitionblock">

 <table><tr>

 <td class="icon">

@@ -3033,23 +2957,23 @@ during the dive.</td>
 <div class="admonitionblock">

 <table><tr>

 <td class="icon">

-<img src="images/icons/He.jpg" alt="Note" />

-</td>

-<td class="content">Clicking this button allows display of the partial pressure of <strong>helium</strong>

-during the dive.  This is only of importance to divers using Trimix,

-Helitrox or similar breathing gasses.</td>

-</tr></table>

-</div>

-<div class="paragraph"><p>The <strong>air consumption</strong> graph displays the tank pressure and its change during

-the dive. The air consumption takes depth into account so that even when

-manually entering the start and end pressures the graph is not a straight

-line.  Similarly to the depth graph the slope of the tank pressure gives the

-user information about the momentary SAC rate (Surface Air Consumption) when

-using an air integrated dive computer.  Here the colour coding is not

-relative to some absolute values but relative to the average normalised air

-consumption during the dive. So areas that are red or orange indicate times

-of increased normalized air consumption while dark green reflects times when

-the diver was using less gas than average.</p></div>

+<img src="images/icons/He.jpg" alt="Note" />
+</td>
+<td class="content">Clicking this button allows display of the partial pressure of <strong>helium</strong>
+during the dive.  This is only important to divers using Trimix, Helitrox or
+similar breathing gasses.</td>
+</tr></table>
+</div>
+<div class="paragraph"><p>The <strong>air consumption</strong> graph displays the tank pressure and its change during
+the dive. The air consumption takes depth into account so that even when
+manually entering the start and end pressures the graph, is not a straight
+line.  Like the depth graph, the slope of the tank pressure gives you
+information about the momentary SAC rate (Surface Air Consumption) when
+using an air integrated dive computer.  Here the color coding is not
+relative to some absolute values but relative to the average normalized air
+consumption during the dive. So areas that are red or orange indicate times
+of increased normalized air consumption while dark green reflects times when
+the diver was using less gas than average.</p></div>
 <div class="admonitionblock">

 <table><tr>

 <td class="icon">

@@ -3061,68 +2985,64 @@ rate sensor.</td>
 </tr></table>

 </div>

 <div class="paragraph"><p>It is possible to <strong>zoom</strong> into the profile graph. This is done either by using

-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 intuitively recognizable;

-something

-that free divers clearly 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">

+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>
+<div class="admonitionblock">
+<table><tr>
+<td class="icon">
 <img src="images/icons/ruler.jpg" alt="Note" />

-</td>

-<td class="content">Measurements of <strong>depth or time differences</strong> can be achieved by using the

-<strong>ruler button</strong> on the left of the dive profile panel.  The measurement is

-done by dragging the red dots to the two points on the dive profile that the

-user wishes to measure. Information is then given in the horizontal white

-area underneath the two red dots.</td>

-</tr></table>

-</div>

-<div class="admonitionblock">

+</td>
+<td class="content">Measurements of <strong>depth or time differences</strong> can be achieved by using the
+<strong>ruler button</strong> on the left of the dive profile panel.  The measurement is
+done by dragging the red dots to the two points on the dive profile that you
+wish to measure. Information is then given in the horizontal white area
+underneath the two red dots.</td>
+</tr></table>
+</div>
+<div class="admonitionblock">
 <table><tr>

 <td class="icon">

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

-</td>

-<td class="content">Photographs that have been added to a dive can be shown on the profile by

-selecting the <strong>Show-photo</strong> button. The position of a photo on the profile

-indicates the exact time when this photo was taken. If this button is not

-active, the photos are hidden.</td>

-</tr></table>

-</div>

-<div class="paragraph"><p>The profile can also include the dive computer reported <strong>ceiling</strong> (more

-precisely, the deepest deco stop that the dive computer calculated for each

-particular moment in time) as a red overlay on the dive profile. Ascent

-ceilings arise when a direct ascent to the surface increases the risk of a

-diver suffering from decompression sickness (DCS) and it is necessary to

-either ascend slower or to perform decompression stop(s) before ascending to

-the surface. Not all dive computers record this information and make it

-available for download; for example all of the Suunto dive computers fail to

-make this very useful data available to divelog software. <em>Subsurface</em> also

-calculates ceilings independently, shown as a green overlay on the dive

-profile.  Because of the differences in algorithms used and amount of data

-available (and other factors taken into consideration at the time of the

-calculation) it is unlikely that ceilings from dive computers and from

-<em>Subsurface</em> are the same, even if the same algorithm and <em>gradient factors</em>

-(see below) are used.  It is also quite common that <em>Subsurface</em> calculates

-a ceiling for non-decompression dives when the dive computer stayed in

-non-deco mode during the whole dive (represented by the <span class="green">dark green</span>

-section in the profile at the beginning of this section). This is caused by

-the fact that <em>Subsurface’s</em> calculations describe the deco obligation at

-each moment during a dive, while dive computers usually take the upcoming

-ascent into account. During the ascent some excess nitrogen (and possibly

-helium) are already breathed off so even though the diver technically

-encountered a ceiling at depth, the dive still does not require an explicit

-deco stop. This feature allows dive computers to offer longer non-stop

-bottom times.</p></div>

-<div class="admonitionblock">

-<table><tr>

-<td class="icon">

+</td>
+<td class="content">Photographs that have been added to a dive can be shown on the profile by
+selecting the <strong>Show-photo</strong> button. The position of a photo on the profile
+shows the exact time when this photo was taken. If this button is not
+active, the photos are hidden.</td>
+</tr></table>
+</div>
+<div class="paragraph"><p>The profile can also include the dive computer reported <strong>ceiling</strong> (more
+precisely, the deepest deco stop that the dive computer calculated for each
+particular moment in time) as a red overlay on the dive profile. Ascent
+ceilings occur when a direct ascent to the surface increases the risk of a
+diver suffering from decompression sickness (DCS) and it is necessary to
+either ascend slower or to perform decompression stop(s) before ascending to
+the surface. Not all dive computers record this information and make it
+available for download; for example none of the Suunto dive computers make
+these data available to divelog software. <em>Subsurface</em> also calculates
+ceilings independently, shown as a green overlay on the dive profile.
+Because of the differences in algorithms used and amount of data available
+(and other factors taken into consideration at the time of the calculation)
+it’s unlikely that ceilings from dive computers and from <em>Subsurface</em> are
+the same, even if the same algorithm and <em>gradient factors</em> (see below) are
+used.  It’s also quite common that <em>Subsurface</em> calculates a ceiling for
+non-decompression dives when the dive computer stayed in non-deco mode
+during the whole dive (represented by the <span class="green">dark green</span> section in the
+profile at the beginning of this section). This is because <em>Subsurface’s</em>
+calculations describe the deco obligation at each moment during a dive,
+while dive computers usually take the upcoming ascent into account. During
+the ascent some excess nitrogen (and possibly helium) are already breathed
+off so even though the diver technically encountered a ceiling at depth, the
+dive still does not require a specific deco stop. This feature lets dive
+computers offer longer non-stop bottom times.</p></div>
+<div class="admonitionblock">
+<table><tr>
+<td class="icon">
 <img src="images/icons/cceiling.jpg" alt="Note" />

 </td>

 <td class="content">If the dive computer itself calculates a ceiling and makes it available to

@@ -3168,18 +3088,17 @@ then the ceiling is indicated in 3 m increments (<strong>C</strong> in figure be
 <div class="admonitionblock">

 <table><tr>

 <td class="icon">

-<img src="images/icons/ShowCylindersButton.jpg" alt="Note" />

-</td>

-<td class="content">By selecting this icon, the different cylinders used during a dive can be

-represented as a coloured bar at the bottom of the <strong>Dive Profile</strong>. In

-general oxygen is represented by a green bar, nitrogen with a yellow bar and

-helium with a red bar. The image below shows a dive which first uses a

-trimix cylinder (red and green), followed by a switch to a nitrox cylinder

-(yellow and green) after 23 minutes. Cylinders with air are shown as a light

-blue bar.</td>

-</tr></table>

-</div>

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

+<img src="images/icons/ShowCylindersButton.jpg" alt="Note" />
+</td>
+<td class="content">By selecting this icon, the different cylinders used during a dive can be
+represented as a colored bar at the bottom of the <strong>Dive Profile</strong>. In general
+oxygen is represented by a green bar, nitrogen a yellow bar and helium a red
+bar. The image below shows a dive which first uses a trimix cylinder (red
+and green), followed by a switch to a nitrox cylinder (yellow and green)
+after 23 minutes. Cylinders with air are shown as a light blue bar.</td>
+</tr></table>
+</div>
+<div class="imageblock" style="text-align:center;">
 <div class="content">

 <img src="images/ShowCylinders_f20.jpg" alt="Figure: Cylinder use graph" />

 </div>

@@ -3192,20 +3111,19 @@ blue bar.</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

 ZH-L16 algorithm and are displayed as lines ranging from green (faster

-tissues) to blue (slower tissues).  The black line, graphed above the

-ambient pressure, is the maximum allowable tissue supersaturation (pressure

-limit) derived from the gradient factors specified in the <strong>Preferences</strong>. For

-divers involved in planned decompression diving, efficient rates of

-offgasing are obtained with tissue pressures between the ambient inert gas

-pressure (grey line) and the pressure limit (black line). This display is a

-representation of the tissue pressures during the whole dive. In contrast,

-the <a href="#S_gas_pressure_graph">Gas Pressure Graph</a> in the <strong>Information Box</strong>

-on the <strong>Dive Profile</strong> is an instantaneous reflection of tissue pressures at

-the moment in time reflected by the position of the cursor on the dive

-profile.</td>

-</tr></table>

-</div>

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

+tissues) to blue (slower tissues).  The black line, graphed above the
+ambient pressure, is the maximum allowable tissue supersaturation (pressure
+limit) derived from the gradient factors specified in the <strong>Preferences</strong>. For
+divers doing planned decompression diving, efficient rates of offgassing are
+obtained with tissue pressures between the ambient inert gas pressure (grey
+line) and the pressure limit (black line). This display is a representation
+of the tissue pressures during the whole dive. In contrast, the
+<a href="#S_gas_pressure_graph">Gas Pressure Graph</a> in the <strong>Information Box</strong> on
+the <strong>Dive Profile</strong> is an instantaneous reflection of tissue pressures at the
+moment in time, at the position of the cursor on the dive profile.</td>
+</tr></table>
+</div>
+<div class="imageblock" style="text-align:center;">
 <div class="content">

 <img src="images/tissuesGraph.jpg" alt="Figure: Inert gas tissue pressure graph" />

 </div>

@@ -3231,148 +3149,146 @@ dive. For more information external to this manual see:</p></div>
 </li>

 </ul></div>

 </div>

-<div class="sect2">

-<h3 id="_the_dive_profile_context_menu">6.5. The Dive Profile context menu</h3>

-<div class="paragraph"><p>The context menu for the Dive Profile is accessed by right-clicking while

-the mouse cursor is over the Dive Profile panel. The menu allows the

-creation of Bookmarks or Gas Change Event markers or manual CCR set-point

-changes other than the ones that might have been imported from a Dive

-Computer. Markers are placed against the depth profile line and with the

-time of the event set by where the mouse cursor was when the right mouse

-button was initially clicked to bring up the menu. Gas Change events involve

-a selection of which gas is being switched to, the list of choices being

-based on the available gases defined in the <strong>Equipment</strong> Tab. Set-point

-change events open a dialog allowing to choose the next set-point value. As

-in the planner, a set-point value of zero indicates the diver is breathing

-from an open circuit system while any non-zero value indicates the use of a

-closed circuit rebreather (CCR).  By right-clicking while over an existing

-marker a menu appears, adding options to allow deletion of the marker or to

-allow all markers of that type to be hidden. Hidden events can be restored

-to view by selecting Unhide all events from the context menu.</p></div>

-</div>

-<div class="sect2">

-<h3 id="S_InfoBox">6.6. The <strong>Information Box</strong></h3>

-<div class="paragraph"><p>The Information box displays a large range of information pertaining to the

-dive profile. Normally the Information Box is located to the top left of the

-<strong>Dive Profile</strong> panel. If the mouse points outside of the <strong>Dive Profile</strong>

-panel, then only the top line of the Information Box is visible (see

-left-hand part of figure (<strong>A</strong>) below). The Information Box can be moved

+<div class="sect2">
+<h3 id="_the_dive_profile_context_menu">6.5. The Dive Profile context menu</h3>
+<div class="paragraph"><p>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
+Bookmarks, Gas Change Event markers, or manual CCR set-point changes other
+than the ones that might have been imported from a Dive Computer. Markers
+are placed against the depth profile line, with the time of the event set by
+where the mouse cursor was when the right mouse button was first clicked to
+bring up the menu. Gas Change events involve a selection of which gas is
+being switched TO. The list of choices is based on the available gases
+defined in the <strong>Equipment</strong> Tab. Setpoint change events open a dialog letting
+you choose the next setpoint value. As in the planner, a setpoint value of
+zero shows the diver is breathing from an open circuit system while any
+non-zero value shows the use of a closed circuit rebreather (CCR).  By
+right-clicking while over an existing marker a menu appears, adding options
+to allow deletion of the marker, or to allow all markers of that type to be
+hidden. Hidden events can be restored to view by selecting Unhide all events
+from the context menu.</p></div>
+</div>
+<div class="sect2">
+<h3 id="S_InfoBox">6.6. The <strong>Information Box</strong></h3>
+<div class="paragraph"><p>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
+<strong>Dive Profile</strong> panel. If the mouse points outside of the <strong>Dive Profile</strong>
+panel, then only the top line of the Information Box is visible (see
+left-hand part of figure (<strong>A</strong>) below). The Information Box can be moved
 around in the <strong>Dive Profile</strong> panel by click-dragging it with the mouse so

 that it is not obstructing important detail. The position of the Information

 Box is saved and used again during subsequent dive analyses.</p></div>

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

 <div class="content">

-<img src="images/InfoBox2.jpg" alt="Figure: Information Box" />

-</div>

-</div>

-<div class="paragraph"><p>The moment the mouse points inside the <strong>Dive Profile</strong> panel, the information

-box expands and shows many data items. In this situation, the data reflect

-the time point along the dive profile indicated by the mouse cursor (see

-right-hand part of figure (<strong>B</strong>) above where the Information Box reflects the

-situation at the position of the cursor [arrow] in that image). Therefore,

-moving the cursor in the horizontal direction allows the Information Box to

-show information for any point along the dive profile.  In this mode, the

-Information Box gives extensive statistics about depth, gas and ceiling

-characteristics of the particular dive. These include: Time period into the

-dive (indicated by a @), depth, cylinder pressure (P), temperature,

-ascent/descent rate, surface air consumption (SAC), oxygen partial pressure,

-maximum operating depth, equivalent air depth (EAD), equivalent narcotic

-depth (END), equivalent air density depth (EADD), decompression requirements

-at that instant in time (Deco), time to surface (TTS), the calculated

-ceiling, as well as the calculated ceiling for several Bühlmann tissue

-compartments.</p></div>

-<div class="paragraph"><p>The user has control over the display of several statistics, represented as

-four buttons on the left of the profile panel. These are:</p></div>

-<div class="admonitionblock">

-<table><tr>

-<td class="icon">

+<img src="images/InfoBox2.jpg" alt="Figure: Information Box" />
+</div>
+</div>
+<div class="paragraph"><p>When the mouse points inside the <strong>Dive Profile</strong> panel, the information box
+expands and shows many data items. In this situation, the data reflect the
+time point along the dive profile shown by the mouse cursor (see right-hand
+part of figure (<strong>B</strong>) above where the Information Box reflects the situation
+at the position of the cursor [arrow] in that image). Moving the cursor
+horizontally lets the Information Box show information for any point along
+the dive profile.  In this mode, the Information Box gives extensive
+statistics about depth, gas and ceiling characteristics of the particular
+dive. These include: Time period into the dive (indicated by a @), depth,
+cylinder pressure (P), temperature, ascent/descent rate, surface air
+consumption (SAC), oxygen partial pressure, maximum operating depth,
+equivalent air depth (EAD), equivalent narcotic depth (END), equivalent air
+density depth (EADD), decompression requirements at that instant in time
+(Deco), time to surface (TTS), the calculated ceiling, as well as the
+calculated ceiling for several Bühlmann tissue compartments.</p></div>
+<div class="paragraph"><p>The user has control over the display of some statistics, shown as four
+buttons on the left of the profile panel. These are:</p></div>
+<div class="admonitionblock">
+<table><tr>
+<td class="icon">
 <img src="images/icons/MOD.jpg" alt="Note" />

 </td>

 <td class="content">Clicking this button causes the Information Box to display the <strong>Maximum

 Operating Depth (MOD)</strong> of the dive, given the gas mixture used. MOD is

 dependent on the oxygen concentration in the breathing gas.  For air (21%

-oxygen) it is around 57 m if a maximum pO<sub>2</sub> of 1.4 is specified in the

-<strong>Preferences</strong> section (select <em>File</em> &#8594; Preferences &#8594; Graph_ and edit the

-text box <em>Max pO<sub>2</sub> when showing MOD</em>.  Below the MOD there is a markedly

-increased risk of exposure to the dangers associated with oxygen toxicity.</td>

-</tr></table>

-</div>

-<div class="admonitionblock">

+oxygen) it is around 57 m if a maximum pO<sub>2</sub> of 1.4 is specified in the
+<strong>Preferences</strong> section (select <em>File</em> &#8594; Preferences &#8594; Graph_ and edit the
+text box <em>Max pO<sub>2</sub> when showing MOD</em>.  Below the MOD there is a markedly
+increased risk of exposure to the dangers of oxygen toxicity.</td>
+</tr></table>
+</div>
+<div class="admonitionblock">
 <table><tr>

 <td class="icon">

 <img src="images/icons/NDL.jpg" alt="Note" />

 </td>

 <td class="content">Clicking this button causes the Information Box to display either the

-<strong>No-deco Limit (NDL)</strong> or the <strong>Total Time to Surface (TTS)</strong>. NDL is the time

-duration that a diver can continue with a dive, given the present depth,

-that does not require decompression (that is, before an ascent ceiling

-appears). Once one has exceeded the NDL and decompression is required (that

-is, there is an ascent ceiling above the diver, then TTS gives the number of

-minutes required before the diver can surface. TTS includes ascent time as

-well as decompression time. TTS is calculated assuming an ascent surface air

-consumption (SAC) for the gas currently used. Even if the profile contains

-several gas switches, TTS at a specific moment during the dive is calculated

-using the current gas.  For TTS longer than 2 hours, it is not accurately

-calculated and Subsurface only indicates <em>TTS &gt; 2h</em>.</td>

-</tr></table>

-</div>

-<div class="admonitionblock">

+<strong>No-deco Limit (NDL)</strong> or the <strong>Total Time to Surface (TTS)</strong>. NDL is the time
+duration that a diver can continue with a dive, given the present depth,
+that does not require decompression (that is, before an ascent ceiling
+appears). Once a diver has exceeded the NDL and decompression is required
+(that is, there is an ascent ceiling above the diver) then TTS gives the
+number of minutes required before the diver can surface. TTS includes ascent
+time as well as decompression time. TTS is calculated assuming an ascent
+surface air consumption (SAC) for the gas currently used. Even if the
+profile contains several gas switches, TTS at a specific moment during the
+dive is calculated using the current gas.  TTS longer than 2 hours is not
+accurately calculated and Subsurface only indicates <em>TTS &gt; 2h</em>.</td>
+</tr></table>
+</div>
+<div class="admonitionblock">
 <table><tr>

 <td class="icon">

-<img src="images/icons/SAC.jpg" alt="Note" />

-</td>

-<td class="content">Clicking this button causes the Information Box to display the <strong>Surface Air

-Consumption (SAC)</strong>.  SAC is an indication of the surface-normalised

-respiration rate of a diver. The value of SAC is less than the real

-respiration rate because a diver at 10m uses breathing gas at a rate roughly

-double that of the equivalent rate at the surface. SAC gives an indication

-of breathing gas consumption rate independent of the depth of the dive so

-that the respiratory rates of different dives can be compared. The units for

-SAC is litres/min or cub ft/min.</td>

-</tr></table>

-</div>

-<div class="admonitionblock">

+<img src="images/icons/SAC.jpg" alt="Note" />
+</td>
+<td class="content">Clicking this button causes the Information Box to display the <strong>Surface Air
+Consumption (SAC)</strong>.  SAC is an indication of the surface-normalized
+respiration rate of a diver. The value of SAC is less than the real
+respiration rate because a diver at 10m uses breathing gas at a rate roughly
+double that of the equivalent rate at the surface. SAC gives an indication
+of breathing gas consumption rate independent of the depth of the dive, so
+the respiratory rates of different dives can be compared. The units for SAC
+is liters/min or cubic ft/min.</td>
+</tr></table>
+</div>
+<div class="admonitionblock">
 <table><tr>

 <td class="icon">

 <img src="images/icons/EAD.jpg" alt="Note" />

-</td>

-<td class="content">Clicking this button displays the <strong>Equivalent Air Depth (EAD)</strong> for nitrox

-dives as well as the <strong>Equivalent Narcotic Depth (END)</strong> for trimix

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

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

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

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

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

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

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

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

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

-equalling the END.</td>

-</tr></table>

-</div>

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

-data.</p></div>

-<div class="sect3">

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

-<div class="paragraph"><p>On the left of the <strong>Information Box</strong> is a vertical bar graph indicating the

-pressures of the nitrogen (and other inert gases, e.g. helium, if

-applicable) that the diver was inhaling <em>at a particular instant during the

-dive</em>, indicated by the position of the cursor on the <strong>Dive Profile</strong>. The

-drawing on the left below indicates the meaning of the different parts of

-the Gas Pressure Bar Graph.</p></div>

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

+</td>
+<td class="content">Clicking this button displays the <strong>Equivalent Air Depth (EAD)</strong> for nitrox
+dives as well as the <strong>Equivalent Narcotic Depth (END)</strong> for trimix
+dives. These are important to divers breathe gases other than air. Their
+values are dependent on the composition of the breathing gas.  The EAD is
+the depth of a hypothetical air dive that has the same partial pressure of
+nitrogen as the current depth of the nitrox dive at hand. A nitrox dive
+leads to the same decompression obligation as an air dive to the depth
+equalling the EAD. The END is the depth of a hypothetical air dive that has
+the same sum of partial pressures of the narcotic gases nitrogen and oxygen
+as the current trimix dive. A trimix diver can expect the same narcotic
+effect as a diver breathing air diving at a depth equalling the END.</td>
+</tr></table>
+</div>
+<div class="paragraph"><p>Figure (<strong>B</strong>) above shows an information box with a nearly complete set of
+data.</p></div>
+<div class="sect3">
+<h4 id="S_gas_pressure_graph">6.6.1. The Gas Pressure Bar Graph</h4>
+<div class="paragraph"><p>On the left of the <strong>Information Box</strong> is a vertical bar graph showing the
+pressures of the nitrogen (and other inert gases, e.g. helium, if
+applicable) that the diver was inhaling <em>at a particular instant during the
+dive</em>. It is shown by the position of the cursor on the <strong>Dive Profile</strong>. The
+drawing on the left below indicates the meaning of the different parts of
+the Gas Pressure Bar Graph.</p></div>
+<div class="imageblock" style="text-align:center;">
 <div class="content">

 <img src="images/GasPressureBarGraph.jpg" alt="FIGURE:Gas Pressure bar Graph" />

 </div>

 </div>

 <div class="ulist"><ul>

-<li>

-<p>

-The light green area indicates the total gas, with the top margin of the

-  light green area indicating the total gas pressure inhaled by the diver and

-  measured from the bottom of the graph to the top of the light green

-  area. This pressure has a <em>relative</em> value in the graph and does not

-  indicate absolute pressure.

+<li>
+<p>
+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
+  measured from the bottom of the graph to the top of the light green
+  area. This pressure has a <em>relative</em> value in the graph and does not
+  indicate absolute pressure.
 </p>

 </li>

 <li>

@@ -3401,33 +3317,33 @@ The top black horizontal line indicates the gradient factor that applies to
   <strong>Subsurface</strong>.

 </p>

 </li>

-<li>

-<p>

-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

-  is expected to be severe, resulting in decompression sickness.

-</p>

-</li>

-</ul></div>

-<div class="paragraph"><p>These five values are indicated on the left in the graph above. The way the

-Gas Pressure Bar Graph changes during a dive is indicated on the right hand

-side of the above figure for a diver using EAN32.</p></div>

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

-<li>

-<p>

-Graph <strong>A</strong> indicates the situation at the start of a dive with diver at the

-  surface. The pressures in all the tissue compartments are still at the

-  equilibrium pressure because no diving has taken place.

-</p>

-</li>

-<li>

-<p>

-Graph <strong>B</strong> indicates the situation after a descent to 30 meters. Few of the

-  tissue compartments have had time to respond to the descent, their gas

-  pressures being far below the equilibrium gas pressure.

-</p>

-</li>

-<li>

+<li>
+<p>
+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
+  is expected to be severe, resulting in decompression sickness.
+</p>
+</li>
+</ul></div>
+<div class="paragraph"><p>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
+of the above figure for a diver using EAN32.</p></div>
+<div class="ulist"><ul>
+<li>
+<p>
+Graph <strong>A</strong> indicates the start of a dive with the diver at the surface. The
+  pressures in all the tissue compartments are still at the equilibrium
+  pressure because no diving has taken place.
+</p>
+</li>
+<li>
+<p>
+Graph <strong>B</strong> 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
+  pressures are far below the equilibrium gas pressure.
+</p>
+</li>
+<li>
 <p>

 Graph <strong>C</strong> represents the pressures after 30 minutes at 30 m. The fast

   compartments have attained equilibrium (i.e. they have reached the hight of

@@ -3435,17 +3351,17 @@ Graph <strong>C</strong> represents the pressures after 30 minutes at 30 m. The
   (towards the right) have not reached equilibrium and are in the process of

   slowly increasing in pressure.

 </p>

-</li>

-<li>

-<p>

-Graph <strong>D</strong> 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

-  bar to 1.45 bar, the pressures in the different tissue compartments now

-  exceed that of the total gas pressure and approaches the gradient factor

-  value (i.e.  the top black horizontal line). Further ascent will result in

-  exceeding the gradient factor value (GFHigh), endangering the diver.

-</p>

-</li>

+</li>
+<li>
+<p>
+Graph <strong>D</strong> 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
+  bar to 1.45 bar, the pressures in the different tissue compartments now
+  exceed that of the total gas pressure and approach the gradient factor value
+  (i.e.  the top black horizontal line). Further ascent will result in
+  exceeding the gradient factor value (GFHigh), endangering the diver.
+</p>
+</li>
 <li>

 <p>

 Graph <strong>E</strong> indicates the situation after remaining at 4.5 meters for 10

@@ -3458,167 +3374,161 @@ Graph <strong>E</strong> indicates the situation after remaining at 4.5 meters f
 </ul></div>

 </div>

 </div>

-</div>

-</div>

-<div class="sect1">

-<h2 id="_organising_the_logbook_manipulating_groups_of_dives">7. Organising the logbook (Manipulating groups of dives)</h2>

-<div class="sectionbody">

-<div class="sect2">

-<h3 id="_the_dive_list_context_menu">7.1. The Dive List context menu</h3>

-<div class="paragraph"><p>Several actions on either a single dive or a group of dives can be performed

-using the Dive List Context Menu, found by selecting either a single dive or

-a group of dives and then right-clicking.</p></div>

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

-<div class="content">

-<img src="images/ContextMenu.jpg" alt="Figure: Context Menu" />

-</div>

-</div>

-<div class="paragraph"><p>The context menu is used in many manipulations described below.</p></div>

-<div class="sect3">

-<h4 id="_customising_the_columns_showed_in_the_strong_dive_list_strong_panel">7.1.1. Customising the columns showed in the <strong>Dive List</strong> panel</h4>

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

-<div class="content">

-<img src="images/DiveListOptions.jpg" alt="Example: Dive list info options" />

+</div>
+</div>
+<div class="sect1">
+<h2 id="_organizing_the_logbook_manipulating_groups_of_dives">7. Organizing the logbook (Manipulating groups of dives)</h2>
+<div class="sectionbody">
+<div class="sect2">
+<h3 id="_the_dive_list_context_menu">7.1. The Dive List context menu</h3>
+<div class="paragraph"><p>Several actions on either a single dive, or a group of dives, can be
+performed using the Dive List Context Menu.  It is found by selecting either
+a single dive or a group of dives and then right-clicking.</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/ContextMenu.jpg" alt="Figure: Context Menu" />
+</div>
+</div>
+<div class="paragraph"><p>The context menu is used in many functions described below.</p></div>
+<div class="sect3">
+<h4 id="_customizing_the_columns_showed_in_the_strong_dive_list_strong_panel">7.1.1. Customizing the columns showed in the <strong>Dive List</strong> panel</h4>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/DiveListOptions.jpg" alt="Example: Dive list info options" />
 </div>

 </div>

 <div class="paragraph"><p>The default information in the <strong>Dive List</strong> includes, for each dive,

 Dive_number, Date, Rating, Dive_depth, Dive_duration and Dive_location. This

-information can be controlled and changed by right-clicking on the header

-bar of the <strong>Dive List</strong>. For instance, a right-click on the <em>Date</em> header

-brings up a list of items that can be shown in the dive list (see

-above). Select an item to be shown in the <strong>Dive List</strong> or to be deleted from

-the dive list (reflected by the check symbols) and the list is immediately

-updated. Preferences for information shown in the <strong>Dive List</strong> are saved and

-used when <em>Subsurface</em> is re-opened.</p></div>

-</div>

-</div>

-<div class="sect2">

-<h3 id="S_Renumber">7.2. Renumbering the dives</h3>

-<div class="paragraph"><p>Dives are normally numbered incrementally from non-recent dives (low

-sequence numbers) to recent dives (having the highest sequence numbers). The

-numbering of the dives is not always consistent. For instance, when

-non-recent dives are added to the dive list the numbering does not

-automatically follow on because of the dives that are more recent in

-date/time than the newly-added dive with an older date/time. Therefore, one

-may sometimes need to renumber the dives.  This is performed by selecting

-(from the Main Menu) <em>Log &#8594; Renumber</em>. Users are given a choice with

-respect to the lowest sequence number to be used.  Completing this operation

-results in new sequence numbers (based on date/time)  for the dives in the

-<strong>Dive List</strong> panel.</p></div>

-<div class="paragraph"><p>One can also renumber a few selected dives in the dive list. Select the

-dives that need renumbering. Right-click on the selected list and use the

-Dive List Context Menu to perform the renumbering. A popup window appears

-requiring the user to specify the starting number for the renumbering

-process.</p></div>

-</div>

-<div class="sect2">

-<h3 id="S_Group">7.3. Grouping dives into trips and manipulating trips</h3>

-<div class="paragraph"><p>For regular divers, the dive list can rapidly become very long. <em>Subsurface</em>

-can group dives into <em>trips</em>. It performs this by grouping dives that have

-date/times not separated in time by more than two days, thus creating a

-single heading for each diving trip represented in the dive log. Below is an

-ungrouped dive list (<strong>A</strong>, on the left) as well as the corresponding grouped

-dive list comprising five dive trips (<strong>B</strong>, on the right):</p></div>

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

-<div class="content">

-<img src="images/Group2.jpg" alt="Figure: Grouping dives" />

-</div>

-</div>

-<div class="paragraph"><p>Grouping into trips allows a rapid way of accessing individual dives without

-having to scan a long lists of dives. In order to group the dives in a dive

-list, (from the Main Menu) select <em>Log &#8594; Autogroup</em>. The <strong>Dive List</strong> panel

-now shows only the titles for the trips.</p></div>

-<div class="sect3">

-<h4 id="_editing_the_title_and_associated_information_for_a_particular_trip">7.3.1. Editing the title and associated information for a particular trip</h4>

-<div class="paragraph"><p>Normally, in the dive list, minimal information is included in the trip

-title.  More information about a trip can be added by selecting its trip

-title from the <strong>Dive List</strong>. This shows a <strong>Trip Notes</strong> tab in the <strong>Notes</strong>

-panel. Here one can add or edit information about the date/time, the trip

-location and any other general comments about the trip as a whole (e.g. the

-dive company that was dived with, the general weather and surface conditions

-during the trip, etc.).  After entering this information, select <strong>Save</strong> from

-the buttons at the top right of the <strong>Trip Notes</strong> tab. The trip title in the

-<strong>Dive List</strong> panel should now reflect the edited information.</p></div>

-</div>

-<div class="sect3">

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

-<div class="paragraph"><p>Once the dives have been grouped into trips, users can expand one or more

-trips by clicking the arrow-head on the left of each trip title. This

-expands the selected trip, revealing the individual dives performed during

-the trip.</p></div>

-</div>

-<div class="sect3">

-<h4 id="_collapsing_or_expanding_dive_information_for_different_trips">7.3.3. Collapsing or expanding dive information for different trips</h4>

-<div class="paragraph"><p>After selecting a particular trip in the dive list, the context menu allows

-several possibilities to expand or collapse dives within trips. This

-includes expanding all trips and collapsing all trips.</p></div>

-</div>

-<div class="sect3">

-<h4 id="_merging_dives_from_more_than_one_trip_into_a_single_trip">7.3.4. Merging dives from more than one trip into a single trip</h4>

+information can be controlled and changed by right-clicking on the header
+bar of the <strong>Dive List</strong>. For instance, a right-click on the <em>Date</em> header
+brings up a list of items that can be shown in the dive list (see
+above). Select an item to be shown in the <strong>Dive List</strong> or be deleted
+(reflected by the check symbols) and the list is immediately
+updated. Preferences for information shown in the <strong>Dive List</strong> are saved and
+used when <em>Subsurface</em> is re-opened.</p></div>
+</div>
+</div>

+<div class="sect2">
+<h3 id="S_Renumber">7.2. Renumbering the dives</h3>
+<div class="paragraph"><p>Dives are normally numbered incrementally from non-recent dives (low
+sequence numbers) to recent dives (higher sequence numbers).  Numbering of
+dives is not always consistent. For instance, when non-recent dives are
+added, correct numbering does not automatically follow on because of the
+dives that are more recent in date/time than the newly-added dive with an
+older date/time. So you may need to renumber the dives.  Do this by
+selecting (from the Main Menu) <em>Log &#8594; Renumber</em>. Users are given a choice
+of the lowest sequence number to be used.  This results in new sequence
+numbers (based on date/time)  for the dives in the <strong>Dive List</strong> panel.</p></div>
+<div class="paragraph"><p>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
+Dive List Context Menu to perform the renumbering. A popup window appears
+letting the user specify the starting number for the process.</p></div>
+</div>
+<div class="sect2">
+<h3 id="S_Group">7.3. Grouping dives into trips and manipulating trips</h3>
+<div class="paragraph"><p>For regular divers, the dive list can rapidly become very long. <em>Subsurface</em>
+can group dives into <em>trips</em>. It does this by grouping dives that have
+date/times not separated in time by more than two days, so creating a single
+heading for each diving trip represented in the dive log. Below is an
+ungrouped dive list (<strong>A</strong>, on the left) as well as the corresponding grouped
+dive list of five dive trips (<strong>B</strong>, on the right):</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/Group2.jpg" alt="Figure: Grouping dives" />
+</div>
+</div>
+<div class="paragraph"><p>Grouping into trips allows a rapid way of accessing individual dives without
+having to scan a long lists of dives. To group the dives in a dive list,
+(from the Main Menu) select <em>Log &#8594; Autogroup</em>. The <strong>Dive List</strong> panel now
+shows only the titles for the trips.</p></div>
+<div class="sect3">
+<h4 id="_editing_the_title_and_associated_information_for_a_particular_trip">7.3.1. Editing the title and associated information for a particular trip</h4>
+<div class="paragraph"><p>Normally, in the dive list, minimal information is included in the trip
+title.  More information about a trip can be added by selecting its trip
+title from the <strong>Dive List</strong>. This shows a <strong>Trip Notes</strong> tab in the <strong>Notes</strong>
+panel. Here you can add or edit information about the date/time, the trip
+location and any other general comments about the trip as a whole (e.g. the
+dive company that was used, the general weather and surface conditions
+during the trip, etc.).  After entering this information, select <strong>Save</strong> from
+the buttons at the top right of the <strong>Trip Notes</strong> tab. The trip title in the
+<strong>Dive List</strong> panel should now reflect the edited information.</p></div>
+</div>
+<div class="sect3">
+<h4 id="_viewing_the_dives_during_a_particular_trip">7.3.2. Viewing the dives during a particular trip</h4>
+<div class="paragraph"><p>Once the dives have been grouped into trips, you can expand one or more
+trips by clicking the arrow-head on the left of each trip title. This
+expands the selected trip, revealing individual dives done during the trip.</p></div>
+</div>
+<div class="sect3">
+<h4 id="_collapsing_or_expanding_dive_information_for_different_trips">7.3.3. Collapsing or expanding dive information for different trips</h4>
+<div class="paragraph"><p>After selecting a particular trip in the dive list, the context menu allows
+several options to expand or collapse dives within trips. This includes
+expanding all trips and collapsing all trips.</p></div>
+</div>
+<div class="sect3">
+<h4 id="_merging_dives_from_more_than_one_trip_into_a_single_trip">7.3.4. Merging dives from more than one trip into a single trip</h4>
 <div class="paragraph"><p>After selecting a trip title, the context menu allows the merging of trips

 by either merging the selected trip with the trip below or with the trip

 above. (Merge trip with trip below; Merge trip with trip above)</p></div>

-</div>

-<div class="sect3">

-<h4 id="_splitting_a_single_trip_into_more_than_one_trip">7.3.5. Splitting a single trip into more than one trip</h4>

-<div class="paragraph"><p>If a trip includes ten dives, the user can split this trip into two trips

-(trip 1: top 4 dives; trip 2: bottom 6 dives) by selecting and

-right-clicking the top four dives. The resulting context menu allows the

-user to create a new trip by choosing the option <strong>Create new trip

-above</strong>. The top four dives are then grouped into a separate trip. The

-figures below shows the selection and context menu on the left (A) and the

-completed action on the right (B):</p></div>

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

-<div class="content">

-<img src="images/SplitDive3a.jpg" alt="FIGURE: Split a trip into 2 trips" />

+</div>
+<div class="sect3">
+<h4 id="_splitting_a_single_trip_into_more_than_one_trip">7.3.5. Splitting a single trip into more than one trip</h4>
+<div class="paragraph"><p>If a trip includes 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
+top four dives. The resulting context menu lets the user create a new trip
+by choosing the option <strong>Create new trip above</strong>. The top four dives are then
+grouped into a separate trip. The figures below show the selection and
+context menu on the left (A) and the completed action on the right (B):</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/SplitDive3a.jpg" alt="FIGURE: Split a trip into 2 trips" />
 </div>

 </div>

 </div>

 </div>

 <div class="sect2">

 <h3 id="_manipulating_single_dives">7.4. Manipulating single dives</h3>

-<div class="sect3">

-<h4 id="_delete_a_dive_from_the_dive_log">7.4.1. Delete a dive from the dive log</h4>

-<div class="paragraph"><p>Dives can be permanently deleted from the dive log by selecting and

-right-clicking them to bring up the context menu, and then selecting <strong>Delete

-dive(s)</strong>. Typically this would apply to a case where a user wishes to delete

-workshop calibration dives of the dive computer or dives of extremely short

-duration.</p></div>

-</div>

-<div class="sect3">

-<h4 id="_unlink_a_dive_from_a_trip">7.4.2. Unlink a dive from a trip</h4>

-<div class="paragraph"><p>Users can unlink dives from the trip to which they belong. In order to do

-this, select and right-click the relevant dives to bring up the context

-menu. Then select the option <strong>Remove dive(s)  from trip</strong>. The dive(s) now

-appear immediately above or below the trip to which they belonged, depending

-on the date and time of the unlinked dive.</p></div>

-</div>

-<div class="sect3">

-<h4 id="_add_a_dive_to_the_trip_immediately_above">7.4.3. Add a dive to the trip immediately above</h4>

+<div class="sect3">
+<h4 id="_delete_a_dive_from_the_dive_log">7.4.1. Delete a dive from the dive log</h4>
+<div class="paragraph"><p>Dives can be permanently deleted from the dive log by selecting and
+right-clicking them to bring up the context menu, then selecting <strong>Delete
+dive(s)</strong>. Typically this would apply to a case where a user wishes to delete
+workshop calibration dives of the dive computer or dives of extremely short
+duration.</p></div>
+</div>
+<div class="sect3">
+<h4 id="_unlink_a_dive_from_a_trip">7.4.2. Unlink a dive from a trip</h4>
+<div class="paragraph"><p>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
+the option <strong>Remove dive(s)  from trip</strong>. The dive(s) now appear immediately
+above or below the trip to which they belonged, depending on the date and
+time of the unlinked dive.</p></div>
+</div>
+<div class="sect3">
+<h4 id="_add_a_dive_to_the_trip_immediately_above">7.4.3. Add a dive to the trip immediately above</h4>
 <div class="paragraph"><p>Selected dives can be moved from the trip to which they belong and placed

 within a separate trip. To do this, select and right-click the dive(s) to

 bring up the context menu, and then select <strong>Create new trip above</strong>.</p></div>

-</div>

-<div class="sect3">

-<h4 id="_shift_the_start_time_of_dive_s">7.4.4. Shift the start time of dive(s)</h4>

-<div class="paragraph"><p>Sometimes it is necessary to adjust the start time of a dive. This may apply

-to situations where dives are performed in different time zones or when the

-dive computer has an erroneous time. In order to do this, select and

-right-click the dive(s) to be adjusted. This action brings up the context

-menu on which the <strong>Shift times</strong> option should be selected. User must then

-specify the time (in hours and minutes) by which the dives should be

-adjusted and click on the option indicating whether the time adjustment

-should be ealier or later.</p></div>

-</div>

-<div class="sect3">

-<h4 id="_merge_dives_into_a_single_dive">7.4.5. Merge dives into a single dive</h4>

-<div class="paragraph"><p>Sometimes a dive is briefly interrupted, e.g. if a diver returns to the

-surface for a few minutes, resulting in two or more dives being recorded by

-the dive computer and appearing as different dives in the <strong>Dive List</strong>

-panel. Users can merge these dives onto a single dive by selecting the

-appropriate dives, right-clicking them to bring up the context menu and then

-selecting <strong>Merge selected dives</strong>. It may be necessary to edit the dive

-information in the <strong>Notes</strong> panel to reflect events or conditions that apply

+</div>
+<div class="sect3">
+<h4 id="_shift_the_start_time_of_dive_s">7.4.4. Shift the start time of dive(s)</h4>
+<div class="paragraph"><p>Sometimes it’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
+computer has a wrong time. To do this, select and right-click the dive(s) to
+be adjusted. This brings up the context menu on which the <strong>Shift times</strong>
+option should be selected. You must then specify the time (in hours and
+minutes) by which the dives should be adjusted and click on the option of
+whether the time adjustment should be earlier or later.</p></div>
+</div>
+<div class="sect3">
+<h4 id="_merge_dives_into_a_single_dive">7.4.5. Merge dives into a single dive</h4>
+<div class="paragraph"><p>Sometimes a dive is briefly interrupted, for example, if a diver returns to
+the surface for a few minutes. That results in two or more dives being
+recorded by the dive computer and appearing as different dives in the <strong>Dive
+List</strong> panel. You can merge these dives onto a single dive by selecting the
+appropriate dives, right-clicking them to bring up the context menu and then
+selecting <strong>Merge selected dives</strong>. It may be necessary to edit the dive
+information in the <strong>Notes</strong> panel to reflect events or conditions that apply
 to the merged dive. The figure below shows the depth profile of two dives

 that were merged:</p></div>

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

@@ -3635,53 +3545,53 @@ redone.  This includes: <em>delete dives</em>, <em>merge dives</em>, <em>renumbe
 the <strong>Main Menu</strong> select <em>Edit</em>. This brings up the possibility to <em>Undo</em> or

 <em>Redo</em> an action.</p></div>

 </div>

-</div>

-<div class="sect2">

-<h3 id="S_Filter">7.5. Filtering the dive list</h3>

-<div class="paragraph"><p>The dives in the <strong>Dive List</strong> panel can be filtered, that is, one can select

-only some of the dives based on their attributes, e.g. dive tags, dive site,

-dive master, buddy or protective clothing. For instance, filtering allows

-one to list the deep dives at a particular dive site, or otherwise the cave

-dives with a particular buddy.</p></div>

-<div class="paragraph"><p>To open the filter, select <em>Log &#8594; Filter divelist</em> from the main menu. This

-opens the <em>Filter Panel</em> at the top of the <em>Subsurface</em> window. Three icons

-are located at the top right hand of the filter panel (see image below). The

-<em>Filter Panel</em> can be reset (i.e. all current filters cleared) by selecting

-the <strong>yellow angled arrow</strong>. The <em>Filter Panel</em> may also be minimised by

-selecting the <strong>green up-arrow". When minimised, only these three icons are

-shown.  The panel can be maximised by clicking the icon that minimised the

-panel. The filter may also be reset and closed by selecting the *red button</strong>

-with the white cross.</p></div>

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

-<div class="content">

+</div>
+<div class="sect2">
+<h3 id="S_Filter">7.5. Filtering the dive list</h3>
+<div class="paragraph"><p>The dives in the <strong>Dive List</strong> panel can be filtered, so you can select only
+some of the dives based on their attributes, e.g. dive tags, dive site, dive
+master, buddy or protective clothing. For instance, filtering lets you list
+the deep dives at a particular dive site, or otherwise the cave dives with a
+particular buddy.</p></div>
+<div class="paragraph"><p>To open the filter, select <em>Log &#8594; Filter divelist</em> from the main menu. This
+opens the <em>Filter Panel</em> at the top of the <em>Subsurface</em> window. Three icons
+are located at the top right hand of the filter panel (see image below). The
+<em>Filter Panel</em> can be reset (i.e. all current filters cleared) by selecting
+the <strong>yellow angled arrow</strong>. The <em>Filter Panel</em> may also be minimized by
+selecting the <strong>green up-arrow". When minimized, only these three icons are
+shown.  The panel can be maximized by clicking the same icon that minimized
+it. The filter may also be reset and closed by selecting the *red button</strong>
+with the white cross.</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
 <img src="images/Filterpanel.jpg" alt="Figure: Filter panel" />

-</div>

-</div>

-<div class="paragraph"><p>Four filter criteria may be used to filter the dive list: dive tags, person

-(buddy / dive master), dive site and dive suit, each of which is represented

-by a check list with check boxes. Above each check list is a second-level

-filter tool, allowing the listing of only some of the attributes within that

-check list. For instance, typing "<em>ca</em>" in the filter textbox above the tags

-check list results in the tags check list being reduced to "<em>cave</em>" and

-"<em>cavern</em>". Filtering of the check list enables the rapid finding of search

-terms for filtering the dive list.</p></div>

-<div class="paragraph"><p>To activate filtering of the dive list, check at least one check box in one

-of the four check lists. The dive list is then shortened to include only the

-dives that pertain to the criteria specified in the check lists.  The four

-check lists work as a filter with <em>AND</em> operators, Subsurface filters

-therefore for <em>cave</em> as a tag AND <em>Joe Smith</em> as a buddy; but the filters

-within a category are inclusive - filtering for <em>cave</em> and <em>boat</em> shows

-those dives that have either one OR both of these tags.</p></div>

-</div>

-</div>

-</div>

-<div class="sect1">

-<h2 id="S_ExportLog">8. Exporting the dive log or parts of the dive log</h2>

-<div class="sectionbody">

-<div class="paragraph"><p>There are two routes for the export of dive information from Subsurface:</p></div>

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

-<li>

-<p>

+</div>
+</div>
+<div class="paragraph"><p>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
+by a check list with check boxes. Above each check list is a second-level
+filter tool, allowing the listing of only some attributes within that check
+list. For instance, typing "<em>ca</em>" in the filter text box above the tags
+check list, results in the list being reduced to "<em>cave</em>" and
+"<em>cavern</em>". Filtering the check list helps to rapidly find search terms for
+filtering the dive list.</p></div>
+<div class="paragraph"><p>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
+dives that pertain to the criteria specified in the check lists.  The four
+check lists work as a filter with <em>AND</em> operators. Subsurface filters
+therefore for <em>cave</em> as a tag AND <em>Joe Smith</em> as a buddy. But the filters
+within a category are inclusive - filtering for <em>cave</em> and <em>boat</em> shows
+those dives that have either one OR both of these tags.</p></div>
+</div>
+</div>

+</div>

+<div class="sect1">
+<h2 id="S_ExportLog">8. Exporting the dive log or parts of the dive log</h2>
+<div class="sectionbody">
+<div class="paragraph"><p>There are two ways to export dive information from Subsurface:</p></div>
+<div class="ulist"><ul>
+<li>
+<p>
 Exporter les informations de plongée vers <em>Facebook</em>

 </p>

 </li>

@@ -3691,64 +3601,60 @@ Exporter les informations de plongée vers <em>Facebook</em>
   destinations ou formats</a>

 </p>

 </li>

-</ul></div>

-<div class="sect2">

-<h3 id="S_facebook">8.1. Export des informations de plongée vers <em>Facebook</em></h3>

-<div class="paragraph"><p>L&#8217;export des plongées vers <em>Facebook</em> est géré différemment des autres types

-d&#8217;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 &#8594; Préférences &#8594; Facebook</em>, un écran de connexion est

-présenté (image <strong>A</strong> sur la gauche, ci dessous). Entrez l&#8217;identifiant et le

-mot de passe <em>Facebook</em>. Une fois connecté à <em>Facebook</em>, le panneau de

-l&#8217;image <strong>B</strong> ci dessous est présenté, 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" />

-</div>

-</div>

-<div class="paragraph"><p>From the <em>Subsurface</em> window it is easy to determine whether <em>Subsurface</em>

-has a valid connection to <em>Facebook</em> From the <strong>Main Menu</strong>, select <em>Share on

-&#8594; 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 colour and can be selected).</p></div>

-<div class="paragraph"><p>Une fois qu&#8217;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 &#8594; Facebook</em>,

-une fenêtre s&#8217;affiche, pour déterminer quelles informations seront

-transférées avec le profil de plongée (voir l&#8217;image <strong>B</strong> ci-dessous). Pour

-transférer un profil de plongée vers <em>Facebook</em>, le nom d&#8217;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&#8217;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&#8217;une connexion Facebook standard depuis

-un navigateur ou l&#8217;application Facebook. Malgré que cela soit une étape

-supplémentaire, c&#8217;est la meilleure solution pour éviter d&#8217;avoir des

-publications non désirées sur votre ligne temporelle publique.</p></div>

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

-<div class="content">

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

+</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 &#8594;
+Preferences &#8594; 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="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/facebook1_f20.jpg" alt="Figure: Facebook login" />
+</div>
+</div>
+<div class="paragraph"><p>From the <em>Subsurface</em> window it’s easy to determine whether <em>Subsurface</em> has
+a valid connection to <em>Facebook</em> From the <strong>Main Menu</strong>, select <em>Share on &#8594;
+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 &#8594; 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="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/facebook2_f20.jpg" alt="Figure: Facebook login" />
 </div>

 </div>

 <div class="paragraph"><p>Si besoin, fermer la connexion <em>Facebook</em> en fermant <em>Subsurface</em> ou en

 sélectionnant _Fichier &#8594; Préférences &#8594; Facebook, à partir du menu

 principal et en cliquant sur le bouton approprié dans le panneau des

-préférences Facebook.</p></div>

-</div>

-<div class="sect2">

-<h3 id="S_Export_other">8.2. Export dive information  to other destinations or formats</h3>

-<div class="paragraph"><p>For non-<em>Facebook exports</em>, the export function can be reached by selecting

-<em>File &#8594; Export</em>, which brings up the Export dialog. This dialog always

-gives two options: save ALL dives, or save only the dives selected in <strong>Dive

-List</strong> panel of <em>Subsurface</em>. Click the appropriate radio button (see images

+préférences Facebook.</p></div>
+</div>
+<div class="sect2">
+<h3 id="S_Export_other">8.2. Export dive information to other destinations or formats</h3>
+<div class="paragraph"><p>For non-<em>Facebook exports</em>, the export function can be found by selecting
+<em>File &#8594; Export</em>, which brings up the Export dialog. This dialog always
+gives two options: save ALL dives, or save only the dives selected in <strong>Dive
+List</strong> panel of <em>Subsurface</em>. Click the appropriate radio button (see images
 below).</p></div>

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

 <div class="content">

@@ -3769,22 +3675,22 @@ Universal Dive Data Format (<em>UDDF</em>). Refer to <em>http://uddf.org</em> fo
   dive computers and computer programs.

 </p>

 </li>

-<li>

-<p>

-<em>Divelogs.de</em>, an Internet-based dive log repository. In order to upload to

-  <em>Divelogs.de</em>, one needs a user-ID as well as a password for

-  <em>Divelogs.de</em>. Log into <em>http://en.divelogs.de</em> and subscribe to this

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

-</p>

-</li>

-<li>

-<p>

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

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

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

-</p>

-</li>

-<li>

+<li>
+<p>
+<em>Divelogs.de</em>, an Internet-based dive log repository. In order to upload to
+  <em>Divelogs.de</em>, you need a user-ID as well as a password for
+  <em>Divelogs.de</em>. Log into <em>http://en.divelogs.de</em> and subscribe to this
+  service to upload dive log data from <em>Subsurface</em>.
+</p>
+</li>
+<li>
+<p>
+<em>DiveShare</em> is also a dive log repository on the Internet focusing on
+  recreational dives. To upload dives, you need a user ID, so registration
+  with <em>http://scubadiveshare.com</em> is required.
+</p>
+</li>
+<li>
 <p>

 <em>CSV dive details</em>, that includes the most critical information of the dive

   profile. Included information of a dive is: dive number, date, time, buddy,

@@ -3806,23 +3712,23 @@ Universal Dive Data Format (<em>UDDF</em>). Refer to <em>http://uddf.org</em> fo
   must be enabled. The HTML export cannot be changed or edited.  It contains

   most of the information recorded in the dive log. However, it does not show

   the calculated values in the <strong>Dive Profile</strong> panel, e.g. calculated cylinder

-  pressure, gas pressures and MOD. The HTML export contains a search option to

-  search the dive log. HTML export is specified on the second tab of the

-  Export dialog (image <strong>B</strong> above). A typical use of this option is to export

-  all one&#8217;s dives to a smartphone or a tablet where it would serve as a very

-  portable record of dives useful for dive companies that wish to verify the

-  dive history of a diver, often doing away with the need to carry one&#8217;s

-  original logbook with one when doing dives with dive companies.

-</p>

-</li>

-<li>

-<p>

-<em>Worldmap</em> 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 one

-  selects any of the dive sites on the map, a summary of the dive is available

-  in text, as shown in the image below.

-</p>

-</li>

+  pressure, gas pressures and MOD. The HTML export contains a search option to
+  search the dive log. HTML export is specified on the second tab of the
+  Export dialog (image <strong>B</strong> above). A typical use of this option is to export
+  all one&#8217;s dives to a smartphone or a tablet where it would serve as a
+  portable record of dives. That is useful for dive companies that wish to
+  verify the dive history of a diver, often doing away with the need to carry
+  an original logbook when doing dives with dive companies.
+</p>
+</li>
+<li>
+<p>
+<em>Worldmap</em> 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
+  select any of the dive sites on the map, a summary of the dive is available
+  in text, as shown in the image below.
+</p>
+</li>
 </ul></div>

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

 <div class="content">

@@ -3831,14 +3737,14 @@ Universal Dive Data Format (<em>UDDF</em>). Refer to <em>http://uddf.org</em> fo
 </div>

 <div class="ulist"><ul>

 <li>

-<p>

-<em>Image depths</em>, which creates a text file that contains the file names of

-  all photos or images attached to any of the selected dives in the <em>Dive

-  List</em>, together with the depth under water where of each of those photos

-  were taken.

-</p>

-</li>

-<li>

+<p>
+<em>Image depths</em>, which creates a text file that contains the file names of
+  all photos or images attached to any of the selected dives in the <em>Dive
+  List</em>, together with the depth underwater where of each of those photos was
+  taken.
+</p>
+</li>
+<li>
 <p>

 <em>General Settings</em>, under the HTML tab, provides the following options:

 </p>

@@ -3868,34 +3774,33 @@ Export List only: a list of dives only (date, time, depth, duration) will be exp
 <p>

 Under <em>Style Options</em> some style-related options are available like font

   size and theme.

-</p>

-</li>

-</ul></div>

-<div class="paragraph"><p>Export to other formats can be achieved through third party facilities, for

-instance <em>www.divelogs.de</em>.</p></div>

-</div>

-</div>

+</p>
+</li>
+</ul></div>
+<div class="paragraph"><p>Export to other formats can be done through third party facilities, for
+instance <em>www.divelogs.de</em>.</p></div>
+</div>
+</div>
 </div>

 <div class="sect1">

-<h2 id="S_Cloud_access">9. Keeping a <em>Subsurface</em> dive log in the Cloud</h2>

-<div class="sectionbody">

-<div class="paragraph"><p>For each diver, dive log information is highly important. Not only is it a

-record of diving activities for one&#8217;s own pleasure, but it is important

-information required for admission to further training courses or

-(sometimes) even diving sites. The security of the dive log is therefore

-critical. In order to have a dive log that is resistant to failure of a home

-computer hard drive, loss or theft of equipment, the Cloud is an obvious

-solution. This also has the added benefit that one can access one&#8217;s dive log

-from anywhere in the world without having to carry it with oneself. For this

-reason, facilities such as <em>divelogs.de</em> and <em>Diving Log</em> offer to store

-dive log information on the Internet.</p></div>

-<div class="paragraph"><p><em>Subsurface</em> includes access to a transparently integrated cloud storage

-back end that is available to all Subsurface users. Storing and retrieving a

-dive log from the cloud is no more difficult than accessing the dives on the

-local hard disk.  The only requirement is that one should first register as

-a user on the cloud.  To use <em>Subsurface cloud storage</em> , follow these

-steps:</p></div>

-<div class="sect2">

+<h2 id="S_Cloud_access">9. Keeping a <em>Subsurface</em> dive log in the Cloud</h2>
+<div class="sectionbody">
+<div class="paragraph"><p>For each diver, dive log information is highly important. Not only is it a
+record of diving activities for one&#8217;s own pleasure, but it’s important
+information required for admission to training courses or sometimes even
+diving sites. The security of the dive log is critical. To have a dive log
+that is resistant to failure of a home computer hard drive, loss or theft of
+equipment, the Cloud is an obvious solution. This also has the added benefit
+that you can access your dive log from anywhere in the world. For this
+reason, facilities such as <em>divelogs.de</em> and <em>Diving Log</em> offer to store
+dive log information on the Internet.</p></div>
+<div class="paragraph"><p><em>Subsurface</em> includes access to a transparently integrated cloud storage
+back end that is available to all Subsurface users. Storing and retrieving a
+dive log from the cloud is no more difficult than accessing the dives on the
+local hard disk.  The only requirement is that you should first register as
+a user on the cloud.  To use <em>Subsurface cloud storage</em> , follow these
+steps:</p></div>
+<div class="sect2">
 <h3 id="_create_a_cloud_storage_account">9.1. Create a cloud storage account</h3>

 <div class="ulist"><ul>

 <li>

@@ -3941,109 +3846,108 @@ will be marked as verified and the <em>Subsurface cloud storage</em> service is
 </div>

 <div class="sect2">

 <h3 id="_using_em_subsurface_cloud_storage_em">9.2. Using <em>Subsurface cloud storage</em></h3>

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

-<li>

-<p>

-Once the cloud storage has been initialised, two new items appear in the

-   <em>File</em> menu of the main menu system: <em>Open cloud storage</em> and <em>Save to cloud storage</em>.

-These options allow the user to load and save data to the <em>Subsurface

-cloud storage</em> server.

-</p>

-</li>

-<li>

-<p>

-In the <em>Defaults Preferences</em> tab, one can select to use the <em>Subsurface cloud

-storage</em> data as one&#8217;s default data file by checking the check box marked <em>Cloud storage default file</em>.

- This means that the data from

-the <em>Subsurface cloud storage</em> is loaded when <em>Subsurface</em> starts ans saved there when one closes <em>Subsurface</em>.

-</p>

-</li>

-<li>

-<p>

-<em>Subsurface</em> keeps a local copy of the data and the cloud facility remains fully

-functional even if used while disconnected to the Internet. <em>Subsurface</em> simply synchronises the

-data with the cloud server the next time ithe program is used while the computer is

-connected to the Internet.

-</p>

-</li>

+<div class="ulist"><ul>
+<li>
+<p>
+Once the cloud storage has been initialized, two new items appear in the
+   <em>File</em> menu of the main menu system: <em>Open cloud storage</em> and <em>Save to cloud storage</em>.
+These options let you load and save data to the <em>Subsurface
+cloud storage</em> server.
+</p>
+</li>
+<li>
+<p>
+In the <em>Defaults Preferences</em> tab, you can select to use the <em>Subsurface cloud
+storage</em> data as the default data file by checking the box marked <em>Cloud storage default file</em>.
+ This means the data from
+the <em>Subsurface cloud storage</em> is loaded when <em>Subsurface</em> starts and saved there when <em>Subsurface</em> closes.
+</p>
+</li>
+<li>
+<p>
+<em>Subsurface</em> keeps a local copy of the data and the cloud facility remains fully
+functional even if used while disconnected to the Internet. <em>Subsurface</em> simply synchronizes the
+data with the cloud server the next time the program is used while the computer is
+connected to the Internet.
+</p>
+</li>
 </ul></div>

 </div>

-<div class="sect2">

-<h3 id="S_Cloud_storage">9.3. Web access to <em>Subsurface cloud storage</em></h3>

-<div class="paragraph"><p>One of the nice side benefits of using <em>Subsurface cloud storage</em> is that

-one can also access one&#8217;s dive data from any web browser. Simply open

-<a href="https://cloud.subsurface-divelog.org"><em>https://cloud.subsurface-divelog.org</em></a>,

-log in with the same email and password, and you can see an HTML export of

-the last dive data that was synced to the <em>Subsurface cloud storage</em>. The

-dive information that is shown is only the contents of the recorded dive

-logs, NOT the calculated values shown in the <strong>Profile</strong> panel, including some

-cylinder pressures, deco ceilings and O<sub>2</sub>/He/N<sub>2</sub> partial pressures.</p></div>

-</div>

-<div class="sect2">

-<h3 id="_other_cloud_services">9.4. Other cloud services</h3>

-<div class="paragraph"><p>If one prefers not to use the integrated cloud storage of dive logs (and

-don&#8217;t need the web access), it is also simple to store dive logs in the

-cloud using several of the existing facilities on the Internet.  For

-instance <a href="http://www.dropbox.com/"><em>Dropbox</em></a> offers a free application that

-allows files on the Dropbox servers to be seen as a local folder on one&#8217;s

-desktop computer.</p></div>

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

-<div class="content">

-<img src="images/Cloud.jpg" alt="FIGURE: Dropbox folder" />

-</div>

-</div>

-<div class="paragraph"><p>The <em>Dropbox</em> program creates a copy of the <em>Dropbox</em> Internet Cloud content

-on one&#8217;s desktop computer. When the computer is connected to the Internet,

-the Internet content is automatically updated. Therefore both the <em>Open</em> and

-<em>Save</em> of dive logs are done using the local copy of the dive log in the

-local <em>Dropbox</em> folder, so there&#8217;s no need for a direct internet

-connection. If the local copy is modified, e.g. by adding a dive, the remote

-copy in the <em>Dropbox</em> server in the Cloud will be automatically updated

-whenever Internet access is available.</p></div>

-<div class="paragraph"><p>In this way a dive log in one&#8217;s <em>Dropbox</em> folder can be accessed seamlessly

-from the Internet and can be accessed from any place with Internet

-access. Currently there are no costs involved for this service. Dropbox

-(Windows, Mac and Linux) can be installed by accessing the

-<a href="http://www.dropbox.com/install"><em>Install Page on the Dropbox website</em></a>

-Alternatively one can use <em>Dropbox</em> as a mechanism to backup one&#8217;s dive

-log. To Store a dive log on <em>Dropbox</em>, select <em>File &#8594; Save as</em> from the

-<em>Subsurface</em> main menu, navigate to the <em>Dropbox</em> folder and select the

-<em>Save</em> button. To access the dive log in <em>Dropbox</em>, select <em>File &#8594; Open

-Logbook</em> from the <em>Subsurface</em> main menu and navigate to the dive log file

-in the <em>Dropbox</em> folder and select the <em>Open</em> button.</p></div>

-<div class="paragraph"><p>Several paid services exist on the Internet (e.g. Google, Amazon) where the

-same process could be used for the Cloud-based storage of dive logs.</p></div>

-</div>

-</div>

-</div>

-<div class="sect1">

-<h2 id="S_PrintDivelog">10. Printing a dive log</h2>

-<div class="sectionbody">

-<div class="paragraph"><p><em>Subsurface</em> provides a simple and flexible interface to print a whole dive log or only a few selected dives.

-  Pre-installed templates or a custom written template can be used to choose where the data are fitted into the page.</p></div>

-<div class="paragraph"><p>Before printing, two decisions are required:</p></div>

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

-<li>

-<p>

-Should the whole dive log be printed or only part of it? If only part of the

-  dive log is required, then select the required dives from the <strong>Dive List</strong>

-  panel.

-</p>

-</li>

-<li>

-<p>

-If the dive profiles needs printing, what gas partial pressure information

-  should be shown? Select the appropriate toggle-buttons on the button bar to

-  the left of the <strong>Dive Profile</strong> panel.

-</p>

-</li>

-</ul></div>

-<div class="paragraph"><p>If <em>File &#8594; Print</em> is selected from the Main menu, the the dialogue below

-(image <strong>A</strong>) appears. Three specifications are needed to achieve the desired

-information and page layout:</p></div>

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

-<div class="content">

-<img src="images/Print1_f22.jpg" alt="FIGURE: Print dialogue" />

+<div class="sect2">
+<h3 id="S_Cloud_storage">9.3. Web access to <em>Subsurface cloud storage</em></h3>
+<div class="paragraph"><p>One of the nice side benefits of using <em>Subsurface cloud storage</em> is that
+you can also access your dive data from any web browser. Simply open
+<a href="https://cloud.subsurface-divelog.org"><em>https://cloud.subsurface-divelog.org</em></a>,
+log in with the same email and password, and you can see an HTML export of
+the last dive data that was synced to <em>Subsurface cloud storage</em>. The dive
+information shown is only the contents of the recorded dive logs, NOT the
+calculated values shown in the <strong>Profile</strong> panel, including some cylinder
+pressures, deco ceilings and O<sub>2</sub>/He/N<sub>2</sub> partial pressures.</p></div>
+</div>
+<div class="sect2">
+<h3 id="_other_cloud_services">9.4. Other cloud services</h3>
+<div class="paragraph"><p>If you prefers not to use the integrated cloud storage of dive logs (and
+don&#8217;t need the web access), it’s simple to store dive logs in the cloud
+using several of the existing facilities on the Internet.  For instance
+<a href="http://www.dropbox.com/"><em>Dropbox</em></a> offers a free application that allows
+files on the Dropbox servers to be seen as a local folder on a desktop
+computer.</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/Cloud.jpg" alt="FIGURE: Dropbox folder" />
+</div>
+</div>
+<div class="paragraph"><p>The <em>Dropbox</em> program creates a copy of the <em>Dropbox</em> Internet Cloud content
+on your desktop computer. When the computer is connected to the Internet,
+the Internet content is automatically updated. Therefore both the <em>Open</em> and
+<em>Save</em> of dive logs are done using the local copy of the dive log in the
+local <em>Dropbox</em> folder, so there&#8217;s no need for a direct internet
+connection. If the local copy is modified, e.g. by adding a dive, the remote
+copy in the <em>Dropbox</em> server in the Cloud will be automatically updated
+whenever Internet access is available.</p></div>
+<div class="paragraph"><p>In this way a dive log in your <em>Dropbox</em> folder can be accessed seamlessly
+from the Internet and can be accessed anywhere with Internet
+access. Currently there are no costs involved for this service. Dropbox
+(Windows, Mac and Linux) can be installed by accessing the
+<a href="http://www.dropbox.com/install"><em>Install Page on the Dropbox website</em></a>
+Alternatively you can use <em>Dropbox</em> as a way back up your dive log. To Store
+a dive log on <em>Dropbox</em>, select <em>File &#8594; Save as</em> from the <em>Subsurface</em> main
+menu, navigate to the <em>Dropbox</em> folder and select the <em>Save</em> button. To
+access the dive log in <em>Dropbox</em>, select <em>File &#8594; Open Logbook</em> from the
+<em>Subsurface</em> main menu and navigate to the dive log file in the <em>Dropbox</em>
+folder and select the <em>Open</em> button.</p></div>
+<div class="paragraph"><p>Several paid services exist on the Internet (e.g. Google, Amazon) where the
+same process could be used for the Cloud-based storage of dive logs.</p></div>
+</div>
+</div>

+</div>

+<div class="sect1">
+<h2 id="S_PrintDivelog">10. Printing a dive log</h2>
+<div class="sectionbody">
+<div class="paragraph"><p><em>Subsurface</em> provides a simple and flexible way to print a whole dive log or only a few selected dives.
+  Pre-installed templates or a custom written template can be used to choose where the data are fitted into the page.</p></div>
+<div class="paragraph"><p>Some decisions need to be made before printing:</p></div>
+<div class="ulist"><ul>
+<li>
+<p>
+Should the whole dive log be printed or only part of it? If only part is
+  required, select the required dives from the <strong>Dive List</strong> panel.
+</p>
+</li>
+<li>
+<p>
+If the dive profiles are printed, what gas partial pressure information
+  should be shown? Select the appropriate toggle-buttons on the button bar to
+  the left of the <strong>Dive Profile</strong> panel.
+</p>
+</li>
+</ul></div>
+<div class="paragraph"><p>If <em>File &#8594; Print</em> is selected from the Main menu, the dialogue below (image
+<strong>A</strong>) appears. Three specifications are needed to get the desired information
+and page layout:</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/Print1_f22.jpg" alt="FIGURE: Print dialogue" />
 </div>

 </div>

 <div class="olist arabic"><ol class="arabic">

@@ -4069,28 +3973,28 @@ Under <em>Print type</em> select one of two options:
 <p>

 Under <em>Print options</em> select:

 </p>

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

-<li>

-<p>

-Printing only the dives selected from the dive list prior to activating the

-  print dialogue by checking the box <em>Print only selected dives</em>. If this

-  check box is <strong>not</strong> checked all dives in the <strong>Dive List</strong> panel are printed.

-</p>

-</li>

-<li>

-<p>

-Printing in colour, achieved by checking the box with <em>Print in colour</em>. If

-  this check box is not checked, printing is in monochrome (grey scale).

-</p>

-</li>

-</ul></div>

-</li>

-</ol></div>

-<div class="paragraph"><p>Under <em>Template</em> select a template to be used as the page layout. There are

-several templates (see image <strong>B</strong>, above).</p></div>

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

-<li>

-<p>

+<div class="ulist"><ul>
+<li>
+<p>
+Printing only the dives selected from the dive list before activating the
+  print dialogue by checking the box <em>Print only selected dives</em>. If this
+  check box is <strong>not</strong> checked ALL dives in the <strong>Dive List</strong> panel are printed.
+</p>
+</li>
+<li>
+<p>
+Printing in color, done by checking the box with _Print in color. If this
+  check box is not checked, printing is in black and white.
+</p>
+</li>
+</ul></div>
+</li>
+</ol></div>
+<div class="paragraph"><p>Under <em>Template</em> select a template to be used as the page layout. There are
+several choices.  (see image <strong>B</strong>, above).</p></div>
+<div class="ulist"><ul>
+<li>
+<p>
 <em>Table</em>: This prints a summary table of all dives selected (see below).

 </p>

 </li>

@@ -4136,20 +4040,20 @@ several templates (see image <strong>B</strong>, above).</p></div>
 <li>

 <p>

 <em>Six Dives</em>: Print six dives per page, also showing the dive profiles.

-</p>

-</li>

-</ul></div>

-<div class="paragraph"><p>Users can <em>Preview</em> the printed page by selecting the <em>Preview</em> button on

-the dialogue (see image <strong>A</strong> at the start of this section). After preview,

-changes to the options in the print dialogue can be made, resulting in a

-layout that fits personal taste.</p></div>

-<div class="paragraph"><p>Next, select the <em>Print</em> button (see image <strong>A</strong> at the start of this

-section). This activates the regular print dialogue used by the user

-operating system, allowing one to choose a printer and to set its properties

-(see image below):</p></div>

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

-<div class="content">

-<img src="images/Print_print_f22.jpg" alt="FIGURE: Print dialog" />

+</p>
+</li>
+</ul></div>
+<div class="paragraph"><p>You can <em>Preview</em> the printed page by selecting the <em>Preview</em> button on the
+dialogue (see image <strong>A</strong> at the start of this section). After preview, you
+can change the options in the print dialogue, so the layout fits personal
+taste.</p></div>
+<div class="paragraph"><p>Next, select the <em>Print</em> button (see image <strong>A</strong> at the start of this
+section). This activates the regular print dialogue used by the operating
+system, letting you choose a printer and set its properties (see image
+below):</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/Print_print_f22.jpg" alt="FIGURE: Print dialog" />
 </div>

 </div>

 <div class="paragraph"><p>Set the print resolution of the printer to an appropriate value by changing

@@ -4161,44 +4065,44 @@ page.</p></div>
 <img src="images/Printpreview.jpg" alt="FIGURE: Print preview page" />

 </div>

 </div>

-<div class="sect2">

-<h3 id="_créer_un_modèle_d_8217_impression_personnalisé_avancé">10.1. Créer un modèle d&#8217;impression personnalisé (avancé)</h3>

-<div class="paragraph"><p>Writing a custom template is an effective way to produce highly customized

-printouts. Subsurface uses HTML templates to render printing. One can create

-a template, export a new template, import an existing template and delete an

-existing template by using the appropriate buttons under the <em>Template</em>

-dropdown list in the print dialogue. See <a href="#S_APPENDIX_E">APPENDIX E</a> for

+<div class="sect2">
+<h3 id="_créer_un_modèle_d_8217_impression_personnalisé_avancé">10.1. Créer un modèle d&#8217;impression personnalisé (avancé)</h3>
+<div class="paragraph"><p>Writing a custom template is an effective way to produce highly customized
+printouts. Subsurface uses HTML templates to render printing. You can create
+a template, export a new template, import an existing template and delete an
+existing template by using the appropriate buttons under the <em>Template</em>
+dropdown list in the print dialogue. See <a href="#S_APPENDIX_E">APPENDIX E</a> for
 information on how to write or modify a template.</p></div>

 </div>

 </div>

 </div>

-<div class="sect1">

-<h2 id="S_Configure">11. Configurer un ordinateur de plongée</h2>

-<div class="sectionbody">

-<div class="paragraph"><p><em>Subsurface</em> permet de configurer son ordinateur de plongée. Actuellement,

-les familles d&#8217;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&#8217;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&#8217;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&#8217;informations sur la manière de procéder.</p></div>

-<div class="paragraph"><p>Une fois que l&#8217;ordinateur de plongée est connecté à <em>Subsurface</em>,

-sélectionner <em>Fichier &#8594; Configurer l&#8217;ordinateur de plongée</em>, à partir du

-menu principal. Fournir le nom du périphérique dans le champ en haut du

+<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>Une fois que l&#8217;ordinateur de plongée est connecté à <em>Subsurface</em>,
+sélectionner <em>Fichier &#8594; Configurer l&#8217;ordinateur de plongée</em>, à partir du
+menu principal. Fournir le nom du périphérique dans le champ en haut du
 panneau de configuration et sélectionner le bon modèle d&#8217;ordinateur de

 plongée à partir du panneau à gauche (voir l&#8217;image ci-dessous).</p></div>

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

 <div class="content">

-<img src="images/Configure_dc_f20.jpg" alt="FIGURE: Configure dive computer" />

-</div>

-</div>

-<div class="paragraph"><p>En utilisant les boutons appropriés du panneau de configuration, les actions

-suivantes peuvent être réalisées :</p></div>

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

-<li>

-<p>

+<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="ulist"><ul>
+<li>
+<p>
 <strong>Récupérer les détails disponibles</strong>. Cela charge la configuration existante à partir de l&#8217;ordinateur de plongée

    dans <em>Subsurface</em>, en l&#8217;affichant dans le panneau de configuration.

 </p>

@@ -4231,38 +4135,38 @@ suivantes peuvent être réalisées :</p></div>
 </div>

 </div>

 <div class="sect1">

-<h2 id="S_Preferences">12. Setting user <em>Preferences</em> for <em>Subsurface</em></h2>

-<div class="sectionbody">

-<div class="paragraph"><p>There are several user-definable settings within <em>Subsurface</em>, found by

-selecting <em>File &#8594; Preferences</em>. The settings are performed in seven groups:

-<strong>Defaults</strong>, <strong>Units</strong>, <strong>Graph</strong>, <strong>Language</strong> and <strong>Network</strong>, <strong>Facebook</strong> and

-<strong>Georeference</strong>, all of which operate on the same principles: the user must

-specify the settings that are to be changed, then these changes are saved

-using the <strong>Apply</strong> button. After applying all the new settings users can then

-leave the settings panel by selecting <strong>OK</strong>. If <strong>Discard</strong> is selected,

-changes to the preferences are not saved.</p></div>

-<div class="sect2">

-<h3 id="_defaults">12.1. Defaults</h3>

-<div class="paragraph"><p>There are several settings in the <strong>Defaults</strong> panel:</p></div>

+<h2 id="S_Preferences">12. Setting user <em>Preferences</em> for <em>Subsurface</em></h2>
+<div class="sectionbody">
+<div class="paragraph"><p>There are several user-definable settings within <em>Subsurface</em>, found by
+selecting <em>File &#8594; Preferences</em>. The settings are in seven groups:
+<strong>Defaults</strong>, <strong>Units</strong>, <strong>Graph</strong>, <strong>Language</strong> and <strong>Network</strong>, <strong>Facebook</strong> and
+<strong>Georeference</strong>.  All operate on the same principles: the user must specify
+settings that are to be changed, then save them using the <strong>Apply</strong>
+button. After applying all the new settings users can then leave the
+settings panel by selecting <strong>OK</strong>. If <strong>Discard</strong> is selected, changes to the
+preferences are not saved.</p></div>
+<div class="sect2">
+<h3 id="_defaults">12.1. Defaults</h3>
+<div class="paragraph"><p>There are several settings in the <strong>Defaults</strong> panel:</p></div>
 <div class="imageblock" style="text-align:center;">

 <div class="content">

 <img src="images/Pref1_f20.jpg" alt="FIGURE: Preferences defaults page" />

 </div>

 </div>

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

-<li>

-<p>

-<strong>Lists and tables</strong>: Here one can specify the font type and font size of the

-     <strong>Dive Table</strong> panel. By decreasing the font size of the <strong>Dive Table</strong>, users can see more dives on a screen.

-</p>

-</li>

-<li>

-<p>

-<strong>Dives</strong>: For the <em>Default Dive File</em> one needs to specify the directory and

-     file name of one&#8217;s

-     electronic dive log book. This is a file with filename extension of either <em>.xml</em> or <em>.ssrf</em>. When

-     launched, <em>Subsurface</em> will automatically load the specified dive log book. There are three options:

-</p>

+<div class="ulist"><ul>
+<li>
+<p>
+<strong>Lists and tables</strong>: Here you can specify the font type and font size of the
+     <strong>Dive Table</strong> panel: By decreasing the font size of the <strong>Dive Table</strong>, you can see more dives on a screen.
+</p>
+</li>
+<li>
+<p>
+<strong>Dives</strong>: For the <em>Default Dive File</em> you need to specify the directory and
+     file name of your
+     electronic dive log book. This is a file with filename extension of either <em>.xml</em> or <em>.ssrf</em>. When
+     launched, <em>Subsurface</em> will automatically load the specified dive log book. There are three options:
+</p>
 <div class="ulist"><ul>

 <li>

 <p>

@@ -4275,13 +4179,13 @@ changes to the preferences are not saved.</p></div>
        as described above.

 </p>

 </li>

-<li>

-<p>

-<em>Cloud storage default file</em>: When checked, <em>Subsurface automatically loads the dive log from the cloud

-       device that was initialised using the <strong>Preferences</strong> _Network</em> tab (see below).

-</p>

-</li>

-</ul></div>

+<li>
+<p>
+<em>Cloud storage default file</em>: When checked, <em>Subsurface automatically loads the dive log from the cloud
+       device that was initialized using the <strong>Preferences</strong> _Network</em> tab (see below).
+</p>
+</li>
+</ul></div>
 </li>

 <li>

 <p>

@@ -4320,63 +4224,65 @@ changes to the preferences are not saved.</p></div>
 <h3 id="_units">12.2. Units</h3>

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

 <div class="content">

-<img src="images/Pref2_f20.jpg" alt="FIGURE: Preferences Units page" />

-</div>

-</div>

-<div class="paragraph"><p>Here users can choose between metric and imperial units of depth, pressure,

-volume, temperature and mass. By selecting the Metric or Imperial radio

-button at the top, one can specify that all units are in the chosen

-measurement system.  Alternatively, if one selects the <strong>Personalise</strong> radio

-button, units can be selected independently, with some units in the metric

-system and others in imperial.</p></div>

-<div class="paragraph"><p>Irrespective of the above settings, dive time measurements can be either in

-seconds or minutes.  Choose the appropriate option. GPS coordinates can be

-represented either as traditional coordinates (degrees, minutes, seconds) or

-as decimal degrees Choose the appropriate option.</p></div>

+<img src="images/Pref2_f20.jpg" alt="FIGURE: Preferences Units page" />
+</div>
+</div>
+<div class="paragraph"><p>Here you can choose between metric and imperial units of depth, pressure,
+volume, temperature and mass. By selecting the Metric or Imperial radio
+button at the top, you can specify that all units are in the chosen
+measurement system.  Alternatively, if you select the <strong>Personalize</strong> radio
+button, units can be selected independently, with some in the metric system
+and others in imperial.</p></div>
+<div class="paragraph"><p>Regardless of the above settings, dive time measurements can be either in
+seconds or minutes.  Choose the appropriate option. GPS coordinates can be
+represented either as traditional coordinates (degrees, minutes, seconds) or
+as decimal degrees Choose the appropriate option.</p></div>
 </div>

 <div class="sect2">

 <h3 id="_graph">12.3. Graph</h3>

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

 <div class="content">

 <img src="images/Pref3_f20.jpg" alt="FIGURE: Preferences Graph page" />

-</div>

-</div>

-<div class="paragraph" id="S_GradientFactors"><p>This panel allows two type of selections:</p></div>

-<div class="paragraph"><p><strong>Show</strong>: Here users can specify the amount of information shown as part of

-the dive profile:

-<strong> Thresholds: <em>Subsurface</em> can display the nitrogen, oxygen and the helium partial pressures during

-   the dive, enabled by using the toolbar on the left hand side of the <strong>Dive Profile</strong>

-   panel. For each of these graphs users can specify a threshold value on the right-hand side of the

-   Preferences panel. If any of the graphs go above the specified threshold level, the graph is

-   highlighted in red, indicating that the particular partial pressure threshold has been exceeded.

-</strong> <em>Max pO<sub>2</sub> is used for calculating the MOD when displaying the maximum operative depth (MOD)

-   for a dive. Specify an appropriate partial pressure. A value of 1.4 is commonly used.

-<strong> _Draw dive computer reported ceiling red</em>: This checkbox allows exactly what it says. By default

-   the computer reported ceiling is shown in white.

-   Not all dive computers report ceiling values. If the dive computer does report it, it may differ

-   from the ceilings calculated by <em>Subsurface</em> because of the different algorithms and

-   gradient factors, as well as the dynamic way that a

-   dive computer can calculate ceilings during a dive.

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

-<strong>*  <em>Show average depth</em>: If this box is checked, the *Dive Profile</strong> panel contains a grey line that indicates

-    the mean depth of the dive up to any time instant during the dive. Normally this is a u-shaped line indicating the deepest mean depth just before the

-   ascent.</p></div>

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

-<li>

+</div>
+</div>
+<div class="paragraph" id="S_GradientFactors"><p>This panel allows two type of selections:</p></div>
+<div class="paragraph"><p><strong>Show</strong>: Here you can specify the amount of information shown as part of
+the dive profile:
+<strong> Thresholds: <em>Subsurface</em> can display the nitrogen, oxygen and the helium partial pressures during
+   the dive, done by using the toolbar on the left hand side of the <strong>Dive Profile</strong>
+   panel. For each of these graphs you can specify a threshold value on the right-hand side of the
+   Preferences panel. If any of the graphs go above the specified threshold level, the graph is
+   highlighted in red, indicating the particular partial pressure threshold has been exceeded.
+</strong> <em>Max pO<sub>2</sub> is used for calculating the MOD when displaying the maximum operative depth (MOD)
+   for a dive. Specify an appropriate partial pressure. A value of 1.4 is commonly used.
+<strong> _Draw dive computer reported ceiling red</em>: This checkbox does exactly what it says. By default
+   the computer reported ceiling is shown in white.
+   Not all dive computers report ceiling values. If the dive computer does report it, it may differ
+   from the ceilings calculated by <em>Subsurface</em> because of the different algorithms and
+   gradient factors, as well as the dynamic way a
+   dive computer calculates ceilings during a dive.
+</strong> <em>Show unused cylinders in Equipment Tab</em>: This checkbox allows display of information about unused cylinders when viewing the
+<strong>Equipment Tab</strong>. If this box is not checked, and if any cylinders entered using the <strong>Equipment Tab</strong> are not used (e.g. there
+was no gas switch to such a cylinder), then these cylinders are omitted from that list.
+<strong>*  <em>Show average depth</em>: If this box is checked, the *Dive Profile</strong> panel contains a grey line that shows
+    the mean depth of the dive, up to any time instant during the dive. Normally this is a u-shaped line indicating the deepest mean depth just before
+   ascent.</p></div>
+<div class="ulist"><ul>
+<li>
 <p>

 <strong>Misc</strong>:

 </p>

 <div class="ulist" id="GradientFactors_Ref"><ul>

 <li>

 <p>

-Gradient Factors (GFLow and GFHigh):* Set the <em>gradient factors</em> used while diving. GF_Low is

-   the gradient factor at depth and GF_High is used just below the surface.

-   At intermediate depths gradient factors between GF_Low and GF_High are used.

-   Gradient factors add conservatism to the nitrogen exposure during a dive, in a

-   similar way that many dive computers have a conservatism setting. The lower

-   the value of a gradient factor, the more conservative the calculations are with

-   respect to nitrogen loading and the deeper the ascent ceilings are. Gradient

-   factors of 20/60 are considered conservative and values of 70/90 are considered

+Gradient Factors (GFLow and GFHigh):* Set the <em>gradient factors</em> used while diving. GF_Low is
+   the gradient factor at depth and GF_High is used just below the surface.
+   At intermediate depths gradient factors between GF_Low and GF_High are used.
+   Gradient factors add conservatism to nitrogen exposure during a dive, in a
+   similar way that many dive computers have a conservative setting. The lower
+   the value of a gradient factor, the more conservative the calculations are with
+   respect to nitrogen loading and the deeper the ascent ceilings are. Gradient
+   factors of 20/60 are considered conservative and values of 70/90 are considered
    harsh. Checking the <strong>GFLow at max depth</strong> box causes GF_Low to be used at the

    deepest depth of a dive. If this box is not checked, GF_Low is applied at

    all depths deeper than the first deco stop. For more information see:

@@ -4393,14 +4299,14 @@ Gradient Factors (GFLow and GFHigh):* Set the <em>gradient factors</em> used whi
 </p>

 </li>

 </ul></div>

-</li>

-<li>

-<p>

-<em>CCR: Show setpoints when viewing pO2:</em> With this checkbox ativated, the pO<sub>2</sub>

-    graph on the dive profile has an overlay in red which inticates the CCR setpoint

-    values. See the section on <a href="#S_CCR_dives">Closed Circuit Rebreather dives</a>.

-</p>

-</li>

+</li>
+<li>
+<p>
+<em>CCR: Show setpoints when viewing pO2:</em> With this checkbox activated, the pO<sub>2</sub>
+    graph on the dive profile has an overlay in red which indicates the CCR setpoint
+    values. See the section on <a href="#S_CCR_dives">Closed Circuit Rebreather dives</a>.
+</p>
+</li>
 <li>

 <p>

 <em>CCR: Show individual O<sub>2</sub> sensor values when viewing pO<sub>2</sub>:</em> Show the pO<sub>2</sub>

@@ -4422,13 +4328,13 @@ Gradient Factors (GFLow and GFHigh):* Set the <em>gradient factors</em> used whi
     during a particular dive. Setpoint changes during the dive can be added via the

     profile context menu.

 </p>

-</li>

-<li>

-<p>

-<em>pSCR O<sub>2</sub> metabolism rate:</em> For a semiclosed rebreather (pSCR) system, this is the

-    volume of oxygen used by a diver during a minute. Set this value for pSCR dive planning

-    and decompression calculations.

-</p>

+</li>
+<li>
+<p>
+<em>pSCR O<sub>2</sub> metabolism rate:</em> For a semi-closed rebreather (pSCR) system, this is the
+    volume of oxygen used by a diver during a minute. Set this value for pSCR dive planning
+    and decompression calculations.
+</p>
 </li>

 <li>

 <p>

@@ -4446,29 +4352,28 @@ Gradient Factors (GFLow and GFHigh):* Set the <em>gradient factors</em> used whi
 <div class="paragraph"><p>Choose a language that <em>Subsurface</em> will use.</p></div>

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

 <div class="content">

-<img src="images/Pref4_f20.jpg" alt="FIGURE: Preferences Language page" />

-</div>

-</div>

-<div class="paragraph"><p>A checkbox allows one to use the <em>System Default</em> language which in most

-cases will be the correct setting; with this <em>Subsurface</em> simply runs in the

-same language / country settings as the underlying operating system. If this

-is for some reason undesirable one can uncheck this checkbox and pick a

-language / country combination from the list of included localizations. The

-<em>Filter</em> text box allows one to list similar languages. For instance there

-are several system variants of English or French. <strong>This particular

-preference requires a restart of <em>Subsurface</em> to take effect</strong>.</p></div>

-</div>

-<div class="sect2">

-<h3 id="_network">12.5. Network</h3>

-<div class="paragraph"><p>This panel facilitates communication between <em>Subsurface</em> and data sources

-on the Internet.  This is important, for instance, when <em>Subsurface</em> needs

-to communicate with Internet services such as Cloud storage or the

-<a href="#S_Companion"><em>Subsurface Companion app</em></a>. These Internet requirements are

-determined by one&#8217;s type of connection to the Internet and by the Internet

-Service Provider (ISP) used.  One&#8217;s ISP should provide the appropriate

-information.</p></div>

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

-<div class="content">

+<img src="images/Pref4_f20.jpg" alt="FIGURE: Preferences Language page" />
+</div>
+</div>
+<div class="paragraph"><p>A checkbox lets you use the <em>System Default</em> language which in most cases
+will be the correct setting; with this <em>Subsurface</em> simply runs in the same
+language / country settings as the underlying operating system.  To change
+it, uncheck this checkbox and pick a language / country combination from the
+list of locations. The <em>Filter</em> text box lists similar languages. For
+instance there are several system variants of English or French. <strong>This
+particular preference requires a restart of <em>Subsurface</em> to take effect</strong>.</p></div>
+</div>
+<div class="sect2">
+<h3 id="_network">12.5. Network</h3>
+<div class="paragraph"><p>This panel facilitates communication between <em>Subsurface</em> and data sources
+on the Internet.  This is important, for instance, when <em>Subsurface</em> needs
+to communicate with web services such as Cloud storage or the
+<a href="#S_Companion"><em>Subsurface Companion app</em></a>. These Internet requirements are
+determined by your type of connection to the Internet and by the Internet
+Service Provider (ISP) used.  Your ISP should provide the appropriate
+information.</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
 <img src="images/Pref5_f20.jpg" alt="FIGURE: Preferences Network page" />

 </div>

 </div>

@@ -4484,83 +4389,81 @@ password are required so that <em>Subsurface</em> can automatically pass
 through the proxy server to access the Internet. This information is usually obtained

 from one&#8217;s ISP.

 </p>

-</li>

-<li>

-<p>

-<em>Subsurface cloud storage</em>: To store one&#8217;s dive log in the cloud, a valid email address

-   and password are required. This allows <em>Subsurface</em> to email security information

-   regarding cloud storage to a user, and to set up the cloud storage appropriately.

-   Two additional options are given:

-</p>

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

-<li>

-<p>

-<em>Sync to cloud in the background</em>: This option allows saving of dive information to the cloud storage

-   while the user performs other tasks within <em>Subsurface</em>.

-</p>

-</li>

-<li>

+</li>
+<li>
+<p>
+<em>Subsurface cloud storage</em>: To store your dive log in the cloud, a valid email address
+   and password are required. This lets <em>Subsurface</em> email security information
+   regarding cloud storage to you, and to set up cloud storage appropriately.
+   Two additional options are given:
+</p>
+<div class="ulist"><ul>
+<li>
+<p>
+<em>Sync to cloud in the background</em>: This option allows saving of dive information to the cloud storage
+   while you do other things within <em>Subsurface</em>.
+</p>
+</li>
+<li>
 <p>

 <em>Save password locally</em>: This allows local storage of the cloud storage password. Note that this

    information is saved in raw text form, not encoded in any way.

 </p>

 </li>

 </ul></div>

-</li>

-<li>

-<p>

-<em>Subsurface web service</em>: When one subscribes to the <a href="#S_Companion">Subsurface web service</a>, a very

-     long and hard-to-remember userID is issued. This is the place to save that userID. By

-     checking the option <em>Save User ID locally?</em>, one ensures that a local copy of that userID

-     is saved.

-</p>

-</li>

-</ul></div>

-</div>

-<div class="sect2">

-<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>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&#8217;a aucun

-effet. Reportez-vous à la section <a href="#S_facebook">Export des profils de

-plongée vers Facebook</a> pour plus d&#8217;informations.</p></div>

-</div>

-<div class="sect2">

-<h3 id="_georeference">12.7. Georeference</h3>

-<div class="paragraph"><p><em>Subsurface</em> provides a geo-lookup service (that is, given the coordinates

-of a dive site (derived from a click on the <strong>Dive Map panel</strong> at the bottom

-right of the <em>Subsurface</em> window, or from a GPS instrument or from the

-<em>Subsurface</em> Companion app), a lookup on the Internet is performed to find

-the name of the closest known location. Obviously this function only works

-if <em>Subsurface</em> has an Internet connection. The preference of the dive site

-name can be configured, e.g. <em>Country/State/City</em> or <em>City/State/Country</em>

-(see image below).</p></div>

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

-<div class="content">

-<img src="images/Pref7_f20.jpg" alt="FIGURE: Facebook login panel" />

-</div>

-</div>

-</div>

-</div>

-</div>

-<div class="sect1">

-<h2 id="S_DivePlanner">13. The <em>Subsurface</em> dive planner</h2>

-<div class="sectionbody">

-<div class="paragraph"><p>Dive planning is an advanced feature of <em>Subsurface</em>, accessible by

-selecting <em>Log &#8594; Plan Dive</em> from the main menu. It allows calculation of

-nitrogen load during a dive by using the Bühlmann ZH-L16 algorithm with the

-addition of gradient factors as implemented by Erik Baker.</p></div>

-<div class="sidebarblock">

-<div class="content">

-<div class="admonitionblock">

+</li>
+<li>
+<p>
+<em>Subsurface web service</em>: When you subscribe to the <a href="#S_Companion">Subsurface web service</a>, a very
+     long and hard-to-remember userID is issued. This is the place to save that userID. By
+     checking the option <em>Save User ID locally?</em>, you ensure a local copy of that userID is saved.
+</p>
+</li>
+</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>
+<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>
+<div class="sect2">
+<h3 id="_georeference">12.7. Georeference</h3>
+<div class="paragraph"><p><em>Subsurface</em> provides a geo-lookup service (that is, given the coordinates
+of a dive site) derived from a click on the <strong>Dive Map panel</strong> at the bottom
+right of the <em>Subsurface</em> window, or from a GPS instrument or from the
+<em>Subsurface</em> Companion app). A search on the Internet is done to find the
+name of the closest known location. This function only works if <em>Subsurface</em>
+has an Internet connection. The preference of the dive site name can be
+configured, e.g. <em>Country/State/City</em> or <em>City/State/Country</em> (see image
+below).</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/Pref7_f20.jpg" alt="FIGURE: Facebook login panel" />
+</div>

+</div>

+</div>

+</div>

+</div>

+<div class="sect1">
+<h2 id="S_DivePlanner">13. The <em>Subsurface</em> dive planner</h2>
+<div class="sectionbody">
+<div class="paragraph"><p>Dive planning is an advanced feature of <em>Subsurface</em>, accessed by selecting
+<em>Log &#8594; Plan Dive</em> from the main menu. It allows calculation of nitrogen
+load during a dive by using the Bühlmann ZH-L16 algorithm with the addition
+of gradient factors as implemented by Erik Baker.</p></div>
+<div class="sidebarblock">
+<div class="content">
+<div class="admonitionblock">
 <table><tr>

 <td class="icon">

 <img src="images/icons/warning2.png" alt="Warning" />

@@ -4609,17 +4512,16 @@ A user who is not absolutely sure about any of the above requirements should
 </ul></div>

 </div></div>

 <div class="sect2">

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

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

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

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

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

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

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

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

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

-use.</p></div>

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

+<h3 id="_the_em_subsurface_em_dive_planner_screen">13.1. The <em>Subsurface</em> dive planner screen</h3>
+<div class="paragraph"><p>Like the <em>Subsurface</em> dive log, the planner screen is divided into several
+sections (see image below). The <strong>setup</strong> parameters for a dive are entered
+into the sections on the left hand side of the screen.  They are: Available
+Gases, Rates, Planning, Gas Options and Notes.</p></div>
+<div class="paragraph"><p>At the top right hand is a green <strong>design panel</strong> on which the profile of the
+dive can be manipulated directly by dragging and clicking as explained
+below. This feature makes the <em>Subsurface</em> dive planner unique in ease of
+use.</p></div>
+<div class="paragraph"><p>At the bottom right is a text panel with a heading of <em>Dive Plan
 Details</em>. This is where the details of the dive plan are provided in a way

 that can easily be copied to other software. This is also where any warning

 messages about the dive plan are printed.</p></div>

@@ -4631,13 +4533,13 @@ messages about the dive plan are printed.</p></div>
 </div>

 <div class="sect2">

 <h3 id="_open_circuit_dives">13.2. Open circuit dives</h3>

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

-<li>

-<p>

-Towards the centre bottom of the planner (circled in blue in the image

-   above) is a dropbox with three options. Select the appropriate one of these:

-</p>

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

+<div class="ulist"><ul>
+<li>
+<p>
+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:
+</p>
+<div class="ulist"><ul>
 <li>

 <p>

 Open Circuit (the default)

@@ -4659,16 +4561,16 @@ pSCR
 <p>

 Choose the Open Circuit option.

 </p>

-</li>

-<li>

-<p>

-In the top left-hand area of the planning screen, ensure that the constant

-  dive parameters are appropriate. These are: Start date and time of the

-  intended dive, Atmospheric Pressure and Altitude above sea level of the dive

-  site. The atmospheric pressure can also be entered as an altitude in metres,

-  assuming a sea-level atmospheric pressure of 1.013 bar.

-</p>

-</li>

+</li>
+<li>
+<p>
+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
+  dive, Atmospheric Pressure and Altitude above sea level of the dive
+  site. The atmospheric pressure can also be entered as an altitude in meters,
+  assuming a sea-level atmospheric pressure of 1.013 bar.
+</p>
+</li>
 <li>

 <p>

 In the table labelled <em>Available Gases</em>, add the information of the

@@ -4687,17 +4589,17 @@ In the table labelled <em>Available Gases</em>, add the information of the
 <p>

 The profile of the planned dive can be created in two ways:

 </p>

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

-<li>

-<p>

-Drag the waypoints (the small white circles) on the existing dive profile in

-    a way to represent the dive. Additional waypoints can be created by

-    double-clicking the existing dive profile. Waypoints can be deleted by

-    right-clicking a particular waypoint and selecting the <em>delete</em> item from

-    the resulting context menu.

-</p>

-</li>

-<li>

+<div class="ulist"><ul>
+<li>
+<p>
+Drag the waypoints (the small white circles) on the existing dive profile to
+    represent the dive. Additional waypoints can be created by double-clicking
+    the existing dive profile. Waypoints can be deleted by right-clicking a
+    particular waypoint and selecting the <em>delete</em> item from the resulting
+    context menu.
+</p>
+</li>
+<li>
 <p>

 The most efficient way to create a dive profile is to enter the appropriate

     values into the table marked <em>Dive planner points</em>. The first line of the

@@ -4712,33 +4614,29 @@ The most efficient way to create a dive profile is to enter the appropriate
 </li>

 </ul></div>

 </li>

-</ul></div>

-<div class="sect3">

-<h4 id="_recreational_dives">13.2.1. Recreational dives</h4>

-<div class="paragraph"><p>Recreational mode is what comes closest to planning a dive based on the

-non-decompression limit (NDL).  It computes the maximal time a diver can

-stay at the current depth without incurring any mandatory decompression

-stops and without using more than the existing gas (minus a reserve). The

-planner automatically takes into account the nitrogen load incurred in

-previous dives. But conventional dive tables are also used in a way that can

-take into account previous dives. Why use a dive planner for recreational

-dives? Using recreational dive tables, the maximum depth of a dive is taken

-into account. However, few dives are undertaken at a constant depth

-corresponding to the maximum depth (i.e. a "square" dive profile). This

-means that dive tables overestimate the nitrogen load incurred during

-previous dives. The <em>Subsurface</em> dive planner calculates nitrogen load

-according to the real dive profiles of all uploaded previous dives, in a

-similar way as dive computers calculate nitrogen load during a dive. This

-means that the diver gets <em>credit</em> in terms of nitrogen loading for not

-remaining at maximum depth during previous dives, enabling planning of a

-longer subsequent dive. For the planner to work it is therefore crucial to

-upload all previous dives onto <em>Subsurface</em> before performing dive planning.</p></div>

-<div class="paragraph"><p>To plan a dive, the appropriate settings need to be defined.</p></div>

-<div class="paragraph"><p>Ensure that the date and time is set to that of the intended dive. This

-allows calculation of the nitrogen load incurred during previous dives.</p></div>

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

-<li>

-<p>

+</ul></div>
+<div class="sect3">
+<h4 id="_recreational_dives">13.2.1. Recreational dives</h4>
+<div class="paragraph"><p>Recreational mode is what comes closest to planning a dive based on the non-decompression limit (NDL).
+It computes the maximum time a diver can stay at the current depth without needing mandatory decompression
+stops and without using more than the existing gas (minus a reserve). The planner automatically takes
+into account the nitrogen load incurred in previous dives. But conventional dive tables are also used in a
+way that can take into account previous dives. Why use a dive planner for recreational dives? Using
+recreational dive tables, the maximum depth of a dive is taken into account. But few dives are
+done at a constant depth corresponding to the maximum depth (i.e. a "square" dive profile). This means
+dive tables overestimate the nitrogen load incurred during previous dives. The <em>Subsurface</em>
+dive planner calculates nitrogen load according to the real dive profiles of all uploaded previous dives,
+in a similar way as dive computers calculate nitrogen load during a dive. This means that the diver gets <em>credit,</em>
+in terms of nitrogen load, for not remaining at maximum depth during
+previous dives, so a longer subsequent dive can be planned.
+ For the planner to work it&#8217;s crucial to upload all previous dives
+onto <em>Subsurface</em> before doing dive planning.
+To plan a dive, the appropriate settings need to be defined.</p></div>
+<div class="paragraph"><p>Ensure the date and time is set to that of the intended dive. This allows
+calculation of the nitrogen load incurred during previous dives.</p></div>
+<div class="ulist"><ul>
+<li>
+<p>
 Immediately under the heading <em>Planning</em> are two checkboxes <em>Recreational</em>

   and <em>Safety Stop</em>.  Check these two boxes.

 </p>

@@ -4750,33 +4648,32 @@ Then define the cylinder size, the gas mixture (air or % oxygen) and the
   <em>Available gases</em>.

 </p>

 </li>

-<li>

-<p>

-The planner calculates whether the specified cylinder contains enough

-  air/gas to complete the planned dive. In order for this to be realistic,

-  under <em>Gas options</em>, specify an appropriate surface air consumption (SAC)

-  rate for <em>Bottom SAC</em>. Suitable values are between 15 l/min and 30 l/min,

-  with novice divers or difficult dives requiring SAC rates closer to 30l/min.

-</p>

-</li>

-<li>

-<p>

-Define the amount of gas that the cylinder must have at the end of the

-  bottom section of the dive just before ascent. A value of 50 bar is often

-  used. The reason for this reserve gas is to provide for the possible need to

-  bring one&#8217;s buddy to the surface using gas sharing. How much gas is used in

-  sharing depends on the depth of the ascent. This can be a bit hard to

-  estimate, so most agencies assume a fixed amount of gas, or actually of

-  pressure e.g. 40 or 50 bar or 25% or 33% (rule of thirds). But <em>Subsurface</em>

-  can do better because it knows about the ascent and that is why we add the

-  amount of gas during the ascent (i.e. the "deco gas“).  Subsurface still

-  uses a fixed pressure „reserve“ but that is supposed to be for the

-  additional gas used around the realisation that there is a problem and one&#8217;s

-  pulse rate goes up when one starts to buddy breathe. This reserve amount is

-  user configurable.

-</p>

-</li>

-<li>

+<li>
+<p>
+The planner calculates whether the specified cylinder contains enough
+  air/gas to complete the planned dive. In order for this to be accurate,
+  under <em>Gas options</em>, specify an appropriate surface air consumption (SAC)
+  rate for <em>Bottom SAC</em>. Suitable values are between 15 l/min and 30 l/min,
+  with novice divers or difficult dives requiring SAC rates closer to 30l/min.
+</p>

+</li>
+<li>
+<p>
+Define the amount of gas 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
+  reason for this reserve gas is to provide for the possible need to bring a
+  buddy to the surface using gas sharing. How much gas is used in sharing
+  depends on the depth of the ascent. This can be difficult to estimate, so
+  most agencies assume a fixed amount of gas, or actually of pressure e.g. 40
+  or 50 bar or 25% or 33% (rule of thirds). But <em>Subsurface</em> can do better
+  because it knows about the ascent and that is why we add the amount of gas
+  during the ascent (i.e. the "deco gas“).  Subsurface still uses a fixed
+  pressure "reserve" but that&#8217;s supposed to be for the additional gas used
+  when there&#8217;s a problem and your pulse rate goes up when you start to buddy
+  breathe. This reserve amount is user configurable.
+</p>
+</li>
+<li>
 <p>

 Define the depth of the dive by dragging the waypoints (white dots) on the

   dive profile or (even better) defining the appropriate depths using the

@@ -4792,55 +4689,55 @@ Define the depth of the dive by dragging the waypoints (white dots) on the
 <p>

 The ascent speed can be changed. The default ascent speeds are those

   considered safe for recreational divers.

-</p>

-</li>

-</ul></div>

-<div class="paragraph"><p>The dive profile in the planner indicates the maximum dive time within

-no-deco limits using the Bühlmann ZH-L16 algorithm and the gas and depth

-settings specified as described above. The <em>Subsurface</em> planner allows rapid

-assessment of dive duration as a function of dive depth, given the nitrogen

-load incurred during previous dives. The dive plan includes estimates of the

-amount of air/gas used, depending on the cylinder settings specified under

+</p>
+</li>
+</ul></div>
+<div class="paragraph"><p>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
+specified as described above. The <em>Subsurface</em> planner allows rapid
+assessment of dive duration as a function of dive depth, given the nitrogen
+load incurred during previous dives. The dive plan includes estimates of the
+amount of air/gas used, depending on the cylinder settings specified under
 <em>Available gases</em>. If the initial cylinder pressure is set to 0, the dive

 duration shown is the true no-deco limit (NDL) without taking into account

 gas used during the dive. If the surface above the dive profile is RED it

-means that recreational dive limits are exceeded and either the dive

-duration or the dive depth needs to be reduced.</p></div>

-<div class="paragraph"><p>Below is an image of a dive plan for a recreational dive at 30

-metres. Although the no-deco limit (NDL) is 23 minutes, the duration of the

-dive is limited by the amount of air in the cylinder, reflected by the

-information in the text box at the bottom right of the panel that requires

-sufficient air for buddy-sharing during the ascent.</p></div>

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

-<div class="content">

-<img src="images/rec_diveplan.jpg" alt="FIGURE: A recreational dive plan: setup" />

-</div>

-</div>

-</div>

-<div class="sect3">

-<h4 id="_non_recreational_open_circuit_dives_including_decompression">13.2.2. Non-recreational open circuit dives, including decompression</h4>

-<div class="paragraph"><p>Non-recreational dive planning involves exceeding the no-deco limits and/or

-using multiple breathing gases.  Such dives are planned in three stages:</p></div>

-<div class="paragraph"><p><strong>a) Nitrogen management</strong>: This is performed by specifying the rates for descent and ascent,

-as well as the deco model (GFLow, GFHigh or Conservatism level) under the headings <em>Rates</em> and <em>Planning</em>

-to the bottom left of the planning screen. Two deco models are supported the Bühlmann model and the VPM-B

-model. Select one of the two models. When selecting the Bühlmann model, the gradient factors (GF_high and GF_low

-need to be specified. Initially, the GFHigh and GFLow values in the <em>Preferences</em>

-panel of <em>Subsurface</em> is used. If these are changed within the planner (see <em>Gas Options</em> within

-the planner), the new values are

-used without changing the original values in the <em>Preferences</em>. Gradient Factor settings strongly affect the calculated ceilings and their depths.

-A very low GFLow value brings about decompression stops early on during the dive.

- ** For more information about Gradient factors, see the section on <a href="#S_GradientFactors">Gradient Factor Preference settings</a>.</p></div>

-<div class="paragraph"><p>If the VPM-B model is selected, the Conservatism_level needs to be specified

-on a scale of 0 (least conservative) to 4 (most conservative).  This model

-tends to give deco stops at deeper levels than the Bühlmann model and often

-results in slightly shorter dive durations than the Bühlmann model. When

-selecting one of these models, keep in mind that they are NOT exact

-physiological models but only mathematical models that appear to work in

-practice.</p></div>

-<div class="paragraph"><p>For more information external to this manual see:</p></div>

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

-<li>

+means that recreational dive limits are exceeded and either the dive
+duration or the dive depth needs to be reduced.</p></div>
+<div class="paragraph"><p>Below is an image of a dive plan for a recreational dive at 30
+meters. Although the no-deco limit (NDL) is 23 minutes, the duration of the
+dive is limited by the amount of air in the cylinder. That is shown in the
+text box at the bottom right of the panel, requiring sufficient air for
+buddy-sharing during ascent.</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/rec_diveplan.jpg" alt="FIGURE: A recreational dive plan: setup" />
+</div>

+</div>

+</div>

+<div class="sect3">
+<h4 id="_non_recreational_open_circuit_dives_including_decompression">13.2.2. Non-recreational open circuit dives, including decompression</h4>
+<div class="paragraph"><p>Non-recreational dive planning involves exceeding the no-deco limits and/or
+using multiple breathing gases.  These dives are planned in three stages:</p></div>
+<div class="paragraph"><p><strong>a) Nitrogen management</strong>: This is done by specifying the rates for descent and ascent,
+as well as the deco model (GFLow, GFHigh or Conservatism level) under the headings <em>Rates</em> and <em>Planning</em>
+to the bottom left of the planning screen. Two deco models are supported the Bühlmann model and the VPM-B
+model. Select one of the two models. When selecting the Bühlmann model, the gradient factors (GF_high and GF_low
+need to be specified. Initially, the GFHigh and GFLow values in the <em>Preferences</em>
+panel of <em>Subsurface</em> is used. If these are changed within the planner (see <em>Gas Options</em> within
+the planner), the new values are
+used without changing the original values in the <em>Preferences</em>.
+Gradient Factor settings strongly affect the calculated ceilings and their depths.
+A very low GFLow value brings on decompression stops early during the dive.
+ ** For more information about Gradient factors, see the section on <a href="#S_GradientFactors">Gradient Factor Preference settings</a>.</p></div>
+<div class="paragraph"><p>If the VPM-B model is selected, the Conservatism_level needs to be specified
+on a scale of 0 (least conservative) to 4 (most conservative).  This model
+tends to give deco stops at deeper levels than the Bühlmann model and often
+results in slightly shorter dive durations than the Bühlmann model. When
+selecting one of these models, keep in mind they are NOT exact physiological
+models but only mathematical models that appear to work in practice.</p></div>
+<div class="paragraph"><p>For more information external to this manual see:</p></div>
+<div class="ulist"><ul>
+<li>
 <p>

 <a href="http://www.tek-dive.com/portal/upload/M-Values.pdf">Understanding

    M-values by Erik Baker, <em>Immersed</em> Vol. 3, No. 3.</a>

@@ -4855,75 +4752,76 @@ for Divers</em>, by Mark Powell (2008). Aquapress</a> Southend-on-Sea, UK. ISBN
 1-905492-07-3.  Un excellent livre non technique qui traite à la fois des

 modèles de décompression Bühlmann et VPM-B.

 </p>

-</li>

-</ul></div>

-<div class="paragraph"><p>The ascent rate is critical for nitrogen off-gassing at the end of the dive

-and is specified for several depth ranges, utilising the average (or mean)

-depth as a yardstick. The mean depth of the dive plan is indicated by a

-light grey line on the dive profile. Ascent rates at deeper levels are often

-in the range of 8-12 m/min, while ascent rates near the surface are often in

-the range of 4-9 m/min. The descent rate is also specified. If the option

-<em>Drop to first depth</em> is activated, then the descent phase of the planned

-dive will be at the maximal descent rate specified in the <em>Rates</em> section of

-the dive setup.</p></div>

-<div class="paragraph"><p><strong>b) Oxygen management</strong>: In the <strong>Gas Options</strong> part of the dive specification, the maximum partial

-pressure for oxygen needs to be specified for the

-bottom part of the dive (<em>bottom po2</em>) as well as for the decompression part of the dive (<em>deco po2</em>).

+</li>
+</ul></div>
+<div class="paragraph"><p>The ascent rate is critical for nitrogen off-gassing at the end of the dive
+and is specified for several depth ranges, using the average (or mean) depth
+as a yardstick. The mean depth of the dive plan is shown by a light grey
+line on the dive profile. Ascent rates at deeper levels are often in the
+range of 8-12 m/min, while ascent rates near the surface are often in the
+range of 4-9 m/min. The descent rate is also specified. If the option <em>Drop
+to first depth</em> is activated, the descent phase of the planned dive will be
+at the maximal descent rate specified in the <em>Rates</em> section of the dive
+setup.</p></div>
+<div class="paragraph"><p><strong>b) Oxygen management</strong>: In the <strong>Gas Options</strong> part of the dive specification, the maximum partial
+pressure for oxygen needs to be specified for the
+bottom part of the dive (<em>bottom po2</em>) as well as for the decompression part of the dive (<em>deco po2</em>).
 The most commonly

 used values are 1.4 bar for the bottom part of the dive and 1.6 bar for any decompression

-stages. Normally, a partial pressure of 1.6 bar is not exceeded. PO2 settings and the depth at which switching to a gas takes place can also be edited in the

-<em>Available Gases</em> dialog. Normally the planner decides on switching to a new gas when, during

-ascent, the partial pressure of the new gas has increased to 1.6 bar.</p></div>

-<div class="paragraph"><p><strong>c) Gas management</strong>: With open-circuit dives this is a primary consideration. One needs to keep within the limits of the amount of gas within the dive

-cylinder(s), allowing for an appropriate margin for a safe return to the surface, possibly

-sharing with a buddy. Under the <em>Gas Options</em> heading, specify the best (but conservative) estimate

-of your surface-equivalent air consumption (SAC, also termed RMV) in

-litres/min (for the time being, only SI units are supported).  Specify the SAC during the

-bottom part of the dive (<em>bottom SAC</em>) as well as during the decompression or safety stops of the

-dive (<em>deco SAC</em>). Values of 15-30 l/min are common. For good gas management, a thumbsuck guess

-is not sufficient and one needs to

-monitor one&#8217;s gas consumption on a regular basis, dependent on different dive conditions and/or equipment.

-The planner calculates the total volume of gas used during the dive and issues a warning

-if one exceeds the total amount of gas available. Good practice demands that one does not dive to

-the limit of the gas supply but that an appropriate reserve is kept for unforeseen circumstances.

-For technical diving, this reserve can be up to 66% of the total available gas.</p></div>

-<div class="paragraph"><p>Now (at last) one can start the detailed time-depth planning of the

-dive. <em>Subsurface</em> offers a unique graphical interface for performing this

-part of the planning. The mechanics of doing this is similar to

-hand-entering a dive profile in the dive log part of <em>Subsurface</em>. Upon

-activating the planner, a default dive of depth 15 m for 40 min is offered

-in the bue design surface to the top right hand of the screen. The white

-dots (waypoints) on the profile can be dragged with a mouse. Create more

-waypoints by double-clicking on the profile line and ensuring that the

-profile reflects the intended dive. Drag the waypoints to represent the

-depth and duration of the dive. It is NOT necessary to specify the ascent

-part of the dive since the planner calculates this, based on the settings

-that have been specified.  If any of the management limits (for nitrogen,

-oxygen or gas) is exceeded, the surface above the dive profile changes from

-BLUE to RED.</p></div>

-<div class="paragraph"><p>Each waypoint on the dive profile creates a <em>Dive Planner Point</em> in the

-table on the left of the dive planner panel. Ensure that the <em>Used Gas</em>

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

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

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

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

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

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

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

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

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

-plan. In fact, one can create the whole dive profile by editing the <em>Dive

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

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

-explained in the section <a href="#S_CreateProfile">hand-creating a dive profile</a>. These changes should reflect the cylinders and gas compositions

-defined in the table with <em>Available Gases</em>.  If two or more gases are used,

-automatic gas switches will be suggested during the ascent to the

-surface. However, these changes can be deleted by right-clicking the gas

-change and by manually creating a gas change by right-clicking on the

-appropriate waypoint.</p></div>

-<div class="paragraph"><p>A non-zero value in the "CC set point" column of the table of dive planner

-points indicates a valid setpoint for oxygen partial pressure and that the

-segment is dived using a closed circuit rebreather (CCR). If the last

+stages. Normally, a partial pressure of 1.6 bar is not exceeded. PO2 settings and the depth at which switching to a gas takes place can also be edited in the
+<em>Available Gases</em> dialog. Normally the planner decides on switching to a new gas when, during
+ascent, the partial pressure of the new gas has increased to 1.6 bar.</p></div>
+<div class="paragraph"><p><strong>c) Gas management</strong>: With open-circuit dives this is a primary
+consideration. Divers need to keep within the limits of the amount of
+gas within the dive
+cylinder(s), allowing for an appropriate margin for a safe return to the surface, possibly
+sharing with a buddy. Under the <em>Gas Options</em> heading, specify the best (but conservative) estimate
+of your surface-equivalent air consumption (SAC, also termed RMV) in
+liters/min (for the time being, only SI units are supported).  Specify the SAC during the
+bottom part of the dive (<em>bottom SAC</em>) as well as during the decompression or safety stops of the
+dive (<em>deco SAC</em>). Values of 15-30 l/min are common. For good gas management, a guess
+is not sufficient and you needs to
+monitor gas consumption on a regular basis, dependent on different dive conditions and/or equipment.
+The planner calculates the total volume of gas used during the dive and issues a warning
+if you exceeds the total amount of gas available. Good practice demands that divers not dive to
+the limit of the gas supply but that an appropriate reserve is kept
+for unforeseen circumstances.
+For technical diving, this reserve can be up to 66% of the total available gas.</p></div>
+<div class="paragraph"><p>Now you can start the detailed time-depth planning of the dive. <em>Subsurface</em>
+offers an unique graphical interface for doing planning. Themechanics are
+similar to hand-entering a dive profile in the dive log part of
+<em>Subsurface</em>. Upon activating the planner, a default dive of depth 15 m for
+40 min is offered in the blue design surface to the top right hand of the
+screen. The white dots (waypoints) on the profile can be dragged with a
+mouse. Create more waypoints by double-clicking on the profile line and
+ensuring the profile reflects the intended dive. Drag the waypoints to
+represent the depth and duration of the dive. It is NOT necessary to specify
+the ascent part of the dive since the planner calculates this, based on the
+settings that have been specified.  If any of the management limits (for
+nitrogen, oxygen or gas) are exceeded, the surface above the dive profile
+changes from BLUE to RED.</p></div>
+<div class="paragraph"><p>Each waypoint on the dive profile creates a <em>Dive Planner Point</em> in the
+table on the left of the dive planner panel. Be sure the <em>Used Gas</em> value in
+each row of that table corresponds to one of the gas mixtures specified in
+the <em>Available Gases</em> table.  Add new waypoints until the main features of
+the dive have been completed, e.g. the bottom time segment and deep stops
+(if these are implemented). Leave the remaining waypoints on the ascent to
+<em>Subsurface</em>. In most cases <em>Subsurface</em> computes additional way points in
+order to fulfill decompression requirements for that dive. A waypoint can be
+moved by selecting it and by using the arrow keys.  The waypoints listed in
+the <em>Dive Planner Points</em> dialogue can be edited by hand in order to get a
+precise presentation of the dive plan. In fact, you can create the whole
+dive profile by editing the <em>Dive Planner Points</em> dialog.</p></div>
+<div class="paragraph"><p>Show any changes in gas cylinder used by indicating gas changes as explained
+in the section <a href="#S_CreateProfile">hand-creating a dive profile</a>. These
+changes should reflect the cylinders and gas compositions defined in the
+table with <em>Available Gases</em>.  If two or more gases are used, automatic gas
+switches will be suggested during the ascent to the surface. These changes
+can be deleted by right-clicking the gas change and manually creating a gas
+change by right-clicking on the appropriate waypoint.</p></div>
+<div class="paragraph"><p>A non-zero value in the "CC set point" column of the table of dive planner
+points indicates a valid setpoint for oxygen partial pressure and that the
+segment is dived using a closed circuit rebreather (CCR). If the last
 manually entered segment is a CCR segment, the decompression phase is

 computed assuming the diver uses a CCR with the specified set-point. If the

 last segment (however short) is on open circuit (OC, indicated by a zero

@@ -4933,15 +4831,15 @@ considers gas changes in OC mode.</p></div>
 using EAN50 and using the settings as described above.</p></div>

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

 <div class="content">

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

-</div>

-</div>

-<div class="paragraph"><p>Once the above has been completed, one can save it by clicking the <em>Save</em>

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

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

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

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

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

+<img src="images/DivePlanner2_f20.jpg" alt="FIGURE: Planning a dive: setup" />
+</div>
+</div>
+<div class="paragraph"><p>Once the above steps have been completed, save by clicking the <em>Save</em> button
+towards the top middle of the planner. The saved dive plan will appear in
+the <strong>Dive List</strong> panel of <em>Subsurface</em>.</p></div>
+<div class="paragraph"><p><strong>The dive plan details</strong></p></div>
+<div class="paragraph"><p>On the bottom right of the dive planner, under <em>Dive Plan Details</em>, the
+exact details of the dive plan are provided. These details may be modified
 by checking any of the options under the <em>Notes</em> section of the dive

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

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

@@ -4960,13 +4858,13 @@ from the segment durations at a particular level.</p></div>
 <div class="paragraph"><p>To plan a dive using a passive semi-closed rebreather (pSCR), select <em>pSCR</em> rather than

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

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

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

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

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

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

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

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

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

+from the main menu, where the gas consumption calculation takes into account the pSCR dump
+ratio (default 10:1) as well as the metabolism rate. The calculation also takes the oxygen drop
+accross the mouthpiece of the rebreather into account. If the
+pO<sub>2</sub> drops below what is considered safe, a warning appears in the <em>Dive plan
+details</em>. A typical pSCR configuration is with a single cylinder and one or more bail-out
+cylinders. Therefore the setup of the <em>Available gases</em> and the <em>Dive planner points</em> tables
+are very similar to that of a CCR dive plan, described below. However, no oxygen setpoints
 are specified for pSCR dives. Below is a dive plan for a pSCR dive. The dive is comparable

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

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

@@ -4984,72 +4882,72 @@ the dropdown list, circled in blue in the image below.</p></div>
 diluent cylinder and for any bail-out cylinders. Do NOT enter the information for the oxygen

 cylinder since it is implied when the <em>CCR</em> dropdown selection is made.</p></div>

 <div class="paragraph"><p><strong>Entering setpoints</strong>: Specify a default setpoint in the Preferences tab, by selecting <em>File &#8594;  Preferences &#8594;  Graph</em> from

-the main menu. All user-entered segments in the <em>Dive planner points</em> table

-use the default setpoint value. Then, different setpoints can be specified for dive segments

-in the <em>Dive planner points</em> table. A zero setpoint

-means the diver bails out to open circuit mode for that segment. The decompression is always calculated

-using the setpoint of the last manually entered segment. So, to plan a bail out ascent for a

-CCR dive, add a one-minute dive segment to the end with a setpoint value of 0. The decompression

-algorithm does not switch deco-gases automatically while in CCR mode (i.e. when a positive setpoint is specified) but,

-of course, this is calculated for bail out ascents.</p></div>

-<div class="paragraph"><p>The dive profile for a CCR dive may look something like the image below.</p></div>

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

-<div class="content">

+the main menu. All user-entered segments in the <em>Dive planner points</em> table
+use the default setpoint value. Then, different setpoints can be specified for dive segments
+in the <em>Dive planner points</em> table. A zero setpoint
+means the diver bails out to open circuit mode for that segment. Decompression is always calculated
+using the setpoint of the last manually entered segment. So, to plan a bail out ascent for a
+CCR dive, add a one-minute dive segment to the end with a setpoint value of 0. The decompression
+algorithm does not switch deco-gases automatically while in CCR mode (i.e. when a positive setpoint is specified) but
+this is calculated for bail out ascents.</p></div>
+<div class="paragraph"><p>The dive profile for a CCR dive may look something like the image below.</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
 <img src="images/Planner_CCR1_f20.jpg" alt="FIGURE: Planning a CCR dive: setup" />

-</div>

-</div>

-<div class="paragraph"><p>Note that, in the <em>Dive plan details</em>, the gas consumption for a CCR segment

-is not calculated, so gas consumptions of 0 litres are the norm.</p></div>

-</div>

-<div class="sect2">

-<h3 id="S_Replan">13.5. Modifying an existing dive plan</h3>

-<div class="paragraph"><p>Normally, when a dive plan has been saved, it is accessible from the <strong>Dive

-List</strong>, like any other dive log. Within the <strong>Dive List</strong> there is not a way to

-change a saved dive plan.  To perform changes to a dive plan, select it on

-the <strong>Dive List</strong>. Then, in the main menu, select <em>Log &#8594; Re-plan dive</em>. This

-will open the selected dive plan within the dive planner, allowing changes

-to be made and saved as usual.</p></div>

-<div class="paragraph"><p>In addition there is the option "Save new". This keeps the original planned

-dive and adds a (possibly modified) copy to the dive list. If that copy is

-saved with the same start time as the original, the two dives are considered

-two versions of the same dive and do not influence other each during

+</div>
+</div>
+<div class="paragraph"><p>Note that, in the <em>Dive plan details</em>, the gas consumption for a CCR segment
+is not calculated, so gas consumptions of 0 liters are the norm.</p></div>
+</div>
+<div class="sect2">
+<h3 id="S_Replan">13.5. Modifying an existing dive plan</h3>
+<div class="paragraph"><p>Normally, when a dive plan has been saved, it is accessible from the <strong>Dive
+List</strong>, like any other dive log. Within the <strong>Dive List</strong> there is no way to
+change a saved dive plan.  To change a dive plan, select it on the <strong>Dive
+List</strong>. Then, in the main menu, select <em>Log &#8594; Re-plan dive</em>. This will open
+the selected dive plan within the dive planner, letting changes be made and
+saved as usual.</p></div>
+<div class="paragraph"><p>In addition, there is the option "Save new". This keeps the original planned
+dive and adds a (possibly modified) copy to the dive list. If that copy is
+saved with the same start time as the original, the two dives are considered
+two versions of the same dive and do not influence other each during
 decompression calculation (see next section).</p></div>

 </div>

-<div class="sect2">

-<h3 id="_planning_for_repetitive_dives">13.6. Planning for repetitive dives</h3>

-<div class="paragraph"><p>Repetitive dives can easily be planned if the dates and start times of the

-repetitive dive set is specified appropriately in the top left-hand <em>Start

-Time</em> field. <em>Subsurface</em> calculates the gas loading figures correctly and

-the effect of the first dive is evaluated on later dives.</p></div>

-<div class="paragraph"><p>If one has just completed a long/deep dive and is planning another dive,

-then highlight, in the <strong>Dive List</strong>, the dive that has just been completed

-and then activate the planner. Depending on the start time of the planned

-dive, the planner takes into account the gas loading incurred during the

-completed dive and allows planning within these limitations.</p></div>

-<div class="paragraph"><p>If only a few standard configurations are used (e.g. in GUE), then a

-template dive can be created conforming to one of the configurations. If one

-now wishes to plan a dive using this configuration, just highlight the

-template dive in the <strong>Dive List</strong> and activate the planner: the planner takes

-into account the configuration in the highlighted dive.</p></div>

-</div>

-<div class="sect2">

-<h3 id="_printing_the_dive_plan">13.7. Printing the dive plan</h3>

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

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

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

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

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

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

+<div class="sect2">
+<h3 id="_planning_for_repetitive_dives">13.6. Planning for repetitive dives</h3>
+<div class="paragraph"><p>Repetitive dives can easily be planned if the dates and start times of the
+repetitive dive set are specified appropriately in the top left-hand <em>Start
+Time</em> field. <em>Subsurface</em> calculates the gas loading figures and the affect
+of the first dive is evaluated on later dives.</p></div>
+<div class="paragraph"><p>If you have just completed a long/deep dive and are planning another dive,
+then highlight, in the <strong>Dive List</strong>, the dive that has just been done then
+activate the planner. Depending on the start time of the planned dive, the
+planner takes into account the gas loading during the completed dive and
+plans accordingly.</p></div>
+<div class="paragraph"><p>If only a few standard configurations are used (e.g. in GUE), then a
+template dive can be created conforming to one of the configurations. If you
+want to plan a dive using this configuration, highlight the template dive in
+the <strong>Dive List</strong> and activate the planner: the planner takes into account the
+configuration in the highlighted dive.</p></div>
+</div>
+<div class="sect2">
+<h3 id="_printing_the_dive_plan">13.7. Printing the dive plan</h3>
+<div class="paragraph"><p>Selecting the <em>Print</em> button in the planner allows printing of the <em>Dive
+Plan Details</em> for wet notes. You can also cut and paste the <em>Dive Plan
+Details</em> to include in a text file or word processing document.</p></div>
+<div class="paragraph"><p>Dive plans have many characteristics in common with dive logs (dive profile,
+dive notes, etc).  After a dive plan has been saved, the dive details and
+gas calculations are saved in the <strong>Notes</strong> tab. While a dive plan is being
 designed, it can be printed using the <em>Print</em> button in the dive

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

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

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

-calculations cannot be accessed in the same way as during the planning

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

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

-paste to a word processor.</p></div>

-</div>

-</div>

+it is represented in a way very similar to a dive log and the gas
+calculations cannot be accessed in the same way as during the planning
+process. The only way to print the dive plan is to use the <em>File &#8594; Print</em>
+function on the main menu in the same way as for dive logs or by copy and
+paste to a word processor.</p></div>
+</div>
+</div>
 </div>

 <div class="sect1">

 <h2 id="_description_des_éléments_du_menu_principal_de_subsurface">14. Description des éléments du menu principal de Subsurface</h2>

@@ -5065,26 +4963,24 @@ des sections de ce manuel traitant des opérations relatives.</p></div>
 <a href="#S_NewLogbook"><em>Nouveau carnet de plongée</em></a> - Fermer le carnet de plongée

   actuellement ouvert et supprime toutes les informations de plongées.

 </p>

-</li>

-<li>

-<p>

-<em>Ouvrir un carnet de plongée</em> - Cela ouvre une fenêtre pour sélectionner le

-  carnet de plongée à ouvrir.

-</p>

-</li>

-<li>

+</li>
+<li>
+<p>
+<em>Open logbook</em> - Open the file manager to select a dive logbook to open.
+</p>
+</li>
+<li>
 <p>

 <em>Open cloud storage</em> - Open the dive log previously saved in

   <a href="#S_Cloud_storage"><em>Cloud storage</em></a>.

 </p>

-</li>

-<li>

-<p>

-<em>Sauvegarder</em> - Enregistrer le carnet de plongée qui est actuellement

-  ouvert.

-</p>

-</li>

-<li>

+</li>
+<li>
+<p>
+<em>Save</em> - Save the dive logbook currently open.
+</p>
+</li>
+<li>
 <p>

 <em>Save to cloud storage</em> - Save the current dive log to

   <a href="#S_Cloud_storage"><em>Cloud storage</em></a>.

@@ -5094,13 +4990,13 @@ des sections de ce manuel traitant des opérations relatives.</p></div>
 <p>

 <em>Enregsitrer sous</em> - Enregistrer le carnet actuel sous un nom différent.

 </p>

-</li>

-<li>

-<p>

-<em>Fermer</em> - Fermer le carnet de plongée actuellement ouvert.

-</p>

-</li>

-<li>

+</li>
+<li>
+<p>
+<em>Close</em> - Close the dive logbook currently open.
+</p>
+</li>
+<li>
 <p>

 <a href="#S_ExportLog"><em>Exporter</em></a> - Exporter le carnet de plongée actuellement

   ouvert (ou les plongées sélectionnées dans le carnet) vers un des nombreux

@@ -5178,33 +5074,32 @@ des sections de ce manuel traitant des opérations relatives.</p></div>
 <a href="#S_EnterData"><em>Ajouter une plongée</em></a> -  Ajouter manuellement une nouvelle

   plongée au panneau de la <strong>liste des plongées</strong>.

 </p>

-</li>

-<li>

-<p>

-<em>Edit dive</em> - Edit a dive of which the profile was entered by hande and not

-  from a dive computer.

-</p>

-</li>

-<li>

-<p>

-<a href="#S_DivePlanner"><em>Planifier une plongée</em></a> - Cette fonctionnalité permet de

-  planifier des plongées.

-</p>

-</li>

-<li>

+</li>
+<li>
+<p>
+<em>Edit dive</em> - Edit a dive where the profile was entered by hand and not from
+  a dive computer.
+</p>
+</li>
+<li>
+<p>
+<a href="#S_DivePlanner"><em>Planifier une plongée</em></a> - Planifier des plongées.
+</p>
+</li>
+<li>
 <p>

 <a href="#S_Replan"><em>Modifier la plongée dans le planificateur</em></a> - Modifier une

   plongée planifiée qui a été enregistrée dans la <strong>liste des plongées</strong>.

 </p>

-</li>

-<li>

-<p>

-<a href="#S_CopyComponents"><em>Copier les composants de la plongée</em></a> - En

-  sélectionnant cette option, vous pouvez copier les informations de plusieurs

-  champs d&#8217;un journal de plongée vers le presse-papier.

-</p>

-</li>

-<li>

+</li>
+<li>
+<p>
+<a href="#S_CopyComponents"><em>Copier les composants de la plongée</em></a> - Copier les
+  informations de plusieurs champs d&#8217;un journal de plongée vers le
+  presse-papier.
+</p>
+</li>
+<li>
 <p>

 <em>Coller les composants de la plongée</em>  - Colle, dans les plongées

   sélectionnées dans la <strong>liste des plongées</strong>, les informations copiées au

@@ -5223,13 +5118,13 @@ des sections de ce manuel traitant des opérations relatives.</p></div>
   <strong>liste des plongées</strong> dans des voyages de plongées.

 </p>

 </li>

-<li>

-<p>

-<a href="#S_DeviceNames"><em>Editer les noms des ordinateurs de plongée</em></a> - Modifier

-  les noms des ordinateurs de plongée pour faciliter vos journaux (logs).

-</p>

-</li>

-<li>

+<li>
+<p>
+<a href="#S_DeviceNames"><em>Editer les noms des ordinateurs de plongée</em></a> - Modifier
+  les noms des ordinateurs de plongée pour coordonner vos journaux (logs).
+</p>
+</li>
+<li>
 <p>

 <a href="#S_Filter"><em>Filtrer la liste des plongées</em></a> - Sélectionner seulement

   certaines plongées, à partir de tags ou de critères de plongées.

@@ -5274,15 +5169,14 @@ des sections de ce manuel traitant des opérations relatives.</p></div>
 <em>Statistiques annuelles</em>  - Affiche par année le résumé des statistiques des

   plongées effectuées.

 </p>

-</li>

-<li>

-<p>

-<em>Prev DC</em> - If a single dive was logged from more than one dive computer,

-  switch to data from

-   ordinateur de plongée précédent.

-</p>

-</li>

-<li>

+</li>
+<li>
+<p>
+<em>Prev DC</em> - Switch to data from previous dive computer, if a single dive was
+  logged from more than one.
+</p>
+</li>
+<li>
 <p>

 <em>Ordinateur suivant</em>  - Passer à l&#8217;ordinateur de plongée suivant.

 </p>

@@ -5344,15 +5238,15 @@ des sections de ce manuel traitant des opérations relatives.</p></div>
 <h3 id="_assurez_vous_que_les_pilotes_drivers_nécessaires_sont_installés">15.1. Assurez-vous que les pilotes (drivers) nécessaires sont installés</h3>

 <div class="admonitionblock">

 <table><tr>

-<td class="icon">

-<img src="images/icons/drivers.jpg" alt="Note" />

-</td>

-<td class="content">Le système d&#8217;exploitation de l&#8217;ordinateur nécessite les bons pilotes pour

-communiquer avec l&#8217;ordinateur de plongée de la façon utilisée par

-l&#8217;ordinateur de plongée (Bluetooth, USB, infra-rouge).</td>

-</tr></table>

-</div>

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

+<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>
+</tr></table>
+</div>
+<div class="ulist"><ul>
 <li>

 <p>

 Sous Linux, les utilisateurs doivent avoir le bon module noyau de chargé. La

@@ -5382,18 +5276,17 @@ de documents et logiciels Silicon Labs</a>.</p></div>
 <h3 id="S_HowFindDeviceName">15.2. Comment trouver le nom du périphérique branché sur USB et paramétrer les permissions en écriture</h3>

 <div class="admonitionblock">

 <table><tr>

-<td class="icon">

-<img src="images/icons/usb.jpg" alt="Note" />

-</td>

-<td class="content">Lorsqu&#8217;un utilisateur connecte un ordinateur de plongée en utilisant l&#8217;USB,

-généralement <em>Subsurface</em> proposera soit une liste déroulante contenant le

-bon nom (ou le point de montage pour un Uemis Zurich) ou la liste sera

-désactivée si aucun nom de périphérique n&#8217;est nécessaire. Dans les rares cas

-où cela ne fonctionnerait pas, voici quelques suggestions pour trouver le

-nom de votre périphérique ;</td>

-</tr></table>

-</div>

-<div class="paragraph"><div class="title">Sur Windows :</div><p>Essayez simplement COM1, COM2, etc. La liste déroulante devrait contenir

+<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&#8217;t work, here are some ways to find out what the device name is:</td>
+</tr></table>
+</div>
+<div class="paragraph"><div class="title">Sur Windows :</div><p>Essayez simplement COM1, COM2, etc. La liste déroulante devrait contenir
 tous les périphériques COM connectés.</p></div>

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

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

@@ -5445,48 +5338,51 @@ usbcore: registered new interface driver ftdi_sio
 ftdi_sio: v1.6.0:USB FTDI Serial Converters Driver</code></pre>

 </div></div>

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

-détecté et connecté sur <code>ttyUSB3</code>. Cette information peut à présent être

-utilisée pour les paramètres d&#8217;importation en tant que <code>/dev/ttyUSB3</code> pour

-que Subsurface utilise le bon port USB.</p></div>

-<div class="paragraph"><p>S&#8217;assurer que l&#8217;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 du groupe <code>dialout</code>. 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&#8217;utilisateur est <em>johnB</em> :</p></div>

-<div class="paragraph"><p>En tant que root, tapez : usermod -a -G dialout johnB+ (utilisateurs

-d&#8217;Ubuntu : <code>sudo usermod -a -G dialout johnB</code>)  Cela ajoute johnB au groupe

-<code>dialout</code>.

+détecté et connecté sur <code>ttyUSB3</code>. Cette information peut à présent être
+utilisée pour les paramètres d&#8217;importation en tant que <code>/dev/ttyUSB3</code> pour
+que Subsurface utilise le bon port USB.</p></div>
+<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&#8217;t be able to use the
+USB port. Let us assume one&#8217;s username is <em>johnB</em>.</p></div>
+<div class="paragraph"><p>En tant que root, tapez : usermod -a -G dialout johnB+ (utilisateurs
+d&#8217;Ubuntu : <code>sudo usermod -a -G dialout johnB</code>)  Cela ajoute johnB au groupe
+<code>dialout</code>.
 Tapez : <code>id johnB</code>     Cela liste tous les groupes auquel johnB appartient et

 vérifiez que

-l&#8217;appartenance au groupe est bien effectif. Le groupe <code>dialout</code> devrait

-être listé

-parmi les différents IDs.

-Sous certaines circonstances, les modifications ne prennent effet qu&#8217;après une déconnexionpuis reconnexion sur l&#8217;ordinateur (sous Ubuntu, par exemple).

-Avec le bon nom de périphérique (par exemple <code>dev/ttyUSB3</code>) et avec un accès

-en écriture au port USB, l&#8217;ordinateur de plongée devrait se connecter et

-vous devriez pouvoir importer vos plongées.</p></div>

-</div>

+l&#8217;appartenance au groupe est bien effectif. Le groupe <code>dialout</code> devrait
+être listé
+parmi les différents IDs.
+Sous certaines circonstances, les modifications ne prennent effet qu&#8217;après une déconnexion
+puis reconnexion sur l&#8217;ordinateur (sous Ubuntu, par exemple).</p></div>
+<div class="paragraph"><p>Avec le bon nom de périphérique (par exemple <code>dev/ttyUSB3</code>) et avec un accès
+en écriture au port USB, l&#8217;ordinateur de plongée devrait se connecter et
+vous devriez pouvoir importer vos plongées.</p></div>
+</div>
 <div class="sect2">

 <h3 id="S_HowFindBluetoothDeviceName">15.3. Manually setting up Bluetooth enabled devices</h3>

 <div class="admonitionblock">

 <table><tr>

 <td class="icon">

 <img src="images/icons/bluetooth.jpg" alt="Note" />

-</td>

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

-Weikamp Frog or the Shearwater Predator, Petrel and Nerd there is a

-different procedure to get the devices name to communicate with

-<em>Subsurface</em>. Follow these steps:</td>

-</tr></table>

-</div>

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

-<li>

-<p>

-<strong>For the dive computer, after enabling Bluetooth, ensure it is in Upload mode.</strong>

-</p>

-</li>

-</ul></div>

+</td>
+<td class="content">For dive computers communicating through Bluetooth like the Heinrichs
+Weikamp Frog or the Shearwater Predator, Petrel and Nerd there is a
+different procedure to get the device’s name to communicate with
+<em>Subsurface</em>. Follow these steps:</td>
+</tr></table>
+</div>
+<div class="ulist"><ul>
+<li>
+<p>
+<strong>For the dive computer, after enabling Bluetooth, be sure it is in Upload mode.</strong>
+</p>
+</li>
+</ul></div>
 <div class="paragraph"><p>For Bluetooth pairing of the dive computer, refer to the manufacturer&#8217;s user

 guide. When using a Shearwater Predator/Petrel/Nerd, select <em>Dive Log &#8594;

 Upload Log</em> and wait for the <em>Wait PC</em> message.</p></div>

@@ -5514,25 +5410,24 @@ using other software, remove the existing pairing with the dive computer.</p></d
 <div class="sect3">

 <h4 id="_sur_macos">15.3.2. Sur MacOS :</h4>

 <div class="paragraph"><p>Click on the Bluetooth symbol in the menu bar and select <em>Set up Bluetooth

-Device&#8230;</em>. The dive computer should then show up in the list of

-devices. Select it and go through the pairing process. This step should only

-be needed once for initial setup.</p></div>

-<div class="paragraph"><p>Once the pairing is completed the correct device is shown in the <em>Device or

-Mount Point</em> drop-down in the <em>Subsurface</em> <strong>Import</strong> dialog.</p></div>

-</div>

-<div class="sect3">

-<h4 id="_sur_linux">15.3.3. Sur Linux</h4>

-<div class="paragraph"><p>Ensure Bluetooth is enabled on the <em>Subsurface</em> computer.  On most common

-distributions this should be true out of the box and pairing should be

-straight forward. For instance, Gnome3 shows a Bluetooth icon on the right

-of the toolbar at the top of the screen.  Users have reported difficulties

-with some Bluetooth controllers.  If you have an onboard controller, try

-that first.  It is simplest if you remove any USB Bluetooth dongles.  If you

-have a USB dongle that came with your dive computer, try that before any

-others.</p></div>

-<div class="paragraph"><p>Setting up a connection to download dives from your Bluetooth-enabled

-device, such as the <em>Shearwater Petrel</em>, is not yet an automated process and

-will generally require the command prompt.  It is essentially a three step

+Device&#8230;</em>. The dive computer should then show up in the list of
+devices. Select it and go through the pairing process. This step should only
+be needed once for initial setup.</p></div>
+<div class="paragraph"><p>Once the pairing is complete, the correct device is shown in the <em>Device or
+Mount Point</em> drop-down in the <em>Subsurface</em> <strong>Import</strong> dialog.</p></div>
+</div>
+<div class="sect3">
+<h4 id="_sur_linux">15.3.3. Sur Linux</h4>
+<div class="paragraph"><p>Be sure Bluetooth is enabled on the <em>Subsurface</em> computer.  On most common
+distributions this should be true out of the box and pairing should be
+straightforward. For instance, Gnome3 shows a Bluetooth icon on the right of
+the toolbar at the top of the screen.  Users have reported difficulties with
+some Bluetooth controllers.  If you have an onboard controller, try that
+first.  It is simplest if you remove any USB Bluetooth dongles.  If you have
+a USB dongle that came with your dive computer, try that before any others.</p></div>
+<div class="paragraph"><p>Setting up a connection to download dives from your Bluetooth-enabled
+device, such as the <em>Shearwater Petrel</em>, is not yet an automated process and
+will generally require the command prompt.  It is essentially a three step
 process.</p></div>

 <div class="ulist"><ul>

 <li>

@@ -5569,13 +5464,13 @@ the previous section). On the command terminal, enter:</p></div>
 <div class="paragraph"><p>Attempt to set up the Bluetooth controller and pair your dive computer using

 the graphical environment of the operating system. After setting the dive

 computer to upload mode, click the Bluetooth icon in the system tray and

-select <em>Add new device</em>. The dive computer should appear. If asked for a

-password, enter 0000.  Write down or copy the MAC address of your dive

-computer - this needed later and should be in the form  00:11:22:33:44:55.</p></div>

-<div class="paragraph"><p>If the graphical method didn&#8217;t work, pair the device from the command

-line. Open a terminal and use <code>hciconfig</code> to check the Bluetooth controller

-status</p></div>

-<div class="literalblock">

+select <em>Add new device</em>. The dive computer should appear. If asked for a
+password, enter 0000.  Write down or copy the MAC address of your dive
+computer - this needed later and should be in the form  00:11:22:33:44:55.</p></div>
+<div class="paragraph"><p>If the graphical method doesn&#8217;t work, pair the device from the command
+line. Open a terminal and use <code>hciconfig</code> to check the Bluetooth controller
+status</p></div>
+<div class="literalblock">
 <div class="content">

 <pre><code>$ hciconfig

 hci0:   Type: BR/EDR  Bus: USB

@@ -5760,32 +5655,32 @@ upload mode countdown is still running, go to_Subsurface_, select
 </td>

 <td class="content"><em>Subsurface</em> downloads the information stored on the SDA (the built-in file

 system of the Uemis) including information about dive spots and

-equipment. Buddy information is not yet downloadable.  Things are very

-similar to a normal USB-connected dive computer (the Uemis is one of those

-that recharge when connected to the USB port).  The main difference is that

-one does not enter a device name, but instead the location where the

-UEMISSDA file system is mounted once connected to the dive computer. On

-Windows this is a drive letter ( often <em>E:</em> or <em>F:</em>), on a Mac this is

-<em>/Volumes/UEMISSDA</em> and on Linux systems this differs depending on the

-distribution. On Fedora it usually is

-<em>/var/run/media/&lt;your_username&gt;/UEMISSDA</em>. In all cases <em>Subsurface</em> should

+equipment. Buddy information is not yet downloadable.  Things are very
+similar to a normal USB-connected dive computer (the Uemis is one of those
+that recharge when connected to the USB port).  The main difference is that
+you don’t enter a device name, but instead the location where the UEMISSDA
+file system is mounted once connected to the dive computer. On Windows this
+is a drive letter ( often <em>E:</em> or <em>F:</em>), on a Mac this is
+<em>/Volumes/UEMISSDA</em> and on Linux systems this differs depending on the
+distribution. On Fedora it usually is
+<em>/var/run/media/&lt;your_username&gt;/UEMISSDA</em>. In all cases <em>Subsurface</em> should
 suggest the correct location in the drop down list.</td>

 </tr></table>

-</div>

-<div class="paragraph"><p>After selecting the above device name, download the dives from the Uemis

-Zurich. One technical issue with the Uemis Zurich download implementation

-(this is a Uemis firmware limitation, not a <em>Subsurface</em> issue) is that one

-cannot download more than about 40-50 dives without running out of memory on

-the SDA. This will usually only happen the very first time one downloads

-dives from the Uemis Zurich.  Normally when downloading at the end of a day

-or even after a dive trip, the capacity is sufficient. If <em>Subsurface</em>

-displays an error that the dive computer ran out of space the solution is

-straight forward.  Disconnect the SDA, turn it off and on again, and

-reconnect it. You can now retry (or start a new download session) and the

-download will continue where it stopped previously. One may have to do this

-more than once, depending on how many dives are stored on the dive computer.</p></div>

-</div>

-<div class="sect2">

+</div>
+<div class="paragraph"><p>After selecting the above device name, download the dives from the Uemis
+Zurich. One technical issue with the Uemis Zurich download implementation
+(this is a Uemis firmware limitation, not a <em>Subsurface</em> issue) is that you
+cannot download more than about 40-50 dives without running out of memory on
+the SDA. This will usually only happen the very first time you download
+dives from the Uemis Zurich.  Normally when downloading at the end of a day
+or even after a dive trip, the capacity is sufficient. If <em>Subsurface</em>
+displays an error that the dive computer ran out of space, the solution is
+straightforward.  Disconnect the SDA, turn it off and on again, and
+reconnect it. You can now retry (or start a new download session) and the
+download will continue where it stopped previously. You may have to do this
+more than once, depending on how many dives are stored on the dive computer.</p></div>
+</div>
+<div class="sect2">
 <h3 id="S_ImportingGalileo">16.2. Importing from Uwatec Galileo</h3>

 <div class="admonitionblock">

 <table><tr>

@@ -5802,19 +5697,19 @@ the IrDA interface with the dive computer. The easiest way is to load the
 <strong>irda-tools</strong> package from the

 <a href="http://irda.sourceforge.net/docs/startirda.html">Linux IrDA Project</a>.  After

 the installation of the irda-tools, the <strong>root user</strong> can specify a device

-name from the console as follows: <code>irattach irda0</code></td>

-</tr></table>

-</div>

-<div class="paragraph"><p>After executing this command, Subsurface will recognise the Galileo dive

-computer and download dive information.</p></div>

-<div class="paragraph"><p>Under Windows, a similar situation exists. Drivers for the MCS7780 are

-available from some Internet web sites e.g.

-<a href="http://www.drivers-download.com/Drv/MosChip/MCS7780/">www.drivers-download.com</a>.

-Windows-based IrDA drivers for the Uwatec can also be downloaded from the

-ScubaPro web site, drivers being located on the download page for the

-ScubaPro SmartTrak software.</p></div>

-<div class="paragraph"><p>For the Apple Mac, IrDA communication via the MCS7780 link is not available

-for OSX 10.6 or higher.</p></div>

+name from the console as follows: <code>irattach irda0</code></td>
+</tr></table>
+</div>
+<div class="paragraph"><p>After executing this command, Subsurface will recognize the Galileo dive
+computer and download dive information.</p></div>
+<div class="paragraph"><p>Under Windows, a similar situation exists. Drivers for the MCS7780 are
+available from some Internet web sites e.g.
+<a href="http://www.drivers-download.com/Drv/MosChip/MCS7780/">www.drivers-download.com</a>.
+Windows-based IrDA drivers for the Uwatec can also be downloaded from the
+ScubaPro web site, with drivers located on the download page for the
+ScubaPro SmartTrak software.</p></div>
+<div class="paragraph"><p>For the Apple Mac, IrDA communication via the MCS7780 link is not available
+for OSX 10.6 or higher.</p></div>
 </div>

 <div class="sect2">

 <h3 id="S_ImportingDR5">16.3. Importing from Heinrichs Weikamp DR5</h3>

@@ -5873,15 +5768,15 @@ section above, <a href="#S_Bluetooth"><em>Connecting Subsurface to a Bluetooth-e
 <img src="images/MkVI.jpeg" alt="Note" />

 </td>

 <td class="content">Download of dive logs from the MkVI is performed using a custom

-communications adapter and the <em>Poseidon PC Configuration Software</em>,

-obtained when purchasing the MKVI equipment. The latter is a Windows

-application allowing configuration of equipment and storage of dive

-logs. Communication between dive computer and desktop computer utilises the

-IrDA infra-red protocol. Only data for one dive can be downloaded at a time,

-comprising three files:</td>

-</tr></table>

-</div>

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

+communications adapter and the <em>Poseidon PC Configuration Software</em>,
+obtained when purchasing the MKVI equipment. The latter is a Windows
+application allowing configuration of equipment and storage of dive
+logs. Communication between dive computer and desktop computer utilizes the
+IrDA infra-red protocol. Only data for one dive can be downloaded at a time,
+in three files:</td>
+</tr></table>
+</div>
+<div class="ulist"><ul>
 <li>

 <p>

 Setup configuration for the dive and key dive parameters (file with a .txt

@@ -5897,13 +5792,13 @@ Dive log details (file with a .csv extension)
 <p>

 Redbook format dive log (file with .cvsr extension). This is a compressed

   version of the dive log using a proprietary format.

-</p>

-</li>

-</ul></div>

-<div class="paragraph"><p><em>Subsurface</em> accesses the .txt and the .csv files to obtain dive log

-information.</p></div>

-</div>

-<div class="sect2">

+</p>
+</li>
+</ul></div>
+<div class="paragraph"><p><em>Subsurface</em> accesses the .txt and the .csv files to get dive log
+information.</p></div>
+</div>
+<div class="sect2">
 <h3 id="_importing_from_apd_inspiration_evolution_ccr">16.7. Importing from APD Inspiration/Evolution CCR</h3>

 <div class="admonitionblock">

 <table><tr>

@@ -5957,53 +5852,49 @@ Copy the contents of the clipboard into the text editor and save the text
 Within <em>Subsurface</em>, select <em>Import &#8594; Import log files</em> to open the

   <a href="#Unified_import">universal import dialogue</a>.

 </p>

-</li>

-<li>

-<p>

-In the dropdown list towards the bottom right of the dialogue (labled

-  <em>Filter:</em>), select "APD log viewer".

-</p>

-</li>

-<li>

-<p>

-On the list of file names select the <em>.apd</em> file that has been created

-  above. An import dialogue opens indicating the default settings for the data

-  in the <em>.apd</em> file. If any changes are required, do this as for

-  <a href="#S_ImportingCSVDives">CSV imports</a>.

-</p>

-</li>

-</ul></div>

+</li>
+<li>
+<p>
+In the dropdown list towards the bottom right of the dialogue (labeled
+  <em>Filter:</em>), select "APD log viewer".
+On the list of file names select the <em>.apd</em> file  created. An import
+dialogue opens showing the default settings for the data in the
+<em>.apd</em> file. If changes are required,
+  do this as for <a href="#S_ImportingCSVDives">CSV imports</a>.
+</p>
+</li>
+</ul></div>
 <div class="imageblock" style="text-align:center;">

 <div class="content">

 <img src="images/APD_CSVimportF22.jpg" alt="Figure: APD log viewer import" />

 </div>

 </div>

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

-<li>

-<p>

-The top left hand dropdown box in the import panel allows one to select the

-  APD dive computer for which the dive log needs to be imported. The default

-  it is DC1, <em>i.e.</em> the first of the two dive computers the APD uses. It is

-  possible to sequentially import the data for both dive computers by first

-  importing CD1 and then DC2.(<strong>Hint</strong>: The logs for the two dive computers are

-  viewed by selecting <em>View &#8594; Next DC</em> from the Main Menu after the uploading

-  has been completed)

-</p>

-</li>

-<li>

+<div class="ulist"><ul>
+<li>
+<p>
+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
+  DC1, <em>i.e.</em> the first of the two dive computers the APD uses. It is possible
+  to sequentially import the data for both dive computers by first importing
+  CD1 and then DC2.(<strong>Hint</strong>: The logs for the two dive computers are viewed by
+  selecting <em>View &#8594; Next DC</em> from the Main Menu after the uploading has been
+  completed)
+</p>
+</li>
+<li>
 <p>

 Click the <em>Ok</em> button at the bottom of the import panel.

-</p>

-</li>

-</ul></div>

-<div class="paragraph"><p>The APD dive log will appear within <em>Subsurface</em>. The dive

-computer-generated ceiling generated by the Inspiration can be viewed by

-selecting the appropriate button on the left of the <strong>Dive Profile</strong>. Cylinder

-pressure data are not logged by the APD equipment but can be manually

-entered in the <em>Equipment</em> Tab.</p></div>

-</div>

-</div>

-</div>

+</p>
+</li>
+</ul></div>
+<div class="paragraph"><p>The APD dive log will appear within <em>Subsurface</em>. The dive computer-
+generated ceiling provided by the Inspiration can be viewed by selecting the
+appropriate button on the left of the <strong>Dive Profile</strong>. Cylinder pressure data
+are not logged by the APD equipment but can be manually entered in the
+<em>Equipment</em> Tab.</p></div>
+</div>
+</div>
+</div>
 <div class="sect1">

 <h2 id="_appendix_c_exporting_dive_log_information_from_external_dive_log_software">17. APPENDIX C: Exporting Dive log information from external dive log software.</h2>

 <div class="sectionbody">

@@ -6129,15 +6020,15 @@ Back in the Export pop-up, press the button <em>Export</em>
 The dives are now exported to the file Divelog.SDE.

 </p>

 </li>

-</ol></div>

-<div class="paragraph"><p><strong>Divemanager 4 (DM4) and Divemanager 5 (DM5):</strong></p></div>

-<div class="paragraph"><p>DM4 and DM5 use identical mechanisms for exporting dive logs.  To export a

-divelog from Divemanager one needs to locate the DM4/DM5 database where the

-dives are stored. the user can either look for the original database or make

-a backup of the dives. Both methods are described here.</p></div>

-<div class="paragraph"><p>Locating the Suunto DM4 (or DM5) database:</p></div>

-<div class="olist arabic"><ol class="arabic">

-<li>

+</ol></div>
+<div class="paragraph"><p><strong>Divemanager 4 (DM4) and Divemanager 5 (DM5):</strong></p></div>
+<div class="paragraph"><p>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
+dives are stored. You can either look for the original database or make a
+backup of the dives. Both methods are described here.</p></div>
+<div class="paragraph"><p>Locating the Suunto DM4 (or DM5) database:</p></div>
+<div class="olist arabic"><ol class="arabic">
+<li>
 <p>

 Start Suunto DM4/DM5

 </p>

@@ -6151,13 +6042,13 @@ Select <em>Help &#8594; About</em>
 <p>

 Click <em>Copy</em> after text <em>Copy log folder path to clipboard</em>

 </p>

-</li>

-<li>

-<p>

-Now open Windows Explorer

-</p>

-</li>

-<li>

+</li>
+<li>
+<p>
+Ouvrir l&#8217;explorateur Windows
+</p>
+</li>
+<li>
 <p>

 Paste the address to the path box at the top of the File Explorer

 </p>

@@ -6217,32 +6108,32 @@ directly imported to Subsurface.</td>
 <h3 id="_exporting_from_mares_dive_organiser_v2_1">17.3. Exporting from Mares Dive Organiser V2.1</h3>

 <div class="admonitionblock" id="Mares_Export">

 <table><tr>

-<td class="icon">

-<img src="images/icons/mareslogo.jpg" alt="Note" />

-</td>

-<td class="content">Mares Dive Organiser is a Windows application. The dive log is kept as a

-Microsoft SQL Compact Edition database with a <em>.sdf</em> filename extension. The

-database includes all Dive Organiser-registered divers on the particular

-computer and all Mares dive computers used. The safest way to obtain a copy

-of the dive database is to export the information to another compatible

-format which can be imported into <em>Subsurface</em>.</td>

-</tr></table>

-</div>

-<div class="olist arabic"><ol class="arabic">

-<li>

-<p>

-Within Dive Organiser, select <em>Database &#8594; Backup</em> from the main menu and

-   back up the database to the desk top.  This creates a zipped file

-   DiveOrganiserxxxxx.dbf.

-</p>

-</li>

-<li>

-<p>

-Rename the file to DiveOrganiserxxxxx.zip. Inside the zipped directory is a

-   file <em>DiveOrganiser.sdf</em>.

-</p>

-</li>

-<li>

+<td class="icon">
+<img src="images/icons/mareslogo.jpg" alt="Note" />
+</td>
+<td class="content">Mares Dive Organizer is a Windows application. The dive log is kept as a
+Microsoft SQL Compact Edition database with a <em>.sdf</em> filename extension. The
+database includes all Dive Organizer-registered divers on the particular
+computer and all Mares dive computers used. The safest way to get a copy of
+the dive database is to export the information to another compatible format
+which can then be imported into <em>Subsurface</em>.</td>
+</tr></table>
+</div>
+<div class="olist arabic"><ol class="arabic">
+<li>
+<p>
+Within Dive Organizer, select <em>Database &#8594; Backup</em> from the main menu and
+   back up the database to the desk top.  This creates a zipped file
+   DiveOrganizerxxxxx.dbf.
+</p>
+</li>
+<li>
+<p>
+Rename the file to DiveOrganizerxxxxx.zip. Inside the zipped directory is a
+   file <em>DiveOrganizer.sdf</em>.
+</p>
+</li>
+<li>
 <p>

 Extract the <em>.sdf</em> file from the zipped folder to your Desktop.

 </p>

@@ -6260,18 +6151,18 @@ The password for accessing the .zip file is <em>mares</em>.
 <table><tr>

 <td class="icon">

 <img src="images/icons/divingloglogo.jpg" alt="Note" />

-</td>

-<td class="content">The best way to bring your logs from DivingLog to Subsurface is to convert

-the whole database. This is because other export formats do not include all

-the details, and we would lack e.g. gas switches and information of what

-units are used. With database import, all this information is included and

-readily available for us.</td>

-</tr></table>

-</div>

-<div class="paragraph"><p>To transfer all files from DivingLog to Subsurface, do the following:</p></div>

-<div class="olist arabic"><ol class="arabic">

-<li>

-<p>

+</td>
+<td class="content">The best way to bring your logs from DivingLog to Subsurface is to convert
+the whole database. This is because other export formats do not include all
+the details, and would lack, for example, gas switches and information of
+what units are used. With database import, all this information is included
+and readily available.</td>
+</tr></table>
+</div>
+<div class="paragraph"><p>To transfer all files from DivingLog to Subsurface:</p></div>
+<div class="olist arabic"><ol class="arabic">
+<li>
+<p>
 In DivingLog open the <em>File &#8594; Export &#8594; SQLite</em> menu

 </p>

 </li>

@@ -6294,35 +6185,32 @@ Close the Settings dialog
 <p>

 Click <em>Export</em> button and select the filename

 </p>

-</li>

-</ol></div>

-<div class="paragraph"><p>Once this is done, open the saved database file with Subsurface and the

-dives are automatically converted to our own format. Last step to do is save

-the log file in Subsurface.</p></div>

-</div>

-</div>

-</div>

-<div class="sect1">

-<h2 id="_annexe_d_exporter_un_tableur_vers_le_format_csv">18. ANNEXE D : Exporter un tableur vers le format CSV</h2>

-<div class="sectionbody">

-<div class="paragraph" id="S_Appendix_D"><p>De nombreux plongeurs conservent un carnet de plongée sous forme de fichier

-numérique, souvent un tableur avec différents champs et informations. Ces

-données peuvent facilement être importées dans <em>Subsurface</em> après que le

-tableur a été converti en fichier CSV. Cette section explique la procedure

-pour convertir un carnet de plongée enregistrée sous forme de tableur vers

-un fichier CSV qui pourra ensuite être importé dans <em>Subsurface</em>. Créer un

-fichier CSV est une tache simple malgré que la procédure soit différente

-selon le tableur utilisé.</p></div>

-<div class="paragraph"><p>La première étape est d&#8217;organiser les données de plongées dans le tableur

-pour que la première ligne contienne le nom (ou le titre) de chaque colonne

-et que les informations de chaque plongée soient contenues sur une seule

-ligne. <em>Subsurface</em> supporte de nombreux éléments (Dive #, Date, Time,

-Duration, Location, GPS, Max Depth, Mean Depth, Buddy, Notes, Weight et

-Tags). L&#8217;utilisateur peut organiser les données de plongées selon quelques

-règles simples :</p></div>

-<div class="olist arabic"><ol class="arabic">

-<li>

-<p>

+</li>
+</ol></div>
+<div class="paragraph"><p>Once this is done, open the saved database file with Subsurface and the
+dives are automatically converted to Subsurface’s own format. Last step to
+do is save the log file in Subsurface.</p></div>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_annexe_d_exporter_un_tableur_vers_le_format_csv">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="olist arabic"><ol class="arabic">
+<li>
+<p>
 Date : utiliser un des formats suivants : aaaa-mm-jj, jj.mm.aaaa, mm/jj/aaaa

 </p>

 </li>

@@ -6342,19 +6230,18 @@ Système d&#8217;unité : un seul système d&#8217;unité doit être utilisé (p
 Étiquettes et équipiers : les valeurs doivent être séparées par des

    virgules.

 </p>

-</li>

-<li>

-<p>

-Position GPS : vous devez utiliser les degrés décimaux, par exemple :

-   30.22496 30.821798

-</p>

-</li>

-</ol></div>

-<div class="sect2">

-<h3 id="_em_libreoffice_calc_em_et_em_openoffice_calc_em">18.1. <em>LibreOffice Calc</em> et <em>OpenOffice Calc</em></h3>

-<div class="paragraph"><p>These are open source spreadsheet applications forming parts of larger open

-source office suite applications. The user interaction with <em>LibreOffice</em>

-and <em>OpenOffice</em> is very similar.  In Libreoffice Calc the time format

+</li>
+<li>
+<p>
+Position GPS : utilisez les degrés décimaux, par exemple : 30.22496
+   30.821798
+=== <em>LibreOffice Calc</em> et <em>OpenOffice Calc</em>
+</p>
+</li>
+</ol></div>
+<div class="paragraph"><p>These are open source spreadsheet applications forming parts of larger open
+source office suite applications. The user interaction with <em>LibreOffice</em>
+and <em>OpenOffice</em> is very similar.  In Libreoffice Calc the time format
 should be set to minutes:seconds - [mm]:ss and dates should be set to one

 of: yyyy-mm-dd, dd.mm.yyyy, mm/dd/yyyy. A typical dive log may look like

 this:</p></div>

@@ -6376,29 +6263,28 @@ to prevent conflicts with the comma when using this as a decimal point),
 then select <em>OK</em>.</p></div>

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

 <div class="content">

-<img src="images/LOffice_field_options.jpg" alt="FIGURE: Field options" />

-</div>

-</div>

-<div class="paragraph"><p>One can double check the .CSV file by opening it with a text editor, and

-then import the dive data as explained on the section

-<a href="#S_ImportingCSVDives">Importing CSV dives</a>.</p></div>

-</div>

-<div class="sect2">

-<h3 id="_microsoft_em_excel_em">18.2. Microsoft <em>Excel</em></h3>

-<div class="paragraph"><p>The field delimiter (called "<em>list separator</em>" in Microsoft manuals) is not

-accessible from within <em>Excel</em> and needs to be set through the <em>Microsoft

-Control Panel</em>. After changing the separator character, all software on the

-Windows machine use the new character as a separator.  One can change the

-character back to the default character by following the same procedure,

-outlined below.</p></div>

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

-<li>

-<p>

-In Microsoft Windows, click the <strong>Start</strong> button, and then select <em>Control

-  Panel</em> from the list on the right-hand side.

-</p>

-</li>

-<li>

+<img src="images/LOffice_field_options.jpg" alt="FIGURE: Field options" />
+</div>
+</div>
+<div class="paragraph"><p>Double check the .CSV file by opening it with a text editor, and then import
+the dive data as explained on the section <a href="#S_ImportingCSVDives">Importing
+CSV dives</a>.</p></div>
+<div class="sect2">
+<h3 id="_microsoft_em_excel_em">18.1. Microsoft <em>Excel</em></h3>
+<div class="paragraph"><p>The field delimiter (called "<em>list separator</em>" in Microsoft manuals) is not
+accessible from within <em>Excel</em> and needs to be set through the <em>Microsoft
+Control Panel</em>. After changing the separator character, all software on the
+Windows machine uses the new character as a separator.  You can change the
+character back to the default character by following the same procedure,
+outlined below.</p></div>
+<div class="ulist"><ul>
+<li>
+<p>
+In Microsoft Windows, click the <strong>Start</strong> button, then select <em>Control Panel</em>
+  from the list on the right-hand side.
+</p>
+</li>
+<li>
 <p>

 Open the <em>Regional and Language Options</em> dialog box.

 </p>

@@ -6436,100 +6322,100 @@ top left, then <em>Save As</em>.</p></div>
 <img src="images/Win_SaveCSV1.jpg" alt="FIGURE: Excel save as option" />

 </div>

 </div>

-<div class="paragraph"><p>Click on the left-hand part of the <em>Save as</em> option, NOT on the arrow on the

-right-hand. This brings up a dialogue for saving the spreadsheet in an

-alternative format. From the dropdown list at the bottom of the dialogue,

-marked <em>Save as Type:</em>, select <em>CSV(Comma delimited) (*.CSV)</em>. Ensure that

-the appropriate folder has been selected to save the CSV file into.</p></div>

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

-<div class="content">

-<img src="images/Win_SaveCSV3.jpg" alt="FIGURE: Excel save CSV dialogue" />

-</div>

-</div>

-<div class="paragraph"><p>Select the <em>Save</em> button. The CSV-formatted file is saved into the folder

-that was selected. One can double check the .CSV file by opening it with a

-text editor, and then import the dive data as explained on the section

-<a href="#S_ImportingCSVDives">Importing CSV dives</a>.</p></div>

-</div>

-</div>

-</div>

-<div class="sect1">

-<h2 id="S_APPENDIX_E">19. ANNEXE E : Créer un modèle d&#8217;impression personnalisé</h2>

-<div class="sectionbody">

-<div class="paragraph"><p><em>Subsurface</em> provides a mechanism to create or modify templates for printing

-dive logs in order to produce customised printouts of dive logs. Templates,

-written in HTML as well as a simple Grantlee instruction set, are rendered

-to the print device by <em>Subsurface</em>.</p></div>

-<div class="paragraph"><p>Templates are accessed using the print dialogue (see image <strong>B</strong> below).</p></div>

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

-<div class="content">

-<img src="images/Print1_f22.jpg" alt="FIGURE: Print dialogue" />

-</div>

-</div>

-<div class="paragraph"><p>The buttons under the <em>Template</em> dropdown box allows one to <em>Edit</em>,

-<em>Delete</em>, <em>Import</em> and to <em>Export</em> templates (see image <strong>A</strong> above). New or

-modified templates are stored as HTML files in the same directory as the

-dive log being processed. In order to create or modify a template, select

-one of the templates from the template dropdown list in the print dialogue

-(see image <strong>B</strong> above). Choose an existing template that resembles the final

-desired printout. Then select <em>Edit</em>.</p></div>

-<div class="paragraph"><p>The Edit Panel comprises three tabs:</p></div>

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

-<div class="content">

-<img src="images/Template1_f22.jpg" alt="FIGURE: template edit dialogue" />

-</div>

-</div>

-<div class="paragraph"><p>1) The <em>Style</em> tab (image <strong>A</strong> above) controls the font, line spacing and colour

-   template used for printing the dive log.  The style attributes are

-   editable. Choose one of the four colour palets used for colour printing.</p></div>

-<div class="paragraph"><p>2) The <em>Colors</em> tab (image <strong>B</strong> above) allows editing the colours used for

-   printing the dive log. The colours are highly customisable: the <em>Edit</em>

-   buttons in the <em>Colors</em> tab allows choosing abritrary colours for different

-   components of the dive log printout.</p></div>

-<div class="paragraph"><p>3) The <em>Template</em> tab of the Edit Panel (see image below) allows creating a

-   template using HTML as well as a few Grantlee programming

-   primitives. Grantlee provides the ability to create and format HTML code in

-   a highly simple but efficient way (see below). The HTML of the template can

-   be edited and saved. The saved template is stored in the same directory as

-   the dive being processed. By default, a <em>Custom</em> template is a skeleton with

-   no specific print instructions. The informastion being printed needs to be

-   specified and formatted in the by replacing the section marked with: "&lt;!--

-   Template must be filled -&#8594;". Writing HTML code with Grantlee instructions

-   allows unlimited freedom in determining what is printed an in which way it

-   should be rendered.</p></div>

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

-<div class="content">

-<img src="images/Template2_f22.jpg" alt="FIGURE:Template tab" />

-</div>

-</div>

-<div class="paragraph"><p>One can adapt any of the existing templates and save it to the dive log

-directory. The standard templates (e.g. One dive, Six dives, Table) can be

-modified in this way. After completing the edits, use the <em>Export</em> button in

-the print dialogue to save the new template using a new template name.</p></div>

-<div class="paragraph"><p>To write a custom template the following elements must exist so that the

-template will be correctly handled and rendered.</p></div>

-<div class="sect2">

-<h3 id="_main_dive_loop">19.1. Main dive loop</h3>

-<div class="paragraph"><p><em>Subsurface</em> exports a dive list called (<strong>dives</strong>) to the <em>Grantlee</em>

-backend. It is possible to iterate over the list as follows:</p></div>

-<div class="literalblock">

-<div class="title">template.html</div>

-<div class="content">

-<pre><code>        {% for dive in dives %}

-                &lt;h1&gt; {{ dive.number }} &lt;/h1&gt;

+<div class="paragraph"><p>Click on the left-hand part of the <em>Save as</em> option, NOT on the arrow on the
+right-hand. This brings up a dialogue for saving the spreadsheet in an
+alternative format. From the dropdown list at the bottom of the dialogue,
+marked <em>Save as Type:</em>, select <em>CSV(Comma delimited) (*.CSV)</em>. Be sure the
+appropriate folder has been selected to save the CSV file into.</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/Win_SaveCSV3.jpg" alt="FIGURE: Excel save CSV dialogue" />
+</div>
+</div>
+<div class="paragraph"><p>Select the <em>Save</em> button. The CSV-formatted file is saved into the folder
+that was selected. You can double check the .CSV file by opening it with a
+text editor, then import the dive data as explained on the section
+<a href="#S_ImportingCSVDives">Importing CSV dives</a>.</p></div>
+</div>
+</div>
+</div>

+<div class="sect1">
+<h2 id="S_APPENDIX_E">19. ANNEXE E : Créer un modèle d&#8217;impression personnalisé</h2>
+<div class="sectionbody">
+<div class="paragraph"><p><em>Subsurface</em> has a way to create or modify templates for printing dive logs
+to produce customized printouts of them. Templates written in HTML, as well
+as a simple Grantlee instruction set, are rendered to the print device by
+<em>Subsurface</em>.</p></div>
+<div class="paragraph"><p>Templates are accessed using the print dialogue (see image <strong>B</strong> below).</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/Print1_f22.jpg" alt="FIGURE: Print dialogue" />
+</div>
+</div>
+<div class="paragraph"><p>The buttons under the <em>Template</em> dropdown box lets you <em>Edit</em>, <em>Delete</em>,
+<em>Import</em> and <em>Export</em> templates (see image <strong>A</strong> above). New or modified
+templates are stored as HTML files in the same directory as the dive log
+being processed. In order to create or modify a template, select one of the
+templates from the template dropdown list in the print dialogue (see image
+<strong>B</strong> above). Choose an existing template that resembles the final desired
+printout. Then select <em>Edit</em>.</p></div>
+<div class="paragraph"><p>The Edit Panel has three tabs:</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/Template1_f22.jpg" alt="FIGURE: template edit dialogue" />
+</div>
+</div>
+<div class="paragraph"><p>1) The <em>Style</em> tab (image <strong>A</strong> above) controls the font, line spacing and color
+   template used for printing the dive log.  The style attributes are
+   editable. Choose one of the four color palettes used for color printing.</p></div>
+<div class="paragraph"><p>2) The <em>Colors</em> tab (image <strong>B</strong> above) allows editing the colors used for
+   printing the dive log. The colors are highly customizable: the <em>Edit</em>
+   buttons in the <em>Colors</em> tab allows choosing arbitrary colors for different
+   components of the dive log printout.</p></div>
+<div class="paragraph"><p>3) The <em>Template</em> tab of the Edit Panel (see image below) allows creating a
+   template using HTML as well as a few Grantlee programming
+   primitives. Grantlee can create and format HTML code in a highly simple but
+   efficient way (see below). The HTML of the template can be edited and
+   saved. The saved template is stored in the same directory as the dive being
+   processed. By default, a <em>Custom</em> template is a skeleton with no specific
+   print instructions. The information printed needs to be specified and
+   formatted in the template by replacing the section marked with: "&lt;!--
+   Template must be filled -&#8594;". Writing HTML code with Grantlee instructions
+   allows unlimited freedom in determining what is printed and in which way it
+   should be rendered.</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/Template2_f22.jpg" alt="FIGURE:Template tab" />
+</div>
+</div>
+<div class="paragraph"><p>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
+modified in this way. After completing the edits, use the <em>Export</em> button in
+the print dialogue to save the new template using a new template name.</p></div>
+<div class="paragraph"><p>To write a custom template, the following elements must exist so the
+template will be correctly handled and rendered.</p></div>
+<div class="sect2">
+<h3 id="_main_dive_loop">19.1. Main dive loop</h3>
+<div class="paragraph"><p><em>Subsurface</em> exports a dive list called (<strong>dives</strong>) to the <em>Grantlee</em> back
+end. It is possible to iterate over the list as follows:
+.template.html</p></div>
+<div class="literalblock">
+<div class="content">
+<pre><code>        {% for dive in dives %}
+                &lt;h1&gt; {{ dive.number }} &lt;/h1&gt;
         {% endfor %}</code></pre>

 </div></div>

 <div class="literalblock">

 <div class="title">output.html</div>

 <div class="content">

 <pre><code>        &lt;h1&gt; 1 &lt;/h1&gt;

-        &lt;h1&gt; 2 &lt;/h1&gt;

-        &lt;h1&gt; 3 &lt;/h1&gt;</code></pre>

-</div></div>

-<div class="paragraph"><p>Additional information about <em>Grantlee</em> can be found

-<a href="http://www.grantlee.org/apidox/for_themers.html">here</a></p></div>

-</div>

-<div class="sect2">

+        &lt;h1&gt; 2 &lt;/h1&gt;
+        &lt;h1&gt; 3 &lt;/h1&gt;</code></pre>
+</div></div>
+<div class="paragraph"><p>Additional information about <em>Grantlee</em> can be found at
+<a href="http://www.grantlee.org/apidox/for_themers.html">here</a></p></div>
+</div>
+<div class="sect2">
 <h3 id="_grantlee_exported_variables">19.2. Grantlee exported variables</h3>

 <div class="paragraph"><p>Only a subset of the dive data is exported:</p></div>

 <div class="tableblock">

@@ -6551,13 +6437,13 @@ cellspacing="0" cellpadding="4">
 <tr>

 <td align="left" valign="top"><p class="table">id</p></td>

 <td align="left" valign="top"><p class="table">(<strong>int</strong>) unique dive ID, should be used to fetch the dive profile</p></td>

-</tr>

-<tr>

-<td align="left" valign="top"><p class="table">date</p></td>

-<td align="left" valign="top"><p class="table">(<strong>string</strong>) data of the dive</p></td>

-</tr>

-<tr>

-<td align="left" valign="top"><p class="table">time</p></td>

+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">date</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) date of the dive</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">time</p></td>
 <td align="left" valign="top"><p class="table">(<strong>string</strong>) time of the dive</p></td>

 </tr>

 <tr>

@@ -6571,45 +6457,89 @@ cellspacing="0" cellpadding="4">
 <tr>

 <td align="left" valign="top"><p class="table">depth</p></td>

 <td align="left" valign="top"><p class="table">(<strong>string</strong>) depth of the dive</p></td>

-</tr>

-<tr>

-<td align="left" valign="top"><p class="table">divemaster</p></td>

-<td align="left" valign="top"><p class="table">(<strong>string</strong>) divemaster data</p></td>

-</tr>

-<tr>

-<td align="left" valign="top"><p class="table">buddy</p></td>

-<td align="left" valign="top"><p class="table">(<strong>string</strong>) buddy data</p></td>

-</tr>

-<tr>

-<td align="left" valign="top"><p class="table">airTemp</p></td>

-<td align="left" valign="top"><p class="table">(<strong>string</strong>) air temperature of dive</p></td>

-</tr>

-<tr>

-<td align="left" valign="top"><p class="table">waterTemp</p></td>

-<td align="left" valign="top"><p class="table">(<strong>string</strong>) water temperature of dive</p></td>

-</tr>

-<tr>

-<td align="left" valign="top"><p class="table">notes</p></td>

+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">divemaster</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) dive master for the dive</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">buddy</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) buddy for the dive</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">airTemp</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) air temperature of the dive</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">waterTemp</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) water temperature of the dive</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">notes</p></td>
 <td align="left" valign="top"><p class="table">(<strong>string</strong>) dive notes</p></td>

-</tr>

-<tr>

-<td align="left" valign="top"><p class="table">rating</p></td>

-<td align="left" valign="top"><p class="table">(<strong>int</strong>) dive rating ranges from 0 to 5</p></td>

-</tr>

-<tr>

-<td align="left" valign="top"><p class="table">sac</p></td>

-<td align="left" valign="top"><p class="table">(<strong>string</strong>) sac value</p></td>

-</tr>

-<tr>

-<td align="left" valign="top"><p class="table">tags</p></td>

-<td align="left" valign="top"><p class="table">(<strong>string</strong>) all dive tags concatenate together</p></td>

-</tr>

-<tr>

-<td align="left" valign="top"><p class="table">gas</p></td>

-<td align="left" valign="top"><p class="table">(<strong>string</strong>) used gas cylinder</p></td>

-</tr>

-</tbody>

-</table>

+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">rating</p></td>
+<td align="left" valign="top"><p class="table">(<strong>int</strong>) dive rating which ranges from 0 to 5</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">sac</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) SAC value for the dive</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">tags</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) list of dive tags for the dive</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">gas</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) list of gases used in the dive</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">suit</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) the suit used for the dive</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">cylinders</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) complete information of all used cylinders</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">cylinder0-7</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) information about a specific cylinder</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">weights</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) complete information of all used weight systems</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">weight0-5</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) information about a specific weight system</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">maxcns</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) maxCNS value for the dive</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">otu</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) OTU value for the dive</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">sumWeight</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) the summed weight of all used weight systems</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">startPressure</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) the start pressure</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">endPressure</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) the end pressure</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">firstGas</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) first used gas</p></td>
+</tr>
+</tbody>
+</table>
 </div>

 <div class="paragraph"><p><em>Subsurface</em> also exports <strong>template_options</strong> data. This data must be used as

 <em>CSS</em> values to provide a dynamically editable template. The exported data

@@ -6714,15 +6644,15 @@ cellspacing="0" cellpadding="4">
                 -webkit-filter: grayscale(100%);

         }</code></pre>

 </div></div>

-</div>

-<div class="sect2">

-<h3 id="_defined_css_selectors">19.3. Defined CSS selectors</h3>

-<div class="paragraph"><p>As the dive profile is placed after rendering, <em>Subsurface</em> uses a special

-<em>CSS</em> selectors to do some searches in the HTML output. The <em>CSS</em> selectors

-in the following table should be added.</p></div>

-<div class="tableblock">

-<table rules="all"

-width="100%"

+</div>
+<div class="sect2">
+<h3 id="_defined_css_selectors">19.3. Defined CSS selectors</h3>
+<div class="paragraph"><p>As the dive profile is placed after rendering, <em>Subsurface</em> uses special
+<em>CSS</em> selectors to searche in the HTML output. The <em>CSS</em> selectors in the
+following table should be added.</p></div>
+<div class="tableblock">
+<table rules="all"
+width="100%"
 frame="border"

 cellspacing="0" cellpadding="4">

 <col width="33%" />

@@ -6739,18 +6669,18 @@ cellspacing="0" cellpadding="4">
 <td align="left" valign="top"><p class="table">id</p></td>

 <td align="left" valign="top"><p class="table">is used to fetch the relevant dive profile</p></td>

 </tr>

-<tr>

-<td align="left" valign="top"><p class="table">diveProfile</p></td>

-<td align="left" valign="top"><p class="table">class</p></td>

-<td align="left" valign="top"><p class="table">each div that will contain a dive profile should have this class selector in addition to the dive_{{ dive.id }} id selector</p></td>

-</tr>

-<tr>

-<td align="left" valign="top"><p class="table">dontbreak</p></td>

-<td align="left" valign="top"><p class="table">class</p></td>

-<td align="left" valign="top"><p class="table">prevents the div with this class to be divided into two pages, this can be used

-in flow layout templates only (when data-numberofdives = 0)</p></td>

-</tr>

-</tbody>

+<tr>
+<td align="left" valign="top"><p class="table">diveProfile</p></td>
+<td align="left" valign="top"><p class="table">class</p></td>
+<td align="left" valign="top"><p class="table">each dive that will contain a dive profile should have this class selector in addition to the dive_{{ dive.id }} id selector</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">dontbreak</p></td>
+<td align="left" valign="top"><p class="table">class</p></td>
+<td align="left" valign="top"><p class="table">prevents the dive with this class from being divided into two pages. This can be used
+in flow layout templates only (when data-numberofdives = 0)</p></td>
+</tr>
+</tbody>
 </table>

 </div>

 <div class="admonitionblock">

@@ -6763,16 +6693,16 @@ data-numberofdives = 0).</td>
 </tr></table>

 </div>

 </div>

-<div class="sect2">

-<h3 id="_special_attributes">19.4. Special attributes</h3>

-<div class="paragraph"><p>There are two ways of rendering- either rendering a specific number of dives

-in each page or make <em>Subsurface</em> try to fit as much dives as possible into

-one page (<em>flow</em> rendering).</p></div>

-<div class="paragraph"><p>The <strong>data-numberofdives</strong> data attribute is added to the body tag to set the

-rendering mode</p></div>

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

-<li>

-<p>

+<div class="sect2">
+<h3 id="_special_attributes">19.4. Special attributes</h3>
+<div class="paragraph"><p>There are two ways of rendering- either rendering a specific number of dives
+in each page or make <em>Subsurface</em> try to fit as many dives as possible into
+one page (<em>flow</em> rendering).</p></div>
+<div class="paragraph"><p>The <strong>data-numberofdives</strong> data attribute is added to the body tag to set the
+rendering mode.</p></div>
+<div class="ulist"><ul>
+<li>
+<p>
 render 6 dives per page:

 </p>

 </li>

@@ -6811,13 +6741,13 @@ page size.</td>
 <h3 id="S_APPENDIX_F">20.1. Subsurface appears to miscalculate gas consumption and SAC</h3>

 <div class="paragraph" id="SAC_CALCULATION"><p><em>Question</em>: I dived with a 12.2 l tank, starting with 220 bar and ending

 with 100 bar, and I calculate a different SAC compared what <em>Subsurface</em>

-calculates. Is <em>Subsurface</em> miscalculating?</p></div>

-<div class="paragraph"><p><em>Answer</em>: Not really. What happens is that <em>Subsurface</em> actually calculates

-gas consumption differently - and better - than you expect.  In particular,

-it takes the incompressibility of the gas into account.  Traditionally, Gas

-consumption and SAC should be: <code>consumption = tank size x (start pressure -

-end pressure)</code></p></div>

-<div class="paragraph"><p>and that&#8217;s true for an ideal gas, and it&#8217;s what you get taught in dive

+calculates. Is <em>Subsurface</em> miscalculating?</p></div>
+<div class="paragraph"><p><em>Answer</em>: Not really. What happens is that <em>Subsurface</em> actually calculates
+gas consumption differently - and better - than you expect.  In particular,
+it takes the incompressibility of the gas into account.  Traditionally, gas
+consumption and SAC should be: <code>consumption = tank size x (start pressure -
+end pressure)</code></p></div>
+<div class="paragraph"><p>and that&#8217;s true for an ideal gas, and it&#8217;s what you get taught in dive
 theory.  But an "ideal gas" doesn&#8217;t actually exist, and real gases actually

 don&#8217;t compress linearly with pressure. Also, you are missing the fact that

 one atmosphere of pressure isn&#8217;t actually one bar.  So the <strong>real</strong>

@@ -6856,33 +6786,32 @@ even more noticeable if you do things like divemastering the initial OW
 dives, when you may stay in the water for a long time, but spend most of it

 at the surface. And then you don&#8217;t want that to count as some kind of long

 dive”.</p></div>

-</div>

-<div class="sect2">

-<h3 id="_some_dive_profiles_are_missing_from_the_download">20.3. Some dive profiles are missing from the download</h3>

-<div class="paragraph" id="DC_HISTORY"><p><em>Question</em>: I cannot download all my dives, only the most recent ones even

-though my dive computer&#8217;s manual states that it records history of e.g. 999

-dives.</p></div>

-<div class="paragraph"><p><em>Answer</em>: Dive history is different than the dive profiles on the log.  The

-history only keeps track of the total number of dives and total amount of

-time spent below surface. The logs, on the other hand, store the dive

-profile, but they have limited amount of memory to do so. The exact amount

-of dive profiles that can be stored on the device depend on sample interval

-and duration of the dives. Once the memory is full the oldest dives get

-overwritten with new dives. Thus we are only able to download the last 13,

-30 or 199 dives.</p></div>

-<div class="paragraph"><p>If you have downloaded your dives to different dive logging software before

-they were overwritten, there is a high chance that Subsurface can import

-these. However, if the logs are only on your dive computer, they cannot be

-salvaged after being over written by new dives.</p></div>

-</div>

-</div>

-</div>

-</div>

-<div id="footnotes"><hr /></div>

-<div id="footer">

-<div id="footer-text">

-Last updated 2015-12-15 13:35:30 PST

-</div>

-</div>

-</body>

+</div>
+<div class="sect2">
+<h3 id="_some_dive_profiles_are_missing_from_the_download">20.3. Some dive profiles are missing from the download</h3>
+<div class="paragraph" id="DC_HISTORY"><p><em>Question</em>: I cannot download all my dives, only the most recent ones, even
+though my dive computer&#8217;s manual states that it records history of e.g. 999
+dives? <em>Answer</em>: Dive history is different than the dive profiles on the
+log.  The history only keeps track of the total number of dives and total
+amount of time spent below surface. The logs, on the other hand, store the
+dive profile, but they have a limited amount of memory to do so. The exact
+amount of dive profiles that can be stored on the device depends on sample
+interval and duration of the dives. Once the memory is full the oldest dives
+get overwritten with new dives. Thus we are only able to download the last
+13, 30 or 199 dives.</p></div>
+<div class="paragraph"><p>If you have downloaded your dives to different dive logging software before
+they were overwritten, there is a good chance that Subsurface can import
+these. However, if the logs are only on your dive computer, they cannot be
+salvaged after being overwritten by new dives.</p></div>
+</div>
+</div>
+</div>
+</div>

+<div id="footnotes"><hr /></div>
+<div id="footer">
+<div id="footer-text">
+Last updated 2016-03-12 13:57:29 CET
+</div>
+</div>
+</body>
 </html>

diff --git a/Documentation/user-manual_fr.txt b/Documentation/user-manual_fr.txt
index 9a42072ff..12c886571 100644
--- a/Documentation/user-manual_fr.txt
+++ b/Documentation/user-manual_fr.txt
@@ -27,29 +27,27 @@ rapport à d'autres solutions logicielles similaires :
    ou de loisir ? Utilisez-vous un enregistreur de profondeur et de durée
    Reefnet Sensus avec un ordinateur de plongée ? _Subsurface_ offre une
    interface standard pour télécharger les enregistrements des plongées à
-   partir de tous ces équipements de plongée et pour enregistrer et analyser
+   partir de tous ces équipements de plongée, en enregistrant et en analysant
    ces enregistrements dans un système unique.
  - Utilisez-vous plus d'un système d'exploitation ? _Subsurface_ est
    intégralement compatible avec Mac, Linux et Windows, ce qui vous permet
    d'accéder à vos enregistrements de plongées sur chaque système
    d'exploitation en utilisant une application unique.
- - Utilisez-vous Linux ou Mac et votre ordinateur de plongée n'a que des
+ - Utilisez-vous Linux ou Mac mais votre ordinateur de plongée n'a que des
    logiciels pour Windows pour télécharger les informations de plongées (par
    exemple Mares) ? _Subsurface_ fournit un moyen de télécharger et d'analyser
    vos enregistrements de plongées sur d'autres systèmes d'exploitation.
  - Avez-vous besoin d'un planificateur de plongée graphique intuitif qui
    intègre et prend en compte les plongées qui ont déjà été enregistrées ?
- - Avez-vous besoin d'un moyen d'enregistrer ou de sauvegarder votre carnet de
-   plongée sur Internet, Vous permettant de visualiser votre carnet depuis
-   n'importe où, en utilisant un navigateur Internet ?
-
-_Subsurface_ est disponible pour Windows (Win XP ou plus récent), les Macs
-basés sur processeurs Intel (OS/X) et de nombreuses distributions
-Linux. _Subsurface_ peut être compilé pour bien plus de plateformes
-matérielles et d'environnements logiciels où Qt et libdivecomputer sont
-disponibles.
-
-Le but de ce document est l'utilisation du programme Subsurface. Pour
+Avez-vous besoin d'un moyen d'nregistrer et de sauvegarder vos plongées sur
+Internet, vous permettant de les voir depuis n'importe où en utilisant un
+navigateur Internet ? _Subsurface_ est disponible pour Windows (Win XP ou
+plus récent), les Macs basés sur processeurs Intel (OS/X) et de nombreuses
+distributions Linux. _Subsurface_ peut être compilé pour bien plus de
+plateformes matérielles et d'environnements logiciels où Qt et
+libdivecomputer sont disponibles.
+
+Ce manuel explique comment utiliser le programme _Subsurface_. Pour
 installer le logiciel, consultez la page _Téléchargement_ sur le
 http://subsurface-divelog.org/[site web de _Subsurface_]. En cas de
 problème, vous pouvez envoyer un e-mail sur
@@ -73,44 +71,35 @@ provided:
 
 The _SEARCH_ function is activated by pressing control-F or command-F on the
 keyboard. A text box appears at the bottom right-hand of the window (see
-image below).  For instance, if one typed the word "_weights_" into the
-search text box, this word will be searched for throughout this user
-manual. To the right of the search text box are two arrows pointing upwards
-and downwards. Selecting these allow finding, respectively, the previous and
-the next occurence of the term being searched for.
-
+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"]
 
 
-_PREVIOUS/NEXT LINK_. One can move between links (underlined words allowing
-one to jump to specific sections in this user manual) by right-clicking on
-the text of the manual.  This brings up a context menu for jumping to
-previous links selected while reading the manual (see image above). For
-instance if a link in the manual has been selected, then the option to _Go
-Back_ shows the text at the last link that was selected (similar to the
-Previous Page button in a browser). Conversely the _Go Forward_ option
-enables jumping to the text perused before selecting the _Go Back_
-option. The _Reload_ option causes the complete user manual to be reloaded
-into the user manual window.
-
+_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.
 [[S_UserSurvey]]
 Le sondage utilisateur
 ----------------------
-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.
+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.
 
 [[S_StartUsing]]
 Commencer à utiliser le programme
@@ -121,47 +110,40 @@ 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 :
 
-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 *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. 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).
+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).
 
 [[S_ViewPanels]]
 
 image::images/main_window_f22.jpg["The Main Window", align="center"]
 
-L'utilisateur peut déterminer si lesquels des quatre panneaux sont affichés
-en sélectionnant l'option *Vue* dans le menu principal. Cette fonctionnalité
-permet plusieurs choix d'affichage :
+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:
 
 *Tout* : affiche les quatre panneaux tels que sur la capture d'écran ci-dessus.
 
@@ -172,43 +154,37 @@ permet plusieurs choix d'affichage :
 *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* : affiche uniquement la carte mondiale, centrée sur la dernière plongée sélectionnée.
+*Globe*: Show only the world map, centered on the last selected dive.
 
-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.
+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.
 
-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.
+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.
 
 [[S_NewLogbook]]
 Créer un nouveau carnet de plongée
 ----------------------------------
-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.
+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_GetInformation]]
 == Enregistrement des informations de plongée dans le carnet
-
-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.
-
+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.
 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 :
-
- - Entrer les informations de plongée à la main. Cela est utile si le plongeur
-   n'a pas
+ - Enter dive information by hand. This is useful if the diver didn’t
  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]
@@ -218,12 +194,9 @@ données de plongée au carnet. Plus de détails dans les sections suivantes.
  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].
-
-2) Si les plongées ont été enregistrées en utilisant un ordinateur de plongée,
-   le profil de profondeur de la
- plongée et de nombreuses informations supplémentaires peuvent être
- utilisées. Ces plongées peuvent être importées à partir de :
-
+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:
  - 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
 
@@ -231,9 +204,7 @@ données de plongée au carnet. Plus de détails dans les sections suivantes.
    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].
-
- - Importer à partir d'un tableur ou de fichiers CSV contenant les profils de
-   plongées.
+ - Spreadsheet or CSV files containing dive profiles.
  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]
 
@@ -244,19 +215,18 @@ données de plongée au carnet. Plus de détails dans les sections suivantes.
 This is usually the approach for dives without a dive computer. The basic
 record of information within _Subsurface_ is a dive. The most important
 information in a simple dive logbook usually includes dive type, date, time,
-duration, depth, the names of your dive buddy and of the dive master or dive
+duration, depth, the names of your dive buddy and the dive master or dive
 guide, and some remarks about the dive. _Subsurface_ can store much more
-information than this for each dive. In order to add a dive to a dive log,
-select _Log -> Add Dive_ from the Main Menu. The program then shows three
-panels to enter information for a dive: two tabs in the *Info* panel
-(*Notes* and *Equipment*), as well as the *Dive Profile* panel that displays
-a graphical profile of each dive. These panels are respectively marked
-[red]#A#, [red]#B# and [red]#C# in the figure below. Each of these tabs will
-now be explained for data entry.
+information for each dive.  To add a dive to a dive log, select _Log -> Add
+Dive_ from the Main Menu. The program then shows three panels on which to
+enter information for a dive: two tabs in the *Info* panel (*Notes* and
+*Equipment*), as well as the *Dive Profile* panel that displays a graphical
+profile of each dive. These panels are respectively marked [red]#A#,
+[red]#B# and [red]#C# in the figure below. Each of these tabs will now be
+explained for data entry.
 
 image::images/AddDive1_f22.jpg["FIGURE: Add dive", align="center"]
-
-When one edits a field in Notes or Equipment panels, _Subsurface_ enters
+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
 *Notes* panel (see the image below). This message is displayed in all the
 panels under Notes and Equipment when in *Editing Mode*.
@@ -267,56 +237,54 @@ The _Apply changes_ button should only be selected after all the parts of a
 dive have been entered.  When entering dives by hand, the _Info_,
 _Equipment_ and _Profile_ tabs should be completed before saving the
 information. By selecting the _Apply changes_ button, a local copy of the
-information for this specific dive is saved in memory. When one closes
-Subsurface, the program will ask again, this time whether the complete dive
-log should be saved on disk or not.
+information for this specific dive is saved in memory. The _Apply changes_
+button should ONLY be selected after all parts of a dive have been
+entered. When you close Subsurface, the program will ask again, this time
+whether the complete dive log should be saved on disk or not.
 
 [[S_CreateProfile]]
 ==== Creating a Dive Profile
 
 The *Dive Profile* (a graphical representation of the depth of the dive as a
-function of time) is indicated in the panel on the top right hand of the
+function of time) is shown in the panel on the top right hand of the
 _Subsurface_ window. When a dive is manually added to a logbook,
 _Subsurface_ presents a default dive profile that needs to be modified to
-best represent the dive being described:
+best represent the dive described:
 
 image::images/DiveProfile1_f20.jpg["FIGURE: Initial dive profile", align="center"]
 
 _Modifying the dive profile_: When the cursor is moved around the dive
-profile, its position is indicated by two right-angled red lines as shown
-below.  The time and depth represented by the cursor are indicated at the
-top of the black information box (@ and D). The units (metric/imperial) on
-the axes are determined by the *Preference* settings. The dive profile
-itself comprises several line segments demarcated by waypoints (white dots
-on the profile, as shown above). The default dive depth is 15 m.  If the
-dive depth was 20 m then the user needs to drag the appropriate waypoints
-downwards to represent 20 m. To add a waypoint, double-click on any line
-segment. To move an additional waypoint, drag it.  To remove this waypoint,
-right-click on it and choose "Remove this point" from the context menu. Drag
-the waypoints to represent an accurate time duration for the dive. Below is
-a dive profile for a dive to 20 m for 30 min, followed by a 5 minute safety
-stop at 5 m.
+profile, its position is shown by two right-angled red lines as seen below.
+The time and depth represented by the cursor are indicated at the top of the
+black information box (@ and D). The units (metric/imperial) on the axes are
+determined by the *Preference* settings. The dive profile itself comprises
+several line segments demarcated by waypoints (white dots on the profile, as
+shown above). The default dive depth is 15 m.  If the dive depth was 20 m
+then you need to drag the appropriate waypoints downward to 20 m. To add a
+waypoint, double-click on any line segment. To move an additional waypoint,
+drag it.  To remove a waypoint, right-click on it and choose "Remove this
+point" from the context menu. Drag the waypoints to represent an accurate
+time duration for the dive. Below is a dive profile for a dive to 20 m for
+30 min, followed by a 5 minute safety stop at 5 m.
 
 image::images/DiveProfile2_f20.jpg["FIGURE: Edited dive profile", align="center"]
 
-_Specifying the gas composition:_ The gas composition used is clearly
-indicated along the line segments of the dive profile. This defaults to the
-first gas mixture specified in the *Equipment* tab, which was air in the
-case of the profile above. The gas mixtures of segments of the dive profile
-can be edited. This is done by right-clicking on the particular waypoint and
-selecting the appropriate gas from the context menu. Changing the gas for a
-waypoint affects the gas shown in the segment _to the left_ of that
-waypoint. Note that only the gases defined in the *Equipment* tab appear in
-the context menu (see image below).
+_Specifying the gas composition:_ The gas composition used is indicated
+along the line segments of the dive profile. This defaults to the first gas
+mixture specified in the *Equipment* tab, which was air in the case of the
+profile above. The gas mixtures of segments of the dive profile can be
+changed by right-clicking on the particular waypoint and selecting the
+appropriate gas from the context menu. Changing the gas for a waypoint
+affects the gas shown in the segment _to the left_ of that waypoint. Note
+that only the gases defined in the *Equipment* tab appear in the context
+menu (see image below).
 
 image::images/DiveProfile3_f20.jpg["FIGURE: Gas composition context menu", align="center"]
 
-With the profile having been defined, more details must be added in order to
-have a fuller record of the dive. To do this, the *Notes* and the
-*Equipment* tabs on the top left hand of the _Subsurface_ window should be
-used. Click on xref:S_Notes_dc[*this link*] for instructions to use these
-tabs.
-
+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
+top left hand of the _Subsurface_ window should be used. Click on
+xref:S_Notes_dc[*this link*] for instructions on how to use these tabs.
 [[S_ImportDiveComputer]]
 === Importer de nouvelles informations de plongée à partir de l'ordinateur de plongée
 
@@ -325,37 +293,36 @@ tabs.
 The use of dive computers allows the collection of a large amount of
 information about each dive, e.g. a detailed record of depth, duration,
 rates of ascent/descent and of gas partial pressures. _Subsurface_ can
-capture this information and present it as part of the dive information,
-using dive information from a wide range of dive computers. The latest list
-of supported dive computers can be found at:
+capture this information, using dive details from a wide range of dive
+computers. The latest list of supported dive computers can be found at:
 link:http://subsurface-divelog.org/documentation/supported-dive-computers/[
 Supported dive computers].
 
 [icon="images/icons/warning2.png"]
 [WARNING]
-Several dive computers consume more power when they are in their
-PC-Communication mode. **This could drain the dive computer's battery**. We
-therefore recommend that the user checks if the dive computer is charged
-when connected to the USB port of a PC. For example, several Suunto and
-Mares dive computers do not recharge through the USB connection. Users
-should refer to the dive computer's manual if they are unsure whether the
-dive computer recharges its batteries while connected to the USB port.
+Several dive computers consume more power when they are in PC-Communication
+mode. **This could drain the dive computer's battery**. We recommend the
+user checks to be sure the dive computer is charged when connected to the
+USB port of a PC. For example, several Suunto and Mares dive computers do
+not recharge through the USB connection. Users should refer to the dive
+computer's manual if they are unsure whether the dive computer recharges its
+batteries while connected to the USB port.
 
 To import dive information from a dive computer to a computer with
-_Subsurface_, it is necessary that the two pieces of equipment communicate
-with one another.  This involves setting up the communications port (or
-mount point) of the computer with _Subsurface_ that communicates with the
-dive computer. In order to set up this communication, one needs to find the
-appropriate information to instruct _Subsurface_ where and how to import the
-dive information.
+_Subsurface_, the two pieces of equipment must communicate with one
+another.  This involves setting up the communications port (or mount point)
+of the computer with _Subsurface_ that communicates with the dive
+computer. To set up this communication, users need to find the appropriate
+information to instruct _Subsurface_ where and how to import the dive
+information.
 xref:_appendix_a_operating_system_specific_information_for_importing_dive_information_from_a_dive_computer[Appendix
-A] provides the technical information to help the user achieving this for
+A] provides the technical information to help the user achieve this for
 different operating systems and
 xref:_appendix_b_dive_computer_specific_information_for_importing_dive_information[Appendix
 B] has dive computer specific information.
 
-After this, the dive computer can be hooked up to the user's PC, which can
-be achieved by following these steps:
+After this, the dive computer can be hooked up to the user's PC using these
+steps:
 
 1. The interface cable should be connected to a free USB port (or the Infra-red
 	or Bluetooth connection set up as described later in this manual)
@@ -369,12 +336,12 @@ be achieved by following these steps:
 
 image::images/DC_import_f20.jpg["FIGURE: Download dialogue 1", align="center"]
 
-Dive computers tend to keep a certain number of dives in their memory, even
-though these dives have already been imported to _Subsurface_. For that
-reason, if the dive computer allows this, _Subsurface_ only imports dives
-that have not been uploaded before. This makes the download process faster
-on most dive computers and also saves battery power of the dive computer (at
-least for those not charging while connected via USB).
+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
+the dive computer allows this, _Subsurface_ only imports dives that have not
+been uploaded before. This makes the download process faster on most dive
+computers and also saves battery power of the dive computer (at least for
+those not charging while connected via USB).
 
  - 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,
@@ -389,16 +356,15 @@ least for those not charging while connected via USB).
    A] and
    xref:_appendix_b_dive_computer_specific_information_for_importing_dive_information[Appendix
    B] for technical details on how to find the appropriate port information for
-   a particular dive computer and, in some cases, how to do the correct
-   settings to the operating system of the computer on which _Subsurface_ is
-   running.
+   a specific dive computer and, in some cases, how to do the correct settings
+   to the operating system of the computer on which _Subsurface_ is running.
 
  - If all the dives on the dive computer need to be downloaded, check the
    checkbox _Force download of all dives_. Normally, _Subsurface_ only
    downloads dives after the date-time of the last dive in the *Dive List*
-   panel. If one or more of your dives in _Subsurface_ have been accidentally
+   panel. If one or more of your dives in _Subsurface_ has been accidentally
    deleted or if there are older dives that still need to be downloaded from
-   the dive computer, this checkbox needs to be activated. Some dive computers
+   the dive computer, this box needs to be checked. Some dive computers
    (e.g. Mares Puck) do not provide a contents list to _Subsurface_ before the
    download in order to select only new dives.  Consequently, for these dive
    computers, all dives are downloaded irrespective of the status of this check
@@ -407,37 +373,36 @@ least for those not charging while connected via USB).
  - If the checkbox _Always prefer downloaded dives_ has been checked and,
    during download, dives with identical date-times exist on the dive computer
    and on the _Subsurface_ *Dive List* panel, the dive in the _Subsurface_
-   divelog will be overwritten by the dive record from the dive computer.
+   divelog will be overwritten by the dive record from the computer.
 
  - 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*.
 
  - Do *not* check the checkboxes labelled _Save libdivecomputer logfile_ and
    _Save libdivecomputer dumpfile_. These are only used as diagnostic tools
-   when problems with downloads are experienced (see below).
-
- - Then select the _Download_ button.  With communication established, one can
+   when there are problems with downloads(see below).
+ - Then select the _Download_ button.  With communication established, you can
    see how the data are retrieved from the dive computer.  Depending on the
    make of the dive computer and/or number of recorded dives, this could take
    some time. Be patient. The _Download_ dialogue shows a progress bar at the
-   bottom of the dialogue (for some dive computers the progress information
-   could be inaccurate as we cannot determine how much downloadable data there
-   is until all data have been downloaded). After successful download, Dialogue
-   *B* in the figure above appears.  After the dives have been downloaded, they
-   appear in a tabular format on the right-hand side of the dialogue (see image
-   *B*, above). Each dive comprises a row in the table, with the date, duration
-   and depth shown. Next to each dive is a checkbox: check all the dives that
-   need to be transferred to the *Dive List*. In the case of the image above,
-   the last six dives are checked and will be transferred to the *Dive
-   List*. Then click the _OK_ button at the bottom of the dialogue. All the
-   imported dives appear in the *Dive List*, sorted by date and
-   time. Disconnect and switch off the dive computer to conserve its battery
-   power.
+   bottom of the dialogue.  Remember for some dive computers progress
+   information could be inaccurate since the program doesn’t know how much
+   downloadable data there is until the download is complete. After successful
+   download, Dialogue *B* in the figure above appears.  After the dives have
+   been downloaded, they appear in a tabular format on the right-hand side of
+   the dialogue (see image *B*, above). Each dive comprises a row in the table,
+   with the date, duration and depth shown. Next to each dive is a checkbox:
+   check all the dives that need to be transferred to the *Dive List*. In the
+   case of the image above, the last six dives are checked and will be
+   transferred to the *Dive List*. Then click the _OK_ button at the bottom of
+   the dialogue. All the imported dives appear in the *Dive List*, sorted by
+   date and time. Disconnect and switch off the dive computer to conserve its
+   battery power.
 
 
 
-After this has been completed, select the OK button.  The checked dives are
-transferred to the *Dive List*.
+Then click the OK button.  The checked dives are transferred to the *Dive
+List*.
 
  - 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
@@ -452,38 +417,37 @@ Check the following:
 
  - Is the dive computer still in PC-communication or Upload mode?
 
- - Is the battery of the dive computer fully charged? If not then the battery
-   must be charged or replaced.
+ - Is the dive computer’s battery fully charged? If not then charge or replace
+   it.
 
- - Is the connecting cable faulty? Does the cable work perfectly using other
-   software? Has it worked before, or is this the first time the cable is being
-   used? Are the contacts on the dive computer and the cable clean?
+ - 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
+   the contacts on the dive computer and the cable clean?
 
  - Consult
    xref:_appendix_a_operating_system_specific_information_for_importing_dive_information_from_a_dive_computer[Appendix
-   A] and make sure that the correct Mount Point was specified (see above).
+   A] to be sure the correct Mount Point was specified (see above).
 
  - On Unix-like operating systems, does the user have write permission to the
    USB port? If not, consult
    xref:_appendix_a_operating_system_specific_information_for_importing_dive_information_from_a_dive_computer[Appendix
    A]
 
-If the _Subsurface_ computer does not recognise the USB adaptor by showing
+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
-possibility that the cable or USB adaptor is faulty. A faulty cable is the
-most common cause of communication failure between dive computer and
-_Subsurface_ computer. It is also possible that the _Subsurface_ computer
-cannot interpret the data. Perform a download for diagnostic purposes with
-the following two check boxes checked in the download dialogue discussed
-above:
+possibility the cable or USB adaptor is faulty. A faulty cable is the most
+common cause of communication failure between a dive computer and
+_Subsurface_ computer. It’s also possible the _Subsurface_ computer cannot
+interpret the data. Perform a download for diagnostic purposes with the
+following two boxes checked in the download dialogue discussed above:
 
 	Save libdivecomputer logfile
 	Save libdivecomputer dumpfile
 
 *Important*: These check boxes are only used when problems are encountered
-during the download process: under normal circumstances they should not be checked.
-When checking these boxes, the user is prompted to select a folder to
-save the information to. The default folder is the one in which the _Subsurface_
+during the download process. Under normal circumstances they should not be checked.
+When checking these boxes, the user is prompted to select a folder where the information will be saved. The default folder is the one in which the
+_Subsurface_
 dive log is kept.
 
 *Important:* _After downloading with the above checkboxes
@@ -495,7 +459,7 @@ checked, no dives are added to the
 
 These files should be send to the _Subsurface_ mail list:
 _subsurface@subsurface-divelog.org_ with a request for the files to be
-analysed. Provide the dive computer make and model as well as contextual
+analyzed. Provide the dive computer make and model as well as contextual
 information about the dives recorded on the dive computer.
 ****
 
@@ -504,60 +468,52 @@ information about the dives recorded on the dive computer.
 [icon="images/icons/bluetooth.jpg"]
 
 Bluetooth is becoming a more common way of communication between dive
-computers and _Subsurface_, for instance, the Shearwater Petrel Mk2 and the
-OSTC Mk3. _Subsurface_ provides a largely operating system independent
+computers and _Subsurface_, for or instance, the Shearwater Petrel Mk2 and
+the OSTC Mk3. _Subsurface_ provides a largely operating system independent
 Bluetooth interface. Setting up _Subsurface_ for Bluetooth communication
 requires four steps:
 
-- Ensure that Bluetooth is activated on the host computer running
-  _Subsurface_.
-- Ensure that _Subsurface_ sees the Bluetooth adapter on the host computer.
-- Ensure the Bluetooth-enabled dive computer is Bluetooth-discoverable and in
+- Be sure Bluetooth is activated on the host computer running _Subsurface_.
+- Be sure _Subsurface_ sees the Bluetooth adapter on the host computer.
+- Be sure the Bluetooth-enabled dive computer is Bluetooth-discoverable and in
   PC upload mode.
-- Ensure that _Subsurface_ is paired with the Bluetooth-enabled dive computer.
+- Be sure _Subsurface_ is paired with the Bluetooth-enabled dive computer.
 
 Select the Download dialogue by selecting _Import -> Import from dive
-computer_ from the *Main Menu*. If one checks the check box labelled
-_"Choose Bluetooth download mode"_, the dialogue below appears.
-
+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"]
 
 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 lefthand
+and its Bluetooth address are shown on the right hand side, On the left hand
 side, if the computer has connected more than one local Bluetooth devices
 the user can use the list box to indicate which one needs to connect to
 _Subsurface_.  The power state (on/off) of the Bluetooth adapter is shown
-below the address and can be changed by checking the _Turn on/off_ check
-box.
-
-If the Bluetooth address is not shown, then _Subsurface_ does not see the
-local Bluetooth device. Ensure that the Bluetooth driver is installed
-correctly on the _Subsurface_ computer and check if it can be used by other
-Bluetooth utilities like _bluetoothctl_ or _bluemoon_. This achieves the
-first two steps above.
-
-Ensure that the Bluetooth-enabled dive computer is in PC-upload mode and
-that it is discoverable by other Bluetooth devices. Consult the manual of
-the dive computer to perform this. Now the third item in the list above has
-been achieved.
-
-Select the _Scan_ button towards the bottom left of the dialogue
-above. After searching for a small amount of time, the dive computer should
-be listed (perhaps as one of a number of Bluetooth devices) in the main list
-box on the lefthand side of the dialogue (see image above). If this is not
-achieved, select the _Clear_ button and then scan again for Bluetooth
-devices using the _Scan_ button. After performing these actions _Subsurface_
-should see the dive computer.  The label of the discovered dive computer
-contains the name of the device, its address and its pairing status. If the
-device is not paired and has a red background colour, a context menu can be
-opened by selecting the item with a right-click.  Select the the _Pair_
-option and wait for the task to complete. If this dive computer is being
-paired to Subsurface for the first time, it is possible that Subsurface will
-request a Pass Code or PIN number. The most commonly-used Pass Code is 0000,
-and this works for the Shearwater Petrel. If necessary, consult the user
-manual of the dive computer being used.
+below the address and can be changed by checking the _Turn on/off_ box.  If
+the Bluetooth address is not shown, then _Subsurface_ does not see the local
+Bluetooth device. Be sure the Bluetooth driver is installed correctly on the
+_Subsurface_ computer and check if it can be used by other Bluetooth
+utilities like _bluetoothctl_ or _bluemoon_. This finishes the first two
+steps above.  Be sure the Bluetooth-enabled dive computer is in PC-upload
+mode and it is discoverable by other Bluetooth devices. Consult the manual
+of the dive computer for more information. Now the third item in the list
+above has been finished.  Select the _Scan_ button towards the bottom left
+of the dialogue above. After searching, the dive computer should be listed
+(perhaps as one of a number of Bluetooth devices) in the main list box on
+the lefthand side of the dialogue (see image above). If this does not work,
+select the _Clear_ button, then scan again for Bluetooth devices using the
+_Scan_ button. After taking these actions _Subsurface_ should see the dive
+computer.  The label of the discovered dive computer contains the name of
+the device, its address and its pairing status. If the device is not paired
+and has a red background color, a context menu can be opened by selecting
+the item with a right-click.  Select the the _Pair_ option and wait for the
+task to complete. If this dive computer is being paired to Subsurface for
+the first time, it’s possible Subsurface will request a Pass Code or PIN
+number. The most commonly-used Pass Code is 0000, and this works for the
+Shearwater Petrel. If necessary, consult the user manual of the dive
+computer being used.
 
 ****
 [icon="images/icons/important.png"]
@@ -580,41 +536,40 @@ One way to achieve this is to use +bluetoothctl+:
 	[agent] Enter PIN code: 0000
 ****
 
-After the devices are paired the _Save_ button of the dialogue can be
-pressed.  This closes the Bluetooth dialogue. Now select _Download_ in the
-_Download from dive computer_ dialogue which should still be open. The
-downloaded dives are shown on the righthand side of the download dialogue.
+After the devices are paired, press the _Save_ button of the dialogue.  This
+closes the Bluetooth dialogue. Now select _Download_ in the _Download from
+dive computer_ dialogue which should still be open. The downloaded dives are
+shown on the righthand side of the download dialogue.
 
 ===== Sur Windows :
 image::images/DC_import_Bluetooth_Windows.png["FIGURE: Download Bluetooth on Windows", align="center"]
 
 On _Windows_ platforms the _Local Bluetooth device details section_ on the
-right is not displayed as is the case on the Linux/Mac implementations.  To
-successfully initiate a scan (by pressing the _Scan_ button)  check that the
-Bluetooth device on the _Subsurface_ computer is turned on by selecting the
-dive computer from the list of available Bluetooth devices (see image
-above). If the dive computer is accessed by Subsurface for the first time,
-it is possible that Subsurface will request a Pass Code/PIN number. Supply
-the Pass Code recommended in the user manual of the dive computer.  A Pass
-Code of 0000 is often appropriate.
+right is not displayed as is the case on the Linux/Mac systems.  To start a
+scan (by pressing the _Scan_ button)  check that the Bluetooth device on the
+_Subsurface_ computer is turned on by selecting the dive computer from the
+list of available Bluetooth devices (see image above). If the dive computer
+is being accessed by Subsurface for the first time, it’s possible Subsurface
+will request a Pass Code or PIN number. Supply the Pass Code recommended in
+the user manual of the dive computer.  A Pass Code or PIN of 0000 is often
+the default.
 
 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
-permissions and put a message on the right side of the screen: _Add a
-device, Tap to set up your DC device_. Always allow this pairing. After a
-discovered item is selected, select the _Save_ button.  Finally select the
-_Download_ button on the _Download_ dialogue and wait for the process to
-complete.
+permission and put a message on the right side of the screen: _Add a device,
+Tap to set up your DC device_. Always allow this pairing. After a discovered
+item is selected, select the _Save_ button.  Finally select the _Download_
+button on the _Download_ dialogue and wait for the process to complete.
 
 [icon="images/icons/important.png"]
 [IMPORTANT]
 Currently _Subsurface_ works only with local Bluetooth adapters which use
 Microsoft Bluetooth Stack. If the local device uses _Widcomm_, _Stonestreet
-One Bluetopia Bluetooth_ or _BlueSoleil_ drivers it will definitely not
-work. However, Bluetooth hardware/dongles from these manufacturers
-(e.g. iSonic) that support the Microsoft Bluetooth Stack do work.
+One Bluetopia Bluetooth_ or _BlueSoleil_ drivers it will not work. However,
+Bluetooth hardware/dongles from these manufacturers (e.g. iSonic) that
+support the Microsoft Bluetooth Stack do work.
 
-A log messageOn the bottom left of the _Remote Bluetooth device selection_
+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
 another dive computer for download using the "Remote Bluetooth selection
 dialogue" press the three-dots button from the _"Choose Bluetooth download
@@ -635,59 +590,58 @@ with _Subsurface_.
 ==== Changing the name of a dive computer
 
 It may be necessary to distinguish between different dive computers used to
-upload dive logs to _Subsurface_. For instance if one's partner's dive
-computer is the same make and model as one's own and dive logs are uploaded
-from both dive computers to the same _Subsurface_ computer, then one would
-perhaps like to call one dc "Alice's Suunto D4" and the other one "Bob's
-Suunto D4". Alternatively, consider a technical diver dives with two or more
-dive computers of the same model, the logs of both (or all) being uploaded.
-In this case it might be prudent to call one of them "Suunto D4 (1)" and
-another one "Suunto D4 (2)". This is easily done in _Subsurface_.  On the
-*Main Menu*, select _Log -> Edit device names_. A dialog opens, indicating
-the current Model, ID and Nickname of the dive computers used for
-upload. Edit the Nickname field for the appropriate dive computer. After
-saving the Nickname, the dive logs show the nickname for that particular
-device instead of the model name, allowing easy identification of devices.
+upload dive logs to _Subsurface_. For instance if a buddy’s dive computer is
+the same make and model as your own and dive logs are uploaded from both
+dive computers to the same _Subsurface_ computer, then you might like to
+call one "Alice's Suunto D4" and the other "Bob's Suunto D4". Alternatively,
+consider a technical diver who dives with two or more dive computers of the
+same model, the logs of both (or all) being uploaded.  In this case it might
+be prudent to call one of them "Suunto D4 (1)" and another "Suunto D4
+(2)". This is easily done in _Subsurface_.  On the *Main Menu*, select _Log
+-> Edit device names_. A dialog box opens, showing the current Model, ID and
+Nickname of the dive computers used for upload. Edit the Nickname field for
+the appropriate dive computer. After saving the Nickname, the dive logs show
+the nickname for that particular device instead of the model name, allowing
+easy identification of devices.
 
 [[S_EditDiveInfo]]
 ==== Updating the dive information imported from the dive computer.
 
 With the uploaded dives in the *Dive List*, the information from the dive
-computer is not complete and more details must be added in order to have a
-fuller record of the dives. To do this, the *Notes* and the *Equipment* tabs
-on the top left hand of the _Subsurface_ window should be used.
+computer is not complete and more details must be added to have a full
+record of the dives. To do this, the *Notes* and the *Equipment* tabs on the
+top left hand of the _Subsurface_ window should be used.
 
 [[S_Notes_dc]]
 ===== Notes
 
-To have a more complete dive record the user needs to add additional
+To have a more complete dive record, the user needs to add additional
 information by hand. The procedure below is virtually identical for
 hand-entered dives and for dives downloaded from a dive computer.
 
-In some cases, one has to provide the date and time of the dive, e.g. when
-entering a dive by hand or when a dive computer does not provide the date
-and time of the dive.  (Usually the date and time of the dive, gas mixture
-and water temperature are shown as obtained from the dive computer)  If the
-contents of the *Notes tab* is changed or edited in any way, the message in
-a blue box at the top of the panel indicates that the dive is being
-edited. If one clicks on the *Notes* tab, the following fields are visible
+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
+date and time of the dive.  (Usually the date and time of the dive, gas
+mixture and water temperature are shown as obtained from the dive computer)
+If the contents of the *Notes tab* is changed or edited in any way, the
+message in a blue box at the top of the panel shows the dive is being
+edited. If you click on the *Notes* tab, the following fields are visible
 (left hand image, below):
 
 image::images/AddDive3_f22.jpg["FIGURE: The Notes tab", align="center"]
 
 The right hand image, above, shows a *Notes tab* filled with dive
 information.  The *Time* field reflects the date and time of the dive. By
-clicking the date, a calendar is displayed from which one can choose the
+clicking the date, a calendar is displayed from which you can choose the
 correct date. Press ESC to close the calendar.  The time values (hour and
 minutes) can also be edited directly by clicking on each of them in the text
 box and by over-typing the information displayed.
 
 *Air/water temperatures*: Air and water temperatures during the dive are shown
 in text boxes to the right of the Start time. Many dive computers supply water
-temperature information and this box may therefore contain information.
-If air temperature is not provided by the dive computer, the first temperature reading
-might be used for the air temperature. Generally this is close enough to the real air temperature as
-the change in the temperature sensor reading is quite slow to follow the changes in the environment.
+temperature information and this box may have information.
+If air temperature isn’t provided by the dive computer, the first temperature reading
+might be used for the air temperature. Generally this is close to the real air temperature.
 If editing is required, only a value is required, the units of temperature will be
 automatically supplied by
 _Subsurface_ (following the _Preferences_, metric or imperial units will
@@ -697,50 +651,47 @@ be used).
 [icon="images/icons/warning2.png"]
 [WARNING]
 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
+information in the *Notes* and *Equipment* tabs can therefore NOT be edited
 at the same time as the dive site information. Save all the other dive
 information (e.g.  divemaster, buddy, protective gear, notes about the dive)
-by selecting _Apply changes_ on the *Notes* tab before editing the dive site
-information. Only then, supply a dive site name in the textbox labelled
-_Location_ on the *Notes* tab.
-
-Type the name of the dive site, e.g. "Tihany, Lake Balaton, Hungary".  If
-several dives are performed at the same location, the dive site information
-for the first dive is re-used.  Existing dive location information can be
-edited at any time by selecting (on the *Dive List* panel) a dive performed
-at that site and by opening the location information by clicking the globe
-button on the right of the location name (see image on the right,
-above). When entering a dive location name, auto location of dive site names
-makes it easy to select an existing dive site name (i.e. when typing the
-name of a dive site, a dropdown list appears showing all sites with similar
-names). If the dive site has been used before, click on the already-existing
-name.  The dive site names in the dropdown list contain either a globe
-symbol (indicating existing dive sites in the _Subsurface_ database)  or a
-*+* symbol (indicating dive site names that appear consistent with the
-current dive site name but which have not been added to the dive site
-database).  Therefore, if the present dive site has not been used before, a
-message appears as follows (image *A* below):
+by selecting _Apply changes_ on the *Notes* tab BEFORE editing the dive site
+information. Then supply a dive site name in the textbox labelled _Location_
+on the *Notes* tab.
+
+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
+first dive is re-used.  Existing dive locations can be edited by selecting
+(on the *Dive List* panel) a dive done at that site and by opening the
+location information. Click the globe button on the right of the location
+name (see image on the right, above). When entering a dive location name,
+auto location of dive site names makes it easy to select an existing dive
+site name.  When typing the name of a dive site, a dropdown list appears
+showing all sites with similar names. If the dive site has been used before,
+click on the already-existing name.  The dive site names in the dropdown
+list contain either a globe symbol (indicating existing dive sites in the
+_Subsurface_ database)  or a *+* symbol (indicating dive site names that
+appear consistent with the current dive site name but which haven’t been
+added to the dive site database).  If the present dive site has not been
+used before, a message appears as follows (image *A* below):
 
 image::images/Locations1_f22.jpg["FIGURE:Location description panel", align="center"]
 
 Doubleclick on the new dive site name. A panel appears to enter the
-coordinates and other important information about the site (image *B*,
-above). The most important items are the coordinates of the site. There are
-three ways of specifying the coordinates:
-
-a. One can find the coordinates on the world map in the bottom right hand part
-   of the _Subsurface_ window. The map displays an orange bar indicating "No
-   location data - Move the map and double-click to set the dive
-   location". Upon a doubleclick at the appropriate place, the orange bar
-   disappears and the coordinates are stored.
-
-b. The coordinates can be obtained from the _Subsurface_ Companion app if the
-   user has an Android or iPhone device with GPS and if the coordinates of the
-   dive site were stored using that device.  xref:S_Companion[Click here for
-   more information]
-
-c. The coordinates can be entered by hand if they are known, using one of four
-   formats with latitude followed by longitude:
+coordinates and other information about the site (image *B*, above). The
+most important items are the coordinates of the site. There are three ways
+to specify coordinates:
+
+a. 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 and double-click to set the dive location". Doubleclick at the
+   appropriate place, and the orange bar disappears and the coordinates are
+   stored.
+
+b. 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:S_Companion[Click here for more information]
+c. Enter by hand if the coordinates are known, using one of four formats with
+   latitude followed by longitude:
 
 	ISO 6709 Annex D format e.g. 30°13'28.9"N 30°49'1.5"E Degrees and decimal
 	minutes, e.g. N30° 13.49760' , E30° 49.30788' Degrees minutes seconds,
@@ -751,86 +702,85 @@ Southern hemisphere latitudes are given with a *S*, e.g. S30°, or with a
 negative value, e.g. -30.22496. Similarly western longitudes are given with
 a *W*, e.g. W07°, or with a negative value, e.g. -7.34323. Some keyboards
 don't have the degree sign (°). It can be replaced by a *d* like this: N30d
-W20d.  If both a dive site name and coordinates have been provided, Save the
+W20d.  If both a dive site name and coordinates have been provided, save the
 dive site information by selecting the button _Apply changes_ at the top of
 the panel.
 
-*Important*: GPS coordinates of a dive site are linked to the Location
-name - so *saving* a dive site with only coordinates and no dive site name
-causes unexpected behaviour (Subsurface will think that all of these
+*Important*: GPS coordinates of a dive site are linked to the location
+name - so *saving* a dive site with only coordinates and no name
+causes problems. (Subsurface will think all of these
 dives have the same location and try to keep their GPS coordinates the
 same).
 
 *Dive site name lookup:* If coordinates have been typed into the appropriate
-text box, one can perform an automated name lookup based on the coordinates.
-This is achieved when _Subsurface_ uses the Internet to find the name of the dive site
+text box, you can do an automated name lookup based on the coordinates.
+This is done when _Subsurface_ uses the Internet to find the name of the dive site
 based on the coordinates that were typed. If a name has been found, it is
 automatically inserted into the tags box. The list box
 (Titled _Dive sites on same coordinates_") at the bottom
 of the dive site panel contains the names of other dives sites used at the
 current location. For instance if the dive site is "Blue Hole" and there are several
-dive sites named "Blue Hole", all these sites are listed in this list box.
+sites named "Blue Hole", all of them are listed.
 
-Enter any other textual information about the dive site (Description and
+Enter any other contextual information about the dive site (Description and
 Notes), then select _Apply Changes_ to save the geolocation for this dive
-site. At a later stage the dive site information can be edited by clicking
-the globe icon to the right of the dive site name in the *Notes tab*.
+site.  The dive site information can later be edited by clicking the globe
+icon to the right of the dive site name in the *Notes tab*.
 
-*Dive mode*: This is a dropdown box allowing one to choose the type of dive
-performed. The options are OC (Open Circuit SCUBA, the default seting, meant for most recreational dives),
+*Dive mode*: This is a dropdown box allowing you to choose the type of dive
+performed. The options are OC (Open Circuit SCUBA, the default setting, for most recreational dives),
 Freedive (dive without SCUBA equipment), CCR (Closed-circuit
 rebreather) and pSCR (Passive semi-closed rebreather).
 
-*Divemaster*: The name of the dive master or dive guide for this dive should be
+*Divemaster*: The name of the divemaster or dive guide should be
 entered in this field
 which offers auto selection based on the list of dive masters in
 the current logbook.
 
-*Buddy*: In this field, one enters the name(s) of the buddy / buddies
-(separated with commas) who accompanied him/her on the
+*Buddy*: In this field, enter the name(s) of the buddy or buddies
+(separated with commas) who were on the
 dive. Auto selection based on the list of buddies in the current logbook is
 offered.
 
 *Suit*: Here the type of dive suit used can be entered.
 Auto selection of the suit description is available.
 Some dry-suit users may choose to use this field to record what combination of
-suit and thermal undersuit was used.
+suit and thermal under suit was used.
 
-*Rating*: One can provide a subjective overall rating of the dive on a
+*Rating*: You can provide a subjective overall rating of the dive on a
 5-point scale by clicking the appropriate star on the rating scale.
 
-*Visibility*: Similarly, one can provide a rating of visibility during the
+*Visibility*: You can provide a rating of visibility during the
 dive on a
 5-point scale by clicking the appropriate star.
 
-*Tags*: Tags that describe the type of dive performed can be entered
+*Tags*: Tags that describe the type of dive done can be entered
 here (separated by commas). Examples of common tags are boat, drift, training,
 cave, etc.
-_Subsurface_ has many built-in tags. If the user starts typing a tag, the
+_Subsurface_ has many built-in tags. If you starts typing a tag, the
 program
-will list the tags that correspond to the typing. For instance, if the user
-typed
-+cav+, then the tags *cave* and *cavern* are shown for the user to choose from.
+will list the tags that correspond to the typing. For instance, by typing
++cav+, the tags *cave* and *cavern* are shown to choose from.
 
 *Notes*: Any additional information for the dive can be entered here.
 
 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, so
-there's no need to use them until *ALL* other information has been
-added. The image xref:S_Notes_dc[at the beginning of this section] shows an
-example of a *Notes tab* after completion of the dive information.
+information for tabs in the *Info* panel and in the *Dive Profile*
+panel. Use them when *ALL* other information has been added. The image
+xref:S_Notes_dc[at the beginning of this section] shows an example of a
+*Notes tab* after completing the dive information.
 
 ===== Equipment
 
-The Equipment tab allows one to enter information about the type of cylinder
-and gas used as well as the weights used for the dive. The message in a blue
+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
 box at the top of the panel:
 
 image::images/BlueEditBar_f22.jpg["FIGURE: Blue edit bar", align="center"]
 
-indicates that the dive is being edited. This is a highly interactive part
-of _Subsurface_ and the information on cylinders and gases (entered here)
-determines the behaviour of the *Dive profile* (top right-hand panel).
+shows the dive is being edited. This is a highly interactive part of
+_Subsurface_ and the information on cylinders and gases (entered here)
+determines the behavior of the *Dive profile* (top right-hand panel).
 
 [[cylinder_definitions]]
 *Cylinders*: The cylinder information is entered through a dialogue that looks
@@ -839,23 +789,21 @@ like this:
 image::images/DC_gas-dialogue1_f20.jpg["FIGURE: Initial cylinder dialogue", align="center"]
 
 For hand-entered dives, this information needs to be typed in. For dive
-computers, _Subsurface_ often obtains the gas used from the dive computer
-and automatically inserts the gas composition(% oxygen or % helium) in the
-table. The + button at the top right allows the user to add more cylinders
-for this dive. The dark dustbin icon on the left allows the deletion of
-information for a cylinder.  Note that it is not possible to delete a
-cylinder if it is used during the dive. A cylinder might be implicitly used
-in the dive, even without a gas change event.
-
-The user should start by selecting a cylinder type on the left-hand side of
-the table.  To select a cylinder, the _Type_ box should be clicked. This
-brings up a list button that can be used to display a dropdown list of
-cylinders:
+computers, _Subsurface_ often gets the gas used from the dive computer and
+automatically inserts the gas composition(% oxygen or % helium) in the
+table. The + button at the top right lets you add more cylinders for this
+dive. The dark dust bin icon on the left lets you delete information for a
+cylinder.  Note that it is not possible to delete a cylinder if it is used
+during the dive. A cylinder might be implicitly used in the dive, even
+without a gas change event.  Start by selecting a cylinder type on the
+left-hand side of the table.  To select a cylinder, the _Type_ box should be
+clicked. This brings up a list button that can be used to display a dropdown
+list of cylinders:
 
 image::images/DC_gas-dialogue2_f20.jpg["FIGURE: The cylinder drop-down list button", align="center"]
 
 The drop-down list can then be used to select the cylinder type that was
-used for this dive or the user may start typing in the box which shows the
+used for this dive, or just start typing in the box which shows the
 available options for the entered characters. The *Size* of the cylinder as
 well as its working pressure (_Work.press_) will automatically be shown in
 the dialogue.
@@ -871,14 +819,14 @@ inappropriate fields should be left empty. After typing the information for
 the cylinder, save the data either by pressing _ENTER_ on the keyboard or by
 clicking outside the cell containing the cursor. Information for any
 additional cylinders can be added by using the + button at the top right
-hand. Following is an example of a complete description for a dive using two
-cylinders (air and EAN50):
+hand. The following is an example of a complete description for a dive using
+two cylinders (air and EAN50):
 
 image::images/CylinderDataEntry3_f20.jpg["FIGURE: a completed cylinder dive information table", align="center"]
 
 *Weights*: Information about the weight system used can be entered
-using a dialogue very similar to that of the cylinder information. If one
-clicks
+using a dialogue similar to that of the cylinder information. If you
+click
 the + button on the top right of the weights dialogue, the table looks like
 this:
 
@@ -889,44 +837,44 @@ a down-arrow:
 
 image::images/WeightsDataEntry2_f20.jpg["FIGURE:Weights type drop-down list button", align="center"]
 This can be used to select the type of weight system used during the dive or
-the user may start typing in the box to specify a different weighting
-mechanism that will be saved by _Subsurface_.  In the *Weight* field, type
-in the amount of weight used during the dive. After specifying the weight
-system, save the data by either pressing _ENTER_ on the keyboard or by
-clicking outside the cell with the cursor.  It is possible to enter
-information for more than one weight system by adding an additional system
-using the + button on the top right hand. Weight systems can be deleted
-using the dustbin icon on the left hand. Here is an example of information
-for a dive with two types of weights: integrated as well as a weight belt:
+just may start typing in the box to specify a different weighting mechanism
+that will be saved by _Subsurface_.  In the *Weight* field, type in the
+amount of weight used during the dive. After specifying the weight system,
+save the data by pressing _ENTER_ on the keyboard or by clicking outside the
+cell with the cursor.  It’s possible to enter information for more than one
+weight system by adding an additional system using the + button on the top
+right hand. Weight systems can be deleted using the dust bin icon on the
+left hand. Here is an example of information for a dive with two types of
+weights: integrated as well as a weight belt:
 
 image::images/WeightsDataEntry3_f20.jpg["FIGURE: A completed weights information table", align="center"]
 
 ==== Editing several selected dives simultaneously
 
 _METHOD 1_: After uploading dives from a dive computer, the dive profiles of
-each uploaded dive is shown in the *Dive profile* tab, as well as a few
-items of information in the *Notes* tab (e.g. water temperature) and in the
-*Equipment* tab (e.g. gas pressures and gas composition). However the other
-fields remain empty.  It may be useful to simultaneously edit some of the
-fields in the *Notes* and *Equipment* tabs.  For instance, it is possible
-that a diver performed several dives during a single day, using identical
-equipment while diving at the same dive site or with the same dive master
-and/or buddy or tags. Instead of completing the information for each of
-these dives separately, one can select all the dives for that day in the
-*Dive List* and insert the same information in the *Notes* and *Equipment*
-fields that need identical information. This is achieved by editing the dive
-notes or the equipment for any one of the selected dives.
-
-The simultaneous editing only works with fields that do not already contain
-information.  This means that, if some fields have been edited for a
-particular dive among the selected dives, these are not changed while
-editing the dives simultaneously. Technically, the rule for editing several
-dives simultaneously is: if the data field being edited contains _exactly
-the same information_ for all the dives that have been selected, the new,
-edited information is substituted for all the selected dives, otherwise only
-the edited dive is changed, even though several dives have been selected in
-the *Dive List*. This greatly speeds up the completion of the dive log after
-several similar dives.
+each is shown in the *Dive profile* tab, as well as a few items of
+information in the *Notes* tab (e.g. water temperature) and in the
+*Equipment* tab (e.g. gas pressures and gas composition). Other fields
+remain empty.  It may be useful to simultaneously edit some of the fields in
+the *Notes* and *Equipment* tabs.  For instance, it’s possible that a diver
+performed several dives during a single day, using identical equipment at
+the same dive site, or with the same divemaster and/or buddy or
+tags. Instead of completing the information for each dive separately, select
+all the dives for that day in the *Dive List* and insert the same
+information in the *Notes* and *Equipment* fields that need identical
+information. This is done by editing the dive notes or the equipment for any
+one of the selected dives.
+
+Simultaneous editing only works with fields that do not already contain
+information.  This means if some fields have been edited for a particular
+dive among the selected dives, these are not changed while editing the dives
+simultaneously. Technically, the rule for editing several dives
+simultaneously is: if the data field being edited contains _exactly the same
+information_ for all the dives that have been selected, the new, edited
+information is substituted for all the selected dives. Otherwise only the
+edited dive is changed, even though several dives have been selected in the
+*Dive List*. This speeds up the completion of the dive log after several
+similar dives.
 
 [[S_CopyComponents]]
 _METHOD 2_:There is a different way of achieving the same goal. Select a
@@ -942,14 +890,13 @@ log.
 
 ==== Adding Bookmarks to a dive
 
-Many divers wish to annotate their dives with text that indicate particular
-events during the dive, e.g. "Saw dolphins", or "Released surface
-buoy". This is easily done:
+Many divers wish to annotate dives with text that indicate particular
+events, e.g. "Saw dolphins", or "Released surface buoy". This is easily
+done:
 
  - 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
-   on the dive profile at the point that was initially selected (see *A*
-   below).
+   on the dive profile at that point (see *A* below).
 
  - Right-click on the red flag. This brings up the context menu (see *B*
    below). Select _Edit name_.
@@ -957,8 +904,8 @@ buoy". This is easily done:
  - 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.
 
- - If one hovers using the mouse over the red bookmark, the appropriate text is
-   shown at the bottom of the information box (see *D* below).
+ - Hovering the mouse over the red bookmark, the appropriate text is shown at
+   the bottom of the information box (see *D* below).
 
 image::images/Bookmarks.jpg["FIGURE: Bookmark dialog", align="center"]
 
@@ -968,57 +915,54 @@ image::images/Bookmarks.jpg["FIGURE: Bookmark dialog", align="center"]
 The information entered in the *Notes* tab and the *Equipment* tab can be
 saved by using the two buttons on the top right hand of the *Notes* tab. If
 the _Apply changes_ button is clicked, the dive data are saved in the memory
-image of the dive. If the _Discard changes_ button is clicked, then the
-newly entered dive data are erased from the computer memory, although the
-dive profile is retained. When the user exits _Subsurface_ there is a final
-prompt to confirm that the new data should now be saved permanently on the
+image of the dive. If the _Discard changes_ button is clicked, the newly
+entered dive data are erased from the computer memory, although the dive
+profile is retained. When the user exits _Subsurface_ there is a final
+prompt to confirm the new data should now be saved permanently on the
 computer disk.
 
 === Importer les informations à partir d'autres sources de données numériques ou d'autres formats de données
 
 [[S_ImportingAlienDiveLogs]]
 
-If a user has been diving for some time, it is possible that several dives
-were logged using other dive log software. This information does not need
-retyping because these dive logs can probably be imported into
+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
 _Subsurface_. _Subsurface_ will import dive logs from a range of other dive
-log software. While some software is supported natively, for others the user
-has to export the logbook(s) to an intermediate format so that they can then
-be imported by _Subsurface_.  Currently, _Subsurface_ supports importing CSV
+log software. While some software is supported natively, for others you will
+need to export the logbook(s) to an intermediate format so they can then be
+imported by _Subsurface_.  Currently, _Subsurface_ supports importing CSV
 log files from several sources.  APD LogViewer, XP5, Sensus and Seabear
 files are preconfigured, but because the import is flexible, users can
 configure their own imports.  Manually kept log files (e.g. a spreadsheet)
 can also be imported by configuring the CSV import.  _Subsurface_ can also
-import UDDF and UDCF files used by some divelog software and some dive
-computers, like the Heinrichs & Weikamp DR5. Finally, for some divelog
-software like Mares Dive Organiser it is currently suggested to import the
-logbooks first into a webservice like _divelogs.de_ and then import them
-from there with _Subsurface_, as divelogs.de supports a few additional
-logbook formats that _Subsurface_ currently cannot parse.
-
-If the format of other software is supported natively on Subsurface, it
-should be sufficient to select either _Import -> Import log files_ or _File
--> Open log file_. _Subsurface_ supports the data formats of many dive
-computers, including Suunto and Shearwater. When importing dives,
-_Subsurface_ tries to detect multiple records for the same dive and merges
-the information as best as it can. If there are no time zone issues (or
-other reasons that would cause the beginning time of the dives to be
-significantly different) _Subsurface_ will not create duplicate
-entries. Below follows more specific information to achieve data import to
-_Subsurface_.
-
+import UDDF and UDCF files used by some dive log software and some dive
+computers, like the Heinrichs & Weikamp DR5. Finally, for some dive log
+software like Mares Dive Organizer we currently recommend you import the
+logbooks first into a web service like _divelogs.de_ and then import from
+there with _Subsurface_. Divelogs.de supports a few additional logbook
+formats that _Subsurface_ currently cannot handle.
+
+If the format of other software is supported natively on Subsurface, select
+either _Import -> Import log files_ or _File -> Open log file_. _Subsurface_
+supports the data formats of many dive computers, including Suunto and
+Shearwater. When importing dives, _Subsurface_ tries to detect multiple
+records for the same dive and merges the information as best as it can. If
+there are no time zone issues (or other reasons that would cause the
+beginning time of the dives to be significantly different) _Subsurface_ will
+not create duplicate entries. Below is more specific information to import
+data to _Subsurface_.
 ==== Using the universal import dialogue
 [[Unified_import]]
 
-Importing dives from other software is performed through a universal
-interface activated by selecting _Import_ from the Main Menu, then clicking
-on _Import Log Files_. This brings up dialogue *A*, below.
+Importing dives from other software is done through a universal interface
+activated by selecting _Import_ from the Main Menu, then clicking on _Import
+Log Files_. This brings up dialogue *A*, below.
 
 image::images/Import1_f20.jpg["FIGURE: Import dialogue: step 1", align="center"]
 
 Towards the bottom right is a dropdown selector with a default label of
-_Dive Log Files_ which gives access to the different types of direct imports
-available, as in dialogue *B*, above. Currently these are:
+_Dive Log Files_ which accesses different types of direct imports available,
+as in dialogue *B*, above. Currently these are:
 
  - XML-formatted dive logs (DivingLog 5.0, MacDive and several other dive log
    systems)
@@ -1035,8 +979,8 @@ available, as in dialogue *B*, above. Currently these are:
  - CSV (text-based and spreadsheet-based) dive logs, including APD CCR logs
 
 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
-imported dive log in the _Subsurface_ *Dive List*. Some other formats, not
+window containing the file list on the right of the dialogue, opens the
+imported dive log in the _Subsurface_ *Dive List*. Some other formats not
 accessible through the Import dialogue are also supported, as explained
 below.
 
@@ -1051,33 +995,34 @@ select _OSTCTools Files (.dive .DIVE)_. This makes the _OSTC Tools_ dive
 logs visible in the file list panel. Select one or more dive, then click the
 _Open_ button. The OSTC dives are shown in the *Dive List* panel.
 
-Actually, 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 although untested, Frog, OSTC2 and OSTC CR.
+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
+although untested, Frog, OSTC2 and OSTC CR.
 
-Please, remember that OSTCTools is *not* a true diving log software, but a
-useful set of tools for analysis and management of OSTC devices. This way,
-only raw dive computer data will be performed with the import to
-_Subsurface_; one has to to manually complete the rest of data which may be
-important (buddies, equipment, notes, etc).
+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. Only raw dive computer data will be imported to _Subsurface_; you
+have to manually complete the rest of the data you want (buddies, equipment,
+notes, etc).
 
 
-==== Importing from Mares Dive Organiser V2.1
+==== Importing from Mares Dive Organizer V2.1
 
-Since Mares utilise proprietary Windows software not compatible with
+Since Mares uses proprietary Windows software not compatible with
 multi-platform applications, these dive logs cannot be directly imported
 into _Subsurface_. Mares dive logs need to be imported using a three-step
-process, using _www.divelogs.de_ as a mechanism to extract the dive log
+process, using _www.divelogs.de_ as a gateway to extract the dive log
 information.
 
-1. Export the dive log data from Mares Dive Organiser to the user's desktop,
-   using a _.sdf_ file name extension. Refer to xref:Mares_Export[Appendix C]
-   for more information.
-2. Data should then be imported into _www.divelogs.de_. One needs to create a
-   user account in _www.divelogs.de_, log into that web site, then select
-   _Import Logbook -> Dive Organiser_ from the menu on the left hand side.  The
-   instructions must be carefully followed to transfer the dive information (in
-   _.sdf_ format) from the Dive Organiser database to _www.divelogs.de_.
+1. 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
+   information.
+2. 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
+   select _Import Logbook -> Dive Organizer from the menu on the left hand
+   side.  The instructions must be carefully followed to transfer the dive
+   information (in _.sdf_ format) from the Dive Organizer database to
+   _www.divelogs.de_.
 3. Finally, import the dives from _divelogs.de_ to _Subsurface_, using the
    instructions below.
 
@@ -1085,15 +1030,15 @@ information.
 [[S_ImportingDivelogsDe]]
 ==== Importing dives from *divelogs.de*
 
-The import of dive information from _divelogs.de_ is simple, using a single
+Importing dive information from _divelogs.de_ is simple, using a single
 dialogue box. The _Import -> Import from Divelogs.de_ option should be
 selected from the Main Menu. This brings up a dialogue box (see image *A*
-below). Enter a user-ID and password for _divelogs.de_ into the appropriate
-fields and then select the _Download_ button. Download from _divelogs.de_
-starts immediately, displaying a progress bar in the dialogue box. At the
-end of the download, the success status is indicated (see image *B*,
-below). The _Apply_ button should then be selected, after which the imported
-dives appear in the _Subsurface_ *Dive List* panel.
+below). Enter a user-ID and password for _divelogs.de_ and then select the
+_Download_ button. Download from _divelogs.de_ starts immediately,
+displaying a progress bar in the dialogue box. At the end of the download,
+the success status is shown (see image *B*, below). The _Apply_ button
+should then be selected, after which the imported dives appear in the
+_Subsurface_ *Dive List* panel.
 
 image::images/Divelogs1.jpg["FIGURE:Download from Divelogs.de", align="center"]
 
@@ -1104,7 +1049,7 @@ A comma-separated file (.csv) can be used to import dive information either
 as dive profiles (as in the case of the APD Inspiration and Evolution closed
 circuit rebreathers) or as dive metadata (in case the user keeps dive data
 in a spreadsheet). The _CSV_ format is a universal simplified format that
-allows for easy information exchange between different computers or software
+allows easy information exchange between different computers or software
 packages. For an introduction to CSV-formatted files see xref:S_CSV_Intro[A
 Diver's Introduction To CSV Files]. _Subsurface_ dive logs can also be
 exported in _CSV_ format to other software that reads this format. See
@@ -1115,8 +1060,8 @@ _Subsurface_.
 [[S_ImportingCSVDives]]
 ===== Importer les plongées au format CSV à partir des ordinateurs de plongées ou d'autres logiciels de carnet de plongée
 
-One can view a _CSV_ file by using an ordinary text editor. It is normally
-organised into a single line that provides the headers (or _field names_ or
+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
 _column headings_) of the data columns, followed by the data, one record per
 line.
 
@@ -1125,22 +1070,22 @@ _Subsurface_:
 
 1. _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,
-   dive duration, names of buddy and dive master and perhaps some information
-   about cylinder pressures before and after the dive, as well as a comment or
-   two about the dive. All the data for a single dive go on a single line of
-   text, following the order of the column headings.
+   dive duration, names of buddy and divemaster and information about cylinder
+   pressures before and after the dive, as well as comments about the dive. All
+   the data for a single dive go on a single line of text, following the order
+   of the column headings.
 
 2. _CSV dive profile_: This dive log format includes much more information
    about a single dive. For instance there may be information at 30-second
-   intervals, indicating depth, water temperature at that depth, and cylinder
-   pressure at that moment in time. Each line contains the information for a
-   single instant in time during the dive, 30 seconds after that of the
-   previous instant. Many lines are required to complete the depth profile
-   information for a single dive. This is a common export format used by
-   closed-circuit rebreather (CCR) dive equipment and many software packages
-   that handle dive computer data and/or dive logs.
-
-Before being able to import the _CSV_ data to _Subsurface_ *one needs to
+   intervals, indicating depth, water temperature, and cylinder pressure at
+   that moment in time. Each line contains the information for a single instant
+   in time during the dive, 30 seconds after that of the previous instant. Many
+   lines are required to complete the depth profile information for a single
+   dive. This is a common export format used by closed-circuit rebreather (CCR)
+   dive equipment and many software packages that handle dive computer data
+   and/or dive logs.
+
+Before being able to import the _CSV_ data to _Subsurface_ *you needs to
 know a few things about the data being imported*:
 
 a. Which character separates the different columns within a single line of
@@ -1158,7 +1103,7 @@ b. Which data columns need to be imported into _Subsurface_? Is it a _CSV dive
 
 c. Is the numeric information (e.g. dive depth) in metric or in imperial units?
 
-Armed with this information, importing the data into _Subsurface_ is
+With this information, importing the data into _Subsurface_ is
 straightforward. Select _Import -> Import Log Files_ from the main menu. In
 the resulting file selection menu, select _CSV files_ (towards the bottom
 right). This shows all .CSV files in the selected directory. Select the file
@@ -1166,37 +1111,36 @@ that needs to be imported. A configuration panel appears as depicted below:
 
 image::images/csv_import1_f20.jpg["FIGURE: CSV download dialogue 1", align="center"]
 
-Notice that, at the top left, there is a dropdown list containing
-pre-configured settings for some of the more common dive computers and
-software packages encountered by divers. If the _CSV_ file being imported
-originated from any of these pre-configured items, then select it. Otherwise
-use the _Manual Import_ option. The configuration panel also has dropdown
-lists for the specification of the appropriate field separator (Tab, comma
-or semicolon), the date format used in the _CSV_ file, the time units
-(seconds, minutes or minutes:seconds), as well as the unit system (metric or
-imperial). Selecting the appropriate options among these is critical for the
-successful import of the data.
-
-The last remaining task is to ensure that all the data columns have the
-appropriate column headings. The top blue row of the data table contains the
-column headings found in the _CSV_ data file. The blue row of balloons
-immediately above these contains the names understood by _Subsurface_. These
-balloons can be moved using a drag-and-drop action. For instance,
-_Subsurface_ expects the column heading for Dive number (" # ") to be "Dive
-# ". If the column heading that _Subsurface_ expects is not in the blue row,
-then drag the appropriate balloon from the upper area and drop it in the
-appropriate blue cell at the top of the table. To indicate the correct
-column for "Dive #", drag the ballooned item labelled "Dive # " and drop it
-in the blue cell immediately above the white cell containing " # ". This is
-depicted in the image below.
+At the top left, there is a dropdown list containing pre- configured
+settings for common dive computers and software packages.
+ If the _CSV_ file being imported originated from any of
+these pre-configured items, select it. Otherwise use the _Manual Import_
+option. The configuration panel also has dropdown lists for the specification of the appropriate
+field separator (Tab, comma or semicolon), the date format used in the _CSV_ file,
+the time units (seconds, minutes or minutes:seconds), as well as the unit system
+(metric or imperial). Selecting the appropriate options among these is critical for
+the successful data import.
+
+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
+headings found in the _CSV_ data file. The blue row of balloons immediately
+above these contains the names understood by _Subsurface_. These balloons
+can be moved using a drag-and-drop action. For instance, _Subsurface_
+expects the column heading for Dive number (" # ") to be "Dive # ". If the
+column heading that _Subsurface_ expects is not in the blue row, drag the
+appropriate balloon from the upper area and drop it in the appropriate blue
+cell at the top of the table. To indicate the correct column for "Dive #",
+drag the ballooned item labelled "Dive # " and drop it in the blue cell
+immediately above the white cell containing " # ". This is depicted in the
+image below.
 
 image::images/csv_import2_f20.jpg["FIGURE: CSV download dialogue 2", align="center"]
 
-Continue in this way to ensure that all the column headings in the blue row
-of cells correspond to the headings listed in the top part of the
-dialogue. Having completed this task, select the _OK_ button to the bottom
-right of the dialogue.  The data from the _CSV_ file are imported and shown
-in the *Dive List* panel.
+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.
+When finished, select the _OK_ button on the bottom right of the dialogue.
+The data from the _CSV_ file are imported and shown in the *Dive List*
+panel.
 
 [[S_CSV_Intro]]
 ****
@@ -1205,17 +1149,17 @@ in the *Dive List* panel.
 [IMPORTANT]
 
 _CSV_ is an abbreviation for a data file format: _Comma-Separated
-Values_. It is a file format allowing someone to view or edit the
-information using a text editor such as Notepad (Windows), gedit (Linux) or
-TextWrangler (OS/X). The two main advantages of the _CSV_ format is that the
-data are easily editable as text without any proprietary software and
-ensuring all information is human-readable, not being obscured by any custom
-or proprietary attributes that proprietary software insert into files.
-Because of its simplicity the _CSV_ format is used as an interchange format
-between many software packages, e.g. between spreadsheet, statistical,
-graphics, database and diving software. Within _Subsurface_, _CSV_ files can
-also be used to import information from other sources such as
-spreadsheet-based dive logs and even from some dive computers.
+Values_. It is a file format that lets you view or edit information using a
+text editor like Notepad (Windows), gedit (Linux) or TextWrangler
+(OS/X). There are two main advantages of the _CSV_ format.  First, the data
+are easily editable as text without any proprietary software.  Second, all
+information is human-readable, not obscured by any custom or proprietary
+attributes that proprietary software inserts into files.  Because of its
+simplicity the _CSV_ format is used as an interchange format between many
+software packages, e.g. between spreadsheet, statistical, graphics, database
+and diving software. Within _Subsurface_, _CSV_ files can also be used to
+import information from other sources like spreadsheet-based dive logs and
+some dive computers.
 
 _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
@@ -1223,7 +1167,7 @@ used to separate fields within a single line. The field separator is
 frequently a comma, a colon, a SPACE character or a TAB character. When
 exporting data from spreadsheet software, the field separator needs to be
 specified in order to create the _CSV_ file. _CSV_ files are normally
-organised into a single line that provides the headers (or _field names_) of
+organized into a single line that provides the headers (or _field names_) of
 the data columns, followed by the data, one record per line. Note that each
 field name may comprise more than one word separated by spaces; for instance
 _Dive site_, below. Here is an example of dive information for four dives
@@ -1267,21 +1211,21 @@ computer:
 
 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_
-file, making it much easier to work with _CSV_ files.  _CSV_ files can
-therefore be used in many contexts for importing data into a _Subsurface_
-dive log.  Knowledge of a few basic things about the content of the _CSV_
-file allows a smooth import of the dives into _Subsurface_.
+file, making it much easier to work with _CSV_ files.  _CSV_ files can be
+used in many contexts for importing data into a _Subsurface_ dive log.
+Knowing a few basic things about the content of the _CSV_ file helps with a
+smooth import of the dives into _Subsurface_.
 
 ****
 
 
 [icon="images/icons/important.png"]
 [IMPORTANT]
-The _CSV_ import has a couple of caveats. One should avoid some special
-characters like ampersand (&), less than (<), greater than (>) and double
-quotes (") as part of the numbers or text within a cell. The file should use
-UTF-8 character set, if using non-ASCII characters. Also the size of the
-_CSV_ file might cause problems. Importing 100 dives at a time (_CSV dive
+But, the _CSV_ import has a couple of caveats. Avoid some special characters
+like ampersand (&), less than (<), greater than (>) and double quotes (") as
+part of the numbers or text within a cell. The file should use UTF-8
+character set, if using non-ASCII characters. Also the size of the _CSV_
+file might cause problems. Importing 100 dives at a time (_CSV dive
 details_) works, but larger files might exceed the limits of the parser
 used. When encountering problems with _CSV_ imports, first try with a
 smaller file to make sure everything works.
@@ -1293,18 +1237,16 @@ smaller file to make sure everything works.
 Using the *Subsurface Companion App* on an _Android device_   or
 xref:S_iphone[_iPhone_] with GPS, the coordinates
 for the diving
-location can be automatically passed to the _Subsurface_
-dive log. The Companion App stores the dive locations on
-a dedicated Internet file server. _Subsurface_, in turn, can collect
-the localities from the file server.
-
+location can be automatically passed to the _Subsurface_ dive log. The Companion App
+stores dive locations on a dedicated Internet server. _Subsurface_ can collect
+the locations from the server.
 To do this:
 
 ==== 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*
-  will be sent, a long number that gives access to the file server and
+  will be sent, a long number giving you access to the file server and
   Companion App capabilities.
 
 - Download the app from
@@ -1316,99 +1258,97 @@ To do this:
 
 On first use the app has three options:
 
-* _Create a new account._ Equivalent to registering in _Subsurface_ companion
-  page using an Internet browser. One can request a *DIVERID* using this
-  option, but this is supplied via email and followed up by interaction with
-  the http://api.hohndel.org/login/[_Subsurface companion web page_] in order
-  to activate the account.
+* _Create a new account._ Equivalent to registering in the _Subsurface_
+  companion page using an Internet browser. You can request a *DIVERID* using
+  this option, but it’s supplied via email and followed up by interaction with
+  the http://api.hohndel.org/login/[_Subsurface companion web page_] to
+  activate the account.
 
-* _Retrieve an account._ If users forgot their *DIVERID* they will receive an
+* _Retrieve an account._ If users forget their *DIVERID* they will receive an
   email to recover the number.
 
 * _Use an existing account._ Users are prompted for their *DIVERID*. The app
-  saves this *DIVERID* and does not ask for it again unless one uses the
+  saves this *DIVERID* and doesn’t ask for it again unless you use the
   _Disconnect_ menu option (see below).
 
 [icon="images/icons/important.png"]
 [IMPORTANT]
 In the _Subsurface_ main program, the *DIVERID* should also be entered on
-the Default Preferences panel, obtained by selecting _File -> Preferences ->
-Defaults_ from the main menu in _Subsurface_ itself.  This facilitates
-synchronisation between _Subsurface_ and the Companion App.
+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
 
-Now one is ready to get a dive position and send it to the server. The
+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
 any dives.
 
-Touch the "+" icon on the top right to add a new dive site, a menu will be
-showed with 3 options:
+Touch the "+" icon on the top right to add a new dive site, a menu shows
+with 3 options:
 
 * 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.
 
-* Use Map: This option allows the user to fix a position by searching a world
-  map. A world map is shown (see *B* below) on which one should indicate the
-  desired position with a _long press_ on the touch sensitive screen (if the
-  marked location is erroneous, simply indicate a new location)  and select
-  the check symbol in the upper right. A dialog is shown allowing to enter the
-  name of the dive location and the date-time of the dive (see *C* below). In
-  order to import this dive location in _Subsurface_ it's advisable to set the
-  time to agree with the time of that dive on the dive computer.
+* 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
+  position with a _long press_ on the touch sensitive screen (if the marked
+  location is wrong, simply choose a new location)  and select the check
+  symbol in the upper right. A dialog is shown letting you enter the name of
+  the dive location and the date and time of the dive (see *C* below). In
+  order to import this dive location in _Subsurface_ you should set the time
+  to agree with the time of that dive on the dive computer.
 
 image::images/Companion_5.jpg["FIGURE: Companion App, add location using map", align="center"]
 
 
 * 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
-  stored locations shown. Now one needs to select the appropriate locations,
-  then select 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.
+  stored locations shown. Now select the appropriate locations, then select
+  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
 
 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
-selection box to the left indicating that they require upload to the
-server. One can select individual dive locations from the list. A selected
+selection box to the left showing they need to be uploaded to the
+server. You can select individual dive locations from the list. A selected
 location has a check mark in the selection box on the left. Group operations
-(such as _Delete_ or _Send_)  are performed on several locations that are
-selected.
+(like _Delete_ or _Send_)  are performed on several selected locations.
 
 Dive locations in this list can be viewed in two ways: a list of locations
-or a map indicating the dive locations. The display mode (List or Map) is
-changed by selecting _Dives_ at the top left of the screen (see *A* below)
-and then selecting the display mode. The display mode can be changed either
-from the list of locations or from the map (see *B* below). If one selects a
-location (on the list or on the map), an editing panel opens (see *C* below)
-where the dive description or other details may be changed.
+or a map showing them. The display mode (List or Map) is changed by
+selecting _Dives_ at the top left of the screen (see *A* below) and then
+selecting the display mode. The display mode can be changed either from the
+list of locations or from the map (see *B* below). If you select a location
+(on the list or on the map), an editing panel opens (see *C* below) where
+the dive description or other details may be changed.
 
 image::images/Companion_4.jpg["FIGURE: Companion App, add location using map", align="center"]
 
 
-When one selects a dive (*not* selecting the check box), the name given to
+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
 of the screen:
 
 - Edit (pencil): Change the text name or other characteristics of the dive
   location.
 
-- Maps: Display a map showing the dive location.
-
-After editing and saving a dive location (see *C* above), one needs to
-upload it to the web service, as explained below.
+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
 
-There are several ways to send locations to the server.  The easiest is by
+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
 arrow at the top right of the screen.
 
 [icon="images/icons/important.png"]
 [IMPORTANT]
-Users must be careful, as the trash icon on the right means exactly what it
-should; it deletes the selected dive location(s).
+Be careful! The trash icon on the right means exactly what it should; it
+deletes the selected dive location(s).
 
 image::images/Companion_1.jpg["FIGURE: Screen shots (A-B) of companion app", align="center"]
 
@@ -1427,24 +1367,22 @@ Selecting the _Settings_ menu option results in the right hand image above
 - _Web-service URL._ This is predefined (http://api.hohndel.org/)
 
 - _User ID._ The DIVERID obtained by registering as described above. The
-  easiest way to obtain it is simply to copy and paste from the confirmation
-  email but, of course, users can also type this information.
-
+  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 synchronise each time the app is started.
+  and those on the web service synchronize each time the app is started.
 
 - _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 a unique dive location, users can leave the service
-running in the background of their Android device, allowing the continuous
+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.
 
-
-The settings below define the behaviour of the service:
+The settings below define the behavior of the service:
 
 - _Min duration._ In minutes. The app will try to get a location every X
   minutes until stopped by the user.
@@ -1455,14 +1393,14 @@ The settings below define the behaviour of the service:
 
 [icon="images/icons/info.jpg"]
 [TIP]
-_How does the background service work?_ Assuming the user sets 5 minutes and
-50 meters in the settings above, the app will start by recording a location
-at the current location, followed by another one at every 5 minutes *or*
-every time one moves 50 m from previous location.  If subsequent locations
-are within a radius of 50 meters from the previous one, a new location is
-not saved. If the user is not moving, only one location is saved, but if the
-user is moving, a trace of the route is obtained by saving a location every
-50 meters.
+_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
+location at the current location, followed by another one at every 5 minutes
+*or* every time one moves 50 m from previous location.  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.  If the diver is moving, a trace of the route is obtained by saving a
+location every 50 meters.
 
 ===== Other
 
@@ -1479,16 +1417,15 @@ Search the saved dive locations by name or by date and time.
 
 ===== Start service
 
-Initiates the _background service_ following the previously defined
-settings.
+Starts the _background service_ following the previously defined settings.
 
 ===== Disconnect
 
-This is a badly named option that disconnects the app from the server by
-resetting the user ID in the app, showing the first screen where an account
-can be created, retrieve the ID for an existing account or use the users own
-ID. The disconnect option is useful if a user's Android device was used to
-download the dive locations of another registered diver.
+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.
 
 ===== Send all locations
 
@@ -1497,27 +1434,27 @@ This option sends all locations stored in the Android device to the server.
 [[S_iphone]]
 ==== Using the Subsurface companion app on an _iPhone_ to record dive locations
 
-The iPhone interface is quite simple. One needs to type the user ID
-(obtained during registration) into the space reserved for it, then select
-"Dive in" (see left part of the image below) and start collecting dive
-location information.
+The iPhone interface is quite simple. Type the user ID (obtained during
+registration) into the space reserved for it, then select "Dive in" (see
+left part of the image below) and start collecting dive location
+information.
 
 image::images/iphone.jpg["FIGURE: Using iPhone companion application", align="center", width=640]
 
 Dives can be added automatically or manually. In manual mode, a dive
 location or waypoint is added to the GPS input stream. In automatic mode, a
-continuous path of GPS locations is created from which, much later, after
-import, subsurface can select the appropriate GPS locations based on the
-times of dives. The default mode for the _iphone_ is automatic. When one
-adds a dive, the location service is started automatically and a red bar
-appears at the bottom of the screen. After the dive one can click on the red
-bar to end the location service. While the location service is running one
-can only add dives using the manual mechanism.
-
-One can edit the site name afterwards by selecting the dive from the dive
+continuous path of GPS locations is created from which, after import,
+Subsurface can select the appropriate GPS locations based on the times of
+dives. The default mode for the _iphone_ is automatic. When adding a dive,
+the location service is started automatically and a red bar appears at the
+bottom of the screen. After the dive, click on the red bar to end the
+location service. While the location service is running you can only add
+dives manually.
+
+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
-dive list is automatically uploaded from the iPhone to the webservice and
-there is not an option to trigger upload manually.
+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
@@ -1527,49 +1464,49 @@ _Subsurface_ before obtaining the GPS coordinates from the server. The
 download dialog can be reached via _Ctrl+G_ or from the _Subsurface_ Main
 Menu _Import -> Import GPS data from Subsurface Service_, resulting in the
 image on the left (*A*), below. On first use the DIVERID text box is
-blank. Provide a DIVERID, then select the _Download_ button to initiate the
+blank. Provide a DIVERID, then select the _Download_ button to start the
 download process, after which the screen on the right (*B*) below appears:
 
 image::images/DownloadGPS.jpg["FIGURE: Downloading Companion app GPS data", align="center"]
 
-Note that the _Apply_ button is now active. By clicking on it, users can
-update the locations of the newly entered or uploaded dives in _Subsurface_
-which applies the coordinates and names entered on the app for all the new
-dives that match the date-times of the uploaded GPS localities. If one has
-entered the name of the dive location in _Subsurface_ before downloading the
-GPS coordinates, this name will take precedence over downloaded one.
+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_. That applies the coordinates and names entered on the app to
+all the new dives that match the date-times of the uploaded GPS
+localities. If you have entered the name of the dive location in
+_Subsurface_ before downloading the GPS coordinates, this name will take
+precedence over downloaded one.
 
 Since _Subsurface_ matches GPS locations from the Android device and dive
 information from the dive computer based on date-time data, automatic
-assignment of GPS data to dives is dependent on agreement of the date-time
-information between these two devices. Although _Subsurface_ has a wide
-range tolerance, it may be unable to identify the appropriate dive if there
-is a large difference between the time in the dive computer and that of the
-Android device, resulting in no updates.
+assignment of GPS data to dives depends on agreeing date-time information
+between the two devices. Although _Subsurface_ has a wide range tolerance,
+it may not be able to identify the appropriate dive if there's a large
+difference between the time in the dive computer and that of the Android
+device.  That results in no updates.
 
 Similar date-times may not always be possible and there may be many reasons
-for this (e.g. time zones), or _Subsurface_ may be unable to decide which is
-the correct position for a dive (e.g. on repetitive dives while running
+for this (e.g. time zones).  _Subsurface_ may also be unable to decide which
+is the correct position for a dive (e.g. on repetitive dives while running
 _background service_ there may be several locations that would be included
 in the time range that fit not only the first dive, but one or more
-subsequent dives as well).  A workaround for this situation to manually edit
-the date-time of a dive in the _Subsurface_ Dive List *before* downloading
-the GPS data and then to change the date-time back again *after* downloading
-GPS data.
+subsequent dives as well).  A workaround to manually edit the date-time of a
+dive in the _Subsurface_ Dive List *before* downloading the GPS data and
+then to change the date-time back again *after* downloading GPS data.
 
 [icon="images/icons/info.jpg"]
 [NOTE]
 TIPS:
 
-- _Background service_, being a very powerful tool, may fill the location list
-  with many unnecessary locations not corresponding to the exact dive point
-  but reflecting the boat's route.  Currently these locations are difficult to
-  delete from the server. In some situations it is therefore prudent to clean
-  up the list on the Android device before sending the dive points to the web
-  server by simply deleting the inappropriate locations. This might be
-  necessary, for instance, if one wants to keep the location list clear to see
-  dives in the web service map display (see above).
-
+- _Background service_ may fill the location list with unnecessary locations
+  that don’t correspond to the exact dive point but do correspond to the
+  boat's route.
+   Right now, these locations are difficult to delete from the server. In some
+   situations it
+  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. This might be necessary, for instance, if you want to keep the
+  location list clear to see dives in the web service map display (see above).
 - 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
   Template_ setting while running the _background service_, especially on a
@@ -1579,11 +1516,11 @@ TIPS:
 === Adding photographs to dives
 
 Many (if not most) divers take a camera with them and take photographs
-during a dive. One would like to associate each photograph with a specific
-dive. _Subsurface_ allows one to load photos into a dive. Photos are
-superimposed on the dive profile, from where they can be viewed.
+during a dive. To match each photograph with a specific dive, _Subsurface_
+lets you load photos into a dive. Photos are superimposed on the dive
+profile, from where they can be viewed.
 
-==== Loading photos and getting synchronisation between dive computer and camera
+==== Loading photos and synchronizing between dive computer and camera
 
 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
@@ -1596,45 +1533,45 @@ to be loaded into _Subsurface_ and click the _Open_ button.
 
 image::images/LoadImage2_f20.jpg["FIGURE: Load images option", align="center"]
 
-This brings up the time synchronisation dialog, shown below. The critical
-problem is that the time synchronisation is not perfect between the dive
-computer used during a dive, and the camera used during that same
-dive. These two devices often differ by several minutes. If _Subsurface_ can
-achieve synchronisation, then the exact times of photographs can be used to
-position photographs on the dive profile.
+This brings up the time synchronization dialog, shown below. But be aware
+that the time synchronization is not perfect between the dive computer used
+during a dive, and the camera used during that same dive. These two devices
+often differ by several minutes. If _Subsurface_ can synchronize, then the
+exact times of photographs can be used to position photographs on the dive
+profile.
 
-_Subsurface_ achieves this synchronisation in three ways:
+_Subsurface_ synchronizes in three ways:
 
-- *Pro-actively*: Before the dive, ensure synchronisation of the dive computer time settings with
+- *Pro-actively*: Before the dive, ensure synchronization of the dive computer time settings with
   the time settings of the camera by changing the date-time settings on one or both of these devices.
-- *Manually*: If the user wrote down the exact camera time at the start of a dive, the
-  difference in time between the two devices can be determined. Actually, as long as the device
-  settings for time has not been changed in either device, one could write down the times of
-  both devices after the dive or even at the end of the day. One can then manually set the time
+- *Manually*: If you wrote down the exact camera time at the start of a dive, the
+  difference in time between the two devices can be determined. As long as the device
+  settings for time has not been changed in either device, you could write down the times of
+  both devices after the dive or even at the end of the day. You can then manually set the time
   difference in the _Time shift_ dialog. Towards the top of the dialog is a time setting tool
-  immediately under the heading _Shift times of image(s) by_, evident in figure *A* below.
+  immediately under the heading _Shift times of image(s) by_, shown in figure *A* below.
   If the camera time is 7 minutes later than that of the dive computer, set the time setting
   tool to a value of 00:07.  Select either the _earlier_ or _later_ radio button.
   In the above example, the _earlier_ option is appropriate, since the photos need to be shifted
   7 minutes earlier (camera is 7 minutes ahead of dive computer). Ignore any "AM" or "PM" suffix
-  in that tool. Click the _OK_ button and synchronisation is achieved.
+  in that tool. Click the _OK_ button and synchronization is done.
 
-image::images/LoadImage3b_f20.jpg["FIGURE: Synchronisation dialog", align="center"]
+image::images/LoadImage3b_f20.jpg["FIGURE: Synchronization dialog", align="center"]
 
 
-- *By photograph*: There is a very slick way of achieving synchronisation. If one takes a
-  photograph of the face of the dive computer showing the time, then _Subsurface_ can obtain
-  the exact time the photograph was taken, using the metadata that the camera stores within
-  each photo. In order to do this, use the bottom half of the _Time shift_ dialog. If one uses
+- *By photograph*: There is a very slick way of synchronizing. If you take a
+  photograph of the face of the dive computer showing the time, then _Subsurface_ can get
+  the exact time the photograph was taken, using the metadata the camera stores within
+  each photo. To do this, use the bottom half of the _Time shift_ dialog. If you use
   the bottom part, the top part of the dialog is ignored. Click on
-  the horizontal bar entitled "_Select image of dive computer showing time_. This brings up
-  a file browser with which one can select the photograph of the dive computer time. Select the
+  the horizontal bar called "_Select image of dive computer showing time_. This brings up
+  a file browser letting you select the photograph of the dive computer time. Select the
   photograph using the file browser and click on _OK_. This photograph of the dive computer
   appears in the bottom panel of the _Shift times_ dialog. Now _Subsurface_ knows exactly
   when the photograph has been taken. Now set the date-time dialog to the left of the photo
-  so that this tool reflects the date and time of the dive computer in the photo. When the
+  so it reflects the date and time of the dive computer in the photo. When the
   date-time tool has been set, _Subsurface_ knows exactly what the time difference between
-  camera and dive computer is, and synchronisation is achieved.
+  camera and dive computer is, and it can synchronize.
   Image *B* above shows a photograph of the face of the dive computer and with the date-time tool set to the
   date-time.
 
@@ -1647,9 +1584,9 @@ After the images have been loaded, they appear in two places:
 
  - the _Photos_ tab of the *Notes* panel.
  - as tiny icons (stubs) on the dive profile at the appropriate positions
-   reflecting the time each photograph was taken.  In order to view the photos
-   on the dive profile, activate the _show-photos_ button in the tool bar to
-   the left of the dive profile:
+   reflecting the time each photograph was taken.  To view the photos on the
+   dive profile, activate the _show-photos_ button in the tool bar to the left
+   of the dive profile:
 
 image::images/icons/ShowPhotos_f20.png["FIGURE:Show photos toolbar button", align="left"]
 
@@ -1657,18 +1594,17 @@ This results in a profile display as in the image below:
 
 image::images/LoadImage4_f20.jpg["FIGURE: Photos on dive profile", align="center"]
 
-If one hovers with the mouse over any of the photo icons, then a thumbnail
-photo is shown of the appropriate photo. See the image below:
+If you hover the mouse over any of the photo icons, a thumbnail photo is
+shown of the appropriate photo. See the image below:
 
 image::images/LoadImage5_f20.jpg["FIGURE:Thumbnail photo on dive profile", align="center"]
 
 Clicking on the thumbnail brings up a full size photo overlaid on the
-_Subsurface_ window. This allows good viewing of the photographs that have
-been added (see the image below). Note that the thumbnail has a small
-dustbin icon in the bottom right hand corner (see image above). If one
-selects the dustbin, the image is removed from the dive. Therefore some care
-is required when clicking on a thumbnail. Images can also be deleted using
-the _Photos_ tab (see text below).
+_Subsurface_ window. This allows good viewing of the added photographs. (see
+the image below). Note that the thumbnail has a small dustbin icon in the
+bottom right hand corner (see image above). Selecting the dustbin removes
+the image from the dive. Be careful when clicking on a thumbnail. Images can
+also be deleted using the _Photos_ tab (see text below).
 
 image::images/LoadImage6_f20.jpg["FIGURE: Full-screen photo on dive profile", align="center"]
 
@@ -1678,60 +1614,55 @@ Photographs associated with a dive are shown as thumbnails in the _Photos_
 tab of the _Notes_ panel. Photos taken in rapid succession during a dive
 (therefore sometimes with large overlap on the dive profile) can easily be
 accessed in the _Photos_ tab. This tab serves as a tool for individually
-accessing the photos of a dive, while the stubs on the dive profile give an
-indication of when during a dive a photo was taken. By single-clicking on a
-thumbnail in the _Photos_ panel, a photo is selected. By double-clicking a
-thumbnail, the full-sized image is shown, overlaying the _Subsurface_
-window. A photo can be deleted from the _Photos_ panel by selecting it
-(single-click) and then by pressing the _Del_ key on the keyboard. This
-removes the photo both from the _Photos_ tab as well as the dive profile.
+accessing the photos of a dive, while the stubs on the dive profile show
+when during a dive a photo was taken. By single-clicking on a thumbnail in
+the _Photos_ panel, a photo is selected. By double-clicking a thumbnail, the
+full-sized image is shown, overlaying the _Subsurface_ window. A photo can
+be deleted from the _Photos_ panel by selecting it (single-click) and then
+by pressing the _Del_ key on the keyboard. This removes the photo BOTH from
+the _Photos_ tab as well as the dive profile.
 
 ==== Photos on an external hard disk
-
-Most underwater photographers store their photos on an external drive. If
-such a drive can be mapped by the operating system (almost always the case)
-the photos can be directly accessed by _Subsurface_. This facilitates the
-interaction between _Subsurface_ and an external repository of photos. When
-associating a dive profile with photos from an external drive, the normal
-procedure of selection and synchronisation (see text above) is used.
-However, after the external drive has been disconnected, _Subsurface_ cannot
-access these photos any more.  If the display of photos is activated (using
-the toolbox to the left of the _Dive Profile_), the program only shows a
-small white dot where each photo should be on the dive profile.  In addition
-the _Photos_ tab only shows the file names of the photos. This is normal
-behaviour.  If, later, the external drive with the photos is connected
-again, the photos can be seen in the normal way.
+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
+photos can be directly accessed by _Subsurface_. This eases the interaction
+between _Subsurface_ and an external repository of photos. When associating
+a dive profile with photos from an external drive, the normal procedure of
+selection and synchronization (see text above) is used.  After the external
+drive has been disconnected, _Subsurface_ cannot access these photos any
+more.  If the display of photos is activated (using the toolbox to the left
+of the _Dive Profile_), the program only shows a small white dot where each
+photo should be on the dive profile.  In addition the _Photos_ tab only
+shows the file names of the photos.  If the external drive with the photos
+is re-connected, the photos can be seen in the normal way.
 
 [[S_FindMovedImages]]
 ==== Moving photographs among directories, hard disks or computers
 
 After a photograph has been loaded into _Subsurface_ and associated with a specific dive, the directory
- where the photo lies is stored, allowing _Subsurface_ to find the photograph when the dive is
+ where the photo lies is stored, letting _Subsurface_ find the photograph when the dive is
  opened again. If the photo or the whole photo collection is moved to another drive or to a different
- machine, it is unlikely that the directory structure will remain identical to that of the original uploaded
+ machine, the directory structure will be different to that of the original uploaded
  photo. When this happens, _Subsurface_ looks for the photos at their original location before they were moved,
- cannot find them and therefore cannot display them. Because, after moving photos, large numbers of photos
+ cannot find them and cannot display them. Because after moving photos, large numbers of photos
  may need to be deleted and re-imported from the new location, _Subsurface_ has a mechanism that eases the
  process of updating the directory information for each photo: automatic updates using fingerprints.
 
 When a photo is loaded into _Subsurface_, a fingerprint for the image is calculated and stored with the
  other reference information for that photo. After moving a photo collection (that has already been loaded
- into _Subsurface_) to a different directory, disk or computer, _Subsurface_ can  perform the
- following steps:
-
-- look through a particular directory (and all its subdirectories recursively)
-  where photos have been moved
- to,
+ into _Subsurface_) to a different directory, disk or computer, _Subsurface_ can:
 
+look through a particular directory (and all its subdirectories recursively)
+where photos have been moved to,
 - calculate fingerprints for all photos in this directory, and
 
 - if there is a match between a calculated fingerprint and the one originally
   calculated when a photo was
- loaded into _Subsurface_ (even if the original file name has changed), to
+ loaded into _Subsurface_ (even if the original file name has changed),
  automatically update the directory information so that _Subsurface_ can find
  the photo in the new moved directory.
 
-This is achieved by selecting from the Main Menu: _File ->      Find moved images_. This brings up a window within
+This is done by selecting from the Main Menu: _File ->      Find moved images_. This brings up a window within
  which the NEW directory of the photos needs to be specified. Select the appropriate directory and click
  the _Scan_ button towards the bottom right of the panel. The process may require several minutes to
  complete, after which _Subsurface_ will show the appropriate photographs when a particular dive is opened.
@@ -1743,16 +1674,16 @@ This is achieved by selecting from the Main Menu: _File ->      Find moved image
 [icon="images/icons/important.png"]
 [IMPORTANT]
 
-_Subsurface_ automatically calculates fingerprints for all images that can
-be accessed by _Subsurface_.  When manipulating images, ensure that all the
-images associated with the dive log can be accessed by _Subsurface_.
+_Subsurface_ automatically calculates fingerprints for all images that it
+can access.  When manipulating images, be sure all the images associated
+with the dive log can be accessed by _Subsurface_.
 
 _Subsurface_ automatically checks and, if necessary, updates the
 fingerprints associated with a single dive if:
 - The images associated with that dive are visible as thumbnails on the *Dive
   Profile*.
-- One edits anything in the *Notes tab* panel and save the edits by selecting
-  _Apply changes_.
+- If you edit anything in the *Notes tab* panel and save the edits by
+  selecting _Apply changes_.
 
 ****
 
@@ -1763,19 +1694,19 @@ fingerprints associated with a single dive if:
 ==== Multicylinder dives
 
 _Subsurface_ easily handles dives involving more than one
-cylinder. Multi-cylinder diving usually happens (a) if a diver does not have
-enough gas for the complete dive in a single cylinder; (b) if the diver
-needs more than one gas mixture because of the depth or the decompression
-needs of the dive. For this reason multi-cylinder dives are often used by
-technical divers who dive deep or long. As far as _Subsurface_ is concerned,
-there are only two types of information that need to be provided:
+cylinder. Multi-cylinder diving usually happens (a) if a diver doesn’t have
+enough gas for the complete dive in a single cylinder; (b) if a diver needs
+more than one gas mixture because of the depth or the decompression needs of
+the dive. For this reason multi-cylinder dives are often used by technical
+divers who dive deep or long. As far as _Subsurface_ is concerned, there are
+only two types of information that need to be provided:
 
 - *Describe the cylinders used during the dive* This is performed in the *Equipment tab* of
   the *Info* panel, as xref:cylinder_definitions[described above]. Enter the cylinders one by one,
-  specifying the characteristics of the cylinder and the gas composition within each cylinder.
+  specifying each’s characteristics and the gas composition within it.
 
-- *Record the times at which switches from one cylinder to another was done:* This is information
-  provided by some dive computers (provided the diver indicated these changes to the dive computer
+- *Record the times at which the switch from one cylinder to another was done:* This is information
+  tracked by some dive computers (provided the diver indicated these changes to the dive computer
   by pressing specific buttons). If the dive computer does not provide the information, the diver has to
   record these changes using a different method, e.g. writing it on a slate.
 
@@ -1787,9 +1718,9 @@ there are only two types of information that need to be provided:
   *tank bar* button in the toolbar has been activated, the cylinder switches are also indicated in the
   tank bar.
 
-Having performed these tasks, _Subsurface_ indicates the appropriate use of
+When this is complete, _Subsurface_ indicates the appropriate use of
 cylinders in the dive profile.  Below is a multi-cylinder dive, starting off
-with EAN28, then changing cylinders to EAN50 after 26 minutes to perform
+with EAN28, then changing cylinders to EAN50 after 26 minutes for
 decompression.
 
 image::images/multicylinder_dive.jpg["FIGURE: Multicylinder profile", align="center"]
@@ -1797,31 +1728,30 @@ image::images/multicylinder_dive.jpg["FIGURE: Multicylinder profile", align="cen
 ==== Sidemount dives
 
 Sidemount diving is just another form of multi-cylinder diving, often with
-both or all cylinders having the same gas mixture. Although it is a popular
-configuration for cave divers, sidemount diving can be performed by
-recreational divers who have completed the appropriate training. Sidemount
-dive logging involves, exactly as with multi-cylinder dives, above, three
-steps:
+both or all cylinders having the same gas mixture. Although it’s a popular
+configuration for cave divers, Sidemount diving can be done by recreational
+divers who’ve completed the appropriate training. sidemount dive logging
+involves three steps, exactly as with multi-cylinder dives above:
 
 - *During the dive, record cylinder switch events*. Since sidemount diving normally involves two
-  cylinders with air or with the same gas mixture, _Subsurface_ distinguishes among these different
-  cylinders. In contrast, many dive computers that allow gas switching only distinguish among different
-  _gases_ used, not among different _cylinders_ used. This means that when sidemount dives are downloaded
-  from these dive computers, the events of switching between cylinders with the same gas are not downloaded. This may mean
-  that one may have to keep a written log of cylinder switch times using a slate, or (if the dive computer
-  has this facility) marking each cylinder switch with a bookmark that can be retrieved later. Returning
+  cylinders with air or with the same gas mixture, _Subsurface_ distinguishes between these different
+  cylinders. In contrast, many dive computers that allow gas switching only distinguish between different
+  _gases_ used, not among different _cylinders_ used. This means when sidemount dives are downloaded
+  from these dive computers, the switching event between cylinders with the same gas is not downloaded. This may mean
+  that a diver may have to keep a written log of cylinder switch times using a slate, or (if the dive computer
+  has the capability) marking each cylinder switch with a bookmark that can be retrieved later. Returning
   from a dive with the times of cylinder changes is the only tricky part of logging sidemount dives.
 - *Within _Subsurface_ describe the cylinders used during the dive*. The diver needs to provide the
   specifications of the different cylinders, using the *Equipment* tab of the *Info Panel* (see
   image below where two 12 litre cylinder were used).
 - *Indicate cylinder change events on the _Subsurface_ dive profile*. Once the dive log has been imported
-  from a dive computer into _Subsurface_, the cylinder switch events need to be indicated on the dive profile.
-  Cylinder changes are recorded by right-clicking at the appropriate point on the dive profile and then
+  from a dive computer into _Subsurface_, the cylinder switch events need to be shown on the dive profile.
+  Cylinder changes are recorded by right-clicking at the appropriate point on the dive profile, then
   selecting _Add gas change_. A list of the appropriate cylinders is shown with the
   currently used cylinder greyed out. In the image below Tank 1 is greyed out, leaving only Tank 2
-  to be selected. Select the appropriate cylinder. The cylinder change is then indicated on the dive
+  to be selected. Select the appropriate cylinder. The cylinder change is then shown on the dive
   profile with a cylinder symbol. If the *Tank Bar* is activated using the toolbar to the left of the
-  profile, then the cylinder change is also indicated on the Tank Bar (see image below). After all
+  profile, then the cylinder change is also shown on the Tank Bar (see image below). After all
   the cylinder change events have been recorded on the dive profile, the correct cylinder pressures
   for both cylinders are shown on the dive profile, as in the image below.
 
@@ -1836,19 +1766,19 @@ logging tool.
 
 [icon="images/halcyon_RB80.jpg"]
 [NOTE]
-Passive semi-closed rebreathers (pSCR) comprise a technical advance in
-diving equipment that recirculates the breathing gas that a diver breathes,
-while removing carbon dioxide from the exhaled gas. While a small amount
-(typically a tenth) of the exhaled breathing gas is released into the water,
-a small amount of fresh gas is released from the back gas cylinder
-(typically containing nitrox).  A diver, using a single cylinder of
-breathing gas can therefore dive for much longer periods than using a
-recreational open-circuit configuration. With pSCR equipment, a very small
-amount of breathing gas is released every time the breather inhales. With
-active SCR (aSCR) equipment, in contrast, a small amount of breathing gas is
-released continuously from the back cylinder.
-
-To log pSCR dives, no special procedures are required, just the normal steps
+Passive semi-closed rebreathers (pSCR) are a technical advance in diving
+equipment that recirculates the breathing gas a diver uses, while removing
+carbon dioxide from the exhaled gas. While a small amount (typically a
+tenth) of the exhaled breathing gas is released into the water, a small
+amount of fresh gas is released from the back gas cylinder (typically
+containing nitrox).  A diver using a single cylinder of breathing gas can
+therefore dive for much longer periods than using a recreational
+open-circuit configuration. With pSCR equipment, a very small amount of
+breathing gas is released every time the diver inhales. With active SCR
+(aSCR) equipment, in contrast, a small amount of breathing gas is released
+continuously from the back cylinder.
+
+To log pSCR dives, no special procedures are required. Use the normal steps
 outlined above:
 
 - Select pSCR in the _Dive Mode_ dropdown list on the *Info* panel.
@@ -1858,8 +1788,8 @@ outlined above:
   cylinder/gas changes as described above in the section on
   xref:S_MulticylinderDives[multicylinder dives].
 
-If a pSCR _Dive Mode_ has been selected, the dive ceiling for pSCR dives is
-adjusted for the oxygen drop across the mouthpiece which often requires
+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
 longer decompression periods. Below is a dive profile of a pSCR dive using
 EAN36 on the back cylinder and oxygen for decompression. Note that this dive
 lasted over two hours.
@@ -1874,9 +1804,9 @@ image::images/pSCR_profile.jpg["FIGURE: pSCR profile", align="center"]
 [icon="images/APD.jpg"]
 [NOTE]
 Closed system rebreathers use advanced technology to recirculate gas that
-has been breathed while doing two things to maintain a breathable oxygen
+has been breathed. They also do two things to maintain a breathable oxygen
 concentration:
-a) remove carbon dioxide from the gas that has been exhaled
+a) remove carbon dioxide from the exhaled gas
 regulate the oxygen concentration to remain within safe diving limits.  The
 CCR interface of _Subsurface_ is currently experimental and under active
 development. Subsurface currently supports Poseidon MkVI and APD
@@ -1885,8 +1815,8 @@ recreational dive computer, a CCR system computer does not allow the
 download of a log containing multiple dives. Rather, each dive is stored
 independently. This means that _Subsurface_ cannot download a dive log
 directly from a CCR dive computer, but that it imports CCR dive logs in the
-same way that it imports dive log data from other digital databases: one
-dive at a time.
+same way it imports dive log data from other digital databases: one dive at
+a time.
 
 ===== Import a CCR dive
 
@@ -1896,14 +1826,14 @@ select _Import -> Import log files_ to bring up the
 xref:Unified_import[universal import dialogue]. As explained in that
 section, the bottom right hand of the import dialogue contains a dropdown
 list (labled _Filter:_) of appropriate devices that currently
-includes(Poseidon) MkVI or APD log viewer files (import for other CCR
-equipment is under active development). Having selected the appropriate CCR
+include(Poseidon) MkVI or APD log viewer files. Import for other CCR
+equipment is under active development. Having selected the appropriate CCR
 format and the directory where the original dive logs have been stored from
-the CCR dive computer, one can select a particular dive log file (in the
-case of the MkVI it is a file with a .txt extension). After selecting the
-appropriate dive log, activate the _Open_ button at the bottom right hand of
-the universal import dialogue.  The selected dive is imported to the
-_Subsurface_ dive list.
+the CCR dive computer, select a particular dive log file (in the case of the
+MkVI it is a file with a .txt extension). After selecting the appropriate
+dive log, click the _Open_ button at the bottom right hand of the universal
+import dialogue.  The selected dive is imported to the _Subsurface_ dive
+list.
 
 ===== Displayed information for a CCR dive
 
@@ -1921,8 +1851,8 @@ follows:
 
 - For THREE-sensor systems (e.g. APD), the mean value is also used. However
   differences of more than 0,1 bar in the simultaneous readings of different
-  sensors are treated as spurious. If one of the three sensors provides
-  spurious data, it is ignored.
+  sensors are treated as false. If one of the three sensors provides false
+  data, it is ignored.
 
 - If no sensor data are available, the pO~2~ value is assumed to be equal to
   the setpoint.
@@ -1931,20 +1861,20 @@ The mean pO~2~ of the sensors is indicated with a green line,
 
 The oxygen setpoint values as well as the readings from the individual
 oxygen sensors can be shown. The display of additional CCR information is
-turned on by checking the appropriate checkboxes in the _Preferences_ panel
+turned on by checking the appropriate boxes in the _Preferences_ panel
 (accessible by selecting xref:S_CCR_options[_File -> Preferences ->
 Graph_]). This part of the _Preferences_ panel is shown in the image below,
 representing two checkboxes that modify the display of pO~2~ when the
-appropriate toolbar button on the Dive Profile has been activated.
+appropriate toolbar button on the Dive Profile has been checked.
 
 image::images/CCR_preferences_f20.jpg["FIGURE: CCR preferences panel", align="center"]
 
-Checking any of these check boxes allows the display of additional
-oxygen-related information whenever the pO~2~ toolbar button on the
-_Profile_ panel is activated.  The first checkbox allows the display of
-setpoint information. This is a red line superimposed on the green oxygen
-partial pressure graph and allows a comparison of the mean measured oxygen
-partial pressure and the setpoint values, as shown below.
+Checking any of these boxes allows the display of additional oxygen-related
+information whenever the pO~2~ toolbar button on the _Profile_ panel is
+activated.  The first checkbox allows the display of setpoint
+information. This is a red line superimposed on the green oxygen partial
+pressure graph and allows a comparison of the mean measured oxygen partial
+pressure and the setpoint values, as shown below.
 
 image::images/CCR_setpoint_f20.jpg["FIGURE: CCR setpoint and po2 graph", align="center"]
 
@@ -1977,8 +1907,8 @@ two cylinders are shown as green lines overlapping the depth profile. In
 addition, start and end pressures for both oxygen and diluent cylinders are
 shown in the _Equipment Tab_.  Below is a dive profile for a CCR dive,
 including an overlay of setpoint and oxygen sensor data, as well as the
-cylinder pressure data. In this case there is good agreement from the
-readings of the two oxygen sensors.
+cylinder pressure data. In this case there is agreement from the readings of
+the two oxygen sensors.
 
 image::images/CCR_dive_profile_f22.jpg["FIGURE: CCR dive profile", align="center"]
 
@@ -1996,9 +1926,9 @@ dive profile:
 
 image::images/icons/cceiling.jpg["DC ceiling icon"]
 
-The default colour of the computer-generated deco ceiling is white. However,
-this can be set to red by checking the appropriate check box after selecting
-_File -> Preferences -> Graph_.  Below is a dive profile indicating the dive
+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 ->
+Preferences -> Graph_.  Below is a dive profile indicating the dive
 computer-generated deco ceiling:
 
 image::images/CCR_dive_ceilingF22.jpg["FIGURE: CCR computer-generated deco ceiling", align="center"]
@@ -2043,8 +1973,8 @@ image::images/ExtraDataTab_f20.jpg["FIGURE: Extra Data tab", align="center"]
 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
 Ctrl-click or Shift-click of the mouse. If only one dive has been selected,
-figures pertaining to only that dive are given. This tab shows the number of
-dives selected, the total amount of dive time in these dives, as well as the
+figures for only that dive are given. This tab shows the number of dives
+selected, the total amount of dive time in these dives, as well as the
 minimum, maximum and mean for the dive duration, water temperature and
 surface air consumption (SAC). It also shows the depth of the shallowest and
 deepest dives of those selected.
@@ -2056,23 +1986,23 @@ image::images/Profile2.jpg["Typical dive profile", align="center"]
 
 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
-the left hand side that allows control over several display options. The
+the left hand side that lets you control several display options. The
 functions of these buttons are described below. The main item in the Dive
-Profile is the graph of dive depth as a function of time. In addition to the
-obvious information of the depth it also shows the ascent and descent rates
-compared to the recommended speed of going up or down in the water
-column. This information is given using different colours:
+Profile is the graph of dive depth as a function of time. In addition to
+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:
 |====================
-|*Couleur*|*Vitesse de descente (m/min)*|*Vitesse de remontée (m/min)*
-|Rouge|> 30|> 18
+|*Color*|*Descent speed (m/min)*|*Ascent speed (m/min)*
+|Red|> 30|> 18
 |Orange|18 - 30|9 - 18
-|Jaune|9 - 18|4 - 9
-|Vert clair|1.5 - 9|1.5 - 4
-|Vert foncé|< 1.5|< 1.5
+|Yellow|9 - 18|4 - 9
+|Light green|1.5 - 9|1.5 - 4
+|Dark green|< 1.5|< 1.5
 |=====================
 
 The profile also includes depth readings for the peaks and troughs in the
-graph.  Thus, users should see the depth of the deepest point and other
+graph.  So users should see the depth of the deepest point and other
 peaks. Mean depth is plotted as a grey line, indicating mean dive depth up
 to a particular moment during the dive.
 
@@ -2080,8 +2010,8 @@ to a particular moment during the dive.
 [NOTE]
 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
-the dive profile frequently increases the size of the dive profile to fill
-the area of the panel efficiently.
+the dive profile increases the size of the dive profile to fill the area of
+the panel.
 
 *Water temperature* is displayed with its own blue line with temperature values
 placed adjacent to significant changes.
@@ -2090,13 +2020,13 @@ 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
 dive computer reported deco ceilings (only visible for deep, long, or
 repetitive dives).  Partial pressures of oxygen are indicated in green,
-those of nitrogen in black, and those of helium in dark red. These partial
-pressure graphs are shown below the profile data.
+nitrogen in black, and helium in dark red. These partial pressure graphs are
+shown below the profile data.
 
 [icon="images/icons/O2.jpg"]
 [NOTE]
 Clicking this button allows display of the partial pressure of *oxygen*
-during the dive. This is depicted below the dive depth and water temperature
+during the dive. This is shown below the dive depth and water temperature
 graphs.
 
 [icon="images/icons/N2.jpg"]
@@ -2107,16 +2037,16 @@ during the dive.
 [icon="images/icons/He.jpg"]
 [NOTE]
 Clicking this button allows display of the partial pressure of *helium*
-during the dive.  This is only of importance to divers using Trimix,
-Helitrox or similar breathing gasses.
+during the dive.  This is only important to divers using Trimix, Helitrox or
+similar breathing gasses.
 
 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
-manually entering the start and end pressures the graph is not a straight
-line.  Similarly to the depth graph the slope of the tank pressure gives the
-user information about the momentary SAC rate (Surface Air Consumption) when
-using an air integrated dive computer.  Here the colour coding is not
-relative to some absolute values but relative to the average normalised air
+manually entering the start and end pressures the graph, is not a straight
+line.  Like the depth graph, the slope of the tank pressure gives you
+information about the momentary SAC rate (Surface Air Consumption) when
+using an air integrated dive computer.  Here the color coding is not
+relative to some absolute values but relative to the average normalized air
 consumption during the dive. So areas that are red or orange indicate times
 of increased normalized air consumption while dark green reflects times when
 the diver was using less gas than average.
@@ -2131,53 +2061,50 @@ It is possible to *zoom* into the profile graph. This is done either by using
 the scroll wheel / scroll gesture of your mouse or trackpad. By default
 _Subsurface_ always shows a profile area large enough for at least 30 minutes
 and 30m
- (100ft) – this way short or shallow dives are intuitively recognizable;
-something
-that free divers clearly won’t care about.
-
+ (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"]
 [NOTE]
 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
-done by dragging the red dots to the two points on the dive profile that the
-user wishes to measure. Information is then given in the horizontal white
-area underneath the two red dots.
+done by dragging the red dots to the two points on the dive profile that you
+wish to measure. Information is then given in the horizontal white area
+underneath the two red dots.
 
 [icon="images/icons/ShowPhotos.png"]
 [NOTE]
 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
-indicates the exact time when this photo was taken. If this button is not
+shows the exact time when this photo was taken. If this button is not
 active, the photos are hidden.
 
 
 The profile can also include the dive computer reported *ceiling* (more
 precisely, the deepest deco stop that the dive computer calculated for each
 particular moment in time) as a red overlay on the dive profile. Ascent
-ceilings arise when a direct ascent to the surface increases the risk of a
+ceilings occur when a direct ascent to the surface increases the risk of a
 diver suffering from decompression sickness (DCS) and it is necessary to
 either ascend slower or to perform decompression stop(s) before ascending to
 the surface. Not all dive computers record this information and make it
-available for download; for example all of the Suunto dive computers fail to
-make this very useful data available to divelog software. _Subsurface_ also
-calculates ceilings independently, shown as a green overlay on the dive
-profile.  Because of the differences in algorithms used and amount of data
-available (and other factors taken into consideration at the time of the
-calculation) it is unlikely that ceilings from dive computers and from
-_Subsurface_ are the same, even if the same algorithm and _gradient factors_
-(see below) are used.  It is also quite common that _Subsurface_ calculates
-a ceiling for non-decompression dives when the dive computer stayed in
-non-deco mode during the whole dive (represented by the [green]#dark green#
-section in the profile at the beginning of this section). This is caused by
-the fact that _Subsurface’s_ calculations describe the deco obligation at
-each moment during a dive, while dive computers usually take the upcoming
-ascent into account. During the ascent some excess nitrogen (and possibly
-helium) are already breathed off so even though the diver technically
-encountered a ceiling at depth, the dive still does not require an explicit
-deco stop. This feature allows dive computers to offer longer non-stop
-bottom times.
+available for download; for example none of the Suunto dive computers make
+these data available to divelog software. _Subsurface_ also calculates
+ceilings independently, shown as a green overlay on the dive profile.
+Because of the differences in algorithms used and amount of data available
+(and other factors taken into consideration at the time of the calculation)
+it’s unlikely that ceilings from dive computers and from _Subsurface_ are
+the same, even if the same algorithm and _gradient factors_ (see below) are
+used.  It’s also quite common that _Subsurface_ calculates a ceiling for
+non-decompression dives when the dive computer stayed in non-deco mode
+during the whole dive (represented by the [green]#dark green# section in the
+profile at the beginning of this section). This is because _Subsurface’s_
+calculations describe the deco obligation at each moment during a dive,
+while dive computers usually take the upcoming ascent into account. During
+the ascent some excess nitrogen (and possibly helium) are already breathed
+off so even though the diver technically encountered a ceiling at depth, the
+dive still does not require a specific deco stop. This feature lets dive
+computers offer longer non-stop bottom times.
 
 [icon="images/icons/cceiling.jpg"]
 [NOTE]
@@ -2208,12 +2135,11 @@ image::images/Ceilings2.jpg["Figure: Ceiling with 3m resolution", align="center"
 [icon="images/icons/ShowCylindersButton.jpg"]
 [NOTE]
 By selecting this icon, the different cylinders used during a dive can be
-represented as a coloured bar at the bottom of the *Dive Profile*. In
-general oxygen is represented by a green bar, nitrogen with a yellow bar and
-helium with a red bar. The image below shows a dive which first uses a
-trimix cylinder (red and green), followed by a switch to a nitrox cylinder
-(yellow and green) after 23 minutes. Cylinders with air are shown as a light
-blue bar.
+represented as a colored bar at the bottom of the *Dive Profile*. In general
+oxygen is represented by a green bar, nitrogen a yellow bar and helium a red
+bar. The image below shows a dive which first uses a trimix cylinder (red
+and green), followed by a switch to a nitrox cylinder (yellow and green)
+after 23 minutes. Cylinders with air are shown as a light blue bar.
 
 image::images/ShowCylinders_f20.jpg["Figure: Cylinder use graph", align="center"]
 
@@ -2227,14 +2153,13 @@ ZH-L16 algorithm and are displayed as lines ranging from green (faster
 tissues) to blue (slower tissues).  The black line, graphed above the
 ambient pressure, is the maximum allowable tissue supersaturation (pressure
 limit) derived from the gradient factors specified in the *Preferences*. For
-divers involved in planned decompression diving, efficient rates of
-offgasing are obtained with tissue pressures between the ambient inert gas
-pressure (grey line) and the pressure limit (black line). This display is a
-representation of the tissue pressures during the whole dive. In contrast,
-the xref:S_gas_pressure_graph[Gas Pressure Graph] in the *Information Box*
-on the *Dive Profile* is an instantaneous reflection of tissue pressures at
-the moment in time reflected by the position of the cursor on the dive
-profile.
+divers doing planned decompression diving, efficient rates of offgassing are
+obtained with tissue pressures between the ambient inert gas pressure (grey
+line) and the pressure limit (black line). This display is a representation
+of the tissue pressures during the whole dive. In contrast, the
+xref:S_gas_pressure_graph[Gas Pressure Graph] in the *Information Box* on
+the *Dive Profile* is an instantaneous reflection of tissue pressures at the
+moment in time, at the position of the cursor on the dive profile.
 
 image::images/tissuesGraph.jpg["Figure: Inert gas tissue pressure graph", align="center"]
 
@@ -2255,27 +2180,26 @@ dive. For more information external to this manual see:
 === The Dive Profile context menu
 
 The context menu for the Dive Profile is accessed by right-clicking while
-the mouse cursor is over the Dive Profile panel. The menu allows the
-creation of Bookmarks or Gas Change Event markers or manual CCR set-point
-changes other than the ones that might have been imported from a Dive
-Computer. Markers are placed against the depth profile line and with the
-time of the event set by where the mouse cursor was when the right mouse
-button was initially clicked to bring up the menu. Gas Change events involve
-a selection of which gas is being switched to, the list of choices being
-based on the available gases defined in the *Equipment* Tab. Set-point
-change events open a dialog allowing to choose the next set-point value. As
-in the planner, a set-point value of zero indicates the diver is breathing
-from an open circuit system while any non-zero value indicates the use of a
-closed circuit rebreather (CCR).  By right-clicking while over an existing
-marker a menu appears, adding options to allow deletion of the marker or to
-allow all markers of that type to be hidden. Hidden events can be restored
-to view by selecting Unhide all events from the context menu.
+the mouse cursor is over the Dive Profile panel. The menu lets you create
+Bookmarks, Gas Change Event markers, or manual CCR set-point changes other
+than the ones that might have been imported from a Dive Computer. Markers
+are placed against the depth profile line, with the time of the event set by
+where the mouse cursor was when the right mouse button was first clicked to
+bring up the menu. Gas Change events involve a selection of which gas is
+being switched TO. The list of choices is based on the available gases
+defined in the *Equipment* Tab. Setpoint change events open a dialog letting
+you choose the next setpoint value. As in the planner, a setpoint value of
+zero shows the diver is breathing from an open circuit system while any
+non-zero value shows the use of a closed circuit rebreather (CCR).  By
+right-clicking while over an existing marker a menu appears, adding options
+to allow deletion of the marker, or to allow all markers of that type to be
+hidden. Hidden events can be restored to view by selecting Unhide all events
+from the context menu.
 
 [[S_InfoBox]]
 === The *Information Box*
-
-The Information box displays a large range of information pertaining to the
-dive profile. Normally the Information Box is located to the top left of the
+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
 *Dive Profile* panel. If the mouse points outside of the *Dive Profile*
 panel, then only the top line of the Information Box is visible (see
 left-hand part of figure (*A*) below). The Information Box can be moved
@@ -2285,25 +2209,24 @@ Box is saved and used again during subsequent dive analyses.
 
 image::images/InfoBox2.jpg["Figure: Information Box", align="center"]
 
-The moment the mouse points inside the *Dive Profile* panel, the information
-box expands and shows many data items. In this situation, the data reflect
-the time point along the dive profile indicated by the mouse cursor (see
-right-hand part of figure (*B*) above where the Information Box reflects the
-situation at the position of the cursor [arrow] in that image). Therefore,
-moving the cursor in the horizontal direction allows the Information Box to
-show information for any point along the dive profile.  In this mode, the
-Information Box gives extensive statistics about depth, gas and ceiling
-characteristics of the particular dive. These include: Time period into the
-dive (indicated by a @), depth, cylinder pressure (P), temperature,
-ascent/descent rate, surface air consumption (SAC), oxygen partial pressure,
-maximum operating depth, equivalent air depth (EAD), equivalent narcotic
-depth (END), equivalent air density depth (EADD), decompression requirements
-at that instant in time (Deco), time to surface (TTS), the calculated
-ceiling, as well as the calculated ceiling for several Bühlmann tissue
-compartments.
-
-The user has control over the display of several statistics, represented as
-four buttons on the left of the profile panel. These are:
+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
+time point along the dive profile shown by the mouse cursor (see right-hand
+part of figure (*B*) above where the Information Box reflects the situation
+at the position of the cursor [arrow] in that image). Moving the cursor
+horizontally lets the Information Box show information for any point along
+the dive profile.  In this mode, the Information Box gives extensive
+statistics about depth, gas and ceiling characteristics of the particular
+dive. These include: Time period into the dive (indicated by a @), depth,
+cylinder pressure (P), temperature, ascent/descent rate, surface air
+consumption (SAC), oxygen partial pressure, maximum operating depth,
+equivalent air depth (EAD), equivalent narcotic depth (END), equivalent air
+density depth (EADD), decompression requirements at that instant in time
+(Deco), time to surface (TTS), the calculated ceiling, as well as the
+calculated ceiling for several Bühlmann tissue compartments.
+
+The user has control over the display of some statistics, shown as four
+buttons on the left of the profile panel. These are:
 
 [icon="images/icons/MOD.jpg"]
 [NOTE]
@@ -2313,7 +2236,7 @@ dependent on the oxygen concentration in the breathing gas.  For air (21%
 oxygen) it is around 57 m if a maximum pO~2~ of 1.4 is specified in the
 *Preferences* section (select _File_ -> Preferences -> Graph_ and edit the
 text box _Max pO~2~ when showing MOD_.  Below the MOD there is a markedly
-increased risk of exposure to the dangers associated with oxygen toxicity.
+increased risk of exposure to the dangers of oxygen toxicity.
 
 [icon="images/icons/NDL.jpg"]
 [NOTE]
@@ -2321,40 +2244,39 @@ 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
 duration that a diver can continue with a dive, given the present depth,
 that does not require decompression (that is, before an ascent ceiling
-appears). Once one has exceeded the NDL and decompression is required (that
-is, there is an ascent ceiling above the diver, then TTS gives the number of
-minutes required before the diver can surface. TTS includes ascent time as
-well as decompression time. TTS is calculated assuming an ascent surface air
-consumption (SAC) for the gas currently used. Even if the profile contains
-several gas switches, TTS at a specific moment during the dive is calculated
-using the current gas.  For TTS longer than 2 hours, it is not accurately
-calculated and Subsurface only indicates _TTS > 2h_.
+appears). Once a diver has exceeded the NDL and decompression is required
+(that is, there is an ascent ceiling above the diver) then TTS gives the
+number of minutes required before the diver can surface. TTS includes ascent
+time as well as decompression time. TTS is calculated assuming an ascent
+surface air consumption (SAC) for the gas currently used. Even if the
+profile contains several gas switches, TTS at a specific moment during the
+dive is calculated using the current gas.  TTS longer than 2 hours is not
+accurately calculated and Subsurface only indicates _TTS > 2h_.
 
 [icon="images/icons/SAC.jpg"]
 [NOTE]
 Clicking this button causes the Information Box to display the *Surface Air
-Consumption (SAC)*.  SAC is an indication of the surface-normalised
+Consumption (SAC)*.  SAC is an indication of the surface-normalized
 respiration rate of a diver. The value of SAC is less than the real
 respiration rate because a diver at 10m uses breathing gas at a rate roughly
 double that of the equivalent rate at the surface. SAC gives an indication
-of breathing gas consumption rate independent of the depth of the dive so
-that the respiratory rates of different dives can be compared. The units for
-SAC is litres/min or cub ft/min.
+of breathing gas consumption rate independent of the depth of the dive, so
+the respiratory rates of different dives can be compared. The units for SAC
+is liters/min or cubic ft/min.
 
 [icon="images/icons/EAD.jpg"]
 [NOTE]
 Clicking this button displays the *Equivalent Air Depth (EAD)* for nitrox
 dives as well as the *Equivalent Narcotic Depth (END)* for trimix
-dives. These are numbers of importance to divers who use breathing gases
-other than air. Their values are dependent on the composition of the
-breathing gas.  The EAD is the depth of a hypothetical air dive that has the
-same partial pressure of nitrogen as the current depth of the nitrox dive at
-hand. A nitrox dive leads to the same decompression obligation as an air
-dive to the depth equalling the EAD. The END is the depth of a hypothetical
-air dive that has the same sum of partial pressures of the narcotic gases
-nitrogen and oxygen as the current trimix dive. A trimix diver can expect
-the same narcotic effect as a diver breathing air diving at a depth
-equalling the END.
+dives. These are important to divers breathe gases other than air. Their
+values are dependent on the composition of the breathing gas.  The EAD is
+the depth of a hypothetical air dive that has the same partial pressure of
+nitrogen as the current depth of the nitrox dive at hand. A nitrox dive
+leads to the same decompression obligation as an air dive to the depth
+equalling the EAD. The END is the depth of a hypothetical air dive that has
+the same sum of partial pressures of the narcotic gases nitrogen and oxygen
+as the current trimix dive. A trimix diver can expect the same narcotic
+effect as a diver breathing air diving at a depth equalling the END.
 
 Figure (*B*) above shows an information box with a nearly complete set of
 data.
@@ -2362,17 +2284,17 @@ data.
 [[S_gas_pressure_graph]]
 ==== The Gas Pressure Bar Graph
 
-On the left of the *Information Box* is a vertical bar graph indicating the
+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
 applicable) that the diver was inhaling _at a particular instant during the
-dive_, indicated by the position of the cursor on the *Dive Profile*. The
+dive_. It is shown by the position of the cursor on the *Dive Profile*. The
 drawing on the left below indicates the meaning of the different parts of
 the Gas Pressure Bar Graph.
 
 image::images/GasPressureBarGraph.jpg["FIGURE:Gas Pressure bar Graph", align="center"]
 
 - The light green area indicates the total gas, with the top margin of the
-  light green area indicating the total gas pressure inhaled by the diver and
+  light green area showing the total gas pressure inhaled by the diver and
   measured from the bottom of the graph to the top of the light green
   area. This pressure has a _relative_ value in the graph and does not
   indicate absolute pressure.
@@ -2395,20 +2317,20 @@ image::images/GasPressureBarGraph.jpg["FIGURE:Gas Pressure bar Graph", align="ce
   *Subsurface*.
 
 - 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
+  M-value. That is the pressure value of inert gases at which bubble formation
   is expected to be severe, resulting in decompression sickness.
 
-These five values are indicated on the left in the graph above. The way the
-Gas Pressure Bar Graph changes during a dive is indicated on the right hand
-side of the above figure for a diver using EAN32.
+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
+of the above figure for a diver using EAN32.
 
-- Graph *A* indicates the situation at the start of a dive with diver at the
-  surface. The pressures in all the tissue compartments are still at the
-  equilibrium pressure because no diving has taken place.
+- 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
+  pressure because no diving has taken place.
 
 - Graph *B* indicates the situation after a descent to 30 meters. Few of the
-  tissue compartments have had time to respond to the descent, their gas
-  pressures being far below the equilibrium gas pressure.
+  tissue compartments have had time to respond to the descent, so their gas
+  pressures are far below the equilibrium gas pressure.
 
 - 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
@@ -2416,11 +2338,11 @@ side of the above figure for a diver using EAN32.
   (towards the right) have not reached equilibrium and are in the process of
   slowly increasing in pressure.
 
-- 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
+- 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
   bar to 1.45 bar, the pressures in the different tissue compartments now
-  exceed that of the total gas pressure and approaches the gradient factor
-  value (i.e.  the top black horizontal line). Further ascent will result in
+  exceed that of the total gas pressure and approach the gradient factor value
+  (i.e.  the top black horizontal line). Further ascent will result in
   exceeding the gradient factor value (GFHigh), endangering the diver.
 
 - Graph *E* indicates the situation after remaining at 4.5 meters for 10
@@ -2431,19 +2353,19 @@ side of the above figure for a diver using EAN32.
 
 
 
-== Organising the logbook (Manipulating groups of dives)
+== Organizing the logbook (Manipulating groups of dives)
 
 === The Dive List context menu
 
-Several actions on either a single dive or a group of dives can be performed
-using the Dive List Context Menu, found by selecting either a single dive or
-a group of dives and then right-clicking.
+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
+a single dive or a group of dives and then right-clicking.
 
 image::images/ContextMenu.jpg["Figure: Context Menu", align="center"]
 
-The context menu is used in many manipulations described below.
+The context menu is used in many functions described below.
 
-==== Customising the columns showed in the *Dive List* panel
+==== Customizing the columns showed in the *Dive List* panel
 
 image::images/DiveListOptions.jpg["Example: Dive list info options", align="center"]
 
@@ -2452,8 +2374,8 @@ Dive_number, Date, Rating, Dive_depth, Dive_duration and Dive_location. This
 information can be controlled and changed by right-clicking on the header
 bar of the *Dive List*. For instance, a right-click on the 'Date' header
 brings up a list of items that can be shown in the dive list (see
-above). Select an item to be shown in the *Dive List* or to be deleted from
-the dive list (reflected by the check symbols) and the list is immediately
+above). Select an item to be shown in the *Dive List* or be deleted
+(reflected by the check symbols) and the list is immediately
 updated. Preferences for information shown in the *Dive List* are saved and
 used when _Subsurface_ is re-opened.
 
@@ -2461,64 +2383,60 @@ used when _Subsurface_ is re-opened.
 === Renumbering the dives
 
 Dives are normally numbered incrementally from non-recent dives (low
-sequence numbers) to recent dives (having the highest sequence numbers). The
-numbering of the dives is not always consistent. For instance, when
-non-recent dives are added to the dive list the numbering does not
-automatically follow on because of the dives that are more recent in
-date/time than the newly-added dive with an older date/time. Therefore, one
-may sometimes need to renumber the dives.  This is performed by selecting
-(from the Main Menu) _Log -> Renumber_. Users are given a choice with
-respect to the lowest sequence number to be used.  Completing this operation
-results in new sequence numbers (based on date/time)  for the dives in the
-*Dive List* panel.
-
-One can also renumber a few selected dives in the dive list. Select the
+sequence numbers) to recent dives (higher sequence numbers).  Numbering of
+dives is not always consistent. For instance, when non-recent dives are
+added, correct numbering does not automatically follow on because of the
+dives that are more recent in date/time than the newly-added dive with an
+older date/time. So you may need to renumber the dives.  Do this by
+selecting (from the Main Menu) _Log -> Renumber_. Users are given a choice
+of the lowest sequence number to be used.  This results in new sequence
+numbers (based on date/time)  for the dives in the *Dive List* panel.
+
+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
 Dive List Context Menu to perform the renumbering. A popup window appears
-requiring the user to specify the starting number for the renumbering
-process.
+letting the user specify the starting number for the process.
 
 [[S_Group]]
 === Grouping dives into trips and manipulating trips
 
 For regular divers, the dive list can rapidly become very long. _Subsurface_
-can group dives into _trips_. It performs this by grouping dives that have
-date/times not separated in time by more than two days, thus creating a
-single heading for each diving trip represented in the dive log. Below is an
+can group dives into _trips_. It does this by grouping dives that have
+date/times not separated in time by more than two days, so creating a single
+heading for each diving trip represented in the dive log. Below is an
 ungrouped dive list (*A*, on the left) as well as the corresponding grouped
-dive list comprising five dive trips (*B*, on the right):
+dive list of five dive trips (*B*, on the right):
 
 image::images/Group2.jpg["Figure: Grouping dives", align="center"]
 
 Grouping into trips allows a rapid way of accessing individual dives without
-having to scan a long lists of dives. In order to group the dives in a dive
-list, (from the Main Menu) select _Log -> Autogroup_. The *Dive List* panel
-now shows only the titles for the trips.
+having to scan a long lists of dives. To group the dives in a dive list,
+(from the Main Menu) select _Log -> Autogroup_. The *Dive List* panel now
+shows only the titles for the trips.
 
 ==== Editing the title and associated information for a particular trip
 
 Normally, in the dive list, minimal information is included in the trip
 title.  More information about a trip can be added by selecting its trip
 title from the *Dive List*. This shows a *Trip Notes* tab in the *Notes*
-panel. Here one can add or edit information about the date/time, the trip
+panel. Here you can add or edit information about the date/time, the trip
 location and any other general comments about the trip as a whole (e.g. the
-dive company that was dived with, the general weather and surface conditions
+dive company that was used, the general weather and surface conditions
 during the trip, etc.).  After entering this information, select *Save* from
 the buttons at the top right of the *Trip Notes* tab. The trip title in the
 *Dive List* panel should now reflect the edited information.
 
 ==== Viewing the dives during a particular trip
 
-Once the dives have been grouped into trips, users can expand one or more
+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
-expands the selected trip, revealing the individual dives performed during
-the trip.
+expands the selected trip, revealing individual dives done during the trip.
 
 ==== Collapsing or expanding dive information for different trips
 
 After selecting a particular trip in the dive list, the context menu allows
-several possibilities to expand or collapse dives within trips. This
-includes expanding all trips and collapsing all trips.
+several options to expand or collapse dives within trips. This includes
+expanding all trips and collapsing all trips.
 
 ==== Merging dives from more than one trip into a single trip
 
@@ -2527,14 +2445,12 @@ by either merging the selected trip with the trip below or with the trip
 above. (Merge trip with trip below; Merge trip with trip above)
 
 ==== Splitting a single trip into more than one trip
-
-If a trip includes ten dives, the user can split this trip into two trips
-(trip 1: top 4 dives; trip 2: bottom 6 dives) by selecting and
-right-clicking the top four dives. The resulting context menu allows the
-user to create a new trip by choosing the option *Create new trip
-above*. The top four dives are then grouped into a separate trip. The
-figures below shows the selection and context menu on the left (A) and the
-completed action on the right (B):
+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
+top four dives. The resulting context menu lets the user create a new trip
+by choosing the option *Create new trip above*. The top four dives are then
+grouped into a separate trip. The figures below show the selection and
+context menu on the left (A) and the completed action on the right (B):
 
 image::images/SplitDive3a.jpg["FIGURE: Split a trip into 2 trips", align="center"]
 
@@ -2543,18 +2459,18 @@ image::images/SplitDive3a.jpg["FIGURE: Split a trip into 2 trips", align="center
 ==== Delete a dive from the dive log
 
 Dives can be permanently deleted from the dive log by selecting and
-right-clicking them to bring up the context menu, and then selecting *Delete
+right-clicking them to bring up the context menu, then selecting *Delete
 dive(s)*. Typically this would apply to a case where a user wishes to delete
 workshop calibration dives of the dive computer or dives of extremely short
 duration.
 
 ==== Unlink a dive from a trip
 
-Users can unlink dives from the trip to which they belong. In order to do
-this, select and right-click the relevant dives to bring up the context
-menu. Then select the option *Remove dive(s)  from trip*. The dive(s) now
-appear immediately above or below the trip to which they belonged, depending
-on the date and time of the unlinked dive.
+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
+the option *Remove dive(s)  from trip*. The dive(s) now appear immediately
+above or below the trip to which they belonged, depending on the date and
+time of the unlinked dive.
 
 ==== Add a dive to the trip immediately above
 
@@ -2563,22 +2479,20 @@ within a separate trip. To do this, select and right-click the dive(s) to
 bring up the context menu, and then select *Create new trip above*.
 
 ==== Shift the start time of dive(s)
-
-Sometimes it is necessary to adjust the start time of a dive. This may apply
-to situations where dives are performed in different time zones or when the
-dive computer has an erroneous time. In order to do this, select and
-right-click the dive(s) to be adjusted. This action brings up the context
-menu on which the *Shift times* option should be selected. User must then
-specify the time (in hours and minutes) by which the dives should be
-adjusted and click on the option indicating whether the time adjustment
-should be ealier or later.
+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
+computer has a wrong time. To do this, select and right-click the dive(s) to
+be adjusted. This brings up the context menu on which the *Shift times*
+option should be selected. You must then specify the time (in hours and
+minutes) by which the dives should be adjusted and click on the option of
+whether the time adjustment should be earlier or later.
 
 ==== Merge dives into a single dive
 
-Sometimes a dive is briefly interrupted, e.g. if a diver returns to the
-surface for a few minutes, resulting in two or more dives being recorded by
-the dive computer and appearing as different dives in the *Dive List*
-panel. Users can merge these dives onto a single dive by selecting the
+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
+recorded by the dive computer and appearing as different dives in the *Dive
+List* panel. You can merge these dives onto a single dive by selecting the
 appropriate dives, right-clicking them to bring up the context menu and then
 selecting *Merge selected dives*. It may be necessary to edit the dive
 information in the *Notes* panel to reflect events or conditions that apply
@@ -2599,45 +2513,45 @@ _Redo_ an action.
 [[S_Filter]]
 === Filtering the dive list
 
-The dives in the *Dive List* panel can be filtered, that is, one can select
-only some of the dives based on their attributes, e.g. dive tags, dive site,
-dive master, buddy or protective clothing. For instance, filtering allows
-one to list the deep dives at a particular dive site, or otherwise the cave
-dives with a particular buddy.
+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
+master, buddy or protective clothing. For instance, filtering lets you list
+the deep dives at a particular dive site, or otherwise the cave dives with a
+particular buddy.
 
 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
 are located at the top right hand of the filter panel (see image below). The
 _Filter Panel_ can be reset (i.e. all current filters cleared) by selecting
-the *yellow angled arrow*. The _Filter Panel_ may also be minimised by
-selecting the *green up-arrow". When minimised, only these three icons are
-shown.  The panel can be maximised by clicking the icon that minimised the
-panel. The filter may also be reset and closed by selecting the *red button*
+the *yellow angled arrow*. The _Filter Panel_ may also be minimized by
+selecting the *green up-arrow". When minimized, only these three icons are
+shown.  The panel can be maximized by clicking the same icon that minimized
+it. The filter may also be reset and closed by selecting the *red button*
 with the white cross.
 
 image::images/Filterpanel.jpg["Figure: Filter panel", align="center"]
 
 Four filter criteria may be used to filter the dive list: dive tags, person
-(buddy / dive master), dive site and dive suit, each of which is represented
+(buddy / divemaster), dive site and dive suit.  Each of these is represented
 by a check list with check boxes. Above each check list is a second-level
-filter tool, allowing the listing of only some of the attributes within that
-check list. For instance, typing "_ca_" in the filter textbox above the tags
-check list results in the tags check list being reduced to "_cave_" and
-"_cavern_". Filtering of the check list enables the rapid finding of search
-terms for filtering the dive list.
+filter tool, allowing the listing of only some attributes within that check
+list. For instance, typing "_ca_" in the filter text box above the tags
+check list, results in the list being reduced to "_cave_" and
+"_cavern_". Filtering the check list helps to rapidly find search terms for
+filtering the dive list.
 
 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
 dives that pertain to the criteria specified in the check lists.  The four
-check lists work as a filter with _AND_ operators, Subsurface filters
-therefore for _cave_ as a tag AND _Joe Smith_ as a buddy; but the filters
+check lists work as a filter with _AND_ operators. Subsurface filters
+therefore for _cave_ as a tag AND _Joe Smith_ as a buddy. But the filters
 within a category are inclusive - filtering for _cave_ and _boat_ shows
 those dives that have either one OR both of these tags.
 
 [[S_ExportLog]]
 == Exporting the dive log or parts of the dive log
 
-There are two routes for the export of dive information from Subsurface:
+There are two ways to export dive information from Subsurface:
 
 - Exporter les informations de plongée vers _Facebook_
 
@@ -2647,45 +2561,41 @@ There are two routes for the export of dive information from Subsurface:
 [[S_facebook]]
 === Export des informations de plongée vers _Facebook_
 
-L'export des plongées vers _Facebook_ est géré différemment des autres types
-d'export 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
-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_.
+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.
 
 image::images/facebook1_f20.jpg["Figure: Facebook login", align="center"]
 
-From the _Subsurface_ window it is easy to determine whether _Subsurface_
-has a valid connection to _Facebook_ From the *Main Menu*, select _Share on
--> Facebook_ (image *A*, below). Normally, the _Facebook_ option is greyed
+From the _Subsurface_ window it’s easy to determine whether _Subsurface_ has
+a valid connection to _Facebook_ From the *Main Menu*, select _Share on ->
+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 colour and can be selected).
-
-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 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.
+(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.
 
 image::images/facebook2_f20.jpg["Figure: Facebook login", align="center"]
 
@@ -2695,8 +2605,8 @@ 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
-For non-_Facebook exports_, the export function can be reached by selecting
+=== Export dive information to other destinations or 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
 List* panel of _Subsurface_. Click the appropriate radio button (see images
@@ -2713,13 +2623,13 @@ A dive log or part of it can be saved in three formats:
   dive computers and computer programs.
 
 * _Divelogs.de_, an Internet-based dive log repository. In order to upload to
-  _Divelogs.de_, one needs a user-ID as well as a password for
+  _Divelogs.de_, you need a user-ID as well as a password for
   _Divelogs.de_. Log into _http://en.divelogs.de_ and subscribe to this
-  service in order to upload dive log data from _Subsurface_.
+  service to upload dive log data from _Subsurface_.
 
-* _DiveShare_ is also a dive log repository on the Internet focusing on the
-  recreational dives. In order to upload dives one has to provide a used ID,
-  so registration with _http://scubadiveshare.com_ is required.
+* _DiveShare_ is also a dive log repository on the Internet focusing on
+  recreational dives. To upload dives, you need a user ID, so registration
+  with _http://scubadiveshare.com_ is required.
 
 * _CSV dive details_, that includes the most critical information of the dive
   profile. Included information of a dive is: dive number, date, time, buddy,
@@ -2738,14 +2648,14 @@ A dive log or part of it can be saved in three formats:
   pressure, gas pressures and MOD. The HTML export contains a search option to
   search the dive log. HTML export is specified on the second tab of the
   Export dialog (image *B* above). A typical use of this option is to export
-  all one's dives to a smartphone or a tablet where it would serve as a very
-  portable record of dives useful for dive companies that wish to verify the
-  dive history of a diver, often doing away with the need to carry one's
-  original logbook with one when doing dives with dive companies.
+  all one's dives to a smartphone or a tablet where it would serve as a
+  portable record of dives. That is useful for dive companies that wish to
+  verify the dive history of a diver, often doing away with the need to carry
+  an original logbook when doing dives with dive companies.
 
 * _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 one
-  selects any of the dive sites on the map, a summary of the dive is available
+  some information about it are indicated. This map is not editable. If you
+  select any of the dive sites on the map, a summary of the dive is available
   in text, as shown in the image below.
 
 image::images/mapview_f20.jpg["Figure: HTML Map export view", align="center"]
@@ -2753,8 +2663,8 @@ image::images/mapview_f20.jpg["Figure: HTML Map export view", align="center"]
 
 * _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
-  List_, together with the depth under water where of each of those photos
-  were taken.
+  List_, together with the depth underwater where of each of those photos was
+  taken.
 
 * _General Settings_, under the HTML tab, provides the following options:
 
@@ -2769,27 +2679,26 @@ image::images/mapview_f20.jpg["Figure: HTML Map export view", align="center"]
 * Under _Style Options_ some style-related options are available like font
   size and theme.
 
-Export to other formats can be achieved through third party facilities, for
+Export to other formats can be done through third party facilities, for
 instance _www.divelogs.de_.
 
 [[S_Cloud_access]]
 == Keeping a _Subsurface_ dive log in the Cloud
 
 For each diver, dive log information is highly important. Not only is it a
-record of diving activities for one's own pleasure, but it is important
-information required for admission to further training courses or
-(sometimes) even diving sites. The security of the dive log is therefore
-critical. In order to have a dive log that is resistant to failure of a home
-computer hard drive, loss or theft of equipment, the Cloud is an obvious
-solution. This also has the added benefit that one can access one's dive log
-from anywhere in the world without having to carry it with oneself. For this
+record of diving activities for one's own pleasure, but it’s important
+information required for admission to training courses or sometimes even
+diving sites. The security of the dive log is critical. To have a dive log
+that is resistant to failure of a home computer hard drive, loss or theft of
+equipment, the Cloud is an obvious solution. This also has the added benefit
+that you can access your dive log from anywhere in the world. For this
 reason, facilities such as _divelogs.de_ and _Diving Log_ offer to store
 dive log information on the Internet.
 
 _Subsurface_ includes access to a transparently integrated cloud storage
 back end that is available to all Subsurface users. Storing and retrieving a
 dive log from the cloud is no more difficult than accessing the dives on the
-local hard disk.  The only requirement is that one should first register as
+local hard disk.  The only requirement is that you should first register as
 a user on the cloud.  To use _Subsurface cloud storage_ , follow these
 steps:
 
@@ -2813,45 +2722,45 @@ will be marked as verified and the _Subsurface cloud storage_ service is initial
 
 === Using _Subsurface cloud storage_
 
-** Once the cloud storage has been initialised, two new items appear in the
+** Once the cloud storage has been initialized, two new items appear in the
    _File_ menu of the main menu system: _Open cloud storage_ and _Save to cloud storage_.
-These options allow the user to load and save data to the _Subsurface
+These options let you load and save data to the _Subsurface
 cloud storage_ server.
-** In the _Defaults Preferences_ tab, one can select to use the _Subsurface cloud
-storage_ data as one's default data file by checking the check box marked _Cloud storage default file_.
- This means that the data from
-the _Subsurface cloud storage_ is loaded when _Subsurface_ starts ans saved there when one closes _Subsurface_.
+** In the _Defaults Preferences_ tab, you can select to use the _Subsurface cloud
+storage_ data as the default data file by checking the box marked _Cloud storage default file_.
+ This means the data from
+the _Subsurface cloud storage_ is loaded when _Subsurface_ starts and saved there when _Subsurface_ closes.
 
 ** _Subsurface_ keeps a local copy of the data and the cloud facility remains fully
-functional even if used while disconnected to the Internet. _Subsurface_ simply synchronises the
-data with the cloud server the next time ithe program is used while the computer is
+functional even if used while disconnected to the Internet. _Subsurface_ simply synchronizes the
+data with the cloud server the next time the program is used while the computer is
 connected to the Internet.
 
 [[S_Cloud_storage]]
 === Web access to _Subsurface cloud storage_
 
 One of the nice side benefits of using _Subsurface cloud storage_ is that
-one can also access one's dive data from any web browser. Simply open
+you can also access your dive data from any web browser. Simply open
 https://cloud.subsurface-divelog.org[_https://cloud.subsurface-divelog.org_],
 log in with the same email and password, and you can see an HTML export of
-the last dive data that was synced to the _Subsurface cloud storage_. The
-dive information that is shown is only the contents of the recorded dive
-logs, NOT the calculated values shown in the *Profile* panel, including some
-cylinder pressures, deco ceilings and O~2~/He/N~2~ partial pressures.
+the last dive data that was synced to _Subsurface cloud storage_. The dive
+information shown is only the contents of the recorded dive logs, NOT the
+calculated values shown in the *Profile* panel, including some cylinder
+pressures, deco ceilings and O~2~/He/N~2~ partial pressures.
 
 === Other cloud services
 
-If one prefers not to use the integrated cloud storage of dive logs (and
-don't need the web access), it is also simple to store dive logs in the
-cloud using several of the existing facilities on the Internet.  For
-instance http://www.dropbox.com/[_Dropbox_] offers a free application that
-allows files on the Dropbox servers to be seen as a local folder on one's
-desktop computer.
+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
+using several of the existing facilities on the Internet.  For instance
+http://www.dropbox.com/[_Dropbox_] offers a free application that allows
+files on the Dropbox servers to be seen as a local folder on a desktop
+computer.
 
 image::images/Cloud.jpg["FIGURE: Dropbox folder", align="center"]
 
 The _Dropbox_ program creates a copy of the _Dropbox_ Internet Cloud content
-on one's desktop computer. When the computer is connected to the Internet,
+on your desktop computer. When the computer is connected to the Internet,
 the Internet content is automatically updated. Therefore both the _Open_ and
 _Save_ of dive logs are done using the local copy of the dive log in the
 local _Dropbox_ folder, so there's no need for a direct internet
@@ -2859,17 +2768,17 @@ connection. If the local copy is modified, e.g. by adding a dive, the remote
 copy in the _Dropbox_ server in the Cloud will be automatically updated
 whenever Internet access is available.
 
-In this way a dive log in one's _Dropbox_ folder can be accessed seamlessly
-from the Internet and can be accessed from any place with Internet
+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. Currently there are no costs involved for this service. Dropbox
 (Windows, Mac and Linux) can be installed by accessing the
 http://www.dropbox.com/install[_Install Page on the Dropbox website_]
-Alternatively one can use _Dropbox_ as a mechanism to backup one's dive
-log. To Store a dive log on _Dropbox_, select _File -> Save as_ from the
-_Subsurface_ main menu, navigate to the _Dropbox_ folder and select the
-_Save_ button. To access the dive log in _Dropbox_, select _File -> Open
-Logbook_ from the _Subsurface_ main menu and navigate to the dive log file
-in the _Dropbox_ folder and select the _Open_ button.
+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
+menu, navigate to the _Dropbox_ folder and select the _Save_ button. To
+access the dive log in _Dropbox_, select _File -> Open Logbook_ from the
+_Subsurface_ main menu and navigate to the dive log file in the _Dropbox_
+folder and select the _Open_ button.
 
 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.
@@ -2878,21 +2787,20 @@ same process could be used for the Cloud-based storage of dive logs.
 [[S_PrintDivelog]]
 == Printing a dive log
 
-_Subsurface_ provides a simple and flexible interface to print a whole dive log or only a few selected dives.
+_Subsurface_ provides a simple and flexible way to print a whole dive log or only a few selected dives.
   Pre-installed templates or a custom written template can be used to choose where the data are fitted into the page.
 
-Before printing, two decisions are required:
+Some decisions need to be made before printing:
 
-- Should the whole dive log be printed or only part of it? If only part of the
-  dive log is required, then select the required dives from the *Dive List*
-  panel.
-- If the dive profiles needs printing, what gas partial pressure information
+- 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.
+- If the dive profiles are printed, what gas partial pressure information
   should be shown? Select the appropriate toggle-buttons on the button bar to
   the left of the *Dive Profile* panel.
 
-If _File -> Print_ is selected from the Main menu, the the dialogue below
-(image *A*) appears. Three specifications are needed to achieve the desired
-information and page layout:
+If _File -> Print_ is selected from the Main menu, the dialogue below (image
+*A*) appears. Three specifications are needed to get the desired information
+and page layout:
 
 image::images/Print1_f22.jpg["FIGURE: Print dialogue", align="center"]
 
@@ -2904,14 +2812,14 @@ image::images/Print1_f22.jpg["FIGURE: Print dialogue", align="center"]
 
 2. Under _Print options_ select:
 
-- Printing only the dives selected from the dive list prior to activating the
+- Printing only the dives selected from the dive list before activating the
   print dialogue by checking the box _Print only selected dives_. If this
-  check box is *not* checked all dives in the *Dive List* panel are printed.
-- Printing in colour, achieved by checking the box with _Print in colour_. If
-  this check box is not checked, printing is in monochrome (grey scale).
+  check box is *not* checked ALL dives in the *Dive List* panel are printed.
+- 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.
 
 Under _Template_ select a template to be used as the page layout. There are
-several templates (see image *B*, above).
+several choices.  (see image *B*, above).
 
 - _Table_: This prints a summary table of all dives selected (see below).
 
@@ -2932,15 +2840,15 @@ image::images/print2_f22.jpg["FIGURE: Print one dive / page", align="center"]
 - _Two Dives_: Print two dives per page, also showing the dive profiles.
 - _Six Dives_: Print six dives per page, also showing the dive profiles.
 
-Users can _Preview_ the printed page by selecting the _Preview_ button on
-the dialogue (see image *A* at the start of this section). After preview,
-changes to the options in the print dialogue can be made, resulting in a
-layout that fits personal taste.
+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
+can change the options in the print dialogue, so the layout fits personal
+taste.
 
 Next, select the _Print_ button (see image *A* at the start of this
-section). This activates the regular print dialogue used by the user
-operating system, allowing one to choose a printer and to set its properties
-(see image below):
+section). This activates the regular print dialogue used by the operating
+system, letting you choose a printer and set its properties (see image
+below):
 
 image::images/Print_print_f22.jpg["FIGURE: Print dialog", align="center"]
 
@@ -2954,7 +2862,7 @@ image::images/Printpreview.jpg["FIGURE: Print preview page", align="center"]
 === Créer un modèle d'impression personnalisé (avancé)
 
 Writing a custom template is an effective way to produce highly customized
-printouts. Subsurface uses HTML templates to render printing. One can create
+printouts. Subsurface uses HTML templates to render printing. You can create
 a template, export a new template, import an existing template and delete an
 existing template by using the appropriate buttons under the _Template_
 dropdown list in the print dialogue. See <<S_APPENDIX_E,APPENDIX E>> for
@@ -2963,16 +2871,16 @@ information on how to write or modify a template.
 [[S_Configure]]
 == Configurer un ordinateur de plongée
 
-_Subsurface_ permet de configurer son ordinateur de plongée. Actuellement,
-les familles d'ordinateurs supportés sont Heinrichs-Weikamp (OSTC 2, OSTC 3)
-et Suunto Vyper (Stinger, Mosquito, D3, Vyper, Vytec, Cobra, Gekko et
-Zoop). De nombreux paramètres de ces ordinateurs de plongée peuvent être
-lues et modifiées. La première étape est de s'assurer que les pilotes pour
-votre ordinateur de plongée sont installés (é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.
+_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.
 
 Une fois que l'ordinateur de plongée est connecté à _Subsurface_,
 sélectionner _Fichier -> Configurer l'ordinateur de plongée_, à partir du
@@ -2982,8 +2890,8 @@ plongée à partir du panneau à gauche (voir l'image ci-dessous).
 
 image::images/Configure_dc_f20.jpg["FIGURE: Configure dive computer", align="center"]
 
-En utilisant les boutons appropriés du panneau de configuration, les actions
-suivantes peuvent être réalisées :
+Using the appropriate buttons on the configuration panel, the following
+actions can be done:
 
  - *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.
@@ -3001,13 +2909,13 @@ suivantes peuvent être réalisées :
 == Setting user _Preferences_ for _Subsurface_
 
 There are several user-definable settings within _Subsurface_, found by
-selecting _File -> Preferences_. The settings are performed in seven groups:
+selecting _File -> Preferences_. The settings are in seven groups:
 *Defaults*, *Units*, *Graph*, *Language* and *Network*, *Facebook* and
-*Georeference*, all of which operate on the same principles: the user must
-specify the settings that are to be changed, then these changes are saved
-using the *Apply* button. After applying all the new settings users can then
-leave the settings panel by selecting *OK*. If *Discard* is selected,
-changes to the preferences are not saved.
+*Georeference*.  All operate on the same principles: the user must specify
+settings that are to be changed, then save them using the *Apply*
+button. After applying all the new settings users can then leave the
+settings panel by selecting *OK*. If *Discard* is selected, changes to the
+preferences are not saved.
 
 === Defaults
 
@@ -3015,18 +2923,18 @@ There are several settings in the *Defaults* panel:
 
 image::images/Pref1_f20.jpg["FIGURE: Preferences defaults page", align="center"]
 
-  ** *Lists and tables*: Here one can specify the font type and font size of the
-     *Dive Table* panel. By decreasing the font size of the *Dive Table*, users can see more dives on a screen.
+  ** *Lists and tables*: Here you can specify the font type and font size of the
+     *Dive Table* panel: By decreasing the font size of the *Dive Table*, you can see more dives on a screen.
 
-  ** *Dives*: For the _Default Dive File_ one needs to specify the directory and
-     file name of one's
+  ** *Dives*: For the _Default Dive File_ you need to specify the directory and
+     file name of your
      electronic dive log book. This is a file with filename extension of either _.xml_ or _.ssrf_. When
      launched, _Subsurface_ will automatically load the specified dive log book. There are three options:
      - _No default file_: When checked, _Subsurface_ does not automatically load a dive log at startup.
      - _Local default file_: When checked, _Subsurface_ automatically loads a dive log from the local hard disk
        as described above.
      - _Cloud storage default file_: When checked, _Subsurface automatically loads the dive log from the cloud
-       device that was initialised using the *Preferences* _Network_ tab (see below).
+       device that was initialized using the *Preferences* _Network_ tab (see below).
 
   ** *Display invalid*:  Dives can be marked as invalid (when a user wishes to hide
      dives that he/she doesn't consider valid dives, e.g. pool dives, but still want to
@@ -3050,14 +2958,14 @@ image::images/Pref1_f20.jpg["FIGURE: Preferences defaults page", align="center"]
 === Units
 image::images/Pref2_f20.jpg["FIGURE: Preferences Units page", align="center"]
 
-Here users can choose between metric and imperial units of depth, pressure,
+Here you can choose between metric and imperial units of depth, pressure,
 volume, temperature and mass. By selecting the Metric or Imperial radio
-button at the top, one can specify that all units are in the chosen
-measurement system.  Alternatively, if one selects the *Personalise* radio
-button, units can be selected independently, with some units in the metric
-system and others in imperial.
+button at the top, you can specify that all units are in the chosen
+measurement system.  Alternatively, if you select the *Personalize* radio
+button, units can be selected independently, with some in the metric system
+and others in imperial.
 
-Irrespective of the above settings, dive time measurements can be either in
+Regardless of the above settings, dive time measurements can be either in
 seconds or minutes.  Choose the appropriate option. GPS coordinates can be
 represented either as traditional coordinates (degrees, minutes, seconds) or
 as decimal degrees Choose the appropriate option.
@@ -3069,24 +2977,26 @@ image::images/Pref3_f20.jpg["FIGURE: Preferences Graph page", align="center"]
 [[S_GradientFactors]]
 This panel allows two type of selections:
 
-*Show*: Here users can specify the amount of information shown as part of
+*Show*: Here you can specify the amount of information shown as part of
 the dive profile:
 ** Thresholds: _Subsurface_ can display the nitrogen, oxygen and the helium partial pressures during
-   the dive, enabled by using the toolbar on the left hand side of the *Dive Profile*
-   panel. For each of these graphs users can specify a threshold value on the right-hand side of the
+   the dive, done by using the toolbar on the left hand side of the *Dive Profile*
+   panel. For each of these graphs you can specify a threshold value on the right-hand side of the
    Preferences panel. If any of the graphs go above the specified threshold level, the graph is
-   highlighted in red, indicating that the particular partial pressure threshold has been exceeded.
+   highlighted in red, indicating the particular partial pressure threshold has been exceeded.
 ** _Max pO~2~ is used for calculating the MOD when displaying the maximum operative depth (MOD)
    for a dive. Specify an appropriate partial pressure. A value of 1.4 is commonly used.
-** _Draw dive computer reported ceiling red_: This checkbox allows exactly what it says. By default
+** _Draw dive computer reported ceiling red_: This checkbox does exactly what it says. By default
    the computer reported ceiling is shown in white.
    Not all dive computers report ceiling values. If the dive computer does report it, it may differ
    from the ceilings calculated by _Subsurface_ because of the different algorithms and
-   gradient factors, as well as the dynamic way that a
-   dive computer can calculate ceilings during a dive.
-** _Show unused cylinders in Equipment Tab_: This checkbox allows display of information about unused cylinders when viewing the *Equipment Tab*. Conversely, if this box is not checked, and if any cylinders entered using the *Equipment Tab* are not used (e.g. there was no gas switch to such a cylinder), then these cylinders are omitted from that list.
-**  _Show average depth_: If this box is checked, the *Dive Profile* panel contains a grey line that indicates
-    the mean depth of the dive up to any time instant during the dive. Normally this is a u-shaped line indicating the deepest mean depth just before the
+   gradient factors, as well as the dynamic way a
+   dive computer calculates ceilings during a dive.
+** _Show unused cylinders in Equipment Tab_: This checkbox allows display of information about unused cylinders when viewing the
+*Equipment Tab*. If this box is not checked, and if any cylinders entered using the *Equipment Tab* are not used (e.g. there
+was no gas switch to such a cylinder), then these cylinders are omitted from that list.
+**  _Show average depth_: If this box is checked, the *Dive Profile* panel contains a grey line that shows
+    the mean depth of the dive, up to any time instant during the dive. Normally this is a u-shaped line indicating the deepest mean depth just before
    ascent.
 
 * *Misc*:
@@ -3095,8 +3005,8 @@ the dive profile:
 ** Gradient Factors (GFLow and GFHigh):* Set the _gradient factors_ used while diving. GF_Low is
    the gradient factor at depth and GF_High is used just below the surface.
    At intermediate depths gradient factors between GF_Low and GF_High are used.
-   Gradient factors add conservatism to the nitrogen exposure during a dive, in a
-   similar way that many dive computers have a conservatism setting. The lower
+   Gradient factors add conservatism to nitrogen exposure during a dive, in a
+   similar way that many dive computers have a conservative setting. The lower
    the value of a gradient factor, the more conservative the calculations are with
    respect to nitrogen loading and the deeper the ascent ceilings are. Gradient
    factors of 20/60 are considered conservative and values of 70/90 are considered
@@ -3108,8 +3018,8 @@ the dive profile:
 
  *** link:http://www.rebreatherworld.com/general-and-new-to-rebreather-articles/5037-gradient-factors-for-dummies.html[Gradient factors for dummies, by Kevin Watts]
 
- ** _CCR: Show setpoints when viewing pO2:_ With this checkbox ativated, the pO~2~
-    graph on the dive profile has an overlay in red which inticates the CCR setpoint
+ ** _CCR: Show setpoints when viewing pO2:_ With this checkbox activated, the pO~2~
+    graph on the dive profile has an overlay in red which indicates the CCR setpoint
     values. See the section on xref:S_CCR_dives[Closed Circuit Rebreather dives].
 
  ** _CCR: Show individual O~2~ sensor values when viewing pO~2~:_ Show the pO~2~
@@ -3123,7 +3033,7 @@ the dive profile:
     during a particular dive. Setpoint changes during the dive can be added via the
     profile context menu.
 
- ** _pSCR O~2~ metabolism rate:_ For a semiclosed rebreather (pSCR) system, this is the
+ ** _pSCR O~2~ metabolism rate:_ For a semi-closed rebreather (pSCR) system, this is the
     volume of oxygen used by a diver during a minute. Set this value for pSCR dive planning
     and decompression calculations.
 
@@ -3137,22 +3047,21 @@ Choose a language that _Subsurface_ will use.
 
 image::images/Pref4_f20.jpg["FIGURE: Preferences Language page", align="center"]
 
-A checkbox allows one to use the _System Default_ language which in most
-cases will be the correct setting; with this _Subsurface_ simply runs in the
-same language / country settings as the underlying operating system. If this
-is for some reason undesirable one can uncheck this checkbox and pick a
-language / country combination from the list of included localizations. The
-_Filter_ text box allows one to list similar languages. For instance there
-are several system variants of English or French. *This particular
-preference requires a restart of _Subsurface_ to take effect*.
+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
+language / country settings as the underlying operating system.  To change
+it, uncheck this checkbox and pick a language / country combination from the
+list of locations. The _Filter_ text box lists similar languages. For
+instance there are several system variants of English or French. *This
+particular preference requires a restart of _Subsurface_ to take effect*.
 
 === Network
 This panel facilitates communication between _Subsurface_ and data sources
 on the Internet.  This is important, for instance, when _Subsurface_ needs
-to communicate with Internet services such as Cloud storage or the
+to communicate with web services such as Cloud storage or the
 <<S_Companion,_Subsurface Companion app_>>. These Internet requirements are
-determined by one's type of connection to the Internet and by the Internet
-Service Provider (ISP) used.  One's ISP should provide the appropriate
+determined by your type of connection to the Internet and by the Internet
+Service Provider (ISP) used.  Your ISP should provide the appropriate
 information.
 
 image::images/Pref5_f20.jpg["FIGURE: Preferences Network page", align="center"]
@@ -3167,54 +3076,52 @@ password are required so that _Subsurface_ can automatically pass
 through the proxy server to access the Internet. This information is usually obtained
 from one's ISP.
 
-** _Subsurface cloud storage_: To store one's dive log in the cloud, a valid email address
-   and password are required. This allows _Subsurface_ to email security information
-   regarding cloud storage to a user, and to set up the cloud storage appropriately.
+** _Subsurface cloud storage_: To store your dive log in the cloud, a valid email address
+   and password are required. This lets _Subsurface_ email security information
+   regarding cloud storage to you, and to set up cloud storage appropriately.
    Two additional options are given:
    - _Sync to cloud in the background_: This option allows saving of dive information to the cloud storage
-   while the user performs other tasks within _Subsurface_.
+   while you do other things within _Subsurface_.
    - _Save password locally_: This allows local storage of the cloud storage password. Note that this
    information is saved in raw text form, not encoded in any way.
 
-** _Subsurface web service_: When one subscribes to the <<S_Companion,Subsurface web service>>, a very
+** _Subsurface web service_: When you subscribe to the <<S_Companion,Subsurface web service>>, a very
      long and hard-to-remember userID is issued. This is the place to save that userID. By
-     checking the option _Save User ID locally?_, one ensures that a local copy of that userID
-     is saved.
+     checking the option _Save User ID locally?_, you ensure a local copy of that userID is saved.
 
 
 [[S_Facebook]]
-=== Accès Facebook
-Ce panneau vous permet de vous connecter à votre compte Facebook pour
-transférer des informations de Subsurface vers Facebook.
+=== Facebook Access
+This panel lets you log into a Facebook account in order to transfer
+information from Subsurface to Facebook.
 
 image::images/Pref6_f20.jpg["FIGURE: Facebook login panel", align="center"]
 
-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.
+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.
 
 === Georeference
 
 _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
+of a dive site) derived from a click on the *Dive Map panel* at the bottom
 right of the _Subsurface_ window, or from a GPS instrument or from the
-_Subsurface_ Companion app), a lookup on the Internet is performed to find
-the name of the closest known location. Obviously this function only works
-if _Subsurface_ has an Internet connection. The preference of the dive site
-name can be configured, e.g. _Country/State/City_ or _City/State/Country_
-(see image below).
+_Subsurface_ Companion app). A search on the Internet is done to find the
+name of the closest known location. This function only works if _Subsurface_
+has an Internet connection. The preference of the dive site name can be
+configured, e.g. _Country/State/City_ or _City/State/Country_ (see image
+below).
 
 image::images/Pref7_f20.jpg["FIGURE: Facebook login panel", align="center"]
 
 [[S_DivePlanner]]
 == The _Subsurface_ dive planner
-Dive planning is an advanced feature of _Subsurface_, accessible by
-selecting _Log -> Plan Dive_ from the main menu. It allows calculation of
-nitrogen load during a dive by using the Bühlmann ZH-L16 algorithm with the
-addition of gradient factors as implemented by Erik Baker.
+Dive planning is an advanced feature of _Subsurface_, accessed by selecting
+_Log -> Plan Dive_ from the main menu. It allows calculation of nitrogen
+load during a dive by using the Bühlmann ZH-L16 algorithm with the addition
+of gradient factors as implemented by Erik Baker.
 
 ****
 [icon="images/icons/warning2.png"]
@@ -3241,12 +3148,11 @@ used under the following conditions:
 
 Like the _Subsurface_ dive log, the planner screen is divided into several
 sections (see image below). The *setup* parameters for a dive are entered
-into the several sections on the left hand side of the screen.  The setup is
-divided into several sections: Available Gases, Rates, Planning, Gas Options
-and Notes.
+into the sections on the left hand side of the screen.  They are: Available
+Gases, Rates, Planning, Gas Options and Notes.
 
-At the top right hand is a green *design panel* upon which the profile of
-the dive can be manipulated directly by dragging and clicking as explained
+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
 below. This feature makes the _Subsurface_ dive planner unique in ease of
 use.
 
@@ -3260,17 +3166,17 @@ image::images/PlannerWindow1_f20.jpg["FIGURE: Dive planner startup window", alig
 
 === Open circuit dives
 
--  Towards the centre bottom of the planner (circled in blue in the image
+-  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:
  ** Open Circuit (the default)
  ** CCR
  ** pSCR
 
 - Choose the Open Circuit option.
-- In the top left-hand area of the planning screen, ensure that the constant
-  dive parameters are appropriate. These are: Start date and time of the
-  intended dive, Atmospheric Pressure and Altitude above sea level of the dive
-  site. The atmospheric pressure can also be entered as an altitude in metres,
+- 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
+  dive, Atmospheric Pressure and Altitude above sea level of the dive
+  site. The atmospheric pressure can also be entered as an altitude in meters,
   assuming a sea-level atmospheric pressure of 1.013 bar.
 
 - In the table labelled _Available Gases_, add the information of the
@@ -3285,11 +3191,11 @@ image::images/PlannerWindow1_f20.jpg["FIGURE: Dive planner startup window", alig
   the top right-hand of the dialogue.
 
 - The profile of the planned dive can be created in two ways:
- *  Drag the waypoints (the small white circles) on the existing dive profile in
-    a way to represent the dive. Additional waypoints can be created by
-    double-clicking the existing dive profile. Waypoints can be deleted by
-    right-clicking a particular waypoint and selecting the _delete_ item from
-    the resulting context menu.
+ *  Drag the waypoints (the small white circles) on the existing dive profile to
+    represent the dive. Additional waypoints can be created by double-clicking
+    the existing dive profile. Waypoints can be deleted by right-clicking a
+    particular waypoint and selecting the _delete_ item from the resulting
+    context menu.
  *  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
     table represents the duration and the final depth of the descent from the
@@ -3302,29 +3208,24 @@ image::images/PlannerWindow1_f20.jpg["FIGURE: Dive planner startup window", alig
 
 ==== Recreational dives
 
-Recreational mode is what comes closest to planning a dive based on the
-non-decompression limit (NDL).  It computes the maximal time a diver can
-stay at the current depth without incurring any mandatory decompression
-stops and without using more than the existing gas (minus a reserve). The
-planner automatically takes into account the nitrogen load incurred in
-previous dives. But conventional dive tables are also used in a way that can
-take into account previous dives. Why use a dive planner for recreational
-dives? Using recreational dive tables, the maximum depth of a dive is taken
-into account. However, few dives are undertaken at a constant depth
-corresponding to the maximum depth (i.e. a "square" dive profile). This
-means that dive tables overestimate the nitrogen load incurred during
-previous dives. The _Subsurface_ dive planner calculates nitrogen load
-according to the real dive profiles of all uploaded previous dives, in a
-similar way as dive computers calculate nitrogen load during a dive. This
-means that the diver gets 'credit' in terms of nitrogen loading for not
-remaining at maximum depth during previous dives, enabling planning of a
-longer subsequent dive. For the planner to work it is therefore crucial to
-upload all previous dives onto _Subsurface_ before performing dive planning.
-
+Recreational mode is what comes closest to planning a dive based on the non-decompression limit (NDL).
+It computes the maximum time a diver can stay at the current depth without needing mandatory decompression
+stops and without using more than the existing gas (minus a reserve). The planner automatically takes
+into account the nitrogen load incurred in previous dives. But conventional dive tables are also used in a
+way that can take into account previous dives. Why use a dive planner for recreational dives? Using
+recreational dive tables, the maximum depth of a dive is taken into account. But few dives are
+done at a constant depth corresponding to the maximum depth (i.e. a "square" dive profile). This means
+dive tables overestimate the nitrogen load incurred during previous dives. The _Subsurface_
+dive planner calculates nitrogen load according to the real dive profiles of all uploaded previous dives,
+in a similar way as dive computers calculate nitrogen load during a dive. This means that the diver gets 'credit,'
+in terms of nitrogen load, for not remaining at maximum depth during
+previous dives, so a longer subsequent dive can be planned.
+ For the planner to work it's crucial to upload all previous dives
+onto _Subsurface_ before doing dive planning.
 To plan a dive, the appropriate settings need to be defined.
 
-Ensure that the date and time is set to that of the intended dive. This
-allows calculation of the nitrogen load incurred during previous dives.
+Ensure the date and time is set to that of the intended dive. This allows
+calculation of the nitrogen load incurred during previous dives.
 
 - Immediately under the heading _Planning_ are two checkboxes _Recreational_
   and _Safety Stop_.  Check these two boxes.
@@ -3334,24 +3235,23 @@ allows calculation of the nitrogen load incurred during previous dives.
   _Available gases_.
 
 - The planner calculates whether the specified cylinder contains enough
-  air/gas to complete the planned dive. In order for this to be realistic,
+  air/gas to complete the planned dive. In order for this to be accurate,
   under _Gas options_, specify an appropriate surface air consumption (SAC)
   rate for _Bottom SAC_. Suitable values are between 15 l/min and 30 l/min,
   with novice divers or difficult dives requiring SAC rates closer to 30l/min.
 
-- Define the amount of gas that the cylinder must have at the end of the
-  bottom section of the dive just before ascent. A value of 50 bar is often
-  used. The reason for this reserve gas is to provide for the possible need to
-  bring one's buddy to the surface using gas sharing. How much gas is used in
-  sharing depends on the depth of the ascent. This can be a bit hard to
-  estimate, so most agencies assume a fixed amount of gas, or actually of
-  pressure e.g. 40 or 50 bar or 25% or 33% (rule of thirds). But _Subsurface_
-  can do better because it knows about the ascent and that is why we add the
-  amount of gas during the ascent (i.e. the "deco gas“).  Subsurface still
-  uses a fixed pressure „reserve“ but that is supposed to be for the
-  additional gas used around the realisation that there is a problem and one's
-  pulse rate goes up when one starts to buddy breathe. This reserve amount is
-  user configurable.
+- 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
+  reason for this reserve gas is to provide for the possible need to bring a
+  buddy to the surface using gas sharing. How much gas is used in sharing
+  depends on the depth of the ascent. This can be difficult to estimate, so
+  most agencies assume a fixed amount of gas, or actually of pressure e.g. 40
+  or 50 bar or 25% or 33% (rule of thirds). But _Subsurface_ can do better
+  because it knows about the ascent and that is why we add the amount of gas
+  during the ascent (i.e. the "deco gas“).  Subsurface still uses a fixed
+  pressure "reserve" but that's supposed to be for the additional gas used
+  when there's a problem and your pulse rate goes up when you start to buddy
+  breathe. This reserve amount is user configurable.
 
 - 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
@@ -3365,9 +3265,9 @@ allows calculation of the nitrogen load incurred during previous dives.
 - The ascent speed can be changed. The default ascent speeds are those
   considered safe for recreational divers.
 
-The dive profile in the planner indicates the maximum dive time within
-no-deco limits using the Bühlmann ZH-L16 algorithm and the gas and depth
-settings specified as described above. The _Subsurface_ planner allows rapid
+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
+specified as described above. The _Subsurface_ planner allows rapid
 assessment of dive duration as a function of dive depth, given the nitrogen
 load incurred during previous dives. The dive plan includes estimates of the
 amount of air/gas used, depending on the cylinder settings specified under
@@ -3378,36 +3278,36 @@ means that recreational dive limits are exceeded and either the dive
 duration or the dive depth needs to be reduced.
 
 Below is an image of a dive plan for a recreational dive at 30
-metres. Although the no-deco limit (NDL) is 23 minutes, the duration of the
-dive is limited by the amount of air in the cylinder, reflected by the
-information in the text box at the bottom right of the panel that requires
-sufficient air for buddy-sharing during the ascent.
+meters. Although the no-deco limit (NDL) is 23 minutes, the duration of the
+dive is limited by the amount of air in the cylinder. That is shown in the
+text box at the bottom right of the panel, requiring sufficient air for
+buddy-sharing during ascent.
 
 image::images/rec_diveplan.jpg["FIGURE: A recreational dive plan: setup", align="center"]
 
 ==== Non-recreational open circuit dives, including decompression
 
 Non-recreational dive planning involves exceeding the no-deco limits and/or
-using multiple breathing gases.  Such dives are planned in three stages:
+using multiple breathing gases.  These dives are planned in three stages:
 
-*a) Nitrogen management*: This is performed by specifying the rates for descent and ascent,
+*a) Nitrogen management*: This is done by specifying the rates for descent and ascent,
 as well as the deco model (GFLow, GFHigh or Conservatism level) under the headings _Rates_ and _Planning_
 to the bottom left of the planning screen. Two deco models are supported the Bühlmann model and the VPM-B
 model. Select one of the two models. When selecting the Bühlmann model, the gradient factors (GF_high and GF_low
 need to be specified. Initially, the GFHigh and GFLow values in the _Preferences_
 panel of _Subsurface_ is used. If these are changed within the planner (see _Gas Options_ within
 the planner), the new values are
-used without changing the original values in the _Preferences_. Gradient Factor settings strongly affect the calculated ceilings and their depths.
-A very low GFLow value brings about decompression stops early on during the dive.
+used without changing the original values in the _Preferences_.
+Gradient Factor settings strongly affect the calculated ceilings and their depths.
+A very low GFLow value brings on decompression stops early during the dive.
  ** For more information about Gradient factors, see the section on xref:S_GradientFactors[Gradient Factor Preference settings].
 
 If the VPM-B model is selected, the Conservatism_level needs to be specified
 on a scale of 0 (least conservative) to 4 (most conservative).  This model
 tends to give deco stops at deeper levels than the Bühlmann model and often
 results in slightly shorter dive durations than the Bühlmann model. When
-selecting one of these models, keep in mind that they are NOT exact
-physiological models but only mathematical models that appear to work in
-practice.
+selecting one of these models, keep in mind they are NOT exact physiological
+models but only mathematical models that appear to work in practice.
 
 For more information external to this manual see:
 
@@ -3421,14 +3321,14 @@ for Divers_, by Mark Powell (2008). Aquapress] Southend-on-Sea, UK. ISBN 10:
 modèles de décompression Bühlmann et VPM-B.
 
 The ascent rate is critical for nitrogen off-gassing at the end of the dive
-and is specified for several depth ranges, utilising the average (or mean)
-depth as a yardstick. The mean depth of the dive plan is indicated by a
-light grey line on the dive profile. Ascent rates at deeper levels are often
-in the range of 8-12 m/min, while ascent rates near the surface are often in
-the range of 4-9 m/min. The descent rate is also specified. If the option
-_Drop to first depth_ is activated, then the descent phase of the planned
-dive will be at the maximal descent rate specified in the _Rates_ section of
-the dive setup.
+and is specified for several depth ranges, using the average (or mean) depth
+as a yardstick. The mean depth of the dive plan is shown by a light grey
+line on the dive profile. Ascent rates at deeper levels are often in the
+range of 8-12 m/min, while ascent rates near the surface are often in the
+range of 4-9 m/min. The descent rate is also specified. If the option _Drop
+to first depth_ is activated, the descent phase of the planned dive will be
+at the maximal descent rate specified in the _Rates_ section of the dive
+setup.
 
 *b) Oxygen management*: In the *Gas Options* part of the dive specification, the maximum partial
 pressure for oxygen needs to be specified for the
@@ -3439,57 +3339,57 @@ stages. Normally, a partial pressure of 1.6 bar is not exceeded. PO2 settings an
 _Available Gases_ dialog. Normally the planner decides on switching to a new gas when, during
 ascent, the partial pressure of the new gas has increased to 1.6 bar.
 
-*c) Gas management*: With open-circuit dives this is a primary consideration. One needs to keep within the limits of the amount of gas within the dive
+*c) Gas management*: With open-circuit dives this is a primary
+consideration. Divers need to keep within the limits of the amount of
+gas within the dive
 cylinder(s), allowing for an appropriate margin for a safe return to the surface, possibly
 sharing with a buddy. Under the _Gas Options_ heading, specify the best (but conservative) estimate
 of your surface-equivalent air consumption (SAC, also termed RMV) in
-litres/min (for the time being, only SI units are supported).  Specify the SAC during the
+liters/min (for the time being, only SI units are supported).  Specify the SAC during the
 bottom part of the dive (_bottom SAC_) as well as during the decompression or safety stops of the
-dive (_deco SAC_). Values of 15-30 l/min are common. For good gas management, a thumbsuck guess
-is not sufficient and one needs to
-monitor one's gas consumption on a regular basis, dependent on different dive conditions and/or equipment.
+dive (_deco SAC_). Values of 15-30 l/min are common. For good gas management, a guess
+is not sufficient and you needs to
+monitor gas consumption on a regular basis, dependent on different dive conditions and/or equipment.
 The planner calculates the total volume of gas used during the dive and issues a warning
-if one exceeds the total amount of gas available. Good practice demands that one does not dive to
-the limit of the gas supply but that an appropriate reserve is kept for unforeseen circumstances.
+if you exceeds the total amount of gas available. Good practice demands that divers not dive to
+the limit of the gas supply but that an appropriate reserve is kept
+for unforeseen circumstances.
 For technical diving, this reserve can be up to 66% of the total available gas.
 
-Now (at last) one can start the detailed time-depth planning of the
-dive. _Subsurface_ offers a unique graphical interface for performing this
-part of the planning. The mechanics of doing this is similar to
-hand-entering a dive profile in the dive log part of _Subsurface_. Upon
-activating the planner, a default dive of depth 15 m for 40 min is offered
-in the bue design surface to the top right hand of the screen. The white
-dots (waypoints) on the profile can be dragged with a mouse. Create more
-waypoints by double-clicking on the profile line and ensuring that the
-profile reflects the intended dive. Drag the waypoints to represent the
-depth and duration of the dive. It is NOT necessary to specify the ascent
-part of the dive since the planner calculates this, based on the settings
-that have been specified.  If any of the management limits (for nitrogen,
-oxygen or gas) is exceeded, the surface above the dive profile changes from
-BLUE to RED.
+Now you can start the detailed time-depth planning of the dive. _Subsurface_
+offers an unique graphical interface for doing planning. Themechanics are
+similar to hand-entering a dive profile in the dive log part of
+_Subsurface_. Upon activating the planner, a default dive of depth 15 m for
+40 min is offered in the blue design surface to the top right hand of the
+screen. The white dots (waypoints) on the profile can be dragged with a
+mouse. Create more waypoints by double-clicking on the profile line and
+ensuring the profile reflects the intended dive. Drag the waypoints to
+represent the depth and duration of the dive. It is NOT necessary to specify
+the ascent part of the dive since the planner calculates this, based on the
+settings that have been specified.  If any of the management limits (for
+nitrogen, oxygen or gas) are exceeded, the surface above the dive profile
+changes from BLUE to RED.
 
 Each waypoint on the dive profile creates a _Dive Planner Point_ in the
-table on the left of the dive planner panel. Ensure that the _Used Gas_
-value in each row of that table corresponds to one of the gas mixtures
-specified in the _Available Gases_ table.  Add new waypoints until the main
-features of the dive have been completed, e.g. the bottom time segment and
-deep stops (if these are implemented). Leave the remaining waypoints on the
-ascent to _Subsurface_. In most cases _Subsurface_ computes additional way
-points in order to fulfil decompression requirements for that dive. A
-waypoint can be moved by selecting that waypoint and by using the arrow
-keys.  The waypoints listed in the _Dive Planner Points_ dialogue can be
-edited by hand in order to obtain a precise presentation of the dive
-plan. In fact, one can create the whole dive profile by editing the _Dive
-Planner Points_ dialog.
-
-Indicate any changes in gas cylinder used by indicating gas changes as
-explained in the section <<S_CreateProfile,hand-creating a dive
-profile>>. These changes should reflect the cylinders and gas compositions
-defined in the table with _Available Gases_.  If two or more gases are used,
-automatic gas switches will be suggested during the ascent to the
-surface. However, these changes can be deleted by right-clicking the gas
-change and by manually creating a gas change by right-clicking on the
-appropriate waypoint.
+table on the left of the dive planner panel. Be sure the _Used Gas_ value in
+each row of that table corresponds to one of the gas mixtures specified in
+the _Available Gases_ table.  Add new waypoints until the main features of
+the dive have been completed, e.g. the bottom time segment and deep stops
+(if these are implemented). Leave the remaining waypoints on the ascent to
+_Subsurface_. In most cases _Subsurface_ computes additional way points in
+order to fulfill decompression requirements for that dive. A waypoint can be
+moved by selecting it and by using the arrow keys.  The waypoints listed in
+the _Dive Planner Points_ dialogue can be edited by hand in order to get a
+precise presentation of the dive plan. In fact, you can create the whole
+dive profile by editing the _Dive Planner Points_ dialog.
+
+Show any changes in gas cylinder used by indicating gas changes as explained
+in the section <<S_CreateProfile,hand-creating a dive profile>>. These
+changes should reflect the cylinders and gas compositions defined in the
+table with _Available Gases_.  If two or more gases are used, automatic gas
+switches will be suggested during the ascent to the surface. These changes
+can be deleted by right-clicking the gas change and manually creating a gas
+change by right-clicking on the appropriate waypoint.
 
 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
@@ -3505,9 +3405,9 @@ using EAN50 and using the settings as described above.
 
 image::images/DivePlanner2_f20.jpg["FIGURE: Planning a dive: setup", align="center"]
 
-Once the above has been completed, one can save it by clicking the _Save_
-button towards the top middle of the planner. The saved dive plan will
-appear in the *Dive List* panel of _Subsurface_.
+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
+the *Dive List* panel of _Subsurface_.
 
 *The dive plan details*
 
@@ -3534,7 +3434,7 @@ The parameters of the pSCR dive can be set by selecting  _File ->   Preferences
 from the main menu, where the gas consumption calculation takes into account the pSCR dump
 ratio (default 10:1) as well as the metabolism rate. The calculation also takes the oxygen drop
 accross the mouthpiece of the rebreather into account. If the
-pO~2~ drops below what is considered a save value, a warning appears in the _Dive plan
+pO~2~ drops below what is considered safe, a warning appears in the _Dive plan
 details_. A typical pSCR configuration is with a single cylinder and one or more bail-out
 cylinders. Therefore the setup of the _Available gases_ and the _Dive planner points_ tables
 are very similar to that of a CCR dive plan, described below. However, no oxygen setpoints
@@ -3558,30 +3458,30 @@ cylinder since it is implied when the _CCR_ dropdown selection is made.
 the main menu. All user-entered segments in the _Dive planner points_ table
 use the default setpoint value. Then, different setpoints can be specified for dive segments
 in the _Dive planner points_ table. A zero setpoint
-means the diver bails out to open circuit mode for that segment. The decompression is always calculated
+means the diver bails out to open circuit mode for that segment. Decompression is always calculated
 using the setpoint of the last manually entered segment. So, to plan a bail out ascent for a
 CCR dive, add a one-minute dive segment to the end with a setpoint value of 0. The decompression
-algorithm does not switch deco-gases automatically while in CCR mode (i.e. when a positive setpoint is specified) but,
-of course, this is calculated for bail out ascents.
+algorithm does not switch deco-gases automatically while in CCR mode (i.e. when a positive setpoint is specified) but
+this is calculated for bail out ascents.
 
 The dive profile for a CCR dive may look something like the image below.
 
 image::images/Planner_CCR1_f20.jpg["FIGURE: Planning a CCR dive: setup", align="center"]
 
 Note that, in the _Dive plan details_, the gas consumption for a CCR segment
-is not calculated, so gas consumptions of 0 litres are the norm.
+is not calculated, so gas consumptions of 0 liters are the norm.
 
 [[S_Replan]]
 === Modifying an existing dive plan
 
 Normally, when a dive plan has been saved, it is accessible from the *Dive
-List*, like any other dive log. Within the *Dive List* there is not a way to
-change a saved dive plan.  To perform changes to a dive plan, select it on
-the *Dive List*. Then, in the main menu, select _Log -> Re-plan dive_. This
-will open the selected dive plan within the dive planner, allowing changes
-to be made and saved as usual.
+List*, like any other dive log. Within the *Dive List* there is no way to
+change a saved dive plan.  To change a dive plan, select it on the *Dive
+List*. Then, in the main menu, select _Log -> Re-plan dive_. This will open
+the selected dive plan within the dive planner, letting changes be made and
+saved as usual.
 
-In addition there is the option "Save new". This keeps the original planned
+In addition, there is the option "Save new". This keeps the original planned
 dive and adds a (possibly modified) copy to the dive list. If that copy is
 saved with the same start time as the original, the two dives are considered
 two versions of the same dive and do not influence other each during
@@ -3590,27 +3490,27 @@ decompression calculation (see next section).
 === Planning for repetitive dives
 
 Repetitive dives can easily be planned if the dates and start times of the
-repetitive dive set is specified appropriately in the top left-hand _Start
-Time_ field. _Subsurface_ calculates the gas loading figures correctly and
-the effect of the first dive is evaluated on later dives.
+repetitive dive set are specified appropriately in the top left-hand _Start
+Time_ field. _Subsurface_ calculates the gas loading figures and the affect
+of the first dive is evaluated on later dives.
 
-If one has just completed a long/deep dive and is planning another dive,
-then highlight, in the *Dive List*, the dive that has just been completed
-and then activate the planner. Depending on the start time of the planned
-dive, the planner takes into account the gas loading incurred during the
-completed dive and allows planning within these limitations.
+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
+activate the planner. Depending on the start time of the planned dive, the
+planner takes into account the gas loading during the completed dive and
+plans accordingly.
 
 If only a few standard configurations are used (e.g. in GUE), then a
-template dive can be created conforming to one of the configurations. If one
-now wishes to plan a dive using this configuration, just highlight the
-template dive in the *Dive List* and activate the planner: the planner takes
-into account the configuration in the highlighted dive.
+template dive can be created conforming to one of the configurations. If you
+want to plan a dive using this configuration, highlight the template dive in
+the *Dive List* and activate the planner: the planner takes into account the
+configuration in the highlighted dive.
 
 === Printing the dive plan
 
 Selecting the _Print_ button in the planner allows printing of the _Dive
-Plan Details_ for wet notes. Alternatively one can cut and paste the _Dive
-Plan Details_ for inclusion in a text file or word processing document.
+Plan Details_ for wet notes. You can also cut and paste the _Dive Plan
+Details_ to include in a text file or word processing document.
 
 Dive plans have many characteristics in common with dive logs (dive profile,
 dive notes, etc).  After a dive plan has been saved, the dive details and
@@ -3621,7 +3521,7 @@ Details_ panel of the dive planner. However, after the plan has been saved,
 it is represented in a way very similar to a dive log and the gas
 calculations cannot be accessed in the same way as during the planning
 process. The only way to print the dive plan is to use the _File -> Print_
-facility on the main menu in the same way as for dive logs or by copy and
+function on the main menu in the same way as for dive logs or by copy and
 paste to a word processor.
 
 == Description des éléments du menu principal de Subsurface
@@ -3633,16 +3533,14 @@ 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.
-- _Ouvrir un carnet de plongée_ - Cela ouvre une fenêtre pour sélectionner le
-  carnet de plongée à ouvrir.
+- _Open logbook_ - Open the file manager to select a dive logbook to open.
 - _Open cloud storage_ - Open the dive log previously saved in
   <<S_Cloud_storage,_Cloud storage_>>.
-- _Sauvegarder_ - Enregistrer le carnet de plongée qui est actuellement
-  ouvert.
+- _Save_ - Save the dive logbook currently open.
 - _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.
-- _Fermer_ - Fermer le carnet de plongée actuellement ouvert.
+- _Close_ - Close the dive logbook currently open.
 - <<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.
@@ -3672,15 +3570,14 @@ des sections de ce manuel traitant des opérations relatives.
 === Journal (log)
 - <<S_EnterData,_Ajouter une plongée_>> -  Ajouter manuellement une nouvelle
   plongée au panneau de la *liste des plongées*.
-- _Edit dive_ - Edit a dive of which the profile was entered by hande and not
-  from a dive computer.
-- <<S_DivePlanner,_Planifier une plongée_>> - Cette fonctionnalité permet de
-  planifier des plongées.
+- _Edit dive_ - Edit a dive where the profile was entered by hand and not from
+  a dive computer.
+- <<S_DivePlanner,_Planifier une plongée_>> - Planifier des plongées.
 - <<S_Replan,_Modifier la plongée dans le planificateur_>> - Modifier une
   plongée planifiée qui a été enregistrée dans la *liste des plongées*.
-- <<S_CopyComponents,_Copier les composants de la plongée_>> - En
-  sélectionnant cette option, vous pouvez copier les informations de plusieurs
-  champs d'un journal de plongée vers le presse-papier.
+- <<S_CopyComponents,_Copier les composants de la plongée_>> - Copier les
+  informations de plusieurs champs d'un journal de plongée vers le
+  presse-papier.
 - _Coller les composants de la plongée_  - Colle, dans les plongées
   sélectionnées dans la *liste des plongées*, les informations copiées au
   préalable avec l'option _Copier les composants de la plongée_.
@@ -3689,7 +3586,7 @@ des sections de ce manuel traitant des opérations relatives.
 - <<S_Group,_Grouper automatiquement_>> - Grouper les plongées du panneau de
   *liste des plongées* dans des voyages de plongées.
 - <<S_DeviceNames,_Editer les noms des ordinateurs de plongée_>> - Modifier
-  les noms des ordinateurs de plongée pour faciliter vos journaux (logs).
+  les noms des ordinateurs de plongée pour coordonner vos journaux (logs).
 - <<S_Filter,_Filtrer la liste des plongées_>> - Sélectionner seulement
   certaines plongées, à partir de tags ou de critères de plongées.
 
@@ -3705,9 +3602,8 @@ des sections de ce manuel traitant des opérations relatives.
   mondiale*.
 - _Statistiques annuelles_  - Affiche par année le résumé des statistiques des
   plongées effectuées.
-- _Prev DC_ - If a single dive was logged from more than one dive computer,
-  switch to data from
-   ordinateur de plongée précédent.
+- _Prev DC_ - Switch to data from previous dive computer, if a single dive was
+  logged from more than one.
 - _Ordinateur suivant_  - Passer à l'ordinateur de plongée suivant.
 - _Plein écran_  - Passer en mode plein écran.
 
@@ -3734,9 +3630,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]
-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).
+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).
 
 	* Sous Linux, les utilisateurs doivent avoir le bon module noyau de chargé. La
 	  plupart des distributions Linux le font automatiquement, de telle sorte que
@@ -3760,12 +3656,11 @@ 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]
-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
-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 ;
+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:
 
 .Sur Windows :
 
@@ -3810,13 +3705,15 @@ 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.
 
-S'assurer que l'utilisateur possède les droits d'écriture sur le port série
-USB :
+Ensuring the user has write permission to the USB serial port:
 
-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' :
+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'.
 
 En tant que root, tapez : usermod -a -G dialout johnB+ (utilisateurs
 d'Ubuntu : +sudo usermod -a -G dialout johnB+)  Cela ajoute johnB au groupe
@@ -3826,7 +3723,9 @@ vérifiez que
 l'appartenance au groupe est bien effectif. Le groupe +dialout+ devrait
 être listé
 parmi les différents IDs.
-Sous certaines circonstances, les modifications ne prennent effet qu'après une déconnexionpuis reconnexion sur l'ordinateur (sous Ubuntu, par exemple).
+Sous certaines circonstances, les modifications ne prennent effet qu'après une déconnexion
+puis reconnexion sur l'ordinateur (sous Ubuntu, par exemple).
+
 Avec le bon nom de périphérique (par exemple +dev/ttyUSB3+) et avec un accès
 en écriture au port USB, l'ordinateur de plongée devrait se connecter et
 vous devriez pouvoir importer vos plongées.
@@ -3838,10 +3737,10 @@ vous devriez pouvoir importer vos plongées.
 [NOTE]
 For dive computers communicating through Bluetooth like the Heinrichs
 Weikamp Frog or the Shearwater Predator, Petrel and Nerd there is a
-different procedure to get the devices name to communicate with
+different procedure to get the device’s name to communicate with
 _Subsurface_. Follow these steps:
 
- * *For the dive computer, after enabling Bluetooth, ensure it is in Upload mode.*
+ * *For the dive computer, after enabling Bluetooth, be sure it is in Upload mode.*
 
 For Bluetooth pairing of the dive computer, refer to the manufacturer's user
 guide. When using a Shearwater Predator/Petrel/Nerd, select _Dive Log ->
@@ -3872,18 +3771,17 @@ Device..._. The dive computer should then show up in the list of
 devices. Select it and go through the pairing process. This step should only
 be needed once for initial setup.
 
-Once the pairing is completed the correct device is shown in the 'Device or
+Once the pairing is complete, the correct device is shown in the 'Device or
 Mount Point' drop-down in the _Subsurface_ *Import* dialog.
 
 ==== Sur Linux
-Ensure Bluetooth is enabled on the _Subsurface_ computer.  On most common
+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
-straight forward. For instance, Gnome3 shows a Bluetooth icon on the right
-of the toolbar at the top of the screen.  Users have reported difficulties
-with some Bluetooth controllers.  If you have an onboard controller, try
-that first.  It is simplest if you remove any USB Bluetooth dongles.  If you
-have a USB dongle that came with your dive computer, try that before any
-others.
+straightforward. For instance, Gnome3 shows a Bluetooth icon on the right of
+the toolbar at the top of the screen.  Users have reported difficulties with
+some Bluetooth controllers.  If you have an onboard controller, try that
+first.  It is simplest if you remove any USB Bluetooth dongles.  If you have
+a USB dongle that came with your dive computer, try that before any others.
 
 Setting up a connection to download dives from your Bluetooth-enabled
 device, such as the _Shearwater Petrel_, is not yet an automated process and
@@ -3920,7 +3818,7 @@ select 'Add new device'. The dive computer should appear. If asked for a
 password, enter 0000.  Write down or copy the MAC address of your dive
 computer - this needed later and should be in the form 	00:11:22:33:44:55.
 
-If the graphical method didn't work, pair the device from the command
+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
 
@@ -4070,9 +3968,9 @@ system of the Uemis) including information about dive spots and
 equipment. Buddy information is not yet downloadable.  Things are very
 similar to a normal USB-connected dive computer (the Uemis is one of those
 that recharge when connected to the USB port).  The main difference is that
-one does not enter a device name, but instead the location where the
-UEMISSDA file system is mounted once connected to the dive computer. On
-Windows this is a drive letter ( often 'E:' or 'F:'), on a Mac this is
+you don’t enter a device name, but instead the location where the UEMISSDA
+file system is mounted once connected to the dive computer. On Windows this
+is a drive letter ( often 'E:' or 'F:'), on a Mac this is
 '/Volumes/UEMISSDA' and on Linux systems this differs depending on the
 distribution. On Fedora it usually is
 '/var/run/media/<your_username>/UEMISSDA'. In all cases _Subsurface_ should
@@ -4080,15 +3978,15 @@ suggest the correct location in the drop down list.
 
 After selecting the above device name, download the dives from the Uemis
 Zurich. One technical issue with the Uemis Zurich download implementation
-(this is a Uemis firmware limitation, not a _Subsurface_ issue) is that one
+(this is a Uemis firmware limitation, not a _Subsurface_ issue) is that you
 cannot download more than about 40-50 dives without running out of memory on
-the SDA. This will usually only happen the very first time one downloads
+the SDA. This will usually only happen the very first time you download
 dives from the Uemis Zurich.  Normally when downloading at the end of a day
 or even after a dive trip, the capacity is sufficient. If _Subsurface_
-displays an error that the dive computer ran out of space the solution is
-straight forward.  Disconnect the SDA, turn it off and on again, and
+displays an error that the dive computer ran out of space, the solution is
+straightforward.  Disconnect the SDA, turn it off and on again, and
 reconnect it. You can now retry (or start a new download session) and the
-download will continue where it stopped previously. One may have to do this
+download will continue where it stopped previously. You may have to do this
 more than once, depending on how many dives are stored on the dive computer.
 
 [[S_ImportingGalileo]]
@@ -4108,14 +4006,14 @@ http://irda.sourceforge.net/docs/startirda.html[Linux IrDA Project].  After
 the installation of the irda-tools, the *root user* can specify a device
 name from the console as follows: +irattach irda0+
 
-After executing this command, Subsurface will recognise the Galileo dive
+After executing this command, Subsurface will recognize the Galileo dive
 computer and download dive information.
 
 Under Windows, a similar situation exists. Drivers for the MCS7780 are
 available from some Internet web sites e.g.
 http://www.drivers-download.com/Drv/MosChip/MCS7780/[www.drivers-download.com].
 Windows-based IrDA drivers for the Uwatec can also be downloaded from the
-ScubaPro web site, drivers being located on the download page for the
+ScubaPro web site, with drivers located on the download page for the
 ScubaPro SmartTrak software.
 
 For the Apple Mac, IrDA communication via the MCS7780 link is not available
@@ -4169,9 +4067,9 @@ Download of dive logs from the MkVI is performed using a custom
 communications adapter and the _Poseidon PC Configuration Software_,
 obtained when purchasing the MKVI equipment. The latter is a Windows
 application allowing configuration of equipment and storage of dive
-logs. Communication between dive computer and desktop computer utilises the
+logs. Communication between dive computer and desktop computer utilizes the
 IrDA infra-red protocol. Only data for one dive can be downloaded at a time,
-comprising three files:
+in three files:
 
 - Setup configuration for the dive and key dive parameters (file with a .txt
   extension)
@@ -4179,7 +4077,7 @@ comprising three files:
 - Redbook format dive log (file with .cvsr extension). This is a compressed
   version of the dive log using a proprietary format.
 
-_Subsurface_ accesses the .txt and the .csv files to obtain dive log
+_Subsurface_ accesses the .txt and the .csv files to get dive log
 information.
 
 
@@ -4205,29 +4103,29 @@ _Subsurface_ as follows:
   file with a filename extension of _.apd_
 - Within _Subsurface_, select _Import -> Import log files_ to open the
   xref:Unified_import[universal import dialogue].
-- In the dropdown list towards the bottom right of the dialogue (labled
+- In the dropdown list towards the bottom right of the dialogue (labeled
   'Filter:'), select "APD log viewer".
-- On the list of file names select the _.apd_ file that has been created
-  above. An import dialogue opens indicating the default settings for the data
-  in the _.apd_ file. If any changes are required, do this as for
-  xref:S_ImportingCSVDives[CSV imports].
+On the list of file names select the _.apd_ file  created. An import
+dialogue opens showing the default settings for the data in the
+_.apd_ file. If changes are required,
+  do this as for xref:S_ImportingCSVDives[CSV imports].
 
 image::images/APD_CSVimportF22.jpg["Figure: APD log viewer import", align="center"]
 
-- The top left hand dropdown box in the import panel allows one to select the
-  APD dive computer for which the dive log needs to be imported. The default
-  it is DC1, _i.e._ the first of the two dive computers the APD uses. It is
-  possible to sequentially import the data for both dive computers by first
-  importing CD1 and then DC2.(*Hint*: The logs for the two dive computers are
-  viewed by selecting _View -> Next DC_ from the Main Menu after the uploading
-  has been completed)
+- 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
+  DC1, _i.e._ the first of the two dive computers the APD uses. It is possible
+  to sequentially import the data for both dive computers by first importing
+  CD1 and then DC2.(*Hint*: The logs for the two dive computers are viewed by
+  selecting _View -> Next DC_ from the Main Menu after the uploading has been
+  completed)
 - Click the _Ok_ button at the bottom of the import panel.
 
-The APD dive log will appear within _Subsurface_. The dive
-computer-generated ceiling generated by the Inspiration can be viewed by
-selecting the appropriate button on the left of the *Dive Profile*. Cylinder
-pressure data are not logged by the APD equipment but can be manually
-entered in the _Equipment_ Tab.
+The APD dive log will appear within _Subsurface_. The dive computer-
+generated ceiling provided by the Inspiration can be viewed by selecting the
+appropriate button on the left of the *Dive Profile*. Cylinder pressure data
+are not logged by the APD equipment but can be manually entered in the
+_Equipment_ Tab.
 
 == APPENDIX C: Exporting Dive log information from external dive log software.
 
@@ -4280,16 +4178,16 @@ naming conventions to export dive log data.
 *Divemanager 4 (DM4) and Divemanager 5 (DM5):*
 
 DM4 and DM5 use identical mechanisms for exporting dive logs.  To export a
-divelog from Divemanager one needs to locate the DM4/DM5 database where the
-dives are stored. the user can either look for the original database or make
-a backup of the dives. Both methods are described here.
+divelog from Divemanager you need to locate the DM4/DM5 database where the
+dives are stored. You can either look for the original database or make a
+backup of the dives. Both methods are described here.
 
 Locating the Suunto DM4 (or DM5) database:
 
 1. Start Suunto DM4/DM5
 2. Select 'Help -> About'
 3. Click 'Copy' after text 'Copy log folder path to clipboard'
-4. Now open Windows Explorer
+4. Ouvrir l'explorateur Windows
 5. Paste the address to the path box at the top of the File Explorer
 6. The database is called DM4.db or DM5.db
 
@@ -4320,18 +4218,18 @@ directly imported to Subsurface.
 
 [icon="images/icons/mareslogo.jpg"]
 [NOTE]
-Mares Dive Organiser is a Windows application. The dive log is kept as a
+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
-database includes all Dive Organiser-registered divers on the particular
-computer and all Mares dive computers used. The safest way to obtain a copy
-of the dive database is to export the information to another compatible
-format which can be imported into _Subsurface_.
+database includes all Dive Organizer-registered divers on the particular
+computer and all Mares dive computers used. The safest way to get a copy of
+the dive database is to export the information to another compatible format
+which can then be imported into _Subsurface_.
 
-1. Within Dive Organiser, select _Database -> Backup_ from the main menu and
+1. Within Dive Organizer, select _Database -> Backup_ from the main menu and
    back up the database to the desk top.  This creates a zipped file
-   DiveOrganiserxxxxx.dbf.
-2. Rename the file to DiveOrganiserxxxxx.zip. Inside the zipped directory is a
-   file _DiveOrganiser.sdf_.
+   DiveOrganizerxxxxx.dbf.
+2. Rename the file to DiveOrganizerxxxxx.zip. Inside the zipped directory is a
+   file _DiveOrganizer.sdf_.
 3. Extract the _.sdf_ file from the zipped folder to your Desktop.
 4. The password for accessing the .zip file is _mares_.
 
@@ -4342,11 +4240,11 @@ format which can be imported into _Subsurface_.
 [NOTE]
 The best way to bring your logs from DivingLog to Subsurface is to convert
 the whole database. This is because other export formats do not include all
-the details, and we would lack e.g. gas switches and information of what
-units are used. With database import, all this information is included and
-readily available for us.
+the details, and would lack, for example, gas switches and information of
+what units are used. With database import, all this information is included
+and readily available.
 
-To transfer all files from DivingLog to Subsurface, do the following:
+To transfer all files from DivingLog to Subsurface:
 
 1. In DivingLog open the 'File -> Export -> SQLite' menu
 2. Select 'Settings' button
@@ -4355,28 +4253,25 @@ To transfer all files from DivingLog to Subsurface, do the following:
 5. Click 'Export' button and select the filename
 
 Once this is done, open the saved database file with Subsurface and the
-dives are automatically converted to our own format. Last step to do is save
-the log file in Subsurface.
+dives are automatically converted to Subsurface’s own format. Last step to
+do is save the log file in Subsurface.
 
 == ANNEXE D : Exporter un tableur vers le format CSV
 [[S_Appendix_D]]
 
-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 une tache simple malgré que la procédure soit différente
-selon le tableur utilisé.
-
-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 :
+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:
 
 1. Date : utiliser un des formats suivants : aaaa-mm-jj, jj.mm.aaaa, mm/jj/aaaa
 2. Durée : le format est minutes:secondes.
@@ -4384,9 +4279,8 @@ règles simples :
    entre les unités impériales et métriques)
 4. Étiquettes et équipiers : les valeurs doivent être séparées par des
    virgules.
-5. Position GPS : vous devez utiliser les degrés décimaux, par exemple :
-   30.22496 30.821798
-
+5. Position GPS : utilisez les degrés décimaux, par exemple : 30.22496
+   30.821798
 === _LibreOffice Calc_ et _OpenOffice Calc_
 
 These are open source spreadsheet applications forming parts of larger open
@@ -4410,21 +4304,21 @@ then select _OK_.
 
 image::images/LOffice_field_options.jpg["FIGURE: Field options", align="center"]
 
-One can double check the .CSV file by opening it with a text editor, and
-then import the dive data as explained on the section
-xref:S_ImportingCSVDives[Importing CSV dives].
+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
+CSV dives].
 
 === Microsoft _Excel_
 
 The field delimiter (called "_list separator_" in Microsoft manuals) is not
 accessible from within _Excel_ and needs to be set through the _Microsoft
 Control Panel_. After changing the separator character, all software on the
-Windows machine use the new character as a separator.  One can change the
+Windows machine uses the new character as a separator.  You can change the
 character back to the default character by following the same procedure,
 outlined below.
 
-- In Microsoft Windows, click the *Start* button, and then select _Control
-  Panel_ from the list on the right-hand side.
+- In Microsoft Windows, click the *Start* button, then select _Control Panel_
+  from the list on the right-hand side.
 - Open the _Regional and Language Options_ dialog box.
 - Do one of the following: ** In Windows 7, click the _Formats_ tab, and then
   click _Customize this format_.  ** In Windows XP, click the _Regional
@@ -4447,75 +4341,73 @@ image::images/Win_SaveCSV1.jpg["FIGURE: Excel save as option", align="center"]
 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
 alternative format. From the dropdown list at the bottom of the dialogue,
-marked _Save as Type:_, select _CSV(Comma delimited) (*.CSV)_. Ensure that
-the appropriate folder has been selected to save the CSV file into.
+marked _Save as Type:_, select _CSV(Comma delimited) (*.CSV)_. Be sure the
+appropriate folder has been selected to save the CSV file into.
 
 image::images/Win_SaveCSV3.jpg["FIGURE: Excel save CSV dialogue", align="center"]
 
 Select the _Save_ button. The CSV-formatted file is saved into the folder
-that was selected. One can double check the .CSV file by opening it with a
-text editor, and then import the dive data as explained on the section
+that was selected. You can double check the .CSV file by opening it with a
+text editor, then import the dive data as explained on the section
 xref:S_ImportingCSVDives[Importing CSV dives].
-
 [[S_APPENDIX_E]]
 == ANNEXE E : Créer un modèle d'impression personnalisé
 
-_Subsurface_ provides a mechanism to create or modify templates for printing
-dive logs in order to produce customised printouts of dive logs. Templates,
-written in HTML as well as a simple Grantlee instruction set, are rendered
-to the print device by _Subsurface_.
+_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
+as a simple Grantlee instruction set, are rendered to the print device by
+_Subsurface_.
 
 Templates are accessed using the print dialogue (see image *B* below).
 
 image::images/Print1_f22.jpg["FIGURE: Print dialogue", align="center"]
 
-The buttons under the _Template_ dropdown box allows one to _Edit_,
-_Delete_, _Import_ and to _Export_ templates (see image *A* above). New or
-modified templates are stored as HTML files in the same directory as the
-dive log being processed. In order to create or modify a template, select
-one of the templates from the template dropdown list in the print dialogue
-(see image *B* above). Choose an existing template that resembles the final
-desired printout. Then select _Edit_.
+The buttons under the _Template_ dropdown box lets you _Edit_, _Delete_,
+_Import_ and _Export_ templates (see image *A* above). New or modified
+templates are stored as HTML files in the same directory as the dive log
+being processed. In order to create or modify a template, select one of the
+templates from the template dropdown list in the print dialogue (see image
+*B* above). Choose an existing template that resembles the final desired
+printout. Then select _Edit_.
 
-The Edit Panel comprises three tabs:
+The Edit Panel has three tabs:
 
 image::images/Template1_f22.jpg["FIGURE: template edit dialogue", align="center"]
 
-1) The _Style_ tab (image *A* above) controls the font, line spacing and colour
+1) 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. Choose one of the four colour palets used for colour printing.
+   editable. Choose one of the four color palettes used for color printing.
 
-2) The _Colors_ tab (image *B* above) allows editing the colours used for
-   printing the dive log. The colours are highly customisable: the _Edit_
-   buttons in the _Colors_ tab allows choosing abritrary colours for different
+2) The _Colors_ tab (image *B* above) allows editing the colors used for
+   printing the dive log. The colors are highly customizable: the _Edit_
+   buttons in the _Colors_ tab allows choosing arbitrary colors for different
    components of the dive log printout.
 
 3) The _Template_ tab of the Edit Panel (see image below) allows creating a
    template using HTML as well as a few Grantlee programming
-   primitives. Grantlee provides the ability to create and format HTML code in
-   a highly simple but efficient way (see below). The HTML of the template can
-   be edited and saved. The saved template is stored in the same directory as
-   the dive being processed. By default, a _Custom_ template is a skeleton with
-   no specific print instructions. The informastion being printed needs to be
-   specified and formatted in the by replacing the section marked with: "<!--
+   primitives. Grantlee can create and format HTML code in a highly simple but
+   efficient way (see below). The HTML of the template can be edited and
+   saved. The saved template is stored in the same directory as the dive being
+   processed. By default, a _Custom_ template is a skeleton with no specific
+   print instructions. The information printed needs to be specified and
+   formatted in the template by replacing the section marked with: "<!--
    Template must be filled -->". Writing HTML code with Grantlee instructions
-   allows unlimited freedom in determining what is printed an in which way it
+   allows unlimited freedom in determining what is printed and in which way it
    should be rendered.
 
 image::images/Template2_f22.jpg["FIGURE:Template tab", align="center"]
 
-One can adapt any of the existing templates and save it to the dive log
+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
 modified in this way. After completing the edits, use the _Export_ button in
 the print dialogue to save the new template using a new template name.
 
-To write a custom template the following elements must exist so that the
+To write a custom template, the following elements must exist so the
 template will be correctly handled and rendered.
 
 === Main dive loop
-_Subsurface_ exports a dive list called (*dives*) to the _Grantlee_
-backend. It is possible to iterate over the list as follows:
-
+_Subsurface_ exports a dive list called (*dives*) to the _Grantlee_ back
+end. It is possible to iterate over the list as follows:
 .template.html
 ....
 	{% for dive in dives %}
@@ -4530,7 +4422,7 @@ backend. It is possible to iterate over the list as follows:
 	<h1> 3 </h1>
 ....
 
-Additional information about _Grantlee_ can be found
+Additional information about _Grantlee_ can be found at
 http://www.grantlee.org/apidox/for_themers.html[here]
 
 === Grantlee exported variables
@@ -4539,20 +4431,31 @@ Only a subset of the dive data is exported:
 |*Name*|*Description*
 |number| (*int*) dive number
 |id| (*int*) unique dive ID, should be used to fetch the dive profile
-|date| (*string*) data of the dive
+|date| (*string*) date of the dive
 |time| (*string*) time of the dive
 |location| (*string*) location of the dive
 |duration| (*string*) duration of the dive
 |depth| (*string*) depth of the dive
-|divemaster| (*string*) divemaster data
-|buddy| (*string*) buddy data
-|airTemp| (*string*) air temperature of dive
-|waterTemp| (*string*) water temperature of dive
+|divemaster| (*string*) dive master for the dive
+|buddy| (*string*) buddy for the dive
+|airTemp| (*string*) air temperature of the dive
+|waterTemp| (*string*) water temperature of the dive
 |notes| (*string*) dive notes
-|rating| (*int*) dive rating ranges from 0 to 5
-|sac| (*string*) sac value
-|tags| (*string*) all dive tags concatenate together
-|gas| (*string*) used gas cylinder
+|rating| (*int*) dive rating which ranges from 0 to 5
+|sac| (*string*) SAC value for the dive
+|tags| (*string*) list of dive tags for the dive
+|gas| (*string*) list of gases used in the dive
+|suit| (*string*) the suit used for the dive
+|cylinders| (*string*) complete information of all used cylinders
+|cylinder0-7| (*string*) information about a specific cylinder
+|weights| (*string*) complete information of all used weight systems
+|weight0-5| (*string*) information about a specific weight system
+|maxcns| (*string*) maxCNS value for the dive
+|otu| (*string*) OTU value for the dive
+|sumWeight| (*string*) the summed weight of all used weight systems
+|startPressure| (*string*) the start pressure
+|endPressure| (*string*) the end pressure
+|firstGas| (*string*) first used gas
 |=====================
 
 _Subsurface_ also exports *template_options* data. This data must be used as
@@ -4605,16 +4508,15 @@ contains a single member:
 ....
 
 === Defined CSS selectors
-
-As the dive profile is placed after rendering, _Subsurface_ uses a special
-_CSS_ selectors to do some searches in the HTML output. The _CSS_ selectors
-in the following table should be added.
+As the dive profile is placed after rendering, _Subsurface_ uses special
+_CSS_ selectors to searche in the HTML output. The _CSS_ selectors in the
+following table should be added.
 
 |====================
 |*Selector*|*Type*|*Description*
 |dive_{{ dive.id }} | id | is used to fetch the relevant dive profile
-|diveProfile | class | each div that will contain a dive profile should have this class selector in addition to the dive_{{ dive.id }} id selector
-|dontbreak | class | prevents the div with this class to be divided into two pages, this can be used
+|diveProfile | class | each dive that will contain a dive profile should have this class selector in addition to the dive_{{ dive.id }} id selector
+|dontbreak | class | prevents the dive with this class from being divided into two pages. This can be used
 in flow layout templates only (when data-numberofdives = 0)
 |=====================
 
@@ -4624,11 +4526,11 @@ data-numberofdives = 0).
 === Special attributes
 
 There are two ways of rendering- either rendering a specific number of dives
-in each page or make _Subsurface_ try to fit as much dives as possible into
+in each page or make _Subsurface_ try to fit as many dives as possible into
 one page (_flow_ rendering).
 
 The *data-numberofdives* data attribute is added to the body tag to set the
-rendering mode
+rendering mode.
 
 - render 6 dives per page:
 
@@ -4655,7 +4557,7 @@ calculates. Is _Subsurface_ miscalculating?
 
 'Answer': Not really. What happens is that _Subsurface_ actually calculates
 gas consumption differently - and better - than you expect.  In particular,
-it takes the incompressibility of the gas into account.  Traditionally, Gas
+it takes the incompressibility of the gas into account.  Traditionally, gas
 consumption and SAC should be: +consumption = tank size x (start pressure -
 end pressure)+
 
@@ -4708,20 +4610,18 @@ dive”.
 === Some dive profiles are missing from the download
 
 [[DC_HISTORY]]
-'Question': I cannot download all my dives, only the most recent ones even
+'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
-dives.
-
-'Answer': Dive history is different than the dive profiles on the log.  The
-history only keeps track of the total number of dives and total amount of
-time spent below surface. The logs, on the other hand, store the dive
-profile, but they have limited amount of memory to do so. The exact amount
-of dive profiles that can be stored on the device depend on sample interval
-and duration of the dives. Once the memory is full the oldest dives get
-overwritten with new dives. Thus we are only able to download the last 13,
-30 or 199 dives.
+dives? 'Answer': Dive history is different than the dive profiles on the
+log.  The history only keeps track of the total number of dives and total
+amount of time spent below surface. The logs, on the other hand, store the
+dive profile, but they have a limited amount of memory to do so. The exact
+amount of dive profiles that can be stored on the device depends on sample
+interval and duration of the dives. Once the memory is full the oldest dives
+get overwritten with new dives. Thus we are only able to download the last
+13, 30 or 199 dives.
 
 If you have downloaded your dives to different dive logging software before
-they were overwritten, there is a high chance that Subsurface can import
+they were overwritten, there is a good chance that Subsurface can import
 these. However, if the logs are only on your dive computer, they cannot be
-salvaged after being over written by new dives.
+salvaged after being overwritten by new dives.