diff options
| -rw-r--r-- | Documentation/50-pot/subsurface-mobile-manual.pot | 2 | ||||
| -rw-r--r-- | Documentation/50-pot/subsurface-user-manual.pot | 2929 | ||||
| -rw-r--r-- | Documentation/fr/po/subsurface-user-manual.fr.po | 4351 | ||||
| -rw-r--r-- | Documentation/mobile-manual_fr.html.git | 2 | ||||
| -rw-r--r-- | Documentation/mobile-manual_fr.txt | 2 | ||||
| -rw-r--r-- | Documentation/user-manual_fr.html.git | 616 | ||||
| -rw-r--r-- | Documentation/user-manual_fr.txt | 515 |
7 files changed, 4667 insertions, 3750 deletions
diff --git a/Documentation/50-pot/subsurface-mobile-manual.pot b/Documentation/50-pot/subsurface-mobile-manual.pot index 2ef2344db..1b603033d 100644 --- a/Documentation/50-pot/subsurface-mobile-manual.pot +++ b/Documentation/50-pot/subsurface-mobile-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: 2017-10-16 10:18+0200\n" +"POT-Creation-Date: 2017-10-20 22:41+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" diff --git a/Documentation/50-pot/subsurface-user-manual.pot b/Documentation/50-pot/subsurface-user-manual.pot index d6e6d7854..59b581744 100644 --- a/Documentation/50-pot/subsurface-user-manual.pot +++ b/Documentation/50-pot/subsurface-user-manual.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: subsurface-manual VERSION\n" "Report-Msgid-Bugs-To: subsurface@subsurface-divelog.org\n" -"POT-Creation-Date: 2017-10-16 10:18+0200\n" +"POT-Creation-Date: 2017-10-20 22:41+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" @@ -42,7 +42,7 @@ msgstr "" #. type: Plain text #: user-manual.txt:23 -msgid "[blue]#_Version 4.6, March 2017_#" +msgid "[blue]#_Version 4.7, October 2017_#" msgstr "" #. type: Plain text @@ -500,7 +500,7 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:236 user-manual.txt:802 +#: user-manual.txt:236 user-manual.txt:834 #, no-wrap msgid "images/BlueEditBar_f22.jpg" msgstr "" @@ -620,7 +620,7 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:309 user-manual.txt:677 user-manual.txt:1103 user-manual.txt:3398 +#: user-manual.txt:309 user-manual.txt:692 user-manual.txt:1137 user-manual.txt:3493 user-manual.txt:3855 #, no-wrap msgid "images/icons/warning2.png" msgstr "" @@ -804,7 +804,7 @@ msgid "*PROBLEMS WITH DATA DOWNLOAD FROM A DIVE COMPUTER?*\n" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:424 user-manual.txt:531 user-manual.txt:575 user-manual.txt:588 user-manual.txt:1244 user-manual.txt:1309 user-manual.txt:1472 user-manual.txt:1548 user-manual.txt:1867 +#: user-manual.txt:424 user-manual.txt:546 user-manual.txt:590 user-manual.txt:603 user-manual.txt:1292 user-manual.txt:1357 user-manual.txt:1520 user-manual.txt:1596 user-manual.txt:1915 #, no-wrap msgid "images/icons/important.png" msgstr "" @@ -917,45 +917,57 @@ msgid "Connecting _Subsurface_ to a Bluetooth-enabled dive computer" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:479 user-manual.txt:4033 +#: user-manual.txt:479 user-manual.txt:4196 #, no-wrap msgid "images/icons/bluetooth.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:486 +#: user-manual.txt:491 msgid "" "Bluetooth is becoming a more common way of communication between dive " -"computers and _Subsurface_, for or instance, the Shearwater Petrel Mk2 and " -"the OSTC Mk3. _Subsurface_ provides a largely operating system independent " -"Bluetooth interface. Setting up _Subsurface_ for Bluetooth communication " -"requires four steps:" +"computers and _Subsurface_. _Subsurface_ provides a largely operating system " +"independent Bluetooth interface. An increasing number of dive computers use " +"Bluetooth Low Energy (BTLE) as a means of communication. However, BTLE is " +"not a standardised protocol, consequently adaptations need to be made for " +"communicating with each different dive computer model. See the " +"link:https://subsurface-divelog.org/documentation/supported-dive-computers/[list " +"of supported dive computers]. Bluetooth communication is often more " +"reliable if all Bluetooth devices seen by the _Subsurface_ computer are " +"removed and pairing with the Bluetooth dive computer is performed from " +"afresh. The Bluetooth and BTLE interfaces are under active development with " +"respect to new dive computers that use this mechanism of communication." +msgstr "" + +#. type: Plain text +#: user-manual.txt:494 +msgid "Setting up _Subsurface_ for Bluetooth communication requires four steps:" msgstr "" #. type: Plain text -#: user-manual.txt:488 +#: user-manual.txt:496 msgid "Ensure Bluetooth is activated on the host computer running _Subsurface_." msgstr "" #. type: Plain text -#: user-manual.txt:489 +#: user-manual.txt:497 msgid "Ensure _Subsurface_ sees the Bluetooth adapter on the host computer." msgstr "" #. type: Plain text -#: user-manual.txt:490 +#: user-manual.txt:498 msgid "" "Ensure the Bluetooth-enabled dive computer is Bluetooth-discoverable and in " "PC upload mode." msgstr "" #. type: Plain text -#: user-manual.txt:491 +#: user-manual.txt:499 msgid "Ensure _Subsurface_ is paired with the Bluetooth-enabled dive computer." msgstr "" #. type: Plain text -#: user-manual.txt:495 +#: user-manual.txt:503 msgid "" "Select the Download dialogue by selecting _Import -> Import from dive " "computer_ from the *Main Menu*. After checking the box labelled _\"Choose " @@ -963,52 +975,65 @@ msgid "" msgstr "" #. type: Title ===== -#: user-manual.txt:496 +#: user-manual.txt:504 #, no-wrap msgid "On Linux or MacOS:" msgstr "" #. type: Target for macro image -#: user-manual.txt:498 +#: user-manual.txt:506 #, no-wrap msgid "images/DC_import_Bluetooth.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:529 +#: user-manual.txt:513 +msgid "" +"Although the _Subsurface_ Bluetooth interface is intended to function " +"without Bluetooth pairing at the operating system level, it is always " +"prudent to follow up initial Bluetooth pairing problems by pairing the " +"Bluetooth dive computer with the _Subsurface_ computer using the operating " +"system services of the desktop computer. Delete all existing pairings and " +"start by scanning for Bluetooth devices from an empty list (on the desktop) " +"of Bluetooth devices. Once _Subsurface_ has recognised the Bluetooth dive " +"computer, subsequent divelog downloads are likely to be simple." +msgstr "" + +#. type: Plain text +#: user-manual.txt:544 msgid "" "On the _Linux_ or _MacOS_ platforms the name of the _Subsurface_ computer " -"and its Bluetooth address are shown on the right hand side, On the left hand " -"side, if the computer has connected more than one local Bluetooth devices " -"you can use the list box to indicate which one needs to connect to " -"_Subsurface_. The power state (on/off) of the Bluetooth adapter is shown " -"below the address and can be changed by checking the _Turn on/off_ box. If " -"the Bluetooth address is not shown, then _Subsurface_ does not see the local " -"Bluetooth device. Ensure the Bluetooth driver is installed correctly on the " -"_Subsurface_ computer and check if it can be used by other Bluetooth " -"utilities like _bluetoothctl_ or _bluemoon_. This completes the first two " -"steps above. Ensure the Bluetooth-enabled dive computer is in PC-upload " -"mode and it is discoverable by other Bluetooth devices. Consult the manual " -"of the dive computer for more information. Now the third item in the list " -"above has been finished. Select the _Scan_ button towards the bottom left " -"of the dialogue above. After searching, the dive computer should be listed " -"(perhaps as one of a number of Bluetooth devices) in the main list box on " -"the lefthand side of the dialogue (see image above). If this does not work, " -"select the _Clear_ button, then scan again for Bluetooth devices using the " -"_Scan_ button. After taking these actions _Subsurface_ should see the dive " -"computer. The label of the discovered dive computer contains the name of " -"the device, its address and its pairing status. If the device is not paired " -"and has a red background color, a context menu can be opened by selecting " -"the item with a right-click. Select the the _Pair_ option and wait for the " -"task to complete. If this dive computer is being paired to Subsurface for " -"the first time, it’s possible Subsurface will request a Pass Code or PIN " -"number. The most commonly-used Pass Code is 0000, and this works for the " -"Shearwater Petrel. If necessary, consult the user manual of the dive " -"computer being used." +"and its Bluetooth address are shown on the right hand side. The power state " +"(on/off) of the Bluetooth adapter is shown below the address and can be " +"changed by checking the _Turn on/off_ box. If the Bluetooth address is not " +"shown, then _Subsurface_ does not see the local Bluetooth device. Ensure the " +"Bluetooth driver is installed correctly on the _Subsurface_ computer and " +"check if it can be used by other Bluetooth utilities like _bluetoothctl_ or " +"_bluemoon_. This completes the first two steps above. Ensure the " +"Bluetooth-enabled dive computer is in PC-upload mode and it is discoverable " +"by other Bluetooth devices. Consult the manual of the dive computer for more " +"information. Now the third item in the list above has been finished. Select " +"the _Scan_ button towards the bottom left of the dialogue above. After " +"searching, the dive computer should be listed (perhaps as one of a number of " +"Bluetooth devices) in the main list box on the lefthand side of the dialogue " +"(see image above). If this does not work, select the _Clear_ button, then " +"scan again for Bluetooth devices using the _Scan_ button. After taking these " +"actions _Subsurface_ should see the dive computer. On the left hand side, " +"if the computer has more than one local Bluetooth devices connected, use the " +"list box to indicate which one needs to connect to _Subsurface_. The label " +"of the discovered dive computer contains the name of the device, its address " +"and its pairing status. For BTLE devices the address often starts with " +"\"LE\". If the device is not paired and has a red background color, a " +"context menu can be opened by selecting the item with a right-click. Select " +"the the _Pair_ option and wait for the task to complete. If this dive " +"computer is being paired to Subsurface for the first time, it’s possible " +"Subsurface will request a Pass Code or PIN number. The most commonly-used " +"Pass Code is 0000, and this works for the Shearwater Petrel. If necessary, " +"consult the user manual of the dive computer being used." msgstr "" #. type: delimited block * -#: user-manual.txt:536 +#: user-manual.txt:551 msgid "" "Currently _Subsurface_ does not support Bluetooth pairing with dive " "computers that require a custom PIN code. In order to pair the devices, use " @@ -1016,12 +1041,12 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:538 +#: user-manual.txt:553 msgid "One way to achieve this is to use +bluetoothctl+:" msgstr "" #. type: delimited block * -#: user-manual.txt:549 +#: user-manual.txt:564 #, no-wrap msgid "" "\t$ bluetoothctl\n" @@ -1037,7 +1062,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:555 +#: user-manual.txt:570 msgid "" "After the devices are paired, press the _Save_ button of the dialogue. This " "closes the Bluetooth dialogue. Now select _Download_ in the _Download from " @@ -1046,19 +1071,19 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:556 user-manual.txt:3960 user-manual.txt:4048 +#: user-manual.txt:571 user-manual.txt:4123 user-manual.txt:4211 #, no-wrap msgid "On Windows:" msgstr "" #. type: Target for macro image -#: user-manual.txt:557 +#: user-manual.txt:572 #, no-wrap msgid "images/DC_import_Bluetooth_Windows.png" msgstr "" #. type: Plain text -#: user-manual.txt:567 +#: user-manual.txt:582 msgid "" "On _Windows_ platforms the _Local Bluetooth device details section_ on the " "right is not displayed as is the case on the Linux/Mac systems. To start a " @@ -1072,7 +1097,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:574 +#: user-manual.txt:589 msgid "" "The pairing step is checked and done automatically during the download " "process. If the devices have never been paired the system will ask " @@ -1083,7 +1108,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:582 +#: user-manual.txt:597 msgid "" "Currently _Subsurface_ works only with local Bluetooth adapters which use " "Microsoft Bluetooth Stack. If the local device uses _Widcomm_, _Stonestreet " @@ -1093,7 +1118,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:587 +#: user-manual.txt:602 msgid "" "A log message on the bottom left of the _Remote Bluetooth device selection_ " "shows details about the current status of the Bluetooth agent. To select " @@ -1103,7 +1128,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:597 +#: user-manual.txt:612 #, no-wrap msgid "" "*IN CASE OF PROBLEMS*: If the Bluetooth adapter from the _Subsurface_ " @@ -1118,13 +1143,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:599 +#: user-manual.txt:614 #, no-wrap msgid "Changing the name of a dive computer" msgstr "" #. type: Plain text -#: user-manual.txt:615 +#: user-manual.txt:630 msgid "" "It may be necessary to distinguish between different dive computers used to " "upload dive logs to _Subsurface_. For instance if a buddy’s dive computer is " @@ -1143,13 +1168,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:617 +#: user-manual.txt:632 #, no-wrap msgid "Uploading data for a specific dive from more than one dive computer" msgstr "" #. type: Plain text -#: user-manual.txt:628 +#: user-manual.txt:643 msgid "" "Some divers use more than one dive computer at the same time, e.g. during " "technical diving. If you import the dive profiles from these different dive " @@ -1165,13 +1190,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:630 +#: user-manual.txt:645 #, no-wrap msgid "Updating the dive information imported from the dive computer." msgstr "" #. type: Plain text -#: user-manual.txt:637 +#: user-manual.txt:652 msgid "" "With the uploaded dives in the *Dive List*, the information from the dive " "computer is not complete and more details must be added to have a full " @@ -1180,13 +1205,13 @@ msgid "" msgstr "" #. type: Title ===== -#: user-manual.txt:639 +#: user-manual.txt:654 #, no-wrap msgid "Notes" msgstr "" #. type: Plain text -#: user-manual.txt:644 +#: user-manual.txt:659 msgid "" "To have a more complete dive record, the user needs to add additional " "information by hand. The procedure below is virtually identical for " @@ -1194,7 +1219,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:654 +#: user-manual.txt:669 msgid "" "In some cases, you must provide the date and time of the dive, for example " "when entering a dive by hand or when a dive computer doesn’t provide the " @@ -1207,13 +1232,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:655 +#: user-manual.txt:670 #, no-wrap msgid "images/AddDive3_f22.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:664 +#: user-manual.txt:679 msgid "" "The right hand image, above, shows a *Notes tab* filled with dive " "information. The *Date* and *Time* fields reflects the date and time of the " @@ -1224,7 +1249,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:674 +#: user-manual.txt:689 #, no-wrap msgid "" "*Air/water temperatures*: Air and water temperatures during the dive are " @@ -1244,13 +1269,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:677 +#: user-manual.txt:692 #, no-wrap msgid "*Location*:\n" msgstr "" #. type: Plain text -#: user-manual.txt:685 +#: user-manual.txt:700 msgid "" "Dive locations are managed as a *separate* part of the dive log. The dive " "information in the *Notes* and *Equipment* tabs can therefore NOT be edited " @@ -1262,88 +1287,157 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:702 +#: user-manual.txt:708 +#, no-wrap msgid "" -"Type in the name of the dive site, e.g. \"Tihany, Lake Balaton, Hungary\". " -"If several dives are made at the same location, the site information for the " -"first dive is re-used. Existing dive locations can be edited by selecting " -"(on the *Dive List* panel) a dive done at that site and by opening the " -"location information. Click the globe button on the right of the location " -"name (see image image *A* below). When typing the name of a dive site, a " -"dropdown list appears showing all sites with similar names. If the dive site " -"has been used before, click on the already-existing name. The dive site " -"names in the dropdown list contain either a globe symbol (indicating " -"existing dive sites in the _Subsurface_ database) or a *+* symbol " -"(indicating dive site names that appear consistent with the current dive " -"site name but which haven’t been added to the dive site database). If the " -"present dive site has not been used before, a message appears as follows " -"(image *A* below):" +"*Using existing dive locations:* Type in the name of the dive site, " +"e.g. \"Tihany, Lake Balaton, Hungary\".\n" +"If several dives are\n" +"made at the same location, the site information for the first dive is " +"re-used.\n" +"Therefore, if a dive site has been used before, the name of that site (and " +"sometimes\n" +"the names of similar sites) appears below the dive site text box (image " +"below). Double-click on\n" +"the appropriate dive site name and the dive location will be associated with " +"the\n" +"dive being entered. Then select _Apply Changes_ (image below) to save the " +"geolocation for this dive site.\n" msgstr "" #. type: Target for macro image -#: user-manual.txt:703 +#: user-manual.txt:709 #, no-wrap -msgid "images/Locations1_f22.jpg" +msgid "images/Location1.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:708 +#: user-manual.txt:715 +#, no-wrap msgid "" -"Click the globe button and a panel appears to enter the coordinates and " -"other information about the site (image *B*, above). The most important " -"items are the coordinates of the site. There are three ways to specify " -"coordinates:" +"*Entering a new dive location:* On the other hand, having dived at a new " +"dive location,\n" +"a new record needs to be created\n" +"that could be used for the new and for later dives at this new site. Type " +"the name of the new dive site into the text box\n" +"(image A below).\n" +msgstr "" + +#. type: Target for macro image +#: user-manual.txt:716 +#, no-wrap +msgid "images/Globe_image1.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:714 +#: user-manual.txt:723 msgid "" -"Use the world map in the bottom right hand part of the _Subsurface_ " -"window. The map displays an orange bar indicating \"No location data - Move " -"the map and double-click to set the dive location\". Doubleclick at the " -"appropriate place, and the orange bar disappears and the coordinates are " -"stored." +"Double-click on the blue bar below the new dive location name. The blue bar " +"disappears (image B above) and the globe icon on the right-hand of the " +"location name text box turns blue. In the Dive Map part of the _Subsurface_ " +"window, a world map appears (image C above). Click on the blue globe icon to " +"the right of the dive site name in the _Notes_ panel (image B above). This " +"opens a window for entering the details of the new dive location (image A " +"below). The globe icon changes to indicate that the location data are being " +"edited. The only important data here are the geographic coordinates of the " +"dive location." +msgstr "" + +#. type: Target for macro image +#: user-manual.txt:724 +#, no-wrap +msgid "images/Globe_image2.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:719 -msgid "" -"Use eiher the Subsurface-Mobile App or the _Subsurface_ Companion App on an " -"Android or iPhone device with GPS and if the dive site coordinates were " -"stored using one of these apps. xref:S_Companion[Click here for more " -"information]" +#: user-manual.txt:727 +msgid "There are three ways of adding the the coordinates:" msgstr "" #. type: Plain text -#: user-manual.txt:721 +#: user-manual.txt:730 +#, no-wrap msgid "" -"Enter coordiantes by hand if they are known, using one of four formats with " -"latitude followed by longitude:" +"*(1):* Enter coordinates by hand if they are known, using one of\n" +" four formats with latitude followed by longitude:\n" msgstr "" #. type: Plain text -#: user-manual.txt:726 +#: user-manual.txt:735 +#, no-wrap 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. N30° 13' 29.8\" , E30° 49' 1.5\" Decimal degrees, e.g. 30.22496 , " -"30.821798" +"\tISO 6709 Annex D format e.g. 30°13'28.9\"N 30°49'1.5\"E\n" +"\tDegrees and decimal minutes, e.g. N30° 13.49760' , E30° 49.30788'\n" +"\tDegrees minutes seconds, e.g. N30° 13' 29.8\" , E30° 49' 1.5\"\n" +"\tDecimal degrees, e.g. 30.22496 , 30.821798\n" msgstr "" #. type: Plain text -#: user-manual.txt:734 +#: user-manual.txt:744 msgid "" "Southern hemisphere latitudes are given with a *S*, e.g. S30°, or with a " "negative value, e.g. -30.22496. Similarly western longitudes are given with " "a *W*, e.g. W07°, or with a negative value, e.g. -7.34323. Some keyboards " "don't have the degree sign (°). It can be replaced by a *d* like this: N30d " -"W20d. If both a dive site name and coordinates have been provided, save the " -"dive site information by selecting the button _Apply changes_ at the top of " -"the panel." +"W20d. Enter any other contextual information about the dive site " +"(Description and Notes), then select _Apply Changes_ to save the geolocation " +"for this dive site. The dive site information can later be edited by " +"clicking the globe icon to the right of the dive site name in the *Notes " +"tab*." +msgstr "" + +#. type: Plain text +#: user-manual.txt:756 +#, no-wrap +msgid "" +"*(2):* Use the Dive Map to specify the coordinates. The Dive map now shows\n" +"all the existing dive lications in grey as well as an additional marker in " +"red\n" +"(image B above). Drag the red marker to the location of the dive site being " +"entered.\n" +"The map can be dragged and zoomed using the mouse wheel. Position the red " +"marker\n" +"by dragging it on the map, zooming in on the appropriate part of the map and " +"placing\n" +"the marker at an appropriate position (image B below). The coordinates of " +"the dive\n" +"location are automatically inserted into the appropriate text box in the " +"dive location\n" +"information window (image A below). Enter any other contextual information " +"about the dive site (Description and Notes),\n" +"then select _Apply Changes_ to save the geolocation for this dive site.\n" +"The dive site information can later be edited by clicking the globe icon to " +"the right of the\n" +"dive site name in the *Notes tab*.\n" +msgstr "" + +#. type: Target for macro image +#: user-manual.txt:757 +#, no-wrap +msgid "images/Globe_image3.jpg" +msgstr "" + +#. type: Plain text +#: user-manual.txt:761 +msgid "" +"Once the dive location data have been saved, the dive on the Dive List has a " +"globe icon immediately to the left of the location name of a particular " +"dive." +msgstr "" + +#. type: Plain text +#: user-manual.txt:766 +#, no-wrap +msgid "" +"*(3):* Use eiher the Subsurface-Mobile App or the _Subsurface_ Companion App " +"on an\n" +" Android or iPhone device with GPS and if the dive site coordinates\n" +" were stored using one of these apps.\n" +" xref:S_Companion[Click here for more information]\n" msgstr "" #. type: Plain text -#: user-manual.txt:740 +#: user-manual.txt:772 #, no-wrap msgid "" "*Important*: GPS coordinates of a dive site are linked to the location\n" @@ -1354,14 +1448,14 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:750 +#: user-manual.txt:782 #, no-wrap msgid "" "*Dive site name lookup:* If you typed coordinates into the appropriate\n" "text box, you can do an automated name lookup based on the coordinates.\n" "This is done when _Subsurface_ uses the Internet to find the name of the " "dive site\n" -"based on the coordinates that were typed. If a name has been found, it is\n" +"based on the coordinates that were given. 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" @@ -1371,7 +1465,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:755 +#: user-manual.txt:787 msgid "" "Enter any other contextual information about the dive site (Description and " "Notes), then select _Apply Changes_ to save the geolocation for this dive " @@ -1380,7 +1474,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:760 +#: user-manual.txt:792 #, no-wrap msgid "" "*Dive mode*: This is a dropdown box allowing you to choose the type of " @@ -1392,7 +1486,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:765 +#: user-manual.txt:797 #, no-wrap msgid "" "*Divemaster*: The name of the divemaster or dive guide should be\n" @@ -1402,7 +1496,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:770 +#: user-manual.txt:802 #, no-wrap msgid "" "*Buddy*: In this field, enter the name(s) of the buddy or buddies\n" @@ -1413,7 +1507,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:775 +#: user-manual.txt:807 #, no-wrap msgid "" "*Suit*: Here the type of dive suit used can be entered.\n" @@ -1424,7 +1518,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:778 +#: user-manual.txt:810 #, no-wrap msgid "" "*Rating*: Provide a subjective overall rating of the dive on a\n" @@ -1432,7 +1526,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:781 +#: user-manual.txt:813 #, no-wrap msgid "" "*Visibility*: Provide a rating of visibility during the\n" @@ -1440,7 +1534,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:788 +#: user-manual.txt:820 #, no-wrap msgid "" "*Tags*: Tags that describe the type of dive done can be entered\n" @@ -1454,13 +1548,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:790 +#: user-manual.txt:822 #, no-wrap msgid "*Notes*: Any additional information for the dive can be entered here.\n" msgstr "" #. type: Plain text -#: user-manual.txt:795 +#: user-manual.txt:827 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* " @@ -1470,13 +1564,13 @@ msgid "" msgstr "" #. type: Title ===== -#: user-manual.txt:796 +#: user-manual.txt:828 #, no-wrap msgid "Equipment" msgstr "" #. type: Plain text -#: user-manual.txt:801 +#: user-manual.txt:833 msgid "" "The Equipment tab allow entering information about the type of cylinder and " "gas used, as well as the weights used for the dive. The message in the blue " @@ -1484,7 +1578,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:808 +#: user-manual.txt:840 msgid "" "shows the equipment is being edited. This is a highly interactive part of " "_Subsurface_ and the information on cylinders and gases (entered here) " @@ -1492,7 +1586,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:812 +#: user-manual.txt:844 #, no-wrap msgid "" "*Cylinders*: The cylinder information is entered through a dialogue that " @@ -1501,13 +1595,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:813 +#: user-manual.txt:845 #, no-wrap msgid "images/DC_gas-dialogue1_f20.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:826 +#: user-manual.txt:858 msgid "" "For hand-entered dives, this information needs to be typed in. For dive " "computers, _Subsurface_ often gets the gas used from the dive computer and " @@ -1523,13 +1617,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:827 +#: user-manual.txt:859 #, no-wrap msgid "images/DC_gas-dialogue2_f20.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:834 +#: user-manual.txt:866 msgid "" "The drop-down list can then be used to select the cylinder type that was " "used for this dive, or just start typing in the box which shows the " @@ -1539,7 +1633,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:838 +#: user-manual.txt:870 msgid "" "Next, indicate the starting pressure and the ending pressure of the " "specified gas during the dive. The unit of pressure (metric/imperial) " @@ -1547,7 +1641,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:849 +#: user-manual.txt:881 msgid "" "Finally, provide the gas mixture used. If air was used, the value of 21% can " "be entered into the oxygen box or this field can be left blank. If nitrox or " @@ -1561,13 +1655,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:850 +#: user-manual.txt:882 #, no-wrap msgid "images/CylinderDataEntry3_f20.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:856 +#: user-manual.txt:888 #, no-wrap msgid "" "*Weights*: Information about the weight system used can be entered\n" @@ -1578,26 +1672,26 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:857 +#: user-manual.txt:889 #, no-wrap msgid "images/WeightsDataEntry1_f20.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:861 +#: user-manual.txt:893 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:862 +#: user-manual.txt:894 #, no-wrap msgid "images/WeightsDataEntry2_f20.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:876 +#: user-manual.txt:908 msgid "" "This can be used to select the type of weight system used during the " "dive. You may start typing in the box to specify a different weighting " @@ -1612,19 +1706,19 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:877 +#: user-manual.txt:909 #, no-wrap msgid "images/WeightsDataEntry3_f20.jpg" msgstr "" #. type: Title ==== -#: user-manual.txt:879 +#: user-manual.txt:911 #, no-wrap msgid "Editing several selected dives simultaneously" msgstr "" #. type: Plain text -#: user-manual.txt:895 +#: user-manual.txt:927 msgid "" "_METHOD 1_: After downloading dives from a dive computer, the dive profiles " "of each is shown in the *Dive profile* tab, as well as a few items of " @@ -1642,7 +1736,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:905 +#: user-manual.txt:937 msgid "" "Simultaneous editing only works with fields that do not already contain " "information. This means if some fields have been edited for a particular " @@ -1657,7 +1751,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:914 +#: user-manual.txt:946 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 " @@ -1672,13 +1766,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:916 +#: user-manual.txt:948 #, no-wrap msgid "Adding Bookmarks to a dive" msgstr "" #. type: Plain text -#: user-manual.txt:921 +#: user-manual.txt:953 msgid "" "Many divers wish to annotate dives with text that indicate particular " "events, e.g. \"Saw dolphins\", or \"Released surface buoy\". This is easily " @@ -1686,7 +1780,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:925 +#: user-manual.txt:957 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 " @@ -1694,40 +1788,40 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:927 +#: user-manual.txt:959 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:930 +#: user-manual.txt:962 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:933 +#: user-manual.txt:965 msgid "" "Hovering the mouse over the red bookmark, the appropriate text is shown at " "the bottom of the information box (see *D* below)." msgstr "" #. type: Target for macro image -#: user-manual.txt:934 +#: user-manual.txt:966 #, no-wrap msgid "images/Bookmarks.jpg" msgstr "" #. type: Title ==== -#: user-manual.txt:937 +#: user-manual.txt:969 #, no-wrap msgid "Saving the updated dive information" msgstr "" #. type: Plain text -#: user-manual.txt:948 +#: user-manual.txt:980 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 " @@ -1740,7 +1834,7 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:949 +#: user-manual.txt:981 #, no-wrap msgid "" "Importing dive information from other digital data sources or other data " @@ -1748,7 +1842,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:972 +#: user-manual.txt:1004 msgid "" "Many divers log their dives using the proprietary software provided by the " "manufacturers of their dive computers. _Subsurface_ can import dive logs " @@ -1769,7 +1863,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:984 +#: user-manual.txt:1016 msgid "" "If the format of other software is supported natively on Subsurface, select " "either _Import -> Import log files_ or _File -> Open log file_. Notice that " @@ -1784,13 +1878,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:985 +#: user-manual.txt:1017 #, no-wrap msgid "Using the universal import dialogue" msgstr "" #. type: Plain text -#: user-manual.txt:991 +#: user-manual.txt:1023 msgid "" "Importing dives from other software is done through a universal interface " "activated by selecting _Import_ from the Main Menu, then clicking on _Import " @@ -1798,13 +1892,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:992 +#: user-manual.txt:1024 #, no-wrap msgid "images/Import1_f20.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:997 +#: user-manual.txt:1029 msgid "" "Towards the bottom right is a dropdown selector with a default label of " "_Dive Log Files_ which accesses different types of direct imports available, " @@ -1812,89 +1906,89 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:999 +#: user-manual.txt:1031 msgid "" "XML-formatted dive logs (DivingLog 5.0, MacDive and several other dive log " "systems)" msgstr "" #. type: Plain text -#: user-manual.txt:1000 +#: user-manual.txt:1032 msgid "Cochran dive logs" msgstr "" #. type: Plain text -#: user-manual.txt:1001 +#: user-manual.txt:1033 msgid "UDDF-formatted dive logs (e.g. Kenozooid)" msgstr "" #. type: Plain text -#: user-manual.txt:1002 +#: user-manual.txt:1034 msgid "UDCF-formatted dive logs" msgstr "" #. type: Plain text -#: user-manual.txt:1003 +#: user-manual.txt:1035 msgid "Poseidon MkVI CCR logs" msgstr "" #. type: Plain text -#: user-manual.txt:1004 +#: user-manual.txt:1036 msgid "APD Inspiration/Evolution CCR logs" msgstr "" #. type: Plain text -#: user-manual.txt:1005 +#: user-manual.txt:1037 msgid "LiquiVision logs" msgstr "" #. type: Plain text -#: user-manual.txt:1006 +#: user-manual.txt:1038 msgid "divelogs.de logs" msgstr "" #. type: Plain text -#: user-manual.txt:1007 +#: user-manual.txt:1039 msgid "OSTC Tools logs" msgstr "" #. type: Plain text -#: user-manual.txt:1008 +#: user-manual.txt:1040 msgid "JDiveLog" msgstr "" #. type: Plain text -#: user-manual.txt:1009 +#: user-manual.txt:1041 msgid "Suunto Dive Manager (DM3, DM4, DM5)" msgstr "" #. type: Plain text -#: user-manual.txt:1010 +#: user-manual.txt:1042 msgid "DL7 files used by Diver's Alert network (DAN)" msgstr "" #. type: Plain text -#: user-manual.txt:1011 +#: user-manual.txt:1043 msgid "Underwater technologies AV1 dive logs" msgstr "" #. type: Plain text -#: user-manual.txt:1012 +#: user-manual.txt:1044 msgid "Divesoft dive logs" msgstr "" #. type: Plain text -#: user-manual.txt:1013 +#: user-manual.txt:1045 msgid "Poseidon MK VI eCCR dive logs" msgstr "" #. type: Plain text -#: user-manual.txt:1014 +#: user-manual.txt:1046 msgid "CSV (text-based and spreadsheet-based) dive logs, including APD CCR logs" msgstr "" #. type: Plain text -#: user-manual.txt:1019 +#: user-manual.txt:1051 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 " @@ -1904,13 +1998,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:1020 +#: user-manual.txt:1052 #, no-wrap msgid "Importing from OSTCTools" msgstr "" #. type: Plain text -#: user-manual.txt:1029 +#: user-manual.txt:1061 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 " @@ -1923,7 +2017,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1033 +#: user-manual.txt:1065 msgid "" "All H&W devices supported by OSTCTools can be imported to _Subsurface_. This " "includes OSTC, OSTC Mk2, OSTC 2N/2C, OSTC3, OSTC Sport, and probably " @@ -1931,7 +2025,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1038 +#: user-manual.txt:1070 msgid "" "Please remember that OSTCTools is *not* true diving log software, but rather " "a useful set of tools for analysis and management of OSTC devices. Only raw " @@ -1940,13 +2034,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:1040 +#: user-manual.txt:1072 #, no-wrap msgid "Importing from Mares Dive Organizer V2.1" msgstr "" #. type: Plain text -#: user-manual.txt:1047 +#: user-manual.txt:1079 msgid "" "Since Mares uses proprietary Windows software not compatible with " "multi-platform applications, these dive logs cannot be directly imported " @@ -1956,7 +2050,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1052 +#: user-manual.txt:1084 msgid "" "Export the dive log data from Mares Dive Organizer to your desktop, using a " "_.sdf_ file name extension. Refer to xref:Mares_Export[Appendix C] for more " @@ -1964,7 +2058,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1058 +#: user-manual.txt:1090 msgid "" "Data should then be imported into _www.divelogs.de_. First, create a user " "account in _www.divelogs.de_ and Log into that web site, then select _Import " @@ -1974,20 +2068,20 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1060 +#: user-manual.txt:1092 msgid "" "Finally, import the dives from _divelogs.de_ to _Subsurface_, using the " "instructions below." msgstr "" #. type: Title ==== -#: user-manual.txt:1063 +#: user-manual.txt:1095 #, no-wrap msgid "Importing Scubapro _SmartTrak_ divelogs" msgstr "" #. type: Plain text -#: user-manual.txt:1070 +#: user-manual.txt:1102 msgid "" "_SmartTrak_ stores the raw data from a Uwatec/Scubapro dive computer along " "with a plethora of other data manually added by the user, ranging from dive " @@ -1998,7 +2092,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1075 +#: user-manual.txt:1107 msgid "" "A stand alone tool for Linux has been developed to import the _.slg_ files " "generated by SmartTrak to Subsurface's _.xml_ format. It can be built " @@ -2007,52 +2101,59 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1078 +#: user-manual.txt:1109 msgid "" -"Feel free to contact the _Subsurface_ development team on " -"mailto:subsurface@subsurface-divelog.org[our mailing list] for assistance in " -"importing _SmartTrak_ dive logs." +"In addition, a web service is available for divelog convertions from " +"SmartTrak to _Subsurface_ (see below)." msgstr "" #. type: Plain text -#: user-manual.txt:1081 +#: user-manual.txt:1112 msgid "" -"Assuming the above dependencies have been installed and the _Subsurface_ " -"source tree is in the directory _~/src/subsurface_, then:" +"Feel free to contact the _Subsurface_ development team on " +"mailto:subsurface@subsurface-divelog.org[our mailing list] for assistance in " +"importing _SmartTrak_ dive logs." msgstr "" #. type: Title ===== -#: user-manual.txt:1082 +#: user-manual.txt:1113 #, no-wrap msgid "Building _smtk2ssrf_" msgstr "" #. type: Plain text -#: user-manual.txt:1085 +#: user-manual.txt:1117 +msgid "" +"Assuming the above dependencies have been installed and the _Subsurface_ " +"source tree is in the directory _~/src/subsurface_, then:" +msgstr "" + +#. type: Plain text +#: user-manual.txt:1119 msgid "Move to the source tree directory." msgstr "" #. type: Plain text -#: user-manual.txt:1087 +#: user-manual.txt:1121 msgid "" "Run \" $ ccmake build \" and set SMARTTRAK_IMPORT option to *on* (off by " "default)." msgstr "" #. type: Plain text -#: user-manual.txt:1088 +#: user-manual.txt:1122 msgid "Generate with [c] and save and exit with [g]." msgstr "" #. type: Plain text -#: user-manual.txt:1090 +#: user-manual.txt:1124 msgid "" "Build as you prefer, using the _build.sh_ script (recomended) or moving to " "build directory and running _make_." msgstr "" #. type: Plain text -#: user-manual.txt:1093 +#: user-manual.txt:1127 msgid "" "After a successful build, there will be an executable named _smtk2ssrf_ in " "the _subsurface/build_ directory. Copy or move it to a directory in your " @@ -2060,13 +2161,13 @@ msgid "" msgstr "" #. type: Title ===== -#: user-manual.txt:1094 +#: user-manual.txt:1128 #, no-wrap msgid "Running" msgstr "" #. type: Plain text -#: user-manual.txt:1100 +#: user-manual.txt:1134 msgid "" "_smtk2ssrf_ accepts 0, 2 or more parameters. If it is launched without " "parameters in a graphical user interface, a simple window opens for choosing " @@ -2075,13 +2176,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1101 +#: user-manual.txt:1135 #, no-wrap msgid "images/smtk2ssrf.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:1108 +#: user-manual.txt:1142 msgid "" "Existing data in the destination file will be erased, so *DO NOT* use a " "regular subsurface divelog file as a destination: rather, specify a *new* " @@ -2089,20 +2190,20 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1110 +#: user-manual.txt:1144 msgid "" "If launched from a command line with two or more parameters, the format is " "as follows:" msgstr "" #. type: Plain text -#: user-manual.txt:1112 +#: user-manual.txt:1146 #, no-wrap msgid "\t$ smrtk2ssrf /input/file_1.slg /input/file_2.slg /output/file3.xml\n" msgstr "" #. type: Plain text -#: user-manual.txt:1120 +#: user-manual.txt:1154 msgid "" "where _input_ is the directory containing the .slg file(s) and _output_ is " "the directory where the _Subsurface_-formatted output is written to. Files " @@ -2113,13 +2214,46 @@ msgid "" msgstr "" #. type: Title ===== -#: user-manual.txt:1121 +#: user-manual.txt:1155 +#, no-wrap +msgid "For the lazy: a web service to convert _SmartTrak_ to _Subsurface_" +msgstr "" + +#. type: Plain text +#: user-manual.txt:1158 +msgid "Open the website at:" +msgstr "" + +#. type: Plain text +#: user-manual.txt:1160 +msgid "_https://thetheoreticaldiver.org/rch-cgi-bin/smtk2ssrf.pl_" +msgstr "" + +#. type: Plain text +#: user-manual.txt:1166 +msgid "" +"This is a no-frills web service for converting _SmartTrak_ dive logs to " +"_Subsurface_. Select the browse button. This allows you to browse your " +"computer directories and to select the _SmartTrak_ divelog to be " +"converted. Once it has been selected, click the _Submit query_ button. After " +"a short while, a dialog box appears (image below) for saving the converted " +"file to the local computer." +msgstr "" + +#. type: Target for macro image +#: user-manual.txt:1167 +#, no-wrap +msgid "images/strk2ssrf_web.jpg" +msgstr "" + +#. type: Title ===== +#: user-manual.txt:1169 #, no-wrap msgid "Merging the imported dives with the existing divelog" msgstr "" #. type: Plain text -#: user-manual.txt:1131 +#: user-manual.txt:1179 msgid "" "Open the new file (generated in the previous steps) using _Subsurface_ and " "check the dives and data. If everything is fine, close the _.xml_ file and " @@ -2132,13 +2266,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:1133 +#: user-manual.txt:1181 #, no-wrap msgid "Importing dives from *divelogs.de*" msgstr "" #. type: Plain text -#: user-manual.txt:1146 +#: user-manual.txt:1194 msgid "" "Importing dive information from _divelogs.de_ is simple, using a single " "dialogue box. The _Import -> Import from Divelogs.de_ option should be " @@ -2152,19 +2286,19 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1147 +#: user-manual.txt:1195 #, no-wrap msgid "images/Divelogs1.jpg" msgstr "" #. type: Title ==== -#: user-manual.txt:1150 +#: user-manual.txt:1198 #, no-wrap msgid "Importing data in CSV format" msgstr "" #. type: Plain text -#: user-manual.txt:1161 +#: user-manual.txt:1209 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 " @@ -2180,13 +2314,13 @@ msgid "" msgstr "" #. type: Title ===== -#: user-manual.txt:1163 +#: user-manual.txt:1211 #, no-wrap msgid "Importing dives in CSV format from dive computers or other dive log software" msgstr "" #. type: Plain text -#: user-manual.txt:1168 +#: user-manual.txt:1216 msgid "" "_CSV_ files can be viewed using an ordinary text editor. A _CSV_ file is " "normally organized into a single line that provides the headers (or _field " @@ -2195,14 +2329,14 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1170 +#: user-manual.txt:1218 msgid "" "There are two types of _CSV_ dive logs that can be imported into " "_Subsurface_:" msgstr "" #. type: Plain text -#: user-manual.txt:1176 +#: user-manual.txt:1224 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, " @@ -2213,7 +2347,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1185 +#: user-manual.txt:1233 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 " @@ -2227,14 +2361,14 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1188 +#: user-manual.txt:1236 msgid "" "Before being able to import the _CSV_ data to _Subsurface_ *you need to know " "a few things about the data being imported*:" msgstr "" #. type: Plain text -#: user-manual.txt:1196 +#: user-manual.txt:1244 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 " @@ -2246,7 +2380,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1200 +#: user-manual.txt:1248 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 " @@ -2255,12 +2389,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1202 +#: user-manual.txt:1250 msgid "Is the numeric information (e.g. dive depth) in metric or in imperial units?" msgstr "" #. type: Plain text -#: user-manual.txt:1209 +#: user-manual.txt:1257 msgid "" "With this information, importing the data into _Subsurface_ is " "straightforward. Select _Import -> Import Log Files_ from the main menu. In " @@ -2270,13 +2404,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1210 +#: user-manual.txt:1258 #, no-wrap msgid "images/csv_import1_f20.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:1221 +#: user-manual.txt:1269 #, no-wrap msgid "" "At the top left, there is a dropdown list containing pre- configured\n" @@ -2295,7 +2429,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1233 +#: user-manual.txt:1281 msgid "" "Complete this by ensuring that all the data columns have the appropriate " "column headings. The top blue row of the data table contains the column " @@ -2312,13 +2446,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1234 +#: user-manual.txt:1282 #, no-wrap msgid "images/csv_import2_f20.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:1240 +#: user-manual.txt:1288 msgid "" "Continue in this way to ensure all the column headings in the blue row of " "cells correspond to the headings listed in the top part of the dialogue. " @@ -2328,13 +2462,13 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:1244 +#: user-manual.txt:1292 #, no-wrap msgid "*A Diver's Introduction to _CSV_ Files*\n" msgstr "" #. type: delimited block * -#: user-manual.txt:1258 +#: user-manual.txt:1306 msgid "" "_CSV_ is an abbreviation for a data file format: _Comma-Separated " "Values_. It is a file format that allows you to view or edit information " @@ -2351,7 +2485,7 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:1267 +#: user-manual.txt:1315 msgid "" "The most important attribute of a _CSV_ file is the _field separator_, the " "character used to separate fields within a single line. The field separator " @@ -2366,7 +2500,7 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:1273 +#: user-manual.txt:1321 #, no-wrap msgid "" "\tDive site,Dive date,Time,Dive_duration, Dive_depth,Dive buddy\n" @@ -2377,14 +2511,14 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:1275 +#: user-manual.txt:1323 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:1281 +#: user-manual.txt:1329 #, no-wrap msgid "" "\tDive site\tDive date\tTime\tDive_duration\tDive_depth\tDive buddy\n" @@ -2395,7 +2529,7 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:1289 +#: user-manual.txt:1337 msgid "" "It is clear why many people prefer the TAB-delimited format to the " "comma-delimited format. The disadvantage is that you cannot see the TAB " @@ -2409,7 +2543,7 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:1300 +#: user-manual.txt:1348 #, no-wrap msgid "" "\tDive Time (s)\tDepth (m)\tpO~2~ - Setpoint (Bar) \tpO~2~ - C1 Cell 1 " @@ -2426,7 +2560,7 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:1306 +#: user-manual.txt:1354 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_ " @@ -2437,7 +2571,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1319 +#: user-manual.txt:1367 msgid "" "But, the _CSV_ import has a couple of caveats. Avoid some special characters " "like ampersand (&), less than (<), greater than (>) and double quotes (\") " @@ -2450,56 +2584,56 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:1320 +#: user-manual.txt:1368 #, no-wrap msgid "Importing Dive coordinates from a mobile device with GPS." msgstr "" #. type: Plain text -#: user-manual.txt:1324 +#: user-manual.txt:1372 msgid "" "A smartphone with built-in GPS facilities can be used to store the locations " "of dives. This is performed by:" msgstr "" #. type: Plain text -#: user-manual.txt:1327 +#: user-manual.txt:1375 msgid "" "Taking the mobile device along on the dive boat / liveabord while " "automatically collecting dive site coordinate information." msgstr "" #. type: Plain text -#: user-manual.txt:1329 +#: user-manual.txt:1377 msgid "" "Uploading the coordinates from the mobile device to the _Subsurface_ " "Internet server." msgstr "" #. type: Plain text -#: user-manual.txt:1332 +#: user-manual.txt:1380 msgid "" "Syncronising the dives in the _Subsurface_ dive list with the coordinates " "stored on the _Subsurface_ Internet server." msgstr "" #. type: Plain text -#: user-manual.txt:1334 -msgid "_Subsurface has two tools for achieving this:" +#: user-manual.txt:1382 +msgid "_Subsurface_ has two tools for achieving this:" msgstr "" #. type: Plain text -#: user-manual.txt:1336 +#: user-manual.txt:1384 msgid "The _Subsurface Companion App_ (Android and iOS)." msgstr "" #. type: Plain text -#: user-manual.txt:1338 +#: user-manual.txt:1386 msgid "The _Subsurface-mobile_ app (Android and iOS)" msgstr "" #. type: Plain text -#: user-manual.txt:1347 +#: user-manual.txt:1395 msgid "" "Both of these applications perform the collection of dive site coordinates " "and the synchronisation with dives in the _Subsurface_ dive list. However, " @@ -2513,26 +2647,26 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1349 +#: user-manual.txt:1397 msgid "" "For information on using the _Subsurface Companion App_, click " "xref:S_Companion[_here_]." msgstr "" #. type: Title ==== -#: user-manual.txt:1350 +#: user-manual.txt:1398 #, no-wrap msgid "Storing and and using GPS locations using _Subsurface-mobile_" msgstr "" #. type: Title ===== -#: user-manual.txt:1352 +#: user-manual.txt:1400 #, no-wrap msgid "Install _Subsurface-mobile_" msgstr "" #. type: Plain text -#: user-manual.txt:1358 +#: user-manual.txt:1406 msgid "" "Find _Subsurface-mobile_ on Google Play and install it on an Android " "device. The app is free. The iOS version is currently " @@ -2542,13 +2676,13 @@ msgid "" msgstr "" #. type: Title ===== -#: user-manual.txt:1359 +#: user-manual.txt:1407 #, no-wrap msgid "Create a _Subsurface-mobile_ account" msgstr "" #. type: Plain text -#: user-manual.txt:1367 +#: user-manual.txt:1415 msgid "" "This topic is discussed at length in the _Subsurface-mobile_ user manual. In " "the Credentials screen of _Subsurface-mobile_ provide an e-mail address and " @@ -2560,7 +2694,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1370 +#: user-manual.txt:1418 #, no-wrap msgid "" "*N.B.:* To successfully create a user account, the mobile device must have " @@ -2569,19 +2703,19 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1371 +#: user-manual.txt:1419 #, no-wrap msgid "images/MobileCredentials.jpg" msgstr "" #. type: Title ===== -#: user-manual.txt:1374 +#: user-manual.txt:1422 #, no-wrap msgid "Configure auto-collecting of GPS coordinates" msgstr "" #. type: Plain text -#: user-manual.txt:1380 +#: user-manual.txt:1428 msgid "" "Activate the main menu of _Subsurface-mobile_ by selecting the \"hamburger\" " "menu button at the bottom left of the _Subsurface-mobile_ screen (see image " @@ -2591,19 +2725,19 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1382 +#: user-manual.txt:1430 msgid "" "_Time threshold._ (minutes). The app will try to get a location every X " "minutes" msgstr "" #. type: Plain text -#: user-manual.txt:1384 +#: user-manual.txt:1432 msgid "_Distance threshold._ (meters). Minimum distance between two locations." msgstr "" #. type: Plain text -#: user-manual.txt:1393 +#: user-manual.txt:1441 #, no-wrap msgid "" "*How are GPS coordinates collected?* Assuming the diver sets 5 minutes and " @@ -2623,13 +2757,13 @@ msgid "" msgstr "" #. type: Title ===== -#: user-manual.txt:1394 +#: user-manual.txt:1442 #, no-wrap msgid "Activate the automated recording of GPS locations" msgstr "" #. type: Plain text -#: user-manual.txt:1399 +#: user-manual.txt:1447 msgid "" "The _Subsurface-mobile_ main menu has a checkbox at the bottom left labled " "_Run location service_ (see image below). Checking the box starts the " @@ -2637,32 +2771,32 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1400 +#: user-manual.txt:1448 #, no-wrap msgid "images/MobileMenu.jpg" msgstr "" #. type: Title ===== -#: user-manual.txt:1402 +#: user-manual.txt:1450 #, no-wrap msgid "After the dive, stop the automated recording of GPS locations" msgstr "" #. type: Plain text -#: user-manual.txt:1405 +#: user-manual.txt:1453 msgid "" "Uncheck the check box at the bottom left of the _Subsurface-mobile_ main " "menu." msgstr "" #. type: Title ===== -#: user-manual.txt:1406 +#: user-manual.txt:1454 #, no-wrap msgid "Upload the GPS locations onto the _Subsurface_ Internet server." msgstr "" #. type: Plain text -#: user-manual.txt:1413 +#: user-manual.txt:1461 #, no-wrap msgid "" "*N.B.:* Uploading the GPS locations to the Internet can only take place if " @@ -2677,20 +2811,20 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1416 +#: user-manual.txt:1464 msgid "" "From the _Subsurface-mobile_ main menu, select _GPS_ -> _Upload GPS " "data_. The locations are uploaded." msgstr "" #. type: Title ===== -#: user-manual.txt:1417 +#: user-manual.txt:1465 #, no-wrap msgid "Apply the stored GPS locations to dives on the _Subsurface_ dive list." msgstr "" #. type: Plain text -#: user-manual.txt:1426 +#: user-manual.txt:1474 msgid "" "_Subsurface_ collects the first GPS location recorded after the start of a " "dive (obtained within _Subsurface_ from either the dive computer or from the " @@ -2702,7 +2836,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1431 +#: user-manual.txt:1479 msgid "" "The " "https://subsurface-divelog.org/documentation/subsurface-mobile-user-manual[user " @@ -2712,7 +2846,7 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:1434 +#: user-manual.txt:1482 #, no-wrap msgid "" "Importing GPS coordinates with the _Subsurface Companion App_ for mobile " @@ -2720,7 +2854,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1443 +#: user-manual.txt:1491 #, no-wrap msgid "" "Using the *Subsurface Companion App* on an _Android device_ or\n" @@ -2735,13 +2869,13 @@ msgid "" msgstr "" #. type: Title ===== -#: user-manual.txt:1444 +#: user-manual.txt:1492 #, no-wrap msgid "Create a Companion App account" msgstr "" #. type: Plain text -#: user-manual.txt:1449 +#: user-manual.txt:1497 msgid "" "Register on the http://api.hohndel.org/login/[_Subsurface companion web " "page_]. A confirmation email with instructions and a personal *DIVERID* " @@ -2750,7 +2884,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1454 +#: user-manual.txt:1502 msgid "" "Download the app from " "https://play.google.com/store/apps/details?id=org.subsurface[Google Play " @@ -2759,18 +2893,18 @@ msgid "" msgstr "" #. type: Title ===== -#: user-manual.txt:1455 +#: user-manual.txt:1503 #, no-wrap msgid "Using the Subsurface companion app on an Android smartphone" msgstr "" #. type: Plain text -#: user-manual.txt:1458 +#: user-manual.txt:1506 msgid "On first use the app has three options:" msgstr "" #. type: Plain text -#: user-manual.txt:1464 +#: user-manual.txt:1512 msgid "" "_Create a new account._ Equivalent to registering in the _Subsurface_ " "companion page using an Internet browser. You can request a *DIVERID* using " @@ -2780,14 +2914,14 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1467 +#: user-manual.txt:1515 msgid "" "_Retrieve an account._ If you forget your *DIVERID* you will receive an " "email to recover the ID string." msgstr "" #. type: Plain text -#: user-manual.txt:1471 +#: user-manual.txt:1519 msgid "" "_Use an existing account._ You are prompted for your *DIVERID*. The app " "saves this *DIVERID* and doesn’t ask for it again unless you use the " @@ -2795,7 +2929,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1479 +#: user-manual.txt:1527 msgid "" "In the _Subsurface_ main program, the *DIVERID* should also be entered on " "the Default Preferences panel, by selecting _File -> Preferences -> General_ " @@ -2804,13 +2938,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1481 +#: user-manual.txt:1529 #, no-wrap msgid "*Creating new dive locations*\n" msgstr "" #. type: Plain text -#: user-manual.txt:1485 +#: user-manual.txt:1533 msgid "" "Now you are ready to get a dive position and send it to the server. The " "Android display looks like the left hand image (*A*) below, but without any " @@ -2818,21 +2952,21 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1488 +#: user-manual.txt:1536 msgid "" "Touch the + icon at the top right to add a new dive site. A menu with 3 " "options shows:" msgstr "" #. type: Plain text -#: user-manual.txt:1491 +#: user-manual.txt:1539 msgid "" "Current: A prompt for a place name is shown (or a request to activate the " "GPS if it is turned off), after which the current location is saved." msgstr "" #. type: Plain text -#: user-manual.txt:1500 +#: user-manual.txt:1548 msgid "" "Use Map: This option allows you to fix a position by searching a world " "map. A world map is shown (see *B* below). Specify the desired position with " @@ -2845,13 +2979,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1501 +#: user-manual.txt:1549 #, no-wrap msgid "images/Companion_5.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:1508 +#: user-manual.txt:1556 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 its " @@ -2860,13 +2994,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1511 +#: user-manual.txt:1559 #, no-wrap msgid "*List of dive locations*\n" msgstr "" #. type: Plain text -#: user-manual.txt:1518 +#: user-manual.txt:1566 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 " @@ -2877,7 +3011,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1526 +#: user-manual.txt:1574 msgid "" "Dive locations in this list can be viewed in two ways: a list of locations " "or a map showing them. The display mode (List or Map) is changed by " @@ -2889,13 +3023,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1527 +#: user-manual.txt:1575 #, no-wrap msgid "images/Companion_4.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:1533 +#: user-manual.txt:1581 msgid "" "Upon selecting a dive (*not* selecting the check box), the name given to it, " "date/time and GPS coordinates are shown with two options at the top of the " @@ -2903,12 +3037,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1535 +#: user-manual.txt:1583 msgid "Edit (pencil): Change the name of the dive location." msgstr "" #. type: Plain text -#: user-manual.txt:1540 +#: user-manual.txt:1588 msgid "" "Maps: Display a map showing the dive location. After editing and saving a " "dive location (see *C* above), upload it to the web service, as explained " @@ -2916,13 +3050,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1542 +#: user-manual.txt:1590 #, no-wrap msgid "*Uploading dive locations*\n" msgstr "" #. type: Plain text -#: user-manual.txt:1547 +#: user-manual.txt:1595 msgid "" "There are several ways to send locations to the server. The easiest is " "simply selecting the locations (See *A* below) and then touching the right " @@ -2930,50 +3064,50 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1552 +#: user-manual.txt:1600 msgid "" "Be careful! The trash icon on the right means exactly what it should; it " "deletes the selected dive location(s)." msgstr "" #. type: Target for macro image -#: user-manual.txt:1553 +#: user-manual.txt:1601 #, no-wrap msgid "images/Companion_1.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:1558 +#: user-manual.txt:1606 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: Plain text -#: user-manual.txt:1561 +#: user-manual.txt:1609 #, no-wrap msgid "*Settings on the Companion App*\n" msgstr "" #. type: Plain text -#: user-manual.txt:1563 +#: user-manual.txt:1611 msgid "" "Selecting the _Settings_ menu option results in the right hand image above " "(*B*)." msgstr "" #. type: Plain text -#: user-manual.txt:1565 +#: user-manual.txt:1613 msgid "_Server and account_" msgstr "" #. type: Plain text -#: user-manual.txt:1567 +#: user-manual.txt:1615 msgid "_Web-service URL._ This is predefined (http://api.hohndel.org/)" msgstr "" #. type: Plain text -#: user-manual.txt:1570 +#: user-manual.txt:1618 msgid "" "_User ID._ The DIVERID obtained by registering as described above. The " "easiest way to get it is to copy and paste from the confirmation email or " @@ -2981,31 +3115,31 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1572 +#: user-manual.txt:1620 msgid "_Synchronisation_" msgstr "" #. type: Plain text -#: user-manual.txt:1575 +#: user-manual.txt:1623 msgid "" "_Synchronize on startup_. If selected, dive locations in the Android device " "and those on the web service synchronize each time the app is started." msgstr "" #. type: Plain text -#: user-manual.txt:1578 +#: user-manual.txt:1626 msgid "" "_Upload new dives._ If selected, each time the user adds a dive location it " "is automatically sent to the server." msgstr "" #. type: Plain text -#: user-manual.txt:1580 +#: user-manual.txt:1628 msgid "_Background service_" msgstr "" #. type: Plain text -#: user-manual.txt:1583 +#: user-manual.txt:1631 msgid "" "Instead of entering an unique dive location, you can leave the service " "running in the background, allowing a continuous collection of GPS " @@ -3013,35 +3147,35 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1585 +#: user-manual.txt:1633 msgid "The settings below define the behavior of the service:" msgstr "" #. type: Plain text -#: user-manual.txt:1588 +#: user-manual.txt:1636 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:1590 +#: user-manual.txt:1638 msgid "_Min distance._ In meters. Minimum distance between two locations." msgstr "" #. type: Plain text -#: user-manual.txt:1592 +#: user-manual.txt:1640 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:1593 user-manual.txt:1694 user-manual.txt:2119 +#: user-manual.txt:1641 user-manual.txt:1742 user-manual.txt:2214 #, no-wrap msgid "images/icons/info.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:1603 +#: user-manual.txt:1651 msgid "" "_How does the background service work?_ Assuming the diver sets 5 minutes " "and 50 meters in the settings above, the app will start by recording a " @@ -3054,54 +3188,54 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1605 +#: user-manual.txt:1653 msgid "_Other_" msgstr "" #. type: Plain text -#: user-manual.txt:1608 +#: user-manual.txt:1656 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:1610 +#: user-manual.txt:1658 msgid "_Subsurface website._ A link to the URL of Subsurface web" msgstr "" #. type: Plain text -#: user-manual.txt:1612 +#: user-manual.txt:1660 msgid "_Version._ Displays the current version of the Companion App." msgstr "" #. type: Plain text -#: user-manual.txt:1614 +#: user-manual.txt:1662 msgid "_Search_" msgstr "" #. type: Plain text -#: user-manual.txt:1616 +#: user-manual.txt:1664 msgid "Search the saved dive locations by name or by date and time." msgstr "" #. type: Plain text -#: user-manual.txt:1618 +#: user-manual.txt:1666 msgid "_Start service_" msgstr "" #. type: Plain text -#: user-manual.txt:1620 +#: user-manual.txt:1668 msgid "Starts the _background service_ following the previously defined settings." msgstr "" #. type: Plain text -#: user-manual.txt:1622 +#: user-manual.txt:1670 msgid "_Disconnect_" msgstr "" #. type: Plain text -#: user-manual.txt:1629 +#: user-manual.txt:1677 msgid "" "This is admittedly a badly named option that disconnects the app from the " "server. It resets the user ID in the app, showing the first screen where an " @@ -3111,23 +3245,23 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1631 +#: user-manual.txt:1679 msgid "_Send all locations_" msgstr "" #. type: Plain text -#: user-manual.txt:1633 +#: user-manual.txt:1681 msgid "This option sends all locations stored in the Android device to the server." msgstr "" #. type: Title ===== -#: user-manual.txt:1635 +#: user-manual.txt:1683 #, no-wrap msgid "Using the Subsurface companion app on an _iPhone_ to record dive locations" msgstr "" #. type: Plain text -#: user-manual.txt:1640 +#: user-manual.txt:1688 msgid "" "The iPhone interface is quite simple. Type the user ID (obtained during " "registration) into the space reserved for it, then select \"Dive in\" (see " @@ -3136,13 +3270,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1641 +#: user-manual.txt:1689 #, no-wrap msgid "images/iphone.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:1652 +#: user-manual.txt:1700 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 " @@ -3156,7 +3290,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1658 +#: user-manual.txt:1706 msgid "" "You can edit the site name afterwards by selecting the dive from the dive " "list and clicking on the site name. There are no other editable fields. The " @@ -3165,13 +3299,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1661 +#: user-manual.txt:1709 #, no-wrap msgid "*Downloading dive locations to the _Subsurface_ divelog*\n" msgstr "" #. type: Plain text -#: user-manual.txt:1669 +#: user-manual.txt:1717 msgid "" "Download dive(s) from a dive computer or enter them manually into " "_Subsurface_ before obtaining the GPS coordinates from the server. The " @@ -3183,13 +3317,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1670 +#: user-manual.txt:1718 #, no-wrap msgid "images/DownloadGPS.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:1678 +#: user-manual.txt:1726 msgid "" "Note that the _Apply_ button is now active: selecting it updates the " "locations of the newly entered or uploaded dives in _Subsurface_, i.e. it " @@ -3200,7 +3334,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1685 +#: user-manual.txt:1733 msgid "" "Since _Subsurface_ matches GPS locations from the mobile device and dive " "information from the dive computer based on date-time data, automatic " @@ -3212,7 +3346,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1693 +#: user-manual.txt:1741 msgid "" "Similar date-times may not always be possible and there may be many reasons " "for this (e.g. time zones). _Subsurface_ may also be unable to decide which " @@ -3225,12 +3359,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1697 +#: user-manual.txt:1745 msgid "TIPS:" msgstr "" #. type: Plain text -#: user-manual.txt:1700 +#: user-manual.txt:1748 msgid "" "_Background service_ may fill the location list with unnecessary locations " "that don’t correspond to the exact dive point but do correspond to the " @@ -3238,14 +3372,14 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1701 +#: user-manual.txt:1749 msgid "" "Right now, these locations are difficult to delete from the server. In some " "situations it" msgstr "" #. type: Plain text -#: user-manual.txt:1704 +#: user-manual.txt:1752 msgid "" "is better to clean up the list on the mobile device before sending the dive " "points to the web server by simply deleting the inappropriate " @@ -3254,7 +3388,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1707 +#: user-manual.txt:1755 msgid "" "It may also be useful to give informative names to the locations sent to the " "web server, or at least to use an informative name in the _Name Template_ " @@ -3263,13 +3397,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:1709 +#: user-manual.txt:1757 #, no-wrap msgid "Adding photographs to dives" msgstr "" #. type: Plain text -#: user-manual.txt:1715 +#: user-manual.txt:1763 msgid "" "Many (if not most) divers take photographs during a dive. _Subsurface_ " "allows the storage and display of photographs for each dive. Photos are " @@ -3278,13 +3412,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:1716 +#: user-manual.txt:1764 #, no-wrap msgid "Loading photos and synchronizing between dive computer and camera" msgstr "" #. type: Plain text -#: user-manual.txt:1722 +#: user-manual.txt:1770 msgid "" "Right-click on a dive or on a group of dives on the dive list, bringing up " "the xref:S_DiveListContextMenu[Dive list context Menu]. Select the " @@ -3294,13 +3428,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1723 +#: user-manual.txt:1771 #, no-wrap msgid "images/LoadImage2_f20.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:1730 +#: user-manual.txt:1778 msgid "" "If photos are imported from the Internet, provide a URL pointing to a single " "photograph. If the URL points to a directory, no images are imported: " @@ -3310,7 +3444,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1737 +#: user-manual.txt:1785 msgid "" "Having selected the local folder or Internet image to be imported, the time " "synchronization dialog appears (see image below). The time synchronization " @@ -3322,12 +3456,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1739 +#: user-manual.txt:1787 msgid "_Subsurface_ synchronizes camera with dive computer in three ways:" msgstr "" #. type: Plain text -#: user-manual.txt:1742 +#: user-manual.txt:1790 #, no-wrap msgid "" "*Pro-actively*: Before the dive, ensure synchronization of the dive computer " @@ -3337,7 +3471,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1753 +#: user-manual.txt:1801 #, no-wrap msgid "" "*Manually*: Writing down the exact camera time at the start of a dive allows " @@ -3360,13 +3494,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1754 +#: user-manual.txt:1802 #, no-wrap msgid "images/LoadImage3b_f23.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:1772 +#: user-manual.txt:1820 #, no-wrap msgid "" "*By photograph*: There is a very slick way of achieving synchronization, " @@ -3401,13 +3535,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1773 +#: user-manual.txt:1821 #, no-wrap msgid "images/LoadImage3c_f23.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:1777 +#: user-manual.txt:1825 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 (see the red warning in the image " @@ -3418,23 +3552,23 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:1778 +#: user-manual.txt:1826 #, no-wrap msgid "Viewing the photos" msgstr "" #. type: Plain text -#: user-manual.txt:1781 +#: user-manual.txt:1829 msgid "After the images have been loaded, they appear in two places:" msgstr "" #. type: Plain text -#: user-manual.txt:1783 +#: user-manual.txt:1831 msgid "the _Photos_ tab of the *Notes* panel (left part of image below)." msgstr "" #. type: Plain text -#: user-manual.txt:1787 +#: user-manual.txt:1835 msgid "" "as tiny icons (stubs) on the dive profile at the appropriate positions " "reflecting the time each photograph was taken. To view the photos on the " @@ -3443,37 +3577,37 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1788 +#: user-manual.txt:1836 #, no-wrap msgid "images/icons/ShowPhotos_f20.png" msgstr "" #. type: Plain text -#: user-manual.txt:1791 +#: user-manual.txt:1839 msgid "This results in a profile display as in the image below:" msgstr "" #. type: Target for macro image -#: user-manual.txt:1792 +#: user-manual.txt:1840 #, no-wrap msgid "images/LoadImage4_f20.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:1796 +#: user-manual.txt:1844 msgid "" "Hover the mouse over any of the photo stubs. A thumbnail photo is shown of " "the appropriate photo. See the image below:" msgstr "" #. type: Target for macro image -#: user-manual.txt:1797 +#: user-manual.txt:1845 #, no-wrap msgid "images/LoadImage5_f20.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:1806 +#: user-manual.txt:1854 msgid "" "Clicking on the thumbnail brings up a full size photo overlaid on the " "_Subsurface_ window, allowing a good view of the photographs (see the image " @@ -3484,19 +3618,19 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1807 +#: user-manual.txt:1855 #, no-wrap msgid "images/LoadImage6_f20.jpg" msgstr "" #. type: Title ==== -#: user-manual.txt:1809 +#: user-manual.txt:1857 #, no-wrap msgid "The _Photos_ tab" msgstr "" #. type: Plain text -#: user-manual.txt:1819 +#: user-manual.txt:1867 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 " @@ -3512,13 +3646,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:1820 +#: user-manual.txt:1868 #, no-wrap msgid "Photos on an external hard disk" msgstr "" #. type: Plain text -#: user-manual.txt:1830 +#: user-manual.txt:1878 msgid "" "Most underwater photographers store photos on an external drive. If such a " "drive can be mapped by the operating system (almost always the case) the " @@ -3535,13 +3669,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:1831 +#: user-manual.txt:1879 #, no-wrap msgid "Finding out which dives have associated photos." msgstr "" #. type: Plain text -#: user-manual.txt:1836 +#: user-manual.txt:1884 msgid "" "Inspecting each individual dive in order to determine whether there are " "associated photos can be time consuming. There is a rapid way of seeing " @@ -3555,13 +3689,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:1838 +#: user-manual.txt:1886 #, no-wrap msgid "Moving photographs among directories, hard disks or computers" msgstr "" #. type: Plain text -#: user-manual.txt:1847 +#: user-manual.txt:1895 #, no-wrap msgid "" "After a photograph has been loaded into _Subsurface_ and associated with a " @@ -3581,7 +3715,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1851 +#: user-manual.txt:1899 #, no-wrap msgid "" "When a photo is loaded into _Subsurface_, a fingerprint for the image is " @@ -3593,19 +3727,19 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1853 +#: user-manual.txt:1901 msgid "" "look through a particular directory (and all its subdirectories recursively) " "where photos have been moved to," msgstr "" #. type: Plain text -#: user-manual.txt:1854 +#: user-manual.txt:1902 msgid "calculate fingerprints for all photos in this directory, and" msgstr "" #. type: Plain text -#: user-manual.txt:1857 +#: user-manual.txt:1905 msgid "" "if there is a match between a calculated fingerprint and the one calculated " "when a photo was originally loaded into _Subsurface_ (even if the original " @@ -3614,7 +3748,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1862 +#: user-manual.txt:1910 #, no-wrap msgid "" "This is done by selecting from the Main Menu: _File -> Find moved " @@ -3628,13 +3762,13 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:1867 +#: user-manual.txt:1915 #, no-wrap msgid "*Upgrading legacy photo collections without fingerprints*\n" msgstr "" #. type: delimited block * -#: user-manual.txt:1872 +#: user-manual.txt:1920 msgid "" "_Subsurface_ automatically calculates fingerprints for all images that it " "can access. When manipulating images, ensure that all the images associated " @@ -3642,47 +3776,47 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:1874 +#: user-manual.txt:1922 msgid "" "_Subsurface_ automatically checks and, if necessary, updates the " "fingerprints associated with a single dive if:" msgstr "" #. type: delimited block * -#: user-manual.txt:1876 +#: user-manual.txt:1924 msgid "" "The images associated with that dive are visible as thumbnails on the *Dive " "Profile*." msgstr "" #. type: delimited block * -#: user-manual.txt:1878 +#: user-manual.txt:1926 msgid "" "If you edit anything in the *Notes* panel and save the edits by selecting " "_Apply changes_." msgstr "" #. type: Title === -#: user-manual.txt:1881 +#: user-manual.txt:1929 #, no-wrap msgid "Logging special types of dives" msgstr "" #. type: Plain text -#: user-manual.txt:1884 +#: user-manual.txt:1932 msgid "" "This section gives examples of the versatility of _Subsurface_ as a dive " "logging tool." msgstr "" #. type: Title ==== -#: user-manual.txt:1887 +#: user-manual.txt:1935 #, no-wrap msgid "Multicylinder dives" msgstr "" #. type: Plain text -#: user-manual.txt:1894 +#: user-manual.txt:1942 msgid "" "_Subsurface_ easily handles dives involving more than one " "cylinder. Multi-cylinder diving usually happens (a) if a diver doesn’t have " @@ -3694,7 +3828,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1898 +#: user-manual.txt:1946 #, no-wrap msgid "" "*Describe the cylinders used during the dive* This is performed in the " @@ -3706,7 +3840,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1904 +#: user-manual.txt:1952 #, no-wrap msgid "" "*Record the times at which the switch from one cylinder to another was " @@ -3721,7 +3855,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1912 +#: user-manual.txt:1960 #, no-wrap msgid "" "*Record the cylinder changes on the dive profile*: If the latter option\n" @@ -3738,7 +3872,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1916 +#: user-manual.txt:1964 msgid "" "When this is complete, _Subsurface_ indicates the appropriate use of " "cylinders in the dive profile. Below is a two-cylinder dive, starting off " @@ -3747,29 +3881,54 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1917 +#: user-manual.txt:1965 #, no-wrap msgid "images/multicylinder_dive.jpg" msgstr "" +#. type: Plain text +#: user-manual.txt:1974 +msgid "" +"Several dive computers perform automatic recording of cylinder pressure. In " +"this case no manual intervention is needed. Older dive computers " +"(e.g. Uwatec Galileo, several Suunto models) handle more than one pressure " +"transducer on cylinders, switching from one sensor to another as the diver " +"switches among cylinders and providing a sequential record of cylinders " +"pressures during a dive. Some of the latest models (e.g. Shearwater Perdix " +"AI, Scubapro G2) record two or more pressure transducers concurrently and " +"continuously during the whole dive. In these cases _Suburface correctly " +"interprets the data. There is continuous effort within the _Subsurface_ " +"development team to add new dive computer models to those that can be " +"downloaded from and to represent cylinder pressures correctly. Regardless of " +"the type of sensor handling of dive computers, technical divers are likely " +"to use both automated and manual methods of cylinder pressure logging when " +"more than two gases are used. However, automated recording of cylinder " +"pressure simplifies logging of sidemount dives (where two cylinders are " +"used). See the " +"link:https://subsurface-divelog.org/documentation/supported-dive-computers/[list " +"of supported dive computers]." +msgstr "" + #. type: Title ==== -#: user-manual.txt:1919 +#: user-manual.txt:1975 #, no-wrap msgid "Sidemount dives" msgstr "" #. type: Plain text -#: user-manual.txt:1925 +#: user-manual.txt:1982 msgid "" "Sidemount diving is just another form of multi-cylinder diving, often with " "both or all cylinders having the same gas mixture. Although it’s a popular " "configuration for cave divers, sidemount diving can be done by recreational " -"divers who’ve completed the appropriate training. Sidemount dive logging " -"involves three steps, exactly as with multi-cylinder dives above:" +"divers who have completed the appropriate training. See the comments in the " +"last paragraph, above, about automated recording of cylinder " +"pressures. Manual logging of cylinder pressures during sidemount involves " +"three steps, exactly as with multi-cylinder dives above:" msgstr "" #. type: Plain text -#: user-manual.txt:1934 +#: user-manual.txt:1991 #, no-wrap msgid "" "*During the dive, record cylinder switch events*. Since sidemount diving " @@ -3791,7 +3950,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1937 +#: user-manual.txt:1994 #, no-wrap msgid "" "*Within _Subsurface_ describe the cylinders used during the dive*. The diver " @@ -3802,7 +3961,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1947 +#: user-manual.txt:2004 #, no-wrap msgid "" "*Indicate cylinder change events on the _Subsurface_ dive profile*. Once the " @@ -3827,25 +3986,25 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1948 +#: user-manual.txt:2005 #, no-wrap msgid "images/sidemount1.jpg" msgstr "" #. type: Title ==== -#: user-manual.txt:1951 +#: user-manual.txt:2008 #, no-wrap msgid "Passive semi-closed circuit rebreather (pSCR) dives" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:1953 +#: user-manual.txt:2010 #, no-wrap msgid "images/halcyon_RB80.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:1963 +#: user-manual.txt:2020 msgid "" "Passive semi-closed rebreathers (pSCR) are a technical advance in diving " "equipment that recirculates the breathing gas a diver uses, while removing " @@ -3860,19 +4019,19 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1965 +#: user-manual.txt:2022 msgid "" "To log pSCR dives, no special procedures are required. Use the normal steps " "outlined above:" msgstr "" #. type: Plain text -#: user-manual.txt:1967 +#: user-manual.txt:2024 msgid "Select pSCR in the _Dive Mode_ dropdown list on the *Info* panel." msgstr "" #. type: Plain text -#: user-manual.txt:1971 +#: user-manual.txt:2028 msgid "" "pSCR diving often involves gas changes, requiring an additional cylinder. " "Define all the appropriate cylinders as described above and indicate the " @@ -3881,7 +4040,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1976 +#: user-manual.txt:2033 msgid "" "If a pSCR _Dive Mode_ has been selected, the dive ceiling for that is " "adjusted for the oxygen drop across the mouthpiece, which often requires " @@ -3891,64 +4050,69 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1977 +#: user-manual.txt:2034 #, no-wrap msgid "images/pSCR_profile.jpg" msgstr "" #. type: Title ==== -#: user-manual.txt:1982 +#: user-manual.txt:2039 #, no-wrap msgid "Closed circuit rebreather (CCR) dives" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:1984 +#: user-manual.txt:2041 #, no-wrap msgid "images/APD.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:1989 +#: user-manual.txt:2046 msgid "" -"Closed system rebreathers use advanced technology to recirculate gas that " -"has been breathed. They also do two things to maintain a breathable oxygen " -"concentration:" +"Closed system rebreathers also recirculate gas that has been " +"breathed. However, they use advanced technology to maintain a breathable " +"oxygen concentration:" msgstr "" #. type: Plain text -#: user-manual.txt:1990 -msgid "remove carbon dioxide from the exhaled gas" +#: user-manual.txt:2047 +msgid "remove carbon dioxide from the exhaled gas." msgstr "" #. type: Plain text -#: user-manual.txt:1999 +#: user-manual.txt:2058 msgid "" "regulate the oxygen concentration to remain within safe diving limits. The " "CCR interface of _Subsurface_ is currently experimental and under active " "development. Subsurface currently supports Poseidon MkVI and APD " -"Discovery/Evolution dive computers. In contrast to a conventional " -"recreational dive computer, a CCR system computer does not allow the " -"download of a log containing multiple dives. Rather, each dive is stored " -"independently. This means that _Subsurface_ cannot download a dive log " -"directly from a CCR dive computer, but that it imports individual CCR dive " -"profiles in the same way it imports dive log data from other digital " -"databases: one dive at a time." +"Discovery/Evolution dive computers, as well as Shearwater dive computers " +"connected to CCR systems. In contrast to a conventional recreational dive " +"computer, a CCR system computer usually does not allow the download of a log " +"containing multiple dives. Rather, each dive is stored independently. This " +"means that _Subsurface_ cannot download a dive log directly from a CCR dive " +"computer, but that it imports individual CCR dive profiles in the same way " +"it imports dive log data from other digital databases: one dive at a " +"time. However, the Shearwater based CCR systems are different in this " +"respect and allow multi-dive downloads." msgstr "" #. type: Title ===== -#: user-manual.txt:2000 +#: user-manual.txt:2059 #, no-wrap msgid "Import a CCR dive" msgstr "" #. type: Plain text -#: user-manual.txt:2017 +#: user-manual.txt:2078 msgid "" -"See the section dealing with xref:S_ImportingAlienDiveLogs[Importing dive " -"information from other digital sources]. CCR dive data are currently " -"obtained from the proprietary software provided when purchasing CCR dice " -"equipment. See " +"For Shearwater CCR controllers, or independent Shearwater CCR logs, just " +"download the dive log as would be the case for non-CCR dives. _Subsurface_ " +"interprets the CCR dive log correctly. Except for Shearwater CCR dive " +"computers, CCR dive data are currently obtained from the proprietary " +"software provided when purchasing CCR dive equipment. See the section " +"dealing with xref:S_ImportingAlienDiveLogs[Importing dive information from " +"other digital sources] and " "<<_appendix_b_dive_computer_specific_information_for_importing_dive_information,Appendix " "B>> for more complete information. Use that software to download the dive " "data into a known directory. From the main menu of _Subsurface_, select " @@ -3966,13 +4130,13 @@ msgid "" msgstr "" #. type: Title ===== -#: user-manual.txt:2018 +#: user-manual.txt:2079 #, no-wrap msgid "Displayed information for a CCR dive" msgstr "" #. type: Plain text -#: user-manual.txt:2028 +#: user-manual.txt:2089 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 " @@ -3986,12 +4150,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2030 +#: user-manual.txt:2091 msgid "For TWO O~2~ sensors the mean value of the two sensors are given." msgstr "" #. type: Plain text -#: user-manual.txt:2034 +#: user-manual.txt:2095 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 " @@ -4000,19 +4164,19 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2036 +#: user-manual.txt:2097 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:2038 +#: user-manual.txt:2099 msgid "The mean pO~2~ of the sensors is indicated with a green line," msgstr "" #. type: Plain text -#: user-manual.txt:2046 +#: user-manual.txt:2107 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 " @@ -4024,13 +4188,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2047 +#: user-manual.txt:2108 #, no-wrap msgid "images/CCR_preferences_f20.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2054 +#: user-manual.txt:2115 msgid "" "Checking any of these boxes allows the display of additional oxygen-related " "information whenever the pO~2~ toolbar button on the _Profile_ panel is " @@ -4041,13 +4205,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2055 +#: user-manual.txt:2116 #, no-wrap msgid "images/CCR_setpoint_f20.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2059 +#: user-manual.txt:2120 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 " @@ -4055,22 +4219,22 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2061 +#: user-manual.txt:2122 msgid "Sensor 1: grey" msgstr "" #. type: Plain text -#: user-manual.txt:2062 +#: user-manual.txt:2123 msgid "Sensor 2: blue" msgstr "" #. type: Plain text -#: user-manual.txt:2063 +#: user-manual.txt:2124 msgid "Sensor 3: brown" msgstr "" #. type: Plain text -#: user-manual.txt:2067 +#: user-manual.txt:2128 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 " @@ -4078,13 +4242,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2068 +#: user-manual.txt:2129 #, no-wrap msgid "images/CCR_sensor_data_f20.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2073 +#: user-manual.txt:2134 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, " @@ -4092,7 +4256,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2077 +#: user-manual.txt:2138 msgid "" "_Events_: Several events are logged, e.g. switching the mouthpiece to open " "circuit. These events are indicated by yellow triangles and, if you hover " @@ -4101,7 +4265,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2085 +#: user-manual.txt:2146 msgid "" "_Cylinder pressures_: Some CCR dive computers like the Poseidon MkVI record " "the pressures of the oxygen and diluent cylinders. The pressures of these " @@ -4114,13 +4278,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2086 +#: user-manual.txt:2147 #, no-wrap msgid "images/CCR_dive_profile_f22.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2091 +#: user-manual.txt:2152 msgid "" "_Equipment-specific information_: Equipment-specific information gathered by " "_Subsurface_ is shown in the xref:S_ExtraDataTab[Extra data tab]. This may " @@ -4128,7 +4292,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2097 +#: user-manual.txt:2158 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 " @@ -4140,13 +4304,13 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2098 user-manual.txt:2442 +#: user-manual.txt:2159 user-manual.txt:2537 #, no-wrap msgid "images/icons/cceiling.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2103 +#: user-manual.txt:2164 msgid "" "The default color of the computer-generated deco ceiling is white. This can " "be set to red by checking the appropriate check box after selecting _File -> " @@ -4155,13 +4319,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2104 +#: user-manual.txt:2165 #, no-wrap msgid "images/CCR_dive_ceilingF22.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2108 +#: user-manual.txt:2169 msgid "" "More equipment-specific information for downloading CCR dive logs for " "Poseidon MkVI and APD equipment can be found in " @@ -4170,19 +4334,111 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:2109 +#: user-manual.txt:2170 #, no-wrap msgid "Obtaining more information about dives entered into the logbook" msgstr "" #. type: Title === -#: user-manual.txt:2111 +#: user-manual.txt:2172 +#, no-wrap +msgid "Using the Dive Map to obtain more dive information" +msgstr "" + +#. type: Plain text +#: user-manual.txt:2175 +msgid "" +"The Dive Map has a number of buttons useful for manipulation several aspects " +"of a dive. These are:" +msgstr "" + +#. type: Named 'icon' AttributeList argument for style 'icon' +#: user-manual.txt:2176 +#, no-wrap +msgid "images/icons/MapViewMode.jpg" +msgstr "" + +#. type: Plain text +#: user-manual.txt:2180 +msgid "" +"Select this button to show the Dive Map as a satellite image or as a Google " +"Maps representation." +msgstr "" + +#. type: Named 'icon' AttributeList argument for style 'icon' +#: user-manual.txt:2181 +#, no-wrap +msgid "images/icons/MapViewPlus.jpg" +msgstr "" + +#. type: Plain text +#: user-manual.txt:2184 +msgid "Zoom in. Select a smaller area of the map." +msgstr "" + +#. type: Named 'icon' AttributeList argument for style 'icon' +#: user-manual.txt:2185 +#, no-wrap +msgid "images/icons/MapViewMinus.jpg" +msgstr "" + +#. type: Plain text +#: user-manual.txt:2188 +msgid "Zoom out. Select a larger area of the map." +msgstr "" + +#. type: Target for macro image +#: user-manual.txt:2189 +#, no-wrap +msgid "images/MapMenu.jpg" +msgstr "" + +#. type: Plain text +#: user-manual.txt:2193 +msgid "" +"The \"Hamburger\" button on the top right-hand of the Dive Map activates the " +"Map menu. The items are:" +msgstr "" + +#. type: Plain text +#: user-manual.txt:2196 +msgid "" +"Open location in _Google Maps_. Open the location of the active dive in a " +"separate Google Maps window with the dive site indicated by a Google Maps " +"teardrop marker." +msgstr "" + +#. type: Plain text +#: user-manual.txt:2199 +msgid "" +"Copy location to clipboard (decimal). Copy the coordinates of the active " +"dive to the clipboard in decimal degrees e.g. -25.933905 30.710572" +msgstr "" + +#. type: Plain text +#: user-manual.txt:2202 +msgid "" +"Copy location to clipboard (sexagesimal). Copy the coordinates of the active " +"dive to the clipboard in sexagecimal, e.g. 25°56'02.058\"S 30°42'38.059\"E" +msgstr "" + +#. type: Plain text +#: user-manual.txt:2205 +msgid "" +"Select visible dive locations. In the Dive List panel, highlight all the " +"dive sites visible in the Dive Map. This allows easy selection of the dives " +"within a particular geographical area to inspect them or to calculate " +"statistics for them." +msgstr "" + +#. type: Title === +#: user-manual.txt:2206 #, no-wrap msgid "The *Info* tab (for individual dives)" msgstr "" #. type: Plain text -#: user-manual.txt:2118 +#: user-manual.txt:2213 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 " @@ -4192,7 +4448,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2125 +#: user-manual.txt:2220 msgid "" "Gas consumption and SAC calculations: _Subsurface_ calculates SAC and Gas " "consumption taking in account gas incompressibility, particularly at tank " @@ -4201,13 +4457,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:2127 +#: user-manual.txt:2222 #, no-wrap msgid "The *Extra Data* tab (usually for individual dives)" msgstr "" #. type: Plain text -#: user-manual.txt:2135 +#: user-manual.txt:2230 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 " @@ -4219,19 +4475,19 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2136 +#: user-manual.txt:2231 #, no-wrap msgid "images/ExtraDataTab_f20.jpg" msgstr "" #. type: Title === -#: user-manual.txt:2138 +#: user-manual.txt:2233 #, no-wrap msgid "The *Stats* tab (for groups of dives)" msgstr "" #. type: Plain text -#: user-manual.txt:2149 +#: user-manual.txt:2244 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 " @@ -4244,19 +4500,19 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:2151 +#: user-manual.txt:2246 #, no-wrap msgid "The *Dive Profile*" msgstr "" #. type: Target for macro image -#: user-manual.txt:2153 +#: user-manual.txt:2248 #, no-wrap msgid "images/Profile2.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2164 +#: user-manual.txt:2259 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 " @@ -4269,7 +4525,7 @@ msgid "" msgstr "" #. type: delimited block | -#: user-manual.txt:2171 +#: user-manual.txt:2266 #, no-wrap msgid "" "|*Color*|*Descent speed (m/min)*|*Ascent speed (m/min)*\n" @@ -4281,7 +4537,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2176 +#: user-manual.txt:2271 msgid "" "The profile also includes depth readings for the peaks and troughs in the " "graph. So users should see the depth of the deepest point and other " @@ -4290,13 +4546,13 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2177 +#: user-manual.txt:2272 #, no-wrap msgid "images/icons/scale.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2182 +#: user-manual.txt:2277 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 " @@ -4305,7 +4561,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2185 +#: user-manual.txt:2280 #, no-wrap msgid "" "*Water temperature* is shown as a blue line with temperature values\n" @@ -4313,13 +4569,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2187 +#: user-manual.txt:2282 #, no-wrap msgid "The *Information Box*" msgstr "" #. type: Plain text -#: user-manual.txt:2194 +#: user-manual.txt:2289 msgid "" "The Information box displays a large range of information about the dive " "profile. Normally the Information Box is located to the top left of the " @@ -4330,13 +4586,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2195 +#: user-manual.txt:2290 #, no-wrap msgid "images/InfoBox2.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2211 +#: user-manual.txt:2306 msgid "" "When the mouse points inside the *Dive Profile* panel, the information box " "expands and shows many data items. In this situation, the data reflect the " @@ -4357,13 +4613,13 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2212 +#: user-manual.txt:2307 #, no-wrap msgid "images/icons/MOD.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2219 +#: user-manual.txt:2314 msgid "" "Show the *Maximum Operating Depth (MOD)* of the dive, given the gas mixture " "used. MOD is dependent on the oxygen concentration in the breathing gas. " @@ -4375,13 +4631,13 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2220 +#: user-manual.txt:2315 #, no-wrap msgid "images/icons/NDL.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2231 +#: user-manual.txt:2326 msgid "" "Show either the *No-deco Limit (NDL)* or the *Total Time to Surface " "(TTS)*. NDL is the time duration that a diver can continue with a dive, " @@ -4396,13 +4652,13 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2232 +#: user-manual.txt:2327 #, no-wrap msgid "images/icons/SAC.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2240 +#: user-manual.txt:2335 msgid "" "Show the *Surface Air Consumption (SAC)*, an indication of the " "surface-normalized respiration rate of a diver. The value of SAC is less " @@ -4414,13 +4670,13 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2241 +#: user-manual.txt:2336 #, no-wrap msgid "images/icons/EAD.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2256 +#: user-manual.txt:2351 msgid "" "Show the *Equivalent Air Depth (EAD)* for nitrox dives as well as the " "*Equivalent Narcotic Depth (END)* for trimix dives. These are important to " @@ -4436,20 +4692,20 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2258 +#: user-manual.txt:2353 msgid "" "Figure (*B*) above shows an information box with a nearly complete set of " "data." msgstr "" #. type: Title ===== -#: user-manual.txt:2261 +#: user-manual.txt:2356 #, no-wrap msgid "The Gas Pressure Bar Graph" msgstr "" #. type: Plain text -#: user-manual.txt:2268 +#: user-manual.txt:2363 msgid "" "On the left of the *Information Box* is a vertical bar graph showing the " "pressures of the nitrogen (and other inert gases, e.g. helium, if " @@ -4460,13 +4716,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2269 +#: user-manual.txt:2364 #, no-wrap msgid "images/GasPressureBarGraph.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2275 +#: user-manual.txt:2370 msgid "" "The light green area indicates the gas pressure, with the top margin of the " "light green area showing the total gas pressure of ALL gases inhaled by the " @@ -4476,7 +4732,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2281 +#: user-manual.txt:2376 msgid "" "The horizontal black line underneath the light green margin indicates the " "equilibrium pressure of the INERT gases inhaled by the diver, usually " @@ -4487,7 +4743,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2285 +#: user-manual.txt:2380 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 " @@ -4495,7 +4751,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2291 +#: user-manual.txt:2386 msgid "" "The top black horizontal line indicates the inert gas pressure limit " "determined by the gradient factor that applies to the depth of the diver at " @@ -4505,7 +4761,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2295 +#: user-manual.txt:2390 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 " @@ -4514,7 +4770,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2298 +#: user-manual.txt:2393 msgid "" "These five values are shown on the left in the image above. The way the Gas " "Pressure Bar Graph changes during a dive can be seen on the right hand side " @@ -4522,7 +4778,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2301 +#: user-manual.txt:2396 msgid "" "Graph *A* indicates the start of a dive with the diver at the surface. The " "pressures in all the tissue compartments are still at the surface " @@ -4530,7 +4786,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2304 +#: user-manual.txt:2399 msgid "" "Graph *B* indicates the situation after a descent to 30 meters. Few of the " "tissue compartments have had time to respond to the descent, so their gas " @@ -4538,7 +4794,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2309 +#: user-manual.txt:2404 msgid "" "Graph *C* represents the pressures after 30 minutes at 30 m. The fast " "compartments have attained equilibrium (i.e. they have reached the height of " @@ -4548,7 +4804,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2315 +#: user-manual.txt:2410 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 " @@ -4559,7 +4815,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2320 +#: user-manual.txt:2415 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 " @@ -4569,13 +4825,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2321 +#: user-manual.txt:2416 #, no-wrap msgid "Computer-reported events during dive" msgstr "" #. type: Plain text -#: user-manual.txt:2333 +#: user-manual.txt:2428 msgid "" "Many dive computers record events during a dive. For instance, most dive " "computers report alarms relating to high partial pressures of oxygen, to " @@ -4594,7 +4850,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2338 +#: user-manual.txt:2433 msgid "" "Events are indicated by symbols on the dive profile. Notifications are shown " "as a white, round symbol with a letter _i_; warnings are indicated by a " @@ -4605,13 +4861,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2339 +#: user-manual.txt:2434 #, no-wrap msgid "images/profile_symbols.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2344 +#: user-manual.txt:2439 msgid "" "Some dive computers report _bookmarks_ that the diver has set during the " "dive. These are indicated as a small red flag on the profile and are " @@ -4620,13 +4876,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2345 +#: user-manual.txt:2440 #, no-wrap msgid "The Profile Toolbar" msgstr "" #. type: Plain text -#: user-manual.txt:2353 +#: user-manual.txt:2448 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 " @@ -4637,44 +4893,44 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2354 +#: user-manual.txt:2449 #, no-wrap msgid "images/icons/O2.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2358 +#: user-manual.txt:2453 msgid "" "Show the partial pressure of *oxygen* during the dive. This is shown below " "the dive depth and water temperature graphs." msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2359 +#: user-manual.txt:2454 #, no-wrap msgid "images/icons/N2.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2362 +#: user-manual.txt:2457 msgid "Show the partial pressure of *nitrogen* during the dive." msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2363 +#: user-manual.txt:2458 #, no-wrap msgid "images/icons/He.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2367 +#: user-manual.txt:2462 msgid "" "Display of the partial pressure of *helium* during the dive. This is only " "important to divers using Trimix, Helitrox or similar breathing gasses." msgstr "" #. type: Plain text -#: user-manual.txt:2380 +#: user-manual.txt:2475 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 " @@ -4689,7 +4945,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2384 +#: user-manual.txt:2479 msgid "" "When in planner mode, the SAC is set to be constant during the bottom part " "of the dive as well during decompression. Therefore, when planning a dive, " @@ -4697,20 +4953,20 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2385 +#: user-manual.txt:2480 #, no-wrap msgid "images/icons/Heartbutton.png" msgstr "" #. type: Plain text -#: user-manual.txt:2389 +#: user-manual.txt:2484 msgid "" "Clicking on the heart rate button allows display of heart rate information " "during the dive if the dive computer was attached to a heart rate sensor." msgstr "" #. type: Plain text -#: user-manual.txt:2395 +#: user-manual.txt:2490 msgid "" "It is possible to *zoom* into the profile graph. This is done either by " "using the scroll wheel / scroll gesture of the mouse or trackpad. By default " @@ -4720,19 +4976,19 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2396 +#: user-manual.txt:2491 #, no-wrap msgid "images/MeasuringBar.png" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2398 +#: user-manual.txt:2493 #, no-wrap msgid "images/icons/ruler.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2406 +#: user-manual.txt:2501 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 " @@ -4742,13 +4998,13 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2407 +#: user-manual.txt:2502 #, no-wrap msgid "images/icons/ShowPhotos.png" msgstr "" #. type: Plain text -#: user-manual.txt:2414 +#: user-manual.txt:2509 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 " @@ -4757,7 +5013,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2441 +#: user-manual.txt:2536 msgid "" "The profile can also include the dive computer reported *ceiling* (more " "precisely, the deepest deco stop that the dive computer calculated for each " @@ -4786,7 +5042,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2447 +#: user-manual.txt:2542 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 " @@ -4794,13 +5050,13 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2448 +#: user-manual.txt:2543 #, no-wrap msgid "images/icons/ceiling1.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2453 +#: user-manual.txt:2548 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 " @@ -4809,13 +5065,13 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2454 +#: user-manual.txt:2549 #, no-wrap msgid "images/icons/ceiling2.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2458 +#: user-manual.txt:2553 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 " @@ -4823,26 +5079,26 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2459 +#: user-manual.txt:2554 #, no-wrap msgid "images/icons/ceiling3.jpg" msgstr "" #. type: delimited block = -#: user-manual.txt:2464 +#: user-manual.txt:2559 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:2465 +#: user-manual.txt:2560 #, no-wrap msgid "images/Ceilings2.jpg" msgstr "" #. type: delimited block = -#: user-manual.txt:2468 +#: user-manual.txt:2563 msgid "" "Gradient Factor settings strongly affect the calculated ceilings and their " "depths. For more information about Gradient factors, see the section on " @@ -4855,7 +5111,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2470 user-manual.txt:3309 +#: user-manual.txt:2565 user-manual.txt:3404 #, no-wrap msgid "" " *** http://www.tek-dive.com/portal/upload/M-Values.pdf[Understanding " @@ -4863,7 +5119,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2472 user-manual.txt:3311 +#: user-manual.txt:2567 user-manual.txt:3406 #, no-wrap msgid "" " *** " @@ -4872,13 +5128,13 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2476 +#: user-manual.txt:2571 #, no-wrap msgid "images/icons/ShowCylindersButton.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2482 +#: user-manual.txt:2577 msgid "" "By selecting this icon, the different cylinders used during a dive can be " "represented as a colored bar at the bottom of the *Dive Profile*. In general " @@ -4889,19 +5145,19 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2483 +#: user-manual.txt:2578 #, no-wrap msgid "images/ShowCylinders_f20.jpg" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2487 +#: user-manual.txt:2582 #, no-wrap msgid "images/icons/heatmap.png" msgstr "" #. type: delimited block = -#: user-manual.txt:2494 +#: user-manual.txt:2589 msgid "" "Display the tissue heat-map. The heat map summarises, for the duration of " "the dive, the inert gas tissue pressures for each of the 16 tissue " @@ -4913,13 +5169,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2495 +#: user-manual.txt:2590 #, no-wrap msgid "images/Heatmap.jpg" msgstr "" #. type: delimited block = -#: user-manual.txt:2503 +#: user-manual.txt:2598 msgid "" "Image *A* on the left shows the xref:S_gas_pressure_graph[Gas Pressure " "Graph] in the *Information box*, representing a snapshot of inert gas " @@ -4932,7 +5188,7 @@ msgid "" msgstr "" #. type: delimited block = -#: user-manual.txt:2511 +#: user-manual.txt:2606 msgid "" "Image *B* shows a gradient of unique colours, spanning the whole range of " "inert gas pressures. It is possible to map the height of each of the dark " @@ -4946,7 +5202,7 @@ msgid "" msgstr "" #. type: delimited block = -#: user-manual.txt:2519 +#: user-manual.txt:2614 msgid "" "The bottom range in *B* (marked _On-gassing_) includes colours from light " "blue to black, representing tissue gas pressures below the equilibrium " @@ -4961,7 +5217,7 @@ msgid "" msgstr "" #. type: delimited block = -#: user-manual.txt:2525 +#: user-manual.txt:2620 msgid "" "The central range in *B* includes the colours from black to light green, " "when the inert gas pressure of a tissue compartment is higher than the " @@ -4972,7 +5228,7 @@ msgid "" msgstr "" #. type: delimited block = -#: user-manual.txt:2534 +#: user-manual.txt:2629 msgid "" "The top range in *B* (marked _Off-gassing_) includes colours from light " "green to red and white, repesenting tissue gas pressures above that of the " @@ -4988,7 +5244,7 @@ msgid "" msgstr "" #. type: delimited block = -#: user-manual.txt:2542 +#: user-manual.txt:2637 msgid "" "Image *C* shows the colour mapping of each of the vertical bars in *A*, the " "fast tissues (on the left in *A*) depicted at the top and the slow tissue " @@ -5000,7 +5256,7 @@ msgid "" msgstr "" #. type: delimited block = -#: user-manual.txt:2549 +#: user-manual.txt:2644 msgid "" "Image *D* is a compilation of similar colour mappings of 16 tissue " "compartments during a 10-minute period of a dive, the colours representing " @@ -5011,7 +5267,7 @@ msgid "" msgstr "" #. type: delimited block = -#: user-manual.txt:2553 +#: user-manual.txt:2648 msgid "" "The colours of the heat map are not affected by the gradient factor " "settings. This is because the heat map indicates tissue pressures relative " @@ -5020,14 +5276,14 @@ msgid "" msgstr "" #. type: delimited block = -#: user-manual.txt:2555 +#: user-manual.txt:2650 msgid "" "http://www.tek-dive.com/portal/upload/M-Values.pdf[Understanding M-values by " "Erik Baker, _Immersed_ Vol. 3, No. 3.]" msgstr "" #. type: delimited block = -#: user-manual.txt:2558 +#: user-manual.txt:2653 msgid "" "Since the colours of the heat map are not affected by the gradient " "factor(s), the heat map is also applicable when using the VPM-B " @@ -5035,7 +5291,7 @@ msgid "" msgstr "" #. type: delimited block = -#: user-manual.txt:2562 +#: user-manual.txt:2657 msgid "" "The image below compares the profiles and heat maps for two planned " "decompression dives to 60m: the first using the Bühlmann decompression " @@ -5045,7 +5301,7 @@ msgid "" msgstr "" #. type: delimited block = -#: user-manual.txt:2567 +#: user-manual.txt:2662 msgid "" "In both profiles, the inert gas pressures in the faster tissues rise much " "more rapidly than the slower tissues during the descent and bottom phase, " @@ -5056,7 +5312,7 @@ msgid "" msgstr "" #. type: delimited block = -#: user-manual.txt:2572 +#: user-manual.txt:2667 msgid "" "The comparison of the two profiles and heatmaps shows that by including deep " "stops, the oversaturation gradient in the faster tissues early in ascent " @@ -5066,19 +5322,19 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2573 +#: user-manual.txt:2668 #, no-wrap msgid "images/tissueHeatmap.jpg" msgstr "" #. type: Title ==== -#: user-manual.txt:2576 +#: user-manual.txt:2671 #, no-wrap msgid "The Dive Profile context menu" msgstr "" #. type: Plain text -#: user-manual.txt:2595 +#: user-manual.txt:2690 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 creating " @@ -5099,19 +5355,19 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:2596 +#: user-manual.txt:2691 #, no-wrap msgid "Organizing the logbook (Manipulating groups of dives)" msgstr "" #. type: Title === -#: user-manual.txt:2599 +#: user-manual.txt:2694 #, no-wrap msgid "The Dive List context menu" msgstr "" #. type: Plain text -#: user-manual.txt:2603 +#: user-manual.txt:2698 msgid "" "Several actions on either a single dive, or a group of dives, can be " "performed using the Dive List Context Menu. It is found by selecting either " @@ -5119,30 +5375,30 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2604 +#: user-manual.txt:2699 #, no-wrap msgid "images/ContextMenu.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2607 +#: user-manual.txt:2702 msgid "The context menu is used in many functions described below." msgstr "" #. type: Title ==== -#: user-manual.txt:2609 +#: user-manual.txt:2704 #, no-wrap msgid "Customizing the columns showed in the *Dive List* panel" msgstr "" #. type: Target for macro image -#: user-manual.txt:2611 +#: user-manual.txt:2706 #, no-wrap msgid "images/DiveListOptions.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2619 +#: user-manual.txt:2714 msgid "" "The default information in the *Dive List* includes, for each dive, " "Dive_number, Date, Rating, Dive_depth, Dive_duration and Dive_location. This " @@ -5154,7 +5410,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2624 +#: user-manual.txt:2719 msgid "" "By selecting the _Photos_ checkbox in the dropdown list, an icon is shown " "indicating whether any photos are associated with a particular dive. There " @@ -5162,26 +5418,26 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2625 +#: user-manual.txt:2720 #, no-wrap msgid "images/icons/duringPhoto.png" msgstr "" #. type: Plain text -#: user-manual.txt:2628 +#: user-manual.txt:2723 msgid "" "This dive has photographs taken during the dive, typically using an " "underwater camera." msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2629 +#: user-manual.txt:2724 #, no-wrap msgid "images/icons/outsidePhoto.png" msgstr "" #. type: Plain text -#: user-manual.txt:2634 +#: user-manual.txt:2729 msgid "" "This dive has photographs taken immediately before or immediately after the " "dive. This is useful for finding photos of dive teams or boats just " @@ -5190,26 +5446,26 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2635 +#: user-manual.txt:2730 #, no-wrap msgid "images/icons/inAndOutPhoto.png" msgstr "" #. type: Plain text -#: user-manual.txt:2638 +#: user-manual.txt:2733 msgid "" "This dive has photographs taken both during the dive and immdiately before " "or after the dive." msgstr "" #. type: Title === -#: user-manual.txt:2640 +#: user-manual.txt:2735 #, no-wrap msgid "Renumbering the dives" msgstr "" #. type: Plain text -#: user-manual.txt:2652 +#: user-manual.txt:2747 msgid "" "Dives are normally numbered incrementally from non-recent dives (low " "sequence numbers) to recent dives (higher sequence numbers). Numbering of " @@ -5223,7 +5479,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2657 +#: user-manual.txt:2752 msgid "" "Renumber a few selected dives in the dive list by selecting only the dives " "that need renumbering. Right-click on the selected list and use the Dive " @@ -5232,13 +5488,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:2659 +#: user-manual.txt:2754 #, no-wrap msgid "Grouping dives into trips and manipulating trips" msgstr "" #. type: Plain text -#: user-manual.txt:2667 +#: user-manual.txt:2762 msgid "" "For regular divers, the dive list can rapidly become very long. _Subsurface_ " "can group dives into _trips_. It does this by grouping dives that have " @@ -5249,13 +5505,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2668 +#: user-manual.txt:2763 #, no-wrap msgid "images/Group2.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2674 +#: user-manual.txt:2769 msgid "" "Grouping into trips allows a rapid way of accessing individual dives without " "having to scan a long lists of dives. To group the dives in a dive list, " @@ -5264,13 +5520,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2675 +#: user-manual.txt:2770 #, no-wrap msgid "Editing the title and associated information for a particular trip" msgstr "" #. type: Plain text -#: user-manual.txt:2688 +#: user-manual.txt:2783 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 " @@ -5284,13 +5540,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2689 +#: user-manual.txt:2784 #, no-wrap msgid "Viewing the dives during a particular trip" msgstr "" #. type: Plain text -#: user-manual.txt:2694 +#: user-manual.txt:2789 msgid "" "Once the dives have been grouped into trips, you can expand one or more " "trips by clicking the expansion button [+/-] on the left of each trip " @@ -5299,13 +5555,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2695 +#: user-manual.txt:2790 #, no-wrap msgid "Merging dives from more than one trip into a single trip" msgstr "" #. type: Plain text -#: user-manual.txt:2700 +#: user-manual.txt:2795 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 " @@ -5313,13 +5569,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2701 +#: user-manual.txt:2796 #, no-wrap msgid "Splitting a single trip into more than one trip" msgstr "" #. type: Plain text -#: user-manual.txt:2710 +#: user-manual.txt:2805 msgid "" "If a trip includes, for example, ten dives, you can split this trip into two " "trips (trip 1: top four dives; trip 2: bottom six dives) by selecting and " @@ -5331,25 +5587,25 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2711 +#: user-manual.txt:2806 #, no-wrap msgid "images/SplitDive3a.jpg" msgstr "" #. type: Title === -#: user-manual.txt:2713 +#: user-manual.txt:2808 #, no-wrap msgid "Manipulating single dives" msgstr "" #. type: Title ==== -#: user-manual.txt:2715 +#: user-manual.txt:2810 #, no-wrap msgid "Delete a dive from the dive log" msgstr "" #. type: Plain text -#: user-manual.txt:2722 +#: user-manual.txt:2817 msgid "" "Dives can be permanently deleted from the dive log by selecting and " "right-clicking them to bring up the context menu, then selecting *Delete " @@ -5359,13 +5615,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2723 +#: user-manual.txt:2818 #, no-wrap msgid "Unlink a dive from a trip" msgstr "" #. type: Plain text -#: user-manual.txt:2730 +#: user-manual.txt:2825 msgid "" "You can unlink dives from the trip to which they belong. To do this, select " "and right-click the relevant dives to bring up the context menu. Then select " @@ -5375,13 +5631,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2731 +#: user-manual.txt:2826 #, no-wrap msgid "Add a dive to the trip immediately above" msgstr "" #. type: Plain text -#: user-manual.txt:2736 +#: user-manual.txt:2831 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 " @@ -5389,13 +5645,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2737 +#: user-manual.txt:2832 #, no-wrap msgid "Shift the start time of dive(s)" msgstr "" #. type: Plain text -#: user-manual.txt:2747 +#: user-manual.txt:2842 msgid "" "Sometimes it’s necessary to adjust the start time of a dive. This may apply " "to situations where dives are done in different time zones or when the dive " @@ -5407,13 +5663,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2748 +#: user-manual.txt:2843 #, no-wrap msgid "Merge dives into a single dive" msgstr "" #. type: Plain text -#: user-manual.txt:2758 +#: user-manual.txt:2853 msgid "" "Sometimes a dive is briefly interrupted, for example, if a diver returns to " "the surface for a few minutes, resulting in two or more dives being recorded " @@ -5427,19 +5683,19 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2759 +#: user-manual.txt:2854 #, no-wrap msgid "images/MergedDive.png" msgstr "" #. type: Title ==== -#: user-manual.txt:2761 +#: user-manual.txt:2856 #, no-wrap msgid "Split selected dives" msgstr "" #. type: Plain text -#: user-manual.txt:2769 +#: user-manual.txt:2864 msgid "" "On some occasions, a diver reaches the surface and immediately dives " "again. However, it may happen that the dive computer does not register a new " @@ -5451,32 +5707,32 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2770 +#: user-manual.txt:2865 #, no-wrap msgid "Load image(s) from file(s)" msgstr "" #. type: Plain text -#: user-manual.txt:2772 user-manual.txt:2775 +#: user-manual.txt:2867 user-manual.txt:2870 msgid "" "This topic is discussed in the section: xref:S_LoadImage[Adding photographs " "to dives]." msgstr "" #. type: Title ==== -#: user-manual.txt:2773 +#: user-manual.txt:2868 #, no-wrap msgid "Load image from web" msgstr "" #. type: Title ==== -#: user-manual.txt:2776 +#: user-manual.txt:2871 #, no-wrap msgid "Undo dive manipulations" msgstr "" #. type: Plain text -#: user-manual.txt:2782 +#: user-manual.txt:2877 msgid "" "Important actions on dives or trips, described above, can be undone or " "redone. This includes: _delete dives_, _merge dives_, _split selected " @@ -5486,13 +5742,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:2785 +#: user-manual.txt:2880 #, no-wrap msgid "Filtering the dive list" msgstr "" #. type: Plain text -#: user-manual.txt:2791 +#: user-manual.txt:2886 msgid "" "The dives in the *Dive List* panel can be filtered, selecting only some of " "the dives based on their attributes, e.g. dive tags, dive site, divemaster, " @@ -5502,7 +5758,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2799 +#: user-manual.txt:2894 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 " @@ -5516,13 +5772,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2800 +#: user-manual.txt:2895 #, no-wrap msgid "images/Filterpanel.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2809 +#: user-manual.txt:2904 msgid "" "Four filter criteria may be used to filter the dive list: dive tags, person " "(buddy / divemaster), dive site and dive suit. Each of these is represented " @@ -5535,7 +5791,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2817 +#: user-manual.txt:2912 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 " @@ -5547,36 +5803,36 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:2819 +#: user-manual.txt:2914 #, no-wrap msgid "Exporting the dive log or parts of the dive log" msgstr "" #. type: Plain text -#: user-manual.txt:2822 +#: user-manual.txt:2917 msgid "There are two ways to export dive information from Subsurface:" msgstr "" #. type: Plain text -#: user-manual.txt:2824 +#: user-manual.txt:2919 msgid "Export dive information to _Facebook_" msgstr "" #. type: Plain text -#: user-manual.txt:2826 +#: user-manual.txt:2921 msgid "" "xref:S_Export_other[Export dive information to other destinations or " "formats]" msgstr "" #. type: Title === -#: user-manual.txt:2828 +#: user-manual.txt:2923 #, no-wrap msgid "Exporting dive information to _Facebook_" msgstr "" #. type: Plain text -#: user-manual.txt:2837 +#: user-manual.txt:2932 msgid "" "Export of dives to _Facebook_ is handled differently from other types of " "export because a connection to _Facebook_ is required, needing a _Facebook_ " @@ -5591,7 +5847,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2841 +#: user-manual.txt:2936 msgid "" "Once logged into to _Facebook_ , a panel is shown with a message: \"_To " "disconnect Subsurface from your Facebook account, use the 'Share on' menu " @@ -5599,13 +5855,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2842 +#: user-manual.txt:2937 #, no-wrap msgid "images/facebook1.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2855 +#: user-manual.txt:2950 msgid "" "Having established a login to _Facebook_, transferring a dive profile to a " "_Facebook_ timeline is easy. In the _Subsurface_ *Dive List* panel, " @@ -5624,7 +5880,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2859 +#: user-manual.txt:2954 msgid "" "Both the album created and the post to your timeline are marked as " "private. In order for friends to be able to see the post, log into " @@ -5632,26 +5888,26 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2860 +#: user-manual.txt:2955 #, no-wrap msgid "images/facebook2.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2864 +#: user-manual.txt:2959 msgid "" "If required, then close the _Facebook_ connection by selecting, from the " "*Main Menu*, _Share on -> Disconnect from -> Facebook_ (image *B* above)." msgstr "" #. type: Title === -#: user-manual.txt:2866 +#: user-manual.txt:2961 #, no-wrap msgid "Export dive information to other destinations or formats" msgstr "" #. type: Plain text -#: user-manual.txt:2871 +#: user-manual.txt:2966 msgid "" "For non-_Facebook exports_, the export function can be found by selecting " "_File -> Export_, which brings up the Export dialog. This dialog always " @@ -5661,23 +5917,23 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2872 +#: user-manual.txt:2967 #, no-wrap msgid "images/Export_f20.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2875 +#: user-manual.txt:2970 msgid "A dive log or part of it can be saved in several formats:" msgstr "" #. type: Plain text -#: user-manual.txt:2877 +#: user-manual.txt:2972 msgid "_Subsurface XML_ format. This is the native format used by _Subsurface_." msgstr "" #. type: Plain text -#: user-manual.txt:2881 +#: user-manual.txt:2976 msgid "" "Universal Dive Data Format (_UDDF_). Refer to _http://uddf.org_ for more " "information. UDDF is a generic format that enables communication among many " @@ -5685,7 +5941,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2885 +#: user-manual.txt:2980 msgid "" "_Divelogs.de_, an Internet-based dive log repository. In order to upload to " "_Divelogs.de_, you need a user-ID as well as a password for " @@ -5694,7 +5950,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2889 +#: user-manual.txt:2984 msgid "" "_DiveShare_ is also a dive log repository on the Internet focusing on " "recreational dives. To upload dives, you need a user ID, so registration " @@ -5702,7 +5958,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2894 +#: user-manual.txt:2989 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, " @@ -5711,7 +5967,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2897 +#: user-manual.txt:2992 msgid "" "_CSV dive profile_, that includes a large amount of detail for each dive, " "including the depth profile, temperature and pressure information of each " @@ -5719,7 +5975,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2910 +#: user-manual.txt:3005 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 " @@ -5736,7 +5992,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2915 +#: user-manual.txt:3010 msgid "" "_Worldmap_ format, an HTML file with a world map upon which each dive and " "some information about it are indicated. This map is not editable. If you " @@ -5745,13 +6001,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2916 +#: user-manual.txt:3011 #, no-wrap msgid "images/mapview_f20.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2925 +#: user-manual.txt:3020 msgid "" "_TeX_ format, a file for printing using the TeX typesetting software. Choose " "a filename with a '.tex' extension. You will also need a template file, that " @@ -5763,13 +6019,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2926 +#: user-manual.txt:3021 #, no-wrap msgid "images/texexample.png" msgstr "" #. type: Plain text -#: user-manual.txt:2933 +#: user-manual.txt:3028 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 " @@ -5778,12 +6034,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2935 +#: user-manual.txt:3030 msgid "_General Settings_, under the HTML tab, provides the following options:" msgstr "" #. type: Plain text -#: user-manual.txt:2943 +#: user-manual.txt:3038 #, no-wrap msgid "" "** Subsurface Numbers: if this option is checked, the dive(s) are exported " @@ -5801,27 +6057,27 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2946 +#: user-manual.txt:3041 msgid "" "Under _Style Options_ some style-related options are available like font " "size and theme." msgstr "" #. type: Plain text -#: user-manual.txt:2949 +#: user-manual.txt:3044 msgid "" "Export to other formats can be done through third party facilities, for " "instance _www.divelogs.de_." msgstr "" #. type: Title == -#: user-manual.txt:2951 +#: user-manual.txt:3046 #, no-wrap msgid "Keeping a _Subsurface_ dive log in the Cloud" msgstr "" #. type: Plain text -#: user-manual.txt:2961 +#: user-manual.txt:3056 msgid "" "For each diver, dive log information is highly important. Not only is it a " "record of diving activities for your pleasure, but it’s important " @@ -5835,7 +6091,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2967 +#: user-manual.txt:3062 msgid "" "_Subsurface_ includes access to a transparently integrated cloud storage " "back end that is available to all Subsurface users. Storing and retrieving a " @@ -5846,13 +6102,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:2968 +#: user-manual.txt:3063 #, no-wrap msgid "Create a cloud storage account" msgstr "" #. type: Plain text -#: user-manual.txt:2985 +#: user-manual.txt:3080 #, no-wrap msgid "" "** Open the *Network Preferences* by selecting _File_ -> _Preferences_ -> " @@ -5880,13 +6136,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:2986 +#: user-manual.txt:3081 #, no-wrap msgid "Using _Subsurface cloud storage_" msgstr "" #. type: Plain text -#: user-manual.txt:2996 +#: user-manual.txt:3091 #, no-wrap msgid "" "** Once the cloud storage has been initialized, two new items appear in " @@ -5905,7 +6161,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3001 +#: user-manual.txt:3096 #, no-wrap msgid "" "** _Subsurface_ keeps a local copy of the data and the cloud facility " @@ -5918,13 +6174,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3003 +#: user-manual.txt:3098 #, no-wrap msgid "Web access to _Subsurface cloud storage_" msgstr "" #. type: Plain text -#: user-manual.txt:3013 +#: user-manual.txt:3108 msgid "" "One of the nice side benefits of using _Subsurface cloud storage_ is that " "you can also access your dive data from any web browser. Simply open " @@ -5937,13 +6193,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3014 +#: user-manual.txt:3109 #, no-wrap msgid "Other cloud services" msgstr "" #. type: Plain text -#: user-manual.txt:3024 +#: user-manual.txt:3119 msgid "" "If you prefer not to use the integrated cloud storage of dive logs (and " "don't need the web access), it’s simple to store dive logs in the cloud " @@ -5954,13 +6210,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:3025 +#: user-manual.txt:3120 #, no-wrap msgid "images/Cloud.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:3034 +#: user-manual.txt:3129 msgid "" "The _Dropbox_ program creates a copy of the _Dropbox_ Internet Cloud content " "on your desktop computer. When the computer is connected to the Internet, " @@ -5973,13 +6229,13 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:3037 +#: user-manual.txt:3132 #, no-wrap msgid "Several _Subsurface_ users on one desktop computer" msgstr "" #. type: Plain text -#: user-manual.txt:3041 +#: user-manual.txt:3136 msgid "" "A frequent need is for two or more persons to use _Subsurface_ on the same " "desktop computer. For instance members of a household may use the same " @@ -5988,7 +6244,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3053 +#: user-manual.txt:3148 #, no-wrap msgid "" "*A)* If the different users of a desktop computer do not log onto the " @@ -6015,24 +6271,24 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3055 +#: user-manual.txt:3150 #, no-wrap msgid "\tsubsurface --user=John\n" msgstr "" #. type: Plain text -#: user-manual.txt:3057 +#: user-manual.txt:3152 msgid "while Joan can launch _Subsurface_ using:" msgstr "" #. type: Plain text -#: user-manual.txt:3059 +#: user-manual.txt:3154 #, no-wrap msgid "\tsubsurface --user=Joan\n" msgstr "" #. type: Plain text -#: user-manual.txt:3067 +#: user-manual.txt:3162 #, no-wrap msgid "" "In this case, each user's preferences, settings and cloud access information " @@ -6052,7 +6308,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3071 +#: user-manual.txt:3166 #, no-wrap msgid "" "*B)* On the other hand, if the users log onto the same computer using " @@ -6064,13 +6320,13 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:3073 +#: user-manual.txt:3168 #, no-wrap msgid "Printing a dive log" msgstr "" #. type: Plain text -#: user-manual.txt:3077 +#: user-manual.txt:3172 #, no-wrap msgid "" "_Subsurface_ provides a simple and flexible way to print a whole dive log or " @@ -6080,19 +6336,19 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3079 +#: user-manual.txt:3174 msgid "Some decisions need to be made before printing:" msgstr "" #. type: Plain text -#: user-manual.txt:3082 +#: user-manual.txt:3177 msgid "" "Should the whole dive log be printed or only part of it? If only part is " "required, select the required dives from the *Dive List* panel." msgstr "" #. type: Plain text -#: user-manual.txt:3084 +#: user-manual.txt:3179 msgid "" "If the dive profiles are printed, what gas partial pressure information " "should be shown? Select the appropriate toggle-buttons on the button bar to " @@ -6100,7 +6356,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3087 +#: user-manual.txt:3182 msgid "" "If _File -> Print_ is selected from the Main menu, the dialogue below (image " "*A*) appears. Three specifications are needed to get the desired information " @@ -6108,35 +6364,35 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:3088 user-manual.txt:4616 +#: user-manual.txt:3183 user-manual.txt:4780 #, no-wrap msgid "images/Print1_f22.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:3091 +#: user-manual.txt:3186 msgid "Under _Print type_ select one of two options:" msgstr "" #. type: Plain text -#: user-manual.txt:3093 +#: user-manual.txt:3188 msgid "" "_Dive list print_: Print dives from the *Dive List* panel with profiles and " "other information." msgstr "" #. type: Plain text -#: user-manual.txt:3094 +#: user-manual.txt:3189 msgid "_Statistics print_: Print yearly statistics of the dives." msgstr "" #. type: Plain text -#: user-manual.txt:3096 +#: user-manual.txt:3191 msgid "Under _Print options_ select:" msgstr "" #. type: Plain text -#: user-manual.txt:3101 +#: user-manual.txt:3196 msgid "" "Printing only the dives selected from the dive list before activating the " "print dialogue by checking the box _Print only selected dives_. If this " @@ -6144,73 +6400,73 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3103 +#: user-manual.txt:3198 msgid "" "Printing in color, done by checking the box with _Print in color_. If this " "check box is not checked, printing is in black and white." msgstr "" #. type: Plain text -#: user-manual.txt:3106 +#: user-manual.txt:3201 msgid "" "Under _Template_ select a template to be used as the page layout. There are " "several choices. (see image *B*, above)." msgstr "" #. type: Plain text -#: user-manual.txt:3108 +#: user-manual.txt:3203 msgid "_Table_: This prints a summary table of all dives selected (see below)." msgstr "" #. type: Target for macro image -#: user-manual.txt:3109 +#: user-manual.txt:3204 #, no-wrap msgid "images/Print_summarylist_f22.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:3112 +#: user-manual.txt:3207 msgid "" "_Flow layout_: Print the text associated with each dive without printing the " "dive profiles" msgstr "" #. type: Plain text -#: user-manual.txt:3113 +#: user-manual.txt:3208 msgid "of each dive (see below):" msgstr "" #. type: Target for macro image -#: user-manual.txt:3114 +#: user-manual.txt:3209 #, no-wrap msgid "images/Print_flow_layout_f22.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:3117 +#: user-manual.txt:3212 msgid "" "_One Dive_: Print one dive per page, also showing the dive profile (see " "below)" msgstr "" #. type: Target for macro image -#: user-manual.txt:3118 +#: user-manual.txt:3213 #, no-wrap msgid "images/print2_f22.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:3122 +#: user-manual.txt:3217 msgid "_Two Dives_: Print two dives per page, also showing the dive profiles." msgstr "" #. type: Plain text -#: user-manual.txt:3123 +#: user-manual.txt:3218 msgid "_Six Dives_: Print six dives per page, also showing the dive profiles." msgstr "" #. type: Plain text -#: user-manual.txt:3127 +#: user-manual.txt:3222 msgid "" "You can _Preview_ the printed page by selecting the _Preview_ button on the " "dialogue (see image *A* at the start of this section). After preview, you " @@ -6219,7 +6475,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3131 +#: user-manual.txt:3226 msgid "" "Next, select the _Print_ button (see image *A* at the start of this " "section). This activates the regular print dialogue used by the operating " @@ -6228,13 +6484,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:3132 +#: user-manual.txt:3227 #, no-wrap msgid "images/Print_print_f22.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:3137 +#: user-manual.txt:3232 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 " @@ -6243,19 +6499,19 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:3138 +#: user-manual.txt:3233 #, no-wrap msgid "images/Printpreview.jpg" msgstr "" #. type: Title === -#: user-manual.txt:3140 +#: user-manual.txt:3235 #, no-wrap msgid "Writing a custom print template (advanced)" msgstr "" #. type: Plain text -#: user-manual.txt:3146 +#: user-manual.txt:3241 msgid "" "Writing a custom template is an effective way to produce highly customized " "printouts. Subsurface uses HTML templates to render printing. You can create " @@ -6266,13 +6522,13 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:3148 +#: user-manual.txt:3243 #, no-wrap msgid "Configuring a dive computer" msgstr "" #. type: Plain text -#: user-manual.txt:3156 +#: user-manual.txt:3251 msgid "" "_Subsurface_ lets you configure a dive computer. Currently, the " "Heinrichs-Weikamp (OSTC 2/2N/2C, OSTC 3, Sport) and Suunto Vyper (Stinger, " @@ -6286,7 +6542,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3162 +#: user-manual.txt:3257 msgid "" "Once the dive computer is connected to the _Subsurface_ computer, select " "_File -> Configure dive computer_ from the _Main Menu_. Select the " @@ -6296,20 +6552,20 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:3163 +#: user-manual.txt:3258 #, no-wrap msgid "images/Configure_dc_f20.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:3166 +#: user-manual.txt:3261 msgid "" "Using the appropriate buttons on the configuration panel, the following " "actions can be done:" msgstr "" #. type: Plain text -#: user-manual.txt:3169 +#: user-manual.txt:3264 #, no-wrap msgid "" "*Retrieve available details*. This loads the existing configuration from the " @@ -6318,7 +6574,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3171 +#: user-manual.txt:3266 #, no-wrap msgid "" "*Save changes to device*. This changes the configuration of the\n" @@ -6327,7 +6583,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3173 +#: user-manual.txt:3268 #, no-wrap msgid "" "*Backup*. This saves the configuration data to a file. _Subsurface_ asks " @@ -6336,7 +6592,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3175 +#: user-manual.txt:3270 #, no-wrap msgid "" "*Restore backup*. This loads the information from a backup file and displays " @@ -6345,7 +6601,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3177 +#: user-manual.txt:3272 #, no-wrap msgid "" "*Update firmware*. If new firmware is available for the dive computer, this " @@ -6354,13 +6610,13 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:3180 +#: user-manual.txt:3275 #, no-wrap msgid "Setting user _Preferences_ for _Subsurface_" msgstr "" #. type: Plain text -#: user-manual.txt:3191 +#: user-manual.txt:3286 msgid "" "There are several user-definable settings within _Subsurface_, found by " "selecting _File -> Preferences_, mostly affecting the way in which " @@ -6375,24 +6631,24 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3192 +#: user-manual.txt:3287 #, no-wrap msgid "General" msgstr "" #. type: Plain text -#: user-manual.txt:3195 +#: user-manual.txt:3290 msgid "There are several headings in the *General* panel:" msgstr "" #. type: Target for macro image -#: user-manual.txt:3196 +#: user-manual.txt:3291 #, no-wrap msgid "images/Pref1_f23.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:3200 +#: user-manual.txt:3295 #, no-wrap msgid "" " ** *Lists and tables*: Specify the font type and font size of the\n" @@ -6401,7 +6657,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3205 +#: user-manual.txt:3300 #, no-wrap msgid "" " ** *Dives*: For the _Default Dive Log File_ specify the directory and\n" @@ -6413,7 +6669,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3206 +#: user-manual.txt:3301 #, no-wrap msgid "" "_No default file_: When checked, _Subsurface_ does not automatically load a " @@ -6421,7 +6677,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3207 +#: user-manual.txt:3302 #, no-wrap msgid "" "_Local default file_: When checked, _Subsurface_ automatically loads a dive " @@ -6429,7 +6685,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3209 +#: user-manual.txt:3304 #, no-wrap msgid "" "_Cloud storage default file_: When checked, _Subsurface automatically loads " @@ -6439,7 +6695,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3211 +#: user-manual.txt:3306 #, no-wrap msgid "" "** *Display invalid*: Dives can be marked as invalid (when a user wishes to " @@ -6447,7 +6703,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3214 +#: user-manual.txt:3309 #, no-wrap msgid "" "dives that he/she doesn't consider valid dives, e.g. pool dives, but still " @@ -6458,7 +6714,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3216 +#: user-manual.txt:3311 #, no-wrap msgid "" "** *Default cylinder*: From the dropdown list, select the default cylinder " @@ -6466,13 +6722,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3217 +#: user-manual.txt:3312 #, no-wrap msgid "the *Equipment* tab of the *Notes* panel.\n" msgstr "" #. type: Plain text -#: user-manual.txt:3219 +#: user-manual.txt:3314 #, no-wrap msgid "" "** *Animations*: Some actions in showing the dive profile are performed " @@ -6480,7 +6736,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3225 +#: user-manual.txt:3320 #, no-wrap msgid "" "animations. For instance, the axis values for depth and time change from " @@ -6496,7 +6752,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3227 +#: user-manual.txt:3322 #, no-wrap msgid "" "** *Clear all settings*: As indicated in the button below this heading, all " @@ -6504,25 +6760,25 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3228 +#: user-manual.txt:3323 #, no-wrap msgid "cleared and set to default values.\n" msgstr "" #. type: Title === -#: user-manual.txt:3229 +#: user-manual.txt:3324 #, no-wrap msgid "Units" msgstr "" #. type: Target for macro image -#: user-manual.txt:3230 +#: user-manual.txt:3325 #, no-wrap msgid "images/Pref2_f23.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:3237 +#: user-manual.txt:3332 msgid "" "Choose between metric and imperial units of depth, pressure, volume, " "temperature and mass. By selecting the Metric or Imperial radio button at " @@ -6533,7 +6789,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3243 +#: user-manual.txt:3338 msgid "" "Regardless of the above settings, dive time measurements can be either in " "seconds or minutes. Choose the appropriate option. GPS coordinates can be " @@ -6542,24 +6798,24 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3244 +#: user-manual.txt:3339 #, no-wrap msgid "Profile" msgstr "" #. type: Plain text -#: user-manual.txt:3246 +#: user-manual.txt:3341 msgid "This panel has three sections:" msgstr "" #. type: Target for macro image -#: user-manual.txt:3248 +#: user-manual.txt:3343 #, no-wrap msgid "images/Pref4_f23.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:3261 +#: user-manual.txt:3356 #, no-wrap msgid "" "*Gas pressure display setup*. Even though nitrogen and helium pressures are " @@ -6581,13 +6837,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3263 +#: user-manual.txt:3358 #, no-wrap msgid "** CCR Options: These options determine oxygen management for CCR dives:\n" msgstr "" #. type: Plain text -#: user-manual.txt:3268 +#: user-manual.txt:3363 #, no-wrap msgid "" "*** _Dive planner default setpoint_: Specify the O~2~ setpoint for a\n" @@ -6598,7 +6854,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3272 +#: user-manual.txt:3367 #, no-wrap msgid "" "*** _CCR: Show setpoints when viewing pO~2~:_ With this checkbox activated, " @@ -6610,7 +6866,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3276 +#: user-manual.txt:3371 #, no-wrap msgid "" "*** _CCR: Show individual O~2~ sensor values when viewing pO~2~:_ Show the " @@ -6621,7 +6877,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3278 +#: user-manual.txt:3373 #, no-wrap msgid "" "*Ceiling display setup*. These settings mostly deal with nitrogen and helium " @@ -6629,7 +6885,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3279 +#: user-manual.txt:3374 #, no-wrap msgid "" "by determining how the decompression ceiling (ascent ceiling) is calculated " @@ -6637,7 +6893,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3286 +#: user-manual.txt:3381 #, no-wrap msgid "" "** _Draw dive computer reported ceiling red_: This checkbox does exactly " @@ -6652,7 +6908,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3291 +#: user-manual.txt:3386 #, no-wrap msgid "" "** _Algorithm for calculating ceiling_. Choose between the Bühlmann " @@ -6664,7 +6920,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3307 +#: user-manual.txt:3402 #, no-wrap msgid "" "*** Bühlmann: Set the _gradient factors_ (GFLow and GFHigh) for calculcating " @@ -6694,7 +6950,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3314 +#: user-manual.txt:3409 #, no-wrap msgid "" " ** _pSCR options_. These preferences determine how passive semi-closed " @@ -6703,7 +6959,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3318 +#: user-manual.txt:3413 #, no-wrap msgid "" " *** _Metabolic rate:_ this is the\n" @@ -6713,7 +6969,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3321 +#: user-manual.txt:3416 #, no-wrap msgid "" " *** _pSCR ratio:_ The dilution ratio (or dump ratio) is the ratio of gas " @@ -6723,13 +6979,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3323 +#: user-manual.txt:3418 #, no-wrap msgid "*Misc*\n" msgstr "" #. type: Plain text -#: user-manual.txt:3330 +#: user-manual.txt:3425 #, no-wrap msgid "" "** _Show unused cylinders in Equipment Tab_: This checkbox allows display of " @@ -6747,24 +7003,24 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3332 +#: user-manual.txt:3427 #, no-wrap msgid "Language" msgstr "" #. type: Plain text -#: user-manual.txt:3334 +#: user-manual.txt:3429 msgid "Choose a language that _Subsurface_ will use." msgstr "" #. type: Target for macro image -#: user-manual.txt:3335 +#: user-manual.txt:3430 #, no-wrap msgid "images/Pref3_f23.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:3344 +#: user-manual.txt:3439 msgid "" "Check the _System Default_ language i.e. the language of the underlying " "operating system if this is appropriate. This is the default setting in " @@ -6776,20 +7032,20 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3346 +#: user-manual.txt:3441 msgid "" "In this section also specify appropriate date and time formats for showing " "dive details." msgstr "" #. type: Title === -#: user-manual.txt:3347 +#: user-manual.txt:3442 #, no-wrap msgid "Network" msgstr "" #. type: Plain text -#: user-manual.txt:3352 +#: user-manual.txt:3447 msgid "" "This panel facilitates communication between _Subsurface_ and data sources " "on the Internet. This is important, for instance, when _Subsurface_ needs " @@ -6799,18 +7055,18 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:3354 +#: user-manual.txt:3449 #, no-wrap msgid "images/Pref5_f23.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:3357 +#: user-manual.txt:3452 msgid "This dialogue has three sections:" msgstr "" #. type: Plain text -#: user-manual.txt:3365 +#: user-manual.txt:3460 #, no-wrap msgid "" "** _Proxy_:\n" @@ -6827,7 +7083,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3370 +#: user-manual.txt:3465 #, no-wrap msgid "" "** _Subsurface cloud storage_: To store your dive log in the cloud, a valid " @@ -6840,7 +7096,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3371 +#: user-manual.txt:3466 #, no-wrap msgid "" "_Sync to cloud in the background_: This option allows saving of dive " @@ -6848,13 +7104,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3372 +#: user-manual.txt:3467 #, no-wrap msgid "while you do other things within _Subsurface_.\n" msgstr "" #. type: Plain text -#: user-manual.txt:3373 +#: user-manual.txt:3468 #, no-wrap msgid "" "_Save password locally_: This allows local storage of the cloud storage " @@ -6862,13 +7118,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3374 +#: user-manual.txt:3469 #, no-wrap msgid "information is saved in raw text form, not encoded in any way.\n" msgstr "" #. type: Plain text -#: user-manual.txt:3378 +#: user-manual.txt:3473 #, no-wrap msgid "" "** _Subsurface web service_: When you subscribe to the " @@ -6880,13 +7136,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3379 +#: user-manual.txt:3474 #, no-wrap msgid "Georeference" msgstr "" #. type: Plain text -#: user-manual.txt:3387 +#: user-manual.txt:3482 msgid "" "_Subsurface_ provides a geo-lookup service (that is, given the coordinates " "of a dive site) derived from a click on the *Dive Map panel* at the bottom " @@ -6899,19 +7155,19 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:3388 +#: user-manual.txt:3483 #, no-wrap msgid "images/Pref7_f23.jpg" msgstr "" #. type: Title == -#: user-manual.txt:3391 +#: user-manual.txt:3486 #, no-wrap msgid "The _Subsurface_ dive planner" msgstr "" #. type: Plain text -#: user-manual.txt:3396 +#: user-manual.txt:3491 msgid "" "Dive planning is an advanced feature of _Subsurface_, accessed by selecting " "_Log -> Plan Dive_ from the main menu. It allows calculation of inert gas " @@ -6920,27 +7176,27 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:3404 +#: user-manual.txt:3499 msgid "" -"The _Subsurface_ dive planner IS CURRENTLY EXPERIMENTAL and assumes the user " -"is already familiar with the _Subsurface_ user interface. It is explicitly " -"used under the following conditions:" +"The _Subsurface_ dive planner IS EXPERIMENTAL and assumes the user is " +"already familiar with the _Subsurface_ user interface. It is explicitly used " +"under the following conditions:" msgstr "" #. type: delimited block * -#: user-manual.txt:3407 +#: user-manual.txt:3502 msgid "" "The user is conversant with dive planning and has the necessary training to " "perform dive planning." msgstr "" #. type: delimited block * -#: user-manual.txt:3408 +#: user-manual.txt:3503 msgid "The user plans dives within his/her certification limits." msgstr "" #. type: delimited block * -#: user-manual.txt:3411 +#: user-manual.txt:3506 msgid "" "Dive planning makes large assumptions about the characteristics of the " "_average person_ and cannot compensate for individual physiology or health " @@ -6948,32 +7204,32 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:3412 +#: user-manual.txt:3507 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:3413 +#: user-manual.txt:3508 msgid "The user is familiar with the user interface of _Subsurface_." msgstr "" #. type: delimited block * -#: user-manual.txt:3415 +#: user-manual.txt:3510 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:3417 +#: user-manual.txt:3512 #, no-wrap msgid "The _Subsurface_ dive planner screen" msgstr "" #. type: Plain text -#: user-manual.txt:3422 +#: user-manual.txt:3517 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 " @@ -6982,7 +7238,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3426 +#: user-manual.txt:3521 msgid "" "At the top right hand is a green *design panel* on which the profile of the " "dive can be manipulated directly by dragging and clicking as explained " @@ -6991,7 +7247,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3430 +#: user-manual.txt:3525 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 " @@ -7000,26 +7256,26 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:3431 +#: user-manual.txt:3526 #, no-wrap -msgid "images/PlannerWindow1_f20.jpg" +msgid "images/PlannerWindow1.jpg" msgstr "" #. type: Title === -#: user-manual.txt:3434 +#: user-manual.txt:3529 #, no-wrap msgid "Open circuit dives" msgstr "" #. type: Plain text -#: user-manual.txt:3437 +#: user-manual.txt:3532 msgid "" "Towards the center bottom of the planner (circled in blue in the image " "above) is a dropbox with three options. Select the appropriate one of these:" msgstr "" #. type: Plain text -#: user-manual.txt:3440 +#: user-manual.txt:3535 #, no-wrap msgid "" "** Open Circuit (the default)\n" @@ -7028,12 +7284,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3442 +#: user-manual.txt:3537 msgid "Choose the Open Circuit option." msgstr "" #. type: Plain text -#: user-manual.txt:3446 +#: user-manual.txt:3541 msgid "" "In the top left-hand area of the planning screen, be sure the constant dive " "parameters are appropriate. These are: Start date and time of the intended " @@ -7043,7 +7299,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3455 +#: user-manual.txt:3550 msgid "" "In the table labelled _Available Gases_, add the information of the " "cylinders to be used as well as the gas composition within that " @@ -7058,12 +7314,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3457 +#: user-manual.txt:3552 msgid "The _Available Gases_ table includes three gas depth fields, labelled:" msgstr "" #. type: Plain text -#: user-manual.txt:3458 +#: user-manual.txt:3553 #, no-wrap msgid "" "** Deco switch at: the switch depth for deco gases. Unless overridden by the " @@ -7071,7 +7327,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3459 +#: user-manual.txt:3554 #, no-wrap msgid "" "automatically calculated based on the Deco pO~2~ preference (default 1.6 " @@ -7079,7 +7335,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3460 +#: user-manual.txt:3555 #, no-wrap msgid "" "** Bot. MOD: the gas Maximum Operating Depth (MOD) if it is used as a bottom " @@ -7087,7 +7343,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3462 +#: user-manual.txt:3557 #, no-wrap msgid "" "calculated based on the Bottom pO~2~ preference (default 1.4 bar). Editing " @@ -7097,7 +7353,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3463 +#: user-manual.txt:3558 #, no-wrap msgid "" "** MND: the gas Maximum Narcotic Depth (MND). Automatically calculated based " @@ -7105,7 +7361,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3465 +#: user-manual.txt:3560 #, no-wrap msgid "" "preference (default 30m / 98 ft). Editing this field will modify the He% " @@ -7114,12 +7370,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3467 +#: user-manual.txt:3562 msgid "The profile of the planned dive can be created in two ways:" msgstr "" #. type: Plain text -#: user-manual.txt:3472 +#: user-manual.txt:3567 msgid "" "Drag the waypoints (the small white circles) on the existing dive profile to " "represent the dive. Additional waypoints can be created by double-clicking " @@ -7129,7 +7385,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3480 +#: user-manual.txt:3575 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 " @@ -7143,13 +7399,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:3481 +#: user-manual.txt:3576 #, no-wrap msgid "Recreational dives" msgstr "" #. type: Plain text -#: user-manual.txt:3498 +#: user-manual.txt:3593 #, no-wrap msgid "" "Recreational mode is what comes closest to planning a dive based on the " @@ -7180,21 +7436,21 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3501 +#: user-manual.txt:3596 msgid "" "Ensure the date and time is set to that of the intended dive. This allows " "calculation of the nitrogen load incurred during previous dives." msgstr "" #. type: Plain text -#: user-manual.txt:3504 +#: user-manual.txt:3599 msgid "" "Immediately under the heading _Planning_ are two checkboxes _Recreational_ " "and _Safety Stop_. Check these two boxes." msgstr "" #. type: Plain text -#: user-manual.txt:3508 +#: user-manual.txt:3603 msgid "" "Then define the cylinder size, the gas mixture (air or % oxygen) and the " "working cylinder pressure in the top left-hand section of the planner under " @@ -7202,7 +7458,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3513 +#: user-manual.txt:3608 msgid "" "The planner calculates whether the specified cylinder contains enough " "air/gas to complete the planned dive. In order for this to be accurate, " @@ -7212,7 +7468,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3522 +#: user-manual.txt:3617 msgid "" "Define the amount of gas the cylinder must have at the end of the bottom " "section of the dive just before ascent. A value of 50 bar is often used. The " @@ -7229,7 +7485,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3530 +#: user-manual.txt:3625 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 " @@ -7242,14 +7498,14 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3533 +#: user-manual.txt:3628 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:3541 +#: user-manual.txt:3636 msgid "" "The dive profile in the planner shows the maximum dive time within no-deco " "limits using the Bühlmann ZH-L16 algorithm and the gas and depth settings " @@ -7265,36 +7521,34 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3545 +#: user-manual.txt:3639 msgid "" "Below is an image of a dive plan for a recreational dive at 30 " "meters. Although the no-deco limit (NDL) is 23 minutes, the duration of the " -"dive is limited by the amount of air in the cylinder. That is shown in the " -"text box at the bottom right of the panel, requiring sufficient air for " -"buddy-sharing during ascent." +"dive is limited by the amount of air in the cylinder." msgstr "" #. type: Target for macro image -#: user-manual.txt:3546 +#: user-manual.txt:3640 #, no-wrap msgid "images/Planner_OC_rec.jpg" msgstr "" #. type: Title ==== -#: user-manual.txt:3548 +#: user-manual.txt:3642 #, no-wrap msgid "Non-recreational open circuit dives, including decompression" msgstr "" #. type: Plain text -#: user-manual.txt:3552 +#: user-manual.txt:3646 msgid "" "Non-recreational dive planning involves exceeding the no-deco limits and/or " "using multiple breathing gases. These dives are planned in three stages:" msgstr "" #. type: Plain text -#: user-manual.txt:3564 +#: user-manual.txt:3658 #, no-wrap msgid "" "*a) Nitrogen management*: This is done by specifying the rates for descent " @@ -7320,7 +7574,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3570 +#: user-manual.txt:3664 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 " @@ -7333,7 +7587,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3581 +#: user-manual.txt:3675 msgid "" "Please note as well that there is an intrinsic assumption of the VPM-B model " "that off-gassing only happens during the ascent phase of the dive (which is " @@ -7348,26 +7602,26 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3583 +#: user-manual.txt:3677 msgid "For more information external to this manual see:" msgstr "" #. type: Plain text -#: user-manual.txt:3585 +#: user-manual.txt:3679 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:3586 +#: user-manual.txt:3680 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:3588 +#: user-manual.txt:3682 msgid "" "link:https://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: " @@ -7376,7 +7630,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3596 +#: user-manual.txt:3690 msgid "" "The ascent rate is critical for nitrogen off-gassing at the end of the dive " "and is specified for several depth ranges, using the mean depth as a " @@ -7389,7 +7643,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3605 +#: user-manual.txt:3699 #, no-wrap msgid "" "*b) Oxygen management*: In the *Gas Options* part of the dive specification, " @@ -7408,7 +7662,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3636 +#: user-manual.txt:3721 #, no-wrap msgid "" "*c) Gas management*: With open-circuit dives this is a primary\n" @@ -7443,38 +7697,21 @@ msgid "" "first deco gas change depth or the surface. This procedure is called the " "\"minimum gas\" or \"rock bottom\"\n" "consideration and it is used by various (but not all)\n" -"technical diving organisations. The calculation assumes that in worst case " -"an out of gas (OoG)\n" -"situation could occur at the end of the planned bottom time at maximum " -"depth. This OoG event forces\n" -"the buddy team the share the gas of one diver and to stay at maximum depth " -"for an additional\n" -"time of n minutes (preferences option \"problem solving time\").\n" -"At the same moment the combined SAC of both divers is increased by a " -"estimated factor (preferences option\n" -"\"SAC factor\") compared to the SAC factor of a single diver under normal " -"conditions.\n" -"The result of the minimum gas calculation for the bottom gas is printed to " -"the planner output as an\n" -"additional information. No automatic checks are performed based on this " -"result.\n" -"Please take care that the feature only gives valid results for simple, " -"rectengular shaped single\n" -"level dive profiles. For multi level dives one would need to check every leg " -"of the profile independently.\n" -msgstr "" - -#. type: Plain text -#: user-manual.txt:3649 +"technical diving organisations. See the text below for a detailed " +"explanation.\n" +msgstr "" + +#. type: Plain text +#: user-manual.txt:3733 msgid "" "Now you can start the detailed time-depth planning of the dive. _Subsurface_ " "offers an unique graphical interface for doing planning. The mechanics are " "similar to hand-entering a dive profile in the dive log part of " "_Subsurface_. Upon activating the planner, a default dive of depth 15 m for " -"20 min is offered in the blue design surface to the top right hand of the " -"screen. The white dots (waypoints) on the profile can be dragged with a " -"mouse. Create more waypoints by double-clicking on the profile line and " -"ensuring the profile reflects the intended dive. Drag the waypoints to " +"20 min is offered in the blue design surface in the top right hand part of " +"the planner window. The white dots (waypoints) on the profile can be dragged " +"with a mouse. Create more waypoints by double-clicking on the profile line " +"and ensuring the profile reflects the intended dive. Drag the waypoints to " "represent the depth and duration of the dive. It is NOT necessary to specify " "the ascent part of the dive since the planner calculates this, based on the " "existing settings. If any of the management limits (for nitrogen, oxygen or " @@ -7483,7 +7720,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3660 +#: user-manual.txt:3744 msgid "" "Each waypoint on the dive profile creates a _Dive Planner Point_ in the " "table on the left of the dive planner panel. Ensure the _Used Gas_ value in " @@ -7500,7 +7737,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3666 +#: user-manual.txt:3750 msgid "" "Show any changes in gas cylinder used by indicating gas changes as explained " "in the section <<S_CreateProfile,hand-creating a dive profile>>. These " @@ -7510,33 +7747,65 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3675 +#: user-manual.txt:3764 msgid "" -"A non-zero value in the \"CC setpoint\" column of the table of dive planner " -"points indicates a valid setpoint for oxygen partial pressure and that the " -"segment is dived using a closed circuit rebreather (CCR). If the last " -"manually entered segment is a CCR segment, the decompression phase is " -"computed assuming the diver uses a CCR with the specified set-point. If the " -"last segment (however short) is on open circuit (OC, indicated by a zero " +"Cylinders used for the plan need to be entered in the table of _Available " +"gases_. In the column _Type_ select the appropriate cylinder size by using " +"the dropdown list that appears when double-clicking a cell in this " +"column. By default, a large number of sizes are listed, and a new cylinder " +"size can be created by typing this into the text box. The cylinder size, " +"start pressure and default switch depths are initialised " +"automatically. Specify the gas composition (e.g. helium and oxygen " +"content). A non-zero value in the \"CC setpoint\" column of the table of " +"dive planner points indicates a valid setpoint for oxygen partial pressure " +"and that the segment is dived using a closed circuit rebreather (CCR). If " +"the last manually entered segment is a CCR segment, the decompression phase " +"is computed assuming the diver uses a CCR with the specified set-point. If " +"the last segment (however short) is on open circuit (OC, indicated by a zero " "set-point) the decompression is computed in OC mode and the planner only " "considers gas changes in OC mode." msgstr "" #. type: Plain text -#: user-manual.txt:3678 +#: user-manual.txt:3774 msgid "" -"Below is an example of a dive plan to 45m using Tx21/35, followed by an " -"ascent using EAN50 and oxygen and using the settings as described above." +"Enter dive profile segments in the _Dive planner points_ table by providing " +"a time duration for a segment as well as its final depth. If more than one " +"cylinder is used during the dive, ensure that the appropriate cylinder is " +"selected for each segment of the dive plan by double-clicking the cell and " +"selecting the appropriate cylinder from the dropdown list in the _Used gas_ " +"column. If required, insert a row in the _Dive planner points_ table by " +"adding a new line and then setting the _Run time_ value appropriately. In " +"image A below, a segment (using an EAN50 cylinder) has been added and you " +"wish to use this gas during the very start of the dive (the other gas is not " +"breathable at the surface). Upon pressing Enter on the keyboard, that " +"segment is moved to the top of that table and the plan is adjusted " +"automatically to take into account this new segment of the dive plan (image " +"B below)." msgstr "" #. type: Target for macro image -#: user-manual.txt:3679 +#: user-manual.txt:3775 +#, no-wrap +msgid "images/planner1.jpg" +msgstr "" + +#. type: Plain text +#: user-manual.txt:3779 +msgid "" +"Below is an example of a dive plan to 55m using Tx20/30 and the Bühlmann " +"algorithm, followed by an ascent using EAN50 and using the settings as " +"described above." +msgstr "" + +#. type: Target for macro image +#: user-manual.txt:3780 #, no-wrap -msgid "images/Planner_OC_deco_VPM.jpg" +msgid "images/Planner_OC_deco.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:3684 +#: user-manual.txt:3785 msgid "" "Once the above steps have been completed, save by clicking the _Save_ button " "towards the top middle of the planner. The saved dive plan will appear in " @@ -7544,26 +7813,25 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3686 +#: user-manual.txt:3787 #, no-wrap msgid "*The dive plan details*\n" msgstr "" #. type: Plain text -#: user-manual.txt:3694 +#: user-manual.txt:3795 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 " -"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." +"details of the dive plan are provided. These 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 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:3699 +#: user-manual.txt:3800 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 " @@ -7572,14 +7840,161 @@ msgid "" "from the segment durations at a particular level." msgstr "" +#. type: Plain text +#: user-manual.txt:3807 +msgid "" +"The planner has a check box _Display plan variations_. By checking this box, " +"the planner provides information about a dive that is a little deeper or " +"slightly longer than the planned dive. This can be found near the top of the " +"_Dive plan details_ where the dive duration is indicated. Checking this " +"option creates a lot of additional computation, to such a degree that the " +"planner is slower than otherwise. The information is typically given as:" +msgstr "" + +#. type: Plain text +#: user-manual.txt:3809 +#, no-wrap +msgid " Runtime: 53min + 0:52/m + 4:21/min\n" +msgstr "" + +#. type: Plain text +#: user-manual.txt:3811 user-manual.txt:3846 +msgid "This indicates:" +msgstr "" + +#. type: Plain text +#: user-manual.txt:3813 +msgid "Calculated dive duration is 53 min." +msgstr "" + +#. type: Plain text +#: user-manual.txt:3814 +msgid "" +"For each extra meter in depth during the bottom phase of the dive, the " +"duration increases by 52 seconds." +msgstr "" + +#. type: Plain text +#: user-manual.txt:3818 +msgid "" +"For each extra minute of bottom time, the duration increases by 4 min 21 " +"sec. Thus, if the bottom time is two minutes longer than planned, the dive " +"duration will be (2+2*4min 21 sec) = 10 minutes 42 sec longer and would " +"probably require that each deco stop is 10:42/53:00 = 20% longer than " +"planned. These calculations are only applicable for small deviations from " +"the dive plan, not for larger deviations." +msgstr "" + +#. type: Plain text +#: user-manual.txt:3820 +msgid "Minimum gas requirements*" +msgstr "" + +#. type: Plain text +#: user-manual.txt:3830 +msgid "" +"The planner also estimates the *minimum gas* pressure required for safe " +"ascent after an event that causes the dive to be aborted. The calculation " +"assumes that in worst case an out of gas (OoG) situation could occur at the " +"end of the planned bottom time at maximum depth. This OoG event forces the " +"buddy team the share the gas of one diver and to stay at maximum depth for " +"an additional number of minutes. At the same moment the combined SAC of " +"both divers is increased by a estimated factor compared to the SAC factor of " +"a single diver under normal conditions. The result of the minimum gas " +"calculation for the bottom gas is printed to the planner output. No " +"automatic checks are performed based on this result. The feature only gives " +"valid results for simple, rectengular shaped single level dive profiles. For " +"multi level dives one would need to check every leg of the profile " +"independently." +msgstr "" + +#. type: Plain text +#: user-manual.txt:3832 +msgid "There are two selector boxes on the left of the _Dive plan details_:" +msgstr "" + +#. type: Plain text +#: user-manual.txt:3836 +#, no-wrap +msgid "" +"*SAC factor*. This is your estimate of the degree to which your SAC " +"increases if a critical problem arises underwater,\n" +"e.g. gas sharing or entanglement. Realistic values range from 2 to 5, " +"reflecting the gas use of two divers sharing\n" +"a single gas cylinder after an OoG situation.\n" +msgstr "" + +#. type: Plain text +#: user-manual.txt:3838 +#, no-wrap +msgid "" +"*Problem solving time*. This is your estimate of how long you would take to " +"solve the problem before starting the ascent\n" +"to terminate the dive. The default value is 2 minutes.\n" +msgstr "" + +#. type: Plain text +#: user-manual.txt:3842 +msgid "" +"Using the above information, the planner then estimates what the minimum " +"botom gas cylinder pressure needs to be for a safe ascent. This information " +"is given near the bottom of the _Dive plan details_, following the " +"calculation of bottom gas used during the dive if it exactly follows the " +"plan. the minimum gas is typically given as:" +msgstr "" + +#. type: Plain text +#: user-manual.txt:3844 +#, no-wrap +msgid " Minimum gas (based on 2.0xSAC/+1min@81m): 2130 l/90bar/Δ:+80bar\n" +msgstr "" + +#. type: Plain text +#: user-manual.txt:3848 +msgid "Within parentheses, the *SAC factor* and *Problem solving time* specified." +msgstr "" + +#. type: Plain text +#: user-manual.txt:3849 +msgid "" +"The number of liters of back gas required for a safe ascent (2130 litres in " +"the example above)" +msgstr "" + +#. type: Plain text +#: user-manual.txt:3850 +msgid "" +"The number of bars of back gas required for a safe ascent (90 bars in the " +"example above)." +msgstr "" + +#. type: Plain text +#: user-manual.txt:3853 +msgid "" +"The delta-value: number of bars of back gas available at the end of the " +"bottom section of the dive, _over and above_ the minimum gas requirement (80 " +"bars in the above example). A positive delta reflects a safe plan; a " +"negative delta indicates insufficient gas for a safe ascent." +msgstr "" + +#. type: delimited block * +#: user-manual.txt:3861 +msgid "" +"The *plan variations* and *minimum gas* estimates are only guidelines for a " +"diver performing dive planning, intended to enhance the safety of executing " +"a particular dive plan. They are NOT precise and should NOT be relied upon " +"as the only safety features in dive planning. Interpret these estimates " +"within the framework of your formal training to perform dive planning." +msgstr "" + #. type: Title === -#: user-manual.txt:3700 +#: user-manual.txt:3863 #, no-wrap msgid "Planning pSCR dives" msgstr "" #. type: Plain text -#: user-manual.txt:3717 +#: user-manual.txt:3880 #, no-wrap msgid "" "To plan a dive using a passive semi-closed rebreather (pSCR), select _pSCR_ " @@ -7613,26 +8028,26 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:3718 +#: user-manual.txt:3881 #, no-wrap -msgid "images/Planner_pSCR1_f20.jpg" +msgid "images/Planner_pSCR.jpg" msgstr "" #. type: Title === -#: user-manual.txt:3721 +#: user-manual.txt:3884 #, no-wrap msgid "Planning CCR dives" msgstr "" #. type: Plain text -#: user-manual.txt:3725 +#: user-manual.txt:3888 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:3729 +#: user-manual.txt:3892 #, no-wrap msgid "" "*Available gases*: In the _Available gases_ table, enter the cylinder " @@ -7643,7 +8058,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3739 +#: user-manual.txt:3902 #, no-wrap msgid "" "*Entering setpoints*: Specify a default setpoint in the Preferences tab, by " @@ -7665,31 +8080,31 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3741 +#: user-manual.txt:3904 msgid "The dive profile for a CCR dive may look something like the image below." msgstr "" #. type: Target for macro image -#: user-manual.txt:3742 +#: user-manual.txt:3905 #, no-wrap -msgid "images/Planner_CCR1_f20.jpg" +msgid "images/Planner_CCR.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:3746 +#: user-manual.txt:3909 msgid "" "Note that, in the _Dive plan details_, the gas consumption for a CCR segment " "is not calculated, so gas consumptions of 0 liters are the norm." msgstr "" #. type: Title === -#: user-manual.txt:3748 +#: user-manual.txt:3911 #, no-wrap msgid "Modifying an existing dive plan" msgstr "" #. type: Plain text -#: user-manual.txt:3755 +#: user-manual.txt:3918 msgid "" "Normally, when a dive plan has been saved, it is accessible from the *Dive " "List*, like any other dive log. Within the *Dive List* there is no way to " @@ -7700,7 +8115,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3761 +#: user-manual.txt:3924 msgid "" "In addition, there is the option \"Save new\". This keeps the original " "planned dive and adds a (possibly modified, - earlier dives are now taken " @@ -7711,13 +8126,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3762 +#: user-manual.txt:3925 #, no-wrap msgid "Planning for repetitive dives" msgstr "" #. type: Plain text -#: user-manual.txt:3769 +#: user-manual.txt:3932 msgid "" "Repetitive dives can easily be planned if the dates and start times of the " "repetitive dive set are specified appropriately in the top left-hand _Start " @@ -7726,7 +8141,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3775 +#: user-manual.txt:3938 msgid "" "If you have just completed a long/deep dive and are planning another dive, " "then highlight, in the *Dive List*, the dive that has just been logged then " @@ -7736,7 +8151,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3780 +#: user-manual.txt:3943 msgid "" "If only a few standard configurations are used (e.g. in GUE), then a " "template dive can be created conforming to one of the configurations. If you " @@ -7746,13 +8161,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3781 +#: user-manual.txt:3944 #, no-wrap msgid "Printing the dive plan" msgstr "" #. type: Plain text -#: user-manual.txt:3786 +#: user-manual.txt:3949 msgid "" "Selecting the _Print_ button in the planner allows printing of the _Dive " "Plan Details_ for wet notes. You can also cut and paste the _Dive Plan " @@ -7760,7 +8175,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3792 +#: user-manual.txt:3955 msgid "" "However, after the plan has been saved, it is represented in a way very " "similar to a dive log and the gas calculations cannot be accessed in the " @@ -7770,13 +8185,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3794 +#: user-manual.txt:3957 #, no-wrap msgid "Saving a dive with its dive plan" msgstr "" #. type: Plain text -#: user-manual.txt:3801 +#: user-manual.txt:3964 msgid "" "In the section dealing with <<S_MultipleDiveComputers, dives using more than " "one dive computer>> we discussed the way in which multiple profiles for a " @@ -7787,24 +8202,24 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3803 +#: user-manual.txt:3966 msgid "Do the dive planning and save the final plan in the _Dive List_." msgstr "" #. type: Plain text -#: user-manual.txt:3804 +#: user-manual.txt:3967 msgid "After diving, upload the dive data from the dive computer." msgstr "" #. type: Plain text -#: user-manual.txt:3806 +#: user-manual.txt:3969 msgid "" "Change the date and time of the _dive plan_ to coincide with that of the " "real-life dive from the _dive computer_." msgstr "" #. type: Plain text -#: user-manual.txt:3809 +#: user-manual.txt:3972 msgid "" "In the _Dive List_, highlight the dive plan as well as the data for the real " "dive and merge the two dives, making use of the Dive List Context Menu " @@ -7812,7 +8227,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3813 +#: user-manual.txt:3976 msgid "" "The text version of the dive plan is appended to the Notes in the _Notes " "Tab_. With this merged dive highlighted in the _Dive List_, switch between " @@ -7821,13 +8236,13 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:3814 +#: user-manual.txt:3977 #, no-wrap msgid "Running _Subsurface_ from the command-line" msgstr "" #. type: Plain text -#: user-manual.txt:3818 +#: user-manual.txt:3981 msgid "" "_Subsurface_ can be launched from the command-line to set some specialised " "settings or as part of an script-based automated process for manipulating a " @@ -7835,18 +8250,18 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3820 +#: user-manual.txt:3983 #, no-wrap msgid "\tsubsurface [options] [logfile ...] [--import logfile ...]\n" msgstr "" #. type: Plain text -#: user-manual.txt:3822 +#: user-manual.txt:3985 msgid "The options include:" msgstr "" #. type: delimited block | -#: user-manual.txt:3836 +#: user-manual.txt:3999 #, no-wrap msgid "" "|*Command-line option*|*Description*\n" @@ -7871,13 +8286,13 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:3838 +#: user-manual.txt:4001 #, no-wrap msgid "Description of the Subsurface Main Menu items" msgstr "" #. type: Plain text -#: user-manual.txt:3843 +#: user-manual.txt:4006 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 " @@ -7885,261 +8300,261 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3844 +#: user-manual.txt:4007 #, no-wrap msgid "File" msgstr "" #. type: Plain text -#: user-manual.txt:3847 +#: user-manual.txt:4010 msgid "" "<<S_NewLogbook,_New Logbook_>> - Close the currently open dive logbook and " "clear all dive information." msgstr "" #. type: Plain text -#: user-manual.txt:3849 +#: user-manual.txt:4012 msgid "_Open logbook_ - Open the file manager to select a dive logbook to open." msgstr "" #. type: Plain text -#: user-manual.txt:3850 +#: user-manual.txt:4013 msgid "_Save_ - Save the dive logbook currently open." msgstr "" #. type: Plain text -#: user-manual.txt:3851 +#: user-manual.txt:4014 msgid "_Save as_ - Save the current logbook under a different file name." msgstr "" #. type: Plain text -#: user-manual.txt:3852 +#: user-manual.txt:4015 msgid "" "_Open cloud storage_ - Open the dive log previously saved in " "<<S_Cloud_storage,_Cloud storage_>>." msgstr "" #. type: Plain text -#: user-manual.txt:3853 +#: user-manual.txt:4016 msgid "" "_Save to cloud storage_ - Save the current dive log to " "<<S_Cloud_storage,_Cloud storage_>>." msgstr "" #. type: Plain text -#: user-manual.txt:3854 +#: user-manual.txt:4017 msgid "" "_Take cloud storage online_ - " "******************************************************" msgstr "" #. type: Plain text -#: user-manual.txt:3855 +#: user-manual.txt:4018 msgid "_Close_ - Close the dive logbook currently open." msgstr "" #. type: Plain text -#: user-manual.txt:3857 +#: user-manual.txt:4020 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:3858 +#: user-manual.txt:4021 msgid "<<S_PrintDivelog,_Print_>> - Print the currently open logbook." msgstr "" #. type: Plain text -#: user-manual.txt:3859 +#: user-manual.txt:4022 msgid "<<S_Preferences,_Preferences_>> - Set the _Subsurface_ preferences." msgstr "" #. type: Plain text -#: user-manual.txt:3860 +#: user-manual.txt:4023 msgid "" "<<S_FindMovedImages, _Find moved images_>> - If photos taken during dives " "have been moved to" msgstr "" #. type: Plain text -#: user-manual.txt:3861 +#: user-manual.txt:4024 msgid "" "a different disk or directory, locate them and link them to the appropriate " "dives." msgstr "" #. type: Plain text -#: user-manual.txt:3862 +#: user-manual.txt:4025 msgid "" "<<S_Configure,_Configure dive computer_>> - Edit the configuration of a dive " "computer." msgstr "" #. type: Plain text -#: user-manual.txt:3863 +#: user-manual.txt:4026 msgid "_Quit_ - Quit _Subsurface_." msgstr "" #. type: Title === -#: user-manual.txt:3865 +#: user-manual.txt:4028 #, no-wrap msgid "Edit" msgstr "" #. type: Plain text -#: user-manual.txt:3867 +#: user-manual.txt:4030 msgid "The Edit option allows one to undo or redo an action, e.g. deleting dives." msgstr "" #. type: Title === -#: user-manual.txt:3868 +#: user-manual.txt:4031 #, no-wrap msgid "Import" msgstr "" #. type: Plain text -#: user-manual.txt:3871 +#: user-manual.txt:4034 msgid "" "<<S_ImportDiveComputer,_Import from dive computer_>> - Import dive " "information from a dive computer." msgstr "" #. type: Plain text -#: user-manual.txt:3873 +#: user-manual.txt:4036 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:3875 +#: user-manual.txt:4038 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:3877 +#: user-manual.txt:4040 msgid "" "<<S_ImportingDivelogsDe,_Import from Divelogs.de_>> - Import dive " "information from _www.Divelogs.de_." msgstr "" #. type: Title === -#: user-manual.txt:3878 +#: user-manual.txt:4041 #, no-wrap msgid "Log" msgstr "" #. type: Plain text -#: user-manual.txt:3880 +#: user-manual.txt:4043 msgid "" "<<S_EnterData,_Add Dive_>> - Manually add a new dive to the *Dive List* " "panel." msgstr "" #. type: Plain text -#: user-manual.txt:3881 +#: user-manual.txt:4044 msgid "" "_Edit dive_ - Edit a dive where the profile was entered by hand and not from " "a dive computer." msgstr "" #. type: Plain text -#: user-manual.txt:3882 +#: user-manual.txt:4045 msgid "<<S_DivePlanner,_Plan Dive_>> - Plan dives." msgstr "" #. type: Plain text -#: user-manual.txt:3883 +#: user-manual.txt:4046 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:3885 +#: user-manual.txt:4048 msgid "" "<<S_CopyComponents,_Copy dive components_>> - Copy information from several " "fields of a dive log onto the clipboard." msgstr "" #. type: Plain text -#: user-manual.txt:3887 +#: user-manual.txt:4050 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:3889 +#: user-manual.txt:4052 msgid "" "<<S_Renumber,_Renumber_>> - Renumber the dives listed in the *Dive List* " "panel." msgstr "" #. type: Plain text -#: user-manual.txt:3891 +#: user-manual.txt:4054 msgid "" "<<S_Group,_Auto Group_>> - Group the dives in the *Dive List* panel into " "dive trips." msgstr "" #. type: Plain text -#: user-manual.txt:3892 +#: user-manual.txt:4055 msgid "" "<<S_DeviceNames,_Edit Device Names_>> - Edit the names of dive computers to " "coordinate your logs." msgstr "" #. type: Plain text -#: user-manual.txt:3893 +#: user-manual.txt:4056 msgid "" "<<S_Filter,_Filter divelist_>> - Select only some dives, based on specific " "tags or dive criteria." msgstr "" #. type: Title === -#: user-manual.txt:3894 +#: user-manual.txt:4057 #, no-wrap msgid "View" msgstr "" #. type: Plain text -#: user-manual.txt:3897 +#: user-manual.txt:4060 msgid "<<S_ViewPanels,_All_>> - View the four main _Subsurface_ panels all at once." msgstr "" #. type: Plain text -#: user-manual.txt:3898 +#: user-manual.txt:4061 msgid "<<S_ViewPanels,_Dive List_>> - View only the *Dive List* panel." msgstr "" #. type: Plain text -#: user-manual.txt:3899 +#: user-manual.txt:4062 msgid "<<S_ViewPanels,_Profile_>> - View only the *Dive Profile* panel." msgstr "" #. type: Plain text -#: user-manual.txt:3900 +#: user-manual.txt:4063 msgid "<<S_ViewPanels,_Info_>> - View only the *Notes* panel." msgstr "" #. type: Plain text -#: user-manual.txt:3901 +#: user-manual.txt:4064 msgid "<<S_ViewPanels,_Globe_>> - View only the *World Map* panel." msgstr "" #. type: Plain text -#: user-manual.txt:3903 +#: user-manual.txt:4066 msgid "" "_Yearly Statistics_ - Display summary statistics about dives during this and " "past years." msgstr "" #. type: Plain text -#: user-manual.txt:3906 +#: user-manual.txt:4069 msgid "" "_Prev DC_ - Switch to data from previous dive computer, if a single dive was " "logged from more than one. See the sections on " @@ -8148,50 +8563,50 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3907 +#: user-manual.txt:4070 msgid "_Next DC_ - Switch to next dive computer." msgstr "" #. type: Plain text -#: user-manual.txt:3908 +#: user-manual.txt:4071 msgid "_Full Screen_ - Toggles Full Screen mode." msgstr "" #. type: Title === -#: user-manual.txt:3909 +#: user-manual.txt:4072 #, no-wrap msgid "Share on" msgstr "" #. type: Plain text -#: user-manual.txt:3911 +#: user-manual.txt:4074 msgid "" "<<S_Facebook,_Facebook_>> - Share the currently selected dive on your " "Facebook timeline." msgstr "" #. type: Title === -#: user-manual.txt:3912 +#: user-manual.txt:4075 #, no-wrap msgid "Help" msgstr "" #. type: Plain text -#: user-manual.txt:3915 +#: user-manual.txt:4078 msgid "" "_About Subsurface_ - Show a panel with the version number of _Subsurface_ as " "well as licensing information." msgstr "" #. type: Plain text -#: user-manual.txt:3917 +#: user-manual.txt:4080 msgid "" "_Check for updates_ - Find out whether a newer version of Subsurface is " "available on the https://subsurface-divelog.org/[_Subsurface_ web site]." msgstr "" #. type: Plain text -#: user-manual.txt:3919 +#: user-manual.txt:4082 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 " @@ -8199,12 +8614,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3920 +#: user-manual.txt:4083 msgid "_User manual_ - Open a window showing this user manual." msgstr "" #. type: Title == -#: user-manual.txt:3923 +#: user-manual.txt:4086 #, no-wrap msgid "" "APPENDIX A: Operating system specific information for importing dive " @@ -8212,19 +8627,19 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3925 +#: user-manual.txt:4088 #, 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:3926 +#: user-manual.txt:4089 #, no-wrap msgid "images/icons/drivers.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:3931 +#: user-manual.txt:4094 msgid "" "The operating system of the desktop computer needs the appropriate drivers " "in order to communicate with the dive computer, the way the dive computer " @@ -8232,7 +8647,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3937 +#: user-manual.txt:4100 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 " @@ -8241,7 +8656,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3941 +#: user-manual.txt:4104 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 " @@ -8249,7 +8664,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3948 +#: user-manual.txt:4111 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 " @@ -8260,19 +8675,19 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3950 +#: user-manual.txt:4113 #, 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:3951 +#: user-manual.txt:4114 #, no-wrap msgid "images/icons/usb.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:3959 +#: user-manual.txt:4122 msgid "" "When connecting a dive computer by using a USB connector, usually " "_Subsurface_ will either propose a drop down list with the correct device " @@ -8282,61 +8697,61 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3964 +#: user-manual.txt:4127 msgid "" "Simply try COM1, COM2, etc. The drop down list should contain all connected " "COM devices." msgstr "" #. type: Title ==== -#: user-manual.txt:3965 user-manual.txt:4063 +#: user-manual.txt:4128 user-manual.txt:4226 #, no-wrap msgid "On MacOS:" msgstr "" #. type: Plain text -#: user-manual.txt:3968 +#: user-manual.txt:4131 msgid "The drop down box should find all connected dive computers." msgstr "" #. type: Block title -#: user-manual.txt:3969 +#: user-manual.txt:4132 #, no-wrap msgid "On Linux:" msgstr "" #. type: Plain text -#: user-manual.txt:3972 +#: user-manual.txt:4135 msgid "There is a definitive way to find the port:" msgstr "" #. type: Plain text -#: user-manual.txt:3974 +#: user-manual.txt:4137 msgid "Disconnect the USB cable from the dive computer" msgstr "" #. type: Plain text -#: user-manual.txt:3975 +#: user-manual.txt:4138 msgid "Open a terminal" msgstr "" #. type: Plain text -#: user-manual.txt:3976 user-manual.txt:3978 +#: user-manual.txt:4139 user-manual.txt:4141 msgid "Type the command: 'dmesg' and press enter" msgstr "" #. type: Plain text -#: user-manual.txt:3977 +#: user-manual.txt:4140 msgid "Plug in the USB cable of the dive computer" msgstr "" #. type: Plain text -#: user-manual.txt:3980 +#: user-manual.txt:4143 msgid "A message similar to this one should appear:" msgstr "" #. type: Plain text -#: user-manual.txt:3996 +#: user-manual.txt:4159 #, no-wrap msgid "" "\tusb 2-1.1: new full speed USB device number 14 using ehci_hcd\n" @@ -8357,7 +8772,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4001 +#: user-manual.txt:4164 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 " @@ -8365,12 +8780,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4003 +#: user-manual.txt:4166 msgid "Ensuring the user has write permission to the USB serial port:" msgstr "" #. type: Plain text -#: user-manual.txt:4013 +#: user-manual.txt:4176 msgid "" "On Unix-like operating systems the USB ports can only be accessed by users " "who are members special group that can be e.g. +dialout+ or +uucp+. This " @@ -8382,14 +8797,14 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4017 +#: user-manual.txt:4180 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:4022 +#: user-manual.txt:4185 #, no-wrap msgid "" "Type: +id johnB+ This lists all the groups that johnB belongs to and\n" @@ -8401,7 +8816,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4024 +#: user-manual.txt:4187 #, no-wrap msgid "" "Under some circumstances this change takes only effect (eg. on Ubuntu) " @@ -8410,7 +8825,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4029 +#: user-manual.txt:4192 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 you " @@ -8418,13 +8833,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4032 +#: user-manual.txt:4195 #, no-wrap msgid "Manually setting up Bluetooth enabled devices" msgstr "" #. type: Plain text -#: user-manual.txt:4039 +#: user-manual.txt:4202 msgid "" "For dive computers communicating through Bluetooth like the Heinrichs " "Weikamp Frog or the Shearwater Predator, Petrel and Nerd there is a " @@ -8433,7 +8848,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4041 +#: user-manual.txt:4204 #, no-wrap msgid "" "*For the dive computer, after enabling Bluetooth, be sure it is in Upload " @@ -8441,7 +8856,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4045 +#: user-manual.txt:4208 msgid "" "For Bluetooth pairing of the dive computer, refer to the manufacturer's user " "guide. When using a Shearwater Predator/Petrel/Nerd, select _Dive Log -> " @@ -8449,13 +8864,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4047 +#: user-manual.txt:4210 #, no-wrap msgid "*Pair the _Subsurface_ computer with the dive computer.*\n" msgstr "" #. type: Plain text -#: user-manual.txt:4056 +#: user-manual.txt:4219 msgid "" "Bluetooth is most likely already enabled. For pairing with the dive computer " "choose _Control Panel -> Bluetooth Devices -> Add Wireless Device_. This " @@ -8467,21 +8882,21 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4059 +#: user-manual.txt:4222 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:4062 +#: user-manual.txt:4225 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:4069 +#: user-manual.txt:4232 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 " @@ -8490,20 +8905,20 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4072 +#: user-manual.txt:4235 msgid "" "Once the pairing is complete, the correct device is shown in the 'Device or " "Mount Point' drop-down in the _Subsurface_ *Import* dialog." msgstr "" #. type: Title ==== -#: user-manual.txt:4073 +#: user-manual.txt:4236 #, no-wrap msgid "On Linux" msgstr "" #. type: Plain text -#: user-manual.txt:4081 +#: user-manual.txt:4244 msgid "" "Be sure Bluetooth is enabled on the _Subsurface_ computer. On most common " "distributions this should be true out of the box and pairing should be " @@ -8515,7 +8930,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4085 +#: user-manual.txt:4248 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 " @@ -8524,23 +8939,23 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4087 +#: user-manual.txt:4250 msgid "Enable the Bluetooth controller and pair your dive computer" msgstr "" #. type: Plain text -#: user-manual.txt:4088 +#: user-manual.txt:4251 msgid "Establish an RFCOMM connection" msgstr "" #. type: Title ===== -#: user-manual.txt:4089 user-manual.txt:4229 +#: user-manual.txt:4252 user-manual.txt:4392 #, no-wrap msgid "Download the dives with Subsurface" msgstr "" #. type: Plain text -#: user-manual.txt:4095 +#: user-manual.txt:4258 msgid "" "Ensure the dive computer is in upload mode. On the _Shearwater Petrel_, " "_Petrel 2_ and _Nerd_ cycle through the menu, select 'Dive Log', then " @@ -8551,7 +8966,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4100 +#: user-manual.txt:4263 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 " @@ -8561,23 +8976,23 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4102 +#: user-manual.txt:4265 msgid "+sudo usermod -a -G dialout username+" msgstr "" #. type: Plain text -#: user-manual.txt:4104 +#: user-manual.txt:4267 msgid "Then log out and log in for the change to take effect." msgstr "" #. type: Title ===== -#: user-manual.txt:4105 +#: user-manual.txt:4268 #, no-wrap msgid "Enabling the Bluetooth controller and pairing your dive computer" msgstr "" #. type: Plain text -#: user-manual.txt:4111 +#: user-manual.txt:4274 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 " @@ -8588,7 +9003,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4114 +#: user-manual.txt:4277 msgid "" "If the graphical method doesn't work, pair the device from the command " "line. Open a terminal and use +hciconfig+ to check the Bluetooth controller " @@ -8596,7 +9011,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4121 +#: user-manual.txt:4284 #, no-wrap msgid "" "\t$ hciconfig\n" @@ -8608,7 +9023,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4126 +#: user-manual.txt:4289 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 " @@ -8618,7 +9033,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4134 +#: user-manual.txt:4297 #, no-wrap msgid "" "\tsudo hciconfig hci0 up auth+ (enter password when prompted)\n" @@ -8631,25 +9046,25 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4136 +#: user-manual.txt:4299 msgid "Check that the status now includes +'UP', 'RUNNING' AND 'AUTH'+." msgstr "" #. type: Plain text -#: user-manual.txt:4138 +#: user-manual.txt:4301 msgid "" "If there are multiple controllers running, it's easiest to turn off the " "unused controller(s). For example, for +hci1+:" msgstr "" #. type: Plain text -#: user-manual.txt:4140 +#: user-manual.txt:4303 #, no-wrap msgid "\tsudo hciconfig hci1 down\n" msgstr "" #. type: Plain text -#: user-manual.txt:4143 +#: user-manual.txt:4306 msgid "" "Next step is to 'trust' and 'pair' the dive computer. On distros with Bluez " "5, such as Fedora 22, you can use a tool called +blutootctl+, which will " @@ -8657,7 +9072,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4164 +#: user-manual.txt:4327 #, no-wrap msgid "" "\tbluetoothctl\n" @@ -8686,14 +9101,14 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4167 +#: user-manual.txt:4330 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:4170 +#: user-manual.txt:4333 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 " @@ -8701,7 +9116,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4175 +#: user-manual.txt:4338 #, no-wrap msgid "" "\thcitool -i hci0 scanning\n" @@ -8711,82 +9126,82 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4177 +#: user-manual.txt:4340 msgid "Once the dive computer is paired, set up the RFCOMM connection." msgstr "" #. type: Title ===== -#: user-manual.txt:4178 +#: user-manual.txt:4341 #, no-wrap msgid "Establishing the RFCOMM connection" msgstr "" #. type: Plain text -#: user-manual.txt:4181 +#: user-manual.txt:4344 msgid "The command to establish an RFCOMM connection is:" msgstr "" #. type: Plain text -#: user-manual.txt:4183 +#: user-manual.txt:4346 msgid "+sudo rfcomm -i <controller> connect <dev> <bdaddr> [channel]+" msgstr "" #. type: Plain text -#: user-manual.txt:4185 +#: user-manual.txt:4348 msgid "+<controller>+ is the Bluetooth controller, +hci0+." msgstr "" #. type: Plain text -#: user-manual.txt:4186 +#: user-manual.txt:4349 msgid "+<dev>+ is the RFCOMM device file, +rfcomm0+" msgstr "" #. type: Plain text -#: user-manual.txt:4187 +#: user-manual.txt:4350 msgid "+<bdaddr>+ is the dive computer's MAC address, +00:11:22:33:44:55+" msgstr "" #. type: Plain text -#: user-manual.txt:4188 +#: user-manual.txt:4351 msgid "+[channel]+ is the dive computer's Bluetooth channel we need to connect to." msgstr "" #. type: Plain text -#: user-manual.txt:4191 +#: user-manual.txt:4354 msgid "" "If you omit 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:4193 +#: user-manual.txt:4356 msgid "_Shearwater Petrel 1_: channel 1" msgstr "" #. type: Plain text -#: user-manual.txt:4194 +#: user-manual.txt:4357 msgid "_Shearwater Petrel 2_: channel 5" msgstr "" #. type: Plain text -#: user-manual.txt:4195 +#: user-manual.txt:4358 msgid "_Shearwater Nerd_: channel 5" msgstr "" #. type: Plain text -#: user-manual.txt:4196 +#: user-manual.txt:4359 msgid "_Heinrichs-Weikamp OSTC Sport_: channel 1" msgstr "" #. type: Plain text -#: user-manual.txt:4198 +#: user-manual.txt:4361 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:4200 +#: user-manual.txt:4363 #, no-wrap msgid "" "\tsudo rfcomm -i hci0 connect rfcomm0 00:11:22:33:44:55 5 (enter a password, " @@ -8794,12 +9209,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4202 +#: user-manual.txt:4365 msgid "This gives the response:" msgstr "" #. type: Plain text -#: user-manual.txt:4205 +#: user-manual.txt:4368 #, no-wrap msgid "" "\tConnected /dev/rfcomm0 to 00:11:22:33:44:55 on channel 5\n" @@ -8807,14 +9222,14 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4207 +#: user-manual.txt:4370 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:4211 +#: user-manual.txt:4374 #, no-wrap msgid "" "\tsudo rfcomm -i hci0 connect rfcomm0 00:11:22:33:44:55 (enter a password, " @@ -8824,7 +9239,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4215 +#: user-manual.txt:4378 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 " @@ -8833,7 +9248,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4225 +#: user-manual.txt:4388 #, no-wrap msgid "" "\tsdptool -i hci0 records 00:11:22:33:44:55\n" @@ -8848,7 +9263,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4228 +#: user-manual.txt:4391 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 " @@ -8856,7 +9271,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4231 +#: user-manual.txt:4394 msgid "" "After establishing the RFCOMM connection and while the dive computer's " "upload mode countdown is still running, go to_Subsurface_, select " @@ -8866,25 +9281,25 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:4237 +#: user-manual.txt:4400 #, no-wrap msgid "APPENDIX B: Dive Computer specific information for importing dive data." msgstr "" #. type: Title === -#: user-manual.txt:4240 +#: user-manual.txt:4403 #, no-wrap msgid "Importing from Uemis Zurich" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4242 +#: user-manual.txt:4405 #, no-wrap msgid "images/icons/iumis.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4258 +#: user-manual.txt:4421 msgid "" "_Subsurface_ downloads the information stored on the SDA (the built-in file " "system of the Uemis) including information about dive spots and " @@ -8901,7 +9316,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4273 +#: user-manual.txt:4436 msgid "" "After selecting the above device name, download the dives from the Uemis " "Zurich. One technical issue with the Uemis Zurich download implementation " @@ -8918,19 +9333,19 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4275 +#: user-manual.txt:4438 #, no-wrap msgid "Importing from Uwatec Galileo" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4277 +#: user-manual.txt:4440 #, no-wrap msgid "images/icons/Galileo.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4292 +#: user-manual.txt:4455 msgid "" "The Uwatec Galileo dive computers use infra red (IrDA) communication between " "the dive computer and Subsurface. The Uwatec hardware uses a USB dongle " @@ -8946,14 +9361,14 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4295 +#: user-manual.txt:4458 msgid "" "After executing this command, Subsurface will recognize the Galileo dive " "computer and download dive information." msgstr "" #. type: Plain text -#: user-manual.txt:4301 +#: user-manual.txt:4464 msgid "" "Under Windows, a similar situation exists. Drivers for the MCS7780 are " "available from some Internet web sites e.g. " @@ -8964,26 +9379,26 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4304 +#: user-manual.txt:4467 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:4306 +#: user-manual.txt:4469 #, no-wrap msgid "Importing from Heinrichs Weikamp DR5" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4308 +#: user-manual.txt:4471 #, no-wrap msgid "images/icons/HW_DR5.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4318 +#: user-manual.txt:4481 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. " @@ -8996,19 +9411,19 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4321 +#: user-manual.txt:4484 #, no-wrap msgid "Importing from xDEEP BLACK" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4323 +#: user-manual.txt:4486 #, no-wrap msgid "images/icons/HW_xdeepblack.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4332 +#: user-manual.txt:4495 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 " @@ -9022,19 +9437,19 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4334 +#: user-manual.txt:4497 #, no-wrap msgid "Importing from Shearwater Predator/Petrel/Nerd using Bluetooth" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4336 +#: user-manual.txt:4499 #, no-wrap msgid "images/icons/predator.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4339 +#: user-manual.txt:4502 msgid "" "Specific instructions for downloading dives using Bluetooth are given in the " "section above, <<S_Bluetooth,_Connecting Subsurface to a Bluetooth-enabled " @@ -9042,19 +9457,19 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4341 +#: user-manual.txt:4504 #, no-wrap msgid "Importing from Poseidon MkVI Discovery" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4343 +#: user-manual.txt:4506 #, no-wrap msgid "images/MkVI.jpeg" msgstr "" #. type: Plain text -#: user-manual.txt:4351 +#: user-manual.txt:4514 msgid "" "Download of dive logs from the MkVI is performed using a custom " "communications adapter and the _Poseidon PC Configuration Software_, " @@ -9066,45 +9481,45 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4354 +#: user-manual.txt:4517 msgid "" "Setup configuration for the dive and key dive parameters (file with a .txt " "extension)" msgstr "" #. type: Plain text -#: user-manual.txt:4355 +#: user-manual.txt:4518 msgid "Dive log details (file with a .csv extension)" msgstr "" #. type: Plain text -#: user-manual.txt:4357 +#: user-manual.txt:4520 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:4359 +#: user-manual.txt:4522 msgid "" "_Subsurface_ accesses the .txt and the .csv files to get dive log " "information." msgstr "" #. type: Title === -#: user-manual.txt:4361 +#: user-manual.txt:4524 #, no-wrap msgid "Importing from APD Inspiration/Evolution CCR" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4363 +#: user-manual.txt:4526 #, no-wrap msgid "images/APDComputer.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4371 +#: user-manual.txt:4534 msgid "" "The dive logs of an APD Inspiration or similar CCR dive computer are " "downloaded using a communications adapter and _AP Communicator_, obtained " @@ -9116,55 +9531,55 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4373 +#: user-manual.txt:4536 msgid "Download the dive using _AP Communicator_." msgstr "" #. type: Plain text -#: user-manual.txt:4374 +#: user-manual.txt:4537 msgid "Open a dive within the _AP Log Viewer_." msgstr "" #. type: Plain text -#: user-manual.txt:4375 +#: user-manual.txt:4538 msgid "Select the tab at the top of the screen, entitled \"_Data_\"." msgstr "" #. type: Plain text -#: user-manual.txt:4376 +#: user-manual.txt:4539 msgid "" "With the raw dive log data show on the screen, click on \"_Copy to " "Clipboard_\"." msgstr "" #. type: Plain text -#: user-manual.txt:4377 +#: user-manual.txt:4540 msgid "Open a text editor, e.g. Notepad (Windows) or TextWrangler (Mac)." msgstr "" #. type: Plain text -#: user-manual.txt:4379 +#: user-manual.txt:4542 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:4380 +#: user-manual.txt:4543 msgid "" "Within _Subsurface_, select _Import -> Import log files_ to open the " "xref:Unified_import[universal import dialogue]." msgstr "" #. type: Plain text -#: user-manual.txt:4381 +#: user-manual.txt:4544 msgid "" "In the dropdown list towards the bottom right of the dialogue (labeled " "'Filter:'), select \"APD log viewer\"." msgstr "" #. type: Plain text -#: user-manual.txt:4385 +#: user-manual.txt:4548 #, no-wrap msgid "" "On the list of file names select the _.apd_ file created. An import\n" @@ -9174,13 +9589,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:4386 +#: user-manual.txt:4549 #, no-wrap msgid "images/APD_CSVimportF22.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4394 +#: user-manual.txt:4557 msgid "" "The top left hand dropdown box in the import panel lets you select the APD " "dive computer for which the dive log needs to be imported. The default it is " @@ -9192,12 +9607,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4395 +#: user-manual.txt:4558 msgid "Click the _Ok_ button at the bottom of the import panel." msgstr "" #. type: Plain text -#: user-manual.txt:4400 +#: user-manual.txt:4563 msgid "" "The APD dive log will appear within _Subsurface_. The dive computer- " "generated ceiling provided by the Inspiration can be viewed by selecting the " @@ -9207,13 +9622,13 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:4401 +#: user-manual.txt:4564 #, no-wrap msgid "APPENDIX C: Exporting Dive log information from external dive log software." msgstr "" #. type: Plain text -#: user-manual.txt:4410 +#: user-manual.txt:4573 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, " @@ -9223,22 +9638,22 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4412 +#: user-manual.txt:4575 msgid "Export the foreign dive log data to format that is accessible from" msgstr "" #. type: Plain text -#: user-manual.txt:4413 +#: user-manual.txt:4576 msgid "_Subsurface_." msgstr "" #. type: Plain text -#: user-manual.txt:4414 +#: user-manual.txt:4577 msgid "Import the accessible dive log data into _Subsurface_." msgstr "" #. type: Plain text -#: user-manual.txt:4418 +#: user-manual.txt:4581 msgid "" "This appendix provides some information about approaches to export dive log " "data from foreign dive log software. The procedures below mostly apply to " @@ -9246,19 +9661,19 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4420 +#: user-manual.txt:4583 #, no-wrap msgid "Exporting from *Suunto Divemanager (DM3, DM4 or DM5)*" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4421 +#: user-manual.txt:4584 #, no-wrap msgid "images/icons/suuntologo.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4428 +#: user-manual.txt:4591 msgid "" "DiveManager is a Windows application for Suunto dive computers. Divemanager " "3 (DM3) is an older version of the Suunto software. More recent Suunto dive " @@ -9268,64 +9683,64 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4430 +#: user-manual.txt:4593 #, no-wrap msgid "*Divemanager 3 (DM3):*\n" msgstr "" #. type: Plain text -#: user-manual.txt:4432 +#: user-manual.txt:4595 msgid "Start 'Suunto Divemanager 3' and log in with the name containing the logs" msgstr "" #. type: Plain text -#: user-manual.txt:4433 +#: user-manual.txt:4596 msgid "Do not start the import wizard to import dives from the dive computer." msgstr "" #. type: Plain text -#: user-manual.txt:4435 +#: user-manual.txt:4598 msgid "" "In the navigation tree on the left side of the program-window, select the " "appropriate dives." msgstr "" #. type: Plain text -#: user-manual.txt:4436 +#: user-manual.txt:4599 msgid "Within the list of dives, select the dives you would like to import later:" msgstr "" #. type: Plain text -#: user-manual.txt:4437 +#: user-manual.txt:4600 msgid "To select certain dives: hold 'ctrl' and click the dive" msgstr "" #. type: Plain text -#: user-manual.txt:4439 +#: user-manual.txt:4602 msgid "" "To select all dives: Select the first dive, hold down shift and select the " "last dive" msgstr "" #. type: Plain text -#: user-manual.txt:4440 +#: user-manual.txt:4603 msgid "With the dives marked, use the program menu _File -> Export_" msgstr "" #. type: Plain text -#: user-manual.txt:4441 +#: user-manual.txt:4604 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:4442 +#: user-manual.txt:4605 msgid "Click the browse button next to the field Export Path" msgstr "" #. type: Plain text -#: user-manual.txt:4444 +#: user-manual.txt:4607 #, no-wrap msgid "" "** A file-manager like window pops up\n" @@ -9333,13 +9748,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4445 +#: user-manual.txt:4608 #, no-wrap msgid "Divelog.SDE file\n" msgstr "" #. type: Plain text -#: user-manual.txt:4447 +#: user-manual.txt:4610 #, no-wrap msgid "" "** Optionally change the name of the file for saving\n" @@ -9347,25 +9762,25 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4448 +#: user-manual.txt:4611 #, no-wrap msgid "Back in the Export pop-up, press the button 'Export'\n" msgstr "" #. type: Plain text -#: user-manual.txt:4449 +#: user-manual.txt:4612 #, no-wrap msgid "The dives are now exported to the file Divelog.SDE.\n" msgstr "" #. type: Plain text -#: user-manual.txt:4451 +#: user-manual.txt:4614 #, no-wrap msgid "*Divemanager 4 (DM4) and Divemanager 5 (DM5):*\n" msgstr "" #. type: Plain text -#: user-manual.txt:4456 +#: user-manual.txt:4619 msgid "" "DM4 and DM5 use identical mechanisms for exporting dive logs. To export a " "divelog from Divemanager you need to locate the DM4/DM5 database where the " @@ -9374,81 +9789,81 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4458 +#: user-manual.txt:4621 msgid "Locating the Suunto DM4 (or DM5) database:" msgstr "" #. type: Plain text -#: user-manual.txt:4460 user-manual.txt:4469 +#: user-manual.txt:4623 user-manual.txt:4632 msgid "Start Suunto DM4/DM5" msgstr "" #. type: Plain text -#: user-manual.txt:4461 +#: user-manual.txt:4624 msgid "Select 'Help -> About'" msgstr "" #. type: Plain text -#: user-manual.txt:4462 +#: user-manual.txt:4625 msgid "Click 'Copy' after text 'Copy log folder path to clipboard'" msgstr "" #. type: Plain text -#: user-manual.txt:4463 +#: user-manual.txt:4626 msgid "Open Windows Explorer" msgstr "" #. type: Plain text -#: user-manual.txt:4464 +#: user-manual.txt:4627 msgid "Paste the address to the path box at the top of the File Explorer" msgstr "" #. type: Plain text -#: user-manual.txt:4465 +#: user-manual.txt:4628 msgid "The database is called DM4.db or DM5.db" msgstr "" #. type: Plain text -#: user-manual.txt:4467 +#: user-manual.txt:4630 msgid "Making a backup copy of the Suunto DM4/DM5 database:" msgstr "" #. type: Plain text -#: user-manual.txt:4470 +#: user-manual.txt:4633 msgid "Select 'File - Create backup'" msgstr "" #. type: Plain text -#: user-manual.txt:4472 +#: user-manual.txt:4635 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:4473 +#: user-manual.txt:4636 msgid "Click 'Save'" msgstr "" #. type: Plain text -#: user-manual.txt:4474 +#: user-manual.txt:4637 msgid "The dives are now exported to the file DM4.bak (or DM5.bak)" msgstr "" #. type: Title === -#: user-manual.txt:4476 +#: user-manual.txt:4639 #, no-wrap msgid "Exporting from Atomic Logbook" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4479 +#: user-manual.txt:4642 #, no-wrap msgid "images/icons/atomiclogo.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4486 +#: user-manual.txt:4649 msgid "" "Atomic Logbook is Windows software by Atomic Aquatics. It allows downloading " "of dive information from Cobalt and Cobalt 2 dive computers. The divelog is " @@ -9458,19 +9873,19 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4488 +#: user-manual.txt:4651 #, no-wrap msgid "Exporting from Mares Dive Organiser V2.1" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4491 +#: user-manual.txt:4654 #, no-wrap msgid "images/icons/mareslogo.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4499 +#: user-manual.txt:4662 msgid "" "Mares Dive Organizer is a Windows application. The dive log is kept as a " "Microsoft SQL Compact Edition database with a '.sdf' filename extension. The " @@ -9481,7 +9896,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4504 +#: user-manual.txt:4667 msgid "" "Within Dive Organizer, select _Database -> Backup_ from the main menu and " "back up the database to the desk top. This creates a zipped file " @@ -9489,36 +9904,36 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4507 +#: user-manual.txt:4670 msgid "" "Rename the file to DiveOrganizerxxxxx.zip. Inside the zipped directory is a " "file _DiveOrganizer.sdf_." msgstr "" #. type: Plain text -#: user-manual.txt:4508 +#: user-manual.txt:4671 msgid "Extract the _.sdf_ file from the zipped folder to your Desktop." msgstr "" #. type: Plain text -#: user-manual.txt:4509 +#: user-manual.txt:4672 msgid "The password for accessing the .zip file is _mares_." msgstr "" #. type: Title === -#: user-manual.txt:4511 +#: user-manual.txt:4674 #, no-wrap msgid "Exporting from *DivingLog 5.0 and 6.0*" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4513 +#: user-manual.txt:4676 #, no-wrap msgid "images/icons/divingloglogo.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4520 +#: user-manual.txt:4683 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 " @@ -9528,37 +9943,37 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4522 +#: user-manual.txt:4685 msgid "To transfer all files from DivingLog to Subsurface:" msgstr "" #. type: Plain text -#: user-manual.txt:4524 +#: user-manual.txt:4687 msgid "In DivingLog open the 'File -> Export -> SQLite' menu" msgstr "" #. type: Plain text -#: user-manual.txt:4525 +#: user-manual.txt:4688 msgid "Select 'Settings' button" msgstr "" #. type: Plain text -#: user-manual.txt:4526 +#: user-manual.txt:4689 msgid "Set the 'RTF2Plaintext' to 'true'" msgstr "" #. type: Plain text -#: user-manual.txt:4527 +#: user-manual.txt:4690 msgid "Close the Settings dialog" msgstr "" #. type: Plain text -#: user-manual.txt:4528 +#: user-manual.txt:4691 msgid "Click 'Export' button and select the filename" msgstr "" #. type: Plain text -#: user-manual.txt:4532 +#: user-manual.txt:4695 msgid "" "Once this is done, open the saved database file with Subsurface and the " "dives are automatically converted to Subsurface’s own format. Last step to " @@ -9566,13 +9981,13 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:4533 +#: user-manual.txt:4696 #, no-wrap msgid "APPENDIX D: Exporting a spreadsheet to CSV format" msgstr "" #. type: Plain text -#: user-manual.txt:4543 +#: user-manual.txt:4706 msgid "" "Many divers keep a dive log in some form of digital file, commonly a " "spreadsheet with various fields of information. These logs can be easily " @@ -9584,7 +9999,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4549 +#: user-manual.txt:4712 msgid "" "Organize the diving data in the spreadsheet, so the first row contains the " "names (or titles) of each column and the information for each dive is stored " @@ -9594,40 +10009,40 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4551 +#: user-manual.txt:4714 msgid "Date: use one of the following formats: yyyy-mm-dd, dd.mm.yyyy, mm/dd/yyyy" msgstr "" #. type: Plain text -#: user-manual.txt:4552 +#: user-manual.txt:4715 msgid "Duration: the format should be minutes:seconds." msgstr "" #. type: Plain text -#: user-manual.txt:4553 +#: user-manual.txt:4716 msgid "" "Unit system: only one unit system should be used (no mix of imperial and " "metric units)" msgstr "" #. type: Plain text -#: user-manual.txt:4554 +#: user-manual.txt:4717 msgid "Tags and buddies: values should be separated using a comma." msgstr "" #. type: Plain text -#: user-manual.txt:4555 +#: user-manual.txt:4718 msgid "GPS position: use decimal degrees, e.g. 30.22496 30.821798" msgstr "" #. type: Title === -#: user-manual.txt:4555 +#: user-manual.txt:4719 #, no-wrap msgid "_LibreOffice Calc_ and _OpenOffice Calc_" msgstr "" #. type: Plain text -#: user-manual.txt:4559 +#: user-manual.txt:4723 msgid "" "These are open source spreadsheet applications forming parts of larger open " "source office suite applications. The user interaction with _LibreOffice_ " @@ -9638,13 +10053,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:4560 +#: user-manual.txt:4724 #, no-wrap msgid "images/LOffice_spreadsheetdata.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4563 +#: user-manual.txt:4727 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 " @@ -9652,13 +10067,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:4564 +#: user-manual.txt:4728 #, no-wrap msgid "images/LOffice_save_as_options.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4567 +#: user-manual.txt:4731 msgid "" "After selecting _Save_, select the appropriate field delimiter (choose _Tab_ " "to prevent conflicts with the comma when using this as a decimal point), " @@ -9666,13 +10081,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:4568 +#: user-manual.txt:4732 #, no-wrap msgid "images/LOffice_field_options.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4571 +#: user-manual.txt:4735 msgid "" "Double check the .CSV file by opening it with a text editor, and then import " "the dive data as explained on the section xref:S_ImportingCSVDives[Importing " @@ -9680,13 +10095,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4572 +#: user-manual.txt:4736 #, no-wrap msgid "Microsoft _Excel_" msgstr "" #. type: Plain text -#: user-manual.txt:4578 +#: user-manual.txt:4742 msgid "" "The field delimiter (called \"_list separator_\" in Microsoft manuals) is " "not accessible from within _Excel_ and needs to be set through the " @@ -9697,67 +10112,67 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4580 +#: user-manual.txt:4744 msgid "" "In Microsoft Windows, click the *Start* button, then select _Control Panel_ " "from the list on the right-hand side." msgstr "" #. type: Plain text -#: user-manual.txt:4581 +#: user-manual.txt:4745 msgid "Open the _Regional and Language Options_ dialog box." msgstr "" #. type: Plain text -#: user-manual.txt:4583 +#: user-manual.txt:4747 msgid "" "Do the following: ** In Windows 7, click the _Formats_ tab, and then click " "_Customize this format_." msgstr "" #. type: Plain text -#: user-manual.txt:4584 +#: user-manual.txt:4748 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:4585 +#: user-manual.txt:4749 msgid "Click _OK_ twice." msgstr "" #. type: Plain text -#: user-manual.txt:4587 +#: user-manual.txt:4751 msgid "Below is an image of the _Control Panel_:" msgstr "" #. type: Target for macro image -#: user-manual.txt:4588 +#: user-manual.txt:4752 #, no-wrap msgid "images/Win_SaveCSV2.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4591 +#: user-manual.txt:4755 msgid "To export the dive log in CSV format:" msgstr "" #. type: Plain text -#: user-manual.txt:4593 +#: user-manual.txt:4757 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:4594 +#: user-manual.txt:4758 #, no-wrap msgid "images/Win_SaveCSV1.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4600 +#: user-manual.txt:4764 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 " @@ -9767,13 +10182,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:4601 +#: user-manual.txt:4765 #, no-wrap msgid "images/Win_SaveCSV3.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4607 +#: user-manual.txt:4771 msgid "" "Select the _Save_ button. The CSV-formatted file is saved into the folder " "that was selected. You can double check the .CSV file by opening it with a " @@ -9782,13 +10197,13 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:4608 +#: user-manual.txt:4772 #, no-wrap msgid "APPENDIX E: Writing a custom print template" msgstr "" #. type: Plain text -#: user-manual.txt:4613 +#: user-manual.txt:4777 msgid "" "_Subsurface_ has a way to create or modify templates for printing dive logs " "to produce customized printouts of them. Templates written in HTML, as well " @@ -9797,12 +10212,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4615 +#: user-manual.txt:4779 msgid "Templates are accessed using the print dialogue (see image *B* below)." msgstr "" #. type: Plain text -#: user-manual.txt:4623 +#: user-manual.txt:4787 msgid "" "The buttons under the _Template_ dropdown box lets you _Edit_, _Delete_, " "_Import_ and _Export_ templates (see image *A* above). New or modified " @@ -9814,18 +10229,18 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4625 +#: user-manual.txt:4789 msgid "The Edit Panel has three tabs:" msgstr "" #. type: Target for macro image -#: user-manual.txt:4626 +#: user-manual.txt:4790 #, no-wrap msgid "images/Template1_f22.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4630 +#: user-manual.txt:4794 msgid "" "The _Style_ tab (image *A* above) controls the font, line spacing and color " "template used for printing the dive log. The style attributes are " @@ -9833,7 +10248,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4634 +#: user-manual.txt:4798 msgid "" "The _Colors_ tab (image *B* above) allows editing the colors used for " "printing the dive log. The colors are highly customizable: the _Edit_ " @@ -9842,7 +10257,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4643 +#: user-manual.txt:4807 msgid "" "The _Template_ tab of the Edit Panel (see image below) allows creating a " "template using HTML as well as a few Grantlee programming " @@ -9858,13 +10273,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:4644 +#: user-manual.txt:4808 #, no-wrap msgid "images/Template2_f22.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4649 +#: user-manual.txt:4813 msgid "" "You can adapt any of the existing templates and save it to the dive log " "directory. The standard templates (e.g. One dive, Six dives, Table) can be " @@ -9873,33 +10288,33 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4651 +#: user-manual.txt:4815 msgid "" "To write a custom template, the following elements must exist so the " "template will be correctly handled and rendered." msgstr "" #. type: Title === -#: user-manual.txt:4652 +#: user-manual.txt:4816 #, no-wrap msgid "Main dive loop" msgstr "" #. type: Plain text -#: user-manual.txt:4654 +#: user-manual.txt:4818 msgid "" "_Subsurface_ exports a dive list called (*dives*) to the _Grantlee_ back " "end. It is possible to iterate over the list as follows:" msgstr "" #. type: Block title -#: user-manual.txt:4654 user-manual.txt:4719 user-manual.txt:4736 +#: user-manual.txt:4818 user-manual.txt:4883 user-manual.txt:4900 #, no-wrap msgid "template.html" msgstr "" #. type: delimited block . -#: user-manual.txt:4659 +#: user-manual.txt:4823 #, no-wrap msgid "" "\t{% for dive in dives %}\n" @@ -9908,13 +10323,13 @@ msgid "" msgstr "" #. type: Block title -#: user-manual.txt:4661 user-manual.txt:4724 user-manual.txt:4743 +#: user-manual.txt:4825 user-manual.txt:4888 user-manual.txt:4907 #, no-wrap msgid "output.html" msgstr "" #. type: delimited block . -#: user-manual.txt:4666 +#: user-manual.txt:4830 #, no-wrap msgid "" "\t<h1> 1 </h1>\n" @@ -9923,25 +10338,25 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4669 +#: user-manual.txt:4833 msgid "" "Additional information about _Grantlee_ can be found " "http://www.grantlee.org/apidox/for_themers.html[here]" msgstr "" #. type: Title === -#: user-manual.txt:4670 +#: user-manual.txt:4834 #, no-wrap msgid "Grantlee exported variables" msgstr "" #. type: Plain text -#: user-manual.txt:4672 +#: user-manual.txt:4836 msgid "Only a subset of the dive data is exported:" msgstr "" #. type: delimited block | -#: user-manual.txt:4701 +#: user-manual.txt:4865 #, no-wrap msgid "" "|*Name*|*Description*\n" @@ -9975,7 +10390,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4705 +#: user-manual.txt:4869 msgid "" "_Subsurface_ also exports *template_options* data. This data must be used as " "_CSS_ values to provide a dynamically editable template. The exported data " @@ -9983,7 +10398,7 @@ msgid "" msgstr "" #. type: delimited block | -#: user-manual.txt:4717 +#: user-manual.txt:4881 #, no-wrap msgid "" "|*Name*|*Description*\n" @@ -10002,26 +10417,26 @@ msgid "" msgstr "" #. type: delimited block . -#: user-manual.txt:4722 +#: user-manual.txt:4886 #, no-wrap msgid "\tborder-width: {{ template_options.borderwidth }}px;\n" msgstr "" #. type: delimited block . -#: user-manual.txt:4727 +#: user-manual.txt:4891 #, no-wrap msgid "\tborder-width: 3px;\n" msgstr "" #. type: Plain text -#: user-manual.txt:4730 +#: user-manual.txt:4894 msgid "" "Another variable that _Subsurface_ exports is *print_options*. This variable " "contains a single member:" msgstr "" #. type: delimited block | -#: user-manual.txt:4733 +#: user-manual.txt:4897 #, no-wrap msgid "" "|*Name*|*Description*\n" @@ -10030,7 +10445,7 @@ msgid "" msgstr "" #. type: delimited block . -#: user-manual.txt:4741 +#: user-manual.txt:4905 #, no-wrap msgid "" "\tbody {\n" @@ -10039,7 +10454,7 @@ msgid "" msgstr "" #. type: delimited block . -#: user-manual.txt:4748 +#: user-manual.txt:4912 #, no-wrap msgid "" "\tbody {\n" @@ -10048,13 +10463,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4750 +#: user-manual.txt:4914 #, no-wrap msgid "Defined CSS selectors" msgstr "" #. type: Plain text -#: user-manual.txt:4753 +#: user-manual.txt:4917 msgid "" "As the dive profile is placed after rendering, _Subsurface_ uses special " "_CSS_ selectors to search in the HTML output. The _CSS_ selectors in the " @@ -10062,7 +10477,7 @@ msgid "" msgstr "" #. type: delimited block | -#: user-manual.txt:4760 +#: user-manual.txt:4924 #, no-wrap msgid "" "|*Selector*|*Type*|*Description*\n" @@ -10075,20 +10490,20 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4763 +#: user-manual.txt:4927 msgid "" "Rendering dive profiles is not supported for flow layout templates (when " "data-numberofdives = 0)." msgstr "" #. type: Title === -#: user-manual.txt:4764 +#: user-manual.txt:4928 #, no-wrap msgid "Special attributes" msgstr "" #. type: Plain text -#: user-manual.txt:4768 +#: user-manual.txt:4932 msgid "" "There are two ways of rendering- either rendering a specific number of dives " "in each page or make _Subsurface_ try to fit as many dives as possible into " @@ -10096,55 +10511,55 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4770 +#: user-manual.txt:4934 msgid "" "The *data-numberofdives* data attribute is added to the body tag to set the " "rendering mode." msgstr "" #. type: Plain text -#: user-manual.txt:4772 +#: user-manual.txt:4936 msgid "render 6 dives per page:" msgstr "" #. type: delimited block . -#: user-manual.txt:4775 +#: user-manual.txt:4939 #, no-wrap msgid "\t<body data-numberofdives = 6>\n" msgstr "" #. type: Plain text -#: user-manual.txt:4778 +#: user-manual.txt:4942 msgid "render as much dives as possible:" msgstr "" #. type: delimited block . -#: user-manual.txt:4781 +#: user-manual.txt:4945 #, no-wrap msgid "\t<body data-numberofdives = 0>\n" msgstr "" #. type: Plain text -#: user-manual.txt:4784 +#: user-manual.txt:4948 msgid "" "All CSS units should be in relative lengths only, to support printing on any " "page size." msgstr "" #. type: Title == -#: user-manual.txt:4785 +#: user-manual.txt:4949 #, no-wrap msgid "APPENDIX F: FAQs." msgstr "" #. type: Title === -#: user-manual.txt:4787 +#: user-manual.txt:4951 #, no-wrap msgid "Subsurface appears to miscalculate gas consumption and SAC" msgstr "" #. type: Plain text -#: user-manual.txt:4791 +#: user-manual.txt:4955 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_ " @@ -10152,7 +10567,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4797 +#: user-manual.txt:4961 msgid "" "'Answer': Not really. What happens is that _Subsurface_ actually calculates " "gas consumption differently - and better - than you expect. In particular, " @@ -10162,7 +10577,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4803 +#: user-manual.txt:4967 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 " @@ -10172,12 +10587,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4805 +#: user-manual.txt:4969 msgid "+consumption = (amount_of_air_at_beginning - amount_of_air_at_end)+" msgstr "" #. type: Plain text -#: user-manual.txt:4811 +#: user-manual.txt:4975 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 " @@ -10188,12 +10603,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4813 +#: user-manual.txt:4977 msgid "+12.2*((220-100)/1.013)+" msgstr "" #. type: Plain text -#: user-manual.txt:4818 +#: user-manual.txt:4982 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 " @@ -10203,7 +10618,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4824 +#: user-manual.txt:4988 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 " @@ -10214,7 +10629,7 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4825 +#: user-manual.txt:4989 #, no-wrap msgid "" "Some dive profiles have time discrepancies with the recorded samples from my " @@ -10222,7 +10637,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4829 +#: user-manual.txt:4993 msgid "" "_Subsurface_ ends up ignoring surface time for many things (average depth, " "divetime, SAC, etc). 'Question': Why do dive durations in my dive computer " @@ -10230,7 +10645,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4837 +#: user-manual.txt:5001 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 " @@ -10244,13 +10659,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4838 +#: user-manual.txt:5002 #, no-wrap msgid "Some dive profiles are missing from the download" msgstr "" #. type: Plain text -#: user-manual.txt:4852 +#: user-manual.txt:5016 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 " @@ -10265,7 +10680,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4856 +#: user-manual.txt:5020 msgid "" "If you have downloaded your dives to different dive logging software before " "they were overwritten, there is a good chance that Subsurface can import " diff --git a/Documentation/fr/po/subsurface-user-manual.fr.po b/Documentation/fr/po/subsurface-user-manual.fr.po index 72df302bf..a11d86a49 100644 --- a/Documentation/fr/po/subsurface-user-manual.fr.po +++ b/Documentation/fr/po/subsurface-user-manual.fr.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: subsurface@subsurface-divelog.org\n" -"POT-Creation-Date: 2017-10-11 10:20+0200\n" -"PO-Revision-Date: 2017-10-11 10:28+0100\n" +"POT-Creation-Date: 2017-10-20 22:41+0200\n" +"PO-Revision-Date: 2017-10-20 22:56+0100\n" "Last-Translator: Guillaume GARDET <guillaume.gardet@free.fr>\n" "Language-Team: French <kde-i18n-doc@kde.org>\n" "Language: fr\n" @@ -36,22 +36,18 @@ msgstr "[big]#MANUEL UTILISATEUR#" #: user-manual.txt:21 #, no-wrap msgid "" -"*Manual authors*: Willem Ferguson, Jacco van Koll, Dirk Hohndel, Reinout" -" Hoornweg,\n" -"Linus Torvalds, Miika Turkia, Amit Chaudhuri, Jan Schubert, Salvador Cuñat," -" Pedro Neves,\n" +"*Manual authors*: Willem Ferguson, Jacco van Koll, Dirk Hohndel, Reinout Hoornweg,\n" +"Linus Torvalds, Miika Turkia, Amit Chaudhuri, Jan Schubert, Salvador Cuñat, Pedro Neves,\n" "Stefan Fuchs\n" msgstr "" -"*Auteurs du manuel* : Willem Ferguson, Jacco van Koll, Dirk Hohndel, Reinout" -" Hoornweg,\n" -"Linus Torvalds, Miika Turkia, Amit Chaudhuri, Jan Schubert, Salvador Cuñat," -" Pedro Neves,\n" +"*Auteurs du manuel* : Willem Ferguson, Jacco van Koll, Dirk Hohndel, Reinout Hoornweg,\n" +"Linus Torvalds, Miika Turkia, Amit Chaudhuri, Jan Schubert, Salvador Cuñat, Pedro Neves,\n" "Stefan Fuchs\n" #. type: Plain text #: user-manual.txt:23 -msgid "[blue]#_Version 4.6, March 2017_#" -msgstr "[blue]#_Version 4.6, mars 2017_#" +msgid "[blue]#_Version 4.7, October 2017_#" +msgstr "[blue]#_Version 4.7, octobre 2017_#" #. type: Plain text #: user-manual.txt:28 @@ -435,9 +431,7 @@ msgstr "" #: user-manual.txt:159 #, no-wrap msgid "*All*: show all four of the panels as in the screenshot above.\n" -msgstr "" -"*Tout* : affiche les quatre panneaux tels que sur la capture d'écran" -" ci-dessus.\n" +msgstr "*Tout* : affiche les quatre panneaux tels que sur la capture d'écran ci-dessus.\n" #. type: Plain text #: user-manual.txt:161 @@ -449,9 +443,7 @@ msgstr "*Liste des plongées* : affiche uniquement la liste des plongées.\n" #: user-manual.txt:163 #, no-wrap msgid "*Profile*: Show only the Dive Profile of the selected dive.\n" -msgstr "" -"*Profil* : affiche uniquement le profile de plongée de la plongée" -" sélectionnée.\n" +msgstr "*Profil* : affiche uniquement le profile de plongée de la plongée sélectionnée.\n" #. type: Plain text #: user-manual.txt:166 @@ -460,17 +452,14 @@ msgid "" "*Info*: Show only the Notes about the last selected dive and statistics for\n" "all highlighted dives.\n" msgstr "" -"*Info* : affiche uniquement les notes de plongées de la dernière plongée" -" sélectionnée et les statistiques pour\n" +"*Info* : affiche uniquement les notes de plongées de la dernière plongée sélectionnée et les statistiques pour\n" "toutes les plongées mises en surbrillance.\n" #. type: Plain text #: user-manual.txt:168 #, no-wrap msgid "*Globe*: Show only the world map, centered on the last selected dive.\n" -msgstr "" -"*Globe* : affiche uniquement la carte mondiale, centrée sur la dernière" -" plongée sélectionnée.\n" +msgstr "*Globe* : affiche uniquement la carte mondiale, centrée sur la dernière plongée sélectionnée.\n" #. type: Plain text #: user-manual.txt:173 @@ -695,7 +684,7 @@ msgstr "" "les panneau sous Notes et Équipement en *Mode édition*." #. type: Target for macro image -#: user-manual.txt:236 user-manual.txt:802 +#: user-manual.txt:236 user-manual.txt:834 #, no-wrap msgid "images/BlueEditBar_f22.jpg" msgstr "images/BlueEditBar_f22.jpg" @@ -843,9 +832,7 @@ msgstr "" #: user-manual.txt:296 #, no-wrap msgid "Importing new dive information from a Dive Computer" -msgstr "" -"Importer de nouvelles informations de plongée à partir de l'ordinateur de" -" plongée" +msgstr "Importer de nouvelles informations de plongée à partir de l'ordinateur de plongée" #. type: Title ==== #: user-manual.txt:298 @@ -874,8 +861,8 @@ msgstr "" "computers/[Ordinateurs de plongée supportés]." #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:309 user-manual.txt:677 user-manual.txt:1103 -#: user-manual.txt:3398 +#: user-manual.txt:309 user-manual.txt:692 user-manual.txt:1137 +#: user-manual.txt:3493 user-manual.txt:3855 #, no-wrap msgid "images/icons/warning2.png" msgstr "images/icons/warning2.png" @@ -894,7 +881,7 @@ msgstr "" "Certains ordinateurs de plongée consomme plus d'énergie lorsqu'ils sont en " "mode Communication PC. **Ceci peut consommer une grande partie de la " "batterie de votre ordinateur de plongée**. Nous recommandons à l'utilisateur " -"de vérifier que l'ordinateur de plongée est chargé lorsqu'il est conneté au " +"de vérifier que l'ordinateur de plongée est chargé lorsqu'il est connecté au " "port USB du PC. Par exemple, certains ordinateurs Suunto et Mares ne se " "rechargent pas via la connection USB. Les utilisateurs doivent se reporter " "au manuel de leur ordinateur de plongée s'ils ne savent pas si leur " @@ -910,12 +897,10 @@ msgid "" "of the computer with _Subsurface_ that communicates with the dive computer. " "To set up this communication, users need to find the appropriate information " "to instruct _Subsurface_ where and how to import the dive information. xref:" -"_appendix_a_operating_system_specific_information_for_importing_dive_informati" -"on_from_a_dive_computer[Appendix " +"_appendix_a_operating_system_specific_information_for_importing_dive_information_from_a_dive_computer[Appendix " "A] provides the technical information to help the user achieve this for " "different operating systems and xref:" -"_appendix_b_dive_computer_specific_information_for_importing_dive_information[" -"Appendix " +"_appendix_b_dive_computer_specific_information_for_importing_dive_information[Appendix " "B] has dive computer specific information." msgstr "" "Pour importer les informations depuis un ordinateur de plongée vers un " @@ -926,12 +911,10 @@ msgstr "" "cette communication, les utilisateurs doivent trouver l'information " "appropriée pour renseigner à _Subsurface_ d'où et comment importer les " "informations de plongée. xref:" -"_appendix_a_operating_system_specific_information_for_importing_dive_informati" -"on_from_a_dive_computer[Annexe " +"_appendix_a_operating_system_specific_information_for_importing_dive_information_from_a_dive_computer[Annexe " "A] donne les informations techniques pour aider l'utilisateur à configurer " "ceci pour les différents systèmes d'exploitation et xref:" -"_appendix_b_dive_computer_specific_information_for_importing_dive_information[" -"Annexe " +"_appendix_b_dive_computer_specific_information_for_importing_dive_information[Annexe " "B] contient des informations spécifiques à chaque ordinateur de plongée." #. type: Plain text @@ -949,7 +932,7 @@ msgid "" "The interface cable should be connected to a free USB port (or the Infra-red" msgstr "" "Le cable d'interface doit être connecté à un port USB libre (ou une " -"connection infrarouge" +"connection infra-rouge" #. type: Plain text #: user-manual.txt:340 @@ -1022,11 +1005,9 @@ msgid "" "The *Device or Mount Point* drop-down list contains the USB or Bluetooth " "port name that _Subsurface_ needs in order to communicate with the dive " "computer. The appropriate port name must be selected. Consult xref:" -"_appendix_a_operating_system_specific_information_for_importing_dive_informati" -"on_from_a_dive_computer[Appendix " +"_appendix_a_operating_system_specific_information_for_importing_dive_information_from_a_dive_computer[Appendix " "A] and xref:" -"_appendix_b_dive_computer_specific_information_for_importing_dive_information[" -"Appendix " +"_appendix_b_dive_computer_specific_information_for_importing_dive_information[Appendix " "B] for technical details on how to find the appropriate port information for " "a specific dive computer and, in some cases, how to do the correct settings " "to the operating system of the computer on which _Subsurface_ is running." @@ -1034,11 +1015,9 @@ msgstr "" "Le menu déroulant *Périphérique ou point de montage* le nom du port USB ou " "Bluetooth dont _Subsurface_ a besoin pour communiquer avec l'ordinateur de " "plongée. Le port approprié doit être sélectionné. Consultez xref:" -"_appendix_a_operating_system_specific_information_for_importing_dive_informati" -"on_from_a_dive_computer[Annexe " +"_appendix_a_operating_system_specific_information_for_importing_dive_information_from_a_dive_computer[Annexe " "A] et xref:" -"_appendix_b_dive_computer_specific_information_for_importing_dive_information[" -"Annexe " +"_appendix_b_dive_computer_specific_information_for_importing_dive_information[Annexe " "B] pour obtenir des détails techniques sur la façon de trouver des " "informations sur le port approprié à chaque ordinateur de plongée et, dans " "certains cas, sur les réglages requis pour le système d'exploitation de " @@ -1163,13 +1142,12 @@ msgstr "" #: user-manual.txt:424 #, no-wrap msgid "*PROBLEMS WITH DATA DOWNLOAD FROM A DIVE COMPUTER?*\n" -msgstr "" -"*PROBLÈMES AVEC LE TÉLÉCHARGEMENT DES DONNÉS DE L'ORDINATEUR DE PLONGÉE?*\n" +msgstr "*PROBLÈMES AVEC LE TÉLÉCHARGEMENT DES DONNÉS DE L'ORDINATEUR DE PLONGÉE?*\n" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:424 user-manual.txt:531 user-manual.txt:575 -#: user-manual.txt:588 user-manual.txt:1244 user-manual.txt:1309 -#: user-manual.txt:1472 user-manual.txt:1548 user-manual.txt:1867 +#: user-manual.txt:424 user-manual.txt:546 user-manual.txt:590 +#: user-manual.txt:603 user-manual.txt:1292 user-manual.txt:1357 +#: user-manual.txt:1520 user-manual.txt:1596 user-manual.txt:1915 #, no-wrap msgid "images/icons/important.png" msgstr "images/icons/important.png" @@ -1201,22 +1179,20 @@ msgid "" "Has it worked before, or is this the first time the cable is being used? Are " "the contacts on the dive computer and the cable clean?" msgstr "" -"Le câble de connection est-il fautif? Le câble fonctionne-t-il avec d'autres " +"Le câble de connexion est-il fautif ? Le câble fonctionne-t-il avec d'autres " "logiciels? A-t-il fonctionné précédemment, ou est-ce la première fois que ce " "câble est utilisé? Les contacts sur l'ordinateur de plongée et le câble sont-" -"ils propres?" +"ils propres ?" #. type: delimited block * #: user-manual.txt:441 msgid "" "Consult xref:" -"_appendix_a_operating_system_specific_information_for_importing_dive_informati" -"on_from_a_dive_computer[Appendix " +"_appendix_a_operating_system_specific_information_for_importing_dive_information_from_a_dive_computer[Appendix " "A] to be sure the correct Mount Point was specified (see above)." msgstr "" "Consultez xref:" -"_appendix_a_operating_system_specific_information_for_importing_dive_informati" -"on_from_a_dive_computer[Annexe " +"_appendix_a_operating_system_specific_information_for_importing_dive_information_from_a_dive_computer[Annexe " "A] pour être certain que le point de montage correct a été spécifié (voir ci-" "dessus)." @@ -1225,14 +1201,12 @@ msgstr "" msgid "" "On Unix-like operating systems, does the user have write permission to the " "USB port? If not, consult xref:" -"_appendix_a_operating_system_specific_information_for_importing_dive_informati" -"on_from_a_dive_computer[Appendix " +"_appendix_a_operating_system_specific_information_for_importing_dive_information_from_a_dive_computer[Appendix " "A]" msgstr "" "Sur les systèmes d'exploitation de type Unix, l'utilisateur a-t-il les " "droits d'écriture sur le port USB? Si non, consultez xref:" -"_appendix_a_operating_system_specific_information_for_importing_dive_informati" -"on_from_a_dive_computer[Annexe " +"_appendix_a_operating_system_specific_information_for_importing_dive_information_from_a_dive_computer[Annexe " "A]" #. type: delimited block * @@ -1270,19 +1244,14 @@ msgstr "" #, no-wrap msgid "" "*Important*: These check boxes are only used when problems are encountered\n" -"during the download process. Under normal circumstances they should not be" -" checked.\n" -"When checking these boxes, the user is prompted to select a folder where the" -" information will be saved. The default folder is the one in which the\n" +"during the download process. Under normal circumstances they should not be checked.\n" +"When checking these boxes, the user is prompted to select a folder where the information will be saved. The default folder is the one in which the\n" "_Subsurface_\n" "dive log is kept.\n" msgstr "" -"*Important*: ces cases à cocher ne doivent être utilisées qu'en cas de" -" problème\n" -"durant le processus de téléchargement. En temps normal, elles ne doivent pas" -" être cochées.\n" -"En cochant ces cases, l'utilisateur doit sélectionner un dossier où" -" l'information sera enregistrée. Le dossier par défaut est celui dans lequel\n" +"*Important*: ces cases à cocher ne doivent être utilisées qu'en cas de problème\n" +"durant le processus de téléchargement. En temps normal, elles ne doivent pas être cochées.\n" +"En cochant ces cases, l'utilisateur doit sélectionner un dossier où l'information sera enregistrée. Le dossier par défaut est celui dans lequel\n" "le carnet de\n" "_Subsurface_ est stocké.\n" @@ -1296,8 +1265,7 @@ msgid "" msgstr "" "*Important:* _après un téléchargement avec les cases ci-dessus\n" "cochées, aucune plongée n'est ajoutée à la\n" -"*Liste des plongées* mais deux fichiers sont créés dans le dossier" -" sélectionné précédemment_:\n" +"*Liste des plongées* mais deux fichiers sont créés dans le dossier sélectionné précédemment_:\n" #. type: delimited block * #: user-manual.txt:469 @@ -1326,32 +1294,41 @@ msgstr "" #: user-manual.txt:478 #, no-wrap msgid "Connecting _Subsurface_ to a Bluetooth-enabled dive computer" -msgstr "" -"Connection de _Subsurface_ à un ordinateur de plongée équipé de Bluetooth" +msgstr "Connexion de _Subsurface_ à un ordinateur de plongée équipé de Bluetooth" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:479 user-manual.txt:4033 +#: user-manual.txt:479 user-manual.txt:4196 #, no-wrap msgid "images/icons/bluetooth.jpg" msgstr "images/icons/bluetooth.jpg" #. type: Plain text -#: user-manual.txt:486 +#: user-manual.txt:491 msgid "" "Bluetooth is becoming a more common way of communication between dive " -"computers and _Subsurface_, for or instance, the Shearwater Petrel Mk2 and " -"the OSTC Mk3. _Subsurface_ provides a largely operating system independent " -"Bluetooth interface. Setting up _Subsurface_ for Bluetooth communication " -"requires four steps:" +"computers and _Subsurface_. _Subsurface_ provides a largely operating system " +"independent Bluetooth interface. An increasing number of dive computers use " +"Bluetooth Low Energy (BTLE) as a means of communication. However, BTLE is " +"not a standardised protocol, consequently adaptations need to be made for " +"communicating with each different dive computer model. See the link:https://" +"subsurface-divelog.org/documentation/supported-dive-computers/[list of " +"supported dive computers]. Bluetooth communication is often more reliable " +"if all Bluetooth devices seen by the _Subsurface_ computer are removed and " +"pairing with the Bluetooth dive computer is performed from afresh. The " +"Bluetooth and BTLE interfaces are under active development with respect to " +"new dive computers that use this mechanism of communication." msgstr "" -"Bluetooth devient un protocole de communication de plus en plus courant pour " -"relier des ordinateurs de plongée à _Subsurface_, par exemple le Shearwater " -"Petrel Mk2 et l'OSTC Mk3. _Subsurface_ propose une interface Bluetooth " -"largement indépendante du système d'exploitation. La configuration de " -"_Subsurface_ pour la liaison Bluetootj nécessite quatre étapes:" #. type: Plain text -#: user-manual.txt:488 +#: user-manual.txt:494 +msgid "" +"Setting up _Subsurface_ for Bluetooth communication requires four steps:" +msgstr "" +"La configuration de _Subsurface_ pour une communication Bluetooth nécessite " +"4 étapes :" + +#. type: Plain text +#: user-manual.txt:496 msgid "" "Ensure Bluetooth is activated on the host computer running _Subsurface_." msgstr "" @@ -1359,13 +1336,13 @@ msgstr "" "est actif." #. type: Plain text -#: user-manual.txt:489 +#: user-manual.txt:497 msgid "Ensure _Subsurface_ sees the Bluetooth adapter on the host computer." msgstr "" "Vérifiez que _Subsurface_ détecte l'adaptateur Bluetooth de l'ordinateur." #. type: Plain text -#: user-manual.txt:490 +#: user-manual.txt:498 msgid "" "Ensure the Bluetooth-enabled dive computer is Bluetooth-discoverable and in " "PC upload mode." @@ -1374,13 +1351,13 @@ msgstr "" "Connection PC." #. type: Plain text -#: user-manual.txt:491 +#: user-manual.txt:499 msgid "Ensure _Subsurface_ is paired with the Bluetooth-enabled dive computer." msgstr "" "Vérifiez que _Subsurface_ est jumelé avec l'ordinateur de plongée Bluetooth." #. type: Plain text -#: user-manual.txt:495 +#: user-manual.txt:503 msgid "" "Select the Download dialogue by selecting _Import -> Import from dive " "computer_ from the *Main Menu*. After checking the box labelled _\"Choose " @@ -1392,83 +1369,94 @@ msgstr "" "Bluetooth\"_, la boîte de dialogue ci-dessous apparaît." #. type: Title ===== -#: user-manual.txt:496 +#: user-manual.txt:504 #, no-wrap msgid "On Linux or MacOS:" msgstr "Sur Linux ou MacOS :" #. type: Target for macro image -#: user-manual.txt:498 +#: user-manual.txt:506 #, no-wrap msgid "images/DC_import_Bluetooth.jpg" msgstr "images/DC_import_Bluetooth.jpg" #. type: Plain text -#: user-manual.txt:529 +#: user-manual.txt:513 +msgid "" +"Although the _Subsurface_ Bluetooth interface is intended to function " +"without Bluetooth pairing at the operating system level, it is always " +"prudent to follow up initial Bluetooth pairing problems by pairing the " +"Bluetooth dive computer with the _Subsurface_ computer using the operating " +"system services of the desktop computer. Delete all existing pairings and " +"start by scanning for Bluetooth devices from an empty list (on the desktop) " +"of Bluetooth devices. Once _Subsurface_ has recognised the Bluetooth dive " +"computer, subsequent divelog downloads are likely to be simple." +msgstr "" + +#. type: Plain text +#: user-manual.txt:544 msgid "" "On the _Linux_ or _MacOS_ platforms the name of the _Subsurface_ computer " -"and its Bluetooth address are shown on the right hand side, On the left hand " -"side, if the computer has connected more than one local Bluetooth devices " -"you can use the list box to indicate which one needs to connect to " -"_Subsurface_. The power state (on/off) of the Bluetooth adapter is shown " -"below the address and can be changed by checking the _Turn on/off_ box. If " -"the Bluetooth address is not shown, then _Subsurface_ does not see the local " -"Bluetooth device. Ensure the Bluetooth driver is installed correctly on the " -"_Subsurface_ computer and check if it can be used by other Bluetooth " -"utilities like _bluetoothctl_ or _bluemoon_. This completes the first two " -"steps above. Ensure the Bluetooth-enabled dive computer is in PC-upload " -"mode and it is discoverable by other Bluetooth devices. Consult the manual " -"of the dive computer for more information. Now the third item in the list " -"above has been finished. Select the _Scan_ button towards the bottom left " -"of the dialogue above. After searching, the dive computer should be listed " -"(perhaps as one of a number of Bluetooth devices) in the main list box on " -"the lefthand side of the dialogue (see image above). If this does not work, " -"select the _Clear_ button, then scan again for Bluetooth devices using the " -"_Scan_ button. After taking these actions _Subsurface_ should see the dive " -"computer. The label of the discovered dive computer contains the name of " -"the device, its address and its pairing status. If the device is not paired " -"and has a red background color, a context menu can be opened by selecting " -"the item with a right-click. Select the the _Pair_ option and wait for the " -"task to complete. If this dive computer is being paired to Subsurface for " -"the first time, it’s possible Subsurface will request a Pass Code or PIN " -"number. The most commonly-used Pass Code is 0000, and this works for the " -"Shearwater Petrel. If necessary, consult the user manual of the dive " -"computer being used." +"and its Bluetooth address are shown on the right hand side. The power state " +"(on/off) of the Bluetooth adapter is shown below the address and can be " +"changed by checking the _Turn on/off_ box. If the Bluetooth address is not " +"shown, then _Subsurface_ does not see the local Bluetooth device. Ensure the " +"Bluetooth driver is installed correctly on the _Subsurface_ computer and " +"check if it can be used by other Bluetooth utilities like _bluetoothctl_ or " +"_bluemoon_. This completes the first two steps above. Ensure the Bluetooth-" +"enabled dive computer is in PC-upload mode and it is discoverable by other " +"Bluetooth devices. Consult the manual of the dive computer for more " +"information. Now the third item in the list above has been finished. Select " +"the _Scan_ button towards the bottom left of the dialogue above. After " +"searching, the dive computer should be listed (perhaps as one of a number of " +"Bluetooth devices) in the main list box on the lefthand side of the dialogue " +"(see image above). If this does not work, select the _Clear_ button, then " +"scan again for Bluetooth devices using the _Scan_ button. After taking these " +"actions _Subsurface_ should see the dive computer. On the left hand side, " +"if the computer has more than one local Bluetooth devices connected, use the " +"list box to indicate which one needs to connect to _Subsurface_. The label " +"of the discovered dive computer contains the name of the device, its address " +"and its pairing status. For BTLE devices the address often starts with \"LE" +"\". If the device is not paired and has a red background color, a context " +"menu can be opened by selecting the item with a right-click. Select the the " +"_Pair_ option and wait for the task to complete. If this dive computer is " +"being paired to Subsurface for the first time, it’s possible Subsurface will " +"request a Pass Code or PIN number. The most commonly-used Pass Code is 0000, " +"and this works for the Shearwater Petrel. If necessary, consult the user " +"manual of the dive computer being used." msgstr "" "Sur les plateformes _Linux_ ou -MacOS_, le nom de l'ordinateur utilisant " -"Subsurface_ et son adresse Bluetooth sont affichées du côté droit. À gauche, " -"si l'ordinateur a été connecté à plusieurs périphériques Bluetootj locaux, " -"vous pouvez utiliser la liste pour indiquer lequel doit être connecté à " -"°Subsurface_. L'état (allumé/éteint) de l'adaptateur Bluetooth est affiché " -"sous l'adresse et peut être modifié en cliquer sur la case _Allumer/" -"éteindre_. Si l'adresse Bluetooth n'est pas affichée, _Subsurface_ ne " -"détecte pas le périphérique Bluetooth local. Assurez-vous que le driver " -"Bluetooth est installé correctement sur l'ordinateur utilisant _Subsurface_ " -"et vérifiez qu'il peut être utilisé par d'autres utilitaires Bluetooth comme " -"_bluetoothctl_ ou _bluemoon_. Ceci clôture les deux premières étapes. " -"Vérifiez que l'ordinateur de plongée avec Bluetooth est en mode Connection " -"PC et est détactable pour d'autres périphériques Bluetooth. Consultez le " -"manuel de l'ordinateur de plongée pour plus d'information. À présent, la " -"troisième étape de notre liste est terminée. Sélectionnez le bouton " -"_Scannez_ en bas à gauche de la boîte de dialogue ci-dessus. Après la " -"recherche, l'ordinateur de plongée devrait se trouver dans la liste (peut-" -"être sous la norme d'un numéro de périphérique Bluetooth) dans la liste " -"principale sur la gauche de la boîte de dialogue (voir image ci-dessus). Si " -"cela ne fonctionne pas, sélectionnez le bouton _Effacer_, puis scannez à " -"nouveau en utilisant le bouton _Scan_. Après avoir suivi cette procédure, " -"_Subsurface_ devrait voir l'ordinateur de plongée. La dénomination de " -"l'ordinateur de plongée détecté contient le nom du périphérique, son adresse " -"et son statut de jumelage. Si le périphérique n'est pas jumelé et que son " -"nom est affiché avec un arrière-plan rouge, un menu contextuel peut être " -"ouvert en sélectionnant ce nom avec un cli-droit. Sélectionnez l'option " -"_Jumeler_ et attendez que la tâche soit terminée. Si l'ordinateur est jumelé " -"à Subsurface pour la première fois, il est possible que Subsurface demande " -"un nombre ou un code PIN. Le plus utilisé est 0000, et c'est celui qui " -"fonctionne pour un Shearwater Petrel. Si nécessaire, consultez le manuel " -"utilisateur de l'ordinateur de plongée que vous utilisez." +"Subsurface_ et son adresse Bluetooth sont affichées du côté droit. L'état " +"(allumé/éteint) de l'adaptateur Bluetooth est affiché sous l'adresse et peut " +"être modifié en cliquer sur la case _Allumer/éteindre_. Si l'adresse " +"Bluetooth n'est pas affichée, _Subsurface_ ne détecte pas le périphérique " +"Bluetooth local. Assurez-vous que le driver Bluetooth est installé " +"correctement sur l'ordinateur utilisant _Subsurface_ et vérifiez qu'il peut " +"être utilisé par d'autres utilitaires Bluetooth comme _bluetoothctl_ ou " +"_bluemoon_. Ceci clôture les deux premières étapes. Vérifiez que " +"l'ordinateur de plongée avec Bluetooth est en mode Connexion PC et est " +"détectable pour d'autres périphériques Bluetooth. Consultez le manuel de " +"l'ordinateur de plongée pour plus d'information. À présent, la troisième " +"étape de notre liste est terminée. Sélectionnez le bouton _Scannez_ en bas " +"à gauche de la boîte de dialogue ci-dessus. Après la recherche, l'ordinateur " +"de plongée devrait se trouver dans la liste (peut-être sous la norme d'un " +"numéro de périphérique Bluetooth) dans la liste principale sur la gauche de " +"la boîte de dialogue (voir image ci-dessus). Si cela ne fonctionne pas, " +"sélectionnez le bouton _Effacer_, puis scannez à nouveau en utilisant le " +"bouton _Scan_. Après avoir suivi cette procédure, _Subsurface_ devrait voir " +"l'ordinateur de plongée. La dénomination de l'ordinateur de plongée détecté " +"contient le nom du périphérique, son adresse et son statut de jumelage. Si " +"le périphérique n'est pas jumelé et que son nom est affiché avec un arrière-" +"plan rouge, un menu contextuel peut être ouvert en sélectionnant ce nom avec " +"un cli-droit. Sélectionnez l'option _Jumeler_ et attendez que la tâche soit " +"terminée. Si l'ordinateur est jumelé à Subsurface pour la première fois, il " +"est possible que Subsurface demande un nombre ou un code PIN. Le plus " +"utilisé est 0000, et c'est celui qui fonctionne pour un Shearwater Petrel. " +"Si nécessaire, consultez le manuel utilisateur de l'ordinateur de plongée " +"que vous utilisez." #. type: delimited block * -#: user-manual.txt:536 +#: user-manual.txt:551 msgid "" "Currently _Subsurface_ does not support Bluetooth pairing with dive " "computers that require a custom PIN code. In order to pair the devices, use " @@ -1480,12 +1468,12 @@ msgstr "" "d'exploitation comme suggéré ci-dessous." #. type: delimited block * -#: user-manual.txt:538 +#: user-manual.txt:553 msgid "One way to achieve this is to use +bluetoothctl+:" msgstr "Une façon d'y parvenir est d'utiliser +bluetoothctl+:" #. type: delimited block * -#: user-manual.txt:549 +#: user-manual.txt:564 #, no-wrap msgid "" "\t$ bluetoothctl\n" @@ -1511,7 +1499,7 @@ msgstr "" "\t[agent] Enter PIN code: 0000\n" #. type: Plain text -#: user-manual.txt:555 +#: user-manual.txt:570 msgid "" "After the devices are paired, press the _Save_ button of the dialogue. This " "closes the Bluetooth dialogue. Now select _Download_ in the _Download from " @@ -1526,19 +1514,19 @@ msgstr "" "la boîte de dialogue de téléchargement." #. type: Title ==== -#: user-manual.txt:556 user-manual.txt:3960 user-manual.txt:4048 +#: user-manual.txt:571 user-manual.txt:4123 user-manual.txt:4211 #, no-wrap msgid "On Windows:" msgstr "Sur Windows :" #. type: Target for macro image -#: user-manual.txt:557 +#: user-manual.txt:572 #, no-wrap msgid "images/DC_import_Bluetooth_Windows.png" msgstr "images/DC_import_Bluetooth_Windows.png" #. type: Plain text -#: user-manual.txt:567 +#: user-manual.txt:582 msgid "" "On _Windows_ platforms the _Local Bluetooth device details section_ on the " "right is not displayed as is the case on the Linux/Mac systems. To start a " @@ -1561,7 +1549,7 @@ msgstr "" "plongée. Un code ou PIN de 0000 est souvent le code par défaut." #. type: Plain text -#: user-manual.txt:574 +#: user-manual.txt:589 msgid "" "The pairing step is checked and done automatically during the download " "process. If the devices have never been paired the system will ask " @@ -1580,7 +1568,7 @@ msgstr "" "téléchargement et attendez la fin du processus." #. type: Plain text -#: user-manual.txt:582 +#: user-manual.txt:597 msgid "" "Currently _Subsurface_ works only with local Bluetooth adapters which use " "Microsoft Bluetooth Stack. If the local device uses _Widcomm_, _Stonestreet " @@ -1596,7 +1584,7 @@ msgstr "" "fonctionneront." #. type: Plain text -#: user-manual.txt:587 +#: user-manual.txt:602 msgid "" "A log message on the bottom left of the _Remote Bluetooth device selection_ " "shows details about the current status of the Bluetooth agent. To select " @@ -1612,36 +1600,31 @@ msgstr "" "Bluetooth\"_." #. type: Plain text -#: user-manual.txt:597 +#: user-manual.txt:612 #, no-wrap msgid "" -"*IN CASE OF PROBLEMS*: If the Bluetooth adapter from the _Subsurface_" -" computer\n" +"*IN CASE OF PROBLEMS*: If the Bluetooth adapter from the _Subsurface_ computer\n" "gets stuck and the _Download_ process fails repeatedly,\n" -" _unpair_ the devices and then repeat the above steps. If this is not" -" successful,\n" +" _unpair_ the devices and then repeat the above steps. If this is not successful,\n" " xref:S_HowFindBluetoothDeviceName[_Appendix A_] contains\n" "information for manually setting up and inspecting the Bluetooth connection\n" "with _Subsurface_.\n" msgstr "" -"*EN CAS DE PROBLÈMES*: si l'adaptateur Bluetooth de l'ordinateur utilisant" -" _Subsurface_\n" +"*EN CAS DE PROBLÈMES*: si l'adaptateur Bluetooth de l'ordinateur utilisant _Subsurface_\n" "se bloque et que le processus de _téléchargement_ échoue de façon répétée,\n" -" _dissociez_ les périphériques et répétez les étapes ci-dessus. Si cela ne" -" fonctionne pas,\n" +" _dissociez_ les périphériques et répétez les étapes ci-dessus. Si cela ne fonctionne pas,\n" " l' xref:S_HowFindBluetoothDeviceName[_Annexe A_] contient\n" -"des informations sur la configuration manuelle et la vérification de la" -" connection Bluetooth\n" +"des informations sur la configuration manuelle et la vérification de la connection Bluetooth\n" "avec _Subsurface_.\n" #. type: Title ==== -#: user-manual.txt:599 +#: user-manual.txt:614 #, no-wrap msgid "Changing the name of a dive computer" msgstr "Changement du nom d'un ordinateur de plongée" #. type: Plain text -#: user-manual.txt:615 +#: user-manual.txt:630 msgid "" "It may be necessary to distinguish between different dive computers used to " "upload dive logs to _Subsurface_. For instance if a buddy’s dive computer is " @@ -1676,15 +1659,13 @@ msgstr "" "modèle, permettant une identification plus facile des périphériques." #. type: Title ==== -#: user-manual.txt:617 +#: user-manual.txt:632 #, no-wrap msgid "Uploading data for a specific dive from more than one dive computer" -msgstr "" -"Chargement des données d'une plongée spécifique depuis plusieurs ordinateurs" -" de plongée" +msgstr "Chargement des données d'une plongée spécifique depuis plusieurs ordinateurs de plongée" #. type: Plain text -#: user-manual.txt:628 +#: user-manual.txt:643 msgid "" "Some divers use more than one dive computer at the same time, e.g. during " "technical diving. If you import the dive profiles from these different dive " @@ -1712,13 +1693,13 @@ msgstr "" "par le choix de l'un ou l'autre ordinateur de plongée." #. type: Title ==== -#: user-manual.txt:630 +#: user-manual.txt:645 #, no-wrap msgid "Updating the dive information imported from the dive computer." msgstr "Mise à jour de l'information importée depuis un ordinateur de plongée." #. type: Plain text -#: user-manual.txt:637 +#: user-manual.txt:652 msgid "" "With the uploaded dives in the *Dive List*, the information from the dive " "computer is not complete and more details must be added to have a full " @@ -1732,13 +1713,13 @@ msgstr "" "fenêtre de _Subsurface_ doivent être utilisés." #. type: Title ===== -#: user-manual.txt:639 +#: user-manual.txt:654 #, no-wrap msgid "Notes" msgstr "Notes" #. type: Plain text -#: user-manual.txt:644 +#: user-manual.txt:659 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-" @@ -1750,7 +1731,7 @@ msgstr "" "celles qui sont téléchargées depuis un ordinateur de plongée." #. type: Plain text -#: user-manual.txt:654 +#: user-manual.txt:669 msgid "" "In some cases, you must provide the date and time of the dive, for example " "when entering a dive by hand or when a dive computer doesn’t provide the " @@ -1772,13 +1753,13 @@ msgstr "" "en bas à gauche):" #. type: Target for macro image -#: user-manual.txt:655 +#: user-manual.txt:670 #, no-wrap msgid "images/AddDive3_f22.jpg" msgstr "images/AddDive3_f22.jpg" #. type: Plain text -#: user-manual.txt:664 +#: user-manual.txt:679 msgid "" "The right hand image, above, shows a *Notes tab* filled with dive " "information. The *Date* and *Time* fields reflects the date and time of the " @@ -1796,48 +1777,37 @@ msgstr "" "texte et en remplaçant l'information qui s'y trouve." #. type: Plain text -#: user-manual.txt:674 +#: user-manual.txt:689 #, no-wrap msgid "" -"*Air/water temperatures*: Air and water temperatures during the dive are" -" shown\n" -"in text boxes to the right of the Start time. Many dive computers supply" -" water\n" +"*Air/water temperatures*: Air and water temperatures during the dive are shown\n" +"in text boxes to the right of the Start time. Many dive computers supply water\n" "temperature information and this box may have information.\n" -"If air temperature isn’t provided by the dive computer, the first temperature" -" reading\n" -"might be used for the air temperature. Generally this is close to the real" -" air temperature.\n" -"If editing is required, only a value is required, the units of temperature" -" will be\n" +"If air temperature isn’t provided by the dive computer, the first temperature reading\n" +"might be used for the air temperature. Generally this is close to the real air temperature.\n" +"If editing is required, only a value is required, the units of temperature will be\n" "automatically supplied by\n" "_Subsurface_ (following the _Preferences_, metric or imperial units will\n" "be used).\n" msgstr "" -"*Température de l'air/eau*: les températures de l'air et de l'eau pendant la" -" plongée sont affichées\n" -"dans des boîtes de texte à droite de l'heure de début de plongée. De nombreux" -" ordinateurs de plongée \n" -"renseignent la température de l'eau, et cette boîte peut contenir cette" -" information.\n" -"Si la température de l'air n'est pas renseignée par l'ordinateur de plongée," -" la première température pour l'eau\n" -"peut être utilisée comme température de l'air. En général, elle est proche de" -" la température de l'air.\n" -"S'il est nécessaire d'éditer ces informations, seule une valeur est" -" nécessaire, l'unité de température étant\n" +"*Température de l'air/eau*: les températures de l'air et de l'eau pendant la plongée sont affichées\n" +"dans des boîtes de texte à droite de l'heure de début de plongée. De nombreux ordinateurs de plongée \n" +"renseignent la température de l'eau, et cette boîte peut contenir cette information.\n" +"Si la température de l'air n'est pas renseignée par l'ordinateur de plongée, la première température pour l'eau\n" +"peut être utilisée comme température de l'air. En général, elle est proche de la température de l'air.\n" +"S'il est nécessaire d'éditer ces informations, seule une valeur est nécessaire, l'unité de température étant\n" "automatiquement fournie par\n" "_Subsurface_ (sur base des _Préférences_, les unités métriques ou impériales\n" "seront utilisées).\n" #. type: Plain text -#: user-manual.txt:677 +#: user-manual.txt:692 #, no-wrap msgid "*Location*:\n" msgstr "*Lieu*:\n" #. type: Plain text -#: user-manual.txt:685 +#: user-manual.txt:700 msgid "" "Dive locations are managed as a *separate* part of the dive log. The dive " "information in the *Notes* and *Equipment* tabs can therefore NOT be edited " @@ -1858,130 +1828,159 @@ msgstr "" "*Notes*." #. type: Plain text -#: user-manual.txt:702 -msgid "" -"Type in the name of the dive site, e.g. \"Tihany, Lake Balaton, Hungary\". " -"If several dives are made at the same location, the site information for the " -"first dive is re-used. Existing dive locations can be edited by selecting " -"(on the *Dive List* panel) a dive done at that site and by opening the " -"location information. Click the globe button on the right of the location " -"name (see image image *A* below). When typing the name of a dive site, a " -"dropdown list appears showing all sites with similar names. If the dive site " -"has been used before, click on the already-existing name. The dive site " -"names in the dropdown list contain either a globe symbol (indicating " -"existing dive sites in the _Subsurface_ database) or a *+* symbol " -"(indicating dive site names that appear consistent with the current dive " -"site name but which haven’t been added to the dive site database). If the " -"present dive site has not been used before, a message appears as follows " -"(image *A* below):" -msgstr "" -"Entrez le nom du site de plongée, p. ex. \"Tihany, Lac Balaton, Hongrie\". " -"Si plusieurs plongées ont été faites au même endroit, les informations de " -"lieu de la première plongée sont ré-utilisées. Les lieux de plongée " -"existants peuvent être édités en sélectionnant (dans le panneau *Liste des " -"plongées*) une plongée faite sur ce site et en ouvrant les informations de " -"cet endroit. Cliquez sur le bouton avec une image de globe à droite du nom " -"du lieu (voir l'image *A* ci-dessous). Lorsque vous entrez le nom d'un site " -"de plongée, une liste déroulante apparaît, affichant tous les sites " -"comportant un nom similaire. Si le site de plongée a déjà été utilisé " -"précédemment, cliquez sur le nom existant. Les noms de sites de plongée " -"présents dans la liste contiennent soit un symbole en forme de globe " -"(indiquant qu'ils sont répertoriés comme lieux de plongée dans la base de " -"données de _Subsurface_) ou un symbole *+* (qui indique des noms de lieux " -"de plongée qui semblent consistant avec le nom du site courant mais qui " -"n'ont pas encore été ajoutés à la base de données). Si le site de plongée " -"actuel n'a pas encore été utilisé, un message apparaît comme suit (voir " -"image *A* ci-dessous):" +#: user-manual.txt:708 +#, no-wrap +msgid "" +"*Using existing dive locations:* Type in the name of the dive site, e.g. \"Tihany, Lake Balaton, Hungary\".\n" +"If several dives are\n" +"made at the same location, the site information for the first dive is re-used.\n" +"Therefore, if a dive site has been used before, the name of that site (and sometimes\n" +"the names of similar sites) appears below the dive site text box (image below). Double-click on\n" +"the appropriate dive site name and the dive location will be associated with the\n" +"dive being entered. Then select _Apply Changes_ (image below) to save the geolocation for this dive site.\n" +msgstr "" #. type: Target for macro image -#: user-manual.txt:703 +#: user-manual.txt:709 #, no-wrap -msgid "images/Locations1_f22.jpg" -msgstr "images/Locations1_f22.jpg" +msgid "images/Location1.jpg" +msgstr "images/Location1.jpg" #. type: Plain text -#: user-manual.txt:708 +#: user-manual.txt:715 +#, no-wrap msgid "" -"Click the globe button and a panel appears to enter the coordinates and " -"other information about the site (image *B*, above). The most important " -"items are the coordinates of the site. There are three ways to specify " -"coordinates:" +"*Entering a new dive location:* On the other hand, having dived at a new dive location,\n" +"a new record needs to be created\n" +"that could be used for the new and for later dives at this new site. Type the name of the new dive site into the text box\n" +"(image A below).\n" msgstr "" -"Cliquez sur le bouton contenant une image de globe; un panneau apparaît " -"permettant d'entrer les coordonnées et d'autres informations concernant le " -"site (voir image *B* ci-dessus). Les informations les plus importantes sont " -"les coordonnées du site. Il y a trois façons de spécifier les coordonnées:" + +#. type: Target for macro image +#: user-manual.txt:716 +#, no-wrap +msgid "images/Globe_image1.jpg" +msgstr "images/Globe_image1.jpg" #. type: Plain text -#: user-manual.txt:714 +#: user-manual.txt:723 msgid "" -"Use the world map in the bottom right hand part of the _Subsurface_ window. " -"The map displays an orange bar indicating \"No location data - Move the map " -"and double-click to set the dive location\". Doubleclick at the appropriate " -"place, and the orange bar disappears and the coordinates are stored." +"Double-click on the blue bar below the new dive location name. The blue bar " +"disappears (image B above) and the globe icon on the right-hand of the " +"location name text box turns blue. In the Dive Map part of the _Subsurface_ " +"window, a world map appears (image C above). Click on the blue globe icon to " +"the right of the dive site name in the _Notes_ panel (image B above). This " +"opens a window for entering the details of the new dive location (image A " +"below). The globe icon changes to indicate that the location data are being " +"edited. The only important data here are the geographic coordinates of the " +"dive location." msgstr "" -"Utilisez la carte du monde en bas à droite de la fenêtre de _Subsurface_. " -"Cette carte affiche une barre orange indiquant \"Pas de données de " -"localisation - Bougez la carte et double-cliquez pour définir le lieu de " -"plongée\". Double-cliquez à l'endroit requis; la barre orange disparaît " -"alors et les coordonnées sont stockées." + +#. type: Target for macro image +#: user-manual.txt:724 +#, no-wrap +msgid "images/Globe_image2.jpg" +msgstr "images/Globe_image2.jpg" #. type: Plain text -#: user-manual.txt:719 -msgid "" -"Use eiher the Subsurface-Mobile App or the _Subsurface_ Companion App on an " -"Android or iPhone device with GPS and if the dive site coordinates were " -"stored using one of these apps. xref:S_Companion[Click here for more " -"information]" +#: user-manual.txt:727 +msgid "There are three ways of adding the the coordinates:" msgstr "" -"Utiliser l'application Subsurface-Mobile ou l'application _Subsurface_ " -"Companion avec un périphérique Android ou un iPhone avec GPS si les " -"coordonnées du site de plongée ont été stockées en utilisant une de ces " -"applications. xref:S_Companion[Cliquez ici pour plus d'information]" #. type: Plain text -#: user-manual.txt:721 +#: user-manual.txt:730 +#, no-wrap msgid "" -"Enter coordiantes by hand if they are known, using one of four formats with " -"latitude followed by longitude:" +"*(1):* Enter coordinates by hand if they are known, using one of\n" +" four formats with latitude followed by longitude:\n" msgstr "" -"Entrez les coordonnées manuellement si vous les connaissez, en utilisant un " -"des quatre formats avec la latitude suivie de la longitude:" +"*(1):* Entrer les coordonnées manuellement si vous les connaissez,\n" +" en utilisant un des quatre formats avec la latitude suivie de la longitude :\n" #. type: Plain text -#: user-manual.txt:726 +#: user-manual.txt:735 +#, no-wrap 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. " -"N30° 13' 29.8\" , E30° 49' 1.5\" Decimal degrees, e.g. 30.22496 , 30.821798" +"\tISO 6709 Annex D format e.g. 30°13'28.9\"N 30°49'1.5\"E\n" +"\tDegrees and decimal minutes, e.g. N30° 13.49760' , E30° 49.30788'\n" +"\tDegrees minutes seconds, e.g. N30° 13' 29.8\" , E30° 49' 1.5\"\n" +"\tDecimal degrees, e.g. 30.22496 , 30.821798\n" msgstr "" -"Format ISO 6709 Annexe D p. ex. 30°13'28.9\"N 30°49'1.5\"E Degrés et minutes " -"décimales, p. ex. N30° 13.49760' , E30° 49.30788' Degrés minutes secondes, " -"p. ex. N30° 13' 29.8\" , E30° 49' 1.5\" Degrés décimaux, p. ex. 30.22496 , " -"30.821798" +"\tFormat ISO 6709 Annexe D, ex. 30°13'28.9\"N 30°49'1.5\"E\n" +"\tDegrés et minutes décimales, ex. N30° 13.49760' , E30° 49.30788'\n" +"\tDegrés minutes secondes, ex. N30° 13' 29.8\" , E30° 49' 1.5\"\n" +"\tDegrés décimaux, ex. 30.22496 , 30.821798\n" #. type: Plain text -#: user-manual.txt:734 +#: user-manual.txt:744 msgid "" "Southern hemisphere latitudes are given with a *S*, e.g. S30°, or with a " "negative value, e.g. -30.22496. Similarly western longitudes are given with " "a *W*, e.g. W07°, or with a negative value, e.g. -7.34323. Some keyboards " "don't have the degree sign (°). It can be replaced by a *d* like this: N30d " -"W20d. If both a dive site name and coordinates have been provided, save the " -"dive site information by selecting the button _Apply changes_ at the top of " -"the panel." +"W20d. Enter any other contextual information about the dive site " +"(Description and Notes), then select _Apply Changes_ to save the geolocation " +"for this dive site. The dive site information can later be edited by " +"clicking the globe icon to the right of the dive site name in the *Notes " +"tab*." +msgstr "" +"Les latitudes dans l'hémisphère sud sont données avec un *S*, ex. S30°, ou " +"avec une valeur négative, ex. -30.22496. De la même façon, les longitudes " +"ouest sont données avec un *W*, ex. W07°, ou avec une valeur négative, ex. " +"-7.34323. Certains claviers ne comportent par le signe degré (°). Il peut " +"être remplacé par un *d* comme ceci: N30d W20d. Entrer tout autre " +"informations à propos du site de plongée (Description et notes), puis " +"sélectionner _Appliquer les modifications_ pour sauvegarder la " +"géolocalisation de ce site. Les informations du site de plongée pourront " +"être modifiées ultérieurement, en cliquant sur l'icône de globe à droite du " +"nom du site de plongée, dans l'\"onglet notes\"." + +#. type: Plain text +#: user-manual.txt:756 +#, no-wrap +msgid "" +"*(2):* Use the Dive Map to specify the coordinates. The Dive map now shows\n" +"all the existing dive lications in grey as well as an additional marker in red\n" +"(image B above). Drag the red marker to the location of the dive site being entered.\n" +"The map can be dragged and zoomed using the mouse wheel. Position the red marker\n" +"by dragging it on the map, zooming in on the appropriate part of the map and placing\n" +"the marker at an appropriate position (image B below). The coordinates of the dive\n" +"location are automatically inserted into the appropriate text box in the dive location\n" +"information window (image A below). Enter any other contextual information about the dive site (Description and Notes),\n" +"then select _Apply Changes_ to save the geolocation for this dive site.\n" +"The dive site information can later be edited by clicking the globe icon to the right of the\n" +"dive site name in the *Notes tab*.\n" msgstr "" -"Les latitudes dans l'hémisphère sud sont données avec un *S*, p. ex. S30°, " -"ou avec une valeur négative, p. ex. -30.22496. De la même façon, les " -"longitudes ouest sont données avec un *W*, p. ex. W07°, ou avec une valeur " -"négative, p. ex. -7.34323. Certains claviers ne comportent par le signe " -"degré (°). Il peut être remplacé par un *d* comme ceci: N30d W20d. Si le " -"nom du site de plongée et les coordonnées ont tous les deux été renseignés, " -"enregistrez les informations du site de plongée en sélectionnant le bouton " -"_Appliquer les modifications_ en haut du panneau." + +#. type: Target for macro image +#: user-manual.txt:757 +#, no-wrap +msgid "images/Globe_image3.jpg" +msgstr "images/Globe_image3.jpg" #. type: Plain text -#: user-manual.txt:740 +#: user-manual.txt:761 +msgid "" +"Once the dive location data have been saved, the dive on the Dive List has a " +"globe icon immediately to the left of the location name of a particular dive." +msgstr "" + +#. type: Plain text +#: user-manual.txt:766 +#, no-wrap +msgid "" +"*(3):* Use eiher the Subsurface-Mobile App or the _Subsurface_ Companion App on an\n" +" Android or iPhone device with GPS and if the dive site coordinates\n" +" were stored using one of these apps.\n" +" xref:S_Companion[Click here for more information]\n" +msgstr "" +"*(3):* Utiliser l'application Subsurface-Mobile ou l'application _Subsurface_ Companion avec un \n" +"périphérique Android ou un iPhone avec GPS si les coordonnées du site de plongée ont été stockées \n" +"en utilisant une de ces applications. \n" +"xref:S_Companion[Cliquez ici pour plus d'information]\n" + +#. type: Plain text +#: user-manual.txt:772 #, no-wrap msgid "" "*Important*: GPS coordinates of a dive site are linked to the location\n" @@ -1991,45 +1990,36 @@ msgid "" "same).\n" msgstr "" "*Important*: les coordonnées GPS d'un site de plongée sont liées au nom de\n" -"lieu - ainsi, *enregistrer* un site de plongée avec uniquement les" -" coordonnées mais aucun nom\n" +"lieu - ainsi, *enregistrer* un site de plongée avec uniquement les coordonnées mais aucun nom\n" "causera des problèmes. (Subsurface pensera que toutes ces\n" "plongées ont le même lieu et tentera de garder leurs coordonnées GPS\n" "identiques).\n" #. type: Plain text -#: user-manual.txt:750 +#: user-manual.txt:782 #, no-wrap msgid "" "*Dive site name lookup:* If you typed coordinates into the appropriate\n" "text box, you can do an automated name lookup based on the coordinates.\n" -"This is done when _Subsurface_ uses the Internet to find the name of the dive" -" site\n" -"based on the coordinates that were typed. If a name has been found, it is\n" +"This is done when _Subsurface_ uses the Internet to find the name of the dive site\n" +"based on the coordinates that were given. 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" +"current location. For instance if the dive site is \"Blue Hole\" and there are several\n" "sites named \"Blue Hole\", all of them are listed.\n" msgstr "" -"*Recherche du nom d'un site de plongée*: si vous avez entré les coordonnées" -" dans la boîte\n" -"de texte appropriée, vous pouvez lancer une recherche de nom sur base des" -" coordonnées.\n" -"Ceci est réalisé lorsque _Subsurface_ utilise Internet pour trouver le nom" -" d'un site de plongée\n" -"sur base des coordonées que vous avez entrées. Si un nom est trouvé, il est\n" -"automatiquement inséré dans la boîte Étiquettes. La liste (intitulée _\"Sites" -" de plongée situés aux mêmes coordonnées_\") en bas\n" -"du panneau du site de plongée contient les noms d'autres sites de plongée" -" utilisés\n" -"au même endroit. Par exemple, si le site de plongée est \"Blue Hole\" et" -" qu'il y a plusieurs\n" +"*Recherche du nom d'un site de plongée*: si vous avez entré les coordonnées dans la boîte\n" +"de texte appropriée, vous pouvez lancer une recherche de nom sur base des coordonnées.\n" +"Ceci est réalisé lorsque _Subsurface_ utilise Internet pour trouver le nom d'un site de plongée\n" +"sur base des coordonnées que vous avez entrées. Si un nom est trouvé, il est\n" +"automatiquement inséré dans la boîte Étiquettes. La liste (intitulée _\"Sites de plongée situés aux mêmes coordonnées_\") en bas\n" +"du panneau du site de plongée contient les noms d'autres sites de plongée utilisés\n" +"au même endroit. Par exemple, si le site de plongée est \"Blue Hole\" et qu'il y a plusieurs\n" "sites nommés \"Blue Hole\", ils seront tous listés.\n" #. type: Plain text -#: user-manual.txt:755 +#: user-manual.txt:787 msgid "" "Enter any other contextual information about the dive site (Description and " "Notes), then select _Apply Changes_ to save the geolocation for this dive " @@ -2043,24 +2033,21 @@ msgstr "" "en forme de globe à droite du nom du site de plongée dans l'onglet *Notes*." #. type: Plain text -#: user-manual.txt:760 +#: user-manual.txt:792 #, no-wrap msgid "" "*Dive mode*: This is a dropdown box allowing you to choose the type of dive\n" -"performed. The options are OC (Open Circuit SCUBA, the default setting, for" -" most recreational dives),\n" +"performed. The options are OC (Open Circuit SCUBA, the default setting, for most recreational dives),\n" "Freedive (dive without SCUBA equipment), CCR (Closed-circuit\n" "rebreather) and pSCR (Passive semi-closed rebreather).\n" msgstr "" -"*Mode de plongée*: cette liste déroulante vous permet de choisir le type de" -" plongée\n" -"réalisée. Les options sont OC (scaphandre en circuit ouvert, le choix par" -" défaut pour la plupart des plongées loisir),\n" +"*Mode de plongée*: cette liste déroulante vous permet de choisir le type de plongée\n" +"réalisée. Les options sont OC (scaphandre en circuit ouvert, le choix par défaut pour la plupart des plongées loisir),\n" "Apnée (plongée sans scaphandre), CCR (recycleur\n" "en circuit fermé) et pSCR (recycleur passif semi-fermé).\n" #. type: Plain text -#: user-manual.txt:765 +#: user-manual.txt:797 #, no-wrap msgid "" "*Divemaster*: The name of the divemaster or dive guide should be\n" @@ -2068,14 +2055,13 @@ msgid "" "which offers auto selection based on the list of divemasters in\n" "the current logbook.\n" msgstr "" -"*Moniteur/Guide de palanquée*: le nom du moniteur ou du guide de palanquée" -" doit être\n" +"*Moniteur/Guide de palanquée*: le nom du moniteur ou du guide de palanquée doit être\n" "entré dans ce champ\n" "qui permet une sélection automatique basé sur la liste des moniteurs\n" "déjà présents dans le carnet en cours.\n" #. type: Plain text -#: user-manual.txt:770 +#: user-manual.txt:802 #, no-wrap msgid "" "*Buddy*: In this field, enter the name(s) of the buddy or buddies\n" @@ -2085,28 +2071,25 @@ msgid "" msgstr "" "*Équipier*: dans ce champ, entrez le(s) nom(s) de votre/vos équipier(s)\n" "(sparés par des virgules) qui participaient à la\n" -"plongée. Une sélection automatique se base sur la liste des équipiers déjà" -" présents dans le\n" +"plongée. Une sélection automatique se base sur la liste des équipiers déjà présents dans le\n" "carnet en cours.\n" #. type: Plain text -#: user-manual.txt:775 +#: user-manual.txt:807 #, no-wrap msgid "" "*Suit*: Here the type of dive suit used can be entered.\n" "Auto selection of the suit description is available.\n" -"Some dry-suit users may choose to use this field to record what combination" -" of\n" +"Some dry-suit users may choose to use this field to record what combination of\n" "suit and thermal under suit was used.\n" msgstr "" "*Combinaison*: le type de combinaison peut être entré ici.\n" "Une sélection automatique est disponible.\n" -"Certains utilisateurs de vêtement étanche peuvent utiliser ce champ pour" -" enregistrer quelle ensemble de\n" +"Certains utilisateurs de vêtement étanche peuvent utiliser ce champ pour enregistrer quelle ensemble de\n" "combinaison et souris ils ont utilisé.\n" #. type: Plain text -#: user-manual.txt:778 +#: user-manual.txt:810 #, no-wrap msgid "" "*Rating*: Provide a subjective overall rating of the dive on a\n" @@ -2116,7 +2099,7 @@ msgstr "" "échelle de 5 points en cliquant sur l'étoile correspondante.\n" #. type: Plain text -#: user-manual.txt:781 +#: user-manual.txt:813 #, no-wrap msgid "" "*Visibility*: Provide a rating of visibility during the\n" @@ -2126,37 +2109,31 @@ msgstr "" "échelle de 5 points en cliquant sur l'étoile correspondante.\n" #. type: Plain text -#: user-manual.txt:788 +#: user-manual.txt:820 #, no-wrap msgid "" "*Tags*: Tags that describe the type of dive done can be entered\n" -"here (separated by commas). Examples of common tags are boat, drift," -" training,\n" +"here (separated by commas). Examples of common tags are boat, drift, training,\n" "cave, etc.\n" -"_Subsurface_ has many built-in tags. By starting to type a tag, _Subsurface_" -" lists\n" +"_Subsurface_ has many built-in tags. By starting to type a tag, _Subsurface_ lists\n" "the tags that correspond to the typing. For instance, by typing\n" "+cav+, the tags *cave* and *cavern* are shown to choose from.\n" msgstr "" "*Étiquettes*: il est possible de définir ici des étiquettes qui décrivent le\n" -"type de plongée (séparées par des virgules). Des exemples courants" -" d'étiquettes sont bateau, \n" +"type de plongée (séparées par des virgules). Des exemples courants d'étiquettes sont bateau, \n" "plongée dérivante, exercice, grotte, etc.\n" -"_Subsurface_ contient de nombreuses étiquettes. En commençant à taper une" -" étiquette, _Subsurface_ liste\n" +"_Subsurface_ contient de nombreuses étiquettes. En commençant à taper une étiquette, _Subsurface_ liste\n" "les étiquettes correspondant à la frappe. Par exemple, en entrant\n" "+cav+, les étiquettes *cave* et *caverne* sont proposées.\n" #. type: Plain text -#: user-manual.txt:790 +#: user-manual.txt:822 #, no-wrap msgid "*Notes*: Any additional information for the dive can be entered here.\n" -msgstr "" -"*Notes*: toute information supplémentaire concernant une plongée peut être" -" entrée ici.\n" +msgstr "*Notes*: toute information supplémentaire concernant une plongée peut être entrée ici.\n" #. type: Plain text -#: user-manual.txt:795 +#: user-manual.txt:827 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. " @@ -2172,13 +2149,13 @@ msgstr "" "*Notes* après avoir complété les informations d'une plongée." #. type: Title ===== -#: user-manual.txt:796 +#: user-manual.txt:828 #, no-wrap msgid "Equipment" msgstr "Équipement" #. type: Plain text -#: user-manual.txt:801 +#: user-manual.txt:833 msgid "" "The Equipment tab allow entering information about the type of cylinder and " "gas used, as well as the weights used for the dive. The message in the blue " @@ -2189,7 +2166,7 @@ msgstr "" "message dans la boîte bleue en haut du panneau:" #. type: Plain text -#: user-manual.txt:808 +#: user-manual.txt:840 msgid "" "shows the equipment is being edited. This is a highly interactive part of " "_Subsurface_ and the information on cylinders and gases (entered here) " @@ -2201,25 +2178,23 @@ msgstr "" "droite)." #. type: Plain text -#: user-manual.txt:812 +#: user-manual.txt:844 #, no-wrap msgid "" -"*Cylinders*: The cylinder information is entered through a dialogue that" -" looks\n" +"*Cylinders*: The cylinder information is entered through a dialogue that looks\n" "like this:\n" msgstr "" -"*Blocs*: les informations concernant les blocs sont entrées via une boîte de" -" dialogue\n" +"*Blocs*: les informations concernant les blocs sont entrées via une boîte de dialogue\n" "qui ressemble à ceci:\n" #. type: Target for macro image -#: user-manual.txt:813 +#: user-manual.txt:845 #, no-wrap msgid "images/DC_gas-dialogue1_f20.jpg" msgstr "images/DC_gas-dialogue1_f20.jpg" #. type: Plain text -#: user-manual.txt:826 +#: user-manual.txt:858 msgid "" "For hand-entered dives, this information needs to be typed in. For dive " "computers, _Subsurface_ often gets the gas used from the dive computer and " @@ -2247,13 +2222,13 @@ msgstr "" "déroulante de blocs:" #. type: Target for macro image -#: user-manual.txt:827 +#: user-manual.txt:859 #, no-wrap msgid "images/DC_gas-dialogue2_f20.jpg" msgstr "images/DC_gas-dialogue2_f20.jpg" #. type: Plain text -#: user-manual.txt:834 +#: user-manual.txt:866 msgid "" "The drop-down list can then be used to select the cylinder type that was " "used for this dive, or just start typing in the box which shows the " @@ -2268,7 +2243,7 @@ msgstr "" "automatiquement affichées dans la boîte de dialogue." #. type: Plain text -#: user-manual.txt:838 +#: user-manual.txt:870 msgid "" "Next, indicate the starting pressure and the ending pressure of the " "specified gas during the dive. The unit of pressure (metric/imperial) " @@ -2279,7 +2254,7 @@ msgstr "" "correspond au réglage choisi dans les _Préférences_." #. type: Plain text -#: user-manual.txt:849 +#: user-manual.txt:881 msgid "" "Finally, provide the gas mixture used. If air was used, the value of 21% can " "be entered into the oxygen box or this field can be left blank. If nitrox or " @@ -2303,13 +2278,13 @@ msgstr "" "utilisant deux blocs (air et EAN50):" #. type: Target for macro image -#: user-manual.txt:850 +#: user-manual.txt:882 #, no-wrap msgid "images/CylinderDataEntry3_f20.jpg" msgstr "images/CylinderDataEntry3_f20.jpg" #. type: Plain text -#: user-manual.txt:856 +#: user-manual.txt:888 #, no-wrap msgid "" "*Weights*: Information about the weight system used can be entered\n" @@ -2323,13 +2298,13 @@ msgstr "" "comme suit:\n" #. type: Target for macro image -#: user-manual.txt:857 +#: user-manual.txt:889 #, no-wrap msgid "images/WeightsDataEntry1_f20.jpg" msgstr "images/WeightsDataEntry1_f20.jpg" #. type: Plain text -#: user-manual.txt:861 +#: user-manual.txt:893 msgid "" "By clicking on the _Type_ field, a drop-down list becomes accessible through " "a down-arrow:" @@ -2338,13 +2313,13 @@ msgstr "" "via une flèche vers le bas:" #. type: Target for macro image -#: user-manual.txt:862 +#: user-manual.txt:894 #, no-wrap msgid "images/WeightsDataEntry2_f20.jpg" msgstr "images/WeightsDataEntry2_f20.jpg" #. type: Plain text -#: user-manual.txt:876 +#: user-manual.txt:908 msgid "" "This can be used to select the type of weight system used during the dive. " "You may start typing in the box to specify a different weighting mechanism " @@ -2370,19 +2345,19 @@ msgstr "" "de lestage: des poids intégrés et une ceinture:" #. type: Target for macro image -#: user-manual.txt:877 +#: user-manual.txt:909 #, no-wrap msgid "images/WeightsDataEntry3_f20.jpg" msgstr "images/WeightsDataEntry3_f20.jpg" #. type: Title ==== -#: user-manual.txt:879 +#: user-manual.txt:911 #, no-wrap msgid "Editing several selected dives simultaneously" msgstr "Éditer simultanément une sélection de plusieurs plongées" #. type: Plain text -#: user-manual.txt:895 +#: user-manual.txt:927 msgid "" "_METHOD 1_: After downloading dives from a dive computer, the dive profiles " "of each is shown in the *Dive profile* tab, as well as a few items of " @@ -2400,7 +2375,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:905 +#: user-manual.txt:937 msgid "" "Simultaneous editing only works with fields that do not already contain " "information. This means if some fields have been edited for a particular " @@ -2415,7 +2390,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:914 +#: user-manual.txt:946 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 " @@ -2430,13 +2405,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:916 +#: user-manual.txt:948 #, no-wrap msgid "Adding Bookmarks to a dive" msgstr "Ajout des signets à une plongée" #. type: Plain text -#: user-manual.txt:921 +#: user-manual.txt:953 msgid "" "Many divers wish to annotate dives with text that indicate particular " "events, e.g. \"Saw dolphins\", or \"Released surface buoy\". This is easily " @@ -2447,7 +2422,7 @@ msgstr "" "\"Déploiement de parachute de palier\". Ceci peut ^être facilement réalisé:" #. type: Plain text -#: user-manual.txt:925 +#: user-manual.txt:957 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 " @@ -2459,7 +2434,7 @@ msgstr "" "plongée (voir *A* ci-dessous)." #. type: Plain text -#: user-manual.txt:927 +#: user-manual.txt:959 msgid "" "Right-click on the red flag. This brings up the context menu (see *B* " "below). Select _Edit name_." @@ -2468,7 +2443,7 @@ msgstr "" "(voir *B* ci-dessous). Sélectionnez _Modifier le nom_." #. type: Plain text -#: user-manual.txt:930 +#: user-manual.txt:962 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." @@ -2478,7 +2453,7 @@ msgstr "" "au signet." #. type: Plain text -#: user-manual.txt:933 +#: user-manual.txt:965 msgid "" "Hovering the mouse over the red bookmark, the appropriate text is shown at " "the bottom of the information box (see *D* below)." @@ -2487,19 +2462,19 @@ msgstr "" "dans le bas de la boîte d'information (voir *D* ci-dessous)." #. type: Target for macro image -#: user-manual.txt:934 +#: user-manual.txt:966 #, no-wrap msgid "images/Bookmarks.jpg" msgstr "images/Bookmarks.jpg" #. type: Title ==== -#: user-manual.txt:937 +#: user-manual.txt:969 #, no-wrap msgid "Saving the updated dive information" msgstr "Enregistrer les informations de plongée mises à jour" #. type: Plain text -#: user-manual.txt:948 +#: user-manual.txt:980 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 " @@ -2522,17 +2497,13 @@ msgstr "" "disque de l'ordinateur." #. type: Title === -#: user-manual.txt:949 +#: user-manual.txt:981 #, 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" +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:972 +#: user-manual.txt:1004 msgid "" "Many divers log their dives using the proprietary software provided by the " "manufacturers of their dive computers. _Subsurface_ can import dive logs " @@ -2553,7 +2524,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:984 +#: user-manual.txt:1016 msgid "" "If the format of other software is supported natively on Subsurface, select " "either _Import -> Import log files_ or _File -> Open log file_. Notice that " @@ -2568,13 +2539,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:985 +#: user-manual.txt:1017 #, no-wrap msgid "Using the universal import dialogue" msgstr "Utilisation de la boîte de dialogue universelle d'importation" #. type: Plain text -#: user-manual.txt:991 +#: user-manual.txt:1023 msgid "" "Importing dives from other software is done through a universal interface " "activated by selecting _Import_ from the Main Menu, then clicking on _Import " @@ -2586,13 +2557,13 @@ msgstr "" "apparaître la boîte de dialogue *A*, comme ci-dessous." #. type: Target for macro image -#: user-manual.txt:992 +#: user-manual.txt:1024 #, no-wrap msgid "images/Import1_f20.jpg" msgstr "images/Import1_f20.jpg" #. type: Plain text -#: user-manual.txt:997 +#: user-manual.txt:1029 msgid "" "Towards the bottom right is a dropdown selector with a default label of " "_Dive Log Files_ which accesses different types of direct imports available, " @@ -2604,7 +2575,7 @@ msgstr "" "s'agit de:" #. type: Plain text -#: user-manual.txt:999 +#: user-manual.txt:1031 msgid "" "XML-formatted dive logs (DivingLog 5.0, MacDive and several other dive log " "systems)" @@ -2613,84 +2584,84 @@ msgstr "" "systèmes de carnet de plongée)" #. type: Plain text -#: user-manual.txt:1000 +#: user-manual.txt:1032 msgid "Cochran dive logs" msgstr "Carnets de plongée Cochran" #. type: Plain text -#: user-manual.txt:1001 +#: user-manual.txt:1033 msgid "UDDF-formatted dive logs (e.g. Kenozooid)" msgstr "Carnets de plongée formatés en UDDF (p. ex. Kenozooid)" #. type: Plain text -#: user-manual.txt:1002 +#: user-manual.txt:1034 msgid "UDCF-formatted dive logs" msgstr "Carnets de plongée formatés en UDCF" #. type: Plain text -#: user-manual.txt:1003 +#: user-manual.txt:1035 msgid "Poseidon MkVI CCR logs" msgstr "Logs Poseidon MkVI CCR" #. type: Plain text -#: user-manual.txt:1004 +#: user-manual.txt:1036 msgid "APD Inspiration/Evolution CCR logs" msgstr "Logs APD Inspiration/Evolution CCR" #. type: Plain text -#: user-manual.txt:1005 +#: user-manual.txt:1037 msgid "LiquiVision logs" msgstr "Logs LiquiVision" #. type: Plain text -#: user-manual.txt:1006 +#: user-manual.txt:1038 msgid "divelogs.de logs" msgstr "Logs divelogs.de" #. type: Plain text -#: user-manual.txt:1007 +#: user-manual.txt:1039 msgid "OSTC Tools logs" msgstr "Logs OSTC Tools" #. type: Plain text -#: user-manual.txt:1008 +#: user-manual.txt:1040 msgid "JDiveLog" msgstr "JDiveLog" #. type: Plain text -#: user-manual.txt:1009 +#: user-manual.txt:1041 msgid "Suunto Dive Manager (DM3, DM4, DM5)" msgstr "Suunto Dive Manager (DM3, DM4, DM5)" #. type: Plain text -#: user-manual.txt:1010 +#: user-manual.txt:1042 msgid "DL7 files used by Diver's Alert network (DAN)" msgstr "Fichers DL7 utilisés par Diver's Alert network (DAN)" #. type: Plain text -#: user-manual.txt:1011 +#: user-manual.txt:1043 msgid "Underwater technologies AV1 dive logs" msgstr "Logs Underwater technologies AV1" #. type: Plain text -#: user-manual.txt:1012 +#: user-manual.txt:1044 msgid "Divesoft dive logs" msgstr "Logs Divesoft" #. type: Plain text -#: user-manual.txt:1013 +#: user-manual.txt:1045 msgid "Poseidon MK VI eCCR dive logs" msgstr "Logs Poseidon MK VI eCCR" #. type: Plain text -#: user-manual.txt:1014 +#: user-manual.txt:1046 msgid "" "CSV (text-based and spreadsheet-based) dive logs, including APD CCR logs" msgstr "" "Carnet de plongée CSV (format texte ou tableau), y compris les logs APD CCR" #. type: Plain text -#: user-manual.txt:1019 +#: user-manual.txt:1051 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 " @@ -2705,13 +2676,13 @@ msgstr "" "dialogue d'importation, sont également supportés, comme expliqué ci-dessous." #. type: Title ==== -#: user-manual.txt:1020 +#: user-manual.txt:1052 #, no-wrap msgid "Importing from OSTCTools" msgstr "Importation depuis OSTCTools" #. type: Plain text -#: user-manual.txt:1029 +#: user-manual.txt:1061 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 " @@ -2724,7 +2695,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1033 +#: user-manual.txt:1065 msgid "" "All H&W devices supported by OSTCTools can be imported to _Subsurface_. This " "includes OSTC, OSTC Mk2, OSTC 2N/2C, OSTC3, OSTC Sport, and probably " @@ -2736,7 +2707,7 @@ msgstr "" "CR." #. type: Plain text -#: user-manual.txt:1038 +#: user-manual.txt:1070 msgid "" "Please remember that OSTCTools is *not* true diving log software, but rather " "a useful set of tools for analysis and management of OSTC devices. Only raw " @@ -2750,13 +2721,13 @@ msgstr "" "équipement, notes, etc.) doit être complété manuellement." #. type: Title ==== -#: user-manual.txt:1040 +#: user-manual.txt:1072 #, no-wrap msgid "Importing from Mares Dive Organizer V2.1" msgstr "Importation depuis Mares Dive Organizer V2.1" #. type: Plain text -#: user-manual.txt:1047 +#: user-manual.txt:1079 msgid "" "Since Mares uses proprietary Windows software not compatible with multi-" "platform applications, these dive logs cannot be directly imported into " @@ -2771,7 +2742,7 @@ msgstr "" "comme passerelle pour extraire les informations du carnet de plongée." #. type: Plain text -#: user-manual.txt:1052 +#: user-manual.txt:1084 msgid "" "Export the dive log data from Mares Dive Organizer to your desktop, using a " "_.sdf_ file name extension. Refer to xref:Mares_Export[Appendix C] for more " @@ -2782,7 +2753,7 @@ msgstr "" "vous à l'xref:Mares_Export[Annexe C] pour plus d'information." #. type: Plain text -#: user-manual.txt:1058 +#: user-manual.txt:1090 msgid "" "Data should then be imported into _www.divelogs.de_. First, create a user " "account in _www.divelogs.de_ and Log into that web site, then select _Import " @@ -2792,7 +2763,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1060 +#: user-manual.txt:1092 msgid "" "Finally, import the dives from _divelogs.de_ to _Subsurface_, using the " "instructions below." @@ -2801,13 +2772,13 @@ msgstr "" "suivant les instructions ci-dessous." #. type: Title ==== -#: user-manual.txt:1063 +#: user-manual.txt:1095 #, no-wrap msgid "Importing Scubapro _SmartTrak_ divelogs" msgstr "Importer les logs Scubapro _SmartTrak_" #. type: Plain text -#: user-manual.txt:1070 +#: user-manual.txt:1102 msgid "" "_SmartTrak_ stores the raw data from a Uwatec/Scubapro dive computer along " "with a plethora of other data manually added by the user, ranging from dive " @@ -2818,7 +2789,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1075 +#: user-manual.txt:1107 msgid "" "A stand alone tool for Linux has been developed to import the _.slg_ files " "generated by SmartTrak to Subsurface's _.xml_ format. It can be built " @@ -2827,7 +2798,14 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1078 +#: user-manual.txt:1109 +msgid "" +"In addition, a web service is available for divelog convertions from " +"SmartTrak to _Subsurface_ (see below)." +msgstr "" + +#. type: Plain text +#: user-manual.txt:1112 msgid "" "Feel free to contact the _Subsurface_ development team on mailto:" "subsurface@subsurface-divelog.org[our mailing list] for assistance in " @@ -2837,45 +2815,45 @@ msgstr "" "mailto:subsurface@subsurface-divelog.org[notre liste de diffusion] pour de " "l'aide à l'importation des lofs _SmartTrak_." +#. type: Title ===== +#: user-manual.txt:1113 +#, no-wrap +msgid "Building _smtk2ssrf_" +msgstr "Compiler _smtk2ssrf_" + #. type: Plain text -#: user-manual.txt:1081 +#: user-manual.txt:1117 msgid "" "Assuming the above dependencies have been installed and the _Subsurface_ " "source tree is in the directory _~/src/subsurface_, then:" msgstr "" -#. type: Title ===== -#: user-manual.txt:1082 -#, no-wrap -msgid "Building _smtk2ssrf_" -msgstr "Compiler _smtk2ssrf_" - #. type: Plain text -#: user-manual.txt:1085 +#: user-manual.txt:1119 msgid "Move to the source tree directory." msgstr "" #. type: Plain text -#: user-manual.txt:1087 +#: user-manual.txt:1121 msgid "" "Run \" $ ccmake build \" and set SMARTTRAK_IMPORT option to *on* (off by " "default)." msgstr "" #. type: Plain text -#: user-manual.txt:1088 +#: user-manual.txt:1122 msgid "Generate with [c] and save and exit with [g]." msgstr "" #. type: Plain text -#: user-manual.txt:1090 +#: user-manual.txt:1124 msgid "" "Build as you prefer, using the _build.sh_ script (recomended) or moving to " "build directory and running _make_." msgstr "" #. type: Plain text -#: user-manual.txt:1093 +#: user-manual.txt:1127 msgid "" "After a successful build, there will be an executable named _smtk2ssrf_ in " "the _subsurface/build_ directory. Copy or move it to a directory in your " @@ -2883,13 +2861,13 @@ msgid "" msgstr "" #. type: Title ===== -#: user-manual.txt:1094 +#: user-manual.txt:1128 #, no-wrap msgid "Running" msgstr "Utilisation" #. type: Plain text -#: user-manual.txt:1100 +#: user-manual.txt:1134 msgid "" "_smtk2ssrf_ accepts 0, 2 or more parameters. If it is launched without " "parameters in a graphical user interface, a simple window opens for choosing " @@ -2898,13 +2876,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1101 +#: user-manual.txt:1135 #, no-wrap msgid "images/smtk2ssrf.jpg" msgstr "images/smtk2ssrf.jpg" #. type: Plain text -#: user-manual.txt:1108 +#: user-manual.txt:1142 msgid "" "Existing data in the destination file will be erased, so *DO NOT* use a " "regular subsurface divelog file as a destination: rather, specify a *new* " @@ -2912,20 +2890,20 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1110 +#: user-manual.txt:1144 msgid "" "If launched from a command line with two or more parameters, the format is " "as follows:" msgstr "" #. type: Plain text -#: user-manual.txt:1112 +#: user-manual.txt:1146 #, no-wrap msgid "\t$ smrtk2ssrf /input/file_1.slg /input/file_2.slg /output/file3.xml\n" msgstr "\t$ smrtk2ssrf /input/file_1.slg /input/file_2.slg /output/file3.xml\n" #. type: Plain text -#: user-manual.txt:1120 +#: user-manual.txt:1154 msgid "" "where _input_ is the directory containing the .slg file(s) and _output_ is " "the directory where the _Subsurface_-formatted output is written to. Files " @@ -2936,13 +2914,46 @@ msgid "" msgstr "" #. type: Title ===== -#: user-manual.txt:1121 +#: user-manual.txt:1155 +#, no-wrap +msgid "For the lazy: a web service to convert _SmartTrak_ to _Subsurface_" +msgstr "" + +#. type: Plain text +#: user-manual.txt:1158 +msgid "Open the website at:" +msgstr "" + +#. type: Plain text +#: user-manual.txt:1160 +msgid "_https://thetheoreticaldiver.org/rch-cgi-bin/smtk2ssrf.pl_" +msgstr "" + +#. type: Plain text +#: user-manual.txt:1166 +msgid "" +"This is a no-frills web service for converting _SmartTrak_ dive logs to " +"_Subsurface_. Select the browse button. This allows you to browse your " +"computer directories and to select the _SmartTrak_ divelog to be converted. " +"Once it has been selected, click the _Submit query_ button. After a short " +"while, a dialog box appears (image below) for saving the converted file to " +"the local computer." +msgstr "" + +#. type: Target for macro image +#: user-manual.txt:1167 +#, no-wrap +msgid "images/strk2ssrf_web.jpg" +msgstr "images/strk2ssrf_web.jpg" + +#. type: Title ===== +#: user-manual.txt:1169 #, no-wrap msgid "Merging the imported dives with the existing divelog" msgstr "Fusionner les plongées importées dans un carnet de plongée existant" #. type: Plain text -#: user-manual.txt:1131 +#: user-manual.txt:1179 msgid "" "Open the new file (generated in the previous steps) using _Subsurface_ and " "check the dives and data. If everything is fine, close the _.xml_ file and " @@ -2955,13 +2966,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:1133 +#: user-manual.txt:1181 #, no-wrap msgid "Importing dives from *divelogs.de*" msgstr "Importer des plongées depuis *divelogs.de*" #. type: Plain text -#: user-manual.txt:1146 +#: user-manual.txt:1194 msgid "" "Importing dive information from _divelogs.de_ is simple, using a single " "dialogue box. The _Import -> Import from Divelogs.de_ option should be " @@ -2975,19 +2986,19 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1147 +#: user-manual.txt:1195 #, no-wrap msgid "images/Divelogs1.jpg" msgstr "images/Divelogs1.jpg" #. type: Title ==== -#: user-manual.txt:1150 +#: user-manual.txt:1198 #, no-wrap msgid "Importing data in CSV format" msgstr "Importer des données au format CSV" #. type: Plain text -#: user-manual.txt:1161 +#: user-manual.txt:1209 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 " @@ -3003,16 +3014,13 @@ msgid "" msgstr "" #. type: Title ===== -#: user-manual.txt:1163 +#: user-manual.txt:1211 #, 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" +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:1168 +#: user-manual.txt:1216 msgid "" "_CSV_ files can be viewed using an ordinary text editor. A _CSV_ file is " "normally organized into a single line that provides the headers (or _field " @@ -3021,7 +3029,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1170 +#: user-manual.txt:1218 msgid "" "There are two types of _CSV_ dive logs that can be imported into " "_Subsurface_:" @@ -3030,7 +3038,7 @@ msgstr "" "importées dans _Subsurface_:" #. type: Plain text -#: user-manual.txt:1176 +#: user-manual.txt:1224 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, " @@ -3041,7 +3049,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1185 +#: user-manual.txt:1233 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 " @@ -3055,14 +3063,14 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1188 +#: user-manual.txt:1236 msgid "" "Before being able to import the _CSV_ data to _Subsurface_ *you need to know " "a few things about the data being imported*:" msgstr "" #. type: Plain text -#: user-manual.txt:1196 +#: user-manual.txt:1244 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 " @@ -3074,7 +3082,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1200 +#: user-manual.txt:1248 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 " @@ -3083,7 +3091,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1202 +#: user-manual.txt:1250 msgid "" "Is the numeric information (e.g. dive depth) in metric or in imperial units?" msgstr "" @@ -3091,7 +3099,7 @@ msgstr "" "système métrique ou mesures impériales?" #. type: Plain text -#: user-manual.txt:1209 +#: user-manual.txt:1257 msgid "" "With this information, importing the data into _Subsurface_ is " "straightforward. Select _Import -> Import Log Files_ from the main menu. In " @@ -3101,32 +3109,28 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1210 +#: user-manual.txt:1258 #, no-wrap msgid "images/csv_import1_f20.jpg" msgstr "images/csv_import1_f20.jpg" #. type: Plain text -#: user-manual.txt:1221 +#: user-manual.txt:1269 #, no-wrap msgid "" "At the top left, there is a dropdown list containing pre- configured\n" "settings for common dive computers and software packages.\n" " If the _CSV_ file being imported originated from any of\n" "these pre-configured items, select it. Otherwise use the _Manual Import_\n" -"option. The configuration panel also has dropdown lists for the specification" -" of the appropriate\n" -"field separator (Tab, comma or semicolon), the date format used in the _CSV_" -" file,\n" -"the time units (seconds, minutes or minutes:seconds), as well as the unit" -" system\n" -"(metric or imperial). Selecting the appropriate options among these is" -" critical for\n" +"option. The configuration panel also has dropdown lists for the specification of the appropriate\n" +"field separator (Tab, comma or semicolon), the date format used in the _CSV_ file,\n" +"the time units (seconds, minutes or minutes:seconds), as well as the unit system\n" +"(metric or imperial). Selecting the appropriate options among these is critical for\n" "successful data import.\n" msgstr "" #. type: Plain text -#: user-manual.txt:1233 +#: user-manual.txt:1281 msgid "" "Complete this by ensuring that all the data columns have the appropriate " "column headings. The top blue row of the data table contains the column " @@ -3143,13 +3147,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1234 +#: user-manual.txt:1282 #, no-wrap msgid "images/csv_import2_f20.jpg" msgstr "images/csv_import2_f20.jpg" #. type: Plain text -#: user-manual.txt:1240 +#: user-manual.txt:1288 msgid "" "Continue in this way to ensure all the column headings in the blue row of " "cells correspond to the headings listed in the top part of the dialogue. " @@ -3158,13 +3162,13 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:1244 +#: user-manual.txt:1292 #, no-wrap msgid "*A Diver's Introduction to _CSV_ Files*\n" msgstr "*Introduction aux fichiers _CSV_ pour la plongée*\n" #. type: delimited block * -#: user-manual.txt:1258 +#: user-manual.txt:1306 msgid "" "_CSV_ is an abbreviation for a data file format: _Comma-Separated Values_. " "It is a file format that allows you to view or edit information using a text " @@ -3181,7 +3185,7 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:1267 +#: user-manual.txt:1315 msgid "" "The most important attribute of a _CSV_ file is the _field separator_, the " "character used to separate fields within a single line. The field separator " @@ -3196,7 +3200,7 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:1273 +#: user-manual.txt:1321 #, no-wrap msgid "" "\tDive site,Dive date,Time,Dive_duration, Dive_depth,Dive buddy\n" @@ -3207,7 +3211,7 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:1275 +#: user-manual.txt:1323 msgid "" "The above data are not easily read by a human. Here is the same information " "in TAB-delimited format:" @@ -3216,7 +3220,7 @@ msgstr "" "Voici les mêmes informations dans un format séparé par des tabulations :" #. type: delimited block * -#: user-manual.txt:1281 +#: user-manual.txt:1329 #, no-wrap msgid "" "\tDive site\tDive date\tTime\tDive_duration\tDive_depth\tDive buddy\n" @@ -3227,7 +3231,7 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:1289 +#: user-manual.txt:1337 msgid "" "It is clear why many people prefer the TAB-delimited format to the comma-" "delimited format. The disadvantage is that you cannot see the TAB " @@ -3241,11 +3245,10 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:1300 +#: user-manual.txt:1348 #, no-wrap msgid "" -"\tDive Time (s)\tDepth (m)\tpO~2~ - Setpoint (Bar) \tpO~2~ - C1 Cell 1" -" (Bar)\tAmbient temp. (Celsius)\n" +"\tDive Time (s)\tDepth (m)\tpO~2~ - Setpoint (Bar) \tpO~2~ - C1 Cell 1 (Bar)\tAmbient temp. (Celsius)\n" "\t0 0.0 0.70 0.81 13.1\n" "\t0 1.2 0.70 0.71 13.1\n" "\t0 0.0 0.70 0.71 13.1\n" @@ -3258,7 +3261,7 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:1306 +#: user-manual.txt:1354 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_ " @@ -3269,7 +3272,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1319 +#: user-manual.txt:1367 msgid "" "But, the _CSV_ import has a couple of caveats. Avoid some special characters " "like ampersand (&), less than (<), greater than (>) and double quotes (\") " @@ -3282,14 +3285,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:1320 +#: user-manual.txt:1368 #, no-wrap msgid "Importing Dive coordinates from a mobile device with GPS." -msgstr "" -"Importation des coordonnées de plongée depuis un appareil mobile avec GPS." +msgstr "Importation des coordonnées de plongée depuis un appareil mobile avec GPS." #. type: Plain text -#: user-manual.txt:1324 +#: user-manual.txt:1372 msgid "" "A smartphone with built-in GPS facilities can be used to store the locations " "of dives. This is performed by:" @@ -3298,43 +3300,43 @@ msgstr "" "Ceci est réalisé comme suit:" #. type: Plain text -#: user-manual.txt:1327 +#: user-manual.txt:1375 msgid "" "Taking the mobile device along on the dive boat / liveabord while " "automatically collecting dive site coordinate information." msgstr "" #. type: Plain text -#: user-manual.txt:1329 +#: user-manual.txt:1377 msgid "" "Uploading the coordinates from the mobile device to the _Subsurface_ " "Internet server." msgstr "" #. type: Plain text -#: user-manual.txt:1332 +#: user-manual.txt:1380 msgid "" "Syncronising the dives in the _Subsurface_ dive list with the coordinates " "stored on the _Subsurface_ Internet server." msgstr "" #. type: Plain text -#: user-manual.txt:1334 -msgid "_Subsurface has two tools for achieving this:" -msgstr "_Subsurface_ comporte deux outils pour réaliser cela:" +#: user-manual.txt:1382 +msgid "_Subsurface_ has two tools for achieving this:" +msgstr "_Subsurface_ comporte deux outils pour réaliser cela :" #. type: Plain text -#: user-manual.txt:1336 +#: user-manual.txt:1384 msgid "The _Subsurface Companion App_ (Android and iOS)." msgstr "L'application _Subsurface Companion_ (Android et iOS)." #. type: Plain text -#: user-manual.txt:1338 +#: user-manual.txt:1386 msgid "The _Subsurface-mobile_ app (Android and iOS)" msgstr "L'application _Subsurface-mobile_ (Android et iOS)" #. type: Plain text -#: user-manual.txt:1347 +#: user-manual.txt:1395 msgid "" "Both of these applications perform the collection of dive site coordinates " "and the synchronisation with dives in the _Subsurface_ dive list. However, " @@ -3348,7 +3350,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1349 +#: user-manual.txt:1397 msgid "" "For information on using the _Subsurface Companion App_, click xref:" "S_Companion[_here_]." @@ -3357,19 +3359,19 @@ msgstr "" "Companion_, cliquez xref:S_Companion[_ici_]." #. type: Title ==== -#: user-manual.txt:1350 +#: user-manual.txt:1398 #, no-wrap msgid "Storing and and using GPS locations using _Subsurface-mobile_" msgstr "" #. type: Title ===== -#: user-manual.txt:1352 +#: user-manual.txt:1400 #, no-wrap msgid "Install _Subsurface-mobile_" msgstr "" #. type: Plain text -#: user-manual.txt:1358 +#: user-manual.txt:1406 msgid "" "Find _Subsurface-mobile_ on Google Play and install it on an Android device. " "The app is free. The iOS version is currently experimental. _Subsurface-" @@ -3378,13 +3380,13 @@ msgid "" msgstr "" #. type: Title ===== -#: user-manual.txt:1359 +#: user-manual.txt:1407 #, no-wrap msgid "Create a _Subsurface-mobile_ account" msgstr "" #. type: Plain text -#: user-manual.txt:1367 +#: user-manual.txt:1415 msgid "" "This topic is discussed at length in the _Subsurface-mobile_ user manual. In " "the Credentials screen of _Subsurface-mobile_ provide an e-mail address and " @@ -3396,28 +3398,27 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1370 +#: user-manual.txt:1418 #, no-wrap msgid "" -"*N.B.:* To successfully create a user account, the mobile device must have" -" Internet connectivity,\n" +"*N.B.:* To successfully create a user account, the mobile device must have Internet connectivity,\n" "either through the cellular network or via wifi.\n" msgstr "" #. type: Target for macro image -#: user-manual.txt:1371 +#: user-manual.txt:1419 #, no-wrap msgid "images/MobileCredentials.jpg" msgstr "images/MobileCredentials.jpg" #. type: Title ===== -#: user-manual.txt:1374 +#: user-manual.txt:1422 #, no-wrap msgid "Configure auto-collecting of GPS coordinates" msgstr "" #. type: Plain text -#: user-manual.txt:1380 +#: user-manual.txt:1428 msgid "" "Activate the main menu of _Subsurface-mobile_ by selecting the \"hamburger\" " "menu button at the bottom left of the _Subsurface-mobile_ screen (see image " @@ -3427,45 +3428,39 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1382 +#: user-manual.txt:1430 msgid "" "_Time threshold._ (minutes). The app will try to get a location every X " "minutes" msgstr "" #. type: Plain text -#: user-manual.txt:1384 +#: user-manual.txt:1432 msgid "_Distance threshold._ (meters). Minimum distance between two locations." msgstr "" #. type: Plain text -#: user-manual.txt:1393 +#: user-manual.txt:1441 #, no-wrap msgid "" -"*How are GPS coordinates collected?* Assuming the diver sets 5 minutes and" -" 50\n" -"meters in the settings above, the app will start by recording a location at" -" the current\n" -"location, followed by another one at every 5 minutes *or* every time you move" -" 50 m\n" +"*How are GPS coordinates collected?* Assuming the diver sets 5 minutes and 50\n" +"meters in the settings above, the app will start by recording a location at the current\n" +"location, followed by another one at every 5 minutes *or* every time you move 50 m\n" "from previous location, whichever happens first.\n" -"If subsequent locations are within a radius of 50 meters from the previous" -" one,\n" -"a new location is not saved. If the diver is not moving, only one location" -" is\n" +"If subsequent locations are within a radius of 50 meters from the previous one,\n" +"a new location is not saved. If the diver is not moving, only one location is\n" "saved, at least until the _Time-threshold_ period has elapsed.\n" -"If the diver moves, a trace of the route is obtained by saving a location" -" every 50 meters.\n" +"If the diver moves, a trace of the route is obtained by saving a location every 50 meters.\n" msgstr "" #. type: Title ===== -#: user-manual.txt:1394 +#: user-manual.txt:1442 #, no-wrap msgid "Activate the automated recording of GPS locations" msgstr "" #. type: Plain text -#: user-manual.txt:1399 +#: user-manual.txt:1447 msgid "" "The _Subsurface-mobile_ main menu has a checkbox at the bottom left labled " "_Run location service_ (see image below). Checking the box starts the " @@ -3473,59 +3468,56 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1400 +#: user-manual.txt:1448 #, no-wrap msgid "images/MobileMenu.jpg" msgstr "images/MobileMenu.jpg" #. type: Title ===== -#: user-manual.txt:1402 +#: user-manual.txt:1450 #, no-wrap msgid "After the dive, stop the automated recording of GPS locations" msgstr "" #. type: Plain text -#: user-manual.txt:1405 +#: user-manual.txt:1453 msgid "" "Uncheck the check box at the bottom left of the _Subsurface-mobile_ main " "menu." msgstr "" #. type: Title ===== -#: user-manual.txt:1406 +#: user-manual.txt:1454 #, no-wrap msgid "Upload the GPS locations onto the _Subsurface_ Internet server." msgstr "" #. type: Plain text -#: user-manual.txt:1413 +#: user-manual.txt:1461 #, no-wrap msgid "" -"*N.B.:* Uploading the GPS locations to the Internet can only take place if" -" the mobile\n" +"*N.B.:* Uploading the GPS locations to the Internet can only take place if the mobile\n" "device has reliable access to the Internet, either via a cellular network or\n" -"via a wifi connection. If the Internet is not accessible from the dive" -" site(s),\n" -"then GPS uploading can only take place after the dive or after the dive" -" trip,\n" +"via a wifi connection. If the Internet is not accessible from the dive site(s),\n" +"then GPS uploading can only take place after the dive or after the dive trip,\n" "when an Internet connection has been re-established.\n" msgstr "" #. type: Plain text -#: user-manual.txt:1416 +#: user-manual.txt:1464 msgid "" "From the _Subsurface-mobile_ main menu, select _GPS_ -> _Upload GPS data_. " "The locations are uploaded." msgstr "" #. type: Title ===== -#: user-manual.txt:1417 +#: user-manual.txt:1465 #, no-wrap msgid "Apply the stored GPS locations to dives on the _Subsurface_ dive list." msgstr "" #. type: Plain text -#: user-manual.txt:1426 +#: user-manual.txt:1474 msgid "" "_Subsurface_ collects the first GPS location recorded after the start of a " "dive (obtained within _Subsurface_ from either the dive computer or from the " @@ -3537,7 +3529,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1431 +#: user-manual.txt:1479 msgid "" "The https://subsurface-divelog.org/documentation/subsurface-mobile-user-" "manual[user manual for _Subsurface-mobile_] (accessible from within that " @@ -3546,36 +3538,32 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:1434 +#: user-manual.txt:1482 #, no-wrap -msgid "" -"Importing GPS coordinates with the _Subsurface Companion App_ for mobile" -" phones" +msgid "Importing GPS coordinates with the _Subsurface Companion App_ for mobile phones" msgstr "" #. type: Plain text -#: user-manual.txt:1443 +#: user-manual.txt:1491 #, no-wrap msgid "" "Using the *Subsurface Companion App* on an _Android device_ or\n" "xref:S_iphone[_iPhone_] with GPS, the coordinates\n" "for the diving\n" -"location can be automatically passed to the _Subsurface_ dive log. The" -" Companion App\n" -"stores dive locations on a dedicated Internet server. _Subsurface_ can" -" collect\n" +"location can be automatically passed to the _Subsurface_ dive log. The Companion App\n" +"stores dive locations on a dedicated Internet server. _Subsurface_ can collect\n" "the locations from the server.\n" "To do this:\n" msgstr "" #. type: Title ===== -#: user-manual.txt:1444 +#: user-manual.txt:1492 #, no-wrap msgid "Create a Companion App account" msgstr "" #. type: Plain text -#: user-manual.txt:1449 +#: user-manual.txt:1497 msgid "" "Register on the http://api.hohndel.org/login/[_Subsurface companion web " "page_]. A confirmation email with instructions and a personal *DIVERID* " @@ -3584,7 +3572,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1454 +#: user-manual.txt:1502 msgid "" "Download the app from https://play.google.com/store/apps/details?id=org." "subsurface[Google Play Store] or from https://f-droid.org/repository/browse/?" @@ -3592,18 +3580,18 @@ msgid "" msgstr "" #. type: Title ===== -#: user-manual.txt:1455 +#: user-manual.txt:1503 #, no-wrap msgid "Using the Subsurface companion app on an Android smartphone" msgstr "" #. type: Plain text -#: user-manual.txt:1458 +#: user-manual.txt:1506 msgid "On first use the app has three options:" msgstr "" #. type: Plain text -#: user-manual.txt:1464 +#: user-manual.txt:1512 msgid "" "_Create a new account._ Equivalent to registering in the _Subsurface_ " "companion page using an Internet browser. You can request a *DIVERID* using " @@ -3613,14 +3601,14 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1467 +#: user-manual.txt:1515 msgid "" "_Retrieve an account._ If you forget your *DIVERID* you will receive an " "email to recover the ID string." msgstr "" #. type: Plain text -#: user-manual.txt:1471 +#: user-manual.txt:1519 msgid "" "_Use an existing account._ You are prompted for your *DIVERID*. The app " "saves this *DIVERID* and doesn’t ask for it again unless you use the " @@ -3628,7 +3616,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1479 +#: user-manual.txt:1527 msgid "" "In the _Subsurface_ main program, the *DIVERID* should also be entered on " "the Default Preferences panel, by selecting _File -> Preferences -> General_ " @@ -3637,13 +3625,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1481 +#: user-manual.txt:1529 #, no-wrap msgid "*Creating new dive locations*\n" msgstr "*Créer de nouveaux emplacements de plongée*\n" #. type: Plain text -#: user-manual.txt:1485 +#: user-manual.txt:1533 msgid "" "Now you are ready to get a dive position and send it to the server. The " "Android display looks like the left hand image (*A*) below, but without any " @@ -3651,21 +3639,21 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1488 +#: user-manual.txt:1536 msgid "" "Touch the + icon at the top right to add a new dive site. A menu with 3 " "options shows:" msgstr "" #. type: Plain text -#: user-manual.txt:1491 +#: user-manual.txt:1539 msgid "" "Current: A prompt for a place name is shown (or a request to activate the " "GPS if it is turned off), after which the current location is saved." msgstr "" #. type: Plain text -#: user-manual.txt:1500 +#: user-manual.txt:1548 msgid "" "Use Map: This option allows you to fix a position by searching a world map. " "A world map is shown (see *B* below). Specify the desired position with a " @@ -3678,13 +3666,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1501 +#: user-manual.txt:1549 #, no-wrap msgid "images/Companion_5.jpg" msgstr "images/Companion_5.jpg" #. type: Plain text -#: user-manual.txt:1508 +#: user-manual.txt:1556 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 its " @@ -3693,13 +3681,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1511 +#: user-manual.txt:1559 #, no-wrap msgid "*List of dive locations*\n" msgstr "*Liste des emplacements de plongée*\n" #. type: Plain text -#: user-manual.txt:1518 +#: user-manual.txt:1566 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 " @@ -3710,7 +3698,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1526 +#: user-manual.txt:1574 msgid "" "Dive locations in this list can be viewed in two ways: a list of locations " "or a map showing them. The display mode (List or Map) is changed by " @@ -3722,13 +3710,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1527 +#: user-manual.txt:1575 #, no-wrap msgid "images/Companion_4.jpg" msgstr "images/Companion_4.jpg" #. type: Plain text -#: user-manual.txt:1533 +#: user-manual.txt:1581 msgid "" "Upon selecting a dive (*not* selecting the check box), the name given to it, " "date/time and GPS coordinates are shown with two options at the top of the " @@ -3736,12 +3724,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1535 +#: user-manual.txt:1583 msgid "Edit (pencil): Change the name of the dive location." msgstr "" #. type: Plain text -#: user-manual.txt:1540 +#: user-manual.txt:1588 msgid "" "Maps: Display a map showing the dive location. After editing and saving a " "dive location (see *C* above), upload it to the web service, as explained " @@ -3749,13 +3737,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1542 +#: user-manual.txt:1590 #, no-wrap msgid "*Uploading dive locations*\n" msgstr "" #. type: Plain text -#: user-manual.txt:1547 +#: user-manual.txt:1595 msgid "" "There are several ways to send locations to the server. The easiest is " "simply selecting the locations (See *A* below) and then touching the right " @@ -3763,50 +3751,50 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1552 +#: user-manual.txt:1600 msgid "" "Be careful! The trash icon on the right means exactly what it should; it " "deletes the selected dive location(s)." msgstr "" #. type: Target for macro image -#: user-manual.txt:1553 +#: user-manual.txt:1601 #, no-wrap msgid "images/Companion_1.jpg" msgstr "images/Companion_1.jpg" #. type: Plain text -#: user-manual.txt:1558 +#: user-manual.txt:1606 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: Plain text -#: user-manual.txt:1561 +#: user-manual.txt:1609 #, no-wrap msgid "*Settings on the Companion App*\n" msgstr "" #. type: Plain text -#: user-manual.txt:1563 +#: user-manual.txt:1611 msgid "" "Selecting the _Settings_ menu option results in the right hand image above " "(*B*)." msgstr "" #. type: Plain text -#: user-manual.txt:1565 +#: user-manual.txt:1613 msgid "_Server and account_" msgstr "" #. type: Plain text -#: user-manual.txt:1567 +#: user-manual.txt:1615 msgid "_Web-service URL._ This is predefined (http://api.hohndel.org/)" msgstr "" #. type: Plain text -#: user-manual.txt:1570 +#: user-manual.txt:1618 msgid "" "_User ID._ The DIVERID obtained by registering as described above. The " "easiest way to get it is to copy and paste from the confirmation email or " @@ -3814,66 +3802,66 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1572 +#: user-manual.txt:1620 msgid "_Synchronisation_" msgstr "_Synchronisation_" #. type: Plain text -#: user-manual.txt:1575 +#: user-manual.txt:1623 msgid "" "_Synchronize on startup_. If selected, dive locations in the Android device " "and those on the web service synchronize each time the app is started." msgstr "" #. type: Plain text -#: user-manual.txt:1578 +#: user-manual.txt:1626 msgid "" "_Upload new dives._ If selected, each time the user adds a dive location it " "is automatically sent to the server." msgstr "" #. type: Plain text -#: user-manual.txt:1580 +#: user-manual.txt:1628 msgid "_Background service_" msgstr "" #. type: Plain text -#: user-manual.txt:1583 +#: user-manual.txt:1631 msgid "" "Instead of entering an unique dive location, you can leave the service " "running in the background, allowing a continuous collection of GPS locations." msgstr "" #. type: Plain text -#: user-manual.txt:1585 +#: user-manual.txt:1633 msgid "The settings below define the behavior of the service:" msgstr "" #. type: Plain text -#: user-manual.txt:1588 +#: user-manual.txt:1636 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:1590 +#: user-manual.txt:1638 msgid "_Min distance._ In meters. Minimum distance between two locations." msgstr "" #. type: Plain text -#: user-manual.txt:1592 +#: user-manual.txt:1640 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:1593 user-manual.txt:1694 user-manual.txt:2119 +#: user-manual.txt:1641 user-manual.txt:1742 user-manual.txt:2214 #, no-wrap msgid "images/icons/info.jpg" msgstr "images/icons/info.jpg" #. type: Plain text -#: user-manual.txt:1603 +#: user-manual.txt:1651 msgid "" "_How does the background service work?_ Assuming the diver sets 5 minutes " "and 50 meters in the settings above, the app will start by recording a " @@ -3886,55 +3874,55 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1605 +#: user-manual.txt:1653 msgid "_Other_" msgstr "" #. type: Plain text -#: user-manual.txt:1608 +#: user-manual.txt:1656 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:1610 +#: user-manual.txt:1658 msgid "_Subsurface website._ A link to the URL of Subsurface web" msgstr "" #. type: Plain text -#: user-manual.txt:1612 +#: user-manual.txt:1660 msgid "_Version._ Displays the current version of the Companion App." msgstr "" #. type: Plain text -#: user-manual.txt:1614 +#: user-manual.txt:1662 msgid "_Search_" msgstr "" #. type: Plain text -#: user-manual.txt:1616 +#: user-manual.txt:1664 msgid "Search the saved dive locations by name or by date and time." msgstr "" #. type: Plain text -#: user-manual.txt:1618 +#: user-manual.txt:1666 msgid "_Start service_" msgstr "" #. type: Plain text -#: user-manual.txt:1620 +#: user-manual.txt:1668 msgid "" "Starts the _background service_ following the previously defined settings." msgstr "" #. type: Plain text -#: user-manual.txt:1622 +#: user-manual.txt:1670 msgid "_Disconnect_" msgstr "" #. type: Plain text -#: user-manual.txt:1629 +#: user-manual.txt:1677 msgid "" "This is admittedly a badly named option that disconnects the app from the " "server. It resets the user ID in the app, showing the first screen where an " @@ -3944,25 +3932,24 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1631 +#: user-manual.txt:1679 msgid "_Send all locations_" msgstr "" #. type: Plain text -#: user-manual.txt:1633 +#: user-manual.txt:1681 msgid "" "This option sends all locations stored in the Android device to the server." msgstr "" #. type: Title ===== -#: user-manual.txt:1635 +#: user-manual.txt:1683 #, no-wrap -msgid "" -"Using the Subsurface companion app on an _iPhone_ to record dive locations" +msgid "Using the Subsurface companion app on an _iPhone_ to record dive locations" msgstr "" #. type: Plain text -#: user-manual.txt:1640 +#: user-manual.txt:1688 msgid "" "The iPhone interface is quite simple. Type the user ID (obtained during " "registration) into the space reserved for it, then select \"Dive in\" (see " @@ -3970,13 +3957,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1641 +#: user-manual.txt:1689 #, no-wrap msgid "images/iphone.jpg" msgstr "images/iphone.jpg" #. type: Plain text -#: user-manual.txt:1652 +#: user-manual.txt:1700 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 " @@ -3990,7 +3977,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1658 +#: user-manual.txt:1706 msgid "" "You can edit the site name afterwards by selecting the dive from the dive " "list and clicking on the site name. There are no other editable fields. The " @@ -3999,13 +3986,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1661 +#: user-manual.txt:1709 #, no-wrap msgid "*Downloading dive locations to the _Subsurface_ divelog*\n" msgstr "" #. type: Plain text -#: user-manual.txt:1669 +#: user-manual.txt:1717 msgid "" "Download dive(s) from a dive computer or enter them manually into " "_Subsurface_ before obtaining the GPS coordinates from the server. The " @@ -4017,13 +4004,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1670 +#: user-manual.txt:1718 #, no-wrap msgid "images/DownloadGPS.jpg" msgstr "images/DownloadGPS.jpg" #. type: Plain text -#: user-manual.txt:1678 +#: user-manual.txt:1726 msgid "" "Note that the _Apply_ button is now active: selecting it updates the " "locations of the newly entered or uploaded dives in _Subsurface_, i.e. it " @@ -4034,7 +4021,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1685 +#: user-manual.txt:1733 msgid "" "Since _Subsurface_ matches GPS locations from the mobile device and dive " "information from the dive computer based on date-time data, automatic " @@ -4046,7 +4033,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1693 +#: user-manual.txt:1741 msgid "" "Similar date-times may not always be possible and there may be many reasons " "for this (e.g. time zones). _Subsurface_ may also be unable to decide which " @@ -4059,12 +4046,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1697 +#: user-manual.txt:1745 msgid "TIPS:" msgstr "CONSEILS:" #. type: Plain text -#: user-manual.txt:1700 +#: user-manual.txt:1748 msgid "" "_Background service_ may fill the location list with unnecessary locations " "that don’t correspond to the exact dive point but do correspond to the " @@ -4072,14 +4059,14 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1701 +#: user-manual.txt:1749 msgid "" "Right now, these locations are difficult to delete from the server. In some " "situations it" msgstr "" #. type: Plain text -#: user-manual.txt:1704 +#: user-manual.txt:1752 msgid "" "is better to clean up the list on the mobile device before sending the dive " "points to the web server by simply deleting the inappropriate locations. " @@ -4088,7 +4075,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1707 +#: user-manual.txt:1755 msgid "" "It may also be useful to give informative names to the locations sent to the " "web server, or at least to use an informative name in the _Name Template_ " @@ -4097,13 +4084,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:1709 +#: user-manual.txt:1757 #, no-wrap msgid "Adding photographs to dives" msgstr "Ajouter des photos aux plongées" #. type: Plain text -#: user-manual.txt:1715 +#: user-manual.txt:1763 msgid "" "Many (if not most) divers take photographs during a dive. _Subsurface_ " "allows the storage and display of photographs for each dive. Photos are " @@ -4112,15 +4099,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:1716 +#: user-manual.txt:1764 #, no-wrap msgid "Loading photos and synchronizing between dive computer and camera" -msgstr "" -"Chargement des photos et synchronisation entre l'ordinateur de plongée et" -" l'appareil photo" +msgstr "Chargement des photos et synchronisation entre l'ordinateur de plongée et l'appareil photo" #. type: Plain text -#: user-manual.txt:1722 +#: user-manual.txt:1770 msgid "" "Right-click on a dive or on a group of dives on the dive list, bringing up " "the xref:S_DiveListContextMenu[Dive list context Menu]. Select the " @@ -4130,13 +4115,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1723 +#: user-manual.txt:1771 #, no-wrap msgid "images/LoadImage2_f20.jpg" msgstr "images/LoadImage2_f20.jpg" #. type: Plain text -#: user-manual.txt:1730 +#: user-manual.txt:1778 msgid "" "If photos are imported from the Internet, provide a URL pointing to a single " "photograph. If the URL points to a directory, no images are imported: " @@ -4146,7 +4131,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1737 +#: user-manual.txt:1785 msgid "" "Having selected the local folder or Internet image to be imported, the time " "synchronization dialog appears (see image below). The time synchronization " @@ -4158,93 +4143,72 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1739 +#: user-manual.txt:1787 msgid "_Subsurface_ synchronizes camera with dive computer in three ways:" msgstr "" "_Subsurface_ synchronise l'appareil photo avec l'ordinateur de plongée de " "trois façons:" #. type: Plain text -#: user-manual.txt:1742 +#: user-manual.txt:1790 #, no-wrap msgid "" -"*Pro-actively*: Before the dive, ensure synchronization of the dive computer" -" time settings with\n" -"the time settings of the camera by changing the date-time settings on one or" -" both of these devices.\n" +"*Pro-actively*: Before the dive, ensure synchronization of the dive computer time settings with\n" +"the time settings of the camera by changing the date-time settings on one or both of these devices.\n" msgstr "" #. type: Plain text -#: user-manual.txt:1753 +#: user-manual.txt:1801 #, no-wrap msgid "" -"*Manually*: Writing down the exact camera time at the start of a dive allows" -" using the\n" +"*Manually*: Writing down the exact camera time at the start of a dive allows using the\n" "difference in time between the two devices. As long as the device\n" "settings for time has not been changed in either device, the times of\n" -"both devices after the dive or even at the end of the day allows manually" -" setting the time\n" -"difference in the _Time shift_ dialog (see image below). Towards the top of" -" the dialog is a time\n" -"setting tool immediately under the heading _Shift times of image(s) by_, in" -" the image below.\n" -"If the camera time is 7 minutes later than that of the dive computer, set the" -" time setting\n" +"both devices after the dive or even at the end of the day allows manually setting the time\n" +"difference in the _Time shift_ dialog (see image below). Towards the top of the dialog is a time\n" +"setting tool immediately under the heading _Shift times of image(s) by_, in the image below.\n" +"If the camera time is 7 minutes later than that of the dive computer, set the time setting\n" "tool to a value of 00:07 and select the _Earlier_ radio button.\n" "This is appropriate, since the photos need to be shifted\n" -"7 minutes earlier (camera is 7 minutes ahead of dive computer). Ignore any" -" \"AM\" or \"PM\" suffix\n" +"7 minutes earlier (camera is 7 minutes ahead of dive computer). Ignore any \"AM\" or \"PM\" suffix\n" "in that tool. Click the _OK_ button and synchronization is done.\n" msgstr "" #. type: Target for macro image -#: user-manual.txt:1754 +#: user-manual.txt:1802 #, no-wrap msgid "images/LoadImage3b_f23.jpg" msgstr "images/LoadImage3b_f23.jpg" #. type: Plain text -#: user-manual.txt:1772 -#, no-wrap -msgid "" -"*By photograph*: There is a very slick way of achieving synchronization," -" requiring a\n" -"photograph of the face of the dive computer showing the time. _Subsurface_" -" gets\n" -"the exact time the photograph was taken, using the metadata the camera stores" -" within\n" -"each photo and compares this with the time visible on the photo. To do this," -" use the\n" -"bottom half of the _Time shift_ dialog. In this case the top part of the" -" dialog is ignored. Click on\n" -"the horizontal bar called _Select image of dive computer showing time_. This" -" brings up\n" -"a file browser for selecting the photograph of the dive computer time. Select" -" the\n" -"photograph using the file browser and click on _OK_. This photograph of the" -" dive computer\n" -"appears in the bottom panel of the _Shift times_ dialog. Now _Subsurface_" -" knows exactly\n" -"when the photograph was taken. Now set the date-time dialog to the left of" -" the photo\n" +#: user-manual.txt:1820 +#, no-wrap +msgid "" +"*By photograph*: There is a very slick way of achieving synchronization, requiring a\n" +"photograph of the face of the dive computer showing the time. _Subsurface_ gets\n" +"the exact time the photograph was taken, using the metadata the camera stores within\n" +"each photo and compares this with the time visible on the photo. To do this, use the\n" +"bottom half of the _Time shift_ dialog. In this case the top part of the dialog is ignored. Click on\n" +"the horizontal bar called _Select image of dive computer showing time_. This brings up\n" +"a file browser for selecting the photograph of the dive computer time. Select the\n" +"photograph using the file browser and click on _OK_. This photograph of the dive computer\n" +"appears in the bottom panel of the _Shift times_ dialog. Now _Subsurface_ knows exactly\n" +"when the photograph was taken. Now set the date-time dialog to the left of the photo\n" "so it reflects the date and time of the dive computer in the photo. When the\n" -"date-time tool has been set, _Subsurface_ knows exactly what the time" -" difference between\n" -"camera and dive computer is, and it can synchronize the devices. The image" -" below shows\n" -"a photograph of the face of the dive computer and with the date-time tool set" -" to the\n" +"date-time tool has been set, _Subsurface_ knows exactly what the time difference between\n" +"camera and dive computer is, and it can synchronize the devices. The image below shows\n" +"a photograph of the face of the dive computer and with the date-time tool set to the\n" "date-time.\n" msgstr "" #. type: Target for macro image -#: user-manual.txt:1773 +#: user-manual.txt:1821 #, no-wrap msgid "images/LoadImage3c_f23.jpg" msgstr "images/LoadImage3c_f23.jpg" #. type: Plain text -#: user-manual.txt:1777 +#: user-manual.txt:1825 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 (see the red warning in the image " @@ -4255,23 +4219,23 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:1778 +#: user-manual.txt:1826 #, no-wrap msgid "Viewing the photos" msgstr "Visualiser les photos" #. type: Plain text -#: user-manual.txt:1781 +#: user-manual.txt:1829 msgid "After the images have been loaded, they appear in two places:" msgstr "Après avoir été chargées, les images apparaissent à deux endroits:" #. type: Plain text -#: user-manual.txt:1783 +#: user-manual.txt:1831 msgid "the _Photos_ tab of the *Notes* panel (left part of image below)." msgstr "" #. type: Plain text -#: user-manual.txt:1787 +#: user-manual.txt:1835 msgid "" "as tiny icons (stubs) on the dive profile at the appropriate positions " "reflecting the time each photograph was taken. To view the photos on the " @@ -4280,37 +4244,37 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1788 +#: user-manual.txt:1836 #, no-wrap msgid "images/icons/ShowPhotos_f20.png" msgstr "images/icons/ShowPhotos_f20.png" #. type: Plain text -#: user-manual.txt:1791 +#: user-manual.txt:1839 msgid "This results in a profile display as in the image below:" msgstr "" #. type: Target for macro image -#: user-manual.txt:1792 +#: user-manual.txt:1840 #, no-wrap msgid "images/LoadImage4_f20.jpg" msgstr "images/LoadImage4_f20.jpg" #. type: Plain text -#: user-manual.txt:1796 +#: user-manual.txt:1844 msgid "" "Hover the mouse over any of the photo stubs. A thumbnail photo is shown of " "the appropriate photo. See the image below:" msgstr "" #. type: Target for macro image -#: user-manual.txt:1797 +#: user-manual.txt:1845 #, no-wrap msgid "images/LoadImage5_f20.jpg" msgstr "images/LoadImage5_f20.jpg" #. type: Plain text -#: user-manual.txt:1806 +#: user-manual.txt:1854 msgid "" "Clicking on the thumbnail brings up a full size photo overlaid on the " "_Subsurface_ window, allowing a good view of the photographs (see the image " @@ -4321,19 +4285,19 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1807 +#: user-manual.txt:1855 #, no-wrap msgid "images/LoadImage6_f20.jpg" msgstr "images/LoadImage6_f20.jpg" #. type: Title ==== -#: user-manual.txt:1809 +#: user-manual.txt:1857 #, no-wrap msgid "The _Photos_ tab" msgstr "L'onglet _Photos_" #. type: Plain text -#: user-manual.txt:1819 +#: user-manual.txt:1867 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 " @@ -4349,13 +4313,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:1820 +#: user-manual.txt:1868 #, no-wrap msgid "Photos on an external hard disk" msgstr "Photos stockées sur un disque dur externe" #. type: Plain text -#: user-manual.txt:1830 +#: user-manual.txt:1878 msgid "" "Most underwater photographers store photos on an external drive. If such a " "drive can be mapped by the operating system (almost always the case) the " @@ -4372,13 +4336,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:1831 +#: user-manual.txt:1879 #, no-wrap msgid "Finding out which dives have associated photos." msgstr "Trouver quelles plongées ont des photos associées." #. type: Plain text -#: user-manual.txt:1836 +#: user-manual.txt:1884 msgid "" "Inspecting each individual dive in order to determine whether there are " "associated photos can be time consuming. There is a rapid way of seeing " @@ -4392,57 +4356,47 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:1838 +#: user-manual.txt:1886 #, no-wrap msgid "Moving photographs among directories, hard disks or computers" msgstr "Déplacer des photos entre dossiers, disques durs ou ordinateurs" #. type: Plain text -#: user-manual.txt:1847 +#: user-manual.txt:1895 #, no-wrap msgid "" -"After a photograph has been loaded into _Subsurface_ and associated with a" -" specific dive,\n" -"_Subsurface_ saves the directory path where the photo lies as well as the" -" file name of the photo,\n" +"After a photograph has been loaded into _Subsurface_ and associated with a specific dive,\n" +"_Subsurface_ saves the directory path where the photo lies as well as the file name of the photo,\n" "in order to find it when the dive is opened again.\n" -"If the photo or the whole photo collection is moved to another drive or to a" -" different\n" -" machine, the path to the photo changes. Now, _Subsurface_ looks for the" -" photos at their original location before they were moved,\n" -" cannot find them and cannot display them. Because, after moving photos," -" large numbers of photos\n" -" may need to be deleted and re-imported from the new location, _Subsurface_" -" has a mechanism to ease this inconvenience: automatic updates using" -" fingerprints.\n" +"If the photo or the whole photo collection is moved to another drive or to a different\n" +" machine, the path to the photo changes. Now, _Subsurface_ looks for the photos at their original location before they were moved,\n" +" cannot find them and cannot display them. Because, after moving photos, large numbers of photos\n" +" may need to be deleted and re-imported from the new location, _Subsurface_ has a mechanism to ease this inconvenience: automatic updates using fingerprints.\n" msgstr "" #. type: Plain text -#: user-manual.txt:1851 +#: user-manual.txt:1899 #, no-wrap msgid "" -"When a photo is loaded into _Subsurface_, a fingerprint for the image is" -" calculated and stored with the\n" -" other reference information for that photo. After moving a photo collection" -" (that has already been loaded\n" -" into _Subsurface_) to a different directory, disk or computer, _Subsurface_" -" can:\n" +"When a photo is loaded into _Subsurface_, a fingerprint for the image is calculated and stored with the\n" +" other reference information for that photo. After moving a photo collection (that has already been loaded\n" +" into _Subsurface_) to a different directory, disk or computer, _Subsurface_ can:\n" msgstr "" #. type: Plain text -#: user-manual.txt:1853 +#: user-manual.txt:1901 msgid "" "look through a particular directory (and all its subdirectories recursively) " "where photos have been moved to," msgstr "" #. type: Plain text -#: user-manual.txt:1854 +#: user-manual.txt:1902 msgid "calculate fingerprints for all photos in this directory, and" msgstr "" #. type: Plain text -#: user-manual.txt:1857 +#: user-manual.txt:1905 msgid "" "if there is a match between a calculated fingerprint and the one calculated " "when a photo was originally loaded into _Subsurface_ (even if the original " @@ -4451,27 +4405,23 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1862 +#: user-manual.txt:1910 #, no-wrap msgid "" -"This is done by selecting from the Main Menu: _File -> Find moved" -" images_. This brings up a window within\n" -" which the NEW directory of the photos needs to be specified. Select the" -" appropriate directory and click\n" -" the _Scan_ button towards the bottom right of the panel. The process may" -" require several minutes to\n" -" complete, after which _Subsurface_ will show the appropriate photographs" -" when a particular dive is opened.\n" +"This is done by selecting from the Main Menu: _File -> Find moved images_. This brings up a window within\n" +" which the NEW directory of the photos needs to be specified. Select the appropriate directory and click\n" +" the _Scan_ button towards the bottom right of the panel. The process may require several minutes to\n" +" complete, after which _Subsurface_ will show the appropriate photographs when a particular dive is opened.\n" msgstr "" #. type: delimited block * -#: user-manual.txt:1867 +#: user-manual.txt:1915 #, no-wrap msgid "*Upgrading legacy photo collections without fingerprints*\n" msgstr "" #. type: delimited block * -#: user-manual.txt:1872 +#: user-manual.txt:1920 msgid "" "_Subsurface_ automatically calculates fingerprints for all images that it " "can access. When manipulating images, ensure that all the images associated " @@ -4479,47 +4429,47 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:1874 +#: user-manual.txt:1922 msgid "" "_Subsurface_ automatically checks and, if necessary, updates the " "fingerprints associated with a single dive if:" msgstr "" #. type: delimited block * -#: user-manual.txt:1876 +#: user-manual.txt:1924 msgid "" "The images associated with that dive are visible as thumbnails on the *Dive " "Profile*." msgstr "" #. type: delimited block * -#: user-manual.txt:1878 +#: user-manual.txt:1926 msgid "" "If you edit anything in the *Notes* panel and save the edits by selecting " "_Apply changes_." msgstr "" #. type: Title === -#: user-manual.txt:1881 +#: user-manual.txt:1929 #, no-wrap msgid "Logging special types of dives" msgstr "" #. type: Plain text -#: user-manual.txt:1884 +#: user-manual.txt:1932 msgid "" "This section gives examples of the versatility of _Subsurface_ as a dive " "logging tool." msgstr "" #. type: Title ==== -#: user-manual.txt:1887 +#: user-manual.txt:1935 #, no-wrap msgid "Multicylinder dives" msgstr "" #. type: Plain text -#: user-manual.txt:1894 +#: user-manual.txt:1942 msgid "" "_Subsurface_ easily handles dives involving more than one cylinder. Multi-" "cylinder diving usually happens (a) if a diver doesn’t have enough gas for " @@ -4531,50 +4481,40 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1898 +#: user-manual.txt:1946 #, no-wrap msgid "" -"*Describe the cylinders used during the dive* This is performed in the" -" *Equipment tab* of\n" -"the *Info* panel, as xref:cylinder_definitions[described above]. Enter the" -" cylinders one by one,\n" +"*Describe the cylinders used during the dive* This is performed in the *Equipment tab* of\n" +"the *Info* panel, as xref:cylinder_definitions[described above]. Enter the cylinders one by one,\n" "specifying its size and pressure, as well as the gas composition within it.\n" msgstr "" #. type: Plain text -#: user-manual.txt:1904 +#: user-manual.txt:1952 #, no-wrap msgid "" -"*Record the times at which the switch from one cylinder to another was done:*" -" This is information\n" -"tracked by some dive computers (provided the diver indicated these changes to" -" the dive computer\n" -"by pressing specific buttons). If the dive computer does not provide the" -" information, the diver has to\n" -"record these changes using a different method, e.g. writing it on a slate or" -" by creating a bookmark on the dive\n" +"*Record the times at which the switch from one cylinder to another was done:* This is information\n" +"tracked by some dive computers (provided the diver indicated these changes to the dive computer\n" +"by pressing specific buttons). If the dive computer does not provide the information, the diver has to\n" +"record these changes using a different method, e.g. writing it on a slate or by creating a bookmark on the dive\n" "computer.\n" msgstr "" #. type: Plain text -#: user-manual.txt:1912 +#: user-manual.txt:1960 #, no-wrap msgid "" "*Record the cylinder changes on the dive profile*: If the latter option\n" -"was followed, the diver needs to indicate the gas change event by" -" right-clicking at the appropriate point\n" -"in time on the *Dive Profile* panel and indicating the cylinder to which the" -" change was made. After\n" -"right-clicking, follow the context menu to \"Add gas change\" and select the" -" appropriate cylinder from\n" +"was followed, the diver needs to indicate the gas change event by right-clicking at the appropriate point\n" +"in time on the *Dive Profile* panel and indicating the cylinder to which the change was made. After\n" +"right-clicking, follow the context menu to \"Add gas change\" and select the appropriate cylinder from\n" "those defined during the first step, above (see image below). If the\n" -"*tank bar* button in the toolbar has been activated, the cylinder switches" -" are also indicated in the\n" +"*tank bar* button in the toolbar has been activated, the cylinder switches are also indicated in the\n" "tank bar (image below).\n" msgstr "" #. type: Plain text -#: user-manual.txt:1916 +#: user-manual.txt:1964 msgid "" "When this is complete, _Subsurface_ indicates the appropriate use of " "cylinders in the dive profile. Below is a two-cylinder dive, starting off " @@ -4583,105 +4523,110 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1917 +#: user-manual.txt:1965 #, no-wrap msgid "images/multicylinder_dive.jpg" msgstr "images/multicylinder_dive.jpg" +#. type: Plain text +#: user-manual.txt:1974 +msgid "" +"Several dive computers perform automatic recording of cylinder pressure. In " +"this case no manual intervention is needed. Older dive computers (e.g. " +"Uwatec Galileo, several Suunto models) handle more than one pressure " +"transducer on cylinders, switching from one sensor to another as the diver " +"switches among cylinders and providing a sequential record of cylinders " +"pressures during a dive. Some of the latest models (e.g. Shearwater Perdix " +"AI, Scubapro G2) record two or more pressure transducers concurrently and " +"continuously during the whole dive. In these cases _Suburface correctly " +"interprets the data. There is continuous effort within the _Subsurface_ " +"development team to add new dive computer models to those that can be " +"downloaded from and to represent cylinder pressures correctly. Regardless of " +"the type of sensor handling of dive computers, technical divers are likely " +"to use both automated and manual methods of cylinder pressure logging when " +"more than two gases are used. However, automated recording of cylinder " +"pressure simplifies logging of sidemount dives (where two cylinders are " +"used). See the link:https://subsurface-divelog.org/documentation/supported-" +"dive-computers/[list of supported dive computers]." +msgstr "" + #. type: Title ==== -#: user-manual.txt:1919 +#: user-manual.txt:1975 #, no-wrap msgid "Sidemount dives" msgstr "Plongées Sidemount" #. type: Plain text -#: user-manual.txt:1925 +#: user-manual.txt:1982 msgid "" "Sidemount diving is just another form of multi-cylinder diving, often with " "both or all cylinders having the same gas mixture. Although it’s a popular " "configuration for cave divers, sidemount diving can be done by recreational " -"divers who’ve completed the appropriate training. Sidemount dive logging " -"involves three steps, exactly as with multi-cylinder dives above:" +"divers who have completed the appropriate training. See the comments in the " +"last paragraph, above, about automated recording of cylinder pressures. " +"Manual logging of cylinder pressures during sidemount involves three steps, " +"exactly as with multi-cylinder dives above:" msgstr "" #. type: Plain text -#: user-manual.txt:1934 +#: user-manual.txt:1991 #, no-wrap msgid "" -"*During the dive, record cylinder switch events*. Since sidemount diving" -" normally involves two\n" -"cylinders with air or with the same gas mixture, _Subsurface_ distinguishes" -" between these different\n" -"cylinders. In contrast, many dive computers that allow gas switching only" -" distinguish between different\n" -"_gases_ used, not among different _cylinders_ used. This means when sidemount" -" dives are downloaded\n" -"from these dive computers, the switching event between cylinders with the" -" same gas is not downloaded. This may mean\n" -"that a diver may have to keep a written log of cylinder switch times using a" -" slate, or (if the dive computer\n" -"has the capability) marking each cylinder switch with a bookmark that can be" -" retrieved later. Returning\n" -"from a dive with the times of cylinder changes is the only tedious part of" -" logging sidemount dives.\n" +"*During the dive, record cylinder switch events*. Since sidemount diving normally involves two\n" +"cylinders with air or with the same gas mixture, _Subsurface_ distinguishes between these different\n" +"cylinders. In contrast, many dive computers that allow gas switching only distinguish between different\n" +"_gases_ used, not among different _cylinders_ used. This means when sidemount dives are downloaded\n" +"from these dive computers, the switching event between cylinders with the same gas is not downloaded. This may mean\n" +"that a diver may have to keep a written log of cylinder switch times using a slate, or (if the dive computer\n" +"has the capability) marking each cylinder switch with a bookmark that can be retrieved later. Returning\n" +"from a dive with the times of cylinder changes is the only tedious part of logging sidemount dives.\n" msgstr "" #. type: Plain text -#: user-manual.txt:1937 +#: user-manual.txt:1994 #, no-wrap msgid "" -"*Within _Subsurface_ describe the cylinders used during the dive*. The diver" -" needs to provide the\n" -"specifications of the different cylinders, using the *Equipment* tab of the" -" *Info Panel* (see\n" +"*Within _Subsurface_ describe the cylinders used during the dive*. The diver needs to provide the\n" +"specifications of the different cylinders, using the *Equipment* tab of the *Info Panel* (see\n" "image below where two 12 litre cylinders were used).\n" msgstr "" #. type: Plain text -#: user-manual.txt:1947 -#, no-wrap -msgid "" -"*Indicate cylinder change events on the _Subsurface_ dive profile*. Once the" -" dive log has been imported\n" -"from a dive computer into _Subsurface_, the cylinder switch events need to be" -" shown on the dive profile.\n" -"Cylinder changes are recorded by right-clicking at the appropriate point on" -" the dive profile, then\n" -"selecting _Add gas change_. A list of the appropriate cylinders is shown with" -" the\n" -"currently used cylinder greyed out. In the image below Tank 1 is greyed out," -" leaving only Tank 2\n" -"to be selected. Select the appropriate cylinder. The cylinder change is then" -" shown on the dive\n" -"profile with a cylinder symbol. If the *Tank Bar* is activated using the" -" toolbar to the left of the\n" -"profile, then the cylinder change is also shown on the Tank Bar (see image" -" below). After all\n" -"the cylinder change events have been recorded on the dive profile, the" -" correct cylinder pressures\n" +#: user-manual.txt:2004 +#, no-wrap +msgid "" +"*Indicate cylinder change events on the _Subsurface_ dive profile*. Once the dive log has been imported\n" +"from a dive computer into _Subsurface_, the cylinder switch events need to be shown on the dive profile.\n" +"Cylinder changes are recorded by right-clicking at the appropriate point on the dive profile, then\n" +"selecting _Add gas change_. A list of the appropriate cylinders is shown with the\n" +"currently used cylinder greyed out. In the image below Tank 1 is greyed out, leaving only Tank 2\n" +"to be selected. Select the appropriate cylinder. The cylinder change is then shown on the dive\n" +"profile with a cylinder symbol. If the *Tank Bar* is activated using the toolbar to the left of the\n" +"profile, then the cylinder change is also shown on the Tank Bar (see image below). After all\n" +"the cylinder change events have been recorded on the dive profile, the correct cylinder pressures\n" "for both cylinders are shown on the dive profile, as in the image below.\n" msgstr "" #. type: Target for macro image -#: user-manual.txt:1948 +#: user-manual.txt:2005 #, no-wrap msgid "images/sidemount1.jpg" msgstr "images/sidemount1.jpg" #. type: Title ==== -#: user-manual.txt:1951 +#: user-manual.txt:2008 #, no-wrap msgid "Passive semi-closed circuit rebreather (pSCR) dives" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:1953 +#: user-manual.txt:2010 #, no-wrap msgid "images/halcyon_RB80.jpg" msgstr "images/halcyon_RB80.jpg" #. type: Plain text -#: user-manual.txt:1963 +#: user-manual.txt:2020 msgid "" "Passive semi-closed rebreathers (pSCR) are a technical advance in diving " "equipment that recirculates the breathing gas a diver uses, while removing " @@ -4696,19 +4641,19 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1965 +#: user-manual.txt:2022 msgid "" "To log pSCR dives, no special procedures are required. Use the normal steps " "outlined above:" msgstr "" #. type: Plain text -#: user-manual.txt:1967 +#: user-manual.txt:2024 msgid "Select pSCR in the _Dive Mode_ dropdown list on the *Info* panel." msgstr "" #. type: Plain text -#: user-manual.txt:1971 +#: user-manual.txt:2028 msgid "" "pSCR diving often involves gas changes, requiring an additional cylinder. " "Define all the appropriate cylinders as described above and indicate the " @@ -4717,7 +4662,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1976 +#: user-manual.txt:2033 msgid "" "If a pSCR _Dive Mode_ has been selected, the dive ceiling for that is " "adjusted for the oxygen drop across the mouthpiece, which often requires " @@ -4727,65 +4672,70 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1977 +#: user-manual.txt:2034 #, no-wrap msgid "images/pSCR_profile.jpg" msgstr "images/pSCR_profile.jpg" #. type: Title ==== -#: user-manual.txt:1982 +#: user-manual.txt:2039 #, no-wrap msgid "Closed circuit rebreather (CCR) dives" msgstr "Plongées en recycleur circuit fermé (CCR)" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:1984 +#: user-manual.txt:2041 #, no-wrap msgid "images/APD.jpg" msgstr "images/APD.jpg" #. type: Plain text -#: user-manual.txt:1989 +#: user-manual.txt:2046 msgid "" -"Closed system rebreathers use advanced technology to recirculate gas that " -"has been breathed. They also do two things to maintain a breathable oxygen " +"Closed system rebreathers also recirculate gas that has been breathed. " +"However, they use advanced technology to maintain a breathable oxygen " "concentration:" msgstr "" #. type: Plain text -#: user-manual.txt:1990 -msgid "remove carbon dioxide from the exhaled gas" +#: user-manual.txt:2047 +msgid "remove carbon dioxide from the exhaled gas." msgstr "" #. type: Plain text -#: user-manual.txt:1999 +#: user-manual.txt:2058 msgid "" "regulate the oxygen concentration to remain within safe diving limits. The " "CCR interface of _Subsurface_ is currently experimental and under active " "development. Subsurface currently supports Poseidon MkVI and APD Discovery/" -"Evolution dive computers. In contrast to a conventional recreational dive " -"computer, a CCR system computer does not allow the download of a log " -"containing multiple dives. Rather, each dive is stored independently. This " -"means that _Subsurface_ cannot download a dive log directly from a CCR dive " -"computer, but that it imports individual CCR dive profiles in the same way " -"it imports dive log data from other digital databases: one dive at a time." +"Evolution dive computers, as well as Shearwater dive computers connected to " +"CCR systems. In contrast to a conventional recreational dive computer, a CCR " +"system computer usually does not allow the download of a log containing " +"multiple dives. Rather, each dive is stored independently. This means that " +"_Subsurface_ cannot download a dive log directly from a CCR dive computer, " +"but that it imports individual CCR dive profiles in the same way it imports " +"dive log data from other digital databases: one dive at a time. However, the " +"Shearwater based CCR systems are different in this respect and allow multi-" +"dive downloads." msgstr "" #. type: Title ===== -#: user-manual.txt:2000 +#: user-manual.txt:2059 #, no-wrap msgid "Import a CCR dive" msgstr "Importer une plongée CCR" #. type: Plain text -#: user-manual.txt:2017 +#: user-manual.txt:2078 msgid "" -"See the section dealing with xref:S_ImportingAlienDiveLogs[Importing dive " -"information from other digital sources]. CCR dive data are currently " -"obtained from the proprietary software provided when purchasing CCR dice " -"equipment. See " -"<<_appendix_b_dive_computer_specific_information_for_importing_dive_informatio" -"n," +"For Shearwater CCR controllers, or independent Shearwater CCR logs, just " +"download the dive log as would be the case for non-CCR dives. _Subsurface_ " +"interprets the CCR dive log correctly. Except for Shearwater CCR dive " +"computers, CCR dive data are currently obtained from the proprietary " +"software provided when purchasing CCR dive equipment. See the section " +"dealing with xref:S_ImportingAlienDiveLogs[Importing dive information from " +"other digital sources] and " +"<<_appendix_b_dive_computer_specific_information_for_importing_dive_information," "Appendix B>> for more complete information. Use that software to download " "the dive data into a known directory. From the main menu of _Subsurface_, " "select _Import -> Import log files_ to bring up the xref:" @@ -4802,13 +4752,13 @@ msgid "" msgstr "" #. type: Title ===== -#: user-manual.txt:2018 +#: user-manual.txt:2079 #, no-wrap msgid "Displayed information for a CCR dive" msgstr "" #. type: Plain text -#: user-manual.txt:2028 +#: user-manual.txt:2089 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 " @@ -4822,12 +4772,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2030 +#: user-manual.txt:2091 msgid "For TWO O~2~ sensors the mean value of the two sensors are given." msgstr "" #. type: Plain text -#: user-manual.txt:2034 +#: user-manual.txt:2095 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 " @@ -4836,19 +4786,19 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2036 +#: user-manual.txt:2097 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:2038 +#: user-manual.txt:2099 msgid "The mean pO~2~ of the sensors is indicated with a green line," msgstr "" #. type: Plain text -#: user-manual.txt:2046 +#: user-manual.txt:2107 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 " @@ -4860,13 +4810,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2047 +#: user-manual.txt:2108 #, no-wrap msgid "images/CCR_preferences_f20.jpg" msgstr "images/CCR_preferences_f20.jpg" #. type: Plain text -#: user-manual.txt:2054 +#: user-manual.txt:2115 msgid "" "Checking any of these boxes allows the display of additional oxygen-related " "information whenever the pO~2~ toolbar button on the _Profile_ panel is " @@ -4877,13 +4827,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2055 +#: user-manual.txt:2116 #, no-wrap msgid "images/CCR_setpoint_f20.jpg" msgstr "images/CCR_setpoint_f20.jpg" #. type: Plain text -#: user-manual.txt:2059 +#: user-manual.txt:2120 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 " @@ -4891,22 +4841,22 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2061 +#: user-manual.txt:2122 msgid "Sensor 1: grey" msgstr "" #. type: Plain text -#: user-manual.txt:2062 +#: user-manual.txt:2123 msgid "Sensor 2: blue" msgstr "" #. type: Plain text -#: user-manual.txt:2063 +#: user-manual.txt:2124 msgid "Sensor 3: brown" msgstr "" #. type: Plain text -#: user-manual.txt:2067 +#: user-manual.txt:2128 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 " @@ -4914,13 +4864,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2068 +#: user-manual.txt:2129 #, no-wrap msgid "images/CCR_sensor_data_f20.jpg" msgstr "images/CCR_sensor_data_f20.jpg" #. type: Plain text -#: user-manual.txt:2073 +#: user-manual.txt:2134 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, " @@ -4928,7 +4878,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2077 +#: user-manual.txt:2138 msgid "" "_Events_: Several events are logged, e.g. switching the mouthpiece to open " "circuit. These events are indicated by yellow triangles and, if you hover " @@ -4937,7 +4887,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2085 +#: user-manual.txt:2146 msgid "" "_Cylinder pressures_: Some CCR dive computers like the Poseidon MkVI record " "the pressures of the oxygen and diluent cylinders. The pressures of these " @@ -4950,13 +4900,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2086 +#: user-manual.txt:2147 #, no-wrap msgid "images/CCR_dive_profile_f22.jpg" msgstr "images/CCR_dive_profile_f22.jpg" #. type: Plain text -#: user-manual.txt:2091 +#: user-manual.txt:2152 msgid "" "_Equipment-specific information_: Equipment-specific information gathered by " "_Subsurface_ is shown in the xref:S_ExtraDataTab[Extra data tab]. This may " @@ -4964,7 +4914,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2097 +#: user-manual.txt:2158 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 " @@ -4976,13 +4926,13 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2098 user-manual.txt:2442 +#: user-manual.txt:2159 user-manual.txt:2537 #, no-wrap msgid "images/icons/cceiling.jpg" msgstr "images/icons/cceiling.jpg" #. type: Plain text -#: user-manual.txt:2103 +#: user-manual.txt:2164 msgid "" "The default color of the computer-generated deco ceiling is white. This can " "be set to red by checking the appropriate check box after selecting _File -> " @@ -4991,35 +4941,126 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2104 +#: user-manual.txt:2165 #, no-wrap msgid "images/CCR_dive_ceilingF22.jpg" msgstr "images/CCR_dive_ceilingF22.jpg" #. type: Plain text -#: user-manual.txt:2108 +#: user-manual.txt:2169 msgid "" "More equipment-specific information for downloading CCR dive logs for " "Poseidon MkVI and APD equipment can be found in xref:" -"_appendix_b_dive_computer_specific_information_for_importing_dive_information[" -"Appendix " +"_appendix_b_dive_computer_specific_information_for_importing_dive_information[Appendix " "B]." msgstr "" #. type: Title == -#: user-manual.txt:2109 +#: user-manual.txt:2170 #, no-wrap msgid "Obtaining more information about dives entered into the logbook" msgstr "" #. type: Title === -#: user-manual.txt:2111 +#: user-manual.txt:2172 +#, no-wrap +msgid "Using the Dive Map to obtain more dive information" +msgstr "Utiliser la carte des plongées pour obtenir plus d'informations sur les plongées" + +#. type: Plain text +#: user-manual.txt:2175 +msgid "" +"The Dive Map has a number of buttons useful for manipulation several aspects " +"of a dive. These are:" +msgstr "" + +#. type: Named 'icon' AttributeList argument for style 'icon' +#: user-manual.txt:2176 +#, no-wrap +msgid "images/icons/MapViewMode.jpg" +msgstr "images/icons/MapViewMode.jpg" + +#. type: Plain text +#: user-manual.txt:2180 +msgid "" +"Select this button to show the Dive Map as a satellite image or as a Google " +"Maps representation." +msgstr "" + +#. type: Named 'icon' AttributeList argument for style 'icon' +#: user-manual.txt:2181 +#, no-wrap +msgid "images/icons/MapViewPlus.jpg" +msgstr "images/icons/MapViewPlus.jpg" + +#. type: Plain text +#: user-manual.txt:2184 +msgid "Zoom in. Select a smaller area of the map." +msgstr "" + +#. type: Named 'icon' AttributeList argument for style 'icon' +#: user-manual.txt:2185 +#, no-wrap +msgid "images/icons/MapViewMinus.jpg" +msgstr "images/icons/MapViewMinus.jpg" + +#. type: Plain text +#: user-manual.txt:2188 +msgid "Zoom out. Select a larger area of the map." +msgstr "" + +#. type: Target for macro image +#: user-manual.txt:2189 +#, no-wrap +msgid "images/MapMenu.jpg" +msgstr "images/MapMenu.jpg" + +#. type: Plain text +#: user-manual.txt:2193 +msgid "" +"The \"Hamburger\" button on the top right-hand of the Dive Map activates the " +"Map menu. The items are:" +msgstr "" + +#. type: Plain text +#: user-manual.txt:2196 +msgid "" +"Open location in _Google Maps_. Open the location of the active dive in a " +"separate Google Maps window with the dive site indicated by a Google Maps " +"teardrop marker." +msgstr "" + +#. type: Plain text +#: user-manual.txt:2199 +msgid "" +"Copy location to clipboard (decimal). Copy the coordinates of the active " +"dive to the clipboard in decimal degrees e.g. -25.933905 30.710572" +msgstr "" + +#. type: Plain text +#: user-manual.txt:2202 +msgid "" +"Copy location to clipboard (sexagesimal). Copy the coordinates of the active " +"dive to the clipboard in sexagecimal, e.g. 25°56'02.058\"S 30°42'38.059\"E" +msgstr "" + +#. type: Plain text +#: user-manual.txt:2205 +msgid "" +"Select visible dive locations. In the Dive List panel, highlight all the " +"dive sites visible in the Dive Map. This allows easy selection of the dives " +"within a particular geographical area to inspect them or to calculate " +"statistics for them." +msgstr "" + +#. type: Title === +#: user-manual.txt:2206 #, no-wrap msgid "The *Info* tab (for individual dives)" msgstr "L'onglet *Informations* (pour une seule plongée)" #. type: Plain text -#: user-manual.txt:2118 +#: user-manual.txt:2213 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 " @@ -5035,7 +5076,7 @@ msgstr "" "l'oxygène (OTU) atteint." #. type: Plain text -#: user-manual.txt:2125 +#: user-manual.txt:2220 msgid "" "Gas consumption and SAC calculations: _Subsurface_ calculates SAC and Gas " "consumption taking in account gas incompressibility, particularly at tank " @@ -5049,13 +5090,13 @@ msgstr "" "SAC_CALCULATION[l'Annexe F] pour plus d'information." #. type: Title === -#: user-manual.txt:2127 +#: user-manual.txt:2222 #, no-wrap msgid "The *Extra Data* tab (usually for individual dives)" msgstr "L'onglet *Extra info* (généralement pour des plongées séparées)" #. type: Plain text -#: user-manual.txt:2135 +#: user-manual.txt:2230 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 " @@ -5076,19 +5117,19 @@ msgstr "" "une plongée utilisant un recycleur Poseidon." #. type: Target for macro image -#: user-manual.txt:2136 +#: user-manual.txt:2231 #, no-wrap msgid "images/ExtraDataTab_f20.jpg" msgstr "images/ExtraDataTab_f20.jpg" #. type: Title === -#: user-manual.txt:2138 +#: user-manual.txt:2233 #, no-wrap msgid "The *Stats* tab (for groups of dives)" msgstr "L'onglet *Statistiques* (pour un groupe de plongées)" #. type: Plain text -#: user-manual.txt:2149 +#: user-manual.txt:2244 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 " @@ -5110,19 +5151,19 @@ msgstr "" "plus petite et la plus grande profondeur atteinte pour ces plongées." #. type: Title === -#: user-manual.txt:2151 +#: user-manual.txt:2246 #, no-wrap msgid "The *Dive Profile*" msgstr "Le *Profil de plongée*" #. type: Target for macro image -#: user-manual.txt:2153 +#: user-manual.txt:2248 #, no-wrap msgid "images/Profile2.jpg" msgstr "images/Profile2.jpg" #. type: Plain text -#: user-manual.txt:2164 +#: user-manual.txt:2259 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 " @@ -5144,7 +5185,7 @@ msgstr "" "donnée en utilisant différentes couleurs:" #. type: delimited block | -#: user-manual.txt:2171 +#: user-manual.txt:2266 #, no-wrap msgid "" "|*Color*|*Descent speed (m/min)*|*Ascent speed (m/min)*\n" @@ -5162,7 +5203,7 @@ msgstr "" "|Vert foncé|< 1.5|< 1.5\n" #. type: Plain text -#: user-manual.txt:2176 +#: user-manual.txt:2271 msgid "" "The profile also includes depth readings for the peaks and troughs in the " "graph. So users should see the depth of the deepest point and other peaks. " @@ -5176,13 +5217,13 @@ msgstr "" "profondeur à un moment précis de la plongée." #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2177 +#: user-manual.txt:2272 #, no-wrap msgid "images/icons/scale.jpg" msgstr "images/icons/scale.jpg" #. type: Plain text -#: user-manual.txt:2182 +#: user-manual.txt:2277 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 " @@ -5195,24 +5236,23 @@ msgstr "" "augmente la taille du profil de plongée pour remplir la zone du panneau." #. type: Plain text -#: user-manual.txt:2185 +#: user-manual.txt:2280 #, no-wrap msgid "" "*Water temperature* is shown as a blue line with temperature values\n" "placed adjacent to significant changes.\n" msgstr "" -"La *température de l'eau* est indiquée par une ligne bleue avec des valeurs" -" de\n" +"La *température de l'eau* est indiquée par une ligne bleue avec des valeurs de\n" "température placées lors de changements significatifs.\n" #. type: Title ==== -#: user-manual.txt:2187 +#: user-manual.txt:2282 #, no-wrap msgid "The *Information Box*" msgstr "La boîte *Information*" #. type: Plain text -#: user-manual.txt:2194 +#: user-manual.txt:2289 msgid "" "The Information box displays a large range of information about the dive " "profile. Normally the Information Box is located to the top left of the " @@ -5230,13 +5270,13 @@ msgstr "" "analyses de plongée suivantes." #. type: Target for macro image -#: user-manual.txt:2195 +#: user-manual.txt:2290 #, no-wrap msgid "images/InfoBox2.jpg" msgstr "images/InfoBox2.jpg" #. type: Plain text -#: user-manual.txt:2211 +#: user-manual.txt:2306 msgid "" "When the mouse points inside the *Dive Profile* panel, the information box " "expands and shows many data items. In this situation, the data reflect the " @@ -5257,13 +5297,13 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2212 +#: user-manual.txt:2307 #, no-wrap msgid "images/icons/MOD.jpg" msgstr "images/icons/MOD.jpg" #. type: Plain text -#: user-manual.txt:2219 +#: user-manual.txt:2314 msgid "" "Show the *Maximum Operating Depth (MOD)* of the dive, given the gas mixture " "used. MOD is dependent on the oxygen concentration in the breathing gas. " @@ -5282,13 +5322,13 @@ msgstr "" "important d'exposition aux dangers liés à la toxicité de l'oxygène." #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2220 +#: user-manual.txt:2315 #, no-wrap msgid "images/icons/NDL.jpg" msgstr "images/icons/NDL.jpg" #. type: Plain text -#: user-manual.txt:2231 +#: user-manual.txt:2326 msgid "" "Show either the *No-deco Limit (NDL)* or the *Total Time to Surface (TTS)*. " "NDL is the time duration that a diver can continue with a dive, given the " @@ -5303,13 +5343,13 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2232 +#: user-manual.txt:2327 #, no-wrap msgid "images/icons/SAC.jpg" msgstr "images/icons/SAC.jpg" #. type: Plain text -#: user-manual.txt:2240 +#: user-manual.txt:2335 msgid "" "Show the *Surface Air Consumption (SAC)*, an indication of the surface-" "normalized respiration rate of a diver. The value of SAC is less than the " @@ -5321,13 +5361,13 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2241 +#: user-manual.txt:2336 #, no-wrap msgid "images/icons/EAD.jpg" msgstr "images/icons/EAD.jpg" #. type: Plain text -#: user-manual.txt:2256 +#: user-manual.txt:2351 msgid "" "Show the *Equivalent Air Depth (EAD)* for nitrox dives as well as the " "*Equivalent Narcotic Depth (END)* for trimix dives. These are important to " @@ -5343,7 +5383,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2258 +#: user-manual.txt:2353 msgid "" "Figure (*B*) above shows an information box with a nearly complete set of " "data." @@ -5353,13 +5393,13 @@ msgstr "" # "graphique à barres"? #. type: Title ===== -#: user-manual.txt:2261 +#: user-manual.txt:2356 #, fuzzy, no-wrap msgid "The Gas Pressure Bar Graph" msgstr "Le graphique de pression gazeuse" #. type: Plain text -#: user-manual.txt:2268 +#: user-manual.txt:2363 msgid "" "On the left of the *Information Box* is a vertical bar graph showing the " "pressures of the nitrogen (and other inert gases, e.g. helium, if " @@ -5370,13 +5410,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2269 +#: user-manual.txt:2364 #, no-wrap msgid "images/GasPressureBarGraph.jpg" msgstr "images/GasPressureBarGraph.jpg" #. type: Plain text -#: user-manual.txt:2275 +#: user-manual.txt:2370 msgid "" "The light green area indicates the gas pressure, with the top margin of the " "light green area showing the total gas pressure of ALL gases inhaled by the " @@ -5386,7 +5426,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2281 +#: user-manual.txt:2376 msgid "" "The horizontal black line underneath the light green margin indicates the " "equilibrium pressure of the INERT gases inhaled by the diver, usually " @@ -5397,7 +5437,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2285 +#: user-manual.txt:2380 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 " @@ -5405,7 +5445,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2291 +#: user-manual.txt:2386 msgid "" "The top black horizontal line indicates the inert gas pressure limit " "determined by the gradient factor that applies to the depth of the diver at " @@ -5415,7 +5455,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2295 +#: user-manual.txt:2390 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 " @@ -5424,7 +5464,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2298 +#: user-manual.txt:2393 msgid "" "These five values are shown on the left in the image above. The way the Gas " "Pressure Bar Graph changes during a dive can be seen on the right hand side " @@ -5432,7 +5472,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2301 +#: user-manual.txt:2396 msgid "" "Graph *A* indicates the start of a dive with the diver at the surface. The " "pressures in all the tissue compartments are still at the surface " @@ -5440,7 +5480,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2304 +#: user-manual.txt:2399 msgid "" "Graph *B* indicates the situation after a descent to 30 meters. Few of the " "tissue compartments have had time to respond to the descent, so their gas " @@ -5448,7 +5488,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2309 +#: user-manual.txt:2404 msgid "" "Graph *C* represents the pressures after 30 minutes at 30 m. The fast " "compartments have attained equilibrium (i.e. they have reached the height of " @@ -5458,7 +5498,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2315 +#: user-manual.txt:2410 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 " @@ -5469,7 +5509,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2320 +#: user-manual.txt:2415 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 " @@ -5479,13 +5519,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2321 +#: user-manual.txt:2416 #, no-wrap msgid "Computer-reported events during dive" msgstr "Événements rapportés par l'ordinateur durant la plongée" #. type: Plain text -#: user-manual.txt:2333 +#: user-manual.txt:2428 msgid "" "Many dive computers record events during a dive. For instance, most dive " "computers report alarms relating to high partial pressures of oxygen, to " @@ -5504,7 +5544,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2338 +#: user-manual.txt:2433 msgid "" "Events are indicated by symbols on the dive profile. Notifications are shown " "as a white, round symbol with a letter _i_; warnings are indicated by a " @@ -5515,13 +5555,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2339 +#: user-manual.txt:2434 #, no-wrap msgid "images/profile_symbols.jpg" msgstr "images/profile_symbols.jpg" #. type: Plain text -#: user-manual.txt:2344 +#: user-manual.txt:2439 msgid "" "Some dive computers report _bookmarks_ that the diver has set during the " "dive. These are indicated as a small red flag on the profile and are " @@ -5529,13 +5569,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2345 +#: user-manual.txt:2440 #, no-wrap msgid "The Profile Toolbar" msgstr "La barre d'outils du profil" #. type: Plain text -#: user-manual.txt:2353 +#: user-manual.txt:2448 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 " @@ -5546,13 +5586,13 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2354 +#: user-manual.txt:2449 #, no-wrap msgid "images/icons/O2.jpg" msgstr "images/icons/O2.jpg" #. type: Plain text -#: user-manual.txt:2358 +#: user-manual.txt:2453 msgid "" "Show the partial pressure of *oxygen* during the dive. This is shown below " "the dive depth and water temperature graphs." @@ -5561,24 +5601,24 @@ msgstr "" "affiché sous les graphiques de profondeur et de température de l'eau." #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2359 +#: user-manual.txt:2454 #, no-wrap msgid "images/icons/N2.jpg" msgstr "images/icons/N2.jpg" #. type: Plain text -#: user-manual.txt:2362 +#: user-manual.txt:2457 msgid "Show the partial pressure of *nitrogen* during the dive." msgstr "Affiche la pression partielle d'*azote* durant la plongée." #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2363 +#: user-manual.txt:2458 #, no-wrap msgid "images/icons/He.jpg" msgstr "images/icons/He.jpg" #. type: Plain text -#: user-manual.txt:2367 +#: user-manual.txt:2462 msgid "" "Display of the partial pressure of *helium* during the dive. This is only " "important to divers using Trimix, Helitrox or similar breathing gasses." @@ -5588,7 +5628,7 @@ msgstr "" "(Helitrox) ou d'autres mélanges gazeux similaires." #. type: Plain text -#: user-manual.txt:2380 +#: user-manual.txt:2475 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 " @@ -5603,7 +5643,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2384 +#: user-manual.txt:2479 msgid "" "When in planner mode, the SAC is set to be constant during the bottom part " "of the dive as well during decompression. Therefore, when planning a dive, " @@ -5611,13 +5651,13 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2385 +#: user-manual.txt:2480 #, no-wrap msgid "images/icons/Heartbutton.png" msgstr "images/icons/Heartbutton.png" #. type: Plain text -#: user-manual.txt:2389 +#: user-manual.txt:2484 msgid "" "Clicking on the heart rate button allows display of heart rate information " "during the dive if the dive computer was attached to a heart rate sensor." @@ -5627,7 +5667,7 @@ msgstr "" "plongée est jumelé avec un détecteur de rythme cardique." #. type: Plain text -#: user-manual.txt:2395 +#: user-manual.txt:2490 msgid "" "It is possible to *zoom* into the profile graph. This is done either by " "using the scroll wheel / scroll gesture of the mouse or trackpad. By default " @@ -5637,19 +5677,19 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2396 +#: user-manual.txt:2491 #, no-wrap msgid "images/MeasuringBar.png" msgstr "images/MeasuringBar.png" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2398 +#: user-manual.txt:2493 #, no-wrap msgid "images/icons/ruler.jpg" msgstr "images/icons/ruler.jpg" #. type: Plain text -#: user-manual.txt:2406 +#: user-manual.txt:2501 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 " @@ -5659,13 +5699,13 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2407 +#: user-manual.txt:2502 #, no-wrap msgid "images/icons/ShowPhotos.png" msgstr "images/icons/ShowPhotos.png" #. type: Plain text -#: user-manual.txt:2414 +#: user-manual.txt:2509 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 " @@ -5678,7 +5718,7 @@ msgstr "" "prise. Si le bouton n'est pas actif, les photos sont masquées." #. type: Plain text -#: user-manual.txt:2441 +#: user-manual.txt:2536 msgid "" "The profile can also include the dive computer reported *ceiling* (more " "precisely, the deepest deco stop that the dive computer calculated for each " @@ -5707,7 +5747,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2447 +#: user-manual.txt:2542 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 " @@ -5719,13 +5759,13 @@ msgstr "" "par l'ordinateur de plongée\" dans le panneau Profil." #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2448 +#: user-manual.txt:2543 #, no-wrap msgid "images/icons/ceiling1.jpg" msgstr "images/icons/ceiling1.jpg" #. type: Plain text -#: user-manual.txt:2453 +#: user-manual.txt:2548 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 " @@ -5738,13 +5778,13 @@ msgstr "" "façons:" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2454 +#: user-manual.txt:2549 #, no-wrap msgid "images/icons/ceiling2.jpg" msgstr "images/icons/ceiling2.jpg" #. type: Plain text -#: user-manual.txt:2458 +#: user-manual.txt:2553 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 " @@ -5755,13 +5795,13 @@ msgstr "" "modèle Bühlmann (*B* dans l'image ci-dessous)." #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2459 +#: user-manual.txt:2554 #, no-wrap msgid "images/icons/ceiling3.jpg" msgstr "images/icons/ceiling3.jpg" #. type: delimited block = -#: user-manual.txt:2464 +#: user-manual.txt:2559 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)." @@ -5771,13 +5811,13 @@ msgstr "" "l'image ci-dessous)." #. type: Target for macro image -#: user-manual.txt:2465 +#: user-manual.txt:2560 #, no-wrap msgid "images/Ceilings2.jpg" msgstr "images/Ceilings2.jpg" #. type: delimited block = -#: user-manual.txt:2468 +#: user-manual.txt:2563 msgid "" "Gradient Factor settings strongly affect the calculated ceilings and their " "depths. For more information about Gradient factors, see the section on xref:" @@ -5790,35 +5830,25 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2470 user-manual.txt:3309 +#: user-manual.txt:2565 user-manual.txt:3404 #, 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" +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:2472 user-manual.txt:3311 +#: user-manual.txt:2567 user-manual.txt:3406 #, no-wrap -msgid "" -" *** link:http://www.rebreatherworld.com/general-and-new-to-rebreather-article" -"s/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-article" -"s/5037-gradient-factors-for-dummies.html[Gradient factors for dummies, by" -" Kevin Watts]\n" +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: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2476 +#: user-manual.txt:2571 #, no-wrap msgid "images/icons/ShowCylindersButton.jpg" msgstr "images/icons/ShowCylindersButton.jpg" #. type: Plain text -#: user-manual.txt:2482 +#: user-manual.txt:2577 msgid "" "By selecting this icon, the different cylinders used during a dive can be " "represented as a colored bar at the bottom of the *Dive Profile*. In general " @@ -5829,19 +5859,19 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2483 +#: user-manual.txt:2578 #, no-wrap msgid "images/ShowCylinders_f20.jpg" msgstr "images/ShowCylinders_f20.jpg" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2487 +#: user-manual.txt:2582 #, no-wrap msgid "images/icons/heatmap.png" msgstr "images/icons/heatmap.png" #. type: delimited block = -#: user-manual.txt:2494 +#: user-manual.txt:2589 msgid "" "Display the tissue heat-map. The heat map summarises, for the duration of " "the dive, the inert gas tissue pressures for each of the 16 tissue " @@ -5853,13 +5883,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2495 +#: user-manual.txt:2590 #, no-wrap msgid "images/Heatmap.jpg" msgstr "images/Heatmap.jpg" #. type: delimited block = -#: user-manual.txt:2503 +#: user-manual.txt:2598 msgid "" "Image *A* on the left shows the xref:S_gas_pressure_graph[Gas Pressure " "Graph] in the *Information box*, representing a snapshot of inert gas " @@ -5872,7 +5902,7 @@ msgid "" msgstr "" #. type: delimited block = -#: user-manual.txt:2511 +#: user-manual.txt:2606 msgid "" "Image *B* shows a gradient of unique colours, spanning the whole range of " "inert gas pressures. It is possible to map the height of each of the dark " @@ -5886,7 +5916,7 @@ msgid "" msgstr "" #. type: delimited block = -#: user-manual.txt:2519 +#: user-manual.txt:2614 msgid "" "The bottom range in *B* (marked _On-gassing_) includes colours from light " "blue to black, representing tissue gas pressures below the equilibrium " @@ -5901,7 +5931,7 @@ msgid "" msgstr "" #. type: delimited block = -#: user-manual.txt:2525 +#: user-manual.txt:2620 msgid "" "The central range in *B* includes the colours from black to light green, " "when the inert gas pressure of a tissue compartment is higher than the " @@ -5912,7 +5942,7 @@ msgid "" msgstr "" #. type: delimited block = -#: user-manual.txt:2534 +#: user-manual.txt:2629 msgid "" "The top range in *B* (marked _Off-gassing_) includes colours from light " "green to red and white, repesenting tissue gas pressures above that of the " @@ -5928,7 +5958,7 @@ msgid "" msgstr "" #. type: delimited block = -#: user-manual.txt:2542 +#: user-manual.txt:2637 msgid "" "Image *C* shows the colour mapping of each of the vertical bars in *A*, the " "fast tissues (on the left in *A*) depicted at the top and the slow tissue " @@ -5940,7 +5970,7 @@ msgid "" msgstr "" #. type: delimited block = -#: user-manual.txt:2549 +#: user-manual.txt:2644 msgid "" "Image *D* is a compilation of similar colour mappings of 16 tissue " "compartments during a 10-minute period of a dive, the colours representing " @@ -5951,7 +5981,7 @@ msgid "" msgstr "" #. type: delimited block = -#: user-manual.txt:2553 +#: user-manual.txt:2648 msgid "" "The colours of the heat map are not affected by the gradient factor " "settings. This is because the heat map indicates tissue pressures relative " @@ -5960,7 +5990,7 @@ msgid "" msgstr "" #. type: delimited block = -#: user-manual.txt:2555 +#: user-manual.txt:2650 msgid "" "http://www.tek-dive.com/portal/upload/M-Values.pdf[Understanding M-values by " "Erik Baker, _Immersed_ Vol. 3, No. 3.]" @@ -5969,7 +5999,7 @@ msgstr "" "Erik Baker, _Immersed_ Vol. 3, No. 3.]" #. type: delimited block = -#: user-manual.txt:2558 +#: user-manual.txt:2653 msgid "" "Since the colours of the heat map are not affected by the gradient " "factor(s), the heat map is also applicable when using the VPM-B " @@ -5977,7 +6007,7 @@ msgid "" msgstr "" #. type: delimited block = -#: user-manual.txt:2562 +#: user-manual.txt:2657 msgid "" "The image below compares the profiles and heat maps for two planned " "decompression dives to 60m: the first using the Bühlmann decompression " @@ -5987,7 +6017,7 @@ msgid "" msgstr "" #. type: delimited block = -#: user-manual.txt:2567 +#: user-manual.txt:2662 msgid "" "In both profiles, the inert gas pressures in the faster tissues rise much " "more rapidly than the slower tissues during the descent and bottom phase, " @@ -5998,7 +6028,7 @@ msgid "" msgstr "" #. type: delimited block = -#: user-manual.txt:2572 +#: user-manual.txt:2667 msgid "" "The comparison of the two profiles and heatmaps shows that by including deep " "stops, the oversaturation gradient in the faster tissues early in ascent " @@ -6008,19 +6038,19 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2573 +#: user-manual.txt:2668 #, no-wrap msgid "images/tissueHeatmap.jpg" msgstr "images/tissueHeatmap.jpg" #. type: Title ==== -#: user-manual.txt:2576 +#: user-manual.txt:2671 #, no-wrap msgid "The Dive Profile context menu" msgstr "Le menu contextuel du Profil de plongée" #. type: Plain text -#: user-manual.txt:2595 +#: user-manual.txt:2690 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 creating " @@ -6041,19 +6071,19 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:2596 +#: user-manual.txt:2691 #, no-wrap msgid "Organizing the logbook (Manipulating groups of dives)" msgstr "Organiser le carnet de plongée (manipuler des groupes de plongées)" #. type: Title === -#: user-manual.txt:2599 +#: user-manual.txt:2694 #, no-wrap msgid "The Dive List context menu" msgstr "Le menu contextuel de la Liste des plongées" #. type: Plain text -#: user-manual.txt:2603 +#: user-manual.txt:2698 msgid "" "Several actions on either a single dive, or a group of dives, can be " "performed using the Dive List Context Menu. It is found by selecting either " @@ -6061,33 +6091,32 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2604 +#: user-manual.txt:2699 #, no-wrap msgid "images/ContextMenu.jpg" msgstr "images/ContextMenu.jpg" #. type: Plain text -#: user-manual.txt:2607 +#: user-manual.txt:2702 msgid "The context menu is used in many functions described below." msgstr "" "Le menu contextuel est utilisé pour de nombreuses fonctions décrites ci-" "dessous." #. type: Title ==== -#: user-manual.txt:2609 +#: user-manual.txt:2704 #, no-wrap msgid "Customizing the columns showed in the *Dive List* panel" -msgstr "" -"Personnaliser les colonnes affichées dans le panneau *Liste des plongées*" +msgstr "Personnaliser les colonnes affichées dans le panneau *Liste des plongées*" #. type: Target for macro image -#: user-manual.txt:2611 +#: user-manual.txt:2706 #, no-wrap msgid "images/DiveListOptions.jpg" msgstr "images/DiveListOptions.jpg" #. type: Plain text -#: user-manual.txt:2619 +#: user-manual.txt:2714 msgid "" "The default information in the *Dive List* includes, for each dive, " "Dive_number, Date, Rating, Dive_depth, Dive_duration and Dive_location. This " @@ -6099,7 +6128,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2624 +#: user-manual.txt:2719 msgid "" "By selecting the _Photos_ checkbox in the dropdown list, an icon is shown " "indicating whether any photos are associated with a particular dive. There " @@ -6107,13 +6136,13 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2625 +#: user-manual.txt:2720 #, no-wrap msgid "images/icons/duringPhoto.png" msgstr "images/icons/duringPhoto.png" #. type: Plain text -#: user-manual.txt:2628 +#: user-manual.txt:2723 msgid "" "This dive has photographs taken during the dive, typically using an " "underwater camera." @@ -6122,13 +6151,13 @@ msgstr "" "prises avec un appareil ou caméra submersible." #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2629 +#: user-manual.txt:2724 #, no-wrap msgid "images/icons/outsidePhoto.png" msgstr "images/icons/outsidePhoto.png" #. type: Plain text -#: user-manual.txt:2634 +#: user-manual.txt:2729 msgid "" "This dive has photographs taken immediately before or immediately after the " "dive. This is useful for finding photos of dive teams or boats just before/" @@ -6137,26 +6166,26 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2635 +#: user-manual.txt:2730 #, no-wrap msgid "images/icons/inAndOutPhoto.png" msgstr "images/icons/inAndOutPhoto.png" #. type: Plain text -#: user-manual.txt:2638 +#: user-manual.txt:2733 msgid "" "This dive has photographs taken both during the dive and immdiately before " "or after the dive." msgstr "" #. type: Title === -#: user-manual.txt:2640 +#: user-manual.txt:2735 #, no-wrap msgid "Renumbering the dives" msgstr "Renuméroter les plongées" #. type: Plain text -#: user-manual.txt:2652 +#: user-manual.txt:2747 msgid "" "Dives are normally numbered incrementally from non-recent dives (low " "sequence numbers) to recent dives (higher sequence numbers). Numbering of " @@ -6170,7 +6199,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2657 +#: user-manual.txt:2752 msgid "" "Renumber a few selected dives in the dive list by selecting only the dives " "that need renumbering. Right-click on the selected list and use the Dive " @@ -6179,13 +6208,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:2659 +#: user-manual.txt:2754 #, no-wrap msgid "Grouping dives into trips and manipulating trips" msgstr "Grouper des plongées en voyages et manipuler les voyages" #. type: Plain text -#: user-manual.txt:2667 +#: user-manual.txt:2762 msgid "" "For regular divers, the dive list can rapidly become very long. _Subsurface_ " "can group dives into _trips_. It does this by grouping dives that have date/" @@ -6196,13 +6225,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2668 +#: user-manual.txt:2763 #, no-wrap msgid "images/Group2.jpg" msgstr "images/Group2.jpg" #. type: Plain text -#: user-manual.txt:2674 +#: user-manual.txt:2769 msgid "" "Grouping into trips allows a rapid way of accessing individual dives without " "having to scan a long lists of dives. To group the dives in a dive list, " @@ -6211,13 +6240,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2675 +#: user-manual.txt:2770 #, no-wrap msgid "Editing the title and associated information for a particular trip" msgstr "Éditer le titre et l'information associée à un voyage déterminé" #. type: Plain text -#: user-manual.txt:2688 +#: user-manual.txt:2783 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 " @@ -6231,13 +6260,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2689 +#: user-manual.txt:2784 #, no-wrap msgid "Viewing the dives during a particular trip" msgstr "Visualiser les plongées d'un voyage déterminé" #. type: Plain text -#: user-manual.txt:2694 +#: user-manual.txt:2789 msgid "" "Once the dives have been grouped into trips, you can expand one or more " "trips by clicking the expansion button [+/-] on the left of each trip title. " @@ -6245,13 +6274,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2695 +#: user-manual.txt:2790 #, no-wrap msgid "Merging dives from more than one trip into a single trip" msgstr "Fusionner des plongées venant des voyages différents en un seul voyage" #. type: Plain text -#: user-manual.txt:2700 +#: user-manual.txt:2795 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 " @@ -6259,13 +6288,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2701 +#: user-manual.txt:2796 #, no-wrap msgid "Splitting a single trip into more than one trip" msgstr "Diviser un voyage en plusieurs voyages" #. type: Plain text -#: user-manual.txt:2710 +#: user-manual.txt:2805 msgid "" "If a trip includes, for example, ten dives, you can split this trip into two " "trips (trip 1: top four dives; trip 2: bottom six dives) by selecting and " @@ -6277,25 +6306,25 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2711 +#: user-manual.txt:2806 #, no-wrap msgid "images/SplitDive3a.jpg" msgstr "images/SplitDive3a.jpg" #. type: Title === -#: user-manual.txt:2713 +#: user-manual.txt:2808 #, no-wrap msgid "Manipulating single dives" msgstr "Manipuler des plongées uniques" #. type: Title ==== -#: user-manual.txt:2715 +#: user-manual.txt:2810 #, no-wrap msgid "Delete a dive from the dive log" msgstr "Effacer une plongée du carnet de plongée" #. type: Plain text -#: user-manual.txt:2722 +#: user-manual.txt:2817 msgid "" "Dives can be permanently deleted from the dive log by selecting and right-" "clicking them to bring up the context menu, then selecting *Delete dive(s)*. " @@ -6304,13 +6333,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2723 +#: user-manual.txt:2818 #, no-wrap msgid "Unlink a dive from a trip" msgstr "" #. type: Plain text -#: user-manual.txt:2730 +#: user-manual.txt:2825 msgid "" "You can unlink dives from the trip to which they belong. To do this, select " "and right-click the relevant dives to bring up the context menu. Then select " @@ -6320,13 +6349,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2731 +#: user-manual.txt:2826 #, no-wrap msgid "Add a dive to the trip immediately above" msgstr "" #. type: Plain text -#: user-manual.txt:2736 +#: user-manual.txt:2831 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 " @@ -6334,13 +6363,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2737 +#: user-manual.txt:2832 #, no-wrap msgid "Shift the start time of dive(s)" msgstr "Décaler l'heure de début d'une ou plusieurs plongées" #. type: Plain text -#: user-manual.txt:2747 +#: user-manual.txt:2842 msgid "" "Sometimes it’s necessary to adjust the start time of a dive. This may apply " "to situations where dives are done in different time zones or when the dive " @@ -6352,13 +6381,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2748 +#: user-manual.txt:2843 #, no-wrap msgid "Merge dives into a single dive" msgstr "Fusionner plusieurs plongées en une seule" #. type: Plain text -#: user-manual.txt:2758 +#: user-manual.txt:2853 msgid "" "Sometimes a dive is briefly interrupted, for example, if a diver returns to " "the surface for a few minutes, resulting in two or more dives being recorded " @@ -6371,19 +6400,19 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2759 +#: user-manual.txt:2854 #, no-wrap msgid "images/MergedDive.png" msgstr "images/MergedDive.png" #. type: Title ==== -#: user-manual.txt:2761 +#: user-manual.txt:2856 #, no-wrap msgid "Split selected dives" msgstr "Diviser les plongées sélectionnées" #. type: Plain text -#: user-manual.txt:2769 +#: user-manual.txt:2864 msgid "" "On some occasions, a diver reaches the surface and immediately dives again. " "However, it may happen that the dive computer does not register a new dive, " @@ -6395,32 +6424,32 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2770 +#: user-manual.txt:2865 #, no-wrap msgid "Load image(s) from file(s)" msgstr "" #. type: Plain text -#: user-manual.txt:2772 user-manual.txt:2775 +#: user-manual.txt:2867 user-manual.txt:2870 msgid "" "This topic is discussed in the section: xref:S_LoadImage[Adding photographs " "to dives]." msgstr "" #. type: Title ==== -#: user-manual.txt:2773 +#: user-manual.txt:2868 #, no-wrap msgid "Load image from web" msgstr "" #. type: Title ==== -#: user-manual.txt:2776 +#: user-manual.txt:2871 #, no-wrap msgid "Undo dive manipulations" msgstr "Annuler les manipuations sur les plongées" #. type: Plain text -#: user-manual.txt:2782 +#: user-manual.txt:2877 msgid "" "Important actions on dives or trips, described above, can be undone or " "redone. This includes: _delete dives_, _merge dives_, _split selected " @@ -6430,13 +6459,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:2785 +#: user-manual.txt:2880 #, no-wrap msgid "Filtering the dive list" msgstr "Filtrer la liste des plongées" #. type: Plain text -#: user-manual.txt:2791 +#: user-manual.txt:2886 msgid "" "The dives in the *Dive List* panel can be filtered, selecting only some of " "the dives based on their attributes, e.g. dive tags, dive site, divemaster, " @@ -6446,7 +6475,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2799 +#: user-manual.txt:2894 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 " @@ -6460,13 +6489,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2800 +#: user-manual.txt:2895 #, no-wrap msgid "images/Filterpanel.jpg" msgstr "images/Filterpanel.jpg" #. type: Plain text -#: user-manual.txt:2809 +#: user-manual.txt:2904 msgid "" "Four filter criteria may be used to filter the dive list: dive tags, person " "(buddy / divemaster), dive site and dive suit. Each of these is represented " @@ -6479,7 +6508,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2817 +#: user-manual.txt:2912 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 " @@ -6491,24 +6520,24 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:2819 +#: user-manual.txt:2914 #, no-wrap msgid "Exporting the dive log or parts of the dive log" msgstr "Export le carnet de plongée ou des parties de celui-ci" #. type: Plain text -#: user-manual.txt:2822 +#: user-manual.txt:2917 msgid "There are two ways to export dive information from Subsurface:" msgstr "" "Il y a deux façons d'exporter des informations de plongée depuis Subsurface:" #. type: Plain text -#: user-manual.txt:2824 +#: user-manual.txt:2919 msgid "Export dive information to _Facebook_" msgstr "Exporter les informations de plongée vers _Facebook_" #. type: Plain text -#: user-manual.txt:2826 +#: user-manual.txt:2921 msgid "" "xref:S_Export_other[Export dive information to other destinations or formats]" msgstr "" @@ -6516,13 +6545,13 @@ msgstr "" "destinations ou formats]" #. type: Title === -#: user-manual.txt:2828 +#: user-manual.txt:2923 #, no-wrap msgid "Exporting dive information to _Facebook_" msgstr "Export des informations de plongée vers _Facebook_" #. type: Plain text -#: user-manual.txt:2837 +#: user-manual.txt:2932 msgid "" "Export of dives to _Facebook_ is handled differently from other types of " "export because a connection to _Facebook_ is required, needing a _Facebook_ " @@ -6540,7 +6569,7 @@ msgstr "" "identifiant et un mot de passe. À partir du menu principal, sélectionnez " "_Partager sur -> Connecter à -> Facebook_ (image *A* ci-dessous). Un écran " "de connexion s'affiche (image *B* ci dessous). Entrez l'identifiant et le " -"mot de passe _Facebook_. Depuis la fentre _Subsurface_, il est facile de " +"mot de passe _Facebook_. Depuis la fenêtre _Subsurface_, il est facile de " "vérifier si _Subsurface_ a une connection valide vers _Facebook_ : Depuis le " "\"Menu principal\", sélectionnez _Partager sur_ (image *A* ci-dessous). " "Normalement, l'option _Facebook_ est grisée. Mais si une connection vers " @@ -6548,7 +6577,7 @@ msgstr "" "sélectionnable)." #. type: Plain text -#: user-manual.txt:2841 +#: user-manual.txt:2936 msgid "" "Once logged into to _Facebook_ , a panel is shown with a message: \"_To " "disconnect Subsurface from your Facebook account, use the 'Share on' menu " @@ -6556,13 +6585,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2842 +#: user-manual.txt:2937 #, no-wrap msgid "images/facebook1.jpg" msgstr "images/facebook1.jpg" #. type: Plain text -#: user-manual.txt:2855 +#: user-manual.txt:2950 msgid "" "Having established a login to _Facebook_, transferring a dive profile to a " "_Facebook_ timeline is easy. In the _Subsurface_ *Dive List* panel, " @@ -6596,7 +6625,7 @@ msgstr "" "fenêtre de confirmation apparait ,indiquant le succès du transfert." #. type: Plain text -#: user-manual.txt:2859 +#: user-manual.txt:2954 msgid "" "Both the album created and the post to your timeline are marked as private. " "In order for friends to be able to see the post, log into _Facebook_ using a " @@ -6608,27 +6637,26 @@ msgstr "" "permissions." #. type: Target for macro image -#: user-manual.txt:2860 +#: user-manual.txt:2955 #, no-wrap msgid "images/facebook2.jpg" msgstr "images/facebook2.jpg" #. type: Plain text -#: user-manual.txt:2864 +#: user-manual.txt:2959 msgid "" "If required, then close the _Facebook_ connection by selecting, from the " "*Main Menu*, _Share on -> Disconnect from -> Facebook_ (image *B* above)." msgstr "" #. type: Title === -#: user-manual.txt:2866 +#: user-manual.txt:2961 #, no-wrap msgid "Export dive information to other destinations or formats" -msgstr "" -"Exporter des informations de plongée vers d'autres destinations ou formats" +msgstr "Exporter des informations de plongée vers d'autres destinations ou formats" #. type: Plain text -#: user-manual.txt:2871 +#: user-manual.txt:2966 msgid "" "For non-_Facebook exports_, the export function can be found by selecting " "_File -> Export_, which brings up the Export dialog. This dialog always " @@ -6638,27 +6666,27 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2872 +#: user-manual.txt:2967 #, no-wrap msgid "images/Export_f20.jpg" msgstr "images/Export_f20.jpg" #. type: Plain text -#: user-manual.txt:2875 +#: user-manual.txt:2970 msgid "A dive log or part of it can be saved in several formats:" msgstr "" "Un carnet de plongée ou une partie de celui-ci peut être enregistré dans " "différents formats:" #. type: Plain text -#: user-manual.txt:2877 +#: user-manual.txt:2972 msgid "" "_Subsurface XML_ format. This is the native format used by _Subsurface_." msgstr "" "Format _Subsurface XML_. C'est le format utilisé nativement par _Subsurface_." #. type: Plain text -#: user-manual.txt:2881 +#: user-manual.txt:2976 msgid "" "Universal Dive Data Format (_UDDF_). Refer to _http://uddf.org_ for more " "information. UDDF is a generic format that enables communication among many " @@ -6666,7 +6694,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2885 +#: user-manual.txt:2980 msgid "" "_Divelogs.de_, an Internet-based dive log repository. In order to upload to " "_Divelogs.de_, you need a user-ID as well as a password for _Divelogs.de_. " @@ -6675,7 +6703,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2889 +#: user-manual.txt:2984 msgid "" "_DiveShare_ is also a dive log repository on the Internet focusing on " "recreational dives. To upload dives, you need a user ID, so registration " @@ -6683,7 +6711,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2894 +#: user-manual.txt:2989 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, " @@ -6692,7 +6720,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2897 +#: user-manual.txt:2992 msgid "" "_CSV dive profile_, that includes a large amount of detail for each dive, " "including the depth profile, temperature and pressure information of each " @@ -6700,7 +6728,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2910 +#: user-manual.txt:3005 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 " @@ -6717,7 +6745,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2915 +#: user-manual.txt:3010 msgid "" "_Worldmap_ format, an HTML file with a world map upon which each dive and " "some information about it are indicated. This map is not editable. If you " @@ -6726,13 +6754,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2916 +#: user-manual.txt:3011 #, no-wrap msgid "images/mapview_f20.jpg" msgstr "images/mapview_f20.jpg" #. type: Plain text -#: user-manual.txt:2925 +#: user-manual.txt:3020 msgid "" "_TeX_ format, a file for printing using the TeX typesetting software. Choose " "a filename with a '.tex' extension. You will also need a template file, that " @@ -6743,13 +6771,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2926 +#: user-manual.txt:3021 #, no-wrap msgid "images/texexample.png" msgstr "images/texexample.png" #. type: Plain text -#: user-manual.txt:2933 +#: user-manual.txt:3028 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 " @@ -6758,50 +6786,45 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2935 +#: user-manual.txt:3030 msgid "_General Settings_, under the HTML tab, provides the following options:" msgstr "" #. type: Plain text -#: user-manual.txt:2943 +#: user-manual.txt:3038 #, no-wrap msgid "" -"** Subsurface Numbers: if this option is checked, the dive(s) are exported" -" with the\n" -" numbers associated with them in Subsurface, Otherwise the dive(s) will be" -" numbered\n" +"** Subsurface Numbers: if this option is checked, the dive(s) are exported with the\n" +" numbers associated with them in Subsurface, Otherwise the dive(s) will be numbered\n" " starting from 1.\n" -"** Export Yearly Statistics: if this option is checked, a yearly statistics" -" table will\n" +"** Export Yearly Statistics: if this option is checked, a yearly statistics table will\n" " be attached to the HTML exports.\n" -"** Export List only: a list of dives only (date, time, depth, duration) will" -" be exported\n" -" and the detailed dive information, e.g. dive profile, will not be" -" available.\n" +"** Export List only: a list of dives only (date, time, depth, duration) will be exported\n" +" and the detailed dive information, e.g. dive profile, will not be available.\n" msgstr "" #. type: Plain text -#: user-manual.txt:2946 +#: user-manual.txt:3041 msgid "" "Under _Style Options_ some style-related options are available like font " "size and theme." msgstr "" #. type: Plain text -#: user-manual.txt:2949 +#: user-manual.txt:3044 msgid "" "Export to other formats can be done through third party facilities, for " "instance _www.divelogs.de_." msgstr "" #. type: Title == -#: user-manual.txt:2951 +#: user-manual.txt:3046 #, no-wrap msgid "Keeping a _Subsurface_ dive log in the Cloud" msgstr "" #. type: Plain text -#: user-manual.txt:2961 +#: user-manual.txt:3056 msgid "" "For each diver, dive log information is highly important. Not only is it a " "record of diving activities for your pleasure, but it’s important " @@ -6815,7 +6838,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2967 +#: user-manual.txt:3062 msgid "" "_Subsurface_ includes access to a transparently integrated cloud storage " "back end that is available to all Subsurface users. Storing and retrieving a " @@ -6825,84 +6848,70 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:2968 +#: user-manual.txt:3063 #, no-wrap msgid "Create a cloud storage account" msgstr "" #. type: Plain text -#: user-manual.txt:2985 +#: user-manual.txt:3080 #, no-wrap msgid "" -"** Open the *Network Preferences* by selecting _File_ -> _Preferences_ ->" -" _Network_.\n" -"** In the section headed _Subsurface cloud storage_, enter an email address" -" that\n" +"** Open the *Network Preferences* by selecting _File_ -> _Preferences_ -> _Network_.\n" +"** In the section headed _Subsurface cloud storage_, enter an email address that\n" " _Subsurface_ can use for user registration.\n" "** Enter a novel password that _Subsurface_ will use to store the\n" " dive log in the cloud.\n" "** Click _Apply_ to send the above email address and password to the\n" -" (remote) cloud server. The server responds by sending a verification PIN" -" to\n" -" the above email address (This is the *only* occasion that _Subsurface_ uses" -" the\n" -" email address provided above). The *Network Preferences* dialog now has a" -" new PIN text\n" +" (remote) cloud server. The server responds by sending a verification PIN to\n" +" the above email address (This is the *only* occasion that _Subsurface_ uses the\n" +" email address provided above). The *Network Preferences* dialog now has a new PIN text\n" " box, not visible previously.\n" -"** Enter the PIN in the corresponding text box in the *Network Preferences*" -" dialog\n" +"** Enter the PIN in the corresponding text box in the *Network Preferences* dialog\n" "(this field is only visible while the server is waiting for email\n" "address confirmation)\n" "** Click _Apply_ again. The _Subsurface cloud storage_ account\n" -"will be marked as verified and the _Subsurface cloud storage_ service is" -" initialised for use.\n" +"will be marked as verified and the _Subsurface cloud storage_ service is initialised for use.\n" msgstr "" #. type: Title === -#: user-manual.txt:2986 +#: user-manual.txt:3081 #, no-wrap msgid "Using _Subsurface cloud storage_" msgstr "" #. type: Plain text -#: user-manual.txt:2996 +#: user-manual.txt:3091 #, no-wrap msgid "" "** Once the cloud storage has been initialized, two new items appear in the\n" -" _File_ menu of the main menu system: _Open cloud storage_ and _Save to" -" cloud storage_.\n" +" _File_ menu of the main menu system: _Open cloud storage_ and _Save to cloud storage_.\n" "These options let you load and save data to the _Subsurface\n" "cloud storage_ server.\n" -"** In the _Defaults Preferences_ tab, you can select to use the _Subsurface" -" cloud\n" -"storage_ data as the default data file by checking the box marked _Cloud" -" storage default file_.\n" +"** In the _Defaults Preferences_ tab, you can select to use the _Subsurface cloud\n" +"storage_ data as the default data file by checking the box marked _Cloud storage default file_.\n" " This means the data from\n" -"the _Subsurface cloud storage_ is loaded when _Subsurface_ starts and saved" -" there when _Subsurface_ closes.\n" +"the _Subsurface cloud storage_ is loaded when _Subsurface_ starts and saved there when _Subsurface_ closes.\n" msgstr "" #. type: Plain text -#: user-manual.txt:3001 +#: user-manual.txt:3096 #, no-wrap msgid "" -"** _Subsurface_ keeps a local copy of the data and the cloud facility remains" -" fully\n" -"functional even if used while disconnected to the Internet. _Subsurface_" -" simply synchronizes the\n" -"data with the cloud server the next time the program is used while the" -" computer is\n" +"** _Subsurface_ keeps a local copy of the data and the cloud facility remains fully\n" +"functional even if used while disconnected to the Internet. _Subsurface_ simply synchronizes the\n" +"data with the cloud server the next time the program is used while the computer is\n" "connected to the Internet.\n" msgstr "" #. type: Title === -#: user-manual.txt:3003 +#: user-manual.txt:3098 #, no-wrap msgid "Web access to _Subsurface cloud storage_" msgstr "" #. type: Plain text -#: user-manual.txt:3013 +#: user-manual.txt:3108 msgid "" "One of the nice side benefits of using _Subsurface cloud storage_ is that " "you can also access your dive data from any web browser. Simply open https://" @@ -6915,13 +6924,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3014 +#: user-manual.txt:3109 #, no-wrap msgid "Other cloud services" msgstr "" #. type: Plain text -#: user-manual.txt:3024 +#: user-manual.txt:3119 msgid "" "If you prefer not to use the integrated cloud storage of dive logs (and " "don't need the web access), it’s simple to store dive logs in the cloud " @@ -6932,13 +6941,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:3025 +#: user-manual.txt:3120 #, no-wrap msgid "images/Cloud.jpg" msgstr "images/Cloud.jpg" #. type: Plain text -#: user-manual.txt:3034 +#: user-manual.txt:3129 msgid "" "The _Dropbox_ program creates a copy of the _Dropbox_ Internet Cloud content " "on your desktop computer. When the computer is connected to the Internet, " @@ -6951,13 +6960,13 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:3037 +#: user-manual.txt:3132 #, no-wrap msgid "Several _Subsurface_ users on one desktop computer" msgstr "" #. type: Plain text -#: user-manual.txt:3041 +#: user-manual.txt:3136 msgid "" "A frequent need is for two or more persons to use _Subsurface_ on the same " "desktop computer. For instance members of a household may use the same " @@ -6966,112 +6975,89 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3053 -#, no-wrap -msgid "" -"*A)* If the different users of a desktop computer do not log onto the" -" desktop/laptop under different user names\n" -" then the simplest way is for each person to use her/his own divelog file" -" within Subsurface. In this case John\n" -" would work with the _Subsurface_ file _johns-divelog_ and Joan would use" -" _joans-divelog_. Select\n" -" the appropriate dive log by selecting, from the *Main Menu*, _File -> Open" -" logbook_ and then select your own\n" -" dive log file from the list of files lower down in the menu. However, a" -" problem arises if the users\n" -" prefer different settings for _Subsurface_. For instance, one diver may" -" prefer to see the dive ceiling in the\n" -" *Profile Panel* and photos icons in the *Dive List*, while the other may" -" not have these preferences. In addition,\n" -" the cloud connection is normally unique for each _Subsurface_ installation" -" and if more than one user wishes to save\n" -" dive data on the cloud, it is inconvenient to open the *Preferences* and" -" change the user-ID data every time\n" -" the cloud is accessed. To solve these problems, launch _Subsurface_ with a" -" _--user=<user name>_ command-line option.\n" +#: user-manual.txt:3148 +#, no-wrap +msgid "" +"*A)* If the different users of a desktop computer do not log onto the desktop/laptop under different user names\n" +" then the simplest way is for each person to use her/his own divelog file within Subsurface. In this case John\n" +" would work with the _Subsurface_ file _johns-divelog_ and Joan would use _joans-divelog_. Select\n" +" the appropriate dive log by selecting, from the *Main Menu*, _File -> Open logbook_ and then select your own\n" +" dive log file from the list of files lower down in the menu. However, a problem arises if the users\n" +" prefer different settings for _Subsurface_. For instance, one diver may prefer to see the dive ceiling in the\n" +" *Profile Panel* and photos icons in the *Dive List*, while the other may not have these preferences. In addition,\n" +" the cloud connection is normally unique for each _Subsurface_ installation and if more than one user wishes to save\n" +" dive data on the cloud, it is inconvenient to open the *Preferences* and change the user-ID data every time\n" +" the cloud is accessed. To solve these problems, launch _Subsurface_ with a _--user=<user name>_ command-line option.\n" " John can then activate _Subsurface_ with this command-line instruction:\n" msgstr "" #. type: Plain text -#: user-manual.txt:3055 +#: user-manual.txt:3150 #, no-wrap msgid "\tsubsurface --user=John\n" msgstr "" #. type: Plain text -#: user-manual.txt:3057 +#: user-manual.txt:3152 msgid "while Joan can launch _Subsurface_ using:" msgstr "" #. type: Plain text -#: user-manual.txt:3059 +#: user-manual.txt:3154 #, no-wrap msgid "\tsubsurface --user=Joan\n" msgstr "" #. type: Plain text -#: user-manual.txt:3067 +#: user-manual.txt:3162 #, no-wrap msgid "" -"In this case, each user's preferences, settings and cloud access information" -" are stored separately, allowing\n" -" each diver to interact with _Subsurface_ in her/his preferred way and with" -" individual cloud access. The above\n" -" process can be made user-friendly by creating a link/shortcut with a" -" desktop icon that executes the above\n" -" command-line instruction. Use of the _--user=_ option therefore enables" -" each user to create, maintain and\n" -" backup a separate dive log within a personalised user interface. This way," -" when each diver launches _Subsurface_,\n" -" it opens with the correct dive log as well as the appropriate display and" -" backup preferences, and each diver\n" -" can access their own divelog on a mobile device using" -" https://subsurface-divelog.org/documentation/subsurface-mobile-user-manual[_S" -"ubsurface-Mobile_].\n" +"In this case, each user's preferences, settings and cloud access information are stored separately, allowing\n" +" each diver to interact with _Subsurface_ in her/his preferred way and with individual cloud access. The above\n" +" process can be made user-friendly by creating a link/shortcut with a desktop icon that executes the above\n" +" command-line instruction. Use of the _--user=_ option therefore enables each user to create, maintain and\n" +" backup a separate dive log within a personalised user interface. This way, when each diver launches _Subsurface_,\n" +" it opens with the correct dive log as well as the appropriate display and backup preferences, and each diver\n" +" can access their own divelog on a mobile device using https://subsurface-divelog.org/documentation/subsurface-mobile-user-manual[_Subsurface-Mobile_].\n" msgstr "" #. type: Plain text -#: user-manual.txt:3071 +#: user-manual.txt:3166 #, no-wrap msgid "" -"*B)* On the other hand, if the users log onto the same computer using" -" different userIDs and passwords (i.e. users each\n" -"have a separate user space), _Subsurface_ is available independently to each" -" user and every diver automatically has a separate\n" -"user profile and settings, including unique cloud and _Subsurface-Mobile_" -" access.\n" +"*B)* On the other hand, if the users log onto the same computer using different userIDs and passwords (i.e. users each\n" +"have a separate user space), _Subsurface_ is available independently to each user and every diver automatically has a separate\n" +"user profile and settings, including unique cloud and _Subsurface-Mobile_ access.\n" msgstr "" #. type: Title == -#: user-manual.txt:3073 +#: user-manual.txt:3168 #, no-wrap msgid "Printing a dive log" msgstr "Imprimer un carnet de plongée" #. type: Plain text -#: user-manual.txt:3077 +#: user-manual.txt:3172 #, no-wrap msgid "" -"_Subsurface_ provides a simple and flexible way to print a whole dive log or" -" only a few selected dives.\n" -" Pre-installed templates or a custom written template can be used to choose" -" where the data are fitted into the page.\n" +"_Subsurface_ provides a simple and flexible way to print a whole dive log or only a few selected dives.\n" +" Pre-installed templates or a custom written template can be used to choose where the data are fitted into the page.\n" msgstr "" #. type: Plain text -#: user-manual.txt:3079 +#: user-manual.txt:3174 msgid "Some decisions need to be made before printing:" msgstr "Certains choix doivent être fait avant l'impression:" #. type: Plain text -#: user-manual.txt:3082 +#: user-manual.txt:3177 msgid "" "Should the whole dive log be printed or only part of it? If only part is " "required, select the required dives from the *Dive List* panel." msgstr "" #. type: Plain text -#: user-manual.txt:3084 +#: user-manual.txt:3179 msgid "" "If the dive profiles are printed, what gas partial pressure information " "should be shown? Select the appropriate toggle-buttons on the button bar to " @@ -7079,7 +7065,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3087 +#: user-manual.txt:3182 msgid "" "If _File -> Print_ is selected from the Main menu, the dialogue below (image " "*A*) appears. Three specifications are needed to get the desired information " @@ -7087,35 +7073,35 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:3088 user-manual.txt:4616 +#: user-manual.txt:3183 user-manual.txt:4780 #, no-wrap msgid "images/Print1_f22.jpg" msgstr "images/Print1_f22.jpg" #. type: Plain text -#: user-manual.txt:3091 +#: user-manual.txt:3186 msgid "Under _Print type_ select one of two options:" msgstr "" #. type: Plain text -#: user-manual.txt:3093 +#: user-manual.txt:3188 msgid "" "_Dive list print_: Print dives from the *Dive List* panel with profiles and " "other information." msgstr "" #. type: Plain text -#: user-manual.txt:3094 +#: user-manual.txt:3189 msgid "_Statistics print_: Print yearly statistics of the dives." msgstr "" #. type: Plain text -#: user-manual.txt:3096 +#: user-manual.txt:3191 msgid "Under _Print options_ select:" msgstr "" #. type: Plain text -#: user-manual.txt:3101 +#: user-manual.txt:3196 msgid "" "Printing only the dives selected from the dive list before activating the " "print dialogue by checking the box _Print only selected dives_. If this " @@ -7123,73 +7109,73 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3103 +#: user-manual.txt:3198 msgid "" "Printing in color, done by checking the box with _Print in color_. If this " "check box is not checked, printing is in black and white." msgstr "" #. type: Plain text -#: user-manual.txt:3106 +#: user-manual.txt:3201 msgid "" "Under _Template_ select a template to be used as the page layout. There are " "several choices. (see image *B*, above)." msgstr "" #. type: Plain text -#: user-manual.txt:3108 +#: user-manual.txt:3203 msgid "_Table_: This prints a summary table of all dives selected (see below)." msgstr "" #. type: Target for macro image -#: user-manual.txt:3109 +#: user-manual.txt:3204 #, no-wrap msgid "images/Print_summarylist_f22.jpg" msgstr "images/Print_summarylist_f22.jpg" #. type: Plain text -#: user-manual.txt:3112 +#: user-manual.txt:3207 msgid "" "_Flow layout_: Print the text associated with each dive without printing the " "dive profiles" msgstr "" #. type: Plain text -#: user-manual.txt:3113 +#: user-manual.txt:3208 msgid "of each dive (see below):" msgstr "" #. type: Target for macro image -#: user-manual.txt:3114 +#: user-manual.txt:3209 #, no-wrap msgid "images/Print_flow_layout_f22.jpg" msgstr "images/Print_flow_layout_f22.jpg" #. type: Plain text -#: user-manual.txt:3117 +#: user-manual.txt:3212 msgid "" "_One Dive_: Print one dive per page, also showing the dive profile (see " "below)" msgstr "" #. type: Target for macro image -#: user-manual.txt:3118 +#: user-manual.txt:3213 #, no-wrap msgid "images/print2_f22.jpg" msgstr "images/print2_f22.jpg" #. type: Plain text -#: user-manual.txt:3122 +#: user-manual.txt:3217 msgid "_Two Dives_: Print two dives per page, also showing the dive profiles." msgstr "" #. type: Plain text -#: user-manual.txt:3123 +#: user-manual.txt:3218 msgid "_Six Dives_: Print six dives per page, also showing the dive profiles." msgstr "" #. type: Plain text -#: user-manual.txt:3127 +#: user-manual.txt:3222 msgid "" "You can _Preview_ the printed page by selecting the _Preview_ button on the " "dialogue (see image *A* at the start of this section). After preview, you " @@ -7198,7 +7184,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3131 +#: user-manual.txt:3226 msgid "" "Next, select the _Print_ button (see image *A* at the start of this " "section). This activates the regular print dialogue used by the operating " @@ -7207,13 +7193,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:3132 +#: user-manual.txt:3227 #, no-wrap msgid "images/Print_print_f22.jpg" msgstr "images/Print_print_f22.jpg" #. type: Plain text -#: user-manual.txt:3137 +#: user-manual.txt:3232 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 " @@ -7222,19 +7208,19 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:3138 +#: user-manual.txt:3233 #, no-wrap msgid "images/Printpreview.jpg" msgstr "images/Printpreview.jpg" #. type: Title === -#: user-manual.txt:3140 +#: user-manual.txt:3235 #, no-wrap msgid "Writing a custom print template (advanced)" msgstr "Créer un modèle d'impression personnalisé (avancé)" #. type: Plain text -#: user-manual.txt:3146 +#: user-manual.txt:3241 msgid "" "Writing a custom template is an effective way to produce highly customized " "printouts. Subsurface uses HTML templates to render printing. You can create " @@ -7245,13 +7231,13 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:3148 +#: user-manual.txt:3243 #, no-wrap msgid "Configuring a dive computer" msgstr "Configurer un ordinateur de plongée" #. type: Plain text -#: user-manual.txt:3156 +#: user-manual.txt:3251 msgid "" "_Subsurface_ lets you configure a dive computer. Currently, the Heinrichs-" "Weikamp (OSTC 2/2N/2C, OSTC 3, Sport) and Suunto Vyper (Stinger, Mosquito, " @@ -7260,8 +7246,7 @@ msgid "" "and changed to different values. To begin, be sure the appropriate hardware " "driver is installed for the dive computer (also required for downloading " "dives) and the device name of the dive computer is known. See " -"<<_appendix_a_operating_system_specific_information_for_importing_dive_informa" -"tion_from_a_dive_computer," +"<<_appendix_a_operating_system_specific_information_for_importing_dive_information_from_a_dive_computer," "APPENDIX A>> for information on how to do this." msgstr "" "_Subsurface_ vous permet de configurer un ordinateur de plongée. " @@ -7272,12 +7257,11 @@ msgstr "" "pilotes pour votre ordinateur de plongée sont installés (également " "nécessaire pour télécharger les plongées) et que le nom de périphérique de " "l'ordinateur de plongée est connu. Voir " -"<<_appendix_a_operating_system_specific_information_for_importing_dive_informa" -"tion_from_a_dive_computer, " +"<<_appendix_a_operating_system_specific_information_for_importing_dive_information_from_a_dive_computer, " "ANNEXE A>> pour plus d'informations sur la manière de procéder." #. type: Plain text -#: user-manual.txt:3162 +#: user-manual.txt:3257 msgid "" "Once the dive computer is connected to the _Subsurface_ computer, select " "_File -> Configure dive computer_ from the _Main Menu_. Select the " @@ -7293,13 +7277,13 @@ msgstr "" "gauche (voir l'image ci-dessous)." #. type: Target for macro image -#: user-manual.txt:3163 +#: user-manual.txt:3258 #, no-wrap msgid "images/Configure_dc_f20.jpg" msgstr "images/Configure_dc_f20.jpg" #. type: Plain text -#: user-manual.txt:3166 +#: user-manual.txt:3261 msgid "" "Using the appropriate buttons on the configuration panel, the following " "actions can be done:" @@ -7308,73 +7292,63 @@ msgstr "" "suivantes peuvent être effectuées :" #. type: Plain text -#: user-manual.txt:3169 +#: user-manual.txt:3264 #, no-wrap msgid "" -"*Retrieve available details*. This loads the existing configuration from the" -" dive computer\n" +"*Retrieve available details*. This loads the existing configuration from the dive computer\n" "to _Subsurface_, showing it in the configuration panel.\n" msgstr "" -"*Récupérer les détails disponibles*. Cela charge la configuration existante à" -" partir de l'ordinateur de plongée\n" +"*Récupérer les détails disponibles*. Cela charge la configuration existante à partir de l'ordinateur de plongée\n" "dans _Subsurface_, en l'affichant dans le panneau de configuration.\n" #. type: Plain text -#: user-manual.txt:3171 +#: user-manual.txt:3266 #, no-wrap msgid "" "*Save changes to device*. This changes the configuration of the\n" -"dive computer to correspond to the information shown in the configuration" -" panel.\n" +"dive computer to correspond to the information shown in the configuration panel.\n" msgstr "" -"*Enregistrer les modifications sur le périphérique*. Cela change la" -" configuration de l'ordinateur\n" -"de plongée pour correspondre aux informations affichées dans le panneau de" -" configuration.\n" +"*Enregistrer les modifications sur le périphérique*. Cela change la configuration de l'ordinateur\n" +"de plongée pour correspondre aux informations affichées dans le panneau de configuration.\n" #. type: Plain text -#: user-manual.txt:3173 +#: user-manual.txt:3268 #, no-wrap msgid "" "*Backup*. This saves the configuration data to a file. _Subsurface_ asks for\n" "a file location and file name for the saved information.\n" msgstr "" -"*Sauvegarder*. Cela enregistre la configuration dans un fichier. _Subsurface_" -" demande\n" +"*Sauvegarder*. Cela enregistre la configuration dans un fichier. _Subsurface_ demande\n" "l'emplacement et le nom du fichier pour enregistrer les informations.\n" #. type: Plain text -#: user-manual.txt:3175 +#: user-manual.txt:3270 #, no-wrap msgid "" -"*Restore backup*. This loads the information from a backup file and displays" -" it\n" +"*Restore backup*. This loads the information from a backup file and displays it\n" "in the configuration panel.\n" msgstr "" -"*Restaurer une sauvegarde*. Cela charge les informations à partir d'un" -" fichier de sauvegarde et l'affiche\n" +"*Restaurer une sauvegarde*. Cela charge les informations à partir d'un fichier de sauvegarde et l'affiche\n" "dans le panneau de configuration.\n" #. type: Plain text -#: user-manual.txt:3177 +#: user-manual.txt:3272 #, no-wrap msgid "" -"*Update firmware*. If new firmware is available for the dive computer, this" -" is\n" +"*Update firmware*. If new firmware is available for the dive computer, this is\n" "loaded into the dive computer.\n" msgstr "" -"*Mettre à jour le firmware*. Si un nouveau firmware est disponible pour" -" l'ordinateur de plongée,\n" +"*Mettre à jour le firmware*. Si un nouveau firmware est disponible pour l'ordinateur de plongée,\n" "il sera chargé dans l'ordinateur de plongée.\n" #. type: Title == -#: user-manual.txt:3180 +#: user-manual.txt:3275 #, no-wrap msgid "Setting user _Preferences_ for _Subsurface_" msgstr "" #. type: Plain text -#: user-manual.txt:3191 +#: user-manual.txt:3286 msgid "" "There are several user-definable settings within _Subsurface_, found by " "selecting _File -> Preferences_, mostly affecting the way in which " @@ -7388,154 +7362,131 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3192 +#: user-manual.txt:3287 #, no-wrap msgid "General" msgstr "" #. type: Plain text -#: user-manual.txt:3195 +#: user-manual.txt:3290 msgid "There are several headings in the *General* panel:" msgstr "" #. type: Target for macro image -#: user-manual.txt:3196 +#: user-manual.txt:3291 #, no-wrap msgid "images/Pref1_f23.jpg" msgstr "images/Pref1_f23.jpg" #. type: Plain text -#: user-manual.txt:3200 +#: user-manual.txt:3295 #, no-wrap msgid "" " ** *Lists and tables*: Specify the font type and font size of the\n" -" *Dive Table* panel: decreasing the font size allows one to see more" -" dives on a screen.\n" +" *Dive Table* panel: decreasing the font size allows one to see more dives on a screen.\n" msgstr "" #. type: Plain text -#: user-manual.txt:3205 +#: user-manual.txt:3300 #, no-wrap msgid "" " ** *Dives*: For the _Default Dive Log File_ specify the directory and\n" " file name of your\n" -" electronic dive log book. This is a file with filename extension of" -" either _.xml_ or _.ssrf_. When\n" -" launched, _Subsurface_ will automatically load the specified dive log" -" book. There are three options:\n" +" electronic dive log book. This is a file with filename extension of either _.xml_ or _.ssrf_. When\n" +" launched, _Subsurface_ will automatically load the specified dive log book. There are three options:\n" msgstr "" #. type: Plain text -#: user-manual.txt:3206 +#: user-manual.txt:3301 #, no-wrap -msgid "" -"_No default file_: When checked, _Subsurface_ does not automatically load a" -" dive log at startup.\n" +msgid "_No default file_: When checked, _Subsurface_ does not automatically load a dive log at startup.\n" msgstr "" #. type: Plain text -#: user-manual.txt:3207 +#: user-manual.txt:3302 #, no-wrap -msgid "" -"_Local default file_: When checked, _Subsurface_ automatically loads a dive" -" log from the local hard disk.\n" +msgid "_Local default file_: When checked, _Subsurface_ automatically loads a dive log from the local hard disk.\n" msgstr "" #. type: Plain text -#: user-manual.txt:3209 +#: user-manual.txt:3304 #, no-wrap msgid "" -"_Cloud storage default file_: When checked, _Subsurface automatically loads" -" the dive log from the cloud\n" -"device that was initialized using the *Preferences* _Network_ tab (see" -" below).\n" +"_Cloud storage default file_: When checked, _Subsurface automatically loads the dive log from the cloud\n" +"device that was initialized using the *Preferences* _Network_ tab (see below).\n" msgstr "" #. type: Plain text -#: user-manual.txt:3211 +#: user-manual.txt:3306 #, no-wrap -msgid "" -"** *Display invalid*: Dives can be marked as invalid (when a user wishes to" -" hide\n" +msgid "** *Display invalid*: Dives can be marked as invalid (when a user wishes to hide\n" msgstr "" #. type: Plain text -#: user-manual.txt:3214 +#: user-manual.txt:3309 #, no-wrap msgid "" -"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" +"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:3216 +#: user-manual.txt:3311 #, no-wrap -msgid "" -"** *Default cylinder*: From the dropdown list, select the default cylinder to" -" be used in\n" +msgid "** *Default cylinder*: From the dropdown list, select the default cylinder to be used in\n" msgstr "" #. type: Plain text -#: user-manual.txt:3217 +#: user-manual.txt:3312 #, no-wrap msgid "the *Equipment* tab of the *Notes* panel.\n" msgstr "" #. type: Plain text -#: user-manual.txt:3219 +#: user-manual.txt:3314 #, no-wrap -msgid "" -"** *Animations*: Some actions in showing the dive profile are performed" -" using\n" +msgid "** *Animations*: Some actions in showing the dive profile are performed using\n" msgstr "" #. type: Plain text -#: user-manual.txt:3225 +#: user-manual.txt:3320 #, no-wrap msgid "" -"animations. For instance, the axis values for depth and time change from dive" -" to\n" -"dive. When viewing a different dive, these changes in axis characteristics do" -" not\n" -"happen instantaneously, but are animated. The _Speed_ of animations can be" -" controlled\n" +"animations. For instance, the axis values for depth and time change from dive to\n" +"dive. When viewing a different dive, these changes in axis characteristics do not\n" +"happen instantaneously, but are animated. The _Speed_ of animations can be controlled\n" "by setting this slider\n" -"with faster animation speed to the left, and a 0 value representing no" -" animation\n" +"with faster animation speed to the left, and a 0 value representing no animation\n" "at all.\n" msgstr "" #. type: Plain text -#: user-manual.txt:3227 +#: user-manual.txt:3322 #, no-wrap -msgid "" -"** *Clear all settings*: As indicated in the button below this heading, all" -" settings are\n" +msgid "** *Clear all settings*: As indicated in the button below this heading, all settings are\n" msgstr "" #. type: Plain text -#: user-manual.txt:3228 +#: user-manual.txt:3323 #, no-wrap msgid "cleared and set to default values.\n" msgstr "" #. type: Title === -#: user-manual.txt:3229 +#: user-manual.txt:3324 #, no-wrap msgid "Units" msgstr "" #. type: Target for macro image -#: user-manual.txt:3230 +#: user-manual.txt:3325 #, no-wrap msgid "images/Pref2_f23.jpg" msgstr "images/Pref2_f23.jpg" #. type: Plain text -#: user-manual.txt:3237 +#: user-manual.txt:3332 msgid "" "Choose between metric and imperial units of depth, pressure, volume, " "temperature and mass. By selecting the Metric or Imperial radio button at " @@ -7546,7 +7497,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3243 +#: user-manual.txt:3338 msgid "" "Regardless of the above settings, dive time measurements can be either in " "seconds or minutes. Choose the appropriate option. GPS coordinates can be " @@ -7555,229 +7506,187 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3244 +#: user-manual.txt:3339 #, no-wrap msgid "Profile" msgstr "Profil" #. type: Plain text -#: user-manual.txt:3246 +#: user-manual.txt:3341 msgid "This panel has three sections:" msgstr "Ce panneau comporte trois sections:" #. type: Target for macro image -#: user-manual.txt:3248 +#: user-manual.txt:3343 #, no-wrap msgid "images/Pref4_f23.jpg" msgstr "images/Pref4_f23.jpg" #. type: Plain text -#: user-manual.txt:3261 +#: user-manual.txt:3356 #, no-wrap msgid "" -"*Gas pressure display setup*. Even though nitrogen and helium pressures are" -" also included here, these items mainly pertain to oxygen management:\n" -"** _Thresholds_: _Subsurface_ can display graphs of the nitrogen, oxygen and" -" the helium\n" +"*Gas pressure display setup*. Even though nitrogen and helium pressures are also included here, these items mainly pertain to oxygen management:\n" +"** _Thresholds_: _Subsurface_ can display graphs of the nitrogen, oxygen and the helium\n" " partial pressures during\n" " the dive, activated using the toolbar on the left of the *Dive Profile*\n" -" panel. For each of these graphs, specify a threshold value. If any of the" -" graphs go\n" +" panel. For each of these graphs, specify a threshold value. If any of the graphs go\n" " above the specified threshold, the graph is\n" -" highlighted in red, indicating the particular partial pressure threshold" -" has been exceeded.\n" -" The pO~2~ threshold is probably the most important one and a value of 1.6" -" is commonly used.\n" -"** _pO~2~ in calculating MOD_ is used for calculating the maximum operative" -" depth for a particular\n" +" highlighted in red, indicating the particular partial pressure threshold has been exceeded.\n" +" The pO~2~ threshold is probably the most important one and a value of 1.6 is commonly used.\n" +"** _pO~2~ in calculating MOD_ is used for calculating the maximum operative depth for a particular\n" " nitrox or trimix gas mixture. A value of 1.4 is commonly used.\n" msgstr "" #. type: Plain text -#: user-manual.txt:3263 +#: user-manual.txt:3358 #, no-wrap -msgid "" -"** CCR Options: These options determine oxygen management for CCR dives:\n" +msgid "** CCR Options: These options determine oxygen management for CCR dives:\n" msgstr "" #. type: Plain text -#: user-manual.txt:3268 +#: user-manual.txt:3363 #, no-wrap msgid "" "*** _Dive planner default setpoint_: Specify the O~2~ setpoint for a\n" " CCR dive plan. This determines the pO~2~ maintained\n" -" during a particular dive. Setpoint changes during the dive can be added" -" via the\n" +" during a particular dive. Setpoint changes during the dive can be added via the\n" " profile context menu.\n" msgstr "" #. type: Plain text -#: user-manual.txt:3272 +#: user-manual.txt:3367 #, no-wrap msgid "" -"*** _CCR: Show setpoints when viewing pO~2~:_ With this checkbox activated," -" the pO~2~\n" -" graph on the dive profile has an overlay in red which indicates the CCR" -" setpoint\n" -" values. See the section on xref:S_CCR_dives[Closed Circuit Rebreather" -" dives].\n" +"*** _CCR: Show setpoints when viewing pO~2~:_ With this checkbox activated, the pO~2~\n" +" graph on the dive profile has an overlay in red which indicates the CCR setpoint\n" +" values. See the section on xref:S_CCR_dives[Closed Circuit Rebreather dives].\n" msgstr "" #. type: Plain text -#: user-manual.txt:3276 +#: user-manual.txt:3371 #, no-wrap msgid "" -"*** _CCR: Show individual O~2~ sensor values when viewing pO~2~:_ Show the" -" pO~2~\n" -" values associated with each of the individual oxygen sensors of a CCR" -" system.\n" +"*** _CCR: Show individual O~2~ sensor values when viewing pO~2~:_ Show the pO~2~\n" +" values associated with each of the individual oxygen sensors of a CCR system.\n" " See the section on xref:S_CCR_dives[Closed Circuit Rebreather dives].\n" msgstr "" #. type: Plain text -#: user-manual.txt:3278 +#: user-manual.txt:3373 #, no-wrap -msgid "" -"*Ceiling display setup*. These settings mostly deal with nitrogen and helium" -" management\n" +msgid "*Ceiling display setup*. These settings mostly deal with nitrogen and helium management\n" msgstr "" #. type: Plain text -#: user-manual.txt:3279 +#: user-manual.txt:3374 #, no-wrap -msgid "" -"by determining how the decompression ceiling (ascent ceiling) is calculated" -" and displayed:\n" +msgid "by determining how the decompression ceiling (ascent ceiling) is calculated and displayed:\n" msgstr "" #. type: Plain text -#: user-manual.txt:3286 +#: user-manual.txt:3381 #, no-wrap msgid "" -"** _Draw dive computer reported ceiling red_: This checkbox does exactly what" -" it says. By default\n" +"** _Draw dive computer reported ceiling red_: This checkbox does exactly what it says. By default\n" " the computer reported ceiling is shown in white.\n" -" Not all dive computers report ceiling values. If the dive computer does" -" report it, it may differ\n" -" from the ceilings calculated by _Subsurface_ because of the different" -" algorithms and\n" +" Not all dive computers report ceiling values. If the dive computer does report it, it may differ\n" +" from the ceilings calculated by _Subsurface_ because of the different algorithms and\n" " gradient factors, as well as the dynamic way a\n" " dive computer calculates ceilings during a dive.\n" msgstr "" #. type: Plain text -#: user-manual.txt:3291 +#: user-manual.txt:3386 #, no-wrap msgid "" "** _Algorithm for calculating ceiling_. Choose between the Bühlmann Z1H-L16\n" " decompression model and the VPM-B model:\n" -"*** _VPM-B_: Provide a conservatism level for calculating the VPM-B ceiling." -" Values between 0\n" +"*** _VPM-B_: Provide a conservatism level for calculating the VPM-B ceiling. Values between 0\n" " (least conservative) and 4 (most conservative) are valid.\n" msgstr "" #. type: Plain text -#: user-manual.txt:3307 +#: user-manual.txt:3402 #, no-wrap msgid "" -"*** Bühlmann: Set the _gradient factors_ (GFLow and GFHigh) for calculcating" -" the deco ceiling following\n" -" the ZH-L16 algorithm. GF_Low is the gradient factor at depth and GF_High" -" is used at the surface.\n" -" At intermediate depths gradient factors between GF_Low and GF_High are" -" used.\n" -" Gradient factors add conservatism to nitrogen and helium exposure during a" -" dive, in a\n" -" similar way that many dive computers have a conservatism setting. The" -" lower\n" -" the value of a gradient factor, the more conservative the calculations are" -" with\n" +"*** Bühlmann: Set the _gradient factors_ (GFLow and GFHigh) for calculcating the deco ceiling following\n" +" the ZH-L16 algorithm. GF_Low is the gradient factor at depth and GF_High is used at the surface.\n" +" At intermediate depths gradient factors between GF_Low and GF_High are used.\n" +" Gradient factors add conservatism to nitrogen and helium exposure during a dive, in a\n" +" similar way that many dive computers have a conservatism setting. The lower\n" +" the value of a gradient factor, the more conservative the calculations are with\n" " respect to inert gas loading and the deeper the ceilings are. Gradient\n" -" factors of 20/60 are considered conservative and values of 70/90 are" -" considered\n" +" factors of 20/60 are considered conservative and values of 70/90 are considered\n" " harsh.\n" -" In addition decide whether to check the _GFLow at max. depth_ box. If" -" checked, GF_Low is used for the\n" -" deepest dive depth and linearly increased up to the GF_High value at the" -" surface. If unchecked,\n" -" GF_Low is used between the deepest dive depth and the first deco stop," -" after which the\n" -" gradient factor linearly increases up to the GF_High value at the surface." -" For more information see:\n" +" In addition decide whether to check the _GFLow at max. depth_ box. If checked, GF_Low is used for the\n" +" deepest dive depth and linearly increased up to the GF_High value at the surface. If unchecked,\n" +" GF_Low is used between the deepest dive depth and the first deco stop, after which the\n" +" gradient factor linearly increases up to the GF_High value at the surface. For more information see:\n" msgstr "" #. type: Plain text -#: user-manual.txt:3314 +#: user-manual.txt:3409 #, no-wrap msgid "" -" ** _pSCR options_. These preferences determine how passive semi-closed" -" circuit (pSCR) dives\n" +" ** _pSCR options_. These preferences determine how passive semi-closed circuit (pSCR) dives\n" " are planned and how the pSCR deco ceiling is calculated:\n" msgstr "" #. type: Plain text -#: user-manual.txt:3318 +#: user-manual.txt:3413 #, no-wrap msgid "" " *** _Metabolic rate:_ this is the\n" -" volume of oxygen used by a diver during a minute. Set this value for pSCR" -" dive planning\n" +" volume of oxygen used by a diver during a minute. Set this value for pSCR dive planning\n" " and decompression calculations.\n" msgstr "" #. type: Plain text -#: user-manual.txt:3321 +#: user-manual.txt:3416 #, no-wrap msgid "" -" *** _pSCR ratio:_ The dilution ratio (or dump ratio) is the ratio of gas" -" released to the\n" -" environment to that of the gas recirculated to the diver. A 1:10 ratio is" -" commonly used.\n" +" *** _pSCR ratio:_ The dilution ratio (or dump ratio) is the ratio of gas released to the\n" +" environment to that of the gas recirculated to the diver. A 1:10 ratio is commonly used.\n" msgstr "" #. type: Plain text -#: user-manual.txt:3323 +#: user-manual.txt:3418 #, no-wrap msgid "*Misc*\n" msgstr "" #. type: Plain text -#: user-manual.txt:3330 +#: user-manual.txt:3425 #, no-wrap msgid "" -"** _Show unused cylinders in Equipment Tab_: This checkbox allows display of" -" information about unused cylinders when viewing the\n" -"*Equipment Tab*. If this box is not checked, and if any cylinders entered" -" using the *Equipment Tab* are not used (e.g. there\n" -"was no gas switch to such a cylinder), then these cylinders are omitted from" -" that list.\n" -"** _Show mean depth_: If this box is checked, the *Dive Profile* panel" -" contains a grey line that shows\n" -" the mean depth of the dive, up to any time instant during the dive." -" Normally this is a u-shaped line indicating the deepest mean depth just" -" before\n" +"** _Show unused cylinders in Equipment Tab_: This checkbox allows display of information about unused cylinders when viewing the\n" +"*Equipment Tab*. If this box is not checked, and if any cylinders entered using the *Equipment Tab* are not used (e.g. there\n" +"was no gas switch to such a cylinder), then these cylinders are omitted from that list.\n" +"** _Show mean depth_: If this box is checked, the *Dive Profile* panel contains a grey line that shows\n" +" the mean depth of the dive, up to any time instant during the dive. Normally this is a u-shaped line indicating the deepest mean depth just before\n" " ascent.\n" msgstr "" #. type: Title === -#: user-manual.txt:3332 +#: user-manual.txt:3427 #, no-wrap msgid "Language" msgstr "Langue" #. type: Plain text -#: user-manual.txt:3334 +#: user-manual.txt:3429 msgid "Choose a language that _Subsurface_ will use." msgstr "Choisissez une langue que _Subsurface_ utilisera." #. type: Target for macro image -#: user-manual.txt:3335 +#: user-manual.txt:3430 #, no-wrap msgid "images/Pref3_f23.jpg" msgstr "images/Pref3_f23.jpg" #. type: Plain text -#: user-manual.txt:3344 +#: user-manual.txt:3439 msgid "" "Check the _System Default_ language i.e. the language of the underlying " "operating system if this is appropriate. This is the default setting in " @@ -7789,7 +7698,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3346 +#: user-manual.txt:3441 msgid "" "In this section also specify appropriate date and time formats for showing " "dive details." @@ -7798,13 +7707,13 @@ msgstr "" "l'affiche des détails de plongée." #. type: Title === -#: user-manual.txt:3347 +#: user-manual.txt:3442 #, no-wrap msgid "Network" msgstr "Réseau" #. type: Plain text -#: user-manual.txt:3352 +#: user-manual.txt:3447 msgid "" "This panel facilitates communication between _Subsurface_ and data sources " "on the Internet. This is important, for instance, when _Subsurface_ needs " @@ -7813,94 +7722,80 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:3354 +#: user-manual.txt:3449 #, no-wrap msgid "images/Pref5_f23.jpg" msgstr "images/Pref5_f23.jpg" #. type: Plain text -#: user-manual.txt:3357 +#: user-manual.txt:3452 msgid "This dialogue has three sections:" msgstr "" #. type: Plain text -#: user-manual.txt:3365 +#: user-manual.txt:3460 #, no-wrap msgid "" "** _Proxy_:\n" -"If a proxy server is used for Internet access, the type of proxy needs to be" -" selected from the dropdown list,\n" -"after which the IP address of the host and the appropriate port number" -" should\n" -"be provided. If the proxy server uses authentication, the appropriate userID" -" and\n" +"If a proxy server is used for Internet access, the type of proxy needs to be selected from the dropdown list,\n" +"after which the IP address of the host and the appropriate port number should\n" +"be provided. If the proxy server uses authentication, the appropriate userID and\n" "password are required so that _Subsurface_ can automatically pass\n" -"through the proxy server to access the Internet. This information is usually" -" obtained\n" +"through the proxy server to access the Internet. This information is usually obtained\n" "from your ISP.\n" msgstr "" #. type: Plain text -#: user-manual.txt:3370 +#: user-manual.txt:3465 #, no-wrap msgid "" -"** _Subsurface cloud storage_: To store your dive log in the cloud, a valid" -" email address\n" -" and password are required. This lets _Subsurface_ email security" -" information\n" -" regarding cloud storage to you, and to set up cloud storage" -" appropriately.\n" +"** _Subsurface cloud storage_: To store your dive log in the cloud, a valid email address\n" +" and password are required. This lets _Subsurface_ email security information\n" +" regarding cloud storage to you, and to set up cloud storage appropriately.\n" " Two additional options are given:\n" msgstr "" #. type: Plain text -#: user-manual.txt:3371 +#: user-manual.txt:3466 #, no-wrap -msgid "" -"_Sync to cloud in the background_: This option allows saving of dive" -" information to the cloud storage\n" +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:3372 +#: user-manual.txt:3467 #, no-wrap msgid "while you do other things within _Subsurface_.\n" msgstr "" #. type: Plain text -#: user-manual.txt:3373 +#: user-manual.txt:3468 #, no-wrap -msgid "" -"_Save password locally_: This allows local storage of the cloud storage" -" password. Note that this\n" +msgid "_Save password locally_: This allows local storage of the cloud storage password. Note that this\n" msgstr "" #. type: Plain text -#: user-manual.txt:3374 +#: user-manual.txt:3469 #, no-wrap msgid "information is saved in raw text form, not encoded in any way.\n" msgstr "" #. type: Plain text -#: user-manual.txt:3378 +#: user-manual.txt:3473 #, no-wrap msgid "" -"** _Subsurface web service_: When you subscribe to the <" -"<S_Companion,Subsurface web service>>, a very\n" -" long and hard-to-remember userID is issued. This is the place to save" -" that userID. By\n" -" checking the option _Save User ID locally?_, you ensure a local copy of" -" that userID is saved.\n" +"** _Subsurface web service_: When you subscribe to the <<S_Companion,Subsurface web service>>, a very\n" +" long and hard-to-remember userID is issued. This is the place to save that userID. By\n" +" checking the option _Save User ID locally?_, you ensure a local copy of that userID is saved.\n" msgstr "" #. type: Title === -#: user-manual.txt:3379 +#: user-manual.txt:3474 #, no-wrap msgid "Georeference" msgstr "Géoréférencement" #. type: Plain text -#: user-manual.txt:3387 +#: user-manual.txt:3482 msgid "" "_Subsurface_ provides a geo-lookup service (that is, given the coordinates " "of a dive site) derived from a click on the *Dive Map panel* at the bottom " @@ -7913,19 +7808,19 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:3388 +#: user-manual.txt:3483 #, no-wrap msgid "images/Pref7_f23.jpg" msgstr "images/Pref7_f23.jpg" #. type: Title == -#: user-manual.txt:3391 +#: user-manual.txt:3486 #, no-wrap msgid "The _Subsurface_ dive planner" msgstr "Le planificateur de plongée de _Subsurface_" #. type: Plain text -#: user-manual.txt:3396 +#: user-manual.txt:3491 msgid "" "Dive planning is an advanced feature of _Subsurface_, accessed by selecting " "_Log -> Plan Dive_ from the main menu. It allows calculation of inert gas " @@ -7934,19 +7829,18 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:3404 +#: user-manual.txt:3499 msgid "" -"The _Subsurface_ dive planner IS CURRENTLY EXPERIMENTAL and assumes the user " -"is already familiar with the _Subsurface_ user interface. It is explicitly " -"used under the following conditions:" +"The _Subsurface_ dive planner IS EXPERIMENTAL and assumes the user is " +"already familiar with the _Subsurface_ user interface. It is explicitly used " +"under the following conditions:" msgstr "" -"Le planificateur de plongée de _Subsurface_ EST POUR L'INSTANT EN PHASE " -"EXPÉRIMENTALE et suppose que l'utilisateur est déjà familier avec " -"l'interface utilisateur de _Subsurface_. Il est utilisé explicitement aux " -"conditions suivantes:" +"Le planificateur de plongée de _Subsurface_ EST EN PHASE EXPÉRIMENTALE et " +"suppose que l'utilisateur est déjà familier avec l'interface utilisateur de " +"_Subsurface_. Il est utilisé explicitement aux conditions suivantes :" #. type: delimited block * -#: user-manual.txt:3407 +#: user-manual.txt:3502 msgid "" "The user is conversant with dive planning and has the necessary training to " "perform dive planning." @@ -7955,13 +7849,13 @@ msgstr "" "la formation nécessaire pour faire une planification de plongée." #. type: delimited block * -#: user-manual.txt:3408 +#: user-manual.txt:3503 msgid "The user plans dives within his/her certification limits." msgstr "" "L'utilisateur planifie des plongées dans les limites de sa certification." #. type: delimited block * -#: user-manual.txt:3411 +#: user-manual.txt:3506 msgid "" "Dive planning makes large assumptions about the characteristics of the " "_average person_ and cannot compensate for individual physiology or health " @@ -7972,7 +7866,7 @@ msgstr "" "santé, l'historique personnel et les caractéristiques du mode de vie." #. type: delimited block * -#: user-manual.txt:3412 +#: user-manual.txt:3507 msgid "" "The safety of a dive plan depends heavily on the way in which the planner is " "used." @@ -7981,12 +7875,12 @@ msgstr "" "façon dont le planificateur est utilisé." #. type: delimited block * -#: user-manual.txt:3413 +#: user-manual.txt:3508 msgid "The user is familiar with the user interface of _Subsurface_." msgstr "L'utilisateur est familier avec l'interface de _Subsurface_." #. type: delimited block * -#: user-manual.txt:3415 +#: user-manual.txt:3510 msgid "" "A user who is not absolutely sure about any of the above requirements should " "not use this feature." @@ -7995,13 +7889,13 @@ msgstr "" "ne devrait pas utiliser cette fonction." #. type: Title === -#: user-manual.txt:3417 +#: user-manual.txt:3512 #, no-wrap msgid "The _Subsurface_ dive planner screen" msgstr "L'écran du planificateur de plongée _Subsurface_" #. type: Plain text -#: user-manual.txt:3422 +#: user-manual.txt:3517 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 " @@ -8010,7 +7904,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3426 +#: user-manual.txt:3521 msgid "" "At the top right hand is a green *design panel* on which the profile of the " "dive can be manipulated directly by dragging and clicking as explained " @@ -8019,7 +7913,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3430 +#: user-manual.txt:3525 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 " @@ -8028,26 +7922,26 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:3431 +#: user-manual.txt:3526 #, no-wrap -msgid "images/PlannerWindow1_f20.jpg" -msgstr "images/PlannerWindow1_f20.jpg" +msgid "images/PlannerWindow1.jpg" +msgstr "images/PlannerWindow1.jpg" #. type: Title === -#: user-manual.txt:3434 +#: user-manual.txt:3529 #, no-wrap msgid "Open circuit dives" msgstr "Plongées en circuit ouvert" #. type: Plain text -#: user-manual.txt:3437 +#: user-manual.txt:3532 msgid "" "Towards the center bottom of the planner (circled in blue in the image " "above) is a dropbox with three options. Select the appropriate one of these:" msgstr "" #. type: Plain text -#: user-manual.txt:3440 +#: user-manual.txt:3535 #, no-wrap msgid "" "** Open Circuit (the default)\n" @@ -8059,12 +7953,12 @@ msgstr "" "** pSCR\n" #. type: Plain text -#: user-manual.txt:3442 +#: user-manual.txt:3537 msgid "Choose the Open Circuit option." msgstr "Choisissez l'option Circuit ouvert." #. type: Plain text -#: user-manual.txt:3446 +#: user-manual.txt:3541 msgid "" "In the top left-hand area of the planning screen, be sure the constant dive " "parameters are appropriate. These are: Start date and time of the intended " @@ -8074,7 +7968,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3455 +#: user-manual.txt:3550 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. " @@ -8089,70 +7983,59 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3457 +#: user-manual.txt:3552 msgid "The _Available Gases_ table includes three gas depth fields, labelled:" msgstr "" "Le tableau _Gaz disponibles_ inclut trois champs de profondeur de gaz, " "nommés:" #. type: Plain text -#: user-manual.txt:3458 +#: user-manual.txt:3553 #, no-wrap -msgid "" -"** Deco switch at: the switch depth for deco gases. Unless overridden by the" -" user, this will be\n" +msgid "** Deco switch at: the switch depth for deco gases. Unless overridden by the user, this will be\n" msgstr "" #. type: Plain text -#: user-manual.txt:3459 +#: user-manual.txt:3554 #, no-wrap -msgid "" -"automatically calculated based on the Deco pO~2~ preference (default 1.6" -" bar)\n" +msgid "automatically calculated based on the Deco pO~2~ preference (default 1.6 bar)\n" msgstr "" #. type: Plain text -#: user-manual.txt:3460 +#: user-manual.txt:3555 #, no-wrap -msgid "" -"** Bot. MOD: the gas Maximum Operating Depth (MOD) if it is used as a bottom" -" mix. Automatically\n" +msgid "** Bot. MOD: the gas Maximum Operating Depth (MOD) if it is used as a bottom mix. Automatically\n" msgstr "" #. type: Plain text -#: user-manual.txt:3462 +#: user-manual.txt:3557 #, no-wrap msgid "" -"calculated based on the Bottom pO~2~ preference (default 1.4 bar). Editing" -" this field will modify the\n" -"O~2~% according to the depth set. Set to ''*'' to calculate the best O~2~%" -" for the dive maximum depth.\n" +"calculated based on the Bottom pO~2~ preference (default 1.4 bar). Editing this field will modify the\n" +"O~2~% according to the depth set. Set to ''*'' to calculate the best O~2~% for the dive maximum depth.\n" msgstr "" #. type: Plain text -#: user-manual.txt:3463 +#: user-manual.txt:3558 #, no-wrap -msgid "" -"** MND: the gas Maximum Narcotic Depth (MND). Automatically calculated based" -" on the Best Mix END\n" +msgid "** MND: the gas Maximum Narcotic Depth (MND). Automatically calculated based on the Best Mix END\n" msgstr "" #. type: Plain text -#: user-manual.txt:3465 +#: user-manual.txt:3560 #, no-wrap msgid "" -"preference (default 30m / 98 ft). Editing this field will modify the He%" -" according to the depth set.\n" +"preference (default 30m / 98 ft). Editing this field will modify the He% according to the depth set.\n" "Set to ''*'' to calculate the best He% for the dive maximum depth.\n" msgstr "" #. type: Plain text -#: user-manual.txt:3467 +#: user-manual.txt:3562 msgid "The profile of the planned dive can be created in two ways:" msgstr "Le profil d'une plongée planifiée peut être créé de deux façons:" #. type: Plain text -#: user-manual.txt:3472 +#: user-manual.txt:3567 msgid "" "Drag the waypoints (the small white circles) on the existing dive profile to " "represent the dive. Additional waypoints can be created by double-clicking " @@ -8162,7 +8045,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3480 +#: user-manual.txt:3575 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 " @@ -8176,35 +8059,25 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:3481 +#: user-manual.txt:3576 #, no-wrap msgid "Recreational dives" msgstr "Plongées loisir" #. type: Plain text -#: user-manual.txt:3498 -#, no-wrap -msgid "" -"Recreational mode is what comes closest to planning a dive based on the" -" non-decompression limit (NDL).\n" -"It computes the maximum time a diver can stay at the current depth without" -" needing mandatory decompression\n" -"stops and without using more than the existing gas (minus a reserve). The" -" planner automatically takes\n" -"into account the nitrogen load incurred in previous dives. But conventional" -" dive tables are also used in a\n" -"way that can take into account previous dives. Why use a dive planner for" -" recreational dives? Using\n" -"recreational dive tables, the maximum depth of a dive is taken into account." -" But few dives are\n" -"done at a constant depth corresponding to the maximum depth (i.e. a" -" \"square\" dive profile). This means\n" -"dive tables overestimate the nitrogen load incurred during previous dives." -" The _Subsurface_\n" -"dive planner calculates nitrogen load according to the real dive profiles of" -" all uploaded previous dives,\n" -"in a similar way as dive computers calculate nitrogen load during a dive." -" This means that the diver gets 'credit,'\n" +#: user-manual.txt:3593 +#, no-wrap +msgid "" +"Recreational mode is what comes closest to planning a dive based on the non-decompression limit (NDL).\n" +"It computes the maximum time a diver can stay at the current depth without needing mandatory decompression\n" +"stops and without using more than the existing gas (minus a reserve). The planner automatically takes\n" +"into account the nitrogen load incurred in previous dives. But conventional dive tables are also used in a\n" +"way that can take into account previous dives. Why use a dive planner for recreational dives? Using\n" +"recreational dive tables, the maximum depth of a dive is taken into account. But few dives are\n" +"done at a constant depth corresponding to the maximum depth (i.e. a \"square\" dive profile). This means\n" +"dive tables overestimate the nitrogen load incurred during previous dives. The _Subsurface_\n" +"dive planner calculates nitrogen load according to the real dive profiles of all uploaded previous dives,\n" +"in a similar way as dive computers calculate nitrogen load during a dive. This means that the diver gets 'credit,'\n" "in terms of nitrogen load, for not remaining at maximum depth during\n" "previous dives, so a longer subsequent dive can be planned.\n" " For the planner to work it's crucial to upload all previous dives\n" @@ -8213,21 +8086,21 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3501 +#: user-manual.txt:3596 msgid "" "Ensure the date and time is set to that of the intended dive. This allows " "calculation of the nitrogen load incurred during previous dives." msgstr "" #. type: Plain text -#: user-manual.txt:3504 +#: user-manual.txt:3599 msgid "" "Immediately under the heading _Planning_ are two checkboxes _Recreational_ " "and _Safety Stop_. Check these two boxes." msgstr "" #. type: Plain text -#: user-manual.txt:3508 +#: user-manual.txt:3603 msgid "" "Then define the cylinder size, the gas mixture (air or % oxygen) and the " "working cylinder pressure in the top left-hand section of the planner under " @@ -8235,7 +8108,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3513 +#: user-manual.txt:3608 msgid "" "The planner calculates whether the specified cylinder contains enough air/" "gas to complete the planned dive. In order for this to be accurate, under " @@ -8245,7 +8118,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3522 +#: user-manual.txt:3617 msgid "" "Define the amount of gas the cylinder must have at the end of the bottom " "section of the dive just before ascent. A value of 50 bar is often used. The " @@ -8262,7 +8135,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3530 +#: user-manual.txt:3625 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 " @@ -8275,7 +8148,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3533 +#: user-manual.txt:3628 msgid "" "The ascent speed can be changed. The default ascent speeds are those " "considered safe for recreational divers." @@ -8284,7 +8157,7 @@ msgstr "" "défaut sont celles qui sont considérées comme sûres pour les plongées loisir." #. type: Plain text -#: user-manual.txt:3541 +#: user-manual.txt:3636 msgid "" "The dive profile in the planner shows the maximum dive time within no-deco " "limits using the Bühlmann ZH-L16 algorithm and the gas and depth settings " @@ -8300,62 +8173,52 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3545 +#: user-manual.txt:3639 msgid "" "Below is an image of a dive plan for a recreational dive at 30 meters. " "Although the no-deco limit (NDL) is 23 minutes, the duration of the dive is " -"limited by the amount of air in the cylinder. That is shown in the text box " -"at the bottom right of the panel, requiring sufficient air for buddy-sharing " -"during ascent." +"limited by the amount of air in the cylinder." msgstr "" #. type: Target for macro image -#: user-manual.txt:3546 +#: user-manual.txt:3640 #, no-wrap msgid "images/Planner_OC_rec.jpg" msgstr "images/Planner_OC_rec.jpg" # Une autre idée de traduction pour "non-recreational"? #. type: Title ==== -#: user-manual.txt:3548 -#, fuzzy, no-wrap +#: user-manual.txt:3642 +#, no-wrap msgid "Non-recreational open circuit dives, including decompression" -msgstr "Plongées en circuit ouvert _non loisir_, incluant une décompression" +msgstr "Plongées en circuit ouvert non loisir, incluant une décompression" #. type: Plain text -#: user-manual.txt:3552 +#: user-manual.txt:3646 msgid "" "Non-recreational dive planning involves exceeding the no-deco limits and/or " "using multiple breathing gases. These dives are planned in three stages:" msgstr "" #. type: Plain text -#: user-manual.txt:3564 +#: user-manual.txt:3658 #, no-wrap msgid "" -"*a) Nitrogen management*: This is done by specifying the rates for descent" -" and ascent,\n" -"as well as the deco model (GFLow, GFHigh or Conservatism level) under the" -" headings _Rates_ and _Planning_\n" -"to the bottom left of the planning screen. Two deco models are supported the" -" Bühlmann model and the VPM-B\n" -"model. Select one of the two models. When selecting the Bühlmann model, the" -" gradient factors (GFHigh and GFLow\n" -"need to be specified. Initially, the GFHigh and GFLow values in the" -" _Preferences_\n" -"panel of _Subsurface_ is used. If these are changed within the planner (see" -" _Gas Options_ within\n" +"*a) Nitrogen management*: This is done by specifying the rates for descent and ascent,\n" +"as well as the deco model (GFLow, GFHigh or Conservatism level) under the headings _Rates_ and _Planning_\n" +"to the bottom left of the planning screen. Two deco models are supported the Bühlmann model and the VPM-B\n" +"model. Select one of the two models. When selecting the Bühlmann model, the gradient factors (GFHigh and GFLow\n" +"need to be specified. Initially, the GFHigh and GFLow values in the _Preferences_\n" +"panel of _Subsurface_ is used. If these are changed within the planner (see _Gas Options_ within\n" "the planner), the new values are\n" "used without changing the original values in the _Preferences_.\n" -"Gradient Factor settings strongly affect the calculated ceilings and their" -" depths.\n" +"Gradient Factor settings strongly affect the calculated ceilings and their depths.\n" "A very low GFLow value brings on decompression stops early during the dive.\n" -" ** For more information about Gradient factors, see the section on" -" xref:S_GradientFactors[Gradient Factor Preference settings].\n" +" ** For more information about Gradient factors, see the section on xref:S_GradientFactors[Gradient Factor Preference settings].\n" msgstr "" #. type: Plain text -#: user-manual.txt:3570 +#: user-manual.txt:3664 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 " @@ -8368,7 +8231,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3581 +#: user-manual.txt:3675 msgid "" "Please note as well that there is an intrinsic assumption of the VPM-B model " "that off-gassing only happens during the ascent phase of the dive (which is " @@ -8383,12 +8246,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3583 +#: user-manual.txt:3677 msgid "For more information external to this manual see:" msgstr "Pour plus d'information en dehors de ce manuel, voir:" #. type: Plain text -#: user-manual.txt:3585 +#: user-manual.txt:3679 msgid "" "link:http://www.tek-dive.com/portal/upload/M-Values.pdf[Understanding M-" "values by Erik Baker, _Immersed_ Vol. 3, No. 3.]" @@ -8397,7 +8260,7 @@ msgstr "" "values by Erik Baker, _Immersed_ Vol. 3, No. 3.]" #. type: Plain text -#: user-manual.txt:3586 +#: user-manual.txt:3680 msgid "" "link:http://www.rebreatherworld.com/general-and-new-to-rebreather-" "articles/5037-gradient-factors-for-dummies.html[Gradient factors for " @@ -8408,7 +8271,7 @@ msgstr "" "dummies, by Kevin Watts]" #. type: Plain text -#: user-manual.txt:3588 +#: user-manual.txt:3682 msgid "" "link:https://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" @@ -8423,7 +8286,7 @@ msgstr "" "traite à la fois des modèles de décompression Bühlmann et VPM-B." #. type: Plain text -#: user-manual.txt:3596 +#: user-manual.txt:3690 msgid "" "The ascent rate is critical for nitrogen off-gassing at the end of the dive " "and is specified for several depth ranges, using the mean depth as a " @@ -8436,92 +8299,57 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3605 +#: user-manual.txt:3699 #, no-wrap msgid "" -"*b) Oxygen management*: In the *Gas Options* part of the dive specification," -" the maximum partial\n" +"*b) Oxygen management*: In the *Gas Options* part of the dive specification, the maximum partial\n" "pressure for oxygen needs to be specified for the\n" -"bottom part of the dive (_bottom po2_) as well as for the decompression part" -" of the dive (_deco po2_).\n" -"Commonly used values are 1.4 bar for the bottom part of the dive and 1.6 bar" -" for any decompression\n" -"stages. Normally, a partial pressure of 1.6 bar is not exceeded. The depth at" -" which switching to a gas\n" +"bottom part of the dive (_bottom po2_) as well as for the decompression part of the dive (_deco po2_).\n" +"Commonly used values are 1.4 bar for the bottom part of the dive and 1.6 bar for any decompression\n" +"stages. Normally, a partial pressure of 1.6 bar is not exceeded. The depth at which switching to a gas\n" "takes place can be edited in the\n" -"_Available Gases_ dialog. Normally, the planner decides on switching to a new" -" gas when, during\n" +"_Available Gases_ dialog. Normally, the planner decides on switching to a new gas when, during\n" "ascent, the partial pressure of the new gas has decreased to 1.6 bar.\n" msgstr "" #. type: Plain text -#: user-manual.txt:3636 +#: user-manual.txt:3721 #, no-wrap msgid "" "*c) Gas management*: With open-circuit dives this is a primary\n" "consideration. Divers need to keep within the limits of the amount of\n" "gas within the dive\n" -"cylinder(s), allowing for an appropriate margin for a safe return to the" -" surface, possibly\n" -"sharing with a buddy. Under the _Gas Options_ heading, specify the best (but" -" conservative) estimate\n" +"cylinder(s), allowing for an appropriate margin for a safe return to the surface, possibly\n" +"sharing with a buddy. Under the _Gas Options_ heading, specify the best (but conservative) estimate\n" "of your surface-equivalent air consumption (SAC, also termed RMV) in\n" -"liters/min (for the time being, only SI units are supported). Specify the SAC" -" during the\n" -"bottom part of the dive (_bottom SAC_) as well as during the decompression or" -" safety stops of the\n" -"dive (_deco SAC_). Values of 15-30 l/min are common. For good gas management," -" a guess\n" +"liters/min (for the time being, only SI units are supported). Specify the SAC during the\n" +"bottom part of the dive (_bottom SAC_) as well as during the decompression or safety stops of the\n" +"dive (_deco SAC_). Values of 15-30 l/min are common. For good gas management, a guess\n" "is not sufficient and you needs to\n" -"monitor gas consumption on a regular basis, dependent on different dive" -" conditions and/or equipment.\n" -"The planner calculates the total volume of gas used during the dive and" -" issues a warning\n" -"if you exceeds the total amount of gas available. Good practice demands that" -" divers not dive to\n" +"monitor gas consumption on a regular basis, dependent on different dive conditions and/or equipment.\n" +"The planner calculates the total volume of gas used during the dive and issues a warning\n" +"if you exceeds the total amount of gas available. Good practice demands that divers not dive to\n" "the limit of the gas supply but that an appropriate reserve is kept\n" "for unforeseen circumstances.\n" -"For technical diving, this reserve can be up to 66% of the total available" -" gas.\n" -"In addition to calculating the total gas consumption for every cylinder the" -" planner provides one way\n" -"of calculating the recommended volume of bottom gas which is needed for safe" -" asscent to the\n" -"first deco gas change depth or the surface. This procedure is called the" -" \"minimum gas\" or \"rock bottom\"\n" +"For technical diving, this reserve can be up to 66% of the total available gas.\n" +"In addition to calculating the total gas consumption for every cylinder the planner provides one way\n" +"of calculating the recommended volume of bottom gas which is needed for safe asscent to the\n" +"first deco gas change depth or the surface. This procedure is called the \"minimum gas\" or \"rock bottom\"\n" "consideration and it is used by various (but not all)\n" -"technical diving organisations. The calculation assumes that in worst case an" -" out of gas (OoG)\n" -"situation could occur at the end of the planned bottom time at maximum depth." -" This OoG event forces\n" -"the buddy team the share the gas of one diver and to stay at maximum depth" -" for an additional\n" -"time of n minutes (preferences option \"problem solving time\").\n" -"At the same moment the combined SAC of both divers is increased by a" -" estimated factor (preferences option\n" -"\"SAC factor\") compared to the SAC factor of a single diver under normal" -" conditions.\n" -"The result of the minimum gas calculation for the bottom gas is printed to" -" the planner output as an\n" -"additional information. No automatic checks are performed based on this" -" result.\n" -"Please take care that the feature only gives valid results for simple," -" rectengular shaped single\n" -"level dive profiles. For multi level dives one would need to check every leg" -" of the profile independently.\n" -msgstr "" - -#. type: Plain text -#: user-manual.txt:3649 +"technical diving organisations. See the text below for a detailed explanation.\n" +msgstr "" + +#. type: Plain text +#: user-manual.txt:3733 msgid "" "Now you can start the detailed time-depth planning of the dive. _Subsurface_ " "offers an unique graphical interface for doing planning. The mechanics are " "similar to hand-entering a dive profile in the dive log part of " "_Subsurface_. Upon activating the planner, a default dive of depth 15 m for " -"20 min is offered in the blue design surface to the top right hand of the " -"screen. The white dots (waypoints) on the profile can be dragged with a " -"mouse. Create more waypoints by double-clicking on the profile line and " -"ensuring the profile reflects the intended dive. Drag the waypoints to " +"20 min is offered in the blue design surface in the top right hand part of " +"the planner window. The white dots (waypoints) on the profile can be dragged " +"with a mouse. Create more waypoints by double-clicking on the profile line " +"and ensuring the profile reflects the intended dive. Drag the waypoints to " "represent the depth and duration of the dive. It is NOT necessary to specify " "the ascent part of the dive since the planner calculates this, based on the " "existing settings. If any of the management limits (for nitrogen, oxygen or " @@ -8530,7 +8358,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3660 +#: user-manual.txt:3744 msgid "" "Each waypoint on the dive profile creates a _Dive Planner Point_ in the " "table on the left of the dive planner panel. Ensure the _Used Gas_ value in " @@ -8547,7 +8375,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3666 +#: user-manual.txt:3750 msgid "" "Show any changes in gas cylinder used by indicating gas changes as explained " "in the section <<S_CreateProfile,hand-creating a dive profile>>. These " @@ -8557,36 +8385,68 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3675 +#: user-manual.txt:3764 msgid "" -"A non-zero value in the \"CC setpoint\" column of the table of dive planner " -"points indicates a valid setpoint for oxygen partial pressure and that the " -"segment is dived using a closed circuit rebreather (CCR). If the last " -"manually entered segment is a CCR segment, the decompression phase is " -"computed assuming the diver uses a CCR with the specified set-point. If the " -"last segment (however short) is on open circuit (OC, indicated by a zero set-" -"point) the decompression is computed in OC mode and the planner only " -"considers gas changes in OC mode." +"Cylinders used for the plan need to be entered in the table of _Available " +"gases_. In the column _Type_ select the appropriate cylinder size by using " +"the dropdown list that appears when double-clicking a cell in this column. " +"By default, a large number of sizes are listed, and a new cylinder size can " +"be created by typing this into the text box. The cylinder size, start " +"pressure and default switch depths are initialised automatically. Specify " +"the gas composition (e.g. helium and oxygen content). A non-zero value in " +"the \"CC setpoint\" column of the table of dive planner points indicates a " +"valid setpoint for oxygen partial pressure and that the segment is dived " +"using a closed circuit rebreather (CCR). If the last manually entered " +"segment is a CCR segment, the decompression phase is computed assuming the " +"diver uses a CCR with the specified set-point. If the last segment (however " +"short) is on open circuit (OC, indicated by a zero set-point) the " +"decompression is computed in OC mode and the planner only considers gas " +"changes in OC mode." msgstr "" #. type: Plain text -#: user-manual.txt:3678 +#: user-manual.txt:3774 +msgid "" +"Enter dive profile segments in the _Dive planner points_ table by providing " +"a time duration for a segment as well as its final depth. If more than one " +"cylinder is used during the dive, ensure that the appropriate cylinder is " +"selected for each segment of the dive plan by double-clicking the cell and " +"selecting the appropriate cylinder from the dropdown list in the _Used gas_ " +"column. If required, insert a row in the _Dive planner points_ table by " +"adding a new line and then setting the _Run time_ value appropriately. In " +"image A below, a segment (using an EAN50 cylinder) has been added and you " +"wish to use this gas during the very start of the dive (the other gas is not " +"breathable at the surface). Upon pressing Enter on the keyboard, that " +"segment is moved to the top of that table and the plan is adjusted " +"automatically to take into account this new segment of the dive plan (image " +"B below)." +msgstr "" + +#. type: Target for macro image +#: user-manual.txt:3775 +#, no-wrap +msgid "images/planner1.jpg" +msgstr "images/planner1.jpg" + +#. type: Plain text +#: user-manual.txt:3779 msgid "" -"Below is an example of a dive plan to 45m using Tx21/35, followed by an " -"ascent using EAN50 and oxygen and using the settings as described above." +"Below is an example of a dive plan to 55m using Tx20/30 and the Bühlmann " +"algorithm, followed by an ascent using EAN50 and using the settings as " +"described above." msgstr "" "Ci-dessous, vous trouverez un exemple d'une planification de plongée " -"utilisant du Tx21/35, suivie d'une remontée utilisant de l'EAN50 et de " -"l'oxygène, et utilisant les réglages décrits ci-dessous." +"utilisant du Tx20/30 et l'algorithme Bühlmann, suivie d'une remontée " +"utilisant du EAN50 et utilisant les réglages décrits ci-dessous." #. type: Target for macro image -#: user-manual.txt:3679 +#: user-manual.txt:3780 #, no-wrap -msgid "images/Planner_OC_deco_VPM.jpg" -msgstr "images/Planner_OC_deco_VPM.jpg" +msgid "images/Planner_OC_deco.jpg" +msgstr "images/Planner_OC_deco.jpg" #. type: Plain text -#: user-manual.txt:3684 +#: user-manual.txt:3785 msgid "" "Once the above steps have been completed, save by clicking the _Save_ button " "towards the top middle of the planner. The saved dive plan will appear in " @@ -8594,26 +8454,25 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3686 +#: user-manual.txt:3787 #, no-wrap msgid "*The dive plan details*\n" msgstr "*Les détails du plan de plongée*\n" #. type: Plain text -#: user-manual.txt:3694 +#: user-manual.txt:3795 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 " -"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." +"details of the dive plan are provided. These 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 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:3699 +#: user-manual.txt:3800 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 " @@ -8622,123 +8481,248 @@ msgid "" "from the segment durations at a particular level." msgstr "" +#. type: Plain text +#: user-manual.txt:3807 +msgid "" +"The planner has a check box _Display plan variations_. By checking this box, " +"the planner provides information about a dive that is a little deeper or " +"slightly longer than the planned dive. This can be found near the top of the " +"_Dive plan details_ where the dive duration is indicated. Checking this " +"option creates a lot of additional computation, to such a degree that the " +"planner is slower than otherwise. The information is typically given as:" +msgstr "" + +#. type: Plain text +#: user-manual.txt:3809 +#, no-wrap +msgid " Runtime: 53min + 0:52/m + 4:21/min\n" +msgstr "" + +#. type: Plain text +#: user-manual.txt:3811 user-manual.txt:3846 +msgid "This indicates:" +msgstr "" + +#. type: Plain text +#: user-manual.txt:3813 +msgid "Calculated dive duration is 53 min." +msgstr "" + +#. type: Plain text +#: user-manual.txt:3814 +msgid "" +"For each extra meter in depth during the bottom phase of the dive, the " +"duration increases by 52 seconds." +msgstr "" + +#. type: Plain text +#: user-manual.txt:3818 +msgid "" +"For each extra minute of bottom time, the duration increases by 4 min 21 " +"sec. Thus, if the bottom time is two minutes longer than planned, the dive " +"duration will be (2+2*4min 21 sec) = 10 minutes 42 sec longer and would " +"probably require that each deco stop is 10:42/53:00 = 20% longer than " +"planned. These calculations are only applicable for small deviations from " +"the dive plan, not for larger deviations." +msgstr "" + +#. type: Plain text +#: user-manual.txt:3820 +msgid "Minimum gas requirements*" +msgstr "" + +#. type: Plain text +#: user-manual.txt:3830 +msgid "" +"The planner also estimates the *minimum gas* pressure required for safe " +"ascent after an event that causes the dive to be aborted. The calculation " +"assumes that in worst case an out of gas (OoG) situation could occur at the " +"end of the planned bottom time at maximum depth. This OoG event forces the " +"buddy team the share the gas of one diver and to stay at maximum depth for " +"an additional number of minutes. At the same moment the combined SAC of " +"both divers is increased by a estimated factor compared to the SAC factor of " +"a single diver under normal conditions. The result of the minimum gas " +"calculation for the bottom gas is printed to the planner output. No " +"automatic checks are performed based on this result. The feature only gives " +"valid results for simple, rectengular shaped single level dive profiles. For " +"multi level dives one would need to check every leg of the profile " +"independently." +msgstr "" + +#. type: Plain text +#: user-manual.txt:3832 +msgid "There are two selector boxes on the left of the _Dive plan details_:" +msgstr "" + +#. type: Plain text +#: user-manual.txt:3836 +#, no-wrap +msgid "" +"*SAC factor*. This is your estimate of the degree to which your SAC increases if a critical problem arises underwater,\n" +"e.g. gas sharing or entanglement. Realistic values range from 2 to 5, reflecting the gas use of two divers sharing\n" +"a single gas cylinder after an OoG situation.\n" +msgstr "" + +#. type: Plain text +#: user-manual.txt:3838 +#, no-wrap +msgid "" +"*Problem solving time*. This is your estimate of how long you would take to solve the problem before starting the ascent\n" +"to terminate the dive. The default value is 2 minutes.\n" +msgstr "" + +#. type: Plain text +#: user-manual.txt:3842 +msgid "" +"Using the above information, the planner then estimates what the minimum " +"botom gas cylinder pressure needs to be for a safe ascent. This information " +"is given near the bottom of the _Dive plan details_, following the " +"calculation of bottom gas used during the dive if it exactly follows the " +"plan. the minimum gas is typically given as:" +msgstr "" + +#. type: Plain text +#: user-manual.txt:3844 +#, no-wrap +msgid " Minimum gas (based on 2.0xSAC/+1min@81m): 2130 l/90bar/Δ:+80bar\n" +msgstr "" + +#. type: Plain text +#: user-manual.txt:3848 +msgid "" +"Within parentheses, the *SAC factor* and *Problem solving time* specified." +msgstr "" + +#. type: Plain text +#: user-manual.txt:3849 +msgid "" +"The number of liters of back gas required for a safe ascent (2130 litres in " +"the example above)" +msgstr "" + +#. type: Plain text +#: user-manual.txt:3850 +msgid "" +"The number of bars of back gas required for a safe ascent (90 bars in the " +"example above)." +msgstr "" + +#. type: Plain text +#: user-manual.txt:3853 +msgid "" +"The delta-value: number of bars of back gas available at the end of the " +"bottom section of the dive, _over and above_ the minimum gas requirement (80 " +"bars in the above example). A positive delta reflects a safe plan; a " +"negative delta indicates insufficient gas for a safe ascent." +msgstr "" + +#. type: delimited block * +#: user-manual.txt:3861 +msgid "" +"The *plan variations* and *minimum gas* estimates are only guidelines for a " +"diver performing dive planning, intended to enhance the safety of executing " +"a particular dive plan. They are NOT precise and should NOT be relied upon " +"as the only safety features in dive planning. Interpret these estimates " +"within the framework of your formal training to perform dive planning." +msgstr "" + #. type: Title === -#: user-manual.txt:3700 +#: user-manual.txt:3863 #, no-wrap msgid "Planning pSCR dives" msgstr "" #. type: Plain text -#: user-manual.txt:3717 +#: user-manual.txt:3880 #, no-wrap msgid "" -"To plan a dive using a passive semi-closed rebreather (pSCR), select _pSCR_" -" rather than\n" +"To plan a dive using a passive semi-closed rebreather (pSCR), select _pSCR_ rather than\n" "_Open circuit_ in the dropdown list.\n" -"The parameters of the pSCR dive can be set by selecting _File -> " -" Preferences -> Profile_\n" -"from the main menu, where the gas consumption calculation takes into account" -" the pSCR dump\n" -"ratio (default 1:10) as well as the metabolic rate. The calculation also" -" takes the oxygen drop\n" +"The parameters of the pSCR dive can be set by selecting _File -> Preferences -> Profile_\n" +"from the main menu, where the gas consumption calculation takes into account the pSCR dump\n" +"ratio (default 1:10) as well as the metabolic rate. The calculation also takes the oxygen drop\n" "accross the mouthpiece of the rebreather into account. If the\n" -"pO~2~ drops below what is considered safe, a warning appears in the _Dive" -" plan\n" -"details_. A typical pSCR cylinder setup is very similar to an open circuit" -" dive;\n" -"one or more drive cilinders, possibly with different bottom and" -" decompression\n" +"pO~2~ drops below what is considered safe, a warning appears in the _Dive plan\n" +"details_. A typical pSCR cylinder setup is very similar to an open circuit dive;\n" +"one or more drive cilinders, possibly with different bottom and decompression\n" "gasses, including gas switches during the dive like in open circuit diving.\n" -"Therefore, the setup of the _Available gases_ and the _Dive planner points_" -" tables\n" -"are very similar to that of a open circuit dive plan, described above." -" However, no oxygen setpoints\n" -"are specified for pSCR dives. Below is a dive plan for a pSCR dive. The dive" -" is comparable\n" -"to that of the CCR dive 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" +"Therefore, the setup of the _Available gases_ and the _Dive planner points_ tables\n" +"are very similar to that of a open circuit dive plan, described above. However, no oxygen setpoints\n" +"are specified for pSCR dives. Below is a dive plan for a pSCR dive. The dive is comparable\n" +"to that of the CCR dive 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:3718 +#: user-manual.txt:3881 #, no-wrap -msgid "images/Planner_pSCR1_f20.jpg" -msgstr "images/Planner_pSCR1_f20.jpg" +msgid "images/Planner_pSCR.jpg" +msgstr "images/Planner_pSCR.jpg" #. type: Title === -#: user-manual.txt:3721 +#: user-manual.txt:3884 #, no-wrap msgid "Planning CCR dives" msgstr "Planifier des plongées CCR (recycleur)" #. type: Plain text -#: user-manual.txt:3725 +#: user-manual.txt:3888 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:3729 +#: user-manual.txt:3892 #, no-wrap msgid "" -"*Available gases*: In the _Available gases_ table, enter the cylinder" -" information for the\n" -"diluent cylinder and for any bail-out cylinders. Do NOT enter the information" -" for the oxygen\n" +"*Available gases*: In the _Available gases_ table, enter the cylinder information for the\n" +"diluent cylinder and for any bail-out cylinders. Do NOT enter the information for the oxygen\n" "cylinder since it is implied when the _CCR_ dropdown selection is made.\n" msgstr "" #. type: Plain text -#: user-manual.txt:3739 +#: user-manual.txt:3902 #, no-wrap msgid "" -"*Entering setpoints*: Specify a default setpoint in the Preferences tab, by" -" selecting _File -> Preferences -> Profile_ from\n" +"*Entering setpoints*: Specify a default setpoint in the Preferences tab, by selecting _File -> Preferences -> Profile_ 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" +"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." -" Decompression is always calculated\n" -"using the setpoint of the last manually entered segment. So, to plan a bail" -" out ascent for a\n" -"CCR dive, add a one-minute dive segment to the end with a setpoint value of" -" 0. The decompression\n" -"algorithm does not switch deco-gases automatically while in CCR mode (i.e." -" when a positive setpoint is specified) but\n" +"means the diver bails out to open circuit mode for that segment. Decompression is always calculated\n" +"using the setpoint of the last manually entered segment. So, to plan a bail out ascent for a\n" +"CCR dive, add a one-minute dive segment to the end with a setpoint value of 0. The decompression\n" +"algorithm does not switch deco-gases automatically while in CCR mode (i.e. when a positive setpoint is specified) but\n" "this is calculated for bail out ascents.\n" msgstr "" #. type: Plain text -#: user-manual.txt:3741 +#: user-manual.txt:3904 msgid "" "The dive profile for a CCR dive may look something like the image below." msgstr "" #. type: Target for macro image -#: user-manual.txt:3742 +#: user-manual.txt:3905 #, no-wrap -msgid "images/Planner_CCR1_f20.jpg" -msgstr "images/Planner_CCR1_f20.jpg" +msgid "images/Planner_CCR.jpg" +msgstr "images/Planner_CCR.jpg" #. type: Plain text -#: user-manual.txt:3746 +#: user-manual.txt:3909 msgid "" "Note that, in the _Dive plan details_, the gas consumption for a CCR segment " "is not calculated, so gas consumptions of 0 liters are the norm." msgstr "" #. type: Title === -#: user-manual.txt:3748 +#: user-manual.txt:3911 #, no-wrap msgid "Modifying an existing dive plan" msgstr "Modifier une planification existante" #. type: Plain text -#: user-manual.txt:3755 +#: user-manual.txt:3918 msgid "" "Normally, when a dive plan has been saved, it is accessible from the *Dive " "List*, like any other dive log. Within the *Dive List* there is no way to " @@ -8749,7 +8733,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3761 +#: user-manual.txt:3924 msgid "" "In addition, there is the option \"Save new\". This keeps the original " "planned dive and adds a (possibly modified, - earlier dives are now taken " @@ -8760,13 +8744,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3762 +#: user-manual.txt:3925 #, no-wrap msgid "Planning for repetitive dives" msgstr "Planifier des plongées successives" #. type: Plain text -#: user-manual.txt:3769 +#: user-manual.txt:3932 msgid "" "Repetitive dives can easily be planned if the dates and start times of the " "repetitive dive set are specified appropriately in the top left-hand _Start " @@ -8775,7 +8759,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3775 +#: user-manual.txt:3938 msgid "" "If you have just completed a long/deep dive and are planning another dive, " "then highlight, in the *Dive List*, the dive that has just been logged then " @@ -8785,7 +8769,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3780 +#: user-manual.txt:3943 msgid "" "If only a few standard configurations are used (e.g. in GUE), then a " "template dive can be created conforming to one of the configurations. If you " @@ -8795,13 +8779,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3781 +#: user-manual.txt:3944 #, no-wrap msgid "Printing the dive plan" msgstr "Imprimer un plan de plongée" #. type: Plain text -#: user-manual.txt:3786 +#: user-manual.txt:3949 msgid "" "Selecting the _Print_ button in the planner allows printing of the _Dive " "Plan Details_ for wet notes. You can also cut and paste the _Dive Plan " @@ -8809,7 +8793,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3792 +#: user-manual.txt:3955 msgid "" "However, after the plan has been saved, it is represented in a way very " "similar to a dive log and the gas calculations cannot be accessed in the " @@ -8819,13 +8803,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3794 +#: user-manual.txt:3957 #, no-wrap msgid "Saving a dive with its dive plan" msgstr "Enregistrer une plongée avec sa planification" #. type: Plain text -#: user-manual.txt:3801 +#: user-manual.txt:3964 msgid "" "In the section dealing with <<S_MultipleDiveComputers, dives using more than " "one dive computer>> we discussed the way in which multiple profiles for a " @@ -8836,25 +8820,25 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3803 +#: user-manual.txt:3966 msgid "Do the dive planning and save the final plan in the _Dive List_." msgstr "" #. type: Plain text -#: user-manual.txt:3804 +#: user-manual.txt:3967 msgid "After diving, upload the dive data from the dive computer." msgstr "" "Après la plongée, télécharger les données depuis l'ordinateur de plongée." #. type: Plain text -#: user-manual.txt:3806 +#: user-manual.txt:3969 msgid "" "Change the date and time of the _dive plan_ to coincide with that of the " "real-life dive from the _dive computer_." msgstr "" #. type: Plain text -#: user-manual.txt:3809 +#: user-manual.txt:3972 msgid "" "In the _Dive List_, highlight the dive plan as well as the data for the real " "dive and merge the two dives, making use of the Dive List Context Menu " @@ -8862,7 +8846,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3813 +#: user-manual.txt:3976 msgid "" "The text version of the dive plan is appended to the Notes in the _Notes " "Tab_. With this merged dive highlighted in the _Dive List_, switch between " @@ -8871,13 +8855,13 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:3814 +#: user-manual.txt:3977 #, no-wrap msgid "Running _Subsurface_ from the command-line" msgstr "Lancer _Subsurface_ depuis la ligne de commande" #. type: Plain text -#: user-manual.txt:3818 +#: user-manual.txt:3981 msgid "" "_Subsurface_ can be launched from the command-line to set some specialised " "settings or as part of an script-based automated process for manipulating a " @@ -8885,49 +8869,43 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3820 +#: user-manual.txt:3983 #, no-wrap msgid "\tsubsurface [options] [logfile ...] [--import logfile ...]\n" msgstr "" #. type: Plain text -#: user-manual.txt:3822 +#: user-manual.txt:3985 msgid "The options include:" msgstr "Ces options incluent:" #. type: delimited block | -#: user-manual.txt:3836 +#: user-manual.txt:3999 #, no-wrap msgid "" "|*Command-line option*|*Description*\n" "|--help|Print a summary of the command-line options\n" "| -h|Print a summary of the command-line options\n" -"|--import logfile ...|A file name before this option is treated as an" -" existing dive log, everything after is imported into the existing dive log\n" +"|--import logfile ...|A file name before this option is treated as an existing dive log, everything after is imported into the existing dive log\n" "|--verbose|Print debug information while running _Subsurface_\n" "| -v|Print debug information while running _Subsurface_\n" "| -v -v| Print even more debug information while running _Subsurface_\n" "|--version|Prints the current version of _Subsurface_\n" -"|--survey|Opens the xref:S_UserSurvey[user survey] immediately after starting" -" _Subsurface_\n" -"|--user=<username>|Choose the xref:S_user_space[configuration space] of user" -" <username>\n" -"|--cloud-timeout=<duration>|Set the timeout for cloud connection (0 <" -" duration < 60). This enables longer timeouts for slow Internet connections\n" -"|--win32console|Create a dedicated console if needed (Windows only). Add this" -" option before everything else\n" -"|--win32log|Write the program output to subsurface.log (Windows only). Add" -" option before everything else\n" +"|--survey|Opens the xref:S_UserSurvey[user survey] immediately after starting _Subsurface_\n" +"|--user=<username>|Choose the xref:S_user_space[configuration space] of user <username>\n" +"|--cloud-timeout=<duration>|Set the timeout for cloud connection (0 < duration < 60). This enables longer timeouts for slow Internet connections\n" +"|--win32console|Create a dedicated console if needed (Windows only). Add this option before everything else\n" +"|--win32log|Write the program output to subsurface.log (Windows only). Add option before everything else\n" msgstr "" #. type: Title == -#: user-manual.txt:3838 +#: user-manual.txt:4001 #, 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:3843 +#: user-manual.txt:4006 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 " @@ -8938,13 +8916,13 @@ msgstr "" "des sections de ce manuel traitant des opérations relatives." #. type: Title === -#: user-manual.txt:3844 +#: user-manual.txt:4007 #, no-wrap msgid "File" msgstr "Fichier" #. type: Plain text -#: user-manual.txt:3847 +#: user-manual.txt:4010 msgid "" "<<S_NewLogbook,_New Logbook_>> - Close the currently open dive logbook and " "clear all dive information." @@ -8953,7 +8931,7 @@ msgstr "" "actuellement ouvert et supprime toutes les informations de plongées." #. type: Plain text -#: user-manual.txt:3849 +#: user-manual.txt:4012 msgid "" "_Open logbook_ - Open the file manager to select a dive logbook to open." msgstr "" @@ -8961,44 +8939,44 @@ msgstr "" "carnet de plongée à ouvrir." #. type: Plain text -#: user-manual.txt:3850 +#: user-manual.txt:4013 msgid "_Save_ - Save the dive logbook currently open." msgstr "_Sauvegarder_ - Enregistrer le carnet de plongée actuellement ouvert." #. type: Plain text -#: user-manual.txt:3851 +#: user-manual.txt:4014 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:3852 +#: user-manual.txt:4015 msgid "" "_Open cloud storage_ - Open the dive log previously saved in " "<<S_Cloud_storage,_Cloud storage_>>." msgstr "" #. type: Plain text -#: user-manual.txt:3853 +#: user-manual.txt:4016 msgid "" "_Save to cloud storage_ - Save the current dive log to <<S_Cloud_storage," "_Cloud storage_>>." msgstr "" #. type: Plain text -#: user-manual.txt:3854 +#: user-manual.txt:4017 msgid "" "_Take cloud storage online_ - " "******************************************************" msgstr "" #. type: Plain text -#: user-manual.txt:3855 +#: user-manual.txt:4018 msgid "_Close_ - Close the dive logbook currently open." msgstr "_Fermer_ - Fermer le carnet de plongée actuellement ouvert." #. type: Plain text -#: user-manual.txt:3857 +#: user-manual.txt:4020 msgid "" "<<S_ExportLog,_Export_>> - Export the currently open dive logbook (or the " "selected dives in the logbook) to one of several formats." @@ -9008,34 +8986,34 @@ msgstr "" "formats." #. type: Plain text -#: user-manual.txt:3858 +#: user-manual.txt:4021 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:3859 +#: user-manual.txt:4022 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:3860 +#: user-manual.txt:4023 msgid "" "<<S_FindMovedImages, _Find moved images_>> - If photos taken during dives " "have been moved to" msgstr "" #. type: Plain text -#: user-manual.txt:3861 +#: user-manual.txt:4024 msgid "" "a different disk or directory, locate them and link them to the appropriate " "dives." msgstr "" #. type: Plain text -#: user-manual.txt:3862 +#: user-manual.txt:4025 msgid "" "<<S_Configure,_Configure dive computer_>> - Edit the configuration of a dive " "computer." @@ -9044,30 +9022,30 @@ msgstr "" "configuration d'un ordinateur de plongée." #. type: Plain text -#: user-manual.txt:3863 +#: user-manual.txt:4026 msgid "_Quit_ - Quit _Subsurface_." msgstr "_Quitter_ - Quitter _Subsurface_." #. type: Title === -#: user-manual.txt:3865 +#: user-manual.txt:4028 #, no-wrap msgid "Edit" msgstr "Édition" #. type: Plain text -#: user-manual.txt:3867 +#: user-manual.txt:4030 msgid "" "The Edit option allows one to undo or redo an action, e.g. deleting dives." msgstr "" #. type: Title === -#: user-manual.txt:3868 +#: user-manual.txt:4031 #, no-wrap msgid "Import" msgstr "Importer" #. type: Plain text -#: user-manual.txt:3871 +#: user-manual.txt:4034 msgid "" "<<S_ImportDiveComputer,_Import from dive computer_>> - Import dive " "information from a dive computer." @@ -9076,7 +9054,7 @@ msgstr "" "Importer des informations de plongées à partir de l'ordinateur de plongée." #. type: Plain text -#: user-manual.txt:3873 +#: user-manual.txt:4036 msgid "" "<<Unified_import,_Import Log Files_>> - Import dive information from a file " "in in a _Subsurface_-compatible format." @@ -9086,7 +9064,7 @@ msgstr "" "_Subsurface_." #. type: Plain text -#: user-manual.txt:3875 +#: user-manual.txt:4038 msgid "" "<<S_Companion,_Import GPS data from Subsurface web service_>> - Load GPS " "coordinates from the _Subsurface_ mobile phone app." @@ -9096,7 +9074,7 @@ msgstr "" "(téléphones et tablettes)." #. type: Plain text -#: user-manual.txt:3877 +#: user-manual.txt:4040 msgid "" "<<S_ImportingDivelogsDe,_Import from Divelogs.de_>> - Import dive " "information from _www.Divelogs.de_." @@ -9105,13 +9083,13 @@ msgstr "" "informations de plongées à partir de _www.Divelogs.de_." #. type: Title === -#: user-manual.txt:3878 +#: user-manual.txt:4041 #, no-wrap msgid "Log" msgstr "Journal (log)" #. type: Plain text -#: user-manual.txt:3880 +#: user-manual.txt:4043 msgid "" "<<S_EnterData,_Add Dive_>> - Manually add a new dive to the *Dive List* " "panel." @@ -9120,19 +9098,19 @@ msgstr "" "plongée au panneau de la *liste des plongées*." #. type: Plain text -#: user-manual.txt:3881 +#: user-manual.txt:4044 msgid "" "_Edit dive_ - Edit a dive where the profile was entered by hand and not from " "a dive computer." msgstr "" #. type: Plain text -#: user-manual.txt:3882 +#: user-manual.txt:4045 msgid "<<S_DivePlanner,_Plan Dive_>> - Plan dives." msgstr "<<S_DivePlanner,_Planifier une plongée_>> - Planifier des plongées." #. type: Plain text -#: user-manual.txt:3883 +#: user-manual.txt:4046 msgid "" "<<S_Replan,_Edit dive in planner_>> - Edit a dive plan that has been saved " "into the *Dive List*." @@ -9141,7 +9119,7 @@ msgstr "" "plongée planifiée qui a été enregistrée dans la *liste des plongées*." #. type: Plain text -#: user-manual.txt:3885 +#: user-manual.txt:4048 msgid "" "<<S_CopyComponents,_Copy dive components_>> - Copy information from several " "fields of a dive log onto the clipboard." @@ -9151,7 +9129,7 @@ msgstr "" "papier." #. type: Plain text -#: user-manual.txt:3887 +#: user-manual.txt:4050 msgid "" "_Paste dive components_ - Paste, into the selected dives in the *Dive List*, " "the information copied using the _Copy dive components_ option." @@ -9161,7 +9139,7 @@ msgstr "" "préalable avec l'option _Copier les composants de la plongée_." #. type: Plain text -#: user-manual.txt:3889 +#: user-manual.txt:4052 msgid "" "<<S_Renumber,_Renumber_>> - Renumber the dives listed in the *Dive List* " "panel." @@ -9170,7 +9148,7 @@ msgstr "" "le panneau de la *liste des plongées*." #. type: Plain text -#: user-manual.txt:3891 +#: user-manual.txt:4054 msgid "" "<<S_Group,_Auto Group_>> - Group the dives in the *Dive List* panel into " "dive trips." @@ -9179,7 +9157,7 @@ msgstr "" "*liste des plongées* dans des voyages de plongées." #. type: Plain text -#: user-manual.txt:3892 +#: user-manual.txt:4055 msgid "" "<<S_DeviceNames,_Edit Device Names_>> - Edit the names of dive computers to " "coordinate your logs." @@ -9188,7 +9166,7 @@ msgstr "" "les noms des ordinateurs de plongée pour coordonner vos journaux (logs)." #. type: Plain text -#: user-manual.txt:3893 +#: user-manual.txt:4056 msgid "" "<<S_Filter,_Filter divelist_>> - Select only some dives, based on specific " "tags or dive criteria." @@ -9197,13 +9175,13 @@ msgstr "" "certaines plongées, à partir de tags ou de critères de plongées." #. type: Title === -#: user-manual.txt:3894 +#: user-manual.txt:4057 #, no-wrap msgid "View" msgstr "Vue" #. type: Plain text -#: user-manual.txt:3897 +#: user-manual.txt:4060 msgid "" "<<S_ViewPanels,_All_>> - View the four main _Subsurface_ panels all at once." msgstr "" @@ -9211,33 +9189,33 @@ msgstr "" "_Subsurface_ simultanément." #. type: Plain text -#: user-manual.txt:3898 +#: user-manual.txt:4061 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:3899 +#: user-manual.txt:4062 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:3900 +#: user-manual.txt:4063 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:3901 +#: user-manual.txt:4064 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:3903 +#: user-manual.txt:4066 msgid "" "_Yearly Statistics_ - Display summary statistics about dives during this and " "past years." @@ -9246,7 +9224,7 @@ msgstr "" "plongées effectuées." #. type: Plain text -#: user-manual.txt:3906 +#: user-manual.txt:4069 msgid "" "_Prev DC_ - Switch to data from previous dive computer, if a single dive was " "logged from more than one. See the sections on <<S_MultipleDiveComputers," @@ -9255,23 +9233,23 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3907 +#: user-manual.txt:4070 msgid "_Next DC_ - Switch to next dive computer." msgstr "_Ordinateur suivant_ - Passer à l'ordinateur de plongée suivant." #. type: Plain text -#: user-manual.txt:3908 +#: user-manual.txt:4071 msgid "_Full Screen_ - Toggles Full Screen mode." msgstr "_Plein écran_ - Passer en mode plein écran." #. type: Title === -#: user-manual.txt:3909 +#: user-manual.txt:4072 #, no-wrap msgid "Share on" msgstr "" #. type: Plain text -#: user-manual.txt:3911 +#: user-manual.txt:4074 msgid "" "<<S_Facebook,_Facebook_>> - Share the currently selected dive on your " "Facebook timeline." @@ -9280,13 +9258,13 @@ msgstr "" "Facebook." #. type: Title === -#: user-manual.txt:3912 +#: user-manual.txt:4075 #, no-wrap msgid "Help" msgstr "Aide" #. type: Plain text -#: user-manual.txt:3915 +#: user-manual.txt:4078 msgid "" "_About Subsurface_ - Show a panel with the version number of _Subsurface_ as " "well as licensing information." @@ -9295,7 +9273,7 @@ msgstr "" "_Subsurface_ ainsi que les informations de licence." #. type: Plain text -#: user-manual.txt:3917 +#: user-manual.txt:4080 msgid "" "_Check for updates_ - Find out whether a newer version of Subsurface is " "available on the https://subsurface-divelog.org/[_Subsurface_ web site]." @@ -9305,7 +9283,7 @@ msgstr "" "_Subsurface_ ]." #. type: Plain text -#: user-manual.txt:3919 +#: user-manual.txt:4082 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 " @@ -9316,35 +9294,31 @@ msgstr "" "sondage, si vos habitudes de plongées ont changées." #. type: Plain text -#: user-manual.txt:3920 +#: user-manual.txt:4083 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:3923 +#: user-manual.txt:4086 #, 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." +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:3925 +#: user-manual.txt:4088 #, 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:3926 +#: user-manual.txt:4089 #, no-wrap msgid "images/icons/drivers.jpg" msgstr "images/icons/drivers.jpg" #. type: Plain text -#: user-manual.txt:3931 +#: user-manual.txt:4094 msgid "" "The operating system of the desktop computer needs the appropriate drivers " "in order to communicate with the dive computer, the way the dive computer " @@ -9355,7 +9329,7 @@ msgstr "" "l'ordinateur de plongée (Bluetooth, USB, infra-rouge)." #. type: Plain text -#: user-manual.txt:3937 +#: user-manual.txt:4100 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 " @@ -9369,7 +9343,7 @@ msgstr "" "particulièrement pour certaines technologies telles que l'infra-rouge." #. type: Plain text -#: user-manual.txt:3941 +#: user-manual.txt:4104 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 " @@ -9380,7 +9354,7 @@ msgstr "" "port USB de son ordinateur de bureau." #. type: Plain text -#: user-manual.txt:3948 +#: user-manual.txt:4111 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 " @@ -9398,22 +9372,19 @@ msgstr "" "documents et logiciels Silicon Labs]." #. type: Title === -#: user-manual.txt:3950 +#: user-manual.txt:4113 #, 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" +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:3951 +#: user-manual.txt:4114 #, no-wrap msgid "images/icons/usb.jpg" msgstr "images/icons/usb.jpg" #. type: Plain text -#: user-manual.txt:3959 +#: user-manual.txt:4122 msgid "" "When connecting a dive computer by using a USB connector, usually " "_Subsurface_ will either propose a drop down list with the correct device " @@ -9429,7 +9400,7 @@ msgstr "" "de votre périphérique ;" #. type: Plain text -#: user-manual.txt:3964 +#: user-manual.txt:4127 msgid "" "Simply try COM1, COM2, etc. The drop down list should contain all connected " "COM devices." @@ -9438,56 +9409,56 @@ msgstr "" "tous les périphériques COM connectés." #. type: Title ==== -#: user-manual.txt:3965 user-manual.txt:4063 +#: user-manual.txt:4128 user-manual.txt:4226 #, no-wrap msgid "On MacOS:" msgstr "Sur MacOS :" #. type: Plain text -#: user-manual.txt:3968 +#: user-manual.txt:4131 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:3969 +#: user-manual.txt:4132 #, no-wrap msgid "On Linux:" msgstr "Sur Linux :" #. type: Plain text -#: user-manual.txt:3972 +#: user-manual.txt:4135 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:3974 +#: user-manual.txt:4137 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:3975 +#: user-manual.txt:4138 msgid "Open a terminal" msgstr "Ouvrir un terminal" #. type: Plain text -#: user-manual.txt:3976 user-manual.txt:3978 +#: user-manual.txt:4139 user-manual.txt:4141 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:3977 +#: user-manual.txt:4140 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:3980 +#: user-manual.txt:4143 msgid "A message similar to this one should appear:" msgstr "Un message similaire à celui-ci devrait apparaitre :" #. type: Plain text -#: user-manual.txt:3996 +#: user-manual.txt:4159 #, no-wrap msgid "" "\tusb 2-1.1: new full speed USB device number 14 using ehci_hcd\n" @@ -9523,7 +9494,7 @@ msgstr "" "\tftdi_sio: v1.6.0:USB FTDI Serial Converters Driver\n" #. type: Plain text -#: user-manual.txt:4001 +#: user-manual.txt:4164 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 " @@ -9535,14 +9506,14 @@ msgstr "" "que Subsurface utilise le bon port USB." #. type: Plain text -#: user-manual.txt:4003 +#: user-manual.txt:4166 msgid "Ensuring the user has write permission to the USB serial port:" msgstr "" "S'assurer que l'utilisateur possède les droits d'écriture sur le port série " "USB :" #. type: Plain text -#: user-manual.txt:4013 +#: user-manual.txt:4176 msgid "" "On Unix-like operating systems the USB ports can only be accessed by users " "who are members special group that can be e.g. +dialout+ or +uucp+. This " @@ -9562,7 +9533,7 @@ msgstr "" "USB. Admettons que votre nom d'utilisateur soit 'johnB'." #. type: Plain text -#: user-manual.txt:4017 +#: user-manual.txt:4180 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." @@ -9572,36 +9543,33 @@ msgstr "" "+dialout+." #. type: Plain text -#: user-manual.txt:4022 +#: user-manual.txt:4185 #, no-wrap msgid "" "Type: +id johnB+ This lists all the groups that johnB belongs to and\n" "verifies that\n" -"the appropriate group membership has been created. The +dialout+ group" -" should\n" +"the appropriate group membership has been created. The +dialout+ group should\n" "be listed\n" "among the different IDs.\n" msgstr "" -"Tapez : +id johnB+ Cela liste tous les groupes auquel johnB appartient" -" et\n" +"Tapez : +id johnB+ Cela liste tous les groupes auquel johnB appartient et\n" "vérifiez que \n" "l'appartenance au groupe est bien effectif. Le groupe +dialout+ devrait \n" "être listé\n" "parmi les différents IDs.\n" #. type: Plain text -#: user-manual.txt:4024 +#: user-manual.txt:4187 #, no-wrap msgid "" "Under some circumstances this change takes only effect (eg. on Ubuntu) after\n" "you log out and then log in again.\n" msgstr "" -"Sous certaines circonstances, les modifications ne prennent effet qu'après" -" une déconnexion\n" +"Sous certaines circonstances, les modifications ne prennent effet qu'après une déconnexion\n" "puis reconnexion sur l'ordinateur (sous Ubuntu, par exemple).\n" #. type: Plain text -#: user-manual.txt:4029 +#: user-manual.txt:4192 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 you " @@ -9612,13 +9580,13 @@ msgstr "" "vous devriez pouvoir importer vos plongées." #. type: Title === -#: user-manual.txt:4032 +#: user-manual.txt:4195 #, no-wrap msgid "Manually setting up Bluetooth enabled devices" msgstr "" #. type: Plain text -#: user-manual.txt:4039 +#: user-manual.txt:4202 msgid "" "For dive computers communicating through Bluetooth like the Heinrichs " "Weikamp Frog or the Shearwater Predator, Petrel and Nerd there is a " @@ -9627,15 +9595,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4041 +#: user-manual.txt:4204 #, no-wrap -msgid "" -"*For the dive computer, after enabling Bluetooth, be sure it is in Upload" -" mode.*\n" +msgid "*For the dive computer, after enabling Bluetooth, be sure it is in Upload mode.*\n" msgstr "" #. type: Plain text -#: user-manual.txt:4045 +#: user-manual.txt:4208 msgid "" "For Bluetooth pairing of the dive computer, refer to the manufacturer's user " "guide. When using a Shearwater Predator/Petrel/Nerd, select _Dive Log -> " @@ -9643,14 +9609,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4047 +#: user-manual.txt:4210 #, no-wrap msgid "*Pair the _Subsurface_ computer with the dive computer.*\n" -msgstr "" -"*Jumeler l'ordinateur utilisant _Subsurface_ avec l'ordinateur de plongée.*\n" +msgstr "*Jumeler l'ordinateur utilisant _Subsurface_ avec l'ordinateur de plongée.*\n" #. type: Plain text -#: user-manual.txt:4056 +#: user-manual.txt:4219 msgid "" "Bluetooth is most likely already enabled. For pairing with the dive computer " "choose _Control Panel -> Bluetooth Devices -> Add Wireless Device_. This " @@ -9662,21 +9627,21 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4059 +#: user-manual.txt:4222 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:4062 +#: user-manual.txt:4225 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:4069 +#: user-manual.txt:4232 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. " @@ -9685,20 +9650,20 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4072 +#: user-manual.txt:4235 msgid "" "Once the pairing is complete, the correct device is shown in the 'Device or " "Mount Point' drop-down in the _Subsurface_ *Import* dialog." msgstr "" #. type: Title ==== -#: user-manual.txt:4073 +#: user-manual.txt:4236 #, no-wrap msgid "On Linux" msgstr "Sur Linux" #. type: Plain text -#: user-manual.txt:4081 +#: user-manual.txt:4244 msgid "" "Be sure Bluetooth is enabled on the _Subsurface_ computer. On most common " "distributions this should be true out of the box and pairing should be " @@ -9710,7 +9675,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4085 +#: user-manual.txt:4248 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 " @@ -9719,23 +9684,23 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4087 +#: user-manual.txt:4250 msgid "Enable the Bluetooth controller and pair your dive computer" msgstr "Activez le contrôleur Bluetooth et jumelez votre ordinateur de plongée" #. type: Plain text -#: user-manual.txt:4088 +#: user-manual.txt:4251 msgid "Establish an RFCOMM connection" msgstr "" #. type: Title ===== -#: user-manual.txt:4089 user-manual.txt:4229 +#: user-manual.txt:4252 user-manual.txt:4392 #, no-wrap msgid "Download the dives with Subsurface" msgstr "" #. type: Plain text -#: user-manual.txt:4095 +#: user-manual.txt:4258 msgid "" "Ensure the dive computer is in upload mode. On the _Shearwater Petrel_, " "_Petrel 2_ and _Nerd_ cycle through the menu, select 'Dive Log', then " @@ -9746,7 +9711,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4100 +#: user-manual.txt:4263 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 " @@ -9756,23 +9721,23 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4102 +#: user-manual.txt:4265 msgid "+sudo usermod -a -G dialout username+" msgstr "" #. type: Plain text -#: user-manual.txt:4104 +#: user-manual.txt:4267 msgid "Then log out and log in for the change to take effect." msgstr "" #. type: Title ===== -#: user-manual.txt:4105 +#: user-manual.txt:4268 #, no-wrap msgid "Enabling the Bluetooth controller and pairing your dive computer" msgstr "" #. type: Plain text -#: user-manual.txt:4111 +#: user-manual.txt:4274 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 " @@ -9783,14 +9748,14 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4114 +#: user-manual.txt:4277 msgid "" "If the graphical method doesn't work, pair the device from the command line. " "Open a terminal and use +hciconfig+ to check the Bluetooth controller status." msgstr "" #. type: Plain text -#: user-manual.txt:4121 +#: user-manual.txt:4284 #, no-wrap msgid "" "\t$ hciconfig\n" @@ -9802,7 +9767,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4126 +#: user-manual.txt:4289 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 " @@ -9812,7 +9777,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4134 +#: user-manual.txt:4297 #, no-wrap msgid "" "\tsudo hciconfig hci0 up auth+ (enter password when prompted)\n" @@ -9825,25 +9790,25 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4136 +#: user-manual.txt:4299 msgid "Check that the status now includes +'UP', 'RUNNING' AND 'AUTH'+." msgstr "" #. type: Plain text -#: user-manual.txt:4138 +#: user-manual.txt:4301 msgid "" "If there are multiple controllers running, it's easiest to turn off the " "unused controller(s). For example, for +hci1+:" msgstr "" #. type: Plain text -#: user-manual.txt:4140 +#: user-manual.txt:4303 #, no-wrap msgid "\tsudo hciconfig hci1 down\n" msgstr "" #. type: Plain text -#: user-manual.txt:4143 +#: user-manual.txt:4306 msgid "" "Next step is to 'trust' and 'pair' the dive computer. On distros with Bluez " "5, such as Fedora 22, you can use a tool called +blutootctl+, which will " @@ -9851,7 +9816,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4164 +#: user-manual.txt:4327 #, no-wrap msgid "" "\tbluetoothctl\n" @@ -9860,13 +9825,11 @@ msgid "" "\tAgent registered\n" "\t[bluetooth]# default-agent\n" "\tDefault agent request successful\n" -"\t[bluetooth]# scan on <----now set your dive computer" -" to upload mode\n" +"\t[bluetooth]# scan on <----now set your dive computer to upload mode\n" "\tDiscovery started\n" "\t[CHG] Controller 01:23:45:67:89:AB Discovering: yes\n" "\t[NEW] Device 00:11:22:33:44:55 Petrel\n" -"\t[bluetooth]# trust 00:11:22:33:44:55 <----you can use the tab key to" -" autocomplete the MAC address\n" +"\t[bluetooth]# trust 00:11:22:33:44:55 <----you can use the tab key to autocomplete the MAC address\n" "\t[CHG] Device 00:11:22:33:44:55 Trusted: yes\n" "\tChanging 00:11:22:33:44:55 trust succeeded\n" "\t[bluetooth]# pair 00:11:22:33:44:55\n" @@ -9879,14 +9842,14 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4167 +#: user-manual.txt:4330 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:4170 +#: user-manual.txt:4333 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-" @@ -9894,7 +9857,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4175 +#: user-manual.txt:4338 #, no-wrap msgid "" "\thcitool -i hci0 scanning\n" @@ -9904,96 +9867,94 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4177 +#: user-manual.txt:4340 msgid "Once the dive computer is paired, set up the RFCOMM connection." msgstr "" #. type: Title ===== -#: user-manual.txt:4178 +#: user-manual.txt:4341 #, no-wrap msgid "Establishing the RFCOMM connection" msgstr "" #. type: Plain text -#: user-manual.txt:4181 +#: user-manual.txt:4344 msgid "The command to establish an RFCOMM connection is:" msgstr "" #. type: Plain text -#: user-manual.txt:4183 +#: user-manual.txt:4346 msgid "+sudo rfcomm -i <controller> connect <dev> <bdaddr> [channel]+" msgstr "" #. type: Plain text -#: user-manual.txt:4185 +#: user-manual.txt:4348 msgid "+<controller>+ is the Bluetooth controller, +hci0+." msgstr "" #. type: Plain text -#: user-manual.txt:4186 +#: user-manual.txt:4349 msgid "+<dev>+ is the RFCOMM device file, +rfcomm0+" msgstr "" #. type: Plain text -#: user-manual.txt:4187 +#: user-manual.txt:4350 msgid "+<bdaddr>+ is the dive computer's MAC address, +00:11:22:33:44:55+" msgstr "" #. type: Plain text -#: user-manual.txt:4188 +#: user-manual.txt:4351 msgid "" "+[channel]+ is the dive computer's Bluetooth channel we need to connect to." msgstr "" #. type: Plain text -#: user-manual.txt:4191 +#: user-manual.txt:4354 msgid "" "If you omit 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:4193 +#: user-manual.txt:4356 msgid "_Shearwater Petrel 1_: channel 1" msgstr "" #. type: Plain text -#: user-manual.txt:4194 +#: user-manual.txt:4357 msgid "_Shearwater Petrel 2_: channel 5" msgstr "" #. type: Plain text -#: user-manual.txt:4195 +#: user-manual.txt:4358 msgid "_Shearwater Nerd_: channel 5" msgstr "" #. type: Plain text -#: user-manual.txt:4196 +#: user-manual.txt:4359 msgid "_Heinrichs-Weikamp OSTC Sport_: channel 1" msgstr "" #. type: Plain text -#: user-manual.txt:4198 +#: user-manual.txt:4361 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:4200 +#: user-manual.txt:4363 #, no-wrap -msgid "" -"\tsudo rfcomm -i hci0 connect rfcomm0 00:11:22:33:44:55 5 (enter a password," -" probably 0000, when prompted)\n" +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:4202 +#: user-manual.txt:4365 msgid "This gives the response:" msgstr "" #. type: Plain text -#: user-manual.txt:4205 +#: user-manual.txt:4368 #, no-wrap msgid "" "\tConnected /dev/rfcomm0 to 00:11:22:33:44:55 on channel 5\n" @@ -10001,24 +9962,23 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4207 +#: user-manual.txt:4370 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:4211 +#: user-manual.txt:4374 #, no-wrap msgid "" -"\tsudo rfcomm -i hci0 connect rfcomm0 00:11:22:33:44:55 (enter a password," -" probably 0000, when prompted)\n" +"\tsudo rfcomm -i hci0 connect rfcomm0 00:11:22:33:44:55 (enter a password, probably 0000, when prompted)\n" "\tConnected /dev/rfcomm0 to 00:11:22:33:44:55 on channel 1\n" "\tPress CTRL-C for hangup\n" msgstr "" #. type: Plain text -#: user-manual.txt:4215 +#: user-manual.txt:4378 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 " @@ -10027,7 +9987,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4225 +#: user-manual.txt:4388 #, no-wrap msgid "" "\tsdptool -i hci0 records 00:11:22:33:44:55\n" @@ -10042,7 +10002,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4228 +#: user-manual.txt:4391 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 " @@ -10050,7 +10010,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4231 +#: user-manual.txt:4394 msgid "" "After establishing the RFCOMM connection and while the dive computer's " "upload mode countdown is still running, go to_Subsurface_, select _Import-" @@ -10060,25 +10020,25 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:4237 +#: user-manual.txt:4400 #, no-wrap msgid "APPENDIX B: Dive Computer specific information for importing dive data." msgstr "" #. type: Title === -#: user-manual.txt:4240 +#: user-manual.txt:4403 #, no-wrap msgid "Importing from Uemis Zurich" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4242 +#: user-manual.txt:4405 #, no-wrap msgid "images/icons/iumis.jpg" msgstr "images/icons/iumis.jpg" #. type: Plain text -#: user-manual.txt:4258 +#: user-manual.txt:4421 msgid "" "_Subsurface_ downloads the information stored on the SDA (the built-in file " "system of the Uemis) including information about dive spots and equipment. " @@ -10094,7 +10054,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4273 +#: user-manual.txt:4436 msgid "" "After selecting the above device name, download the dives from the Uemis " "Zurich. One technical issue with the Uemis Zurich download implementation " @@ -10111,19 +10071,19 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4275 +#: user-manual.txt:4438 #, no-wrap msgid "Importing from Uwatec Galileo" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4277 +#: user-manual.txt:4440 #, no-wrap msgid "images/icons/Galileo.jpg" msgstr "images/icons/Galileo.jpg" #. type: Plain text -#: user-manual.txt:4292 +#: user-manual.txt:4455 msgid "" "The Uwatec Galileo dive computers use infra red (IrDA) communication between " "the dive computer and Subsurface. The Uwatec hardware uses a USB dongle " @@ -10139,14 +10099,14 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4295 +#: user-manual.txt:4458 msgid "" "After executing this command, Subsurface will recognize the Galileo dive " "computer and download dive information." msgstr "" #. type: Plain text -#: user-manual.txt:4301 +#: user-manual.txt:4464 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/" @@ -10156,28 +10116,28 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4304 +#: user-manual.txt:4467 msgid "" "For the Apple Mac, IrDA communication via the MCS7780 link is not available " "for OSX 10.6 or higher." msgstr "" -"Pour les ordinateurs Apple Mac, la connection IrDA via l'interface MCS7780 " +"Pour les ordinateurs Apple Mac, la connexion IrDA via l'interface MCS7780 " "n'est plus disponible depuis OSX 10.6 ou supérieur." #. type: Title === -#: user-manual.txt:4306 +#: user-manual.txt:4469 #, no-wrap msgid "Importing from Heinrichs Weikamp DR5" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4308 +#: user-manual.txt:4471 #, no-wrap msgid "images/icons/HW_DR5.jpg" msgstr "images/icons/HW_DR5.jpg" #. type: Plain text -#: user-manual.txt:4318 +#: user-manual.txt:4481 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. " @@ -10190,19 +10150,19 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4321 +#: user-manual.txt:4484 #, no-wrap msgid "Importing from xDEEP BLACK" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4323 +#: user-manual.txt:4486 #, no-wrap msgid "images/icons/HW_xdeepblack.jpg" msgstr "images/icons/HW_xdeepblack.jpg" #. type: Plain text -#: user-manual.txt:4332 +#: user-manual.txt:4495 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 " @@ -10216,19 +10176,19 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4334 +#: user-manual.txt:4497 #, no-wrap msgid "Importing from Shearwater Predator/Petrel/Nerd using Bluetooth" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4336 +#: user-manual.txt:4499 #, no-wrap msgid "images/icons/predator.jpg" msgstr "images/icons/predator.jpg" #. type: Plain text -#: user-manual.txt:4339 +#: user-manual.txt:4502 msgid "" "Specific instructions for downloading dives using Bluetooth are given in the " "section above, <<S_Bluetooth,_Connecting Subsurface to a Bluetooth-enabled " @@ -10236,19 +10196,19 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4341 +#: user-manual.txt:4504 #, no-wrap msgid "Importing from Poseidon MkVI Discovery" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4343 +#: user-manual.txt:4506 #, no-wrap msgid "images/MkVI.jpeg" msgstr "images/MkVI.jpeg" #. type: Plain text -#: user-manual.txt:4351 +#: user-manual.txt:4514 msgid "" "Download of dive logs from the MkVI is performed using a custom " "communications adapter and the _Poseidon PC Configuration Software_, " @@ -10260,45 +10220,45 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4354 +#: user-manual.txt:4517 msgid "" "Setup configuration for the dive and key dive parameters (file with a .txt " "extension)" msgstr "" #. type: Plain text -#: user-manual.txt:4355 +#: user-manual.txt:4518 msgid "Dive log details (file with a .csv extension)" msgstr "" #. type: Plain text -#: user-manual.txt:4357 +#: user-manual.txt:4520 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:4359 +#: user-manual.txt:4522 msgid "" "_Subsurface_ accesses the .txt and the .csv files to get dive log " "information." msgstr "" #. type: Title === -#: user-manual.txt:4361 +#: user-manual.txt:4524 #, no-wrap msgid "Importing from APD Inspiration/Evolution CCR" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4363 +#: user-manual.txt:4526 #, no-wrap msgid "images/APDComputer.jpg" msgstr "images/APDComputer.jpg" #. type: Plain text -#: user-manual.txt:4371 +#: user-manual.txt:4534 msgid "" "The dive logs of an APD Inspiration or similar CCR dive computer are " "downloaded using a communications adapter and _AP Communicator_, obtained " @@ -10310,55 +10270,55 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4373 +#: user-manual.txt:4536 msgid "Download the dive using _AP Communicator_." msgstr "" #. type: Plain text -#: user-manual.txt:4374 +#: user-manual.txt:4537 msgid "Open a dive within the _AP Log Viewer_." msgstr "" #. type: Plain text -#: user-manual.txt:4375 +#: user-manual.txt:4538 msgid "Select the tab at the top of the screen, entitled \"_Data_\"." msgstr "" #. type: Plain text -#: user-manual.txt:4376 +#: user-manual.txt:4539 msgid "" "With the raw dive log data show on the screen, click on \"_Copy to Clipboard_" "\"." msgstr "" #. type: Plain text -#: user-manual.txt:4377 +#: user-manual.txt:4540 msgid "Open a text editor, e.g. Notepad (Windows) or TextWrangler (Mac)." msgstr "" #. type: Plain text -#: user-manual.txt:4379 +#: user-manual.txt:4542 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:4380 +#: user-manual.txt:4543 msgid "" "Within _Subsurface_, select _Import -> Import log files_ to open the xref:" "Unified_import[universal import dialogue]." msgstr "" #. type: Plain text -#: user-manual.txt:4381 +#: user-manual.txt:4544 msgid "" "In the dropdown list towards the bottom right of the dialogue (labeled " "'Filter:'), select \"APD log viewer\"." msgstr "" #. type: Plain text -#: user-manual.txt:4385 +#: user-manual.txt:4548 #, no-wrap msgid "" "On the list of file names select the _.apd_ file created. An import\n" @@ -10368,13 +10328,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:4386 +#: user-manual.txt:4549 #, no-wrap msgid "images/APD_CSVimportF22.jpg" msgstr "images/APD_CSVimportF22.jpg" #. type: Plain text -#: user-manual.txt:4394 +#: user-manual.txt:4557 msgid "" "The top left hand dropdown box in the import panel lets you select the APD " "dive computer for which the dive log needs to be imported. The default it is " @@ -10386,12 +10346,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4395 +#: user-manual.txt:4558 msgid "Click the _Ok_ button at the bottom of the import panel." msgstr "" #. type: Plain text -#: user-manual.txt:4400 +#: user-manual.txt:4563 msgid "" "The APD dive log will appear within _Subsurface_. The dive computer- " "generated ceiling provided by the Inspiration can be viewed by selecting the " @@ -10401,14 +10361,13 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:4401 +#: user-manual.txt:4564 #, no-wrap -msgid "" -"APPENDIX C: Exporting Dive log information from external dive log software." +msgid "APPENDIX C: Exporting Dive log information from external dive log software." msgstr "" #. type: Plain text -#: user-manual.txt:4410 +#: user-manual.txt:4573 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, " @@ -10418,22 +10377,22 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4412 +#: user-manual.txt:4575 msgid "Export the foreign dive log data to format that is accessible from" msgstr "" #. type: Plain text -#: user-manual.txt:4413 +#: user-manual.txt:4576 msgid "_Subsurface_." msgstr "" #. type: Plain text -#: user-manual.txt:4414 +#: user-manual.txt:4577 msgid "Import the accessible dive log data into _Subsurface_." msgstr "" #. type: Plain text -#: user-manual.txt:4418 +#: user-manual.txt:4581 msgid "" "This appendix provides some information about approaches to export dive log " "data from foreign dive log software. The procedures below mostly apply to " @@ -10441,19 +10400,19 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4420 +#: user-manual.txt:4583 #, no-wrap msgid "Exporting from *Suunto Divemanager (DM3, DM4 or DM5)*" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4421 +#: user-manual.txt:4584 #, no-wrap msgid "images/icons/suuntologo.jpg" msgstr "images/icons/suuntologo.jpg" #. type: Plain text -#: user-manual.txt:4428 +#: user-manual.txt:4591 msgid "" "DiveManager is a Windows application for Suunto dive computers. Divemanager " "3 (DM3) is an older version of the Suunto software. More recent Suunto dive " @@ -10463,66 +10422,66 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4430 +#: user-manual.txt:4593 #, no-wrap msgid "*Divemanager 3 (DM3):*\n" msgstr "" #. type: Plain text -#: user-manual.txt:4432 +#: user-manual.txt:4595 msgid "" "Start 'Suunto Divemanager 3' and log in with the name containing the logs" msgstr "" #. type: Plain text -#: user-manual.txt:4433 +#: user-manual.txt:4596 msgid "Do not start the import wizard to import dives from the dive computer." msgstr "" #. type: Plain text -#: user-manual.txt:4435 +#: user-manual.txt:4598 msgid "" "In the navigation tree on the left side of the program-window, select the " "appropriate dives." msgstr "" #. type: Plain text -#: user-manual.txt:4436 +#: user-manual.txt:4599 msgid "" "Within the list of dives, select the dives you would like to import later:" msgstr "" #. type: Plain text -#: user-manual.txt:4437 +#: user-manual.txt:4600 msgid "To select certain dives: hold 'ctrl' and click the dive" msgstr "" #. type: Plain text -#: user-manual.txt:4439 +#: user-manual.txt:4602 msgid "" "To select all dives: Select the first dive, hold down shift and select the " "last dive" msgstr "" #. type: Plain text -#: user-manual.txt:4440 +#: user-manual.txt:4603 msgid "With the dives marked, use the program menu _File -> Export_" msgstr "" #. type: Plain text -#: user-manual.txt:4441 +#: user-manual.txt:4604 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:4442 +#: user-manual.txt:4605 msgid "Click the browse button next to the field Export Path" msgstr "" #. type: Plain text -#: user-manual.txt:4444 +#: user-manual.txt:4607 #, no-wrap msgid "" "** A file-manager like window pops up\n" @@ -10530,13 +10489,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4445 +#: user-manual.txt:4608 #, no-wrap msgid "Divelog.SDE file\n" msgstr "" #. type: Plain text -#: user-manual.txt:4447 +#: user-manual.txt:4610 #, no-wrap msgid "" "** Optionally change the name of the file for saving\n" @@ -10544,25 +10503,25 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4448 +#: user-manual.txt:4611 #, no-wrap msgid "Back in the Export pop-up, press the button 'Export'\n" msgstr "" #. type: Plain text -#: user-manual.txt:4449 +#: user-manual.txt:4612 #, no-wrap msgid "The dives are now exported to the file Divelog.SDE.\n" msgstr "" #. type: Plain text -#: user-manual.txt:4451 +#: user-manual.txt:4614 #, no-wrap msgid "*Divemanager 4 (DM4) and Divemanager 5 (DM5):*\n" msgstr "" #. type: Plain text -#: user-manual.txt:4456 +#: user-manual.txt:4619 msgid "" "DM4 and DM5 use identical mechanisms for exporting dive logs. To export a " "divelog from Divemanager you need to locate the DM4/DM5 database where the " @@ -10571,81 +10530,81 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4458 +#: user-manual.txt:4621 msgid "Locating the Suunto DM4 (or DM5) database:" msgstr "" #. type: Plain text -#: user-manual.txt:4460 user-manual.txt:4469 +#: user-manual.txt:4623 user-manual.txt:4632 msgid "Start Suunto DM4/DM5" msgstr "" #. type: Plain text -#: user-manual.txt:4461 +#: user-manual.txt:4624 msgid "Select 'Help -> About'" msgstr "" #. type: Plain text -#: user-manual.txt:4462 +#: user-manual.txt:4625 msgid "Click 'Copy' after text 'Copy log folder path to clipboard'" msgstr "" #. type: Plain text -#: user-manual.txt:4463 +#: user-manual.txt:4626 msgid "Open Windows Explorer" msgstr "Ouvrir l'explorateur Windows" #. type: Plain text -#: user-manual.txt:4464 +#: user-manual.txt:4627 msgid "Paste the address to the path box at the top of the File Explorer" msgstr "" #. type: Plain text -#: user-manual.txt:4465 +#: user-manual.txt:4628 msgid "The database is called DM4.db or DM5.db" msgstr "" #. type: Plain text -#: user-manual.txt:4467 +#: user-manual.txt:4630 msgid "Making a backup copy of the Suunto DM4/DM5 database:" msgstr "" #. type: Plain text -#: user-manual.txt:4470 +#: user-manual.txt:4633 msgid "Select 'File - Create backup'" msgstr "" #. type: Plain text -#: user-manual.txt:4472 +#: user-manual.txt:4635 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:4473 +#: user-manual.txt:4636 msgid "Click 'Save'" msgstr "" #. type: Plain text -#: user-manual.txt:4474 +#: user-manual.txt:4637 msgid "The dives are now exported to the file DM4.bak (or DM5.bak)" msgstr "" #. type: Title === -#: user-manual.txt:4476 +#: user-manual.txt:4639 #, no-wrap msgid "Exporting from Atomic Logbook" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4479 +#: user-manual.txt:4642 #, no-wrap msgid "images/icons/atomiclogo.jpg" msgstr "images/icons/atomiclogo.jpg" #. type: Plain text -#: user-manual.txt:4486 +#: user-manual.txt:4649 msgid "" "Atomic Logbook is Windows software by Atomic Aquatics. It allows downloading " "of dive information from Cobalt and Cobalt 2 dive computers. The divelog is " @@ -10654,19 +10613,19 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4488 +#: user-manual.txt:4651 #, no-wrap msgid "Exporting from Mares Dive Organiser V2.1" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4491 +#: user-manual.txt:4654 #, no-wrap msgid "images/icons/mareslogo.jpg" msgstr "images/icons/mareslogo.jpg" #. type: Plain text -#: user-manual.txt:4499 +#: user-manual.txt:4662 msgid "" "Mares Dive Organizer is a Windows application. The dive log is kept as a " "Microsoft SQL Compact Edition database with a '.sdf' filename extension. The " @@ -10677,7 +10636,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4504 +#: user-manual.txt:4667 msgid "" "Within Dive Organizer, select _Database -> Backup_ from the main menu and " "back up the database to the desk top. This creates a zipped file " @@ -10685,36 +10644,36 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4507 +#: user-manual.txt:4670 msgid "" "Rename the file to DiveOrganizerxxxxx.zip. Inside the zipped directory is a " "file _DiveOrganizer.sdf_." msgstr "" #. type: Plain text -#: user-manual.txt:4508 +#: user-manual.txt:4671 msgid "Extract the _.sdf_ file from the zipped folder to your Desktop." msgstr "" #. type: Plain text -#: user-manual.txt:4509 +#: user-manual.txt:4672 msgid "The password for accessing the .zip file is _mares_." msgstr "" #. type: Title === -#: user-manual.txt:4511 +#: user-manual.txt:4674 #, no-wrap msgid "Exporting from *DivingLog 5.0 and 6.0*" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4513 +#: user-manual.txt:4676 #, no-wrap msgid "images/icons/divingloglogo.jpg" msgstr "images/icons/divingloglogo.jpg" #. type: Plain text -#: user-manual.txt:4520 +#: user-manual.txt:4683 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 " @@ -10724,37 +10683,37 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4522 +#: user-manual.txt:4685 msgid "To transfer all files from DivingLog to Subsurface:" msgstr "" #. type: Plain text -#: user-manual.txt:4524 +#: user-manual.txt:4687 msgid "In DivingLog open the 'File -> Export -> SQLite' menu" msgstr "" #. type: Plain text -#: user-manual.txt:4525 +#: user-manual.txt:4688 msgid "Select 'Settings' button" msgstr "" #. type: Plain text -#: user-manual.txt:4526 +#: user-manual.txt:4689 msgid "Set the 'RTF2Plaintext' to 'true'" msgstr "" #. type: Plain text -#: user-manual.txt:4527 +#: user-manual.txt:4690 msgid "Close the Settings dialog" msgstr "" #. type: Plain text -#: user-manual.txt:4528 +#: user-manual.txt:4691 msgid "Click 'Export' button and select the filename" msgstr "" #. type: Plain text -#: user-manual.txt:4532 +#: user-manual.txt:4695 msgid "" "Once this is done, open the saved database file with Subsurface and the " "dives are automatically converted to Subsurface’s own format. Last step to " @@ -10762,13 +10721,13 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:4533 +#: user-manual.txt:4696 #, 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:4543 +#: user-manual.txt:4706 msgid "" "Many divers keep a dive log in some form of digital file, commonly a " "spreadsheet with various fields of information. These logs can be easily " @@ -10788,7 +10747,7 @@ msgstr "" "tableur utilisé." #. type: Plain text -#: user-manual.txt:4549 +#: user-manual.txt:4712 msgid "" "Organize the diving data in the spreadsheet, so the first row contains the " "names (or titles) of each column and the information for each dive is stored " @@ -10804,19 +10763,19 @@ msgstr "" "plongées selon quelques règles simples :" #. type: Plain text -#: user-manual.txt:4551 +#: user-manual.txt:4714 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:4552 +#: user-manual.txt:4715 msgid "Duration: the format should be minutes:seconds." msgstr "Durée : le format est minutes:secondes." #. type: Plain text -#: user-manual.txt:4553 +#: user-manual.txt:4716 msgid "" "Unit system: only one unit system should be used (no mix of imperial and " "metric units)" @@ -10825,25 +10784,25 @@ msgstr "" "entre les unités impériales et métriques)" #. type: Plain text -#: user-manual.txt:4554 +#: user-manual.txt:4717 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:4555 +#: user-manual.txt:4718 msgid "GPS position: use decimal degrees, e.g. 30.22496 30.821798" msgstr "" "Position GPS : utilisez les degrés décimaux, par exemple : 30.22496 30.821798" #. type: Title === -#: user-manual.txt:4555 +#: user-manual.txt:4719 #, no-wrap msgid "_LibreOffice Calc_ and _OpenOffice Calc_" msgstr "_LibreOffice Calc_ et _OpenOffice Calc_" #. type: Plain text -#: user-manual.txt:4559 +#: user-manual.txt:4723 msgid "" "These are open source spreadsheet applications forming parts of larger open " "source office suite applications. The user interaction with _LibreOffice_ " @@ -10854,13 +10813,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:4560 +#: user-manual.txt:4724 #, no-wrap msgid "images/LOffice_spreadsheetdata.jpg" msgstr "images/LOffice_spreadsheetdata.jpg" #. type: Plain text -#: user-manual.txt:4563 +#: user-manual.txt:4727 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 " @@ -10868,13 +10827,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:4564 +#: user-manual.txt:4728 #, no-wrap msgid "images/LOffice_save_as_options.jpg" msgstr "images/LOffice_save_as_options.jpg" #. type: Plain text -#: user-manual.txt:4567 +#: user-manual.txt:4731 msgid "" "After selecting _Save_, select the appropriate field delimiter (choose _Tab_ " "to prevent conflicts with the comma when using this as a decimal point), " @@ -10882,13 +10841,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:4568 +#: user-manual.txt:4732 #, no-wrap msgid "images/LOffice_field_options.jpg" msgstr "images/LOffice_field_options.jpg" #. type: Plain text -#: user-manual.txt:4571 +#: user-manual.txt:4735 msgid "" "Double check the .CSV file by opening it with a text editor, and then import " "the dive data as explained on the section xref:S_ImportingCSVDives[Importing " @@ -10896,13 +10855,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4572 +#: user-manual.txt:4736 #, no-wrap msgid "Microsoft _Excel_" msgstr "Microsoft _Excel_" #. type: Plain text -#: user-manual.txt:4578 +#: user-manual.txt:4742 msgid "" "The field delimiter (called \"_list separator_\" in Microsoft manuals) is " "not accessible from within _Excel_ and needs to be set through the " @@ -10913,67 +10872,67 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4580 +#: user-manual.txt:4744 msgid "" "In Microsoft Windows, click the *Start* button, then select _Control Panel_ " "from the list on the right-hand side." msgstr "" #. type: Plain text -#: user-manual.txt:4581 +#: user-manual.txt:4745 msgid "Open the _Regional and Language Options_ dialog box." msgstr "" #. type: Plain text -#: user-manual.txt:4583 +#: user-manual.txt:4747 msgid "" "Do the following: ** In Windows 7, click the _Formats_ tab, and then click " "_Customize this format_." msgstr "" #. type: Plain text -#: user-manual.txt:4584 +#: user-manual.txt:4748 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:4585 +#: user-manual.txt:4749 msgid "Click _OK_ twice." msgstr "" #. type: Plain text -#: user-manual.txt:4587 +#: user-manual.txt:4751 msgid "Below is an image of the _Control Panel_:" msgstr "" #. type: Target for macro image -#: user-manual.txt:4588 +#: user-manual.txt:4752 #, no-wrap msgid "images/Win_SaveCSV2.jpg" msgstr "images/Win_SaveCSV2.jpg" #. type: Plain text -#: user-manual.txt:4591 +#: user-manual.txt:4755 msgid "To export the dive log in CSV format:" msgstr "" #. type: Plain text -#: user-manual.txt:4593 +#: user-manual.txt:4757 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:4594 +#: user-manual.txt:4758 #, no-wrap msgid "images/Win_SaveCSV1.jpg" msgstr "images/Win_SaveCSV1.jpg" #. type: Plain text -#: user-manual.txt:4600 +#: user-manual.txt:4764 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 " @@ -10983,13 +10942,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:4601 +#: user-manual.txt:4765 #, no-wrap msgid "images/Win_SaveCSV3.jpg" msgstr "images/Win_SaveCSV3.jpg" #. type: Plain text -#: user-manual.txt:4607 +#: user-manual.txt:4771 msgid "" "Select the _Save_ button. The CSV-formatted file is saved into the folder " "that was selected. You can double check the .CSV file by opening it with a " @@ -10998,13 +10957,13 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:4608 +#: user-manual.txt:4772 #, 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:4613 +#: user-manual.txt:4777 msgid "" "_Subsurface_ has a way to create or modify templates for printing dive logs " "to produce customized printouts of them. Templates written in HTML, as well " @@ -11013,12 +10972,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4615 +#: user-manual.txt:4779 msgid "Templates are accessed using the print dialogue (see image *B* below)." msgstr "" #. type: Plain text -#: user-manual.txt:4623 +#: user-manual.txt:4787 msgid "" "The buttons under the _Template_ dropdown box lets you _Edit_, _Delete_, " "_Import_ and _Export_ templates (see image *A* above). New or modified " @@ -11030,18 +10989,18 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4625 +#: user-manual.txt:4789 msgid "The Edit Panel has three tabs:" msgstr "" #. type: Target for macro image -#: user-manual.txt:4626 +#: user-manual.txt:4790 #, no-wrap msgid "images/Template1_f22.jpg" msgstr "images/Template1_f22.jpg" #. type: Plain text -#: user-manual.txt:4630 +#: user-manual.txt:4794 msgid "" "The _Style_ tab (image *A* above) controls the font, line spacing and color " "template used for printing the dive log. The style attributes are editable. " @@ -11049,7 +11008,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4634 +#: user-manual.txt:4798 msgid "" "The _Colors_ tab (image *B* above) allows editing the colors used for " "printing the dive log. The colors are highly customizable: the _Edit_ " @@ -11058,7 +11017,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4643 +#: user-manual.txt:4807 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. " @@ -11074,13 +11033,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:4644 +#: user-manual.txt:4808 #, no-wrap msgid "images/Template2_f22.jpg" msgstr "images/Template2_f22.jpg" #. type: Plain text -#: user-manual.txt:4649 +#: user-manual.txt:4813 msgid "" "You can adapt any of the existing templates and save it to the dive log " "directory. The standard templates (e.g. One dive, Six dives, Table) can be " @@ -11089,33 +11048,33 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4651 +#: user-manual.txt:4815 msgid "" "To write a custom template, the following elements must exist so the " "template will be correctly handled and rendered." msgstr "" #. type: Title === -#: user-manual.txt:4652 +#: user-manual.txt:4816 #, no-wrap msgid "Main dive loop" msgstr "" #. type: Plain text -#: user-manual.txt:4654 +#: user-manual.txt:4818 msgid "" "_Subsurface_ exports a dive list called (*dives*) to the _Grantlee_ back " "end. It is possible to iterate over the list as follows:" msgstr "" #. type: Block title -#: user-manual.txt:4654 user-manual.txt:4719 user-manual.txt:4736 +#: user-manual.txt:4818 user-manual.txt:4883 user-manual.txt:4900 #, no-wrap msgid "template.html" msgstr "" #. type: delimited block . -#: user-manual.txt:4659 +#: user-manual.txt:4823 #, no-wrap msgid "" "\t{% for dive in dives %}\n" @@ -11124,13 +11083,13 @@ msgid "" msgstr "" #. type: Block title -#: user-manual.txt:4661 user-manual.txt:4724 user-manual.txt:4743 +#: user-manual.txt:4825 user-manual.txt:4888 user-manual.txt:4907 #, no-wrap msgid "output.html" msgstr "" #. type: delimited block . -#: user-manual.txt:4666 +#: user-manual.txt:4830 #, no-wrap msgid "" "\t<h1> 1 </h1>\n" @@ -11139,25 +11098,25 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4669 +#: user-manual.txt:4833 msgid "" "Additional information about _Grantlee_ can be found http://www.grantlee.org/" "apidox/for_themers.html[here]" msgstr "" #. type: Title === -#: user-manual.txt:4670 +#: user-manual.txt:4834 #, no-wrap msgid "Grantlee exported variables" msgstr "" #. type: Plain text -#: user-manual.txt:4672 +#: user-manual.txt:4836 msgid "Only a subset of the dive data is exported:" msgstr "" #. type: delimited block | -#: user-manual.txt:4701 +#: user-manual.txt:4865 #, no-wrap msgid "" "|*Name*|*Description*\n" @@ -11191,7 +11150,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4705 +#: user-manual.txt:4869 msgid "" "_Subsurface_ also exports *template_options* data. This data must be used as " "_CSS_ values to provide a dynamically editable template. The exported data " @@ -11199,16 +11158,14 @@ msgid "" msgstr "" #. type: delimited block | -#: user-manual.txt:4717 +#: user-manual.txt:4881 #, no-wrap msgid "" "|*Name*|*Description*\n" "|font| (*string*) font family\n" -"|borderwidth| (*int*) border-width value dynamically calculated as 0.1% of" -" the page width with minimum value of 1px\n" +"|borderwidth| (*int*) border-width value dynamically calculated as 0.1% of the page width with minimum value of 1px\n" "|font_size| (*double*) size of fonts in vw, ranges between 1.0 and 2.0\n" -"|line_spacing| (*double*) distance between text lines, ranges between 1.0 and" -" 3.0\n" +"|line_spacing| (*double*) distance between text lines, ranges between 1.0 and 3.0\n" "|color1| (*string*) background color\n" "|color2| (*string*) primary table cell color\n" "|color3| (*string*) secondary table cell color\n" @@ -11218,35 +11175,34 @@ msgid "" msgstr "" #. type: delimited block . -#: user-manual.txt:4722 +#: user-manual.txt:4886 #, no-wrap msgid "\tborder-width: {{ template_options.borderwidth }}px;\n" msgstr "" #. type: delimited block . -#: user-manual.txt:4727 +#: user-manual.txt:4891 #, no-wrap msgid "\tborder-width: 3px;\n" msgstr "" #. type: Plain text -#: user-manual.txt:4730 +#: user-manual.txt:4894 msgid "" "Another variable that _Subsurface_ exports is *print_options*. This variable " "contains a single member:" msgstr "" #. type: delimited block | -#: user-manual.txt:4733 +#: user-manual.txt:4897 #, no-wrap msgid "" "|*Name*|*Description*\n" -"|grayscale | Use _CSS_ filters to convert the page into grayscale (should be" -" added to body style to enable printing grayscale prints)\n" +"|grayscale | Use _CSS_ filters to convert the page into grayscale (should be added to body style to enable printing grayscale prints)\n" msgstr "" #. type: delimited block . -#: user-manual.txt:4741 +#: user-manual.txt:4905 #, no-wrap msgid "" "\tbody {\n" @@ -11255,7 +11211,7 @@ msgid "" msgstr "" #. type: delimited block . -#: user-manual.txt:4748 +#: user-manual.txt:4912 #, no-wrap msgid "" "\tbody {\n" @@ -11264,13 +11220,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4750 +#: user-manual.txt:4914 #, no-wrap msgid "Defined CSS selectors" msgstr "" #. type: Plain text -#: user-manual.txt:4753 +#: user-manual.txt:4917 msgid "" "As the dive profile is placed after rendering, _Subsurface_ uses special " "_CSS_ selectors to search in the HTML output. The _CSS_ selectors in the " @@ -11278,33 +11234,31 @@ msgid "" msgstr "" #. type: delimited block | -#: user-manual.txt:4760 +#: user-manual.txt:4924 #, no-wrap msgid "" "|*Selector*|*Type*|*Description*\n" "|dive_{{ dive.id }} | id | is used to fetch the relevant dive profile\n" -"|diveProfile | class | each dive that will contain a dive profile should have" -" this class selector in addition to the dive_{{ dive.id }} id selector\n" -"|dontbreak | class | prevents the dive with this class from being divided" -" into two pages. This can be used\n" +"|diveProfile | class | each dive that will contain a dive profile should have this class selector in addition to the dive_{{ dive.id }} id selector\n" +"|dontbreak | class | prevents the dive with this class from being divided into two pages. This can be used\n" "in flow layout templates only (when data-numberofdives = 0)\n" msgstr "" #. type: Plain text -#: user-manual.txt:4763 +#: user-manual.txt:4927 msgid "" "Rendering dive profiles is not supported for flow layout templates (when " "data-numberofdives = 0)." msgstr "" #. type: Title === -#: user-manual.txt:4764 +#: user-manual.txt:4928 #, no-wrap msgid "Special attributes" msgstr "" #. type: Plain text -#: user-manual.txt:4768 +#: user-manual.txt:4932 msgid "" "There are two ways of rendering- either rendering a specific number of dives " "in each page or make _Subsurface_ try to fit as many dives as possible into " @@ -11312,36 +11266,36 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4770 +#: user-manual.txt:4934 msgid "" "The *data-numberofdives* data attribute is added to the body tag to set the " "rendering mode." msgstr "" #. type: Plain text -#: user-manual.txt:4772 +#: user-manual.txt:4936 msgid "render 6 dives per page:" msgstr "" #. type: delimited block . -#: user-manual.txt:4775 +#: user-manual.txt:4939 #, no-wrap msgid "\t<body data-numberofdives = 6>\n" msgstr "" #. type: Plain text -#: user-manual.txt:4778 +#: user-manual.txt:4942 msgid "render as much dives as possible:" msgstr "" #. type: delimited block . -#: user-manual.txt:4781 +#: user-manual.txt:4945 #, no-wrap msgid "\t<body data-numberofdives = 0>\n" msgstr "" #. type: Plain text -#: user-manual.txt:4784 +#: user-manual.txt:4948 msgid "" "All CSS units should be in relative lengths only, to support printing on any " "page size." @@ -11349,19 +11303,19 @@ msgstr "" # ANNEXE F: FAQs. #. type: Title == -#: user-manual.txt:4785 +#: user-manual.txt:4949 #, no-wrap msgid "APPENDIX F: FAQs." msgstr "ANNEXE F: FAQs." #. type: Title === -#: user-manual.txt:4787 +#: user-manual.txt:4951 #, no-wrap msgid "Subsurface appears to miscalculate gas consumption and SAC" msgstr "" #. type: Plain text -#: user-manual.txt:4791 +#: user-manual.txt:4955 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_ " @@ -11369,7 +11323,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4797 +#: user-manual.txt:4961 msgid "" "'Answer': Not really. What happens is that _Subsurface_ actually calculates " "gas consumption differently - and better - than you expect. In particular, " @@ -11379,7 +11333,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4803 +#: user-manual.txt:4967 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 " @@ -11389,12 +11343,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4805 +#: user-manual.txt:4969 msgid "+consumption = (amount_of_air_at_beginning - amount_of_air_at_end)+" msgstr "" #. type: Plain text -#: user-manual.txt:4811 +#: user-manual.txt:4975 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 " @@ -11405,12 +11359,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4813 +#: user-manual.txt:4977 msgid "+12.2*((220-100)/1.013)+" msgstr "" #. type: Plain text -#: user-manual.txt:4818 +#: user-manual.txt:4982 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 " @@ -11420,7 +11374,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4824 +#: user-manual.txt:4988 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 " @@ -11431,15 +11385,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4825 +#: user-manual.txt:4989 #, no-wrap -msgid "" -"Some dive profiles have time discrepancies with the recorded samples from my" -" dive computer..." +msgid "Some dive profiles have time discrepancies with the recorded samples from my dive computer..." msgstr "" #. type: Plain text -#: user-manual.txt:4829 +#: user-manual.txt:4993 msgid "" "_Subsurface_ ends up ignoring surface time for many things (average depth, " "divetime, SAC, etc). 'Question': Why do dive durations in my dive computer " @@ -11447,7 +11399,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4837 +#: user-manual.txt:5001 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 " @@ -11461,13 +11413,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4838 +#: user-manual.txt:5002 #, no-wrap msgid "Some dive profiles are missing from the download" msgstr "" #. type: Plain text -#: user-manual.txt:4852 +#: user-manual.txt:5016 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 " @@ -11482,7 +11434,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4856 +#: user-manual.txt:5020 msgid "" "If you have downloaded your dives to different dive logging software before " "they were overwritten, there is a good chance that Subsurface can import " @@ -11490,6 +11442,82 @@ msgid "" "salvaged after being overwritten by new dives." msgstr "" +#~ msgid "" +#~ "Bluetooth is becoming a more common way of communication between dive " +#~ "computers and _Subsurface_, for or instance, the Shearwater Petrel Mk2 " +#~ "and the OSTC Mk3. _Subsurface_ provides a largely operating system " +#~ "independent Bluetooth interface. Setting up _Subsurface_ for Bluetooth " +#~ "communication requires four steps:" +#~ msgstr "" +#~ "Bluetooth devient un protocole de communication de plus en plus courant " +#~ "pour relier des ordinateurs de plongée à _Subsurface_, par exemple le " +#~ "Shearwater Petrel Mk2 et l'OSTC Mk3. _Subsurface_ propose une interface " +#~ "Bluetooth largement indépendante du système d'exploitation. La " +#~ "configuration de _Subsurface_ pour la liaison Bluetootj nécessite quatre " +#~ "étapes:" + +#~ msgid "" +#~ "Type in the name of the dive site, e.g. \"Tihany, Lake Balaton, Hungary" +#~ "\". If several dives are made at the same location, the site information " +#~ "for the first dive is re-used. Existing dive locations can be edited by " +#~ "selecting (on the *Dive List* panel) a dive done at that site and by " +#~ "opening the location information. Click the globe button on the right of " +#~ "the location name (see image image *A* below). When typing the name of a " +#~ "dive site, a dropdown list appears showing all sites with similar names. " +#~ "If the dive site has been used before, click on the already-existing " +#~ "name. The dive site names in the dropdown list contain either a globe " +#~ "symbol (indicating existing dive sites in the _Subsurface_ database) or " +#~ "a *+* symbol (indicating dive site names that appear consistent with the " +#~ "current dive site name but which haven’t been added to the dive site " +#~ "database). If the present dive site has not been used before, a message " +#~ "appears as follows (image *A* below):" +#~ msgstr "" +#~ "Entrez le nom du site de plongée, p. ex. \"Tihany, Lac Balaton, Hongrie" +#~ "\". Si plusieurs plongées ont été faites au même endroit, les " +#~ "informations de lieu de la première plongée sont ré-utilisées. Les lieux " +#~ "de plongée existants peuvent être édités en sélectionnant (dans le " +#~ "panneau *Liste des plongées*) une plongée faite sur ce site et en ouvrant " +#~ "les informations de cet endroit. Cliquez sur le bouton avec une image de " +#~ "globe à droite du nom du lieu (voir l'image *A* ci-dessous). Lorsque " +#~ "vous entrez le nom d'un site de plongée, une liste déroulante apparaît, " +#~ "affichant tous les sites comportant un nom similaire. Si le site de " +#~ "plongée a déjà été utilisé précédemment, cliquez sur le nom existant. " +#~ "Les noms de sites de plongée présents dans la liste contiennent soit un " +#~ "symbole en forme de globe (indiquant qu'ils sont répertoriés comme lieux " +#~ "de plongée dans la base de données de _Subsurface_) ou un symbole *+* " +#~ "(qui indique des noms de lieux de plongée qui semblent consistant avec le " +#~ "nom du site courant mais qui n'ont pas encore été ajoutés à la base de " +#~ "données). Si le site de plongée actuel n'a pas encore été utilisé, un " +#~ "message apparaît comme suit (voir image *A* ci-dessous):" + +#~ msgid "" +#~ "Click the globe button and a panel appears to enter the coordinates and " +#~ "other information about the site (image *B*, above). The most important " +#~ "items are the coordinates of the site. There are three ways to specify " +#~ "coordinates:" +#~ msgstr "" +#~ "Cliquez sur le bouton contenant une image de globe; un panneau apparaît " +#~ "permettant d'entrer les coordonnées et d'autres informations concernant " +#~ "le site (voir image *B* ci-dessus). Les informations les plus importantes " +#~ "sont les coordonnées du site. Il y a trois façons de spécifier les " +#~ "coordonnées:" + +#~ msgid "" +#~ "Use the world map in the bottom right hand part of the _Subsurface_ " +#~ "window. The map displays an orange bar indicating \"No location data - " +#~ "Move the map and double-click to set the dive location\". Doubleclick at " +#~ "the appropriate place, and the orange bar disappears and the coordinates " +#~ "are stored." +#~ msgstr "" +#~ "Utilisez la carte du monde en bas à droite de la fenêtre de _Subsurface_. " +#~ "Cette carte affiche une barre orange indiquant \"Pas de données de " +#~ "localisation - Bougez la carte et double-cliquez pour définir le lieu de " +#~ "plongée\". Double-cliquez à l'endroit requis; la barre orange disparaît " +#~ "alors et les coordonnées sont stockées." + +#~ msgid "images/Planner_OC_deco_VPM.jpg" +#~ msgstr "images/Planner_OC_deco_VPM.jpg" + #~ msgid "images/rec_diveplan.jpg" #~ msgstr "images/rec_diveplan.jpg" @@ -11507,9 +11535,6 @@ msgstr "" #~ "principal et en cliquant sur le bouton approprié dans le panneau des " #~ "préférences Facebook." -#~ msgid "images/LoadImage1_f20.jpg" -#~ msgstr "images/LoadImage1_f20.jpg" - #~ msgid "" #~ " ** link:http://www.rebreatherworld.com/general-and-new-to-rebreather-" #~ "articles/5037-gradient-factors-for-dummies.html[Gradient factors for " diff --git a/Documentation/mobile-manual_fr.html.git b/Documentation/mobile-manual_fr.html.git index b869e73e6..13657436e 100644 --- a/Documentation/mobile-manual_fr.html.git +++ b/Documentation/mobile-manual_fr.html.git @@ -1004,7 +1004,7 @@ characteristics of the mobile device and the font characteristics used by <div id="footer"> <div id="footer-text"> Last updated - 2017-10-16 10:45:05 CEST + 2017-10-20 22:56:41 CEST </div> </div> </body> diff --git a/Documentation/mobile-manual_fr.txt b/Documentation/mobile-manual_fr.txt index c73692638..c47f37266 100644 --- a/Documentation/mobile-manual_fr.txt +++ b/Documentation/mobile-manual_fr.txt @@ -514,3 +514,5 @@ found in the root directory of the local storage of the mobile device. This option provides a wealth of information about the screen characteristics of the mobile device and the font characteristics used by _Subsurface-mobile_. + + diff --git a/Documentation/user-manual_fr.html.git b/Documentation/user-manual_fr.html.git index 831fcdbf6..519141de1 100644 --- a/Documentation/user-manual_fr.html.git +++ b/Documentation/user-manual_fr.html.git @@ -445,7 +445,7 @@ asciidoc.install(3); <div class="paragraph"><p><strong>Auteurs du manuel</strong> : Willem Ferguson, Jacco van Koll, Dirk Hohndel, Reinout Hoornweg, Linus Torvalds, Miika Turkia, Amit Chaudhuri, Jan Schubert, Salvador Cuñat, Pedro Neves, Stefan Fuchs</p></div> -<div class="paragraph"><p><span class="blue"><em>Version 4.6, mars 2017</em></span></p></div> +<div class="paragraph"><p><span class="blue"><em>Version 4.7, octobre 2017</em></span></p></div> <div class="paragraph"><p>Bienvenue en tant qu’utilisateur de <em>Subsurface</em>, un programme avancé d’enregistrement de plongées (carnet de plongées) avec une bonne infrastructure pour décrire, organiser, interpréter et imprimer des plongées @@ -834,7 +834,7 @@ de plongée supportés</a>.</p></div> <td class="content">Certains ordinateurs de plongée consomme plus d'énergie lorsqu’ils sont en mode Communication PC. <strong>Ceci peut consommer une grande partie de la batterie de votre ordinateur de plongée</strong>. Nous recommandons à l’utilisateur -de vérifier que l’ordinateur de plongée est chargé lorsqu’il est conneté au +de vérifier que l’ordinateur de plongée est chargé lorsqu’il est connecté au port USB du PC. Par exemple, certains ordinateurs Suunto et Mares ne se rechargent pas via la connection USB. Les utilisateurs doivent se reporter au manuel de leur ordinateur de plongée s’ils ne savent pas si leur @@ -862,7 +862,7 @@ en suivant ces étapes:</p></div> <li> <p> Le cable d’interface doit être connecté à un port USB libre (ou une - connection infrarouge + connection infra-rouge ou Bluetooth doit être configurée comme décrit ultérieurement dans ce manuel) </p> @@ -1014,10 +1014,10 @@ La batterie de l’ordinateur de plongée est-elle complètement chargée? S </li> <li> <p> -Le câble de connection est-il fautif? Le câble fonctionne-t-il avec d’autres +Le câble de connexion est-il fautif ? Le câble fonctionne-t-il avec d’autres logiciels? A-t-il fonctionné précédemment, ou est-ce la première fois que ce câble est utilisé? Les contacts sur l’ordinateur de plongée et le câble - sont-ils propres? + sont-ils propres ? </p> </li> <li> @@ -1071,12 +1071,21 @@ plongée.</p></div> </div></div> </div> <div class="sect3"> -<h4 id="S_Bluetooth">5.2.2. Connection de <em>Subsurface</em> à un ordinateur de plongée équipé de Bluetooth</h4> -<div class="paragraph"><p>Bluetooth devient un protocole de communication de plus en plus courant pour -relier des ordinateurs de plongée à <em>Subsurface</em>, par exemple le Shearwater -Petrel Mk2 et l’OSTC Mk3. <em>Subsurface</em> propose une interface Bluetooth -largement indépendante du système d’exploitation. La configuration de -<em>Subsurface</em> pour la liaison Bluetootj nécessite quatre étapes:</p></div> +<h4 id="S_Bluetooth">5.2.2. Connexion de <em>Subsurface</em> à un ordinateur de plongée équipé de Bluetooth</h4> +<div class="paragraph"><p>Bluetooth is becoming a more common way of communication between dive +computers and <em>Subsurface</em>. <em>Subsurface</em> provides a largely operating system +independent Bluetooth interface. An increasing number of dive computers use +Bluetooth Low Energy (BTLE) as a means of communication. However, BTLE is +not a standardised protocol, consequently adaptations need to be made for +communicating with each different dive computer model. See the +<a href="https://subsurface-divelog.org/documentation/supported-dive-computers/">list +of supported dive computers</a>. Bluetooth communication is often more +reliable if all Bluetooth devices seen by the <em>Subsurface</em> computer are +removed and pairing with the Bluetooth dive computer is performed from +afresh. The Bluetooth and BTLE interfaces are under active development with +respect to new dive computers that use this mechanism of communication.</p></div> +<div class="paragraph"><p>La configuration de <em>Subsurface</em> pour une communication Bluetooth nécessite +4 étapes :</p></div> <div class="ulist"><ul> <li> <p> @@ -1112,38 +1121,43 @@ Bluetooth"</em>, la boîte de dialogue ci-dessous apparaît.</p></div> <img src="images/DC_import_Bluetooth.jpg" alt="FIGURE: Download Bluetooth" /> </div> </div> +<div class="paragraph"><p>Although the <em>Subsurface</em> Bluetooth interface is intended to function +without Bluetooth pairing at the operating system level, it is always +prudent to follow up initial Bluetooth pairing problems by pairing the +Bluetooth dive computer with the <em>Subsurface</em> computer using the operating +system services of the desktop computer. Delete all existing pairings and +start by scanning for Bluetooth devices from an empty list (on the desktop) +of Bluetooth devices. Once <em>Subsurface</em> has recognised the Bluetooth dive +computer, subsequent divelog downloads are likely to be simple.</p></div> <div class="paragraph"><p>Sur les plateformes <em>Linux</em> ou -MacOS_, le nom de l’ordinateur utilisant -Subsurface_ et son adresse Bluetooth sont affichées du côté droit. À gauche, -si l’ordinateur a été connecté à plusieurs périphériques Bluetootj locaux, -vous pouvez utiliser la liste pour indiquer lequel doit être connecté à -°Subsurface_. L'état (allumé/éteint) de l’adaptateur Bluetooth est affiché -sous l’adresse et peut être modifié en cliquer sur la case -<em>Allumer/éteindre</em>. Si l’adresse Bluetooth n’est pas affichée, <em>Subsurface</em> -ne détecte pas le périphérique Bluetooth local. Assurez-vous que le driver -Bluetooth est installé correctement sur l’ordinateur utilisant <em>Subsurface</em> -et vérifiez qu’il peut être utilisé par d’autres utilitaires Bluetooth comme -<em>bluetoothctl</em> ou <em>bluemoon</em>. Ceci clôture les deux premières étapes. -Vérifiez que l’ordinateur de plongée avec Bluetooth est en mode Connection -PC et est détactable pour d’autres périphériques Bluetooth. Consultez le -manuel de l’ordinateur de plongée pour plus d’information. À présent, la -troisième étape de notre liste est terminée. Sélectionnez le bouton -<em>Scannez</em> en bas à gauche de la boîte de dialogue ci-dessus. Après la -recherche, l’ordinateur de plongée devrait se trouver dans la liste -(peut-être sous la norme d’un numéro de périphérique Bluetooth) dans la -liste principale sur la gauche de la boîte de dialogue (voir image -ci-dessus). Si cela ne fonctionne pas, sélectionnez le bouton <em>Effacer</em>, -puis scannez à nouveau en utilisant le bouton <em>Scan</em>. Après avoir suivi -cette procédure, <em>Subsurface</em> devrait voir l’ordinateur de plongée. La -dénomination de l’ordinateur de plongée détecté contient le nom du -périphérique, son adresse et son statut de jumelage. Si le périphérique -n’est pas jumelé et que son nom est affiché avec un arrière-plan rouge, un -menu contextuel peut être ouvert en sélectionnant ce nom avec un cli-droit. -Sélectionnez l’option <em>Jumeler</em> et attendez que la tâche soit terminée. Si -l’ordinateur est jumelé à Subsurface pour la première fois, il est possible -que Subsurface demande un nombre ou un code PIN. Le plus utilisé est 0000, -et c’est celui qui fonctionne pour un Shearwater Petrel. Si nécessaire, -consultez le manuel utilisateur de l’ordinateur de plongée que vous -utilisez.</p></div> +Subsurface_ et son adresse Bluetooth sont affichées du côté droit. L'état +(allumé/éteint) de l’adaptateur Bluetooth est affiché sous l’adresse et peut +être modifié en cliquer sur la case <em>Allumer/éteindre</em>. Si l’adresse +Bluetooth n’est pas affichée, <em>Subsurface</em> ne détecte pas le périphérique +Bluetooth local. Assurez-vous que le driver Bluetooth est installé +correctement sur l’ordinateur utilisant <em>Subsurface</em> et vérifiez qu’il peut +être utilisé par d’autres utilitaires Bluetooth comme <em>bluetoothctl</em> ou +<em>bluemoon</em>. Ceci clôture les deux premières étapes. Vérifiez que +l’ordinateur de plongée avec Bluetooth est en mode Connexion PC et est +détectable pour d’autres périphériques Bluetooth. Consultez le manuel de +l’ordinateur de plongée pour plus d’information. À présent, la troisième +étape de notre liste est terminée. Sélectionnez le bouton <em>Scannez</em> en bas +à gauche de la boîte de dialogue ci-dessus. Après la recherche, l’ordinateur +de plongée devrait se trouver dans la liste (peut-être sous la norme d’un +numéro de périphérique Bluetooth) dans la liste principale sur la gauche de +la boîte de dialogue (voir image ci-dessus). Si cela ne fonctionne pas, +sélectionnez le bouton <em>Effacer</em>, puis scannez à nouveau en utilisant le +bouton <em>Scan</em>. Après avoir suivi cette procédure, <em>Subsurface</em> devrait voir +l’ordinateur de plongée. La dénomination de l’ordinateur de plongée détecté +contient le nom du périphérique, son adresse et son statut de jumelage. Si +le périphérique n’est pas jumelé et que son nom est affiché avec un +arrière-plan rouge, un menu contextuel peut être ouvert en sélectionnant ce +nom avec un cli-droit. Sélectionnez l’option <em>Jumeler</em> et attendez que la +tâche soit terminée. Si l’ordinateur est jumelé à Subsurface pour la +première fois, il est possible que Subsurface demande un nombre ou un code +PIN. Le plus utilisé est 0000, et c’est celui qui fonctionne pour un +Shearwater Petrel. Si nécessaire, consultez le manuel utilisateur de +l’ordinateur de plongée que vous utilisez.</p></div> <div class="sidebarblock"> <div class="content"> <div class="admonitionblock"> @@ -1331,71 +1345,84 @@ nommez le site de plongée dans la bpîte de texte <em>Lieu</em> dans l’on <strong>Notes</strong>.</td> </tr></table> </div> -<div class="paragraph"><p>Entrez le nom du site de plongée, p. ex. "Tihany, Lac Balaton, Hongrie". Si -plusieurs plongées ont été faites au même endroit, les informations de lieu -de la première plongée sont ré-utilisées. Les lieux de plongée existants -peuvent être édités en sélectionnant (dans le panneau <strong>Liste des plongées</strong>) -une plongée faite sur ce site et en ouvrant les informations de cet -endroit. Cliquez sur le bouton avec une image de globe à droite du nom du -lieu (voir l’image <strong>A</strong> ci-dessous). Lorsque vous entrez le nom d’un site de -plongée, une liste déroulante apparaît, affichant tous les sites comportant -un nom similaire. Si le site de plongée a déjà été utilisé précédemment, -cliquez sur le nom existant. Les noms de sites de plongée présents dans la -liste contiennent soit un symbole en forme de globe (indiquant qu’ils sont -répertoriés comme lieux de plongée dans la base de données de <em>Subsurface</em>) -ou un symbole <strong>+</strong> (qui indique des noms de lieux de plongée qui semblent -consistant avec le nom du site courant mais qui n’ont pas encore été ajoutés -à la base de données). Si le site de plongée actuel n’a pas encore été -utilisé, un message apparaît comme suit (voir image <strong>A</strong> ci-dessous):</p></div> +<div class="paragraph"><p><strong>Using existing dive locations:</strong> Type in the name of the dive site, e.g. "Tihany, Lake Balaton, Hungary". +If several dives are +made at the same location, the site information for the first dive is re-used. +Therefore, if a dive site has been used before, the name of that site (and sometimes +the names of similar sites) appears below the dive site text box (image below). Double-click on +the appropriate dive site name and the dive location will be associated with the +dive being entered. Then select <em>Apply Changes</em> (image below) to save the geolocation for this dive site.</p></div> <div class="imageblock" style="text-align:center;"> <div class="content"> -<img src="images/Locations1_f22.jpg" alt="FIGURE:Location description panel" /> +<img src="images/Location1.jpg" alt="FIGURE:Location choice panel" /> </div> </div> -<div class="paragraph"><p>Cliquez sur le bouton contenant une image de globe; un panneau apparaît -permettant d’entrer les coordonnées et d’autres informations concernant le -site (voir image <strong>B</strong> ci-dessus). Les informations les plus importantes sont -les coordonnées du site. Il y a trois façons de spécifier les coordonnées:</p></div> -<div class="olist loweralpha"><ol class="loweralpha"> -<li> -<p> -Utilisez la carte du monde en bas à droite de la fenêtre de - <em>Subsurface</em>. Cette carte affiche une barre orange indiquant "Pas de données - de localisation - Bougez la carte et double-cliquez pour définir le lieu de - plongée". Double-cliquez à l’endroit requis; la barre orange disparaît alors - et les coordonnées sont stockées. -</p> -</li> -<li> -<p> -Utiliser l’application Subsurface-Mobile ou l’application <em>Subsurface</em> - Companion avec un périphérique Android ou un iPhone avec GPS si les - coordonnées du site de plongée ont été stockées en utilisant une de ces - applications. <a href="#S_Companion">Cliquez ici pour plus d’information</a> -</p> -</li> -<li> -<p> -Entrez les coordonnées manuellement si vous les connaissez, en utilisant un - des quatre formats avec la latitude suivie de la longitude: -</p> +<div class="paragraph"><p><strong>Entering a new dive location:</strong> On the other hand, having dived at a new dive location, +a new record needs to be created +that could be used for the new and for later dives at this new site. Type the name of the new dive site into the text box +(image A below).</p></div> +<div class="imageblock" style="text-align:center;"> +<div class="content"> +<img src="images/Globe_image1.jpg" alt="FIGURE:Location creation panel" /> +</div> +</div> +<div class="paragraph"><p>Double-click on the blue bar below the new dive location name. The blue bar +disappears (image B above) and the globe icon on the right-hand of the +location name text box turns blue. In the Dive Map part of the <em>Subsurface</em> +window, a world map appears (image C above). Click on the blue globe icon to +the right of the dive site name in the <em>Notes</em> panel (image B above). This +opens a window for entering the details of the new dive location (image A +below). The globe icon changes to indicate that the location data are being +edited. The only important data here are the geographic coordinates of the +dive location.</p></div> +<div class="imageblock" style="text-align:center;"> +<div class="content"> +<img src="images/Globe_image2.jpg" alt="FIGURE:Location creation panel" /> +</div> +</div> +<div class="paragraph"><p>There are three ways of adding the the coordinates:</p></div> +<div class="paragraph"><p><strong>(1):</strong> Entrer les coordonnées manuellement si vous les connaissez, + en utilisant un des quatre formats avec la latitude suivie de la longitude :</p></div> <div class="literalblock"> <div class="content"> -<pre><code>Format ISO 6709 Annexe D p. ex. 30°13'28.9"N 30°49'1.5"E Degrés et minutes -décimales, p. ex. N30° 13.49760' , E30° 49.30788' Degrés minutes secondes, -p. ex. N30° 13' 29.8" , E30° 49' 1.5" Degrés décimaux, p. ex. 30.22496 , -30.821798</code></pre> +<pre><code>Format ISO 6709 Annexe D, ex. 30°13'28.9"N 30°49'1.5"E +Degrés et minutes décimales, ex. N30° 13.49760' , E30° 49.30788' +Degrés minutes secondes, ex. N30° 13' 29.8" , E30° 49' 1.5" +Degrés décimaux, ex. 30.22496 , 30.821798</code></pre> </div></div> -</li> -</ol></div> -<div class="paragraph"><p>Les latitudes dans l’hémisphère sud sont données avec un <strong>S</strong>, p. ex. S30°, -ou avec une valeur négative, p. ex. -30.22496. De la même façon, les -longitudes ouest sont données avec un <strong>W</strong>, p. ex. W07°, ou avec une valeur -négative, p. ex. -7.34323. Certains claviers ne comportent par le signe -degré (°). Il peut être remplacé par un <strong>d</strong> comme ceci: N30d W20d. Si le -nom du site de plongée et les coordonnées ont tous les deux été renseignés, -enregistrez les informations du site de plongée en sélectionnant le bouton -<em>Appliquer les modifications</em> en haut du panneau.</p></div> +<div class="paragraph"><p>Les latitudes dans l’hémisphère sud sont données avec un <strong>S</strong>, ex. S30°, ou +avec une valeur négative, ex. -30.22496. De la même façon, les longitudes +ouest sont données avec un <strong>W</strong>, ex. W07°, ou avec une valeur négative, +ex. -7.34323. Certains claviers ne comportent par le signe degré (°). Il +peut être remplacé par un <strong>d</strong> comme ceci: N30d W20d. Entrer tout autre +informations à propos du site de plongée (Description et notes), puis +sélectionner <em>Appliquer les modifications</em> pour sauvegarder la +géolocalisation de ce site. Les informations du site de plongée pourront +être modifiées ultérieurement, en cliquant sur l’icône de globe à droite du +nom du site de plongée, dans l'"onglet notes".</p></div> +<div class="paragraph"><p><strong>(2):</strong> Use the Dive Map to specify the coordinates. The Dive map now shows +all the existing dive lications in grey as well as an additional marker in red +(image B above). Drag the red marker to the location of the dive site being entered. +The map can be dragged and zoomed using the mouse wheel. Position the red marker +by dragging it on the map, zooming in on the appropriate part of the map and placing +the marker at an appropriate position (image B below). The coordinates of the dive +location are automatically inserted into the appropriate text box in the dive location +information window (image A below). Enter any other contextual information about the dive site (Description and Notes), +then select <em>Apply Changes</em> to save the geolocation for this dive site. +The dive site information can later be edited by clicking the globe icon to the right of the +dive site name in the <strong>Notes tab</strong>.</p></div> +<div class="imageblock" style="text-align:center;"> +<div class="content"> +<img src="images/Globe_image3.jpg" alt="FIGURE:Location creation panel" /> +</div> +</div> +<div class="paragraph"><p>Once the dive location data have been saved, the dive on the Dive List has a +globe icon immediately to the left of the location name of a particular +dive.</p></div> +<div class="paragraph"><p><strong>(3):</strong> Utiliser l’application Subsurface-Mobile ou l’application <em>Subsurface</em> Companion avec un +périphérique Android ou un iPhone avec GPS si les coordonnées du site de plongée ont été stockées +en utilisant une de ces applications. +<a href="#S_Companion">Cliquez ici pour plus d’information</a></p></div> <div class="paragraph"><p><strong>Important</strong>: les coordonnées GPS d’un site de plongée sont liées au nom de lieu - ainsi, <strong>enregistrer</strong> un site de plongée avec uniquement les coordonnées mais aucun nom causera des problèmes. (Subsurface pensera que toutes ces @@ -1404,7 +1431,7 @@ identiques).</p></div> <div class="paragraph"><p><strong>Recherche du nom d’un site de plongée</strong>: si vous avez entré les coordonnées dans la boîte de texte appropriée, vous pouvez lancer une recherche de nom sur base des coordonnées. Ceci est réalisé lorsque <em>Subsurface</em> utilise Internet pour trouver le nom d’un site de plongée -sur base des coordonées que vous avez entrées. Si un nom est trouvé, il est +sur base des coordonnées que vous avez entrées. Si un nom est trouvé, il est automatiquement inséré dans la boîte Étiquettes. La liste (intitulée <em>"Sites de plongée situés aux mêmes coordonnées</em>") en bas du panneau du site de plongée contient les noms d’autres sites de plongée utilisés au même endroit. Par exemple, si le site de plongée est "Blue Hole" et qu’il y a plusieurs @@ -1830,13 +1857,15 @@ Microsoft Access databases, preventing the integration the importer into the generated by SmartTrak to Subsurface’s <em>.xml</em> format. It can be built together with <em>Subsurface</em> for Linux systems. Two dependencies need to be installed in your system before building: <em>libglib2.0</em> and <em>libmdb2</em>.</p></div> +<div class="paragraph"><p>In addition, a web service is available for divelog convertions from +SmartTrak to <em>Subsurface</em> (see below).</p></div> <div class="paragraph"><p>N’hésitez pas à contacter l'équipe de développement de <em>Subsurface</em> via <a href="mailto:subsurface@subsurface-divelog.org">notre liste de diffusion</a> pour de l’aide à l’importation des lofs <em>SmartTrak</em>.</p></div> -<div class="paragraph"><p>Assuming the above dependencies have been installed and the <em>Subsurface</em> -source tree is in the directory <em>~/src/subsurface</em>, then:</p></div> <div class="sect4"> <h5 id="_compiler_em_smtk2ssrf_em">Compiler <em>smtk2ssrf</em></h5> +<div class="paragraph"><p>Assuming the above dependencies have been installed and the <em>Subsurface</em> +source tree is in the directory <em>~/src/subsurface</em>, then:</p></div> <div class="ulist"><ul> <li> <p> @@ -1904,6 +1933,22 @@ messages in the console or in the graphical window: some may be relevant as support for Galileo family of dive computers is still a work in progress.</p></div> </div> <div class="sect4"> +<h5 id="_for_the_lazy_a_web_service_to_convert_em_smarttrak_em_to_em_subsurface_em">For the lazy: a web service to convert <em>SmartTrak</em> to <em>Subsurface</em></h5> +<div class="paragraph"><p>Open the website at:</p></div> +<div class="paragraph"><p><em>https://thetheoreticaldiver.org/rch-cgi-bin/smtk2ssrf.pl</em></p></div> +<div class="paragraph"><p>This is a no-frills web service for converting <em>SmartTrak</em> dive logs to +<em>Subsurface</em>. Select the browse button. This allows you to browse your +computer directories and to select the <em>SmartTrak</em> divelog to be +converted. Once it has been selected, click the <em>Submit query</em> button. After +a short while, a dialog box appears (image below) for saving the converted +file to the local computer.</p></div> +<div class="imageblock" style="text-align:center;"> +<div class="content"> +<img src="images/strk2ssrf_web.jpg" alt="FIGURE:Web service to convert SmartTrak divelog" /> +</div> +</div> +</div> +<div class="sect4"> <h5 id="_fusionner_les_plongées_importées_dans_un_carnet_de_plongée_existant">Fusionner les plongées importées dans un carnet de plongée existant</h5> <div class="paragraph"><p>Open the new file (generated in the previous steps) using <em>Subsurface</em> and check the dives and data. If everything is fine, close the <em>.xml</em> file and @@ -2156,7 +2201,7 @@ automatically collecting dive site coordinate information.</p></div> Internet server.</p></div> <div class="paragraph"><p>Syncronising the dives in the <em>Subsurface</em> dive list with the coordinates stored on the <em>Subsurface</em> Internet server.</p></div> -<div class="paragraph"><p><em>Subsurface</em> comporte deux outils pour réaliser cela:</p></div> +<div class="paragraph"><p><em>Subsurface</em> comporte deux outils pour réaliser cela :</p></div> <div class="ulist"><ul> <li> <p> @@ -2927,14 +2972,34 @@ decompression.</p></div> <img src="images/multicylinder_dive.jpg" alt="FIGURE: Multicylinder profile" /> </div> </div> +<div class="paragraph"><p>Several dive computers perform automatic recording of cylinder pressure. In +this case no manual intervention is needed. Older dive computers +(e.g. Uwatec Galileo, several Suunto models) handle more than one pressure +transducer on cylinders, switching from one sensor to another as the diver +switches among cylinders and providing a sequential record of cylinders +pressures during a dive. Some of the latest models (e.g. Shearwater Perdix +AI, Scubapro G2) record two or more pressure transducers concurrently and +continuously during the whole dive. In these cases <em>Suburface correctly +interprets the data. There is continuous effort within the _Subsurface</em> +development team to add new dive computer models to those that can be +downloaded from and to represent cylinder pressures correctly. Regardless of +the type of sensor handling of dive computers, technical divers are likely +to use both automated and manual methods of cylinder pressure logging when +more than two gases are used. However, automated recording of cylinder +pressure simplifies logging of sidemount dives (where two cylinders are +used). See the +<a href="https://subsurface-divelog.org/documentation/supported-dive-computers/">list +of supported dive computers</a>.</p></div> </div> <div class="sect3"> <h4 id="_plongées_sidemount">5.6.2. Plongées Sidemount</h4> <div class="paragraph"><p>Sidemount diving is just another form of multi-cylinder diving, often with both or all cylinders having the same gas mixture. Although it’s a popular configuration for cave divers, sidemount diving can be done by recreational -divers who’ve completed the appropriate training. Sidemount dive logging -involves three steps, exactly as with multi-cylinder dives above:</p></div> +divers who have completed the appropriate training. See the comments in the +last paragraph, above, about automated recording of cylinder +pressures. Manual logging of cylinder pressures during sidemount involves +three steps, exactly as with multi-cylinder dives above:</p></div> <div class="ulist"><ul> <li> <p> @@ -3030,28 +3095,33 @@ over two hours.</p></div> <td class="icon"> <img src="images/APD.jpg" alt="Note" /> </td> -<td class="content">Closed system rebreathers use advanced technology to recirculate gas that -has been breathed. They also do two things to maintain a breathable oxygen -concentration: -a) remove carbon dioxide from the exhaled gas +<td class="content">Closed system rebreathers also recirculate gas that has been +breathed. However, they use advanced technology to maintain a breathable +oxygen concentration: +a) remove carbon dioxide from the exhaled gas. regulate the oxygen concentration to remain within safe diving limits. The CCR interface of <em>Subsurface</em> is currently experimental and under active development. Subsurface currently supports Poseidon MkVI and APD -Discovery/Evolution dive computers. In contrast to a conventional -recreational dive computer, a CCR system computer does not allow the -download of a log containing multiple dives. Rather, each dive is stored -independently. This means that <em>Subsurface</em> cannot download a dive log -directly from a CCR dive computer, but that it imports individual CCR dive -profiles in the same way it imports dive log data from other digital -databases: one dive at a time.</td> +Discovery/Evolution dive computers, as well as Shearwater dive computers +connected to CCR systems. In contrast to a conventional recreational dive +computer, a CCR system computer usually does not allow the download of a log +containing multiple dives. Rather, each dive is stored independently. This +means that <em>Subsurface</em> cannot download a dive log directly from a CCR dive +computer, but that it imports individual CCR dive profiles in the same way +it imports dive log data from other digital databases: one dive at a +time. However, the Shearwater based CCR systems are different in this +respect and allow multi-dive downloads.</td> </tr></table> </div> <div class="sect4"> <h5 id="_importer_une_plongée_ccr">Importer une plongée CCR</h5> -<div class="paragraph"><p>See the section dealing with <a href="#S_ImportingAlienDiveLogs">Importing dive -information from other digital sources</a>. CCR dive data are currently -obtained from the proprietary software provided when purchasing CCR dice -equipment. See +<div class="paragraph"><p>For Shearwater CCR controllers, or independent Shearwater CCR logs, just +download the dive log as would be the case for non-CCR dives. <em>Subsurface</em> +interprets the CCR dive log correctly. Except for Shearwater CCR dive +computers, CCR dive data are currently obtained from the proprietary +software provided when purchasing CCR dive equipment. See the section +dealing with <a href="#S_ImportingAlienDiveLogs">Importing dive information from +other digital sources</a> and <a href="#_appendix_b_dive_computer_specific_information_for_importing_dive_information">Appendix B</a> for more complete information. Use that software to download the dive data into a known directory. From the main menu of <em>Subsurface</em>, select <em>Import → Import log files</em> to bring up the <a href="#Unified_import">universal @@ -3207,7 +3277,73 @@ B</a>.</p></div> <h2 id="_obtaining_more_information_about_dives_entered_into_the_logbook">6. Obtaining more information about dives entered into the logbook</h2> <div class="sectionbody"> <div class="sect2"> -<h3 id="_l_8217_onglet_strong_informations_strong_pour_une_seule_plongée">6.1. L’onglet <strong>Informations</strong> (pour une seule plongée)</h3> +<h3 id="_utiliser_la_carte_des_plongées_pour_obtenir_plus_d_8217_informations_sur_les_plongées">6.1. Utiliser la carte des plongées pour obtenir plus d’informations sur les plongées</h3> +<div class="paragraph"><p>The Dive Map has a number of buttons useful for manipulation several aspects +of a dive. These are:</p></div> +<div class="admonitionblock"> +<table><tr> +<td class="icon"> +<img src="images/icons/MapViewMode.jpg" alt="Note" /> +</td> +<td class="content">Select this button to show the Dive Map as a satellite image or as a Google +Maps representation.</td> +</tr></table> +</div> +<div class="admonitionblock"> +<table><tr> +<td class="icon"> +<img src="images/icons/MapViewPlus.jpg" alt="Note" /> +</td> +<td class="content">Zoom in. Select a smaller area of the map.</td> +</tr></table> +</div> +<div class="admonitionblock"> +<table><tr> +<td class="icon"> +<img src="images/icons/MapViewMinus.jpg" alt="Note" /> +</td> +<td class="content">Zoom out. Select a larger area of the map.</td> +</tr></table> +</div> +<div class="imageblock" style="text-align:left;"> +<div class="content"> +<img src="images/MapMenu.jpg" alt="FIGURE: Map menu" /> +</div> +</div> +<div class="paragraph"><p>The "Hamburger" button on the top right-hand of the Dive Map activates the +Map menu. The items are:</p></div> +<div class="ulist"><ul> +<li> +<p> +Open location in <em>Google Maps</em>. Open the location of the active dive in a + separate Google Maps window with the dive site indicated by a Google Maps + teardrop marker. +</p> +</li> +<li> +<p> +Copy location to clipboard (decimal). Copy the coordinates of the active + dive to the clipboard in decimal degrees e.g. -25.933905 30.710572 +</p> +</li> +<li> +<p> +Copy location to clipboard (sexagesimal). Copy the coordinates of the active + dive to the clipboard in sexagecimal, e.g. 25°56’02.058"S 30°42’38.059"E +</p> +</li> +<li> +<p> +Select visible dive locations. In the Dive List panel, highlight all the + dive sites visible in the Dive Map. This allows easy selection of the dives + within a particular geographical area to inspect them or to calculate + statistics for them. +</p> +</li> +</ul></div> +</div> +<div class="sect2"> +<h3 id="_l_8217_onglet_strong_informations_strong_pour_une_seule_plongée">6.2. L’onglet <strong>Informations</strong> (pour une seule plongée)</h3> <div class="paragraph"><p>L’onglet Informations donnée des informations résumées sur une plongée sélectionnée dans la <strong>Liste des plongées</strong>. Les informations utiles comprennent l’intervalle de surface avant une plongée, les profondeurs @@ -3228,7 +3364,7 @@ supérieures à 200 bar, les rendant plus précises. Référez-vous à </div> </div> <div class="sect2"> -<h3 id="S_ExtraDataTab">6.2. L’onglet <strong>Extra info</strong> (généralement pour des plongées séparées)</h3> +<h3 id="S_ExtraDataTab">6.3. L’onglet <strong>Extra info</strong> (généralement pour des plongées séparées)</h3> <div class="paragraph"><p>Lors de l’utilisation d’un ordinateur de plongée, celui-ci transmet souvent des données qui ne peuvent pas être facilement standardisées parce que la nature de ces informations diffère d’un ordinateur à l’autre. Ces données @@ -3245,7 +3381,7 @@ supplémentaires pour une plongée utilisant un recycleur Poseidon.</p></div> </div> </div> <div class="sect2"> -<h3 id="_l_8217_onglet_strong_statistiques_strong_pour_un_groupe_de_plongées">6.3. L’onglet <strong>Statistiques</strong> (pour un groupe de plongées)</h3> +<h3 id="_l_8217_onglet_strong_statistiques_strong_pour_un_groupe_de_plongées">6.4. L’onglet <strong>Statistiques</strong> (pour un groupe de plongées)</h3> <div class="paragraph"><p>L’onglet Statistiques donne des statistiques résumées pour plusieurs plongées, pour autant que plusieurs plongées soient sélectionnées dans la <strong>Liste des plongées</strong> en utilisant les raccourcis standard Ctrl-clic ou @@ -3257,7 +3393,7 @@ la consommation équivalente à l’air (SAC). L’onglet affiche égale plus petite et la plus grande profondeur atteinte pour ces plongées.</p></div> </div> <div class="sect2"> -<h3 id="S_DiveProfile">6.4. Le <strong>Profil de plongée</strong></h3> +<h3 id="S_DiveProfile">6.5. Le <strong>Profil de plongée</strong></h3> <div class="imageblock" style="text-align:center;"> <div class="content"> <img src="images/Profile2.jpg" alt="Typical dive profile" /> @@ -3333,7 +3469,7 @@ augmente la taille du profil de plongée pour remplir la zone du panneau.</td> <div class="paragraph"><p>La <strong>température de l’eau</strong> est indiquée par une ligne bleue avec des valeurs de température placées lors de changements significatifs.</p></div> <div class="sect3"> -<h4 id="S_InfoBox">6.4.1. La boîte <strong>Information</strong></h4> +<h4 id="S_InfoBox">6.5.1. La boîte <strong>Information</strong></h4> <div class="paragraph"><p>La boîte Information affiche un grand nombre d’informations concernant le profil de plongée. Normalement, la boîte Information est située dans le coin supérieur gauche du panneau <strong>Profil de plongée</strong>. Elle peut être déplacée @@ -3535,7 +3671,7 @@ Graph <strong>E</strong> indicates the situation after remaining at 4.5 meters f </div> </div> <div class="sect3"> -<h4 id="_événements_rapportés_par_l_8217_ordinateur_durant_la_plongée">6.4.2. Événements rapportés par l’ordinateur durant la plongée</h4> +<h4 id="_événements_rapportés_par_l_8217_ordinateur_durant_la_plongée">6.5.2. Événements rapportés par l’ordinateur durant la plongée</h4> <div class="paragraph"><p>Many dive computers record events during a dive. For instance, most dive computers report alarms relating to high partial pressures of oxygen, to rapid ascents or the exceeding of no-deco limits (NDL). On the other hand, @@ -3566,7 +3702,7 @@ dive. These are indicated as a small red flag on the profile and are discussed more fully in the section on <a href="#S_Bookmarks"><em>inserting bookmarks</em></a>.</p></div> </div> <div class="sect3"> -<h4 id="_la_barre_d_8217_outils_du_profil">6.4.3. La barre d’outils du profil</h4> +<h4 id="_la_barre_d_8217_outils_du_profil">6.5.3. La barre d’outils du profil</h4> <div class="paragraph"><p>The dive profile can include graphs of the <strong>partial pressures</strong> of O<sub>2</sub>, N<sub>2</sub>, and He during the dive (see figure above) as well as a calculated and dive computer reported deco ceilings (only visible for deep, long, or @@ -3891,7 +4027,7 @@ tissues at the end of the dive.</p></div> </div> </div> <div class="sect3"> -<h4 id="_le_menu_contextuel_du_profil_de_plongée">6.4.4. Le menu contextuel du Profil de plongée</h4> +<h4 id="_le_menu_contextuel_du_profil_de_plongée">6.5.4. Le menu contextuel du Profil de plongée</h4> <div class="paragraph"><p>The context menu for the Dive Profile is accessed by right-clicking while the mouse cursor is over the Dive Profile panel. The menu allows creating Bookmarks, Gas Change Event markers, or manual CCR set-point changes other @@ -4192,7 +4328,7 @@ d’export car une connexion vers <em>Facebook</em> est nécessaire, nécess identifiant et un mot de passe. À partir du menu principal, sélectionnez <em>Partager sur → Connecter à → Facebook</em> (image <strong>A</strong> ci-dessous). Un écran de connexion s’affiche (image <strong>B</strong> ci dessous). Entrez l’identifiant et le -mot de passe <em>Facebook</em>. Depuis la fentre <em>Subsurface</em>, il est facile de +mot de passe <em>Facebook</em>. Depuis la fenêtre <em>Subsurface</em>, il est facile de vérifier si <em>Subsurface</em> a une connection valide vers <em>Facebook</em> : Depuis le "Menu principal", sélectionnez <em>Partager sur</em> (image <strong>A</strong> ci-dessous). Normalement, l’option <em>Facebook</em> est grisée. Mais si une @@ -5127,10 +5263,9 @@ of gradient factors as implemented by Erik Baker, or using the VPM-B model.</p>< <td class="icon"> <img src="images/icons/warning2.png" alt="Warning" /> </td> -<td class="content">Le planificateur de plongée de <em>Subsurface</em> EST POUR L’INSTANT EN PHASE -EXPÉRIMENTALE et suppose que l’utilisateur est déjà familier avec -l’interface utilisateur de <em>Subsurface</em>. Il est utilisé explicitement aux -conditions suivantes:</td> +<td class="content">Le planificateur de plongée de <em>Subsurface</em> EST EN PHASE EXPÉRIMENTALE et +suppose que l’utilisateur est déjà familier avec l’interface utilisateur de +<em>Subsurface</em>. Il est utilisé explicitement aux conditions suivantes :</td> </tr></table> </div> <div class="ulist"><ul> @@ -5187,7 +5322,7 @@ that can easily be copied to other software. This is also where any warning messages about the dive plan are printed.</p></div> <div class="imageblock" style="text-align:center;"> <div class="content"> -<img src="images/PlannerWindow1_f20.jpg" alt="FIGURE: Dive planner startup window" /> +<img src="images/PlannerWindow1.jpg" alt="FIGURE: Dive planner startup window" /> </div> </div> </div> @@ -5394,9 +5529,7 @@ means that recreational dive limits are exceeded and either the dive duration or the dive depth needs to be reduced.</p></div> <div class="paragraph"><p>Below is an image of a dive plan for a recreational dive at 30 meters. Although the no-deco limit (NDL) is 23 minutes, the duration of the -dive is limited by the amount of air in the cylinder. That is shown in the -text box at the bottom right of the panel, requiring sufficient air for -buddy-sharing during ascent.</p></div> +dive is limited by the amount of air in the cylinder.</p></div> <div class="imageblock" style="text-align:center;"> <div class="content"> <img src="images/Planner_OC_rec.jpg" alt="FIGURE: A recreational dive plan: setup" /> @@ -5404,7 +5537,7 @@ buddy-sharing during ascent.</p></div> </div> </div> <div class="sect3"> -<h4 id="_non_recreational_open_circuit_dives_including_decompression">14.2.2. Non-recreational open circuit dives, including decompression</h4> +<h4 id="_plongées_en_circuit_ouvert_non_loisir_incluant_une_décompression">14.2.2. Plongées en circuit ouvert non loisir, incluant une décompression</h4> <div class="paragraph"><p>Non-recreational dive planning involves exceeding the no-deco limits and/or using multiple breathing gases. These dives are planned in three stages:</p></div> <div class="paragraph"><p><strong>a) Nitrogen management</strong>: This is done by specifying the rates for descent and ascent, @@ -5491,24 +5624,15 @@ In addition to calculating the total gas consumption for every cylinder the plan of calculating the recommended volume of bottom gas which is needed for safe asscent to the first deco gas change depth or the surface. This procedure is called the "minimum gas" or "rock bottom" consideration and it is used by various (but not all) -technical diving organisations. The calculation assumes that in worst case an out of gas (OoG) -situation could occur at the end of the planned bottom time at maximum depth. This OoG event forces -the buddy team the share the gas of one diver and to stay at maximum depth for an additional -time of n minutes (preferences option "problem solving time"). -At the same moment the combined SAC of both divers is increased by a estimated factor (preferences option -"SAC factor") compared to the SAC factor of a single diver under normal conditions. -The result of the minimum gas calculation for the bottom gas is printed to the planner output as an -additional information. No automatic checks are performed based on this result. -Please take care that the feature only gives valid results for simple, rectengular shaped single -level dive profiles. For multi level dives one would need to check every leg of the profile independently.</p></div> +technical diving organisations. See the text below for a detailed explanation.</p></div> <div class="paragraph"><p>Now you can start the detailed time-depth planning of the dive. <em>Subsurface</em> offers an unique graphical interface for doing planning. The mechanics are similar to hand-entering a dive profile in the dive log part of <em>Subsurface</em>. Upon activating the planner, a default dive of depth 15 m for -20 min is offered in the blue design surface to the top right hand of the -screen. The white dots (waypoints) on the profile can be dragged with a -mouse. Create more waypoints by double-clicking on the profile line and -ensuring the profile reflects the intended dive. Drag the waypoints to +20 min is offered in the blue design surface in the top right hand part of +the planner window. The white dots (waypoints) on the profile can be dragged +with a mouse. Create more waypoints by double-clicking on the profile line +and ensuring the profile reflects the intended dive. Drag the waypoints to represent the depth and duration of the dive. It is NOT necessary to specify the ascent part of the dive since the planner calculates this, based on the existing settings. If any of the management limits (for nitrogen, oxygen or @@ -5531,20 +5655,45 @@ in the section <a href="#S_CreateProfile">hand-creating a dive profile</a>. Thes changes should reflect the cylinders and gas compositions defined in the table with <em>Available Gases</em>. If two or more gases are used, automatic gas switches will be planned during the ascent to the surface.</p></div> -<div class="paragraph"><p>A non-zero value in the "CC setpoint" column of the table of dive planner -points indicates a valid setpoint for oxygen partial pressure and that the -segment is dived using a closed circuit rebreather (CCR). If the last -manually entered segment is a CCR segment, the decompression phase is +<div class="paragraph"><p>Cylinders used for the plan need to be entered in the table of <em>Available +gases</em>. In the column <em>Type</em> select the appropriate cylinder size by using +the dropdown list that appears when double-clicking a cell in this +column. By default, a large number of sizes are listed, and a new cylinder +size can be created by typing this into the text box. The cylinder size, +start pressure and default switch depths are initialised +automatically. Specify the gas composition (e.g. helium and oxygen +content). A non-zero value in the "CC setpoint" column of the table of dive +planner points indicates a valid setpoint for oxygen partial pressure and +that the segment is dived using a closed circuit rebreather (CCR). If the +last manually entered segment is a CCR segment, the decompression phase is computed assuming the diver uses a CCR with the specified set-point. If the last segment (however short) is on open circuit (OC, indicated by a zero set-point) the decompression is computed in OC mode and the planner only considers gas changes in OC mode.</p></div> +<div class="paragraph"><p>Enter dive profile segments in the <em>Dive planner points</em> table by providing +a time duration for a segment as well as its final depth. If more than one +cylinder is used during the dive, ensure that the appropriate cylinder is +selected for each segment of the dive plan by double-clicking the cell and +selecting the appropriate cylinder from the dropdown list in the <em>Used gas</em> +column. If required, insert a row in the <em>Dive planner points</em> table by +adding a new line and then setting the <em>Run time</em> value appropriately. In +image A below, a segment (using an EAN50 cylinder) has been added and you +wish to use this gas during the very start of the dive (the other gas is not +breathable at the surface). Upon pressing Enter on the keyboard, that +segment is moved to the top of that table and the plan is adjusted +automatically to take into account this new segment of the dive plan (image +B below).</p></div> +<div class="imageblock" style="text-align:center;"> +<div class="content"> +<img src="images/planner1.jpg" alt="FIGURE: Planning a dive: segments" /> +</div> +</div> <div class="paragraph"><p>Ci-dessous, vous trouverez un exemple d’une planification de plongée -utilisant du Tx21/35, suivie d’une remontée utilisant de l’EAN50 et de -l’oxygène, et utilisant les réglages décrits ci-dessous.</p></div> +utilisant du Tx20/30 et l’algorithme Bühlmann, suivie d’une remontée +utilisant du EAN50 et utilisant les réglages décrits ci-dessous.</p></div> <div class="imageblock" style="text-align:center;"> <div class="content"> -<img src="images/Planner_OC_deco_VPM.jpg" alt="FIGURE: Planning a dive: setup" /> +<img src="images/Planner_OC_deco.jpg" alt="FIGURE: Planning a dive: setup" /> </div> </div> <div class="paragraph"><p>Once the above steps have been completed, save by clicking the <em>Save</em> button @@ -5552,18 +5701,137 @@ towards the top middle of the planner. The saved dive plan will appear in the <strong>Dive List</strong> panel of <em>Subsurface</em>.</p></div> <div class="paragraph"><p><strong>Les détails du plan de plongée</strong></p></div> <div class="paragraph"><p>On the bottom right of the dive planner, under <em>Dive Plan Details</em>, the -exact details of the dive plan are provided. These details may be modified -by checking any of the options under the <em>Notes</em> section of the dive -planner, immediately to the left of the <em>Dive Plan Details</em>. If a <em>Verbatim -dive plan</em> is requested, a detailed sentence-level explanation of the dive -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> +details of the dive plan are provided. These may be modified by checking any +of the options under the <em>Notes</em> section of the dive planner, immediately to +the left of the <em>Dive Plan Details</em>. If a <em>Verbatim dive plan</em> is requested, +a detailed sentence-level explanation of the dive plan is given. If any of +the management specifications have been exceeded during the planning, a +warning message is printed underneath the dive plan information.</p></div> <div class="paragraph"><p>If the option <em>Display segment duration</em> is checked, then the duration of each depth level is indicated in the <em>Dive Plan Details</em>. This duration INCLUDES the transition time to get to that level. However, if the <em>Display transition in deco</em> option is checked, the transitions are shown separately from the segment durations at a particular level.</p></div> +<div class="paragraph"><p>The planner has a check box <em>Display plan variations</em>. By checking this box, +the planner provides information about a dive that is a little deeper or +slightly longer than the planned dive. This can be found near the top of the +<em>Dive plan details</em> where the dive duration is indicated. Checking this +option creates a lot of additional computation, to such a degree that the +planner is slower than otherwise. The information is typically given as:</p></div> +<div class="literalblock"> +<div class="content"> +<pre><code>Runtime: 53min + 0:52/m + 4:21/min</code></pre> +</div></div> +<div class="paragraph"><p>This indicates:</p></div> +<div class="ulist"><ul> +<li> +<p> +Calculated dive duration is 53 min. +</p> +</li> +<li> +<p> +For each extra meter in depth during the bottom phase of the dive, the + duration increases by 52 seconds. +</p> +</li> +<li> +<p> +For each extra minute of bottom time, the duration increases by 4 min 21 + sec. Thus, if the bottom time is two minutes longer than planned, the dive + duration will be (2+2*4min 21 sec) = 10 minutes 42 sec longer and would + probably require that each deco stop is 10:42/53:00 = 20% longer than + planned. These calculations are only applicable for small deviations from + the dive plan, not for larger deviations. +</p> +</li> +<li> +<p> +Minimum gas requirements* +</p> +</li> +</ul></div> +<div class="paragraph"><p>The planner also estimates the <strong>minimum gas</strong> pressure required for safe +ascent after an event that causes the dive to be aborted. The calculation +assumes that in worst case an out of gas (OoG) situation could occur at the +end of the planned bottom time at maximum depth. This OoG event forces the +buddy team the share the gas of one diver and to stay at maximum depth for +an additional number of minutes. At the same moment the combined SAC of +both divers is increased by a estimated factor compared to the SAC factor of +a single diver under normal conditions. The result of the minimum gas +calculation for the bottom gas is printed to the planner output. No +automatic checks are performed based on this result. The feature only gives +valid results for simple, rectengular shaped single level dive profiles. For +multi level dives one would need to check every leg of the profile +independently.</p></div> +<div class="paragraph"><p>There are two selector boxes on the left of the <em>Dive plan details</em>:</p></div> +<div class="ulist"><ul> +<li> +<p> +<strong>SAC factor</strong>. This is your estimate of the degree to which your SAC increases if a critical problem arises underwater, + e.g. gas sharing or entanglement. Realistic values range from 2 to 5, reflecting the gas use of two divers sharing + a single gas cylinder after an OoG situation. +</p> +</li> +<li> +<p> +<strong>Problem solving time</strong>. This is your estimate of how long you would take to solve the problem before starting the ascent + to terminate the dive. The default value is 2 minutes. +</p> +</li> +</ul></div> +<div class="paragraph"><p>Using the above information, the planner then estimates what the minimum +botom gas cylinder pressure needs to be for a safe ascent. This information +is given near the bottom of the <em>Dive plan details</em>, following the +calculation of bottom gas used during the dive if it exactly follows the +plan. the minimum gas is typically given as:</p></div> +<div class="literalblock"> +<div class="content"> +<pre><code>Minimum gas (based on 2.0xSAC/+1min@81m): 2130 l/90bar/Δ:+80bar</code></pre> +</div></div> +<div class="paragraph"><p>This indicates:</p></div> +<div class="ulist"><ul> +<li> +<p> +Within parentheses, the <strong>SAC factor</strong> and <strong>Problem solving time</strong> specified. +</p> +</li> +<li> +<p> +The number of liters of back gas required for a safe ascent (2130 litres in + the example above) +</p> +</li> +<li> +<p> +The number of bars of back gas required for a safe ascent (90 bars in the + example above). +</p> +</li> +<li> +<p> +The delta-value: number of bars of back gas available at the end of the + bottom section of the dive, <em>over and above</em> the minimum gas requirement (80 + bars in the above example). A positive delta reflects a safe plan; a + negative delta indicates insufficient gas for a safe ascent. +</p> +</li> +</ul></div> +<div class="sidebarblock"> +<div class="content"> +<div class="admonitionblock"> +<table><tr> +<td class="icon"> +<img src="images/icons/warning2.png" alt="Warning" /> +</td> +<td class="content">The <strong>plan variations</strong> and <strong>minimum gas</strong> estimates are only guidelines for a +diver performing dive planning, intended to enhance the safety of executing +a particular dive plan. They are NOT precise and should NOT be relied upon +as the only safety features in dive planning. Interpret these estimates +within the framework of your formal training to perform dive planning.</td> +</tr></table> +</div> +</div></div> </div> </div> <div class="sect2"> @@ -5585,7 +5853,7 @@ to that of the CCR dive below, but note the longer ascent duration due to the lo in the loop due to the oxygen drop across the mouthpiece of the pSCR equipment.</p></div> <div class="imageblock" style="text-align:center;"> <div class="content"> -<img src="images/Planner_pSCR1_f20.jpg" alt="FIGURE: Planning a pSCR dive: setup" /> +<img src="images/Planner_pSCR.jpg" alt="FIGURE: Planning a pSCR dive: setup" /> </div> </div> </div> @@ -5608,7 +5876,7 @@ this is calculated for bail out ascents.</p></div> <div class="paragraph"><p>The dive profile for a CCR dive may look something like the image below.</p></div> <div class="imageblock" style="text-align:center;"> <div class="content"> -<img src="images/Planner_CCR1_f20.jpg" alt="FIGURE: Planning a CCR dive: setup" /> +<img src="images/Planner_CCR.jpg" alt="FIGURE: Planning a CCR dive: setup" /> </div> </div> <div class="paragraph"><p>Note that, in the <em>Dive plan details</em>, the gas consumption for a CCR segment @@ -6553,7 +6821,7 @@ available from some Internet web sites e.g. Windows-based IrDA drivers for the Uwatec can also be downloaded from the ScubaPro web site, with drivers located on the download page for the ScubaPro SmartTrak software.</p></div> -<div class="paragraph"><p>Pour les ordinateurs Apple Mac, la connection IrDA via l’interface MCS7780 +<div class="paragraph"><p>Pour les ordinateurs Apple Mac, la connexion IrDA via l’interface MCS7780 n’est plus disponible depuis OSX 10.6 ou supérieur.</p></div> </div> <div class="sect2"> @@ -7082,10 +7350,11 @@ Système d’unité : un seul système d’unité doit être utilisé (p <p> Position GPS : utilisez les degrés décimaux, par exemple : 30.22496 30.821798 -=== <em>LibreOffice Calc</em> et <em>OpenOffice Calc</em> </p> </li> </ol></div> +<div class="sect2"> +<h3 id="_em_libreoffice_calc_em_et_em_openoffice_calc_em">20.1. <em>LibreOffice Calc</em> et <em>OpenOffice Calc</em></h3> <div class="paragraph"><p>These are open source spreadsheet applications forming parts of larger open source office suite applications. The user interaction with <em>LibreOffice</em> and <em>OpenOffice</em> is very similar. In Libreoffice Calc the time format @@ -7116,8 +7385,9 @@ then select <em>OK</em>.</p></div> <div class="paragraph"><p>Double check the .CSV file by opening it with a text editor, and then import the dive data as explained on the section <a href="#S_ImportingCSVDives">Importing CSV dives</a>.</p></div> +</div> <div class="sect2"> -<h3 id="_microsoft_em_excel_em">20.1. Microsoft <em>Excel</em></h3> +<h3 id="_microsoft_em_excel_em">20.2. Microsoft <em>Excel</em></h3> <div class="paragraph"><p>The field delimiter (called "<em>list separator</em>" in Microsoft manuals) is not accessible from within <em>Excel</em> and needs to be set through the <em>Microsoft Control Panel</em>. After changing the separator character, all software on the @@ -7657,7 +7927,7 @@ salvaged after being overwritten by new dives.</p></div> <div id="footer"> <div id="footer-text"> Last updated - 2017-10-16 10:45:06 CEST + 2017-10-20 22:56:42 CEST </div> </div> </body> diff --git a/Documentation/user-manual_fr.txt b/Documentation/user-manual_fr.txt index 10c164d6a..89e51c867 100644 --- a/Documentation/user-manual_fr.txt +++ b/Documentation/user-manual_fr.txt @@ -11,7 +11,7 @@ image::images/Subsurface4Banner.jpg["Banner", align="center"] Linus Torvalds, Miika Turkia, Amit Chaudhuri, Jan Schubert, Salvador Cuñat, Pedro Neves, Stefan Fuchs -[blue]#_Version 4.6, mars 2017_# +[blue]#_Version 4.7, octobre 2017_# Bienvenue en tant qu'utilisateur de _Subsurface_, un programme avancé d'enregistrement de plongées (carnet de plongées) avec une bonne @@ -349,7 +349,7 @@ de plongée supportés]. Certains ordinateurs de plongée consomme plus d'énergie lorsqu'ils sont en mode Communication PC. **Ceci peut consommer une grande partie de la batterie de votre ordinateur de plongée**. Nous recommandons à l'utilisateur -de vérifier que l'ordinateur de plongée est chargé lorsqu'il est conneté au +de vérifier que l'ordinateur de plongée est chargé lorsqu'il est connecté au port USB du PC. Par exemple, certains ordinateurs Suunto et Mares ne se rechargent pas via la connection USB. Les utilisateurs doivent se reporter au manuel de leur ordinateur de plongée s'ils ne savent pas si leur @@ -375,7 +375,7 @@ Après ceci, l'ordinateur de plongée peut être branché au PC de l'utilisateur en suivant ces étapes: 1. Le cable d'interface doit être connecté à un port USB libre (ou une - connection infrarouge + connection infra-rouge ou Bluetooth doit être configurée comme décrit ultérieurement dans ce manuel) @@ -478,10 +478,10 @@ Vérifiez les éléments suivants: - La batterie de l'ordinateur de plongée est-elle complètement chargée? Si ce n'est pas le cas, chargez-la ou remplacez-la. - - Le câble de connection est-il fautif? Le câble fonctionne-t-il avec d'autres + - Le câble de connexion est-il fautif ? Le câble fonctionne-t-il avec d'autres logiciels? A-t-il fonctionné précédemment, ou est-ce la première fois que ce câble est utilisé? Les contacts sur l'ordinateur de plongée et le câble - sont-ils propres? + sont-ils propres ? - Consultez xref:_appendix_a_operating_system_specific_information_for_importing_dive_information_from_a_dive_computer[Annexe @@ -526,14 +526,24 @@ plongée. **** [[S_Bluetooth]] -==== Connection de _Subsurface_ à un ordinateur de plongée équipé de Bluetooth +==== Connexion de _Subsurface_ à un ordinateur de plongée équipé de Bluetooth [icon="images/icons/bluetooth.jpg"] -Bluetooth devient un protocole de communication de plus en plus courant pour -relier des ordinateurs de plongée à _Subsurface_, par exemple le Shearwater -Petrel Mk2 et l'OSTC Mk3. _Subsurface_ propose une interface Bluetooth -largement indépendante du système d'exploitation. La configuration de -_Subsurface_ pour la liaison Bluetootj nécessite quatre étapes: +Bluetooth is becoming a more common way of communication between dive +computers and _Subsurface_. _Subsurface_ provides a largely operating system +independent Bluetooth interface. An increasing number of dive computers use +Bluetooth Low Energy (BTLE) as a means of communication. However, BTLE is +not a standardised protocol, consequently adaptations need to be made for +communicating with each different dive computer model. See the +link:https://subsurface-divelog.org/documentation/supported-dive-computers/[list +of supported dive computers]. Bluetooth communication is often more +reliable if all Bluetooth devices seen by the _Subsurface_ computer are +removed and pairing with the Bluetooth dive computer is performed from +afresh. The Bluetooth and BTLE interfaces are under active development with +respect to new dive computers that use this mechanism of communication. + +La configuration de _Subsurface_ pour une communication Bluetooth nécessite +4 étapes : - Vérifiez que Blutooth est activé sur l'ordinateur sur lequel _Subsurface_ est actif. @@ -551,38 +561,44 @@ Bluetooth"_, la boîte de dialogue ci-dessous apparaît. image::images/DC_import_Bluetooth.jpg["FIGURE: Download Bluetooth", align="center"] +Although the _Subsurface_ Bluetooth interface is intended to function +without Bluetooth pairing at the operating system level, it is always +prudent to follow up initial Bluetooth pairing problems by pairing the +Bluetooth dive computer with the _Subsurface_ computer using the operating +system services of the desktop computer. Delete all existing pairings and +start by scanning for Bluetooth devices from an empty list (on the desktop) +of Bluetooth devices. Once _Subsurface_ has recognised the Bluetooth dive +computer, subsequent divelog downloads are likely to be simple. + Sur les plateformes _Linux_ ou -MacOS_, le nom de l'ordinateur utilisant -Subsurface_ et son adresse Bluetooth sont affichées du côté droit. À gauche, -si l'ordinateur a été connecté à plusieurs périphériques Bluetootj locaux, -vous pouvez utiliser la liste pour indiquer lequel doit être connecté à -°Subsurface_. L'état (allumé/éteint) de l'adaptateur Bluetooth est affiché -sous l'adresse et peut être modifié en cliquer sur la case -_Allumer/éteindre_. Si l'adresse Bluetooth n'est pas affichée, _Subsurface_ -ne détecte pas le périphérique Bluetooth local. Assurez-vous que le driver -Bluetooth est installé correctement sur l'ordinateur utilisant _Subsurface_ -et vérifiez qu'il peut être utilisé par d'autres utilitaires Bluetooth comme -_bluetoothctl_ ou _bluemoon_. Ceci clôture les deux premières étapes. -Vérifiez que l'ordinateur de plongée avec Bluetooth est en mode Connection -PC et est détactable pour d'autres périphériques Bluetooth. Consultez le -manuel de l'ordinateur de plongée pour plus d'information. À présent, la -troisième étape de notre liste est terminée. Sélectionnez le bouton -_Scannez_ en bas à gauche de la boîte de dialogue ci-dessus. Après la -recherche, l'ordinateur de plongée devrait se trouver dans la liste -(peut-être sous la norme d'un numéro de périphérique Bluetooth) dans la -liste principale sur la gauche de la boîte de dialogue (voir image -ci-dessus). Si cela ne fonctionne pas, sélectionnez le bouton _Effacer_, -puis scannez à nouveau en utilisant le bouton _Scan_. Après avoir suivi -cette procédure, _Subsurface_ devrait voir l'ordinateur de plongée. La -dénomination de l'ordinateur de plongée détecté contient le nom du -périphérique, son adresse et son statut de jumelage. Si le périphérique -n'est pas jumelé et que son nom est affiché avec un arrière-plan rouge, un -menu contextuel peut être ouvert en sélectionnant ce nom avec un cli-droit. -Sélectionnez l'option _Jumeler_ et attendez que la tâche soit terminée. Si -l'ordinateur est jumelé à Subsurface pour la première fois, il est possible -que Subsurface demande un nombre ou un code PIN. Le plus utilisé est 0000, -et c'est celui qui fonctionne pour un Shearwater Petrel. Si nécessaire, -consultez le manuel utilisateur de l'ordinateur de plongée que vous -utilisez. +Subsurface_ et son adresse Bluetooth sont affichées du côté droit. L'état +(allumé/éteint) de l'adaptateur Bluetooth est affiché sous l'adresse et peut +être modifié en cliquer sur la case _Allumer/éteindre_. Si l'adresse +Bluetooth n'est pas affichée, _Subsurface_ ne détecte pas le périphérique +Bluetooth local. Assurez-vous que le driver Bluetooth est installé +correctement sur l'ordinateur utilisant _Subsurface_ et vérifiez qu'il peut +être utilisé par d'autres utilitaires Bluetooth comme _bluetoothctl_ ou +_bluemoon_. Ceci clôture les deux premières étapes. Vérifiez que +l'ordinateur de plongée avec Bluetooth est en mode Connexion PC et est +détectable pour d'autres périphériques Bluetooth. Consultez le manuel de +l'ordinateur de plongée pour plus d'information. À présent, la troisième +étape de notre liste est terminée. Sélectionnez le bouton _Scannez_ en bas +à gauche de la boîte de dialogue ci-dessus. Après la recherche, l'ordinateur +de plongée devrait se trouver dans la liste (peut-être sous la norme d'un +numéro de périphérique Bluetooth) dans la liste principale sur la gauche de +la boîte de dialogue (voir image ci-dessus). Si cela ne fonctionne pas, +sélectionnez le bouton _Effacer_, puis scannez à nouveau en utilisant le +bouton _Scan_. Après avoir suivi cette procédure, _Subsurface_ devrait voir +l'ordinateur de plongée. La dénomination de l'ordinateur de plongée détecté +contient le nom du périphérique, son adresse et son statut de jumelage. Si +le périphérique n'est pas jumelé et que son nom est affiché avec un +arrière-plan rouge, un menu contextuel peut être ouvert en sélectionnant ce +nom avec un cli-droit. Sélectionnez l'option _Jumeler_ et attendez que la +tâche soit terminée. Si l'ordinateur est jumelé à Subsurface pour la +première fois, il est possible que Subsurface demande un nombre ou un code +PIN. Le plus utilisé est 0000, et c'est celui qui fonctionne pour un +Shearwater Petrel. Si nécessaire, consultez le manuel utilisateur de +l'ordinateur de plongée que vous utilisez. **** [icon="images/icons/important.png"] @@ -758,56 +774,78 @@ plongée) en sélectionnant _Appliquer les modifications_ dans l'onglet nommez le site de plongée dans la bpîte de texte _Lieu_ dans l'onglet *Notes*. -Entrez le nom du site de plongée, p. ex. "Tihany, Lac Balaton, Hongrie". Si -plusieurs plongées ont été faites au même endroit, les informations de lieu -de la première plongée sont ré-utilisées. Les lieux de plongée existants -peuvent être édités en sélectionnant (dans le panneau *Liste des plongées*) -une plongée faite sur ce site et en ouvrant les informations de cet -endroit. Cliquez sur le bouton avec une image de globe à droite du nom du -lieu (voir l'image *A* ci-dessous). Lorsque vous entrez le nom d'un site de -plongée, une liste déroulante apparaît, affichant tous les sites comportant -un nom similaire. Si le site de plongée a déjà été utilisé précédemment, -cliquez sur le nom existant. Les noms de sites de plongée présents dans la -liste contiennent soit un symbole en forme de globe (indiquant qu'ils sont -répertoriés comme lieux de plongée dans la base de données de _Subsurface_) -ou un symbole *+* (qui indique des noms de lieux de plongée qui semblent -consistant avec le nom du site courant mais qui n'ont pas encore été ajoutés -à la base de données). Si le site de plongée actuel n'a pas encore été -utilisé, un message apparaît comme suit (voir image *A* ci-dessous): - -image::images/Locations1_f22.jpg["FIGURE:Location description panel", align="center"] - -Cliquez sur le bouton contenant une image de globe; un panneau apparaît -permettant d'entrer les coordonnées et d'autres informations concernant le -site (voir image *B* ci-dessus). Les informations les plus importantes sont -les coordonnées du site. Il y a trois façons de spécifier les coordonnées: - -a. Utilisez la carte du monde en bas à droite de la fenêtre de - _Subsurface_. Cette carte affiche une barre orange indiquant "Pas de données - de localisation - Bougez la carte et double-cliquez pour définir le lieu de - plongée". Double-cliquez à l'endroit requis; la barre orange disparaît alors - et les coordonnées sont stockées. - -b. Utiliser l'application Subsurface-Mobile ou l'application _Subsurface_ - Companion avec un périphérique Android ou un iPhone avec GPS si les - coordonnées du site de plongée ont été stockées en utilisant une de ces - applications. xref:S_Companion[Cliquez ici pour plus d'information] -c. Entrez les coordonnées manuellement si vous les connaissez, en utilisant un - des quatre formats avec la latitude suivie de la longitude: - - Format ISO 6709 Annexe D p. ex. 30°13'28.9"N 30°49'1.5"E Degrés et minutes - décimales, p. ex. N30° 13.49760' , E30° 49.30788' Degrés minutes secondes, - p. ex. N30° 13' 29.8" , E30° 49' 1.5" Degrés décimaux, p. ex. 30.22496 , - 30.821798 - -Les latitudes dans l'hémisphère sud sont données avec un *S*, p. ex. S30°, -ou avec une valeur négative, p. ex. -30.22496. De la même façon, les -longitudes ouest sont données avec un *W*, p. ex. W07°, ou avec une valeur -négative, p. ex. -7.34323. Certains claviers ne comportent par le signe -degré (°). Il peut être remplacé par un *d* comme ceci: N30d W20d. Si le -nom du site de plongée et les coordonnées ont tous les deux été renseignés, -enregistrez les informations du site de plongée en sélectionnant le bouton -_Appliquer les modifications_ en haut du panneau. +*Using existing dive locations:* Type in the name of the dive site, e.g. "Tihany, Lake Balaton, Hungary". +If several dives are +made at the same location, the site information for the first dive is re-used. +Therefore, if a dive site has been used before, the name of that site (and sometimes +the names of similar sites) appears below the dive site text box (image below). Double-click on +the appropriate dive site name and the dive location will be associated with the +dive being entered. Then select _Apply Changes_ (image below) to save the geolocation for this dive site. + +image::images/Location1.jpg["FIGURE:Location choice panel", align="center"] + +*Entering a new dive location:* On the other hand, having dived at a new dive location, +a new record needs to be created +that could be used for the new and for later dives at this new site. Type the name of the new dive site into the text box +(image A below). + +image::images/Globe_image1.jpg["FIGURE:Location creation panel", align="center"] + +Double-click on the blue bar below the new dive location name. The blue bar +disappears (image B above) and the globe icon on the right-hand of the +location name text box turns blue. In the Dive Map part of the _Subsurface_ +window, a world map appears (image C above). Click on the blue globe icon to +the right of the dive site name in the _Notes_ panel (image B above). This +opens a window for entering the details of the new dive location (image A +below). The globe icon changes to indicate that the location data are being +edited. The only important data here are the geographic coordinates of the +dive location. + +image::images/Globe_image2.jpg["FIGURE:Location creation panel", align="center"] + +There are three ways of adding the the coordinates: + +*(1):* Entrer les coordonnées manuellement si vous les connaissez, + en utilisant un des quatre formats avec la latitude suivie de la longitude : + + Format ISO 6709 Annexe D, ex. 30°13'28.9"N 30°49'1.5"E + Degrés et minutes décimales, ex. N30° 13.49760' , E30° 49.30788' + Degrés minutes secondes, ex. N30° 13' 29.8" , E30° 49' 1.5" + Degrés décimaux, ex. 30.22496 , 30.821798 + +Les latitudes dans l'hémisphère sud sont données avec un *S*, ex. S30°, ou +avec une valeur négative, ex. -30.22496. De la même façon, les longitudes +ouest sont données avec un *W*, ex. W07°, ou avec une valeur négative, +ex. -7.34323. Certains claviers ne comportent par le signe degré (°). Il +peut être remplacé par un *d* comme ceci: N30d W20d. Entrer tout autre +informations à propos du site de plongée (Description et notes), puis +sélectionner _Appliquer les modifications_ pour sauvegarder la +géolocalisation de ce site. Les informations du site de plongée pourront +être modifiées ultérieurement, en cliquant sur l'icône de globe à droite du +nom du site de plongée, dans l'"onglet notes". + +*(2):* Use the Dive Map to specify the coordinates. The Dive map now shows +all the existing dive lications in grey as well as an additional marker in red +(image B above). Drag the red marker to the location of the dive site being entered. +The map can be dragged and zoomed using the mouse wheel. Position the red marker +by dragging it on the map, zooming in on the appropriate part of the map and placing +the marker at an appropriate position (image B below). The coordinates of the dive +location are automatically inserted into the appropriate text box in the dive location +information window (image A below). Enter any other contextual information about the dive site (Description and Notes), +then select _Apply Changes_ to save the geolocation for this dive site. +The dive site information can later be edited by clicking the globe icon to the right of the +dive site name in the *Notes tab*. + +image::images/Globe_image3.jpg["FIGURE:Location creation panel", align="center"] + +Once the dive location data have been saved, the dive on the Dive List has a +globe icon immediately to the left of the location name of a particular +dive. + +*(3):* Utiliser l'application Subsurface-Mobile ou l'application _Subsurface_ Companion avec un +périphérique Android ou un iPhone avec GPS si les coordonnées du site de plongée ont été stockées +en utilisant une de ces applications. +xref:S_Companion[Cliquez ici pour plus d'information] *Important*: les coordonnées GPS d'un site de plongée sont liées au nom de lieu - ainsi, *enregistrer* un site de plongée avec uniquement les coordonnées mais aucun nom @@ -818,7 +856,7 @@ identiques). *Recherche du nom d'un site de plongée*: si vous avez entré les coordonnées dans la boîte de texte appropriée, vous pouvez lancer une recherche de nom sur base des coordonnées. Ceci est réalisé lorsque _Subsurface_ utilise Internet pour trouver le nom d'un site de plongée -sur base des coordonées que vous avez entrées. Si un nom est trouvé, il est +sur base des coordonnées que vous avez entrées. Si un nom est trouvé, il est automatiquement inséré dans la boîte Étiquettes. La liste (intitulée _"Sites de plongée situés aux mêmes coordonnées_") en bas du panneau du site de plongée contient les noms d'autres sites de plongée utilisés au même endroit. Par exemple, si le site de plongée est "Blue Hole" et qu'il y a plusieurs @@ -1161,15 +1199,18 @@ generated by SmartTrak to Subsurface's _.xml_ format. It can be built together with _Subsurface_ for Linux systems. Two dependencies need to be installed in your system before building: _libglib2.0_ and _libmdb2_. +In addition, a web service is available for divelog convertions from +SmartTrak to _Subsurface_ (see below). + N'hésitez pas à contacter l'équipe de développement de _Subsurface_ via mailto:subsurface@subsurface-divelog.org[notre liste de diffusion] pour de l'aide à l'importation des lofs _SmartTrak_. +===== Compiler _smtk2ssrf_ + Assuming the above dependencies have been installed and the _Subsurface_ source tree is in the directory _~/src/subsurface_, then: -===== Compiler _smtk2ssrf_ - - Move to the source tree directory. - Run " $ ccmake build " and set SMARTTRAK_IMPORT option to *on* (off by default). @@ -1207,6 +1248,21 @@ stored in _file3.xml_ in the _output_ directory. Check any warning and error messages in the console or in the graphical window: some may be relevant as support for Galileo family of dive computers is still a work in progress. +===== For the lazy: a web service to convert _SmartTrak_ to _Subsurface_ + +Open the website at: + +_https://thetheoreticaldiver.org/rch-cgi-bin/smtk2ssrf.pl_ + +This is a no-frills web service for converting _SmartTrak_ dive logs to +_Subsurface_. Select the browse button. This allows you to browse your +computer directories and to select the _SmartTrak_ divelog to be +converted. Once it has been selected, click the _Submit query_ button. After +a short while, a dialog box appears (image below) for saving the converted +file to the local computer. + +image::images/strk2ssrf_web.jpg["FIGURE:Web service to convert SmartTrak divelog", align="center"] + ===== Fusionner les plongées importées dans un carnet de plongée existant Open the new file (generated in the previous steps) using _Subsurface_ and @@ -1435,7 +1491,7 @@ automatically collecting dive site coordinate information. Syncronising the dives in the _Subsurface_ dive list with the coordinates stored on the _Subsurface_ Internet server. -_Subsurface_ comporte deux outils pour réaliser cela: +_Subsurface_ comporte deux outils pour réaliser cela : - L'application _Subsurface Companion_ (Android et iOS). @@ -2063,13 +2119,34 @@ decompression. image::images/multicylinder_dive.jpg["FIGURE: Multicylinder profile", align="center"] +Several dive computers perform automatic recording of cylinder pressure. In +this case no manual intervention is needed. Older dive computers +(e.g. Uwatec Galileo, several Suunto models) handle more than one pressure +transducer on cylinders, switching from one sensor to another as the diver +switches among cylinders and providing a sequential record of cylinders +pressures during a dive. Some of the latest models (e.g. Shearwater Perdix +AI, Scubapro G2) record two or more pressure transducers concurrently and +continuously during the whole dive. In these cases _Suburface correctly +interprets the data. There is continuous effort within the _Subsurface_ +development team to add new dive computer models to those that can be +downloaded from and to represent cylinder pressures correctly. Regardless of +the type of sensor handling of dive computers, technical divers are likely +to use both automated and manual methods of cylinder pressure logging when +more than two gases are used. However, automated recording of cylinder +pressure simplifies logging of sidemount dives (where two cylinders are +used). See the +link:https://subsurface-divelog.org/documentation/supported-dive-computers/[list +of supported dive computers]. + ==== Plongées Sidemount Sidemount diving is just another form of multi-cylinder diving, often with both or all cylinders having the same gas mixture. Although it’s a popular configuration for cave divers, sidemount diving can be done by recreational -divers who’ve completed the appropriate training. Sidemount dive logging -involves three steps, exactly as with multi-cylinder dives above: +divers who have completed the appropriate training. See the comments in the +last paragraph, above, about automated recording of cylinder +pressures. Manual logging of cylinder pressures during sidemount involves +three steps, exactly as with multi-cylinder dives above: - *During the dive, record cylinder switch events*. Since sidemount diving normally involves two cylinders with air or with the same gas mixture, _Subsurface_ distinguishes between these different @@ -2136,27 +2213,32 @@ image::images/pSCR_profile.jpg["FIGURE: pSCR profile", align="center"] [icon="images/APD.jpg"] [NOTE] -Closed system rebreathers use advanced technology to recirculate gas that -has been breathed. They also do two things to maintain a breathable oxygen -concentration: -a) remove carbon dioxide from the exhaled gas +Closed system rebreathers also recirculate gas that has been +breathed. However, they use advanced technology to maintain a breathable +oxygen concentration: +a) remove carbon dioxide from the exhaled gas. regulate the oxygen concentration to remain within safe diving limits. The CCR interface of _Subsurface_ is currently experimental and under active development. Subsurface currently supports Poseidon MkVI and APD -Discovery/Evolution dive computers. In contrast to a conventional -recreational dive computer, a CCR system computer does not allow the -download of a log containing multiple dives. Rather, each dive is stored -independently. This means that _Subsurface_ cannot download a dive log -directly from a CCR dive computer, but that it imports individual CCR dive -profiles in the same way it imports dive log data from other digital -databases: one dive at a time. +Discovery/Evolution dive computers, as well as Shearwater dive computers +connected to CCR systems. In contrast to a conventional recreational dive +computer, a CCR system computer usually does not allow the download of a log +containing multiple dives. Rather, each dive is stored independently. This +means that _Subsurface_ cannot download a dive log directly from a CCR dive +computer, but that it imports individual CCR dive profiles in the same way +it imports dive log data from other digital databases: one dive at a +time. However, the Shearwater based CCR systems are different in this +respect and allow multi-dive downloads. ===== Importer une plongée CCR -See the section dealing with xref:S_ImportingAlienDiveLogs[Importing dive -information from other digital sources]. CCR dive data are currently -obtained from the proprietary software provided when purchasing CCR dice -equipment. See +For Shearwater CCR controllers, or independent Shearwater CCR logs, just +download the dive log as would be the case for non-CCR dives. _Subsurface_ +interprets the CCR dive log correctly. Except for Shearwater CCR dive +computers, CCR dive data are currently obtained from the proprietary +software provided when purchasing CCR dive equipment. See the section +dealing with xref:S_ImportingAlienDiveLogs[Importing dive information from +other digital sources] and <<_appendix_b_dive_computer_specific_information_for_importing_dive_information,Appendix B>> for more complete information. Use that software to download the dive data into a known directory. From the main menu of _Subsurface_, select @@ -2277,6 +2359,44 @@ B]. == Obtaining more information about dives entered into the logbook +=== Utiliser la carte des plongées pour obtenir plus d'informations sur les plongées + +The Dive Map has a number of buttons useful for manipulation several aspects +of a dive. These are: + +[icon="images/icons/MapViewMode.jpg"] +[NOTE] +Select this button to show the Dive Map as a satellite image or as a Google +Maps representation. + +[icon="images/icons/MapViewPlus.jpg"] +[NOTE] +Zoom in. Select a smaller area of the map. + +[icon="images/icons/MapViewMinus.jpg"] +[NOTE] +Zoom out. Select a larger area of the map. + +image::images/MapMenu.jpg["FIGURE: Map menu", align="left"] + +The "Hamburger" button on the top right-hand of the Dive Map activates the +Map menu. The items are: + +* Open location in _Google Maps_. Open the location of the active dive in a + separate Google Maps window with the dive site indicated by a Google Maps + teardrop marker. + +* Copy location to clipboard (decimal). Copy the coordinates of the active + dive to the clipboard in decimal degrees e.g. -25.933905 30.710572 + +* Copy location to clipboard (sexagesimal). Copy the coordinates of the active + dive to the clipboard in sexagecimal, e.g. 25°56'02.058"S 30°42'38.059"E + +* Select visible dive locations. In the Dive List panel, highlight all the + dive sites visible in the Dive Map. This allows easy selection of the dives + within a particular geographical area to inspect them or to calculate + statistics for them. + === L'onglet *Informations* (pour une seule plongée) L'onglet Informations donnée des informations résumées sur une plongée @@ -3074,7 +3194,7 @@ d'export car une connexion vers _Facebook_ est nécessaire, nécessitant un identifiant et un mot de passe. À partir du menu principal, sélectionnez _Partager sur -> Connecter à -> Facebook_ (image *A* ci-dessous). Un écran de connexion s'affiche (image *B* ci dessous). Entrez l'identifiant et le -mot de passe _Facebook_. Depuis la fentre _Subsurface_, il est facile de +mot de passe _Facebook_. Depuis la fenêtre _Subsurface_, il est facile de vérifier si _Subsurface_ a une connection valide vers _Facebook_ : Depuis le "Menu principal", sélectionnez _Partager sur_ (image *A* ci-dessous). Normalement, l'option _Facebook_ est grisée. Mais si une @@ -3676,10 +3796,9 @@ of gradient factors as implemented by Erik Baker, or using the VPM-B model. [icon="images/icons/warning2.png"] [WARNING] -Le planificateur de plongée de _Subsurface_ EST POUR L'INSTANT EN PHASE -EXPÉRIMENTALE et suppose que l'utilisateur est déjà familier avec -l'interface utilisateur de _Subsurface_. Il est utilisé explicitement aux -conditions suivantes: +Le planificateur de plongée de _Subsurface_ EST EN PHASE EXPÉRIMENTALE et +suppose que l'utilisateur est déjà familier avec l'interface utilisateur de +_Subsurface_. Il est utilisé explicitement aux conditions suivantes : - L'utilisateur est bien informé au sujet de la planification de plongée et a la formation nécessaire pour faire une planification de plongée. @@ -3711,7 +3830,7 @@ Details_. This is where the details of the dive plan are provided in a way that can easily be copied to other software. This is also where any warning messages about the dive plan are printed. -image::images/PlannerWindow1_f20.jpg["FIGURE: Dive planner startup window", align="center"] +image::images/PlannerWindow1.jpg["FIGURE: Dive planner startup window", align="center"] === Plongées en circuit ouvert @@ -3841,13 +3960,11 @@ duration or the dive depth needs to be reduced. Below is an image of a dive plan for a recreational dive at 30 meters. Although the no-deco limit (NDL) is 23 minutes, the duration of the -dive is limited by the amount of air in the cylinder. That is shown in the -text box at the bottom right of the panel, requiring sufficient air for -buddy-sharing during ascent. +dive is limited by the amount of air in the cylinder. image::images/Planner_OC_rec.jpg["FIGURE: A recreational dive plan: setup", align="center"] -==== Non-recreational open circuit dives, including decompression +==== Plongées en circuit ouvert non loisir, incluant une décompression Non-recreational dive planning involves exceeding the no-deco limits and/or using multiple breathing gases. These dives are planned in three stages: @@ -3933,26 +4050,16 @@ In addition to calculating the total gas consumption for every cylinder the plan of calculating the recommended volume of bottom gas which is needed for safe asscent to the first deco gas change depth or the surface. This procedure is called the "minimum gas" or "rock bottom" consideration and it is used by various (but not all) -technical diving organisations. The calculation assumes that in worst case an out of gas (OoG) -situation could occur at the end of the planned bottom time at maximum depth. This OoG event forces -the buddy team the share the gas of one diver and to stay at maximum depth for an additional -time of n minutes (preferences option "problem solving time"). -At the same moment the combined SAC of both divers is increased by a estimated factor (preferences option -"SAC factor") compared to the SAC factor of a single diver under normal conditions. -The result of the minimum gas calculation for the bottom gas is printed to the planner output as an -additional information. No automatic checks are performed based on this result. -Please take care that the feature only gives valid results for simple, rectengular shaped single -level dive profiles. For multi level dives one would need to check every leg of the profile independently. - +technical diving organisations. See the text below for a detailed explanation. Now you can start the detailed time-depth planning of the dive. _Subsurface_ offers an unique graphical interface for doing planning. The mechanics are similar to hand-entering a dive profile in the dive log part of _Subsurface_. Upon activating the planner, a default dive of depth 15 m for -20 min is offered in the blue design surface to the top right hand of the -screen. The white dots (waypoints) on the profile can be dragged with a -mouse. Create more waypoints by double-clicking on the profile line and -ensuring the profile reflects the intended dive. Drag the waypoints to +20 min is offered in the blue design surface in the top right hand part of +the planner window. The white dots (waypoints) on the profile can be dragged +with a mouse. Create more waypoints by double-clicking on the profile line +and ensuring the profile reflects the intended dive. Drag the waypoints to represent the depth and duration of the dive. It is NOT necessary to specify the ascent part of the dive since the planner calculates this, based on the existing settings. If any of the management limits (for nitrogen, oxygen or @@ -3978,20 +4085,43 @@ changes should reflect the cylinders and gas compositions defined in the table with _Available Gases_. If two or more gases are used, automatic gas switches will be planned during the ascent to the surface. -A non-zero value in the "CC setpoint" column of the table of dive planner -points indicates a valid setpoint for oxygen partial pressure and that the -segment is dived using a closed circuit rebreather (CCR). If the last -manually entered segment is a CCR segment, the decompression phase is +Cylinders used for the plan need to be entered in the table of _Available +gases_. In the column _Type_ select the appropriate cylinder size by using +the dropdown list that appears when double-clicking a cell in this +column. By default, a large number of sizes are listed, and a new cylinder +size can be created by typing this into the text box. The cylinder size, +start pressure and default switch depths are initialised +automatically. Specify the gas composition (e.g. helium and oxygen +content). A non-zero value in the "CC setpoint" column of the table of dive +planner points indicates a valid setpoint for oxygen partial pressure and +that the segment is dived using a closed circuit rebreather (CCR). If the +last manually entered segment is a CCR segment, the decompression phase is computed assuming the diver uses a CCR with the specified set-point. If the last segment (however short) is on open circuit (OC, indicated by a zero set-point) the decompression is computed in OC mode and the planner only considers gas changes in OC mode. +Enter dive profile segments in the _Dive planner points_ table by providing +a time duration for a segment as well as its final depth. If more than one +cylinder is used during the dive, ensure that the appropriate cylinder is +selected for each segment of the dive plan by double-clicking the cell and +selecting the appropriate cylinder from the dropdown list in the _Used gas_ +column. If required, insert a row in the _Dive planner points_ table by +adding a new line and then setting the _Run time_ value appropriately. In +image A below, a segment (using an EAN50 cylinder) has been added and you +wish to use this gas during the very start of the dive (the other gas is not +breathable at the surface). Upon pressing Enter on the keyboard, that +segment is moved to the top of that table and the plan is adjusted +automatically to take into account this new segment of the dive plan (image +B below). + +image::images/planner1.jpg["FIGURE: Planning a dive: segments", align="center"] + Ci-dessous, vous trouverez un exemple d'une planification de plongée -utilisant du Tx21/35, suivie d'une remontée utilisant de l'EAN50 et de -l'oxygène, et utilisant les réglages décrits ci-dessous. +utilisant du Tx20/30 et l'algorithme Bühlmann, suivie d'une remontée +utilisant du EAN50 et utilisant les réglages décrits ci-dessous. -image::images/Planner_OC_deco_VPM.jpg["FIGURE: Planning a dive: setup", align="center"] +image::images/Planner_OC_deco.jpg["FIGURE: Planning a dive: setup", align="center"] Once the above steps have been completed, save by clicking the _Save_ button towards the top middle of the planner. The saved dive plan will appear in @@ -4000,13 +4130,12 @@ the *Dive List* panel of _Subsurface_. *Les détails du plan de plongée* 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 -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. +details of the dive plan are provided. These 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 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. If the option _Display segment duration_ is checked, then the duration of each depth level is indicated in the _Dive Plan Details_. This duration @@ -4014,6 +4143,81 @@ INCLUDES the transition time to get to that level. However, if the _Display transition in deco_ option is checked, the transitions are shown separately from the segment durations at a particular level. +The planner has a check box _Display plan variations_. By checking this box, +the planner provides information about a dive that is a little deeper or +slightly longer than the planned dive. This can be found near the top of the +_Dive plan details_ where the dive duration is indicated. Checking this +option creates a lot of additional computation, to such a degree that the +planner is slower than otherwise. The information is typically given as: + + Runtime: 53min + 0:52/m + 4:21/min + +This indicates: + + * Calculated dive duration is 53 min. + * For each extra meter in depth during the bottom phase of the dive, the + duration increases by 52 seconds. + * For each extra minute of bottom time, the duration increases by 4 min 21 + sec. Thus, if the bottom time is two minutes longer than planned, the dive + duration will be (2+2*4min 21 sec) = 10 minutes 42 sec longer and would + probably require that each deco stop is 10:42/53:00 = 20% longer than + planned. These calculations are only applicable for small deviations from + the dive plan, not for larger deviations. + +* Minimum gas requirements* + +The planner also estimates the *minimum gas* pressure required for safe +ascent after an event that causes the dive to be aborted. The calculation +assumes that in worst case an out of gas (OoG) situation could occur at the +end of the planned bottom time at maximum depth. This OoG event forces the +buddy team the share the gas of one diver and to stay at maximum depth for +an additional number of minutes. At the same moment the combined SAC of +both divers is increased by a estimated factor compared to the SAC factor of +a single diver under normal conditions. The result of the minimum gas +calculation for the bottom gas is printed to the planner output. No +automatic checks are performed based on this result. The feature only gives +valid results for simple, rectengular shaped single level dive profiles. For +multi level dives one would need to check every leg of the profile +independently. + +There are two selector boxes on the left of the _Dive plan details_: + + * *SAC factor*. This is your estimate of the degree to which your SAC increases if a critical problem arises underwater, + e.g. gas sharing or entanglement. Realistic values range from 2 to 5, reflecting the gas use of two divers sharing + a single gas cylinder after an OoG situation. + * *Problem solving time*. This is your estimate of how long you would take to solve the problem before starting the ascent + to terminate the dive. The default value is 2 minutes. + +Using the above information, the planner then estimates what the minimum +botom gas cylinder pressure needs to be for a safe ascent. This information +is given near the bottom of the _Dive plan details_, following the +calculation of bottom gas used during the dive if it exactly follows the +plan. the minimum gas is typically given as: + + Minimum gas (based on 2.0xSAC/+1min@81m): 2130 l/90bar/Δ:+80bar + +This indicates: + + * Within parentheses, the *SAC factor* and *Problem solving time* specified. + * The number of liters of back gas required for a safe ascent (2130 litres in + the example above) + * The number of bars of back gas required for a safe ascent (90 bars in the + example above). + * The delta-value: number of bars of back gas available at the end of the + bottom section of the dive, _over and above_ the minimum gas requirement (80 + bars in the above example). A positive delta reflects a safe plan; a + negative delta indicates insufficient gas for a safe ascent. + +**** +[icon="images/icons/warning2.png"] +[WARNING] +The *plan variations* and *minimum gas* estimates are only guidelines for a +diver performing dive planning, intended to enhance the safety of executing +a particular dive plan. They are NOT precise and should NOT be relied upon +as the only safety features in dive planning. Interpret these estimates +within the framework of your formal training to perform dive planning. +**** + === Planning pSCR dives To plan a dive using a passive semi-closed rebreather (pSCR), select _pSCR_ rather than @@ -4032,7 +4236,7 @@ are specified for pSCR dives. Below is a dive plan for a pSCR dive. The dive is 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"] +image::images/Planner_pSCR.jpg["FIGURE: Planning a pSCR dive: setup", align="center"] === Planifier des plongées CCR (recycleur) @@ -4056,7 +4260,7 @@ this is calculated for bail out ascents. The dive profile for a CCR dive may look something like the image below. -image::images/Planner_CCR1_f20.jpg["FIGURE: Planning a CCR dive: setup", align="center"] +image::images/Planner_CCR.jpg["FIGURE: Planning a CCR dive: setup", align="center"] Note that, in the _Dive plan details_, the gas consumption for a CCR segment is not calculated, so gas consumptions of 0 liters are the norm. @@ -4659,7 +4863,7 @@ Windows-based IrDA drivers for the Uwatec can also be downloaded from the ScubaPro web site, with drivers located on the download page for the ScubaPro SmartTrak software. -Pour les ordinateurs Apple Mac, la connection IrDA via l'interface MCS7780 +Pour les ordinateurs Apple Mac, la connexion IrDA via l'interface MCS7780 n'est plus disponible depuis OSX 10.6 ou supérieur. [[S_ImportingDR5]] @@ -4926,6 +5130,7 @@ données de plongées selon quelques règles simples : virgules. 5. Position GPS : utilisez les degrés décimaux, par exemple : 30.22496 30.821798 + === _LibreOffice Calc_ et _OpenOffice Calc_ These are open source spreadsheet applications forming parts of larger open |