diff options
| author |  Guillaume GARDET <guillaume.gardet@free.fr> | 2016-11-30 13:58:24 +0100 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2016-12-04 05:37:02 +0900 |
| commit | cac40bd65965d46f4575e54761a8a516e0932096 (patch) | |
| tree | ecb932997f995d27c6bb34a2bb7982581ef52ab3 /Documentation/50-pot | |
| parent | a5dd6d1519bfcf5d26ad45ca84394fadf589c085 (diff) | |
| download | subsurface-cac40bd65965d46f4575e54761a8a516e0932096.tar.gz | |
Documentation: update/merge french translations
Signed-off-by: Guillaume GARDET <guillaume.gardet@free.fr>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'Documentation/50-pot')
| -rw-r--r-- | Documentation/50-pot/subsurface-mobile-manual.pot | 2 | ||||
| -rw-r--r-- | Documentation/50-pot/subsurface-user-manual.pot | 3981 |
2 files changed, 2067 insertions, 1916 deletions
diff --git a/Documentation/50-pot/subsurface-mobile-manual.pot b/Documentation/50-pot/subsurface-mobile-manual.pot index 4396820c6..4205aacbe 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: 2016-10-11 10:50+0200\n" +"POT-Creation-Date: 2016-11-30 13:40+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/Documentation/50-pot/subsurface-user-manual.pot b/Documentation/50-pot/subsurface-user-manual.pot index 5ff8d606f..2a7b9f11e 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: 2016-10-11 10:50+0200\n" +"POT-Creation-Date: 2016-11-30 13:40+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -231,14 +231,15 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:125 +#: user-manual.txt:126 msgid "" "The *Dive Map* on the bottom right, showing the user's dive sites on a world " -"map and centered on the site of the last dive selected in the *Dive List*." +"map and centered on the site of the last dive selected in the *Dive " +"List*. The map scale can be increased or decreased." msgstr "" #. type: Plain text -#: user-manual.txt:129 +#: user-manual.txt:130 msgid "" "The *Info* on the top left, giving more detailed information on the dive " "selected in the *Dive List*, including some statistics for the selected dive " @@ -246,14 +247,15 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:132 +#: user-manual.txt:134 msgid "" "The *Dive Profile* on the top right, showing a graphical dive profile of the " -"selected dive in the *Dive List*." +"selected dive in the *Dive List*. You can zoom into the dive profile for a " +"more detailed view." msgstr "" #. type: Plain text -#: user-manual.txt:136 +#: user-manual.txt:138 msgid "" "The dividers between panels can be dragged to change the size of any of the " "panels. _Subsurface_ remembers the position of the dividers, so the next " @@ -262,7 +264,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:144 +#: user-manual.txt:146 msgid "" "If a single dive is selected in the *Dive List*, the dive location, detailed " "information and profile of the _selected dive_ are shown in the respective " @@ -274,38 +276,38 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:147 +#: user-manual.txt:149 #, no-wrap msgid "images/main_window_f22.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:151 +#: user-manual.txt:153 msgid "" "The user decides which of the four panels are displayed by selecting the " "*View* option on the main menu. This feature has several choices of display:" msgstr "" #. type: Plain text -#: user-manual.txt:153 +#: user-manual.txt:155 #, no-wrap msgid "*All*: show all four of the panels as in the screenshot above.\n" msgstr "" #. type: Plain text -#: user-manual.txt:155 +#: user-manual.txt:157 #, no-wrap msgid "*Divelist*: Show only the Dive List.\n" msgstr "" #. type: Plain text -#: user-manual.txt:157 +#: user-manual.txt:159 #, no-wrap msgid "*Profile*: Show only the Dive Profile of the selected dive.\n" msgstr "" #. type: Plain text -#: user-manual.txt:160 +#: user-manual.txt:162 #, no-wrap msgid "" "*Info*: Show only the Notes about the last selected dive and statistics " @@ -314,13 +316,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:162 +#: user-manual.txt:164 #, no-wrap msgid "*Globe*: Show only the world map, centered on the last selected dive.\n" msgstr "" #. type: Plain text -#: user-manual.txt:168 +#: user-manual.txt:170 msgid "" "Like other functions that can be accessed via the Main Menu, these options " "can also be triggered using keyboard shortcuts. The shortcuts for a " @@ -331,7 +333,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:172 +#: user-manual.txt:174 msgid "" "When the program is started for the first time, it shows no information at " "all, because it does not have any dive information available. In the " @@ -340,13 +342,13 @@ msgid "" msgstr "" #. type: Title - -#: user-manual.txt:175 +#: user-manual.txt:177 #, no-wrap msgid "Creating a new logbook" msgstr "" #. type: Plain text -#: user-manual.txt:180 +#: user-manual.txt:182 msgid "" "Select _File -> New Logbook_ from the main menu. All existing dive data are " "cleared so new information can be added. If there are unsaved data in an " @@ -355,49 +357,49 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:182 +#: user-manual.txt:184 #, no-wrap msgid "Storing dive information in the logbook" msgstr "" #. type: Plain text -#: user-manual.txt:185 +#: user-manual.txt:187 msgid "" "Now that a new logbook is created, it is simple to add dive data it. " "_Subsurface_ allows several ways of adding dive data to a logbook." msgstr "" #. type: Plain text -#: user-manual.txt:186 +#: user-manual.txt:189 msgid "If the user has a handwritten divelog, a spreadsheet or another form of" msgstr "" #. type: Plain text -#: user-manual.txt:188 +#: user-manual.txt:191 msgid "" "manually maintained divelog, dive data can be added to the logbook using one " "of these approaches:" msgstr "" #. type: Plain text -#: user-manual.txt:189 +#: user-manual.txt:193 msgid "Enter dive information by hand. This is useful if the diver didn’t" msgstr "" #. type: Plain text -#: user-manual.txt:191 +#: user-manual.txt:195 msgid "" "use a dive computer and dives were recorded in a written logbook. See: " "xref:S_EnterData[Entering dive information by hand]" msgstr "" #. type: Plain text -#: user-manual.txt:193 +#: user-manual.txt:197 msgid "Import dive log information that has been maintained either as a spreadsheet" msgstr "" #. type: Plain text -#: user-manual.txt:195 +#: user-manual.txt:199 msgid "" "or as a CSV file. Refer to: xref:S_Appendix_D[APPENDIX D: Exporting a " "spreadsheet to CSV format] and to xref:S_ImportingCSVDives[Importing dives " @@ -405,7 +407,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:198 +#: user-manual.txt:203 msgid "" "If a dive is recorded using a dive computer, the depth profile and a large " "amount of additional information can be accessed. These dives can be " @@ -413,44 +415,44 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:199 +#: user-manual.txt:205 msgid "" "The dive computer itself. See: xref:S_ImportDiveComputer[Importing new dive " -"information from a Dive Computer] or" +"information from a Dive Computer];" msgstr "" #. type: Plain text -#: user-manual.txt:201 +#: user-manual.txt:206 msgid "Proprietary software distributed by manufacturers of dive computers. Refer" msgstr "" #. type: Plain text -#: user-manual.txt:202 +#: user-manual.txt:207 msgid "" "to: xref:S_ImportingAlienDiveLogs[Importing dive information from other " "digital data sources or other data formats]." msgstr "" #. type: Plain text -#: user-manual.txt:203 +#: user-manual.txt:208 msgid "Spreadsheet or CSV files containing dive profiles." msgstr "" #. type: Plain text -#: user-manual.txt:204 +#: user-manual.txt:209 msgid "" "See: xref:S_ImportingCSVDives[Importing dives in CSV format from dive " "computers or other dive log software]" msgstr "" #. type: Title === -#: user-manual.txt:207 +#: user-manual.txt:212 #, no-wrap msgid "Entering dive information by hand" msgstr "" #. type: Plain text -#: user-manual.txt:222 +#: user-manual.txt:227 msgid "" "This is usually the approach for dives without a dive computer. The basic " "record of information within _Subsurface_ is a dive. The most important " @@ -467,13 +469,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:223 +#: user-manual.txt:228 #, no-wrap msgid "images/AddDive1_f22.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:227 +#: user-manual.txt:232 msgid "" "When you edit a field in Notes or Equipment panels, _Subsurface_ enters " "*Editing Mode*, indicated by the message in the blue box at the top of the " @@ -482,32 +484,33 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:228 user-manual.txt:789 +#: user-manual.txt:233 user-manual.txt:787 #, no-wrap msgid "images/BlueEditBar_f22.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:236 +#: user-manual.txt:242 msgid "" "The _Apply changes_ button should only be selected after all the parts of a " "dive have been entered. When entering dives by hand, the _Info_, " -"_Equipment_ and _Profile_ tabs should be completed before saving the " +"_Equipment_ and _Profile_ tabs should be completed before applying the " "information. By selecting the _Apply changes_ button, a local copy of the " -"information for this specific dive is saved in memory. The _Apply changes_ " -"button should ONLY be selected after all parts of a dive have been " -"entered. When you close Subsurface, the program will ask again, this time " -"whether the complete dive log should be saved on disk or not." +"information for this specific dive is saved in memory but NOT written to " +"disk. The _Apply changes_ button should ONLY be selected after all parts of " +"a dive have been entered. When closing Subsurface, the program will ask " +"again, this time whether the complete dive log should be saved on disk or " +"not." msgstr "" #. type: Title ==== -#: user-manual.txt:238 +#: user-manual.txt:244 #, no-wrap msgid "Creating a Dive Profile" msgstr "" #. type: Plain text -#: user-manual.txt:245 +#: user-manual.txt:251 msgid "" "The *Dive Profile* (a graphical representation of the depth of the dive as a " "function of time) is shown in the panel on the top right hand of the " @@ -517,13 +520,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:246 +#: user-manual.txt:252 #, no-wrap msgid "images/DiveProfile1_f20.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:264 +#: user-manual.txt:270 msgid "" "_Modifying the dive profile_: When the cursor is moved around the dive " "profile, its position is shown by two right-angled red lines as seen below. " @@ -541,13 +544,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:265 +#: user-manual.txt:271 #, no-wrap msgid "images/DiveProfile2_f20.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:277 +#: user-manual.txt:283 msgid "" "_Specifying the gas composition:_ The gas composition used is indicated " "along the line segments of the dive profile. This defaults to the first gas " @@ -561,13 +564,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:278 +#: user-manual.txt:284 #, no-wrap msgid "images/DiveProfile3_f20.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:285 +#: user-manual.txt:291 msgid "" "With the profile now defined, more details must be added to have a fuller " "record of the dive. To do this, the *Notes* and the *Equipment* tabs on the " @@ -576,19 +579,19 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:286 +#: user-manual.txt:292 #, no-wrap msgid "Importing new dive information from a Dive Computer" msgstr "" #. type: Title ==== -#: user-manual.txt:288 +#: user-manual.txt:294 #, no-wrap msgid "Connecting and importing data from a dive computer." msgstr "" #. type: Plain text -#: user-manual.txt:298 +#: user-manual.txt:304 msgid "" "The use of dive computers allows the collection of a large amount of " "information about each dive, e.g. a detailed record of depth, duration, " @@ -600,13 +603,13 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:299 user-manual.txt:661 user-manual.txt:3152 +#: user-manual.txt:305 user-manual.txt:661 user-manual.txt:3216 #, no-wrap msgid "images/icons/warning2.png" msgstr "" #. type: Plain text -#: user-manual.txt:309 +#: user-manual.txt:315 msgid "" "Several dive computers consume more power when they are in PC-Communication " "mode. **This could drain the dive computer's battery**. We recommend the " @@ -618,7 +621,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:325 +#: user-manual.txt:331 msgid "" "To import dive information from a dive computer to a computer with " "_Subsurface_, the two pieces of equipment must communicate with one " @@ -635,47 +638,47 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:327 +#: user-manual.txt:333 msgid "" "After this, the dive computer can be hooked up to the user's PC using these " "steps:" msgstr "" #. type: Plain text -#: user-manual.txt:329 +#: user-manual.txt:335 msgid "The interface cable should be connected to a free USB port (or the Infra-red" msgstr "" #. type: Plain text -#: user-manual.txt:330 +#: user-manual.txt:336 msgid "or Bluetooth connection set up as described later in this manual)" msgstr "" #. type: Plain text -#: user-manual.txt:332 +#: user-manual.txt:338 msgid "The dive computer should be placed into PC Communication mode." msgstr "" #. type: Plain text -#: user-manual.txt:333 +#: user-manual.txt:339 msgid "(Refer to the manual of the specific dive computer)" msgstr "" #. type: Plain text -#: user-manual.txt:337 +#: user-manual.txt:343 msgid "" "In _Subsurface_, from the Main Menu, select _Import -> Import From Dive " "Computer_. Dialogue *A* in the figure below appears:" msgstr "" #. type: Target for macro image -#: user-manual.txt:339 +#: user-manual.txt:345 #, no-wrap msgid "images/DC_import_f20.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:347 +#: user-manual.txt:353 msgid "" "Dive computers tend to keep a certain number of dives in memory, even though " "these dives have already been imported to _Subsurface_. For that reason, if " @@ -686,7 +689,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:354 +#: user-manual.txt:360 msgid "" "The dialogue has two drop-down lists, *Vendor* and *Dive Computer*. On the " "*vendor* drop-down list select the make of the computer, e.g. Suunto, " @@ -696,7 +699,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:365 +#: user-manual.txt:371 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 " @@ -710,7 +713,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:375 +#: user-manual.txt:381 msgid "" "If all the dives on the dive computer need to be downloaded, check the " "checkbox _Force download of all dives_. Normally, _Subsurface_ only " @@ -725,7 +728,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:381 +#: user-manual.txt:387 msgid "" "If the checkbox _Always prefer downloaded dives_ has been checked and, " "during download, dives with identical date-times exist on the dive computer " @@ -734,14 +737,14 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:384 +#: user-manual.txt:390 msgid "" "The checkbox marked _Download into new trip_ ensures that, after upload, the " "downloaded dives are grouped together as a new trip(s) in the *Dive List*." msgstr "" #. type: Plain text -#: user-manual.txt:388 +#: user-manual.txt:394 msgid "" "Do *not* check the checkboxes labelled _Save libdivecomputer logfile_ and " "_Save libdivecomputer dumpfile_. These are only used as diagnostic tools " @@ -749,40 +752,32 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:407 +#: user-manual.txt:412 msgid "" "Then select the _Download_ button. With communication established, you can " "see how the data are retrieved from the dive computer. Depending on the " "make of the dive computer and/or number of recorded dives, this could take " "some time. Be patient. The _Download_ dialogue shows a progress bar at the " -"bottom of the dialogue. Remember for some dive computers progress " -"information could be inaccurate since the program doesn’t know how much " -"downloadable data there is until the download is complete. After successful " -"download, Dialogue *B* in the figure above appears. After the dives have " -"been downloaded, they appear in a tabular format on the right-hand side of " -"the dialogue (see image *B*, above). Each dive comprises a row in the table, " -"with the date, duration and depth shown. Next to each dive is a checkbox: " -"check all the dives that need to be transferred to the *Dive List*. In the " -"case of the image above, the last six dives are checked and will be " -"transferred to the *Dive List*. Then click the _OK_ button at the bottom of " -"the dialogue. All the imported dives appear in the *Dive List*, sorted by " -"date and time. Disconnect and switch off the dive computer to conserve its " -"battery power." -msgstr "" - -#. type: Plain text -#: user-manual.txt:412 -msgid "" -"Then click the OK button. The checked dives are transferred to the *Dive " -"List*." +"bottom of the dialogue. Remember for some dive computers progress " +"information could be inaccurate since _Subsurface_ doesn’t know how much " +"downloadable data there are until the download is complete. After the dives " +"have been downloaded, they appear in a tabular format on the right-hand side " +"of the dialogue (see image *B*, above). Each dive comprises a row in the " +"table, showing the date, duration and depth. Next to each dive is a " +"checkbox: check all the dives that need to be transferred to the *Dive " +"List*. In the case of the image above, the last six dives are checked and " +"will be transferred to the *Dive List*. Then click the _OK_ button at the " +"bottom of the dialogue. All the imported dives appear in the *Dive List*, " +"sorted by date and time. Disconnect and switch off the dive computer to " +"conserve its battery power." msgstr "" #. type: Plain text #: user-manual.txt:416 msgid "" "If there is a problem in communicating with the dive computer, an error " -"message will be shown, similar to this text: \"Unable to open /dev/ttyUSB0 " -"Mares (Puck Pro)\". Refer to the text in the box below." +"message is shown, similar to this text: \"Unable to open /dev/ttyUSB0 Mares " +"(Puck Pro)\". Refer to the text in the box below." msgstr "" #. type: delimited block * @@ -792,7 +787,7 @@ msgid "*PROBLEMS WITH DATA DOWNLOAD FROM A DIVE COMPUTER?*\n" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:420 user-manual.txt:527 user-manual.txt:571 user-manual.txt:584 user-manual.txt:1156 user-manual.txt:1222 user-manual.txt:1387 user-manual.txt:1463 user-manual.txt:1774 +#: user-manual.txt:420 user-manual.txt:527 user-manual.txt:571 user-manual.txt:584 user-manual.txt:1152 user-manual.txt:1218 user-manual.txt:1383 user-manual.txt:1458 user-manual.txt:1765 #, no-wrap msgid "images/icons/important.png" msgstr "" @@ -846,9 +841,9 @@ msgid "" "an appropriate device name next to the Mount Point, then there is a " "possibility the cable or USB adaptor is faulty. A faulty cable is the most " "common cause of communication failure between a dive computer and " -"_Subsurface_ computer. It’s also possible the _Subsurface_ computer cannot " -"interpret the data. Perform a download for diagnostic purposes with the " -"following two boxes checked in the download dialogue discussed above:" +"_Subsurface_. It’s also possible _Subsurface_ cannot interpret the " +"data. Perform a download for diagnostic purposes with the following two " +"boxes checked in the download dialogue discussed above:" msgstr "" #. type: delimited block * @@ -905,7 +900,7 @@ msgid "Connecting _Subsurface_ to a Bluetooth-enabled dive computer" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:475 user-manual.txt:3714 +#: user-manual.txt:475 user-manual.txt:3782 #, no-wrap msgid "images/icons/bluetooth.jpg" msgstr "" @@ -922,31 +917,31 @@ msgstr "" #. type: Plain text #: user-manual.txt:484 -msgid "Be sure Bluetooth is activated on the host computer running _Subsurface_." +msgid "Ensure Bluetooth is activated on the host computer running _Subsurface_." msgstr "" #. type: Plain text #: user-manual.txt:485 -msgid "Be sure _Subsurface_ sees the Bluetooth adapter on the host computer." +msgid "Ensure _Subsurface_ sees the Bluetooth adapter on the host computer." msgstr "" #. type: Plain text #: user-manual.txt:486 msgid "" -"Be sure the Bluetooth-enabled dive computer is Bluetooth-discoverable and in " +"Ensure the Bluetooth-enabled dive computer is Bluetooth-discoverable and in " "PC upload mode." msgstr "" #. type: Plain text #: user-manual.txt:487 -msgid "Be sure _Subsurface_ is paired with the Bluetooth-enabled dive computer." +msgid "Ensure _Subsurface_ is paired with the Bluetooth-enabled dive computer." msgstr "" #. type: Plain text #: user-manual.txt:491 msgid "" "Select the Download dialogue by selecting _Import -> Import from dive " -"computer_ from the *Main Menu*. If you check the box labelled _\"Choose " +"computer_ from the *Main Menu*. After checking the box labelled _\"Choose " "Bluetooth download mode\"_, the dialogue below appears." msgstr "" @@ -968,14 +963,14 @@ 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 " -"the user can use the list box to indicate which one needs to connect to " +"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. Be sure the Bluetooth driver is installed correctly on the " +"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 finishes the first two " -"steps above. Be sure the Bluetooth-enabled dive computer is in PC-upload " +"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 " @@ -1034,7 +1029,7 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:552 user-manual.txt:3641 user-manual.txt:3729 +#: user-manual.txt:552 user-manual.txt:3709 user-manual.txt:3797 #, no-wrap msgid "On Windows:" msgstr "" @@ -1063,7 +1058,7 @@ msgstr "" #: user-manual.txt:570 msgid "" "The pairing step is checked and done automatically during the download " -"process. If the devices have never been paired the system will ask for your " +"process. If the devices have never been paired the system will ask " "permission and put a message on the right side of the screen: _Add a device, " "Tap to set up your DC device_. Always allow this pairing. After a discovered " "item is selected, select the _Save_ button. Finally select the _Download_ " @@ -1183,10 +1178,10 @@ msgstr "" msgid "" "The right hand image, above, shows a *Notes tab* filled with dive " "information. The *Time* field reflects the date and time of the dive. By " -"clicking the date, a calendar is displayed from which you can choose the " -"correct date. Press ESC to close the calendar. The time values (hour and " -"minutes) can also be edited directly by clicking on each of them in the text " -"box and by over-typing the information displayed." +"clicking the date, a calendar is displayed for selecting the correct " +"date. Press ESC to close the calendar. The time values (hour and minutes) " +"can also be edited directly by clicking on each of them in the text box and " +"by over-typing the information displayed." msgstr "" #. type: Plain text @@ -1275,15 +1270,16 @@ msgstr "" #. type: Plain text #: user-manual.txt:704 msgid "" -"Use the _Subsurface_ Companion app if you have an Android or iPhone device " -"with GPS and if the dive site coordinates were stored using it. " -"xref:S_Companion[Click here for more information]" +"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]" msgstr "" #. type: Plain text #: user-manual.txt:706 msgid "" -"Enter by hand if the coordinates are known, using one of four formats with " +"Enter coordiantes by hand if they are known, using one of four formats with " "latitude followed by longitude:" msgstr "" @@ -1323,8 +1319,7 @@ msgstr "" #: user-manual.txt:735 #, no-wrap msgid "" -"*Dive site name lookup:* If coordinates have been typed into the " -"appropriate\n" +"*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" @@ -1394,41 +1389,40 @@ msgstr "" #: user-manual.txt:763 #, no-wrap msgid "" -"*Rating*: You can provide a subjective overall rating of the dive on a\n" +"*Rating*: Provide a subjective overall rating of the dive on a\n" "5-point scale by clicking the appropriate star on the rating scale.\n" msgstr "" #. type: Plain text -#: user-manual.txt:767 +#: user-manual.txt:766 #, no-wrap msgid "" -"*Visibility*: You can provide a rating of visibility during the\n" -"dive on a\n" -"5-point scale by clicking the appropriate star.\n" +"*Visibility*: Provide a rating of visibility during the\n" +"dive on a 5-point scale by clicking the appropriate star.\n" msgstr "" #. type: Plain text -#: user-manual.txt:775 +#: user-manual.txt:773 #, 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" "cave, etc.\n" -"_Subsurface_ has many built-in tags. If you starts typing a tag, the\n" -"program\n" -"will list the tags that correspond to the typing. For instance, by typing\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 "" #. type: Plain text -#: user-manual.txt:777 +#: user-manual.txt:775 #, no-wrap msgid "*Notes*: Any additional information for the dive can be entered here.\n" msgstr "" #. type: Plain text -#: user-manual.txt:782 +#: user-manual.txt:780 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* " @@ -1438,29 +1432,29 @@ msgid "" msgstr "" #. type: Title ===== -#: user-manual.txt:783 +#: user-manual.txt:781 #, no-wrap msgid "Equipment" msgstr "" #. type: Plain text -#: user-manual.txt:788 +#: user-manual.txt:786 msgid "" -"The Equipment tab lets you enter information about the type of cylinder and " +"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 " "box at the top of the panel:" msgstr "" #. type: Plain text -#: user-manual.txt:795 +#: user-manual.txt:793 msgid "" -"shows the dive is being edited. This is a highly interactive part of " +"shows the equipment is being edited. This is a highly interactive part of " "_Subsurface_ and the information on cylinders and gases (entered here) " "determines the behavior of the *Dive profile* (top right-hand panel)." msgstr "" #. type: Plain text -#: user-manual.txt:799 +#: user-manual.txt:797 #, no-wrap msgid "" "*Cylinders*: The cylinder information is entered through a dialogue that " @@ -1469,20 +1463,20 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:800 +#: user-manual.txt:798 #, no-wrap msgid "images/DC_gas-dialogue1_f20.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:813 +#: user-manual.txt:811 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 " "automatically inserts the gas composition(% oxygen or % helium) in the " -"table. The + button at the top right lets you add more cylinders for this " -"dive. The dark dust bin icon on the left lets you delete information for a " -"cylinder. Note that it is not possible to delete a cylinder if it is used " +"table. The + button at the top right allows adding more cylinders for this " +"dive. The dark dustbin icon on the left allows you to delete information for " +"a cylinder. Note that it is not possible to delete a cylinder if it is used " "during the dive. A cylinder might be implicitly used in the dive, even " "without a gas change event. Start by selecting a cylinder type on the " "left-hand side of the table. To select a cylinder, the _Type_ box should be " @@ -1491,13 +1485,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:814 +#: user-manual.txt:812 #, no-wrap msgid "images/DC_gas-dialogue2_f20.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:821 +#: user-manual.txt:819 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 " @@ -1507,7 +1501,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:825 +#: user-manual.txt:823 msgid "" "Next, indicate the starting pressure and the ending pressure of the " "specified gas during the dive. The unit of pressure (metric/imperial) " @@ -1515,85 +1509,84 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:836 +#: user-manual.txt:834 msgid "" "Finally, provide the gas mixture used. If air was used, the value of 21% can " -"be entered or this field can be left blank. If nitrox or trimix were used, " -"their percentages of oxygen and/or helium should be entered. Any " -"inappropriate fields should be left empty. After typing the information for " -"the cylinder, save the data either by pressing _ENTER_ on the keyboard or by " -"clicking outside the cell containing the cursor. Information for any " -"additional cylinders can be added by using the + button at the top right " -"hand. The following is an example of a complete description for a dive using " -"two cylinders (air and EAN50):" +"be entered into the oxygen box or this field can be left blank. If nitrox or " +"trimix were used, their percentages of oxygen and/or helium should be " +"entered. Any inappropriate fields should be left empty. After typing the " +"information for the cylinder, save the data either by pressing _ENTER_ on " +"the keyboard or by clicking outside the cell containing the " +"cursor. Information for any additional cylinders can be added by using the + " +"button at the top right hand. Here is an example of a complete description " +"for a dive using two cylinders (air and EAN50):" msgstr "" #. type: Target for macro image -#: user-manual.txt:837 +#: user-manual.txt:835 #, no-wrap msgid "images/CylinderDataEntry3_f20.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:844 +#: user-manual.txt:841 #, no-wrap msgid "" "*Weights*: Information about the weight system used can be entered\n" -"using a dialogue similar to that of the cylinder information. If you\n" -"click\n" +"using a dialogue similar to that of the cylinder information. If you click\n" "the + button on the top right of the weights dialogue, the table looks " "like\n" "this:\n" msgstr "" #. type: Target for macro image -#: user-manual.txt:845 +#: user-manual.txt:842 #, no-wrap msgid "images/WeightsDataEntry1_f20.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:849 +#: user-manual.txt:846 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:850 +#: user-manual.txt:847 #, no-wrap msgid "images/WeightsDataEntry2_f20.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:864 +#: user-manual.txt:861 msgid "" -"This can be used to select the type of weight system used during the dive or " -"just may start typing in the box to specify a different weighting mechanism " -"that will be saved by _Subsurface_. In the *Weight* field, type in the " -"amount of weight used during the dive. After specifying the weight system, " -"save the data by pressing _ENTER_ on the keyboard or by clicking outside the " -"cell with the cursor. It’s possible to enter information for more than one " -"weight system by adding an additional system using the + button on the top " -"right hand. Weight systems can be deleted using the dust bin icon on the " -"left hand. Here is an example of information for a dive with two types of " -"weights: integrated as well as a weight belt:" +"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 that will be saved by _Subsurface_. In the *Weight* field, type " +"in the amount of weight used during the dive. After specifying the weight " +"system, save the data by pressing _ENTER_ on the keyboard or by clicking " +"outside the cell with the cursor. It’s possible to enter information for " +"more than one weight system by adding an additional system using the + " +"button on the top right hand. Weight systems can be deleted using the dust " +"bin icon on the left hand. Here is an example of information for a dive with " +"two types of weights: integrated as well as a weight belt:" msgstr "" #. type: Target for macro image -#: user-manual.txt:865 +#: user-manual.txt:862 #, no-wrap msgid "images/WeightsDataEntry3_f20.jpg" msgstr "" #. type: Title ==== -#: user-manual.txt:867 +#: user-manual.txt:864 #, no-wrap msgid "Editing several selected dives simultaneously" msgstr "" #. type: Plain text -#: user-manual.txt:883 +#: user-manual.txt:880 msgid "" "_METHOD 1_: After uploading dives from a dive computer, the dive profiles of " "each is shown in the *Dive profile* tab, as well as a few items of " @@ -1611,7 +1604,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:893 +#: user-manual.txt:890 msgid "" "Simultaneous editing only works with fields that do not already contain " "information. This means if some fields have been edited for a particular " @@ -1626,7 +1619,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:902 +#: user-manual.txt:899 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 " @@ -1641,13 +1634,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:903 +#: user-manual.txt:900 #, no-wrap msgid "Adding Bookmarks to a dive" msgstr "" #. type: Plain text -#: user-manual.txt:908 +#: user-manual.txt:905 msgid "" "Many divers wish to annotate dives with text that indicate particular " "events, e.g. \"Saw dolphins\", or \"Released surface buoy\". This is easily " @@ -1655,7 +1648,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:912 +#: user-manual.txt:909 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 " @@ -1663,40 +1656,40 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:914 +#: user-manual.txt:911 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:917 +#: user-manual.txt:914 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:920 +#: user-manual.txt:917 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:921 +#: user-manual.txt:918 #, no-wrap msgid "images/Bookmarks.jpg" msgstr "" #. type: Title ==== -#: user-manual.txt:924 +#: user-manual.txt:921 #, no-wrap msgid "Saving the updated dive information" msgstr "" #. type: Plain text -#: user-manual.txt:935 +#: user-manual.txt:932 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 " @@ -1709,7 +1702,7 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:936 +#: user-manual.txt:933 #, no-wrap msgid "" "Importing dive information from other digital data sources or other data " @@ -1717,48 +1710,48 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:961 +#: user-manual.txt:956 msgid "" -"If you’ve been diving for some time, it’s possible several dives were logged " -"using other dive log software. These dive logs can probably be imported into " -"_Subsurface_. _Subsurface_ will import dive logs from a range of other dive " -"log software. While some software is supported natively, for others you will " -"need to export the logbook(s) to an intermediate format so they can then be " -"imported by _Subsurface_. Currently, _Subsurface_ supports importing CSV " -"log files from several sources. APD LogViewer, XP5, Sensus and Seabear " -"files are preconfigured, but because the import is flexible, users can " -"configure their own imports. Manually kept log files (e.g. a spreadsheet) " -"can also be imported by configuring the CSV import. _Subsurface_ can also " -"import UDDF and UDCF files used by some dive log software and some dive " -"computers, like the Heinrichs & Weikamp DR5. Finally, for some dive log " -"software like Mares Dive Organizer we currently recommend you import the " -"logbooks first into a web service like _divelogs.de_ and then import from " -"there with _Subsurface_. Divelogs.de supports a few additional logbook " -"formats that _Subsurface_ currently cannot handle." +"Many divers log their dives using the proprietary software provided by the " +"manufacturers of their dive computers. _Subsurface_ can import dive logs " +"from a range of other dive log software. While import from some software is " +"supported natively, others require export of the the dive log to an " +"intermediate format that can then be imported into _Subsurface_. Currently, " +"_Subsurface_ supports importing CSV log files from several sources. Dive " +"log import from APD LogViewer, XP5, Sensus and Seabear files are " +"preconfigured, but because the import is flexible, users can configure their " +"own imports. Manually kept log files (e.g. a spreadsheet) can also be " +"imported by configuring the CSV import. _Subsurface_ can also import UDDF " +"and UDCF files used by some dive log software and some dive computers, like " +"the Heinrichs & Weikamp DR5. Finally, for some dive log software like Mares " +"Dive Organizer we currently recommend importing the logbook first into a web " +"service like _divelogs.de_ and then import from there with " +"_Subsurface_. Divelogs.de supports a few additional logbook formats that " +"_Subsurface_ currently cannot handle." msgstr "" #. type: Plain text -#: user-manual.txt:971 +#: user-manual.txt:966 msgid "" "If the format of other software is supported natively on Subsurface, select " "either _Import -> Import log files_ or _File -> Open log file_. _Subsurface_ " -"supports the data formats of many dive computers, including Suunto and " -"Shearwater. When importing dives, _Subsurface_ tries to detect multiple " -"records for the same dive and merges the information as best as it can. If " -"there are no time zone issues (or other reasons that would cause the " -"beginning time of the dives to be significantly different) _Subsurface_ will " -"not create duplicate entries. Below is more specific information to import " -"data to _Subsurface_." +"supports the data formats of many dive computers, including Suunto, " +"Shearwater and some CCR equipment. When importing dives, _Subsurface_ tries " +"to detect multiple records for the same dive and merges the information as " +"best as it can. If there are no time zone issues (or other reasons that " +"would cause the beginning time of the dives to be significantly different) " +"_Subsurface_ will not create duplicate entries. Below is more specific " +"information to import data to _Subsurface_." msgstr "" #. type: Title ==== -#: user-manual.txt:971 +#: user-manual.txt:967 #, no-wrap msgid "Using the universal import dialogue" msgstr "" #. type: Plain text -#: user-manual.txt:977 +#: user-manual.txt:973 msgid "" "Importing dives from other software is done through a universal interface " "activated by selecting _Import_ from the Main Menu, then clicking on _Import " @@ -1766,13 +1759,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:978 +#: user-manual.txt:974 #, no-wrap msgid "images/Import1_f20.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:983 +#: user-manual.txt:979 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, " @@ -1780,69 +1773,69 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:985 +#: user-manual.txt:981 msgid "" "XML-formatted dive logs (DivingLog 5.0, MacDive and several other dive log " "systems)" msgstr "" #. type: Plain text -#: user-manual.txt:986 +#: user-manual.txt:982 msgid "Cochran dive logs" msgstr "" #. type: Plain text -#: user-manual.txt:987 +#: user-manual.txt:983 msgid "UDDF-formatted dive logs (e.g. Kenozoooid)" msgstr "" #. type: Plain text -#: user-manual.txt:988 +#: user-manual.txt:984 msgid "UDCF-formatted dive logs" msgstr "" #. type: Plain text -#: user-manual.txt:989 +#: user-manual.txt:985 msgid "Poseidon MkVI CCR logs" msgstr "" #. type: Plain text -#: user-manual.txt:990 +#: user-manual.txt:986 msgid "APD Inspiration/Evolution CCR logs" msgstr "" #. type: Plain text -#: user-manual.txt:991 +#: user-manual.txt:987 msgid "LiquiVision logs" msgstr "" #. type: Plain text -#: user-manual.txt:992 -msgid "divelog.de logs" +#: user-manual.txt:988 +msgid "divelogs.de logs" msgstr "" #. type: Plain text -#: user-manual.txt:993 +#: user-manual.txt:989 msgid "OSTC Tools logs" msgstr "" #. type: Plain text -#: user-manual.txt:994 +#: user-manual.txt:990 msgid "JDiveLog" msgstr "" #. type: Plain text -#: user-manual.txt:995 -msgid "Suunto Dive Manager (DM3 and DM4)" +#: user-manual.txt:991 +msgid "Suunto Dive Manager (DM3, DM4, DM5)" msgstr "" #. type: Plain text -#: user-manual.txt:996 +#: user-manual.txt:992 msgid "CSV (text-based and spreadsheet-based) dive logs, including APD CCR logs" msgstr "" #. type: Plain text -#: user-manual.txt:1001 +#: user-manual.txt:997 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 " @@ -1852,13 +1845,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:1002 +#: user-manual.txt:998 #, no-wrap msgid "Importing from OSTCTools" msgstr "" #. type: Plain text -#: user-manual.txt:1011 +#: user-manual.txt:1007 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 " @@ -1871,7 +1864,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1015 +#: user-manual.txt:1011 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 " @@ -1879,23 +1872,22 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1020 +#: user-manual.txt:1016 msgid "" -"Please remember that OSTCTools is *not* a true diving log software, but " -"rather a useful set of tools for analysis and management of OSTC " -"devices. Only raw dive computer data will be imported to _Subsurface_; you " -"have to manually complete the rest of the data you want (buddies, equipment, " -"notes, etc)." +"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 " +"dive computer data will be imported to _Subsurface_; the rest of the data " +"(buddies, equipment, notes, etc) need to be completed manually." msgstr "" #. type: Title ==== -#: user-manual.txt:1022 +#: user-manual.txt:1018 #, no-wrap msgid "Importing from Mares Dive Organizer V2.1" msgstr "" #. type: Plain text -#: user-manual.txt:1029 +#: user-manual.txt:1025 msgid "" "Since Mares uses proprietary Windows software not compatible with " "multi-platform applications, these dive logs cannot be directly imported " @@ -1905,7 +1897,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1034 +#: user-manual.txt:1030 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 " @@ -1913,31 +1905,30 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1040 +#: user-manual.txt:1036 msgid "" -"Data should then be imported into _www.divelogs.de_. You will first need to " -"create a user account in _www.divelogs.de_. Log into that web site, then " -"select _Import Logbook -> Dive Organizer from the menu on the left hand " -"side. The instructions must be carefully followed to transfer the dive " -"information (in _.sdf_ format) from the Dive Organizer database to " -"_www.divelogs.de_." +"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 " +"Logbook -> Dive Organizer from the menu on the left hand side. The " +"instructions must be carefully followed to transfer the dive information (in " +"_.sdf_ format) from the Dive Organizer database to _www.divelogs.de_." msgstr "" #. type: Plain text -#: user-manual.txt:1042 +#: user-manual.txt:1038 msgid "" "Finally, import the dives from _divelogs.de_ to _Subsurface_, using the " "instructions below." msgstr "" #. type: Title ==== -#: user-manual.txt:1045 +#: user-manual.txt:1041 #, no-wrap msgid "Importing dives from *divelogs.de*" msgstr "" #. type: Plain text -#: user-manual.txt:1058 +#: user-manual.txt:1054 msgid "" "Importing dive information from _divelogs.de_ is simple, using a single " "dialogue box. The _Import -> Import from Divelogs.de_ option should be " @@ -1951,19 +1942,19 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1059 +#: user-manual.txt:1055 #, no-wrap msgid "images/Divelogs1.jpg" msgstr "" #. type: Title ==== -#: user-manual.txt:1062 +#: user-manual.txt:1058 #, no-wrap msgid "Importing data in CSV format" msgstr "" #. type: Plain text -#: user-manual.txt:1073 +#: user-manual.txt:1069 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 " @@ -1979,29 +1970,31 @@ msgid "" msgstr "" #. type: Title ===== -#: user-manual.txt:1075 +#: user-manual.txt:1071 #, no-wrap msgid "Importing dives in CSV format from dive computers or other dive log software" msgstr "" #. type: Plain text -#: user-manual.txt:1080 +#: user-manual.txt:1076 +#, no-wrap msgid "" -"You can view a _CSV_ file by using an ordinary text editor. It’s normally " -"organized into a single line that provides the headers (or _field names_ or " -"_column headings_) of the data columns, followed by the data, one record per " -"line." +" _CSV_ files can be viewed using an ordinary text editor. A _CSV_ file is " +"normally organized into\n" +"a single line that provides the headers (or _field names_ or _column " +"headings_) of the data\n" +"columns, followed by the data, one record per line.\n" msgstr "" #. type: Plain text -#: user-manual.txt:1082 +#: user-manual.txt:1078 msgid "" "There are two types of _CSV_ dive logs that can be imported into " "_Subsurface_:" msgstr "" #. type: Plain text -#: user-manual.txt:1088 +#: user-manual.txt:1084 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, " @@ -2012,7 +2005,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1097 +#: user-manual.txt:1093 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 " @@ -2026,14 +2019,14 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1100 +#: user-manual.txt:1096 msgid "" -"Before being able to import the _CSV_ data to _Subsurface_ *you needs to " -"know a few things about the data being imported*:" +"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:1108 +#: user-manual.txt:1104 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 " @@ -2045,7 +2038,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1112 +#: user-manual.txt:1108 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 " @@ -2054,12 +2047,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1114 +#: user-manual.txt:1110 msgid "Is the numeric information (e.g. dive depth) in metric or in imperial units?" msgstr "" #. type: Plain text -#: user-manual.txt:1121 +#: user-manual.txt:1117 msgid "" "With this information, importing the data into _Subsurface_ is " "straightforward. Select _Import -> Import Log Files_ from the main menu. In " @@ -2069,13 +2062,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1122 +#: user-manual.txt:1118 #, no-wrap msgid "images/csv_import1_f20.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:1133 +#: user-manual.txt:1129 #, no-wrap msgid "" "At the top left, there is a dropdown list containing pre- configured\n" @@ -2090,11 +2083,11 @@ msgid "" "system\n" "(metric or imperial). Selecting the appropriate options among these is " "critical for\n" -"the successful data import.\n" +"successful data import.\n" msgstr "" #. type: Plain text -#: user-manual.txt:1145 +#: user-manual.txt:1141 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 " @@ -2104,20 +2097,20 @@ msgid "" "expects the column heading for Dive number (\" # \") to be \"Dive # \". If " "the column heading that _Subsurface_ expects is not in the blue row, drag " "the appropriate balloon from the upper area and drop it in the appropriate " -"blue cell at the top of the table. To indicate the correct column for \"Dive " -"#\", drag the ballooned item labelled \"Dive # \" and drop it in the blue " -"cell immediately above the white cell containing \" # \". This is depicted " -"in the image below." +"blue cell at the top of the table. For example, to indicate the correct " +"column for \"Dive #\", drag the ballooned item labelled \"Dive # \" and drop " +"it in the blue cell immediately above the white cell containing \" # \", " +"depicted in the image below." msgstr "" #. type: Target for macro image -#: user-manual.txt:1146 +#: user-manual.txt:1142 #, no-wrap msgid "images/csv_import2_f20.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:1152 +#: user-manual.txt:1148 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. " @@ -2127,17 +2120,17 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:1156 +#: user-manual.txt:1152 #, no-wrap msgid "*A Diver's Introduction to _CSV_ Files*\n" msgstr "" #. type: delimited block * -#: user-manual.txt:1170 +#: user-manual.txt:1166 msgid "" "_CSV_ is an abbreviation for a data file format: _Comma-Separated " -"Values_. It is a file format that lets you view or edit information using a " -"text editor like Notepad (Windows), gedit (Linux) or TextWrangler " +"Values_. It is a file format that allows you to view or edit information " +"using a text editor like Notepad (Windows), gedit (Linux) or TextWrangler " "(OS/X). There are two main advantages of the _CSV_ format. First, the data " "are easily editable as text without any proprietary software. Second, all " "information is human-readable, not obscured by any custom or proprietary " @@ -2150,7 +2143,7 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:1179 +#: user-manual.txt:1175 msgid "" "_CSV_ files can be created or edited with a normal text editor. The most " "important attribute of a _CSV_ file is the _field separator_, the character " @@ -2166,7 +2159,7 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:1185 +#: user-manual.txt:1181 #, no-wrap msgid "" "\tDive site,Dive date,Time,Dive_duration, Dive_depth,Dive buddy\n" @@ -2177,14 +2170,14 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:1187 +#: user-manual.txt:1183 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:1193 +#: user-manual.txt:1189 #, no-wrap msgid "" "\tDive site\tDive date\tTime\tDive_duration\tDive_depth\tDive buddy\n" @@ -2195,10 +2188,10 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:1201 +#: user-manual.txt:1197 msgid "" "It is clear why many people prefer the TAB-delimited format to the " -"comma-delimited format. The disadvantage is that one cannot see the TAB " +"comma-delimited format. The disadvantage is that you cannot see the TAB " "characters. For instance, the space between _Dive_ and _date_ in the top " "line may be a SPACE character or a TAB character (in this case it is a SPACE " "character: the tabs are before and after _Dive date_). If the field names in " @@ -2209,7 +2202,7 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:1212 +#: user-manual.txt:1208 #, no-wrap msgid "" "\tDive Time (s)\tDepth (m)\tpO₂ - Setpoint (Bar) \tpO₂ - C1 Cell 1 " @@ -2226,7 +2219,7 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:1218 +#: user-manual.txt:1214 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_ " @@ -2237,7 +2230,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1232 +#: user-manual.txt:1228 msgid "" "But, the _CSV_ import has a couple of caveats. Avoid some special characters " "like ampersand (&), less than (<), greater than (>) and double quotes (\") " @@ -2250,56 +2243,56 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:1234 +#: user-manual.txt:1230 #, no-wrap msgid "Importing Dive coordinates from a mobile device with GPS." msgstr "" #. type: Plain text -#: user-manual.txt:1238 +#: user-manual.txt:1234 msgid "" "A smartphone with built-in GPS facilities can be used to store the locations " "of dives. This is performed by:" msgstr "" #. type: Plain text -#: user-manual.txt:1241 +#: user-manual.txt:1237 msgid "" "Taking the mobile device along on the dive boat / liveabord while " "automatically collecting dive site coordinate information." msgstr "" #. type: Plain text -#: user-manual.txt:1243 +#: user-manual.txt:1239 msgid "" "Uploading the coordinates from the mobile device to the _Subsurface_ " "Internet server." msgstr "" #. type: Plain text -#: user-manual.txt:1246 +#: user-manual.txt:1242 msgid "" "Syncronising the dives in the _Subsurface_ dive list with the coordinates " "stored on the _Subsurface_ Internet server." msgstr "" #. type: Plain text -#: user-manual.txt:1248 +#: user-manual.txt:1244 msgid "_Subsurface has two tools for achieving this:" msgstr "" #. type: Plain text -#: user-manual.txt:1250 +#: user-manual.txt:1246 msgid "The _Subsurface Companion App_ (Android and iOS)." msgstr "" #. type: Plain text -#: user-manual.txt:1252 +#: user-manual.txt:1248 msgid "The _Subsurface-mobile_ app (Android and iOS)" msgstr "" #. type: Plain text -#: user-manual.txt:1261 +#: user-manual.txt:1257 msgid "" "Both of these applications perform the collection of dive site coordinates " "and the synchronisation with dives in the _Subsurface_ dive list. However, " @@ -2313,26 +2306,26 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1263 +#: user-manual.txt:1259 msgid "" "For information on using the _Subsurface Companion App_, click " "xref:S_iCompanion[_here_]." msgstr "" #. type: Title ==== -#: user-manual.txt:1264 +#: user-manual.txt:1260 #, no-wrap msgid "Storing and and using GPS locations using _Subsurface-mobile_" msgstr "" #. type: Title ===== -#: user-manual.txt:1266 +#: user-manual.txt:1262 #, no-wrap msgid "Install _Subsurface-mobile_" msgstr "" #. type: Plain text -#: user-manual.txt:1272 +#: user-manual.txt:1268 msgid "" "Find _Subsurface-mobile_ on Google Play and install it on an Android " "device. The app is free. The iOS version is currently " @@ -2342,13 +2335,13 @@ msgid "" msgstr "" #. type: Title ===== -#: user-manual.txt:1273 +#: user-manual.txt:1269 #, no-wrap msgid "Create a _Subsurface-mobile_ account" msgstr "" #. type: Plain text -#: user-manual.txt:1281 +#: user-manual.txt:1277 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 " @@ -2360,7 +2353,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1284 +#: user-manual.txt:1280 #, no-wrap msgid "" "*N.B.:* To successfully create a user account, the mobile device must have " @@ -2369,19 +2362,19 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1285 +#: user-manual.txt:1281 #, no-wrap msgid "images/MobileCredentials.jpg" msgstr "" #. type: Title ===== -#: user-manual.txt:1288 +#: user-manual.txt:1284 #, no-wrap msgid "Configure auto-collecting of GPS coordinates" msgstr "" #. type: Plain text -#: user-manual.txt:1294 +#: user-manual.txt:1290 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 " @@ -2391,27 +2384,27 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1296 +#: user-manual.txt:1292 msgid "" "_Time threshold._ (minutes). The app will try to get a location every X " "minutes" msgstr "" #. type: Plain text -#: user-manual.txt:1298 +#: user-manual.txt:1294 msgid "_Distance threshold._ (meters). Minimum distance between two locations." msgstr "" #. type: Plain text -#: user-manual.txt:1307 +#: user-manual.txt:1303 #, no-wrap msgid "" "*How are GPS coordinates collected?* Assuming the diver sets 5 minutes and " "50\n" "meters in the settings above, the app will start by recording a location at " "the current\n" -"location, followed by another one at every 5 minutes *or* every time one " -"moves 50 m\n" +"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" @@ -2423,13 +2416,13 @@ msgid "" msgstr "" #. type: Title ===== -#: user-manual.txt:1308 +#: user-manual.txt:1304 #, no-wrap msgid "Activate the automated recording of GPS locations" msgstr "" #. type: Plain text -#: user-manual.txt:1313 +#: user-manual.txt:1309 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 " @@ -2437,32 +2430,32 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1314 +#: user-manual.txt:1310 #, no-wrap msgid "images/MobileMenu.jpg" msgstr "" #. type: Title ===== -#: user-manual.txt:1316 +#: user-manual.txt:1312 #, no-wrap msgid "After the dive, stop the automated recording of GPS locations" msgstr "" #. type: Plain text -#: user-manual.txt:1319 +#: user-manual.txt:1315 msgid "" "Uncheck the check box at the bottom left of the _Subsurface-mobile_ main " "menu." msgstr "" #. type: Title ===== -#: user-manual.txt:1320 +#: user-manual.txt:1316 #, no-wrap msgid "Upload the GPS locations onto the _Subsurface_ Internet server." msgstr "" #. type: Plain text -#: user-manual.txt:1327 +#: user-manual.txt:1323 #, no-wrap msgid "" "*N.B.:* Uploading the GPS locations to the Internet can only take place if " @@ -2477,7 +2470,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1331 +#: user-manual.txt:1327 msgid "" "From the _Subsurface-mobile_ main menu, select _GPS_ -> _Upload GPS " "data_. The locations are uploaded. Check the indicator at the top of the " @@ -2485,13 +2478,13 @@ msgid "" msgstr "" #. type: Title ===== -#: user-manual.txt:1332 +#: user-manual.txt:1328 #, no-wrap msgid "Apply the stored GPS locations to dives on the _Subsurface_ dive list." msgstr "" #. type: Plain text -#: user-manual.txt:1341 +#: user-manual.txt:1337 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 " @@ -2503,7 +2496,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1346 +#: user-manual.txt:1342 msgid "" "The " "https://subsurface-divelog.org/documentation/subsurface-mobile-user-manual[user " @@ -2513,7 +2506,7 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:1349 +#: user-manual.txt:1345 #, no-wrap msgid "" "Importing GPS coordinates with the _Subsurface Companion App_ for mobile " @@ -2521,7 +2514,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1358 +#: user-manual.txt:1354 #, no-wrap msgid "" "Using the *Subsurface Companion App* on an _Android device_ or\n" @@ -2536,22 +2529,22 @@ msgid "" msgstr "" #. type: Title ===== -#: user-manual.txt:1359 +#: user-manual.txt:1355 #, no-wrap msgid "Create a Companion App account" msgstr "" #. type: Plain text -#: user-manual.txt:1364 +#: user-manual.txt:1360 msgid "" "Register on the http://api.hohndel.org/login/[_Subsurface companion web " "page_]. A confirmation email with instructions and a personal *DIVERID* " -"will be sent, a long number giving you access to the file server and " -"Companion App capabilities." +"will be sent, a long number enabling access to the file server and Companion " +"App capabilities." msgstr "" #. type: Plain text -#: user-manual.txt:1369 +#: user-manual.txt:1365 msgid "" "Download the app from " "https://play.google.com/store/apps/details?id=org.subsurface[Google Play " @@ -2560,18 +2553,18 @@ msgid "" msgstr "" #. type: Title ===== -#: user-manual.txt:1370 +#: user-manual.txt:1366 #, no-wrap msgid "Using the Subsurface companion app on an Android smartphone" msgstr "" #. type: Plain text -#: user-manual.txt:1373 +#: user-manual.txt:1369 msgid "On first use the app has three options:" msgstr "" #. type: Plain text -#: user-manual.txt:1379 +#: user-manual.txt:1375 msgid "" "_Create a new account._ Equivalent to registering in the _Subsurface_ " "companion page using an Internet browser. You can request a *DIVERID* using " @@ -2581,22 +2574,22 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1382 +#: user-manual.txt:1378 msgid "" -"_Retrieve an account._ If users forget their *DIVERID* they will receive an " -"email to recover the number." +"_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:1386 +#: user-manual.txt:1382 msgid "" -"_Use an existing account._ Users are prompted for their *DIVERID*. The app " +"_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 " "_Disconnect_ menu option (see below)." msgstr "" #. type: Plain text -#: user-manual.txt:1394 +#: user-manual.txt:1390 msgid "" "In the _Subsurface_ main program, the *DIVERID* should also be entered on " "the Default Preferences panel, by selecting _File -> Preferences -> " @@ -2605,68 +2598,69 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1396 -msgid "====== Creating new dive locations" +#: user-manual.txt:1392 +#, no-wrap +msgid "*Creating new dive locations*\n" msgstr "" #. type: Plain text -#: user-manual.txt:1400 +#: user-manual.txt:1396 msgid "" "Now you are ready to get a dive position and send it to the server. The " -"Android display will look like the left hand image (*A*) below, but without " -"any dives." +"Android display looks like the left hand image (*A*) below, but without any " +"dives." msgstr "" #. type: Plain text -#: user-manual.txt:1403 +#: user-manual.txt:1399 msgid "" -"Touch the \"+\" icon on the top right to add a new dive site, a menu shows " -"with 3 options:" +"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:1406 +#: user-manual.txt:1402 msgid "" -"Current: A prompt for a place name (or a request to activate the GPS if it " -"is turned off) will be displayed, after which the current location is saved." +"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:1415 +#: user-manual.txt:1411 msgid "" -"Use Map: This option lets you fix a position by searching a world map. A " -"world map is shown (see *B* below) on which you can show the desired " -"position with a _long press_ on the touch sensitive screen (if the marked " -"location is wrong, simply choose a new location) and select the check " -"symbol in the upper right. A dialog is shown letting you enter the name of " -"the dive location and the date and time of the dive (see *C* below). In " -"order to import this dive location in _Subsurface_ you should set the time " -"to agree with the time of that dive on the dive computer." +"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 _long press_ on the touch sensitive screen (if the marked location is " +"wrong, simply choose a new location) and select the check symbol in the " +"upper right. A dialog is shown allowing you to enter the name of the dive " +"location and the date and time of the dive (see *C* below). In order to " +"import this dive location in _Subsurface_, set the time to agree with the " +"time of that dive on the dive computer." msgstr "" #. type: Target for macro image -#: user-manual.txt:1416 +#: user-manual.txt:1412 #, no-wrap msgid "images/Companion_5.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:1424 +#: user-manual.txt:1419 msgid "" -"Import local GPX file: The android device searches for .gpx files and " -"located archives will be shown. The selected .gpx file is opened and the " -"stored locations shown. Now select the appropriate locations, then select " -"the tab in the upper right, after which the locations will be sent to the " -"web service and added to the list on the Android device." +"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 " +"locations shown. Now select the appropriate locations, then select the tab " +"in the upper right, afterAndroid device." msgstr "" #. type: Plain text -#: user-manual.txt:1426 -msgid "====== Dive lists of dive locations" +#: user-manual.txt:1421 +#, no-wrap +msgid "*Dive lists of dive locations*\n" msgstr "" #. type: Plain text -#: user-manual.txt:1433 +#: user-manual.txt:1428 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 " @@ -2677,40 +2671,40 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1441 +#: user-manual.txt:1436 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 " "selecting _Dives_ at the top left of the screen (see *A* below) and then " "selecting the display mode. The display mode can be changed either from the " -"list of locations or from the map (see *B* below). If you select a location " +"list of locations or from the map (see *B* below). Upon selecting a location " "(on the list or on the map), an editing panel opens (see *C* below) where " "the dive description or other details may be changed." msgstr "" #. type: Target for macro image -#: user-manual.txt:1442 +#: user-manual.txt:1437 #, no-wrap msgid "images/Companion_4.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:1448 +#: user-manual.txt:1443 msgid "" -"When you select a dive (*not* selecting the check box), the name given to " -"it, date/time and GPS coordinates will be shown, with two options at the top " -"of the screen:" +"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 " +"screen:" msgstr "" #. type: Plain text -#: user-manual.txt:1450 +#: user-manual.txt:1445 msgid "" "Edit (pencil): Change the text name or other characteristics of the dive " "location." msgstr "" #. type: Plain text -#: user-manual.txt:1455 +#: user-manual.txt:1450 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 " @@ -2718,12 +2712,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1457 -msgid "====== Uploading dive locations" +#: user-manual.txt:1452 +#, no-wrap +msgid "*Uploading dive locations*\n" msgstr "" #. type: Plain text -#: user-manual.txt:1462 +#: user-manual.txt:1457 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 " @@ -2731,107 +2726,118 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1467 +#: user-manual.txt:1462 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:1468 +#: user-manual.txt:1463 #, no-wrap msgid "images/Companion_1.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:1473 +#: user-manual.txt:1468 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:1476 -msgid "====== Settings on the Companion App" +#: user-manual.txt:1471 +#, no-wrap +msgid "*Settings on the Companion App*\n" msgstr "" #. type: Plain text -#: user-manual.txt:1478 +#: user-manual.txt:1473 msgid "" "Selecting the _Settings_ menu option results in the right hand image above " "(*B*)." msgstr "" #. type: Plain text -#: user-manual.txt:1480 -msgid "====== Server and account" +#: user-manual.txt:1475 +msgid "_Server and account_" msgstr "" #. type: Plain text -#: user-manual.txt:1482 +#: user-manual.txt:1477 msgid "_Web-service URL._ This is predefined (http://api.hohndel.org/)" msgstr "" #. type: Plain text -#: user-manual.txt:1486 +#: user-manual.txt:1480 msgid "" "_User ID._ The DIVERID obtained by registering as described above. The " "easiest way to get it is to copy and paste from the confirmation email or " -"just type it in. ====== Synchronisation" +"just type it in." msgstr "" #. type: Plain text -#: user-manual.txt:1489 +#: user-manual.txt:1482 +msgid "_Synchronisation_" +msgstr "" + +#. type: Plain text +#: user-manual.txt:1485 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:1492 +#: user-manual.txt:1488 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:1496 +#: user-manual.txt:1490 +msgid "_Background service_" +msgstr "" + +#. type: Plain text +#: user-manual.txt:1493 msgid "" -"====== Background service Instead of entering an unique dive location, one " -"can leave the service running in the background of your Android device, " -"allowing a continuous collection of GPS locations." +"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:1498 +#: user-manual.txt:1495 msgid "The settings below define the behavior of the service:" msgstr "" #. type: Plain text -#: user-manual.txt:1501 +#: user-manual.txt:1498 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:1503 +#: user-manual.txt:1500 msgid "_Min distance._ In meters. Minimum distance between two locations." msgstr "" #. type: Plain text -#: user-manual.txt:1505 +#: user-manual.txt:1502 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:1506 user-manual.txt:1607 user-manual.txt:2021 +#: user-manual.txt:1503 user-manual.txt:1604 user-manual.txt:2018 #, no-wrap msgid "images/icons/info.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:1516 +#: user-manual.txt:1513 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 " @@ -2844,80 +2850,80 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1518 -msgid "====== Other" +#: user-manual.txt:1515 +msgid "_Other_" msgstr "" #. type: Plain text -#: user-manual.txt:1521 +#: user-manual.txt:1518 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:1523 +#: user-manual.txt:1520 msgid "_Subsurface website._ A link to the URL of Subsurface web" msgstr "" #. type: Plain text -#: user-manual.txt:1525 +#: user-manual.txt:1522 msgid "_Version._ Displays the current version of the Companion App." msgstr "" #. type: Plain text -#: user-manual.txt:1527 -msgid "====== Search" +#: user-manual.txt:1524 +msgid "_Search_" msgstr "" #. type: Plain text -#: user-manual.txt:1529 +#: user-manual.txt:1526 msgid "Search the saved dive locations by name or by date and time." msgstr "" #. type: Plain text -#: user-manual.txt:1531 -msgid "====== Start service" +#: user-manual.txt:1528 +msgid "_Start service_" msgstr "" #. type: Plain text -#: user-manual.txt:1533 +#: user-manual.txt:1530 msgid "Starts the _background service_ following the previously defined settings." msgstr "" #. type: Plain text -#: user-manual.txt:1535 -msgid "====== Disconnect" +#: user-manual.txt:1532 +msgid "_Disconnect_" msgstr "" #. type: Plain text -#: user-manual.txt:1542 +#: user-manual.txt:1539 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 " "account can be created, retrieve the ID for an existing account or use the " -"users own ID. The disconnect option is useful if your Android device was " +"users own ID. The _Disconnect_ option is useful if the Android device was " "used to download the dive locations of another registered diver." msgstr "" #. type: Plain text -#: user-manual.txt:1544 -msgid "====== Send all locations" +#: user-manual.txt:1541 +msgid "_Send all locations_" msgstr "" #. type: Plain text -#: user-manual.txt:1546 +#: user-manual.txt:1543 msgid "This option sends all locations stored in the Android device to the server." msgstr "" -#. type: Title ==== -#: user-manual.txt:1548 +#. type: Title ===== +#: user-manual.txt:1545 #, no-wrap msgid "Using the Subsurface companion app on an _iPhone_ to record dive locations" msgstr "" #. type: Plain text -#: user-manual.txt:1553 +#: user-manual.txt:1550 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 " @@ -2926,13 +2932,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1554 +#: user-manual.txt:1551 #, no-wrap msgid "images/iphone.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:1565 +#: user-manual.txt:1562 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 " @@ -2946,22 +2952,22 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1571 +#: user-manual.txt:1568 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 " "dive list is automatically uploaded from the iPhone to the web " -"service. There isn’t an option to trigger upload manually." +"service. There is no option to trigger upload manually." msgstr "" -#. type: Title ===== -#: user-manual.txt:1573 +#. type: Plain text +#: user-manual.txt:1571 #, no-wrap -msgid "Downloading dive locations to the _Subsurface_ divelog" +msgid "*Downloading dive locations to the _Subsurface_ divelog*\n" msgstr "" #. type: Plain text -#: user-manual.txt:1582 +#: user-manual.txt:1579 msgid "" "Download dive(s) from a dive computer or enter them manually into " "_Subsurface_ before obtaining the GPS coordinates from the server. The " @@ -2973,37 +2979,36 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1583 +#: user-manual.txt:1580 #, no-wrap msgid "images/DownloadGPS.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:1591 +#: user-manual.txt:1588 msgid "" -"Note that the _Apply_ button is now active. By clicking on it, you can " -"update the locations of the newly entered or uploaded dives in " -"_Subsurface_. That applies the coordinates and names entered on the app to " -"all the new dives that match the date-times of the uploaded GPS " -"localities. If you have entered the name of the dive location in " -"_Subsurface_ before downloading the GPS coordinates, this name will take " -"precedence over downloaded one." +"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 " +"applies the coordinates and names entered on the app to all the new dives " +"that match the date-times of the uploaded GPS localities. The names of dive " +"locations entered within _Subsurface_ (i.e. before downloading the GPS " +"coordinates) have precedence over downloaded dive locations." msgstr "" #. type: Plain text -#: user-manual.txt:1598 +#: user-manual.txt:1595 msgid "" -"Since _Subsurface_ matches GPS locations from the Android device and dive " +"Since _Subsurface_ matches GPS locations from the mobile device and dive " "information from the dive computer based on date-time data, automatic " "assignment of GPS data to dives depends on agreeing date-time information " "between the two devices. Although _Subsurface_ has a wide range tolerance, " -"it may not be able to identify the appropriate dive if there's a large " +"it may not be able to identify the appropriate dive if there is a large " "difference between the time in the dive computer and that of the Android " -"device. That results in no updates." +"device. This results in no updates." msgstr "" #. type: Plain text -#: user-manual.txt:1606 +#: user-manual.txt:1603 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 " @@ -3016,12 +3021,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1610 +#: user-manual.txt:1607 msgid "TIPS:" msgstr "" #. type: Plain text -#: user-manual.txt:1613 +#: user-manual.txt:1610 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 " @@ -3029,96 +3034,85 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1614 +#: user-manual.txt:1611 msgid "" "Right now, these locations are difficult to delete from the server. In some " "situations it" msgstr "" #. type: Plain text -#: user-manual.txt:1617 +#: user-manual.txt:1614 msgid "" -"is better to clean up the list on the Android device before sending the dive " +"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. This might be necessary, for instance, if you want to keep the " -"location list clear to see dives in the web service map display (see above)." +"locations. This might be necessary, for instance, to keep the location list " +"clear to see dives in the web service map display (see above)." msgstr "" #. type: Plain text -#: user-manual.txt:1620 +#: user-manual.txt:1617 msgid "" -"It may also make sense to give informative names to the locations sent to " -"the web server, or at least to use an informative name in the _Name " -"Template_ setting while running the _background service_, especially on a " -"dive trip with many dives and dive locations." +"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_ " +"setting while running the _background service_, especially on a dive trip " +"with many dives and dive locations." msgstr "" #. type: Title === -#: user-manual.txt:1622 +#: user-manual.txt:1619 #, no-wrap msgid "Adding photographs to dives" msgstr "" #. type: Plain text -#: user-manual.txt:1628 +#: user-manual.txt:1625 msgid "" -"Many (if not most) divers take a camera with them and take photographs " -"during a dive. To match each photograph with a specific dive, _Subsurface_ " -"lets you load photos into a dive. Photos are superimposed on the dive " -"profile, from where they can be viewed." +"Many (if not most) divers take photographs during a dive. _Subsurface_ " +"allows the storage and display of photographs for each dive. Photos are " +"superimposed on the dive profile at the times during the dive when they were " +"taken. They can also be viewed from the dive profile." msgstr "" #. type: Title ==== -#: user-manual.txt:1629 +#: user-manual.txt:1626 #, no-wrap msgid "Loading photos and synchronizing between dive computer and camera" msgstr "" #. type: Plain text -#: user-manual.txt:1633 +#: user-manual.txt:1632 msgid "" -"Left-lick on a dive or on a group of dives on the dive list. Then " -"right-click on this dive or group of dives and choose the option _Load " -"Images_:" +"Left-lick on a dive or on a group of dives on the dive list, bringing up the " +"xref:S_DiveListContextMenu[Dive list context Menu]. Right-click the " +"appropriate option to import images either from file or from the " +"Internet. The system file browser appears. Select the folder and photographs " +"that need to be loaded into _Subsurface_ and click the _Open_ button." msgstr "" #. type: Target for macro image -#: user-manual.txt:1634 -#, no-wrap -msgid "images/LoadImage1_f20.jpg" -msgstr "" - -#. type: Plain text -#: user-manual.txt:1638 -msgid "" -"The system file browser appears. Select the folder and photographs that need " -"to be loaded into _Subsurface_ and click the _Open_ button." -msgstr "" - -#. type: Target for macro image -#: user-manual.txt:1639 +#: user-manual.txt:1633 #, no-wrap msgid "images/LoadImage2_f20.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:1648 +#: user-manual.txt:1641 msgid "" -"This brings up the time synchronization dialog, shown below. But be aware " -"that the time synchronization is not perfect between the dive computer used " -"during a dive, and the camera used during that same dive. These two devices " -"often differ by several minutes. If _Subsurface_ can synchronize, then the " -"exact times of photographs can be used to position photographs on the dive " -"profile." +"This brings up the time synchronization dialog, shown below. The time " +"synchronization is not perfect between the dive computer used during a dive, " +"and the camera used during that same dive. These two devices often differ by " +"several minutes. _Subsurface_ attempts to synchronize these two devices so " +"that the exact times of photographs can be used to position photographs on " +"the dive profile." msgstr "" #. type: Plain text -#: user-manual.txt:1650 -msgid "_Subsurface_ synchronizes in three ways:" +#: user-manual.txt:1643 +msgid "_Subsurface_ synchronizes camera with dive computer in three ways:" msgstr "" #. type: Plain text -#: user-manual.txt:1653 +#: user-manual.txt:1646 #, no-wrap msgid "" "*Pro-actively*: Before the dive, ensure synchronization of the dive computer " @@ -3128,95 +3122,104 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1664 +#: user-manual.txt:1657 #, no-wrap msgid "" -"*Manually*: If you wrote down the exact camera time at the start of a dive, " -"the\n" -"difference in time between the two devices can be determined. As long as the " -"device\n" -"settings for time has not been changed in either device, you could write " -"down the times of\n" -"both devices after the dive or even at the end of the day. You can then " -"manually set the time\n" -"difference in the _Time shift_ dialog. Towards the top of the dialog is a " -"time setting tool\n" -"immediately under the heading _Shift times of image(s) by_, shown in figure " -"*A* below.\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" -"tool to a value of 00:07. Select either the _earlier_ or _later_ radio " -"button.\n" -"In the above example, the _earlier_ option is appropriate, since the photos " -"need to be shifted\n" +"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" "in that tool. Click the _OK_ button and synchronization is done.\n" msgstr "" #. type: Target for macro image -#: user-manual.txt:1665 +#: user-manual.txt:1658 #, no-wrap -msgid "images/LoadImage3b_f20.jpg" +msgid "images/LoadImage3b_f23.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:1683 +#: user-manual.txt:1676 #, no-wrap msgid "" -"*By photograph*: There is a very slick way of synchronizing. If you take a\n" -"photograph of the face of the dive computer showing the time, then " -"_Subsurface_ can get\n" +"*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. To do this, use the bottom half of the _Time shift_ dialog. If " -"you use\n" -"the bottom part, the top part of the dialog is ignored. Click on\n" -"the horizontal bar called \"_Select image of dive computer showing " -"time_. This brings up\n" -"a file browser letting you select the photograph of the dive computer " +"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 has been taken. Now set the date-time dialog to the left " -"of the photo\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.\n" -"Image *B* above shows a photograph of the face of the dive computer and with " -"the date-time tool set to the\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:1677 +#, no-wrap +msgid "images/LoadImage3c_f23.jpg" +msgstr "" + #. type: Plain text -#: user-manual.txt:1686 +#: user-manual.txt:1681 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." +"dive, it is not placed on the dive profile (see the red warning in the image " +"above). However, If the appropriate checkbox is selected (see image above) " +"these images can still be placed on the _Photos_ tab of the *Notes* panel so " +"that all photos associated with a dive are visible, including photos taken " +"before or after the dive." msgstr "" #. type: Title ==== -#: user-manual.txt:1687 +#: user-manual.txt:1682 #, no-wrap msgid "Viewing the photos" msgstr "" #. type: Plain text -#: user-manual.txt:1690 +#: user-manual.txt:1685 msgid "After the images have been loaded, they appear in two places:" msgstr "" #. type: Plain text -#: user-manual.txt:1692 -msgid "the _Photos_ tab of the *Notes* panel." +#: user-manual.txt:1687 +msgid "the _Photos_ tab of the *Notes* panel (left part of image below)." msgstr "" #. type: Plain text -#: user-manual.txt:1696 +#: user-manual.txt:1691 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 " @@ -3225,82 +3228,82 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1697 +#: user-manual.txt:1692 #, no-wrap msgid "images/icons/ShowPhotos_f20.png" msgstr "" #. type: Plain text -#: user-manual.txt:1700 +#: user-manual.txt:1695 msgid "This results in a profile display as in the image below:" msgstr "" #. type: Target for macro image -#: user-manual.txt:1701 +#: user-manual.txt:1696 #, no-wrap msgid "images/LoadImage4_f20.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:1705 +#: user-manual.txt:1700 msgid "" -"If you hover the mouse over any of the photo icons, a thumbnail photo is " -"shown of the appropriate photo. See the image below:" +"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:1706 +#: user-manual.txt:1701 #, no-wrap msgid "images/LoadImage5_f20.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:1715 +#: user-manual.txt:1710 msgid "" "Clicking on the thumbnail brings up a full size photo overlaid on the " -"_Subsurface_ window. This allows good viewing of the added photographs. (see " -"the image below). Note that the thumbnail has a small dustbin icon in the " -"bottom right hand corner (see image above). Selecting the dustbin removes " -"the image from the dive. Be careful when clicking on a thumbnail. Images can " -"also be deleted using the _Photos_ tab (see text below)." +"_Subsurface_ window, allowing a good view of the photographs (see the image " +"below). *Note* that the thumbnail has a small dustbin icon in the bottom " +"right hand corner (see image above). Selecting the dustbin removes the image " +"from the dive. Be careful when clicking on a thumbnail. Images can also be " +"deleted using the _Photos_ tab (see text below)." msgstr "" #. type: Target for macro image -#: user-manual.txt:1716 +#: user-manual.txt:1711 #, no-wrap msgid "images/LoadImage6_f20.jpg" msgstr "" #. type: Title ==== -#: user-manual.txt:1718 +#: user-manual.txt:1713 #, no-wrap msgid "The _Photos_ tab" msgstr "" #. type: Plain text -#: user-manual.txt:1729 +#: user-manual.txt:1723 msgid "" "Photographs associated with a dive are shown as thumbnails in the _Photos_ " "tab of the _Notes_ panel. Photos taken in rapid succession during a dive " "(therefore sometimes with large overlap on the dive profile) can easily be " "accessed in the _Photos_ tab. This tab serves as a tool for individually " "accessing the photos of a dive, while the stubs on the dive profile show " -"when during a dive a photo was taken. By single-clicking on a thumbnail in " -"the _Photos_ panel, a photo is selected. By double-clicking a thumbnail, the " -"full-sized image is shown, overlaying the _Subsurface_ window. A photo can " -"be deleted from the _Photos_ panel by selecting it (single-click) and then " -"by pressing the _Del_ key on the keyboard. This removes the photo BOTH from " -"the _Photos_ tab as well as the dive profile." +"when during a dive a photo was taken. Single-click a thumbnail in the " +"_Photos_ panel to select a photo. Double-click a thumbnail to view the " +"full-sized image, overlaying the _Subsurface_ window. Deleted a photo from " +"the _Photos_ panel by selecting it (single-click) and then by pressing the " +"_Del_ key on the keyboard. This removes the photo BOTH from the _Photos_ tab " +"as well as the dive profile." msgstr "" #. type: Title ==== -#: user-manual.txt:1730 +#: user-manual.txt:1724 #, no-wrap msgid "Photos on an external hard disk" msgstr "" #. type: Plain text -#: user-manual.txt:1740 +#: user-manual.txt:1734 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 " @@ -3309,43 +3312,41 @@ msgid "" "a dive profile with photos from an external drive, the normal procedure of " "selection and synchronization (see text above) is used. After the external " "drive has been disconnected, _Subsurface_ cannot access these photos any " -"more. If the display of photos is activated (using the toolbox to the left " -"of the _Dive Profile_), the program only shows a small white dot where each " -"photo should be on the dive profile. In addition the _Photos_ tab only " -"shows the file names of the photos. If the external drive with the photos " -"is re-connected, the photos can be seen in the normal way." +"more. If the display of photos is activated (using the toolbox icon to the " +"left of the _Dive Profile_), the program shows a small white dot where each " +"photo should be on the dive profile. In addition the _Photos_ tab shows " +"only the file names of the photos. If the external drive with the photos is " +"re-connected, the photos can be seen in the normal way." msgstr "" #. type: Title ==== -#: user-manual.txt:1742 +#: user-manual.txt:1736 #, no-wrap msgid "Moving photographs among directories, hard disks or computers" msgstr "" #. type: Plain text -#: user-manual.txt:1752 +#: user-manual.txt:1745 #, no-wrap msgid "" "After a photograph has been loaded into _Subsurface_ and associated with a " -"specific dive, the directory\n" -" where the photo lies is stored, letting _Subsurface_ find the photograph " -"when the dive is\n" -" opened again. If the photo or the whole photo collection is moved to " -"another drive or to a different\n" -" machine, the directory structure will be different to that of the original " -"uploaded\n" -" photo. When this happens, _Subsurface_ looks for the photos at their " -"original location before they were moved,\n" -" cannot find them and cannot display them. Because after moving photos, " +"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 that eases the\n" -" process of updating the directory information for each photo: automatic " -"updates using fingerprints.\n" +"has a mechanism to ease this inconvenience: automatic updates using " +"fingerprints.\n" msgstr "" #. type: Plain text -#: user-manual.txt:1756 +#: user-manual.txt:1749 #, no-wrap msgid "" "When a photo is loaded into _Subsurface_, a fingerprint for the image is " @@ -3357,34 +3358,28 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1759 +#: user-manual.txt:1751 msgid "" "look through a particular directory (and all its subdirectories recursively) " "where photos have been moved to," msgstr "" #. type: Plain text -#: user-manual.txt:1760 +#: user-manual.txt:1752 msgid "calculate fingerprints for all photos in this directory, and" msgstr "" #. type: Plain text -#: user-manual.txt:1762 +#: user-manual.txt:1755 msgid "" -"if there is a match between a calculated fingerprint and the one originally " -"calculated when a photo was" +"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 " +"file name has changed), automatically update the directory information so " +"that _Subsurface_ can find the photo in the new moved directory." msgstr "" #. type: Plain text -#: user-manual.txt:1764 -msgid "" -"loaded into _Subsurface_ (even if the original file name has changed), " -"automatically update the directory information so that _Subsurface_ can find " -"the photo in the new moved directory." -msgstr "" - -#. type: Plain text -#: user-manual.txt:1769 +#: user-manual.txt:1760 #, no-wrap msgid "" "This is done by selecting from the Main Menu: _File -> Find moved " @@ -3398,54 +3393,61 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:1774 +#: user-manual.txt:1765 #, no-wrap -msgid "*Upgrading existing photo collections without fingerprints*\n" +msgid "*Upgrading legacy photo collections without fingerprints*\n" msgstr "" #. type: delimited block * -#: user-manual.txt:1779 +#: user-manual.txt:1770 msgid "" "_Subsurface_ automatically calculates fingerprints for all images that it " -"can access. When manipulating images, be sure all the images associated " +"can access. When manipulating images, ensure that all the images associated " "with the dive log can be accessed by _Subsurface_." msgstr "" #. type: delimited block * -#: user-manual.txt:1781 +#: user-manual.txt:1772 msgid "" "_Subsurface_ automatically checks and, if necessary, updates the " "fingerprints associated with a single dive if:" msgstr "" #. type: delimited block * -#: user-manual.txt:1782 +#: user-manual.txt:1774 msgid "" "The images associated with that dive are visible as thumbnails on the *Dive " "Profile*." msgstr "" #. type: delimited block * -#: user-manual.txt:1783 +#: user-manual.txt:1776 msgid "" -"If you edit anything in the *Notes tab* panel and save the edits by " -"selecting _Apply changes_." +"If you edit anything in the *Notes* panel and save the edits by selecting " +"_Apply changes_." msgstr "" #. type: Title === -#: user-manual.txt:1787 +#: user-manual.txt:1780 #, no-wrap msgid "Logging special types of dives" msgstr "" +#. type: Plain text +#: user-manual.txt:1783 +msgid "" +"This section gives examples of the versatility of _Subsurface_ as a dive " +"logging tool." +msgstr "" + #. type: Title ==== -#: user-manual.txt:1790 +#: user-manual.txt:1786 #, no-wrap msgid "Multicylinder dives" msgstr "" #. type: Plain text -#: user-manual.txt:1797 +#: user-manual.txt:1793 msgid "" "_Subsurface_ easily handles dives involving more than one " "cylinder. Multi-cylinder diving usually happens (a) if a diver doesn’t have " @@ -3457,18 +3459,19 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1801 +#: user-manual.txt:1797 #, no-wrap msgid "" "*Describe the cylinders used during the dive* This is performed in the " "*Equipment tab* of\n" "the *Info* panel, as xref:cylinder_definitions[described above]. Enter the " "cylinders one by one,\n" -"specifying each’s characteristics and the gas composition within it.\n" +"specifying its size and pressure, as well as the gas composition within " +"it.\n" msgstr "" #. type: Plain text -#: user-manual.txt:1806 +#: user-manual.txt:1803 #, no-wrap msgid "" "*Record the times at which the switch from one cylinder to another was " @@ -3477,11 +3480,13 @@ msgid "" "to the dive computer\n" "by pressing specific buttons). If the dive computer does not provide the " "information, the diver has to\n" -"record these changes using a different method, e.g. writing it on a slate.\n" +"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:1814 +#: user-manual.txt:1811 #, no-wrap msgid "" "*Record the cylinder changes on the dive profile*: If the latter option\n" @@ -3494,42 +3499,42 @@ msgid "" "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.\n" +"tank bar (image below).\n" msgstr "" #. type: Plain text -#: user-manual.txt:1818 +#: user-manual.txt:1815 msgid "" "When this is complete, _Subsurface_ indicates the appropriate use of " -"cylinders in the dive profile. Below is a multi-cylinder dive, starting off " +"cylinders in the dive profile. Below is a two-cylinder dive, starting off " "with EAN28, then changing cylinders to EAN50 after 26 minutes for " "decompression." msgstr "" #. type: Target for macro image -#: user-manual.txt:1819 +#: user-manual.txt:1816 #, no-wrap msgid "images/multicylinder_dive.jpg" msgstr "" #. type: Title ==== -#: user-manual.txt:1821 +#: user-manual.txt:1818 #, no-wrap msgid "Sidemount dives" msgstr "" #. type: Plain text -#: user-manual.txt:1827 +#: user-manual.txt:1824 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 " +"configuration for cave divers, sidemount diving can be done by recreational " +"divers who’ve completed the appropriate training. Sidemount dive logging " "involves three steps, exactly as with multi-cylinder dives above:" msgstr "" #. type: Plain text -#: user-manual.txt:1836 +#: user-manual.txt:1833 #, no-wrap msgid "" "*During the dive, record cylinder switch events*. Since sidemount diving " @@ -3546,23 +3551,23 @@ msgid "" "slate, or (if the dive computer\n" "has the capability) marking each cylinder switch with a bookmark that can be " "retrieved later. Returning\n" -"from a dive with the times of cylinder changes is the only tricky part of " +"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:1839 +#: user-manual.txt:1836 #, 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" -"image below where two 12 litre cylinder were used).\n" +"image below where two 12 litre cylinders were used).\n" msgstr "" #. type: Plain text -#: user-manual.txt:1849 +#: user-manual.txt:1846 #, no-wrap msgid "" "*Indicate cylinder change events on the _Subsurface_ dive profile*. Once the " @@ -3587,32 +3592,25 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1850 +#: user-manual.txt:1847 #, no-wrap msgid "images/sidemount1.jpg" msgstr "" -#. type: Plain text -#: user-manual.txt:1853 -msgid "" -"This section gives an example of the versatility of _Subsurface_ as a dive " -"logging tool." -msgstr "" - #. type: Title ==== -#: user-manual.txt:1856 +#: user-manual.txt:1850 #, no-wrap msgid "Semi-closed circuit rebreather (SCR) dives" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:1858 +#: user-manual.txt:1852 #, no-wrap msgid "images/halcyon_RB80.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:1868 +#: user-manual.txt:1862 msgid "" "Passive semi-closed rebreathers (pSCR) are a technical advance in diving " "equipment that recirculates the breathing gas a diver uses, while removing " @@ -3628,19 +3626,19 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1870 +#: user-manual.txt:1864 msgid "" "To log pSCR dives, no special procedures are required. Use the normal steps " "outlined above:" msgstr "" #. type: Plain text -#: user-manual.txt:1872 +#: user-manual.txt:1866 msgid "Select pSCR in the _Dive Mode_ dropdown list on the *Info* panel." msgstr "" #. type: Plain text -#: user-manual.txt:1876 +#: user-manual.txt:1870 msgid "" "pSCR diving often involves gas changes, requiring an additional cylinder. " "Define all the appropriate cylinders as described above and indicate the " @@ -3649,7 +3647,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1881 +#: user-manual.txt:1875 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 " @@ -3659,25 +3657,25 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1882 +#: user-manual.txt:1876 #, no-wrap msgid "images/pSCR_profile.jpg" msgstr "" #. type: Title ==== -#: user-manual.txt:1887 +#: user-manual.txt:1881 #, no-wrap msgid "Closed circuit rebreather (CCR) dives" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:1889 +#: user-manual.txt:1883 #, no-wrap msgid "images/APD.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:1894 +#: user-manual.txt:1888 msgid "" "Closed system rebreathers use advanced technology to recirculate gas that " "has been breathed. They also do two things to maintain a breathable oxygen " @@ -3685,12 +3683,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1895 +#: user-manual.txt:1889 msgid "remove carbon dioxide from the exhaled gas" msgstr "" #. type: Plain text -#: user-manual.txt:1904 +#: user-manual.txt:1898 msgid "" "regulate the oxygen concentration to remain within safe diving limits. The " "CCR interface of _Subsurface_ is currently experimental and under active " @@ -3699,44 +3697,48 @@ msgid "" "recreational dive computer, a CCR system computer does not allow the " "download of a log containing multiple dives. Rather, each dive is stored " "independently. This means that _Subsurface_ cannot download a dive log " -"directly from a CCR dive computer, but that it imports CCR dive logs in the " -"same way it imports dive log data from other digital databases: one dive at " -"a time." +"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." msgstr "" #. type: Title ===== -#: user-manual.txt:1905 +#: user-manual.txt:1899 #, no-wrap msgid "Import a CCR dive" msgstr "" #. type: Plain text -#: user-manual.txt:1919 +#: user-manual.txt:1916 msgid "" "See the section dealing with xref:S_ImportingAlienDiveLogs[Importing dive " -"information from other digital sources]. From the main menu of _Subsurface_, " -"select _Import -> Import log files_ to bring up the " -"xref:Unified_import[universal import dialogue]. As explained in that " -"section, the bottom right hand of the import dialogue contains a dropdown " -"list (labled _Filter:_) of appropriate devices that currently " -"include(Poseidon) MkVI or APD log viewer files. Import for other CCR " -"equipment is under active development. Having selected the appropriate CCR " -"format and the directory where the original dive logs have been stored from " -"the CCR dive computer, select a particular dive log file (in the case of the " -"MkVI it is a file with a .txt extension). After selecting the appropriate " -"dive log, click the _Open_ button at the bottom right hand of the universal " -"import dialogue. The selected dive is imported to the _Subsurface_ dive " -"list." +"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_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:Unified_import[universal " +"import dialogue]. As explained in that section, the bottom right hand of the " +"import dialogue contains a dropdown list (labled _Filter:_) of appropriate " +"devices that currently include (Poseidon) MkVI or APD log viewer " +"files. Import for other CCR equipment is under active development. Having " +"selected the appropriate CCR format and the directory where the original " +"dive logs have been stored from the CCR dive computer, select a particular " +"dive log file (in the case of the MkVI it is a file with a .txt " +"extension). After selecting the appropriate dive log, click the _Open_ " +"button at the bottom right hand of the universal import dialogue. The " +"selected dive is imported to the _Subsurface_ dive list." msgstr "" #. type: Title ===== -#: user-manual.txt:1920 +#: user-manual.txt:1917 #, no-wrap msgid "Displayed information for a CCR dive" msgstr "" #. type: Plain text -#: user-manual.txt:1930 +#: user-manual.txt:1927 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 " @@ -3750,12 +3752,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1932 +#: user-manual.txt:1929 msgid "For TWO O~2~ sensors the mean value of the two sensors are given." msgstr "" #. type: Plain text -#: user-manual.txt:1936 +#: user-manual.txt:1933 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 " @@ -3764,19 +3766,19 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1938 +#: user-manual.txt:1935 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:1940 +#: user-manual.txt:1937 msgid "The mean pO~2~ of the sensors is indicated with a green line," msgstr "" #. type: Plain text -#: user-manual.txt:1948 +#: user-manual.txt:1945 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 " @@ -3788,13 +3790,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1949 +#: user-manual.txt:1946 #, no-wrap msgid "images/CCR_preferences_f20.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:1956 +#: user-manual.txt:1953 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 " @@ -3805,13 +3807,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1957 +#: user-manual.txt:1954 #, no-wrap msgid "images/CCR_setpoint_f20.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:1961 +#: user-manual.txt:1958 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 " @@ -3819,22 +3821,22 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1963 +#: user-manual.txt:1960 msgid "Sensor 1: grey" msgstr "" #. type: Plain text -#: user-manual.txt:1964 +#: user-manual.txt:1961 msgid "Sensor 2: blue" msgstr "" #. type: Plain text -#: user-manual.txt:1965 +#: user-manual.txt:1962 msgid "Sensor 3: brown" msgstr "" #. type: Plain text -#: user-manual.txt:1969 +#: user-manual.txt:1966 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 " @@ -3842,13 +3844,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1970 +#: user-manual.txt:1967 #, no-wrap msgid "images/CCR_sensor_data_f20.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:1975 +#: user-manual.txt:1972 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, " @@ -3856,16 +3858,16 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1979 +#: user-manual.txt:1976 msgid "" "_Events_: Several events are logged, e.g. switching the mouthpiece to open " -"circuit. These events are indicated by yellow triangles and, if one hovers " +"circuit. These events are indicated by yellow triangles and, if you hover " "over a triangle, a description of that event is given as the bottom line in " "the xref:S_InfoBox[Information Box]." msgstr "" #. type: Plain text -#: user-manual.txt:1987 +#: user-manual.txt:1984 msgid "" "_Cylinder pressures_: Some CCR dive computers like the Poseidon MkVI record " "the pressures of the oxygen and diluent cylinders. The pressures of these " @@ -3878,13 +3880,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1988 +#: user-manual.txt:1985 #, no-wrap msgid "images/CCR_dive_profile_f22.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:1993 +#: user-manual.txt:1990 msgid "" "_Equipment-specific information_: Equipment-specific information gathered by " "_Subsurface_ is shown in the xref:S_ExtraDataTab[Extra data tab]. This may " @@ -3892,7 +3894,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1999 +#: user-manual.txt:1996 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 " @@ -3904,13 +3906,13 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2000 user-manual.txt:2180 +#: user-manual.txt:1997 user-manual.txt:2316 #, no-wrap msgid "images/icons/cceiling.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2005 +#: user-manual.txt:2002 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 -> " @@ -3919,13 +3921,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2006 +#: user-manual.txt:2003 #, no-wrap msgid "images/CCR_dive_ceilingF22.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2010 +#: user-manual.txt:2007 msgid "" "More equipment-specific information for downloading CCR dive logs for " "Poseidon MkVI and APD equipment can be found in " @@ -3934,19 +3936,19 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:2011 +#: user-manual.txt:2008 #, no-wrap msgid "Obtaining more information about dives entered into the logbook" msgstr "" #. type: Title === -#: user-manual.txt:2013 +#: user-manual.txt:2010 #, no-wrap msgid "The *Info* tab (for individual dives)" msgstr "" #. type: Plain text -#: user-manual.txt:2020 +#: user-manual.txt:2017 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 " @@ -3956,22 +3958,22 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2027 +#: user-manual.txt:2024 msgid "" "Gas consumption and SAC calculations: _Subsurface_ calculates SAC and Gas " "consumption taking in account gas incompressibility, particularly at tank " -"pressures above 200 bar, making them more accurate. Users should refer to " +"pressures above 200 bar, making them more accurate. Refer to " "xref:SAC_CALCULATION[Appendix F] for more information." msgstr "" #. type: Title === -#: user-manual.txt:2029 +#: user-manual.txt:2026 #, no-wrap msgid "The *Extra Data* tab (usually for individual dives)" msgstr "" #. type: Plain text -#: user-manual.txt:2037 +#: user-manual.txt:2034 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 " @@ -3983,19 +3985,19 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2038 +#: user-manual.txt:2035 #, no-wrap msgid "images/ExtraDataTab_f20.jpg" msgstr "" #. type: Title === -#: user-manual.txt:2040 +#: user-manual.txt:2037 #, no-wrap msgid "The *Stats* tab (for groups of dives)" msgstr "" #. type: Plain text -#: user-manual.txt:2051 +#: user-manual.txt:2048 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 " @@ -4008,23 +4010,23 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:2053 +#: user-manual.txt:2050 #, no-wrap msgid "The *Dive Profile*" msgstr "" #. type: Target for macro image -#: user-manual.txt:2055 +#: user-manual.txt:2052 #, no-wrap msgid "images/Profile2.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2066 +#: user-manual.txt:2063 msgid "" "Of all the panels in _Subsurface_, the Dive Profile contains the most " "detailed information about each dive. The Dive Profile has a *button bar* on " -"the left hand side that lets you control several display options. The " +"the left hand side, allowing control of several display options. The " "functions of these buttons are described below. The main item in the Dive " "Profile is the graph of dive depth as a function of time. In addition to " "depth, it also shows the ascent and descent rates compared to the " @@ -4033,7 +4035,7 @@ msgid "" msgstr "" #. type: delimited block | -#: user-manual.txt:2073 +#: user-manual.txt:2070 #, no-wrap msgid "" "|*Color*|*Descent speed (m/min)*|*Ascent speed (m/min)*\n" @@ -4045,7 +4047,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2078 +#: user-manual.txt:2075 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 " @@ -4054,13 +4056,13 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2079 +#: user-manual.txt:2076 #, no-wrap msgid "images/icons/scale.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2084 +#: user-manual.txt:2081 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 " @@ -4069,16 +4071,280 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2087 +#: user-manual.txt:2084 #, no-wrap msgid "" -"*Water temperature* is displayed with its own blue line with temperature " -"values\n" +"*Water temperature* is shown as a blue line with temperature values\n" "placed adjacent to significant changes.\n" msgstr "" +#. type: Title ==== +#: user-manual.txt:2087 +#, no-wrap +msgid "The *Information Box*" +msgstr "" + +#. type: Plain text +#: user-manual.txt:2096 +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 " +"*Dive Profile* panel. If the mouse points outside of the *Dive Profile* " +"panel, then only the top line of the Information Box is visible (see " +"left-hand part of figure (*A*) below). The Information Box can be moved " +"around in the *Dive Profile* panel by click-dragging it with the mouse so " +"that it is not obstructing important detail. The position of the Information " +"Box is saved and used again during subsequent dive analyses." +msgstr "" + +#. type: Target for macro image +#: user-manual.txt:2097 +#, no-wrap +msgid "images/InfoBox2.jpg" +msgstr "" + +#. type: Plain text +#: user-manual.txt:2113 +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 " +"time point along the dive profile shown by the mouse cursor (see right-hand " +"part of figure (*B*) above where the Information Box reflects the situation " +"at the position of the cursor [arrow] in that image). Moving the cursor " +"horizontally lets the Information Box show information for any point along " +"the dive profile. It gives extensive statistics about depth, gas and ceiling " +"characteristics of the particular dive. These include: Time period into the " +"dive (indicated by a @), depth, cylinder pressure (P), temperature, " +"ascent/descent rate, surface air consumption (SAC), oxygen partial pressure, " +"maximum operating depth, equivalent air depth (EAD), equivalent narcotic " +"depth (END), equivalent air density depth (EADD), decompression requirements " +"at that instant in time (Deco), time to surface (TTS), the calculated " +"ceiling, as well as of the statistics in the Information Box, shown as four " +"buttons on the left of the profile panel. These are:" +msgstr "" + +#. type: Named 'icon' AttributeList argument for style 'icon' +#: user-manual.txt:2114 +#, no-wrap +msgid "images/icons/MOD.jpg" +msgstr "" + +#. type: Plain text +#: user-manual.txt:2121 +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. " +"For air (21% oxygen) it is around 57 m if a maximum pO~2~ of 1.4 is " +"specified in the *Preferences* section (select _File -> Preferences -> " +"Graph_ and edit the text box _pO~2~ in calculating MOD_. When diving below " +"the MOD there is a markedly increased risk of exposure to the dangers of " +"oxygen toxicity." +msgstr "" + +#. type: Named 'icon' AttributeList argument for style 'icon' +#: user-manual.txt:2122 +#, no-wrap +msgid "images/icons/NDL.jpg" +msgstr "" + +#. type: Plain text +#: user-manual.txt:2134 +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 present depth, that does not require decompression (that is, " +"before an ascent ceiling appears). Once a diver has exceeded the NDL and " +"decompression is required (that is, there is an ascent ceiling above the " +"diver) then TTS gives the number of minutes required before the diver can " +"surface. TTS includes ascent time as well as decompression time. TTS is " +"calculated assuming an ascent surface air consumption (SAC) for the gas " +"currently used. Even if the profile contains several gas switches, TTS at a " +"specific moment during the dive is calculated using the current gas. TTS " +"longer than 2 hours is not accurately calculated and Subsurface only " +"indicates _TTS > 2h_." +msgstr "" + +#. type: Named 'icon' AttributeList argument for style 'icon' +#: user-manual.txt:2135 +#, no-wrap +msgid "images/icons/SAC.jpg" +msgstr "" + +#. type: Plain text +#: user-manual.txt:2143 +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 real respiration rate because a diver at 10m uses breathing gas at " +"a rate roughly double that of the equivalent rate at the surface. SAC gives " +"an indication of breathing gas consumption rate independent of the depth of " +"the dive, so the respiratory rates of different dives can be compared. The " +"units for SAC is liters/min or cubic ft/min." +msgstr "" + +#. type: Named 'icon' AttributeList argument for style 'icon' +#: user-manual.txt:2144 +#, no-wrap +msgid "images/icons/EAD.jpg" +msgstr "" + +#. type: Plain text +#: user-manual.txt:2159 +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 " +"divers breathing gases other than air. Their values are dependent on the " +"composition of the breathing gas. The EAD is the depth of a hypothetical air " +"dive that has the same partial pressure of nitrogen as the current depth of " +"the nitrox dive at hand. A nitrox dive leads to the same decompression " +"obligation as an air dive to the depth equalling the EAD. The END is the " +"depth of a hypothetical air dive that has the same sum of partial pressures " +"of the narcotic gases nitrogen and oxygen as the current trimix dive. A " +"trimix diver can expect the same narcotic effect as a diver breathing air " +"diving at a depth equalling the END." +msgstr "" + #. type: Plain text -#: user-manual.txt:2094 +#: user-manual.txt:2161 +msgid "" +"Figure (*B*) above shows an information box with a nearly complete set of " +"data." +msgstr "" + +#. type: Title ===== +#: user-manual.txt:2163 +#, no-wrap +msgid "The Gas Pressure Bar Graph" +msgstr "" + +#. type: Plain text +#: user-manual.txt:2170 +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 " +"applicable) that the diver was inhaling _at a particular instant during the " +"dive_, shown by the position of the cursor on the *Dive Profile*. The " +"drawing on the left below indicates the meaning of the different parts of " +"the Gas Pressure Bar Graph." +msgstr "" + +#. type: Target for macro image +#: user-manual.txt:2171 +#, no-wrap +msgid "images/GasPressureBarGraph.jpg" +msgstr "" + +#. type: Plain text +#: user-manual.txt:2177 +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 " +"diver and measured from the bottom of the graph to the top of the light " +"green area. This pressure has a _relative_ value in the graph and does not " +"indicate absolute pressure." +msgstr "" + +#. type: Plain text +#: user-manual.txt:2183 +msgid "" +"The horizontal black line underneath the light green margin indicates the " +"equilibrium pressure of the INERT gases inhaled by the diver, usually " +"nitrogen. In the case of trimix, it is the pressures of nitrogen and helium " +"combined. In this example, the user is diving with EAN32, so the equilibrium " +"inert gas pressure is 68% of the distance from the bottom of the graph to " +"the total gas pressure value." +msgstr "" + +#. type: Plain text +#: user-manual.txt:2187 +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 " +"algorithm, with fast tissues on the left hand side." +msgstr "" + +#. type: Plain text +#: user-manual.txt:2193 +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 " +"the particular point on the *Dive Profile*. The gradient factor shown is an " +"interpolation between the GFLow and GFHigh values specified in the _Graph_ " +"tab of the *Preferences Panel* of _Subsurface_." +msgstr "" + +#. type: Plain text +#: user-manual.txt:2197 +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 " +"is expected to be severe, resulting in a significant risk of decompression " +"sickness." +msgstr "" + +#. type: Plain text +#: user-manual.txt:2200 +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 " +"of the above figure for a diver using EAN32." +msgstr "" + +#. type: Plain text +#: user-manual.txt:2203 +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 " +"equilibrium pressure because no diving has taken place." +msgstr "" + +#. type: Plain text +#: user-manual.txt:2206 +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 " +"pressures are far below the equilibrium gas pressure." +msgstr "" + +#. type: Plain text +#: user-manual.txt:2211 +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 " +"the black line indicating the equilibrium pressure). The slower compartments " +"(towards the right) have not reached equilibrium and are in the process of " +"slowly increasing in pressure." +msgstr "" + +#. type: Plain text +#: user-manual.txt:2217 +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 " +"bar to 1.45 bar, the pressures in the different tissue compartments now " +"exceed that of the total gas pressure and approach the gradient factor value " +"(i.e. the top black horizontal line). Further ascent will result in " +"exceeding the gradient factor value (GFHigh), endangering the diver." +msgstr "" + +#. type: Plain text +#: user-manual.txt:2222 +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 " +"pressures in the slow compartments have not changed much. The pressures in " +"the fast compartments do not approach the GFHigh value any more and the " +"diver is safer than in the situation indicated in graph *D*." +msgstr "" + +#. type: Title ==== +#: user-manual.txt:2223 +#, no-wrap +msgid "The Profile Toolbar" +msgstr "" + +#. type: Plain text +#: user-manual.txt:2231 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 " @@ -4089,103 +4355,94 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2095 +#: user-manual.txt:2232 #, no-wrap msgid "images/icons/O2.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2099 +#: user-manual.txt:2236 msgid "" -"Clicking this button allows display of the partial pressure of *oxygen* " -"during the dive. This is shown below the dive depth and water temperature " -"graphs." +"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:2100 +#: user-manual.txt:2237 #, no-wrap msgid "images/icons/N2.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2103 -msgid "" -"Clicking this button allows display of the partial pressure of *nitrogen* " -"during the dive." +#: user-manual.txt:2240 +msgid "Show the partial pressure of *nitrogen* during the dive." msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2104 +#: user-manual.txt:2241 #, no-wrap msgid "images/icons/He.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2108 +#: user-manual.txt:2245 msgid "" -"Clicking this button allows display of the partial pressure of *helium* " -"during the dive. This is only important to divers using Trimix, Helitrox or " -"similar breathing gasses." +"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:2121 +#: user-manual.txt:2258 msgid "" "The *air consumption* graph displays the tank pressure and its change during " "the dive. The air consumption takes depth into account so that even when " "manually entering the start and end pressures the graph, is not a straight " -"line. Like the depth graph, the slope of the tank pressure gives you " +"line. Like the depth graph, the slope of the tank pressure provides " "information about the momentary SAC rate (Surface Air Consumption) when " "using an air integrated dive computer. Here the color coding is not " -"relative to some absolute values but relative to the average normalized air " -"consumption during the dive. So areas that are red or orange indicate times " -"of increased normalized air consumption while dark green reflects times when " +"relative to some absolute values but relative to the mean normalized air " +"consumption during the dive. So areas in red or orange indicate times of " +"increased normalized air consumption while dark green reflects times when " "the diver was using less gas than average." msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2122 +#: user-manual.txt:2259 #, no-wrap msgid "images/icons/Heartbutton.png" msgstr "" #. type: Plain text -#: user-manual.txt:2126 +#: user-manual.txt:2263 msgid "" -"Clicking on the heart rate button will allow the display of heart rate " -"information during the dive if the dive computer was attached to a heart " -"rate sensor." +"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:2133 -#, no-wrap +#: user-manual.txt:2269 msgid "" "It is possible to *zoom* into the profile graph. This is done either by " -"using\n" -"the scroll wheel / scroll gesture of your mouse or trackpad. By default\n" +"using the scroll wheel / scroll gesture of the mouse or trackpad. By default " "_Subsurface_ always shows a profile area large enough for at least 30 " -"minutes\n" -"and 30m\n" -" (100ft) – this way short or shallow dives are easily recognizable;\n" -"something free divers won’t care about.\n" +"minutes and 30m (100ft) – this way short or shallow dives are easily " +"recognizable; something free divers won’t care about." msgstr "" #. type: Target for macro image -#: user-manual.txt:2134 +#: user-manual.txt:2270 #, no-wrap msgid "images/MeasuringBar.png" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2136 +#: user-manual.txt:2272 #, no-wrap msgid "images/icons/ruler.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2144 +#: user-manual.txt:2280 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 " @@ -4195,13 +4452,13 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2145 +#: user-manual.txt:2281 #, no-wrap msgid "images/icons/ShowPhotos.png" msgstr "" #. type: Plain text -#: user-manual.txt:2152 +#: user-manual.txt:2288 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 " @@ -4210,7 +4467,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2179 +#: user-manual.txt:2315 msgid "" "The profile can also include the dive computer reported *ceiling* (more " "precisely, the deepest deco stop that the dive computer calculated for each " @@ -4239,7 +4496,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2185 +#: user-manual.txt:2321 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 " @@ -4247,13 +4504,13 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2186 +#: user-manual.txt:2322 #, no-wrap msgid "images/icons/ceiling1.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2191 +#: user-manual.txt:2327 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 " @@ -4262,13 +4519,13 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2192 +#: user-manual.txt:2328 #, no-wrap msgid "images/icons/ceiling2.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2196 +#: user-manual.txt:2332 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 " @@ -4276,414 +4533,295 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2197 +#: user-manual.txt:2333 #, no-wrap msgid "images/icons/ceiling3.jpg" msgstr "" -#. type: Plain text -#: user-manual.txt:2201 +#. type: delimited block = +#: user-manual.txt:2338 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:2202 +#: user-manual.txt:2339 #, no-wrap msgid "images/Ceilings2.jpg" msgstr "" -#. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2204 -#, no-wrap -msgid "images/icons/ShowCylindersButton.jpg" -msgstr "" - -#. type: Plain text -#: user-manual.txt:2210 -msgid "" -"By selecting this icon, the different cylinders used during a dive can be " -"represented as a colored bar at the bottom of the *Dive Profile*. In general " -"oxygen is represented by a green bar, nitrogen a yellow bar and helium a red " -"bar. The image below shows a dive which first uses a trimix cylinder (red " -"and green), followed by a switch to a nitrox cylinder (yellow and green) " -"after 23 minutes. Cylinders with air are shown as a light blue bar." -msgstr "" - -#. type: Target for macro image -#: user-manual.txt:2211 -#, no-wrap -msgid "images/ShowCylinders_f20.jpg" -msgstr "" - -#. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2214 -#, no-wrap -msgid "images/icons/heatmap.png" -msgstr "" - -#. type: Plain text -#: user-manual.txt:2231 -msgid "" -"Display that tissue heat-map. This is a representation of the inert gas " -"pressures in the different tissues of a decompression model. Faster tissues " -"are displayed on top while the slower tissues are shown on the bottom. The " -"color is a representation of the inert gas loading of the tissue. Blue " -"colors indicate the tissue's inert gas pressure is below the ambient " -"pressure and the tissue is currently on-gasing. The more red the color is, " -"the higher the pressure is above the ambient pressure and the tissue is " -"off-gassing potentially releasing inert gases to the environment which can " -"be the cause for the formation of inert gas bubbles. This display is a " -"representation of the tissue pressures during the whole dive. In contrast, " -"the xref:S_gas_pressure_graph[Gas Pressure Graph] in the *Information Box* " -"on the *Dive Profile* is an instantaneous reflection of tissue pressures at " -"the moment in time, at the position of the cursor on the dive profile." -msgstr "" - -#. type: Target for macro image -#: user-manual.txt:2232 -#, no-wrap -msgid "images/tissueHeatmap.jpg" -msgstr "" - -#. type: Plain text -#: user-manual.txt:2240 +#. type: delimited block = +#: user-manual.txt:2342 msgid "" "Gradient Factor settings strongly affect the calculated ceilings and their " -"depths. For more information about Gradient factors, see the section on " -"xref:S_GradientFactors[Gradient Factor Preference settings]. The currently " +"depths. For more information about Gradient factors, see the section on " +"xref:GradientFactors_Ref[Gradient Factor Preference settings]. The currently " "used gradient factors (e.g. GF 35/75) are shown above the depth profile if " -"the appropriate toolbar buttons are activated. *N.B.:* The indicated " -"gradient factors are NOT the gradient factors in use by the dive computer, " -"but those used by _Subsurface_ to calculate deco obligations during the " -"dive. For more information external to this manual see:" +"the appropriate toolbar buttons are activated. N.B.: The indicated gradient " +"factors are NOT the gradient factors in use by the dive computer, but those " +"used by Subsurface to calculate deco obligations during the dive. For more " +"information external to this manual see:" msgstr "" #. type: Plain text -#: user-manual.txt:2242 +#: user-manual.txt:2344 user-manual.txt:3126 #, no-wrap msgid "" -" ** http://www.tek-dive.com/portal/upload/M-Values.pdf[Understanding " +" *** http://www.tek-dive.com/portal/upload/M-Values.pdf[Understanding " "M-values by Erik Baker, _Immersed_ Vol. 3, No. 3.]\n" msgstr "" #. type: Plain text -#: user-manual.txt:2244 +#: user-manual.txt:2346 user-manual.txt:3128 #, no-wrap msgid "" -" ** " +" *** " "link:http://www.rebreatherworld.com/general-and-new-to-rebreather-articles/5037-gradient-factors-for-dummies.html[Gradient " "factors for dummies, by Kevin Watts]\n" msgstr "" -#. type: Title === -#: user-manual.txt:2246 -#, no-wrap -msgid "The Dive Profile context menu" -msgstr "" - -#. type: Plain text -#: user-manual.txt:2265 -msgid "" -"The context menu for the Dive Profile is accessed by right-clicking while " -"the mouse cursor is over the Dive Profile panel. The menu lets you create " -"Bookmarks, Gas Change Event markers, or manual CCR set-point changes other " -"than the ones that might have been imported from a Dive Computer. Markers " -"are placed against the depth profile line, with the time of the event set by " -"where the mouse cursor was when the right mouse button was first clicked to " -"bring up the menu. Gas Change events involve a selection of which gas is " -"being switched TO. The list of choices is based on the available gases " -"defined in the *Equipment* Tab. Setpoint change events open a dialog letting " -"you choose the next setpoint value. As in the planner, a setpoint value of " -"zero shows the diver is breathing from an open circuit system while any " -"non-zero value shows the use of a closed circuit rebreather (CCR). By " -"right-clicking while over an existing marker a menu appears, adding options " -"to allow deletion of the marker, or to allow all markers of that type to be " -"hidden. Hidden events can be restored to view by selecting Unhide all events " -"from the context menu." -msgstr "" - -#. type: Title === -#: user-manual.txt:2267 +#. type: Named 'icon' AttributeList argument for style 'icon' +#: user-manual.txt:2350 #, no-wrap -msgid "The *Information Box*" +msgid "images/icons/ShowCylindersButton.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2276 +#: user-manual.txt:2356 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 " -"*Dive Profile* panel. If the mouse points outside of the *Dive Profile* " -"panel, then only the top line of the Information Box is visible (see " -"left-hand part of figure (*A*) below). The Information Box can be moved " -"around in the *Dive Profile* panel by click-dragging it with the mouse so " -"that it is not obstructing important detail. The position of the Information " -"Box is saved and used again during subsequent dive analyses." +"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 " +"oxygen is represented by a green bar, nitrogen a yellow bar and helium a red " +"bar. The image below shows a dive which first uses a trimix cylinder (red " +"and green), followed by a switch to a nitrox cylinder (yellow and green) " +"after 23 minutes. Cylinders with air are shown as a light blue bar." msgstr "" #. type: Target for macro image -#: user-manual.txt:2277 +#: user-manual.txt:2357 #, no-wrap -msgid "images/InfoBox2.jpg" -msgstr "" - -#. type: Plain text -#: user-manual.txt:2294 -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 " -"time point along the dive profile shown by the mouse cursor (see right-hand " -"part of figure (*B*) above where the Information Box reflects the situation " -"at the position of the cursor [arrow] in that image). Moving the cursor " -"horizontally lets the Information Box show information for any point along " -"the dive profile. In this mode, the Information Box gives extensive " -"statistics about depth, gas and ceiling characteristics of the particular " -"dive. These include: Time period into the dive (indicated by a @), depth, " -"cylinder pressure (P), temperature, ascent/descent rate, surface air " -"consumption (SAC), oxygen partial pressure, maximum operating depth, " -"equivalent air depth (EAD), equivalent narcotic depth (END), equivalent air " -"density depth (EADD), decompression requirements at that instant in time " -"(Deco), time to surface (TTS), the calculated ceiling, as well as the " -"calculated ceiling for several Bühlmann tissue compartments." -msgstr "" - -#. type: Plain text -#: user-manual.txt:2297 -msgid "" -"The user has control over the display of some statistics, shown as four " -"buttons on the left of the profile panel. These are:" +msgid "images/ShowCylinders_f20.jpg" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2298 +#: user-manual.txt:2361 #, no-wrap -msgid "images/icons/MOD.jpg" +msgid "images/icons/heatmap.png" msgstr "" -#. type: Plain text -#: user-manual.txt:2307 +#. type: delimited block = +#: user-manual.txt:2368 msgid "" -"Clicking this button causes the Information Box to display the *Maximum " -"Operating Depth (MOD)* of the dive, given the gas mixture used. MOD is " -"dependent on the oxygen concentration in the breathing gas. For air (21% " -"oxygen) it is around 57 m if a maximum pO~2~ of 1.4 is specified in the " -"*Preferences* section (select _File_ -> Preferences -> Graph_ and edit the " -"text box _Max pO~2~ when showing MOD_. Below the MOD there is a markedly " -"increased risk of exposure to the dangers of oxygen toxicity." +"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 " +"compartments of the Bühlmann model. Blue colours mean low gas pressures in a " +"tissue compartment and thus on-gassing, green to red means excess gas in the " +"tissue and thus off-gassing. Fast to slow tissues are indicated from top to " +"bottom. The figure below explains in greater detail how the heat map can be " +"interpreted." msgstr "" -#. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2308 +#. type: Target for macro image +#: user-manual.txt:2369 #, no-wrap -msgid "images/icons/NDL.jpg" +msgid "images/Heatmap.jpg" msgstr "" -#. type: Plain text -#: user-manual.txt:2320 +#. type: delimited block = +#: user-manual.txt:2377 msgid "" -"Clicking this button causes the Information Box to display either the " -"*No-deco Limit (NDL)* or the *Total Time to Surface (TTS)*. NDL is the time " -"duration that a diver can continue with a dive, given the present depth, " -"that does not require decompression (that is, before an ascent ceiling " -"appears). Once a diver has exceeded the NDL and decompression is required " -"(that is, there is an ascent ceiling above the diver) then TTS gives the " -"number of minutes required before the diver can surface. TTS includes ascent " -"time as well as decompression time. TTS is calculated assuming an ascent " -"surface air consumption (SAC) for the gas currently used. Even if the " -"profile contains several gas switches, TTS at a specific moment during the " -"dive is calculated using the current gas. TTS longer than 2 hours is not " -"accurately calculated and Subsurface only indicates _TTS > 2h_." -msgstr "" - -#. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2321 -#, no-wrap -msgid "images/icons/SAC.jpg" +"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 " +"pressures at a particular point in time during the dive. The inert gas " +"pressures of 16 tissue compartments are shown as dark green vertical bars " +"with the quick tissue compartments on the left and the slow tissue " +"compartments on the right. Refer to the section on the " +"xref:S_gas_pressure_graph[Gas Pressure Graph] for more details on the " +"different elements of this graph." msgstr "" -#. type: Plain text -#: user-manual.txt:2330 +#. type: delimited block = +#: user-manual.txt:2385 msgid "" -"Clicking this button causes the Information Box to display the *Surface Air " -"Consumption (SAC)*. SAC is an indication of the surface-normalized " -"respiration rate of a diver. The value of SAC is less than the real " -"respiration rate because a diver at 10m uses breathing gas at a rate roughly " -"double that of the equivalent rate at the surface. SAC gives an indication " -"of breathing gas consumption rate independent of the depth of the dive, so " -"the respiratory rates of different dives can be compared. The units for SAC " -"is liters/min or cubic ft/min." +"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 " +"green vertical bars of *A* to a colour in *B*. For instance, the fastest " +"(leftmost) dark green verical bar in *A* has a height corresponding to the " +"medium green part of *B*. The height of this bar can therefore be summarised " +"using a medium green colour. Similarly, the highest dark green bar in *A* is " +"as high as the yellow part of *B*. The 14 remaining tissue pressure bars in " +"*A* can also be translated to colours. The colours represent three ranges of " +"tissue inert gas pressure:" msgstr "" -#. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2331 -#, no-wrap -msgid "images/icons/EAD.jpg" -msgstr "" - -#. type: Plain text -#: user-manual.txt:2346 +#. type: delimited block = +#: user-manual.txt:2393 msgid "" -"Clicking this button displays the *Equivalent Air Depth (EAD)* for nitrox " -"dives as well as the *Equivalent Narcotic Depth (END)* for trimix " -"dives. These are important to divers breathe gases other than air. Their " -"values are dependent on the composition of the breathing gas. The EAD is " -"the depth of a hypothetical air dive that has the same partial pressure of " -"nitrogen as the current depth of the nitrox dive at hand. A nitrox dive " -"leads to the same decompression obligation as an air dive to the depth " -"equalling the EAD. The END is the depth of a hypothetical air dive that has " -"the same sum of partial pressures of the narcotic gases nitrogen and oxygen " -"as the current trimix dive. A trimix diver can expect the same narcotic " -"effect as a diver breathing air diving at a depth equalling the END." +"The bottom range in *B* (marked _On-gassing_) includes colours from light " +"blue to black, representing tissue gas pressures below the equilibrium " +"pressure of inert gas (bottom horizontal line in *A*). The measurement unit " +"is the % of inert gas pressure, relative to the equilibrium inert gas " +"pressure. In this range on-gassing of inert gas takes place because the " +"inert gas pressure in the tissue compartment is lower than in the " +"surrounding environment. Black areas in the heat map indicate that a tissue " +"compartment has reached the equilibrium inert gas pressure, i.e. the inert " +"gas pressure in the tissue compartment equals that of the water in which the " +"diver is. The equilibrium pressure changes according to depth." msgstr "" -#. type: Plain text -#: user-manual.txt:2348 +#. type: delimited block = +#: user-manual.txt:2399 msgid "" -"Figure (*B*) above shows an information box with a nearly complete set of " -"data." -msgstr "" - -#. type: Title ==== -#: user-manual.txt:2350 -#, no-wrap -msgid "The Gas Pressure Bar Graph" +"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 " +"equilibrium pressure but less than the ambient pressure. In this zone " +"decompression is not very efficient because the gradient of inert gas " +"pressure from tissue to the environment is relatively small and indicated by " +"dark green areas of the heat map." msgstr "" -#. type: Plain text -#: user-manual.txt:2357 +#. type: delimited block = +#: user-manual.txt:2408 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 " -"applicable) that the diver was inhaling _at a particular instant during the " -"dive_. It is shown by the position of the cursor on the *Dive Profile*. The " -"drawing on the left below indicates the meaning of the different parts of " -"the Gas Pressure Bar Graph." +"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 " +"total ambient pressure (top of light green area of *A*). The measurement " +"unit is the % of inert gas pressure above ambient pressure, relative to the " +"Bühlmann M-value gradient (bottom of red area in *A*). These tissue " +"pressures are normally reached while ascending to a shallower depth. Below " +"a value of 100%, this range indicates efficient off-gassing of inert gas " +"from the tissue compartment into the environment. Usually, efficient " +"off-gassing is indicated by light green, yellow or orange colours. Above " +"100% (red to white in *B*) the M-value gradient is exceeded and the " +"probability of decompression sickness increases markedly." msgstr "" -#. type: Target for macro image -#: user-manual.txt:2358 -#, no-wrap -msgid "images/GasPressureBarGraph.jpg" -msgstr "" - -#. type: Plain text -#: user-manual.txt:2364 +#. type: delimited block = +#: user-manual.txt:2416 msgid "" -"The light green area indicates the total gas, with the top margin of the " -"light green area showing the total gas pressure inhaled by the diver and " -"measured from the bottom of the graph to the top of the light green " -"area. This pressure has a _relative_ value in the graph and does not " -"indicate absolute pressure." +"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 " +"compartments at the bottom of *C*. The highest vertical bar in *A* (vertical " +"bar 3rd from the left) is presented as the yellow rectangle 3rd from the top " +"in *C*. The 16 vertical bars in *A* are now presented as a vertical column " +"of 16 coloured rectangles, representing a snapshot of tissue compartment gas " +"pressures at a particular instant during the dive." msgstr "" -#. type: Plain text -#: user-manual.txt:2370 +#. type: delimited block = +#: user-manual.txt:2423 msgid "" -"The horizontal black line underneath the light green margin indicates the " -"equilibrium pressure of the inert gases inhaled by the diver, usually " -"nitrogen. In the case of trimix, it is the pressures of nitrogen and helium " -"combined. In this example, the user is diving with EAN32, so the inert gas " -"pressure is 68% of the distance from the bottom of the graph to the total " -"gas pressure value." +"Image *D* is a compilation of similar colour mappings of 16 tissue " +"compartments during a 10-minute period of a dive, the colours representing " +"the inert gas loading of a tissue compartment at a point in time during the " +"dive. Faster tissues are shown at the top and slower tissues at the bottom, " +"with time forming the horizontal axis of the graph. The column of rectangles " +"in *C* can be found on the horizontal axis between 9 and 10 minutes." msgstr "" -#. type: Plain text -#: user-manual.txt:2374 +#. type: delimited block = +#: user-manual.txt:2427 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 " -"algorithm, the fast tissues being on the left hand side." +"The colours of the heat map are not affected by the gradient factor " +"settings. This is because the heat map indicates tissue pressures relative " +"to the Bühlmann M-value gradient, and not relative to any specific gradient " +"factor. For more information external to this manual see:" msgstr "" -#. type: Plain text -#: user-manual.txt:2379 +#. type: delimited block = +#: user-manual.txt:2429 msgid "" -"The top black horizontal line indicates the gradient factor that applies to " -"the depth of the diver at the particular point on the *Dive Profile*. The " -"gradient factor shown is an interpolation between the GFLow and GFHigh " -"values specified in the Graph tab of the *Preferences Panel* of " -"*Subsurface*." +"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:2383 +#. type: delimited block = +#: user-manual.txt:2432 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 " -"is expected to be severe, resulting in decompression sickness." +"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 " +"decompression model." msgstr "" -#. type: Plain text -#: user-manual.txt:2386 +#. type: delimited block = +#: user-manual.txt:2436 msgid "" -"These five values are shown on the left in the graph above. The way the Gas " -"Pressure Bar Graph changes during a dive can be seen on the right hand side " -"of the above figure for a diver using EAN32." +"The image below compares the profiles and heat maps for two planned " +"decompression dives to 60m: the first using the Bühlmann decompression " +"model, the second using the VPM-B decompression model. Both profiles have " +"the same total decompression time, but the VPM-B model requires deeper stops " +"early in the acent phase." msgstr "" -#. type: Plain text -#: user-manual.txt:2389 +#. type: delimited block = +#: user-manual.txt:2441 msgid "" -"Graph *A* indicates the start of a dive with the diver at the surface. The " -"pressures in all the tissue compartments are still at the equilibrium " -"pressure because no diving has taken place." +"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, " +"with the colors transitioning from light blue through blue and purple to " +"black. Similarly, the inert gas pressure in the fast tissues reduces more " +"rapidly than the slow tissues at each decompression stop, with colors " +"transitioning from red, orange and yellow to green and black." msgstr "" -#. type: Plain text -#: user-manual.txt:2392 +#. type: delimited block = +#: user-manual.txt:2446 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 " -"pressures are far below the equilibrium gas pressure." +"The comparison of the two profiles and heatmaps shows that by including deep " +"stops, the oversaturation gradient in the faster tissues early in ascent " +"phase is reduced. However, on-gassing of slower tissues continues during " +"the deep stops, which leads to greater oversaturation gradient in slower " +"tissues at the end of the dive." msgstr "" -#. type: Plain text -#: user-manual.txt:2397 -msgid "" -"Graph *C* represents the pressures after 30 minutes at 30 m. The fast " -"compartments have attained equilibrium (i.e. they have reached the hight of " -"the black line indicating the equilibrium pressure). The slower compartments " -"(towards the right) have not reached equilibrium and are in the process of " -"slowly increasing in pressure." +#. type: Target for macro image +#: user-manual.txt:2447 +#, no-wrap +msgid "images/tissueHeatmap.jpg" msgstr "" -#. type: Plain text -#: user-manual.txt:2403 -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 " -"bar to 1.45 bar, the pressures in the different tissue compartments now " -"exceed that of the total gas pressure and approach the gradient factor value " -"(i.e. the top black horizontal line). Further ascent will result in " -"exceeding the gradient factor value (GFHigh), endangering the diver." +#. type: Title ==== +#: user-manual.txt:2450 +#, no-wrap +msgid "The Dive Profile context menu" msgstr "" #. type: Plain text -#: user-manual.txt:2408 +#: user-manual.txt:2469 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 " -"pressures in the slow compartments have not changed much. The pressures in " -"the fast compartments do not approach the GFHigh value any more and the " -"diver is safer than in the situation indicated in graph *D*." +"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 " +"than the ones that might have been imported from a Dive Computer. Markers " +"are placed against the depth profile line, with the time of the event " +"determined by the mouse cursor when the right mouse button was clicked to " +"bring up the menu. Gas Change events involve a selection of which gas is " +"being switched TO. The list of choices is based on the available gases " +"defined in the *Equipment* Tab. Setpoint change events open a dialog letting " +"you choose the next setpoint value. As in the planner, a setpoint value of " +"zero shows the diver is breathing from an open circuit system while any " +"non-zero value shows the use of a closed circuit rebreather (CCR). By " +"right-clicking while over an existing marker a menu appears, adding options " +"to allow deletion of the marker, or to allow all markers of that type to be " +"hidden. Hidden events can be restored to view by selecting Unhide all events " +"from the context menu." msgstr "" #. type: Title == -#: user-manual.txt:2411 +#: user-manual.txt:2470 #, no-wrap msgid "Organizing the logbook (Manipulating groups of dives)" msgstr "" #. type: Title === -#: user-manual.txt:2413 +#: user-manual.txt:2473 #, no-wrap msgid "The Dive List context menu" msgstr "" #. type: Plain text -#: user-manual.txt:2417 +#: user-manual.txt:2477 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 " @@ -4692,115 +4830,115 @@ msgstr "" #. TODO: NEEDS REPLACEMENT #. type: Target for macro image -#: user-manual.txt:2419 +#: user-manual.txt:2479 #, no-wrap msgid "images/ContextMenu.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2422 +#: user-manual.txt:2482 msgid "The context menu is used in many functions described below." msgstr "" #. type: Title ==== -#: user-manual.txt:2423 +#: user-manual.txt:2483 #, no-wrap msgid "Customizing the columns showed in the *Dive List* panel" msgstr "" #. type: Target for macro image -#: user-manual.txt:2425 +#: user-manual.txt:2485 #, no-wrap msgid "images/DiveListOptions.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2433 +#: user-manual.txt:2493 msgid "" "The default information in the *Dive List* includes, for each dive, " "Dive_number, Date, Rating, Dive_depth, Dive_duration and Dive_location. This " "information can be controlled and changed by right-clicking on the header " "bar of the *Dive List*. For instance, a right-click on the 'Date' header " "brings up a list of items that can be shown in the dive list (see " -"above). Select an item to be shown in the *Dive List* or be deleted " +"above). Select an item to be included in the *Dive List* or to be deleted " "(reflected by the check symbols) and the list is immediately " "updated. Preferences for information shown in the *Dive List* are saved and " "used when _Subsurface_ is re-opened." msgstr "" #. type: Title === -#: user-manual.txt:2435 +#: user-manual.txt:2495 #, no-wrap msgid "Renumbering the dives" msgstr "" #. type: Plain text -#: user-manual.txt:2447 +#: user-manual.txt:2507 msgid "" "Dives are normally numbered incrementally from non-recent dives (low " "sequence numbers) to recent dives (higher sequence numbers). Numbering of " "dives is not always consistent. For instance, when non-recent dives are " "added, correct numbering does not automatically follow on because of the " "dives that are more recent in date/time than the newly-added dive with an " -"older date/time. So you may need to renumber the dives. Do this by " -"selecting (from the Main Menu) _Log -> Renumber_. Users are given a choice " -"of the lowest sequence number to be used. This results in new sequence " -"numbers (based on date/time) for the dives in the *Dive List* panel." +"older date/time. This requires renumbering the dives. Do this by selecting " +"(from the Main Menu) _Log -> Renumber_. Provide the lowest sequence number " +"to be used. This results in new sequence numbers (based on date/time) for " +"all the dives in the *Dive List* panel." msgstr "" #. type: Plain text -#: user-manual.txt:2452 +#: user-manual.txt:2512 msgid "" -"You can also renumber a few selected dives in the dive list. Select the " -"dives that need renumbering. Right-click on the selected list and use the " -"Dive List Context Menu to perform the renumbering. A popup window appears " -"letting the user specify the starting number for the process." +"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 " +"List Context Menu to perform the renumbering. A popup window appears letting " +"the user specify the starting number for the process." msgstr "" #. type: Title === -#: user-manual.txt:2454 +#: user-manual.txt:2514 #, no-wrap msgid "Grouping dives into trips and manipulating trips" msgstr "" #. type: Plain text -#: user-manual.txt:2462 +#: user-manual.txt:2522 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/times not separated in time by more than two days, so creating a single " -"heading for each diving trip represented in the dive log. Below is an " -"ungrouped dive list (*A*, on the left) as well as the corresponding grouped " -"dive list of five dive trips (*B*, on the right):" +"date/times not separated by more than two days and creating a single heading " +"for each diving trip represented in the dive log. Below is an ungrouped dive " +"list (*A*, on the left) as well as the corresponding grouped dive list of " +"five dive trips (*B*, on the right):" msgstr "" #. type: Target for macro image -#: user-manual.txt:2463 +#: user-manual.txt:2523 #, no-wrap msgid "images/Group2.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2469 +#: user-manual.txt:2529 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, " -"(from the Main Menu) select _Log -> Autogroup_. The *Dive List* panel now " +"(from the Main Menu) select _Log -> Auto group_. The *Dive List* panel now " "shows only the titles for the trips." msgstr "" #. type: Title ==== -#: user-manual.txt:2470 +#: user-manual.txt:2530 #, no-wrap msgid "Editing the title and associated information for a particular trip" msgstr "" #. type: Plain text -#: user-manual.txt:2483 +#: user-manual.txt:2543 msgid "" "Normally, in the dive list, minimal information is included in the trip " "title. More information about a trip can be added by selecting its trip " -"title from the *Dive List*. This shows a *Trip Notes* tab in the *Notes* " +"title bar from the *Dive List*. This shows a *Trip Notes* tab in the *Notes* " "panel. Here you can add or edit information about the date/time, the trip " "location and any other general comments about the trip as a whole (e.g. the " "dive company that was used, the general weather and surface conditions " @@ -4810,27 +4948,28 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2484 +#: user-manual.txt:2544 #, no-wrap msgid "Viewing the dives during a particular trip" msgstr "" #. type: Plain text -#: user-manual.txt:2489 +#: user-manual.txt:2549 msgid "" "Once the dives have been grouped into trips, you can expand one or more " -"trips by clicking the arrow-head on the left of each trip title. This " -"expands the selected trip, revealing individual dives done during the trip." +"trips by clicking the expansion button [+/-] on the left of each trip " +"title. This expands the selected trip, revealing individual dives during the " +"trip." msgstr "" #. type: Title ==== -#: user-manual.txt:2490 +#: user-manual.txt:2550 #, no-wrap msgid "Collapsing or expanding dive information for different trips" msgstr "" #. type: Plain text -#: user-manual.txt:2495 +#: user-manual.txt:2555 msgid "" "After selecting a particular trip in the dive list, the context menu allows " "several options to expand or collapse dives within trips. This includes " @@ -4838,13 +4977,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2496 +#: user-manual.txt:2556 #, no-wrap msgid "Merging dives from more than one trip into a single trip" msgstr "" #. type: Plain text -#: user-manual.txt:2501 +#: user-manual.txt:2561 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 " @@ -4852,13 +4991,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2502 +#: user-manual.txt:2562 #, no-wrap msgid "Splitting a single trip into more than one trip" msgstr "" #. type: Plain text -#: user-manual.txt:2511 +#: user-manual.txt:2571 msgid "" "If a trip includes ten dives, you can split this trip into two trips (trip " "1: top 4 dives; trip 2: bottom 6 dives) by selecting and right-clicking the " @@ -4869,25 +5008,25 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2512 +#: user-manual.txt:2572 #, no-wrap msgid "images/SplitDive3a.jpg" msgstr "" #. type: Title === -#: user-manual.txt:2514 +#: user-manual.txt:2574 #, no-wrap msgid "Manipulating single dives" msgstr "" #. type: Title ==== -#: user-manual.txt:2516 +#: user-manual.txt:2576 #, no-wrap msgid "Delete a dive from the dive log" msgstr "" #. type: Plain text -#: user-manual.txt:2523 +#: user-manual.txt:2583 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 " @@ -4897,13 +5036,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2524 +#: user-manual.txt:2584 #, no-wrap msgid "Unlink a dive from a trip" msgstr "" #. type: Plain text -#: user-manual.txt:2531 +#: user-manual.txt:2591 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 " @@ -4913,13 +5052,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2532 +#: user-manual.txt:2592 #, no-wrap msgid "Add a dive to the trip immediately above" msgstr "" #. type: Plain text -#: user-manual.txt:2537 +#: user-manual.txt:2597 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 " @@ -4927,13 +5066,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2538 +#: user-manual.txt:2598 #, no-wrap msgid "Shift the start time of dive(s)" msgstr "" #. type: Plain text -#: user-manual.txt:2548 +#: user-manual.txt:2608 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 " @@ -4945,39 +5084,39 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2549 +#: user-manual.txt:2609 #, no-wrap msgid "Merge dives into a single dive" msgstr "" #. type: Plain text -#: user-manual.txt:2559 +#: user-manual.txt:2619 msgid "" "Sometimes a dive is briefly interrupted, for example, if a diver returns to " -"the surface for a few minutes. That results in two or more dives being " -"recorded by the dive computer and appearing as different dives in the *Dive " -"List* panel. You can merge these dives onto a single dive by selecting the " -"appropriate dives, right-clicking them to bring up the context menu and then " -"selecting *Merge selected dives*. It may be necessary to edit the dive " -"information in the *Notes* panel to reflect events or conditions that apply " -"to the merged dive. The figure below shows the depth profile of two dives " -"that were merged:" +"the surface for a few minutes, resulting in two or more dives being recorded " +"by the dive computer and appearing as different dives in the *Dive List* " +"panel. Merge these dives onto a single dive by selecting the appropriate " +"dives, right-clicking them to bring up the context menu and then selecting " +"*Merge selected dives*. It may be necessary to edit the dive information in " +"the *Notes* panel to reflect events or conditions that apply to the merged " +"dive. The figure below shows the depth profile of two dives that were " +"merged:" msgstr "" #. type: Target for macro image -#: user-manual.txt:2560 +#: user-manual.txt:2620 #, no-wrap msgid "images/MergedDive.png" msgstr "" #. type: Title ==== -#: user-manual.txt:2562 +#: user-manual.txt:2622 #, no-wrap msgid "Undo dive manipulations" msgstr "" #. type: Plain text -#: user-manual.txt:2568 +#: user-manual.txt:2628 msgid "" "Important actions on dives or trips, described above, can be undone or " "redone. This includes: _delete dives_, _merge dives_, _renumber dives_ and " @@ -4987,43 +5126,43 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:2571 +#: user-manual.txt:2631 #, no-wrap msgid "Filtering the dive list" msgstr "" #. type: Plain text -#: user-manual.txt:2577 +#: user-manual.txt:2637 msgid "" -"The dives in the *Dive List* panel can be filtered, so you can select only " -"some of the dives based on their attributes, e.g. dive tags, dive site, dive " -"master, buddy or protective clothing. For instance, filtering lets you list " -"the deep dives at a particular dive site, or otherwise the cave dives with a " +"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, dive master, " +"buddy or protective clothing. For instance, filtering lets you list the deep " +"dives at a particular dive site, or otherwise the cave dives with a " "particular buddy." msgstr "" #. type: Plain text -#: user-manual.txt:2585 +#: user-manual.txt:2645 msgid "" "To open the filter, select _Log -> Filter divelist_ from the main menu. This " "opens the _Filter Panel_ at the top of the _Subsurface_ window. Three icons " "are located at the top right hand of the filter panel (see image below). The " "_Filter Panel_ can be reset (i.e. all current filters cleared) by selecting " "the *yellow angled arrow*. The _Filter Panel_ may also be minimized by " -"selecting the *green up-arrow\". When minimized, only these three icons are " +"selecting the *green up-arrow*. When minimized, only these three icons are " "shown. The panel can be maximized by clicking the same icon that minimized " "it. The filter may also be reset and closed by selecting the *red button* " "with the white cross." msgstr "" #. type: Target for macro image -#: user-manual.txt:2586 +#: user-manual.txt:2646 #, no-wrap msgid "images/Filterpanel.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2595 +#: user-manual.txt:2655 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 " @@ -5036,7 +5175,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2603 +#: user-manual.txt:2663 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 " @@ -5048,67 +5187,67 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:2605 +#: user-manual.txt:2665 #, no-wrap msgid "Exporting the dive log or parts of the dive log" msgstr "" #. type: Plain text -#: user-manual.txt:2608 +#: user-manual.txt:2668 msgid "There are two ways to export dive information from Subsurface:" msgstr "" #. type: Plain text -#: user-manual.txt:2610 +#: user-manual.txt:2670 msgid "Export dive information to _Facebook_" msgstr "" #. type: Plain text -#: user-manual.txt:2612 +#: user-manual.txt:2672 msgid "" "xref:S_Export_other[Export dive information to other destinations or " "formats]" msgstr "" #. type: Title === -#: user-manual.txt:2614 +#: user-manual.txt:2674 #, no-wrap msgid "Exporting dive information to _Facebook_" msgstr "" #. type: Plain text -#: user-manual.txt:2623 +#: user-manual.txt:2683 msgid "" "Export of dives to _Facebook_ is handled differently from other types of " "export because a connection to _Facebook_ is required, needing a _Facebook_ " -"userID and password. If, from the *Main Menu*, you select _File -> " -"Preferences -> Facebook_, a login screen comes up. (image *A* to the left, " +"userID and password. If, from the *Main Menu*, you select _Share on -> " +"Connect to -> Facebook_, a login screen comes up. (image *A* to the left, " "below). Provide a _Facebook_ userID and password. Once logged into to " "_Facebook_ , the panel in image *B*, below is shown, including a _Disconnect " "from Facebook_ button to close the _Facebook_ connection." msgstr "" #. type: Target for macro image -#: user-manual.txt:2624 +#: user-manual.txt:2684 #, no-wrap msgid "images/facebook1_f20.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2629 +#: user-manual.txt:2689 msgid "" "From the _Subsurface_ window it’s easy to determine whether _Subsurface_ has " -"a valid connection to _Facebook_ From the *Main Menu*, select _Share on -> " -"Facebook_ (image *A*, below). Normally, the _Facebook_ option is greyed " -"out. But if there is a connection to _Facebook_, this option is active " -"(i.e. in black color and can be selected)." +"a valid connection to _Facebook_ From the *Main Menu*, select _Share on_ " +"(image *A*, below). Normally, the _Facebook_ option is greyed out. But if " +"there is a connection to _Facebook_, this option is active (i.e. in black " +"color and can be selected)." msgstr "" #. type: Plain text -#: user-manual.txt:2640 +#: user-manual.txt:2700 msgid "" "Having established a login to _Facebook_, transferring a dive profileto a " -"_Facebook_ timeline is easy. Be sure the dive to be transferred to the " +"_Facebook_ timeline is easy. Ensure that the dive to be transferred to the " "timeline is shown in the _Subsurface_ *Dive Profile* panel. If, from the " "*Main Menu*, you select _Share on -> Facebook_ (see image *A* below), a " "dialogue box is shown, determining the amount of additional information " @@ -5125,7 +5264,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2645 +#: user-manual.txt:2705 msgid "" "Both the album created and the post to your timeline will be marked as " "private. In order for friends to be able to see it, change its permissions " @@ -5133,13 +5272,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2646 +#: user-manual.txt:2706 #, no-wrap msgid "images/facebook2_f20.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2650 +#: user-manual.txt:2710 msgid "" "If required, then close the _Facebook_ connection by either closing " "_Subsurface_ or by selecting _File -> Preferences -> Facebook_ from the Main " @@ -5147,13 +5286,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:2652 +#: user-manual.txt:2712 #, no-wrap msgid "Export dive information to other destinations or formats" msgstr "" #. type: Plain text -#: user-manual.txt:2657 +#: user-manual.txt:2717 msgid "" "For non-_Facebook exports_, the export function can be found by selecting " "_File -> Export_, which brings up the Export dialog. This dialog always " @@ -5163,23 +5302,23 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2658 +#: user-manual.txt:2718 #, no-wrap msgid "images/Export_f20.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2661 -msgid "A dive log or part of it can be saved in three formats:" +#: user-manual.txt:2721 +msgid "A dive log or part of it can be saved in several formats:" msgstr "" #. type: Plain text -#: user-manual.txt:2663 +#: user-manual.txt:2723 msgid "_Subsurface XML_ format. This is the native format used by _Subsurface_." msgstr "" #. type: Plain text -#: user-manual.txt:2667 +#: user-manual.txt:2727 msgid "" "Universal Dive Data Format (_UDDF_). Refer to _http://uddf.org_ for more " "information. UDDF is a generic format that enables communication among many " @@ -5187,7 +5326,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2671 +#: user-manual.txt:2731 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 " @@ -5196,7 +5335,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2675 +#: user-manual.txt:2735 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 " @@ -5204,7 +5343,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2680 +#: user-manual.txt:2740 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, " @@ -5213,7 +5352,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2683 +#: user-manual.txt:2743 msgid "" "_CSV dive profile_, that includes a large amount of detail for each dive, " "including the depth profile, temperature and pressure information of each " @@ -5221,24 +5360,24 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2696 +#: user-manual.txt:2756 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 " "must be enabled. The HTML export cannot be changed or edited. It contains " "most of the information recorded in the dive log. However, it does not show " -"the calculated values in the *Dive Profile* panel, e.g. calculated cylinder " -"pressure, gas pressures and MOD. The HTML export contains a search option to " -"search the dive log. HTML export is specified on the second tab of the " -"Export dialog (image *B* above). A typical use of this option is to export " -"all one's dives to a smartphone or a tablet where it would serve as a " -"portable record of dives. That is useful for dive companies that wish to " -"verify the dive history of a diver, often doing away with the need to carry " +"the calculated values in the *Dive Profile* panel, e.g. dive ceiling, " +"calculated cylinder pressure, gas pressures and MOD. The HTML export " +"contains a search option to search the dive log. HTML export is specified on " +"the second tab of the Export dialog (image *B* above). A typical use of this " +"option is to export all your dives to a smartphone or a tablet where it " +"would serve as a portable record of dives, useful for dive companies wishing " +"to verify the dive history of a diver, and doing away with the need to carry " "an original logbook when doing dives with dive companies." msgstr "" #. type: Plain text -#: user-manual.txt:2701 +#: user-manual.txt:2761 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 " @@ -5247,13 +5386,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2702 +#: user-manual.txt:2762 #, no-wrap msgid "images/mapview_f20.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2709 +#: user-manual.txt:2769 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 " @@ -5262,12 +5401,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2711 +#: user-manual.txt:2771 msgid "_General Settings_, under the HTML tab, provides the following options:" msgstr "" #. type: Plain text -#: user-manual.txt:2719 +#: user-manual.txt:2779 #, no-wrap msgid "" "** Subsurface Numbers: if this option is checked, the dive(s) are exported " @@ -5285,30 +5424,30 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2722 +#: user-manual.txt:2782 msgid "" "Under _Style Options_ some style-related options are available like font " "size and theme." msgstr "" #. type: Plain text -#: user-manual.txt:2725 +#: user-manual.txt:2785 msgid "" "Export to other formats can be done through third party facilities, for " "instance _www.divelogs.de_." msgstr "" #. type: Title == -#: user-manual.txt:2727 +#: user-manual.txt:2787 #, no-wrap msgid "Keeping a _Subsurface_ dive log in the Cloud" msgstr "" #. type: Plain text -#: user-manual.txt:2737 +#: user-manual.txt:2797 msgid "" "For each diver, dive log information is highly important. Not only is it a " -"record of diving activities for one's own pleasure, but it’s important " +"record of diving activities for your pleasure, but it’s important " "information required for admission to training courses or sometimes even " "diving sites. The security of the dive log is critical. To have a dive log " "that is resistant to failure of a home computer hard drive, loss or theft of " @@ -5319,7 +5458,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2743 +#: user-manual.txt:2803 msgid "" "_Subsurface_ includes access to a transparently integrated cloud storage " "back end that is available to all Subsurface users. Storing and retrieving a " @@ -5330,13 +5469,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:2744 +#: user-manual.txt:2804 #, no-wrap msgid "Create a cloud storage account" msgstr "" #. type: Plain text -#: user-manual.txt:2761 +#: user-manual.txt:2821 #, no-wrap msgid "" "** Open the *Network Preferences* by selecting _File_ -> _Preferences_ -> " @@ -5364,13 +5503,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:2762 +#: user-manual.txt:2822 #, no-wrap msgid "Using _Subsurface cloud storage_" msgstr "" #. type: Plain text -#: user-manual.txt:2772 +#: user-manual.txt:2832 #, no-wrap msgid "" "** Once the cloud storage has been initialized, two new items appear in " @@ -5389,7 +5528,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2777 +#: user-manual.txt:2837 #, no-wrap msgid "" "** _Subsurface_ keeps a local copy of the data and the cloud facility " @@ -5402,13 +5541,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:2779 +#: user-manual.txt:2839 #, no-wrap msgid "Web access to _Subsurface cloud storage_" msgstr "" #. type: Plain text -#: user-manual.txt:2789 +#: user-manual.txt:2849 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 " @@ -5421,15 +5560,15 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:2790 +#: user-manual.txt:2850 #, no-wrap msgid "Other cloud services" msgstr "" #. type: Plain text -#: user-manual.txt:2800 +#: user-manual.txt:2860 msgid "" -"If you prefers not to use the integrated cloud storage of dive logs (and " +"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 " "using several of the existing facilities on the Internet. For instance " "http://www.dropbox.com/[_Dropbox_] offers a free application that allows " @@ -5438,13 +5577,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2801 +#: user-manual.txt:2861 #, no-wrap msgid "images/Cloud.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2810 +#: user-manual.txt:2870 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, " @@ -5457,7 +5596,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2817 +#: user-manual.txt:2877 msgid "" "In this way a dive log in your _Dropbox_ folder can be accessed seamlessly " "from the Internet and can be accessed anywhere with Internet " @@ -5467,7 +5606,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2823 +#: user-manual.txt:2883 msgid "" "Alternatively you can use _Dropbox_ as a way back up your dive log. To Store " "a dive log on _Dropbox_, select _File -> Save as_ from the _Subsurface_ main " @@ -5478,20 +5617,20 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2826 +#: user-manual.txt:2886 msgid "" "Several paid services exist on the Internet (e.g. Google, Amazon) where the " "same process could be used for the Cloud-based storage of dive logs." msgstr "" #. type: Title == -#: user-manual.txt:2829 +#: user-manual.txt:2889 #, no-wrap msgid "Printing a dive log" msgstr "" #. type: Plain text -#: user-manual.txt:2833 +#: user-manual.txt:2893 #, no-wrap msgid "" "_Subsurface_ provides a simple and flexible way to print a whole dive log or " @@ -5501,19 +5640,19 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2835 +#: user-manual.txt:2895 msgid "Some decisions need to be made before printing:" msgstr "" #. type: Plain text -#: user-manual.txt:2838 +#: user-manual.txt:2898 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:2840 +#: user-manual.txt:2900 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 " @@ -5521,7 +5660,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2843 +#: user-manual.txt:2903 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 " @@ -5529,35 +5668,35 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2844 user-manual.txt:4298 +#: user-manual.txt:2904 user-manual.txt:4366 #, no-wrap msgid "images/Print1_f22.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2847 +#: user-manual.txt:2907 msgid "Under _Print type_ select one of two options:" msgstr "" #. type: Plain text -#: user-manual.txt:2849 +#: user-manual.txt:2909 msgid "" "_Dive list print_: Print dives from the *Dive List* panel with profiles and " "other information." msgstr "" #. type: Plain text -#: user-manual.txt:2850 +#: user-manual.txt:2910 msgid "_Statistics print_: Print yearly statistics of the dives." msgstr "" #. type: Plain text -#: user-manual.txt:2852 +#: user-manual.txt:2912 msgid "Under _Print options_ select:" msgstr "" #. type: Plain text -#: user-manual.txt:2857 +#: user-manual.txt:2917 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 " @@ -5565,73 +5704,73 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2859 +#: user-manual.txt:2919 msgid "" -"Printing in color, done by checking the box with _Print in color. If this " +"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:2862 +#: user-manual.txt:2922 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:2864 +#: user-manual.txt:2924 msgid "_Table_: This prints a summary table of all dives selected (see below)." msgstr "" #. type: Target for macro image -#: user-manual.txt:2865 +#: user-manual.txt:2925 #, no-wrap msgid "images/Print_summarylist_f22.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2868 +#: user-manual.txt:2928 msgid "" "_Flow layout_: Print the text associated with each dive without printing the " "dive profiles" msgstr "" #. type: Plain text -#: user-manual.txt:2869 +#: user-manual.txt:2929 msgid "of each dive (see below):" msgstr "" #. type: Target for macro image -#: user-manual.txt:2870 +#: user-manual.txt:2930 #, no-wrap msgid "images/Print_flow_layout_f22.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2873 +#: user-manual.txt:2933 msgid "" "_One Dive_: Print one dive per page, also showing the dive profile (see " "below)" msgstr "" #. type: Target for macro image -#: user-manual.txt:2874 +#: user-manual.txt:2934 #, no-wrap msgid "images/print2_f22.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2878 +#: user-manual.txt:2938 msgid "_Two Dives_: Print two dives per page, also showing the dive profiles." msgstr "" #. type: Plain text -#: user-manual.txt:2879 +#: user-manual.txt:2939 msgid "_Six Dives_: Print six dives per page, also showing the dive profiles." msgstr "" #. type: Plain text -#: user-manual.txt:2883 +#: user-manual.txt:2943 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 " @@ -5640,7 +5779,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2887 +#: user-manual.txt:2947 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 " @@ -5649,13 +5788,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2888 +#: user-manual.txt:2948 #, no-wrap msgid "images/Print_print_f22.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2893 +#: user-manual.txt:2953 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 " @@ -5664,19 +5803,19 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2894 +#: user-manual.txt:2954 #, no-wrap msgid "images/Printpreview.jpg" msgstr "" #. type: Title === -#: user-manual.txt:2896 +#: user-manual.txt:2956 #, no-wrap msgid "Writing a custom print template (advanced)" msgstr "" #. type: Plain text -#: user-manual.txt:2902 +#: user-manual.txt:2962 msgid "" "Writing a custom template is an effective way to produce highly customized " "printouts. Subsurface uses HTML templates to render printing. You can create " @@ -5687,13 +5826,13 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:2904 +#: user-manual.txt:2964 #, no-wrap msgid "Configuring a dive computer" msgstr "" #. type: Plain text -#: user-manual.txt:2913 +#: user-manual.txt:2973 msgid "" "_Subsurface_ lets you configure a dive computer. Currently the " "Heinrichs-Weikamp (OSTC 2, OSTC 3) and Suunto Vyper (Stinger, Mosquito, D3, " @@ -5708,30 +5847,30 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2918 +#: user-manual.txt:2979 msgid "" "Once the dive computer is connected to the _Subsurface_ computer, select " -"_File -> Configure dive computer_ from the _Main Menu_. Provide the " -"appropriate device name in the text box at the top of the configuration " -"panel and select the appropriate dive computer model from the panel on the " -"left-hand (see image below)." +"_File -> Configure dive computer_ from the _Main Menu_. Select the " +"appropriate device name (or mount point) in the dropdown list at the top of " +"the configuration panel and select the appropriate dive computer model from " +"the panel on the left-hand (see image below)." msgstr "" #. type: Target for macro image -#: user-manual.txt:2919 +#: user-manual.txt:2980 #, no-wrap msgid "images/Configure_dc_f20.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2922 +#: user-manual.txt:2983 msgid "" "Using the appropriate buttons on the configuration panel, the following " "actions can be done:" msgstr "" #. type: Plain text -#: user-manual.txt:2925 +#: user-manual.txt:2986 #, no-wrap msgid "" "*Retrieve available details*. This loads the existing configuration from the " @@ -5740,7 +5879,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2927 +#: user-manual.txt:2988 #, no-wrap msgid "" "*Save changes to device*. This changes the configuration of the\n" @@ -5749,7 +5888,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2929 +#: user-manual.txt:2990 #, no-wrap msgid "" "*Backup*. This saves the configuration data to a file. _Subsurface_ asks " @@ -5758,7 +5897,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2931 +#: user-manual.txt:2992 #, no-wrap msgid "" "*Restore backup*. This loads the information from a backup file and displays " @@ -5767,7 +5906,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2933 +#: user-manual.txt:2994 #, no-wrap msgid "" "*Update firmware*. If new firmware is available for the dive computer, this " @@ -5776,57 +5915,57 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:2936 +#: user-manual.txt:2997 #, no-wrap msgid "Setting user _Preferences_ for _Subsurface_" msgstr "" #. type: Plain text -#: user-manual.txt:2945 +#: user-manual.txt:3008 msgid "" "There are several user-definable settings within _Subsurface_, found by " -"selecting _File -> Preferences_. The settings are in seven groups: " -"*Defaults*, *Units*, *Graph*, *Language* and *Network*, *Facebook* and " -"*Georeference*. All operate on the same principles: the user must specify " -"settings that are to be changed, then save them using the *Apply* " -"button. After applying all the new settings users can then leave the " -"settings panel by selecting *OK*. If *Discard* is selected, changes to the " -"preferences are not saved." +"selecting _File -> Preferences_, mostly affecting the way in which " +"_Subsurface_ shows dive information to the user. The settings are in six " +"panels: _Defaults_, _Units_, _Graph_, _Language_, _Network_, and " +"_Georeference_, all of which operate on the same principles: specified " +"settings can be applied to the display of the dive log by selecting " +"_Apply_. At this stage, any new settings only apply to the present session " +"and are not saved. In order to apply new settings permanently, select the " +"_Save_ button. If you do not wish to apply the new preferences, select " +"_Cancel_." msgstr "" #. type: Title === -#: user-manual.txt:2946 +#: user-manual.txt:3009 #, no-wrap msgid "Defaults" msgstr "" #. type: Plain text -#: user-manual.txt:2949 -msgid "There are several settings in the *Defaults* panel:" +#: user-manual.txt:3012 +msgid "There are several headings in the *Defaults* panel:" msgstr "" #. type: Target for macro image -#: user-manual.txt:2950 +#: user-manual.txt:3013 #, no-wrap -msgid "images/Pref1_f20.jpg" +msgid "images/Pref1_f23.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2954 +#: user-manual.txt:3017 #, no-wrap msgid "" -" ** *Lists and tables*: Here you can specify the font type and font size of " -"the\n" -" *Dive Table* panel: By decreasing the font size of the *Dive Table*, " -"you can see more dives on a screen.\n" +" ** *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" msgstr "" #. type: Plain text -#: user-manual.txt:2959 +#: user-manual.txt:3022 #, no-wrap msgid "" -" ** *Dives*: For the _Default Dive File_ you need to specify the directory " -"and\n" +" ** *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" @@ -5835,7 +5974,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2960 +#: user-manual.txt:3023 #, no-wrap msgid "" "_No default file_: When checked, _Subsurface_ does not automatically load a " @@ -5843,16 +5982,15 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2962 +#: user-manual.txt:3024 #, no-wrap msgid "" "_Local default file_: When checked, _Subsurface_ automatically loads a dive " -"log from the local hard disk\n" -"as described above.\n" +"log from the local hard disk.\n" msgstr "" #. type: Plain text -#: user-manual.txt:2964 +#: user-manual.txt:3026 #, no-wrap msgid "" "_Cloud storage default file_: When checked, _Subsurface automatically loads " @@ -5862,7 +6000,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2966 +#: user-manual.txt:3028 #, no-wrap msgid "" "** *Display invalid*: Dives can be marked as invalid (when a user wishes to " @@ -5870,7 +6008,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2969 +#: user-manual.txt:3031 #, no-wrap msgid "" "dives that he/she doesn't consider valid dives, e.g. pool dives, but still " @@ -5881,19 +6019,21 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2971 +#: user-manual.txt:3033 #, no-wrap -msgid "** *Default cylinder*: Specify the default cylinder listed 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:2972 +#: user-manual.txt:3034 #, no-wrap msgid "the *Equipment* tab of the *Notes* panel.\n" msgstr "" #. type: Plain text -#: user-manual.txt:2974 +#: user-manual.txt:3036 #, no-wrap msgid "" "** *Animations*: Some actions in showing the dive profile are performed " @@ -5901,7 +6041,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2980 +#: user-manual.txt:3042 #, no-wrap msgid "" "animations. For instance, the axis values for depth and time change from " @@ -5917,7 +6057,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2982 +#: user-manual.txt:3044 #, no-wrap msgid "" "** *Clear all settings*: As indicated in the button below this heading, all " @@ -5925,36 +6065,36 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2983 +#: user-manual.txt:3045 #, no-wrap msgid "cleared and set to default values.\n" msgstr "" #. type: Title === -#: user-manual.txt:2984 +#: user-manual.txt:3046 #, no-wrap msgid "Units" msgstr "" #. type: Target for macro image -#: user-manual.txt:2985 +#: user-manual.txt:3047 #, no-wrap -msgid "images/Pref2_f20.jpg" +msgid "images/Pref2_f23.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2992 +#: user-manual.txt:3054 msgid "" -"Here you can choose between metric and imperial units of depth, pressure, " -"volume, temperature and mass. By selecting the Metric or Imperial radio " -"button at the top, you can specify that all units are in the chosen " -"measurement system. Alternatively, if you select the *Personalize* radio " -"button, units can be selected independently, with some in the metric system " -"and others in imperial." +"Choose between metric and imperial units of depth, pressure, volume, " +"temperature and mass. By selecting the Metric or Imperial radio button at " +"the top, you can specify that all units are in the chosen measurement " +"system. Alternatively, if you select the *Personalize* radio button, units " +"can be selected independently, with some in the metric system and others in " +"imperial." msgstr "" #. type: Plain text -#: user-manual.txt:2998 +#: user-manual.txt:3060 msgid "" "Regardless of the above settings, dive time measurements can be either in " "seconds or minutes. Choose the appropriate option. GPS coordinates can be " @@ -5963,233 +6103,254 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:2999 +#: user-manual.txt:3061 #, no-wrap msgid "Graph" msgstr "" -#. type: Target for macro image -#: user-manual.txt:3001 -#, no-wrap -msgid "images/Pref3_f20.jpg" +#. type: Plain text +#: user-manual.txt:3063 +msgid "This panel has three sections:" msgstr "" -#. type: Plain text -#: user-manual.txt:3005 -msgid "This panel allows two type of selections:" +#. type: Target for macro image +#: user-manual.txt:3065 +#, no-wrap +msgid "images/Pref4_f23.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:3027 +#: user-manual.txt:3078 #, no-wrap msgid "" -"*Show*: Here you can specify the amount of information shown as part of\n" -"the dive profile:\n" -"** Thresholds: _Subsurface_ can display the nitrogen, oxygen and the helium " -"partial pressures during\n" -" the dive, done by using the toolbar on the left hand side of the *Dive " -"Profile*\n" -" panel. For each of these graphs you can specify a threshold value on the " -"right-hand side of the\n" -" Preferences panel. If any of the graphs go above the specified threshold " -"level, the graph is\n" +"*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" +" above the specified threshold, the graph is\n" " highlighted in red, indicating the particular partial pressure threshold " "has been exceeded.\n" -"** _Max pO~2~ is used for calculating the MOD when displaying the maximum " -"operative depth (MOD)\n" -" for a dive. Specify an appropriate partial pressure. A value of 1.4 is " -"commonly used.\n" -"** _Draw dive computer reported ceiling red_: This checkbox does exactly " -"what it says. By default\n" -" the computer reported ceiling is shown in white.\n" -" Not all dive computers report ceiling values. If the dive computer does " -"report it, it may differ\n" -" from the ceilings calculated by _Subsurface_ because of the different " -"algorithms and\n" -" gradient factors, as well as the dynamic way a\n" -" dive computer calculates ceilings during a dive.\n" -"** _Show unused cylinders in Equipment Tab_: This checkbox allows display of " -"information about unused cylinders when viewing the\n" -"*Equipment Tab*. If this box is not checked, and if any cylinders entered " -"using the *Equipment Tab* are not used (e.g. there\n" -"was no gas switch to such a cylinder), then these cylinders are omitted from " -"that list.\n" -"** _Show average depth_: If this box is checked, the *Dive Profile* panel " -"contains a grey line that shows\n" -" the mean depth of the dive, up to any time instant during the " -"dive. Normally this is a u-shaped line indicating the deepest mean depth " -"just before\n" -" ascent.\n" +" 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:3029 +#: user-manual.txt:3080 #, no-wrap -msgid "*Misc*:\n" +msgid "** CCR Options: These options determine oxygen management for CCR dives:\n" msgstr "" #. type: Plain text -#: user-manual.txt:3042 +#: user-manual.txt:3085 #, no-wrap msgid "" -"** Gradient Factors (GFLow and GFHigh):* Set the _gradient factors_ used " -"while diving. GF_Low is\n" -" the gradient factor at depth and GF_High is used just below the " -"surface.\n" -" At intermediate depths gradient factors between GF_Low and GF_High are " -"used.\n" -" Gradient factors add conservatism to nitrogen exposure during a dive, in " -"a\n" -" similar way that many dive computers have a conservative setting. The " -"lower\n" -" the value of a gradient factor, the more conservative the calculations " -"are with\n" -" respect to nitrogen loading and the deeper the ascent ceilings " -"are. Gradient\n" -" factors of 20/60 are considered conservative and values of 70/90 are " -"considered\n" -" harsh. Checking the *GFLow at max depth* box causes GF_Low to be used at " -"the\n" -" deepest depth of a dive. If this box is not checked, GF_Low is applied " -"at\n" -" all depths deeper than the first deco stop. For more information see:\n" +"*** _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" +" profile context menu.\n" msgstr "" #. type: Plain text -#: user-manual.txt:3044 +#: user-manual.txt:3089 #, 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" +"*** _CCR: Show setpoints when viewing pO2:_ With this checkbox activated, " +"the pO~2~\n" +" graph on the dive profile has an overlay in red which indicates the CCR " +"setpoint\n" +" values. See the section on xref:S_CCR_dives[Closed Circuit Rebreather " +"dives].\n" msgstr "" #. type: Plain text -#: user-manual.txt:3046 +#: user-manual.txt:3093 #, no-wrap msgid "" -" *** " -"link:http://www.rebreatherworld.com/general-and-new-to-rebreather-articles/5037-gradient-factors-for-dummies.html[Gradient " -"factors for dummies, by Kevin Watts]\n" +"*** _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:3050 +#: user-manual.txt:3095 #, no-wrap msgid "" -" ** _CCR: Show setpoints when viewing pO2:_ With this checkbox activated, " -"the pO~2~\n" -" graph on the dive profile has an overlay in red which indicates the CCR " -"setpoint\n" -" values. See the section on xref:S_CCR_dives[Closed Circuit Rebreather " -"dives].\n" +"*Ceiling display setup*. These settings mostly deal with nitrogen and helium " +"management\n" msgstr "" #. type: Plain text -#: user-manual.txt:3054 +#: user-manual.txt:3096 #, 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" -" See the section on xref:S_CCR_dives[Closed Circuit Rebreather dives].\n" +"by determining how the decompression ceiling (ascent ceiling) is calculated " +"and displayed:\n" msgstr "" #. type: Plain text -#: user-manual.txt:3056 +#: user-manual.txt:3103 #, no-wrap -msgid "*Configuring dive planning using rebreather equipment:*\n" +msgid "" +"** _Draw dive computer reported ceiling red_: This checkbox does exactly " +"what it says. By default\n" +" the computer reported ceiling is shown in white.\n" +" Not all dive computers report ceiling values. If the dive computer does " +"report it, it may differ\n" +" from the ceilings calculated by _Subsurface_ because of the different " +"algorithms and\n" +" gradient factors, as well as the dynamic way a\n" +" dive computer calculates ceilings during a dive.\n" msgstr "" #. type: Plain text -#: user-manual.txt:3058 +#: user-manual.txt:3108 #, no-wrap msgid "" -"** _Default CCR setpoint for dive planning:_ Specify the O~2~ setpoint for " -"a\n" +"** _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" +" (least conservative) and 4 (most conservative) are valid.\n" msgstr "" #. type: Plain text -#: user-manual.txt:3061 +#: user-manual.txt:3124 #, no-wrap msgid "" -"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" -"profile context menu.\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" +" 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" msgstr "" #. type: Plain text -#: user-manual.txt:3063 +#: user-manual.txt:3131 #, no-wrap msgid "" -"** _pSCR O~2~ metabolism rate:_ For a semi-closed rebreather (pSCR) system, " -"this is the\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:3065 +#: user-manual.txt:3135 #, no-wrap msgid "" -"volume of oxygen used by a diver during a minute. Set this value for pSCR " -"dive planning\n" -"and decompression calculations.\n" +" *** _Metabolic rate:_ this is the\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:3067 +#: user-manual.txt:3138 #, no-wrap msgid "" -"** _pSCR ratio:_ For pSCR equipment the dump ratio is the ratio of gas " +" *** _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:3140 +#, no-wrap +msgid "*Misc*\n" msgstr "" #. type: Plain text -#: user-manual.txt:3069 +#: user-manual.txt:3147 #, no-wrap msgid "" -"environment to that of the gas recirculated to the diver. Set this value for " -"a\n" -"pSCR dive plan. A 1:10 ratio is commonly used.\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:3071 +#: user-manual.txt:3149 #, no-wrap msgid "Language" msgstr "" #. type: Plain text -#: user-manual.txt:3073 +#: user-manual.txt:3151 msgid "Choose a language that _Subsurface_ will use." msgstr "" #. type: Target for macro image -#: user-manual.txt:3074 +#: user-manual.txt:3152 #, no-wrap -msgid "images/Pref4_f20.jpg" +msgid "images/Pref3_f23.jpg" +msgstr "" + +#. type: Plain text +#: user-manual.txt:3161 +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 " +"_Subsurface_. To change it, uncheck this checkbox and pick a language / " +"country combination from the list of locations. The _Filter_ text box to " +"list similar languages. For instance there are several system variants of " +"English or French. *This particular preference requires a restart of " +"_Subsurface_ to take effect*." msgstr "" #. type: Plain text -#: user-manual.txt:3084 +#: user-manual.txt:3163 msgid "" -"A checkbox lets you use the _System Default_ language which in most cases " -"will be the correct setting; with this _Subsurface_ simply runs in the same " -"language / country settings as the underlying operating system. To change " -"it, uncheck this checkbox and pick a language / country combination from the " -"list of locations. The _Filter_ text box lists similar languages. For " -"instance there are several system variants of English or French. *This " -"particular preference requires a restart of _Subsurface_ to take effect*." +"In this section also specify appropriate date an time formats for showing " +"dive details." msgstr "" #. type: Title === -#: user-manual.txt:3085 +#: user-manual.txt:3164 #, no-wrap msgid "Network" msgstr "" #. type: Plain text -#: user-manual.txt:3092 +#: user-manual.txt:3171 msgid "" "This panel facilitates communication between _Subsurface_ and data sources " "on the Internet. This is important, for instance, when _Subsurface_ needs " @@ -6201,18 +6362,18 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:3093 +#: user-manual.txt:3172 #, no-wrap -msgid "images/Pref5_f20.jpg" +msgid "images/Pref5_f23.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:3096 +#: user-manual.txt:3175 msgid "This dialogue has three sections:" msgstr "" #. type: Plain text -#: user-manual.txt:3104 +#: user-manual.txt:3183 #, no-wrap msgid "" "** _Proxy type_:\n" @@ -6225,11 +6386,11 @@ msgid "" "password are required so that _Subsurface_ can automatically pass\n" "through the proxy server to access the Internet. This information is usually " "obtained\n" -"from one's ISP.\n" +"from your ISP.\n" msgstr "" #. type: Plain text -#: user-manual.txt:3109 +#: user-manual.txt:3188 #, no-wrap msgid "" "** _Subsurface cloud storage_: To store your dive log in the cloud, a valid " @@ -6242,7 +6403,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3110 +#: user-manual.txt:3189 #, no-wrap msgid "" "_Sync to cloud in the background_: This option allows saving of dive " @@ -6250,13 +6411,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3111 +#: user-manual.txt:3190 #, no-wrap msgid "while you do other things within _Subsurface_.\n" msgstr "" #. type: Plain text -#: user-manual.txt:3112 +#: user-manual.txt:3191 #, no-wrap msgid "" "_Save password locally_: This allows local storage of the cloud storage " @@ -6264,13 +6425,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3113 +#: user-manual.txt:3192 #, no-wrap msgid "information is saved in raw text form, not encoded in any way.\n" msgstr "" #. type: Plain text -#: user-manual.txt:3117 +#: user-manual.txt:3196 #, no-wrap msgid "" "** _Subsurface web service_: When you subscribe to the " @@ -6282,42 +6443,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3120 -#, no-wrap -msgid "Facebook Access" -msgstr "" - -#. type: Plain text -#: user-manual.txt:3123 -msgid "" -"This panel lets you log into a Facebook account in order to transfer " -"information from Subsurface to Facebook." -msgstr "" - -#. type: Target for macro image -#: user-manual.txt:3124 -#, no-wrap -msgid "images/Pref6_f20.jpg" -msgstr "" - -#. type: Plain text -#: user-manual.txt:3132 -msgid "" -"If you provide a valid Facebook userID and password, a connection to " -"Facebook is created. That connection is closed when one closing down " -"Subsurface. Currently the checkbox labelled \"Keep me logged in to " -"Subsurface\", on the login screen has no effect. See the section " -"xref:S_facebook[Exporting dive profiles to Facebook] for more information." -msgstr "" - -#. type: Title === -#: user-manual.txt:3133 +#: user-manual.txt:3197 #, no-wrap msgid "Georeference" msgstr "" #. type: Plain text -#: user-manual.txt:3141 +#: user-manual.txt:3205 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 " @@ -6330,28 +6462,28 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:3142 +#: user-manual.txt:3206 #, no-wrap -msgid "images/Pref7_f20.jpg" +msgid "images/Pref7_f23.jpg" msgstr "" #. type: Title == -#: user-manual.txt:3145 +#: user-manual.txt:3209 #, no-wrap msgid "The _Subsurface_ dive planner" msgstr "" #. type: Plain text -#: user-manual.txt:3150 +#: user-manual.txt:3214 msgid "" "Dive planning is an advanced feature of _Subsurface_, accessed by selecting " -"_Log -> Plan Dive_ from the main menu. It allows calculation of nitrogen " +"_Log -> Plan Dive_ from the main menu. It allows calculation of inert gas " "load during a dive by using the Bühlmann ZH-L16 algorithm with the addition " "of gradient factors as implemented by Erik Baker." msgstr "" #. type: delimited block * -#: user-manual.txt:3158 +#: user-manual.txt:3222 msgid "" "The _Subsurface_ dive planner IS CURRENTLY EXPERIMENTAL and assumes the user " "is already familiar with the _Subsurface_ user interface. It is explicitly " @@ -6359,19 +6491,19 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:3161 +#: user-manual.txt:3225 msgid "" "The user is conversant with dive planning and has the necessary training to " "perform dive planning." msgstr "" #. type: delimited block * -#: user-manual.txt:3162 +#: user-manual.txt:3226 msgid "The user plans dives within his/her certification limits." msgstr "" #. type: delimited block * -#: user-manual.txt:3165 +#: user-manual.txt:3229 msgid "" "Dive planning makes large assumptions about the characteristics of the " "_average person_ and cannot compensate for individual physiology or health " @@ -6379,32 +6511,32 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:3166 +#: user-manual.txt:3230 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:3167 +#: user-manual.txt:3231 msgid "The user is familiar with the user interface of _Subsurface_." msgstr "" #. type: delimited block * -#: user-manual.txt:3169 +#: user-manual.txt:3233 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:3171 +#: user-manual.txt:3235 #, no-wrap msgid "The _Subsurface_ dive planner screen" msgstr "" #. type: Plain text -#: user-manual.txt:3176 +#: user-manual.txt:3240 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 " @@ -6413,7 +6545,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3180 +#: user-manual.txt:3244 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 " @@ -6422,7 +6554,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3184 +#: user-manual.txt:3248 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 " @@ -6431,26 +6563,26 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:3185 +#: user-manual.txt:3249 #, no-wrap msgid "images/PlannerWindow1_f20.jpg" msgstr "" #. type: Title === -#: user-manual.txt:3188 +#: user-manual.txt:3252 #, no-wrap msgid "Open circuit dives" msgstr "" #. type: Plain text -#: user-manual.txt:3191 +#: user-manual.txt:3255 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:3194 +#: user-manual.txt:3258 #, no-wrap msgid "" "** Open Circuit (the default)\n" @@ -6459,12 +6591,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3196 +#: user-manual.txt:3260 msgid "Choose the Open Circuit option." msgstr "" #. type: Plain text -#: user-manual.txt:3200 +#: user-manual.txt:3264 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 " @@ -6474,7 +6606,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3209 +#: user-manual.txt:3273 msgid "" "In the table labelled _Available Gases_, add the information of the " "cylinders to be used as well as the gas composition within that " @@ -6489,12 +6621,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3211 +#: user-manual.txt:3275 msgid "The _Available Gases_ table includes three gas depth fields, labelled:" msgstr "" #. type: Plain text -#: user-manual.txt:3212 +#: user-manual.txt:3276 #, no-wrap msgid "" "** Deco switch at: the switch depth for deco gases. Unless overridden by the " @@ -6502,7 +6634,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3213 +#: user-manual.txt:3277 #, no-wrap msgid "" "automatically calculated based on the Deco pO₂ preference (default 1.6 " @@ -6510,7 +6642,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3214 +#: user-manual.txt:3278 #, no-wrap msgid "" "** Bot. MOD: the gas Maximum Operating Depth (MOD) if it is used as a bottom " @@ -6518,7 +6650,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3216 +#: user-manual.txt:3280 #, no-wrap msgid "" "calculated based on the Bottom pO₂ preference (default 1.4 bar). Editing " @@ -6528,7 +6660,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3217 +#: user-manual.txt:3281 #, no-wrap msgid "" "** MND: the gas Maximum Narcotic Depth (MND). Automatically calculated based " @@ -6536,7 +6668,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3219 +#: user-manual.txt:3283 #, no-wrap msgid "" "preference (default 30m / 98 ft). Editing this field will modify the He% " @@ -6545,12 +6677,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3221 +#: user-manual.txt:3285 msgid "The profile of the planned dive can be created in two ways:" msgstr "" #. type: Plain text -#: user-manual.txt:3226 +#: user-manual.txt:3290 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 " @@ -6560,7 +6692,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3234 +#: user-manual.txt:3298 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 " @@ -6574,13 +6706,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:3235 +#: user-manual.txt:3299 #, no-wrap msgid "Recreational dives" msgstr "" #. type: Plain text -#: user-manual.txt:3252 +#: user-manual.txt:3316 #, no-wrap msgid "" "Recreational mode is what comes closest to planning a dive based on the " @@ -6611,21 +6743,21 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3255 +#: user-manual.txt:3319 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:3258 +#: user-manual.txt:3322 msgid "" "Immediately under the heading _Planning_ are two checkboxes _Recreational_ " "and _Safety Stop_. Check these two boxes." msgstr "" #. type: Plain text -#: user-manual.txt:3262 +#: user-manual.txt:3326 msgid "" "Then define the cylinder size, the gas mixture (air or % oxygen) and the " "starting cylinder pressure in the top left-hand section of the planner under " @@ -6633,7 +6765,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3267 +#: user-manual.txt:3331 msgid "" "The planner calculates whether the specified cylinder contains enough " "air/gas to complete the planned dive. In order for this to be accurate, " @@ -6643,7 +6775,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3276 +#: user-manual.txt:3340 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 " @@ -6660,7 +6792,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3284 +#: user-manual.txt:3348 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 " @@ -6673,14 +6805,14 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3287 +#: user-manual.txt:3351 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:3295 +#: user-manual.txt:3359 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 " @@ -6696,7 +6828,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3299 +#: user-manual.txt:3363 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 " @@ -6706,26 +6838,26 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:3300 +#: user-manual.txt:3364 #, no-wrap msgid "images/rec_diveplan.jpg" msgstr "" #. type: Title ==== -#: user-manual.txt:3302 +#: user-manual.txt:3366 #, no-wrap msgid "Non-recreational open circuit dives, including decompression" msgstr "" #. type: Plain text -#: user-manual.txt:3306 +#: user-manual.txt:3370 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:3318 +#: user-manual.txt:3382 #, no-wrap msgid "" "*a) Nitrogen management*: This is done by specifying the rates for descent " @@ -6735,7 +6867,7 @@ msgid "" "to the bottom left of the planning screen. Two deco models are supported the " "Bühlmann model and the VPM-B\n" "model. Select one of the two models. When selecting the Bühlmann model, the " -"gradient factors (GF_high and GF_low\n" +"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 " @@ -6751,37 +6883,39 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3323 +#: user-manual.txt:3388 msgid "" "If the VPM-B model is selected, the Conservatism_level needs to be specified " "on a scale of 0 (least conservative) to 4 (most conservative). This model " "tends to give deco stops at deeper levels than the Bühlmann model and often " -"results in slightly shorter dive durations than the Bühlmann model. When " -"selecting one of these models, keep in mind they are NOT exact physiological " -"models but only mathematical models that appear to work in practice." +"results in slightly shorter dive durations than the Bühlmann model, albeit " +"at the cost of higher tissue compartment pressures in the slow tissues. " +"When selecting one of these models, keep in mind they are NOT exact " +"physiological models but only mathematical models that appear to work in " +"practice." msgstr "" #. type: Plain text -#: user-manual.txt:3325 +#: user-manual.txt:3390 msgid "For more information external to this manual see:" msgstr "" #. type: Plain text -#: user-manual.txt:3327 +#: user-manual.txt:3392 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:3328 +#: user-manual.txt:3393 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:3330 +#: user-manual.txt:3395 msgid "" "link:http://www.amazon.com/Deco-Divers-Decompression-Theory-Physiology/dp/1905492073/ref=sr_1_1?s=books&ie=UTF8&qid=1403932320&sr=1-1&keywords=deco+for+divers[_Deco " "for Divers_, by Mark Powell (2008). Aquapress] Southend-on-Sea, UK. ISBN 10: " @@ -6790,21 +6924,20 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3338 +#: user-manual.txt:3403 msgid "" "The ascent rate is critical for nitrogen off-gassing at the end of the dive " -"and is specified for several depth ranges, using the average (or mean) depth " -"as a yardstick. The mean depth of the dive plan is shown by a light grey " -"line on the dive profile. Ascent rates at deeper levels are often in the " -"range of 8-12 m/min, while ascent rates near the surface are often in the " -"range of 4-9 m/min. The descent rate is also specified. If the option _Drop " -"to first depth_ is activated, the descent phase of the planned dive will be " -"at the maximal descent rate specified in the _Rates_ section of the dive " -"setup." +"and is specified for several depth ranges, using the mean depth as a " +"yardstick. The mean depth of the dive plan is shown by a light grey line on " +"the dive profile. Ascent rates at deeper levels are often in the range of " +"8-12 m/min, while ascent rates near the surface are often in the range of " +"4-9 m/min. The descent rate is also specified. If the option _Drop to first " +"depth_ is activated, the descent phase of the planned dive will be at the " +"maximal descent rate specified in the _Rates_ section of the dive setup." msgstr "" #. type: Plain text -#: user-manual.txt:3347 +#: user-manual.txt:3411 #, no-wrap msgid "" "*b) Oxygen management*: In the *Gas Options* part of the dive specification, " @@ -6812,19 +6945,18 @@ msgid "" "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" -"The most commonly\n" -"used values are 1.4 bar for the bottom part of the dive and 1.6 bar for any " -"decompression\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. PO2 " "settings and the depth at which switching to a gas takes place can also be " "edited in the\n" "_Available Gases_ dialog. Normally the planner decides on switching to a new " "gas when, during\n" -"ascent, the partial pressure of the new gas has increased to 1.6 bar.\n" +"ascent, the partial pressure of the new gas has decreased to 1.6 bar.\n" msgstr "" #. type: Plain text -#: user-manual.txt:3364 +#: user-manual.txt:3428 #, no-wrap msgid "" "*c) Gas management*: With open-circuit dives this is a primary\n" @@ -6835,7 +6967,7 @@ msgid "" "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 " +"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" @@ -6855,28 +6987,28 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3376 +#: user-manual.txt:3440 msgid "" "Now you can start the detailed time-depth planning of the dive. _Subsurface_ " -"offers an unique graphical interface for doing planning. Themechanics are " +"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 " -"40 min is offered in the blue design surface to the top right hand of the " +"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 " "represent the depth and duration of the dive. It is NOT necessary to specify " "the ascent part of the dive since the planner calculates this, based on the " -"settings that have been specified. If any of the management limits (for " -"nitrogen, oxygen or gas) are exceeded, the surface above the dive profile " -"changes from BLUE to RED." +"existing settings. If any of the management limits (for nitrogen, oxygen or " +"gas) are exceeded, the surface above the dive profile changes from BLUE to " +"RED." msgstr "" #. type: Plain text -#: user-manual.txt:3388 +#: user-manual.txt:3452 msgid "" "Each waypoint on the dive profile creates a _Dive Planner Point_ in the " -"table on the left of the dive planner panel. Be sure the _Used Gas_ value in " +"table on the left of the dive planner panel. Ensure the _Used Gas_ value in " "each row of that table corresponds to one of the gas mixtures specified in " "the _Available Gases_ table. Add new waypoints until the main features of " "the dive have been completed, e.g. the bottom time segment and deep stops " @@ -6885,12 +7017,12 @@ msgid "" "order to fulfill decompression requirements for that dive. A waypoint can be " "moved by selecting it and by using the arrow keys. The waypoints listed in " "the _Dive Planner Points_ dialogue can be edited by hand in order to get a " -"precise presentation of the dive plan. In fact, you can create the whole " -"dive profile by editing the _Dive Planner Points_ dialog." +"precise presentation of the dive plan. In fact, it is sometimes more easy to " +"create the whole dive profile by editing the _Dive Planner Points_ dialog." msgstr "" #. type: Plain text -#: user-manual.txt:3396 +#: user-manual.txt:3460 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 " @@ -6902,7 +7034,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3405 +#: user-manual.txt:3469 msgid "" "A non-zero value in the \"CC set point\" column of the table of dive planner " "points indicates a valid setpoint for oxygen partial pressure and that the " @@ -6910,25 +7042,25 @@ msgid "" "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. The planner only " +"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:3408 +#: user-manual.txt:3472 msgid "" "Below is an example of a dive plan to 45m using EAN26, followed by an ascent " "using EAN50 and using the settings as described above." msgstr "" #. type: Target for macro image -#: user-manual.txt:3409 +#: user-manual.txt:3473 #, no-wrap msgid "images/DivePlanner2_f20.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:3414 +#: user-manual.txt:3478 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 " @@ -6936,13 +7068,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3416 +#: user-manual.txt:3480 #, no-wrap msgid "*The dive plan details*\n" msgstr "" #. type: Plain text -#: user-manual.txt:3424 +#: user-manual.txt:3488 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 " @@ -6955,7 +7087,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3429 +#: user-manual.txt:3493 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 " @@ -6965,13 +7097,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3430 +#: user-manual.txt:3494 #, no-wrap msgid "Planning pSCR dives" msgstr "" #. type: Plain text -#: user-manual.txt:3445 +#: user-manual.txt:3509 #, no-wrap msgid "" "To plan a dive using a passive semi-closed rebreather (pSCR), select _pSCR_ " @@ -6981,7 +7113,7 @@ msgid "" "Preferences -> Graph_\n" "from the main menu, where the gas consumption calculation takes into account " "the pSCR dump\n" -"ratio (default 10:1) as well as the metabolism rate. The calculation also " +"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 " @@ -7001,26 +7133,26 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:3446 +#: user-manual.txt:3510 #, no-wrap msgid "images/Planner_pSCR1_f20.jpg" msgstr "" #. type: Title === -#: user-manual.txt:3449 +#: user-manual.txt:3513 #, no-wrap msgid "Planning CCR dives" msgstr "" #. type: Plain text -#: user-manual.txt:3453 +#: user-manual.txt:3517 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:3457 +#: user-manual.txt:3521 #, no-wrap msgid "" "*Available gases*: In the _Available gases_ table, enter the cylinder " @@ -7031,7 +7163,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3467 +#: user-manual.txt:3531 #, no-wrap msgid "" "*Entering setpoints*: Specify a default setpoint in the Preferences tab, by " @@ -7053,58 +7185,59 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3469 +#: user-manual.txt:3533 msgid "The dive profile for a CCR dive may look something like the image below." msgstr "" #. type: Target for macro image -#: user-manual.txt:3470 +#: user-manual.txt:3534 #, no-wrap msgid "images/Planner_CCR1_f20.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:3474 +#: user-manual.txt:3538 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:3476 +#: user-manual.txt:3540 #, no-wrap msgid "Modifying an existing dive plan" msgstr "" #. type: Plain text -#: user-manual.txt:3483 +#: user-manual.txt:3547 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 " "change a saved dive plan. To change a dive plan, select it on the *Dive " "List*. Then, in the main menu, select _Log -> Re-plan dive_. This will open " -"the selected dive plan within the dive planner, letting changes be made and " -"saved as usual." +"the selected dive plan within the dive planner, allowing changes to be made " +"and saved as usual." msgstr "" #. type: Plain text -#: user-manual.txt:3489 +#: user-manual.txt:3553 msgid "" "In addition, there is the option \"Save new\". This keeps the original " -"planned dive and adds a (possibly modified) copy to the dive list. If that " -"copy is saved with the same start time as the original, the two dives are " -"considered two versions of the same dive and do not influence other each " -"during decompression calculation (see next section)." +"planned dive and adds a (possibly modified, - earlier dives are now taken " +"into account -) copy to the dive list. If that copy is saved with the same " +"start time as the original, the two dives are considered two versions of the " +"same dive and do not influence other each during decompression calculation " +"(see next section)." msgstr "" #. type: Title === -#: user-manual.txt:3490 +#: user-manual.txt:3554 #, no-wrap msgid "Planning for repetitive dives" msgstr "" #. type: Plain text -#: user-manual.txt:3497 +#: user-manual.txt:3561 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 " @@ -7113,17 +7246,17 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3503 +#: user-manual.txt:3567 msgid "" "If you have just completed a long/deep dive and are planning another dive, " -"then highlight, in the *Dive List*, the dive that has just been done then " +"then highlight, in the *Dive List*, the dive that has just been logged then " "activate the planner. Depending on the start time of the planned dive, the " "planner takes into account the gas loading during the completed dive and " "plans accordingly." msgstr "" #. type: Plain text -#: user-manual.txt:3508 +#: user-manual.txt:3572 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 " @@ -7133,13 +7266,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3509 +#: user-manual.txt:3573 #, no-wrap msgid "Printing the dive plan" msgstr "" #. type: Plain text -#: user-manual.txt:3514 +#: user-manual.txt:3578 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 " @@ -7147,7 +7280,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3524 +#: user-manual.txt:3588 msgid "" "Dive plans have many characteristics in common with dive logs (dive profile, " "dive notes, etc). After a dive plan has been saved, the dive details and " @@ -7163,13 +7296,13 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:3525 +#: user-manual.txt:3589 #, no-wrap msgid "Description of the Subsurface Main Menu items" msgstr "" #. type: Plain text -#: user-manual.txt:3530 +#: user-manual.txt:3594 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 " @@ -7177,293 +7310,311 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3531 +#: user-manual.txt:3595 #, no-wrap msgid "File" msgstr "" #. type: Plain text -#: user-manual.txt:3534 +#: user-manual.txt:3598 msgid "" "<<S_NewLogbook,_New Logbook_>> - Close the currently open dive logbook and " "clear all dive information." msgstr "" #. type: Plain text -#: user-manual.txt:3536 +#: user-manual.txt:3600 msgid "_Open logbook_ - Open the file manager to select a dive logbook to open." msgstr "" #. type: Plain text -#: user-manual.txt:3537 -msgid "" -"_Open cloud storage_ - Open the dive log previously saved in " -"<<S_Cloud_storage,_Cloud storage_>>." +#: user-manual.txt:3601 +msgid "_Save_ - Save the dive logbook currently open." msgstr "" #. type: Plain text -#: user-manual.txt:3538 -msgid "_Save_ - Save the dive logbook currently open." +#: user-manual.txt:3602 +msgid "_Save as_ - Save the current logbook under a different file name." msgstr "" #. type: Plain text -#: user-manual.txt:3539 +#: user-manual.txt:3603 +msgid "" +"_Open cloud storage_ - Open the dive log previously saved in " +"<<S_Cloud_storage,_Cloud storage_>>." +msgstr "" + +#. type: Plain text +#: user-manual.txt:3604 msgid "" "_Save to cloud storage_ - Save the current dive log to " "<<S_Cloud_storage,_Cloud storage_>>." msgstr "" #. type: Plain text -#: user-manual.txt:3540 -msgid "_Save as_ - Save the current logbook under a different file name." +#: user-manual.txt:3605 +msgid "" +"_Take cloud storage online_ - " +"******************************************************" msgstr "" #. type: Plain text -#: user-manual.txt:3541 +#: user-manual.txt:3606 msgid "_Close_ - Close the dive logbook currently open." msgstr "" #. type: Plain text -#: user-manual.txt:3543 +#: user-manual.txt:3608 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:3544 +#: user-manual.txt:3609 msgid "<<S_PrintDivelog,_Print_>> - Print the currently open logbook." msgstr "" #. type: Plain text -#: user-manual.txt:3545 +#: user-manual.txt:3610 msgid "<<S_Preferences,_Preferences_>> - Set the _Subsurface_ preferences." msgstr "" #. type: Plain text -#: user-manual.txt:3546 +#: user-manual.txt:3611 msgid "" "<<S_FindMovedImages, _Find moved images_>> - If photos taken during dives " "have been moved to" msgstr "" #. type: Plain text -#: user-manual.txt:3547 +#: user-manual.txt:3612 msgid "" "a different disk or directory, locate them and link them to the appropriate " "dives." msgstr "" #. type: Plain text -#: user-manual.txt:3548 +#: user-manual.txt:3613 msgid "" "<<S_Configure,_Configure dive computer_>> - Edit the configuration of a dive " "computer." msgstr "" #. type: Plain text -#: user-manual.txt:3549 +#: user-manual.txt:3614 msgid "_Quit_ - Quit _Subsurface_." msgstr "" #. type: Title === -#: user-manual.txt:3550 +#: user-manual.txt:3616 +#, no-wrap +msgid "Edit" +msgstr "" + +#. type: Plain text +#: user-manual.txt:3618 +msgid "The Edit option allows one to undo or redo an action, e.g. deleting dives." +msgstr "" + +#. type: Title === +#: user-manual.txt:3619 #, no-wrap msgid "Import" msgstr "" #. type: Plain text -#: user-manual.txt:3553 +#: user-manual.txt:3622 msgid "" "<<S_ImportDiveComputer,_Import from dive computer_>> - Import dive " "information from a dive computer." msgstr "" #. type: Plain text -#: user-manual.txt:3555 +#: user-manual.txt:3624 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:3557 +#: user-manual.txt:3626 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:3559 +#: user-manual.txt:3628 msgid "" "<<S_ImportingDivelogsDe,_Import from Divelogs.de_>> - Import dive " "information from _www.Divelogs.de_." msgstr "" #. type: Title === -#: user-manual.txt:3560 +#: user-manual.txt:3629 #, no-wrap msgid "Log" msgstr "" #. type: Plain text -#: user-manual.txt:3562 +#: user-manual.txt:3631 msgid "" "<<S_EnterData,_Add Dive_>> - Manually add a new dive to the *Dive List* " "panel." msgstr "" #. type: Plain text -#: user-manual.txt:3563 +#: user-manual.txt:3632 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:3564 +#: user-manual.txt:3633 msgid "<<S_DivePlanner,_Plan Dive_>> - Plan dives." msgstr "" #. type: Plain text -#: user-manual.txt:3565 +#: user-manual.txt:3634 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:3567 +#: user-manual.txt:3636 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:3569 +#: user-manual.txt:3638 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:3571 +#: user-manual.txt:3640 msgid "" "<<S_Renumber,_Renumber_>> - Renumber the dives listed in the *Dive List* " "panel." msgstr "" #. type: Plain text -#: user-manual.txt:3573 +#: user-manual.txt:3642 msgid "" "<<S_Group,_Auto Group_>> - Group the dives in the *Dive List* panel into " "dive trips." msgstr "" #. type: Plain text -#: user-manual.txt:3574 +#: user-manual.txt:3643 msgid "" "<<S_DeviceNames,_Edit Device Names_>> - Edit the names of dive computers to " "coordinate your logs." msgstr "" #. type: Plain text -#: user-manual.txt:3575 +#: user-manual.txt:3644 msgid "" "<<S_Filter,_Filter divelist_>> - Select only some dives, based on specific " "tags or dive criteria." msgstr "" #. type: Title === -#: user-manual.txt:3576 +#: user-manual.txt:3645 #, no-wrap msgid "View" msgstr "" #. type: Plain text -#: user-manual.txt:3579 +#: user-manual.txt:3648 msgid "<<S_ViewPanels,_All_>> - View the four main _Subsurface_ panels all at once." msgstr "" #. type: Plain text -#: user-manual.txt:3580 +#: user-manual.txt:3649 msgid "<<S_ViewPanels,_Dive List_>> - View only the *Dive List* panel." msgstr "" #. type: Plain text -#: user-manual.txt:3581 +#: user-manual.txt:3650 msgid "<<S_ViewPanels,_Profile_>> - View only the *Dive Profile* panel." msgstr "" #. type: Plain text -#: user-manual.txt:3582 +#: user-manual.txt:3651 msgid "<<S_ViewPanels,_Info_>> - View only the *Notes* panel." msgstr "" #. type: Plain text -#: user-manual.txt:3583 +#: user-manual.txt:3652 msgid "<<S_ViewPanels,_Globe_>> - View only the *World Map* panel." msgstr "" #. type: Plain text -#: user-manual.txt:3585 +#: user-manual.txt:3654 msgid "" "_Yearly Statistics_ - Display summary statistics about dives during this and " "past years." msgstr "" #. type: Plain text -#: user-manual.txt:3586 +#: user-manual.txt:3655 msgid "" "_Prev DC_ - Switch to data from previous dive computer, if a single dive was " "logged from more than one." msgstr "" #. type: Plain text -#: user-manual.txt:3587 +#: user-manual.txt:3656 msgid "_Next DC_ - Switch to next dive computer." msgstr "" #. type: Plain text -#: user-manual.txt:3588 +#: user-manual.txt:3657 msgid "_Full Screen_ - Toggles Full Screen mode." msgstr "" #. type: Title === -#: user-manual.txt:3589 +#: user-manual.txt:3658 #, no-wrap msgid "Share on" msgstr "" #. type: Plain text -#: user-manual.txt:3591 +#: user-manual.txt:3660 msgid "" "<<S_Facebook,_Facebook_>> - Share the currently selected dive on your " "Facebook timeline." msgstr "" #. type: Title === -#: user-manual.txt:3593 +#: user-manual.txt:3661 #, no-wrap msgid "Help" msgstr "" #. type: Plain text -#: user-manual.txt:3596 +#: user-manual.txt:3664 msgid "" "_About Subsurface_ - Show a panel with the version number of _Subsurface_ as " "well as licensing information." msgstr "" #. type: Plain text -#: user-manual.txt:3598 +#: user-manual.txt:3666 msgid "" "_Check for updates_ - Find out whether a newer version of Subsurface is " "available on the http://subsurface-divelog.org/[_Subsurface_ web site]." msgstr "" #. type: Plain text -#: user-manual.txt:3600 +#: user-manual.txt:3668 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 " @@ -7471,12 +7622,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3601 +#: user-manual.txt:3669 msgid "_User manual_ - Open a window showing this user manual." msgstr "" #. type: Title == -#: user-manual.txt:3604 +#: user-manual.txt:3672 #, no-wrap msgid "" "APPENDIX A: Operating system specific information for importing dive " @@ -7484,19 +7635,19 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3606 +#: user-manual.txt:3674 #, 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:3607 +#: user-manual.txt:3675 #, no-wrap msgid "images/icons/drivers.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:3612 +#: user-manual.txt:3680 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 " @@ -7504,7 +7655,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3618 +#: user-manual.txt:3686 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 " @@ -7513,7 +7664,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3622 +#: user-manual.txt:3690 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 " @@ -7521,7 +7672,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3629 +#: user-manual.txt:3697 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 " @@ -7532,19 +7683,19 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3631 +#: user-manual.txt:3699 #, 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:3632 +#: user-manual.txt:3700 #, no-wrap msgid "images/icons/usb.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:3640 +#: user-manual.txt:3708 msgid "" "When connecting a dive computer by using a USB connector, usually " "_Subsurface_ will either propose a drop down list with the correct device " @@ -7554,61 +7705,61 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3645 +#: user-manual.txt:3713 msgid "" "Simply try COM1, COM2, etc. The drop down list should contain all connected " "COM devices." msgstr "" #. type: Title ==== -#: user-manual.txt:3646 user-manual.txt:3744 +#: user-manual.txt:3714 user-manual.txt:3812 #, no-wrap msgid "On MacOS:" msgstr "" #. type: Plain text -#: user-manual.txt:3649 +#: user-manual.txt:3717 msgid "The drop down box should find all connected dive computers." msgstr "" #. type: Block title -#: user-manual.txt:3650 +#: user-manual.txt:3718 #, no-wrap msgid "On Linux:" msgstr "" #. type: Plain text -#: user-manual.txt:3653 +#: user-manual.txt:3721 msgid "There is a definitive way to find the port:" msgstr "" #. type: Plain text -#: user-manual.txt:3655 +#: user-manual.txt:3723 msgid "Disconnect the USB cable from the dive computer" msgstr "" #. type: Plain text -#: user-manual.txt:3656 +#: user-manual.txt:3724 msgid "Open a terminal" msgstr "" #. type: Plain text -#: user-manual.txt:3657 user-manual.txt:3659 +#: user-manual.txt:3725 user-manual.txt:3727 msgid "Type the command: 'dmesg' and press enter" msgstr "" #. type: Plain text -#: user-manual.txt:3658 +#: user-manual.txt:3726 msgid "Plug in the USB cable of the dive computer" msgstr "" #. type: Plain text -#: user-manual.txt:3661 +#: user-manual.txt:3729 msgid "A message similar to this one should appear:" msgstr "" #. type: Plain text -#: user-manual.txt:3677 +#: user-manual.txt:3745 #, no-wrap msgid "" "\tusb 2-1.1: new full speed USB device number 14 using ehci_hcd\n" @@ -7629,7 +7780,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3682 +#: user-manual.txt:3750 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 " @@ -7637,31 +7788,31 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3684 +#: user-manual.txt:3752 msgid "Ensuring the user has write permission to the USB serial port:" msgstr "" #. type: Plain text -#: user-manual.txt:3694 +#: user-manual.txt:3762 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 " "can be verified by listing the appropriate device permissions e.g. by +ls -l " "/dev/ttyUSB0+. Note that the number in the file name depends on how many USB " -"devices you have connected, and must be adjusted appropriately. If one is " -"not root, one may not be a member of that group and won't be able to use the " -"USB port. Let us assume one's username is 'johnB'." +"devices you have connected, and must be adjusted appropriately. If you are " +"not root, you may not be a member of that group and won't be able to use the " +"USB port. Let us assume your username is 'johnB'." msgstr "" #. type: Plain text -#: user-manual.txt:3698 +#: user-manual.txt:3766 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:3703 +#: user-manual.txt:3771 #, no-wrap msgid "" "Type: +id johnB+ This lists all the groups that johnB belongs to and\n" @@ -7673,30 +7824,30 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3705 +#: user-manual.txt:3773 #, no-wrap msgid "" "Under some circumstances this change takes only effect (eg. on Ubuntu) " "after\n" -"one logs out and then logs in again.\n" +"you log out and then log in again.\n" msgstr "" #. type: Plain text -#: user-manual.txt:3710 +#: user-manual.txt:3778 msgid "" "With the appropriate device name (e.g. +dev/ttyUSB3+) and with write " -"permission to the USB port, the dive computer interface can connect and one " +"permission to the USB port, the dive computer interface can connect and you " "should be able to import dives." msgstr "" #. type: Title === -#: user-manual.txt:3713 +#: user-manual.txt:3781 #, no-wrap msgid "Manually setting up Bluetooth enabled devices" msgstr "" #. type: Plain text -#: user-manual.txt:3720 +#: user-manual.txt:3788 msgid "" "For dive computers communicating through Bluetooth like the Heinrichs " "Weikamp Frog or the Shearwater Predator, Petrel and Nerd there is a " @@ -7705,7 +7856,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3722 +#: user-manual.txt:3790 #, no-wrap msgid "" "*For the dive computer, after enabling Bluetooth, be sure it is in Upload " @@ -7713,7 +7864,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3726 +#: user-manual.txt:3794 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 -> " @@ -7721,13 +7872,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3728 +#: user-manual.txt:3796 #, no-wrap msgid "*Pair the _Subsurface_ computer with the dive computer.*\n" msgstr "" #. type: Plain text -#: user-manual.txt:3737 +#: user-manual.txt:3805 msgid "" "Bluetooth is most likely already enabled. For pairing with the dive computer " "choose _Control Panel -> Bluetooth Devices -> Add Wireless Device_. This " @@ -7739,21 +7890,21 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3740 +#: user-manual.txt:3808 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:3743 +#: user-manual.txt:3811 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:3750 +#: user-manual.txt:3818 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 " @@ -7762,20 +7913,20 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3753 +#: user-manual.txt:3821 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:3754 +#: user-manual.txt:3822 #, no-wrap msgid "On Linux" msgstr "" #. type: Plain text -#: user-manual.txt:3762 +#: user-manual.txt:3830 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 " @@ -7787,7 +7938,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3766 +#: user-manual.txt:3834 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 " @@ -7796,23 +7947,23 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3768 +#: user-manual.txt:3836 msgid "Enable the Bluetooth controller and pair your dive computer" msgstr "" #. type: Plain text -#: user-manual.txt:3769 +#: user-manual.txt:3837 msgid "Establish an RFCOMM connection" msgstr "" #. type: Title ===== -#: user-manual.txt:3770 user-manual.txt:3910 +#: user-manual.txt:3838 user-manual.txt:3978 #, no-wrap msgid "Download the dives with Subsurface" msgstr "" #. type: Plain text -#: user-manual.txt:3776 +#: user-manual.txt:3844 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 " @@ -7823,7 +7974,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3781 +#: user-manual.txt:3849 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 " @@ -7833,23 +7984,23 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3783 +#: user-manual.txt:3851 msgid "+sudo usermod -a -G dialout username+" msgstr "" #. type: Plain text -#: user-manual.txt:3785 +#: user-manual.txt:3853 msgid "Then log out and log in for the change to take effect." msgstr "" #. type: Title ===== -#: user-manual.txt:3786 +#: user-manual.txt:3854 #, no-wrap msgid "Enabling the Bluetooth controller and pairing your dive computer" msgstr "" #. type: Plain text -#: user-manual.txt:3792 +#: user-manual.txt:3860 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 " @@ -7860,7 +8011,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3795 +#: user-manual.txt:3863 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 " @@ -7868,7 +8019,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3802 +#: user-manual.txt:3870 #, no-wrap msgid "" "\t$ hciconfig\n" @@ -7880,7 +8031,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3807 +#: user-manual.txt:3875 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 " @@ -7890,7 +8041,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3815 +#: user-manual.txt:3883 #, no-wrap msgid "" "\tsudo hciconfig hci0 up auth+ (enter password when prompted)\n" @@ -7903,33 +8054,33 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3817 +#: user-manual.txt:3885 msgid "Check that the status now includes +'UP', 'RUNNING' AND 'AUTH'+." msgstr "" #. type: Plain text -#: user-manual.txt:3819 +#: user-manual.txt:3887 msgid "" "If there are multiple controllers running, it's easiest to off the unused " "controller(s). For example, for +hci1+:" msgstr "" #. type: Plain text -#: user-manual.txt:3821 +#: user-manual.txt:3889 #, no-wrap msgid "\tsudo hciconfig hci1 down\n" msgstr "" #. type: Plain text -#: user-manual.txt:3824 +#: user-manual.txt:3892 msgid "" "Next step is to 'trust' and 'pair' the dive computer. On distros with Bluez " -"5, such as Fedora 22, one can use a tool called +blutootctl+, which will " +"5, such as Fedora 22, you can use a tool called +blutootctl+, which will " "bring up its own command prompt." msgstr "" #. type: Plain text -#: user-manual.txt:3845 +#: user-manual.txt:3913 #, no-wrap msgid "" "\tbluetoothctl\n" @@ -7958,14 +8109,14 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3848 +#: user-manual.txt:3916 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:3851 +#: user-manual.txt:3919 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 " @@ -7973,7 +8124,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3856 +#: user-manual.txt:3924 #, no-wrap msgid "" "\thcitool -i hci0 scanning\n" @@ -7983,82 +8134,82 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3858 +#: user-manual.txt:3926 msgid "Once ther dive computer is pired, set up the RFCOMM connection" msgstr "" #. type: Title ===== -#: user-manual.txt:3859 +#: user-manual.txt:3927 #, no-wrap msgid "Establishing the RFCOMM connection" msgstr "" #. type: Plain text -#: user-manual.txt:3862 +#: user-manual.txt:3930 msgid "The command to establish an RFCOMM connection is:" msgstr "" #. type: Plain text -#: user-manual.txt:3864 +#: user-manual.txt:3932 msgid "+sudo rfcomm -i <controller> connect <dev> <bdaddr> [channel]+" msgstr "" #. type: Plain text -#: user-manual.txt:3866 +#: user-manual.txt:3934 msgid "+<controller>+ is the Bluetooth controller, +hci0+." msgstr "" #. type: Plain text -#: user-manual.txt:3867 +#: user-manual.txt:3935 msgid "+<dev>+ is the RFCOMM device file, +rfcomm0+" msgstr "" #. type: Plain text -#: user-manual.txt:3868 +#: user-manual.txt:3936 msgid "+<bdaddr>+ is the dive computer's MAC address, +00:11:22:33:44:55+" msgstr "" #. type: Plain text -#: user-manual.txt:3869 +#: user-manual.txt:3937 msgid "+[channel]+ is the dive computer's Bluetooth channel we need to connect to." msgstr "" #. type: Plain text -#: user-manual.txt:3872 +#: user-manual.txt:3940 msgid "" -"If one omits it, channel 1 is assumed. Based on a limited number of user " +"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:3874 +#: user-manual.txt:3942 msgid "_Shearwater Petrel 1_: channel 1" msgstr "" #. type: Plain text -#: user-manual.txt:3875 +#: user-manual.txt:3943 msgid "_Shearwater Petrel 2_: channel 5" msgstr "" #. type: Plain text -#: user-manual.txt:3876 +#: user-manual.txt:3944 msgid "_Shearwater Nerd_: channel 5" msgstr "" #. type: Plain text -#: user-manual.txt:3877 +#: user-manual.txt:3945 msgid "_Heinrichs-Weikamp OSTC Sport_: channel 1" msgstr "" #. type: Plain text -#: user-manual.txt:3879 +#: user-manual.txt:3947 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:3881 +#: user-manual.txt:3949 #, no-wrap msgid "" "\tsudo rfcomm -i hci0 connect rfcomm0 00:11:22:33:44:55 5 (enter a password, " @@ -8066,12 +8217,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3883 +#: user-manual.txt:3951 msgid "This gives the response:" msgstr "" #. type: Plain text -#: user-manual.txt:3886 +#: user-manual.txt:3954 #, no-wrap msgid "" "\tConnected /dev/rfcomm0 to 00:11:22:33:44:55 on channel 5\n" @@ -8079,14 +8230,14 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3888 +#: user-manual.txt:3956 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:3892 +#: user-manual.txt:3960 #, no-wrap msgid "" "\tsudo rfcomm -i hci0 connect rfcomm0 00:11:22:33:44:55 (enter a password, " @@ -8096,7 +8247,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3896 +#: user-manual.txt:3964 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 " @@ -8105,7 +8256,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3906 +#: user-manual.txt:3974 #, no-wrap msgid "" "\tsdptool -i hci0 records 00:11:22:33:44:55\n" @@ -8120,7 +8271,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3909 +#: user-manual.txt:3977 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 " @@ -8128,7 +8279,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3912 +#: user-manual.txt:3980 msgid "" "After establishing the RFCOMM connection and while the dive computer's " "upload mode countdown is still running, go to_Subsurface_, select " @@ -8138,25 +8289,25 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:3918 +#: user-manual.txt:3986 #, no-wrap msgid "APPENDIX B: Dive Computer specific information for importing dive data." msgstr "" #. type: Title === -#: user-manual.txt:3921 +#: user-manual.txt:3989 #, no-wrap msgid "Importing from Uemis Zurich" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:3923 +#: user-manual.txt:3991 #, no-wrap msgid "images/icons/iumis.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:3939 +#: user-manual.txt:4007 msgid "" "_Subsurface_ downloads the information stored on the SDA (the built-in file " "system of the Uemis) including information about dive spots and " @@ -8173,7 +8324,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3954 +#: user-manual.txt:4022 msgid "" "After selecting the above device name, download the dives from the Uemis " "Zurich. One technical issue with the Uemis Zurich download implementation " @@ -8190,19 +8341,19 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3956 +#: user-manual.txt:4024 #, no-wrap msgid "Importing from Uwatec Galileo" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:3958 +#: user-manual.txt:4026 #, no-wrap msgid "images/icons/Galileo.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:3973 +#: user-manual.txt:4041 msgid "" "The Uwatec Galileo dive computers use infra red (IrDA) communication between " "the dive computer and Subsurface. The Uwatec hardware uses a USB dongle " @@ -8218,14 +8369,14 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3976 +#: user-manual.txt:4044 msgid "" "After executing this command, Subsurface will recognize the Galileo dive " "computer and download dive information." msgstr "" #. type: Plain text -#: user-manual.txt:3982 +#: user-manual.txt:4050 msgid "" "Under Windows, a similar situation exists. Drivers for the MCS7780 are " "available from some Internet web sites e.g. " @@ -8236,26 +8387,26 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3985 +#: user-manual.txt:4053 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:3987 +#: user-manual.txt:4055 #, no-wrap msgid "Importing from Heinrichs Weikamp DR5" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:3989 +#: user-manual.txt:4057 #, no-wrap msgid "images/icons/HW_DR5.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:3999 +#: user-manual.txt:4067 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. " @@ -8268,19 +8419,19 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4002 +#: user-manual.txt:4070 #, no-wrap msgid "Importing from xDEEP BLACK" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4004 +#: user-manual.txt:4072 #, no-wrap msgid "images/icons/HW_xdeepblack.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4013 +#: user-manual.txt:4081 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 " @@ -8294,19 +8445,19 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4015 +#: user-manual.txt:4083 #, no-wrap msgid "Importing from Shearwater Predator/Petrel/Nerd using Bluetooth" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4017 +#: user-manual.txt:4085 #, no-wrap msgid "images/icons/predator.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4020 +#: user-manual.txt:4088 msgid "" "Specific instructions for downloading dives using Bluetooth are given in the " "section above, <<S_Bluetooth,_Connecting Subsurface to a Bluetooth-enabled " @@ -8314,19 +8465,19 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4022 +#: user-manual.txt:4090 #, no-wrap msgid "Importing from Poseidon MkVI Discovery" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4024 +#: user-manual.txt:4092 #, no-wrap msgid "images/MkVI.jpeg" msgstr "" #. type: Plain text -#: user-manual.txt:4032 +#: user-manual.txt:4100 msgid "" "Download of dive logs from the MkVI is performed using a custom " "communications adapter and the _Poseidon PC Configuration Software_, " @@ -8338,45 +8489,45 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4035 +#: user-manual.txt:4103 msgid "" "Setup configuration for the dive and key dive parameters (file with a .txt " "extension)" msgstr "" #. type: Plain text -#: user-manual.txt:4036 +#: user-manual.txt:4104 msgid "Dive log details (file with a .csv extension)" msgstr "" #. type: Plain text -#: user-manual.txt:4038 +#: user-manual.txt:4106 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:4040 +#: user-manual.txt:4108 msgid "" "_Subsurface_ accesses the .txt and the .csv files to get dive log " "information." msgstr "" #. type: Title === -#: user-manual.txt:4042 +#: user-manual.txt:4110 #, no-wrap msgid "Importing from APD Inspiration/Evolution CCR" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4044 +#: user-manual.txt:4112 #, no-wrap msgid "images/APDComputer.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4052 +#: user-manual.txt:4120 msgid "" "The dive logs of an APD Inspiration or similar CCR dive computer are " "downloaded using a communications adapter and _AP Communicator_, obtained " @@ -8388,55 +8539,55 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4054 +#: user-manual.txt:4122 msgid "Download the dive using _AP Communicator_." msgstr "" #. type: Plain text -#: user-manual.txt:4055 +#: user-manual.txt:4123 msgid "Open a dive within the _AP Log Viewer_." msgstr "" #. type: Plain text -#: user-manual.txt:4056 +#: user-manual.txt:4124 msgid "Select the tab at the top of the screen, entitled \"_Data_\"." msgstr "" #. type: Plain text -#: user-manual.txt:4057 +#: user-manual.txt:4125 msgid "" "With the raw dive log data show on the screen, click on \"_Copy to " "Clipboard_\"." msgstr "" #. type: Plain text -#: user-manual.txt:4058 +#: user-manual.txt:4126 msgid "Open a text editor, e.g. Notepad (Windows) or TextWrangler (Mac)." msgstr "" #. type: Plain text -#: user-manual.txt:4060 +#: user-manual.txt:4128 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:4061 +#: user-manual.txt:4129 msgid "" "Within _Subsurface_, select _Import -> Import log files_ to open the " "xref:Unified_import[universal import dialogue]." msgstr "" #. type: Plain text -#: user-manual.txt:4062 +#: user-manual.txt:4130 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:4066 +#: user-manual.txt:4134 #, no-wrap msgid "" "On the list of file names select the _.apd_ file created. An import\n" @@ -8446,13 +8597,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:4067 +#: user-manual.txt:4135 #, no-wrap msgid "images/APD_CSVimportF22.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4075 +#: user-manual.txt:4143 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 " @@ -8464,12 +8615,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4076 +#: user-manual.txt:4144 msgid "Click the _Ok_ button at the bottom of the import panel." msgstr "" #. type: Plain text -#: user-manual.txt:4081 +#: user-manual.txt:4149 msgid "" "The APD dive log will appear within _Subsurface_. The dive computer- " "generated ceiling provided by the Inspiration can be viewed by selecting the " @@ -8479,13 +8630,13 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:4082 +#: user-manual.txt:4150 #, no-wrap msgid "APPENDIX C: Exporting Dive log information from external dive log software." msgstr "" #. type: Plain text -#: user-manual.txt:4091 +#: user-manual.txt:4159 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, " @@ -8495,22 +8646,22 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4093 +#: user-manual.txt:4161 msgid "Export the foreign dive log data to format that is accessible from" msgstr "" #. type: Plain text -#: user-manual.txt:4094 +#: user-manual.txt:4162 msgid "_Subsurface_." msgstr "" #. type: Plain text -#: user-manual.txt:4095 +#: user-manual.txt:4163 msgid "Import the accessible dive log data into _Subsurface_." msgstr "" #. type: Plain text -#: user-manual.txt:4099 +#: user-manual.txt:4167 msgid "" "This appendix provides some information about approaches to export dive log " "data from foreign dive log software. The procedures below mostly apply to " @@ -8518,19 +8669,19 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4101 +#: user-manual.txt:4169 #, no-wrap msgid "Exporting from *Suunto Divemanager (DM3, DM4 or DM5)*" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4102 +#: user-manual.txt:4170 #, no-wrap msgid "images/icons/suuntologo.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4109 +#: user-manual.txt:4177 msgid "" "DiveManager is a MS Windows application for Suunto dive computers. " "Divemanager 3 (DM3) is an older version of the Suunto software. More recent " @@ -8540,64 +8691,64 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4111 +#: user-manual.txt:4179 #, no-wrap msgid "*Divemanager 3 (DM3):*\n" msgstr "" #. type: Plain text -#: user-manual.txt:4113 +#: user-manual.txt:4181 msgid "Start 'Suunto Divemanager 3' and log in with the name containing the logs" msgstr "" #. type: Plain text -#: user-manual.txt:4114 +#: user-manual.txt:4182 msgid "Do not start the import wizard to import dives from the dive computer." msgstr "" #. type: Plain text -#: user-manual.txt:4116 +#: user-manual.txt:4184 msgid "" "In the navigation tree on the left side of the program-window, select the " "appropriate dives." msgstr "" #. type: Plain text -#: user-manual.txt:4117 +#: user-manual.txt:4185 msgid "Within the list of dives, select the dives you would like to import later:" msgstr "" #. type: Plain text -#: user-manual.txt:4118 +#: user-manual.txt:4186 msgid "To select certain dives: hold 'ctrl' and click the dive" msgstr "" #. type: Plain text -#: user-manual.txt:4120 +#: user-manual.txt:4188 msgid "" "To select all dives: Select the first dive, hold down shift and select the " "last dive" msgstr "" #. type: Plain text -#: user-manual.txt:4121 +#: user-manual.txt:4189 msgid "With the dives marked, use the program menu _File -> Export_" msgstr "" #. type: Plain text -#: user-manual.txt:4122 +#: user-manual.txt:4190 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:4123 +#: user-manual.txt:4191 msgid "Click the browse button next to the field Export Path" msgstr "" #. type: Plain text -#: user-manual.txt:4125 +#: user-manual.txt:4193 #, no-wrap msgid "" "** A file-manager like window pops up\n" @@ -8605,13 +8756,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4126 +#: user-manual.txt:4194 #, no-wrap msgid "Divelog.SDE file\n" msgstr "" #. type: Plain text -#: user-manual.txt:4128 +#: user-manual.txt:4196 #, no-wrap msgid "" "** Optionally change the name of the file for saving\n" @@ -8619,25 +8770,25 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4129 +#: user-manual.txt:4197 #, no-wrap msgid "Back in the Export pop-up, press the button 'Export'\n" msgstr "" #. type: Plain text -#: user-manual.txt:4130 +#: user-manual.txt:4198 #, no-wrap msgid "The dives are now exported to the file Divelog.SDE.\n" msgstr "" #. type: Plain text -#: user-manual.txt:4132 +#: user-manual.txt:4200 #, no-wrap msgid "*Divemanager 4 (DM4) and Divemanager 5 (DM5):*\n" msgstr "" #. type: Plain text -#: user-manual.txt:4137 +#: user-manual.txt:4205 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 " @@ -8646,81 +8797,81 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4139 +#: user-manual.txt:4207 msgid "Locating the Suunto DM4 (or DM5) database:" msgstr "" #. type: Plain text -#: user-manual.txt:4141 user-manual.txt:4150 +#: user-manual.txt:4209 user-manual.txt:4218 msgid "Start Suunto DM4/DM5" msgstr "" #. type: Plain text -#: user-manual.txt:4142 +#: user-manual.txt:4210 msgid "Select 'Help -> About'" msgstr "" #. type: Plain text -#: user-manual.txt:4143 +#: user-manual.txt:4211 msgid "Click 'Copy' after text 'Copy log folder path to clipboard'" msgstr "" #. type: Plain text -#: user-manual.txt:4144 +#: user-manual.txt:4212 msgid "Open Windows Explorer" msgstr "" #. type: Plain text -#: user-manual.txt:4145 +#: user-manual.txt:4213 msgid "Paste the address to the path box at the top of the File Explorer" msgstr "" #. type: Plain text -#: user-manual.txt:4146 +#: user-manual.txt:4214 msgid "The database is called DM4.db or DM5.db" msgstr "" #. type: Plain text -#: user-manual.txt:4148 +#: user-manual.txt:4216 msgid "Making a backup copy of the Suunto DM4/DM5 database:" msgstr "" #. type: Plain text -#: user-manual.txt:4151 +#: user-manual.txt:4219 msgid "Select 'File - Create backup'" msgstr "" #. type: Plain text -#: user-manual.txt:4153 +#: user-manual.txt:4221 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:4154 +#: user-manual.txt:4222 msgid "Click 'Save'" msgstr "" #. type: Plain text -#: user-manual.txt:4155 +#: user-manual.txt:4223 msgid "The dives are now exported to the file DM4.bak (or DM5.bak)" msgstr "" #. type: Title === -#: user-manual.txt:4157 +#: user-manual.txt:4225 #, no-wrap msgid "Exporting from Atomic Logbook" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4160 +#: user-manual.txt:4228 #, no-wrap msgid "images/icons/atomiclogo.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4167 +#: user-manual.txt:4235 msgid "" "Atomic Logbook is a Windows software by Atomic Aquatics. It allows " "downloading of dive information from Cobalt and Cobalt 2 dive computers. " @@ -8730,19 +8881,19 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4169 +#: user-manual.txt:4237 #, no-wrap msgid "Exporting from Mares Dive Organiser V2.1" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4172 +#: user-manual.txt:4240 #, no-wrap msgid "images/icons/mareslogo.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4180 +#: user-manual.txt:4248 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 " @@ -8753,7 +8904,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4185 +#: user-manual.txt:4253 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 " @@ -8761,36 +8912,36 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4188 +#: user-manual.txt:4256 msgid "" "Rename the file to DiveOrganizerxxxxx.zip. Inside the zipped directory is a " "file _DiveOrganizer.sdf_." msgstr "" #. type: Plain text -#: user-manual.txt:4189 +#: user-manual.txt:4257 msgid "Extract the _.sdf_ file from the zipped folder to your Desktop." msgstr "" #. type: Plain text -#: user-manual.txt:4190 +#: user-manual.txt:4258 msgid "The password for accessing the .zip file is _mares_." msgstr "" #. type: Title === -#: user-manual.txt:4192 +#: user-manual.txt:4260 #, no-wrap msgid "Exporting from *DivingLog 5.0 and 6.0*" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4194 +#: user-manual.txt:4262 #, no-wrap msgid "images/icons/divingloglogo.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4201 +#: user-manual.txt:4269 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 " @@ -8800,37 +8951,37 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4203 +#: user-manual.txt:4271 msgid "To transfer all files from DivingLog to Subsurface:" msgstr "" #. type: Plain text -#: user-manual.txt:4205 +#: user-manual.txt:4273 msgid "In DivingLog open the 'File -> Export -> SQLite' menu" msgstr "" #. type: Plain text -#: user-manual.txt:4206 +#: user-manual.txt:4274 msgid "Select 'Settings' button" msgstr "" #. type: Plain text -#: user-manual.txt:4207 +#: user-manual.txt:4275 msgid "Set the 'RTF2Plaintext' to 'true'" msgstr "" #. type: Plain text -#: user-manual.txt:4208 +#: user-manual.txt:4276 msgid "Close the Settings dialog" msgstr "" #. type: Plain text -#: user-manual.txt:4209 +#: user-manual.txt:4277 msgid "Click 'Export' button and select the filename" msgstr "" #. type: Plain text -#: user-manual.txt:4213 +#: user-manual.txt:4281 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 " @@ -8838,13 +8989,13 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:4214 +#: user-manual.txt:4282 #, no-wrap msgid "APPENDIX D: Exporting a spreadsheet to CSV format" msgstr "" #. type: Plain text -#: user-manual.txt:4224 +#: user-manual.txt:4292 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 " @@ -8856,7 +9007,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4230 +#: user-manual.txt:4298 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 " @@ -8866,40 +9017,40 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4232 +#: user-manual.txt:4300 msgid "Date: use one of the following formats: yyyy-mm-dd, dd.mm.yyyy, mm/dd/yyyy" msgstr "" #. type: Plain text -#: user-manual.txt:4233 +#: user-manual.txt:4301 msgid "Duration: the format should be minutes:seconds." msgstr "" #. type: Plain text -#: user-manual.txt:4234 +#: user-manual.txt:4302 msgid "" "Unit system: only one unit system should be used (no mix of imperial and " "metric units)" msgstr "" #. type: Plain text -#: user-manual.txt:4235 +#: user-manual.txt:4303 msgid "Tags and buddies: values should be separated using a comma." msgstr "" #. type: Plain text -#: user-manual.txt:4236 +#: user-manual.txt:4304 msgid "GPS position: use decimal degrees, e.g. 30.22496 30.821798" msgstr "" #. type: Title === -#: user-manual.txt:4236 +#: user-manual.txt:4304 #, no-wrap msgid "_LibreOffice Calc_ and _OpenOffice Calc_" msgstr "" #. type: Plain text -#: user-manual.txt:4240 +#: user-manual.txt:4308 msgid "" "These are open source spreadsheet applications forming parts of larger open " "source office suite applications. The user interaction with _LibreOffice_ " @@ -8910,13 +9061,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:4241 +#: user-manual.txt:4309 #, no-wrap msgid "images/LOffice_spreadsheetdata.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4244 +#: user-manual.txt:4312 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 " @@ -8924,13 +9075,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:4245 +#: user-manual.txt:4313 #, no-wrap msgid "images/LOffice_save_as_options.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4248 +#: user-manual.txt:4316 msgid "" "After selecting _Save_, select the appropriate field delimiter (choose _Tab_ " "to prevent conflicts with the comma when using this as a decimal point), " @@ -8938,13 +9089,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:4249 +#: user-manual.txt:4317 #, no-wrap msgid "images/LOffice_field_options.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4252 +#: user-manual.txt:4320 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 " @@ -8952,13 +9103,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4253 +#: user-manual.txt:4321 #, no-wrap msgid "Microsoft _Excel_" msgstr "" #. type: Plain text -#: user-manual.txt:4259 +#: user-manual.txt:4327 msgid "" "The field delimiter (called \"_list separator_\" in Microsoft manuals) is " "not accessible from within _Excel_ and needs to be set through the " @@ -8969,19 +9120,19 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4261 +#: user-manual.txt:4329 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:4262 +#: user-manual.txt:4330 msgid "Open the _Regional and Language Options_ dialog box." msgstr "" #. type: Plain text -#: user-manual.txt:4265 +#: user-manual.txt:4333 msgid "" "Do one of the following: ** In Windows 7, click the _Formats_ tab, and then " "click _Customize this format_. ** In Windows XP, click the _Regional " @@ -8989,48 +9140,48 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4266 +#: user-manual.txt:4334 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:4267 +#: user-manual.txt:4335 msgid "Click _OK_ twice." msgstr "" #. type: Plain text -#: user-manual.txt:4269 +#: user-manual.txt:4337 msgid "Below is an image of the _Control Panel_:" msgstr "" #. type: Target for macro image -#: user-manual.txt:4270 +#: user-manual.txt:4338 #, no-wrap msgid "images/Win_SaveCSV2.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4273 +#: user-manual.txt:4341 msgid "To export the dive log in CSV format:" msgstr "" #. type: Plain text -#: user-manual.txt:4275 +#: user-manual.txt:4343 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:4276 +#: user-manual.txt:4344 #, no-wrap msgid "images/Win_SaveCSV1.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4282 +#: user-manual.txt:4350 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 " @@ -9040,13 +9191,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:4283 +#: user-manual.txt:4351 #, no-wrap msgid "images/Win_SaveCSV3.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4289 +#: user-manual.txt:4357 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 " @@ -9055,13 +9206,13 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:4290 +#: user-manual.txt:4358 #, no-wrap msgid "APPENDIX E: Writing a custom print template" msgstr "" #. type: Plain text -#: user-manual.txt:4295 +#: user-manual.txt:4363 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 " @@ -9070,12 +9221,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4297 +#: user-manual.txt:4365 msgid "Templates are accessed using the print dialogue (see image *B* below)." msgstr "" #. type: Plain text -#: user-manual.txt:4305 +#: user-manual.txt:4373 msgid "" "The buttons under the _Template_ dropdown box lets you _Edit_, _Delete_, " "_Import_ and _Export_ templates (see image *A* above). New or modified " @@ -9087,18 +9238,18 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4307 +#: user-manual.txt:4375 msgid "The Edit Panel has three tabs:" msgstr "" #. type: Target for macro image -#: user-manual.txt:4308 +#: user-manual.txt:4376 #, no-wrap msgid "images/Template1_f22.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4312 +#: user-manual.txt:4380 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 " @@ -9106,7 +9257,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4316 +#: user-manual.txt:4384 msgid "" "The _Colors_ tab (image *B* above) allows editing the colors used for " "printing the dive log. The colors are highly customizable: the _Edit_ " @@ -9115,7 +9266,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4325 +#: user-manual.txt:4393 msgid "" "The _Template_ tab of the Edit Panel (see image below) allows creating a " "template using HTML as well as a few Grantlee programming " @@ -9131,13 +9282,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:4326 +#: user-manual.txt:4394 #, no-wrap msgid "images/Template2_f22.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4331 +#: user-manual.txt:4399 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 " @@ -9146,33 +9297,33 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4333 +#: user-manual.txt:4401 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:4334 +#: user-manual.txt:4402 #, no-wrap msgid "Main dive loop" msgstr "" #. type: Plain text -#: user-manual.txt:4336 +#: user-manual.txt:4404 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:4336 user-manual.txt:4401 user-manual.txt:4418 +#: user-manual.txt:4404 user-manual.txt:4469 user-manual.txt:4486 #, no-wrap msgid "template.html" msgstr "" #. type: delimited block . -#: user-manual.txt:4341 +#: user-manual.txt:4409 #, no-wrap msgid "" "\t{% for dive in dives %}\n" @@ -9181,13 +9332,13 @@ msgid "" msgstr "" #. type: Block title -#: user-manual.txt:4343 user-manual.txt:4406 user-manual.txt:4425 +#: user-manual.txt:4411 user-manual.txt:4474 user-manual.txt:4493 #, no-wrap msgid "output.html" msgstr "" #. type: delimited block . -#: user-manual.txt:4348 +#: user-manual.txt:4416 #, no-wrap msgid "" "\t<h1> 1 </h1>\n" @@ -9196,25 +9347,25 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4351 +#: user-manual.txt:4419 msgid "" "Additional information about _Grantlee_ can be found at " "http://www.grantlee.org/apidox/for_themers.html[here]" msgstr "" #. type: Title === -#: user-manual.txt:4352 +#: user-manual.txt:4420 #, no-wrap msgid "Grantlee exported variables" msgstr "" #. type: Plain text -#: user-manual.txt:4354 +#: user-manual.txt:4422 msgid "Only a subset of the dive data is exported:" msgstr "" #. type: delimited block | -#: user-manual.txt:4383 +#: user-manual.txt:4451 #, no-wrap msgid "" "|*Name*|*Description*\n" @@ -9248,7 +9399,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4387 +#: user-manual.txt:4455 msgid "" "_Subsurface_ also exports *template_options* data. This data must be used as " "_CSS_ values to provide a dynamically editable template. The exported data " @@ -9256,7 +9407,7 @@ msgid "" msgstr "" #. type: delimited block | -#: user-manual.txt:4399 +#: user-manual.txt:4467 #, no-wrap msgid "" "|*Name*|*Description*\n" @@ -9275,26 +9426,26 @@ msgid "" msgstr "" #. type: delimited block . -#: user-manual.txt:4404 +#: user-manual.txt:4472 #, no-wrap msgid "\tborder-width: {{ template_options.borderwidth }}px;\n" msgstr "" #. type: delimited block . -#: user-manual.txt:4409 +#: user-manual.txt:4477 #, no-wrap msgid "\tborder-width: 3px;\n" msgstr "" #. type: Plain text -#: user-manual.txt:4412 +#: user-manual.txt:4480 msgid "" "Another variable that _Subsurface_ exports is *print_options*. This variable " "contains a single member:" msgstr "" #. type: delimited block | -#: user-manual.txt:4415 +#: user-manual.txt:4483 #, no-wrap msgid "" "|*Name*|*Description*\n" @@ -9303,7 +9454,7 @@ msgid "" msgstr "" #. type: delimited block . -#: user-manual.txt:4423 +#: user-manual.txt:4491 #, no-wrap msgid "" "\tbody {\n" @@ -9312,7 +9463,7 @@ msgid "" msgstr "" #. type: delimited block . -#: user-manual.txt:4430 +#: user-manual.txt:4498 #, no-wrap msgid "" "\tbody {\n" @@ -9321,13 +9472,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4432 +#: user-manual.txt:4500 #, no-wrap msgid "Defined CSS selectors" msgstr "" #. type: Plain text -#: user-manual.txt:4435 +#: user-manual.txt:4503 msgid "" "As the dive profile is placed after rendering, _Subsurface_ uses special " "_CSS_ selectors to searche in the HTML output. The _CSS_ selectors in the " @@ -9335,7 +9486,7 @@ msgid "" msgstr "" #. type: delimited block | -#: user-manual.txt:4442 +#: user-manual.txt:4510 #, no-wrap msgid "" "|*Selector*|*Type*|*Description*\n" @@ -9348,20 +9499,20 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4445 +#: user-manual.txt:4513 msgid "" "Rendering dive profiles is not supported for flow layout templates (when " "data-numberofdives = 0)." msgstr "" #. type: Title === -#: user-manual.txt:4446 +#: user-manual.txt:4514 #, no-wrap msgid "Special attributes" msgstr "" #. type: Plain text -#: user-manual.txt:4450 +#: user-manual.txt:4518 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 " @@ -9369,55 +9520,55 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4452 +#: user-manual.txt:4520 msgid "" "The *data-numberofdives* data attribute is added to the body tag to set the " "rendering mode." msgstr "" #. type: Plain text -#: user-manual.txt:4454 +#: user-manual.txt:4522 msgid "render 6 dives per page:" msgstr "" #. type: delimited block . -#: user-manual.txt:4457 +#: user-manual.txt:4525 #, no-wrap msgid "\t<body data-numberofdives = 6>\n" msgstr "" #. type: Plain text -#: user-manual.txt:4460 +#: user-manual.txt:4528 msgid "render as much dives as possible:" msgstr "" #. type: delimited block . -#: user-manual.txt:4463 +#: user-manual.txt:4531 #, no-wrap msgid "\t<body data-numberofdives = 0>\n" msgstr "" #. type: Plain text -#: user-manual.txt:4466 +#: user-manual.txt:4534 msgid "" "All CSS units should be in relative lengths only, to support printing on any " "page size." msgstr "" #. type: Title == -#: user-manual.txt:4467 +#: user-manual.txt:4535 #, no-wrap msgid "APPENDIX F: FAQs." msgstr "" #. type: Title === -#: user-manual.txt:4469 +#: user-manual.txt:4537 #, no-wrap msgid "Subsurface appears to miscalculate gas consumption and SAC" msgstr "" #. type: Plain text -#: user-manual.txt:4473 +#: user-manual.txt:4541 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_ " @@ -9425,7 +9576,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4479 +#: user-manual.txt:4547 msgid "" "'Answer': Not really. What happens is that _Subsurface_ actually calculates " "gas consumption differently - and better - than you expect. In particular, " @@ -9435,7 +9586,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4485 +#: user-manual.txt:4553 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 " @@ -9445,12 +9596,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4487 +#: user-manual.txt:4555 msgid "+consumption = (amount_of_air_at_beginning - amount_of_air_at_end)+" msgstr "" #. type: Plain text -#: user-manual.txt:4493 +#: user-manual.txt:4561 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 " @@ -9461,12 +9612,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4495 +#: user-manual.txt:4563 msgid "+12.2*((220-100)/1.013)+" msgstr "" #. type: Plain text -#: user-manual.txt:4500 +#: user-manual.txt:4568 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 " @@ -9476,7 +9627,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4506 +#: user-manual.txt:4574 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 " @@ -9487,7 +9638,7 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4507 +#: user-manual.txt:4575 #, no-wrap msgid "" "Some dive profiles have time discrepancies with the recorded samples from my " @@ -9495,7 +9646,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4511 +#: user-manual.txt:4579 msgid "" "_Subsurface_ ends up ignoring surface time for many things (average depth, " "divetime, SAC, etc). 'Question': Why do dive durations in my dive computer " @@ -9503,7 +9654,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4519 +#: user-manual.txt:4587 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 " @@ -9517,13 +9668,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4520 +#: user-manual.txt:4588 #, no-wrap msgid "Some dive profiles are missing from the download" msgstr "" #. type: Plain text -#: user-manual.txt:4534 +#: user-manual.txt:4602 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 " @@ -9538,7 +9689,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4538 +#: user-manual.txt:4606 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 " |