diff options
| author |  Guillaume GARDET <guillaume.gardet@free.fr> | 2015-10-13 20:43:15 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2015-10-13 11:52:23 -0700 |
| commit | 409df339b82b67cf4ecf0963f2aa3ca2dc2cf079 (patch) | |
| tree | 310dede0858b7bcaea292ee22c9e35ac8f67c774 /Documentation | |
| parent | 8d2d7cd4a35c0fd7eeabaa8e05e572f2d3faac4c (diff) | |
| download | subsurface-409df339b82b67cf4ecf0963f2aa3ca2dc2cf079.tar.gz | |
Documentation: update french translation of user-manual
Signed-off-by: Guillaume GARDET <guillaume.gardet@free.fr>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/50-pot/subsurface-manual.pot | 2330 | ||||
| -rw-r--r-- | Documentation/fr/po/subsurface-manual.fr.po | 2364 | ||||
| -rw-r--r-- | Documentation/user-manual_fr.html.git | 381 | ||||
| -rw-r--r-- | Documentation/user-manual_fr.txt | 306 |
4 files changed, 2816 insertions, 2565 deletions
diff --git a/Documentation/50-pot/subsurface-manual.pot b/Documentation/50-pot/subsurface-manual.pot index 235e0c8d3..913c8979c 100644 --- a/Documentation/50-pot/subsurface-manual.pot +++ b/Documentation/50-pot/subsurface-manual.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: subsurface-manual VERSION\n" "Report-Msgid-Bugs-To: subsurface@subsurface-divelog.org\n" -"POT-Creation-Date: 2015-10-12 11:04+0200\n" +"POT-Creation-Date: 2015-10-13 20:37+0200\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" @@ -393,7 +393,7 @@ msgstr "" #. type: Plain text #: ./user-manual.txt:188 msgid "" -"The divecomputer itself. See: xref:S_ImportDiveComputer[Importing new dive " +"The dive computer itself. See: xref:S_ImportDiveComputer[Importing new dive " "information from a Dive Computer] or" msgstr "" @@ -460,7 +460,7 @@ msgid "" msgstr "" #. type: Target for macro image -#: ./user-manual.txt:218 ./user-manual.txt:754 +#: ./user-manual.txt:218 ./user-manual.txt:780 #, no-wrap msgid "images/BlueEditBar_f22.jpg" msgstr "" @@ -580,7 +580,7 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: ./user-manual.txt:290 ./user-manual.txt:2997 +#: ./user-manual.txt:290 ./user-manual.txt:649 ./user-manual.txt:3031 #, no-wrap msgid "images/icons/warning2.png" msgstr "" @@ -659,7 +659,7 @@ msgstr "" 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 divecomputer allows this, _Subsurface_ only imports dives " +"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)." @@ -740,7 +740,7 @@ msgid "" "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 righthand side of the dialogue (see image " +"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, " @@ -773,7 +773,7 @@ msgid "*PROBLEMS WITH DATA DOWNLOAD FROM A DIVE COMPUTER?*\n" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: ./user-manual.txt:414 ./user-manual.txt:520 ./user-manual.txt:558 ./user-manual.txt:571 ./user-manual.txt:1123 ./user-manual.txt:1189 ./user-manual.txt:1242 ./user-manual.txt:1318 ./user-manual.txt:1632 +#: ./user-manual.txt:414 ./user-manual.txt:520 ./user-manual.txt:559 ./user-manual.txt:572 ./user-manual.txt:1149 ./user-manual.txt:1215 ./user-manual.txt:1268 ./user-manual.txt:1344 ./user-manual.txt:1658 #, no-wrap msgid "images/icons/important.png" msgstr "" @@ -887,7 +887,7 @@ msgid "Connecting _Subsurface_ to a Bluetooth-enabled dive computer" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: ./user-manual.txt:470 ./user-manual.txt:3535 +#: ./user-manual.txt:470 ./user-manual.txt:3576 #, no-wrap msgid "images/icons/bluetooth.jpg" msgstr "" @@ -950,7 +950,7 @@ msgstr "" #: ./user-manual.txt:497 msgid "" "On the _Linux_ or _MacOS_ platforms the name of the _Subsurface_ computer " -"and its Bluetooth address are shown on the righthand side, On the lefthand " +"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 " "_Subsurface_. The power state (on/off) of the Bluetooth adapter is shown " @@ -1032,7 +1032,7 @@ msgid "" msgstr "" #. type: Title ==== -#: ./user-manual.txt:545 ./user-manual.txt:3466 ./user-manual.txt:3550 +#: ./user-manual.txt:545 ./user-manual.txt:3507 ./user-manual.txt:3591 #, no-wrap msgid "On Windows:" msgstr "" @@ -1044,28 +1044,28 @@ msgid "images/DC_import_Bluetooth_Windows.png" msgstr "" #. type: Plain text -#: ./user-manual.txt:550 +#: ./user-manual.txt:551 msgid "" "On _Windows_ platforms the _Local Bluetooth device details section_ on the " -"left is not displayed. To successfully initiate a scan (by pressing the " +"right is not displayed. To successfully initiate a scan (by pressing the " "_Scan_ button) check that the Bluetooth device on the _Subsurface_ computer " "is turned on." msgstr "" #. type: Plain text -#: ./user-manual.txt:557 +#: ./user-manual.txt:558 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 setup your DC device_. Always allow this pairing. After 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:564 +#: ./user-manual.txt:565 msgid "" "Be aware that currently _Subsurface_ works only with local Bluetooth " "adapters which use Microsoft Bluetooth Stack. If the local device uses " @@ -1074,7 +1074,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:570 +#: ./user-manual.txt:571 msgid "" "A log messageOn the bottom left of the _Remote Bluetooth device selection_ " "shows details about the current status of the Bluetooth agent. To select " @@ -1084,7 +1084,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:580 +#: ./user-manual.txt:581 #, no-wrap msgid "" "*IN CASE OF PROBLEMS*: If the Bluetooth adapter from the _Subsurface_ " @@ -1099,13 +1099,13 @@ msgid "" msgstr "" #. type: Title ==== -#: ./user-manual.txt:583 +#: ./user-manual.txt:584 #, no-wrap msgid "Changing the name of a dive computer" msgstr "" #. type: Plain text -#: ./user-manual.txt:599 +#: ./user-manual.txt:600 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 " @@ -1125,13 +1125,13 @@ msgid "" msgstr "" #. type: Title ==== -#: ./user-manual.txt:601 +#: ./user-manual.txt:602 #, no-wrap msgid "Updating the dive information imported from the dive computer." msgstr "" #. type: Plain text -#: ./user-manual.txt:608 +#: ./user-manual.txt:609 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 " @@ -1140,13 +1140,13 @@ msgid "" msgstr "" #. type: Title ===== -#: ./user-manual.txt:610 +#: ./user-manual.txt:611 #, no-wrap msgid "Notes" msgstr "" #. type: Plain text -#: ./user-manual.txt:615 +#: ./user-manual.txt:616 msgid "" "To have a more complete dive record the user needs to add additional " "information by hand. The procedure below is virtually identical for " @@ -1154,7 +1154,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:625 +#: ./user-manual.txt:626 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 " @@ -1167,24 +1167,24 @@ msgid "" msgstr "" #. type: Target for macro image -#: ./user-manual.txt:626 +#: ./user-manual.txt:627 #, no-wrap msgid "images/AddDive3_f22.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:635 +#: ./user-manual.txt:636 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 " "correct date. Press ESC to close the calendar. The time values (hour and " "minutes) can also be edited directly by clicking on each of them in the text " -"box and by overtyping the information displayed." +"box and by over-typing the information displayed." msgstr "" #. type: Plain text -#: ./user-manual.txt:646 +#: ./user-manual.txt:647 #, no-wrap msgid "" "*Air/water temperatures*: Air and water temperatures during the dive are " @@ -1206,65 +1206,71 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:659 +#: ./user-manual.txt:649 #, no-wrap +msgid "*Location*:\n" +msgstr "" + +#. type: Plain text +#: ./user-manual.txt:657 msgid "" -"*Location*: Here the name of the dive site can be entered, e.g. \"Tihany, " -"Lake\n" -"Balaton, Hungary\". Dive locations are managed as a separate part of the " -"dive log.\n" -"After entering the information for a particular dive site, and several dives " -"are\n" -"performed at the same location, the information is re-used without " -"requiring\n" -"full dive site information again. Existing dive location information\n" -"can be edited at any time by selecting (on the *Dive List* panel) a dive " -"performed at that site\n" -"and by opening the location information by clicking the globe button on " -"the\n" -"right of the location name (see image on the right, above). When entering a " -"dive location name, auto location of\n" -"dive site names makes it easy to select a dive site that already exists in " -"the dive log\n" -"(i.e. when typing the name of a dive site,\n" -"a dropdown list appears showing all sites with similar names). If the dive\n" -"site has been used before, click on the already-existing name.\n" +"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 " +"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." msgstr "" #. type: Plain text -#: ./user-manual.txt:662 +#: ./user-manual.txt:675 msgid "" -"If the present dive site has not been used before, a message appears as " -"follows (image *A* below):" +"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):" msgstr "" #. type: Target for macro image -#: ./user-manual.txt:663 +#: ./user-manual.txt:676 #, no-wrap msgid "images/Locations1_f22.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:668 +#: ./user-manual.txt:681 msgid "" -"Click the + icon on the right hand side. A panel appears to enter the " +"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:" msgstr "" #. type: Plain text -#: ./user-manual.txt:675 +#: ./user-manual.txt:688 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 " +"of the _Subsurface_ window. The map displays an orange bar indicating \"No " "location data - Move the map and double-click to set the dive " -"location\". Upon a double-click at the appropriate place, the orange bar " +"location\". Upon a doubleclick at the appropriate place, the orange bar " "disappears and the coordinates are stored." msgstr "" #. type: Plain text -#: ./user-manual.txt:680 +#: ./user-manual.txt:693 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 " @@ -1273,14 +1279,14 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:683 +#: ./user-manual.txt:696 msgid "" "The coordinates can be entered by hand if they are known, using one of four " "formats with latitude followed by longitude:" msgstr "" #. type: Plain text -#: ./user-manual.txt:688 +#: ./user-manual.txt:701 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, " @@ -1289,29 +1295,50 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:693 +#: ./user-manual.txt:709 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." +"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:699 +#: ./user-manual.txt:715 #, no-wrap msgid "" "*Important*: GPS coordinates of a dive site are linked to the Location\n" -"name - so adding coordinates to dives that do not have a location " -"description\n" -"will cause unexpected behaviour (Subsurface will think that all of these\n" +"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" "dives have the same location and try to keep their GPS coordinates the\n" "same).\n" msgstr "" #. type: Plain text -#: ./user-manual.txt:704 +#: ./user-manual.txt:725 +#, 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" +"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" +msgstr "" + +#. type: Plain text +#: ./user-manual.txt:730 msgid "" "Enter any other textual information about the dive site (Description and " "Notes), then select _Apply Changes_ to save the geolocation for this dive " @@ -1320,7 +1347,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:709 +#: ./user-manual.txt:735 #, no-wrap msgid "" "*Dive mode*: This is a dropdown box allowing one to choose the type of " @@ -1332,7 +1359,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:714 +#: ./user-manual.txt:740 #, no-wrap msgid "" "*Divemaster*: The name of the dive master or dive guide for this dive should " @@ -1343,7 +1370,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:719 +#: ./user-manual.txt:745 #, no-wrap msgid "" "*Buddy*: In this field, one enters the name(s) of the buddy / buddies\n" @@ -1354,7 +1381,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:724 +#: ./user-manual.txt:750 #, no-wrap msgid "" "*Suit*: Here the type of dive suit used can be entered.\n" @@ -1365,7 +1392,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:727 +#: ./user-manual.txt:753 #, no-wrap msgid "" "*Rating*: One can provide a subjective overall rating of the dive on a\n" @@ -1373,7 +1400,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:731 +#: ./user-manual.txt:757 #, no-wrap msgid "" "*Visibility*: Similarly, one can provide a rating of visibility during the\n" @@ -1382,7 +1409,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:740 +#: ./user-manual.txt:766 #, no-wrap msgid "" "*Tags*: Tags that describe the type of dive performed can be entered\n" @@ -1399,13 +1426,13 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:742 +#: ./user-manual.txt:768 #, no-wrap msgid "*Notes*: Any additional information for the dive can be entered here.\n" msgstr "" #. type: Plain text -#: ./user-manual.txt:747 +#: ./user-manual.txt:773 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 " @@ -1415,13 +1442,13 @@ msgid "" msgstr "" #. type: Title ===== -#: ./user-manual.txt:748 +#: ./user-manual.txt:774 #, no-wrap msgid "Equipment" msgstr "" #. type: Plain text -#: ./user-manual.txt:753 +#: ./user-manual.txt:779 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 " @@ -1429,7 +1456,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:760 +#: ./user-manual.txt:786 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) " @@ -1437,7 +1464,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:764 +#: ./user-manual.txt:790 #, no-wrap msgid "" "*Cylinders*: The cylinder information is entered through a dialogue that " @@ -1446,13 +1473,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: ./user-manual.txt:765 +#: ./user-manual.txt:791 #, no-wrap msgid "images/DC_gas-dialogue1_f20.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:774 +#: ./user-manual.txt:800 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 " @@ -1465,7 +1492,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:779 +#: ./user-manual.txt:805 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 " @@ -1474,13 +1501,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: ./user-manual.txt:780 +#: ./user-manual.txt:806 #, no-wrap msgid "images/DC_gas-dialogue2_f20.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:787 +#: ./user-manual.txt:813 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 " @@ -1490,7 +1517,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:791 +#: ./user-manual.txt:817 msgid "" "Next, indicate the starting pressure and the ending pressure of the " "specified gas during the dive. The unit of pressure (metric/imperial) " @@ -1498,7 +1525,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:802 +#: ./user-manual.txt:828 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, " @@ -1512,13 +1539,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: ./user-manual.txt:803 +#: ./user-manual.txt:829 #, no-wrap msgid "images/CylinderDataEntry3_f20.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:810 +#: ./user-manual.txt:836 #, no-wrap msgid "" "*Weights*: Information about the weight system used can be entered\n" @@ -1530,26 +1557,26 @@ msgid "" msgstr "" #. type: Target for macro image -#: ./user-manual.txt:811 +#: ./user-manual.txt:837 #, no-wrap msgid "images/WeightsDataEntry1_f20.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:815 +#: ./user-manual.txt:841 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:816 +#: ./user-manual.txt:842 #, no-wrap msgid "images/WeightsDataEntry2_f20.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:830 +#: ./user-manual.txt:856 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 " @@ -1564,19 +1591,19 @@ msgid "" msgstr "" #. type: Target for macro image -#: ./user-manual.txt:831 +#: ./user-manual.txt:857 #, no-wrap msgid "images/WeightsDataEntry3_f20.jpg" msgstr "" #. type: Title ==== -#: ./user-manual.txt:833 +#: ./user-manual.txt:859 #, no-wrap msgid "Editing several selected dives simultaneously" msgstr "" #. type: Plain text -#: ./user-manual.txt:848 +#: ./user-manual.txt:874 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 " @@ -1594,7 +1621,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:858 +#: ./user-manual.txt:884 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 " @@ -1609,7 +1636,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:867 +#: ./user-manual.txt:893 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 " @@ -1624,13 +1651,13 @@ msgid "" msgstr "" #. type: Title ==== -#: ./user-manual.txt:868 +#: ./user-manual.txt:894 #, no-wrap msgid "Adding Bookmarks to a dive" msgstr "" #. type: Plain text -#: ./user-manual.txt:873 +#: ./user-manual.txt:899 msgid "" "Many divers wish to annotate their dives with text that indicate particular " "events during the dive, e.g. \"Saw dolphins\", or \"Released surface " @@ -1638,7 +1665,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:877 +#: ./user-manual.txt:903 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 " @@ -1647,40 +1674,40 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:879 +#: ./user-manual.txt:905 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:882 +#: ./user-manual.txt:908 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:885 +#: ./user-manual.txt:911 msgid "" "If one hovers using the mouse over the red bookmark, the appropriate text is " "shown at the bottom of the information box (see *D* below)." msgstr "" #. type: Target for macro image -#: ./user-manual.txt:886 +#: ./user-manual.txt:912 #, no-wrap msgid "images/Bookmarks.jpg" msgstr "" #. type: Title ==== -#: ./user-manual.txt:889 +#: ./user-manual.txt:915 #, no-wrap msgid "Saving the updated dive information" msgstr "" #. type: Plain text -#: ./user-manual.txt:900 +#: ./user-manual.txt:926 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 " @@ -1693,7 +1720,7 @@ msgid "" msgstr "" #. type: Title === -#: ./user-manual.txt:901 +#: ./user-manual.txt:927 #, no-wrap msgid "" "Importing dive information from other digital data sources or other data " @@ -1701,7 +1728,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:927 +#: ./user-manual.txt:953 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 " @@ -1723,7 +1750,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:937 +#: ./user-manual.txt:963 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 " @@ -1738,13 +1765,13 @@ msgid "" msgstr "" #. type: Title ==== -#: ./user-manual.txt:938 +#: ./user-manual.txt:964 #, no-wrap msgid "Using the universal import dialogue" msgstr "" #. type: Plain text -#: ./user-manual.txt:944 +#: ./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 " @@ -1752,13 +1779,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: ./user-manual.txt:945 +#: ./user-manual.txt:971 #, no-wrap msgid "images/Import1_f20.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:950 +#: ./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 " @@ -1766,69 +1793,69 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:952 +#: ./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:953 +#: ./user-manual.txt:979 msgid "Cochran dive logs" msgstr "" #. type: Plain text -#: ./user-manual.txt:954 +#: ./user-manual.txt:980 msgid "UDDF-formatted dive logs (e.g. Kenozoooid)" msgstr "" #. type: Plain text -#: ./user-manual.txt:955 +#: ./user-manual.txt:981 msgid "UDCF-formatted dive logs" msgstr "" #. type: Plain text -#: ./user-manual.txt:956 +#: ./user-manual.txt:982 msgid "Poseidon MkVI CCR logs" msgstr "" #. type: Plain text -#: ./user-manual.txt:957 +#: ./user-manual.txt:983 msgid "APD Inspiration/Evolution CCR logs" msgstr "" #. type: Plain text -#: ./user-manual.txt:958 +#: ./user-manual.txt:984 msgid "LiquiVision logs" msgstr "" #. type: Plain text -#: ./user-manual.txt:959 +#: ./user-manual.txt:985 msgid "divelog.de logs" msgstr "" #. type: Plain text -#: ./user-manual.txt:960 +#: ./user-manual.txt:986 msgid "OSTC Tools logs" msgstr "" #. type: Plain text -#: ./user-manual.txt:961 +#: ./user-manual.txt:987 msgid "JDiveLog" msgstr "" #. type: Plain text -#: ./user-manual.txt:962 +#: ./user-manual.txt:988 msgid "Suunto Dive Manager (DM3 and DM4)" msgstr "" #. type: Plain text -#: ./user-manual.txt:963 +#: ./user-manual.txt:989 msgid "CSV (text-based and spreadsheet-based) dive logs, including APD CCR logs" msgstr "" #. type: Plain text -#: ./user-manual.txt:968 +#: ./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 " @@ -1838,13 +1865,13 @@ msgid "" msgstr "" #. type: Title ==== -#: ./user-manual.txt:969 +#: ./user-manual.txt:995 #, no-wrap msgid "Importing from OSTCTools" msgstr "" #. type: Plain text -#: ./user-manual.txt:978 +#: ./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 " @@ -1857,7 +1884,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:982 +#: ./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, " @@ -1865,7 +1892,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:987 +#: ./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, " @@ -1875,13 +1902,13 @@ msgid "" msgstr "" #. type: Title ==== -#: ./user-manual.txt:989 +#: ./user-manual.txt:1015 #, no-wrap msgid "Importing from Mares Dive Organiser V2.1" msgstr "" #. type: Plain text -#: ./user-manual.txt:996 +#: ./user-manual.txt:1022 msgid "" "Since Mares utilise proprietary Windows software not compatible with " "multi-platform applications, these dive logs cannot be directly imported " @@ -1891,7 +1918,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:1001 +#: ./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] " @@ -1899,7 +1926,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:1007 +#: ./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 " @@ -1909,20 +1936,20 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:1009 +#: ./user-manual.txt:1035 msgid "" "Finally, import the dives from _divelogs.de_ to _Subsurface_, using the " "instructions below." msgstr "" #. type: Title ==== -#: ./user-manual.txt:1012 +#: ./user-manual.txt:1038 #, no-wrap msgid "Importing dives from *divelogs.de*" msgstr "" #. type: Plain text -#: ./user-manual.txt:1025 +#: ./user-manual.txt:1051 msgid "" "The import of dive information from _divelogs.de_ is simple, using a single " "dialogue box. The _Import -> Import from Divelogs.de_ option should be " @@ -1936,19 +1963,19 @@ msgid "" msgstr "" #. type: Target for macro image -#: ./user-manual.txt:1026 +#: ./user-manual.txt:1052 #, no-wrap msgid "images/Divelogs1.jpg" msgstr "" #. type: Title ==== -#: ./user-manual.txt:1029 +#: ./user-manual.txt:1055 #, no-wrap msgid "Importing data in CSV format" msgstr "" #. type: Plain text -#: ./user-manual.txt:1040 +#: ./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 " @@ -1964,13 +1991,13 @@ msgid "" msgstr "" #. type: Title ===== -#: ./user-manual.txt:1042 +#: ./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:1047 +#: ./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 " @@ -1979,14 +2006,14 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:1049 +#: ./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:1055 +#: ./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, " @@ -1997,7 +2024,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:1064 +#: ./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 " @@ -2011,14 +2038,14 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:1067 +#: ./user-manual.txt:1093 msgid "" "Before being able to import the _CSV_ data to _Subsurface_ *one needs to " "know a few things about the data being imported*:" msgstr "" #. type: Plain text -#: ./user-manual.txt:1075 +#: ./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 " @@ -2030,7 +2057,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:1079 +#: ./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 " @@ -2039,12 +2066,12 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:1081 -msgid "Is the numeric information (e.g. dive depth) in metric or in imperial unis?" +#: ./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:1088 +#: ./user-manual.txt:1114 msgid "" "Armed with this information, importing the data into _Subsurface_ is " "straightforward. Select _Import -> Import Log Files_ from the main menu. In " @@ -2054,13 +2081,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: ./user-manual.txt:1089 +#: ./user-manual.txt:1115 #, no-wrap msgid "images/csv_import1_f20.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:1100 +#: ./user-manual.txt:1126 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 " @@ -2075,7 +2102,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:1112 +#: ./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 " @@ -2086,19 +2113,19 @@ msgid "" "\"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 labeled \"Dive # \" " +"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:1113 +#: ./user-manual.txt:1139 #, no-wrap msgid "images/csv_import2_f20.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:1119 +#: ./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 " @@ -2108,13 +2135,13 @@ msgid "" msgstr "" #. type: delimited block * -#: ./user-manual.txt:1123 +#: ./user-manual.txt:1149 #, no-wrap msgid "*A Diver's Introduction to _CSV_ Files*\n" msgstr "" #. type: delimited block * -#: ./user-manual.txt:1137 +#: ./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 " @@ -2131,7 +2158,7 @@ msgid "" msgstr "" #. type: delimited block * -#: ./user-manual.txt:1146 +#: ./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 " @@ -2147,7 +2174,7 @@ msgid "" msgstr "" #. type: delimited block * -#: ./user-manual.txt:1152 +#: ./user-manual.txt:1178 #, no-wrap msgid "" "\tDive site,Dive date,Time,Dive_duration, Dive_depth,Dive buddy\n" @@ -2158,14 +2185,14 @@ msgid "" msgstr "" #. type: delimited block * -#: ./user-manual.txt:1154 +#: ./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:1160 +#: ./user-manual.txt:1186 #, no-wrap msgid "" "\tDive site\tDive date\tTime\tDive_duration\tDive_depth\tDive buddy\n" @@ -2176,7 +2203,7 @@ msgid "" msgstr "" #. type: delimited block * -#: ./user-manual.txt:1168 +#: ./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 " @@ -2190,7 +2217,7 @@ msgid "" msgstr "" #. type: delimited block * -#: ./user-manual.txt:1179 +#: ./user-manual.txt:1205 #, no-wrap msgid "" "\tDive Time (s)\tDepth (m)\tpO₂ - Setpoint (Bar) \tpO₂ - C1 Cell 1 " @@ -2207,7 +2234,7 @@ msgid "" msgstr "" #. type: delimited block * -#: ./user-manual.txt:1185 +#: ./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_ " @@ -2218,7 +2245,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:1199 +#: ./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 " @@ -2231,7 +2258,7 @@ msgid "" msgstr "" #. type: Title === -#: ./user-manual.txt:1202 +#: ./user-manual.txt:1228 #, no-wrap msgid "" "Importing GPS coordinates with the _Subsurface Companion App_ for mobile " @@ -2239,7 +2266,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:1211 +#: ./user-manual.txt:1237 #, no-wrap msgid "" "Using the *Subsurface Companion App* on an _Android device_ or\n" @@ -2252,18 +2279,18 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:1213 +#: ./user-manual.txt:1239 msgid "To do this:" msgstr "" #. type: Title ==== -#: ./user-manual.txt:1214 +#: ./user-manual.txt:1240 #, no-wrap msgid "Create a Companion App account" msgstr "" #. type: Plain text -#: ./user-manual.txt:1219 +#: ./user-manual.txt:1245 msgid "" "Register on the http://api.hohndel.org/login/[_Subsurface companion web " "page_]. A confirmation email with instructions and a personal *DIVERID* " @@ -2272,7 +2299,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:1224 +#: ./user-manual.txt:1250 msgid "" "Download the app from " "https://play.google.com/store/apps/details?id=org.subsurface[Google Play " @@ -2281,18 +2308,18 @@ msgid "" msgstr "" #. type: Title ==== -#: ./user-manual.txt:1225 +#: ./user-manual.txt:1251 #, no-wrap msgid "Using the Subsurface companion app on an Android smartphone" msgstr "" #. type: Plain text -#: ./user-manual.txt:1228 +#: ./user-manual.txt:1254 msgid "On first use the app has three options:" msgstr "" #. type: Plain text -#: ./user-manual.txt:1234 +#: ./user-manual.txt:1260 msgid "" "_Create a new account._ Equivalent to registering in _Subsurface_ companion " "page using an Internet browser. One can request a *DIVERID* using this " @@ -2302,14 +2329,14 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:1237 +#: ./user-manual.txt:1263 msgid "" "_Retrieve an account._ If users forgot their *DIVERID* they will receive an " "email to recover the number." msgstr "" #. type: Plain text -#: ./user-manual.txt:1241 +#: ./user-manual.txt:1267 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 " @@ -2317,7 +2344,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:1249 +#: ./user-manual.txt:1275 msgid "" "In the _Subsurface_ main program, the *DIVERID* should also be entered on " "the Default Preferences panel, obtained by selecting _File -> Preferences -> " @@ -2326,13 +2353,13 @@ msgid "" msgstr "" #. type: Title ===== -#: ./user-manual.txt:1250 +#: ./user-manual.txt:1276 #, no-wrap msgid "Creating new dive locations" msgstr "" #. type: Plain text -#: ./user-manual.txt:1255 +#: ./user-manual.txt:1281 msgid "" "Now one is ready to get a dive position and send it to the server. The " "Android display will look like the left hand image (*A*) below, but without " @@ -2340,21 +2367,21 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:1258 +#: ./user-manual.txt:1284 msgid "" "Touch the \"+\" icon on the top right to add a new dive site, a menu will be " "showed with 3 options:" msgstr "" #. type: Plain text -#: ./user-manual.txt:1261 +#: ./user-manual.txt:1287 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:1270 +#: ./user-manual.txt:1296 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 " @@ -2367,13 +2394,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: ./user-manual.txt:1271 +#: ./user-manual.txt:1297 #, no-wrap msgid "images/Companion_5.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:1279 +#: ./user-manual.txt:1305 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 " @@ -2383,13 +2410,13 @@ msgid "" msgstr "" #. type: Title ===== -#: ./user-manual.txt:1280 +#: ./user-manual.txt:1306 #, no-wrap msgid "Dive lists of dive locations" msgstr "" #. type: Plain text -#: ./user-manual.txt:1288 +#: ./user-manual.txt:1314 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 " @@ -2401,7 +2428,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:1296 +#: ./user-manual.txt:1322 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 " @@ -2413,13 +2440,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: ./user-manual.txt:1297 +#: ./user-manual.txt:1323 #, no-wrap msgid "images/Companion_4.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:1303 +#: ./user-manual.txt:1329 msgid "" "When one selects 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 " @@ -2427,32 +2454,32 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:1305 +#: ./user-manual.txt:1331 msgid "" "Edit (pencil): Change the text name or other characteristics of the dive " "location." msgstr "" #. type: Plain text -#: ./user-manual.txt:1307 +#: ./user-manual.txt:1333 msgid "Maps: Display a map showing the dive location." msgstr "" #. type: Plain text -#: ./user-manual.txt:1310 +#: ./user-manual.txt:1336 msgid "" "After editing and saving a dive location (see *C* above), one needs to " "upload it to the web service, as explained below." msgstr "" #. type: Title ===== -#: ./user-manual.txt:1311 +#: ./user-manual.txt:1337 #, no-wrap msgid "Uploading dive locations" msgstr "" #. type: Plain text -#: ./user-manual.txt:1317 +#: ./user-manual.txt:1343 msgid "" "There are several ways to send locations to the server. The easiest is by " "simply selecting the locations (See *A* below) and then touching the right " @@ -2460,51 +2487,51 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:1322 +#: ./user-manual.txt:1348 msgid "" "Users must be careful, as the trash icon on the right means exactly what it " "should; it deletes the selected dive location(s)." msgstr "" #. type: Target for macro image -#: ./user-manual.txt:1323 +#: ./user-manual.txt:1349 #, no-wrap msgid "images/Companion_1.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:1328 +#: ./user-manual.txt:1354 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:1330 +#: ./user-manual.txt:1356 #, no-wrap msgid "Settings on the Companion App" msgstr "" #. type: Plain text -#: ./user-manual.txt:1333 +#: ./user-manual.txt:1359 msgid "" "Selecting the _Settings_ menu option results in the right hand image above " "(*B*)." msgstr "" #. type: Title ===== -#: ./user-manual.txt:1334 +#: ./user-manual.txt:1360 #, no-wrap msgid "Server and account" msgstr "" #. type: Plain text -#: ./user-manual.txt:1337 +#: ./user-manual.txt:1363 msgid "_Web-service URL._ This is predefined (http://api.hohndel.org/)" msgstr "" #. type: Plain text -#: ./user-manual.txt:1341 +#: ./user-manual.txt:1367 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 " @@ -2512,33 +2539,33 @@ msgid "" msgstr "" #. type: Title ===== -#: ./user-manual.txt:1342 +#: ./user-manual.txt:1368 #, no-wrap msgid "Synchronisation" msgstr "" #. type: Plain text -#: ./user-manual.txt:1346 +#: ./user-manual.txt:1372 msgid "" "_Synchronize on startup_. If selected, dive locations in the Android device " "and those on the web service synchronise each time the app is started." msgstr "" #. type: Plain text -#: ./user-manual.txt:1349 +#: ./user-manual.txt:1375 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:1350 +#: ./user-manual.txt:1376 #, no-wrap msgid "Background service" msgstr "" #. type: Plain text -#: ./user-manual.txt:1353 +#: ./user-manual.txt:1379 msgid "" "Instead of entering a unique dive location, users can leave the service " "running in the background of their Android device, allowing the continuous " @@ -2546,40 +2573,40 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:1356 +#: ./user-manual.txt:1382 msgid "The settings below define the behaviour of the service:" msgstr "" #. type: Plain text -#: ./user-manual.txt:1359 +#: ./user-manual.txt:1385 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:1361 +#: ./user-manual.txt:1387 msgid "_Min distance._ In meters. Minimum distance between two locations." msgstr "" #. type: Plain text -#: ./user-manual.txt:1363 +#: ./user-manual.txt:1389 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:1364 ./user-manual.txt:1461 ./user-manual.txt:1880 +#: ./user-manual.txt:1390 ./user-manual.txt:1487 ./user-manual.txt:1905 #, no-wrap msgid "images/icons/info.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:1374 +#: ./user-manual.txt:1400 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 50m from previous location. If subsequent locations " +"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 " @@ -2587,60 +2614,60 @@ msgid "" msgstr "" #. type: Title ===== -#: ./user-manual.txt:1375 +#: ./user-manual.txt:1401 #, no-wrap msgid "Other" msgstr "" #. type: Plain text -#: ./user-manual.txt:1379 +#: ./user-manual.txt:1405 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:1381 +#: ./user-manual.txt:1407 msgid "_Subsurface website._ A link to the URL of Subsurface web" msgstr "" #. type: Plain text -#: ./user-manual.txt:1383 +#: ./user-manual.txt:1409 msgid "_Version._ Displays the current version of the Companion App." msgstr "" #. type: Title ===== -#: ./user-manual.txt:1384 +#: ./user-manual.txt:1410 #, no-wrap msgid "Search" msgstr "" #. type: Plain text -#: ./user-manual.txt:1387 +#: ./user-manual.txt:1413 msgid "Search the saved dive locations by name or by date and time." msgstr "" #. type: Title ===== -#: ./user-manual.txt:1388 +#: ./user-manual.txt:1414 #, no-wrap msgid "Start service" msgstr "" #. type: Plain text -#: ./user-manual.txt:1391 +#: ./user-manual.txt:1417 msgid "" "Initiates the _background service_ following the previously defined " "settings." msgstr "" #. type: Title ===== -#: ./user-manual.txt:1392 +#: ./user-manual.txt:1418 #, no-wrap msgid "Disconnect" msgstr "" #. type: Plain text -#: ./user-manual.txt:1400 +#: ./user-manual.txt:1426 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 " @@ -2650,24 +2677,24 @@ msgid "" msgstr "" #. type: Title ===== -#: ./user-manual.txt:1401 +#: ./user-manual.txt:1427 #, no-wrap msgid "Send all locations" msgstr "" #. type: Plain text -#: ./user-manual.txt:1404 +#: ./user-manual.txt:1430 msgid "This option sends all locations stored in the Android device to the server." msgstr "" #. type: Title ==== -#: ./user-manual.txt:1406 +#: ./user-manual.txt:1432 #, no-wrap msgid "Using the Subsurface companion app on an _iPhone_ to record dive locations" msgstr "" #. type: Plain text -#: ./user-manual.txt:1411 +#: ./user-manual.txt:1437 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 " @@ -2676,13 +2703,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: ./user-manual.txt:1412 +#: ./user-manual.txt:1438 #, no-wrap msgid "images/iphone.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:1419 +#: ./user-manual.txt:1445 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 " @@ -2696,22 +2723,22 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:1425 +#: ./user-manual.txt:1451 msgid "" "One can edit the site name afterwards by selecting the dive from the dive " "list and clicking on the site name. There are no other editable fields. The " -"dive list is automatically uploaded from the iphone to the webservice and " +"dive list is automatically uploaded from the iPhone to the webservice and " "there is not an option to trigger upload manually." msgstr "" #. type: Title ==== -#: ./user-manual.txt:1427 +#: ./user-manual.txt:1453 #, no-wrap msgid "Downloading dive locations to the _Subsurface_ divelog" msgstr "" #. type: Plain text -#: ./user-manual.txt:1436 +#: ./user-manual.txt:1462 msgid "" "Download dive(s) from a dive computer or enter them manually into " "_Subsurface_ before obtaining the GPS coordinates from the server. The " @@ -2723,13 +2750,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: ./user-manual.txt:1437 +#: ./user-manual.txt:1463 #, no-wrap msgid "images/DownloadGPS.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:1445 +#: ./user-manual.txt:1471 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_ " @@ -2740,7 +2767,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:1452 +#: ./user-manual.txt:1478 msgid "" "Since _Subsurface_ matches GPS locations from the Android device and dive " "information from the dive computer based on date-time data, automatic " @@ -2752,7 +2779,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:1460 +#: ./user-manual.txt:1486 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 " @@ -2766,12 +2793,12 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:1464 +#: ./user-manual.txt:1490 msgid "TIPS:" msgstr "" #. type: Plain text -#: ./user-manual.txt:1471 +#: ./user-manual.txt:1497 msgid "" "_Background service_, being a very powerful tool, may fill the location list " "with many unnecessary locations not corresponding to the exact dive point " @@ -2784,7 +2811,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:1475 +#: ./user-manual.txt:1501 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 " @@ -2793,13 +2820,13 @@ msgid "" msgstr "" #. type: Title === -#: ./user-manual.txt:1477 +#: ./user-manual.txt:1503 #, no-wrap msgid "Adding photographs to dives" msgstr "" #. type: Plain text -#: ./user-manual.txt:1483 +#: ./user-manual.txt:1509 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 " @@ -2808,13 +2835,13 @@ msgid "" msgstr "" #. type: Title ==== -#: ./user-manual.txt:1484 +#: ./user-manual.txt:1510 #, no-wrap msgid "Loading photos and getting synchronisation between dive computer and camera" msgstr "" #. type: Plain text -#: ./user-manual.txt:1488 +#: ./user-manual.txt:1514 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 " @@ -2822,26 +2849,26 @@ msgid "" msgstr "" #. type: Target for macro image -#: ./user-manual.txt:1489 +#: ./user-manual.txt:1515 #, no-wrap msgid "images/LoadImage1_f20.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:1493 +#: ./user-manual.txt:1519 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:1494 +#: ./user-manual.txt:1520 #, no-wrap msgid "images/LoadImage2_f20.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:1503 +#: ./user-manual.txt:1529 msgid "" "This brings up the time synchronisation dialog, shown below. The critical " "problem is that the time synchronisation is not perfect between the dive " @@ -2852,12 +2879,12 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:1505 +#: ./user-manual.txt:1531 msgid "_Subsurface_ achieves this synchronisation in three ways:" msgstr "" #. type: Plain text -#: ./user-manual.txt:1508 +#: ./user-manual.txt:1534 #, no-wrap msgid "" "*Pro-actively*: Before the dive, ensure synchronisation of the dive computer " @@ -2867,7 +2894,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:1519 +#: ./user-manual.txt:1545 #, no-wrap msgid "" "*Manually*: If the user wrote down the exact camera time at the start of a " @@ -2894,13 +2921,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: ./user-manual.txt:1520 +#: ./user-manual.txt:1546 #, no-wrap msgid "images/LoadImage3b_f20.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:1538 +#: ./user-manual.txt:1564 #, no-wrap msgid "" "*By photograph*: There is a very slick way of achieving synchronisation. If " @@ -2912,7 +2939,7 @@ msgid "" "each photo. In order to do this, use the bottom half of the _Time shift_ " "dialog. If one uses\n" "the bottom part, the top part of the dialog is ignored. Click on\n" -"the horizontal bar entitled \"_Select image of divecomputer showing " +"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" @@ -2933,30 +2960,30 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:1541 +#: ./user-manual.txt:1567 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:1542 +#: ./user-manual.txt:1568 #, no-wrap msgid "Viewing the photos" msgstr "" #. type: Plain text -#: ./user-manual.txt:1545 +#: ./user-manual.txt:1571 msgid "After the images have been loaded, they appear in two places:" msgstr "" #. type: Plain text -#: ./user-manual.txt:1547 +#: ./user-manual.txt:1573 msgid "the _Photos_ tab of the *Notes* panel." msgstr "" #. type: Plain text -#: ./user-manual.txt:1551 +#: ./user-manual.txt:1577 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 " @@ -2965,37 +2992,37 @@ msgid "" msgstr "" #. type: Target for macro image -#: ./user-manual.txt:1552 +#: ./user-manual.txt:1578 #, no-wrap msgid "images/icons/ShowPhotos_f20.png" msgstr "" #. type: Plain text -#: ./user-manual.txt:1555 +#: ./user-manual.txt:1581 msgid "This results in a profile display as in the image below:" msgstr "" #. type: Target for macro image -#: ./user-manual.txt:1556 +#: ./user-manual.txt:1582 #, no-wrap msgid "images/LoadImage4_f20.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:1560 +#: ./user-manual.txt:1586 msgid "" "If one hovers with the mouse over any of the photo icons, then a thumbnail " "photo is shown of the appropriate photo. See the image below:" msgstr "" #. type: Target for macro image -#: ./user-manual.txt:1561 +#: ./user-manual.txt:1587 #, no-wrap msgid "images/LoadImage5_f20.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:1570 +#: ./user-manual.txt:1596 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 " @@ -3007,19 +3034,19 @@ msgid "" msgstr "" #. type: Target for macro image -#: ./user-manual.txt:1571 +#: ./user-manual.txt:1597 #, no-wrap msgid "images/LoadImage6_f20.jpg" msgstr "" #. type: Title ==== -#: ./user-manual.txt:1573 +#: ./user-manual.txt:1599 #, no-wrap msgid "The _Photos_ tab" msgstr "" #. type: Plain text -#: ./user-manual.txt:1584 +#: ./user-manual.txt:1610 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 " @@ -3035,13 +3062,13 @@ msgid "" msgstr "" #. type: Title ==== -#: ./user-manual.txt:1585 +#: ./user-manual.txt:1611 #, no-wrap msgid "Photos on an external hard disk" msgstr "" #. type: Plain text -#: ./user-manual.txt:1596 +#: ./user-manual.txt:1622 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) " @@ -3059,13 +3086,13 @@ msgid "" msgstr "" #. type: Title ==== -#: ./user-manual.txt:1598 +#: ./user-manual.txt:1624 #, no-wrap msgid "Moving photographs among directories, hard disks or computers" msgstr "" #. type: Plain text -#: ./user-manual.txt:1608 +#: ./user-manual.txt:1634 #, no-wrap msgid "" "After a photograph has been loaded into _Subsurface_ and associated with a " @@ -3087,7 +3114,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:1613 +#: ./user-manual.txt:1639 #, no-wrap msgid "" "When a photo is loaded into _Subsurface_, a fingerprint for the image is " @@ -3100,31 +3127,31 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:1615 +#: ./user-manual.txt:1641 msgid "" "look through a particular directory (and all its subdirectories recursively) " "where photos have been moved" msgstr "" #. type: Plain text -#: ./user-manual.txt:1616 +#: ./user-manual.txt:1642 msgid "to," msgstr "" #. type: Plain text -#: ./user-manual.txt:1618 +#: ./user-manual.txt:1644 msgid "calculate fingerprints for all photos in this directory, and" msgstr "" #. type: Plain text -#: ./user-manual.txt:1620 +#: ./user-manual.txt:1646 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:1622 +#: ./user-manual.txt:1648 msgid "" "loaded into _Subsurface_ (even if the original file name has changed), to " "automatically update the directory information so that _Subsurface_ can find " @@ -3132,7 +3159,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:1627 +#: ./user-manual.txt:1653 #, no-wrap msgid "" "This is achieved by selecting from the Main Menu: _File -> Find moved " @@ -3146,52 +3173,66 @@ msgid "" msgstr "" #. type: delimited block * -#: ./user-manual.txt:1632 +#: ./user-manual.txt:1658 #, no-wrap msgid "*Upgrading existing photo collections without fingerprints*\n" msgstr "" #. type: delimited block * -#: ./user-manual.txt:1642 +#: ./user-manual.txt:1663 +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_." +msgstr "" + +#. type: delimited block * +#: ./user-manual.txt:1665 +msgid "" +"_Subsurface_ automatically checks and, if necessary, updates the " +"fingerprints associated with a single dive if:" +msgstr "" + +#. type: delimited block * +#: ./user-manual.txt:1666 +msgid "" +"The images associated with that dive are visible as thumbnails on the *Dive " +"Profile*." +msgstr "" + +#. type: delimited block * +#: ./user-manual.txt:1667 msgid "" -"Software for the automated finger print calculation of existing photo " -"collections is under development. Currently single dives must be upgraded " -"one at a time. Select the toolbar button on the *Dive profile* panel that " -"enables the display of images. The thumbnails of images are shown on the " -"dive profile. Then open the dive and change anything in the *Notes* panel " -"that brings up the blue edit bar at the top of the notes panel to save the " -"edits. For instance, add a space character at the end of the _Notes_ text " -"box and immediately delete that space character. Select the option _Apply " -"changes_ in the blue edit bar to save the dive information. Fingerprints " -"are calculated while saving this specific dive." +"One edits anything in the *Notes tab* panel and save the edits by selecting " +"_Apply changes_." msgstr "" #. type: Title === -#: ./user-manual.txt:1646 +#: ./user-manual.txt:1671 #, no-wrap msgid "Logging special types of dives" msgstr "" #. type: Title ==== -#: ./user-manual.txt:1649 +#: ./user-manual.txt:1674 #, no-wrap msgid "Multicylinder dives" msgstr "" #. type: Plain text -#: ./user-manual.txt:1656 +#: ./user-manual.txt:1681 msgid "" "_Subsurface_ easily handles dives involving more than one " -"cylinder. Multicylinder diving usually happens (a) if a diver does not have " +"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 multicylinder dives are often used by " +"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:1660 +#: ./user-manual.txt:1685 #, no-wrap msgid "" "*Describe the cylinders used during the dive* This is performed in the " @@ -3203,7 +3244,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:1665 +#: ./user-manual.txt:1690 #, no-wrap msgid "" "*Record the times at which switches from one cylinder to another was done:* " @@ -3216,7 +3257,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:1673 +#: ./user-manual.txt:1698 #, no-wrap msgid "" "*Record the cylinder changes on the dive profile*: If the latter option\n" @@ -3233,7 +3274,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:1677 +#: ./user-manual.txt:1702 msgid "" "Having performed these tasks, _Subsurface_ indicates the appropriate use of " "cylinders in the dive profile. Below is a multi-cylinder dive, starting off " @@ -3242,30 +3283,30 @@ msgid "" msgstr "" #. type: Target for macro image -#: ./user-manual.txt:1678 +#: ./user-manual.txt:1703 #, no-wrap msgid "images/multicylinder_dive.jpg" msgstr "" #. type: Title ==== -#: ./user-manual.txt:1680 +#: ./user-manual.txt:1705 #, no-wrap msgid "Sidemount dives" msgstr "" #. type: Plain text -#: ./user-manual.txt:1686 +#: ./user-manual.txt:1711 msgid "" -"Sidemount diving is just another form of multicylinder diving, often with " +"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 multicylinder dives, above, three " +"dive logging involves, exactly as with multi-cylinder dives, above, three " "steps:" msgstr "" #. type: Plain text -#: ./user-manual.txt:1695 +#: ./user-manual.txt:1720 #, no-wrap msgid "" "*During the dive, record cylinder switch events*. Since sidemount diving " @@ -3287,7 +3328,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:1698 +#: ./user-manual.txt:1723 #, no-wrap msgid "" "*Within _Subsurface_ describe the cylinders used during the dive*. The diver " @@ -3298,7 +3339,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:1708 +#: ./user-manual.txt:1733 #, no-wrap msgid "" "*Indicate cylinder change events on the _Subsurface_ dive profile*. Once the " @@ -3323,32 +3364,32 @@ msgid "" msgstr "" #. type: Target for macro image -#: ./user-manual.txt:1709 +#: ./user-manual.txt:1734 #, no-wrap msgid "images/sidemount1.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:1712 +#: ./user-manual.txt:1737 msgid "" "This section gives an example of the versatility of _Subsurface_ as a dive " "logging tool." msgstr "" #. type: Title ==== -#: ./user-manual.txt:1715 +#: ./user-manual.txt:1740 #, no-wrap msgid "Semi-closed circuit rebreather (SCR) dives" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: ./user-manual.txt:1717 +#: ./user-manual.txt:1742 #, no-wrap msgid "images/halcyon_RB80.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:1727 +#: ./user-manual.txt:1752 msgid "" "Passive semi-closed rebreathers (pSCR) comprise a technical advance in " "diving equipment that recirculates the breathing gas that a diver breathes, " @@ -3364,19 +3405,19 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:1729 +#: ./user-manual.txt:1754 msgid "" "To log pSCR dives, no special procedures are required, just the normal steps " "outlined above:" msgstr "" #. type: Plain text -#: ./user-manual.txt:1731 +#: ./user-manual.txt:1756 msgid "Select pSCR in the _Dive Mode_ dropdown list on the *Info* panel." msgstr "" #. type: Plain text -#: ./user-manual.txt:1735 +#: ./user-manual.txt:1760 msgid "" "pSCR diving often involves gas changes, requiring an additional cylinder. " "Define all the appropriate cylinders as described above and indicate the " @@ -3385,7 +3426,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:1740 +#: ./user-manual.txt:1765 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 " @@ -3395,25 +3436,25 @@ msgid "" msgstr "" #. type: Target for macro image -#: ./user-manual.txt:1741 +#: ./user-manual.txt:1766 #, no-wrap msgid "images/pSCR_profile.jpg" msgstr "" #. type: Title ==== -#: ./user-manual.txt:1746 +#: ./user-manual.txt:1771 #, no-wrap msgid "Closed circuit rebreather (CCR) dives" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: ./user-manual.txt:1748 +#: ./user-manual.txt:1773 #, no-wrap msgid "images/APD.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:1753 +#: ./user-manual.txt:1778 msgid "" "Closed system rebreathers use advanced technology to recirculate gas that " "has been breathed while doing two things to maintain a breathable oxygen " @@ -3421,12 +3462,12 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:1754 +#: ./user-manual.txt:1779 msgid "remove carbon dioxide from the gas that has been exhaled" msgstr "" #. type: Plain text -#: ./user-manual.txt:1763 +#: ./user-manual.txt:1788 msgid "" "regulate the oxygen concentration to remain within safe diving limits. The " "CCR interface of _Subsurface_ is currently experimental and under active " @@ -3441,13 +3482,13 @@ msgid "" msgstr "" #. type: Title ===== -#: ./user-manual.txt:1764 +#: ./user-manual.txt:1789 #, no-wrap msgid "Import a CCR dive" msgstr "" #. type: Plain text -#: ./user-manual.txt:1778 +#: ./user-manual.txt:1803 msgid "" "See the section dealing with xref:S_ImportingAlienDiveLogs[Importing dive " "information from other digital sources]. From the main menu of _Subsurface_, " @@ -3466,13 +3507,13 @@ msgid "" msgstr "" #. type: Title ===== -#: ./user-manual.txt:1779 +#: ./user-manual.txt:1804 #, no-wrap msgid "Displayed information for a CCR dive" msgstr "" #. type: Plain text -#: ./user-manual.txt:1789 +#: ./user-manual.txt:1814 msgid "" "_Partial pressures of gases_: The graph of oxygen partial pressure shows the " "information from the oxygen sensors of the CCR equipment. In contrast to " @@ -3486,12 +3527,12 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:1791 +#: ./user-manual.txt:1816 msgid "For TWO O~2~ sensors the mean value of the two sensors are given." msgstr "" #. type: Plain text -#: ./user-manual.txt:1795 +#: ./user-manual.txt:1820 msgid "" "For THREE-sensor systems (e.g. APD), the mean value is also used. However " "differences of more than 0,1 bar in the simultaneous readings of different " @@ -3500,19 +3541,19 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:1797 +#: ./user-manual.txt:1822 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:1799 +#: ./user-manual.txt:1824 msgid "The mean pO~2~ of the sensors is indicated with a green line," msgstr "" #. type: Plain text -#: ./user-manual.txt:1807 +#: ./user-manual.txt:1832 msgid "" "The oxygen setpoint values as well as the readings from the individual " "oxygen sensors can be shown. The display of additional CCR information is " @@ -3524,13 +3565,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: ./user-manual.txt:1808 +#: ./user-manual.txt:1833 #, no-wrap msgid "images/CCR_preferences_f20.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:1815 +#: ./user-manual.txt:1840 msgid "" "Checking any of these check boxes allows the display of additional " "oxygen-related information whenever the pO~2~ toolbar button on the " @@ -3541,13 +3582,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: ./user-manual.txt:1816 +#: ./user-manual.txt:1841 #, no-wrap msgid "images/CCR_setpoint_f20.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:1820 +#: ./user-manual.txt:1845 msgid "" "The second checkbox allows the display of the data from each individual " "oxygen sensor of the CCR equipment. The data for each sensor is colour-coded " @@ -3555,22 +3596,22 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:1822 +#: ./user-manual.txt:1847 msgid "Sensor 1: grey" msgstr "" #. type: Plain text -#: ./user-manual.txt:1823 +#: ./user-manual.txt:1848 msgid "Sensor 2: blue" msgstr "" #. type: Plain text -#: ./user-manual.txt:1824 +#: ./user-manual.txt:1849 msgid "Sensor 3: brown" msgstr "" #. type: Plain text -#: ./user-manual.txt:1828 +#: ./user-manual.txt:1853 msgid "" "The mean oxygen pO~2~ is indicated by the green line. This allows the direct " "comparison of data from each of the oxygen sensors, useful for detecting " @@ -3578,13 +3619,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: ./user-manual.txt:1829 +#: ./user-manual.txt:1854 #, no-wrap msgid "images/CCR_sensor_data_f20.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:1834 +#: ./user-manual.txt:1859 msgid "" "The setpoint data can be overlaid on the oxygen sensor data by activating " "both of the above check boxes. Partial pressures for nitrogen (and helium, " @@ -3592,7 +3633,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:1838 +#: ./user-manual.txt:1863 msgid "" "_Events_: Several events are logged, e.g. switching the mouthpiece to open " "circuit. These events are indicated by yellow triangles and, if one hovers " @@ -3601,7 +3642,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:1846 +#: ./user-manual.txt:1871 msgid "" "_Cylinder pressures_: Some CCR dive computers like the Poseidon MkVI record " "the pressures of the oxygen and diluent cylinders. The pressures of these " @@ -3614,13 +3655,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: ./user-manual.txt:1847 +#: ./user-manual.txt:1872 #, no-wrap msgid "images/CCR_dive_profile_f22.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:1852 +#: ./user-manual.txt:1877 msgid "" "_Equipment-specific information_: Equipment-specific information gathered by " "_Subsurface_ is shown in the xref:S_ExtraDataTab[Extra data tab]. This may " @@ -3628,7 +3669,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:1858 +#: ./user-manual.txt:1883 msgid "" "The deco ceiling calculated by Subsurface is not very accurate because the " "precise pressure of nitrogen in the loop can usually not be determined from " @@ -3640,13 +3681,13 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: ./user-manual.txt:1859 ./user-manual.txt:2042 +#: ./user-manual.txt:1884 ./user-manual.txt:2067 #, no-wrap msgid "images/icons/cceiling.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:1864 +#: ./user-manual.txt:1889 msgid "" "The default colour of the computer-generated deco ceiling is white. However, " "this can be set to red by checking the appropriate check box after selecting " @@ -3655,13 +3696,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: ./user-manual.txt:1865 +#: ./user-manual.txt:1890 #, no-wrap msgid "images/CCR_dive_ceilingF22.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:1869 +#: ./user-manual.txt:1894 msgid "" "More equipment-specific information for downloading CCR dive logs for " "Poseidon MkVI and APD equipment can be found in " @@ -3670,19 +3711,19 @@ msgid "" msgstr "" #. type: Title == -#: ./user-manual.txt:1870 +#: ./user-manual.txt:1895 #, no-wrap msgid "Obtaining more information about dives entered into the logbook" msgstr "" #. type: Title === -#: ./user-manual.txt:1872 +#: ./user-manual.txt:1897 #, no-wrap msgid "The *Info* tab (for individual dives)" msgstr "" #. type: Plain text -#: ./user-manual.txt:1879 +#: ./user-manual.txt:1904 msgid "" "The Info tab gives some summary information about a particular dive that has " "been selected in the *Dive List*. Useful information here includes the " @@ -3692,7 +3733,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:1886 +#: ./user-manual.txt:1911 msgid "" "Gas consumption and SAC calculations: _Subsurface_ calculates SAC and Gas " "consumption taking in account gas incompressibility, particularly at tank " @@ -3701,13 +3742,13 @@ msgid "" msgstr "" #. type: Title === -#: ./user-manual.txt:1888 +#: ./user-manual.txt:1913 #, no-wrap msgid "The *Extra Data* tab (usually for individual dives)" msgstr "" #. type: Plain text -#: ./user-manual.txt:1896 +#: ./user-manual.txt:1921 msgid "" "When using a dive computer, it often reports several data items that cannot " "easily be presented in a standardised way because the nature of the " @@ -3719,19 +3760,19 @@ msgid "" msgstr "" #. type: Target for macro image -#: ./user-manual.txt:1897 +#: ./user-manual.txt:1922 #, no-wrap msgid "images/ExtraDataTab_f20.jpg" msgstr "" #. type: Title === -#: ./user-manual.txt:1899 +#: ./user-manual.txt:1924 #, no-wrap msgid "The *Stats* tab (for groups of dives)" msgstr "" #. type: Plain text -#: ./user-manual.txt:1910 +#: ./user-manual.txt:1935 msgid "" "The Stats tab gives summary statistics for more than one dive, assuming that " "more than one dive has been selected in the *Dive List* using the standard " @@ -3744,19 +3785,19 @@ msgid "" msgstr "" #. type: Title === -#: ./user-manual.txt:1912 +#: ./user-manual.txt:1937 #, no-wrap msgid "The *Dive Profile*" msgstr "" #. type: Target for macro image -#: ./user-manual.txt:1914 +#: ./user-manual.txt:1939 #, no-wrap msgid "images/Profile2.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:1925 +#: ./user-manual.txt:1950 msgid "" "Of all the panels in _Subsurface_, the Dive Profile contains the most " "detailed information about each dive. The Dive Profile has a *button bar* on " @@ -3769,7 +3810,7 @@ msgid "" msgstr "" #. type: delimited block | -#: ./user-manual.txt:1932 +#: ./user-manual.txt:1957 #, no-wrap msgid "" "|*Colour*|*Descent speed (m/min)*|*Ascent speed (m/min)*\n" @@ -3781,7 +3822,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:1937 +#: ./user-manual.txt:1962 msgid "" "The profile also includes depth readings for the peaks and troughs in the " "graph. Thus, users should see the depth of the deepest point and other " @@ -3790,13 +3831,13 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: ./user-manual.txt:1938 +#: ./user-manual.txt:1963 #, no-wrap msgid "images/icons/scale.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:1943 +#: ./user-manual.txt:1968 msgid "" "In some cases the dive profile does not fill the whole area of the *Dive " "Profile* panel. Clicking the *Scale* button in the toolbar on the left of " @@ -3805,7 +3846,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:1946 +#: ./user-manual.txt:1971 #, no-wrap msgid "" "*Water temperature* is displayed with its own blue line with temperature " @@ -3814,7 +3855,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:1953 +#: ./user-manual.txt:1978 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 " @@ -3825,13 +3866,13 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: ./user-manual.txt:1954 +#: ./user-manual.txt:1979 #, no-wrap msgid "images/icons/O2.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:1958 +#: ./user-manual.txt:1983 msgid "" "Clicking this button allows display of the partial pressure of *oxygen* " "during the dive. This is depicted below the dive depth and water temperature " @@ -3839,26 +3880,26 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: ./user-manual.txt:1959 +#: ./user-manual.txt:1984 #, no-wrap msgid "images/icons/N2.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:1962 +#: ./user-manual.txt:1987 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:1963 +#: ./user-manual.txt:1988 #, no-wrap msgid "images/icons/He.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:1967 +#: ./user-manual.txt:1992 msgid "" "Clicking this button allows display of the partial pressure of *helium* " "during the dive. This is only of importance to divers using Trimix, " @@ -3866,7 +3907,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:1980 +#: ./user-manual.txt:2005 msgid "" "The *air consumption* graph displays the tank pressure and its change during " "the dive. The air consumption takes depth into account so that even when " @@ -3881,13 +3922,13 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: ./user-manual.txt:1981 +#: ./user-manual.txt:2006 #, no-wrap msgid "images/icons/Heartbutton.png" msgstr "" #. type: Plain text -#: ./user-manual.txt:1985 +#: ./user-manual.txt:2010 msgid "" "Clicking on the heart rate button will allow the display of heart rate " "information during the dive if the dive computer was attached to a heart " @@ -3895,7 +3936,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:1993 +#: ./user-manual.txt:2018 #, no-wrap msgid "" "It is possible to *zoom* into the profile graph. This is done either by " @@ -3910,19 +3951,19 @@ msgid "" msgstr "" #. type: Target for macro image -#: ./user-manual.txt:1994 +#: ./user-manual.txt:2019 #, no-wrap msgid "images/MeasuringBar.png" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: ./user-manual.txt:1996 +#: ./user-manual.txt:2021 #, no-wrap msgid "images/icons/ruler.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:2004 +#: ./user-manual.txt:2029 msgid "" "Measurements of *depth or time differences* can be achieved by using the " "*ruler button* on the left of the dive profile panel. The measurement is " @@ -3932,13 +3973,13 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: ./user-manual.txt:2005 +#: ./user-manual.txt:2030 #, no-wrap msgid "images/icons/ShowPhotos.png" msgstr "" #. type: Plain text -#: ./user-manual.txt:2012 +#: ./user-manual.txt:2037 msgid "" "Photographs that have been added to a dive can be shown on the profile by " "selecting the *Show-photo* button. The position of a photo on the profile " @@ -3947,7 +3988,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:2041 +#: ./user-manual.txt:2066 msgid "" "The profile can also include the dive computer reported *ceiling* (more " "precisely, the deepest deco stop that the dive computer calculated for each " @@ -3977,7 +4018,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:2047 +#: ./user-manual.txt:2072 msgid "" "If the dive computer itself calculates a ceiling and makes it available to " "_Subsurface_ during upload of dives, this can be shown as a red area by " @@ -3985,13 +4026,13 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: ./user-manual.txt:2048 +#: ./user-manual.txt:2073 #, no-wrap msgid "images/icons/ceiling1.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:2053 +#: ./user-manual.txt:2078 msgid "" "If the *Calculated ceiling* button on the Profile Panel is clicked, then a " "ceiling, calculated by _Subsurface_, is shown in green if it exists for a " @@ -4000,13 +4041,13 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: ./user-manual.txt:2054 +#: ./user-manual.txt:2079 #, no-wrap msgid "images/icons/ceiling2.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:2058 +#: ./user-manual.txt:2083 msgid "" "If, in addition, the *show all tissues* button on the Profile Panel is " "clicked, the ceiling is shown for the tissue compartments following the " @@ -4014,32 +4055,32 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: ./user-manual.txt:2059 +#: ./user-manual.txt:2084 #, no-wrap msgid "images/icons/ceiling3.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:2063 +#: ./user-manual.txt:2088 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:2064 +#: ./user-manual.txt:2089 #, no-wrap msgid "images/Ceilings2.jpg" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: ./user-manual.txt:2066 +#: ./user-manual.txt:2091 #, no-wrap msgid "images/icons/ShowCylindersButton.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:2072 +#: ./user-manual.txt:2097 msgid "" "By selecting this icon, the different cylinders used during a dive can be " "represented as a coloured bar at the bottom of the *Dive Profile*. In " @@ -4051,19 +4092,19 @@ msgid "" msgstr "" #. type: Target for macro image -#: ./user-manual.txt:2073 +#: ./user-manual.txt:2098 #, no-wrap msgid "images/ShowCylinders_f20.jpg" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: ./user-manual.txt:2076 +#: ./user-manual.txt:2101 #, no-wrap msgid "images/tissues.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:2088 +#: ./user-manual.txt:2113 msgid "" "Display inert gas tissue pressures relative to ambient inert gas pressure " "(horizontal grey line). Tissue pressures are calculated using the Bühlmann " @@ -4082,13 +4123,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: ./user-manual.txt:2089 +#: ./user-manual.txt:2114 #, no-wrap msgid "images/tissuesGraph.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:2097 +#: ./user-manual.txt:2122 msgid "" "Gradient Factor settings strongly affect the calculated ceilings and their " "depths. For more information about Gradient factors, see the section on " @@ -4101,7 +4142,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:2099 +#: ./user-manual.txt:2124 #, no-wrap msgid "" " ** http://www.tek-dive.com/portal/upload/M-Values.pdf[Understanding " @@ -4109,7 +4150,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:2101 +#: ./user-manual.txt:2126 #, no-wrap msgid "" " ** " @@ -4118,13 +4159,13 @@ msgid "" msgstr "" #. type: Title === -#: ./user-manual.txt:2103 +#: ./user-manual.txt:2128 #, no-wrap msgid "The Dive Profile context menu" msgstr "" #. type: Plain text -#: ./user-manual.txt:2121 +#: ./user-manual.txt:2146 msgid "" "The context menu for the Dive Profile is accessed by right-clicking while " "the mouse cursor is over the Dive Profile panel. The menu allows the " @@ -4145,13 +4186,13 @@ msgid "" msgstr "" #. type: Title === -#: ./user-manual.txt:2123 +#: ./user-manual.txt:2148 #, no-wrap msgid "The *Information Box*" msgstr "" #. type: Plain text -#: ./user-manual.txt:2133 +#: ./user-manual.txt:2158 msgid "" "The Information box displays a large range of information pertaining to the " "dive profile. Normally the Information Box is located to the top left of the " @@ -4164,13 +4205,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: ./user-manual.txt:2134 +#: ./user-manual.txt:2159 #, no-wrap msgid "images/InfoBox2.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:2151 +#: ./user-manual.txt:2176 msgid "" "The moment the mouse points inside the *Dive Profile* panel, the information " "box expands and shows many data items. In this situation, the data reflect " @@ -4191,20 +4232,20 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:2154 +#: ./user-manual.txt:2179 msgid "" "The user has control over the display of several statistics, represented as " "four buttons on the left of the profile panel. These are:" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: ./user-manual.txt:2155 +#: ./user-manual.txt:2180 #, no-wrap msgid "images/icons/MOD.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:2164 +#: ./user-manual.txt:2189 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 " @@ -4216,13 +4257,13 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: ./user-manual.txt:2165 +#: ./user-manual.txt:2190 #, no-wrap msgid "images/icons/NDL.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:2174 +#: ./user-manual.txt:2199 msgid "" "Clicking this button causes the Information Box to display the *No-deco " "Limit (NDL)* or the *Total Time to Surface (TTS)*. NDL is the time duration " @@ -4235,13 +4276,13 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: ./user-manual.txt:2175 +#: ./user-manual.txt:2200 #, no-wrap msgid "images/icons/SAC.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:2184 +#: ./user-manual.txt:2209 msgid "" "Clicking this button causes the Information Box to display the *Surface Air " "Consumption (SAC)*. SAC is an indication of the surface-normalised " @@ -4254,13 +4295,13 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: ./user-manual.txt:2185 +#: ./user-manual.txt:2210 #, no-wrap msgid "images/icons/EAD.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:2200 +#: ./user-manual.txt:2225 msgid "" "Clicking this button displays the *Equivalent Air Depth (EAD)* for nitrox " "dives as well as the *Equivalent Narcotic Depth (END)* for trimix " @@ -4277,20 +4318,20 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:2202 +#: ./user-manual.txt:2227 msgid "" "Figure (*B*) above shows an information box with a nearly complete set of " "data." msgstr "" #. type: Title ==== -#: ./user-manual.txt:2204 +#: ./user-manual.txt:2229 #, no-wrap msgid "The Gas Pressure Bar Graph" msgstr "" #. type: Plain text -#: ./user-manual.txt:2211 +#: ./user-manual.txt:2236 msgid "" "On the left of the *Information Box* is a vertical bar graph indicating the " "pressures of the nitrogen (and other inert gases, e.g. helium, if " @@ -4301,13 +4342,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: ./user-manual.txt:2212 +#: ./user-manual.txt:2237 #, no-wrap msgid "images/GasPressureBarGraph.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:2218 +#: ./user-manual.txt:2243 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 " @@ -4317,7 +4358,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:2224 +#: ./user-manual.txt:2249 msgid "" "The horizontal black line underneath the light green margin indicates the " "equilibrium pressure of the inert gases inhaled by the diver, usually " @@ -4328,7 +4369,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:2228 +#: ./user-manual.txt:2253 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 " @@ -4336,7 +4377,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:2233 +#: ./user-manual.txt:2258 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 " @@ -4346,7 +4387,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:2237 +#: ./user-manual.txt:2262 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 " @@ -4354,7 +4395,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:2240 +#: ./user-manual.txt:2265 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 " @@ -4362,7 +4403,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:2243 +#: ./user-manual.txt:2268 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 " @@ -4370,7 +4411,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:2246 +#: ./user-manual.txt:2271 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 " @@ -4378,7 +4419,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:2251 +#: ./user-manual.txt:2276 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 " @@ -4388,7 +4429,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:2257 +#: ./user-manual.txt:2282 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 " @@ -4399,7 +4440,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:2262 +#: ./user-manual.txt:2287 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 " @@ -4409,19 +4450,19 @@ msgid "" msgstr "" #. type: Title == -#: ./user-manual.txt:2265 +#: ./user-manual.txt:2290 #, no-wrap msgid "Organising the logbook (Manipulating groups of dives)" msgstr "" #. type: Title === -#: ./user-manual.txt:2267 +#: ./user-manual.txt:2292 #, no-wrap msgid "The Dive List context menu" msgstr "" #. type: Plain text -#: ./user-manual.txt:2271 +#: ./user-manual.txt:2296 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 " @@ -4430,30 +4471,30 @@ msgstr "" #. TODO: NEEDS REPLACEMENT #. type: Target for macro image -#: ./user-manual.txt:2273 +#: ./user-manual.txt:2298 #, no-wrap msgid "images/ContextMenu.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:2276 +#: ./user-manual.txt:2301 msgid "The context menu is used in many manipulations described below." msgstr "" #. type: Title ==== -#: ./user-manual.txt:2277 +#: ./user-manual.txt:2302 #, no-wrap msgid "Customising the columns showed in the *Dive List* panel" msgstr "" #. type: Target for macro image -#: ./user-manual.txt:2279 +#: ./user-manual.txt:2304 #, no-wrap msgid "images/DiveListOptions.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:2287 +#: ./user-manual.txt:2312 msgid "" "The default information in the *Dive List* includes, for each dive, " "Dive_number, Date, Rating, Dive_depth, Dive_duration and Dive_location. This " @@ -4467,13 +4508,13 @@ msgid "" msgstr "" #. type: Title === -#: ./user-manual.txt:2289 +#: ./user-manual.txt:2314 #, no-wrap msgid "Renumbering the dives" msgstr "" #. type: Plain text -#: ./user-manual.txt:2301 +#: ./user-manual.txt:2326 msgid "" "Dives are normally numbered incrementally from non-recent dives (low " "sequence numbers) to recent dives (having the highest sequence numbers). The " @@ -4489,7 +4530,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:2306 +#: ./user-manual.txt:2331 msgid "" "One can also renumber a few selected dives in the dive list. Select the " "dives that need renumbering. Right-click on the selected list and use the " @@ -4499,13 +4540,13 @@ msgid "" msgstr "" #. type: Title === -#: ./user-manual.txt:2308 +#: ./user-manual.txt:2333 #, no-wrap msgid "Grouping dives into trips and manipulating trips" msgstr "" #. type: Plain text -#: ./user-manual.txt:2316 +#: ./user-manual.txt:2341 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 " @@ -4516,13 +4557,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: ./user-manual.txt:2317 +#: ./user-manual.txt:2342 #, no-wrap msgid "images/Group2.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:2323 +#: ./user-manual.txt:2348 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 " @@ -4531,13 +4572,13 @@ msgid "" msgstr "" #. type: Title ==== -#: ./user-manual.txt:2324 +#: ./user-manual.txt:2349 #, no-wrap msgid "Editing the title and associated information for a particular trip" msgstr "" #. type: Plain text -#: ./user-manual.txt:2337 +#: ./user-manual.txt:2362 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 " @@ -4551,13 +4592,13 @@ msgid "" msgstr "" #. type: Title ==== -#: ./user-manual.txt:2338 +#: ./user-manual.txt:2363 #, no-wrap msgid "Viewing the dives during a particular trip" msgstr "" #. type: Plain text -#: ./user-manual.txt:2343 +#: ./user-manual.txt:2368 msgid "" "Once the dives have been grouped into trips, users can expand one or more " "trips by clicking the arrow-head on the left of each trip title. This " @@ -4566,13 +4607,13 @@ msgid "" msgstr "" #. type: Title ==== -#: ./user-manual.txt:2344 +#: ./user-manual.txt:2369 #, no-wrap msgid "Collapsing or expanding dive information for different trips" msgstr "" #. type: Plain text -#: ./user-manual.txt:2349 +#: ./user-manual.txt:2374 msgid "" "After selecting a particular trip in the dive list, the context menu allows " "several possibilities to expand or collapse dives within trips. This " @@ -4580,13 +4621,13 @@ msgid "" msgstr "" #. type: Title ==== -#: ./user-manual.txt:2350 +#: ./user-manual.txt:2375 #, no-wrap msgid "Merging dives from more than one trip into a single trip" msgstr "" #. type: Plain text -#: ./user-manual.txt:2355 +#: ./user-manual.txt:2380 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 " @@ -4594,13 +4635,13 @@ msgid "" msgstr "" #. type: Title ==== -#: ./user-manual.txt:2356 +#: ./user-manual.txt:2381 #, no-wrap msgid "Splitting a single trip into more than one trip" msgstr "" #. type: Plain text -#: ./user-manual.txt:2366 +#: ./user-manual.txt:2391 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 " @@ -4612,25 +4653,25 @@ msgid "" msgstr "" #. type: Target for macro image -#: ./user-manual.txt:2367 +#: ./user-manual.txt:2392 #, no-wrap msgid "images/SplitDive3a.jpg" msgstr "" #. type: Title === -#: ./user-manual.txt:2369 +#: ./user-manual.txt:2394 #, no-wrap msgid "Manipulating single dives" msgstr "" #. type: Title ==== -#: ./user-manual.txt:2371 +#: ./user-manual.txt:2396 #, no-wrap msgid "Delete a dive from the dive log" msgstr "" #. type: Plain text -#: ./user-manual.txt:2378 +#: ./user-manual.txt:2403 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 " @@ -4640,29 +4681,29 @@ msgid "" msgstr "" #. type: Title ==== -#: ./user-manual.txt:2379 +#: ./user-manual.txt:2404 #, no-wrap msgid "Unlink a dive from a trip" msgstr "" #. type: Plain text -#: ./user-manual.txt:2386 +#: ./user-manual.txt:2411 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 unliked dive." +"on the date and time of the unlinked dive." msgstr "" #. type: Title ==== -#: ./user-manual.txt:2387 +#: ./user-manual.txt:2412 #, no-wrap msgid "Add a dive to the trip immediately above" msgstr "" #. type: Plain text -#: ./user-manual.txt:2392 +#: ./user-manual.txt:2417 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 " @@ -4670,13 +4711,13 @@ msgid "" msgstr "" #. type: Title ==== -#: ./user-manual.txt:2393 +#: ./user-manual.txt:2418 #, no-wrap msgid "Shift the start time of dive(s)" msgstr "" #. type: Plain text -#: ./user-manual.txt:2404 +#: ./user-manual.txt:2429 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 " @@ -4689,13 +4730,13 @@ msgid "" msgstr "" #. type: Title ==== -#: ./user-manual.txt:2405 +#: ./user-manual.txt:2430 #, no-wrap msgid "Merge dives into a single dive" msgstr "" #. type: Plain text -#: ./user-manual.txt:2415 +#: ./user-manual.txt:2440 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 " @@ -4709,19 +4750,19 @@ msgid "" msgstr "" #. type: Target for macro image -#: ./user-manual.txt:2416 +#: ./user-manual.txt:2441 #, no-wrap msgid "images/MergedDive.png" msgstr "" #. type: Title ==== -#: ./user-manual.txt:2418 +#: ./user-manual.txt:2443 #, no-wrap msgid "Undo dive manipulations" msgstr "" #. type: Plain text -#: ./user-manual.txt:2424 +#: ./user-manual.txt:2449 msgid "" "Important actions on dives or trips, described above, can be undone or " "redone. This includes: _delete dives_, _merge dives_, _renumber dives_ and " @@ -4731,13 +4772,13 @@ msgid "" msgstr "" #. type: Title === -#: ./user-manual.txt:2427 +#: ./user-manual.txt:2452 #, no-wrap msgid "Filtering the dive list" msgstr "" #. type: Plain text -#: ./user-manual.txt:2433 +#: ./user-manual.txt:2458 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, " @@ -4747,7 +4788,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:2441 +#: ./user-manual.txt:2466 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 " @@ -4761,13 +4802,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: ./user-manual.txt:2442 +#: ./user-manual.txt:2467 #, no-wrap msgid "images/Filterpanel.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:2451 +#: ./user-manual.txt:2476 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 " @@ -4780,7 +4821,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:2459 +#: ./user-manual.txt:2484 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 " @@ -4792,75 +4833,85 @@ msgid "" msgstr "" #. type: Title == -#: ./user-manual.txt:2461 +#: ./user-manual.txt:2486 #, no-wrap msgid "Exporting the dive log or parts of the dive log" msgstr "" #. type: Plain text -#: ./user-manual.txt:2464 +#: ./user-manual.txt:2489 msgid "There are two routes for the export of dive information from Subsurface:" msgstr "" #. type: Plain text -#: ./user-manual.txt:2466 +#: ./user-manual.txt:2491 msgid "Export dive information to _Facebook_" msgstr "" #. type: Plain text -#: ./user-manual.txt:2468 +#: ./user-manual.txt:2493 msgid "" "xref:S_Export_other[Export dive information to other destinations or " "formats]" msgstr "" #. type: Title === -#: ./user-manual.txt:2470 +#: ./user-manual.txt:2495 #, no-wrap msgid "Exporting dive information to _Facebook_" msgstr "" #. type: Plain text -#: ./user-manual.txt:2479 +#: ./user-manual.txt:2504 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 (see image *A* to the " -"left, below). Provide your _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*, 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." msgstr "" #. type: Target for macro image -#: ./user-manual.txt:2480 +#: ./user-manual.txt:2505 #, no-wrap msgid "images/facebook1_f20.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:2492 +#: ./user-manual.txt:2510 +msgid "" +"From the _Subsurface_ window it is easy to determe 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)." +msgstr "" + +#. type: Plain text +#: ./user-manual.txt:2520 msgid "" "Having established a login to _Facebook_, transfer of a dive profile to " -"one's _Facebook_ timeline is easy. Ensure that the dive to transfer to the " -"timeline is depicted in the _Subsurface_ *Dive Profile* panel. If one " -"selects _Share on -> Facebook_ from the *Main Menu* a dialogue is shown, " -"determining the amount of additional information transferred with the dive " -"profile (see image *B*, below). In order to transfer a dive profile to " -"_Facebook_, the name of a _Facebook_ album needs to be provided. The " -"checkboxes on the lefthand side allow one to determine how much additional " -"information should be transferred with the dive profile. This information is " -"shown in the text box on the right hand side of the panel (see image *B*, " -"below). 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_." +"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_." msgstr "" #. type: Plain text -#: ./user-manual.txt:2499 +#: ./user-manual.txt:2527 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 " @@ -4870,13 +4921,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: ./user-manual.txt:2500 +#: ./user-manual.txt:2528 #, no-wrap msgid "images/facebook2_f20.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:2503 +#: ./user-manual.txt:2532 msgid "" "If required, then close the _Facebook_ connection by either closing " "_Subsurface_ or by selecting _File -> Preferences -> Facebook_ from the Main " @@ -4884,13 +4935,13 @@ msgid "" msgstr "" #. type: Title === -#: ./user-manual.txt:2505 +#: ./user-manual.txt:2534 #, no-wrap msgid "Export dive information to other destinations or formats" msgstr "" #. type: Plain text -#: ./user-manual.txt:2510 +#: ./user-manual.txt:2539 msgid "" "For non-_Facebook exports_, the export function can be reached by selecting " "_File -> Export_, which brings up the Export dialog. This dialog always " @@ -4900,23 +4951,23 @@ msgid "" msgstr "" #. type: Target for macro image -#: ./user-manual.txt:2511 +#: ./user-manual.txt:2540 #, no-wrap msgid "images/Export_f20.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:2514 +#: ./user-manual.txt:2543 msgid "A dive log or part of it can be saved in three formats:" msgstr "" #. type: Plain text -#: ./user-manual.txt:2516 +#: ./user-manual.txt:2545 msgid "_Subsurface XML_ format. This is the native format used by _Subsurface_." msgstr "" #. type: Plain text -#: ./user-manual.txt:2520 +#: ./user-manual.txt:2549 msgid "" "Universal Dive Data Format (_UDDF_). Refer to _http://uddf.org_ for more " "information. UDDF is a generic format that enables communication among many " @@ -4924,7 +4975,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:2524 +#: ./user-manual.txt:2553 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 " @@ -4933,7 +4984,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:2528 +#: ./user-manual.txt:2557 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, " @@ -4941,7 +4992,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:2533 +#: ./user-manual.txt:2562 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, " @@ -4950,7 +5001,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:2536 +#: ./user-manual.txt:2565 msgid "" "_CSV dive profile_, that includes a large amount of detail for each dive, " "including the depth profile, temperature and pressure information of each " @@ -4958,7 +5009,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:2549 +#: ./user-manual.txt:2578 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 " @@ -4975,7 +5026,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:2554 +#: ./user-manual.txt:2583 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 " @@ -4984,13 +5035,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: ./user-manual.txt:2555 +#: ./user-manual.txt:2584 #, no-wrap msgid "images/mapview_f20.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:2562 +#: ./user-manual.txt:2591 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 " @@ -4999,12 +5050,12 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:2564 +#: ./user-manual.txt:2593 msgid "_General Settings_, under the HTML tab, provides the following options:" msgstr "" #. type: Plain text -#: ./user-manual.txt:2572 +#: ./user-manual.txt:2601 #, no-wrap msgid "" "** Subsurface Numbers: if this option is checked, the dive(s) are exported " @@ -5022,27 +5073,27 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:2575 +#: ./user-manual.txt:2604 msgid "" "Under _Style Options_ some style-related options are available like font " "size and theme." msgstr "" #. type: Plain text -#: ./user-manual.txt:2578 +#: ./user-manual.txt:2607 msgid "" "Export to other formats can be achieved through third party facilities, for " "instance _www.divelogs.de_." msgstr "" #. type: Title == -#: ./user-manual.txt:2580 +#: ./user-manual.txt:2609 #, no-wrap msgid "Keeping a _Subsurface_ dive log in the Cloud" msgstr "" #. type: Plain text -#: ./user-manual.txt:2591 +#: ./user-manual.txt:2620 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 " @@ -5057,10 +5108,10 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:2597 +#: ./user-manual.txt:2626 msgid "" "_Subsurface_ includes access to a transparently integrated cloud storage " -"backend that is available to all Subsurface users. Storing and retrieving a " +"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 _Subsurface cloud storage_ , follow these " @@ -5068,13 +5119,13 @@ msgid "" msgstr "" #. type: Title === -#: ./user-manual.txt:2598 +#: ./user-manual.txt:2627 #, no-wrap msgid "Create a cloud storage account" msgstr "" #. type: Plain text -#: ./user-manual.txt:2615 +#: ./user-manual.txt:2644 #, no-wrap msgid "" "** Open the *Network Preferences* by selecting _File_ -> _Preferences_ -> " @@ -5102,13 +5153,13 @@ msgid "" msgstr "" #. type: Title === -#: ./user-manual.txt:2616 +#: ./user-manual.txt:2645 #, no-wrap msgid "Using _Subsurface cloud storage_" msgstr "" #. type: Plain text -#: ./user-manual.txt:2626 +#: ./user-manual.txt:2655 #, no-wrap msgid "" "** Once the cloud storage has been initialised, two new items appear in " @@ -5127,7 +5178,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:2631 +#: ./user-manual.txt:2660 #, no-wrap msgid "" "** _Subsurface_ keeps a local copy of the data and the cloud facility " @@ -5140,13 +5191,13 @@ msgid "" msgstr "" #. type: Title === -#: ./user-manual.txt:2633 +#: ./user-manual.txt:2662 #, no-wrap msgid "Web access to _Subsurface cloud storage_" msgstr "" #. type: Plain text -#: ./user-manual.txt:2643 +#: ./user-manual.txt:2672 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 " @@ -5159,13 +5210,13 @@ msgid "" msgstr "" #. type: Title === -#: ./user-manual.txt:2644 +#: ./user-manual.txt:2673 #, no-wrap msgid "Other cloud services" msgstr "" #. type: Plain text -#: ./user-manual.txt:2654 +#: ./user-manual.txt:2683 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 " @@ -5176,13 +5227,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: ./user-manual.txt:2655 +#: ./user-manual.txt:2684 #, no-wrap msgid "images/Cloud.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:2664 +#: ./user-manual.txt:2693 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, " @@ -5195,7 +5246,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:2671 +#: ./user-manual.txt:2700 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 " @@ -5205,7 +5256,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:2677 +#: ./user-manual.txt:2706 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 " @@ -5216,20 +5267,20 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:2680 +#: ./user-manual.txt:2709 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:2683 +#: ./user-manual.txt:2712 #, no-wrap msgid "Printing a dive log" msgstr "" #. type: Plain text -#: ./user-manual.txt:2687 +#: ./user-manual.txt:2716 #, no-wrap msgid "" "_Subsurface_ provides a simple and flexible interface to print a whole dive " @@ -5239,12 +5290,12 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:2689 +#: ./user-manual.txt:2718 msgid "Before printing, two decisions are required:" msgstr "" #. type: Plain text -#: ./user-manual.txt:2692 +#: ./user-manual.txt:2721 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* " @@ -5252,7 +5303,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:2694 +#: ./user-manual.txt:2723 msgid "" "If the dive profiles needs printing, what gas partial pressure information " "should be shown? Select the appropriate toggle-buttons on the button bar to " @@ -5260,7 +5311,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:2697 +#: ./user-manual.txt:2726 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 " @@ -5268,35 +5319,35 @@ msgid "" msgstr "" #. type: Target for macro image -#: ./user-manual.txt:2698 ./user-manual.txt:4113 +#: ./user-manual.txt:2727 ./user-manual.txt:4154 #, no-wrap msgid "images/Print1_f22.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:2701 +#: ./user-manual.txt:2730 msgid "Under _Print type_ select one of two options:" msgstr "" #. type: Plain text -#: ./user-manual.txt:2703 +#: ./user-manual.txt:2732 msgid "" "_Dive list print_: Print dives from the *Dive List* panel with profiles and " "other information." msgstr "" #. type: Plain text -#: ./user-manual.txt:2704 +#: ./user-manual.txt:2733 msgid "_Statistics print_: Print yearly statistics of the dives." msgstr "" #. type: Plain text -#: ./user-manual.txt:2706 +#: ./user-manual.txt:2735 msgid "Under _Print options_ select:" msgstr "" #. type: Plain text -#: ./user-manual.txt:2711 +#: ./user-manual.txt:2740 msgid "" "Printing only the dives selected from the dive list prior to activating the " "print dialogue by checking the box _Print only selected dives_. If this " @@ -5304,85 +5355,73 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:2713 +#: ./user-manual.txt:2742 msgid "" "Printing in colour, achieved by checking the box with _Print in colour_. If " "this check box is not checked, printing is in monochrome (grey scale)." msgstr "" #. type: Plain text -#: ./user-manual.txt:2716 +#: ./user-manual.txt:2745 msgid "" "Under _Template_ select a template to be used as the page layout. There are " "several templates (see image *B*, above)." msgstr "" #. type: Plain text -#: ./user-manual.txt:2718 +#: ./user-manual.txt:2747 msgid "_Table_: This prints a summary table of all dives selected (see below)." msgstr "" #. type: Target for macro image -#: ./user-manual.txt:2719 +#: ./user-manual.txt:2748 #, no-wrap msgid "images/Print_summarylist_f22.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:2722 +#: ./user-manual.txt:2751 msgid "" "_Flow layout_: Print the text associated with each dive without printing the " "dive profiles" msgstr "" #. type: Plain text -#: ./user-manual.txt:2723 +#: ./user-manual.txt:2752 msgid "of each dive (see below):" msgstr "" #. type: Target for macro image -#: ./user-manual.txt:2724 +#: ./user-manual.txt:2753 #, no-wrap msgid "images/Print_flow_layout_f22.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:2727 +#: ./user-manual.txt:2756 msgid "" "_One Dive_: Print one dive per page, also showing the dive profile (see " "below)" msgstr "" #. type: Target for macro image -#: ./user-manual.txt:2728 +#: ./user-manual.txt:2757 #, no-wrap msgid "images/print2_f22.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:2732 +#: ./user-manual.txt:2761 msgid "_Two Dives_: Print two dives per page, also showing the dive profiles." msgstr "" #. type: Plain text -#: ./user-manual.txt:2733 +#: ./user-manual.txt:2762 msgid "_Six Dives_: Print six dives per page, also showing the dive profiles." msgstr "" #. type: Plain text -#: ./user-manual.txt:2734 -msgid "" -"_Custom_: This option allows customisation of the print contents and " -"layout. This is" -msgstr "" - -#. type: Plain text -#: ./user-manual.txt:2735 -msgid "discussed at the end of this section." -msgstr "" - -#. type: Plain text -#: ./user-manual.txt:2739 +#: ./user-manual.txt:2766 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, " @@ -5391,7 +5430,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:2743 +#: ./user-manual.txt:2770 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 " @@ -5400,13 +5439,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: ./user-manual.txt:2744 +#: ./user-manual.txt:2771 #, no-wrap msgid "images/Print_print_f22.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:2749 +#: ./user-manual.txt:2776 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 " @@ -5415,19 +5454,19 @@ msgid "" msgstr "" #. type: Target for macro image -#: ./user-manual.txt:2750 +#: ./user-manual.txt:2777 #, no-wrap msgid "images/Printpreview.jpg" msgstr "" #. type: Title === -#: ./user-manual.txt:2752 +#: ./user-manual.txt:2779 #, no-wrap -msgid "Write a custom printing template (advanced)" +msgid "Writing a custom print template (advanced)" msgstr "" #. type: Plain text -#: ./user-manual.txt:2756 +#: ./user-manual.txt:2783 msgid "" "Writing a custom template is an effective way to produce highly customized " "printouts. Subsurface uses HTML templates to render printing. One can create " @@ -5438,13 +5477,13 @@ msgid "" msgstr "" #. type: Title == -#: ./user-manual.txt:2758 +#: ./user-manual.txt:2785 #, no-wrap msgid "Configuring a dive computer" msgstr "" #. type: Plain text -#: ./user-manual.txt:2766 +#: ./user-manual.txt:2793 msgid "" "_Subsurface_ enables one to configure a dive computer. Currently the " "Heinrichs-Weikamp (OSTC 2, OSTC 3) and Suunto Vyper (Stinger, Mosquito, D3, " @@ -5459,30 +5498,30 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:2771 +#: ./user-manual.txt:2798 msgid "" "Once the dive computer is connected to the _Subsurface_ computer, select " "_File -> Configure dive computer_ from the _Main Menu_. Provide the " "appropriate device name in the text box at the top of the configuration " "panel and select the appropriate dive computer model from the panel on the " -"lefthand (see image below)." +"left-hand (see image below)." msgstr "" #. type: Target for macro image -#: ./user-manual.txt:2772 +#: ./user-manual.txt:2799 #, no-wrap msgid "images/Configure_dc_f20.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:2775 +#: ./user-manual.txt:2802 msgid "" "Using the appropriate buttons on the configuration panel, the following " "actions can be performed:" msgstr "" #. type: Plain text -#: ./user-manual.txt:2778 +#: ./user-manual.txt:2805 #, no-wrap msgid "" "*Retrieve available details*. This loads the existing configuration from the " @@ -5491,7 +5530,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:2780 +#: ./user-manual.txt:2807 #, no-wrap msgid "" "*Save changes to device*. This changes the configuration of the\n" @@ -5500,7 +5539,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:2782 +#: ./user-manual.txt:2809 #, no-wrap msgid "" "*Backup*. This saves the configuration data to a file. _Subsurface_ asks " @@ -5509,7 +5548,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:2784 +#: ./user-manual.txt:2811 #, no-wrap msgid "" "*Restore backup*. This loads the information from a backup file and displays " @@ -5518,7 +5557,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:2786 +#: ./user-manual.txt:2813 #, no-wrap msgid "" "*Update firmware*. If new firmware is available for the dive computer, this " @@ -5527,42 +5566,43 @@ msgid "" msgstr "" #. type: Title == -#: ./user-manual.txt:2789 +#: ./user-manual.txt:2816 #, no-wrap msgid "Setting user _Preferences_ for _Subsurface_" msgstr "" #. type: Plain text -#: ./user-manual.txt:2797 +#: ./user-manual.txt:2826 msgid "" -"There are several settings within _Subsurface_ that the user can " -"specify. These are found when selecting _File -> Preferences_. The settings " -"are performed in five groups: *Defaults*, *Units*, *Graph*, *Language* and " -"*Network*. All five sections operate on the same principles: the user must " +"There are several user-definable settings within _Subsurface_, found by " +"selecting _File -> Preferences_. The settings are performed 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*." +"leave the settings panel by selecting *OK*. If *Discard* is selected, " +"changes to the preferences are not saved." msgstr "" #. type: Title === -#: ./user-manual.txt:2798 +#: ./user-manual.txt:2827 #, no-wrap msgid "Defaults" msgstr "" #. type: Plain text -#: ./user-manual.txt:2801 +#: ./user-manual.txt:2830 msgid "There are several settings in the *Defaults* panel:" msgstr "" #. type: Target for macro image -#: ./user-manual.txt:2802 +#: ./user-manual.txt:2831 #, no-wrap msgid "images/Pref1_f20.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:2806 +#: ./user-manual.txt:2835 #, no-wrap msgid "" " ** *Lists and tables*: Here one can specify the font type and font size of " @@ -5572,7 +5612,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:2811 +#: ./user-manual.txt:2840 #, no-wrap msgid "" " ** *Dives*: For the _Default Dive File_ one needs to specify the directory " @@ -5585,7 +5625,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:2812 +#: ./user-manual.txt:2841 #, no-wrap msgid "" "_No default file_: When checked, _Subsurface_ does not automatically load a " @@ -5593,7 +5633,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:2814 +#: ./user-manual.txt:2843 #, no-wrap msgid "" "_Local default file_: When checked, _Subsurface_ automatically loads a dive " @@ -5602,7 +5642,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:2816 +#: ./user-manual.txt:2845 #, no-wrap msgid "" "_Cloud storage default file_: When checked, _Subsurface automatically loads " @@ -5612,7 +5652,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:2818 +#: ./user-manual.txt:2847 #, no-wrap msgid "" "** *Display invalid*: Dives can be marked as invalid (when a user wishes to " @@ -5620,10 +5660,10 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:2821 +#: ./user-manual.txt:2850 #, no-wrap msgid "" -"dives that he/she don't consider valid dives, e.g. pool dives, but still " +"dives that he/she doesn't consider valid dives, e.g. pool dives, but still " "want to\n" "keep them in the dive log). This controls whether those dives are displayed " "in\n" @@ -5631,19 +5671,19 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:2823 +#: ./user-manual.txt:2852 #, no-wrap msgid "** *Default cylinder*: Specify the default cylinder listed in\n" msgstr "" #. type: Plain text -#: ./user-manual.txt:2824 +#: ./user-manual.txt:2853 #, no-wrap msgid "the *Equipment* tab of the *Notes* panel.\n" msgstr "" #. type: Plain text -#: ./user-manual.txt:2826 +#: ./user-manual.txt:2855 #, no-wrap msgid "" "** *Animations*: Some actions in showing the dive profile are performed " @@ -5651,7 +5691,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:2832 +#: ./user-manual.txt:2861 #, no-wrap msgid "" "animations. For instance, the axis values for depth and time change from " @@ -5667,7 +5707,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:2834 +#: ./user-manual.txt:2863 #, no-wrap msgid "" "** *Clear all settings*: As indicated in the button below this heading, all " @@ -5675,36 +5715,36 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:2835 +#: ./user-manual.txt:2864 #, no-wrap msgid "cleared and set to default values.\n" msgstr "" #. type: Title === -#: ./user-manual.txt:2836 +#: ./user-manual.txt:2865 #, no-wrap msgid "Units" msgstr "" #. type: Target for macro image -#: ./user-manual.txt:2837 +#: ./user-manual.txt:2866 #, no-wrap msgid "images/Pref2_f20.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:2844 +#: ./user-manual.txt:2873 msgid "" -"Here user can choose between metric and imperial units of depth, pressure, " +"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, users can specify that all units are in the chosen " +"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." msgstr "" #. type: Plain text -#: ./user-manual.txt:2850 +#: ./user-manual.txt:2879 msgid "" "Irrespective of the above settings, dive time measurements can be either in " "seconds or minutes. Choose the appropriate option. GPS coordinates can be " @@ -5713,39 +5753,39 @@ msgid "" msgstr "" #. type: Title === -#: ./user-manual.txt:2851 +#: ./user-manual.txt:2880 #, no-wrap msgid "Graph" msgstr "" #. type: Target for macro image -#: ./user-manual.txt:2853 +#: ./user-manual.txt:2882 #, no-wrap msgid "images/Pref3_f20.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:2857 +#: ./user-manual.txt:2886 msgid "This panel allows two type of selections:" msgstr "" #. type: Plain text -#: ./user-manual.txt:2877 +#: ./user-manual.txt:2906 #, no-wrap msgid "" "*Show*: Here users 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 using the toolbar on the left hand side of the *Dive " +" 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" " 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 presure " +" highlighted in red, indicating that the particular partial pressure " "threshold has been exceeded.\n" -"** _Max pO~2~ whn displaying MOD_ is the value used to calculate the maximum " +"** _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" @@ -5754,32 +5794,31 @@ msgid "" " 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_. This is because of the " -"different algorithms and\n" -" gradient factors available for calculating ceilings, as well as the " -"dynamic way that a\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 any cylinders entered " +"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 average depth " +"dive. Normally this is a u-shaped line indicating the deepest mean depth " "just before the\n" " ascent.\n" msgstr "" #. type: Plain text -#: ./user-manual.txt:2879 +#: ./user-manual.txt:2908 #, no-wrap msgid "*Misc*:\n" msgstr "" #. type: Plain text -#: ./user-manual.txt:2892 +#: ./user-manual.txt:2921 #, no-wrap msgid "" "** Gradient Factors (GFLow and GFHigh):* Set the _gradient factors_ used " @@ -5806,7 +5845,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:2894 +#: ./user-manual.txt:2923 #, no-wrap msgid "" " *** http://www.tek-dive.com/portal/upload/M-Values.pdf[Understanding " @@ -5814,7 +5853,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:2896 +#: ./user-manual.txt:2925 #, no-wrap msgid "" " *** " @@ -5823,7 +5862,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:2900 +#: ./user-manual.txt:2929 #, no-wrap msgid "" " ** _CCR: Show setpoints when viewing pO2:_ With this checkbox ativated, the " @@ -5835,7 +5874,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:2904 +#: ./user-manual.txt:2933 #, no-wrap msgid "" " ** _CCR: Show individual O~2~ sensor values when viewing pO~2~:_ Show the " @@ -5846,13 +5885,13 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:2906 +#: ./user-manual.txt:2935 #, no-wrap msgid "*Configuring dive planning using rebreather equipment:*\n" msgstr "" #. type: Plain text -#: ./user-manual.txt:2908 +#: ./user-manual.txt:2937 #, no-wrap msgid "" "** _Default CCR setpoint for dive planning:_ Specify the O~2~ setpoint for " @@ -5860,7 +5899,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:2911 +#: ./user-manual.txt:2940 #, no-wrap msgid "" "CCR dive plan. This determines the pO~2~ maintained\n" @@ -5870,7 +5909,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:2913 +#: ./user-manual.txt:2942 #, no-wrap msgid "" "** _pSCR O~2~ metabolism rate:_ For a semiclosed rebreather (pSCR) system, " @@ -5878,7 +5917,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:2915 +#: ./user-manual.txt:2944 #, no-wrap msgid "" "volume of oxygen used by a diver during a minute. Set this value for pSCR " @@ -5887,7 +5926,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:2917 +#: ./user-manual.txt:2946 #, no-wrap msgid "" "** _pSCR ratio:_ For pSCR equipment the dump ratio is the ratio of gas " @@ -5895,7 +5934,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:2919 +#: ./user-manual.txt:2948 #, no-wrap msgid "" "environment to that of the gas recirculated to the diver. Set this value for " @@ -5904,66 +5943,66 @@ msgid "" msgstr "" #. type: Title === -#: ./user-manual.txt:2921 +#: ./user-manual.txt:2950 #, no-wrap msgid "Language" msgstr "" #. type: Plain text -#: ./user-manual.txt:2923 +#: ./user-manual.txt:2952 msgid "Choose a language that _Subsurface_ will use." msgstr "" #. type: Target for macro image -#: ./user-manual.txt:2924 +#: ./user-manual.txt:2953 #, no-wrap msgid "images/Pref4_f20.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:2934 +#: ./user-manual.txt:2963 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 OS. If this is for some " -"reason undesirable users 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*." +"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*." msgstr "" #. type: Title === -#: ./user-manual.txt:2935 +#: ./user-manual.txt:2964 #, no-wrap msgid "Network" msgstr "" #. type: Plain text -#: ./user-manual.txt:2942 +#: ./user-manual.txt:2970 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, the " -"<<S_Companion,_Subsurface Companion app_>> or data export/import from " -"_Divelogs.de_. 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 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." msgstr "" #. type: Target for macro image -#: ./user-manual.txt:2943 +#: ./user-manual.txt:2971 #, no-wrap msgid "images/Pref5_f20.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:2946 +#: ./user-manual.txt:2974 msgid "This dialogue has three sections:" msgstr "" #. type: Plain text -#: ./user-manual.txt:2954 +#: ./user-manual.txt:2982 #, no-wrap msgid "" "** _Proxy type_:\n" @@ -5980,11 +6019,11 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:2959 +#: ./user-manual.txt:2987 #, no-wrap msgid "" -"** _Subsurface cloud storage_: In order to store one's dive log in the " -"cloud, a valid email address\n" +"** _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 " @@ -5993,7 +6032,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:2960 +#: ./user-manual.txt:2988 #, no-wrap msgid "" "_Sync to cloud in the background_: This option allows saving of dive " @@ -6001,13 +6040,13 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:2961 +#: ./user-manual.txt:2989 #, no-wrap -msgid "while the user performs other tasks inside _Subsurface_.\n" +msgid "while the user performs other tasks within _Subsurface_.\n" msgstr "" #. type: Plain text -#: ./user-manual.txt:2962 +#: ./user-manual.txt:2990 #, no-wrap msgid "" "_Save password locally_: This allows local storage of the cloud storage " @@ -6015,13 +6054,13 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:2963 +#: ./user-manual.txt:2991 #, no-wrap msgid "information is saved in raw text form, not encoded in any way.\n" msgstr "" #. type: Plain text -#: ./user-manual.txt:2968 +#: ./user-manual.txt:2996 #, no-wrap msgid "" "** _Subsurface web service_: When one subscribes to the " @@ -6034,55 +6073,67 @@ msgid "" msgstr "" #. type: Title === -#: ./user-manual.txt:2971 +#: ./user-manual.txt:2999 #, no-wrap msgid "Facebook Accesss" msgstr "" #. type: Plain text -#: ./user-manual.txt:2974 +#: ./user-manual.txt:3002 msgid "" "This panel allows one to log into a Facebook account in order to transfer " "information from Subsurface to Facefook." msgstr "" #. type: Target for macro image -#: ./user-manual.txt:2975 +#: ./user-manual.txt:3003 #, no-wrap msgid "images/Pref6_f20.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:2983 +#: ./user-manual.txt:3011 msgid "" "If one provides a valid Facebook userID and password, a connection to " "Facebook is created. The connection to Facebook is closed when one closes " -"down Subsurface. At this point the checkbox labelled \"Keep connection to " +"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:2984 +#: ./user-manual.txt:3012 #, no-wrap msgid "Georeference" msgstr "" #. type: Plain text -#: ./user-manual.txt:2988 +#: ./user-manual.txt:3020 msgid "" -"_Subsurface_ provides a geo-lookup service (that is, an ability to look up " -"the geographic coordinates of a place name)." +"_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 " +"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)." +msgstr "" + +#. type: Target for macro image +#: ./user-manual.txt:3021 +#, no-wrap +msgid "images/Pref7_f20.jpg" msgstr "" #. type: Title == -#: ./user-manual.txt:2990 +#: ./user-manual.txt:3024 #, no-wrap msgid "The _Subsurface_ dive planner" msgstr "" #. type: Plain text -#: ./user-manual.txt:2995 +#: ./user-manual.txt:3029 msgid "" "Dive planning is an advanced feature of _Subsurface_, accessible by " "selecting _Log -> Plan Dive_ from the main menu. It allows calculation of " @@ -6091,7 +6142,7 @@ msgid "" msgstr "" #. type: delimited block * -#: ./user-manual.txt:3003 +#: ./user-manual.txt:3037 msgid "" "The _Subsurface_ dive planner IS CURRENTLY EXPERIMENTAL and assumes the user " "is already familiar with the _Subsurface_ user interface. It is explicitly " @@ -6099,19 +6150,19 @@ msgid "" msgstr "" #. type: delimited block * -#: ./user-manual.txt:3006 +#: ./user-manual.txt:3040 msgid "" "The user is conversant with dive planning and has the necessary training to " "perform dive planning." msgstr "" #. type: delimited block * -#: ./user-manual.txt:3007 +#: ./user-manual.txt:3041 msgid "The user plans dives within his/her certification limits." msgstr "" #. type: delimited block * -#: ./user-manual.txt:3010 +#: ./user-manual.txt:3044 msgid "" "Dive planning makes large assumptions about the characteristics of the " "_average person_ and cannot compensate for individual physiology or health " @@ -6119,32 +6170,32 @@ msgid "" msgstr "" #. type: delimited block * -#: ./user-manual.txt:3011 +#: ./user-manual.txt:3045 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:3012 +#: ./user-manual.txt:3046 msgid "The user is familiar with the user interface of _Subsurface_." msgstr "" #. type: delimited block * -#: ./user-manual.txt:3014 +#: ./user-manual.txt:3048 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:3016 +#: ./user-manual.txt:3050 #, no-wrap msgid "The _Subsurface_ dive planner screen" msgstr "" #. type: Plain text -#: ./user-manual.txt:3021 +#: ./user-manual.txt:3055 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 " @@ -6154,7 +6205,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3025 +#: ./user-manual.txt:3059 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 " @@ -6163,7 +6214,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3029 +#: ./user-manual.txt:3063 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 " @@ -6172,26 +6223,26 @@ msgid "" msgstr "" #. type: Target for macro image -#: ./user-manual.txt:3030 +#: ./user-manual.txt:3064 #, no-wrap msgid "images/PlannerWindow1_f20.jpg" msgstr "" #. type: Title === -#: ./user-manual.txt:3033 +#: ./user-manual.txt:3067 #, no-wrap msgid "Open circuit dives" msgstr "" #. type: Plain text -#: ./user-manual.txt:3036 +#: ./user-manual.txt:3070 msgid "" "Towards the centre bottom of the planner (circled in blue in the image " "above) is a dropbox with three options. Select the appropriate one of these:" msgstr "" #. type: Plain text -#: ./user-manual.txt:3039 +#: ./user-manual.txt:3073 #, no-wrap msgid "" "** Open Circuit (the default)\n" @@ -6200,12 +6251,12 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3041 +#: ./user-manual.txt:3075 msgid "Choose the Open Circuit option." msgstr "" #. type: Plain text -#: ./user-manual.txt:3045 +#: ./user-manual.txt:3079 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 " @@ -6215,7 +6266,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3054 +#: ./user-manual.txt:3088 msgid "" "In the table labelled _Available Gases_, add the information of the " "cylinders to be used as well as the gas composition within that " @@ -6225,17 +6276,17 @@ msgid "" "pressure of this cylinder. By leaving the oxygen concentration (O2%) filed " "empty, the cylinder is assumed to contain air. Otherwise enter the oxygen " "and/or helium concentration in the boxes provided in this dialogue. Add " -"additional cylinders by using the \"+\" icon to the top righthand of the " +"additional cylinders by using the \"+\" icon to the top right-hand of the " "dialogue." msgstr "" #. type: Plain text -#: ./user-manual.txt:3056 +#: ./user-manual.txt:3090 msgid "The profile of the planned dive can be created in two ways:" msgstr "" #. type: Plain text -#: ./user-manual.txt:3061 +#: ./user-manual.txt:3095 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 " @@ -6245,7 +6296,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3069 +#: ./user-manual.txt:3103 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 " @@ -6259,53 +6310,55 @@ msgid "" msgstr "" #. type: Title ==== -#: ./user-manual.txt:3070 +#: ./user-manual.txt:3104 #, no-wrap msgid "Recreational dives" msgstr "" #. type: Plain text -#: ./user-manual.txt:3085 -msgid "" -"The _Subsurface_ dive planner allows a sophisticated way of planning " -"recreational dives, i.e. dives that remain within no-decompression limits. " -"The dive planner automatically takes into account the nitrogen load incurred " -"in previous dives. But conventional dive tables are also used in a way that " -"can take into account previous dives. Why use a dive planner for " -"recreational dives? Using recreational dive tables, the maximum depth of a " -"dive is taken into acount. However, few dives are undertaken at a constant " -"depth corresponding to the maximum depth (i.e. a \"square\" dive " -"profile). This means that dive tables overestimate the nitrogen load " -"incurred during previous dives. The _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 mean that the diver gets 'credit' in terms of nitrogen loading " -"for not remaining at maximum depth during previous dives, enabling planning " -"a longer subsequent dive. For the planner to work it is therefore crucial to " +#: ./user-manual.txt:3119 +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:3088 +#: ./user-manual.txt:3121 msgid "To plan a dive, the appropriate settings need to be defined." msgstr "" #. type: Plain text -#: ./user-manual.txt:3091 +#: ./user-manual.txt:3124 msgid "" "Ensure that the date and time is set to that of the intended dive. This " "allows calculation of the nitrogen load incurred during previous dives." msgstr "" #. type: Plain text -#: ./user-manual.txt:3094 +#: ./user-manual.txt:3127 msgid "" "Immediately under the heading _Planning_ are two checkboxes _Recreational_ " "and _Safety Stop_. Check these two boxes." msgstr "" #. type: Plain text -#: ./user-manual.txt:3098 +#: ./user-manual.txt:3131 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 " @@ -6313,7 +6366,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3103 +#: ./user-manual.txt:3136 msgid "" "The planner calculates whether the specified cylinder contains enough " "air/gas to complete the planned dive. In order for this to be realistic, " @@ -6323,33 +6376,45 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3106 +#: ./user-manual.txt:3145 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." +"used. The reason for this reserve gas is to provide for the possible need " +"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." msgstr "" #. type: Plain text -#: ./user-manual.txt:3113 +#: ./user-manual.txt:3153 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 " "table under _Dive planner points_ as desribed under the previous heading. If " "this is a multilevel dive, set the appropriate dive depths to represent the " "dive plan by adding waypoints to the dive profile or by adding appropriate " -"dive planner points to the _Dive Planner Points_ table." +"dive planner points to the _Dive Planner Points_ table. _Subsurface_ will " +"automatically extend the bottom section of the dive to the maximum duration " +"within the no-decompression limits (NDL)." msgstr "" #. type: Plain text -#: ./user-manual.txt:3116 +#: ./user-manual.txt:3156 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:3124 +#: ./user-manual.txt:3164 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 " @@ -6365,7 +6430,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3128 +#: ./user-manual.txt:3168 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 " @@ -6375,26 +6440,26 @@ msgid "" msgstr "" #. type: Target for macro image -#: ./user-manual.txt:3129 +#: ./user-manual.txt:3169 #, no-wrap msgid "images/rec_diveplan.jpg" msgstr "" #. type: Title ==== -#: ./user-manual.txt:3131 +#: ./user-manual.txt:3171 #, no-wrap msgid "Non-recreational open circuit dives, including decompression" msgstr "" #. type: Plain text -#: ./user-manual.txt:3135 +#: ./user-manual.txt:3175 msgid "" "Non-recreational dive planning involves exceeding the no-deco limits and/or " "using multiple breathing gases. Such dives are planned in three stages:" msgstr "" #. type: Plain text -#: ./user-manual.txt:3146 +#: ./user-manual.txt:3186 #, no-wrap msgid "" "*a) Nitrogen management*: This is performed by specifying the rates for " @@ -6419,7 +6484,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3151 +#: ./user-manual.txt:3191 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 " @@ -6431,26 +6496,26 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3153 +#: ./user-manual.txt:3193 msgid "For more information external to this manual see:" msgstr "" #. type: Plain text -#: ./user-manual.txt:3155 +#: ./user-manual.txt:3195 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:3156 +#: ./user-manual.txt:3196 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:3158 +#: ./user-manual.txt:3198 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: " @@ -6459,7 +6524,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3166 +#: ./user-manual.txt:3206 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) " @@ -6473,7 +6538,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3175 +#: ./user-manual.txt:3215 #, no-wrap msgid "" "*b) Oxygen management*: In the *Gas Options* part of the dive specification, " @@ -6493,7 +6558,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3189 +#: ./user-manual.txt:3229 #, no-wrap msgid "" "*c) Gas management*: With open-circuit dives this is a primary " @@ -6524,7 +6589,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3201 +#: ./user-manual.txt:3241 msgid "" "Now (at last) one can start the detailed time-depth planning of the " "dive. _Subsurface_ offers a unique graphical interface for performing this " @@ -6543,7 +6608,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3213 +#: ./user-manual.txt:3253 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_ " @@ -6561,7 +6626,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3221 +#: ./user-manual.txt:3261 msgid "" "Indicate any changes in gas cylinder used by indicating gas changes as " "explained in the section <<S_CreateProfile,hand-creating a dive " @@ -6574,7 +6639,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3230 +#: ./user-manual.txt:3270 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 " @@ -6587,20 +6652,20 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3233 +#: ./user-manual.txt:3273 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:3234 +#: ./user-manual.txt:3274 #, no-wrap msgid "images/DivePlanner2_f20.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:3239 +#: ./user-manual.txt:3279 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 " @@ -6608,26 +6673,26 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3241 +#: ./user-manual.txt:3281 #, no-wrap msgid "*The dive plan details*\n" msgstr "" #. type: Plain text -#: ./user-manual.txt:3249 +#: ./user-manual.txt:3289 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 " "by checking any of the options under the _Notes_ section of the dive " "planner, immediately to the left of the _Dive Plan Details_. If a _Verbatim " -"diveplan_ is requested, a detailed sentence-level explanation of the dive " +"dive plan_ is requested, a detailed sentence-level explanation of the dive " "plan is given. If any of the management specifications have been exceeded " "during the planning, a warning message is printed underneath the dive plan " "information." msgstr "" #. type: Plain text -#: ./user-manual.txt:3254 +#: ./user-manual.txt:3294 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 " @@ -6637,13 +6702,13 @@ msgid "" msgstr "" #. type: Title === -#: ./user-manual.txt:3255 +#: ./user-manual.txt:3295 #, no-wrap msgid "Planning pSCR dives" msgstr "" #. type: Plain text -#: ./user-manual.txt:3270 +#: ./user-manual.txt:3310 #, no-wrap msgid "" "To plan a dive using a passive semi-closed rebreather (pSCR), select _pSCR_ " @@ -6662,37 +6727,37 @@ msgid "" "more bail-out\n" "cylinders. Therefore the setup of the _Available gases_ and the _Dive " "planner points_ tables\n" -"are very similar to that of a CCR dive plan, described above. However, no " +"are very similar to that of a CCR dive plan, described below. However, no " "oxygen setpoints\n" "are specified for pSCR dives. Below is a dive plan for a pSCR dive. The dive " "is comparable\n" -"to that of the CCR dive above, but note the longer ascent duration due to " +"to that of the CCR dive below, but note the longer ascent duration due to " "the lower oxygen\n" "in the loop due to the oxygen drop across the mouthpiece of the pSCR " "equipment.\n" msgstr "" #. type: Target for macro image -#: ./user-manual.txt:3271 +#: ./user-manual.txt:3311 #, no-wrap msgid "images/Planner_pSCR1_f20.jpg" msgstr "" #. type: Title === -#: ./user-manual.txt:3274 +#: ./user-manual.txt:3314 #, no-wrap msgid "Planning CCR dives" msgstr "" #. type: Plain text -#: ./user-manual.txt:3278 +#: ./user-manual.txt:3318 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:3282 +#: ./user-manual.txt:3322 #, no-wrap msgid "" "*Available gases*: In the _Available gases_ table, enter the cylinder " @@ -6703,12 +6768,13 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3290 +#: ./user-manual.txt:3332 #, no-wrap msgid "" "*Entering setpoints*: Specify a default setpoint in the Preferences tab, by " -"selecting _File -> Preferences -> Graph_ from the main menu. All " -"user-entered segments in the _Dive planner points_ table\n" +"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" @@ -6719,36 +6785,36 @@ msgid "" "CCR dive, add a one-minute dive segment to the end with a setpoint value of " "0. The decompression\n" "algorithm does not switch deco-gases automatically while in CCR mode " -"(i.e. when a positive setpoint is specified) but, of course, this is " -"calculated for bail out ascents.\n" +"(i.e. when a positive setpoint is specified) but,\n" +"of course, this is calculated for bail out ascents.\n" msgstr "" #. type: Plain text -#: ./user-manual.txt:3292 +#: ./user-manual.txt:3334 msgid "The dive profile for a CCR dive may look something like the image below." msgstr "" #. type: Target for macro image -#: ./user-manual.txt:3293 +#: ./user-manual.txt:3335 #, no-wrap msgid "images/Planner_CCR1_f20.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:3297 +#: ./user-manual.txt:3339 msgid "" "Note that, in the _Dive plan details_, the gas consumption for a CCR segment " "is not calculated, so gas consumptions of 0 litres are the norm." msgstr "" #. type: Title === -#: ./user-manual.txt:3299 +#: ./user-manual.txt:3341 #, no-wrap msgid "Modifying an existing dive plan" msgstr "" #. type: Plain text -#: ./user-manual.txt:3306 +#: ./user-manual.txt:3348 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 " @@ -6759,7 +6825,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3312 +#: ./user-manual.txt:3354 msgid "" "In addition there is the option \"Save new\". This keeps the original " "planned dive and adds a (possibly modified) copy to the dive list. If that " @@ -6769,13 +6835,13 @@ msgid "" msgstr "" #. type: Title === -#: ./user-manual.txt:3313 +#: ./user-manual.txt:3355 #, no-wrap msgid "Planning for repetitive dives" msgstr "" #. type: Plain text -#: ./user-manual.txt:3320 +#: ./user-manual.txt:3362 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 " @@ -6784,7 +6850,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3326 +#: ./user-manual.txt:3368 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 " @@ -6794,7 +6860,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3331 +#: ./user-manual.txt:3373 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 " @@ -6804,13 +6870,13 @@ msgid "" msgstr "" #. type: Title === -#: ./user-manual.txt:3332 +#: ./user-manual.txt:3374 #, no-wrap msgid "Printing the dive plan" msgstr "" #. type: Plain text -#: ./user-manual.txt:3337 +#: ./user-manual.txt:3379 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 " @@ -6818,7 +6884,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3347 +#: ./user-manual.txt:3389 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 " @@ -6834,13 +6900,13 @@ msgid "" msgstr "" #. type: Title == -#: ./user-manual.txt:3348 +#: ./user-manual.txt:3390 #, no-wrap msgid "Description of the Subsurface Main Menu items" msgstr "" #. type: Plain text -#: ./user-manual.txt:3353 +#: ./user-manual.txt:3395 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 " @@ -6848,302 +6914,302 @@ msgid "" msgstr "" #. type: Title === -#: ./user-manual.txt:3354 +#: ./user-manual.txt:3396 #, no-wrap msgid "File" msgstr "" #. type: Plain text -#: ./user-manual.txt:3357 +#: ./user-manual.txt:3399 msgid "" "<<S_NewLogbook,_New Logbook_>> - Close the currently open dive logbook and " "clear all dive information." msgstr "" #. type: Plain text -#: ./user-manual.txt:3359 +#: ./user-manual.txt:3401 msgid "" "_Open logbook_ - This opens the file manager in order to select a dive " "logbook to open." msgstr "" #. type: Plain text -#: ./user-manual.txt:3360 +#: ./user-manual.txt:3402 msgid "" "_Open cloud storage_ - Open the dive log previously saved in " "<<S_Cloud_storage,_Cloud storage_>>." msgstr "" #. type: Plain text -#: ./user-manual.txt:3361 +#: ./user-manual.txt:3403 msgid "_Save_ - Save the dive logbook that is currently open." msgstr "" #. type: Plain text -#: ./user-manual.txt:3362 +#: ./user-manual.txt:3404 msgid "" "_Save to cloud storage_ - Save the current dive log to " "<<S_Cloud_storage,_Cloud storage_>>." msgstr "" #. type: Plain text -#: ./user-manual.txt:3363 +#: ./user-manual.txt:3405 msgid "_Save as_ - Save the current logbook under a different file name." msgstr "" #. type: Plain text -#: ./user-manual.txt:3364 +#: ./user-manual.txt:3406 msgid "_Close_ - Close the dive logbook that is currently open." msgstr "" #. type: Plain text -#: ./user-manual.txt:3366 +#: ./user-manual.txt:3408 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:3367 +#: ./user-manual.txt:3409 msgid "<<S_PrintDivelog,_Print_>> - Print the currently open logbook." msgstr "" #. type: Plain text -#: ./user-manual.txt:3368 +#: ./user-manual.txt:3410 msgid "<<S_Preferences,_Preferences_>> - Set the _Subsurface_ preferences." msgstr "" #. type: Plain text -#: ./user-manual.txt:3369 +#: ./user-manual.txt:3411 msgid "" "<<S_FindMovedImages, _Find moved images_>> - If photos taken during dives " "have been moved to" msgstr "" #. type: Plain text -#: ./user-manual.txt:3370 +#: ./user-manual.txt:3412 msgid "" "a different disk or directory, locate them and link them to the appropriate " "dives." msgstr "" #. type: Plain text -#: ./user-manual.txt:3371 +#: ./user-manual.txt:3413 msgid "" "<<S_Configure,_Configure dive computer_>> - Edit the configuration of a dive " "computer." msgstr "" #. type: Plain text -#: ./user-manual.txt:3372 +#: ./user-manual.txt:3414 msgid "_Quit_ - Quit _Subsurface_." msgstr "" #. type: Title === -#: ./user-manual.txt:3373 +#: ./user-manual.txt:3415 #, no-wrap msgid "Import" msgstr "" #. type: Plain text -#: ./user-manual.txt:3376 +#: ./user-manual.txt:3418 msgid "" "<<S_ImportDiveComputer,_Import from dive computer_>> - Import dive " "information from a dive computer." msgstr "" #. type: Plain text -#: ./user-manual.txt:3378 +#: ./user-manual.txt:3420 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:3380 +#: ./user-manual.txt:3422 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:3382 +#: ./user-manual.txt:3424 msgid "" "<<S_ImportingDivelogsDe,_Import from Divelogs.de_>> - Import dive " "information from _www.Divelogs.de_." msgstr "" #. type: Title === -#: ./user-manual.txt:3383 +#: ./user-manual.txt:3425 #, no-wrap msgid "Log" msgstr "" #. type: Plain text -#: ./user-manual.txt:3385 +#: ./user-manual.txt:3427 msgid "" "<<S_EnterData,_Add Dive_>> - Manually add a new dive to the *Dive List* " "panel." msgstr "" #. type: Plain text -#: ./user-manual.txt:3386 +#: ./user-manual.txt:3428 msgid "" "_Edit dive_ - Edit a dive of which the profile was entered by hande and not " "from a dive computer." msgstr "" #. type: Plain text -#: ./user-manual.txt:3387 +#: ./user-manual.txt:3429 msgid "<<S_DivePlanner,_Plan Dive_>> - This feature allows the planning of dives." msgstr "" #. type: Plain text -#: ./user-manual.txt:3388 +#: ./user-manual.txt:3430 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:3390 +#: ./user-manual.txt:3432 msgid "" "<<S_CopyComponents,_Copy dive components_>> - By selecting this option, one " "can copy information from several fields of a dive log onto the clipboard." msgstr "" #. type: Plain text -#: ./user-manual.txt:3392 +#: ./user-manual.txt:3434 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:3394 +#: ./user-manual.txt:3436 msgid "" "<<S_Renumber,_Renumber_>> - Renumber the dives listed in the *Dive List* " "panel." msgstr "" #. type: Plain text -#: ./user-manual.txt:3396 +#: ./user-manual.txt:3438 msgid "" "<<S_Group,_Auto Group_>> - Group the dives in the *Dive List* panel into " "dive trips." msgstr "" #. type: Plain text -#: ./user-manual.txt:3397 +#: ./user-manual.txt:3439 msgid "" "<<S_DeviceNames,_Edit Device Names_>> - Edit the names of dive computers to " "facilitate your logs." msgstr "" #. type: Plain text -#: ./user-manual.txt:3398 +#: ./user-manual.txt:3440 msgid "" "<<S_Filter,_Filter divelist_>> - Select only some dives, based on specific " "tags or dive criteria." msgstr "" #. type: Title === -#: ./user-manual.txt:3399 +#: ./user-manual.txt:3441 #, no-wrap msgid "View" msgstr "" #. type: Plain text -#: ./user-manual.txt:3402 +#: ./user-manual.txt:3444 msgid "" "<<S_ViewPanels,_All_>> - View the four main _Subsurface_ panels " "simmultaneously." msgstr "" #. type: Plain text -#: ./user-manual.txt:3403 +#: ./user-manual.txt:3445 msgid "<<S_ViewPanels,_Dive List_>> - View only the *Dive List* panel." msgstr "" #. type: Plain text -#: ./user-manual.txt:3404 +#: ./user-manual.txt:3446 msgid "<<S_ViewPanels,_Profile_>> - View only the *Dive Profile* panel." msgstr "" #. type: Plain text -#: ./user-manual.txt:3405 +#: ./user-manual.txt:3447 msgid "<<S_ViewPanels,_Info_>> - View only the *Notes* panel." msgstr "" #. type: Plain text -#: ./user-manual.txt:3406 +#: ./user-manual.txt:3448 msgid "<<S_ViewPanels,_Globe_>> - View only the *World Map* panel." msgstr "" #. type: Plain text -#: ./user-manual.txt:3408 +#: ./user-manual.txt:3450 msgid "" "_Yearly Statistics_ - Display summary statistics about dives during this and " "past years." msgstr "" #. type: Plain text -#: ./user-manual.txt:3409 +#: ./user-manual.txt:3451 msgid "" "_Prev DC_ - If a single dive was logged from more than one dive computer, " "switch to data from" msgstr "" #. type: Plain text -#: ./user-manual.txt:3410 +#: ./user-manual.txt:3452 msgid "previous dive computer." msgstr "" #. type: Plain text -#: ./user-manual.txt:3411 +#: ./user-manual.txt:3453 msgid "_Next DC_ - Switch to next dive computer." msgstr "" #. type: Plain text -#: ./user-manual.txt:3412 +#: ./user-manual.txt:3454 msgid "_Full Screen_ - Toggles Full Screen mode." msgstr "" #. type: Title === -#: ./user-manual.txt:3413 +#: ./user-manual.txt:3455 #, no-wrap msgid "Share on" msgstr "" #. type: Plain text -#: ./user-manual.txt:3415 +#: ./user-manual.txt:3457 msgid "" "<<S_Facebook,_Facebook_>> - Share the currently selected dive on your " "Facebook timeline." msgstr "" #. type: Title === -#: ./user-manual.txt:3417 +#: ./user-manual.txt:3459 #, no-wrap msgid "Help" msgstr "" #. type: Plain text -#: ./user-manual.txt:3420 +#: ./user-manual.txt:3462 msgid "" "_About Subsurface_ - Show a panel with the version number of _Subsurface_ as " "well as licensing information." msgstr "" #. type: Plain text -#: ./user-manual.txt:3422 +#: ./user-manual.txt:3464 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:3424 +#: ./user-manual.txt:3466 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 " @@ -7151,12 +7217,12 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3425 +#: ./user-manual.txt:3467 msgid "_User manual_ - Open a window showing this user manual." msgstr "" #. type: Title == -#: ./user-manual.txt:3429 +#: ./user-manual.txt:3470 #, no-wrap msgid "" "APPENDIX A: Operating system specific information for importing dive " @@ -7164,19 +7230,19 @@ msgid "" msgstr "" #. type: Title === -#: ./user-manual.txt:3431 +#: ./user-manual.txt:3472 #, 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:3432 +#: ./user-manual.txt:3473 #, no-wrap msgid "images/icons/drivers.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:3437 +#: ./user-manual.txt:3478 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 " @@ -7184,7 +7250,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3443 +#: ./user-manual.txt:3484 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 " @@ -7193,7 +7259,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3447 +#: ./user-manual.txt:3488 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 " @@ -7201,7 +7267,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3454 +#: ./user-manual.txt:3495 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 " @@ -7212,19 +7278,19 @@ msgid "" msgstr "" #. type: Title === -#: ./user-manual.txt:3456 +#: ./user-manual.txt:3497 #, 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:3457 +#: ./user-manual.txt:3498 #, no-wrap msgid "images/icons/usb.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:3465 +#: ./user-manual.txt:3506 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 " @@ -7235,61 +7301,61 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3470 +#: ./user-manual.txt:3511 msgid "" "Simply try COM1, COM2, etc. The drop down list should contain all connected " "COM devices." msgstr "" #. type: Title ==== -#: ./user-manual.txt:3471 ./user-manual.txt:3565 +#: ./user-manual.txt:3512 ./user-manual.txt:3606 #, no-wrap msgid "On MacOS:" msgstr "" #. type: Plain text -#: ./user-manual.txt:3474 +#: ./user-manual.txt:3515 msgid "The drop down box should find all connected dive computers." msgstr "" #. type: Block title -#: ./user-manual.txt:3475 +#: ./user-manual.txt:3516 #, no-wrap msgid "On Linux:" msgstr "" #. type: Plain text -#: ./user-manual.txt:3478 +#: ./user-manual.txt:3519 msgid "There is a definitive way to find the port:" msgstr "" #. type: Plain text -#: ./user-manual.txt:3480 +#: ./user-manual.txt:3521 msgid "Disconnect the USB cable from the dive computer" msgstr "" #. type: Plain text -#: ./user-manual.txt:3481 +#: ./user-manual.txt:3522 msgid "Open a terminal" msgstr "" #. type: Plain text -#: ./user-manual.txt:3482 ./user-manual.txt:3484 +#: ./user-manual.txt:3523 ./user-manual.txt:3525 msgid "Type the command: 'dmesg' and press enter" msgstr "" #. type: Plain text -#: ./user-manual.txt:3483 +#: ./user-manual.txt:3524 msgid "Plug in the USB cable of the dive computer" msgstr "" #. type: Plain text -#: ./user-manual.txt:3486 +#: ./user-manual.txt:3527 msgid "A message similar to this one should appear:" msgstr "" #. type: Plain text -#: ./user-manual.txt:3502 +#: ./user-manual.txt:3543 #, no-wrap msgid "" "\tusb 2-1.1: new full speed USB device number 14 using ehci_hcd\n" @@ -7310,7 +7376,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3507 +#: ./user-manual.txt:3548 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 " @@ -7318,12 +7384,12 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3509 +#: ./user-manual.txt:3550 msgid "Ensuring that the user has write permission to the USB serial port:" msgstr "" #. type: Plain text -#: ./user-manual.txt:3515 +#: ./user-manual.txt:3556 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 " @@ -7332,14 +7398,14 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3519 +#: ./user-manual.txt:3560 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:3524 +#: ./user-manual.txt:3565 #, no-wrap msgid "" "Type: +id johnB+ This lists all the groups that johnB belongs to and\n" @@ -7351,7 +7417,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3526 +#: ./user-manual.txt:3567 #, no-wrap msgid "" "Under some circumstances this change takes only effect (eg. on Ubuntu) " @@ -7360,7 +7426,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3531 +#: ./user-manual.txt:3572 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 " @@ -7368,13 +7434,13 @@ msgid "" msgstr "" #. type: Title === -#: ./user-manual.txt:3534 +#: ./user-manual.txt:3575 #, no-wrap msgid "Manually setting up Bluetooth enabled devices" msgstr "" #. type: Plain text -#: ./user-manual.txt:3541 +#: ./user-manual.txt:3582 msgid "" "For dive computers communicating through Bluetooth like the Heinrichs " "Weikamp Frog or the Shearwater Predator and Petrel there is a different " @@ -7383,7 +7449,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3543 +#: ./user-manual.txt:3584 #, no-wrap msgid "" "*For the dive computer, after enabling Bluetooth, ensure it is in Upload " @@ -7391,7 +7457,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3547 +#: ./user-manual.txt:3588 msgid "" "For Bluetooth pairing of the dive computer, refer to the manufacturer's user " "guide. When using a Shearwater Predator/Petrel, select _Dive Log -> Upload " @@ -7399,13 +7465,13 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3549 +#: ./user-manual.txt:3590 #, no-wrap msgid "*Pair the _Subsurface_ computer with the dive computer.*\n" msgstr "" #. type: Plain text -#: ./user-manual.txt:3558 +#: ./user-manual.txt:3599 msgid "" "Bluetooth is most likely already enabled. For pairing with the dive computer " "choose _Control Panel -> Bluetooth Devices -> Add Wireless Device_. This " @@ -7417,21 +7483,21 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3561 +#: ./user-manual.txt:3602 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:3564 +#: ./user-manual.txt:3605 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:3571 +#: ./user-manual.txt:3612 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 " @@ -7440,20 +7506,20 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3574 +#: ./user-manual.txt:3615 msgid "" "Once the pairing is completed the correct device is shown in the 'Device or " "Mount Point' drop-down in the _Subsurface_ *Import* dialog." msgstr "" #. type: Title ==== -#: ./user-manual.txt:3575 +#: ./user-manual.txt:3616 #, no-wrap msgid "On Linux" msgstr "" #. type: Plain text -#: ./user-manual.txt:3583 +#: ./user-manual.txt:3624 msgid "" "Ensure Bluetooth is enabled on the _Subsurface_ computer. On most common " "distributions this should be true out of the box and pairing should be " @@ -7466,7 +7532,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3587 +#: ./user-manual.txt:3628 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 " @@ -7475,23 +7541,23 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3589 +#: ./user-manual.txt:3630 msgid "Enable the Bluetooth controller and pair your dive computer" msgstr "" #. type: Plain text -#: ./user-manual.txt:3590 +#: ./user-manual.txt:3631 msgid "Establish an RFCOMM connection" msgstr "" #. type: Title ===== -#: ./user-manual.txt:3591 ./user-manual.txt:3730 +#: ./user-manual.txt:3632 ./user-manual.txt:3771 #, no-wrap msgid "Download the dives with Subsurface" msgstr "" #. type: Plain text -#: ./user-manual.txt:3597 +#: ./user-manual.txt:3638 msgid "" "Ensure the dive computer is in upload mode. On the _Shearwater Petrel_ and " "_Petrel 2_, cycle through the menu, select 'Dive Log', then 'Upload Log'. " @@ -7502,7 +7568,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3602 +#: ./user-manual.txt:3643 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 " @@ -7512,23 +7578,23 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3604 +#: ./user-manual.txt:3645 msgid "+sudo usermod -a -G dialout username+" msgstr "" #. type: Plain text -#: ./user-manual.txt:3606 +#: ./user-manual.txt:3647 msgid "Then log out and log in for the change to take effect." msgstr "" #. type: Title ===== -#: ./user-manual.txt:3607 +#: ./user-manual.txt:3648 #, no-wrap msgid "Enabling the Bluetooth controller and pairing your dive computer" msgstr "" #. type: Plain text -#: ./user-manual.txt:3613 +#: ./user-manual.txt:3654 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 " @@ -7539,7 +7605,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3616 +#: ./user-manual.txt:3657 msgid "" "If the graphical method didn't work, pair the device from the command " "line. Open a terminal and use +hciconfig+ to check the Bluetooth controller " @@ -7547,7 +7613,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3623 +#: ./user-manual.txt:3664 #, no-wrap msgid "" "\t$ hciconfig\n" @@ -7559,7 +7625,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3628 +#: ./user-manual.txt:3669 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 " @@ -7569,7 +7635,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3636 +#: ./user-manual.txt:3677 #, no-wrap msgid "" "\tsudo hciconfig hci0 up auth+ (enter password when prompted)\n" @@ -7582,25 +7648,25 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3638 +#: ./user-manual.txt:3679 msgid "Check that the status now includes +'UP', 'RUNNING' AND 'AUTH'+." msgstr "" #. type: Plain text -#: ./user-manual.txt:3640 +#: ./user-manual.txt:3681 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:3642 +#: ./user-manual.txt:3683 #, no-wrap msgid "\tsudo hciconfig hci1 down\n" msgstr "" #. type: Plain text -#: ./user-manual.txt:3645 +#: ./user-manual.txt:3686 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 " @@ -7608,7 +7674,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3666 +#: ./user-manual.txt:3707 #, no-wrap msgid "" "\tbluetoothctl\n" @@ -7637,14 +7703,14 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3669 +#: ./user-manual.txt:3710 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:3672 +#: ./user-manual.txt:3713 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 " @@ -7652,7 +7718,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3677 +#: ./user-manual.txt:3718 #, no-wrap msgid "" "\thcitool -i hci0 scanning\n" @@ -7662,77 +7728,77 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3679 +#: ./user-manual.txt:3720 msgid "Once ther dive computer is pired, set up the RFCOMM connection" msgstr "" #. type: Title ===== -#: ./user-manual.txt:3680 +#: ./user-manual.txt:3721 #, no-wrap msgid "Establishing the RFCOMM connection" msgstr "" #. type: Plain text -#: ./user-manual.txt:3683 +#: ./user-manual.txt:3724 msgid "The command to establish an RFCOMM connection is:" msgstr "" #. type: Plain text -#: ./user-manual.txt:3685 +#: ./user-manual.txt:3726 msgid "+sudo rfcomm -i <controller> connect <dev> <bdaddr> [channel]+" msgstr "" #. type: Plain text -#: ./user-manual.txt:3687 +#: ./user-manual.txt:3728 msgid "+<controller>+ is the Bluetooth controller, +hci0+." msgstr "" #. type: Plain text -#: ./user-manual.txt:3688 +#: ./user-manual.txt:3729 msgid "+<dev>+ is the RFCOMM device file, +rfcomm0+" msgstr "" #. type: Plain text -#: ./user-manual.txt:3689 +#: ./user-manual.txt:3730 msgid "+<bdaddr>+ is the dive computer's MAC address, +00:11:22:33:44:55+" msgstr "" #. type: Plain text -#: ./user-manual.txt:3690 +#: ./user-manual.txt:3731 msgid "+[channel]+ is the dive computer's Bluetooth channel we need to connect to." msgstr "" #. type: Plain text -#: ./user-manual.txt:3693 +#: ./user-manual.txt:3734 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:3695 +#: ./user-manual.txt:3736 msgid "_Shearwater Petrel 2_: channel 5" msgstr "" #. type: Plain text -#: ./user-manual.txt:3696 +#: ./user-manual.txt:3737 msgid "_Shearwater Petrel 1_: channel 1" msgstr "" #. type: Plain text -#: ./user-manual.txt:3697 +#: ./user-manual.txt:3738 msgid "_Heinrichs-Weikamp OSTC Sport_: channel 1" msgstr "" #. type: Plain text -#: ./user-manual.txt:3699 +#: ./user-manual.txt:3740 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:3701 +#: ./user-manual.txt:3742 #, no-wrap msgid "" "\tsudo rfcomm -i hci0 connect rfcomm0 00:11:22:33:44:55 5 (enter a password, " @@ -7740,12 +7806,12 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3703 +#: ./user-manual.txt:3744 msgid "This gives the response:" msgstr "" #. type: Plain text -#: ./user-manual.txt:3706 +#: ./user-manual.txt:3747 #, no-wrap msgid "" "\tConnected /dev/rfcomm0 to 00:11:22:33:44:55 on channel 5\n" @@ -7753,14 +7819,14 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3708 +#: ./user-manual.txt:3749 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:3712 +#: ./user-manual.txt:3753 #, no-wrap msgid "" "\tsudo rfcomm -i hci0 connect rfcomm0 00:11:22:33:44:55 (enter a password, " @@ -7770,7 +7836,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3716 +#: ./user-manual.txt:3757 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 " @@ -7779,7 +7845,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3726 +#: ./user-manual.txt:3767 #, no-wrap msgid "" "\tsdptool -i hci0 records 00:11:22:33:44:55\n" @@ -7794,7 +7860,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3729 +#: ./user-manual.txt:3770 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 " @@ -7802,7 +7868,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3732 +#: ./user-manual.txt:3773 msgid "" "After establishing the RFCOMM connection and while the dive computer's " "upload mode countdown is still running, go to_Subsurface_, select " @@ -7812,25 +7878,25 @@ msgid "" msgstr "" #. type: Title == -#: ./user-manual.txt:3738 +#: ./user-manual.txt:3779 #, no-wrap msgid "APPENDIX B: Dive Computer specific information for importing dive data." msgstr "" #. type: Title === -#: ./user-manual.txt:3741 +#: ./user-manual.txt:3782 #, no-wrap msgid "Importing from Uemis Zurich" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: ./user-manual.txt:3743 +#: ./user-manual.txt:3784 #, no-wrap msgid "images/icons/iumis.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:3759 +#: ./user-manual.txt:3800 msgid "" "_Subsurface_ downloads the information stored on the SDA (the built-in file " "system of the Uemis) including information about dive spots and " @@ -7847,7 +7913,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3774 +#: ./user-manual.txt:3815 msgid "" "After selecting the above device name, download the dives from the Uemis " "Zurich. One technical issue with the Uemis Zurich download implementation " @@ -7864,19 +7930,19 @@ msgid "" msgstr "" #. type: Title === -#: ./user-manual.txt:3776 +#: ./user-manual.txt:3817 #, no-wrap msgid "Importing from Uwatec Galileo" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: ./user-manual.txt:3778 +#: ./user-manual.txt:3819 #, no-wrap msgid "images/icons/Galileo.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:3793 +#: ./user-manual.txt:3834 msgid "" "The Uwatec Galileo dive computers use infra red (IrDA) communication between " "the dive computer and Subsurface. The Uwatec hardware uses a USB dongle " @@ -7892,14 +7958,14 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3796 +#: ./user-manual.txt:3837 msgid "" "After executing this command, Subsurface will recognise the Galileo dive " "computer and download dive information." msgstr "" #. type: Plain text -#: ./user-manual.txt:3802 +#: ./user-manual.txt:3843 msgid "" "Under Windows, a similar situation exists. Drivers for the MCS7780 are " "available from some Internet web sites e.g. " @@ -7910,26 +7976,26 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3805 +#: ./user-manual.txt:3846 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:3807 +#: ./user-manual.txt:3848 #, no-wrap msgid "Importing from Heinrichs Weikamp DR5" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: ./user-manual.txt:3809 +#: ./user-manual.txt:3850 #, no-wrap msgid "images/icons/HW_DR5.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:3819 +#: ./user-manual.txt:3860 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. " @@ -7942,19 +8008,19 @@ msgid "" msgstr "" #. type: Title === -#: ./user-manual.txt:3822 +#: ./user-manual.txt:3863 #, no-wrap msgid "Importing from xDEEP BLACK" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: ./user-manual.txt:3824 +#: ./user-manual.txt:3865 #, no-wrap msgid "images/icons/HW_xdeepblack.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:3833 +#: ./user-manual.txt:3874 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 " @@ -7968,19 +8034,19 @@ msgid "" msgstr "" #. type: Title === -#: ./user-manual.txt:3835 +#: ./user-manual.txt:3876 #, no-wrap msgid "Importing from Shearwater Predator/Petrel using Bluetooth" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: ./user-manual.txt:3837 +#: ./user-manual.txt:3878 #, no-wrap msgid "images/icons/predator.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:3840 +#: ./user-manual.txt:3881 msgid "" "Specific instructions for downloading dives using Bluetooth are given in the " "section above, <<S_Bluetooth,_Connecting Subsurface to a Bluetooth-enabled " @@ -7988,19 +8054,19 @@ msgid "" msgstr "" #. type: Title === -#: ./user-manual.txt:3842 +#: ./user-manual.txt:3883 #, no-wrap msgid "Importing from Poseidon MkVI Discovery" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: ./user-manual.txt:3844 +#: ./user-manual.txt:3885 #, no-wrap msgid "images/MkVI.jpeg" msgstr "" #. type: Plain text -#: ./user-manual.txt:3852 +#: ./user-manual.txt:3893 msgid "" "Download of dive logs from the MkVI is performed using a custom " "communications adapter and the _Poseidon PC Configuration Software_, " @@ -8012,45 +8078,45 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3855 +#: ./user-manual.txt:3896 msgid "" "Setup configuration for the dive and key dive parameters (file with a .txt " "extension)" msgstr "" #. type: Plain text -#: ./user-manual.txt:3856 +#: ./user-manual.txt:3897 msgid "Dive log details (file with a .csv extension)" msgstr "" #. type: Plain text -#: ./user-manual.txt:3858 +#: ./user-manual.txt:3899 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:3860 +#: ./user-manual.txt:3901 msgid "" "_Subsurface_ accesses the .txt and the .csv files to obtain dive log " "information." msgstr "" #. type: Title === -#: ./user-manual.txt:3862 +#: ./user-manual.txt:3903 #, no-wrap msgid "Importing from APD Inspiration/Evolution CCR" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: ./user-manual.txt:3864 +#: ./user-manual.txt:3905 #, no-wrap msgid "images/APDComputer.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:3872 +#: ./user-manual.txt:3913 msgid "" "The dive logs of an APD Inspiration or similar CCR dive computer are " "downloaded using a communications adapter and _AP Communicator_, obtained " @@ -8062,55 +8128,55 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3874 +#: ./user-manual.txt:3915 msgid "Download the dive using _AP Communicator_." msgstr "" #. type: Plain text -#: ./user-manual.txt:3875 +#: ./user-manual.txt:3916 msgid "Open a dive within the _AP Log Viewer_." msgstr "" #. type: Plain text -#: ./user-manual.txt:3876 +#: ./user-manual.txt:3917 msgid "Select the tab at the top of the screen, entitled \"_Data_\"." msgstr "" #. type: Plain text -#: ./user-manual.txt:3877 +#: ./user-manual.txt:3918 msgid "" "With the raw dive log data show on the screen, click on \"_Copy to " "Clipboard_\"." msgstr "" #. type: Plain text -#: ./user-manual.txt:3878 +#: ./user-manual.txt:3919 msgid "Open a text editor, e.g. Notepad (Windows) or TextWrangler (Mac)." msgstr "" #. type: Plain text -#: ./user-manual.txt:3880 +#: ./user-manual.txt:3921 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:3881 +#: ./user-manual.txt:3922 msgid "" "Within _Subsurface_, select _Import -> Import log files_ to open the " "xref:Unified_import[universal import dialogue]." msgstr "" #. type: Plain text -#: ./user-manual.txt:3882 +#: ./user-manual.txt:3923 msgid "" "In the dropdown list towards the bottom right of the dialogue (labled " "'Filter:'), select \"APD log viewer\"." msgstr "" #. type: Plain text -#: ./user-manual.txt:3885 +#: ./user-manual.txt:3926 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 " @@ -8119,13 +8185,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: ./user-manual.txt:3886 +#: ./user-manual.txt:3927 #, no-wrap msgid "images/APD_CSVimportF22.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:3894 +#: ./user-manual.txt:3935 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 " @@ -8137,12 +8203,12 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3895 +#: ./user-manual.txt:3936 msgid "Click the _Ok_ button at the bottom of the import panel." msgstr "" #. type: Plain text -#: ./user-manual.txt:3900 +#: ./user-manual.txt:3941 msgid "" "The APD dive log will appear within _Subsurface_. The dive " "computer-generated ceiling generated by the Inspiration can be viewed by " @@ -8152,13 +8218,13 @@ msgid "" msgstr "" #. type: Title == -#: ./user-manual.txt:3901 +#: ./user-manual.txt:3942 #, no-wrap msgid "APPENDIX C: Exporting Dive log information from external dive log software." msgstr "" #. type: Plain text -#: ./user-manual.txt:3910 +#: ./user-manual.txt:3951 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, " @@ -8168,22 +8234,22 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3912 +#: ./user-manual.txt:3953 msgid "Export the foreign dive log data to format that is accessible from" msgstr "" #. type: Plain text -#: ./user-manual.txt:3913 +#: ./user-manual.txt:3954 msgid "_Subsurface_." msgstr "" #. type: Plain text -#: ./user-manual.txt:3914 +#: ./user-manual.txt:3955 msgid "Import the accessible dive log data into _Subsurface_." msgstr "" #. type: Plain text -#: ./user-manual.txt:3918 +#: ./user-manual.txt:3959 msgid "" "This appendix provides some information about approaches to export dive log " "data from foreign dive log software. The procedures below mostly apply to " @@ -8191,19 +8257,19 @@ msgid "" msgstr "" #. type: Title === -#: ./user-manual.txt:3920 +#: ./user-manual.txt:3961 #, no-wrap msgid "Exporting from *Suunto Divemanager (DM3, DM4 or DM5)*" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: ./user-manual.txt:3921 +#: ./user-manual.txt:3962 #, no-wrap msgid "images/icons/suuntologo.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:3928 +#: ./user-manual.txt:3969 msgid "" "DiveManager is a MS Windows application for Suunto dive computers. " "Divemanager 3 (DM3) is an older version of the Suunto software. More recent " @@ -8213,64 +8279,64 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3930 +#: ./user-manual.txt:3971 #, no-wrap msgid "*Divemanager 3 (DM3):*\n" msgstr "" #. type: Plain text -#: ./user-manual.txt:3932 +#: ./user-manual.txt:3973 msgid "Start 'Suunto Divemanager 3' and log in with the name containing the logs" msgstr "" #. type: Plain text -#: ./user-manual.txt:3933 +#: ./user-manual.txt:3974 msgid "Do not start the import wizard to import dives from the dive computer." msgstr "" #. type: Plain text -#: ./user-manual.txt:3935 +#: ./user-manual.txt:3976 msgid "" "In the navigation tree on the left side of the program-window, select the " "appropriate dives." msgstr "" #. type: Plain text -#: ./user-manual.txt:3936 +#: ./user-manual.txt:3977 msgid "Within the list of dives, select the dives you would like to import later:" msgstr "" #. type: Plain text -#: ./user-manual.txt:3937 +#: ./user-manual.txt:3978 msgid "To select certain dives: hold 'ctrl' and click the dive" msgstr "" #. type: Plain text -#: ./user-manual.txt:3939 +#: ./user-manual.txt:3980 msgid "" "To select all dives: Select the first dive, hold down shift and select the " "last dive" msgstr "" #. type: Plain text -#: ./user-manual.txt:3940 +#: ./user-manual.txt:3981 msgid "With the dives marked, use the program menu _File -> Export_" msgstr "" #. type: Plain text -#: ./user-manual.txt:3941 +#: ./user-manual.txt:3982 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:3942 +#: ./user-manual.txt:3983 msgid "Click the browse button next to the field Export Path" msgstr "" #. type: Plain text -#: ./user-manual.txt:3944 +#: ./user-manual.txt:3985 #, no-wrap msgid "" "** A file-manager like window pops up\n" @@ -8278,13 +8344,13 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3945 +#: ./user-manual.txt:3986 #, no-wrap msgid "Divelog.SDE file\n" msgstr "" #. type: Plain text -#: ./user-manual.txt:3947 +#: ./user-manual.txt:3988 #, no-wrap msgid "" "** Optionally change the name of the file for saving\n" @@ -8292,25 +8358,25 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3948 +#: ./user-manual.txt:3989 #, no-wrap msgid "Back in the Export pop-up, press the button 'Export'\n" msgstr "" #. type: Plain text -#: ./user-manual.txt:3949 +#: ./user-manual.txt:3990 #, no-wrap msgid "The dives are now exported to the file Divelog.SDE.\n" msgstr "" #. type: Plain text -#: ./user-manual.txt:3951 +#: ./user-manual.txt:3992 #, no-wrap msgid "*Divemanager 4 (DM4) and Divemanager 5 (DM5):*\n" msgstr "" #. type: Plain text -#: ./user-manual.txt:3956 +#: ./user-manual.txt:3997 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 " @@ -8319,81 +8385,81 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3958 +#: ./user-manual.txt:3999 msgid "Locating the Suunto DM4 (or DM5) database:" msgstr "" #. type: Plain text -#: ./user-manual.txt:3960 ./user-manual.txt:3969 +#: ./user-manual.txt:4001 ./user-manual.txt:4010 msgid "Start Suunto DM4/DM5" msgstr "" #. type: Plain text -#: ./user-manual.txt:3961 +#: ./user-manual.txt:4002 msgid "Select 'Help -> About'" msgstr "" #. type: Plain text -#: ./user-manual.txt:3962 +#: ./user-manual.txt:4003 msgid "Click 'Copy' after text 'Copy log folder path to clipboard'" msgstr "" #. type: Plain text -#: ./user-manual.txt:3963 +#: ./user-manual.txt:4004 msgid "Now open Windows Explorer" msgstr "" #. type: Plain text -#: ./user-manual.txt:3964 +#: ./user-manual.txt:4005 msgid "Paste the address to the path box at the top of the File Explorer" msgstr "" #. type: Plain text -#: ./user-manual.txt:3965 +#: ./user-manual.txt:4006 msgid "The database is called DM4.db or DM5.db" msgstr "" #. type: Plain text -#: ./user-manual.txt:3967 +#: ./user-manual.txt:4008 msgid "Making a backup copy of the Suunto DM4/DM5 database:" msgstr "" #. type: Plain text -#: ./user-manual.txt:3970 +#: ./user-manual.txt:4011 msgid "Select 'File - Create backup'" msgstr "" #. type: Plain text -#: ./user-manual.txt:3972 +#: ./user-manual.txt:4013 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:3973 +#: ./user-manual.txt:4014 msgid "Click 'Save'" msgstr "" #. type: Plain text -#: ./user-manual.txt:3974 +#: ./user-manual.txt:4015 msgid "The dives are now exported to the file DM4.bak (or DM5.bak)" msgstr "" #. type: Title === -#: ./user-manual.txt:3976 +#: ./user-manual.txt:4017 #, no-wrap msgid "Exporting from Atomic Logbook" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: ./user-manual.txt:3979 +#: ./user-manual.txt:4020 #, no-wrap msgid "images/icons/atomiclogo.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:3986 +#: ./user-manual.txt:4027 msgid "" "Atomic Logbook is a Windows software by Atomic Aquatics. It allows " "downloading of dive information from Cobalt and Cobalt 2 dive computers. " @@ -8403,19 +8469,19 @@ msgid "" msgstr "" #. type: Title === -#: ./user-manual.txt:3988 +#: ./user-manual.txt:4029 #, no-wrap msgid "Exporting from Mares Dive Organiser V2.1" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: ./user-manual.txt:3991 +#: ./user-manual.txt:4032 #, no-wrap msgid "images/icons/mareslogo.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:3999 +#: ./user-manual.txt:4040 msgid "" "Mares Dive Organiser is a Windows application. The dive log is kept as a " "Microsoft SQL Compact Edition database with a '.sdf' filename extension. The " @@ -8426,7 +8492,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:4004 +#: ./user-manual.txt:4045 msgid "" "Within Dive Organiser, select _Database -> Backup_ from the main menu and " "back up the database to the desk top. This creates a zipped file " @@ -8434,36 +8500,36 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:4007 +#: ./user-manual.txt:4048 msgid "" "Rename the file to DiveOrganiserxxxxx.zip. Inside the zipped directory is a " "file _DiveOrganiser.sdf_." msgstr "" #. type: Plain text -#: ./user-manual.txt:4008 +#: ./user-manual.txt:4049 msgid "Extract the _.sdf_ file from the zipped folder to your Desktop." msgstr "" #. type: Plain text -#: ./user-manual.txt:4009 +#: ./user-manual.txt:4050 msgid "The password for accessing the .zip file is _mares_." msgstr "" #. type: Title === -#: ./user-manual.txt:4011 +#: ./user-manual.txt:4052 #, no-wrap msgid "Exporting from *DivingLog 5.0 and 6.0*" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: ./user-manual.txt:4013 +#: ./user-manual.txt:4054 #, no-wrap msgid "images/icons/divingloglogo.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:4020 +#: ./user-manual.txt:4061 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 " @@ -8473,37 +8539,37 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:4022 +#: ./user-manual.txt:4063 msgid "To transfer all files from DivingLog to Subsurface, do the following:" msgstr "" #. type: Plain text -#: ./user-manual.txt:4024 +#: ./user-manual.txt:4065 msgid "In DivingLog open the 'File -> Export -> SQLite' menu" msgstr "" #. type: Plain text -#: ./user-manual.txt:4025 +#: ./user-manual.txt:4066 msgid "Select 'Settings' button" msgstr "" #. type: Plain text -#: ./user-manual.txt:4026 +#: ./user-manual.txt:4067 msgid "Set the 'RTF2Plaintext' to 'true'" msgstr "" #. type: Plain text -#: ./user-manual.txt:4027 +#: ./user-manual.txt:4068 msgid "Close the Settings dialog" msgstr "" #. type: Plain text -#: ./user-manual.txt:4028 +#: ./user-manual.txt:4069 msgid "Click 'Export' button and select the filename" msgstr "" #. type: Plain text -#: ./user-manual.txt:4032 +#: ./user-manual.txt:4073 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 " @@ -8511,13 +8577,13 @@ msgid "" msgstr "" #. type: Title == -#: ./user-manual.txt:4033 +#: ./user-manual.txt:4074 #, no-wrap msgid "APPENDIX D: Exporting a spreadsheet to CSV format" msgstr "" #. type: Plain text -#: ./user-manual.txt:4043 +#: ./user-manual.txt:4084 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 " @@ -8530,7 +8596,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:4049 +#: ./user-manual.txt:4090 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 " @@ -8541,40 +8607,40 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:4051 +#: ./user-manual.txt:4092 msgid "Date: use one of the following formats: yyyy-mm-dd, dd.mm.yyyy, mm/dd/yyyy" msgstr "" #. type: Plain text -#: ./user-manual.txt:4052 +#: ./user-manual.txt:4093 msgid "Duration: the format should be minutes:seconds." msgstr "" #. type: Plain text -#: ./user-manual.txt:4053 +#: ./user-manual.txt:4094 msgid "" "Unit system: only one unit system should be used (i.e., no mixture between " "imperial and metric units)" msgstr "" #. type: Plain text -#: ./user-manual.txt:4054 +#: ./user-manual.txt:4095 msgid "Tags and buddies: values should be separated using a comma." msgstr "" #. type: Plain text -#: ./user-manual.txt:4055 +#: ./user-manual.txt:4096 msgid "GPS position: users must use decimal degrees, e.g. 30.22496 30.821798" msgstr "" #. type: Title === -#: ./user-manual.txt:4056 +#: ./user-manual.txt:4097 #, no-wrap msgid "_LibreOffice Calc_ and _OpenOffice Calc_" msgstr "" #. type: Plain text -#: ./user-manual.txt:4060 +#: ./user-manual.txt:4101 msgid "" "These are open source spreadsheet applications forming parts of larger open " "source office suite applications. The user interaction with _LibreOffice_ " @@ -8585,13 +8651,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: ./user-manual.txt:4061 +#: ./user-manual.txt:4102 #, no-wrap msgid "images/LOffice_spreadsheetdata.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:4064 +#: ./user-manual.txt:4105 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 " @@ -8599,13 +8665,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: ./user-manual.txt:4065 +#: ./user-manual.txt:4106 #, no-wrap msgid "images/LOffice_save_as_options.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:4068 +#: ./user-manual.txt:4109 msgid "" "After selecting _Save_, select the appropriate field delimiter (choose _Tab_ " "to prevent conflicts with the comma when using this as a decimal point), " @@ -8613,13 +8679,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: ./user-manual.txt:4069 +#: ./user-manual.txt:4110 #, no-wrap msgid "images/LOffice_field_options.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:4072 +#: ./user-manual.txt:4113 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 " @@ -8627,13 +8693,13 @@ msgid "" msgstr "" #. type: Title === -#: ./user-manual.txt:4073 +#: ./user-manual.txt:4114 #, no-wrap msgid "Microsoft _Excel_" msgstr "" #. type: Plain text -#: ./user-manual.txt:4079 +#: ./user-manual.txt:4120 msgid "" "The field delimiter (called \"_list separator_\" in Microsoft manuals) is " "not accessible from within _Excel_ and needs to be set through the " @@ -8644,19 +8710,19 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:4081 +#: ./user-manual.txt:4122 msgid "" "In Microsoft Windows, click the *Start* button, and then select _Control " "Panel_ from the list on the right-hand side." msgstr "" #. type: Plain text -#: ./user-manual.txt:4082 +#: ./user-manual.txt:4123 msgid "Open the _Regional and Language Options_ dialog box." msgstr "" #. type: Plain text -#: ./user-manual.txt:4085 +#: ./user-manual.txt:4126 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 " @@ -8664,48 +8730,48 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:4086 +#: ./user-manual.txt:4127 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:4087 +#: ./user-manual.txt:4128 msgid "Click _OK_ twice." msgstr "" #. type: Plain text -#: ./user-manual.txt:4089 +#: ./user-manual.txt:4130 msgid "Below is an image of the _Control Panel_:" msgstr "" #. type: Target for macro image -#: ./user-manual.txt:4090 +#: ./user-manual.txt:4131 #, no-wrap msgid "images/Win_SaveCSV2.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:4093 +#: ./user-manual.txt:4134 msgid "To export the dive log in CSV format:" msgstr "" #. type: Plain text -#: ./user-manual.txt:4095 +#: ./user-manual.txt:4136 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:4096 +#: ./user-manual.txt:4137 #, no-wrap msgid "images/Win_SaveCSV1.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:4099 +#: ./user-manual.txt:4140 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 " @@ -8715,13 +8781,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: ./user-manual.txt:4100 +#: ./user-manual.txt:4141 #, no-wrap msgid "images/Win_SaveCSV3.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:4103 +#: ./user-manual.txt:4144 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 " @@ -8730,13 +8796,13 @@ msgid "" msgstr "" #. type: Title == -#: ./user-manual.txt:4105 +#: ./user-manual.txt:4146 #, no-wrap msgid "APPENDIX E: Writing a custom print template" msgstr "" #. type: Plain text -#: ./user-manual.txt:4110 +#: ./user-manual.txt:4151 msgid "" "_Subsurface_ provides a mechanism to create or modify templates for printing " "dive logs in order to produce customised printouts of dive logs. Templates, " @@ -8745,34 +8811,35 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:4112 +#: ./user-manual.txt:4153 msgid "Templates are accessed using the print dialogue (see image *B* below)." msgstr "" #. type: Plain text -#: ./user-manual.txt:4120 +#: ./user-manual.txt:4161 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 " -"the _Custom_ template from the template dropdown list in the print dialogue " -"(see image *B* above), then select _Edit_." +"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:4122 +#: ./user-manual.txt:4163 msgid "The Edit Panel comprises three tabs:" msgstr "" #. type: Target for macro image -#: ./user-manual.txt:4123 +#: ./user-manual.txt:4164 #, no-wrap msgid "images/Template1_f22.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:4127 +#: ./user-manual.txt:4168 msgid "" "The _Style_ tab (image *A* above) controls the font, line spacing and colour " "template used for printing the dive log. The style attributes are " @@ -8780,7 +8847,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:4131 +#: ./user-manual.txt:4172 msgid "" "The _Colors_ tab (image *B* above) allows editing the colours used for " "printing the dive log. The colours are highly customisable: the _Edit_ " @@ -8789,7 +8856,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:4140 +#: ./user-manual.txt:4181 msgid "" "The _Template_ tab of the Edit Panel (see image below) allows creating a " "template using HTML as well as a few Grantlee programming " @@ -8805,47 +8872,48 @@ msgid "" msgstr "" #. type: Target for macro image -#: ./user-manual.txt:4141 +#: ./user-manual.txt:4182 #, no-wrap msgid "images/Template2_f22.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:4144 +#: ./user-manual.txt:4186 msgid "" "One can adapt any of the existing templates and save it to the dive log " "directory. The standard templates (e.g. One dive, Six dives, Table) can be " -"modified in this way." +"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:4146 +#: ./user-manual.txt:4188 msgid "" "To write a custom template the following elements must exist so that the " "template will be correctly handled and rendered." msgstr "" #. type: Title === -#: ./user-manual.txt:4147 +#: ./user-manual.txt:4189 #, no-wrap msgid "Main dive loop" msgstr "" #. type: Plain text -#: ./user-manual.txt:4149 +#: ./user-manual.txt:4191 msgid "" "_Subsurface_ exports a dive list called (*dives*) to the _Grantlee_ " "backend. It is possible to iterate over the list as follows:" msgstr "" #. type: Block title -#: ./user-manual.txt:4150 ./user-manual.txt:4204 ./user-manual.txt:4221 +#: ./user-manual.txt:4192 ./user-manual.txt:4246 ./user-manual.txt:4263 #, no-wrap msgid "template.html" msgstr "" #. type: delimited block . -#: ./user-manual.txt:4155 +#: ./user-manual.txt:4197 #, no-wrap msgid "" "\t{% for dive in dives %}\n" @@ -8854,13 +8922,13 @@ msgid "" msgstr "" #. type: Block title -#: ./user-manual.txt:4157 ./user-manual.txt:4209 ./user-manual.txt:4228 +#: ./user-manual.txt:4199 ./user-manual.txt:4251 ./user-manual.txt:4270 #, no-wrap msgid "output.html" msgstr "" #. type: delimited block . -#: ./user-manual.txt:4162 +#: ./user-manual.txt:4204 #, no-wrap msgid "" "\t<h1> 1 </h1>\n" @@ -8869,25 +8937,25 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:4165 +#: ./user-manual.txt:4207 msgid "" "Additional information about _Grantlee_ can be found " "http://www.grantlee.org/apidox/for_themers.html[here]" msgstr "" #. type: Title === -#: ./user-manual.txt:4166 +#: ./user-manual.txt:4208 #, no-wrap msgid "Grantlee exported variables" msgstr "" #. type: Plain text -#: ./user-manual.txt:4168 +#: ./user-manual.txt:4210 msgid "Only a subset of the dive data is exported:" msgstr "" #. type: delimited block | -#: ./user-manual.txt:4186 +#: ./user-manual.txt:4228 #, no-wrap msgid "" "|*Name*|*Description*\n" @@ -8910,7 +8978,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:4190 +#: ./user-manual.txt:4232 msgid "" "_Subsurface_ also exports *template_options* data. This data must be used as " "_CSS_ values to provide a dynamically editable template. The exported data " @@ -8918,7 +8986,7 @@ msgid "" msgstr "" #. type: delimited block | -#: ./user-manual.txt:4202 +#: ./user-manual.txt:4244 #, no-wrap msgid "" "|*Name*|*Description*\n" @@ -8937,26 +9005,26 @@ msgid "" msgstr "" #. type: delimited block . -#: ./user-manual.txt:4207 +#: ./user-manual.txt:4249 #, no-wrap msgid "\tborder-width: {{ template_options.borderwidth }}px;\n" msgstr "" #. type: delimited block . -#: ./user-manual.txt:4212 +#: ./user-manual.txt:4254 #, no-wrap msgid "\tborder-width: 3px;\n" msgstr "" #. type: Plain text -#: ./user-manual.txt:4215 +#: ./user-manual.txt:4257 msgid "" "Another variable that _Subsurface_ exports is *print_options*. This variable " "contains a single member:" msgstr "" #. type: delimited block | -#: ./user-manual.txt:4218 +#: ./user-manual.txt:4260 #, no-wrap msgid "" "|*Name*|*Description*\n" @@ -8965,7 +9033,7 @@ msgid "" msgstr "" #. type: delimited block . -#: ./user-manual.txt:4226 +#: ./user-manual.txt:4268 #, no-wrap msgid "" "\tbody {\n" @@ -8974,7 +9042,7 @@ msgid "" msgstr "" #. type: delimited block . -#: ./user-manual.txt:4233 +#: ./user-manual.txt:4275 #, no-wrap msgid "" "\tbody {\n" @@ -8983,13 +9051,13 @@ msgid "" msgstr "" #. type: Title === -#: ./user-manual.txt:4235 +#: ./user-manual.txt:4277 #, no-wrap msgid "Defined CSS selectors" msgstr "" #. type: Plain text -#: ./user-manual.txt:4239 +#: ./user-manual.txt:4281 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 " @@ -8997,7 +9065,7 @@ msgid "" msgstr "" #. type: delimited block | -#: ./user-manual.txt:4246 +#: ./user-manual.txt:4288 #, no-wrap msgid "" "|*Selector*|*Type*|*Description*\n" @@ -9010,20 +9078,20 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:4249 +#: ./user-manual.txt:4291 msgid "" "Rendering dive profiles is not supported for flow layout templates (when " "data-numberofdives = 0)." msgstr "" #. type: Title === -#: ./user-manual.txt:4250 +#: ./user-manual.txt:4292 #, no-wrap msgid "Special attributes" msgstr "" #. type: Plain text -#: ./user-manual.txt:4254 +#: ./user-manual.txt:4296 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 " @@ -9031,55 +9099,55 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:4256 +#: ./user-manual.txt:4298 msgid "" "The *data-numberofdives* data attribute is added to the body tag to set the " "rendering mode" msgstr "" #. type: Plain text -#: ./user-manual.txt:4258 +#: ./user-manual.txt:4300 msgid "render 6 dives per page:" msgstr "" #. type: delimited block . -#: ./user-manual.txt:4261 +#: ./user-manual.txt:4303 #, no-wrap msgid "\t<body data-numberofdives = 6>\n" msgstr "" #. type: Plain text -#: ./user-manual.txt:4264 +#: ./user-manual.txt:4306 msgid "render as much dives as possible:" msgstr "" #. type: delimited block . -#: ./user-manual.txt:4267 +#: ./user-manual.txt:4309 #, no-wrap msgid "\t<body data-numberofdives = 0>\n" msgstr "" #. type: Plain text -#: ./user-manual.txt:4270 +#: ./user-manual.txt:4312 msgid "" "All CSS units should be in relative lengths only, to support printing on any " "page size." msgstr "" #. type: Title == -#: ./user-manual.txt:4271 +#: ./user-manual.txt:4313 #, no-wrap msgid "APPENDIX F: FAQs." msgstr "" #. type: Title === -#: ./user-manual.txt:4273 +#: ./user-manual.txt:4315 #, no-wrap msgid "Subsurface appears to miscalculate gas consumption and SAC" msgstr "" #. type: Plain text -#: ./user-manual.txt:4277 +#: ./user-manual.txt:4319 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_ " @@ -9087,7 +9155,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:4283 +#: ./user-manual.txt:4325 msgid "" "'Answer': Not really. What happens is that _Subsurface_ actually calculates " "gas consumption differently - and better - than you expect. In particular, " @@ -9097,7 +9165,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:4289 +#: ./user-manual.txt:4331 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 " @@ -9107,12 +9175,12 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:4291 +#: ./user-manual.txt:4333 msgid "+consumption = (amount_of_air_at_beginning - amount_of_air_at_end)+" msgstr "" #. type: Plain text -#: ./user-manual.txt:4297 +#: ./user-manual.txt:4339 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 " @@ -9123,12 +9191,12 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:4299 +#: ./user-manual.txt:4341 msgid "+12.2*((220-100)/1.013)+" msgstr "" #. type: Plain text -#: ./user-manual.txt:4304 +#: ./user-manual.txt:4346 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 " @@ -9138,7 +9206,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:4310 +#: ./user-manual.txt:4352 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 " @@ -9149,7 +9217,7 @@ msgid "" msgstr "" #. type: Title === -#: ./user-manual.txt:4311 +#: ./user-manual.txt:4353 #, no-wrap msgid "" "Some dive profiles have time discrepancies with the recorded samples from my " @@ -9157,7 +9225,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:4315 +#: ./user-manual.txt:4357 msgid "" "_Subsurface_ ends up ignoring surface time for many things (average depth, " "divetime, SAC, etc). 'Question': Why do dive durations in my dive computer " @@ -9165,7 +9233,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:4323 +#: ./user-manual.txt:4365 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 " @@ -9179,13 +9247,13 @@ msgid "" msgstr "" #. type: Title === -#: ./user-manual.txt:4324 +#: ./user-manual.txt:4366 #, no-wrap msgid "Some dive profiles are missing from the download" msgstr "" #. type: Plain text -#: ./user-manual.txt:4330 +#: ./user-manual.txt:4372 msgid "" "'Question': I cannot download all my dives, only the most recent ones even " "though my dive computer's manual states that it records history of e.g. 999 " @@ -9193,7 +9261,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:4339 +#: ./user-manual.txt:4381 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 " @@ -9206,7 +9274,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:4343 +#: ./user-manual.txt:4385 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 " diff --git a/Documentation/fr/po/subsurface-manual.fr.po b/Documentation/fr/po/subsurface-manual.fr.po index 36b9768ae..314b83b0a 100644 --- a/Documentation/fr/po/subsurface-manual.fr.po +++ b/Documentation/fr/po/subsurface-manual.fr.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: subsurface@subsurface-divelog.org\n" -"POT-Creation-Date: 2015-10-12 11:04+0200\n" -"PO-Revision-Date: 2015-10-12 11:05+0200\n" +"POT-Creation-Date: 2015-10-13 20:37+0200\n" +"PO-Revision-Date: 2015-10-13 20:41+0200\n" "Last-Translator: Guillaume GARDET <guillaume.gardet@opensuse.org>\n" "Language-Team: French <opensuse-fr@opensuse.org>\n" "Language: fr\n" @@ -527,7 +527,7 @@ msgstr "" #. type: Plain text #: user-manual.txt:188 msgid "" -"The divecomputer itself. See: xref:S_ImportDiveComputer[Importing new dive " +"The dive computer itself. See: xref:S_ImportDiveComputer[Importing new dive " "information from a Dive Computer] or" msgstr "" "L'ordinateur de plongée lui-même. Voir : xref:S_ImportDiveComputer[Importer " @@ -605,7 +605,7 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:218 user-manual.txt:754 +#: user-manual.txt:218 user-manual.txt:780 #, no-wrap msgid "images/BlueEditBar_f22.jpg" msgstr "images/BlueEditBar_f22.jpg" @@ -724,7 +724,7 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:290 user-manual.txt:2997 +#: user-manual.txt:290 user-manual.txt:649 user-manual.txt:3031 #, no-wrap msgid "images/icons/warning2.png" msgstr "images/icons/warning2.png" @@ -804,7 +804,7 @@ msgstr "images/DC_import_f20.jpg" 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 divecomputer allows this, _Subsurface_ only imports dives " +"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)." @@ -885,7 +885,7 @@ msgid "" "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 righthand side of the dialogue (see image " +"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, " @@ -917,9 +917,9 @@ msgid "*PROBLEMS WITH DATA DOWNLOAD FROM A DIVE COMPUTER?*\n" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:414 user-manual.txt:520 user-manual.txt:558 -#: user-manual.txt:571 user-manual.txt:1123 user-manual.txt:1189 -#: user-manual.txt:1242 user-manual.txt:1318 user-manual.txt:1632 +#: user-manual.txt:414 user-manual.txt:520 user-manual.txt:559 +#: user-manual.txt:572 user-manual.txt:1149 user-manual.txt:1215 +#: user-manual.txt:1268 user-manual.txt:1344 user-manual.txt:1658 #, no-wrap msgid "images/icons/important.png" msgstr "images/icons/important.png" @@ -1031,7 +1031,7 @@ msgid "Connecting _Subsurface_ to a Bluetooth-enabled dive computer" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:470 user-manual.txt:3535 +#: user-manual.txt:470 user-manual.txt:3576 #, no-wrap msgid "images/icons/bluetooth.jpg" msgstr "images/icons/bluetooth.jpg" @@ -1095,7 +1095,7 @@ msgstr "images/DC_import_Bluetooth.jpg" #: user-manual.txt:497 msgid "" "On the _Linux_ or _MacOS_ platforms the name of the _Subsurface_ computer " -"and its Bluetooth address are shown on the righthand side, On the lefthand " +"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 " "_Subsurface_. The power state (on/off) of the Bluetooth adapter is shown " @@ -1176,7 +1176,7 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:545 user-manual.txt:3466 user-manual.txt:3550 +#: user-manual.txt:545 user-manual.txt:3507 user-manual.txt:3591 #, no-wrap msgid "On Windows:" msgstr "Sur Windows :" @@ -1188,28 +1188,28 @@ msgid "images/DC_import_Bluetooth_Windows.png" msgstr "images/DC_import_Bluetooth_Windows.png" #. type: Plain text -#: user-manual.txt:550 +#: user-manual.txt:551 msgid "" "On _Windows_ platforms the _Local Bluetooth device details section_ on the " -"left is not displayed. To successfully initiate a scan (by pressing the " +"right is not displayed. To successfully initiate a scan (by pressing the " "_Scan_ button) check that the Bluetooth device on the _Subsurface_ computer " "is turned on." msgstr "" #. type: Plain text -#: user-manual.txt:557 +#: user-manual.txt:558 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 setup your DC device_. Always allow this pairing. After 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:564 +#: user-manual.txt:565 msgid "" "Be aware that currently _Subsurface_ works only with local Bluetooth " "adapters which use Microsoft Bluetooth Stack. If the local device uses " @@ -1218,7 +1218,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:570 +#: user-manual.txt:571 msgid "" "A log messageOn the bottom left of the _Remote Bluetooth device selection_ " "shows details about the current status of the Bluetooth agent. To select " @@ -1228,7 +1228,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:580 +#: user-manual.txt:581 #, no-wrap msgid "" "*IN CASE OF PROBLEMS*: If the Bluetooth adapter from the _Subsurface_ computer\n" @@ -1240,13 +1240,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:583 +#: user-manual.txt:584 #, no-wrap msgid "Changing the name of a dive computer" msgstr "" #. type: Plain text -#: user-manual.txt:599 +#: user-manual.txt:600 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 " @@ -1266,13 +1266,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:601 +#: user-manual.txt:602 #, no-wrap msgid "Updating the dive information imported from the dive computer." msgstr "" #. type: Plain text -#: user-manual.txt:608 +#: user-manual.txt:609 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 " @@ -1281,13 +1281,13 @@ msgid "" msgstr "" #. type: Title ===== -#: user-manual.txt:610 +#: user-manual.txt:611 #, no-wrap msgid "Notes" msgstr "Notes" #. type: Plain text -#: user-manual.txt:615 +#: user-manual.txt:616 msgid "" "To have a more complete dive record the user needs to add additional " "information by hand. The procedure below is virtually identical for hand-" @@ -1295,7 +1295,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:625 +#: user-manual.txt:626 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 " @@ -1308,24 +1308,24 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:626 +#: user-manual.txt:627 #, no-wrap msgid "images/AddDive3_f22.jpg" msgstr "images/AddDive3_f22.jpg" #. type: Plain text -#: user-manual.txt:635 +#: user-manual.txt:636 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 " "correct date. Press ESC to close the calendar. The time values (hour and " "minutes) can also be edited directly by clicking on each of them in the text " -"box and by overtyping the information displayed." +"box and by over-typing the information displayed." msgstr "" #. type: Plain text -#: user-manual.txt:646 +#: user-manual.txt:647 #, no-wrap msgid "" "*Air/water temperatures*: Air and water temperatures during the dive are shown\n" @@ -1341,57 +1341,71 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:659 +#: user-manual.txt:649 #, no-wrap +msgid "*Location*:\n" +msgstr "" + +#. type: Plain text +#: user-manual.txt:657 msgid "" -"*Location*: Here the name of the dive site can be entered, e.g. \"Tihany, Lake\n" -"Balaton, Hungary\". Dive locations are managed as a separate part of the dive log.\n" -"After entering the information for a particular dive site, and several dives are\n" -"performed at the same location, the information is re-used without requiring\n" -"full dive site information again. Existing dive location information\n" -"can be edited at any time by selecting (on the *Dive List* panel) a dive performed at that site\n" -"and by opening the location information by clicking the globe button on the\n" -"right of the location name (see image on the right, above). When entering a dive location name, auto location of\n" -"dive site names makes it easy to select a dive site that already exists in the dive log\n" -"(i.e. when typing the name of a dive site,\n" -"a dropdown list appears showing all sites with similar names). If the dive\n" -"site has been used before, click on the already-existing name.\n" +"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 " +"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." msgstr "" #. type: Plain text -#: user-manual.txt:662 +#: user-manual.txt:675 msgid "" -"If the present dive site has not been used before, a message appears as " -"follows (image *A* below):" +"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):" msgstr "" #. type: Target for macro image -#: user-manual.txt:663 +#: user-manual.txt:676 #, no-wrap msgid "images/Locations1_f22.jpg" msgstr "images/Locations1_f22.jpg" #. type: Plain text -#: user-manual.txt:668 +#: user-manual.txt:681 msgid "" -"Click the + icon on the right hand side. A panel appears to enter the " +"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:" msgstr "" #. type: Plain text -#: user-manual.txt:675 +#: user-manual.txt:688 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 " +"of the _Subsurface_ window. The map displays an orange bar indicating \"No " "location data - Move the map and double-click to set the dive location\". " -"Upon a double-click at the appropriate place, the orange bar disappears and " +"Upon a doubleclick at the appropriate place, the orange bar disappears and " "the coordinates are stored." msgstr "" #. type: Plain text -#: user-manual.txt:680 +#: user-manual.txt:693 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 " @@ -1400,14 +1414,14 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:683 +#: user-manual.txt:696 msgid "" "The coordinates can be entered by hand if they are known, using one of four " "formats with latitude followed by longitude:" msgstr "" #. type: Plain text -#: user-manual.txt:688 +#: user-manual.txt:701 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. " @@ -1415,28 +1429,45 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:693 +#: user-manual.txt:709 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." +"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:699 +#: user-manual.txt:715 #, no-wrap msgid "" "*Important*: GPS coordinates of a dive site are linked to the Location\n" -"name - so adding coordinates to dives that do not have a location description\n" -"will cause unexpected behaviour (Subsurface will think that all of these\n" +"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" "dives have the same location and try to keep their GPS coordinates the\n" "same).\n" msgstr "" #. type: Plain text -#: user-manual.txt:704 +#: user-manual.txt:725 +#, 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" +"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" +msgstr "" + +#. type: Plain text +#: user-manual.txt:730 msgid "" "Enter any other textual information about the dive site (Description and " "Notes), then select _Apply Changes_ to save the geolocation for this dive " @@ -1445,7 +1476,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:709 +#: user-manual.txt:735 #, no-wrap msgid "" "*Dive mode*: This is a dropdown box allowing one to choose the type of dive\n" @@ -1455,7 +1486,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:714 +#: user-manual.txt:740 #, no-wrap msgid "" "*Divemaster*: The name of the dive master or dive guide for this dive should be\n" @@ -1465,7 +1496,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:719 +#: user-manual.txt:745 #, no-wrap msgid "" "*Buddy*: In this field, one enters the name(s) of the buddy / buddies\n" @@ -1475,7 +1506,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:724 +#: user-manual.txt:750 #, no-wrap msgid "" "*Suit*: Here the type of dive suit used can be entered.\n" @@ -1485,7 +1516,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:727 +#: user-manual.txt:753 #, no-wrap msgid "" "*Rating*: One can provide a subjective overall rating of the dive on a\n" @@ -1493,7 +1524,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:731 +#: user-manual.txt:757 #, no-wrap msgid "" "*Visibility*: Similarly, one can provide a rating of visibility during the\n" @@ -1502,7 +1533,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:740 +#: user-manual.txt:766 #, no-wrap msgid "" "*Tags*: Tags that describe the type of dive performed can be entered\n" @@ -1516,13 +1547,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:742 +#: user-manual.txt:768 #, no-wrap msgid "*Notes*: Any additional information for the dive can be entered here.\n" msgstr "" #. type: Plain text -#: user-manual.txt:747 +#: user-manual.txt:773 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 " @@ -1532,13 +1563,13 @@ msgid "" msgstr "" #. type: Title ===== -#: user-manual.txt:748 +#: user-manual.txt:774 #, no-wrap msgid "Equipment" msgstr "" #. type: Plain text -#: user-manual.txt:753 +#: user-manual.txt:779 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 " @@ -1546,7 +1577,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:760 +#: user-manual.txt:786 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) " @@ -1554,7 +1585,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:764 +#: user-manual.txt:790 #, no-wrap msgid "" "*Cylinders*: The cylinder information is entered through a dialogue that looks\n" @@ -1562,13 +1593,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:765 +#: user-manual.txt:791 #, no-wrap msgid "images/DC_gas-dialogue1_f20.jpg" msgstr "images/DC_gas-dialogue1_f20.jpg" #. type: Plain text -#: user-manual.txt:774 +#: user-manual.txt:800 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 " @@ -1581,7 +1612,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:779 +#: user-manual.txt:805 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 " @@ -1590,13 +1621,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:780 +#: user-manual.txt:806 #, no-wrap msgid "images/DC_gas-dialogue2_f20.jpg" msgstr "images/DC_gas-dialogue2_f20.jpg" #. type: Plain text -#: user-manual.txt:787 +#: user-manual.txt:813 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 " @@ -1606,7 +1637,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:791 +#: user-manual.txt:817 msgid "" "Next, indicate the starting pressure and the ending pressure of the " "specified gas during the dive. The unit of pressure (metric/imperial) " @@ -1614,7 +1645,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:802 +#: user-manual.txt:828 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, " @@ -1628,13 +1659,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:803 +#: user-manual.txt:829 #, no-wrap msgid "images/CylinderDataEntry3_f20.jpg" msgstr "images/CylinderDataEntry3_f20.jpg" #. type: Plain text -#: user-manual.txt:810 +#: user-manual.txt:836 #, no-wrap msgid "" "*Weights*: Information about the weight system used can be entered\n" @@ -1645,26 +1676,26 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:811 +#: user-manual.txt:837 #, no-wrap msgid "images/WeightsDataEntry1_f20.jpg" msgstr "images/WeightsDataEntry1_f20.jpg" #. type: Plain text -#: user-manual.txt:815 +#: user-manual.txt:841 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:816 +#: user-manual.txt:842 #, no-wrap msgid "images/WeightsDataEntry2_f20.jpg" msgstr "images/WeightsDataEntry2_f20.jpg" #. type: Plain text -#: user-manual.txt:830 +#: user-manual.txt:856 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 " @@ -1679,19 +1710,19 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:831 +#: user-manual.txt:857 #, no-wrap msgid "images/WeightsDataEntry3_f20.jpg" msgstr "images/WeightsDataEntry3_f20.jpg" #. type: Title ==== -#: user-manual.txt:833 +#: user-manual.txt:859 #, no-wrap msgid "Editing several selected dives simultaneously" msgstr "" #. type: Plain text -#: user-manual.txt:848 +#: user-manual.txt:874 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 " @@ -1709,7 +1740,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:858 +#: user-manual.txt:884 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 " @@ -1724,7 +1755,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:867 +#: user-manual.txt:893 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 " @@ -1739,13 +1770,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:868 +#: user-manual.txt:894 #, no-wrap msgid "Adding Bookmarks to a dive" msgstr "" #. type: Plain text -#: user-manual.txt:873 +#: user-manual.txt:899 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\". " @@ -1753,7 +1784,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:877 +#: user-manual.txt:903 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 " @@ -1761,40 +1792,40 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:879 +#: user-manual.txt:905 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:882 +#: user-manual.txt:908 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:885 +#: user-manual.txt:911 msgid "" "If one hovers using the mouse over the red bookmark, the appropriate text is " "shown at the bottom of the information box (see *D* below)." msgstr "" #. type: Target for macro image -#: user-manual.txt:886 +#: user-manual.txt:912 #, no-wrap msgid "images/Bookmarks.jpg" msgstr "images/Bookmarks.jpg" #. type: Title ==== -#: user-manual.txt:889 +#: user-manual.txt:915 #, no-wrap msgid "Saving the updated dive information" msgstr "" #. type: Plain text -#: user-manual.txt:900 +#: user-manual.txt:926 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 " @@ -1807,13 +1838,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:901 +#: user-manual.txt:927 #, 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:927 +#: user-manual.txt:953 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 " @@ -1835,7 +1866,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:937 +#: user-manual.txt:963 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 -" @@ -1850,13 +1881,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:938 +#: user-manual.txt:964 #, no-wrap msgid "Using the universal import dialogue" msgstr "" #. type: Plain text -#: user-manual.txt:944 +#: 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 " @@ -1864,13 +1895,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:945 +#: user-manual.txt:971 #, no-wrap msgid "images/Import1_f20.jpg" msgstr "images/Import1_f20.jpg" #. type: Plain text -#: user-manual.txt:950 +#: 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 " @@ -1878,70 +1909,70 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:952 +#: 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:953 +#: user-manual.txt:979 msgid "Cochran dive logs" msgstr "" #. type: Plain text -#: user-manual.txt:954 +#: user-manual.txt:980 msgid "UDDF-formatted dive logs (e.g. Kenozoooid)" msgstr "" #. type: Plain text -#: user-manual.txt:955 +#: user-manual.txt:981 msgid "UDCF-formatted dive logs" msgstr "" #. type: Plain text -#: user-manual.txt:956 +#: user-manual.txt:982 msgid "Poseidon MkVI CCR logs" msgstr "" #. type: Plain text -#: user-manual.txt:957 +#: user-manual.txt:983 msgid "APD Inspiration/Evolution CCR logs" msgstr "" #. type: Plain text -#: user-manual.txt:958 +#: user-manual.txt:984 msgid "LiquiVision logs" msgstr "" #. type: Plain text -#: user-manual.txt:959 +#: user-manual.txt:985 msgid "divelog.de logs" msgstr "" #. type: Plain text -#: user-manual.txt:960 +#: user-manual.txt:986 msgid "OSTC Tools logs" msgstr "" #. type: Plain text -#: user-manual.txt:961 +#: user-manual.txt:987 msgid "JDiveLog" msgstr "" #. type: Plain text -#: user-manual.txt:962 +#: user-manual.txt:988 msgid "Suunto Dive Manager (DM3 and DM4)" msgstr "" #. type: Plain text -#: user-manual.txt:963 +#: user-manual.txt:989 msgid "" "CSV (text-based and spreadsheet-based) dive logs, including APD CCR logs" msgstr "" #. type: Plain text -#: user-manual.txt:968 +#: 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 " @@ -1951,13 +1982,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:969 +#: user-manual.txt:995 #, no-wrap msgid "Importing from OSTCTools" msgstr "" #. type: Plain text -#: user-manual.txt:978 +#: 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 " @@ -1970,7 +2001,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:982 +#: 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, " @@ -1978,7 +2009,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:987 +#: 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, " @@ -1988,13 +2019,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:989 +#: user-manual.txt:1015 #, no-wrap msgid "Importing from Mares Dive Organiser V2.1" msgstr "" #. type: Plain text -#: user-manual.txt:996 +#: user-manual.txt:1022 msgid "" "Since Mares utilise proprietary Windows software not compatible with multi-" "platform applications, these dive logs cannot be directly imported into " @@ -2004,7 +2035,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1001 +#: 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] " @@ -2012,7 +2043,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1007 +#: 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 " @@ -2022,20 +2053,20 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1009 +#: user-manual.txt:1035 msgid "" "Finally, import the dives from _divelogs.de_ to _Subsurface_, using the " "instructions below." msgstr "" #. type: Title ==== -#: user-manual.txt:1012 +#: user-manual.txt:1038 #, no-wrap msgid "Importing dives from *divelogs.de*" msgstr "" #. type: Plain text -#: user-manual.txt:1025 +#: user-manual.txt:1051 msgid "" "The import of dive information from _divelogs.de_ is simple, using a single " "dialogue box. The _Import -> Import from Divelogs.de_ option should be " @@ -2049,19 +2080,19 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1026 +#: user-manual.txt:1052 #, no-wrap msgid "images/Divelogs1.jpg" msgstr "images/Divelogs1.jpg" #. type: Title ==== -#: user-manual.txt:1029 +#: 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:1040 +#: 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 " @@ -2077,13 +2108,13 @@ msgid "" msgstr "" #. type: Title ===== -#: user-manual.txt:1042 +#: 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:1047 +#: 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 " @@ -2092,14 +2123,14 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1049 +#: 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:1055 +#: 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, " @@ -2110,7 +2141,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1064 +#: 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 " @@ -2124,14 +2155,14 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1067 +#: user-manual.txt:1093 msgid "" "Before being able to import the _CSV_ data to _Subsurface_ *one needs to " "know a few things about the data being imported*:" msgstr "" #. type: Plain text -#: user-manual.txt:1075 +#: 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 " @@ -2143,7 +2174,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1079 +#: 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 " @@ -2152,13 +2183,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1081 +#: user-manual.txt:1107 msgid "" -"Is the numeric information (e.g. dive depth) in metric or in imperial unis?" +"Is the numeric information (e.g. dive depth) in metric or in imperial units?" msgstr "" #. type: Plain text -#: user-manual.txt:1088 +#: user-manual.txt:1114 msgid "" "Armed with this information, importing the data into _Subsurface_ is " "straightforward. Select _Import -> Import Log Files_ from the main menu. In " @@ -2168,13 +2199,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1089 +#: user-manual.txt:1115 #, no-wrap msgid "images/csv_import1_f20.jpg" msgstr "images/csv_import1_f20.jpg" #. type: Plain text -#: user-manual.txt:1100 +#: user-manual.txt:1126 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 " @@ -2189,7 +2220,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1112 +#: 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 " @@ -2200,19 +2231,19 @@ msgid "" "\"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 labeled \"Dive # \" " +"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:1113 +#: user-manual.txt:1139 #, no-wrap msgid "images/csv_import2_f20.jpg" msgstr "images/csv_import2_f20.jpg" #. type: Plain text -#: user-manual.txt:1119 +#: 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. " @@ -2222,13 +2253,13 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:1123 +#: user-manual.txt:1149 #, no-wrap msgid "*A Diver's Introduction to _CSV_ Files*\n" msgstr "" #. type: delimited block * -#: user-manual.txt:1137 +#: 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 " @@ -2245,7 +2276,7 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:1146 +#: 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 " @@ -2261,7 +2292,7 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:1152 +#: user-manual.txt:1178 #, no-wrap msgid "" "\tDive site,Dive date,Time,Dive_duration, Dive_depth,Dive buddy\n" @@ -2272,14 +2303,14 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:1154 +#: 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:1160 +#: user-manual.txt:1186 #, no-wrap msgid "" "\tDive site\tDive date\tTime\tDive_duration\tDive_depth\tDive buddy\n" @@ -2290,7 +2321,7 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:1168 +#: 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 " @@ -2304,7 +2335,7 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:1179 +#: user-manual.txt:1205 #, no-wrap msgid "" "\tDive Time (s)\tDepth (m)\tpO₂ - Setpoint (Bar) \tpO₂ - C1 Cell 1 (Bar)\tAmbient temp. (Celsius)\n" @@ -2320,7 +2351,7 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:1185 +#: 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_ " @@ -2331,7 +2362,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1199 +#: 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 " @@ -2344,13 +2375,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:1202 +#: 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:1211 +#: user-manual.txt:1237 #, no-wrap msgid "" "Using the *Subsurface Companion App* on an _Android device_ or\n" @@ -2363,18 +2394,18 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1213 +#: user-manual.txt:1239 msgid "To do this:" msgstr "" #. type: Title ==== -#: user-manual.txt:1214 +#: user-manual.txt:1240 #, no-wrap msgid "Create a Companion App account" msgstr "" #. type: Plain text -#: user-manual.txt:1219 +#: user-manual.txt:1245 msgid "" "Register on the http://api.hohndel.org/login/[_Subsurface companion web " "page_]. A confirmation email with instructions and a personal *DIVERID* " @@ -2383,7 +2414,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1224 +#: user-manual.txt:1250 msgid "" "Download the app from https://play.google.com/store/apps/details?id=org." "subsurface[Google Play Store] or from http://f-droid.org/repository/browse/?" @@ -2391,18 +2422,18 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:1225 +#: user-manual.txt:1251 #, no-wrap msgid "Using the Subsurface companion app on an Android smartphone" msgstr "" #. type: Plain text -#: user-manual.txt:1228 +#: user-manual.txt:1254 msgid "On first use the app has three options:" msgstr "" #. type: Plain text -#: user-manual.txt:1234 +#: user-manual.txt:1260 msgid "" "_Create a new account._ Equivalent to registering in _Subsurface_ companion " "page using an Internet browser. One can request a *DIVERID* using this " @@ -2412,14 +2443,14 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1237 +#: user-manual.txt:1263 msgid "" "_Retrieve an account._ If users forgot their *DIVERID* they will receive an " "email to recover the number." msgstr "" #. type: Plain text -#: user-manual.txt:1241 +#: user-manual.txt:1267 msgid "" "_Use an existing account._ Users are prompted for their *DIVERID*. The app " "saves this *DIVERID* and does not ask for it again unless one uses the " @@ -2427,7 +2458,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1249 +#: user-manual.txt:1275 msgid "" "In the _Subsurface_ main program, the *DIVERID* should also be entered on " "the Default Preferences panel, obtained by selecting _File -> Preferences -> " @@ -2436,13 +2467,13 @@ msgid "" msgstr "" #. type: Title ===== -#: user-manual.txt:1250 +#: user-manual.txt:1276 #, no-wrap msgid "Creating new dive locations" msgstr "" #. type: Plain text -#: user-manual.txt:1255 +#: user-manual.txt:1281 msgid "" "Now one is ready to get a dive position and send it to the server. The " "Android display will look like the left hand image (*A*) below, but without " @@ -2450,21 +2481,21 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1258 +#: user-manual.txt:1284 msgid "" "Touch the \"+\" icon on the top right to add a new dive site, a menu will be " "showed with 3 options:" msgstr "" #. type: Plain text -#: user-manual.txt:1261 +#: user-manual.txt:1287 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:1270 +#: user-manual.txt:1296 msgid "" "Use Map: This option allows the user to fix a position by searching a world " "map. A world map is shown (see *B* below) on which one should indicate the " @@ -2477,13 +2508,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1271 +#: user-manual.txt:1297 #, no-wrap msgid "images/Companion_5.jpg" msgstr "images/Companion_5.jpg" #. type: Plain text -#: user-manual.txt:1279 +#: user-manual.txt:1305 msgid "" "Import local GPX file: The android device searches for .gpx files and " "located archives will be shown. The selected .gpx file is opened and the " @@ -2493,13 +2524,13 @@ msgid "" msgstr "" #. type: Title ===== -#: user-manual.txt:1280 +#: user-manual.txt:1306 #, no-wrap msgid "Dive lists of dive locations" msgstr "" #. type: Plain text -#: user-manual.txt:1288 +#: user-manual.txt:1314 msgid "" "The main screen shows a list of dive locations, each with a name, date and " "time (see *A* below). Some locations may have an arrow-up icon over the " @@ -2510,7 +2541,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1296 +#: user-manual.txt:1322 msgid "" "Dive locations in this list can be viewed in two ways: a list of locations " "or a map indicating the dive locations. The display mode (List or Map) is " @@ -2522,13 +2553,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1297 +#: user-manual.txt:1323 #, no-wrap msgid "images/Companion_4.jpg" msgstr "images/Companion_4.jpg" #. type: Plain text -#: user-manual.txt:1303 +#: user-manual.txt:1329 msgid "" "When one selects a dive (*not* selecting the check box), the name given to " "it, date/time and GPS coordinates will be shown, with two options at the top " @@ -2536,32 +2567,32 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1305 +#: user-manual.txt:1331 msgid "" "Edit (pencil): Change the text name or other characteristics of the dive " "location." msgstr "" #. type: Plain text -#: user-manual.txt:1307 +#: user-manual.txt:1333 msgid "Maps: Display a map showing the dive location." msgstr "" #. type: Plain text -#: user-manual.txt:1310 +#: user-manual.txt:1336 msgid "" "After editing and saving a dive location (see *C* above), one needs to " "upload it to the web service, as explained below." msgstr "" #. type: Title ===== -#: user-manual.txt:1311 +#: user-manual.txt:1337 #, no-wrap msgid "Uploading dive locations" msgstr "" #. type: Plain text -#: user-manual.txt:1317 +#: user-manual.txt:1343 msgid "" "There are several ways to send locations to the server. The easiest is by " "simply selecting the locations (See *A* below) and then touching the right " @@ -2569,51 +2600,51 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1322 +#: user-manual.txt:1348 msgid "" "Users must be careful, as the trash icon on the right means exactly what it " "should; it deletes the selected dive location(s)." msgstr "" #. type: Target for macro image -#: user-manual.txt:1323 +#: user-manual.txt:1349 #, no-wrap msgid "images/Companion_1.jpg" msgstr "images/Companion_1.jpg" #. type: Plain text -#: user-manual.txt:1328 +#: user-manual.txt:1354 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:1330 +#: user-manual.txt:1356 #, no-wrap msgid "Settings on the Companion App" msgstr "" #. type: Plain text -#: user-manual.txt:1333 +#: user-manual.txt:1359 msgid "" "Selecting the _Settings_ menu option results in the right hand image above " "(*B*)." msgstr "" #. type: Title ===== -#: user-manual.txt:1334 +#: user-manual.txt:1360 #, no-wrap msgid "Server and account" msgstr "" #. type: Plain text -#: user-manual.txt:1337 +#: user-manual.txt:1363 msgid "_Web-service URL._ This is predefined (http://api.hohndel.org/)" msgstr "" #. type: Plain text -#: user-manual.txt:1341 +#: user-manual.txt:1367 msgid "" "_User ID._ The DIVERID obtained by registering as described above. The " "easiest way to obtain it is simply to copy and paste from the confirmation " @@ -2621,33 +2652,33 @@ msgid "" msgstr "" #. type: Title ===== -#: user-manual.txt:1342 +#: user-manual.txt:1368 #, no-wrap msgid "Synchronisation" msgstr "" #. type: Plain text -#: user-manual.txt:1346 +#: user-manual.txt:1372 msgid "" "_Synchronize on startup_. If selected, dive locations in the Android device " "and those on the web service synchronise each time the app is started." msgstr "" #. type: Plain text -#: user-manual.txt:1349 +#: user-manual.txt:1375 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:1350 +#: user-manual.txt:1376 #, no-wrap msgid "Background service" msgstr "" #. type: Plain text -#: user-manual.txt:1353 +#: user-manual.txt:1379 msgid "" "Instead of entering a unique dive location, users can leave the service " "running in the background of their Android device, allowing the continuous " @@ -2655,40 +2686,40 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1356 +#: user-manual.txt:1382 msgid "The settings below define the behaviour of the service:" msgstr "" #. type: Plain text -#: user-manual.txt:1359 +#: user-manual.txt:1385 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:1361 +#: user-manual.txt:1387 msgid "_Min distance._ In meters. Minimum distance between two locations." msgstr "" #. type: Plain text -#: user-manual.txt:1363 +#: user-manual.txt:1389 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:1364 user-manual.txt:1461 user-manual.txt:1880 +#: user-manual.txt:1390 user-manual.txt:1487 user-manual.txt:1905 #, no-wrap msgid "images/icons/info.jpg" msgstr "images/icons/info.jpg" #. type: Plain text -#: user-manual.txt:1374 +#: user-manual.txt:1400 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 50m from previous location. If subsequent locations " +"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 " @@ -2696,59 +2727,59 @@ msgid "" msgstr "" #. type: Title ===== -#: user-manual.txt:1375 +#: user-manual.txt:1401 #, no-wrap msgid "Other" msgstr "" #. type: Plain text -#: user-manual.txt:1379 +#: user-manual.txt:1405 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:1381 +#: user-manual.txt:1407 msgid "_Subsurface website._ A link to the URL of Subsurface web" msgstr "" #. type: Plain text -#: user-manual.txt:1383 +#: user-manual.txt:1409 msgid "_Version._ Displays the current version of the Companion App." msgstr "" #. type: Title ===== -#: user-manual.txt:1384 +#: user-manual.txt:1410 #, no-wrap msgid "Search" msgstr "" #. type: Plain text -#: user-manual.txt:1387 +#: user-manual.txt:1413 msgid "Search the saved dive locations by name or by date and time." msgstr "" #. type: Title ===== -#: user-manual.txt:1388 +#: user-manual.txt:1414 #, no-wrap msgid "Start service" msgstr "" #. type: Plain text -#: user-manual.txt:1391 +#: user-manual.txt:1417 msgid "" "Initiates the _background service_ following the previously defined settings." msgstr "" #. type: Title ===== -#: user-manual.txt:1392 +#: user-manual.txt:1418 #, no-wrap msgid "Disconnect" msgstr "" #. type: Plain text -#: user-manual.txt:1400 +#: user-manual.txt:1426 msgid "" "This is a badly named option that disconnects the app from the server by " "resetting the user ID in the app, showing the first screen where an account " @@ -2758,25 +2789,25 @@ msgid "" msgstr "" #. type: Title ===== -#: user-manual.txt:1401 +#: user-manual.txt:1427 #, no-wrap msgid "Send all locations" msgstr "" #. type: Plain text -#: user-manual.txt:1404 +#: user-manual.txt:1430 msgid "" "This option sends all locations stored in the Android device to the server." msgstr "" #. type: Title ==== -#: user-manual.txt:1406 +#: user-manual.txt:1432 #, no-wrap msgid "Using the Subsurface companion app on an _iPhone_ to record dive locations" msgstr "" #. type: Plain text -#: user-manual.txt:1411 +#: user-manual.txt:1437 msgid "" "The iPhone interface is quite simple. One needs to type the user ID " "(obtained during registration) into the space reserved for it, then select " @@ -2785,13 +2816,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1412 +#: user-manual.txt:1438 #, no-wrap msgid "images/iphone.jpg" msgstr "images/iphone.jpg" #. type: Plain text -#: user-manual.txt:1419 +#: user-manual.txt:1445 msgid "" "Dives can be added automatically or manually. In manual mode, a dive " "location or waypoint is added to the GPS input stream. In automatic mode, a " @@ -2805,22 +2836,22 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1425 +#: user-manual.txt:1451 msgid "" "One can edit the site name afterwards by selecting the dive from the dive " "list and clicking on the site name. There are no other editable fields. The " -"dive list is automatically uploaded from the iphone to the webservice and " +"dive list is automatically uploaded from the iPhone to the webservice and " "there is not an option to trigger upload manually." msgstr "" #. type: Title ==== -#: user-manual.txt:1427 +#: user-manual.txt:1453 #, no-wrap msgid "Downloading dive locations to the _Subsurface_ divelog" msgstr "" #. type: Plain text -#: user-manual.txt:1436 +#: user-manual.txt:1462 msgid "" "Download dive(s) from a dive computer or enter them manually into " "_Subsurface_ before obtaining the GPS coordinates from the server. The " @@ -2832,13 +2863,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1437 +#: user-manual.txt:1463 #, no-wrap msgid "images/DownloadGPS.jpg" msgstr "images/DownloadGPS.jpg" #. type: Plain text -#: user-manual.txt:1445 +#: user-manual.txt:1471 msgid "" "Note that the _Apply_ button is now active. By clicking on it, users can " "update the locations of the newly entered or uploaded dives in _Subsurface_ " @@ -2849,7 +2880,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1452 +#: user-manual.txt:1478 msgid "" "Since _Subsurface_ matches GPS locations from the Android device and dive " "information from the dive computer based on date-time data, automatic " @@ -2861,7 +2892,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1460 +#: user-manual.txt:1486 msgid "" "Similar date-times may not always be possible and there may be many reasons " "for this (e.g. time zones), or _Subsurface_ may be unable to decide which is " @@ -2875,12 +2906,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1464 +#: user-manual.txt:1490 msgid "TIPS:" msgstr "" #. type: Plain text -#: user-manual.txt:1471 +#: user-manual.txt:1497 msgid "" "_Background service_, being a very powerful tool, may fill the location list " "with many unnecessary locations not corresponding to the exact dive point " @@ -2893,7 +2924,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1475 +#: user-manual.txt:1501 msgid "" "It may also make sense to give informative names to the locations sent to " "the web server, or at least to use an informative name in the _Name " @@ -2902,13 +2933,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:1477 +#: user-manual.txt:1503 #, no-wrap msgid "Adding photographs to dives" msgstr "" #. type: Plain text -#: user-manual.txt:1483 +#: user-manual.txt:1509 msgid "" "Many (if not most) divers take a camera with them and take photographs " "during a dive. One would like to associate each photograph with a specific " @@ -2917,39 +2948,39 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:1484 +#: user-manual.txt:1510 #, no-wrap msgid "Loading photos and getting synchronisation between dive computer and camera" msgstr "" #. type: Plain text -#: user-manual.txt:1488 +#: user-manual.txt:1514 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:1489 +#: user-manual.txt:1515 #, no-wrap msgid "images/LoadImage1_f20.jpg" msgstr "images/LoadImage1_f20.jpg" #. type: Plain text -#: user-manual.txt:1493 +#: user-manual.txt:1519 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:1494 +#: user-manual.txt:1520 #, no-wrap msgid "images/LoadImage2_f20.jpg" msgstr "images/LoadImage2_f20.jpg" #. type: Plain text -#: user-manual.txt:1503 +#: user-manual.txt:1529 msgid "" "This brings up the time synchronisation dialog, shown below. The critical " "problem is that the time synchronisation is not perfect between the dive " @@ -2960,12 +2991,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1505 +#: user-manual.txt:1531 msgid "_Subsurface_ achieves this synchronisation in three ways:" msgstr "" #. type: Plain text -#: user-manual.txt:1508 +#: user-manual.txt:1534 #, no-wrap msgid "" "*Pro-actively*: Before the dive, ensure synchronisation of the dive computer time settings with\n" @@ -2973,7 +3004,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1519 +#: user-manual.txt:1545 #, no-wrap msgid "" "*Manually*: If the user wrote down the exact camera time at the start of a dive, the\n" @@ -2990,13 +3021,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1520 +#: user-manual.txt:1546 #, no-wrap msgid "images/LoadImage3b_f20.jpg" msgstr "images/LoadImage3b_f20.jpg" #. type: Plain text -#: user-manual.txt:1538 +#: user-manual.txt:1564 #, no-wrap msgid "" "*By photograph*: There is a very slick way of achieving synchronisation. If one takes a\n" @@ -3004,7 +3035,7 @@ msgid "" "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" "the bottom part, the top part of the dialog is ignored. Click on\n" -"the horizontal bar entitled \"_Select image of divecomputer showing time_. This brings up\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" "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" @@ -3017,30 +3048,30 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1541 +#: user-manual.txt:1567 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:1542 +#: user-manual.txt:1568 #, no-wrap msgid "Viewing the photos" msgstr "" #. type: Plain text -#: user-manual.txt:1545 +#: user-manual.txt:1571 msgid "After the images have been loaded, they appear in two places:" msgstr "" #. type: Plain text -#: user-manual.txt:1547 +#: user-manual.txt:1573 msgid "the _Photos_ tab of the *Notes* panel." msgstr "" #. type: Plain text -#: user-manual.txt:1551 +#: user-manual.txt:1577 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 " @@ -3049,37 +3080,37 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1552 +#: user-manual.txt:1578 #, no-wrap msgid "images/icons/ShowPhotos_f20.png" msgstr "images/icons/ShowPhotos_f20.png" #. type: Plain text -#: user-manual.txt:1555 +#: user-manual.txt:1581 msgid "This results in a profile display as in the image below:" msgstr "" #. type: Target for macro image -#: user-manual.txt:1556 +#: user-manual.txt:1582 #, no-wrap msgid "images/LoadImage4_f20.jpg" msgstr "images/LoadImage4_f20.jpg" #. type: Plain text -#: user-manual.txt:1560 +#: user-manual.txt:1586 msgid "" "If one hovers with the mouse over any of the photo icons, then a thumbnail " "photo is shown of the appropriate photo. See the image below:" msgstr "" #. type: Target for macro image -#: user-manual.txt:1561 +#: user-manual.txt:1587 #, no-wrap msgid "images/LoadImage5_f20.jpg" msgstr "images/LoadImage5_f20.jpg" #. type: Plain text -#: user-manual.txt:1570 +#: user-manual.txt:1596 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 " @@ -3091,19 +3122,19 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1571 +#: user-manual.txt:1597 #, no-wrap msgid "images/LoadImage6_f20.jpg" msgstr "images/LoadImage6_f20.jpg" #. type: Title ==== -#: user-manual.txt:1573 +#: user-manual.txt:1599 #, no-wrap msgid "The _Photos_ tab" msgstr "" #. type: Plain text -#: user-manual.txt:1584 +#: user-manual.txt:1610 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 " @@ -3119,13 +3150,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:1585 +#: user-manual.txt:1611 #, no-wrap msgid "Photos on an external hard disk" msgstr "" #. type: Plain text -#: user-manual.txt:1596 +#: user-manual.txt:1622 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) " @@ -3143,13 +3174,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:1598 +#: user-manual.txt:1624 #, no-wrap msgid "Moving photographs among directories, hard disks or computers" msgstr "" #. type: Plain text -#: user-manual.txt:1608 +#: user-manual.txt:1634 #, no-wrap msgid "" "After a photograph has been loaded into _Subsurface_ and associated with a specific dive, the directory\n" @@ -3163,7 +3194,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1613 +#: user-manual.txt:1639 #, no-wrap msgid "" "When a photo is loaded into _Subsurface_, a fingerprint for the image is calculated and stored with the\n" @@ -3173,31 +3204,31 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1615 +#: user-manual.txt:1641 msgid "" "look through a particular directory (and all its subdirectories recursively) " "where photos have been moved" msgstr "" #. type: Plain text -#: user-manual.txt:1616 +#: user-manual.txt:1642 msgid "to," msgstr "" #. type: Plain text -#: user-manual.txt:1618 +#: user-manual.txt:1644 msgid "calculate fingerprints for all photos in this directory, and" msgstr "" #. type: Plain text -#: user-manual.txt:1620 +#: user-manual.txt:1646 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:1622 +#: user-manual.txt:1648 msgid "" "loaded into _Subsurface_ (even if the original file name has changed), to " "automatically update the directory information so that _Subsurface_ can find " @@ -3205,7 +3236,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1627 +#: user-manual.txt:1653 #, no-wrap msgid "" "This is achieved by selecting from the Main Menu: _File -> Find moved images_. This brings up a window within\n" @@ -3215,52 +3246,66 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:1632 +#: user-manual.txt:1658 #, no-wrap msgid "*Upgrading existing photo collections without fingerprints*\n" msgstr "" #. type: delimited block * -#: user-manual.txt:1642 +#: user-manual.txt:1663 +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_." +msgstr "" + +#. type: delimited block * +#: user-manual.txt:1665 +msgid "" +"_Subsurface_ automatically checks and, if necessary, updates the " +"fingerprints associated with a single dive if:" +msgstr "" + +#. type: delimited block * +#: user-manual.txt:1666 +msgid "" +"The images associated with that dive are visible as thumbnails on the *Dive " +"Profile*." +msgstr "" + +#. type: delimited block * +#: user-manual.txt:1667 msgid "" -"Software for the automated finger print calculation of existing photo " -"collections is under development. Currently single dives must be upgraded " -"one at a time. Select the toolbar button on the *Dive profile* panel that " -"enables the display of images. The thumbnails of images are shown on the " -"dive profile. Then open the dive and change anything in the *Notes* panel " -"that brings up the blue edit bar at the top of the notes panel to save the " -"edits. For instance, add a space character at the end of the _Notes_ text " -"box and immediately delete that space character. Select the option _Apply " -"changes_ in the blue edit bar to save the dive information. Fingerprints " -"are calculated while saving this specific dive." +"One edits anything in the *Notes tab* panel and save the edits by selecting " +"_Apply changes_." msgstr "" #. type: Title === -#: user-manual.txt:1646 +#: user-manual.txt:1671 #, no-wrap msgid "Logging special types of dives" msgstr "" #. type: Title ==== -#: user-manual.txt:1649 +#: user-manual.txt:1674 #, no-wrap msgid "Multicylinder dives" msgstr "" #. type: Plain text -#: user-manual.txt:1656 +#: user-manual.txt:1681 msgid "" -"_Subsurface_ easily handles dives involving more than one cylinder. " -"Multicylinder diving usually happens (a) if a diver does not have enough gas " -"for the complete dive in a single cylinder; (b) if the diver needs more than " -"one gas mixture because of the depth or the decompression needs of the dive. " -"For this reason multicylinder dives are often used by technical divers who " -"dive deep or long. As far as _Subsurface_ is concerned, there are only two " -"types of information that need to be provided:" +"_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:" msgstr "" #. type: Plain text -#: user-manual.txt:1660 +#: user-manual.txt:1685 #, no-wrap msgid "" "*Describe the cylinders used during the dive* This is performed in the *Equipment tab* of\n" @@ -3269,7 +3314,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1665 +#: user-manual.txt:1690 #, no-wrap msgid "" "*Record the times at which switches from one cylinder to another was done:* This is information\n" @@ -3279,7 +3324,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1673 +#: user-manual.txt:1698 #, no-wrap msgid "" "*Record the cylinder changes on the dive profile*: If the latter option\n" @@ -3292,7 +3337,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1677 +#: user-manual.txt:1702 msgid "" "Having performed these tasks, _Subsurface_ indicates the appropriate use of " "cylinders in the dive profile. Below is a multi-cylinder dive, starting off " @@ -3301,30 +3346,30 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1678 +#: user-manual.txt:1703 #, no-wrap msgid "images/multicylinder_dive.jpg" msgstr "images/multicylinder_dive.jpg" #. type: Title ==== -#: user-manual.txt:1680 +#: user-manual.txt:1705 #, no-wrap msgid "Sidemount dives" msgstr "" #. type: Plain text -#: user-manual.txt:1686 +#: user-manual.txt:1711 msgid "" -"Sidemount diving is just another form of multicylinder diving, often with " +"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 multicylinder dives, above, three " +"dive logging involves, exactly as with multi-cylinder dives, above, three " "steps:" msgstr "" #. type: Plain text -#: user-manual.txt:1695 +#: user-manual.txt:1720 #, no-wrap msgid "" "*During the dive, record cylinder switch events*. Since sidemount diving normally involves two\n" @@ -3338,7 +3383,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1698 +#: user-manual.txt:1723 #, no-wrap msgid "" "*Within _Subsurface_ describe the cylinders used during the dive*. The diver needs to provide the\n" @@ -3347,7 +3392,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1708 +#: user-manual.txt:1733 #, no-wrap msgid "" "*Indicate cylinder change events on the _Subsurface_ dive profile*. Once the dive log has been imported\n" @@ -3363,32 +3408,32 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1709 +#: user-manual.txt:1734 #, no-wrap msgid "images/sidemount1.jpg" msgstr "images/sidemount1.jpg" #. type: Plain text -#: user-manual.txt:1712 +#: user-manual.txt:1737 msgid "" "This section gives an example of the versatility of _Subsurface_ as a dive " "logging tool." msgstr "" #. type: Title ==== -#: user-manual.txt:1715 +#: user-manual.txt:1740 #, no-wrap msgid "Semi-closed circuit rebreather (SCR) dives" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:1717 +#: user-manual.txt:1742 #, no-wrap msgid "images/halcyon_RB80.jpg" msgstr "images/halcyon_RB80.jpg" #. type: Plain text -#: user-manual.txt:1727 +#: user-manual.txt:1752 msgid "" "Passive semi-closed rebreathers (pSCR) comprise a technical advance in " "diving equipment that recirculates the breathing gas that a diver breathes, " @@ -3404,19 +3449,19 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1729 +#: user-manual.txt:1754 msgid "" "To log pSCR dives, no special procedures are required, just the normal steps " "outlined above:" msgstr "" #. type: Plain text -#: user-manual.txt:1731 +#: user-manual.txt:1756 msgid "Select pSCR in the _Dive Mode_ dropdown list on the *Info* panel." msgstr "" #. type: Plain text -#: user-manual.txt:1735 +#: user-manual.txt:1760 msgid "" "pSCR diving often involves gas changes, requiring an additional cylinder. " "Define all the appropriate cylinders as described above and indicate the " @@ -3425,7 +3470,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1740 +#: user-manual.txt:1765 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 " @@ -3435,25 +3480,25 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1741 +#: user-manual.txt:1766 #, no-wrap msgid "images/pSCR_profile.jpg" msgstr "images/pSCR_profile.jpg" #. type: Title ==== -#: user-manual.txt:1746 +#: user-manual.txt:1771 #, no-wrap msgid "Closed circuit rebreather (CCR) dives" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:1748 +#: user-manual.txt:1773 #, no-wrap msgid "images/APD.jpg" msgstr "images/APD.jpg" #. type: Plain text -#: user-manual.txt:1753 +#: user-manual.txt:1778 msgid "" "Closed system rebreathers use advanced technology to recirculate gas that " "has been breathed while doing two things to maintain a breathable oxygen " @@ -3461,12 +3506,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1754 +#: user-manual.txt:1779 msgid "remove carbon dioxide from the gas that has been exhaled" msgstr "" #. type: Plain text -#: user-manual.txt:1763 +#: user-manual.txt:1788 msgid "" "regulate the oxygen concentration to remain within safe diving limits. The " "CCR interface of _Subsurface_ is currently experimental and under active " @@ -3480,13 +3525,13 @@ msgid "" msgstr "" #. type: Title ===== -#: user-manual.txt:1764 +#: user-manual.txt:1789 #, no-wrap msgid "Import a CCR dive" msgstr "" #. type: Plain text -#: user-manual.txt:1778 +#: user-manual.txt:1803 msgid "" "See the section dealing with xref:S_ImportingAlienDiveLogs[Importing dive " "information from other digital sources]. From the main menu of _Subsurface_, " @@ -3504,13 +3549,13 @@ msgid "" msgstr "" #. type: Title ===== -#: user-manual.txt:1779 +#: user-manual.txt:1804 #, no-wrap msgid "Displayed information for a CCR dive" msgstr "" #. type: Plain text -#: user-manual.txt:1789 +#: user-manual.txt:1814 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 " @@ -3524,12 +3569,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1791 +#: user-manual.txt:1816 msgid "For TWO O~2~ sensors the mean value of the two sensors are given." msgstr "" #. type: Plain text -#: user-manual.txt:1795 +#: user-manual.txt:1820 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 " @@ -3538,19 +3583,19 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1797 +#: user-manual.txt:1822 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:1799 +#: user-manual.txt:1824 msgid "The mean pO~2~ of the sensors is indicated with a green line," msgstr "" #. type: Plain text -#: user-manual.txt:1807 +#: user-manual.txt:1832 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 " @@ -3562,13 +3607,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1808 +#: user-manual.txt:1833 #, no-wrap msgid "images/CCR_preferences_f20.jpg" msgstr "images/CCR_preferences_f20.jpg" #. type: Plain text -#: user-manual.txt:1815 +#: user-manual.txt:1840 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 " @@ -3579,13 +3624,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1816 +#: user-manual.txt:1841 #, no-wrap msgid "images/CCR_setpoint_f20.jpg" msgstr "images/CCR_setpoint_f20.jpg" #. type: Plain text -#: user-manual.txt:1820 +#: user-manual.txt:1845 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 " @@ -3593,22 +3638,22 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1822 +#: user-manual.txt:1847 msgid "Sensor 1: grey" msgstr "" #. type: Plain text -#: user-manual.txt:1823 +#: user-manual.txt:1848 msgid "Sensor 2: blue" msgstr "" #. type: Plain text -#: user-manual.txt:1824 +#: user-manual.txt:1849 msgid "Sensor 3: brown" msgstr "" #. type: Plain text -#: user-manual.txt:1828 +#: user-manual.txt:1853 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 " @@ -3616,13 +3661,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1829 +#: user-manual.txt:1854 #, no-wrap msgid "images/CCR_sensor_data_f20.jpg" msgstr "images/CCR_sensor_data_f20.jpg" #. type: Plain text -#: user-manual.txt:1834 +#: user-manual.txt:1859 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, " @@ -3630,7 +3675,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1838 +#: user-manual.txt:1863 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 " @@ -3639,7 +3684,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1846 +#: user-manual.txt:1871 msgid "" "_Cylinder pressures_: Some CCR dive computers like the Poseidon MkVI record " "the pressures of the oxygen and diluent cylinders. The pressures of these " @@ -3652,13 +3697,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1847 +#: user-manual.txt:1872 #, no-wrap msgid "images/CCR_dive_profile_f22.jpg" msgstr "images/CCR_dive_profile_f22.jpg" #. type: Plain text -#: user-manual.txt:1852 +#: user-manual.txt:1877 msgid "" "_Equipment-specific information_: Equipment-specific information gathered by " "_Subsurface_ is shown in the xref:S_ExtraDataTab[Extra data tab]. This may " @@ -3666,7 +3711,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1858 +#: user-manual.txt:1883 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 " @@ -3678,13 +3723,13 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:1859 user-manual.txt:2042 +#: user-manual.txt:1884 user-manual.txt:2067 #, no-wrap msgid "images/icons/cceiling.jpg" msgstr "images/icons/cceiling.jpg" #. type: Plain text -#: user-manual.txt:1864 +#: user-manual.txt:1889 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 " @@ -3693,13 +3738,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1865 +#: user-manual.txt:1890 #, no-wrap msgid "images/CCR_dive_ceilingF22.jpg" msgstr "images/CCR_dive_ceilingF22.jpg" #. type: Plain text -#: user-manual.txt:1869 +#: user-manual.txt:1894 msgid "" "More equipment-specific information for downloading CCR dive logs for " "Poseidon MkVI and APD equipment can be found in xref:" @@ -3708,19 +3753,19 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:1870 +#: user-manual.txt:1895 #, no-wrap msgid "Obtaining more information about dives entered into the logbook" msgstr "" #. type: Title === -#: user-manual.txt:1872 +#: user-manual.txt:1897 #, no-wrap msgid "The *Info* tab (for individual dives)" msgstr "" #. type: Plain text -#: user-manual.txt:1879 +#: user-manual.txt:1904 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 " @@ -3730,7 +3775,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1886 +#: user-manual.txt:1911 msgid "" "Gas consumption and SAC calculations: _Subsurface_ calculates SAC and Gas " "consumption taking in account gas incompressibility, particularly at tank " @@ -3739,13 +3784,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:1888 +#: user-manual.txt:1913 #, no-wrap msgid "The *Extra Data* tab (usually for individual dives)" msgstr "" #. type: Plain text -#: user-manual.txt:1896 +#: user-manual.txt:1921 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 " @@ -3757,19 +3802,19 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1897 +#: user-manual.txt:1922 #, no-wrap msgid "images/ExtraDataTab_f20.jpg" msgstr "images/ExtraDataTab_f20.jpg" #. type: Title === -#: user-manual.txt:1899 +#: user-manual.txt:1924 #, no-wrap msgid "The *Stats* tab (for groups of dives)" msgstr "" #. type: Plain text -#: user-manual.txt:1910 +#: user-manual.txt:1935 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 " @@ -3782,19 +3827,19 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:1912 +#: user-manual.txt:1937 #, no-wrap msgid "The *Dive Profile*" msgstr "" #. type: Target for macro image -#: user-manual.txt:1914 +#: user-manual.txt:1939 #, no-wrap msgid "images/Profile2.jpg" msgstr "images/Profile2.jpg" #. type: Plain text -#: user-manual.txt:1925 +#: user-manual.txt:1950 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 " @@ -3807,7 +3852,7 @@ msgid "" msgstr "" #. type: delimited block | -#: user-manual.txt:1932 +#: user-manual.txt:1957 #, no-wrap msgid "" "|*Colour*|*Descent speed (m/min)*|*Ascent speed (m/min)*\n" @@ -3825,7 +3870,7 @@ msgstr "" "|Vert foncé|< 1.5|< 1.5\n" #. type: Plain text -#: user-manual.txt:1937 +#: user-manual.txt:1962 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 " @@ -3834,13 +3879,13 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:1938 +#: user-manual.txt:1963 #, no-wrap msgid "images/icons/scale.jpg" msgstr "images/icons/scale.jpg" #. type: Plain text -#: user-manual.txt:1943 +#: user-manual.txt:1968 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 " @@ -3849,7 +3894,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1946 +#: user-manual.txt:1971 #, no-wrap msgid "" "*Water temperature* is displayed with its own blue line with temperature values\n" @@ -3857,7 +3902,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1953 +#: user-manual.txt:1978 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 " @@ -3868,13 +3913,13 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:1954 +#: user-manual.txt:1979 #, no-wrap msgid "images/icons/O2.jpg" msgstr "images/icons/O2.jpg" #. type: Plain text -#: user-manual.txt:1958 +#: user-manual.txt:1983 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 " @@ -3882,26 +3927,26 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:1959 +#: user-manual.txt:1984 #, no-wrap msgid "images/icons/N2.jpg" msgstr "images/icons/N2.jpg" #. type: Plain text -#: user-manual.txt:1962 +#: user-manual.txt:1987 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:1963 +#: user-manual.txt:1988 #, no-wrap msgid "images/icons/He.jpg" msgstr "images/icons/He.jpg" #. type: Plain text -#: user-manual.txt:1967 +#: user-manual.txt:1992 msgid "" "Clicking this button allows display of the partial pressure of *helium* " "during the dive. This is only of importance to divers using Trimix, " @@ -3909,7 +3954,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1980 +#: user-manual.txt:2005 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 " @@ -3924,13 +3969,13 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:1981 +#: user-manual.txt:2006 #, no-wrap msgid "images/icons/Heartbutton.png" msgstr "images/icons/Heartbutton.png" #. type: Plain text -#: user-manual.txt:1985 +#: user-manual.txt:2010 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 " @@ -3938,7 +3983,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1993 +#: user-manual.txt:2018 #, no-wrap msgid "" "It is possible to *zoom* into the profile graph. This is done either by using\n" @@ -3951,19 +3996,19 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1994 +#: user-manual.txt:2019 #, no-wrap msgid "images/MeasuringBar.png" msgstr "images/MeasuringBar.png" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:1996 +#: user-manual.txt:2021 #, no-wrap msgid "images/icons/ruler.jpg" msgstr "images/icons/ruler.jpg" #. type: Plain text -#: user-manual.txt:2004 +#: user-manual.txt:2029 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 " @@ -3973,13 +4018,13 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2005 +#: user-manual.txt:2030 #, no-wrap msgid "images/icons/ShowPhotos.png" msgstr "images/icons/ShowPhotos.png" #. type: Plain text -#: user-manual.txt:2012 +#: user-manual.txt:2037 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 " @@ -3988,7 +4033,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2041 +#: user-manual.txt:2066 msgid "" "The profile can also include the dive computer reported *ceiling* (more " "precisely, the deepest deco stop that the dive computer calculated for each " @@ -4018,7 +4063,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2047 +#: user-manual.txt:2072 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 " @@ -4026,13 +4071,13 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2048 +#: user-manual.txt:2073 #, no-wrap msgid "images/icons/ceiling1.jpg" msgstr "images/icons/ceiling1.jpg" #. type: Plain text -#: user-manual.txt:2053 +#: user-manual.txt:2078 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 " @@ -4041,13 +4086,13 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2054 +#: user-manual.txt:2079 #, no-wrap msgid "images/icons/ceiling2.jpg" msgstr "images/icons/ceiling2.jpg" #. type: Plain text -#: user-manual.txt:2058 +#: user-manual.txt:2083 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 " @@ -4055,32 +4100,32 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2059 +#: user-manual.txt:2084 #, no-wrap msgid "images/icons/ceiling3.jpg" msgstr "images/icons/ceiling3.jpg" #. type: Plain text -#: user-manual.txt:2063 +#: user-manual.txt:2088 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:2064 +#: user-manual.txt:2089 #, no-wrap msgid "images/Ceilings2.jpg" msgstr "images/Ceilings2.jpg" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2066 +#: user-manual.txt:2091 #, no-wrap msgid "images/icons/ShowCylindersButton.jpg" msgstr "images/icons/ShowCylindersButton.jpg" #. type: Plain text -#: user-manual.txt:2072 +#: user-manual.txt:2097 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 " @@ -4092,19 +4137,19 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2073 +#: user-manual.txt:2098 #, no-wrap msgid "images/ShowCylinders_f20.jpg" msgstr "images/ShowCylinders_f20.jpg" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2076 +#: user-manual.txt:2101 #, no-wrap msgid "images/tissues.jpg" msgstr "images/tissues.jpg" #. type: Plain text -#: user-manual.txt:2088 +#: user-manual.txt:2113 msgid "" "Display inert gas tissue pressures relative to ambient inert gas pressure " "(horizontal grey line). Tissue pressures are calculated using the Bühlmann " @@ -4123,13 +4168,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2089 +#: user-manual.txt:2114 #, no-wrap msgid "images/tissuesGraph.jpg" msgstr "images/tissuesGraph.jpg" #. type: Plain text -#: user-manual.txt:2097 +#: user-manual.txt:2122 msgid "" "Gradient Factor settings strongly affect the calculated ceilings and their " "depths. For more information about Gradient factors, see the section on " @@ -4142,25 +4187,25 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2099 +#: user-manual.txt:2124 #, 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:2101 +#: user-manual.txt:2126 #, 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:2103 +#: user-manual.txt:2128 #, no-wrap msgid "The Dive Profile context menu" msgstr "" #. type: Plain text -#: user-manual.txt:2121 +#: user-manual.txt:2146 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 " @@ -4181,13 +4226,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:2123 +#: user-manual.txt:2148 #, no-wrap msgid "The *Information Box*" msgstr "" #. type: Plain text -#: user-manual.txt:2133 +#: user-manual.txt:2158 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 " @@ -4200,13 +4245,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2134 +#: user-manual.txt:2159 #, no-wrap msgid "images/InfoBox2.jpg" msgstr "images/InfoBox2.jpg" #. type: Plain text -#: user-manual.txt:2151 +#: user-manual.txt:2176 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 " @@ -4227,20 +4272,20 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2154 +#: user-manual.txt:2179 msgid "" "The user has control over the display of several statistics, represented as " "four buttons on the left of the profile panel. These are:" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2155 +#: user-manual.txt:2180 #, no-wrap msgid "images/icons/MOD.jpg" msgstr "images/icons/MOD.jpg" #. type: Plain text -#: user-manual.txt:2164 +#: user-manual.txt:2189 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 " @@ -4252,13 +4297,13 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2165 +#: user-manual.txt:2190 #, no-wrap msgid "images/icons/NDL.jpg" msgstr "images/icons/NDL.jpg" #. type: Plain text -#: user-manual.txt:2174 +#: user-manual.txt:2199 msgid "" "Clicking this button causes the Information Box to display the *No-deco " "Limit (NDL)* or the *Total Time to Surface (TTS)*. NDL is the time duration " @@ -4271,13 +4316,13 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2175 +#: user-manual.txt:2200 #, no-wrap msgid "images/icons/SAC.jpg" msgstr "images/icons/SAC.jpg" #. type: Plain text -#: user-manual.txt:2184 +#: user-manual.txt:2209 msgid "" "Clicking this button causes the Information Box to display the *Surface Air " "Consumption (SAC)*. SAC is an indication of the surface-normalised " @@ -4290,13 +4335,13 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2185 +#: user-manual.txt:2210 #, no-wrap msgid "images/icons/EAD.jpg" msgstr "images/icons/EAD.jpg" #. type: Plain text -#: user-manual.txt:2200 +#: user-manual.txt:2225 msgid "" "Clicking this button displays the *Equivalent Air Depth (EAD)* for nitrox " "dives as well as the *Equivalent Narcotic Depth (END)* for trimix dives. " @@ -4312,20 +4357,20 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2202 +#: user-manual.txt:2227 msgid "" "Figure (*B*) above shows an information box with a nearly complete set of " "data." msgstr "" #. type: Title ==== -#: user-manual.txt:2204 +#: user-manual.txt:2229 #, no-wrap msgid "The Gas Pressure Bar Graph" msgstr "" #. type: Plain text -#: user-manual.txt:2211 +#: user-manual.txt:2236 msgid "" "On the left of the *Information Box* is a vertical bar graph indicating the " "pressures of the nitrogen (and other inert gases, e.g. helium, if " @@ -4336,13 +4381,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2212 +#: user-manual.txt:2237 #, no-wrap msgid "images/GasPressureBarGraph.jpg" msgstr "images/GasPressureBarGraph.jpg" #. type: Plain text -#: user-manual.txt:2218 +#: user-manual.txt:2243 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 " @@ -4352,7 +4397,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2224 +#: user-manual.txt:2249 msgid "" "The horizontal black line underneath the light green margin indicates the " "equilibrium pressure of the inert gases inhaled by the diver, usually " @@ -4363,7 +4408,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2228 +#: user-manual.txt:2253 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 " @@ -4371,7 +4416,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2233 +#: user-manual.txt:2258 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 " @@ -4380,7 +4425,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2237 +#: user-manual.txt:2262 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 " @@ -4388,7 +4433,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2240 +#: user-manual.txt:2265 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 " @@ -4396,7 +4441,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2243 +#: user-manual.txt:2268 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 " @@ -4404,7 +4449,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2246 +#: user-manual.txt:2271 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 " @@ -4412,7 +4457,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2251 +#: user-manual.txt:2276 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 " @@ -4422,7 +4467,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2257 +#: user-manual.txt:2282 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 " @@ -4433,7 +4478,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2262 +#: user-manual.txt:2287 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 " @@ -4443,19 +4488,19 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:2265 +#: user-manual.txt:2290 #, no-wrap msgid "Organising the logbook (Manipulating groups of dives)" msgstr "" #. type: Title === -#: user-manual.txt:2267 +#: user-manual.txt:2292 #, no-wrap msgid "The Dive List context menu" msgstr "" #. type: Plain text -#: user-manual.txt:2271 +#: user-manual.txt:2296 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 " @@ -4464,30 +4509,30 @@ msgstr "" #. TODO: NEEDS REPLACEMENT #. type: Target for macro image -#: user-manual.txt:2273 +#: user-manual.txt:2298 #, no-wrap msgid "images/ContextMenu.jpg" msgstr "images/ContextMenu.jpg" #. type: Plain text -#: user-manual.txt:2276 +#: user-manual.txt:2301 msgid "The context menu is used in many manipulations described below." msgstr "" #. type: Title ==== -#: user-manual.txt:2277 +#: user-manual.txt:2302 #, no-wrap msgid "Customising the columns showed in the *Dive List* panel" msgstr "" #. type: Target for macro image -#: user-manual.txt:2279 +#: user-manual.txt:2304 #, no-wrap msgid "images/DiveListOptions.jpg" msgstr "images/DiveListOptions.jpg" #. type: Plain text -#: user-manual.txt:2287 +#: user-manual.txt:2312 msgid "" "The default information in the *Dive List* includes, for each dive, " "Dive_number, Date, Rating, Dive_depth, Dive_duration and Dive_location. This " @@ -4501,13 +4546,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:2289 +#: user-manual.txt:2314 #, no-wrap msgid "Renumbering the dives" msgstr "" #. type: Plain text -#: user-manual.txt:2301 +#: user-manual.txt:2326 msgid "" "Dives are normally numbered incrementally from non-recent dives (low " "sequence numbers) to recent dives (having the highest sequence numbers). The " @@ -4523,7 +4568,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2306 +#: user-manual.txt:2331 msgid "" "One can also renumber a few selected dives in the dive list. Select the " "dives that need renumbering. Right-click on the selected list and use the " @@ -4533,13 +4578,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:2308 +#: user-manual.txt:2333 #, no-wrap msgid "Grouping dives into trips and manipulating trips" msgstr "" #. type: Plain text -#: user-manual.txt:2316 +#: user-manual.txt:2341 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 " @@ -4550,13 +4595,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2317 +#: user-manual.txt:2342 #, no-wrap msgid "images/Group2.jpg" msgstr "images/Group2.jpg" #. type: Plain text -#: user-manual.txt:2323 +#: user-manual.txt:2348 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 " @@ -4565,13 +4610,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2324 +#: user-manual.txt:2349 #, no-wrap msgid "Editing the title and associated information for a particular trip" msgstr "" #. type: Plain text -#: user-manual.txt:2337 +#: user-manual.txt:2362 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 " @@ -4585,13 +4630,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2338 +#: user-manual.txt:2363 #, no-wrap msgid "Viewing the dives during a particular trip" msgstr "" #. type: Plain text -#: user-manual.txt:2343 +#: user-manual.txt:2368 msgid "" "Once the dives have been grouped into trips, users can expand one or more " "trips by clicking the arrow-head on the left of each trip title. This " @@ -4600,13 +4645,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2344 +#: user-manual.txt:2369 #, no-wrap msgid "Collapsing or expanding dive information for different trips" msgstr "" #. type: Plain text -#: user-manual.txt:2349 +#: user-manual.txt:2374 msgid "" "After selecting a particular trip in the dive list, the context menu allows " "several possibilities to expand or collapse dives within trips. This " @@ -4614,13 +4659,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2350 +#: user-manual.txt:2375 #, no-wrap msgid "Merging dives from more than one trip into a single trip" msgstr "" #. type: Plain text -#: user-manual.txt:2355 +#: user-manual.txt:2380 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 " @@ -4628,13 +4673,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2356 +#: user-manual.txt:2381 #, no-wrap msgid "Splitting a single trip into more than one trip" msgstr "" #. type: Plain text -#: user-manual.txt:2366 +#: user-manual.txt:2391 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-" @@ -4646,25 +4691,25 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2367 +#: user-manual.txt:2392 #, no-wrap msgid "images/SplitDive3a.jpg" msgstr "images/SplitDive3a.jpg" #. type: Title === -#: user-manual.txt:2369 +#: user-manual.txt:2394 #, no-wrap msgid "Manipulating single dives" msgstr "" #. type: Title ==== -#: user-manual.txt:2371 +#: user-manual.txt:2396 #, no-wrap msgid "Delete a dive from the dive log" msgstr "" #. type: Plain text -#: user-manual.txt:2378 +#: user-manual.txt:2403 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 " @@ -4674,29 +4719,29 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2379 +#: user-manual.txt:2404 #, no-wrap msgid "Unlink a dive from a trip" msgstr "" #. type: Plain text -#: user-manual.txt:2386 +#: user-manual.txt:2411 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 unliked dive." +"on the date and time of the unlinked dive." msgstr "" #. type: Title ==== -#: user-manual.txt:2387 +#: user-manual.txt:2412 #, no-wrap msgid "Add a dive to the trip immediately above" msgstr "" #. type: Plain text -#: user-manual.txt:2392 +#: user-manual.txt:2417 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 " @@ -4704,13 +4749,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2393 +#: user-manual.txt:2418 #, no-wrap msgid "Shift the start time of dive(s)" msgstr "" #. type: Plain text -#: user-manual.txt:2404 +#: user-manual.txt:2429 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 " @@ -4723,13 +4768,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2405 +#: user-manual.txt:2430 #, no-wrap msgid "Merge dives into a single dive" msgstr "" #. type: Plain text -#: user-manual.txt:2415 +#: user-manual.txt:2440 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 " @@ -4742,19 +4787,19 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2416 +#: user-manual.txt:2441 #, no-wrap msgid "images/MergedDive.png" msgstr "images/MergedDive.png" #. type: Title ==== -#: user-manual.txt:2418 +#: user-manual.txt:2443 #, no-wrap msgid "Undo dive manipulations" msgstr "" #. type: Plain text -#: user-manual.txt:2424 +#: user-manual.txt:2449 msgid "" "Important actions on dives or trips, described above, can be undone or " "redone. This includes: _delete dives_, _merge dives_, _renumber dives_ and " @@ -4764,13 +4809,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:2427 +#: user-manual.txt:2452 #, no-wrap msgid "Filtering the dive list" msgstr "" #. type: Plain text -#: user-manual.txt:2433 +#: user-manual.txt:2458 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, " @@ -4780,7 +4825,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2441 +#: user-manual.txt:2466 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 " @@ -4794,13 +4839,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2442 +#: user-manual.txt:2467 #, no-wrap msgid "images/Filterpanel.jpg" msgstr "images/Filterpanel.jpg" #. type: Plain text -#: user-manual.txt:2451 +#: user-manual.txt:2476 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 " @@ -4813,7 +4858,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2459 +#: user-manual.txt:2484 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 " @@ -4825,24 +4870,24 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:2461 +#: user-manual.txt:2486 #, no-wrap msgid "Exporting the dive log or parts of the dive log" msgstr "" #. type: Plain text -#: user-manual.txt:2464 +#: user-manual.txt:2489 msgid "" "There are two routes for the export of dive information from Subsurface:" msgstr "" #. type: Plain text -#: user-manual.txt:2466 +#: user-manual.txt:2491 msgid "Export dive information to _Facebook_" msgstr "Exporter les informations de plongée vers _Facebook_" #. type: Plain text -#: user-manual.txt:2468 +#: user-manual.txt:2493 msgid "" "xref:S_Export_other[Export dive information to other destinations or formats]" msgstr "" @@ -4850,75 +4895,85 @@ msgstr "" "destinations ou formats]" #. type: Title === -#: user-manual.txt:2470 +#: user-manual.txt:2495 #, no-wrap msgid "Exporting dive information to _Facebook_" msgstr "Export des informations de plongée vers _Facebook_" #. type: Plain text -#: user-manual.txt:2479 +#: user-manual.txt:2504 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 (see image *A* to the " -"left, below). Provide your _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*, 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." msgstr "" "L'export des plongées vers _Facebook_ est géré différemment des autres types " "d'export car une connexion vers _Facebook_ est nécessaire, nécessitant un " "identifiant et un mot de passe. À partir du menu principal, si vous " "sélectionnez _Fichier -> Préférences -> Facebook_, un écran de connexion est " -"présenté (voir l'image *A* sur la gauche, ci dessous). Entrez vos " -"identifiant et mot de passe _Facebook_. Une fois connecté à _Facebook_, le " -"panneau de l'image *B* ci dessous est présenté, avec un bouton _Déconnecter " -"de Facebook_ pour fermer la connexion _Facebook_." +"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_." #. type: Target for macro image -#: user-manual.txt:2480 +#: user-manual.txt:2505 #, no-wrap msgid "images/facebook1_f20.jpg" msgstr "images/facebook1_f20.jpg" #. type: Plain text -#: user-manual.txt:2492 +#: user-manual.txt:2510 +msgid "" +"From the _Subsurface_ window it is easy to determe 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)." +msgstr "" + +#. type: Plain text +#: user-manual.txt:2520 msgid "" "Having established a login to _Facebook_, transfer of a dive profile to " -"one's _Facebook_ timeline is easy. Ensure that the dive to transfer to the " -"timeline is depicted in the _Subsurface_ *Dive Profile* panel. If one " -"selects _Share on -> Facebook_ from the *Main Menu* a dialogue is shown, " -"determining the amount of additional information transferred with the dive " -"profile (see image *B*, below). In order to transfer a dive profile to " -"_Facebook_, the name of a _Facebook_ album needs to be provided. The " -"checkboxes on the lefthand side allow one to determine how much additional " -"information should be transferred with the dive profile. This information is " -"shown in the text box on the right hand side of the panel (see image *B*, " -"below). 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_." +"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_." 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 " -"est affichée dans le panneau *Profil de plongée* de _Subsurface_. Si vous " -"sélectionnez _Partager sur -> Facebook_ à partir du *menu principal*, 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. (voir l'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." - -#. type: Plain text -#: user-manual.txt:2499 +"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." + +#. type: Plain text +#: user-manual.txt:2527 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 " @@ -4934,13 +4989,13 @@ msgstr "" "publications non désirées sur votre ligne temporelle publique." #. type: Target for macro image -#: user-manual.txt:2500 +#: user-manual.txt:2528 #, no-wrap msgid "images/facebook2_f20.jpg" msgstr "images/facebook2_f20.jpg" #. type: Plain text -#: user-manual.txt:2503 +#: user-manual.txt:2532 msgid "" "If required, then close the _Facebook_ connection by either closing " "_Subsurface_ or by selecting _File -> Preferences -> Facebook_ from the Main " @@ -4952,13 +5007,13 @@ msgstr "" "préférences Facebook." #. type: Title === -#: user-manual.txt:2505 +#: user-manual.txt:2534 #, no-wrap msgid "Export dive information to other destinations or formats" msgstr "" #. type: Plain text -#: user-manual.txt:2510 +#: user-manual.txt:2539 msgid "" "For non-_Facebook exports_, the export function can be reached by selecting " "_File -> Export_, which brings up the Export dialog. This dialog always " @@ -4968,24 +5023,24 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2511 +#: user-manual.txt:2540 #, no-wrap msgid "images/Export_f20.jpg" msgstr "images/Export_f20.jpg" #. type: Plain text -#: user-manual.txt:2514 +#: user-manual.txt:2543 msgid "A dive log or part of it can be saved in three formats:" msgstr "" #. type: Plain text -#: user-manual.txt:2516 +#: user-manual.txt:2545 msgid "" "_Subsurface XML_ format. This is the native format used by _Subsurface_." msgstr "" #. type: Plain text -#: user-manual.txt:2520 +#: user-manual.txt:2549 msgid "" "Universal Dive Data Format (_UDDF_). Refer to _http://uddf.org_ for more " "information. UDDF is a generic format that enables communication among many " @@ -4993,7 +5048,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2524 +#: user-manual.txt:2553 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_. " @@ -5002,7 +5057,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2528 +#: user-manual.txt:2557 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, " @@ -5010,7 +5065,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2533 +#: user-manual.txt:2562 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, " @@ -5019,7 +5074,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2536 +#: user-manual.txt:2565 msgid "" "_CSV dive profile_, that includes a large amount of detail for each dive, " "including the depth profile, temperature and pressure information of each " @@ -5027,7 +5082,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2549 +#: user-manual.txt:2578 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 " @@ -5044,7 +5099,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2554 +#: user-manual.txt:2583 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 " @@ -5053,13 +5108,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2555 +#: user-manual.txt:2584 #, no-wrap msgid "images/mapview_f20.jpg" msgstr "images/mapview_f20.jpg" #. type: Plain text -#: user-manual.txt:2562 +#: user-manual.txt:2591 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 " @@ -5068,12 +5123,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2564 +#: user-manual.txt:2593 msgid "_General Settings_, under the HTML tab, provides the following options:" msgstr "" #. type: Plain text -#: user-manual.txt:2572 +#: user-manual.txt:2601 #, no-wrap msgid "" "** Subsurface Numbers: if this option is checked, the dive(s) are exported with the\n" @@ -5086,27 +5141,27 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2575 +#: user-manual.txt:2604 msgid "" "Under _Style Options_ some style-related options are available like font " "size and theme." msgstr "" #. type: Plain text -#: user-manual.txt:2578 +#: user-manual.txt:2607 msgid "" "Export to other formats can be achieved through third party facilities, for " "instance _www.divelogs.de_." msgstr "" #. type: Title == -#: user-manual.txt:2580 +#: user-manual.txt:2609 #, no-wrap msgid "Keeping a _Subsurface_ dive log in the Cloud" msgstr "" #. type: Plain text -#: user-manual.txt:2591 +#: user-manual.txt:2620 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 " @@ -5121,23 +5176,23 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2597 +#: user-manual.txt:2626 msgid "" "_Subsurface_ includes access to a transparently integrated cloud storage " -"backend that is available to all Subsurface users. Storing and retrieving a " +"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 _Subsurface cloud storage_ , follow these steps:" msgstr "" #. type: Title === -#: user-manual.txt:2598 +#: user-manual.txt:2627 #, no-wrap msgid "Create a cloud storage account" msgstr "" #. type: Plain text -#: user-manual.txt:2615 +#: user-manual.txt:2644 #, no-wrap msgid "" "** Open the *Network Preferences* by selecting _File_ -> _Preferences_ -> _Network_.\n" @@ -5158,13 +5213,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:2616 +#: user-manual.txt:2645 #, no-wrap msgid "Using _Subsurface cloud storage_" msgstr "" #. type: Plain text -#: user-manual.txt:2626 +#: user-manual.txt:2655 #, no-wrap msgid "" "** Once the cloud storage has been initialised, two new items appear in the\n" @@ -5178,7 +5233,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2631 +#: user-manual.txt:2660 #, no-wrap msgid "" "** _Subsurface_ keeps a local copy of the data and the cloud facility remains fully\n" @@ -5188,13 +5243,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:2633 +#: user-manual.txt:2662 #, no-wrap msgid "Web access to _Subsurface cloud storage_" msgstr "" #. type: Plain text -#: user-manual.txt:2643 +#: user-manual.txt:2672 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 " @@ -5208,13 +5263,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:2644 +#: user-manual.txt:2673 #, no-wrap msgid "Other cloud services" msgstr "" #. type: Plain text -#: user-manual.txt:2654 +#: user-manual.txt:2683 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 " @@ -5225,13 +5280,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2655 +#: user-manual.txt:2684 #, no-wrap msgid "images/Cloud.jpg" msgstr "images/Cloud.jpg" #. type: Plain text -#: user-manual.txt:2664 +#: user-manual.txt:2693 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, " @@ -5244,7 +5299,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2671 +#: user-manual.txt:2700 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. " @@ -5254,7 +5309,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2677 +#: user-manual.txt:2706 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 " @@ -5265,20 +5320,20 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2680 +#: user-manual.txt:2709 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:2683 +#: user-manual.txt:2712 #, no-wrap msgid "Printing a dive log" msgstr "" #. type: Plain text -#: user-manual.txt:2687 +#: user-manual.txt:2716 #, no-wrap msgid "" "_Subsurface_ provides a simple and flexible interface to print a whole dive log or only a few selected dives.\n" @@ -5286,12 +5341,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2689 +#: user-manual.txt:2718 msgid "Before printing, two decisions are required:" msgstr "" #. type: Plain text -#: user-manual.txt:2692 +#: user-manual.txt:2721 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* " @@ -5299,7 +5354,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2694 +#: user-manual.txt:2723 msgid "" "If the dive profiles needs printing, what gas partial pressure information " "should be shown? Select the appropriate toggle-buttons on the button bar to " @@ -5307,7 +5362,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2697 +#: user-manual.txt:2726 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 " @@ -5315,35 +5370,35 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2698 user-manual.txt:4113 +#: user-manual.txt:2727 user-manual.txt:4154 #, no-wrap msgid "images/Print1_f22.jpg" msgstr "images/Print1_f22.jpg" #. type: Plain text -#: user-manual.txt:2701 +#: user-manual.txt:2730 msgid "Under _Print type_ select one of two options:" msgstr "" #. type: Plain text -#: user-manual.txt:2703 +#: user-manual.txt:2732 msgid "" "_Dive list print_: Print dives from the *Dive List* panel with profiles and " "other information." msgstr "" #. type: Plain text -#: user-manual.txt:2704 +#: user-manual.txt:2733 msgid "_Statistics print_: Print yearly statistics of the dives." msgstr "" #. type: Plain text -#: user-manual.txt:2706 +#: user-manual.txt:2735 msgid "Under _Print options_ select:" msgstr "" #. type: Plain text -#: user-manual.txt:2711 +#: user-manual.txt:2740 msgid "" "Printing only the dives selected from the dive list prior to activating the " "print dialogue by checking the box _Print only selected dives_. If this " @@ -5351,85 +5406,73 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2713 +#: user-manual.txt:2742 msgid "" "Printing in colour, achieved by checking the box with _Print in colour_. If " "this check box is not checked, printing is in monochrome (grey scale)." msgstr "" #. type: Plain text -#: user-manual.txt:2716 +#: user-manual.txt:2745 msgid "" "Under _Template_ select a template to be used as the page layout. There are " "several templates (see image *B*, above)." msgstr "" #. type: Plain text -#: user-manual.txt:2718 +#: user-manual.txt:2747 msgid "_Table_: This prints a summary table of all dives selected (see below)." msgstr "" #. type: Target for macro image -#: user-manual.txt:2719 +#: user-manual.txt:2748 #, no-wrap msgid "images/Print_summarylist_f22.jpg" msgstr "images/Print_summarylist_f22.jpg" #. type: Plain text -#: user-manual.txt:2722 +#: user-manual.txt:2751 msgid "" "_Flow layout_: Print the text associated with each dive without printing the " "dive profiles" msgstr "" #. type: Plain text -#: user-manual.txt:2723 +#: user-manual.txt:2752 msgid "of each dive (see below):" msgstr "" #. type: Target for macro image -#: user-manual.txt:2724 +#: user-manual.txt:2753 #, no-wrap msgid "images/Print_flow_layout_f22.jpg" msgstr "images/Print_flow_layout_f22.jpg" #. type: Plain text -#: user-manual.txt:2727 +#: user-manual.txt:2756 msgid "" "_One Dive_: Print one dive per page, also showing the dive profile (see " "below)" msgstr "" #. type: Target for macro image -#: user-manual.txt:2728 +#: user-manual.txt:2757 #, no-wrap msgid "images/print2_f22.jpg" msgstr "images/print2_f22.jpg" #. type: Plain text -#: user-manual.txt:2732 +#: user-manual.txt:2761 msgid "_Two Dives_: Print two dives per page, also showing the dive profiles." msgstr "" #. type: Plain text -#: user-manual.txt:2733 +#: user-manual.txt:2762 msgid "_Six Dives_: Print six dives per page, also showing the dive profiles." msgstr "" #. type: Plain text -#: user-manual.txt:2734 -msgid "" -"_Custom_: This option allows customisation of the print contents and layout. " -"This is" -msgstr "" - -#. type: Plain text -#: user-manual.txt:2735 -msgid "discussed at the end of this section." -msgstr "" - -#. type: Plain text -#: user-manual.txt:2739 +#: user-manual.txt:2766 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, " @@ -5438,7 +5481,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2743 +#: user-manual.txt:2770 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 " @@ -5447,13 +5490,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2744 +#: user-manual.txt:2771 #, no-wrap msgid "images/Print_print_f22.jpg" msgstr "images/Print_print_f22.jpg" #. type: Plain text -#: user-manual.txt:2749 +#: user-manual.txt:2776 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 " @@ -5462,19 +5505,19 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2750 +#: user-manual.txt:2777 #, no-wrap msgid "images/Printpreview.jpg" msgstr "images/Printpreview.jpg" #. type: Title === -#: user-manual.txt:2752 +#: user-manual.txt:2779 #, no-wrap -msgid "Write a custom printing template (advanced)" -msgstr "" +msgid "Writing a custom print template (advanced)" +msgstr "Créer un modèle d'impression personnalisé (avancé)" #. type: Plain text -#: user-manual.txt:2756 +#: user-manual.txt:2783 msgid "" "Writing a custom template is an effective way to produce highly customized " "printouts. Subsurface uses HTML templates to render printing. One can create " @@ -5485,13 +5528,13 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:2758 +#: user-manual.txt:2785 #, no-wrap msgid "Configuring a dive computer" msgstr "Configurer un ordinateur de plongée" #. type: Plain text -#: user-manual.txt:2766 +#: user-manual.txt:2793 msgid "" "_Subsurface_ enables one to configure a dive computer. Currently the " "Heinrichs-Weikamp (OSTC 2, OSTC 3) and Suunto Vyper (Stinger, Mosquito, D3, " @@ -5515,13 +5558,13 @@ msgstr "" "ANNEXE A>> pour plus d'informations sur la manière de procéder." #. type: Plain text -#: user-manual.txt:2771 +#: user-manual.txt:2798 msgid "" "Once the dive computer is connected to the _Subsurface_ computer, select " "_File -> Configure dive computer_ from the _Main Menu_. Provide the " "appropriate device name in the text box at the top of the configuration " "panel and select the appropriate dive computer model from the panel on the " -"lefthand (see image below)." +"left-hand (see image below)." msgstr "" "Une fois que l'ordinateur de plongée est connecté à _Subsurface_, " "sélectionner _Fichier -> Configurer l'ordinateur de plongée_, à partir du " @@ -5530,13 +5573,13 @@ msgstr "" "plongée à partir du panneau à gauche (voir l'image ci-dessous)." #. type: Target for macro image -#: user-manual.txt:2772 +#: user-manual.txt:2799 #, no-wrap msgid "images/Configure_dc_f20.jpg" msgstr "images/Configure_dc_f20.jpg" #. type: Plain text -#: user-manual.txt:2775 +#: user-manual.txt:2802 msgid "" "Using the appropriate buttons on the configuration panel, the following " "actions can be performed:" @@ -5545,7 +5588,7 @@ msgstr "" "suivantes peuvent être réalisées :" #. type: Plain text -#: user-manual.txt:2778 +#: user-manual.txt:2805 #, no-wrap msgid "" "*Retrieve available details*. This loads the existing configuration from the dive computer\n" @@ -5555,7 +5598,7 @@ msgstr "" "dans _Subsurface_, en l'affichant dans le panneau de configuration.\n" #. type: Plain text -#: user-manual.txt:2780 +#: user-manual.txt:2807 #, no-wrap msgid "" "*Save changes to device*. This changes the configuration of the\n" @@ -5565,7 +5608,7 @@ msgstr "" "de plongée pour correspondre aux informations affichées dans le panneau de configuration.\n" #. type: Plain text -#: user-manual.txt:2782 +#: user-manual.txt:2809 #, no-wrap msgid "" "*Backup*. This saves the configuration data to a file. _Subsurface_ asks for\n" @@ -5575,7 +5618,7 @@ msgstr "" "l'emplacement et le nom du fichier pour enregistrer les informations.\n" #. type: Plain text -#: user-manual.txt:2784 +#: user-manual.txt:2811 #, no-wrap msgid "" "*Restore backup*. This loads the information from a backup file and displays it\n" @@ -5585,7 +5628,7 @@ msgstr "" "dans le panneau de configuration.\n" #. type: Plain text -#: user-manual.txt:2786 +#: user-manual.txt:2813 #, no-wrap msgid "" "*Update firmware*. If new firmware is available for the dive computer, this is\n" @@ -5595,42 +5638,43 @@ msgstr "" "il sera chargé dans l'ordinateur de plongée.\n" #. type: Title == -#: user-manual.txt:2789 +#: user-manual.txt:2816 #, no-wrap msgid "Setting user _Preferences_ for _Subsurface_" msgstr "" #. type: Plain text -#: user-manual.txt:2797 +#: user-manual.txt:2826 msgid "" -"There are several settings within _Subsurface_ that the user can specify. " -"These are found when selecting _File -> Preferences_. The settings are " -"performed in five groups: *Defaults*, *Units*, *Graph*, *Language* and " -"*Network*. All five sections operate on the same principles: the user must " +"There are several user-definable settings within _Subsurface_, found by " +"selecting _File -> Preferences_. The settings are performed 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*." +"leave the settings panel by selecting *OK*. If *Discard* is selected, " +"changes to the preferences are not saved." msgstr "" #. type: Title === -#: user-manual.txt:2798 +#: user-manual.txt:2827 #, no-wrap msgid "Defaults" msgstr "" #. type: Plain text -#: user-manual.txt:2801 +#: user-manual.txt:2830 msgid "There are several settings in the *Defaults* panel:" msgstr "" #. type: Target for macro image -#: user-manual.txt:2802 +#: user-manual.txt:2831 #, no-wrap msgid "images/Pref1_f20.jpg" msgstr "images/Pref1_f20.jpg" #. type: Plain text -#: user-manual.txt:2806 +#: user-manual.txt:2835 #, no-wrap msgid "" " ** *Lists and tables*: Here one can specify the font type and font size of the\n" @@ -5638,7 +5682,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2811 +#: user-manual.txt:2840 #, no-wrap msgid "" " ** *Dives*: For the _Default Dive File_ one needs to specify the directory and\n" @@ -5648,13 +5692,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2812 +#: user-manual.txt:2841 #, 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:2814 +#: user-manual.txt:2843 #, no-wrap msgid "" "_Local default file_: When checked, _Subsurface_ automatically loads a dive log from the local hard disk\n" @@ -5662,7 +5706,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2816 +#: user-manual.txt:2845 #, no-wrap msgid "" "_Cloud storage default file_: When checked, _Subsurface automatically loads the dive log from the cloud\n" @@ -5670,40 +5714,40 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2818 +#: user-manual.txt:2847 #, 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:2821 +#: user-manual.txt:2850 #, no-wrap msgid "" -"dives that he/she don't consider valid dives, e.g. pool dives, but still want to\n" +"dives that he/she doesn't consider valid dives, e.g. pool dives, but still want to\n" "keep them in the dive log). This controls whether those dives are displayed in\n" "the dive list.\n" msgstr "" #. type: Plain text -#: user-manual.txt:2823 +#: user-manual.txt:2852 #, no-wrap msgid "** *Default cylinder*: Specify the default cylinder listed in\n" msgstr "" #. type: Plain text -#: user-manual.txt:2824 +#: user-manual.txt:2853 #, no-wrap msgid "the *Equipment* tab of the *Notes* panel.\n" msgstr "" #. type: Plain text -#: user-manual.txt:2826 +#: user-manual.txt:2855 #, no-wrap msgid "** *Animations*: Some actions in showing the dive profile are performed using\n" msgstr "" #. type: Plain text -#: user-manual.txt:2832 +#: user-manual.txt:2861 #, no-wrap msgid "" "animations. For instance, the axis values for depth and time change from dive to\n" @@ -5715,42 +5759,42 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2834 +#: user-manual.txt:2863 #, 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:2835 +#: user-manual.txt:2864 #, no-wrap msgid "cleared and set to default values.\n" msgstr "" #. type: Title === -#: user-manual.txt:2836 +#: user-manual.txt:2865 #, no-wrap msgid "Units" msgstr "" #. type: Target for macro image -#: user-manual.txt:2837 +#: user-manual.txt:2866 #, no-wrap msgid "images/Pref2_f20.jpg" msgstr "images/Pref2_f20.jpg" #. type: Plain text -#: user-manual.txt:2844 +#: user-manual.txt:2873 msgid "" -"Here user can choose between metric and imperial units of depth, pressure, " +"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, users can specify that all units are in the chosen " +"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." msgstr "" #. type: Plain text -#: user-manual.txt:2850 +#: user-manual.txt:2879 msgid "" "Irrespective of the above settings, dive time measurements can be either in " "seconds or minutes. Choose the appropriate option. GPS coordinates can be " @@ -5759,55 +5803,55 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:2851 +#: user-manual.txt:2880 #, no-wrap msgid "Graph" msgstr "" #. type: Target for macro image -#: user-manual.txt:2853 +#: user-manual.txt:2882 #, no-wrap msgid "images/Pref3_f20.jpg" msgstr "images/Pref3_f20.jpg" #. type: Plain text -#: user-manual.txt:2857 +#: user-manual.txt:2886 msgid "This panel allows two type of selections:" msgstr "" #. type: Plain text -#: user-manual.txt:2877 +#: user-manual.txt:2906 #, no-wrap msgid "" "*Show*: Here users 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 using the toolbar on the left hand side of the *Dive Profile*\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" " 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 presure threshold has been exceeded.\n" -"** _Max pO~2~ whn displaying MOD_ is the value used to calculate the maximum operative depth (MOD)\n" +" highlighted in red, indicating that 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" " 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_. This is because of the different algorithms and\n" -" gradient factors available for calculating ceilings, as well as the dynamic way that a\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 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 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 average depth just before the\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" " ascent.\n" msgstr "" #. type: Plain text -#: user-manual.txt:2879 +#: user-manual.txt:2908 #, no-wrap msgid "*Misc*:\n" msgstr "" #. type: Plain text -#: user-manual.txt:2892 +#: user-manual.txt:2921 #, no-wrap msgid "" "** Gradient Factors (GFLow and GFHigh):* Set the _gradient factors_ used while diving. GF_Low is\n" @@ -5824,19 +5868,19 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2894 +#: user-manual.txt:2923 #, 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:2896 +#: user-manual.txt:2925 #, 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:2900 +#: user-manual.txt:2929 #, no-wrap msgid "" " ** _CCR: Show setpoints when viewing pO2:_ With this checkbox ativated, the pO~2~\n" @@ -5845,7 +5889,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2904 +#: user-manual.txt:2933 #, no-wrap msgid "" " ** _CCR: Show individual O~2~ sensor values when viewing pO~2~:_ Show the pO~2~\n" @@ -5854,19 +5898,19 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2906 +#: user-manual.txt:2935 #, no-wrap msgid "*Configuring dive planning using rebreather equipment:*\n" msgstr "" #. type: Plain text -#: user-manual.txt:2908 +#: user-manual.txt:2937 #, no-wrap msgid "** _Default CCR setpoint for dive planning:_ Specify the O~2~ setpoint for a\n" msgstr "" #. type: Plain text -#: user-manual.txt:2911 +#: user-manual.txt:2940 #, no-wrap msgid "" "CCR dive plan. This determines the pO~2~ maintained\n" @@ -5875,13 +5919,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2913 +#: user-manual.txt:2942 #, no-wrap msgid "** _pSCR O~2~ metabolism rate:_ For a semiclosed rebreather (pSCR) system, this is the\n" msgstr "" #. type: Plain text -#: user-manual.txt:2915 +#: user-manual.txt:2944 #, no-wrap msgid "" "volume of oxygen used by a diver during a minute. Set this value for pSCR dive planning\n" @@ -5889,13 +5933,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2917 +#: user-manual.txt:2946 #, 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:2919 +#: user-manual.txt:2948 #, no-wrap msgid "" "environment to that of the gas recirculated to the diver. Set this value for a\n" @@ -5903,66 +5947,66 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:2921 +#: user-manual.txt:2950 #, no-wrap msgid "Language" msgstr "" #. type: Plain text -#: user-manual.txt:2923 +#: user-manual.txt:2952 msgid "Choose a language that _Subsurface_ will use." msgstr "" #. type: Target for macro image -#: user-manual.txt:2924 +#: user-manual.txt:2953 #, no-wrap msgid "images/Pref4_f20.jpg" msgstr "images/Pref4_f20.jpg" #. type: Plain text -#: user-manual.txt:2934 +#: user-manual.txt:2963 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 OS. If this is for some " -"reason undesirable users 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*." +"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*." msgstr "" #. type: Title === -#: user-manual.txt:2935 +#: user-manual.txt:2964 #, no-wrap msgid "Network" msgstr "" #. type: Plain text -#: user-manual.txt:2942 +#: user-manual.txt:2970 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, the " -"<<S_Companion,_Subsurface Companion app_>> or data export/import from " -"_Divelogs.de_. 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 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." msgstr "" #. type: Target for macro image -#: user-manual.txt:2943 +#: user-manual.txt:2971 #, no-wrap msgid "images/Pref5_f20.jpg" msgstr "images/Pref5_f20.jpg" #. type: Plain text -#: user-manual.txt:2946 +#: user-manual.txt:2974 msgid "This dialogue has three sections:" msgstr "" #. type: Plain text -#: user-manual.txt:2954 +#: user-manual.txt:2982 #, no-wrap msgid "" "** _Proxy type_:\n" @@ -5975,41 +6019,41 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2959 +#: user-manual.txt:2987 #, no-wrap msgid "" -"** _Subsurface cloud storage_: In order to store one's dive log in the cloud, a valid email address\n" +"** _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" " Two additional options are given:\n" msgstr "" #. type: Plain text -#: user-manual.txt:2960 +#: user-manual.txt:2988 #, 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:2961 +#: user-manual.txt:2989 #, no-wrap -msgid "while the user performs other tasks inside _Subsurface_.\n" +msgid "while the user performs other tasks within _Subsurface_.\n" msgstr "" #. type: Plain text -#: user-manual.txt:2962 +#: user-manual.txt:2990 #, 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:2963 +#: user-manual.txt:2991 #, no-wrap msgid "information is saved in raw text form, not encoded in any way.\n" msgstr "" #. type: Plain text -#: user-manual.txt:2968 +#: user-manual.txt:2996 #, no-wrap msgid "" "** _Subsurface web service_: When one subscribes to the <<S_Companion,Subsurface web service>>, a very\n" @@ -6019,13 +6063,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:2971 +#: user-manual.txt:2999 #, no-wrap msgid "Facebook Accesss" msgstr "Accès Facebook" #. type: Plain text -#: user-manual.txt:2974 +#: user-manual.txt:3002 msgid "" "This panel allows one to log into a Facebook account in order to transfer " "information from Subsurface to Facefook." @@ -6034,17 +6078,17 @@ msgstr "" "transférer des informations de Subsurface vers Facebook." #. type: Target for macro image -#: user-manual.txt:2975 +#: user-manual.txt:3003 #, no-wrap msgid "images/Pref6_f20.jpg" msgstr "images/Pref6_f20.jpg" #. type: Plain text -#: user-manual.txt:2983 +#: user-manual.txt:3011 msgid "" "If one provides a valid Facebook userID and password, a connection to " "Facebook is created. The connection to Facebook is closed when one closes " -"down Subsurface. At this point the checkbox labelled \"Keep connection to " +"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 "" @@ -6056,26 +6100,38 @@ msgstr "" "vers Facebook] pour plus d'informations." #. type: Title === -#: user-manual.txt:2984 +#: user-manual.txt:3012 #, no-wrap msgid "Georeference" msgstr "" #. type: Plain text -#: user-manual.txt:2988 +#: user-manual.txt:3020 msgid "" -"_Subsurface_ provides a geo-lookup service (that is, an ability to look up " -"the geographic coordinates of a place name)." +"_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 " +"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)." msgstr "" +#. type: Target for macro image +#: user-manual.txt:3021 +#, no-wrap +msgid "images/Pref7_f20.jpg" +msgstr "images/Pref7_f20.jpg" + #. type: Title == -#: user-manual.txt:2990 +#: user-manual.txt:3024 #, no-wrap msgid "The _Subsurface_ dive planner" msgstr "" #. type: Plain text -#: user-manual.txt:2995 +#: user-manual.txt:3029 msgid "" "Dive planning is an advanced feature of _Subsurface_, accessible by " "selecting _Log -> Plan Dive_ from the main menu. It allows calculation of " @@ -6084,7 +6140,7 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:3003 +#: user-manual.txt:3037 msgid "" "The _Subsurface_ dive planner IS CURRENTLY EXPERIMENTAL and assumes the user " "is already familiar with the _Subsurface_ user interface. It is explicitly " @@ -6092,19 +6148,19 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:3006 +#: user-manual.txt:3040 msgid "" "The user is conversant with dive planning and has the necessary training to " "perform dive planning." msgstr "" #. type: delimited block * -#: user-manual.txt:3007 +#: user-manual.txt:3041 msgid "The user plans dives within his/her certification limits." msgstr "" #. type: delimited block * -#: user-manual.txt:3010 +#: user-manual.txt:3044 msgid "" "Dive planning makes large assumptions about the characteristics of the " "_average person_ and cannot compensate for individual physiology or health " @@ -6112,32 +6168,32 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:3011 +#: user-manual.txt:3045 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:3012 +#: user-manual.txt:3046 msgid "The user is familiar with the user interface of _Subsurface_." msgstr "" #. type: delimited block * -#: user-manual.txt:3014 +#: user-manual.txt:3048 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:3016 +#: user-manual.txt:3050 #, no-wrap msgid "The _Subsurface_ dive planner screen" msgstr "" #. type: Plain text -#: user-manual.txt:3021 +#: user-manual.txt:3055 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 " @@ -6147,7 +6203,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3025 +#: user-manual.txt:3059 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 " @@ -6156,7 +6212,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3029 +#: user-manual.txt:3063 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 " @@ -6165,26 +6221,26 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:3030 +#: user-manual.txt:3064 #, no-wrap msgid "images/PlannerWindow1_f20.jpg" msgstr "images/PlannerWindow1_f20.jpg" #. type: Title === -#: user-manual.txt:3033 +#: user-manual.txt:3067 #, no-wrap msgid "Open circuit dives" msgstr "" #. type: Plain text -#: user-manual.txt:3036 +#: user-manual.txt:3070 msgid "" "Towards the centre bottom of the planner (circled in blue in the image " "above) is a dropbox with three options. Select the appropriate one of these:" msgstr "" #. type: Plain text -#: user-manual.txt:3039 +#: user-manual.txt:3073 #, no-wrap msgid "" "** Open Circuit (the default)\n" @@ -6193,12 +6249,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3041 +#: user-manual.txt:3075 msgid "Choose the Open Circuit option." msgstr "" #. type: Plain text -#: user-manual.txt:3045 +#: user-manual.txt:3079 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 " @@ -6208,7 +6264,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3054 +#: user-manual.txt:3088 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. " @@ -6218,16 +6274,16 @@ msgid "" "this cylinder. By leaving the oxygen concentration (O2%) filed empty, the " "cylinder is assumed to contain air. Otherwise enter the oxygen and/or helium " "concentration in the boxes provided in this dialogue. Add additional " -"cylinders by using the \"+\" icon to the top righthand of the dialogue." +"cylinders by using the \"+\" icon to the top right-hand of the dialogue." msgstr "" #. type: Plain text -#: user-manual.txt:3056 +#: user-manual.txt:3090 msgid "The profile of the planned dive can be created in two ways:" msgstr "" #. type: Plain text -#: user-manual.txt:3061 +#: user-manual.txt:3095 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-" @@ -6237,7 +6293,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3069 +#: user-manual.txt:3103 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 " @@ -6251,53 +6307,55 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:3070 +#: user-manual.txt:3104 #, no-wrap msgid "Recreational dives" msgstr "" #. type: Plain text -#: user-manual.txt:3085 +#: user-manual.txt:3119 msgid "" -"The _Subsurface_ dive planner allows a sophisticated way of planning " -"recreational dives, i.e. dives that remain within no-decompression limits. " -"The dive planner automatically takes into account the nitrogen load incurred " -"in previous dives. But conventional dive tables are also used in a way that " -"can take into account previous dives. Why use a dive planner for " -"recreational dives? Using recreational dive tables, the maximum depth of a " -"dive is taken into acount. However, few dives are undertaken at a constant " -"depth corresponding to the maximum depth (i.e. a \"square\" dive profile). " -"This means that dive tables overestimate the nitrogen load incurred during " -"previous dives. The _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 " -"mean that the diver gets 'credit' in terms of nitrogen loading for not " -"remaining at maximum depth during previous dives, enabling planning a longer " -"subsequent dive. For the planner to work it is therefore crucial to upload " -"all previous dives onto _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 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:3088 +#: user-manual.txt:3121 msgid "To plan a dive, the appropriate settings need to be defined." msgstr "" #. type: Plain text -#: user-manual.txt:3091 +#: user-manual.txt:3124 msgid "" "Ensure that the date and time is set to that of the intended dive. This " "allows calculation of the nitrogen load incurred during previous dives." msgstr "" #. type: Plain text -#: user-manual.txt:3094 +#: user-manual.txt:3127 msgid "" "Immediately under the heading _Planning_ are two checkboxes _Recreational_ " "and _Safety Stop_. Check these two boxes." msgstr "" #. type: Plain text -#: user-manual.txt:3098 +#: user-manual.txt:3131 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 " @@ -6305,7 +6363,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3103 +#: user-manual.txt:3136 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 " @@ -6315,33 +6373,45 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3106 +#: user-manual.txt:3145 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." +"used. The reason for this reserve gas is to provide for the possible need " +"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." msgstr "" #. type: Plain text -#: user-manual.txt:3113 +#: user-manual.txt:3153 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 " "table under _Dive planner points_ as desribed under the previous heading. If " "this is a multilevel dive, set the appropriate dive depths to represent the " "dive plan by adding waypoints to the dive profile or by adding appropriate " -"dive planner points to the _Dive Planner Points_ table." +"dive planner points to the _Dive Planner Points_ table. _Subsurface_ will " +"automatically extend the bottom section of the dive to the maximum duration " +"within the no-decompression limits (NDL)." msgstr "" #. type: Plain text -#: user-manual.txt:3116 +#: user-manual.txt:3156 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:3124 +#: user-manual.txt:3164 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 " @@ -6357,7 +6427,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3128 +#: user-manual.txt:3168 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 " @@ -6367,26 +6437,26 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:3129 +#: user-manual.txt:3169 #, no-wrap msgid "images/rec_diveplan.jpg" msgstr "images/rec_diveplan.jpg" #. type: Title ==== -#: user-manual.txt:3131 +#: user-manual.txt:3171 #, no-wrap msgid "Non-recreational open circuit dives, including decompression" msgstr "" #. type: Plain text -#: user-manual.txt:3135 +#: user-manual.txt:3175 msgid "" "Non-recreational dive planning involves exceeding the no-deco limits and/or " "using multiple breathing gases. Such dives are planned in three stages:" msgstr "" #. type: Plain text -#: user-manual.txt:3146 +#: user-manual.txt:3186 #, no-wrap msgid "" "*a) Nitrogen management*: This is performed by specifying the rates for descent and ascent,\n" @@ -6402,7 +6472,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3151 +#: user-manual.txt:3191 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 " @@ -6414,12 +6484,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3153 +#: user-manual.txt:3193 msgid "For more information external to this manual see:" msgstr "" #. type: Plain text -#: user-manual.txt:3155 +#: user-manual.txt:3195 msgid "" "link:http://www.tek-dive.com/portal/upload/M-Values.pdf[Understanding M-" "values by Erik Baker, _Immersed_ Vol. 3, No. 3.]" @@ -6428,7 +6498,7 @@ msgstr "" "values by Erik Baker, _Immersed_ Vol. 3, No. 3.]" #. type: Plain text -#: user-manual.txt:3156 +#: user-manual.txt:3196 msgid "" "link:http://www.rebreatherworld.com/general-and-new-to-rebreather-" "articles/5037-gradient-factors-for-dummies.html[Gradient factors for " @@ -6439,7 +6509,7 @@ msgstr "" "dummies, by Kevin Watts]" #. type: Plain text -#: user-manual.txt:3158 +#: user-manual.txt:3198 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" @@ -6454,7 +6524,7 @@ msgstr "" "traite à la fois des modèles de décompression Bühlmann et VPM-B." #. type: Plain text -#: user-manual.txt:3166 +#: user-manual.txt:3206 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) " @@ -6468,7 +6538,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3175 +#: user-manual.txt:3215 #, no-wrap msgid "" "*b) Oxygen management*: In the *Gas Options* part of the dive specification, the maximum partial\n" @@ -6482,7 +6552,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3189 +#: user-manual.txt:3229 #, 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" @@ -6501,7 +6571,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3201 +#: user-manual.txt:3241 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 " @@ -6519,7 +6589,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3213 +#: user-manual.txt:3253 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_ " @@ -6537,7 +6607,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3221 +#: user-manual.txt:3261 msgid "" "Indicate any changes in gas cylinder used by indicating gas changes as " "explained in the section <<S_CreateProfile,hand-creating a dive profile>>. " @@ -6549,7 +6619,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3230 +#: user-manual.txt:3270 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 " @@ -6562,20 +6632,20 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3233 +#: user-manual.txt:3273 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:3234 +#: user-manual.txt:3274 #, no-wrap msgid "images/DivePlanner2_f20.jpg" msgstr "images/DivePlanner2_f20.jpg" #. type: Plain text -#: user-manual.txt:3239 +#: user-manual.txt:3279 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 " @@ -6583,26 +6653,26 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3241 +#: user-manual.txt:3281 #, no-wrap msgid "*The dive plan details*\n" msgstr "" #. type: Plain text -#: user-manual.txt:3249 +#: user-manual.txt:3289 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 " "by checking any of the options under the _Notes_ section of the dive " "planner, immediately to the left of the _Dive Plan Details_. If a _Verbatim " -"diveplan_ is requested, a detailed sentence-level explanation of the dive " +"dive plan_ is requested, a detailed sentence-level explanation of the dive " "plan is given. If any of the management specifications have been exceeded " "during the planning, a warning message is printed underneath the dive plan " "information." msgstr "" #. type: Plain text -#: user-manual.txt:3254 +#: user-manual.txt:3294 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 " @@ -6612,13 +6682,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3255 +#: user-manual.txt:3295 #, no-wrap msgid "Planning pSCR dives" msgstr "" #. type: Plain text -#: user-manual.txt:3270 +#: user-manual.txt:3310 #, no-wrap msgid "" "To plan a dive using a passive semi-closed rebreather (pSCR), select _pSCR_ rather than\n" @@ -6630,33 +6700,33 @@ msgid "" "pO~2~ drops below what is considered a save value, 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 above. However, no oxygen setpoints\n" +"are very similar to that of a CCR dive plan, described below. However, no oxygen setpoints\n" "are specified for pSCR dives. Below is a dive plan for a pSCR dive. The dive is comparable\n" -"to that of the CCR dive above, but note the longer ascent duration due to the lower oxygen\n" +"to that of the CCR dive below, but note the longer ascent duration due to the lower oxygen\n" "in the loop due to the oxygen drop across the mouthpiece of the pSCR equipment.\n" msgstr "" #. type: Target for macro image -#: user-manual.txt:3271 +#: user-manual.txt:3311 #, no-wrap msgid "images/Planner_pSCR1_f20.jpg" msgstr "images/Planner_pSCR1_f20.jpg" #. type: Title === -#: user-manual.txt:3274 +#: user-manual.txt:3314 #, no-wrap msgid "Planning CCR dives" msgstr "" #. type: Plain text -#: user-manual.txt:3278 +#: user-manual.txt:3318 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:3282 +#: user-manual.txt:3322 #, no-wrap msgid "" "*Available gases*: In the _Available gases_ table, enter the cylinder information for the\n" @@ -6665,45 +6735,47 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3290 +#: user-manual.txt:3332 #, no-wrap msgid "" -"*Entering setpoints*: Specify a default setpoint in the Preferences tab, by selecting _File -> Preferences -> Graph_ from the main menu. All user-entered segments in the _Dive planner points_ table\n" +"*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" "using the setpoint of the last manually entered segment. So, to plan a bail out ascent for a\n" "CCR dive, add a one-minute dive segment to the end with a setpoint value of 0. The decompression\n" -"algorithm does not switch deco-gases automatically while in CCR mode (i.e. when a positive setpoint is specified) but, of course, this is calculated for bail out ascents.\n" +"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" msgstr "" #. type: Plain text -#: user-manual.txt:3292 +#: user-manual.txt:3334 msgid "" "The dive profile for a CCR dive may look something like the image below." msgstr "" #. type: Target for macro image -#: user-manual.txt:3293 +#: user-manual.txt:3335 #, no-wrap msgid "images/Planner_CCR1_f20.jpg" msgstr "images/Planner_CCR1_f20.jpg" #. type: Plain text -#: user-manual.txt:3297 +#: user-manual.txt:3339 msgid "" "Note that, in the _Dive plan details_, the gas consumption for a CCR segment " "is not calculated, so gas consumptions of 0 litres are the norm." msgstr "" #. type: Title === -#: user-manual.txt:3299 +#: user-manual.txt:3341 #, no-wrap msgid "Modifying an existing dive plan" msgstr "" #. type: Plain text -#: user-manual.txt:3306 +#: user-manual.txt:3348 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 " @@ -6714,7 +6786,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3312 +#: user-manual.txt:3354 msgid "" "In addition there is the option \"Save new\". This keeps the original " "planned dive and adds a (possibly modified) copy to the dive list. If that " @@ -6724,13 +6796,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3313 +#: user-manual.txt:3355 #, no-wrap msgid "Planning for repetitive dives" msgstr "" #. type: Plain text -#: user-manual.txt:3320 +#: user-manual.txt:3362 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 " @@ -6739,7 +6811,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3326 +#: user-manual.txt:3368 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 " @@ -6749,7 +6821,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3331 +#: user-manual.txt:3373 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 " @@ -6759,13 +6831,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3332 +#: user-manual.txt:3374 #, no-wrap msgid "Printing the dive plan" msgstr "" #. type: Plain text -#: user-manual.txt:3337 +#: user-manual.txt:3379 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 " @@ -6773,7 +6845,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3347 +#: user-manual.txt:3389 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 " @@ -6789,13 +6861,13 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:3348 +#: user-manual.txt:3390 #, 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:3353 +#: user-manual.txt:3395 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 " @@ -6806,13 +6878,13 @@ msgstr "" "des sections de ce manuel traitant des opérations relatives." #. type: Title === -#: user-manual.txt:3354 +#: user-manual.txt:3396 #, no-wrap msgid "File" msgstr "Fichier" #. type: Plain text -#: user-manual.txt:3357 +#: user-manual.txt:3399 msgid "" "<<S_NewLogbook,_New Logbook_>> - Close the currently open dive logbook and " "clear all dive information." @@ -6821,7 +6893,7 @@ msgstr "" "actuellement ouvert et supprime toutes les informations de plongées." #. type: Plain text -#: user-manual.txt:3359 +#: user-manual.txt:3401 msgid "" "_Open logbook_ - This opens the file manager in order to select a dive " "logbook to open." @@ -6830,38 +6902,38 @@ msgstr "" "carnet de plongée à ouvrir." #. type: Plain text -#: user-manual.txt:3360 +#: user-manual.txt:3402 msgid "" "_Open cloud storage_ - Open the dive log previously saved in " "<<S_Cloud_storage,_Cloud storage_>>." msgstr "" #. type: Plain text -#: user-manual.txt:3361 +#: user-manual.txt:3403 msgid "_Save_ - Save the dive logbook that is currently open." msgstr "" "_Sauvegarder_ - Enregistrer le carnet de plongée qui est actuellement ouvert." #. type: Plain text -#: user-manual.txt:3362 +#: user-manual.txt:3404 msgid "" "_Save to cloud storage_ - Save the current dive log to <<S_Cloud_storage," "_Cloud storage_>>." msgstr "" #. type: Plain text -#: user-manual.txt:3363 +#: user-manual.txt:3405 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:3364 +#: user-manual.txt:3406 msgid "_Close_ - Close the dive logbook that is currently open." msgstr "_Fermer_ - Fermer le carnet de plongée actuellement ouvert." #. type: Plain text -#: user-manual.txt:3366 +#: user-manual.txt:3408 msgid "" "<<S_ExportLog,_Export_>> - Export the currently open dive logbook (or the " "selected dives in the logbook) to one of several formats." @@ -6871,34 +6943,34 @@ msgstr "" "formats." #. type: Plain text -#: user-manual.txt:3367 +#: user-manual.txt:3409 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:3368 +#: user-manual.txt:3410 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:3369 +#: user-manual.txt:3411 msgid "" "<<S_FindMovedImages, _Find moved images_>> - If photos taken during dives " "have been moved to" msgstr "" #. type: Plain text -#: user-manual.txt:3370 +#: user-manual.txt:3412 msgid "" "a different disk or directory, locate them and link them to the appropriate " "dives." msgstr "" #. type: Plain text -#: user-manual.txt:3371 +#: user-manual.txt:3413 msgid "" "<<S_Configure,_Configure dive computer_>> - Edit the configuration of a dive " "computer." @@ -6907,18 +6979,18 @@ msgstr "" "configuration d'un ordinateur de plongée." #. type: Plain text -#: user-manual.txt:3372 +#: user-manual.txt:3414 msgid "_Quit_ - Quit _Subsurface_." msgstr "_Quitter_ - Quitter _Subsurface_." #. type: Title === -#: user-manual.txt:3373 +#: user-manual.txt:3415 #, no-wrap msgid "Import" msgstr "Importer" #. type: Plain text -#: user-manual.txt:3376 +#: user-manual.txt:3418 msgid "" "<<S_ImportDiveComputer,_Import from dive computer_>> - Import dive " "information from a dive computer." @@ -6927,7 +6999,7 @@ msgstr "" "Importer des informations de plongées à partir de l'ordinateur de plongée." #. type: Plain text -#: user-manual.txt:3378 +#: user-manual.txt:3420 msgid "" "<<Unified_import,_Import Log Files_>> - Import dive information from a file " "in in a _Subsurface_-compatible format." @@ -6937,7 +7009,7 @@ msgstr "" "_Subsurface_." #. type: Plain text -#: user-manual.txt:3380 +#: user-manual.txt:3422 msgid "" "<<S_Companion,_Import GPS data from Subsurface web service_>> - Load GPS " "coordinates from the _Subsurface_ mobile phone app." @@ -6947,7 +7019,7 @@ msgstr "" "(téléphones et tablettes)." #. type: Plain text -#: user-manual.txt:3382 +#: user-manual.txt:3424 msgid "" "<<S_ImportingDivelogsDe,_Import from Divelogs.de_>> - Import dive " "information from _www.Divelogs.de_." @@ -6956,13 +7028,13 @@ msgstr "" "informations de plongées à partir de _www.Divelogs.de_." #. type: Title === -#: user-manual.txt:3383 +#: user-manual.txt:3425 #, no-wrap msgid "Log" msgstr "Journal (log)" #. type: Plain text -#: user-manual.txt:3385 +#: user-manual.txt:3427 msgid "" "<<S_EnterData,_Add Dive_>> - Manually add a new dive to the *Dive List* " "panel." @@ -6971,14 +7043,14 @@ msgstr "" "plongée au panneau de la *liste des plongées*." #. type: Plain text -#: user-manual.txt:3386 +#: user-manual.txt:3428 msgid "" "_Edit dive_ - Edit a dive of which the profile was entered by hande and not " "from a dive computer." msgstr "" #. type: Plain text -#: user-manual.txt:3387 +#: user-manual.txt:3429 msgid "" "<<S_DivePlanner,_Plan Dive_>> - This feature allows the planning of dives." msgstr "" @@ -6986,7 +7058,7 @@ msgstr "" "planifier des plongées." #. type: Plain text -#: user-manual.txt:3388 +#: user-manual.txt:3430 msgid "" "<<S_Replan,_Edit dive in planner_>> - Edit a dive plan that has been saved " "into the *Dive List*." @@ -6995,7 +7067,7 @@ msgstr "" "plongée planifiée qui a été enregistrée dans la *liste des plongées*." #. type: Plain text -#: user-manual.txt:3390 +#: user-manual.txt:3432 msgid "" "<<S_CopyComponents,_Copy dive components_>> - By selecting this option, one " "can copy information from several fields of a dive log onto the clipboard." @@ -7005,7 +7077,7 @@ msgstr "" "champs d'un journal de plongée vers le presse-papier." #. type: Plain text -#: user-manual.txt:3392 +#: user-manual.txt:3434 msgid "" "_Paste dive components_ - Paste, into the selected dives in the *Dive List*, " "the information copied using the _Copy dive components_ option." @@ -7015,7 +7087,7 @@ msgstr "" "préalable avec l'option _Copier les composants de la plongée_." #. type: Plain text -#: user-manual.txt:3394 +#: user-manual.txt:3436 msgid "" "<<S_Renumber,_Renumber_>> - Renumber the dives listed in the *Dive List* " "panel." @@ -7024,7 +7096,7 @@ msgstr "" "le panneau de la *liste des plongées*." #. type: Plain text -#: user-manual.txt:3396 +#: user-manual.txt:3438 msgid "" "<<S_Group,_Auto Group_>> - Group the dives in the *Dive List* panel into " "dive trips." @@ -7033,7 +7105,7 @@ msgstr "" "*liste des plongées* dans des voyages de plongées." #. type: Plain text -#: user-manual.txt:3397 +#: user-manual.txt:3439 msgid "" "<<S_DeviceNames,_Edit Device Names_>> - Edit the names of dive computers to " "facilitate your logs." @@ -7042,7 +7114,7 @@ msgstr "" "les noms des ordinateurs de plongée pour faciliter vos journaux (logs)." #. type: Plain text -#: user-manual.txt:3398 +#: user-manual.txt:3440 msgid "" "<<S_Filter,_Filter divelist_>> - Select only some dives, based on specific " "tags or dive criteria." @@ -7051,13 +7123,13 @@ msgstr "" "certaines plongées, à partir de tags ou de critères de plongées." #. type: Title === -#: user-manual.txt:3399 +#: user-manual.txt:3441 #, no-wrap msgid "View" msgstr "Vue" #. type: Plain text -#: user-manual.txt:3402 +#: user-manual.txt:3444 msgid "" "<<S_ViewPanels,_All_>> - View the four main _Subsurface_ panels " "simmultaneously." @@ -7066,33 +7138,33 @@ msgstr "" "_Subsurface_ simultanément." #. type: Plain text -#: user-manual.txt:3403 +#: user-manual.txt:3445 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:3404 +#: user-manual.txt:3446 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:3405 +#: user-manual.txt:3447 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:3406 +#: user-manual.txt:3448 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:3408 +#: user-manual.txt:3450 msgid "" "_Yearly Statistics_ - Display summary statistics about dives during this and " "past years." @@ -7101,35 +7173,35 @@ msgstr "" "plongées effectuées." #. type: Plain text -#: user-manual.txt:3409 +#: user-manual.txt:3451 msgid "" "_Prev DC_ - If a single dive was logged from more than one dive computer, " "switch to data from" msgstr "" #. type: Plain text -#: user-manual.txt:3410 +#: user-manual.txt:3452 msgid "previous dive computer." msgstr "ordinateur de plongée précédent." #. type: Plain text -#: user-manual.txt:3411 +#: user-manual.txt:3453 msgid "_Next DC_ - Switch to next dive computer." msgstr "_Ordinateur suivant_ - Passer à l'ordinateur de plongée suivant." #. type: Plain text -#: user-manual.txt:3412 +#: user-manual.txt:3454 msgid "_Full Screen_ - Toggles Full Screen mode." msgstr "_Plein écran_ - Passer en mode plein écran." #. type: Title === -#: user-manual.txt:3413 +#: user-manual.txt:3455 #, no-wrap msgid "Share on" msgstr "" #. type: Plain text -#: user-manual.txt:3415 +#: user-manual.txt:3457 msgid "" "<<S_Facebook,_Facebook_>> - Share the currently selected dive on your " "Facebook timeline." @@ -7138,13 +7210,13 @@ msgstr "" "Facebook." #. type: Title === -#: user-manual.txt:3417 +#: user-manual.txt:3459 #, no-wrap msgid "Help" msgstr "Aide" #. type: Plain text -#: user-manual.txt:3420 +#: user-manual.txt:3462 msgid "" "_About Subsurface_ - Show a panel with the version number of _Subsurface_ as " "well as licensing information." @@ -7153,7 +7225,7 @@ msgstr "" "_Subsurface_ ainsi que les informations de licence." #. type: Plain text -#: user-manual.txt:3422 +#: user-manual.txt:3464 msgid "" "_Check for updates_ - Find out whether a newer version of Subsurface is " "available on the http://subsurface-divelog.org/[_Subsurface_ web site]." @@ -7163,7 +7235,7 @@ msgstr "" "_Subsurface_ ]." #. type: Plain text -#: user-manual.txt:3424 +#: user-manual.txt:3466 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 " @@ -7174,31 +7246,31 @@ msgstr "" "sondage, si vos habitudes de plongées ont changées." #. type: Plain text -#: user-manual.txt:3425 +#: user-manual.txt:3467 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:3429 +#: user-manual.txt:3470 #, 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:3431 +#: user-manual.txt:3472 #, 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:3432 +#: user-manual.txt:3473 #, no-wrap msgid "images/icons/drivers.jpg" msgstr "images/icons/drivers.jpg" #. type: Plain text -#: user-manual.txt:3437 +#: user-manual.txt:3478 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 " @@ -7209,7 +7281,7 @@ msgstr "" "l'ordinateur de plongée (Bluetooth, USB, infra-rouge)." #. type: Plain text -#: user-manual.txt:3443 +#: user-manual.txt:3484 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 " @@ -7223,7 +7295,7 @@ msgstr "" "particulièrement pour certaines technologies telles que l'infra-rouge." #. type: Plain text -#: user-manual.txt:3447 +#: user-manual.txt:3488 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 " @@ -7234,7 +7306,7 @@ msgstr "" "port USB de son ordinateur de bureau." #. type: Plain text -#: user-manual.txt:3454 +#: user-manual.txt:3495 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 " @@ -7252,19 +7324,19 @@ msgstr "" "documents et logiciels Silicon Labs]." #. type: Title === -#: user-manual.txt:3456 +#: user-manual.txt:3497 #, 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:3457 +#: user-manual.txt:3498 #, no-wrap msgid "images/icons/usb.jpg" msgstr "images/icons/usb.jpg" #. type: Plain text -#: user-manual.txt:3465 +#: user-manual.txt:3506 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 " @@ -7281,7 +7353,7 @@ msgstr "" "nom de votre périphérique ;" #. type: Plain text -#: user-manual.txt:3470 +#: user-manual.txt:3511 msgid "" "Simply try COM1, COM2, etc. The drop down list should contain all connected " "COM devices." @@ -7290,56 +7362,56 @@ msgstr "" "tous les périphériques COM connectés." #. type: Title ==== -#: user-manual.txt:3471 user-manual.txt:3565 +#: user-manual.txt:3512 user-manual.txt:3606 #, no-wrap msgid "On MacOS:" msgstr "Sur MacOS :" #. type: Plain text -#: user-manual.txt:3474 +#: user-manual.txt:3515 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:3475 +#: user-manual.txt:3516 #, no-wrap msgid "On Linux:" msgstr "Sur Linux :" #. type: Plain text -#: user-manual.txt:3478 +#: user-manual.txt:3519 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:3480 +#: user-manual.txt:3521 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:3481 +#: user-manual.txt:3522 msgid "Open a terminal" msgstr "Ouvrir un terminal" #. type: Plain text -#: user-manual.txt:3482 user-manual.txt:3484 +#: user-manual.txt:3523 user-manual.txt:3525 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:3483 +#: user-manual.txt:3524 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:3486 +#: user-manual.txt:3527 msgid "A message similar to this one should appear:" msgstr "Un message similaire à celui-ci devrait apparaitre :" #. type: Plain text -#: user-manual.txt:3502 +#: user-manual.txt:3543 #, no-wrap msgid "" "\tusb 2-1.1: new full speed USB device number 14 using ehci_hcd\n" @@ -7375,7 +7447,7 @@ msgstr "" "\tftdi_sio: v1.6.0:USB FTDI Serial Converters Driver\n" #. type: Plain text -#: user-manual.txt:3507 +#: user-manual.txt:3548 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 " @@ -7387,14 +7459,14 @@ msgstr "" "que Subsurface utilise le bon port USB." #. type: Plain text -#: user-manual.txt:3509 +#: user-manual.txt:3550 msgid "Ensuring that the user has write permission to the USB serial port:" msgstr "" "S'assurer que l'utilisateur possède les droits d'écriture sur le port série " "USB :" #. type: Plain text -#: user-manual.txt:3515 +#: user-manual.txt:3556 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 " @@ -7407,7 +7479,7 @@ msgstr "" "utiliser le port USB. Si votre nom d'utilisateur est 'johnB' :" #. type: Plain text -#: user-manual.txt:3519 +#: user-manual.txt:3560 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." @@ -7417,7 +7489,7 @@ msgstr "" "+dialout+." #. type: Plain text -#: user-manual.txt:3524 +#: user-manual.txt:3565 #, no-wrap msgid "" "Type: +id johnB+ This lists all the groups that johnB belongs to and\n" @@ -7433,7 +7505,7 @@ msgstr "" "parmi les différents IDs.\n" #. type: Plain text -#: user-manual.txt:3526 +#: user-manual.txt:3567 #, no-wrap msgid "" "Under some circumstances this change takes only effect (eg. on Ubuntu) after\n" @@ -7441,7 +7513,7 @@ msgid "" msgstr "Sous certaines circonstances, les modifications ne prennent effet qu'après une déconnexionpuis reconnexion sur l'ordinateur (sous Ubuntu, par exemple)." #. type: Plain text -#: user-manual.txt:3531 +#: user-manual.txt:3572 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 " @@ -7452,13 +7524,13 @@ msgstr "" "vous devriez pouvoir importer vos plongées." #. type: Title === -#: user-manual.txt:3534 +#: user-manual.txt:3575 #, no-wrap msgid "Manually setting up Bluetooth enabled devices" msgstr "" #. type: Plain text -#: user-manual.txt:3541 +#: user-manual.txt:3582 msgid "" "For dive computers communicating through Bluetooth like the Heinrichs " "Weikamp Frog or the Shearwater Predator and Petrel there is a different " @@ -7467,13 +7539,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3543 +#: user-manual.txt:3584 #, no-wrap msgid "*For the dive computer, after enabling Bluetooth, ensure it is in Upload mode.*\n" msgstr "" #. type: Plain text -#: user-manual.txt:3547 +#: user-manual.txt:3588 msgid "" "For Bluetooth pairing of the dive computer, refer to the manufacturer's user " "guide. When using a Shearwater Predator/Petrel, select _Dive Log -> Upload " @@ -7481,13 +7553,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3549 +#: user-manual.txt:3590 #, no-wrap msgid "*Pair the _Subsurface_ computer with the dive computer.*\n" msgstr "" #. type: Plain text -#: user-manual.txt:3558 +#: user-manual.txt:3599 msgid "" "Bluetooth is most likely already enabled. For pairing with the dive computer " "choose _Control Panel -> Bluetooth Devices -> Add Wireless Device_. This " @@ -7499,21 +7571,21 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3561 +#: user-manual.txt:3602 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:3564 +#: user-manual.txt:3605 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:3571 +#: user-manual.txt:3612 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. " @@ -7522,20 +7594,20 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3574 +#: user-manual.txt:3615 msgid "" "Once the pairing is completed the correct device is shown in the 'Device or " "Mount Point' drop-down in the _Subsurface_ *Import* dialog." msgstr "" #. type: Title ==== -#: user-manual.txt:3575 +#: user-manual.txt:3616 #, no-wrap msgid "On Linux" msgstr "Sur Linux" #. type: Plain text -#: user-manual.txt:3583 +#: user-manual.txt:3624 msgid "" "Ensure Bluetooth is enabled on the _Subsurface_ computer. On most common " "distributions this should be true out of the box and pairing should be " @@ -7548,7 +7620,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3587 +#: user-manual.txt:3628 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 " @@ -7557,23 +7629,23 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3589 +#: user-manual.txt:3630 msgid "Enable the Bluetooth controller and pair your dive computer" msgstr "" #. type: Plain text -#: user-manual.txt:3590 +#: user-manual.txt:3631 msgid "Establish an RFCOMM connection" msgstr "" #. type: Title ===== -#: user-manual.txt:3591 user-manual.txt:3730 +#: user-manual.txt:3632 user-manual.txt:3771 #, no-wrap msgid "Download the dives with Subsurface" msgstr "" #. type: Plain text -#: user-manual.txt:3597 +#: user-manual.txt:3638 msgid "" "Ensure the dive computer is in upload mode. On the _Shearwater Petrel_ and " "_Petrel 2_, cycle through the menu, select 'Dive Log', then 'Upload Log'. " @@ -7584,7 +7656,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3602 +#: user-manual.txt:3643 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 " @@ -7594,23 +7666,23 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3604 +#: user-manual.txt:3645 msgid "+sudo usermod -a -G dialout username+" msgstr "" #. type: Plain text -#: user-manual.txt:3606 +#: user-manual.txt:3647 msgid "Then log out and log in for the change to take effect." msgstr "" #. type: Title ===== -#: user-manual.txt:3607 +#: user-manual.txt:3648 #, no-wrap msgid "Enabling the Bluetooth controller and pairing your dive computer" msgstr "" #. type: Plain text -#: user-manual.txt:3613 +#: user-manual.txt:3654 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 " @@ -7621,14 +7693,14 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3616 +#: user-manual.txt:3657 msgid "" "If the graphical method didn't work, pair the device from the command line. " "Open a terminal and use +hciconfig+ to check the Bluetooth controller status" msgstr "" #. type: Plain text -#: user-manual.txt:3623 +#: user-manual.txt:3664 #, no-wrap msgid "" "\t$ hciconfig\n" @@ -7640,7 +7712,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3628 +#: user-manual.txt:3669 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 " @@ -7650,7 +7722,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3636 +#: user-manual.txt:3677 #, no-wrap msgid "" "\tsudo hciconfig hci0 up auth+ (enter password when prompted)\n" @@ -7663,25 +7735,25 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3638 +#: user-manual.txt:3679 msgid "Check that the status now includes +'UP', 'RUNNING' AND 'AUTH'+." msgstr "" #. type: Plain text -#: user-manual.txt:3640 +#: user-manual.txt:3681 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:3642 +#: user-manual.txt:3683 #, no-wrap msgid "\tsudo hciconfig hci1 down\n" msgstr "" #. type: Plain text -#: user-manual.txt:3645 +#: user-manual.txt:3686 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 " @@ -7689,7 +7761,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3666 +#: user-manual.txt:3707 #, no-wrap msgid "" "\tbluetoothctl\n" @@ -7715,14 +7787,14 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3669 +#: user-manual.txt:3710 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:3672 +#: user-manual.txt:3713 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-" @@ -7730,7 +7802,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3677 +#: user-manual.txt:3718 #, no-wrap msgid "" "\thcitool -i hci0 scanning\n" @@ -7740,89 +7812,89 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3679 +#: user-manual.txt:3720 msgid "Once ther dive computer is pired, set up the RFCOMM connection" msgstr "" #. type: Title ===== -#: user-manual.txt:3680 +#: user-manual.txt:3721 #, no-wrap msgid "Establishing the RFCOMM connection" msgstr "" #. type: Plain text -#: user-manual.txt:3683 +#: user-manual.txt:3724 msgid "The command to establish an RFCOMM connection is:" msgstr "" #. type: Plain text -#: user-manual.txt:3685 +#: user-manual.txt:3726 msgid "+sudo rfcomm -i <controller> connect <dev> <bdaddr> [channel]+" msgstr "" #. type: Plain text -#: user-manual.txt:3687 +#: user-manual.txt:3728 msgid "+<controller>+ is the Bluetooth controller, +hci0+." msgstr "" #. type: Plain text -#: user-manual.txt:3688 +#: user-manual.txt:3729 msgid "+<dev>+ is the RFCOMM device file, +rfcomm0+" msgstr "" #. type: Plain text -#: user-manual.txt:3689 +#: user-manual.txt:3730 msgid "+<bdaddr>+ is the dive computer's MAC address, +00:11:22:33:44:55+" msgstr "" #. type: Plain text -#: user-manual.txt:3690 +#: user-manual.txt:3731 msgid "" "+[channel]+ is the dive computer's Bluetooth channel we need to connect to." msgstr "" #. type: Plain text -#: user-manual.txt:3693 +#: user-manual.txt:3734 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:3695 +#: user-manual.txt:3736 msgid "_Shearwater Petrel 2_: channel 5" msgstr "" #. type: Plain text -#: user-manual.txt:3696 +#: user-manual.txt:3737 msgid "_Shearwater Petrel 1_: channel 1" msgstr "" #. type: Plain text -#: user-manual.txt:3697 +#: user-manual.txt:3738 msgid "_Heinrichs-Weikamp OSTC Sport_: channel 1" msgstr "" #. type: Plain text -#: user-manual.txt:3699 +#: user-manual.txt:3740 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:3701 +#: user-manual.txt:3742 #, 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:3703 +#: user-manual.txt:3744 msgid "This gives the response:" msgstr "" #. type: Plain text -#: user-manual.txt:3706 +#: user-manual.txt:3747 #, no-wrap msgid "" "\tConnected /dev/rfcomm0 to 00:11:22:33:44:55 on channel 5\n" @@ -7830,14 +7902,14 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3708 +#: user-manual.txt:3749 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:3712 +#: user-manual.txt:3753 #, no-wrap msgid "" "\tsudo rfcomm -i hci0 connect rfcomm0 00:11:22:33:44:55 (enter a password, probably 0000, when prompted)\n" @@ -7846,7 +7918,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3716 +#: user-manual.txt:3757 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 " @@ -7855,7 +7927,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3726 +#: user-manual.txt:3767 #, no-wrap msgid "" "\tsdptool -i hci0 records 00:11:22:33:44:55\n" @@ -7870,7 +7942,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3729 +#: user-manual.txt:3770 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 " @@ -7878,7 +7950,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3732 +#: user-manual.txt:3773 msgid "" "After establishing the RFCOMM connection and while the dive computer's " "upload mode countdown is still running, go to_Subsurface_, select _Import-" @@ -7888,25 +7960,25 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:3738 +#: user-manual.txt:3779 #, no-wrap msgid "APPENDIX B: Dive Computer specific information for importing dive data." msgstr "" #. type: Title === -#: user-manual.txt:3741 +#: user-manual.txt:3782 #, no-wrap msgid "Importing from Uemis Zurich" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:3743 +#: user-manual.txt:3784 #, no-wrap msgid "images/icons/iumis.jpg" msgstr "images/icons/iumis.jpg" #. type: Plain text -#: user-manual.txt:3759 +#: user-manual.txt:3800 msgid "" "_Subsurface_ downloads the information stored on the SDA (the built-in file " "system of the Uemis) including information about dive spots and equipment. " @@ -7922,7 +7994,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3774 +#: user-manual.txt:3815 msgid "" "After selecting the above device name, download the dives from the Uemis " "Zurich. One technical issue with the Uemis Zurich download implementation " @@ -7939,19 +8011,19 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3776 +#: user-manual.txt:3817 #, no-wrap msgid "Importing from Uwatec Galileo" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:3778 +#: user-manual.txt:3819 #, no-wrap msgid "images/icons/Galileo.jpg" msgstr "images/icons/Galileo.jpg" #. type: Plain text -#: user-manual.txt:3793 +#: user-manual.txt:3834 msgid "" "The Uwatec Galileo dive computers use infra red (IrDA) communication between " "the dive computer and Subsurface. The Uwatec hardware uses a USB dongle " @@ -7967,14 +8039,14 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3796 +#: user-manual.txt:3837 msgid "" "After executing this command, Subsurface will recognise the Galileo dive " "computer and download dive information." msgstr "" #. type: Plain text -#: user-manual.txt:3802 +#: user-manual.txt:3843 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/" @@ -7984,26 +8056,26 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3805 +#: user-manual.txt:3846 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:3807 +#: user-manual.txt:3848 #, no-wrap msgid "Importing from Heinrichs Weikamp DR5" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:3809 +#: user-manual.txt:3850 #, no-wrap msgid "images/icons/HW_DR5.jpg" msgstr "images/icons/HW_DR5.jpg" #. type: Plain text -#: user-manual.txt:3819 +#: user-manual.txt:3860 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. " @@ -8016,19 +8088,19 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3822 +#: user-manual.txt:3863 #, no-wrap msgid "Importing from xDEEP BLACK" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:3824 +#: user-manual.txt:3865 #, no-wrap msgid "images/icons/HW_xdeepblack.jpg" msgstr "images/icons/HW_xdeepblack.jpg" #. type: Plain text -#: user-manual.txt:3833 +#: user-manual.txt:3874 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 " @@ -8042,19 +8114,19 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3835 +#: user-manual.txt:3876 #, no-wrap msgid "Importing from Shearwater Predator/Petrel using Bluetooth" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:3837 +#: user-manual.txt:3878 #, no-wrap msgid "images/icons/predator.jpg" msgstr "images/icons/predator.jpg" #. type: Plain text -#: user-manual.txt:3840 +#: user-manual.txt:3881 msgid "" "Specific instructions for downloading dives using Bluetooth are given in the " "section above, <<S_Bluetooth,_Connecting Subsurface to a Bluetooth-enabled " @@ -8062,19 +8134,19 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3842 +#: user-manual.txt:3883 #, no-wrap msgid "Importing from Poseidon MkVI Discovery" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:3844 +#: user-manual.txt:3885 #, no-wrap msgid "images/MkVI.jpeg" msgstr "images/MkVI.jpeg" #. type: Plain text -#: user-manual.txt:3852 +#: user-manual.txt:3893 msgid "" "Download of dive logs from the MkVI is performed using a custom " "communications adapter and the _Poseidon PC Configuration Software_, " @@ -8086,45 +8158,45 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3855 +#: user-manual.txt:3896 msgid "" "Setup configuration for the dive and key dive parameters (file with a .txt " "extension)" msgstr "" #. type: Plain text -#: user-manual.txt:3856 +#: user-manual.txt:3897 msgid "Dive log details (file with a .csv extension)" msgstr "" #. type: Plain text -#: user-manual.txt:3858 +#: user-manual.txt:3899 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:3860 +#: user-manual.txt:3901 msgid "" "_Subsurface_ accesses the .txt and the .csv files to obtain dive log " "information." msgstr "" #. type: Title === -#: user-manual.txt:3862 +#: user-manual.txt:3903 #, no-wrap msgid "Importing from APD Inspiration/Evolution CCR" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:3864 +#: user-manual.txt:3905 #, no-wrap msgid "images/APDComputer.jpg" msgstr "images/APDComputer.jpg" #. type: Plain text -#: user-manual.txt:3872 +#: user-manual.txt:3913 msgid "" "The dive logs of an APD Inspiration or similar CCR dive computer are " "downloaded using a communications adapter and _AP Communicator_, obtained " @@ -8136,55 +8208,55 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3874 +#: user-manual.txt:3915 msgid "Download the dive using _AP Communicator_." msgstr "" #. type: Plain text -#: user-manual.txt:3875 +#: user-manual.txt:3916 msgid "Open a dive within the _AP Log Viewer_." msgstr "" #. type: Plain text -#: user-manual.txt:3876 +#: user-manual.txt:3917 msgid "Select the tab at the top of the screen, entitled \"_Data_\"." msgstr "" #. type: Plain text -#: user-manual.txt:3877 +#: user-manual.txt:3918 msgid "" "With the raw dive log data show on the screen, click on \"_Copy to Clipboard_" "\"." msgstr "" #. type: Plain text -#: user-manual.txt:3878 +#: user-manual.txt:3919 msgid "Open a text editor, e.g. Notepad (Windows) or TextWrangler (Mac)." msgstr "" #. type: Plain text -#: user-manual.txt:3880 +#: user-manual.txt:3921 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:3881 +#: user-manual.txt:3922 msgid "" "Within _Subsurface_, select _Import -> Import log files_ to open the xref:" "Unified_import[universal import dialogue]." msgstr "" #. type: Plain text -#: user-manual.txt:3882 +#: user-manual.txt:3923 msgid "" "In the dropdown list towards the bottom right of the dialogue (labled " "'Filter:'), select \"APD log viewer\"." msgstr "" #. type: Plain text -#: user-manual.txt:3885 +#: user-manual.txt:3926 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 " @@ -8193,13 +8265,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:3886 +#: user-manual.txt:3927 #, no-wrap msgid "images/APD_CSVimportF22.jpg" msgstr "images/APD_CSVimportF22.jpg" #. type: Plain text -#: user-manual.txt:3894 +#: user-manual.txt:3935 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 " @@ -8211,12 +8283,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3895 +#: user-manual.txt:3936 msgid "Click the _Ok_ button at the bottom of the import panel." msgstr "" #. type: Plain text -#: user-manual.txt:3900 +#: user-manual.txt:3941 msgid "" "The APD dive log will appear within _Subsurface_. The dive computer-" "generated ceiling generated by the Inspiration can be viewed by selecting " @@ -8226,13 +8298,13 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:3901 +#: user-manual.txt:3942 #, no-wrap msgid "APPENDIX C: Exporting Dive log information from external dive log software." msgstr "" #. type: Plain text -#: user-manual.txt:3910 +#: user-manual.txt:3951 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, " @@ -8242,22 +8314,22 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3912 +#: user-manual.txt:3953 msgid "Export the foreign dive log data to format that is accessible from" msgstr "" #. type: Plain text -#: user-manual.txt:3913 +#: user-manual.txt:3954 msgid "_Subsurface_." msgstr "" #. type: Plain text -#: user-manual.txt:3914 +#: user-manual.txt:3955 msgid "Import the accessible dive log data into _Subsurface_." msgstr "" #. type: Plain text -#: user-manual.txt:3918 +#: user-manual.txt:3959 msgid "" "This appendix provides some information about approaches to export dive log " "data from foreign dive log software. The procedures below mostly apply to " @@ -8265,19 +8337,19 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3920 +#: user-manual.txt:3961 #, no-wrap msgid "Exporting from *Suunto Divemanager (DM3, DM4 or DM5)*" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:3921 +#: user-manual.txt:3962 #, no-wrap msgid "images/icons/suuntologo.jpg" msgstr "images/icons/suuntologo.jpg" #. type: Plain text -#: user-manual.txt:3928 +#: user-manual.txt:3969 msgid "" "DiveManager is a MS Windows application for Suunto dive computers. " "Divemanager 3 (DM3) is an older version of the Suunto software. More recent " @@ -8287,66 +8359,66 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3930 +#: user-manual.txt:3971 #, no-wrap msgid "*Divemanager 3 (DM3):*\n" msgstr "" #. type: Plain text -#: user-manual.txt:3932 +#: user-manual.txt:3973 msgid "" "Start 'Suunto Divemanager 3' and log in with the name containing the logs" msgstr "" #. type: Plain text -#: user-manual.txt:3933 +#: user-manual.txt:3974 msgid "Do not start the import wizard to import dives from the dive computer." msgstr "" #. type: Plain text -#: user-manual.txt:3935 +#: user-manual.txt:3976 msgid "" "In the navigation tree on the left side of the program-window, select the " "appropriate dives." msgstr "" #. type: Plain text -#: user-manual.txt:3936 +#: user-manual.txt:3977 msgid "" "Within the list of dives, select the dives you would like to import later:" msgstr "" #. type: Plain text -#: user-manual.txt:3937 +#: user-manual.txt:3978 msgid "To select certain dives: hold 'ctrl' and click the dive" msgstr "" #. type: Plain text -#: user-manual.txt:3939 +#: user-manual.txt:3980 msgid "" "To select all dives: Select the first dive, hold down shift and select the " "last dive" msgstr "" #. type: Plain text -#: user-manual.txt:3940 +#: user-manual.txt:3981 msgid "With the dives marked, use the program menu _File -> Export_" msgstr "" #. type: Plain text -#: user-manual.txt:3941 +#: user-manual.txt:3982 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:3942 +#: user-manual.txt:3983 msgid "Click the browse button next to the field Export Path" msgstr "" #. type: Plain text -#: user-manual.txt:3944 +#: user-manual.txt:3985 #, no-wrap msgid "" "** A file-manager like window pops up\n" @@ -8354,13 +8426,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3945 +#: user-manual.txt:3986 #, no-wrap msgid "Divelog.SDE file\n" msgstr "" #. type: Plain text -#: user-manual.txt:3947 +#: user-manual.txt:3988 #, no-wrap msgid "" "** Optionally change the name of the file for saving\n" @@ -8368,25 +8440,25 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3948 +#: user-manual.txt:3989 #, no-wrap msgid "Back in the Export pop-up, press the button 'Export'\n" msgstr "" #. type: Plain text -#: user-manual.txt:3949 +#: user-manual.txt:3990 #, no-wrap msgid "The dives are now exported to the file Divelog.SDE.\n" msgstr "" #. type: Plain text -#: user-manual.txt:3951 +#: user-manual.txt:3992 #, no-wrap msgid "*Divemanager 4 (DM4) and Divemanager 5 (DM5):*\n" msgstr "" #. type: Plain text -#: user-manual.txt:3956 +#: user-manual.txt:3997 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 " @@ -8395,81 +8467,81 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3958 +#: user-manual.txt:3999 msgid "Locating the Suunto DM4 (or DM5) database:" msgstr "" #. type: Plain text -#: user-manual.txt:3960 user-manual.txt:3969 +#: user-manual.txt:4001 user-manual.txt:4010 msgid "Start Suunto DM4/DM5" msgstr "" #. type: Plain text -#: user-manual.txt:3961 +#: user-manual.txt:4002 msgid "Select 'Help -> About'" msgstr "" #. type: Plain text -#: user-manual.txt:3962 +#: user-manual.txt:4003 msgid "Click 'Copy' after text 'Copy log folder path to clipboard'" msgstr "" #. type: Plain text -#: user-manual.txt:3963 +#: user-manual.txt:4004 msgid "Now open Windows Explorer" msgstr "" #. type: Plain text -#: user-manual.txt:3964 +#: user-manual.txt:4005 msgid "Paste the address to the path box at the top of the File Explorer" msgstr "" #. type: Plain text -#: user-manual.txt:3965 +#: user-manual.txt:4006 msgid "The database is called DM4.db or DM5.db" msgstr "" #. type: Plain text -#: user-manual.txt:3967 +#: user-manual.txt:4008 msgid "Making a backup copy of the Suunto DM4/DM5 database:" msgstr "" #. type: Plain text -#: user-manual.txt:3970 +#: user-manual.txt:4011 msgid "Select 'File - Create backup'" msgstr "" #. type: Plain text -#: user-manual.txt:3972 +#: user-manual.txt:4013 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:3973 +#: user-manual.txt:4014 msgid "Click 'Save'" msgstr "" #. type: Plain text -#: user-manual.txt:3974 +#: user-manual.txt:4015 msgid "The dives are now exported to the file DM4.bak (or DM5.bak)" msgstr "" #. type: Title === -#: user-manual.txt:3976 +#: user-manual.txt:4017 #, no-wrap msgid "Exporting from Atomic Logbook" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:3979 +#: user-manual.txt:4020 #, no-wrap msgid "images/icons/atomiclogo.jpg" msgstr "images/icons/atomiclogo.jpg" #. type: Plain text -#: user-manual.txt:3986 +#: user-manual.txt:4027 msgid "" "Atomic Logbook is a Windows software by Atomic Aquatics. It allows " "downloading of dive information from Cobalt and Cobalt 2 dive computers. " @@ -8479,19 +8551,19 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3988 +#: user-manual.txt:4029 #, no-wrap msgid "Exporting from Mares Dive Organiser V2.1" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:3991 +#: user-manual.txt:4032 #, no-wrap msgid "images/icons/mareslogo.jpg" msgstr "images/icons/mareslogo.jpg" #. type: Plain text -#: user-manual.txt:3999 +#: user-manual.txt:4040 msgid "" "Mares Dive Organiser is a Windows application. The dive log is kept as a " "Microsoft SQL Compact Edition database with a '.sdf' filename extension. The " @@ -8502,7 +8574,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4004 +#: user-manual.txt:4045 msgid "" "Within Dive Organiser, select _Database -> Backup_ from the main menu and " "back up the database to the desk top. This creates a zipped file " @@ -8510,36 +8582,36 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4007 +#: user-manual.txt:4048 msgid "" "Rename the file to DiveOrganiserxxxxx.zip. Inside the zipped directory is a " "file _DiveOrganiser.sdf_." msgstr "" #. type: Plain text -#: user-manual.txt:4008 +#: user-manual.txt:4049 msgid "Extract the _.sdf_ file from the zipped folder to your Desktop." msgstr "" #. type: Plain text -#: user-manual.txt:4009 +#: user-manual.txt:4050 msgid "The password for accessing the .zip file is _mares_." msgstr "" #. type: Title === -#: user-manual.txt:4011 +#: user-manual.txt:4052 #, no-wrap msgid "Exporting from *DivingLog 5.0 and 6.0*" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4013 +#: user-manual.txt:4054 #, no-wrap msgid "images/icons/divingloglogo.jpg" msgstr "images/icons/divingloglogo.jpg" #. type: Plain text -#: user-manual.txt:4020 +#: user-manual.txt:4061 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 " @@ -8549,37 +8621,37 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4022 +#: user-manual.txt:4063 msgid "To transfer all files from DivingLog to Subsurface, do the following:" msgstr "" #. type: Plain text -#: user-manual.txt:4024 +#: user-manual.txt:4065 msgid "In DivingLog open the 'File -> Export -> SQLite' menu" msgstr "" #. type: Plain text -#: user-manual.txt:4025 +#: user-manual.txt:4066 msgid "Select 'Settings' button" msgstr "" #. type: Plain text -#: user-manual.txt:4026 +#: user-manual.txt:4067 msgid "Set the 'RTF2Plaintext' to 'true'" msgstr "" #. type: Plain text -#: user-manual.txt:4027 +#: user-manual.txt:4068 msgid "Close the Settings dialog" msgstr "" #. type: Plain text -#: user-manual.txt:4028 +#: user-manual.txt:4069 msgid "Click 'Export' button and select the filename" msgstr "" #. type: Plain text -#: user-manual.txt:4032 +#: user-manual.txt:4073 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 " @@ -8587,13 +8659,13 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:4033 +#: user-manual.txt:4074 #, 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:4043 +#: user-manual.txt:4084 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 " @@ -8614,7 +8686,7 @@ msgstr "" "selon le tableur utilisé." #. type: Plain text -#: user-manual.txt:4049 +#: user-manual.txt:4090 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 " @@ -8632,19 +8704,19 @@ msgstr "" "règles simples :" #. type: Plain text -#: user-manual.txt:4051 +#: user-manual.txt:4092 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:4052 +#: user-manual.txt:4093 msgid "Duration: the format should be minutes:seconds." msgstr "Durée : le format est minutes:secondes." #. type: Plain text -#: user-manual.txt:4053 +#: user-manual.txt:4094 msgid "" "Unit system: only one unit system should be used (i.e., no mixture between " "imperial and metric units)" @@ -8653,26 +8725,26 @@ msgstr "" "entre les unités impériales et métriques)" #. type: Plain text -#: user-manual.txt:4054 +#: user-manual.txt:4095 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:4055 +#: user-manual.txt:4096 msgid "GPS position: users must use decimal degrees, e.g. 30.22496 30.821798" msgstr "" "Position GPS : vous devez utiliser les degrés décimaux, par exemple : " "30.22496 30.821798" #. type: Title === -#: user-manual.txt:4056 +#: user-manual.txt:4097 #, no-wrap msgid "_LibreOffice Calc_ and _OpenOffice Calc_" msgstr "_LibreOffice Calc_ et _OpenOffice Calc_" #. type: Plain text -#: user-manual.txt:4060 +#: user-manual.txt:4101 msgid "" "These are open source spreadsheet applications forming parts of larger open " "source office suite applications. The user interaction with _LibreOffice_ " @@ -8683,13 +8755,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:4061 +#: user-manual.txt:4102 #, no-wrap msgid "images/LOffice_spreadsheetdata.jpg" msgstr "images/LOffice_spreadsheetdata.jpg" #. type: Plain text -#: user-manual.txt:4064 +#: user-manual.txt:4105 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 " @@ -8697,13 +8769,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:4065 +#: user-manual.txt:4106 #, no-wrap msgid "images/LOffice_save_as_options.jpg" msgstr "images/LOffice_save_as_options.jpg" #. type: Plain text -#: user-manual.txt:4068 +#: user-manual.txt:4109 msgid "" "After selecting _Save_, select the appropriate field delimiter (choose _Tab_ " "to prevent conflicts with the comma when using this as a decimal point), " @@ -8711,13 +8783,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:4069 +#: user-manual.txt:4110 #, no-wrap msgid "images/LOffice_field_options.jpg" msgstr "images/LOffice_field_options.jpg" #. type: Plain text -#: user-manual.txt:4072 +#: user-manual.txt:4113 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:" @@ -8725,13 +8797,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4073 +#: user-manual.txt:4114 #, no-wrap msgid "Microsoft _Excel_" msgstr "Microsoft _Excel_" #. type: Plain text -#: user-manual.txt:4079 +#: user-manual.txt:4120 msgid "" "The field delimiter (called \"_list separator_\" in Microsoft manuals) is " "not accessible from within _Excel_ and needs to be set through the " @@ -8742,19 +8814,19 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4081 +#: user-manual.txt:4122 msgid "" "In Microsoft Windows, click the *Start* button, and then select _Control " "Panel_ from the list on the right-hand side." msgstr "" #. type: Plain text -#: user-manual.txt:4082 +#: user-manual.txt:4123 msgid "Open the _Regional and Language Options_ dialog box." msgstr "" #. type: Plain text -#: user-manual.txt:4085 +#: user-manual.txt:4126 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 " @@ -8762,48 +8834,48 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4086 +#: user-manual.txt:4127 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:4087 +#: user-manual.txt:4128 msgid "Click _OK_ twice." msgstr "" #. type: Plain text -#: user-manual.txt:4089 +#: user-manual.txt:4130 msgid "Below is an image of the _Control Panel_:" msgstr "" #. type: Target for macro image -#: user-manual.txt:4090 +#: user-manual.txt:4131 #, no-wrap msgid "images/Win_SaveCSV2.jpg" msgstr "images/Win_SaveCSV2.jpg" #. type: Plain text -#: user-manual.txt:4093 +#: user-manual.txt:4134 msgid "To export the dive log in CSV format:" msgstr "" #. type: Plain text -#: user-manual.txt:4095 +#: user-manual.txt:4136 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:4096 +#: user-manual.txt:4137 #, no-wrap msgid "images/Win_SaveCSV1.jpg" msgstr "images/Win_SaveCSV1.jpg" #. type: Plain text -#: user-manual.txt:4099 +#: user-manual.txt:4140 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 " @@ -8813,13 +8885,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:4100 +#: user-manual.txt:4141 #, no-wrap msgid "images/Win_SaveCSV3.jpg" msgstr "images/Win_SaveCSV3.jpg" #. type: Plain text -#: user-manual.txt:4103 +#: user-manual.txt:4144 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 " @@ -8828,13 +8900,13 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:4105 +#: user-manual.txt:4146 #, 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:4110 +#: user-manual.txt:4151 msgid "" "_Subsurface_ provides a mechanism to create or modify templates for printing " "dive logs in order to produce customised printouts of dive logs. Templates, " @@ -8843,34 +8915,35 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4112 +#: user-manual.txt:4153 msgid "Templates are accessed using the print dialogue (see image *B* below)." msgstr "" #. type: Plain text -#: user-manual.txt:4120 +#: user-manual.txt:4161 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 " -"the _Custom_ template from the template dropdown list in the print dialogue " -"(see image *B* above), then select _Edit_." +"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:4122 +#: user-manual.txt:4163 msgid "The Edit Panel comprises three tabs:" msgstr "" #. type: Target for macro image -#: user-manual.txt:4123 +#: user-manual.txt:4164 #, no-wrap msgid "images/Template1_f22.jpg" msgstr "images/Template1_f22.jpg" #. type: Plain text -#: user-manual.txt:4127 +#: user-manual.txt:4168 msgid "" "The _Style_ tab (image *A* above) controls the font, line spacing and colour " "template used for printing the dive log. The style attributes are editable. " @@ -8878,7 +8951,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4131 +#: user-manual.txt:4172 msgid "" "The _Colors_ tab (image *B* above) allows editing the colours used for " "printing the dive log. The colours are highly customisable: the _Edit_ " @@ -8887,7 +8960,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4140 +#: user-manual.txt:4181 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. " @@ -8903,47 +8976,48 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:4141 +#: user-manual.txt:4182 #, no-wrap msgid "images/Template2_f22.jpg" msgstr "images/Template2_f22.jpg" #. type: Plain text -#: user-manual.txt:4144 +#: user-manual.txt:4186 msgid "" "One can adapt any of the existing templates and save it to the dive log " "directory. The standard templates (e.g. One dive, Six dives, Table) can be " -"modified in this way." +"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:4146 +#: user-manual.txt:4188 msgid "" "To write a custom template the following elements must exist so that the " "template will be correctly handled and rendered." msgstr "" #. type: Title === -#: user-manual.txt:4147 +#: user-manual.txt:4189 #, no-wrap msgid "Main dive loop" msgstr "" #. type: Plain text -#: user-manual.txt:4149 +#: user-manual.txt:4191 msgid "" "_Subsurface_ exports a dive list called (*dives*) to the _Grantlee_ backend. " "It is possible to iterate over the list as follows:" msgstr "" #. type: Block title -#: user-manual.txt:4150 user-manual.txt:4204 user-manual.txt:4221 +#: user-manual.txt:4192 user-manual.txt:4246 user-manual.txt:4263 #, no-wrap msgid "template.html" msgstr "" #. type: delimited block . -#: user-manual.txt:4155 +#: user-manual.txt:4197 #, no-wrap msgid "" "\t{% for dive in dives %}\n" @@ -8952,13 +9026,13 @@ msgid "" msgstr "" #. type: Block title -#: user-manual.txt:4157 user-manual.txt:4209 user-manual.txt:4228 +#: user-manual.txt:4199 user-manual.txt:4251 user-manual.txt:4270 #, no-wrap msgid "output.html" msgstr "" #. type: delimited block . -#: user-manual.txt:4162 +#: user-manual.txt:4204 #, no-wrap msgid "" "\t<h1> 1 </h1>\n" @@ -8967,25 +9041,25 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4165 +#: user-manual.txt:4207 msgid "" "Additional information about _Grantlee_ can be found http://www.grantlee.org/" "apidox/for_themers.html[here]" msgstr "" #. type: Title === -#: user-manual.txt:4166 +#: user-manual.txt:4208 #, no-wrap msgid "Grantlee exported variables" msgstr "" #. type: Plain text -#: user-manual.txt:4168 +#: user-manual.txt:4210 msgid "Only a subset of the dive data is exported:" msgstr "" #. type: delimited block | -#: user-manual.txt:4186 +#: user-manual.txt:4228 #, no-wrap msgid "" "|*Name*|*Description*\n" @@ -9008,7 +9082,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4190 +#: user-manual.txt:4232 msgid "" "_Subsurface_ also exports *template_options* data. This data must be used as " "_CSS_ values to provide a dynamically editable template. The exported data " @@ -9016,7 +9090,7 @@ msgid "" msgstr "" #. type: delimited block | -#: user-manual.txt:4202 +#: user-manual.txt:4244 #, no-wrap msgid "" "|*Name*|*Description*\n" @@ -9033,26 +9107,26 @@ msgid "" msgstr "" #. type: delimited block . -#: user-manual.txt:4207 +#: user-manual.txt:4249 #, no-wrap msgid "\tborder-width: {{ template_options.borderwidth }}px;\n" msgstr "" #. type: delimited block . -#: user-manual.txt:4212 +#: user-manual.txt:4254 #, no-wrap msgid "\tborder-width: 3px;\n" msgstr "" #. type: Plain text -#: user-manual.txt:4215 +#: user-manual.txt:4257 msgid "" "Another variable that _Subsurface_ exports is *print_options*. This variable " "contains a single member:" msgstr "" #. type: delimited block | -#: user-manual.txt:4218 +#: user-manual.txt:4260 #, no-wrap msgid "" "|*Name*|*Description*\n" @@ -9060,7 +9134,7 @@ msgid "" msgstr "" #. type: delimited block . -#: user-manual.txt:4226 +#: user-manual.txt:4268 #, no-wrap msgid "" "\tbody {\n" @@ -9069,7 +9143,7 @@ msgid "" msgstr "" #. type: delimited block . -#: user-manual.txt:4233 +#: user-manual.txt:4275 #, no-wrap msgid "" "\tbody {\n" @@ -9078,13 +9152,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4235 +#: user-manual.txt:4277 #, no-wrap msgid "Defined CSS selectors" msgstr "" #. type: Plain text -#: user-manual.txt:4239 +#: user-manual.txt:4281 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 " @@ -9092,7 +9166,7 @@ msgid "" msgstr "" #. type: delimited block | -#: user-manual.txt:4246 +#: user-manual.txt:4288 #, no-wrap msgid "" "|*Selector*|*Type*|*Description*\n" @@ -9103,20 +9177,20 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4249 +#: user-manual.txt:4291 msgid "" "Rendering dive profiles is not supported for flow layout templates (when " "data-numberofdives = 0)." msgstr "" #. type: Title === -#: user-manual.txt:4250 +#: user-manual.txt:4292 #, no-wrap msgid "Special attributes" msgstr "" #. type: Plain text -#: user-manual.txt:4254 +#: user-manual.txt:4296 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 " @@ -9124,55 +9198,55 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4256 +#: user-manual.txt:4298 msgid "" "The *data-numberofdives* data attribute is added to the body tag to set the " "rendering mode" msgstr "" #. type: Plain text -#: user-manual.txt:4258 +#: user-manual.txt:4300 msgid "render 6 dives per page:" msgstr "" #. type: delimited block . -#: user-manual.txt:4261 +#: user-manual.txt:4303 #, no-wrap msgid "\t<body data-numberofdives = 6>\n" msgstr "" #. type: Plain text -#: user-manual.txt:4264 +#: user-manual.txt:4306 msgid "render as much dives as possible:" msgstr "" #. type: delimited block . -#: user-manual.txt:4267 +#: user-manual.txt:4309 #, no-wrap msgid "\t<body data-numberofdives = 0>\n" msgstr "" #. type: Plain text -#: user-manual.txt:4270 +#: user-manual.txt:4312 msgid "" "All CSS units should be in relative lengths only, to support printing on any " "page size." msgstr "" #. type: Title == -#: user-manual.txt:4271 +#: user-manual.txt:4313 #, no-wrap msgid "APPENDIX F: FAQs." msgstr "" #. type: Title === -#: user-manual.txt:4273 +#: user-manual.txt:4315 #, no-wrap msgid "Subsurface appears to miscalculate gas consumption and SAC" msgstr "" #. type: Plain text -#: user-manual.txt:4277 +#: user-manual.txt:4319 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_ " @@ -9180,7 +9254,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4283 +#: user-manual.txt:4325 msgid "" "'Answer': Not really. What happens is that _Subsurface_ actually calculates " "gas consumption differently - and better - than you expect. In particular, " @@ -9190,7 +9264,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4289 +#: user-manual.txt:4331 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 " @@ -9200,12 +9274,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4291 +#: user-manual.txt:4333 msgid "+consumption = (amount_of_air_at_beginning - amount_of_air_at_end)+" msgstr "" #. type: Plain text -#: user-manual.txt:4297 +#: user-manual.txt:4339 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 " @@ -9216,12 +9290,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4299 +#: user-manual.txt:4341 msgid "+12.2*((220-100)/1.013)+" msgstr "" #. type: Plain text -#: user-manual.txt:4304 +#: user-manual.txt:4346 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 " @@ -9231,7 +9305,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4310 +#: user-manual.txt:4352 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 " @@ -9242,13 +9316,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4311 +#: user-manual.txt:4353 #, no-wrap msgid "Some dive profiles have time discrepancies with the recorded samples from my dive computer..." msgstr "" #. type: Plain text -#: user-manual.txt:4315 +#: user-manual.txt:4357 msgid "" "_Subsurface_ ends up ignoring surface time for many things (average depth, " "divetime, SAC, etc). 'Question': Why do dive durations in my dive computer " @@ -9256,7 +9330,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4323 +#: user-manual.txt:4365 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 " @@ -9270,13 +9344,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4324 +#: user-manual.txt:4366 #, no-wrap msgid "Some dive profiles are missing from the download" msgstr "" #. type: Plain text -#: user-manual.txt:4330 +#: user-manual.txt:4372 msgid "" "'Question': I cannot download all my dives, only the most recent ones even " "though my dive computer's manual states that it records history of e.g. 999 " @@ -9284,7 +9358,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4339 +#: user-manual.txt:4381 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 " @@ -9297,7 +9371,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4343 +#: user-manual.txt:4385 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 " diff --git a/Documentation/user-manual_fr.html.git b/Documentation/user-manual_fr.html.git index b5941a17d..ac9c1b39e 100644 --- a/Documentation/user-manual_fr.html.git +++ b/Documentation/user-manual_fr.html.git @@ -383,9 +383,9 @@ install: function(toclevels) { function reinstallAndRemoveTimer() {
clearInterval(timerId);
- reinstall();
- }
-
+ reinstall(); + } + timerId = setInterval(reinstall, 500); if (document.addEventListener) document.addEventListener("DOMContentLoaded", reinstallAndRemoveTimer, false); @@ -435,16 +435,16 @@ Utilisez-vous deux marques différentes d’ordinateurs de plongée, chacun ces enregistrements dans un système unique. </p> </li> -<li>
-<p>
-Utilisez-vous plus d’un système d’exploitation ? <em>Subsurface</em> est
+<li> +<p> +Utilisez-vous plus d’un système d’exploitation ? <em>Subsurface</em> 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.
</p>
-</li>
-<li>
-<p>
+</li> +<li> +<p> Utilisez-vous Linux ou Mac et votre ordinateur de plongée n’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’analyser @@ -476,15 +476,15 @@ installer le logiciel, consultez la page <em>Téléchargement</em> sur le 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
-dépendances, merci de consulter le fichier INSTALL inclus dans les sources
-logicielles.</p></div>
+des instructions de compilation du logiciel et (si besoin) de ses +dépendances, merci de consulter le fichier INSTALL inclus dans les sources +logicielles.</p></div> <div class="paragraph"><p><strong>Public</strong> : Plongeurs loisirs, apnéistes, plongeurs Tek et plongeurs
professionnels</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 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="sect1"> <h2 id="S_UserSurvey">1. Utilisation de ce manuel</h2> <div class="sectionbody"> @@ -757,18 +757,18 @@ 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.</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
+<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>
+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’s PC, which can be achieved by following these steps:</p></div> <div class="olist arabic"><ol class="arabic"> @@ -798,7 +798,7 @@ In <em>Subsurface</em>, from the Main Menu, select <em>Import → Import Fro </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 divecomputer allows this, <em>Subsurface</em> only imports dives +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> @@ -814,9 +814,9 @@ The dialogue has two drop-down lists, <strong>Vendor</strong> and <strong>Dive C </li> <li> <p> -The <strong>Device or Mount Point</strong> drop-down list contains the USB or Bluetooth
- port name that <em>Subsurface</em> needs in order to communicate with the dive
- computer. The appropriate port name must be selected. Consult
+The <strong>Device or Mount Point</strong> drop-down list contains the USB or Bluetooth + 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
@@ -830,9 +830,9 @@ The <strong>Device or Mount Point</strong> drop-down list contains the USB or Bl <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
+ 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 @@ -871,7 +871,7 @@ Then select the <em>Download</em> button. With communication established, one c 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 righthand side of the dialogue (see image + 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, @@ -895,9 +895,9 @@ If there is a problem in communicating with the dive computer, an error </li> </ul></div> <div class="sidebarblock"> -<div class="content">
-<div class="paragraph"><p><strong>PROBLEMS WITH DATA DOWNLOAD FROM A DIVE COMPUTER?</strong></p></div>
-<div class="admonitionblock">
+<div class="content"> +<div class="paragraph"><p><strong>PROBLEMS WITH DATA DOWNLOAD FROM A DIVE COMPUTER?</strong></p></div> +<div class="admonitionblock"> <table><tr>
<td class="icon">
<img src="images/icons/important.png" alt="Important" />
@@ -964,9 +964,9 @@ checked, no dives are added to the <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:
+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> @@ -1014,7 +1014,7 @@ computer</em> from the <strong>Main Menu</strong>. If one checks the check box l </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 righthand side, On the lefthand +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 @@ -1080,13 +1080,13 @@ downloaded dives are shown on the righthand side of the download dialogue.</p></ </div> </div> <div class="paragraph"><p>On <em>Windows</em> platforms the <em>Local Bluetooth device details section</em> on the -left is not displayed. To successfully initiate a scan (by pressing the +right is not displayed. 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.</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 setup your DC device</em>. Always allow this pairing. After 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> @@ -1167,7 +1167,7 @@ information. The <strong>Time</strong> field reflects the date and time of the clicking the date, a calendar is displayed from which one can choose the correct date. Press ESC to close the calendar. The time values (hour and minutes) can also be edited directly by clicking on each of them in the text -box and by overtyping the information displayed.</p></div> +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. @@ -1178,26 +1178,43 @@ If editing is required, only a value is required, the units of temperature will automatically supplied by <em>Subsurface</em> (following the <em>Preferences</em>, metric or imperial units will be used).</p></div> -<div class="paragraph"><p><strong>Location</strong>: Here the name of the dive site can be entered, e.g. "Tihany, Lake -Balaton, Hungary". Dive locations are managed as a separate part of the dive log. -After entering the information for a particular dive site, and several dives are -performed at the same location, the information is re-used without requiring -full dive site information again. Existing dive location information -can be edited at any time by selecting (on the <strong>Dive List</strong> panel) a dive performed at that site -and by opening the location information by clicking the globe button on the -right of the location name (see image on the right, above). When entering a dive location name, auto location of -dive site names makes it easy to select a dive site that already exists in the dive log -(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.</p></div> -<div class="paragraph"><p>If the present dive site has not been used before, a message appears as -follows (image <strong>A</strong> below):</p></div> +<div class="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>Click the + icon on the right hand side. A panel appears to enter the +<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> @@ -1205,9 +1222,9 @@ three ways of specifying the coordinates:</p></div> <li> <p> One can find the coordinates on the world map in the bottom right hand part - of the Subsurface window. The map displays an orange bar indicating "No + 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 double-click at the appropriate place, the orange bar + location". Upon a doubleclick at the appropriate place, the orange bar disappears and the coordinates are stored. </p> </li> @@ -1237,12 +1254,23 @@ e.g. N30° 13' 29.8" , E30° 49' 1.5" Decimal degrees, e.g. 30.22496 , negative value, e.g. -30.22496. Similarly western longitudes are given with a <strong>W</strong>, e.g. W07°, or with a negative value, e.g. -7.34323. Some keyboards don’t have the degree sign (°). It can be replaced by a <strong>d</strong> like this: N30d -W20d.</p></div> +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 adding coordinates to dives that do not have a location description -will cause unexpected behaviour (Subsurface will think that all of these +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 @@ -1712,7 +1740,7 @@ Which data columns need to be imported into <em>Subsurface</em>? Is it a <em>CSV </li> <li> <p> -Is the numeric information (e.g. dive depth) in metric or in imperial unis? +Is the numeric information (e.g. dive depth) in metric or in imperial units? </p> </li> </ol></div> @@ -1745,7 +1773,7 @@ balloons can be moved using a drag-and-drop action. For instance, # ". 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 labeled "Dive # " and drop it +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;"> @@ -2102,7 +2130,7 @@ collection of GPS locations.</p></div> <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 50m from previous location. If subsequent locations +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 @@ -2171,7 +2199,7 @@ 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 +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"> @@ -2308,7 +2336,7 @@ position photographs on the dive profile.</p></div> 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 divecomputer showing time</em>. This brings up + 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 @@ -2452,18 +2480,17 @@ if there is a match between a calculated fingerprint and the one originally <td class="icon"> <img src="images/icons/important.png" alt="Important" /> </td> -<td class="content">Software for the automated finger print calculation of existing photo -collections is under development. Currently single dives must be upgraded -one at a time. Select the toolbar button on the <strong>Dive profile</strong> panel that -enables the display of images. The thumbnails of images are shown on the -dive profile. Then open the dive and change anything in the <strong>Notes</strong> panel -that brings up the blue edit bar at the top of the notes panel to save the -edits. For instance, add a space character at the end of the <em>Notes</em> text -box and immediately delete that space character. Select the option <em>Apply -changes</em> in the blue edit bar to save the dive information. Fingerprints -are calculated while saving this specific dive.</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> @@ -2472,10 +2499,10 @@ are calculated while saving this specific dive.</td> <div class="sect3"> <h4 id="S_MulticylinderDives">5.6.1. Multicylinder dives</h4> <div class="paragraph"><p><em>Subsurface</em> easily handles dives involving more than one -cylinder. Multicylinder diving usually happens (a) if a diver does not have +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 multicylinder dives are often used by +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> @@ -2518,11 +2545,11 @@ decompression.</p></div> </div> <div class="sect3"> <h4 id="_sidemount_dives">5.6.2. Sidemount dives</h4> -<div class="paragraph"><p>Sidemount diving is just another form of multicylinder diving, often with +<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 multicylinder dives, above, three +dive logging involves, exactly as with multi-cylinder dives, above, three steps:</p></div> <div class="ulist"><ul> <li> @@ -3496,7 +3523,7 @@ duration.</p></div> this, select and right-click the relevant dives to bring up the context menu. Then select the option <strong>Remove dive(s) from trip</strong>. The dive(s) now appear immediately above or below the trip to which they belonged, depending -on the date and time of the unliked dive.</p></div> +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> @@ -3603,30 +3630,35 @@ Exporter les informations de plongée vers <em>Facebook</em> d’export car une connexion vers <em>Facebook</em> est nécessaire, nécessitant un identifiant et un mot de passe. À partir du menu principal, si vous sélectionnez <em>Fichier → Préférences → Facebook</em>, un écran de connexion est -présenté (voir l’image <strong>A</strong> sur la gauche, ci dessous). Entrez vos -identifiant et mot de passe <em>Facebook</em>. Une fois connecté à <em>Facebook</em>, le -panneau de l’image <strong>B</strong> ci dessous est présenté, avec un bouton <em>Déconnecter -de Facebook</em> pour fermer la connexion <em>Facebook</em>.</p></div> +présenté (image <strong>A</strong> sur la gauche, ci dessous). Entrez l’identifiant et le +mot de passe <em>Facebook</em>. Une fois connecté à <em>Facebook</em>, le panneau de +l’image <strong>B</strong> ci dessous est 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 determe whether <em>Subsurface</em> has +a valid connection to <em>Facebook</em> From the <strong>Main Menu</strong>, select <em>Share on → +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’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 vous -sélectionnez <em>Partager sur → Facebook</em> à partir du <strong>menu principal</strong>, une -fenêtre s’affiche, pour déterminer quelles informations seront transférées -avec le profil de plongée (voir l’image <strong>B</strong> ci-dessous). Pour transférer un -profil de plongée vers <em>Facebook</em>, le nom d’un album <em>Facebook</em> doit être -fourni. Les cases à cocher sur la partie gauche permettent de sélectionner -des informations supplémentaires à transférer avec le profil de plongée. Ces -informations sont affichées dans le champs de texte sur la partie droite du -panneau. (voir l’image <strong>B</strong> ci dessous). Vous pouvez facilement modifier le -message qui sera envoyé 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> +est affichée dans le panneau <strong>Profil de plongée</strong> de <em>Subsurface</em>. Si, à +partir du <strong>menu principal</strong>, vous sélectionnez <em>Partager sur → Facebook</em>, +une fenêtre s’affiche, pour déterminer quelles informations seront +transférées avec le profil de plongée (voir l’image <strong>B</strong> ci-dessous). Pour +transférer un profil de plongée vers <em>Facebook</em>, le nom d’un album +<em>Facebook</em> doit être fourni. Les cases à cocher sur la partie gauche +permettent de sélectionner des informations supplémentaires à transférer +avec le profil de plongée. Ces informations sont affichées dans le champs de +texte sur la partie droite du panneau. (image <strong>B</strong> ci dessous). Vous pouvez +facilement modifier le message qui sera envoyé avec le profil de +plongée. Une fois les informations supplémentaires ajoutées et vérifiées, +sélectionner le bouton <em>OK</em> qui lance le transfert vers <em>Facebook</em>. Après un +moment, une fenêtre apparait indiquant le succès du transfert.</p></div> <div class="paragraph"><p>À la fois l’album créé et la publication sur votre ligne temporelle seront marquées comme privés. Pour que vos amis puissent voir la publication, modifier les permissions à partir d’une connexion Facebook standard depuis @@ -3790,7 +3822,7 @@ from anywhere in the world without having to carry it with oneself. For this reason, facilities such as <em>divelogs.de</em> and <em>Diving Log</em> offer to store dive log information on the Internet.</p></div> <div class="paragraph"><p><em>Subsurface</em> includes access to a transparently integrated cloud storage -backend that is available to all Subsurface users. Storing and retrieving a +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 @@ -4038,13 +4070,6 @@ several templates (see image <strong>B</strong>, above).</p></div> <em>Six Dives</em>: Print six dives per page, also showing the dive profiles. </p> </li> -<li> -<p> -<em>Custom</em>: This option allows customisation of the print contents and - layout. This is - discussed at the end of this section. -</p> -</li> </ul></div> <div class="paragraph"><p>Users can <em>Preview</em> the printed page by selecting the <em>Preview</em> button on the dialogue (see image <strong>A</strong> at the start of this section). After preview, @@ -4069,7 +4094,7 @@ page.</p></div> </div> </div> <div class="sect2"> -<h3 id="_write_a_custom_printing_template_advanced">10.1. Write a custom printing template (advanced)</h3> +<h3 id="_créer_un_modèle_d_8217_impression_personnalisé_avancé">10.1. Créer un modèle d’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 @@ -4140,13 +4165,14 @@ suivantes peuvent être réalisées :</p></div> <div class="sect1"> <h2 id="S_Preferences">12. Setting user <em>Preferences</em> for <em>Subsurface</em></h2> <div class="sectionbody"> -<div class="paragraph"><p>There are several settings within <em>Subsurface</em> that the user can -specify. These are found when selecting <em>File → Preferences</em>. The settings -are performed in five groups: <strong>Defaults</strong>, <strong>Units</strong>, <strong>Graph</strong>, <strong>Language</strong> and -<strong>Network</strong>. All five sections operate on the same principles: the user must +<div class="paragraph"><p>There are several user-definable settings within <em>Subsurface</em>, found by +selecting <em>File → 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>.</p></div> +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> @@ -4192,7 +4218,7 @@ leave the settings panel by selecting <strong>OK</strong>.</p></div> <li> <p> <strong>Display invalid</strong>: Dives can be marked as invalid (when a user wishes to hide - dives that he/she don’t consider valid dives, e.g. pool dives, but still want to + dives that he/she doesn’t consider valid dives, e.g. pool dives, but still want to keep them in the dive log). This controls whether those dives are displayed in the dive list. </p> @@ -4229,9 +4255,9 @@ leave the settings panel by selecting <strong>OK</strong>.</p></div> <img src="images/Pref2_f20.jpg" alt="FIGURE: Preferences Units page" /> </div> </div> -<div class="paragraph"><p>Here user can choose between metric and imperial units of depth, pressure, +<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, users can specify that all units are in the chosen +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> @@ -4251,21 +4277,21 @@ as decimal degrees Choose the appropriate option.</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 using the toolbar on the left hand side of the <strong>Dive Profile</strong> + 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 presure threshold has been exceeded. -</strong> <em>Max pO<sub>2</sub> whn displaying MOD</em> is the value used to calculate the maximum operative depth (MOD) + 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> <em>Draw dive computer reported ceiling red</em>: This checkbox allows exactly what it says. By default +<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>. This is because of the different algorithms and - gradient factors available for calculating ceilings, as well as the dynamic way that a + 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 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 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 average depth just before the + 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> @@ -4357,22 +4383,22 @@ Gradient Factors (GFLow and GFHigh):* Set the <em>gradient factors</em> used whi </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 OS. If this is for some -reason undesirable users 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> +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, the -<a href="#S_Companion"><em>Subsurface Companion app</em></a> or data export/import from -<em>Divelogs.de</em>. These Internet requirements are determined by one’s type of -connection to the Internet and by the Internet Service Provider (ISP) used. -One’s ISP should provide the appropriate information.</p></div> +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’s type of connection to the Internet and by the Internet +Service Provider (ISP) used. One’s 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" /> @@ -4393,7 +4419,7 @@ from one’s ISP. </li> <li> <p> -<em>Subsurface cloud storage</em>: In order to store one’s dive log in the cloud, a valid email address +<em>Subsurface cloud storage</em>: To store one’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: @@ -4402,7 +4428,7 @@ from one’s ISP. <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 inside <em>Subsurface</em>. + while the user performs other tasks within <em>Subsurface</em>. </p> </li> <li> @@ -4441,8 +4467,19 @@ plongée vers Facebook</a> pour plus d’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, an ability to look up -the geographic coordinates of a place name).</p></div> +<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> @@ -4573,7 +4610,7 @@ In the table labelled <em>Available Gases</em>, add the information of the pressure of this cylinder. By leaving the oxygen concentration (O2%) filed empty, the cylinder is assumed to contain air. Otherwise enter the oxygen and/or helium concentration in the boxes provided in this dialogue. Add - additional cylinders by using the "+" icon to the top righthand of the + additional cylinders by using the "+" icon to the top right-hand of the dialogue. </p> </li> @@ -4609,21 +4646,23 @@ The most efficient way to create a dive profile is to enter the appropriate </ul></div> <div class="sect3"> <h4 id="_recreational_dives">13.2.1. Recreational dives</h4> -<div class="paragraph"><p>The <em>Subsurface</em> dive planner allows a sophisticated way of planning -recreational dives, i.e. dives that remain within no-decompression limits. -The dive planner automatically takes into account the nitrogen load incurred -in previous dives. But conventional dive tables are also used in a way that -can take into account previous dives. Why use a dive planner for -recreational dives? Using recreational dive tables, the maximum depth of a -dive is taken into acount. However, few dives are undertaken at a constant -depth corresponding to the maximum depth (i.e. a "square" dive -profile). This means that dive tables overestimate the nitrogen load -incurred during previous dives. The <em>Subsurface</em> dive planner calculates -nitrogen load according to the real dive profiles of all uploaded previous -dives, in a similar way as dive computers calculate nitrogen load during a -dive. This mean that the diver gets <em>credit</em> in terms of nitrogen loading -for not remaining at maximum depth during previous dives, enabling planning -a longer subsequent dive. For the planner to work it is therefore crucial to +<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 @@ -4655,7 +4694,17 @@ The planner calculates whether the specified cylinder contains enough <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. + used. The reason for this reserve gas is to provide for the possible need + 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 <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’s + pulse rate goes up when one starts to buddy breathe. This reserve amount is + user configurable. </p> </li> <li> @@ -4665,7 +4714,9 @@ Define the depth of the dive by dragging the waypoints (white dots) on the table under <em>Dive planner points</em> as desribed under the previous heading. If this is a multilevel dive, set the appropriate dive depths to represent the dive plan by adding waypoints to the dive profile or by adding appropriate - dive planner points to the <em>Dive Planner Points</em> table. + dive planner points to the <em>Dive Planner Points</em> table. <em>Subsurface</em> will + automatically extend the bottom section of the dive to the maximum duration + within the no-decompression limits (NDL). </p> </li> <li> @@ -4824,7 +4875,7 @@ appear in the <strong>Dive List</strong> panel of <em>Subsurface</em>.</p></div> exact details of the dive plan are provided. These details may be modified by checking any of the options under the <em>Notes</em> section of the dive planner, immediately to the left of the <em>Dive Plan Details</em>. If a <em>Verbatim -diveplan</em> is requested, a detailed sentence-level explanation of the dive +dive plan</em> is requested, a detailed sentence-level explanation of the dive plan is given. If any of the management specifications have been exceeded during the planning, a warning message is printed underneath the dive plan information.</p></div> @@ -4846,9 +4897,9 @@ accross the mouthpiece of the rebreather into account. If the pO<sub>2</sub> drops below what is considered a save value, a warning appears in the <em>Dive plan details</em>. A typical pSCR configuration is with a single cylinder and one or more bail-out cylinders. Therefore the setup of the <em>Available gases</em> and the <em>Dive planner points</em> tables -are very similar to that of a CCR dive plan, described above. However, no oxygen setpoints +are 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 above, but note the longer ascent duration due to the lower oxygen +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> <div class="imageblock" style="text-align:center;"> <div class="content"> @@ -4863,13 +4914,15 @@ the dropdown list, circled in blue in the image below.</p></div> <div class="paragraph"><p><strong>Available gases</strong>: In the <em>Available gases</em> table, enter the cylinder information for the diluent cylinder and for any bail-out cylinders. Do NOT enter the information for the oxygen cylinder since it is implied when the <em>CCR</em> dropdown selection is made.</p></div> -<div class="paragraph"><p><strong>Entering setpoints</strong>: Specify a default setpoint in the Preferences tab, by selecting <em>File → Preferences → Graph</em> from the main menu. All user-entered segments in the <em>Dive planner points</em> table +<div class="paragraph"><p><strong>Entering setpoints</strong>: Specify a default setpoint in the Preferences tab, by selecting <em>File → Preferences → Graph</em> from +the main menu. All user-entered segments in the <em>Dive planner points</em> table use the default setpoint value. Then, different setpoints can be specified for dive segments in the <em>Dive planner points</em> table. A zero setpoint means the diver bails out to open circuit mode for that segment. The decompression is always calculated using the setpoint of the last manually entered segment. So, to plan a bail out ascent for a CCR dive, add a one-minute dive segment to the end with a setpoint value of 0. The decompression -algorithm does not switch deco-gases automatically while in CCR mode (i.e. when a positive setpoint is specified) but, of course, this is calculated for bail out ascents.</p></div> +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"> @@ -6343,8 +6396,9 @@ to the print device by <em>Subsurface</em>.</p></div> <em>Delete</em>, <em>Import</em> and to <em>Export</em> templates (see image <strong>A</strong> above). New or modified templates are stored as HTML files in the same directory as the dive log being processed. In order to create or modify a template, select -the <em>Custom</em> template from the template dropdown list in the print dialogue -(see image <strong>B</strong> above), then select <em>Edit</em>.</p></div> +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"> @@ -6376,7 +6430,8 @@ the <em>Custom</em> template from the template dropdown list in the print dialog </div> <div class="paragraph"><p>One can adapt any of the existing templates and save it to the dive log directory. The standard templates (e.g. One dive, Six dives, Table) can be -modified in this way.</p></div> +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"> @@ -6752,7 +6807,7 @@ salvaged after being over written by new dives.</p></div> <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2015-10-12 11:05:42 CEST +Last updated 2015-10-13 20:41:46 CEST </div> </div> </body> diff --git a/Documentation/user-manual_fr.txt b/Documentation/user-manual_fr.txt index 4af0a297a..06a4df182 100644 --- a/Documentation/user-manual_fr.txt +++ b/Documentation/user-manual_fr.txt @@ -350,7 +350,7 @@ 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 divecomputer allows this, _Subsurface_ only imports dives +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). @@ -403,7 +403,7 @@ least for those not charging while connected via USB). 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 righthand side of the dialogue (see image + 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, @@ -504,7 +504,7 @@ _"Choose Bluetooth download mode"_, the dialogue below appears. 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 righthand side, On the lefthand +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 _Subsurface_. The power state (on/off) of the Bluetooth adapter is shown @@ -562,15 +562,16 @@ 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 -left is not displayed. To successfully initiate a scan (by pressing the +right is not displayed. To successfully initiate a scan (by pressing the _Scan_ button) check that the Bluetooth device on the _Subsurface_ computer is turned on. 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 setup your DC device_. Always allow this pairing. After 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. @@ -649,7 +650,7 @@ information. The *Time* field reflects the date and time of the dive. By clicking the date, a calendar is displayed from which one can choose the correct date. Press ESC to close the calendar. The time values (hour and minutes) can also be edited directly by clicking on each of them in the text -box and by overtyping the information displayed. +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 @@ -662,33 +663,45 @@ automatically supplied by _Subsurface_ (following the _Preferences_, metric or imperial units will be used). -*Location*: Here the name of the dive site can be entered, e.g. "Tihany, Lake -Balaton, Hungary". Dive locations are managed as a separate part of the dive log. -After entering the information for a particular dive site, and several dives are -performed at the same location, the information is re-used without requiring -full dive site information again. Existing dive location information -can be edited at any time by selecting (on the *Dive List* panel) a dive performed at that site -and by opening the location information by clicking the globe button on the -right of the location name (see image on the right, above). When entering a dive location name, auto location of -dive site names makes it easy to select a dive site that already exists in the dive log -(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. - -If the present dive site has not been used before, a message appears as -follows (image *A* below): +*Location*: +[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 +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): image::images/Locations1_f22.jpg["FIGURE:Location description panel", align="center"] -Click the + icon on the right hand side. A panel appears to enter the +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 + of the _Subsurface_ window. The map displays an orange bar indicating "No location data - Move the map and double-click to set the dive - location". Upon a double-click at the appropriate place, the orange bar + 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 @@ -708,14 +721,26 @@ 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. +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 adding coordinates to dives that do not have a location description -will cause unexpected behaviour (Subsurface will think that all of these +name - so *saving* 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). +*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 +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. + Enter any other textual 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 @@ -1101,7 +1126,7 @@ b. Which data columns need to be imported into _Subsurface_? Is it a _CSV dive editor and note the titles of the columns to be imported and their column positions. -c. Is the numeric information (e.g. dive depth) in metric or in imperial unis? +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 straightforward. Select _Import -> Import Log Files_ from the main menu. In @@ -1131,7 +1156,7 @@ _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 labeled "Dive # " and drop it +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. @@ -1403,7 +1428,7 @@ The settings below define the behaviour of the service: _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 50m from previous location. If subsequent locations +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 @@ -1461,7 +1486,7 @@ can only add dives using the manual mechanism. One can edit the site name afterwards by selecting the dive from the dive list and clicking on the site name. There are no other editable fields. The -dive list is automatically uploaded from the iphone to the webservice and +dive list is automatically uploaded from the iPhone to the webservice and there is not an option to trigger upload manually. @@ -1572,7 +1597,7 @@ image::images/LoadImage3b_f20.jpg["FIGURE: Synchronisation dialog", align="cente 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 the bottom part, the top part of the dialog is ignored. Click on - the horizontal bar entitled "_Select image of divecomputer showing time_. This brings up + 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 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 @@ -1688,16 +1713,16 @@ This is achieved by selecting from the Main Menu: _File -> Find moved image [icon="images/icons/important.png"] [IMPORTANT] -Software for the automated finger print calculation of existing photo -collections is under development. Currently single dives must be upgraded -one at a time. Select the toolbar button on the *Dive profile* panel that -enables the display of images. The thumbnails of images are shown on the -dive profile. Then open the dive and change anything in the *Notes* panel -that brings up the blue edit bar at the top of the notes panel to save the -edits. For instance, add a space character at the end of the _Notes_ text -box and immediately delete that space character. Select the option _Apply -changes_ in the blue edit bar to save the dive information. Fingerprints -are calculated while saving this specific dive. +_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 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_. **** @@ -1708,10 +1733,10 @@ are calculated while saving this specific dive. ==== Multicylinder dives _Subsurface_ easily handles dives involving more than one -cylinder. Multicylinder diving usually happens (a) if a diver does not have +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 multicylinder dives are often used by +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: @@ -1741,11 +1766,11 @@ image::images/multicylinder_dive.jpg["FIGURE: Multicylinder profile", align="cen ==== Sidemount dives -Sidemount diving is just another form of multicylinder diving, often with +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 multicylinder dives, above, three +dive logging involves, exactly as with multi-cylinder dives, above, three steps: - *During the dive, record cylinder switch events*. Since sidemount diving normally involves two @@ -2495,7 +2520,7 @@ 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 unliked dive. +on the date and time of the unlinked dive. ==== Add a dive to the trip immediately above @@ -2592,28 +2617,34 @@ 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é (voir l'image *A* sur la gauche, ci dessous). Entrez vos -identifiant et mot de passe _Facebook_. Une fois connecté à _Facebook_, le -panneau de l'image *B* ci dessous est présenté, avec un bouton _Déconnecter -de Facebook_ pour fermer la connexion _Facebook_. +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_. image::images/facebook1_f20.jpg["Figure: Facebook login", align="center"] +From the _Subsurface_ window it is easy to determe 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 vous -sélectionnez _Partager sur -> Facebook_ à partir du *menu principal*, 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. (voir l'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. +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, @@ -2722,7 +2753,7 @@ reason, facilities such as _divelogs.de_ and _Diving Log_ offer to store dive log information on the Internet. _Subsurface_ includes access to a transparently integrated cloud storage -backend that is available to all Subsurface users. Storing and retrieving a +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 _Subsurface cloud storage_ , follow these @@ -2866,9 +2897,6 @@ 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. -- _Custom_: This option allows customisation of the print contents and - layout. This is - discussed at the end of this section. 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, @@ -2889,7 +2917,7 @@ page. image::images/Printpreview.jpg["FIGURE: Print preview page", align="center"] -=== Write a custom printing template (advanced) +=== 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 @@ -2938,13 +2966,14 @@ suivantes peuvent être réalisées : [[S_Preferences]] == Setting user _Preferences_ for _Subsurface_ -There are several settings within _Subsurface_ that the user can -specify. These are found when selecting _File -> Preferences_. The settings -are performed in five groups: *Defaults*, *Units*, *Graph*, *Language* and -*Network*. All five sections operate on the same principles: the user must +There are several user-definable settings within _Subsurface_, found by +selecting _File -> Preferences_. The settings are performed 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*. +leave the settings panel by selecting *OK*. If *Discard* is selected, +changes to the preferences are not saved. === Defaults @@ -2966,7 +2995,7 @@ image::images/Pref1_f20.jpg["FIGURE: Preferences defaults page", align="center"] device that was initialised 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 don't consider valid dives, e.g. pool dives, but still want to + dives that he/she doesn't consider valid dives, e.g. pool dives, but still want to keep them in the dive log). This controls whether those dives are displayed in the dive list. @@ -2987,9 +3016,9 @@ image::images/Pref1_f20.jpg["FIGURE: Preferences defaults page", align="center"] === Units image::images/Pref2_f20.jpg["FIGURE: Preferences Units page", align="center"] -Here user can choose between metric and imperial units of depth, pressure, +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, users can specify that all units are in the chosen +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. @@ -3009,21 +3038,21 @@ This panel allows two type of selections: *Show*: Here users 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 using the toolbar on the left hand side of the *Dive Profile* + 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 Preferences panel. If any of the graphs go above the specified threshold level, the graph is - highlighted in red, indicating that the particular partial presure threshold has been exceeded. -** _Max pO~2~ whn displaying MOD_ is the value used to calculate the maximum operative depth (MOD) + highlighted in red, indicating that 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 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_. This is because of the different algorithms and - gradient factors available for calculating ceilings, as well as the dynamic way that a + 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 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 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 average depth just before the + 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. * *Misc*: @@ -3076,21 +3105,21 @@ 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 OS. If this is for some -reason undesirable users 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*. +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*. === 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, the -<<S_Companion,_Subsurface Companion app_>> or data export/import from -_Divelogs.de_. 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 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. image::images/Pref5_f20.jpg["FIGURE: Preferences Network page", align="center"] @@ -3104,12 +3133,12 @@ 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_: In order to store one's dive log in the cloud, a valid email address +** _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. 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 inside _Subsurface_. + while the user performs other tasks 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. @@ -3135,8 +3164,16 @@ plongée vers Facebook] pour plus d'informations. === Georeference -_Subsurface_ provides a geo-lookup service (that is, an ability to look up -the geographic coordinates of a place name). +_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 +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). + +image::images/Pref7_f20.jpg["FIGURE: Facebook login panel", align="center"] [[S_DivePlanner]] == The _Subsurface_ dive planner @@ -3210,7 +3247,7 @@ image::images/PlannerWindow1_f20.jpg["FIGURE: Dive planner startup window", alig pressure of this cylinder. By leaving the oxygen concentration (O2%) filed empty, the cylinder is assumed to contain air. Otherwise enter the oxygen and/or helium concentration in the boxes provided in this dialogue. Add - additional cylinders by using the "+" icon to the top righthand of the + additional cylinders by using the "+" icon to the top right-hand of the dialogue. - The profile of the planned dive can be created in two ways: @@ -3231,21 +3268,23 @@ image::images/PlannerWindow1_f20.jpg["FIGURE: Dive planner startup window", alig ==== Recreational dives -The _Subsurface_ dive planner allows a sophisticated way of planning -recreational dives, i.e. dives that remain within no-decompression limits. -The dive planner automatically takes into account the nitrogen load incurred -in previous dives. But conventional dive tables are also used in a way that -can take into account previous dives. Why use a dive planner for -recreational dives? Using recreational dive tables, the maximum depth of a -dive is taken into acount. However, few dives are undertaken at a constant -depth corresponding to the maximum depth (i.e. a "square" dive -profile). This means that dive tables overestimate the nitrogen load -incurred during previous dives. The _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 mean that the diver gets 'credit' in terms of nitrogen loading -for not remaining at maximum depth during previous dives, enabling planning -a longer subsequent dive. For the planner to work it is therefore crucial to +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. To plan a dive, the appropriate settings need to be defined. @@ -3268,14 +3307,26 @@ allows calculation of the nitrogen load incurred during previous dives. - 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. + used. The reason for this reserve gas is to provide for the possible need + 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 depth of the dive by dragging the waypoints (white dots) on the dive profile or (even better) defining the appropriate depths using the table under _Dive planner points_ as desribed under the previous heading. If this is a multilevel dive, set the appropriate dive depths to represent the dive plan by adding waypoints to the dive profile or by adding appropriate - dive planner points to the _Dive Planner Points_ table. + dive planner points to the _Dive Planner Points_ table. _Subsurface_ will + automatically extend the bottom section of the dive to the maximum duration + within the no-decompression limits (NDL). - The ascent speed can be changed. The default ascent speeds are those considered safe for recreational divers. @@ -3430,7 +3481,7 @@ 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 by checking any of the options under the _Notes_ section of the dive planner, immediately to the left of the _Dive Plan Details_. If a _Verbatim -diveplan_ is requested, a detailed sentence-level explanation of the dive +dive plan_ is requested, a detailed sentence-level explanation of the dive plan is given. If any of the management specifications have been exceeded during the planning, a warning message is printed underneath the dive plan information. @@ -3452,9 +3503,9 @@ 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 details_. A typical pSCR configuration is with a single cylinder and one or more bail-out cylinders. Therefore the setup of the _Available gases_ and the _Dive planner points_ tables -are very similar to that of a CCR dive plan, described above. However, no oxygen setpoints +are 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 above, but note the longer ascent duration due to the lower oxygen +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. image::images/Planner_pSCR1_f20.jpg["FIGURE: Planning a pSCR dive: setup", align="center"] @@ -3469,13 +3520,15 @@ the dropdown list, circled in blue in the image below. diluent cylinder and for any bail-out cylinders. Do NOT enter the information for the oxygen cylinder since it is implied when the _CCR_ dropdown selection is made. -*Entering setpoints*: Specify a default setpoint in the Preferences tab, by selecting _File -> Preferences -> Graph_ from the main menu. All user-entered segments in the _Dive planner points_ table +*Entering setpoints*: Specify a default setpoint in the Preferences tab, by selecting _File -> Preferences -> Graph_ from +the main menu. All user-entered segments in the _Dive planner points_ table use the default setpoint value. Then, different setpoints can be specified for dive segments in the _Dive planner points_ table. A zero setpoint means the diver bails out to open circuit mode for that segment. The decompression is always calculated using the setpoint of the last manually entered segment. So, to plan a bail out ascent for a CCR dive, add a one-minute dive segment to the end with a setpoint value of 0. The decompression -algorithm does not switch deco-gases automatically while in CCR mode (i.e. when a positive setpoint is specified) but, of course, this is calculated for bail out ascents. +algorithm does not switch deco-gases automatically while in CCR mode (i.e. when a positive setpoint is specified) but, +of course, this is calculated for bail out ascents. The dive profile for a CCR dive may look something like the image below. @@ -3642,7 +3695,6 @@ des sections de ce manuel traitant des opérations relatives. - == ANNEXE A : informations spécifiques au système d'exploitation utilisé pour importer les informations de plongées depuis un ordinateur de plongée. === Assurez-vous que les pilotes (drivers) nécessaires sont installés @@ -4386,8 +4438,9 @@ 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 -the _Custom_ template from the template dropdown list in the print dialogue -(see image *B* above), then select _Edit_. +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: @@ -4418,7 +4471,8 @@ 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 directory. The standard templates (e.g. One dive, Six dives, Table) can be -modified in this way. +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 template will be correctly handled and rendered. |