diff options
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/50-pot/subsurface-mobile-manual.pot | 2 | ||||
| -rw-r--r-- | Documentation/50-pot/subsurface-user-manual.pot | 2919 | ||||
| -rw-r--r-- | Documentation/fr/po/subsurface-user-manual.fr.po | 3019 | ||||
| -rw-r--r-- | Documentation/mobile-manual_fr.html.git | 2 | ||||
| -rw-r--r-- | Documentation/user-manual_fr.html.git | 650 | ||||
| -rw-r--r-- | Documentation/user-manual_fr.txt | 407 |
6 files changed, 4313 insertions, 2686 deletions
diff --git a/Documentation/50-pot/subsurface-mobile-manual.pot b/Documentation/50-pot/subsurface-mobile-manual.pot index 4205aacbe..8c8f4e4d0 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-11-30 13:40+0100\n" +"POT-Creation-Date: 2017-01-11 10:42+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 5c50359e6..f98daf8c3 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-11-30 13:40+0100\n" +"POT-Creation-Date: 2017-01-11 10:42+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" @@ -41,11 +41,11 @@ msgstr "" #. type: Plain text #: user-manual.txt:22 -msgid "[blue]#_Version 4.5, October 2015_#" +msgid "[blue]#_Version 4.6, January 2017_#" msgstr "" #. type: Plain text -#: user-manual.txt:28 +#: user-manual.txt:27 msgid "" "Welcome as a user of _Subsurface_, an advanced dive logging program with " "extensive infrastructure to describe, organize, interpret and print scuba " @@ -54,13 +54,20 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:31 +#: user-manual.txt:30 msgid "" "Do you need a flexible way of logging dives using recreational equipment, " "even without a dive computer?" msgstr "" #. type: Plain text +#: user-manual.txt:31 +msgid "" +"Do you wish to seamlessly include GPS locations of dive sites into your dive " +"log?" +msgstr "" + +#. type: Plain text #: user-manual.txt:37 msgid "" "Do you use two different dive computer brands, each with its own proprietary " @@ -76,17 +83,17 @@ msgstr "" #: user-manual.txt:40 msgid "" "Do you use more than one operating system? _Subsurface_ is fully compatible " -"with Mac, Linux and Windows, letting you access your dive log on each " -"operating system using a single application." +"with Mac, Linux and Windows, letting you access your dive log on a range of " +"operating systems using a single application." msgstr "" #. type: Plain text #: user-manual.txt:43 msgid "" -"Do you use Linux or Mac, but your dive computer has only Windows- based " -"software for downloading dive information (e.g. Mares)? _Subsurface_ " -"provides a way of downloading and analyzing your dive logs on other " -"operating systems." +"Do you use Linux or Mac, but your dive computer has only Windows-based " +"software for downloading dive information (e.g. Mares or Scubapro)? " +"_Subsurface_ provides a way of downloading and analyzing your dive logs on " +"other operating systems." msgstr "" #. type: Plain text @@ -97,10 +104,20 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:51 +#: user-manual.txt:47 msgid "" "Do you need a way of storing or backing up your dive log on the Internet, " -"letting you view your dive log from anywhere using an Internet browser? " +"letting you view your dive log from anywhere using an Internet browser?" +msgstr "" + +#. type: Plain text +#: user-manual.txt:48 +msgid "Do you wish to access or modify your dive log using a mobile phone?" +msgstr "" + +#. type: Plain text +#: user-manual.txt:53 +msgid "" "_Subsurface_ binaries are available for Windows PCs (Win XP or later), Intel " "based Macs (OS/X) and many Linux distributions. _Subsurface_ can be built " "for many more hardware platforms and software environments where Qt and " @@ -108,20 +125,20 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:60 +#: user-manual.txt:62 msgid "" "This manual explains how to use the _Subsurface_ program. To install the " "software, consult the _Downloads_ page on the " "http://subsurface-divelog.org/[_Subsurface_ web site]. Please discuss " "issues with this program by sending an email to " "mailto:subsurface@subsurface-divelog.org[our mailing list] and report bugs " -"at https://github.com/Subsurface-divelog/subsurface/issues[our bugtracker]. For instructions on how to " -"build the software and (if needed) its dependencies please consult the " -"INSTALL file included with the source code." +"at https://github.com/Subsurface-divelog/subsurface/issues[our bugtracker]. " +"For instructions on how to build the software and (if needed) its " +"dependencies please consult the INSTALL file included with the source code." msgstr "" #. type: Plain text -#: user-manual.txt:63 +#: user-manual.txt:65 #, no-wrap msgid "" "*Audience*: Recreational Scuba Divers, Free Divers, Tec Divers, " @@ -130,18 +147,18 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:65 +#: user-manual.txt:67 msgid "toc::[]" msgstr "" #. type: Title - -#: user-manual.txt:68 +#: user-manual.txt:70 #, no-wrap msgid "Using this manual" msgstr "" #. type: Plain text -#: user-manual.txt:71 +#: user-manual.txt:73 msgid "" "When opened from within _Subsurface_, this manual does not have external " "controls for paging or selecting previous pages. However, two facilities are " @@ -149,7 +166,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:78 +#: user-manual.txt:80 msgid "" "The _SEARCH_ function is activated by pressing control-F or command-F on the " "keyboard. A text box appears at the bottom right-hand of the window (see " @@ -160,13 +177,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:79 +#: user-manual.txt:81 #, no-wrap msgid "images/UserManualSearch.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:91 +#: user-manual.txt:93 msgid "" "_PREVIOUS/NEXT LINK_. Move between links (underlined words that jump to " "specific sections in the user manual) by right-clicking on the text of the " @@ -179,19 +196,19 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:92 +#: user-manual.txt:94 #, no-wrap msgid "images/UserManualLinksBack.jpg" msgstr "" #. type: Title - -#: user-manual.txt:97 +#: user-manual.txt:99 #, no-wrap msgid "The user survey" msgstr "" #. type: Plain text -#: user-manual.txt:108 +#: user-manual.txt:110 msgid "" "In order to develop _Subsurface_ to serve its users in the best possible " "way, it’s important to have user information. Upon launching _Subsurface_ " @@ -207,13 +224,13 @@ msgid "" msgstr "" #. type: Title - -#: user-manual.txt:111 +#: user-manual.txt:113 #, no-wrap msgid "Start Using the Program" msgstr "" #. type: Plain text -#: user-manual.txt:116 +#: user-manual.txt:118 msgid "" "The _Subsurface_ window is usually divided into four panels with a *Main " "Menu* (File Import Log View Help) at the top of the window (for Windows and " @@ -222,7 +239,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:122 +#: user-manual.txt:124 msgid "" "The *Dive List* on the bottom left, showing all the dives in the user's dive " "log. A dive can be selected and highlighted on the dive list by clicking on " @@ -231,7 +248,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:126 +#: user-manual.txt:128 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 " @@ -239,7 +256,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:130 +#: user-manual.txt:132 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 " @@ -247,7 +264,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:134 +#: user-manual.txt:136 msgid "" "The *Dive Profile* on the top right, showing a graphical dive profile of the " "selected dive in the *Dive List*. You can zoom into the dive profile for a " @@ -255,7 +272,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:138 +#: user-manual.txt:140 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 " @@ -264,7 +281,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:146 +#: user-manual.txt:148 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 " @@ -276,38 +293,38 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:149 +#: user-manual.txt:151 #, no-wrap msgid "images/main_window_f22.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:153 +#: user-manual.txt:155 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:155 +#: user-manual.txt:157 #, no-wrap msgid "*All*: show all four of the panels as in the screenshot above.\n" msgstr "" #. type: Plain text -#: user-manual.txt:157 +#: user-manual.txt:159 #, no-wrap msgid "*Divelist*: Show only the Dive List.\n" msgstr "" #. type: Plain text -#: user-manual.txt:159 +#: user-manual.txt:161 #, no-wrap msgid "*Profile*: Show only the Dive Profile of the selected dive.\n" msgstr "" #. type: Plain text -#: user-manual.txt:162 +#: user-manual.txt:164 #, no-wrap msgid "" "*Info*: Show only the Notes about the last selected dive and statistics " @@ -316,13 +333,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:164 +#: user-manual.txt:166 #, no-wrap msgid "*Globe*: Show only the world map, centered on the last selected dive.\n" msgstr "" #. type: Plain text -#: user-manual.txt:170 +#: user-manual.txt:172 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 " @@ -333,7 +350,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:174 +#: user-manual.txt:176 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 " @@ -342,13 +359,13 @@ msgid "" msgstr "" #. type: Title - -#: user-manual.txt:177 +#: user-manual.txt:179 #, no-wrap msgid "Creating a new logbook" msgstr "" #. type: Plain text -#: user-manual.txt:182 +#: user-manual.txt:184 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 " @@ -357,49 +374,49 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:184 +#: user-manual.txt:186 #, no-wrap msgid "Storing dive information in the logbook" msgstr "" #. type: Plain text -#: user-manual.txt:187 +#: user-manual.txt:189 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:189 +#: user-manual.txt:191 msgid "If the user has a handwritten divelog, a spreadsheet or another form of" msgstr "" #. type: Plain text -#: user-manual.txt:191 +#: user-manual.txt:193 msgid "" "manually maintained divelog, dive data can be added to the logbook using one " "of these approaches:" msgstr "" #. type: Plain text -#: user-manual.txt:193 +#: user-manual.txt:195 msgid "Enter dive information by hand. This is useful if the diver didn’t" msgstr "" #. type: Plain text -#: user-manual.txt:195 +#: user-manual.txt:197 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:197 +#: user-manual.txt:199 msgid "Import dive log information that has been maintained either as a spreadsheet" msgstr "" #. type: Plain text -#: user-manual.txt:199 +#: user-manual.txt:201 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 " @@ -407,7 +424,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:203 +#: user-manual.txt:205 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 " @@ -415,44 +432,44 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:205 +#: user-manual.txt:207 msgid "" "The dive computer itself. See: xref:S_ImportDiveComputer[Importing new dive " "information from a Dive Computer];" msgstr "" #. type: Plain text -#: user-manual.txt:206 +#: user-manual.txt:208 msgid "Proprietary software distributed by manufacturers of dive computers. Refer" msgstr "" #. type: Plain text -#: user-manual.txt:207 +#: user-manual.txt:209 msgid "" "to: xref:S_ImportingAlienDiveLogs[Importing dive information from other " "digital data sources or other data formats]." msgstr "" #. type: Plain text -#: user-manual.txt:208 +#: user-manual.txt:210 msgid "Spreadsheet or CSV files containing dive profiles." msgstr "" #. type: Plain text -#: user-manual.txt:209 +#: user-manual.txt:211 msgid "" "See: xref:S_ImportingCSVDives[Importing dives in CSV format from dive " "computers or other dive log software]" msgstr "" #. type: Title === -#: user-manual.txt:212 +#: user-manual.txt:214 #, no-wrap msgid "Entering dive information by hand" msgstr "" #. type: Plain text -#: user-manual.txt:227 +#: user-manual.txt:229 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 " @@ -469,13 +486,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:228 +#: user-manual.txt:230 #, no-wrap msgid "images/AddDive1_f22.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:232 +#: user-manual.txt:234 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 " @@ -484,13 +501,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:233 user-manual.txt:787 +#: user-manual.txt:235 user-manual.txt:801 #, no-wrap msgid "images/BlueEditBar_f22.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:242 +#: user-manual.txt:244 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_, " @@ -504,13 +521,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:244 +#: user-manual.txt:246 #, no-wrap msgid "Creating a Dive Profile" msgstr "" #. type: Plain text -#: user-manual.txt:251 +#: user-manual.txt:253 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 " @@ -520,13 +537,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:252 +#: user-manual.txt:254 #, no-wrap msgid "images/DiveProfile1_f20.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:270 +#: user-manual.txt:272 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. " @@ -544,13 +561,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:271 +#: user-manual.txt:273 #, no-wrap msgid "images/DiveProfile2_f20.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:283 +#: user-manual.txt:285 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 " @@ -564,13 +581,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:284 +#: user-manual.txt:286 #, no-wrap msgid "images/DiveProfile3_f20.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:291 +#: user-manual.txt:293 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 " @@ -579,19 +596,19 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:292 +#: user-manual.txt:294 #, no-wrap msgid "Importing new dive information from a Dive Computer" msgstr "" #. type: Title ==== -#: user-manual.txt:294 +#: user-manual.txt:296 #, no-wrap msgid "Connecting and importing data from a dive computer." msgstr "" #. type: Plain text -#: user-manual.txt:304 +#: user-manual.txt:306 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, " @@ -603,13 +620,13 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:305 user-manual.txt:661 user-manual.txt:3216 +#: user-manual.txt:307 user-manual.txt:675 user-manual.txt:1098 user-manual.txt:3383 #, no-wrap msgid "images/icons/warning2.png" msgstr "" #. type: Plain text -#: user-manual.txt:315 +#: user-manual.txt:317 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 " @@ -621,7 +638,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:331 +#: user-manual.txt:333 msgid "" "To import dive information from a dive computer to a computer with " "_Subsurface_, the two pieces of equipment must communicate with one " @@ -638,47 +655,47 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:333 +#: user-manual.txt:335 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:335 +#: user-manual.txt:337 msgid "The interface cable should be connected to a free USB port (or the Infra-red" msgstr "" #. type: Plain text -#: user-manual.txt:336 +#: user-manual.txt:338 msgid "or Bluetooth connection set up as described later in this manual)" msgstr "" #. type: Plain text -#: user-manual.txt:338 +#: user-manual.txt:340 msgid "The dive computer should be placed into PC Communication mode." msgstr "" #. type: Plain text -#: user-manual.txt:339 +#: user-manual.txt:341 msgid "(Refer to the manual of the specific dive computer)" msgstr "" #. type: Plain text -#: user-manual.txt:343 +#: user-manual.txt:345 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:345 +#: user-manual.txt:347 #, no-wrap msgid "images/DC_import_f20.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:353 +#: user-manual.txt:355 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 " @@ -689,7 +706,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:360 +#: user-manual.txt:362 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, " @@ -699,7 +716,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:371 +#: user-manual.txt:373 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 " @@ -713,7 +730,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:381 +#: user-manual.txt:383 msgid "" "If all the dives on the dive computer need to be downloaded, check the " "checkbox _Force download of all dives_. Normally, _Subsurface_ only " @@ -728,7 +745,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:387 +#: user-manual.txt:389 msgid "" "If the checkbox _Always prefer downloaded dives_ has been checked and, " "during download, dives with identical date-times exist on the dive computer " @@ -737,14 +754,14 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:390 +#: user-manual.txt:392 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:394 +#: user-manual.txt:396 msgid "" "Do *not* check the checkboxes labelled _Save libdivecomputer logfile_ and " "_Save libdivecomputer dumpfile_. These are only used as diagnostic tools " @@ -752,7 +769,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:412 +#: user-manual.txt:414 msgid "" "Then select the _Download_ button. With communication established, you can " "see how the data are retrieved from the dive computer. Depending on the " @@ -773,7 +790,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:416 +#: user-manual.txt:418 msgid "" "If there is a problem in communicating with the dive computer, an error " "message is shown, similar to this text: \"Unable to open /dev/ttyUSB0 Mares " @@ -781,36 +798,36 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:420 +#: user-manual.txt:422 #, no-wrap 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:1152 user-manual.txt:1218 user-manual.txt:1383 user-manual.txt:1458 user-manual.txt:1765 +#: user-manual.txt:422 user-manual.txt:529 user-manual.txt:573 user-manual.txt:586 user-manual.txt:1239 user-manual.txt:1304 user-manual.txt:1468 user-manual.txt:1543 user-manual.txt:1856 #, no-wrap msgid "images/icons/important.png" msgstr "" #. type: delimited block * -#: user-manual.txt:423 +#: user-manual.txt:425 msgid "Check the following:" msgstr "" #. type: delimited block * -#: user-manual.txt:426 +#: user-manual.txt:428 msgid "Is the dive computer still in PC-communication or Upload mode?" msgstr "" #. type: delimited block * -#: user-manual.txt:428 +#: user-manual.txt:430 msgid "" "Is the dive computer’s battery fully charged? If not then charge or replace " "it." msgstr "" #. type: delimited block * -#: user-manual.txt:432 +#: user-manual.txt:434 msgid "" "Is the connecting cable faulty? Does the cable work using other software? " "Has it worked before, or is this the first time the cable is being used? Are " @@ -818,7 +835,7 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:437 +#: user-manual.txt:439 msgid "" "Consult " "xref:_appendix_a_operating_system_specific_information_for_importing_dive_information_from_a_dive_computer[Appendix " @@ -826,7 +843,7 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:441 +#: user-manual.txt:443 msgid "" "On Unix-like operating systems, does the user have write permission to the " "USB port? If not, consult " @@ -835,7 +852,7 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:449 +#: user-manual.txt:451 msgid "" "If the _Subsurface_ computer does not recognize the USB adaptor by showing " "an appropriate device name next to the Mount Point, then there is a " @@ -847,7 +864,7 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:452 +#: user-manual.txt:454 #, no-wrap msgid "" "\tSave libdivecomputer logfile\n" @@ -855,7 +872,7 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:458 +#: user-manual.txt:460 #, no-wrap msgid "" "*Important*: These check boxes are only used when problems are encountered\n" @@ -868,7 +885,7 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:462 +#: user-manual.txt:464 #, no-wrap msgid "" "*Important:* _After downloading with the above checkboxes\n" @@ -877,7 +894,7 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:465 +#: user-manual.txt:467 #, no-wrap msgid "" "\tsubsurface.log\n" @@ -885,7 +902,7 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:471 +#: user-manual.txt:473 msgid "" "These files should be send to the _Subsurface_ mail list: " "_subsurface@subsurface-divelog.org_ with a request for the files to be " @@ -894,19 +911,19 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:474 +#: user-manual.txt:476 #, no-wrap 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:3782 +#: user-manual.txt:477 user-manual.txt:3995 #, no-wrap msgid "images/icons/bluetooth.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:482 +#: user-manual.txt:484 msgid "" "Bluetooth is becoming a more common way of communication between dive " "computers and _Subsurface_, for or instance, the Shearwater Petrel Mk2 and " @@ -916,29 +933,29 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:484 +#: user-manual.txt:486 msgid "Ensure Bluetooth is activated on the host computer running _Subsurface_." msgstr "" #. type: Plain text -#: user-manual.txt:485 +#: user-manual.txt:487 msgid "Ensure _Subsurface_ sees the Bluetooth adapter on the host computer." msgstr "" #. type: Plain text -#: user-manual.txt:486 +#: user-manual.txt:488 msgid "" "Ensure the Bluetooth-enabled dive computer is Bluetooth-discoverable and in " "PC upload mode." msgstr "" #. type: Plain text -#: user-manual.txt:487 +#: user-manual.txt:489 msgid "Ensure _Subsurface_ is paired with the Bluetooth-enabled dive computer." msgstr "" #. type: Plain text -#: user-manual.txt:491 +#: user-manual.txt:493 msgid "" "Select the Download dialogue by selecting _Import -> Import from dive " "computer_ from the *Main Menu*. After checking the box labelled _\"Choose " @@ -946,19 +963,19 @@ msgid "" msgstr "" #. type: Title ===== -#: user-manual.txt:492 +#: user-manual.txt:494 #, no-wrap msgid "On Linux or MacOS:" msgstr "" #. type: Target for macro image -#: user-manual.txt:494 +#: user-manual.txt:496 #, no-wrap msgid "images/DC_import_Bluetooth.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:525 +#: user-manual.txt:527 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 " @@ -991,7 +1008,7 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:532 +#: user-manual.txt:534 msgid "" "Currently _Subsurface_ does not support Bluetooth pairing with dive " "computers that require a custom PIN code. In order to pair the devices, use " @@ -999,12 +1016,12 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:534 +#: user-manual.txt:536 msgid "One way to achieve this is to use +bluetoothctl+:" msgstr "" #. type: delimited block * -#: user-manual.txt:545 +#: user-manual.txt:547 #, no-wrap msgid "" "\t$ bluetoothctl\n" @@ -1020,7 +1037,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:551 +#: user-manual.txt:553 msgid "" "After the devices are paired, press the _Save_ button of the dialogue. This " "closes the Bluetooth dialogue. Now select _Download_ in the _Download from " @@ -1029,19 +1046,19 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:552 user-manual.txt:3709 user-manual.txt:3797 +#: user-manual.txt:554 user-manual.txt:3922 user-manual.txt:4010 #, no-wrap msgid "On Windows:" msgstr "" #. type: Target for macro image -#: user-manual.txt:553 +#: user-manual.txt:555 #, no-wrap msgid "images/DC_import_Bluetooth_Windows.png" msgstr "" #. type: Plain text -#: user-manual.txt:563 +#: user-manual.txt:565 msgid "" "On _Windows_ platforms the _Local Bluetooth device details section_ on the " "right is not displayed as is the case on the Linux/Mac systems. To start a " @@ -1055,7 +1072,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:570 +#: user-manual.txt:572 msgid "" "The pairing step is checked and done automatically during the download " "process. If the devices have never been paired the system will ask " @@ -1066,7 +1083,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:578 +#: user-manual.txt:580 msgid "" "Currently _Subsurface_ works only with local Bluetooth adapters which use " "Microsoft Bluetooth Stack. If the local device uses _Widcomm_, _Stonestreet " @@ -1076,7 +1093,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:583 +#: user-manual.txt:585 msgid "" "A log message on the bottom left of the _Remote Bluetooth device selection_ " "shows details about the current status of the Bluetooth agent. To select " @@ -1086,7 +1103,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:593 +#: user-manual.txt:595 #, no-wrap msgid "" "*IN CASE OF PROBLEMS*: If the Bluetooth adapter from the _Subsurface_ " @@ -1101,13 +1118,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:596 +#: user-manual.txt:597 #, no-wrap msgid "Changing the name of a dive computer" msgstr "" #. type: Plain text -#: user-manual.txt:612 +#: user-manual.txt:613 msgid "" "It may be necessary to distinguish between different dive computers used to " "upload dive logs to _Subsurface_. For instance if a buddy’s dive computer is " @@ -1126,13 +1143,35 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:614 +#: user-manual.txt:615 +#, no-wrap +msgid "Uploading data for a specific dive from more than one dive computer" +msgstr "" + +#. type: Plain text +#: user-manual.txt:626 +msgid "" +"Some divers use more than one dive computer at the same time, e.g. during " +"technical diving. If you import the dive profiles from these different dive " +"computers into _Subsurface_, the profiles can be viewed " +"independently. During upload the data from the dive computers are " +"automatically merged into a single dive. The different profiles are " +"presented on the _Profile_ panel with the name of each dive computer " +"indicated at the bottom left. *While the dive is highlighted in the _Dive " +"List_*, switch between the profiles of the different dive computers by using " +"either the left/right arrow keyboard keys or by selecting _View -> Previous " +"DC_ or _View -> Next DC_. The data in the _Notes_ panel are not affected by " +"the specific dive computer that is selected." +msgstr "" + +#. type: Title ==== +#: user-manual.txt:628 #, no-wrap msgid "Updating the dive information imported from the dive computer." msgstr "" #. type: Plain text -#: user-manual.txt:621 +#: user-manual.txt:635 msgid "" "With the uploaded dives in the *Dive List*, the information from the dive " "computer is not complete and more details must be added to have a full " @@ -1141,13 +1180,13 @@ msgid "" msgstr "" #. type: Title ===== -#: user-manual.txt:623 +#: user-manual.txt:637 #, no-wrap msgid "Notes" msgstr "" #. type: Plain text -#: user-manual.txt:628 +#: user-manual.txt:642 msgid "" "To have a more complete dive record, the user needs to add additional " "information by hand. The procedure below is virtually identical for " @@ -1155,7 +1194,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:638 +#: user-manual.txt:652 msgid "" "In some cases, you must provide the date and time of the dive, for example " "when entering a dive by hand or when a dive computer doesn’t provide the " @@ -1168,13 +1207,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:639 +#: user-manual.txt:653 #, no-wrap msgid "images/AddDive3_f22.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:648 +#: user-manual.txt:662 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 " @@ -1185,7 +1224,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:658 +#: user-manual.txt:672 #, no-wrap msgid "" "*Air/water temperatures*: Air and water temperatures during the dive are " @@ -1205,13 +1244,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:661 +#: user-manual.txt:675 #, no-wrap msgid "*Location*:\n" msgstr "" #. type: Plain text -#: user-manual.txt:669 +#: user-manual.txt:683 msgid "" "Dive locations are managed as a *separate* part of the dive log. The dive " "information in the *Notes* and *Equipment* tabs can therefore NOT be edited " @@ -1223,7 +1262,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:687 +#: user-manual.txt:701 msgid "" "Type in the name of the dive site, e.g. \"Tihany, Lake Balaton, Hungary\". " "If several dives are made at the same location, the site information for the " @@ -1243,13 +1282,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:688 +#: user-manual.txt:702 #, no-wrap msgid "images/Locations1_f22.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:693 +#: user-manual.txt:707 msgid "" "Doubleclick on the new dive site name. A panel appears to enter the " "coordinates and other information about the site (image *B*, above). The " @@ -1258,7 +1297,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:699 +#: user-manual.txt:713 msgid "" "Use the world map in the bottom right hand part of the _Subsurface_ " "window. The map displays an orange bar indicating \"No location data - Move " @@ -1268,7 +1307,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:704 +#: user-manual.txt:718 msgid "" "Use eiher the Subsurface-Mobile App or the _Subsurface_ Companion App on an " "Android or iPhone device with GPS and if the dive site coordinates were " @@ -1277,14 +1316,14 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:706 +#: user-manual.txt:720 msgid "" "Enter coordiantes by hand if they are known, using one of four formats with " "latitude followed by longitude:" msgstr "" #. type: Plain text -#: user-manual.txt:711 +#: user-manual.txt:725 msgid "" "ISO 6709 Annex D format e.g. 30°13'28.9\"N 30°49'1.5\"E Degrees and decimal " "minutes, e.g. N30° 13.49760' , E30° 49.30788' Degrees minutes seconds, " @@ -1293,7 +1332,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:719 +#: user-manual.txt:733 msgid "" "Southern hemisphere latitudes are given with a *S*, e.g. S30°, or with a " "negative value, e.g. -30.22496. Similarly western longitudes are given with " @@ -1305,7 +1344,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:725 +#: user-manual.txt:739 #, no-wrap msgid "" "*Important*: GPS coordinates of a dive site are linked to the location\n" @@ -1316,7 +1355,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:735 +#: user-manual.txt:749 #, no-wrap msgid "" "*Dive site name lookup:* If you typed coordinates into the appropriate\n" @@ -1333,7 +1372,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:740 +#: user-manual.txt:754 msgid "" "Enter any other contextual information about the dive site (Description and " "Notes), then select _Apply Changes_ to save the geolocation for this dive " @@ -1342,7 +1381,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:745 +#: user-manual.txt:759 #, no-wrap msgid "" "*Dive mode*: This is a dropdown box allowing you to choose the type of " @@ -1354,7 +1393,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:750 +#: user-manual.txt:764 #, no-wrap msgid "" "*Divemaster*: The name of the divemaster or dive guide should be\n" @@ -1364,7 +1403,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:755 +#: user-manual.txt:769 #, no-wrap msgid "" "*Buddy*: In this field, enter the name(s) of the buddy or buddies\n" @@ -1375,7 +1414,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:760 +#: user-manual.txt:774 #, no-wrap msgid "" "*Suit*: Here the type of dive suit used can be entered.\n" @@ -1386,7 +1425,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:763 +#: user-manual.txt:777 #, no-wrap msgid "" "*Rating*: Provide a subjective overall rating of the dive on a\n" @@ -1394,7 +1433,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:766 +#: user-manual.txt:780 #, no-wrap msgid "" "*Visibility*: Provide a rating of visibility during the\n" @@ -1402,7 +1441,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:773 +#: user-manual.txt:787 #, no-wrap msgid "" "*Tags*: Tags that describe the type of dive done can be entered\n" @@ -1416,13 +1455,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:775 +#: user-manual.txt:789 #, no-wrap msgid "*Notes*: Any additional information for the dive can be entered here.\n" msgstr "" #. type: Plain text -#: user-manual.txt:780 +#: user-manual.txt:794 msgid "" "The _Apply changes_ and _Discard changes_ buttons are used to save all the " "information for tabs in the *Info* panel and in the *Dive Profile* " @@ -1432,13 +1471,13 @@ msgid "" msgstr "" #. type: Title ===== -#: user-manual.txt:781 +#: user-manual.txt:795 #, no-wrap msgid "Equipment" msgstr "" #. type: Plain text -#: user-manual.txt:786 +#: user-manual.txt:800 msgid "" "The Equipment tab allow entering information about the type of cylinder and " "gas used, as well as the weights used for the dive. The message in the blue " @@ -1446,7 +1485,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:793 +#: user-manual.txt:807 msgid "" "shows the equipment is being edited. This is a highly interactive part of " "_Subsurface_ and the information on cylinders and gases (entered here) " @@ -1454,7 +1493,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:797 +#: user-manual.txt:811 #, no-wrap msgid "" "*Cylinders*: The cylinder information is entered through a dialogue that " @@ -1463,13 +1502,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:798 +#: user-manual.txt:812 #, no-wrap msgid "images/DC_gas-dialogue1_f20.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:811 +#: user-manual.txt:825 msgid "" "For hand-entered dives, this information needs to be typed in. For dive " "computers, _Subsurface_ often gets the gas used from the dive computer and " @@ -1485,13 +1524,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:812 +#: user-manual.txt:826 #, no-wrap msgid "images/DC_gas-dialogue2_f20.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:819 +#: user-manual.txt:833 msgid "" "The drop-down list can then be used to select the cylinder type that was " "used for this dive, or just start typing in the box which shows the " @@ -1501,7 +1540,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:823 +#: user-manual.txt:837 msgid "" "Next, indicate the starting pressure and the ending pressure of the " "specified gas during the dive. The unit of pressure (metric/imperial) " @@ -1509,7 +1548,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:834 +#: user-manual.txt:848 msgid "" "Finally, provide the gas mixture used. If air was used, the value of 21% can " "be entered into the oxygen box or this field can be left blank. If nitrox or " @@ -1523,13 +1562,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:835 +#: user-manual.txt:849 #, no-wrap msgid "images/CylinderDataEntry3_f20.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:841 +#: user-manual.txt:855 #, no-wrap msgid "" "*Weights*: Information about the weight system used can be entered\n" @@ -1540,26 +1579,26 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:842 +#: user-manual.txt:856 #, no-wrap msgid "images/WeightsDataEntry1_f20.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:846 +#: user-manual.txt:860 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:847 +#: user-manual.txt:861 #, no-wrap msgid "images/WeightsDataEntry2_f20.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:861 +#: user-manual.txt:875 msgid "" "This can be used to select the type of weight system used during the " "dive. You may start typing in the box to specify a different weighting " @@ -1574,19 +1613,19 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:862 +#: user-manual.txt:876 #, no-wrap msgid "images/WeightsDataEntry3_f20.jpg" msgstr "" #. type: Title ==== -#: user-manual.txt:864 +#: user-manual.txt:878 #, no-wrap msgid "Editing several selected dives simultaneously" msgstr "" #. type: Plain text -#: user-manual.txt:880 +#: user-manual.txt:894 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 " @@ -1604,7 +1643,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:890 +#: user-manual.txt:904 msgid "" "Simultaneous editing only works with fields that do not already contain " "information. This means if some fields have been edited for a particular " @@ -1619,7 +1658,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:899 +#: user-manual.txt:913 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 " @@ -1634,13 +1673,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:900 +#: user-manual.txt:915 #, no-wrap msgid "Adding Bookmarks to a dive" msgstr "" #. type: Plain text -#: user-manual.txt:905 +#: user-manual.txt:920 msgid "" "Many divers wish to annotate dives with text that indicate particular " "events, e.g. \"Saw dolphins\", or \"Released surface buoy\". This is easily " @@ -1648,7 +1687,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:909 +#: user-manual.txt:924 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 " @@ -1656,40 +1695,40 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:911 +#: user-manual.txt:926 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:914 +#: user-manual.txt:929 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:917 +#: user-manual.txt:932 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:918 +#: user-manual.txt:933 #, no-wrap msgid "images/Bookmarks.jpg" msgstr "" #. type: Title ==== -#: user-manual.txt:921 +#: user-manual.txt:936 #, no-wrap msgid "Saving the updated dive information" msgstr "" #. type: Plain text -#: user-manual.txt:932 +#: user-manual.txt:947 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 " @@ -1702,7 +1741,7 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:933 +#: user-manual.txt:948 #, no-wrap msgid "" "Importing dive information from other digital data sources or other data " @@ -1710,7 +1749,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:956 +#: user-manual.txt:971 msgid "" "Many divers log their dives using the proprietary software provided by the " "manufacturers of their dive computers. _Subsurface_ can import dive logs " @@ -1731,7 +1770,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:966 +#: user-manual.txt:981 msgid "" "If the format of other software is supported natively on Subsurface, select " "either _Import -> Import log files_ or _File -> Open log file_. _Subsurface_ " @@ -1745,13 +1784,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:967 +#: user-manual.txt:982 #, no-wrap msgid "Using the universal import dialogue" msgstr "" #. type: Plain text -#: user-manual.txt:973 +#: user-manual.txt:988 msgid "" "Importing dives from other software is done through a universal interface " "activated by selecting _Import_ from the Main Menu, then clicking on _Import " @@ -1759,13 +1798,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:974 +#: user-manual.txt:989 #, no-wrap msgid "images/Import1_f20.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:979 +#: user-manual.txt:994 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, " @@ -1773,69 +1812,79 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:981 +#: user-manual.txt:996 msgid "" "XML-formatted dive logs (DivingLog 5.0, MacDive and several other dive log " "systems)" msgstr "" #. type: Plain text -#: user-manual.txt:982 +#: user-manual.txt:997 msgid "Cochran dive logs" msgstr "" #. type: Plain text -#: user-manual.txt:983 -msgid "UDDF-formatted dive logs (e.g. Kenozoooid)" +#: user-manual.txt:998 +msgid "UDDF-formatted dive logs (e.g. Kenozooid)" msgstr "" #. type: Plain text -#: user-manual.txt:984 +#: user-manual.txt:999 msgid "UDCF-formatted dive logs" msgstr "" #. type: Plain text -#: user-manual.txt:985 +#: user-manual.txt:1000 msgid "Poseidon MkVI CCR logs" msgstr "" #. type: Plain text -#: user-manual.txt:986 +#: user-manual.txt:1001 msgid "APD Inspiration/Evolution CCR logs" msgstr "" #. type: Plain text -#: user-manual.txt:987 +#: user-manual.txt:1002 msgid "LiquiVision logs" msgstr "" #. type: Plain text -#: user-manual.txt:988 +#: user-manual.txt:1003 msgid "divelogs.de logs" msgstr "" #. type: Plain text -#: user-manual.txt:989 +#: user-manual.txt:1004 msgid "OSTC Tools logs" msgstr "" #. type: Plain text -#: user-manual.txt:990 +#: user-manual.txt:1005 msgid "JDiveLog" msgstr "" #. type: Plain text -#: user-manual.txt:991 +#: user-manual.txt:1006 msgid "Suunto Dive Manager (DM3, DM4, DM5)" msgstr "" #. type: Plain text -#: user-manual.txt:992 +#: user-manual.txt:1007 +msgid "DL7 files used by Diver's Alert network (DAN)" +msgstr "" + +#. type: Plain text +#: user-manual.txt:1008 +msgid "Underwater technologies AV1 dive logs" +msgstr "" + +#. type: Plain text +#: user-manual.txt:1009 msgid "CSV (text-based and spreadsheet-based) dive logs, including APD CCR logs" msgstr "" #. type: Plain text -#: user-manual.txt:997 +#: user-manual.txt:1014 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 " @@ -1845,13 +1894,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:998 +#: user-manual.txt:1015 #, no-wrap msgid "Importing from OSTCTools" msgstr "" #. type: Plain text -#: user-manual.txt:1007 +#: user-manual.txt:1024 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 " @@ -1864,7 +1913,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1011 +#: user-manual.txt:1028 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 " @@ -1872,7 +1921,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1016 +#: user-manual.txt:1033 msgid "" "Please remember that OSTCTools is *not* true diving log software, but rather " "a useful set of tools for analysis and management of OSTC devices. Only raw " @@ -1881,13 +1930,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:1018 +#: user-manual.txt:1035 #, no-wrap msgid "Importing from Mares Dive Organizer V2.1" msgstr "" #. type: Plain text -#: user-manual.txt:1025 +#: user-manual.txt:1042 msgid "" "Since Mares uses proprietary Windows software not compatible with " "multi-platform applications, these dive logs cannot be directly imported " @@ -1897,7 +1946,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1030 +#: user-manual.txt:1047 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 " @@ -1905,7 +1954,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1036 +#: user-manual.txt:1053 msgid "" "Data should then be imported into _www.divelogs.de_. First, create a user " "account in _www.divelogs.de_ and Log into that web site, then select _Import " @@ -1915,20 +1964,171 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1038 +#: user-manual.txt:1055 msgid "" "Finally, import the dives from _divelogs.de_ to _Subsurface_, using the " "instructions below." msgstr "" #. type: Title ==== -#: user-manual.txt:1041 +#: user-manual.txt:1058 +#, no-wrap +msgid "Importing Scubapro _SmartTrak_ divelogs" +msgstr "" + +#. type: Plain text +#: user-manual.txt:1065 +msgid "" +"_SmartTrak_ stores the raw data from a Uwatec/Scubapro dive computer along " +"with a plethora of other data manually added by the user, ranging from dive " +"points to buddies data or DAN survey info. However, this is Microsoft " +"Windows-based propietary software by Uwatec (today Scubapro) using " +"Microsoft Access databases, preventing the integration the importer into the " +"_Subsurface_ core application." +msgstr "" + +#. type: Plain text +#: user-manual.txt:1070 +msgid "" +"A stand alone tool for Linux has been developed to import the _.slg_ files " +"generated by SmartTrak to Subsurface's _.xml_ format. It can be built " +"together with _Subsurface_ for Linux systems. Two dependencies need to be " +"installed in your system before building: _libglib2.0_ and _libmdb2_." +msgstr "" + +#. type: Plain text +#: user-manual.txt:1073 +msgid "" +"Feel free to contact the _Subsurface_ development team on " +"mailto:subsurface@subsurface-divelog.org[our mailing list] for assistance in " +"importing _SmartTrak_ dive logs." +msgstr "" + +#. type: Plain text +#: user-manual.txt:1076 +msgid "" +"Assuming the above dependencies have been installed and the _Subsurface_ " +"source tree is in the directory _~/src/subsurface_, then:" +msgstr "" + +#. type: Title ===== +#: user-manual.txt:1077 +#, no-wrap +msgid "Building _smtk2ssrf_" +msgstr "" + +#. type: Plain text +#: user-manual.txt:1080 +msgid "Move to the source tree directory." +msgstr "" + +#. type: Plain text +#: user-manual.txt:1082 +msgid "" +"Run \" $ ccmake build \" and set SMARTTRAK_IMPORT option to *on* (off by " +"default)." +msgstr "" + +#. type: Plain text +#: user-manual.txt:1083 +msgid "Generate with [c] and save and exit with [g]." +msgstr "" + +#. type: Plain text +#: user-manual.txt:1085 +msgid "" +"Build as you prefer, using the _build.sh_ script (recomended) or moving to " +"build directory and running _make_." +msgstr "" + +#. type: Plain text +#: user-manual.txt:1088 +msgid "" +"After a successful build, there will be an executable named _smtk2ssrf_ in " +"the _subsurface/build_ directory. Copy or move it to a directory in your " +"$PATH, e.g. _~/bin_." +msgstr "" + +#. type: Title ===== +#: user-manual.txt:1089 +#, no-wrap +msgid "Running" +msgstr "" + +#. type: Plain text +#: user-manual.txt:1095 +msgid "" +"_smtk2ssrf_ accepts 0, 2 or more parameters. If it is launched without " +"parameters in a graphical user interface, a simple window opens for choosing " +"the _.slg_ file(s) to import and a destination file to store the " +"_Subsurface_-formatted data into (see image below)." +msgstr "" + +#. type: Target for macro image +#: user-manual.txt:1096 +#, no-wrap +msgid "images/smtk2ssrf.jpg" +msgstr "" + +#. type: Plain text +#: user-manual.txt:1103 +msgid "" +"Existing data in the destination file will be erased, so *DO NOT* use a " +"regular subsurface divelog file as a destination: rather, specify a *new* " +"filename as a destination." +msgstr "" + +#. type: Plain text +#: user-manual.txt:1105 +msgid "" +"If launched from a command line with two or more parameters, the format is " +"as follows:" +msgstr "" + +#. type: Plain text +#: user-manual.txt:1107 +#, no-wrap +msgid "\t$ smrtk2ssrf /input/file_1.slg /input/file_2.slg /output/file3.xml\n" +msgstr "" + +#. type: Plain text +#: user-manual.txt:1115 +msgid "" +"where _input_ is the directory containing the .slg file(s) and _output_ is " +"the directory where the _Subsurface_-formatted output is written to. Files " +"_file_1.slg_ and _file_2.slg_ in the _input_ directory are imported and " +"stored in _file3.xml_ in the _output_ directory. Check any warning and error " +"messages in the console or in the graphical window: some may be relevant as " +"support for Galileo family of dive computers is still a work in progress." +msgstr "" + +#. type: Title ===== +#: user-manual.txt:1116 +#, no-wrap +msgid "Merging the imported dives with the existing divelog" +msgstr "" + +#. type: Plain text +#: user-manual.txt:1126 +msgid "" +"Open the new file (generated in the previous steps) using _Subsurface_ and " +"check the dives and data. If everything is fine, close the _.xml_ file and " +"open your regular divelog. Then from the *Main Menu* select _Import -> " +"Import log file_ and choose the _.xml_ file containing the imported dives: " +"these will show in the *Dive List*, time ordered, along with the existing " +"dives. The new dives, although time ordered, will keep the numbering system " +"from _SmartTrak_, so a renumbering action is needed. See the section on " +"xref:S_Renumber[Renumbering the dives] for instructions on this topic." +msgstr "" + +#. type: Title ==== +#: user-manual.txt:1128 #, no-wrap msgid "Importing dives from *divelogs.de*" msgstr "" #. type: Plain text -#: user-manual.txt:1054 +#: user-manual.txt:1141 msgid "" "Importing dive information from _divelogs.de_ is simple, using a single " "dialogue box. The _Import -> Import from Divelogs.de_ option should be " @@ -1942,19 +2142,19 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1055 +#: user-manual.txt:1142 #, no-wrap msgid "images/Divelogs1.jpg" msgstr "" #. type: Title ==== -#: user-manual.txt:1058 +#: user-manual.txt:1145 #, no-wrap msgid "Importing data in CSV format" msgstr "" #. type: Plain text -#: user-manual.txt:1069 +#: user-manual.txt:1156 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 " @@ -1970,31 +2170,29 @@ msgid "" msgstr "" #. type: Title ===== -#: user-manual.txt:1071 +#: user-manual.txt:1158 #, no-wrap msgid "Importing dives in CSV format from dive computers or other dive log software" msgstr "" #. type: Plain text -#: user-manual.txt:1076 -#, no-wrap +#: user-manual.txt:1163 msgid "" -" _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" +"_CSV_ files can be viewed using an ordinary text editor. A _CSV_ file is " +"normally organized into a single line that provides the headers (or _field " +"names_ or _column headings_) of the data columns, followed by the data, one " +"record per line." msgstr "" #. type: Plain text -#: user-manual.txt:1078 +#: user-manual.txt:1165 msgid "" "There are two types of _CSV_ dive logs that can be imported into " "_Subsurface_:" msgstr "" #. type: Plain text -#: user-manual.txt:1084 +#: user-manual.txt:1171 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, " @@ -2005,7 +2203,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1093 +#: user-manual.txt:1180 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 " @@ -2019,14 +2217,14 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1096 +#: user-manual.txt:1183 msgid "" "Before being able to import the _CSV_ data to _Subsurface_ *you need to know " "a few things about the data being imported*:" msgstr "" #. type: Plain text -#: user-manual.txt:1104 +#: user-manual.txt:1191 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 " @@ -2038,7 +2236,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1108 +#: user-manual.txt:1195 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 " @@ -2047,12 +2245,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1110 +#: user-manual.txt:1197 msgid "Is the numeric information (e.g. dive depth) in metric or in imperial units?" msgstr "" #. type: Plain text -#: user-manual.txt:1117 +#: user-manual.txt:1204 msgid "" "With this information, importing the data into _Subsurface_ is " "straightforward. Select _Import -> Import Log Files_ from the main menu. In " @@ -2062,13 +2260,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1118 +#: user-manual.txt:1205 #, no-wrap msgid "images/csv_import1_f20.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:1129 +#: user-manual.txt:1216 #, no-wrap msgid "" "At the top left, there is a dropdown list containing pre- configured\n" @@ -2087,7 +2285,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1141 +#: user-manual.txt:1228 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,13 +2302,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1142 +#: user-manual.txt:1229 #, no-wrap msgid "images/csv_import2_f20.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:1148 +#: user-manual.txt:1235 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. " @@ -2120,13 +2318,13 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:1152 +#: user-manual.txt:1239 #, no-wrap msgid "*A Diver's Introduction to _CSV_ Files*\n" msgstr "" #. type: delimited block * -#: user-manual.txt:1166 +#: user-manual.txt:1253 msgid "" "_CSV_ is an abbreviation for a data file format: _Comma-Separated " "Values_. It is a file format that allows you to view or edit information " @@ -2143,7 +2341,7 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:1175 +#: user-manual.txt:1262 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 " @@ -2159,7 +2357,7 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:1181 +#: user-manual.txt:1268 #, no-wrap msgid "" "\tDive site,Dive date,Time,Dive_duration, Dive_depth,Dive buddy\n" @@ -2170,14 +2368,14 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:1183 +#: user-manual.txt:1270 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:1189 +#: user-manual.txt:1276 #, no-wrap msgid "" "\tDive site\tDive date\tTime\tDive_duration\tDive_depth\tDive buddy\n" @@ -2188,7 +2386,7 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:1197 +#: user-manual.txt:1284 msgid "" "It is clear why many people prefer the TAB-delimited format to the " "comma-delimited format. The disadvantage is that you cannot see the TAB " @@ -2202,7 +2400,7 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:1208 +#: user-manual.txt:1295 #, no-wrap msgid "" "\tDive Time (s)\tDepth (m)\tpO₂ - Setpoint (Bar) \tpO₂ - C1 Cell 1 " @@ -2219,7 +2417,7 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:1214 +#: user-manual.txt:1301 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_ " @@ -2230,7 +2428,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1228 +#: user-manual.txt:1314 msgid "" "But, the _CSV_ import has a couple of caveats. Avoid some special characters " "like ampersand (&), less than (<), greater than (>) and double quotes (\") " @@ -2243,56 +2441,56 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:1230 +#: user-manual.txt:1315 #, no-wrap msgid "Importing Dive coordinates from a mobile device with GPS." msgstr "" #. type: Plain text -#: user-manual.txt:1234 +#: user-manual.txt:1319 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:1237 +#: user-manual.txt:1322 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:1239 +#: user-manual.txt:1324 msgid "" "Uploading the coordinates from the mobile device to the _Subsurface_ " "Internet server." msgstr "" #. type: Plain text -#: user-manual.txt:1242 +#: user-manual.txt:1327 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:1244 +#: user-manual.txt:1329 msgid "_Subsurface has two tools for achieving this:" msgstr "" #. type: Plain text -#: user-manual.txt:1246 +#: user-manual.txt:1331 msgid "The _Subsurface Companion App_ (Android and iOS)." msgstr "" #. type: Plain text -#: user-manual.txt:1248 +#: user-manual.txt:1333 msgid "The _Subsurface-mobile_ app (Android and iOS)" msgstr "" #. type: Plain text -#: user-manual.txt:1257 +#: user-manual.txt:1342 msgid "" "Both of these applications perform the collection of dive site coordinates " "and the synchronisation with dives in the _Subsurface_ dive list. However, " @@ -2306,26 +2504,26 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1259 +#: user-manual.txt:1344 msgid "" "For information on using the _Subsurface Companion App_, click " -"xref:S_iCompanion[_here_]." +"xref:S_Companion[_here_]." msgstr "" #. type: Title ==== -#: user-manual.txt:1260 +#: user-manual.txt:1345 #, no-wrap msgid "Storing and and using GPS locations using _Subsurface-mobile_" msgstr "" #. type: Title ===== -#: user-manual.txt:1262 +#: user-manual.txt:1347 #, no-wrap msgid "Install _Subsurface-mobile_" msgstr "" #. type: Plain text -#: user-manual.txt:1268 +#: user-manual.txt:1353 msgid "" "Find _Subsurface-mobile_ on Google Play and install it on an Android " "device. The app is free. The iOS version is currently " @@ -2335,13 +2533,13 @@ msgid "" msgstr "" #. type: Title ===== -#: user-manual.txt:1269 +#: user-manual.txt:1354 #, no-wrap msgid "Create a _Subsurface-mobile_ account" msgstr "" #. type: Plain text -#: user-manual.txt:1277 +#: user-manual.txt:1362 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 " @@ -2353,7 +2551,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1280 +#: user-manual.txt:1365 #, no-wrap msgid "" "*N.B.:* To successfully create a user account, the mobile device must have " @@ -2362,19 +2560,19 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1281 +#: user-manual.txt:1366 #, no-wrap msgid "images/MobileCredentials.jpg" msgstr "" #. type: Title ===== -#: user-manual.txt:1284 +#: user-manual.txt:1369 #, no-wrap msgid "Configure auto-collecting of GPS coordinates" msgstr "" #. type: Plain text -#: user-manual.txt:1290 +#: user-manual.txt:1375 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 " @@ -2384,19 +2582,19 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1292 +#: user-manual.txt:1377 msgid "" "_Time threshold._ (minutes). The app will try to get a location every X " "minutes" msgstr "" #. type: Plain text -#: user-manual.txt:1294 +#: user-manual.txt:1379 msgid "_Distance threshold._ (meters). Minimum distance between two locations." msgstr "" #. type: Plain text -#: user-manual.txt:1303 +#: user-manual.txt:1388 #, no-wrap msgid "" "*How are GPS coordinates collected?* Assuming the diver sets 5 minutes and " @@ -2416,13 +2614,13 @@ msgid "" msgstr "" #. type: Title ===== -#: user-manual.txt:1304 +#: user-manual.txt:1389 #, no-wrap msgid "Activate the automated recording of GPS locations" msgstr "" #. type: Plain text -#: user-manual.txt:1309 +#: user-manual.txt:1394 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 " @@ -2430,32 +2628,32 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1310 +#: user-manual.txt:1395 #, no-wrap msgid "images/MobileMenu.jpg" msgstr "" #. type: Title ===== -#: user-manual.txt:1312 +#: user-manual.txt:1397 #, no-wrap msgid "After the dive, stop the automated recording of GPS locations" msgstr "" #. type: Plain text -#: user-manual.txt:1315 +#: user-manual.txt:1400 msgid "" "Uncheck the check box at the bottom left of the _Subsurface-mobile_ main " "menu." msgstr "" #. type: Title ===== -#: user-manual.txt:1316 +#: user-manual.txt:1401 #, no-wrap msgid "Upload the GPS locations onto the _Subsurface_ Internet server." msgstr "" #. type: Plain text -#: user-manual.txt:1323 +#: user-manual.txt:1408 #, no-wrap msgid "" "*N.B.:* Uploading the GPS locations to the Internet can only take place if " @@ -2470,7 +2668,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1327 +#: user-manual.txt:1412 msgid "" "From the _Subsurface-mobile_ main menu, select _GPS_ -> _Upload GPS " "data_. The locations are uploaded. Check the indicator at the top of the " @@ -2478,13 +2676,13 @@ msgid "" msgstr "" #. type: Title ===== -#: user-manual.txt:1328 +#: user-manual.txt:1413 #, no-wrap msgid "Apply the stored GPS locations to dives on the _Subsurface_ dive list." msgstr "" #. type: Plain text -#: user-manual.txt:1337 +#: user-manual.txt:1422 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 " @@ -2496,7 +2694,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1342 +#: user-manual.txt:1427 msgid "" "The " "https://subsurface-divelog.org/documentation/subsurface-mobile-user-manual[user " @@ -2506,7 +2704,7 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:1345 +#: user-manual.txt:1430 #, no-wrap msgid "" "Importing GPS coordinates with the _Subsurface Companion App_ for mobile " @@ -2514,7 +2712,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1354 +#: user-manual.txt:1439 #, no-wrap msgid "" "Using the *Subsurface Companion App* on an _Android device_ or\n" @@ -2529,13 +2727,13 @@ msgid "" msgstr "" #. type: Title ===== -#: user-manual.txt:1355 +#: user-manual.txt:1440 #, no-wrap msgid "Create a Companion App account" msgstr "" #. type: Plain text -#: user-manual.txt:1360 +#: user-manual.txt:1445 msgid "" "Register on the http://api.hohndel.org/login/[_Subsurface companion web " "page_]. A confirmation email with instructions and a personal *DIVERID* " @@ -2544,7 +2742,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1365 +#: user-manual.txt:1450 msgid "" "Download the app from " "https://play.google.com/store/apps/details?id=org.subsurface[Google Play " @@ -2553,18 +2751,18 @@ msgid "" msgstr "" #. type: Title ===== -#: user-manual.txt:1366 +#: user-manual.txt:1451 #, no-wrap msgid "Using the Subsurface companion app on an Android smartphone" msgstr "" #. type: Plain text -#: user-manual.txt:1369 +#: user-manual.txt:1454 msgid "On first use the app has three options:" msgstr "" #. type: Plain text -#: user-manual.txt:1375 +#: user-manual.txt:1460 msgid "" "_Create a new account._ Equivalent to registering in the _Subsurface_ " "companion page using an Internet browser. You can request a *DIVERID* using " @@ -2574,14 +2772,14 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1378 +#: user-manual.txt:1463 msgid "" "_Retrieve an account._ If you forget your *DIVERID* you will receive an " "email to recover the ID string." msgstr "" #. type: Plain text -#: user-manual.txt:1382 +#: user-manual.txt:1467 msgid "" "_Use an existing account._ You are prompted for your *DIVERID*. The app " "saves this *DIVERID* and doesn’t ask for it again unless you use the " @@ -2589,7 +2787,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1390 +#: user-manual.txt:1475 msgid "" "In the _Subsurface_ main program, the *DIVERID* should also be entered on " "the Default Preferences panel, by selecting _File -> Preferences -> " @@ -2598,13 +2796,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1392 +#: user-manual.txt:1477 #, no-wrap msgid "*Creating new dive locations*\n" msgstr "" #. type: Plain text -#: user-manual.txt:1396 +#: user-manual.txt:1481 msgid "" "Now you are ready to get a dive position and send it to the server. The " "Android display looks like the left hand image (*A*) below, but without any " @@ -2612,21 +2810,21 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1399 +#: user-manual.txt:1484 msgid "" "Touch the + icon at the top right to add a new dive site. A menu with 3 " "options shows:" msgstr "" #. type: Plain text -#: user-manual.txt:1402 +#: user-manual.txt:1487 msgid "" "Current: A prompt for a place name is shown (or a request to activate the " "GPS if it is turned off), after which the current location is saved." msgstr "" #. type: Plain text -#: user-manual.txt:1411 +#: user-manual.txt:1496 msgid "" "Use Map: This option allows you to fix a position by searching a world " "map. A world map is shown (see *B* below). Specify the desired position with " @@ -2639,13 +2837,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1412 +#: user-manual.txt:1497 #, no-wrap msgid "images/Companion_5.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:1419 +#: user-manual.txt:1504 msgid "" "Import local GPX file: The Android device searches for .gpx files and " "located archives will be shown. The selected .gpx file is opened and its " @@ -2654,13 +2852,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1421 +#: user-manual.txt:1506 #, no-wrap msgid "*Dive lists of dive locations*\n" msgstr "" #. type: Plain text -#: user-manual.txt:1428 +#: user-manual.txt:1513 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 " @@ -2671,7 +2869,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1436 +#: user-manual.txt:1521 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 " @@ -2683,13 +2881,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1437 +#: user-manual.txt:1522 #, no-wrap msgid "images/Companion_4.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:1443 +#: user-manual.txt:1528 msgid "" "Upon selecting a dive (*not* selecting the check box), the name given to it, " "date/time and GPS coordinates are shown with two options at the top of the " @@ -2697,14 +2895,14 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1445 +#: user-manual.txt:1530 msgid "" "Edit (pencil): Change the text name or other characteristics of the dive " "location." msgstr "" #. type: Plain text -#: user-manual.txt:1450 +#: user-manual.txt:1535 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 " @@ -2712,13 +2910,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1452 +#: user-manual.txt:1537 #, no-wrap msgid "*Uploading dive locations*\n" msgstr "" #. type: Plain text -#: user-manual.txt:1457 +#: user-manual.txt:1542 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 " @@ -2726,50 +2924,50 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1462 +#: user-manual.txt:1547 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:1463 +#: user-manual.txt:1548 #, no-wrap msgid "images/Companion_1.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:1468 +#: user-manual.txt:1553 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:1471 +#: user-manual.txt:1556 #, no-wrap msgid "*Settings on the Companion App*\n" msgstr "" #. type: Plain text -#: user-manual.txt:1473 +#: user-manual.txt:1558 msgid "" "Selecting the _Settings_ menu option results in the right hand image above " "(*B*)." msgstr "" #. type: Plain text -#: user-manual.txt:1475 +#: user-manual.txt:1560 msgid "_Server and account_" msgstr "" #. type: Plain text -#: user-manual.txt:1477 +#: user-manual.txt:1562 msgid "_Web-service URL._ This is predefined (http://api.hohndel.org/)" msgstr "" #. type: Plain text -#: user-manual.txt:1480 +#: user-manual.txt:1565 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 " @@ -2777,31 +2975,31 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1482 +#: user-manual.txt:1567 msgid "_Synchronisation_" msgstr "" #. type: Plain text -#: user-manual.txt:1485 +#: user-manual.txt:1570 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:1488 +#: user-manual.txt:1573 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:1490 +#: user-manual.txt:1575 msgid "_Background service_" msgstr "" #. type: Plain text -#: user-manual.txt:1493 +#: user-manual.txt:1578 msgid "" "Instead of entering an unique dive location, you can leave the service " "running in the background, allowing a continuous collection of GPS " @@ -2809,35 +3007,35 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1495 +#: user-manual.txt:1580 msgid "The settings below define the behavior of the service:" msgstr "" #. type: Plain text -#: user-manual.txt:1498 +#: user-manual.txt:1583 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:1500 +#: user-manual.txt:1585 msgid "_Min distance._ In meters. Minimum distance between two locations." msgstr "" #. type: Plain text -#: user-manual.txt:1502 +#: user-manual.txt:1587 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:1503 user-manual.txt:1604 user-manual.txt:2018 +#: user-manual.txt:1588 user-manual.txt:1689 user-manual.txt:2108 #, no-wrap msgid "images/icons/info.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:1513 +#: user-manual.txt:1598 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 " @@ -2850,54 +3048,54 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1515 +#: user-manual.txt:1600 msgid "_Other_" msgstr "" #. type: Plain text -#: user-manual.txt:1518 +#: user-manual.txt:1603 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:1520 +#: user-manual.txt:1605 msgid "_Subsurface website._ A link to the URL of Subsurface web" msgstr "" #. type: Plain text -#: user-manual.txt:1522 +#: user-manual.txt:1607 msgid "_Version._ Displays the current version of the Companion App." msgstr "" #. type: Plain text -#: user-manual.txt:1524 +#: user-manual.txt:1609 msgid "_Search_" msgstr "" #. type: Plain text -#: user-manual.txt:1526 +#: user-manual.txt:1611 msgid "Search the saved dive locations by name or by date and time." msgstr "" #. type: Plain text -#: user-manual.txt:1528 +#: user-manual.txt:1613 msgid "_Start service_" msgstr "" #. type: Plain text -#: user-manual.txt:1530 +#: user-manual.txt:1615 msgid "Starts the _background service_ following the previously defined settings." msgstr "" #. type: Plain text -#: user-manual.txt:1532 +#: user-manual.txt:1617 msgid "_Disconnect_" msgstr "" #. type: Plain text -#: user-manual.txt:1539 +#: user-manual.txt:1624 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 " @@ -2907,23 +3105,23 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1541 +#: user-manual.txt:1626 msgid "_Send all locations_" msgstr "" #. type: Plain text -#: user-manual.txt:1543 +#: user-manual.txt:1628 msgid "This option sends all locations stored in the Android device to the server." msgstr "" #. type: Title ===== -#: user-manual.txt:1545 +#: user-manual.txt:1630 #, no-wrap msgid "Using the Subsurface companion app on an _iPhone_ to record dive locations" msgstr "" #. type: Plain text -#: user-manual.txt:1550 +#: user-manual.txt:1635 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 " @@ -2932,13 +3130,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1551 +#: user-manual.txt:1636 #, no-wrap msgid "images/iphone.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:1562 +#: user-manual.txt:1647 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 " @@ -2952,7 +3150,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1568 +#: user-manual.txt:1653 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 " @@ -2961,13 +3159,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1571 +#: user-manual.txt:1656 #, no-wrap msgid "*Downloading dive locations to the _Subsurface_ divelog*\n" msgstr "" #. type: Plain text -#: user-manual.txt:1579 +#: user-manual.txt:1664 msgid "" "Download dive(s) from a dive computer or enter them manually into " "_Subsurface_ before obtaining the GPS coordinates from the server. The " @@ -2979,13 +3177,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1580 +#: user-manual.txt:1665 #, no-wrap msgid "images/DownloadGPS.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:1588 +#: user-manual.txt:1673 msgid "" "Note that the _Apply_ button is now active: selecting it updates the " "locations of the newly entered or uploaded dives in _Subsurface_, i.e. it " @@ -2996,7 +3194,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1595 +#: user-manual.txt:1680 msgid "" "Since _Subsurface_ matches GPS locations from the mobile device and dive " "information from the dive computer based on date-time data, automatic " @@ -3008,7 +3206,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1603 +#: user-manual.txt:1688 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 " @@ -3021,12 +3219,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1607 +#: user-manual.txt:1692 msgid "TIPS:" msgstr "" #. type: Plain text -#: user-manual.txt:1610 +#: user-manual.txt:1695 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 " @@ -3034,14 +3232,14 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1611 +#: user-manual.txt:1696 msgid "" "Right now, these locations are difficult to delete from the server. In some " "situations it" msgstr "" #. type: Plain text -#: user-manual.txt:1614 +#: user-manual.txt:1699 msgid "" "is better to clean up the list on the mobile device before sending the dive " "points to the web server by simply deleting the inappropriate " @@ -3050,7 +3248,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1617 +#: user-manual.txt:1702 msgid "" "It may also be useful to give informative names to the locations sent to the " "web server, or at least to use an informative name in the _Name Template_ " @@ -3059,13 +3257,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:1619 +#: user-manual.txt:1704 #, no-wrap msgid "Adding photographs to dives" msgstr "" #. type: Plain text -#: user-manual.txt:1625 +#: user-manual.txt:1710 msgid "" "Many (if not most) divers take photographs during a dive. _Subsurface_ " "allows the storage and display of photographs for each dive. Photos are " @@ -3074,13 +3272,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:1626 +#: user-manual.txt:1711 #, no-wrap msgid "Loading photos and synchronizing between dive computer and camera" msgstr "" #. type: Plain text -#: user-manual.txt:1632 +#: user-manual.txt:1717 msgid "" "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 " @@ -3090,13 +3288,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1633 +#: user-manual.txt:1718 #, no-wrap msgid "images/LoadImage2_f20.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:1641 +#: user-manual.txt:1726 msgid "" "This brings up the time synchronization dialog, shown below. The time " "synchronization is not perfect between the dive computer used during a dive, " @@ -3107,12 +3305,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1643 +#: user-manual.txt:1728 msgid "_Subsurface_ synchronizes camera with dive computer in three ways:" msgstr "" #. type: Plain text -#: user-manual.txt:1646 +#: user-manual.txt:1731 #, no-wrap msgid "" "*Pro-actively*: Before the dive, ensure synchronization of the dive computer " @@ -3122,7 +3320,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1657 +#: user-manual.txt:1742 #, no-wrap msgid "" "*Manually*: Writing down the exact camera time at the start of a dive allows " @@ -3145,13 +3343,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1658 +#: user-manual.txt:1743 #, no-wrap msgid "images/LoadImage3b_f23.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:1676 +#: user-manual.txt:1761 #, no-wrap msgid "" "*By photograph*: There is a very slick way of achieving synchronization, " @@ -3186,13 +3384,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1677 +#: user-manual.txt:1762 #, no-wrap msgid "images/LoadImage3c_f23.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:1681 +#: user-manual.txt:1766 msgid "" "If the timestamp of a photograph is more than 30 minutes before or after the " "dive, it is not placed on the dive profile (see the red warning in the image " @@ -3203,23 +3401,23 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:1682 +#: user-manual.txt:1767 #, no-wrap msgid "Viewing the photos" msgstr "" #. type: Plain text -#: user-manual.txt:1685 +#: user-manual.txt:1770 msgid "After the images have been loaded, they appear in two places:" msgstr "" #. type: Plain text -#: user-manual.txt:1687 +#: user-manual.txt:1772 msgid "the _Photos_ tab of the *Notes* panel (left part of image below)." msgstr "" #. type: Plain text -#: user-manual.txt:1691 +#: user-manual.txt:1776 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 " @@ -3228,37 +3426,37 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1692 +#: user-manual.txt:1777 #, no-wrap msgid "images/icons/ShowPhotos_f20.png" msgstr "" #. type: Plain text -#: user-manual.txt:1695 +#: user-manual.txt:1780 msgid "This results in a profile display as in the image below:" msgstr "" #. type: Target for macro image -#: user-manual.txt:1696 +#: user-manual.txt:1781 #, no-wrap msgid "images/LoadImage4_f20.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:1700 +#: user-manual.txt:1785 msgid "" "Hover the mouse over any of the photo stubs. A thumbnail photo is shown of " "the appropriate photo. See the image below:" msgstr "" #. type: Target for macro image -#: user-manual.txt:1701 +#: user-manual.txt:1786 #, no-wrap msgid "images/LoadImage5_f20.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:1710 +#: user-manual.txt:1795 msgid "" "Clicking on the thumbnail brings up a full size photo overlaid on the " "_Subsurface_ window, allowing a good view of the photographs (see the image " @@ -3269,19 +3467,19 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1711 +#: user-manual.txt:1796 #, no-wrap msgid "images/LoadImage6_f20.jpg" msgstr "" #. type: Title ==== -#: user-manual.txt:1713 +#: user-manual.txt:1798 #, no-wrap msgid "The _Photos_ tab" msgstr "" #. type: Plain text -#: user-manual.txt:1723 +#: user-manual.txt:1808 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 " @@ -3297,13 +3495,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:1724 +#: user-manual.txt:1809 #, no-wrap msgid "Photos on an external hard disk" msgstr "" #. type: Plain text -#: user-manual.txt:1734 +#: user-manual.txt:1819 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 " @@ -3320,13 +3518,33 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:1736 +#: user-manual.txt:1820 +#, no-wrap +msgid "Finding out which dives have associated photos." +msgstr "" + +#. type: Plain text +#: user-manual.txt:1825 +msgid "" +"Inspecting each individual dive in order to determine whether there are " +"associated photos can be time consuming. There is a rapid way of seeing " +"which dives have associated photos and which not: activate the _Photos_ " +"checkbox in the dropdown list obtained by right-clicking on the header bar " +"of the *Divelist*. In the *Divelist*, all dives with associated photographs " +"have an icon indicating whether the photographs were taken during the dive, " +"just before/after the dive or both during and before/after the dive. More " +"information is provided in the section dealing with <<S_Divelist_columns, " +"photo icons on the *Divelist*>>." +msgstr "" + +#. type: Title ==== +#: user-manual.txt:1827 #, no-wrap msgid "Moving photographs among directories, hard disks or computers" msgstr "" #. type: Plain text -#: user-manual.txt:1745 +#: user-manual.txt:1836 #, no-wrap msgid "" "After a photograph has been loaded into _Subsurface_ and associated with a " @@ -3346,7 +3564,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1749 +#: user-manual.txt:1840 #, no-wrap msgid "" "When a photo is loaded into _Subsurface_, a fingerprint for the image is " @@ -3358,19 +3576,19 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1751 +#: user-manual.txt:1842 msgid "" "look through a particular directory (and all its subdirectories recursively) " "where photos have been moved to," msgstr "" #. type: Plain text -#: user-manual.txt:1752 +#: user-manual.txt:1843 msgid "calculate fingerprints for all photos in this directory, and" msgstr "" #. type: Plain text -#: user-manual.txt:1755 +#: user-manual.txt:1846 msgid "" "if there is a match between a calculated fingerprint and the one calculated " "when a photo was originally loaded into _Subsurface_ (even if the original " @@ -3379,7 +3597,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1760 +#: user-manual.txt:1851 #, no-wrap msgid "" "This is done by selecting from the Main Menu: _File -> Find moved " @@ -3393,13 +3611,13 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:1765 +#: user-manual.txt:1856 #, no-wrap msgid "*Upgrading legacy photo collections without fingerprints*\n" msgstr "" #. type: delimited block * -#: user-manual.txt:1770 +#: user-manual.txt:1861 msgid "" "_Subsurface_ automatically calculates fingerprints for all images that it " "can access. When manipulating images, ensure that all the images associated " @@ -3407,47 +3625,47 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:1772 +#: user-manual.txt:1863 msgid "" "_Subsurface_ automatically checks and, if necessary, updates the " "fingerprints associated with a single dive if:" msgstr "" #. type: delimited block * -#: user-manual.txt:1774 +#: user-manual.txt:1865 msgid "" "The images associated with that dive are visible as thumbnails on the *Dive " "Profile*." msgstr "" #. type: delimited block * -#: user-manual.txt:1776 +#: user-manual.txt:1867 msgid "" "If you edit anything in the *Notes* panel and save the edits by selecting " "_Apply changes_." msgstr "" #. type: Title === -#: user-manual.txt:1780 +#: user-manual.txt:1870 #, no-wrap msgid "Logging special types of dives" msgstr "" #. type: Plain text -#: user-manual.txt:1783 +#: user-manual.txt:1873 msgid "" "This section gives examples of the versatility of _Subsurface_ as a dive " "logging tool." msgstr "" #. type: Title ==== -#: user-manual.txt:1786 +#: user-manual.txt:1876 #, no-wrap msgid "Multicylinder dives" msgstr "" #. type: Plain text -#: user-manual.txt:1793 +#: user-manual.txt:1883 msgid "" "_Subsurface_ easily handles dives involving more than one " "cylinder. Multi-cylinder diving usually happens (a) if a diver doesn’t have " @@ -3459,7 +3677,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1797 +#: user-manual.txt:1887 #, no-wrap msgid "" "*Describe the cylinders used during the dive* This is performed in the " @@ -3471,7 +3689,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1803 +#: user-manual.txt:1893 #, no-wrap msgid "" "*Record the times at which the switch from one cylinder to another was " @@ -3486,7 +3704,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1811 +#: user-manual.txt:1901 #, no-wrap msgid "" "*Record the cylinder changes on the dive profile*: If the latter option\n" @@ -3503,7 +3721,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1815 +#: user-manual.txt:1905 msgid "" "When this is complete, _Subsurface_ indicates the appropriate use of " "cylinders in the dive profile. Below is a two-cylinder dive, starting off " @@ -3512,19 +3730,19 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1816 +#: user-manual.txt:1906 #, no-wrap msgid "images/multicylinder_dive.jpg" msgstr "" #. type: Title ==== -#: user-manual.txt:1818 +#: user-manual.txt:1908 #, no-wrap msgid "Sidemount dives" msgstr "" #. type: Plain text -#: user-manual.txt:1824 +#: user-manual.txt:1914 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 " @@ -3534,7 +3752,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1833 +#: user-manual.txt:1923 #, no-wrap msgid "" "*During the dive, record cylinder switch events*. Since sidemount diving " @@ -3556,7 +3774,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1836 +#: user-manual.txt:1926 #, no-wrap msgid "" "*Within _Subsurface_ describe the cylinders used during the dive*. The diver " @@ -3567,7 +3785,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1846 +#: user-manual.txt:1936 #, no-wrap msgid "" "*Indicate cylinder change events on the _Subsurface_ dive profile*. Once the " @@ -3592,25 +3810,25 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1847 +#: user-manual.txt:1937 #, no-wrap msgid "images/sidemount1.jpg" msgstr "" #. type: Title ==== -#: user-manual.txt:1850 +#: user-manual.txt:1940 #, no-wrap msgid "Semi-closed circuit rebreather (SCR) dives" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:1852 +#: user-manual.txt:1942 #, no-wrap msgid "images/halcyon_RB80.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:1862 +#: user-manual.txt:1952 msgid "" "Passive semi-closed rebreathers (pSCR) are a technical advance in diving " "equipment that recirculates the breathing gas a diver uses, while removing " @@ -3626,19 +3844,19 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1864 +#: user-manual.txt:1954 msgid "" "To log pSCR dives, no special procedures are required. Use the normal steps " "outlined above:" msgstr "" #. type: Plain text -#: user-manual.txt:1866 +#: user-manual.txt:1956 msgid "Select pSCR in the _Dive Mode_ dropdown list on the *Info* panel." msgstr "" #. type: Plain text -#: user-manual.txt:1870 +#: user-manual.txt:1960 msgid "" "pSCR diving often involves gas changes, requiring an additional cylinder. " "Define all the appropriate cylinders as described above and indicate the " @@ -3647,7 +3865,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1875 +#: user-manual.txt:1965 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 " @@ -3657,25 +3875,25 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1876 +#: user-manual.txt:1966 #, no-wrap msgid "images/pSCR_profile.jpg" msgstr "" #. type: Title ==== -#: user-manual.txt:1881 +#: user-manual.txt:1971 #, no-wrap msgid "Closed circuit rebreather (CCR) dives" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:1883 +#: user-manual.txt:1973 #, no-wrap msgid "images/APD.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:1888 +#: user-manual.txt:1978 msgid "" "Closed system rebreathers use advanced technology to recirculate gas that " "has been breathed. They also do two things to maintain a breathable oxygen " @@ -3683,12 +3901,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1889 +#: user-manual.txt:1979 msgid "remove carbon dioxide from the exhaled gas" msgstr "" #. type: Plain text -#: user-manual.txt:1898 +#: user-manual.txt:1988 msgid "" "regulate the oxygen concentration to remain within safe diving limits. The " "CCR interface of _Subsurface_ is currently experimental and under active " @@ -3703,13 +3921,13 @@ msgid "" msgstr "" #. type: Title ===== -#: user-manual.txt:1899 +#: user-manual.txt:1989 #, no-wrap msgid "Import a CCR dive" msgstr "" #. type: Plain text -#: user-manual.txt:1916 +#: user-manual.txt:2006 msgid "" "See the section dealing with xref:S_ImportingAlienDiveLogs[Importing dive " "information from other digital sources]. CCR dive data are currently " @@ -3732,13 +3950,13 @@ msgid "" msgstr "" #. type: Title ===== -#: user-manual.txt:1917 +#: user-manual.txt:2007 #, no-wrap msgid "Displayed information for a CCR dive" msgstr "" #. type: Plain text -#: user-manual.txt:1927 +#: user-manual.txt:2017 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 " @@ -3752,12 +3970,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1929 +#: user-manual.txt:2019 msgid "For TWO O~2~ sensors the mean value of the two sensors are given." msgstr "" #. type: Plain text -#: user-manual.txt:1933 +#: user-manual.txt:2023 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 " @@ -3766,19 +3984,19 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1935 +#: user-manual.txt:2025 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:1937 +#: user-manual.txt:2027 msgid "The mean pO~2~ of the sensors is indicated with a green line," msgstr "" #. type: Plain text -#: user-manual.txt:1945 +#: user-manual.txt:2035 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 " @@ -3790,13 +4008,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1946 +#: user-manual.txt:2036 #, no-wrap msgid "images/CCR_preferences_f20.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:1953 +#: user-manual.txt:2043 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 " @@ -3807,13 +4025,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1954 +#: user-manual.txt:2044 #, no-wrap msgid "images/CCR_setpoint_f20.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:1958 +#: user-manual.txt:2048 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 " @@ -3821,22 +4039,22 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1960 +#: user-manual.txt:2050 msgid "Sensor 1: grey" msgstr "" #. type: Plain text -#: user-manual.txt:1961 +#: user-manual.txt:2051 msgid "Sensor 2: blue" msgstr "" #. type: Plain text -#: user-manual.txt:1962 +#: user-manual.txt:2052 msgid "Sensor 3: brown" msgstr "" #. type: Plain text -#: user-manual.txt:1966 +#: user-manual.txt:2056 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 " @@ -3844,13 +4062,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1967 +#: user-manual.txt:2057 #, no-wrap msgid "images/CCR_sensor_data_f20.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:1972 +#: user-manual.txt:2062 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, " @@ -3858,7 +4076,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1976 +#: user-manual.txt:2066 msgid "" "_Events_: Several events are logged, e.g. switching the mouthpiece to open " "circuit. These events are indicated by yellow triangles and, if you hover " @@ -3867,7 +4085,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1984 +#: user-manual.txt:2074 msgid "" "_Cylinder pressures_: Some CCR dive computers like the Poseidon MkVI record " "the pressures of the oxygen and diluent cylinders. The pressures of these " @@ -3880,13 +4098,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1985 +#: user-manual.txt:2075 #, no-wrap msgid "images/CCR_dive_profile_f22.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:1990 +#: user-manual.txt:2080 msgid "" "_Equipment-specific information_: Equipment-specific information gathered by " "_Subsurface_ is shown in the xref:S_ExtraDataTab[Extra data tab]. This may " @@ -3894,7 +4112,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1996 +#: user-manual.txt:2086 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 " @@ -3906,13 +4124,13 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:1997 user-manual.txt:2316 +#: user-manual.txt:2087 user-manual.txt:2430 #, no-wrap msgid "images/icons/cceiling.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2002 +#: user-manual.txt:2092 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 -> " @@ -3921,13 +4139,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2003 +#: user-manual.txt:2093 #, no-wrap msgid "images/CCR_dive_ceilingF22.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2007 +#: user-manual.txt:2097 msgid "" "More equipment-specific information for downloading CCR dive logs for " "Poseidon MkVI and APD equipment can be found in " @@ -3936,19 +4154,19 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:2008 +#: user-manual.txt:2098 #, no-wrap msgid "Obtaining more information about dives entered into the logbook" msgstr "" #. type: Title === -#: user-manual.txt:2010 +#: user-manual.txt:2100 #, no-wrap msgid "The *Info* tab (for individual dives)" msgstr "" #. type: Plain text -#: user-manual.txt:2017 +#: user-manual.txt:2107 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 " @@ -3958,7 +4176,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2024 +#: user-manual.txt:2114 msgid "" "Gas consumption and SAC calculations: _Subsurface_ calculates SAC and Gas " "consumption taking in account gas incompressibility, particularly at tank " @@ -3967,13 +4185,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:2026 +#: user-manual.txt:2116 #, no-wrap msgid "The *Extra Data* tab (usually for individual dives)" msgstr "" #. type: Plain text -#: user-manual.txt:2034 +#: user-manual.txt:2124 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 " @@ -3985,19 +4203,19 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2035 +#: user-manual.txt:2125 #, no-wrap msgid "images/ExtraDataTab_f20.jpg" msgstr "" #. type: Title === -#: user-manual.txt:2037 +#: user-manual.txt:2127 #, no-wrap msgid "The *Stats* tab (for groups of dives)" msgstr "" #. type: Plain text -#: user-manual.txt:2048 +#: user-manual.txt:2138 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 " @@ -4010,19 +4228,19 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:2050 +#: user-manual.txt:2140 #, no-wrap msgid "The *Dive Profile*" msgstr "" #. type: Target for macro image -#: user-manual.txt:2052 +#: user-manual.txt:2142 #, no-wrap msgid "images/Profile2.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2063 +#: user-manual.txt:2153 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 " @@ -4035,7 +4253,7 @@ msgid "" msgstr "" #. type: delimited block | -#: user-manual.txt:2070 +#: user-manual.txt:2160 #, no-wrap msgid "" "|*Color*|*Descent speed (m/min)*|*Ascent speed (m/min)*\n" @@ -4047,7 +4265,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2075 +#: user-manual.txt:2165 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 " @@ -4056,13 +4274,13 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2076 +#: user-manual.txt:2166 #, no-wrap msgid "images/icons/scale.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2081 +#: user-manual.txt:2171 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 " @@ -4071,7 +4289,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2084 +#: user-manual.txt:2174 #, no-wrap msgid "" "*Water temperature* is shown as a blue line with temperature values\n" @@ -4079,13 +4297,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2087 +#: user-manual.txt:2176 #, no-wrap msgid "The *Information Box*" msgstr "" #. type: Plain text -#: user-manual.txt:2096 +#: user-manual.txt:2185 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 " @@ -4098,13 +4316,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2097 +#: user-manual.txt:2186 #, no-wrap msgid "images/InfoBox2.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2113 +#: user-manual.txt:2202 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 " @@ -4124,13 +4342,13 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2114 +#: user-manual.txt:2203 #, no-wrap msgid "images/icons/MOD.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2121 +#: user-manual.txt:2210 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. " @@ -4142,13 +4360,13 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2122 +#: user-manual.txt:2211 #, no-wrap msgid "images/icons/NDL.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2134 +#: user-manual.txt:2223 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, " @@ -4165,13 +4383,13 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2135 +#: user-manual.txt:2224 #, no-wrap msgid "images/icons/SAC.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2143 +#: user-manual.txt:2232 msgid "" "Show the *Surface Air Consumption (SAC)*, an indication of the " "surface-normalized respiration rate of a diver. The value of SAC is less " @@ -4183,13 +4401,13 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2144 +#: user-manual.txt:2233 #, no-wrap msgid "images/icons/EAD.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2159 +#: user-manual.txt:2248 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 " @@ -4205,20 +4423,20 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2161 +#: user-manual.txt:2250 msgid "" "Figure (*B*) above shows an information box with a nearly complete set of " "data." msgstr "" #. type: Title ===== -#: user-manual.txt:2163 +#: user-manual.txt:2253 #, no-wrap msgid "The Gas Pressure Bar Graph" msgstr "" #. type: Plain text -#: user-manual.txt:2170 +#: user-manual.txt:2260 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 " @@ -4229,13 +4447,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2171 +#: user-manual.txt:2261 #, no-wrap msgid "images/GasPressureBarGraph.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2177 +#: user-manual.txt:2267 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 " @@ -4245,7 +4463,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2183 +#: user-manual.txt:2273 msgid "" "The horizontal black line underneath the light green margin indicates the " "equilibrium pressure of the INERT gases inhaled by the diver, usually " @@ -4256,7 +4474,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2187 +#: user-manual.txt:2277 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 " @@ -4264,7 +4482,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2193 +#: user-manual.txt:2283 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 " @@ -4274,7 +4492,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2197 +#: user-manual.txt:2287 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 " @@ -4283,7 +4501,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2200 +#: user-manual.txt:2290 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 " @@ -4291,7 +4509,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2203 +#: user-manual.txt:2293 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 " @@ -4299,7 +4517,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2206 +#: user-manual.txt:2296 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 " @@ -4307,7 +4525,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2211 +#: user-manual.txt:2301 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 " @@ -4317,7 +4535,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2217 +#: user-manual.txt:2307 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 " @@ -4328,7 +4546,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2222 +#: user-manual.txt:2312 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 " @@ -4338,13 +4556,64 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2223 +#: user-manual.txt:2313 +#, no-wrap +msgid "Computer-reported events during dive" +msgstr "" + +#. type: Plain text +#: user-manual.txt:2325 +msgid "" +"Many dive computers record events during a dive. For instance, most dive " +"computers report alarms relating to high partial pressures of oxygen, to " +"rapid ascents or the exceeding of no-deco limits (NDL). On the other hand, " +"other events are classified as warnings and, for instance, occur when the " +"remaining gas in a cylinder falls below a predetermined limit, a deep stop " +"needs to be performed or the need to change gas during multicylinder " +"dives. Some dive computers also report notifications, e.g. when a safety " +"stop is initiated or terminated or when a predetermined amount of OTUs have " +"been incurred. The alarms, warnings and notifications differs from one dive " +"computer to another: some dive computers do not report any of the above " +"events, while others provide an extensive log of events. The reporting of " +"events is therefore a function of the dive computer used. In addition, " +"_Subsurface_ does not always have the ability to detect all the events " +"reported by a specific dive computer." +msgstr "" + +#. type: Plain text +#: user-manual.txt:2330 +msgid "" +"Events are indicated by symbols on the dive profile. Notifications are shown " +"as a white, round symbol with a letter _i_; warnings are indicated by a " +"yellow triangle and alarms by a red triangle. By moving the cursor over a " +"symbol, the explanation is given in the bottom-most line of the _Information " +"Box_ (see image below, where the cursor is positioned over the alarm that " +"was reported)." +msgstr "" + +#. type: Target for macro image +#: user-manual.txt:2331 +#, no-wrap +msgid "images/profile_symbols.jpg" +msgstr "" + +#. type: Plain text +#: user-manual.txt:2336 +msgid "" +"Some dive computers report _bookmarks_ that the diver has set during the " +"dive. These are indicated as a small red flag on the profile and are " +"discussed more fully in the section on <<S_Bookmarks,_inserting " +"bookmarks_>>." +msgstr "" + +#. type: Title ==== +#: user-manual.txt:2337 #, no-wrap msgid "The Profile Toolbar" msgstr "" #. type: Plain text -#: user-manual.txt:2231 +#: user-manual.txt:2345 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 " @@ -4355,44 +4624,44 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2232 +#: user-manual.txt:2346 #, no-wrap msgid "images/icons/O2.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2236 +#: user-manual.txt:2350 msgid "" "Show the partial pressure of *oxygen* during the dive. This is shown below " "the dive depth and water temperature graphs." msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2237 +#: user-manual.txt:2351 #, no-wrap msgid "images/icons/N2.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2240 +#: user-manual.txt:2354 msgid "Show the partial pressure of *nitrogen* during the dive." msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2241 +#: user-manual.txt:2355 #, no-wrap msgid "images/icons/He.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2245 +#: user-manual.txt:2359 msgid "" "Display of the partial pressure of *helium* during the dive. This is only " "important to divers using Trimix, Helitrox or similar breathing gasses." msgstr "" #. type: Plain text -#: user-manual.txt:2258 +#: user-manual.txt:2372 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 " @@ -4407,20 +4676,20 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2259 +#: user-manual.txt:2373 #, no-wrap msgid "images/icons/Heartbutton.png" msgstr "" #. type: Plain text -#: user-manual.txt:2263 +#: user-manual.txt:2377 msgid "" "Clicking on the heart rate button allows display of heart rate information " "during the dive if the dive computer was attached to a heart rate sensor." msgstr "" #. type: Plain text -#: user-manual.txt:2269 +#: user-manual.txt:2383 msgid "" "It is possible to *zoom* into the profile graph. This is done either by " "using the scroll wheel / scroll gesture of the mouse or trackpad. By default " @@ -4430,19 +4699,19 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2270 +#: user-manual.txt:2384 #, no-wrap msgid "images/MeasuringBar.png" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2272 +#: user-manual.txt:2386 #, no-wrap msgid "images/icons/ruler.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2280 +#: user-manual.txt:2394 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 " @@ -4452,13 +4721,13 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2281 +#: user-manual.txt:2395 #, no-wrap msgid "images/icons/ShowPhotos.png" msgstr "" #. type: Plain text -#: user-manual.txt:2288 +#: user-manual.txt:2402 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 " @@ -4467,7 +4736,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2315 +#: user-manual.txt:2429 msgid "" "The profile can also include the dive computer reported *ceiling* (more " "precisely, the deepest deco stop that the dive computer calculated for each " @@ -4496,7 +4765,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2321 +#: user-manual.txt:2435 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 " @@ -4504,13 +4773,13 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2322 +#: user-manual.txt:2436 #, no-wrap msgid "images/icons/ceiling1.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2327 +#: user-manual.txt:2441 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 " @@ -4519,13 +4788,13 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2328 +#: user-manual.txt:2442 #, no-wrap msgid "images/icons/ceiling2.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2332 +#: user-manual.txt:2446 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 " @@ -4533,26 +4802,26 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2333 +#: user-manual.txt:2447 #, no-wrap msgid "images/icons/ceiling3.jpg" msgstr "" #. type: delimited block = -#: user-manual.txt:2338 +#: user-manual.txt:2452 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:2339 +#: user-manual.txt:2453 #, no-wrap msgid "images/Ceilings2.jpg" msgstr "" #. type: delimited block = -#: user-manual.txt:2342 +#: user-manual.txt:2456 msgid "" "Gradient Factor settings strongly affect the calculated ceilings and their " "depths. For more information about Gradient factors, see the section on " @@ -4565,7 +4834,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2344 user-manual.txt:3126 +#: user-manual.txt:2458 user-manual.txt:3293 #, no-wrap msgid "" " *** http://www.tek-dive.com/portal/upload/M-Values.pdf[Understanding " @@ -4573,7 +4842,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2346 user-manual.txt:3128 +#: user-manual.txt:2460 user-manual.txt:3295 #, no-wrap msgid "" " *** " @@ -4582,13 +4851,13 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2350 +#: user-manual.txt:2464 #, no-wrap msgid "images/icons/ShowCylindersButton.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2356 +#: user-manual.txt:2470 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 " @@ -4599,19 +4868,19 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2357 +#: user-manual.txt:2471 #, no-wrap msgid "images/ShowCylinders_f20.jpg" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2361 +#: user-manual.txt:2475 #, no-wrap msgid "images/icons/heatmap.png" msgstr "" #. type: delimited block = -#: user-manual.txt:2368 +#: user-manual.txt:2482 msgid "" "Display the tissue heat-map. The heat map summarises, for the duration of " "the dive, the inert gas tissue pressures for each of the 16 tissue " @@ -4623,13 +4892,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2369 +#: user-manual.txt:2483 #, no-wrap msgid "images/Heatmap.jpg" msgstr "" #. type: delimited block = -#: user-manual.txt:2377 +#: user-manual.txt:2491 msgid "" "Image *A* on the left shows the xref:S_gas_pressure_graph[Gas Pressure " "Graph] in the *Information box*, representing a snapshot of inert gas " @@ -4642,7 +4911,7 @@ msgid "" msgstr "" #. type: delimited block = -#: user-manual.txt:2385 +#: user-manual.txt:2499 msgid "" "Image *B* shows a gradient of unique colours, spanning the whole range of " "inert gas pressures. It is possible to map the height of each of the dark " @@ -4656,7 +4925,7 @@ msgid "" msgstr "" #. type: delimited block = -#: user-manual.txt:2393 +#: user-manual.txt:2507 msgid "" "The bottom range in *B* (marked _On-gassing_) includes colours from light " "blue to black, representing tissue gas pressures below the equilibrium " @@ -4671,7 +4940,7 @@ msgid "" msgstr "" #. type: delimited block = -#: user-manual.txt:2399 +#: user-manual.txt:2513 msgid "" "The central range in *B* includes the colours from black to light green, " "when the inert gas pressure of a tissue compartment is higher than the " @@ -4682,7 +4951,7 @@ msgid "" msgstr "" #. type: delimited block = -#: user-manual.txt:2408 +#: user-manual.txt:2522 msgid "" "The top range in *B* (marked _Off-gassing_) includes colours from light " "green to red and white, repesenting tissue gas pressures above that of the " @@ -4698,7 +4967,7 @@ msgid "" msgstr "" #. type: delimited block = -#: user-manual.txt:2416 +#: user-manual.txt:2530 msgid "" "Image *C* shows the colour mapping of each of the vertical bars in *A*, the " "fast tissues (on the left in *A*) depicted at the top and the slow tissue " @@ -4710,7 +4979,7 @@ msgid "" msgstr "" #. type: delimited block = -#: user-manual.txt:2423 +#: user-manual.txt:2537 msgid "" "Image *D* is a compilation of similar colour mappings of 16 tissue " "compartments during a 10-minute period of a dive, the colours representing " @@ -4721,7 +4990,7 @@ msgid "" msgstr "" #. type: delimited block = -#: user-manual.txt:2427 +#: user-manual.txt:2541 msgid "" "The colours of the heat map are not affected by the gradient factor " "settings. This is because the heat map indicates tissue pressures relative " @@ -4730,14 +4999,14 @@ msgid "" msgstr "" #. type: delimited block = -#: user-manual.txt:2429 +#: user-manual.txt:2543 msgid "" "http://www.tek-dive.com/portal/upload/M-Values.pdf[Understanding M-values by " "Erik Baker, _Immersed_ Vol. 3, No. 3.]" msgstr "" #. type: delimited block = -#: user-manual.txt:2432 +#: user-manual.txt:2546 msgid "" "Since the colours of the heat map are not affected by the gradient " "factor(s), the heat map is also applicable when using the VPM-B " @@ -4745,7 +5014,7 @@ msgid "" msgstr "" #. type: delimited block = -#: user-manual.txt:2436 +#: user-manual.txt:2550 msgid "" "The image below compares the profiles and heat maps for two planned " "decompression dives to 60m: the first using the Bühlmann decompression " @@ -4755,7 +5024,7 @@ msgid "" msgstr "" #. type: delimited block = -#: user-manual.txt:2441 +#: user-manual.txt:2555 msgid "" "In both profiles, the inert gas pressures in the faster tissues rise much " "more rapidly than the slower tissues during the descent and bottom phase, " @@ -4766,7 +5035,7 @@ msgid "" msgstr "" #. type: delimited block = -#: user-manual.txt:2446 +#: user-manual.txt:2560 msgid "" "The comparison of the two profiles and heatmaps shows that by including deep " "stops, the oversaturation gradient in the faster tissues early in ascent " @@ -4776,19 +5045,19 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2447 +#: user-manual.txt:2561 #, no-wrap msgid "images/tissueHeatmap.jpg" msgstr "" #. type: Title ==== -#: user-manual.txt:2450 +#: user-manual.txt:2564 #, no-wrap msgid "The Dive Profile context menu" msgstr "" #. type: Plain text -#: user-manual.txt:2469 +#: user-manual.txt:2583 msgid "" "The context menu for the Dive Profile is accessed by right-clicking while " "the mouse cursor is over the Dive Profile panel. The menu allows creating " @@ -4809,19 +5078,19 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:2470 +#: user-manual.txt:2584 #, no-wrap msgid "Organizing the logbook (Manipulating groups of dives)" msgstr "" #. type: Title === -#: user-manual.txt:2473 +#: user-manual.txt:2587 #, no-wrap msgid "The Dive List context menu" msgstr "" #. type: Plain text -#: user-manual.txt:2477 +#: user-manual.txt:2591 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 " @@ -4830,50 +5099,97 @@ msgstr "" #. TODO: NEEDS REPLACEMENT #. type: Target for macro image -#: user-manual.txt:2479 +#: user-manual.txt:2593 #, no-wrap msgid "images/ContextMenu.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2482 +#: user-manual.txt:2596 msgid "The context menu is used in many functions described below." msgstr "" #. type: Title ==== -#: user-manual.txt:2483 +#: user-manual.txt:2598 #, no-wrap msgid "Customizing the columns showed in the *Dive List* panel" msgstr "" #. type: Target for macro image -#: user-manual.txt:2485 +#: user-manual.txt:2600 #, no-wrap msgid "images/DiveListOptions.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2493 +#: user-manual.txt:2608 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 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." +"bar of the *Dive List*, bringing up a list of columns that can be shown in " +"the dive list (see above). Check an items to be included in the *Dive " +"List*. The list is immediately updated. Preferences for information shown " +"in the *Dive List* are saved and used when _Subsurface_ is re-opened." +msgstr "" + +#. type: Plain text +#: user-manual.txt:2613 +msgid "" +"By selecting the _Photos_ checkbox in the dropdown list, an icon is shown " +"indicating whether any photos are associated with a particular dive. There " +"are three icons:" +msgstr "" + +#. type: Named 'icon' AttributeList argument for style 'icon' +#: user-manual.txt:2614 +#, no-wrap +msgid "images/icons/duringPhoto.png" +msgstr "" + +#. type: Plain text +#: user-manual.txt:2617 +msgid "" +"This dive has photographs taken during the dive, typically using an " +"underwater camera." +msgstr "" + +#. type: Named 'icon' AttributeList argument for style 'icon' +#: user-manual.txt:2618 +#, no-wrap +msgid "images/icons/outsidePhoto.png" +msgstr "" + +#. type: Plain text +#: user-manual.txt:2623 +msgid "" +"This dive has photographs taken immediately before or immediately after the " +"dive. This is useful for finding photos of dive teams or boats just " +"before/after the dive, whales or other surface animals seen just before or " +"after the dive, or of landscapes as seen from the boat." +msgstr "" + +#. type: Named 'icon' AttributeList argument for style 'icon' +#: user-manual.txt:2624 +#, no-wrap +msgid "images/icons/inAndOutPhoto.png" +msgstr "" + +#. type: Plain text +#: user-manual.txt:2627 +msgid "" +"This dive has photographs taken both during the dive and immdiately before " +"or after the dive." msgstr "" #. type: Title === -#: user-manual.txt:2495 +#: user-manual.txt:2629 #, no-wrap msgid "Renumbering the dives" msgstr "" #. type: Plain text -#: user-manual.txt:2507 +#: user-manual.txt:2641 msgid "" "Dives are normally numbered incrementally from non-recent dives (low " "sequence numbers) to recent dives (higher sequence numbers). Numbering of " @@ -4887,7 +5203,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2512 +#: user-manual.txt:2646 msgid "" "Renumber a few selected dives in the dive list by selecting only the dives " "that need renumbering. Right-click on the selected list and use the Dive " @@ -4896,13 +5212,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:2514 +#: user-manual.txt:2648 #, no-wrap msgid "Grouping dives into trips and manipulating trips" msgstr "" #. type: Plain text -#: user-manual.txt:2522 +#: user-manual.txt:2656 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 " @@ -4913,13 +5229,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2523 +#: user-manual.txt:2657 #, no-wrap msgid "images/Group2.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2529 +#: user-manual.txt:2663 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, " @@ -4928,13 +5244,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2530 +#: user-manual.txt:2664 #, no-wrap msgid "Editing the title and associated information for a particular trip" msgstr "" #. type: Plain text -#: user-manual.txt:2543 +#: user-manual.txt:2677 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 " @@ -4948,13 +5264,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2544 +#: user-manual.txt:2678 #, no-wrap msgid "Viewing the dives during a particular trip" msgstr "" #. type: Plain text -#: user-manual.txt:2549 +#: user-manual.txt:2683 msgid "" "Once the dives have been grouped into trips, you can expand one or more " "trips by clicking the expansion button [+/-] on the left of each trip " @@ -4963,13 +5279,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2550 +#: user-manual.txt:2684 #, no-wrap msgid "Collapsing or expanding dive information for different trips" msgstr "" #. type: Plain text -#: user-manual.txt:2555 +#: user-manual.txt:2689 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 " @@ -4977,13 +5293,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2556 +#: user-manual.txt:2690 #, no-wrap msgid "Merging dives from more than one trip into a single trip" msgstr "" #. type: Plain text -#: user-manual.txt:2561 +#: user-manual.txt:2695 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 " @@ -4991,13 +5307,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2562 +#: user-manual.txt:2696 #, no-wrap msgid "Splitting a single trip into more than one trip" msgstr "" #. type: Plain text -#: user-manual.txt:2571 +#: user-manual.txt:2705 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 " @@ -5008,25 +5324,25 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2572 +#: user-manual.txt:2706 #, no-wrap msgid "images/SplitDive3a.jpg" msgstr "" #. type: Title === -#: user-manual.txt:2574 +#: user-manual.txt:2708 #, no-wrap msgid "Manipulating single dives" msgstr "" #. type: Title ==== -#: user-manual.txt:2576 +#: user-manual.txt:2710 #, no-wrap msgid "Delete a dive from the dive log" msgstr "" #. type: Plain text -#: user-manual.txt:2583 +#: user-manual.txt:2717 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 " @@ -5036,13 +5352,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2584 +#: user-manual.txt:2718 #, no-wrap msgid "Unlink a dive from a trip" msgstr "" #. type: Plain text -#: user-manual.txt:2591 +#: user-manual.txt:2725 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 " @@ -5052,13 +5368,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2592 +#: user-manual.txt:2726 #, no-wrap msgid "Add a dive to the trip immediately above" msgstr "" #. type: Plain text -#: user-manual.txt:2597 +#: user-manual.txt:2731 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 " @@ -5066,13 +5382,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2598 +#: user-manual.txt:2732 #, no-wrap msgid "Shift the start time of dive(s)" msgstr "" #. type: Plain text -#: user-manual.txt:2608 +#: user-manual.txt:2742 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 " @@ -5084,13 +5400,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2609 +#: user-manual.txt:2743 #, no-wrap msgid "Merge dives into a single dive" msgstr "" #. type: Plain text -#: user-manual.txt:2619 +#: user-manual.txt:2753 msgid "" "Sometimes a dive is briefly interrupted, for example, if a diver returns to " "the surface for a few minutes, resulting in two or more dives being recorded " @@ -5104,19 +5420,19 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2620 +#: user-manual.txt:2754 #, no-wrap msgid "images/MergedDive.png" msgstr "" #. type: Title ==== -#: user-manual.txt:2622 +#: user-manual.txt:2756 #, no-wrap msgid "Undo dive manipulations" msgstr "" #. type: Plain text -#: user-manual.txt:2628 +#: user-manual.txt:2762 msgid "" "Important actions on dives or trips, described above, can be undone or " "redone. This includes: _delete dives_, _merge dives_, _renumber dives_ and " @@ -5126,13 +5442,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:2631 +#: user-manual.txt:2765 #, no-wrap msgid "Filtering the dive list" msgstr "" #. type: Plain text -#: user-manual.txt:2637 +#: user-manual.txt:2771 msgid "" "The dives in the *Dive List* panel can be filtered, selecting only some of " "the dives based on their attributes, e.g. dive tags, dive site, dive master, " @@ -5142,7 +5458,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2645 +#: user-manual.txt:2779 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 " @@ -5156,13 +5472,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2646 +#: user-manual.txt:2780 #, no-wrap msgid "images/Filterpanel.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2655 +#: user-manual.txt:2789 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 " @@ -5175,7 +5491,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2663 +#: user-manual.txt:2797 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 " @@ -5187,112 +5503,110 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:2665 +#: user-manual.txt:2799 #, no-wrap msgid "Exporting the dive log or parts of the dive log" msgstr "" #. type: Plain text -#: user-manual.txt:2668 +#: user-manual.txt:2802 msgid "There are two ways to export dive information from Subsurface:" msgstr "" #. type: Plain text -#: user-manual.txt:2670 +#: user-manual.txt:2804 msgid "Export dive information to _Facebook_" msgstr "" #. type: Plain text -#: user-manual.txt:2672 +#: user-manual.txt:2806 msgid "" "xref:S_Export_other[Export dive information to other destinations or " "formats]" msgstr "" #. type: Title === -#: user-manual.txt:2674 +#: user-manual.txt:2808 #, no-wrap msgid "Exporting dive information to _Facebook_" msgstr "" #. type: Plain text -#: user-manual.txt:2683 +#: user-manual.txt:2817 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 _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." +"userID and password. From the *Main Menu*, select _Share on -> Connect to " +"-> Facebook_ (image *A* below) A _Facebook_ login screen appears (image *B* " +"below). Provide a _Facebook_ userID and password. From the _Subsurface_ " +"window it’s easy to determine whether _Subsurface_ has 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:2821 +msgid "" +"Once logged into to _Facebook_ , a panel is shown with a message: \"_To " +"disconnect Subsurface from your Facebook account, use the 'Share on' menu " +"entry_.\" Close this message panel." msgstr "" #. type: Target for macro image -#: user-manual.txt:2684 +#: user-manual.txt:2822 #, no-wrap -msgid "images/facebook1_f20.jpg" +msgid "images/facebook1.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2689 +#: user-manual.txt:2834 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_ " -"(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:2700 -msgid "" -"Having established a login to _Facebook_, transferring a dive profileto a " -"_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 " -"transferred along with the dive profile (image *B*, below). To transfer a " -"dive profile to _Facebook_, the name of a _Facebook_ album is needed. The " -"checkboxes on the left hand side let you decide how much additional " -"information should be transferred with the dive profile. This information is " -"shown in the text box on the right hand side of the panel (image *B*, " -"below). You can easily edit the message that will be posted with the dive " -"profile. After specifying the additional information and verifying the " -"text, select the _OK_ button that triggers the transfer to _Facebook_. After " -"the transfer is done, an acknowledgement dialogue appears, indicating it was " +"Having established a login to _Facebook_, transferring a dive profile to a " +"_Facebook_ timeline is easy. In the _Subsurface_ *Dive Profile* panel, " +"highlight the dive to be transferred. A dialogue box is shown, determining " +"the amount of additional information to be transferred with the dive profile " +"(image *A*, below). To transfer a dive profile to _Facebook_, the name of a " +"_Facebook_ album is needed. The checkboxes on the left hand side determine " +"how much additional information is added to the dive profile, shown in the " +"text box on the right hand side of the panel (image *A*, below). Customise " +"the message that will be posted with the dive profile by editing any of the " +"information. After specifying additional information and verifying the text, " +"select the _OK_ button that triggers the transfer to _Facebook_. After the " +"transfer is done, an acknowledgement dialogue appears, indicating it was " "successful." msgstr "" #. type: Plain text -#: user-manual.txt:2705 +#: user-manual.txt:2838 msgid "" -"Both the album created and the post to your timeline will be marked as " -"private. In order for friends to be able to see it, change its permissions " -"from a regular Facebook login either in a browser or a Facebook app." +"Both the album created and the post to your timeline are marked as " +"private. In order for friends to be able to see the post, log into " +"_Facebook_ using a browser or Facebook app and change its permissions." msgstr "" #. type: Target for macro image -#: user-manual.txt:2706 +#: user-manual.txt:2839 #, no-wrap -msgid "images/facebook2_f20.jpg" +msgid "images/facebook2.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2710 +#: user-manual.txt:2843 msgid "" -"If required, then close the _Facebook_ connection by either closing " -"_Subsurface_ or by selecting _File -> Preferences -> Facebook_ from the Main " -"Menu, and clicking the appropriate button on the Facebook Preferences panel." +"If required, then close the _Facebook_ connection by selecting, from the " +"*Main Menu*, _Share on -> Disconnect from -> Facebook_ (image *B* above)." msgstr "" #. type: Title === -#: user-manual.txt:2712 +#: user-manual.txt:2845 #, no-wrap msgid "Export dive information to other destinations or formats" msgstr "" #. type: Plain text -#: user-manual.txt:2717 +#: user-manual.txt:2850 msgid "" "For non-_Facebook exports_, the export function can be found by selecting " "_File -> Export_, which brings up the Export dialog. This dialog always " @@ -5302,23 +5616,23 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2718 +#: user-manual.txt:2851 #, no-wrap msgid "images/Export_f20.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2721 +#: user-manual.txt:2854 msgid "A dive log or part of it can be saved in several formats:" msgstr "" #. type: Plain text -#: user-manual.txt:2723 +#: user-manual.txt:2856 msgid "_Subsurface XML_ format. This is the native format used by _Subsurface_." msgstr "" #. type: Plain text -#: user-manual.txt:2727 +#: user-manual.txt:2860 msgid "" "Universal Dive Data Format (_UDDF_). Refer to _http://uddf.org_ for more " "information. UDDF is a generic format that enables communication among many " @@ -5326,7 +5640,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2731 +#: user-manual.txt:2864 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 " @@ -5335,7 +5649,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2735 +#: user-manual.txt:2868 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 " @@ -5343,7 +5657,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2740 +#: user-manual.txt:2873 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, " @@ -5352,7 +5666,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2743 +#: user-manual.txt:2876 msgid "" "_CSV dive profile_, that includes a large amount of detail for each dive, " "including the depth profile, temperature and pressure information of each " @@ -5360,7 +5674,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2756 +#: user-manual.txt:2889 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 " @@ -5377,7 +5691,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2761 +#: user-manual.txt:2894 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 " @@ -5386,13 +5700,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2762 +#: user-manual.txt:2895 #, no-wrap msgid "images/mapview_f20.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2769 +#: user-manual.txt:2902 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 " @@ -5401,12 +5715,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2771 +#: user-manual.txt:2904 msgid "_General Settings_, under the HTML tab, provides the following options:" msgstr "" #. type: Plain text -#: user-manual.txt:2779 +#: user-manual.txt:2912 #, no-wrap msgid "" "** Subsurface Numbers: if this option is checked, the dive(s) are exported " @@ -5424,27 +5738,27 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2782 +#: user-manual.txt:2915 msgid "" "Under _Style Options_ some style-related options are available like font " "size and theme." msgstr "" #. type: Plain text -#: user-manual.txt:2785 +#: user-manual.txt:2918 msgid "" "Export to other formats can be done through third party facilities, for " "instance _www.divelogs.de_." msgstr "" #. type: Title == -#: user-manual.txt:2787 +#: user-manual.txt:2920 #, no-wrap msgid "Keeping a _Subsurface_ dive log in the Cloud" msgstr "" #. type: Plain text -#: user-manual.txt:2797 +#: user-manual.txt:2930 msgid "" "For each diver, dive log information is highly important. Not only is it a " "record of diving activities for your pleasure, but it’s important " @@ -5458,7 +5772,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2803 +#: user-manual.txt:2936 msgid "" "_Subsurface_ includes access to a transparently integrated cloud storage " "back end that is available to all Subsurface users. Storing and retrieving a " @@ -5469,13 +5783,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:2804 +#: user-manual.txt:2937 #, no-wrap msgid "Create a cloud storage account" msgstr "" #. type: Plain text -#: user-manual.txt:2821 +#: user-manual.txt:2954 #, no-wrap msgid "" "** Open the *Network Preferences* by selecting _File_ -> _Preferences_ -> " @@ -5503,13 +5817,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:2822 +#: user-manual.txt:2955 #, no-wrap msgid "Using _Subsurface cloud storage_" msgstr "" #. type: Plain text -#: user-manual.txt:2832 +#: user-manual.txt:2965 #, no-wrap msgid "" "** Once the cloud storage has been initialized, two new items appear in " @@ -5528,7 +5842,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2837 +#: user-manual.txt:2970 #, no-wrap msgid "" "** _Subsurface_ keeps a local copy of the data and the cloud facility " @@ -5541,13 +5855,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:2839 +#: user-manual.txt:2972 #, no-wrap msgid "Web access to _Subsurface cloud storage_" msgstr "" #. type: Plain text -#: user-manual.txt:2849 +#: user-manual.txt:2982 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 " @@ -5560,13 +5874,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:2850 +#: user-manual.txt:2983 #, no-wrap msgid "Other cloud services" msgstr "" #. type: Plain text -#: user-manual.txt:2860 +#: user-manual.txt:2993 msgid "" "If you prefer not to use the integrated cloud storage of dive logs (and " "don't need the web access), it’s simple to store dive logs in the cloud " @@ -5577,13 +5891,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2861 +#: user-manual.txt:2994 #, no-wrap msgid "images/Cloud.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2870 +#: user-manual.txt:3003 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, " @@ -5596,7 +5910,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2877 +#: user-manual.txt:3010 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 " @@ -5606,7 +5920,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2883 +#: user-manual.txt:3016 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 " @@ -5617,20 +5931,111 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2886 +#: user-manual.txt:3019 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:2889 +#: user-manual.txt:3021 +#, no-wrap +msgid "Several _Subsurface_ users on one desktop computer" +msgstr "" + +#. type: Plain text +#: user-manual.txt:3025 +msgid "" +"A frequent need is for two or more persons to use _Subsurface_ on the same " +"desktop computer. For instance members of a household may use the same " +"computer or one family member may perform dive uploads for other family " +"members/friends. There are two approaches for doing this." +msgstr "" + +#. type: Plain text +#: user-manual.txt:3037 +#, no-wrap +msgid "" +"*A)* If the different users of a desktop computer do not log onto the " +"desktop/laptop under different user names\n" +" then the simplest way is for each person to use her/his own divelog file " +"within Subsurface. In this case John\n" +" would work with the _Subsurface_ file _johns-divelog_ and Joan would use " +"_joans-divelog_. Select\n" +" the appropriate dive log by selecting, from the *Main Menu*, _File -> Open " +"logbook_ and then select your own\n" +" dive log file from the list of files lower down in the menu. However, a " +"problem arises if the users\n" +" prefer different settings for _Subsurface_. For instance, one diver may " +"prefer to see the dive ceiling in the\n" +" *Profile Panel* and photos icons in the *Dive List*, while the other may " +"not have these preferences. In addition,\n" +" the cloud connection is normally unique for each _Subsurface_ installation " +"and if more than one user wishes to save\n" +" dive data on the cloud, it is inconvenient to open the *Preferences* and " +"change the user-ID data every time\n" +" the cloud is accessed. To solve these problems, launch _Subsurface_ with a " +"_--user=<user name>_ command-line option.\n" +" John can then activate _Subsurface_ with this command-line instruction:\n" +msgstr "" + +#. type: Plain text +#: user-manual.txt:3039 +#, no-wrap +msgid "\tsubsurface --user=John\n" +msgstr "" + +#. type: Plain text +#: user-manual.txt:3041 +msgid "while Joan can launch _Subsurface_ using:" +msgstr "" + +#. type: Plain text +#: user-manual.txt:3043 +#, no-wrap +msgid "\tsubsurface --user=Joan\n" +msgstr "" + +#. type: Plain text +#: user-manual.txt:3051 +#, no-wrap +msgid "" +"In this case, each user's preferences, settings and cloud access information " +"are stored separately, allowing\n" +" each diver to interact with _Subsurface_ in her/his preferred way and with " +"individual cloud access. The above\n" +" process can be made user-friendly by creating a link/shortcut with a " +"desktop icon that executes the above\n" +" command-line instruction. Use of the _--user=_ option therefore enables " +"each user to create, maintain and\n" +" backup a separate dive log within a personalised user interface. This way, " +"when each diver launches _Subsurface_,\n" +" it opens with the correct dive log as well as the appropriate display and " +"backup preferences, and each diver\n" +" can access their own divelog on a mobile device using " +"https://subsurface-divelog.org/documentation/subsurface-mobile-user-manual[_Subsurface-Mobile_].\n" +msgstr "" + +#. type: Plain text +#: user-manual.txt:3055 +#, no-wrap +msgid "" +"*B)* On the other hand, if the users log onto the same computer using " +"different userIDs and passwords (i.e. users each\n" +"have a separate user space), _Subsurface_ is available independently to each " +"user and every diver automatically has a separate\n" +"user profile and settings, including unique cloud and _Subsurface-Mobile_ " +"access.\n" +msgstr "" + +#. type: Title == +#: user-manual.txt:3057 #, no-wrap msgid "Printing a dive log" msgstr "" #. type: Plain text -#: user-manual.txt:2893 +#: user-manual.txt:3061 #, no-wrap msgid "" "_Subsurface_ provides a simple and flexible way to print a whole dive log or " @@ -5640,19 +6045,19 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2895 +#: user-manual.txt:3063 msgid "Some decisions need to be made before printing:" msgstr "" #. type: Plain text -#: user-manual.txt:2898 +#: user-manual.txt:3066 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:2900 +#: user-manual.txt:3068 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 " @@ -5660,7 +6065,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2903 +#: user-manual.txt:3071 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 " @@ -5668,35 +6073,35 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2904 user-manual.txt:4366 +#: user-manual.txt:3072 user-manual.txt:4579 #, no-wrap msgid "images/Print1_f22.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2907 +#: user-manual.txt:3075 msgid "Under _Print type_ select one of two options:" msgstr "" #. type: Plain text -#: user-manual.txt:2909 +#: user-manual.txt:3077 msgid "" "_Dive list print_: Print dives from the *Dive List* panel with profiles and " "other information." msgstr "" #. type: Plain text -#: user-manual.txt:2910 +#: user-manual.txt:3078 msgid "_Statistics print_: Print yearly statistics of the dives." msgstr "" #. type: Plain text -#: user-manual.txt:2912 +#: user-manual.txt:3080 msgid "Under _Print options_ select:" msgstr "" #. type: Plain text -#: user-manual.txt:2917 +#: user-manual.txt:3085 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 " @@ -5704,73 +6109,73 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2919 +#: user-manual.txt:3087 msgid "" "Printing in color, done by checking the box with _Print in color_. If this " "check box is not checked, printing is in black and white." msgstr "" #. type: Plain text -#: user-manual.txt:2922 +#: user-manual.txt:3090 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:2924 +#: user-manual.txt:3092 msgid "_Table_: This prints a summary table of all dives selected (see below)." msgstr "" #. type: Target for macro image -#: user-manual.txt:2925 +#: user-manual.txt:3093 #, no-wrap msgid "images/Print_summarylist_f22.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2928 +#: user-manual.txt:3096 msgid "" "_Flow layout_: Print the text associated with each dive without printing the " "dive profiles" msgstr "" #. type: Plain text -#: user-manual.txt:2929 +#: user-manual.txt:3097 msgid "of each dive (see below):" msgstr "" #. type: Target for macro image -#: user-manual.txt:2930 +#: user-manual.txt:3098 #, no-wrap msgid "images/Print_flow_layout_f22.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2933 +#: user-manual.txt:3101 msgid "" "_One Dive_: Print one dive per page, also showing the dive profile (see " "below)" msgstr "" #. type: Target for macro image -#: user-manual.txt:2934 +#: user-manual.txt:3102 #, no-wrap msgid "images/print2_f22.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2938 +#: user-manual.txt:3106 msgid "_Two Dives_: Print two dives per page, also showing the dive profiles." msgstr "" #. type: Plain text -#: user-manual.txt:2939 +#: user-manual.txt:3107 msgid "_Six Dives_: Print six dives per page, also showing the dive profiles." msgstr "" #. type: Plain text -#: user-manual.txt:2943 +#: user-manual.txt:3111 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 " @@ -5779,7 +6184,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2947 +#: user-manual.txt:3115 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 " @@ -5788,13 +6193,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2948 +#: user-manual.txt:3116 #, no-wrap msgid "images/Print_print_f22.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2953 +#: user-manual.txt:3121 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 " @@ -5803,19 +6208,19 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2954 +#: user-manual.txt:3122 #, no-wrap msgid "images/Printpreview.jpg" msgstr "" #. type: Title === -#: user-manual.txt:2956 +#: user-manual.txt:3124 #, no-wrap msgid "Writing a custom print template (advanced)" msgstr "" #. type: Plain text -#: user-manual.txt:2962 +#: user-manual.txt:3130 msgid "" "Writing a custom template is an effective way to produce highly customized " "printouts. Subsurface uses HTML templates to render printing. You can create " @@ -5826,13 +6231,13 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:2964 +#: user-manual.txt:3132 #, no-wrap msgid "Configuring a dive computer" msgstr "" #. type: Plain text -#: user-manual.txt:2973 +#: user-manual.txt:3140 msgid "" "_Subsurface_ lets you configure a dive computer. Currently the " "Heinrichs-Weikamp (OSTC 2, OSTC 3) and Suunto Vyper (Stinger, Mosquito, D3, " @@ -5841,13 +6246,12 @@ msgid "" "and changed to different values. To begin, be sure the appropriate hardware " "driver is installed for the dive computer (also required for downloading " "dives) and the device name of the dive computer is known. See " -"<<_appendix_a_operating_system_specific_information_for_importing_dive " -"_information_from_a_dive_computer,APPENDIX A>> for information on how to do " -"this." +"<<_appendix_a_operating_system_specific_information_for_importing_dive_information_from_a_dive_computer,APPENDIX " +"A>> for information on how to do this." msgstr "" #. type: Plain text -#: user-manual.txt:2979 +#: user-manual.txt:3146 msgid "" "Once the dive computer is connected to the _Subsurface_ computer, select " "_File -> Configure dive computer_ from the _Main Menu_. Select the " @@ -5857,20 +6261,20 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2980 +#: user-manual.txt:3147 #, no-wrap msgid "images/Configure_dc_f20.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2983 +#: user-manual.txt:3150 msgid "" "Using the appropriate buttons on the configuration panel, the following " "actions can be done:" msgstr "" #. type: Plain text -#: user-manual.txt:2986 +#: user-manual.txt:3153 #, no-wrap msgid "" "*Retrieve available details*. This loads the existing configuration from the " @@ -5879,7 +6283,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2988 +#: user-manual.txt:3155 #, no-wrap msgid "" "*Save changes to device*. This changes the configuration of the\n" @@ -5888,7 +6292,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2990 +#: user-manual.txt:3157 #, no-wrap msgid "" "*Backup*. This saves the configuration data to a file. _Subsurface_ asks " @@ -5897,7 +6301,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2992 +#: user-manual.txt:3159 #, no-wrap msgid "" "*Restore backup*. This loads the information from a backup file and displays " @@ -5906,7 +6310,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2994 +#: user-manual.txt:3161 #, no-wrap msgid "" "*Update firmware*. If new firmware is available for the dive computer, this " @@ -5915,13 +6319,13 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:2997 +#: user-manual.txt:3164 #, no-wrap msgid "Setting user _Preferences_ for _Subsurface_" msgstr "" #. type: Plain text -#: user-manual.txt:3008 +#: user-manual.txt:3175 msgid "" "There are several user-definable settings within _Subsurface_, found by " "selecting _File -> Preferences_, mostly affecting the way in which " @@ -5936,24 +6340,24 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3009 +#: user-manual.txt:3176 #, no-wrap msgid "Defaults" msgstr "" #. type: Plain text -#: user-manual.txt:3012 +#: user-manual.txt:3179 msgid "There are several headings in the *Defaults* panel:" msgstr "" #. type: Target for macro image -#: user-manual.txt:3013 +#: user-manual.txt:3180 #, no-wrap msgid "images/Pref1_f23.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:3017 +#: user-manual.txt:3184 #, no-wrap msgid "" " ** *Lists and tables*: Specify the font type and font size of the\n" @@ -5962,7 +6366,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3022 +#: user-manual.txt:3189 #, no-wrap msgid "" " ** *Dives*: For the _Default Dive Log File_ specify the directory and\n" @@ -5974,7 +6378,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3023 +#: user-manual.txt:3190 #, no-wrap msgid "" "_No default file_: When checked, _Subsurface_ does not automatically load a " @@ -5982,7 +6386,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3024 +#: user-manual.txt:3191 #, no-wrap msgid "" "_Local default file_: When checked, _Subsurface_ automatically loads a dive " @@ -5990,7 +6394,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3026 +#: user-manual.txt:3193 #, no-wrap msgid "" "_Cloud storage default file_: When checked, _Subsurface automatically loads " @@ -6000,7 +6404,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3028 +#: user-manual.txt:3195 #, no-wrap msgid "" "** *Display invalid*: Dives can be marked as invalid (when a user wishes to " @@ -6008,7 +6412,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3031 +#: user-manual.txt:3198 #, no-wrap msgid "" "dives that he/she doesn't consider valid dives, e.g. pool dives, but still " @@ -6019,7 +6423,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3033 +#: user-manual.txt:3200 #, no-wrap msgid "" "** *Default cylinder*: From the dropdown list, select the default cylinder " @@ -6027,13 +6431,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3034 +#: user-manual.txt:3201 #, no-wrap msgid "the *Equipment* tab of the *Notes* panel.\n" msgstr "" #. type: Plain text -#: user-manual.txt:3036 +#: user-manual.txt:3203 #, no-wrap msgid "" "** *Animations*: Some actions in showing the dive profile are performed " @@ -6041,7 +6445,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3042 +#: user-manual.txt:3209 #, no-wrap msgid "" "animations. For instance, the axis values for depth and time change from " @@ -6057,7 +6461,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3044 +#: user-manual.txt:3211 #, no-wrap msgid "" "** *Clear all settings*: As indicated in the button below this heading, all " @@ -6065,25 +6469,25 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3045 +#: user-manual.txt:3212 #, no-wrap msgid "cleared and set to default values.\n" msgstr "" #. type: Title === -#: user-manual.txt:3046 +#: user-manual.txt:3213 #, no-wrap msgid "Units" msgstr "" #. type: Target for macro image -#: user-manual.txt:3047 +#: user-manual.txt:3214 #, no-wrap msgid "images/Pref2_f23.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:3054 +#: user-manual.txt:3221 msgid "" "Choose between metric and imperial units of depth, pressure, volume, " "temperature and mass. By selecting the Metric or Imperial radio button at " @@ -6094,7 +6498,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3060 +#: user-manual.txt:3227 msgid "" "Regardless of the above settings, dive time measurements can be either in " "seconds or minutes. Choose the appropriate option. GPS coordinates can be " @@ -6103,24 +6507,24 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3061 +#: user-manual.txt:3228 #, no-wrap msgid "Graph" msgstr "" #. type: Plain text -#: user-manual.txt:3063 +#: user-manual.txt:3230 msgid "This panel has three sections:" msgstr "" #. type: Target for macro image -#: user-manual.txt:3065 +#: user-manual.txt:3232 #, no-wrap msgid "images/Pref4_f23.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:3078 +#: user-manual.txt:3245 #, no-wrap msgid "" "*Gas pressure display setup*. Even though nitrogen and helium pressures are " @@ -6142,13 +6546,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3080 +#: user-manual.txt:3247 #, no-wrap msgid "** CCR Options: These options determine oxygen management for CCR dives:\n" msgstr "" #. type: Plain text -#: user-manual.txt:3085 +#: user-manual.txt:3252 #, no-wrap msgid "" "*** _Dive planner default setpoint_: Specify the O~2~ setpoint for a\n" @@ -6159,7 +6563,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3089 +#: user-manual.txt:3256 #, no-wrap msgid "" "*** _CCR: Show setpoints when viewing pO2:_ With this checkbox activated, " @@ -6171,7 +6575,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3093 +#: user-manual.txt:3260 #, no-wrap msgid "" "*** _CCR: Show individual O~2~ sensor values when viewing pO~2~:_ Show the " @@ -6182,7 +6586,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3095 +#: user-manual.txt:3262 #, no-wrap msgid "" "*Ceiling display setup*. These settings mostly deal with nitrogen and helium " @@ -6190,7 +6594,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3096 +#: user-manual.txt:3263 #, no-wrap msgid "" "by determining how the decompression ceiling (ascent ceiling) is calculated " @@ -6198,7 +6602,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3103 +#: user-manual.txt:3270 #, no-wrap msgid "" "** _Draw dive computer reported ceiling red_: This checkbox does exactly " @@ -6213,7 +6617,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3108 +#: user-manual.txt:3275 #, no-wrap msgid "" "** _Algorithm for calculating ceiling_. Choose between the Bühlmann " @@ -6225,7 +6629,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3124 +#: user-manual.txt:3291 #, no-wrap msgid "" "*** Bühlmann: Set the _gradient factors_ (GFlow and GFHigh) for calculcating " @@ -6255,7 +6659,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3131 +#: user-manual.txt:3298 #, no-wrap msgid "" " ** _pSCR options_. These preferences determine how passive semi-closed " @@ -6264,7 +6668,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3135 +#: user-manual.txt:3302 #, no-wrap msgid "" " *** _Metabolic rate:_ this is the\n" @@ -6274,7 +6678,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3138 +#: user-manual.txt:3305 #, no-wrap msgid "" " *** _pSCR ratio:_ The dilution ratio (or dump ratio) is the ratio of gas " @@ -6284,13 +6688,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3140 +#: user-manual.txt:3307 #, no-wrap msgid "*Misc*\n" msgstr "" #. type: Plain text -#: user-manual.txt:3147 +#: user-manual.txt:3314 #, no-wrap msgid "" "** _Show unused cylinders in Equipment Tab_: This checkbox allows display of " @@ -6308,24 +6712,24 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3149 +#: user-manual.txt:3316 #, no-wrap msgid "Language" msgstr "" #. type: Plain text -#: user-manual.txt:3151 +#: user-manual.txt:3318 msgid "Choose a language that _Subsurface_ will use." msgstr "" #. type: Target for macro image -#: user-manual.txt:3152 +#: user-manual.txt:3319 #, no-wrap msgid "images/Pref3_f23.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:3161 +#: user-manual.txt:3328 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 " @@ -6337,20 +6741,20 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3163 +#: user-manual.txt:3330 msgid "" "In this section also specify appropriate date an time formats for showing " "dive details." msgstr "" #. type: Title === -#: user-manual.txt:3164 +#: user-manual.txt:3331 #, no-wrap msgid "Network" msgstr "" #. type: Plain text -#: user-manual.txt:3171 +#: user-manual.txt:3338 msgid "" "This panel facilitates communication between _Subsurface_ and data sources " "on the Internet. This is important, for instance, when _Subsurface_ needs " @@ -6362,18 +6766,18 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:3172 +#: user-manual.txt:3339 #, no-wrap msgid "images/Pref5_f23.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:3175 +#: user-manual.txt:3342 msgid "This dialogue has three sections:" msgstr "" #. type: Plain text -#: user-manual.txt:3183 +#: user-manual.txt:3350 #, no-wrap msgid "" "** _Proxy type_:\n" @@ -6390,7 +6794,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3188 +#: user-manual.txt:3355 #, no-wrap msgid "" "** _Subsurface cloud storage_: To store your dive log in the cloud, a valid " @@ -6403,7 +6807,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3189 +#: user-manual.txt:3356 #, no-wrap msgid "" "_Sync to cloud in the background_: This option allows saving of dive " @@ -6411,13 +6815,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3190 +#: user-manual.txt:3357 #, no-wrap msgid "while you do other things within _Subsurface_.\n" msgstr "" #. type: Plain text -#: user-manual.txt:3191 +#: user-manual.txt:3358 #, no-wrap msgid "" "_Save password locally_: This allows local storage of the cloud storage " @@ -6425,13 +6829,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3192 +#: user-manual.txt:3359 #, no-wrap msgid "information is saved in raw text form, not encoded in any way.\n" msgstr "" #. type: Plain text -#: user-manual.txt:3196 +#: user-manual.txt:3363 #, no-wrap msgid "" "** _Subsurface web service_: When you subscribe to the " @@ -6443,13 +6847,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3197 +#: user-manual.txt:3364 #, no-wrap msgid "Georeference" msgstr "" #. type: Plain text -#: user-manual.txt:3205 +#: user-manual.txt:3372 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 " @@ -6462,19 +6866,19 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:3206 +#: user-manual.txt:3373 #, no-wrap msgid "images/Pref7_f23.jpg" msgstr "" #. type: Title == -#: user-manual.txt:3209 +#: user-manual.txt:3376 #, no-wrap msgid "The _Subsurface_ dive planner" msgstr "" #. type: Plain text -#: user-manual.txt:3214 +#: user-manual.txt:3381 msgid "" "Dive planning is an advanced feature of _Subsurface_, accessed by selecting " "_Log -> Plan Dive_ from the main menu. It allows calculation of inert gas " @@ -6483,7 +6887,7 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:3222 +#: user-manual.txt:3389 msgid "" "The _Subsurface_ dive planner IS CURRENTLY EXPERIMENTAL and assumes the user " "is already familiar with the _Subsurface_ user interface. It is explicitly " @@ -6491,19 +6895,19 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:3225 +#: user-manual.txt:3392 msgid "" "The user is conversant with dive planning and has the necessary training to " "perform dive planning." msgstr "" #. type: delimited block * -#: user-manual.txt:3226 +#: user-manual.txt:3393 msgid "The user plans dives within his/her certification limits." msgstr "" #. type: delimited block * -#: user-manual.txt:3229 +#: user-manual.txt:3396 msgid "" "Dive planning makes large assumptions about the characteristics of the " "_average person_ and cannot compensate for individual physiology or health " @@ -6511,32 +6915,32 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:3230 +#: user-manual.txt:3397 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:3231 +#: user-manual.txt:3398 msgid "The user is familiar with the user interface of _Subsurface_." msgstr "" #. type: delimited block * -#: user-manual.txt:3233 +#: user-manual.txt:3400 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:3235 +#: user-manual.txt:3402 #, no-wrap msgid "The _Subsurface_ dive planner screen" msgstr "" #. type: Plain text -#: user-manual.txt:3240 +#: user-manual.txt:3407 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 " @@ -6545,7 +6949,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3244 +#: user-manual.txt:3411 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 " @@ -6554,7 +6958,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3248 +#: user-manual.txt:3415 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 " @@ -6563,26 +6967,26 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:3249 +#: user-manual.txt:3416 #, no-wrap msgid "images/PlannerWindow1_f20.jpg" msgstr "" #. type: Title === -#: user-manual.txt:3252 +#: user-manual.txt:3419 #, no-wrap msgid "Open circuit dives" msgstr "" #. type: Plain text -#: user-manual.txt:3255 +#: user-manual.txt:3422 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:3258 +#: user-manual.txt:3425 #, no-wrap msgid "" "** Open Circuit (the default)\n" @@ -6591,12 +6995,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3260 +#: user-manual.txt:3427 msgid "Choose the Open Circuit option." msgstr "" #. type: Plain text -#: user-manual.txt:3264 +#: user-manual.txt:3431 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 " @@ -6606,7 +7010,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3273 +#: user-manual.txt:3440 msgid "" "In the table labelled _Available Gases_, add the information of the " "cylinders to be used as well as the gas composition within that " @@ -6621,12 +7025,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3275 +#: user-manual.txt:3442 msgid "The _Available Gases_ table includes three gas depth fields, labelled:" msgstr "" #. type: Plain text -#: user-manual.txt:3276 +#: user-manual.txt:3443 #, no-wrap msgid "" "** Deco switch at: the switch depth for deco gases. Unless overridden by the " @@ -6634,7 +7038,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3277 +#: user-manual.txt:3444 #, no-wrap msgid "" "automatically calculated based on the Deco pO₂ preference (default 1.6 " @@ -6642,7 +7046,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3278 +#: user-manual.txt:3445 #, no-wrap msgid "" "** Bot. MOD: the gas Maximum Operating Depth (MOD) if it is used as a bottom " @@ -6650,7 +7054,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3280 +#: user-manual.txt:3447 #, no-wrap msgid "" "calculated based on the Bottom pO₂ preference (default 1.4 bar). Editing " @@ -6660,7 +7064,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3281 +#: user-manual.txt:3448 #, no-wrap msgid "" "** MND: the gas Maximum Narcotic Depth (MND). Automatically calculated based " @@ -6668,7 +7072,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3283 +#: user-manual.txt:3450 #, no-wrap msgid "" "preference (default 30m / 98 ft). Editing this field will modify the He% " @@ -6677,12 +7081,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3285 +#: user-manual.txt:3452 msgid "The profile of the planned dive can be created in two ways:" msgstr "" #. type: Plain text -#: user-manual.txt:3290 +#: user-manual.txt:3457 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 " @@ -6692,7 +7096,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3298 +#: user-manual.txt:3465 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 " @@ -6706,13 +7110,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:3299 +#: user-manual.txt:3466 #, no-wrap msgid "Recreational dives" msgstr "" #. type: Plain text -#: user-manual.txt:3316 +#: user-manual.txt:3483 #, no-wrap msgid "" "Recreational mode is what comes closest to planning a dive based on the " @@ -6743,21 +7147,21 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3319 +#: user-manual.txt:3486 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:3322 +#: user-manual.txt:3489 msgid "" "Immediately under the heading _Planning_ are two checkboxes _Recreational_ " "and _Safety Stop_. Check these two boxes." msgstr "" #. type: Plain text -#: user-manual.txt:3326 +#: user-manual.txt:3493 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 " @@ -6765,7 +7169,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3331 +#: user-manual.txt:3498 msgid "" "The planner calculates whether the specified cylinder contains enough " "air/gas to complete the planned dive. In order for this to be accurate, " @@ -6775,7 +7179,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3340 +#: user-manual.txt:3507 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 " @@ -6792,7 +7196,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3348 +#: user-manual.txt:3515 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 " @@ -6805,14 +7209,14 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3351 +#: user-manual.txt:3518 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:3359 +#: user-manual.txt:3526 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 " @@ -6828,7 +7232,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3363 +#: user-manual.txt:3530 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 " @@ -6838,26 +7242,26 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:3364 +#: user-manual.txt:3531 #, no-wrap msgid "images/rec_diveplan.jpg" msgstr "" #. type: Title ==== -#: user-manual.txt:3366 +#: user-manual.txt:3533 #, no-wrap msgid "Non-recreational open circuit dives, including decompression" msgstr "" #. type: Plain text -#: user-manual.txt:3370 +#: user-manual.txt:3537 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:3382 +#: user-manual.txt:3549 #, no-wrap msgid "" "*a) Nitrogen management*: This is done by specifying the rates for descent " @@ -6883,7 +7287,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3388 +#: user-manual.txt:3555 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 " @@ -6896,26 +7300,26 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3390 +#: user-manual.txt:3557 msgid "For more information external to this manual see:" msgstr "" #. type: Plain text -#: user-manual.txt:3392 +#: user-manual.txt:3559 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:3393 +#: user-manual.txt:3560 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:3395 +#: user-manual.txt:3562 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: " @@ -6924,7 +7328,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3403 +#: user-manual.txt:3570 msgid "" "The ascent rate is critical for nitrogen off-gassing at the end of the dive " "and is specified for several depth ranges, using the mean depth as a " @@ -6937,7 +7341,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3411 +#: user-manual.txt:3578 #, no-wrap msgid "" "*b) Oxygen management*: In the *Gas Options* part of the dive specification, " @@ -6956,7 +7360,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3428 +#: user-manual.txt:3595 #, no-wrap msgid "" "*c) Gas management*: With open-circuit dives this is a primary\n" @@ -6987,7 +7391,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3440 +#: user-manual.txt:3607 msgid "" "Now you can start the detailed time-depth planning of the dive. _Subsurface_ " "offers an unique graphical interface for doing planning. The mechanics are " @@ -7005,7 +7409,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3452 +#: user-manual.txt:3619 msgid "" "Each waypoint on the dive profile creates a _Dive Planner Point_ in the " "table on the left of the dive planner panel. Ensure the _Used Gas_ value in " @@ -7022,7 +7426,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3460 +#: user-manual.txt:3627 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 " @@ -7034,7 +7438,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3469 +#: user-manual.txt:3636 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 " @@ -7047,20 +7451,20 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3472 +#: user-manual.txt:3639 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:3473 +#: user-manual.txt:3640 #, no-wrap msgid "images/DivePlanner2_f20.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:3478 +#: user-manual.txt:3645 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 " @@ -7068,13 +7472,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3480 +#: user-manual.txt:3647 #, no-wrap msgid "*The dive plan details*\n" msgstr "" #. type: Plain text -#: user-manual.txt:3488 +#: user-manual.txt:3655 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 " @@ -7087,7 +7491,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3493 +#: user-manual.txt:3660 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 " @@ -7097,13 +7501,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3494 +#: user-manual.txt:3661 #, no-wrap msgid "Planning pSCR dives" msgstr "" #. type: Plain text -#: user-manual.txt:3509 +#: user-manual.txt:3676 #, no-wrap msgid "" "To plan a dive using a passive semi-closed rebreather (pSCR), select _pSCR_ " @@ -7133,26 +7537,26 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:3510 +#: user-manual.txt:3677 #, no-wrap msgid "images/Planner_pSCR1_f20.jpg" msgstr "" #. type: Title === -#: user-manual.txt:3513 +#: user-manual.txt:3680 #, no-wrap msgid "Planning CCR dives" msgstr "" #. type: Plain text -#: user-manual.txt:3517 +#: user-manual.txt:3684 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:3521 +#: user-manual.txt:3688 #, no-wrap msgid "" "*Available gases*: In the _Available gases_ table, enter the cylinder " @@ -7163,7 +7567,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3531 +#: user-manual.txt:3698 #, no-wrap msgid "" "*Entering setpoints*: Specify a default setpoint in the Preferences tab, by " @@ -7185,31 +7589,31 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3533 +#: user-manual.txt:3700 msgid "The dive profile for a CCR dive may look something like the image below." msgstr "" #. type: Target for macro image -#: user-manual.txt:3534 +#: user-manual.txt:3701 #, no-wrap msgid "images/Planner_CCR1_f20.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:3538 +#: user-manual.txt:3705 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:3540 +#: user-manual.txt:3707 #, no-wrap msgid "Modifying an existing dive plan" msgstr "" #. type: Plain text -#: user-manual.txt:3547 +#: user-manual.txt:3714 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 " @@ -7220,7 +7624,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3553 +#: user-manual.txt:3720 msgid "" "In addition, there is the option \"Save new\". This keeps the original " "planned dive and adds a (possibly modified, - earlier dives are now taken " @@ -7231,13 +7635,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3554 +#: user-manual.txt:3721 #, no-wrap msgid "Planning for repetitive dives" msgstr "" #. type: Plain text -#: user-manual.txt:3561 +#: user-manual.txt:3728 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 " @@ -7246,7 +7650,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3567 +#: user-manual.txt:3734 msgid "" "If you have just completed a long/deep dive and are planning another dive, " "then highlight, in the *Dive List*, the dive that has just been logged then " @@ -7256,7 +7660,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3572 +#: user-manual.txt:3739 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 " @@ -7266,13 +7670,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3573 +#: user-manual.txt:3740 #, no-wrap msgid "Printing the dive plan" msgstr "" #. type: Plain text -#: user-manual.txt:3578 +#: user-manual.txt:3745 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 " @@ -7280,7 +7684,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3588 +#: user-manual.txt:3755 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 " @@ -7295,14 +7699,113 @@ msgid "" "paste to a word processor." msgstr "" +#. type: Title === +#: user-manual.txt:3757 +#, no-wrap +msgid "Saving a dive with its dive plan" +msgstr "" + +#. type: Plain text +#: user-manual.txt:3764 +msgid "" +"In the section dealing with <<S_MultipleDiveComputers, dives using more than " +"one dive computer>> we discussed the way in which multiple profiles for a " +"single dive can be viewed using the left-arrow and right-arrow keyboard " +"keys. A similar method can be used for saving a dive plan with the profile " +"of the actual dive, once this has been uploaded into _Subsurface_. In order " +"to do this:" +msgstr "" + +#. type: Plain text +#: user-manual.txt:3766 +msgid "Do the dive planning and save the final plan in the _Dive List_." +msgstr "" + +#. type: Plain text +#: user-manual.txt:3767 +msgid "After diving, upload the dive data from the dive computer." +msgstr "" + +#. type: Plain text +#: user-manual.txt:3769 +msgid "" +"Change the date and time of the _dive plan_ to coincide with that of the " +"real-life dive from the _dive computer_." +msgstr "" + +#. type: Plain text +#: user-manual.txt:3772 +msgid "" +"In the _Dive List_, highlight the dive plan as well as the data for the real " +"dive and merge the two dives, making use of the Dive List Context Menu " +"(available by righ-clicking a dive)." +msgstr "" + +#. type: Plain text +#: user-manual.txt:3776 +msgid "" +"The text version of the dive plan is appended to the Notes in the _Notes " +"Tab_. With this merged dive highlighted in the _Dive List_, switch between " +"the planned profile and the real-life profile using the " +"righ-arrow/left-arrow keyboard keys." +msgstr "" + #. type: Title == -#: user-manual.txt:3589 +#: user-manual.txt:3777 +#, no-wrap +msgid "Running _Subsurface_ from the command-line" +msgstr "" + +#. type: Plain text +#: user-manual.txt:3781 +msgid "" +"_Subsurface_ can be launched from the command-line to set some specialised " +"settings or as part of an script-based automated process for manipulating a " +"dive log. The format for launching _Subsurface_ from the command-line is:" +msgstr "" + +#. type: Plain text +#: user-manual.txt:3783 +#, no-wrap +msgid "\tsubsurface [options] [logfile ...] [--import logfile ...]\n" +msgstr "" + +#. type: Plain text +#: user-manual.txt:3785 +msgid "The options include:" +msgstr "" + +#. type: delimited block | +#: user-manual.txt:3798 +#, no-wrap +msgid "" +"|*Command-line option*|*Description*\n" +"|--help|Print a summary of the command-line options\n" +"| -h|Print a summary of the command-line options\n" +"|--import logfile ...|A file name before this option is treated as an " +"existing dive log, everything after is imported into the existing dive log\n" +"|--verbose|Print debug information while running _Subsurface_\n" +"| -v|Print debug information while running _Subsurface_\n" +"| -v -v| Print even more debug information while running _Subsurface_\n" +"|--version|Prints the current version of _Subsurface_.\n" +"|--survey|Opens the xref:S_UserSurvey[user survey] immediately after " +"starting _Subsurface_\n" +"|--user=<username>|Choose the xref:S_user_space[configuration space] of user " +"<username>\n" +"|--cloud-timeout=<duration>|Set the timeout for cloud connection (0 < " +"duration < 60). This enables longer timeouts for slow Internet connections\n" +"|--win32console|Create a dedicated console if needed (Windows only). Add " +"this option before everything else\n" +msgstr "" + +#. type: Title == +#: user-manual.txt:3800 #, no-wrap msgid "Description of the Subsurface Main Menu items" msgstr "" #. type: Plain text -#: user-manual.txt:3594 +#: user-manual.txt:3805 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 " @@ -7310,311 +7813,313 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3595 +#: user-manual.txt:3806 #, no-wrap msgid "File" msgstr "" #. type: Plain text -#: user-manual.txt:3598 +#: user-manual.txt:3809 msgid "" "<<S_NewLogbook,_New Logbook_>> - Close the currently open dive logbook and " "clear all dive information." msgstr "" #. type: Plain text -#: user-manual.txt:3600 +#: user-manual.txt:3811 msgid "_Open logbook_ - Open the file manager to select a dive logbook to open." msgstr "" #. type: Plain text -#: user-manual.txt:3601 +#: user-manual.txt:3812 msgid "_Save_ - Save the dive logbook currently open." msgstr "" #. type: Plain text -#: user-manual.txt:3602 +#: user-manual.txt:3813 msgid "_Save as_ - Save the current logbook under a different file name." msgstr "" #. type: Plain text -#: user-manual.txt:3603 +#: user-manual.txt:3814 msgid "" "_Open cloud storage_ - Open the dive log previously saved in " "<<S_Cloud_storage,_Cloud storage_>>." msgstr "" #. type: Plain text -#: user-manual.txt:3604 +#: user-manual.txt:3815 msgid "" "_Save to cloud storage_ - Save the current dive log to " "<<S_Cloud_storage,_Cloud storage_>>." msgstr "" #. type: Plain text -#: user-manual.txt:3605 +#: user-manual.txt:3816 msgid "" "_Take cloud storage online_ - " "******************************************************" msgstr "" #. type: Plain text -#: user-manual.txt:3606 +#: user-manual.txt:3817 msgid "_Close_ - Close the dive logbook currently open." msgstr "" #. type: Plain text -#: user-manual.txt:3608 +#: user-manual.txt:3819 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:3609 +#: user-manual.txt:3820 msgid "<<S_PrintDivelog,_Print_>> - Print the currently open logbook." msgstr "" #. type: Plain text -#: user-manual.txt:3610 +#: user-manual.txt:3821 msgid "<<S_Preferences,_Preferences_>> - Set the _Subsurface_ preferences." msgstr "" #. type: Plain text -#: user-manual.txt:3611 +#: user-manual.txt:3822 msgid "" "<<S_FindMovedImages, _Find moved images_>> - If photos taken during dives " "have been moved to" msgstr "" #. type: Plain text -#: user-manual.txt:3612 +#: user-manual.txt:3823 msgid "" "a different disk or directory, locate them and link them to the appropriate " "dives." msgstr "" #. type: Plain text -#: user-manual.txt:3613 +#: user-manual.txt:3824 msgid "" "<<S_Configure,_Configure dive computer_>> - Edit the configuration of a dive " "computer." msgstr "" #. type: Plain text -#: user-manual.txt:3614 +#: user-manual.txt:3825 msgid "_Quit_ - Quit _Subsurface_." msgstr "" #. type: Title === -#: user-manual.txt:3616 +#: user-manual.txt:3827 #, no-wrap msgid "Edit" msgstr "" #. type: Plain text -#: user-manual.txt:3618 +#: user-manual.txt:3829 msgid "The Edit option allows one to undo or redo an action, e.g. deleting dives." msgstr "" #. type: Title === -#: user-manual.txt:3619 +#: user-manual.txt:3830 #, no-wrap msgid "Import" msgstr "" #. type: Plain text -#: user-manual.txt:3622 +#: user-manual.txt:3833 msgid "" "<<S_ImportDiveComputer,_Import from dive computer_>> - Import dive " "information from a dive computer." msgstr "" #. type: Plain text -#: user-manual.txt:3624 +#: user-manual.txt:3835 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:3626 +#: user-manual.txt:3837 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:3628 +#: user-manual.txt:3839 msgid "" "<<S_ImportingDivelogsDe,_Import from Divelogs.de_>> - Import dive " "information from _www.Divelogs.de_." msgstr "" #. type: Title === -#: user-manual.txt:3629 +#: user-manual.txt:3840 #, no-wrap msgid "Log" msgstr "" #. type: Plain text -#: user-manual.txt:3631 +#: user-manual.txt:3842 msgid "" "<<S_EnterData,_Add Dive_>> - Manually add a new dive to the *Dive List* " "panel." msgstr "" #. type: Plain text -#: user-manual.txt:3632 +#: user-manual.txt:3843 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:3633 +#: user-manual.txt:3844 msgid "<<S_DivePlanner,_Plan Dive_>> - Plan dives." msgstr "" #. type: Plain text -#: user-manual.txt:3634 +#: user-manual.txt:3845 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:3636 +#: user-manual.txt:3847 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:3638 +#: user-manual.txt:3849 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:3640 +#: user-manual.txt:3851 msgid "" "<<S_Renumber,_Renumber_>> - Renumber the dives listed in the *Dive List* " "panel." msgstr "" #. type: Plain text -#: user-manual.txt:3642 +#: user-manual.txt:3853 msgid "" "<<S_Group,_Auto Group_>> - Group the dives in the *Dive List* panel into " "dive trips." msgstr "" #. type: Plain text -#: user-manual.txt:3643 +#: user-manual.txt:3854 msgid "" "<<S_DeviceNames,_Edit Device Names_>> - Edit the names of dive computers to " "coordinate your logs." msgstr "" #. type: Plain text -#: user-manual.txt:3644 +#: user-manual.txt:3855 msgid "" "<<S_Filter,_Filter divelist_>> - Select only some dives, based on specific " "tags or dive criteria." msgstr "" #. type: Title === -#: user-manual.txt:3645 +#: user-manual.txt:3856 #, no-wrap msgid "View" msgstr "" #. type: Plain text -#: user-manual.txt:3648 +#: user-manual.txt:3859 msgid "<<S_ViewPanels,_All_>> - View the four main _Subsurface_ panels all at once." msgstr "" #. type: Plain text -#: user-manual.txt:3649 +#: user-manual.txt:3860 msgid "<<S_ViewPanels,_Dive List_>> - View only the *Dive List* panel." msgstr "" #. type: Plain text -#: user-manual.txt:3650 +#: user-manual.txt:3861 msgid "<<S_ViewPanels,_Profile_>> - View only the *Dive Profile* panel." msgstr "" #. type: Plain text -#: user-manual.txt:3651 +#: user-manual.txt:3862 msgid "<<S_ViewPanels,_Info_>> - View only the *Notes* panel." msgstr "" #. type: Plain text -#: user-manual.txt:3652 +#: user-manual.txt:3863 msgid "<<S_ViewPanels,_Globe_>> - View only the *World Map* panel." msgstr "" #. type: Plain text -#: user-manual.txt:3654 +#: user-manual.txt:3865 msgid "" "_Yearly Statistics_ - Display summary statistics about dives during this and " "past years." msgstr "" #. type: Plain text -#: user-manual.txt:3655 +#: user-manual.txt:3868 msgid "" "_Prev DC_ - Switch to data from previous dive computer, if a single dive was " -"logged from more than one." +"logged from more than one. See the sections on " +"<<S_MultipleDiveComputers,using multiple dive computers for the same dive>> " +"and <<S_MergeDivePlan, Saving an uploaded dive with its dive plan>>." msgstr "" #. type: Plain text -#: user-manual.txt:3656 +#: user-manual.txt:3869 msgid "_Next DC_ - Switch to next dive computer." msgstr "" #. type: Plain text -#: user-manual.txt:3657 +#: user-manual.txt:3870 msgid "_Full Screen_ - Toggles Full Screen mode." msgstr "" #. type: Title === -#: user-manual.txt:3658 +#: user-manual.txt:3871 #, no-wrap msgid "Share on" msgstr "" #. type: Plain text -#: user-manual.txt:3660 +#: user-manual.txt:3873 msgid "" "<<S_Facebook,_Facebook_>> - Share the currently selected dive on your " "Facebook timeline." msgstr "" #. type: Title === -#: user-manual.txt:3661 +#: user-manual.txt:3874 #, no-wrap msgid "Help" msgstr "" #. type: Plain text -#: user-manual.txt:3664 +#: user-manual.txt:3877 msgid "" "_About Subsurface_ - Show a panel with the version number of _Subsurface_ as " "well as licensing information." msgstr "" #. type: Plain text -#: user-manual.txt:3666 +#: user-manual.txt:3879 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:3668 +#: user-manual.txt:3881 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 " @@ -7622,12 +8127,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3669 +#: user-manual.txt:3882 msgid "_User manual_ - Open a window showing this user manual." msgstr "" #. type: Title == -#: user-manual.txt:3672 +#: user-manual.txt:3885 #, no-wrap msgid "" "APPENDIX A: Operating system specific information for importing dive " @@ -7635,19 +8140,19 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3674 +#: user-manual.txt:3887 #, 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:3675 +#: user-manual.txt:3888 #, no-wrap msgid "images/icons/drivers.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:3680 +#: user-manual.txt:3893 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 " @@ -7655,7 +8160,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3686 +#: user-manual.txt:3899 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 " @@ -7664,7 +8169,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3690 +#: user-manual.txt:3903 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 " @@ -7672,7 +8177,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3697 +#: user-manual.txt:3910 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 " @@ -7683,19 +8188,19 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3699 +#: user-manual.txt:3912 #, 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:3700 +#: user-manual.txt:3913 #, no-wrap msgid "images/icons/usb.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:3708 +#: user-manual.txt:3921 msgid "" "When connecting a dive computer by using a USB connector, usually " "_Subsurface_ will either propose a drop down list with the correct device " @@ -7705,61 +8210,61 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3713 +#: user-manual.txt:3926 msgid "" "Simply try COM1, COM2, etc. The drop down list should contain all connected " "COM devices." msgstr "" #. type: Title ==== -#: user-manual.txt:3714 user-manual.txt:3812 +#: user-manual.txt:3927 user-manual.txt:4025 #, no-wrap msgid "On MacOS:" msgstr "" #. type: Plain text -#: user-manual.txt:3717 +#: user-manual.txt:3930 msgid "The drop down box should find all connected dive computers." msgstr "" #. type: Block title -#: user-manual.txt:3718 +#: user-manual.txt:3931 #, no-wrap msgid "On Linux:" msgstr "" #. type: Plain text -#: user-manual.txt:3721 +#: user-manual.txt:3934 msgid "There is a definitive way to find the port:" msgstr "" #. type: Plain text -#: user-manual.txt:3723 +#: user-manual.txt:3936 msgid "Disconnect the USB cable from the dive computer" msgstr "" #. type: Plain text -#: user-manual.txt:3724 +#: user-manual.txt:3937 msgid "Open a terminal" msgstr "" #. type: Plain text -#: user-manual.txt:3725 user-manual.txt:3727 +#: user-manual.txt:3938 user-manual.txt:3940 msgid "Type the command: 'dmesg' and press enter" msgstr "" #. type: Plain text -#: user-manual.txt:3726 +#: user-manual.txt:3939 msgid "Plug in the USB cable of the dive computer" msgstr "" #. type: Plain text -#: user-manual.txt:3729 +#: user-manual.txt:3942 msgid "A message similar to this one should appear:" msgstr "" #. type: Plain text -#: user-manual.txt:3745 +#: user-manual.txt:3958 #, no-wrap msgid "" "\tusb 2-1.1: new full speed USB device number 14 using ehci_hcd\n" @@ -7780,7 +8285,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3750 +#: user-manual.txt:3963 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 " @@ -7788,12 +8293,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3752 +#: user-manual.txt:3965 msgid "Ensuring the user has write permission to the USB serial port:" msgstr "" #. type: Plain text -#: user-manual.txt:3762 +#: user-manual.txt:3975 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 " @@ -7805,14 +8310,14 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3766 +#: user-manual.txt:3979 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:3771 +#: user-manual.txt:3984 #, no-wrap msgid "" "Type: +id johnB+ This lists all the groups that johnB belongs to and\n" @@ -7824,7 +8329,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3773 +#: user-manual.txt:3986 #, no-wrap msgid "" "Under some circumstances this change takes only effect (eg. on Ubuntu) " @@ -7833,7 +8338,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3778 +#: user-manual.txt:3991 msgid "" "With the appropriate device name (e.g. +dev/ttyUSB3+) and with write " "permission to the USB port, the dive computer interface can connect and you " @@ -7841,13 +8346,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3781 +#: user-manual.txt:3994 #, no-wrap msgid "Manually setting up Bluetooth enabled devices" msgstr "" #. type: Plain text -#: user-manual.txt:3788 +#: user-manual.txt:4001 msgid "" "For dive computers communicating through Bluetooth like the Heinrichs " "Weikamp Frog or the Shearwater Predator, Petrel and Nerd there is a " @@ -7856,7 +8361,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3790 +#: user-manual.txt:4003 #, no-wrap msgid "" "*For the dive computer, after enabling Bluetooth, be sure it is in Upload " @@ -7864,7 +8369,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3794 +#: user-manual.txt:4007 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 -> " @@ -7872,13 +8377,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3796 +#: user-manual.txt:4009 #, no-wrap msgid "*Pair the _Subsurface_ computer with the dive computer.*\n" msgstr "" #. type: Plain text -#: user-manual.txt:3805 +#: user-manual.txt:4018 msgid "" "Bluetooth is most likely already enabled. For pairing with the dive computer " "choose _Control Panel -> Bluetooth Devices -> Add Wireless Device_. This " @@ -7890,21 +8395,21 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3808 +#: user-manual.txt:4021 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:3811 +#: user-manual.txt:4024 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:3818 +#: user-manual.txt:4031 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 " @@ -7913,20 +8418,20 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3821 +#: user-manual.txt:4034 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:3822 +#: user-manual.txt:4035 #, no-wrap msgid "On Linux" msgstr "" #. type: Plain text -#: user-manual.txt:3830 +#: user-manual.txt:4043 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 " @@ -7938,7 +8443,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3834 +#: user-manual.txt:4047 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 " @@ -7947,23 +8452,23 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3836 +#: user-manual.txt:4049 msgid "Enable the Bluetooth controller and pair your dive computer" msgstr "" #. type: Plain text -#: user-manual.txt:3837 +#: user-manual.txt:4050 msgid "Establish an RFCOMM connection" msgstr "" #. type: Title ===== -#: user-manual.txt:3838 user-manual.txt:3978 +#: user-manual.txt:4051 user-manual.txt:4191 #, no-wrap msgid "Download the dives with Subsurface" msgstr "" #. type: Plain text -#: user-manual.txt:3844 +#: user-manual.txt:4057 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 " @@ -7974,7 +8479,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3849 +#: user-manual.txt:4062 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 " @@ -7984,23 +8489,23 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3851 +#: user-manual.txt:4064 msgid "+sudo usermod -a -G dialout username+" msgstr "" #. type: Plain text -#: user-manual.txt:3853 +#: user-manual.txt:4066 msgid "Then log out and log in for the change to take effect." msgstr "" #. type: Title ===== -#: user-manual.txt:3854 +#: user-manual.txt:4067 #, no-wrap msgid "Enabling the Bluetooth controller and pairing your dive computer" msgstr "" #. type: Plain text -#: user-manual.txt:3860 +#: user-manual.txt:4073 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 " @@ -8011,7 +8516,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3863 +#: user-manual.txt:4076 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 " @@ -8019,7 +8524,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3870 +#: user-manual.txt:4083 #, no-wrap msgid "" "\t$ hciconfig\n" @@ -8031,7 +8536,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3875 +#: user-manual.txt:4088 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 " @@ -8041,7 +8546,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3883 +#: user-manual.txt:4096 #, no-wrap msgid "" "\tsudo hciconfig hci0 up auth+ (enter password when prompted)\n" @@ -8054,25 +8559,25 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3885 +#: user-manual.txt:4098 msgid "Check that the status now includes +'UP', 'RUNNING' AND 'AUTH'+." msgstr "" #. type: Plain text -#: user-manual.txt:3887 +#: user-manual.txt:4100 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:3889 +#: user-manual.txt:4102 #, no-wrap msgid "\tsudo hciconfig hci1 down\n" msgstr "" #. type: Plain text -#: user-manual.txt:3892 +#: user-manual.txt:4105 msgid "" "Next step is to 'trust' and 'pair' the dive computer. On distros with Bluez " "5, such as Fedora 22, you can use a tool called +blutootctl+, which will " @@ -8080,7 +8585,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3913 +#: user-manual.txt:4126 #, no-wrap msgid "" "\tbluetoothctl\n" @@ -8109,14 +8614,14 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3916 +#: user-manual.txt:4129 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:3919 +#: user-manual.txt:4132 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 " @@ -8124,7 +8629,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3924 +#: user-manual.txt:4137 #, no-wrap msgid "" "\thcitool -i hci0 scanning\n" @@ -8134,82 +8639,82 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3926 +#: user-manual.txt:4139 msgid "Once ther dive computer is pired, set up the RFCOMM connection" msgstr "" #. type: Title ===== -#: user-manual.txt:3927 +#: user-manual.txt:4140 #, no-wrap msgid "Establishing the RFCOMM connection" msgstr "" #. type: Plain text -#: user-manual.txt:3930 +#: user-manual.txt:4143 msgid "The command to establish an RFCOMM connection is:" msgstr "" #. type: Plain text -#: user-manual.txt:3932 +#: user-manual.txt:4145 msgid "+sudo rfcomm -i <controller> connect <dev> <bdaddr> [channel]+" msgstr "" #. type: Plain text -#: user-manual.txt:3934 +#: user-manual.txt:4147 msgid "+<controller>+ is the Bluetooth controller, +hci0+." msgstr "" #. type: Plain text -#: user-manual.txt:3935 +#: user-manual.txt:4148 msgid "+<dev>+ is the RFCOMM device file, +rfcomm0+" msgstr "" #. type: Plain text -#: user-manual.txt:3936 +#: user-manual.txt:4149 msgid "+<bdaddr>+ is the dive computer's MAC address, +00:11:22:33:44:55+" msgstr "" #. type: Plain text -#: user-manual.txt:3937 +#: user-manual.txt:4150 msgid "+[channel]+ is the dive computer's Bluetooth channel we need to connect to." msgstr "" #. type: Plain text -#: user-manual.txt:3940 +#: user-manual.txt:4153 msgid "" "If you omit it, channel 1 is assumed. Based on a limited number of user " "reports, the appropriate channel for the dive computer is probably:" msgstr "" #. type: Plain text -#: user-manual.txt:3942 +#: user-manual.txt:4155 msgid "_Shearwater Petrel 1_: channel 1" msgstr "" #. type: Plain text -#: user-manual.txt:3943 +#: user-manual.txt:4156 msgid "_Shearwater Petrel 2_: channel 5" msgstr "" #. type: Plain text -#: user-manual.txt:3944 +#: user-manual.txt:4157 msgid "_Shearwater Nerd_: channel 5" msgstr "" #. type: Plain text -#: user-manual.txt:3945 +#: user-manual.txt:4158 msgid "_Heinrichs-Weikamp OSTC Sport_: channel 1" msgstr "" #. type: Plain text -#: user-manual.txt:3947 +#: user-manual.txt:4160 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:3949 +#: user-manual.txt:4162 #, no-wrap msgid "" "\tsudo rfcomm -i hci0 connect rfcomm0 00:11:22:33:44:55 5 (enter a password, " @@ -8217,12 +8722,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3951 +#: user-manual.txt:4164 msgid "This gives the response:" msgstr "" #. type: Plain text -#: user-manual.txt:3954 +#: user-manual.txt:4167 #, no-wrap msgid "" "\tConnected /dev/rfcomm0 to 00:11:22:33:44:55 on channel 5\n" @@ -8230,14 +8735,14 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3956 +#: user-manual.txt:4169 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:3960 +#: user-manual.txt:4173 #, no-wrap msgid "" "\tsudo rfcomm -i hci0 connect rfcomm0 00:11:22:33:44:55 (enter a password, " @@ -8247,7 +8752,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3964 +#: user-manual.txt:4177 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 " @@ -8256,7 +8761,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3974 +#: user-manual.txt:4187 #, no-wrap msgid "" "\tsdptool -i hci0 records 00:11:22:33:44:55\n" @@ -8271,7 +8776,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3977 +#: user-manual.txt:4190 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 " @@ -8279,7 +8784,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3980 +#: user-manual.txt:4193 msgid "" "After establishing the RFCOMM connection and while the dive computer's " "upload mode countdown is still running, go to_Subsurface_, select " @@ -8289,25 +8794,25 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:3986 +#: user-manual.txt:4199 #, no-wrap msgid "APPENDIX B: Dive Computer specific information for importing dive data." msgstr "" #. type: Title === -#: user-manual.txt:3989 +#: user-manual.txt:4202 #, no-wrap msgid "Importing from Uemis Zurich" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:3991 +#: user-manual.txt:4204 #, no-wrap msgid "images/icons/iumis.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4007 +#: user-manual.txt:4220 msgid "" "_Subsurface_ downloads the information stored on the SDA (the built-in file " "system of the Uemis) including information about dive spots and " @@ -8324,7 +8829,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4022 +#: user-manual.txt:4235 msgid "" "After selecting the above device name, download the dives from the Uemis " "Zurich. One technical issue with the Uemis Zurich download implementation " @@ -8341,19 +8846,19 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4024 +#: user-manual.txt:4237 #, no-wrap msgid "Importing from Uwatec Galileo" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4026 +#: user-manual.txt:4239 #, no-wrap msgid "images/icons/Galileo.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4041 +#: user-manual.txt:4254 msgid "" "The Uwatec Galileo dive computers use infra red (IrDA) communication between " "the dive computer and Subsurface. The Uwatec hardware uses a USB dongle " @@ -8369,14 +8874,14 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4044 +#: user-manual.txt:4257 msgid "" "After executing this command, Subsurface will recognize the Galileo dive " "computer and download dive information." msgstr "" #. type: Plain text -#: user-manual.txt:4050 +#: user-manual.txt:4263 msgid "" "Under Windows, a similar situation exists. Drivers for the MCS7780 are " "available from some Internet web sites e.g. " @@ -8387,26 +8892,26 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4053 +#: user-manual.txt:4266 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:4055 +#: user-manual.txt:4268 #, no-wrap msgid "Importing from Heinrichs Weikamp DR5" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4057 +#: user-manual.txt:4270 #, no-wrap msgid "images/icons/HW_DR5.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4067 +#: user-manual.txt:4280 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. " @@ -8419,19 +8924,19 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4070 +#: user-manual.txt:4283 #, no-wrap msgid "Importing from xDEEP BLACK" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4072 +#: user-manual.txt:4285 #, no-wrap msgid "images/icons/HW_xdeepblack.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4081 +#: user-manual.txt:4294 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 " @@ -8445,19 +8950,19 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4083 +#: user-manual.txt:4296 #, no-wrap msgid "Importing from Shearwater Predator/Petrel/Nerd using Bluetooth" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4085 +#: user-manual.txt:4298 #, no-wrap msgid "images/icons/predator.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4088 +#: user-manual.txt:4301 msgid "" "Specific instructions for downloading dives using Bluetooth are given in the " "section above, <<S_Bluetooth,_Connecting Subsurface to a Bluetooth-enabled " @@ -8465,19 +8970,19 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4090 +#: user-manual.txt:4303 #, no-wrap msgid "Importing from Poseidon MkVI Discovery" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4092 +#: user-manual.txt:4305 #, no-wrap msgid "images/MkVI.jpeg" msgstr "" #. type: Plain text -#: user-manual.txt:4100 +#: user-manual.txt:4313 msgid "" "Download of dive logs from the MkVI is performed using a custom " "communications adapter and the _Poseidon PC Configuration Software_, " @@ -8489,45 +8994,45 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4103 +#: user-manual.txt:4316 msgid "" "Setup configuration for the dive and key dive parameters (file with a .txt " "extension)" msgstr "" #. type: Plain text -#: user-manual.txt:4104 +#: user-manual.txt:4317 msgid "Dive log details (file with a .csv extension)" msgstr "" #. type: Plain text -#: user-manual.txt:4106 +#: user-manual.txt:4319 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:4108 +#: user-manual.txt:4321 msgid "" "_Subsurface_ accesses the .txt and the .csv files to get dive log " "information." msgstr "" #. type: Title === -#: user-manual.txt:4110 +#: user-manual.txt:4323 #, no-wrap msgid "Importing from APD Inspiration/Evolution CCR" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4112 +#: user-manual.txt:4325 #, no-wrap msgid "images/APDComputer.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4120 +#: user-manual.txt:4333 msgid "" "The dive logs of an APD Inspiration or similar CCR dive computer are " "downloaded using a communications adapter and _AP Communicator_, obtained " @@ -8539,55 +9044,55 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4122 +#: user-manual.txt:4335 msgid "Download the dive using _AP Communicator_." msgstr "" #. type: Plain text -#: user-manual.txt:4123 +#: user-manual.txt:4336 msgid "Open a dive within the _AP Log Viewer_." msgstr "" #. type: Plain text -#: user-manual.txt:4124 +#: user-manual.txt:4337 msgid "Select the tab at the top of the screen, entitled \"_Data_\"." msgstr "" #. type: Plain text -#: user-manual.txt:4125 +#: user-manual.txt:4338 msgid "" "With the raw dive log data show on the screen, click on \"_Copy to " "Clipboard_\"." msgstr "" #. type: Plain text -#: user-manual.txt:4126 +#: user-manual.txt:4339 msgid "Open a text editor, e.g. Notepad (Windows) or TextWrangler (Mac)." msgstr "" #. type: Plain text -#: user-manual.txt:4128 +#: user-manual.txt:4341 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:4129 +#: user-manual.txt:4342 msgid "" "Within _Subsurface_, select _Import -> Import log files_ to open the " "xref:Unified_import[universal import dialogue]." msgstr "" #. type: Plain text -#: user-manual.txt:4130 +#: user-manual.txt:4343 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:4134 +#: user-manual.txt:4347 #, no-wrap msgid "" "On the list of file names select the _.apd_ file created. An import\n" @@ -8597,13 +9102,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:4135 +#: user-manual.txt:4348 #, no-wrap msgid "images/APD_CSVimportF22.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4143 +#: user-manual.txt:4356 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 " @@ -8615,12 +9120,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4144 +#: user-manual.txt:4357 msgid "Click the _Ok_ button at the bottom of the import panel." msgstr "" #. type: Plain text -#: user-manual.txt:4149 +#: user-manual.txt:4362 msgid "" "The APD dive log will appear within _Subsurface_. The dive computer- " "generated ceiling provided by the Inspiration can be viewed by selecting the " @@ -8630,13 +9135,13 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:4150 +#: user-manual.txt:4363 #, no-wrap msgid "APPENDIX C: Exporting Dive log information from external dive log software." msgstr "" #. type: Plain text -#: user-manual.txt:4159 +#: user-manual.txt:4372 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, " @@ -8646,22 +9151,22 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4161 +#: user-manual.txt:4374 msgid "Export the foreign dive log data to format that is accessible from" msgstr "" #. type: Plain text -#: user-manual.txt:4162 +#: user-manual.txt:4375 msgid "_Subsurface_." msgstr "" #. type: Plain text -#: user-manual.txt:4163 +#: user-manual.txt:4376 msgid "Import the accessible dive log data into _Subsurface_." msgstr "" #. type: Plain text -#: user-manual.txt:4167 +#: user-manual.txt:4380 msgid "" "This appendix provides some information about approaches to export dive log " "data from foreign dive log software. The procedures below mostly apply to " @@ -8669,19 +9174,19 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4169 +#: user-manual.txt:4382 #, no-wrap msgid "Exporting from *Suunto Divemanager (DM3, DM4 or DM5)*" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4170 +#: user-manual.txt:4383 #, no-wrap msgid "images/icons/suuntologo.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4177 +#: user-manual.txt:4390 msgid "" "DiveManager is a MS Windows application for Suunto dive computers. " "Divemanager 3 (DM3) is an older version of the Suunto software. More recent " @@ -8691,64 +9196,64 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4179 +#: user-manual.txt:4392 #, no-wrap msgid "*Divemanager 3 (DM3):*\n" msgstr "" #. type: Plain text -#: user-manual.txt:4181 +#: user-manual.txt:4394 msgid "Start 'Suunto Divemanager 3' and log in with the name containing the logs" msgstr "" #. type: Plain text -#: user-manual.txt:4182 +#: user-manual.txt:4395 msgid "Do not start the import wizard to import dives from the dive computer." msgstr "" #. type: Plain text -#: user-manual.txt:4184 +#: user-manual.txt:4397 msgid "" "In the navigation tree on the left side of the program-window, select the " "appropriate dives." msgstr "" #. type: Plain text -#: user-manual.txt:4185 +#: user-manual.txt:4398 msgid "Within the list of dives, select the dives you would like to import later:" msgstr "" #. type: Plain text -#: user-manual.txt:4186 +#: user-manual.txt:4399 msgid "To select certain dives: hold 'ctrl' and click the dive" msgstr "" #. type: Plain text -#: user-manual.txt:4188 +#: user-manual.txt:4401 msgid "" "To select all dives: Select the first dive, hold down shift and select the " "last dive" msgstr "" #. type: Plain text -#: user-manual.txt:4189 +#: user-manual.txt:4402 msgid "With the dives marked, use the program menu _File -> Export_" msgstr "" #. type: Plain text -#: user-manual.txt:4190 +#: user-manual.txt:4403 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:4191 +#: user-manual.txt:4404 msgid "Click the browse button next to the field Export Path" msgstr "" #. type: Plain text -#: user-manual.txt:4193 +#: user-manual.txt:4406 #, no-wrap msgid "" "** A file-manager like window pops up\n" @@ -8756,13 +9261,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4194 +#: user-manual.txt:4407 #, no-wrap msgid "Divelog.SDE file\n" msgstr "" #. type: Plain text -#: user-manual.txt:4196 +#: user-manual.txt:4409 #, no-wrap msgid "" "** Optionally change the name of the file for saving\n" @@ -8770,25 +9275,25 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4197 +#: user-manual.txt:4410 #, no-wrap msgid "Back in the Export pop-up, press the button 'Export'\n" msgstr "" #. type: Plain text -#: user-manual.txt:4198 +#: user-manual.txt:4411 #, no-wrap msgid "The dives are now exported to the file Divelog.SDE.\n" msgstr "" #. type: Plain text -#: user-manual.txt:4200 +#: user-manual.txt:4413 #, no-wrap msgid "*Divemanager 4 (DM4) and Divemanager 5 (DM5):*\n" msgstr "" #. type: Plain text -#: user-manual.txt:4205 +#: user-manual.txt:4418 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 " @@ -8797,81 +9302,81 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4207 +#: user-manual.txt:4420 msgid "Locating the Suunto DM4 (or DM5) database:" msgstr "" #. type: Plain text -#: user-manual.txt:4209 user-manual.txt:4218 +#: user-manual.txt:4422 user-manual.txt:4431 msgid "Start Suunto DM4/DM5" msgstr "" #. type: Plain text -#: user-manual.txt:4210 +#: user-manual.txt:4423 msgid "Select 'Help -> About'" msgstr "" #. type: Plain text -#: user-manual.txt:4211 +#: user-manual.txt:4424 msgid "Click 'Copy' after text 'Copy log folder path to clipboard'" msgstr "" #. type: Plain text -#: user-manual.txt:4212 +#: user-manual.txt:4425 msgid "Open Windows Explorer" msgstr "" #. type: Plain text -#: user-manual.txt:4213 +#: user-manual.txt:4426 msgid "Paste the address to the path box at the top of the File Explorer" msgstr "" #. type: Plain text -#: user-manual.txt:4214 +#: user-manual.txt:4427 msgid "The database is called DM4.db or DM5.db" msgstr "" #. type: Plain text -#: user-manual.txt:4216 +#: user-manual.txt:4429 msgid "Making a backup copy of the Suunto DM4/DM5 database:" msgstr "" #. type: Plain text -#: user-manual.txt:4219 +#: user-manual.txt:4432 msgid "Select 'File - Create backup'" msgstr "" #. type: Plain text -#: user-manual.txt:4221 +#: user-manual.txt:4434 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:4222 +#: user-manual.txt:4435 msgid "Click 'Save'" msgstr "" #. type: Plain text -#: user-manual.txt:4223 +#: user-manual.txt:4436 msgid "The dives are now exported to the file DM4.bak (or DM5.bak)" msgstr "" #. type: Title === -#: user-manual.txt:4225 +#: user-manual.txt:4438 #, no-wrap msgid "Exporting from Atomic Logbook" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4228 +#: user-manual.txt:4441 #, no-wrap msgid "images/icons/atomiclogo.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4235 +#: user-manual.txt:4448 msgid "" "Atomic Logbook is a Windows software by Atomic Aquatics. It allows " "downloading of dive information from Cobalt and Cobalt 2 dive computers. " @@ -8881,19 +9386,19 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4237 +#: user-manual.txt:4450 #, no-wrap msgid "Exporting from Mares Dive Organiser V2.1" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4240 +#: user-manual.txt:4453 #, no-wrap msgid "images/icons/mareslogo.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4248 +#: user-manual.txt:4461 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 " @@ -8904,7 +9409,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4253 +#: user-manual.txt:4466 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 " @@ -8912,36 +9417,36 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4256 +#: user-manual.txt:4469 msgid "" "Rename the file to DiveOrganizerxxxxx.zip. Inside the zipped directory is a " "file _DiveOrganizer.sdf_." msgstr "" #. type: Plain text -#: user-manual.txt:4257 +#: user-manual.txt:4470 msgid "Extract the _.sdf_ file from the zipped folder to your Desktop." msgstr "" #. type: Plain text -#: user-manual.txt:4258 +#: user-manual.txt:4471 msgid "The password for accessing the .zip file is _mares_." msgstr "" #. type: Title === -#: user-manual.txt:4260 +#: user-manual.txt:4473 #, no-wrap msgid "Exporting from *DivingLog 5.0 and 6.0*" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4262 +#: user-manual.txt:4475 #, no-wrap msgid "images/icons/divingloglogo.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4269 +#: user-manual.txt:4482 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 " @@ -8951,37 +9456,37 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4271 +#: user-manual.txt:4484 msgid "To transfer all files from DivingLog to Subsurface:" msgstr "" #. type: Plain text -#: user-manual.txt:4273 +#: user-manual.txt:4486 msgid "In DivingLog open the 'File -> Export -> SQLite' menu" msgstr "" #. type: Plain text -#: user-manual.txt:4274 +#: user-manual.txt:4487 msgid "Select 'Settings' button" msgstr "" #. type: Plain text -#: user-manual.txt:4275 +#: user-manual.txt:4488 msgid "Set the 'RTF2Plaintext' to 'true'" msgstr "" #. type: Plain text -#: user-manual.txt:4276 +#: user-manual.txt:4489 msgid "Close the Settings dialog" msgstr "" #. type: Plain text -#: user-manual.txt:4277 +#: user-manual.txt:4490 msgid "Click 'Export' button and select the filename" msgstr "" #. type: Plain text -#: user-manual.txt:4281 +#: user-manual.txt:4494 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 " @@ -8989,13 +9494,13 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:4282 +#: user-manual.txt:4495 #, no-wrap msgid "APPENDIX D: Exporting a spreadsheet to CSV format" msgstr "" #. type: Plain text -#: user-manual.txt:4292 +#: user-manual.txt:4505 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 " @@ -9007,7 +9512,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4298 +#: user-manual.txt:4511 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 " @@ -9017,40 +9522,40 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4300 +#: user-manual.txt:4513 msgid "Date: use one of the following formats: yyyy-mm-dd, dd.mm.yyyy, mm/dd/yyyy" msgstr "" #. type: Plain text -#: user-manual.txt:4301 +#: user-manual.txt:4514 msgid "Duration: the format should be minutes:seconds." msgstr "" #. type: Plain text -#: user-manual.txt:4302 +#: user-manual.txt:4515 msgid "" "Unit system: only one unit system should be used (no mix of imperial and " "metric units)" msgstr "" #. type: Plain text -#: user-manual.txt:4303 +#: user-manual.txt:4516 msgid "Tags and buddies: values should be separated using a comma." msgstr "" #. type: Plain text -#: user-manual.txt:4304 +#: user-manual.txt:4517 msgid "GPS position: use decimal degrees, e.g. 30.22496 30.821798" msgstr "" #. type: Title === -#: user-manual.txt:4304 +#: user-manual.txt:4517 #, no-wrap msgid "_LibreOffice Calc_ and _OpenOffice Calc_" msgstr "" #. type: Plain text -#: user-manual.txt:4308 +#: user-manual.txt:4521 msgid "" "These are open source spreadsheet applications forming parts of larger open " "source office suite applications. The user interaction with _LibreOffice_ " @@ -9061,13 +9566,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:4309 +#: user-manual.txt:4522 #, no-wrap msgid "images/LOffice_spreadsheetdata.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4312 +#: user-manual.txt:4525 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 " @@ -9075,13 +9580,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:4313 +#: user-manual.txt:4526 #, no-wrap msgid "images/LOffice_save_as_options.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4316 +#: user-manual.txt:4529 msgid "" "After selecting _Save_, select the appropriate field delimiter (choose _Tab_ " "to prevent conflicts with the comma when using this as a decimal point), " @@ -9089,13 +9594,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:4317 +#: user-manual.txt:4530 #, no-wrap msgid "images/LOffice_field_options.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4320 +#: user-manual.txt:4533 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 " @@ -9103,13 +9608,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4321 +#: user-manual.txt:4534 #, no-wrap msgid "Microsoft _Excel_" msgstr "" #. type: Plain text -#: user-manual.txt:4327 +#: user-manual.txt:4540 msgid "" "The field delimiter (called \"_list separator_\" in Microsoft manuals) is " "not accessible from within _Excel_ and needs to be set through the " @@ -9120,19 +9625,19 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4329 +#: user-manual.txt:4542 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:4330 +#: user-manual.txt:4543 msgid "Open the _Regional and Language Options_ dialog box." msgstr "" #. type: Plain text -#: user-manual.txt:4333 +#: user-manual.txt:4546 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 " @@ -9140,48 +9645,48 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4334 +#: user-manual.txt:4547 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:4335 +#: user-manual.txt:4548 msgid "Click _OK_ twice." msgstr "" #. type: Plain text -#: user-manual.txt:4337 +#: user-manual.txt:4550 msgid "Below is an image of the _Control Panel_:" msgstr "" #. type: Target for macro image -#: user-manual.txt:4338 +#: user-manual.txt:4551 #, no-wrap msgid "images/Win_SaveCSV2.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4341 +#: user-manual.txt:4554 msgid "To export the dive log in CSV format:" msgstr "" #. type: Plain text -#: user-manual.txt:4343 +#: user-manual.txt:4556 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:4344 +#: user-manual.txt:4557 #, no-wrap msgid "images/Win_SaveCSV1.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4350 +#: user-manual.txt:4563 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 " @@ -9191,13 +9696,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:4351 +#: user-manual.txt:4564 #, no-wrap msgid "images/Win_SaveCSV3.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4357 +#: user-manual.txt:4570 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 " @@ -9206,13 +9711,13 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:4358 +#: user-manual.txt:4571 #, no-wrap msgid "APPENDIX E: Writing a custom print template" msgstr "" #. type: Plain text -#: user-manual.txt:4363 +#: user-manual.txt:4576 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 " @@ -9221,12 +9726,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4365 +#: user-manual.txt:4578 msgid "Templates are accessed using the print dialogue (see image *B* below)." msgstr "" #. type: Plain text -#: user-manual.txt:4373 +#: user-manual.txt:4586 msgid "" "The buttons under the _Template_ dropdown box lets you _Edit_, _Delete_, " "_Import_ and _Export_ templates (see image *A* above). New or modified " @@ -9238,18 +9743,18 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4375 +#: user-manual.txt:4588 msgid "The Edit Panel has three tabs:" msgstr "" #. type: Target for macro image -#: user-manual.txt:4376 +#: user-manual.txt:4589 #, no-wrap msgid "images/Template1_f22.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4380 +#: user-manual.txt:4593 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 " @@ -9257,7 +9762,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4384 +#: user-manual.txt:4597 msgid "" "The _Colors_ tab (image *B* above) allows editing the colors used for " "printing the dive log. The colors are highly customizable: the _Edit_ " @@ -9266,7 +9771,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4393 +#: user-manual.txt:4606 msgid "" "The _Template_ tab of the Edit Panel (see image below) allows creating a " "template using HTML as well as a few Grantlee programming " @@ -9282,13 +9787,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:4394 +#: user-manual.txt:4607 #, no-wrap msgid "images/Template2_f22.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4399 +#: user-manual.txt:4612 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 " @@ -9297,33 +9802,33 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4401 +#: user-manual.txt:4614 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:4402 +#: user-manual.txt:4615 #, no-wrap msgid "Main dive loop" msgstr "" #. type: Plain text -#: user-manual.txt:4404 +#: user-manual.txt:4617 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:4404 user-manual.txt:4469 user-manual.txt:4486 +#: user-manual.txt:4617 user-manual.txt:4682 user-manual.txt:4699 #, no-wrap msgid "template.html" msgstr "" #. type: delimited block . -#: user-manual.txt:4409 +#: user-manual.txt:4622 #, no-wrap msgid "" "\t{% for dive in dives %}\n" @@ -9332,13 +9837,13 @@ msgid "" msgstr "" #. type: Block title -#: user-manual.txt:4411 user-manual.txt:4474 user-manual.txt:4493 +#: user-manual.txt:4624 user-manual.txt:4687 user-manual.txt:4706 #, no-wrap msgid "output.html" msgstr "" #. type: delimited block . -#: user-manual.txt:4416 +#: user-manual.txt:4629 #, no-wrap msgid "" "\t<h1> 1 </h1>\n" @@ -9347,25 +9852,25 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4419 +#: user-manual.txt:4632 msgid "" "Additional information about _Grantlee_ can be found at " "http://www.grantlee.org/apidox/for_themers.html[here]" msgstr "" #. type: Title === -#: user-manual.txt:4420 +#: user-manual.txt:4633 #, no-wrap msgid "Grantlee exported variables" msgstr "" #. type: Plain text -#: user-manual.txt:4422 +#: user-manual.txt:4635 msgid "Only a subset of the dive data is exported:" msgstr "" #. type: delimited block | -#: user-manual.txt:4451 +#: user-manual.txt:4664 #, no-wrap msgid "" "|*Name*|*Description*\n" @@ -9399,7 +9904,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4455 +#: user-manual.txt:4668 msgid "" "_Subsurface_ also exports *template_options* data. This data must be used as " "_CSS_ values to provide a dynamically editable template. The exported data " @@ -9407,7 +9912,7 @@ msgid "" msgstr "" #. type: delimited block | -#: user-manual.txt:4467 +#: user-manual.txt:4680 #, no-wrap msgid "" "|*Name*|*Description*\n" @@ -9426,26 +9931,26 @@ msgid "" msgstr "" #. type: delimited block . -#: user-manual.txt:4472 +#: user-manual.txt:4685 #, no-wrap msgid "\tborder-width: {{ template_options.borderwidth }}px;\n" msgstr "" #. type: delimited block . -#: user-manual.txt:4477 +#: user-manual.txt:4690 #, no-wrap msgid "\tborder-width: 3px;\n" msgstr "" #. type: Plain text -#: user-manual.txt:4480 +#: user-manual.txt:4693 msgid "" "Another variable that _Subsurface_ exports is *print_options*. This variable " "contains a single member:" msgstr "" #. type: delimited block | -#: user-manual.txt:4483 +#: user-manual.txt:4696 #, no-wrap msgid "" "|*Name*|*Description*\n" @@ -9454,7 +9959,7 @@ msgid "" msgstr "" #. type: delimited block . -#: user-manual.txt:4491 +#: user-manual.txt:4704 #, no-wrap msgid "" "\tbody {\n" @@ -9463,7 +9968,7 @@ msgid "" msgstr "" #. type: delimited block . -#: user-manual.txt:4498 +#: user-manual.txt:4711 #, no-wrap msgid "" "\tbody {\n" @@ -9472,13 +9977,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4500 +#: user-manual.txt:4713 #, no-wrap msgid "Defined CSS selectors" msgstr "" #. type: Plain text -#: user-manual.txt:4503 +#: user-manual.txt:4716 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 " @@ -9486,7 +9991,7 @@ msgid "" msgstr "" #. type: delimited block | -#: user-manual.txt:4510 +#: user-manual.txt:4723 #, no-wrap msgid "" "|*Selector*|*Type*|*Description*\n" @@ -9499,20 +10004,20 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4513 +#: user-manual.txt:4726 msgid "" "Rendering dive profiles is not supported for flow layout templates (when " "data-numberofdives = 0)." msgstr "" #. type: Title === -#: user-manual.txt:4514 +#: user-manual.txt:4727 #, no-wrap msgid "Special attributes" msgstr "" #. type: Plain text -#: user-manual.txt:4518 +#: user-manual.txt:4731 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 " @@ -9520,55 +10025,55 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4520 +#: user-manual.txt:4733 msgid "" "The *data-numberofdives* data attribute is added to the body tag to set the " "rendering mode." msgstr "" #. type: Plain text -#: user-manual.txt:4522 +#: user-manual.txt:4735 msgid "render 6 dives per page:" msgstr "" #. type: delimited block . -#: user-manual.txt:4525 +#: user-manual.txt:4738 #, no-wrap msgid "\t<body data-numberofdives = 6>\n" msgstr "" #. type: Plain text -#: user-manual.txt:4528 +#: user-manual.txt:4741 msgid "render as much dives as possible:" msgstr "" #. type: delimited block . -#: user-manual.txt:4531 +#: user-manual.txt:4744 #, no-wrap msgid "\t<body data-numberofdives = 0>\n" msgstr "" #. type: Plain text -#: user-manual.txt:4534 +#: user-manual.txt:4747 msgid "" "All CSS units should be in relative lengths only, to support printing on any " "page size." msgstr "" #. type: Title == -#: user-manual.txt:4535 +#: user-manual.txt:4748 #, no-wrap msgid "APPENDIX F: FAQs." msgstr "" #. type: Title === -#: user-manual.txt:4537 +#: user-manual.txt:4750 #, no-wrap msgid "Subsurface appears to miscalculate gas consumption and SAC" msgstr "" #. type: Plain text -#: user-manual.txt:4541 +#: user-manual.txt:4754 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_ " @@ -9576,7 +10081,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4547 +#: user-manual.txt:4760 msgid "" "'Answer': Not really. What happens is that _Subsurface_ actually calculates " "gas consumption differently - and better - than you expect. In particular, " @@ -9586,7 +10091,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4553 +#: user-manual.txt:4766 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 " @@ -9596,12 +10101,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4555 +#: user-manual.txt:4768 msgid "+consumption = (amount_of_air_at_beginning - amount_of_air_at_end)+" msgstr "" #. type: Plain text -#: user-manual.txt:4561 +#: user-manual.txt:4774 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 " @@ -9612,12 +10117,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4563 +#: user-manual.txt:4776 msgid "+12.2*((220-100)/1.013)+" msgstr "" #. type: Plain text -#: user-manual.txt:4568 +#: user-manual.txt:4781 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 " @@ -9627,7 +10132,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4574 +#: user-manual.txt:4787 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 " @@ -9638,7 +10143,7 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4575 +#: user-manual.txt:4788 #, no-wrap msgid "" "Some dive profiles have time discrepancies with the recorded samples from my " @@ -9646,7 +10151,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4579 +#: user-manual.txt:4792 msgid "" "_Subsurface_ ends up ignoring surface time for many things (average depth, " "divetime, SAC, etc). 'Question': Why do dive durations in my dive computer " @@ -9654,7 +10159,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4587 +#: user-manual.txt:4800 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 " @@ -9668,13 +10173,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4588 +#: user-manual.txt:4801 #, no-wrap msgid "Some dive profiles are missing from the download" msgstr "" #. type: Plain text -#: user-manual.txt:4602 +#: user-manual.txt:4815 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 " @@ -9689,7 +10194,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4606 +#: user-manual.txt:4819 msgid "" "If you have downloaded your dives to different dive logging software before " "they were overwritten, there is a good chance that Subsurface can import " diff --git a/Documentation/fr/po/subsurface-user-manual.fr.po b/Documentation/fr/po/subsurface-user-manual.fr.po index 035b05778..02ebc68db 100644 --- a/Documentation/fr/po/subsurface-user-manual.fr.po +++ b/Documentation/fr/po/subsurface-user-manual.fr.po @@ -2,13 +2,13 @@ # Copyright (C) 2015 Free Software Foundation, Inc. # This file is distributed under the same license as the PACKAGE package. # -# Guillaume GARDET <guillaume.gardet@free.fr>, 2015, 2016. +# Guillaume GARDET <guillaume.gardet@free.fr>, 2015, 2016, 2017. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: subsurface@subsurface-divelog.org\n" -"POT-Creation-Date: 2016-11-30 13:40+0100\n" -"PO-Revision-Date: 2016-11-30 13:50+0100\n" +"POT-Creation-Date: 2017-01-11 10:42+0100\n" +"PO-Revision-Date: 2017-01-11 10:47+0100\n" "Last-Translator: Guillaume GARDET <guillaume.gardet@opensuse.org>\n" "Language-Team: French <opensuse-fr@opensuse.org>\n" "Language: fr\n" @@ -42,11 +42,13 @@ msgstr "" #. type: Plain text #: user-manual.txt:22 -msgid "[blue]#_Version 4.5, October 2015_#" +#, fuzzy +#| msgid "[blue]#_Version 4.5, October 2015_#" +msgid "[blue]#_Version 4.6, January 2017_#" msgstr "[blue]#_Version 4.5, Octobre 2015_#" #. type: Plain text -#: user-manual.txt:28 +#: user-manual.txt:27 msgid "" "Welcome as a user of _Subsurface_, an advanced dive logging program with " "extensive infrastructure to describe, organize, interpret and print scuba " @@ -60,7 +62,7 @@ msgstr "" "rapport à d'autres solutions logicielles similaires :" #. type: Plain text -#: user-manual.txt:31 +#: user-manual.txt:30 msgid "" "Do you need a flexible way of logging dives using recreational equipment, " "even without a dive computer?" @@ -69,6 +71,15 @@ msgstr "" "équipements loisirs, même sans utiliser d'ordinateur de plongée ?" #. type: Plain text +#: user-manual.txt:31 +msgid "" +"Do you wish to seamlessly include GPS locations of dive sites into your dive " +"log?" +msgstr "" +"Souhaitez-vous inclure facilement les positions GPS des sites de plongées " +"dans votre carnet de plongée ?" + +#. type: Plain text #: user-manual.txt:37 msgid "" "Do you use two different dive computer brands, each with its own proprietary " @@ -91,26 +102,27 @@ msgstr "" #: user-manual.txt:40 msgid "" "Do you use more than one operating system? _Subsurface_ is fully compatible " -"with Mac, Linux and Windows, letting you access your dive log on each " -"operating system using a single application." +"with Mac, Linux and Windows, letting you access your dive log on a range of " +"operating systems using a single application." msgstr "" "Utilisez-vous plus d'un système d'exploitation ? _Subsurface_ est " "intégralement compatible avec Mac, Linux et Windows, ce qui vous permet " -"d'accéder à vos enregistrements de plongées sur chaque système " -"d'exploitation en utilisant une application unique." +"d'accéder à votre carnet de plongées sur chaque système d'exploitation en " +"utilisant une application unique." #. type: Plain text #: user-manual.txt:43 msgid "" -"Do you use Linux or Mac, but your dive computer has only Windows- based " -"software for downloading dive information (e.g. Mares)? _Subsurface_ " -"provides a way of downloading and analyzing your dive logs on other " -"operating systems." +"Do you use Linux or Mac, but your dive computer has only Windows-based " +"software for downloading dive information (e.g. Mares or Scubapro)? " +"_Subsurface_ provides a way of downloading and analyzing your dive logs on " +"other operating systems." msgstr "" "Utilisez-vous Linux ou Mac mais votre ordinateur de plongée n'a que des " "logiciels pour Windows pour télécharger les informations de plongées (par " -"exemple Mares) ? _Subsurface_ fournit un moyen de télécharger et d'analyser " -"vos enregistrements de plongées sur d'autres systèmes d'exploitation." +"exemple Mares ou scubapro) ? _Subsurface_ fournit un moyen de télécharger et " +"d'analyser vos enregistrements de plongées sur d'autres systèmes " +"d'exploitation." #. type: Plain text #: user-manual.txt:45 @@ -122,33 +134,51 @@ msgstr "" "intègre et prend en compte les plongées qui ont déjà été enregistrées ?" #. type: Plain text -#: user-manual.txt:51 +#: user-manual.txt:47 +#, fuzzy +#| msgid "" +#| "Do you need a way of storing or backing up your dive log on the Internet, " +#| "allowing you to view your dive log from anywhere, using an Internet " +#| "browser?" msgid "" "Do you need a way of storing or backing up your dive log on the Internet, " -"letting you view your dive log from anywhere using an Internet browser? " +"letting you view your dive log from anywhere using an Internet browser?" +msgstr "" +"Avez-vous besoin d'un moyen d'enregistrer ou de sauvegarder votre carnet de " +"plongée sur Internet, Vous permettant de visualiser votre carnet depuis " +"n'importe où, en utilisant un navigateur Internet ?" + +#. type: Plain text +#: user-manual.txt:48 +msgid "Do you wish to access or modify your dive log using a mobile phone?" +msgstr "" +"Souhaitez-vous pouvoir accéder ou modifier votre carnet de plongée en " +"utilisant un smartphone ?" + +#. type: Plain text +#: user-manual.txt:53 +msgid "" "_Subsurface_ binaries are available for Windows PCs (Win XP or later), Intel " "based Macs (OS/X) and many Linux distributions. _Subsurface_ can be built " "for many more hardware platforms and software environments where Qt and " "libdivecomputer are available." msgstr "" -"Avez-vous besoin d'un moyen d'nregistrer et de sauvegarder vos plongées sur " -"Internet, vous permettant de les voir depuis n'importe où en utilisant un " -"navigateur Internet ? _Subsurface_ est disponible pour Windows (Win XP ou " -"plus récent), les Macs basés sur processeurs Intel (OS/X) et de nombreuses " -"distributions Linux. _Subsurface_ peut être compilé pour bien plus de " -"plateformes matérielles et d'environnements logiciels où Qt et " -"libdivecomputer sont disponibles." +"_Subsurface_ est disponible pour Windows (Win XP ou plus récent), les Macs " +"basés sur processeurs Intel (OS/X) et de nombreuses distributions Linux. " +"_Subsurface_ peut être compilé pour bien plus de plateformes matérielles et " +"d'environnements logiciels où Qt et libdivecomputer sont disponibles." #. type: Plain text -#: user-manual.txt:60 +#: user-manual.txt:62 msgid "" "This manual explains how to use the _Subsurface_ program. To install the " "software, consult the _Downloads_ page on the http://subsurface-divelog.org/" "[_Subsurface_ web site]. Please discuss issues with this program by sending " "an email to mailto:subsurface@subsurface-divelog.org[our mailing list] and " -"report bugs at https://github.com/Subsurface-divelog/subsurface/issues[our bugtracker]. For instructions on " -"how to build the software and (if needed) its dependencies please consult " -"the INSTALL file included with the source code." +"report bugs at https://github.com/Subsurface-divelog/subsurface/issues[our " +"bugtracker]. For instructions on how to build the software and (if needed) " +"its dependencies please consult the INSTALL file included with the source " +"code." msgstr "" "Ce manuel explique comment utiliser le programme _Subsurface_. Pour " "installer le logiciel, consultez la page _Téléchargement_ sur le http://" @@ -160,7 +190,7 @@ msgstr "" "dans les sources logicielles." #. type: Plain text -#: user-manual.txt:63 +#: user-manual.txt:65 #, no-wrap msgid "" "*Audience*: Recreational Scuba Divers, Free Divers, Tec Divers, Professional\n" @@ -170,18 +200,18 @@ msgstr "" "professionnels\n" #. type: Plain text -#: user-manual.txt:65 +#: user-manual.txt:67 msgid "toc::[]" msgstr "toc::[]" #. type: Title - -#: user-manual.txt:68 +#: user-manual.txt:70 #, no-wrap msgid "Using this manual" msgstr "Utilisation de ce manuel" #. type: Plain text -#: user-manual.txt:71 +#: user-manual.txt:73 msgid "" "When opened from within _Subsurface_, this manual does not have external " "controls for paging or selecting previous pages. However, two facilities are " @@ -189,7 +219,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:78 +#: user-manual.txt:80 msgid "" "The _SEARCH_ function is activated by pressing control-F or command-F on the " "keyboard. A text box appears at the bottom right-hand of the window (see " @@ -200,13 +230,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:79 +#: user-manual.txt:81 #, no-wrap msgid "images/UserManualSearch.jpg" msgstr "images/UserManualSearch.jpg" #. type: Plain text -#: user-manual.txt:91 +#: user-manual.txt:93 msgid "" "_PREVIOUS/NEXT LINK_. Move between links (underlined words that jump to " "specific sections in the user manual) by right-clicking on the text of the " @@ -219,19 +249,19 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:92 +#: user-manual.txt:94 #, no-wrap msgid "images/UserManualLinksBack.jpg" msgstr "images/UserManualLinksBack.jpg" #. type: Title - -#: user-manual.txt:97 +#: user-manual.txt:99 #, no-wrap msgid "The user survey" msgstr "Le sondage utilisateur" #. type: Plain text -#: user-manual.txt:108 +#: user-manual.txt:110 msgid "" "In order to develop _Subsurface_ to serve its users in the best possible " "way, it’s important to have user information. Upon launching _Subsurface_ " @@ -261,13 +291,13 @@ msgstr "" "survey_ sur la ligne de commande." #. type: Title - -#: user-manual.txt:111 +#: user-manual.txt:113 #, no-wrap msgid "Start Using the Program" msgstr "Commencer à utiliser le programme" #. type: Plain text -#: user-manual.txt:116 +#: user-manual.txt:118 msgid "" "The _Subsurface_ window is usually divided into four panels with a *Main " "Menu* (File Import Log View Help) at the top of the window (for Windows and " @@ -280,7 +310,7 @@ msgstr "" "quatre panneaux sont :" #. type: Plain text -#: user-manual.txt:122 +#: user-manual.txt:124 msgid "" "The *Dive List* on the bottom left, showing all the dives in the user's dive " "log. A dive can be selected and highlighted on the dive list by clicking on " @@ -295,7 +325,7 @@ msgstr "" "manipuler un journal (carnet) de plongée." #. type: Plain text -#: user-manual.txt:126 +#: user-manual.txt:128 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*. " @@ -307,7 +337,7 @@ msgstr "" "peut être augmentée ou réduite." #. type: Plain text -#: user-manual.txt:130 +#: user-manual.txt:132 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 " @@ -319,7 +349,7 @@ msgstr "" "en surbrillance." #. type: Plain text -#: user-manual.txt:134 +#: user-manual.txt:136 msgid "" "The *Dive Profile* on the top right, showing a graphical dive profile of the " "selected dive in the *Dive List*. You can zoom into the dive profile for a " @@ -330,7 +360,7 @@ msgstr "" "pouvez zoomer sur le profil de plongée pour une vue plus détaillée." #. type: Plain text -#: user-manual.txt:138 +#: user-manual.txt:140 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 " @@ -343,7 +373,7 @@ msgstr "" "positions." #. type: Plain text -#: user-manual.txt:146 +#: user-manual.txt:148 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 " @@ -364,13 +394,13 @@ msgstr "" "plongées sélectionnées)." #. type: Target for macro image -#: user-manual.txt:149 +#: user-manual.txt:151 #, no-wrap msgid "images/main_window_f22.jpg" msgstr "images/main_window_f22.jpg" #. type: Plain text -#: user-manual.txt:153 +#: user-manual.txt:155 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:" @@ -380,25 +410,25 @@ msgstr "" "permet plusieurs choix d'affichage :" #. type: Plain text -#: user-manual.txt:155 +#: user-manual.txt:157 #, no-wrap msgid "*All*: show all four of the panels as in the screenshot above.\n" msgstr "*Tout* : affiche les quatre panneaux tels que sur la capture d'écran ci-dessus.\n" #. type: Plain text -#: user-manual.txt:157 +#: user-manual.txt:159 #, no-wrap msgid "*Divelist*: Show only the Dive List.\n" msgstr "*Liste des plongées* : affiche uniquement la liste des plongées.\n" #. type: Plain text -#: user-manual.txt:159 +#: user-manual.txt:161 #, no-wrap msgid "*Profile*: Show only the Dive Profile of the selected dive.\n" msgstr "*Profil* : affiche uniquement le profile de plongée de la plongée sélectionnée.\n" #. type: Plain text -#: user-manual.txt:162 +#: user-manual.txt:164 #, no-wrap msgid "" "*Info*: Show only the Notes about the last selected dive and statistics for\n" @@ -408,13 +438,13 @@ msgstr "" "toutes les plongées mises en surbrillance.\n" #. type: Plain text -#: user-manual.txt:164 +#: user-manual.txt:166 #, no-wrap msgid "*Globe*: Show only the world map, centered on the last selected dive.\n" msgstr "*Globe* : affiche uniquement la carte mondiale, centrée sur la dernière plongée sélectionnée.\n" #. type: Plain text -#: user-manual.txt:170 +#: user-manual.txt:172 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 " @@ -431,7 +461,7 @@ msgstr "" "et ne sont donc pas détaillées ici." #. type: Plain text -#: user-manual.txt:174 +#: user-manual.txt:176 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 " @@ -443,13 +473,13 @@ msgstr "" "sera détaillée." #. type: Title - -#: user-manual.txt:177 +#: user-manual.txt:179 #, no-wrap msgid "Creating a new logbook" msgstr "Créer un nouveau carnet de plongée" #. type: Plain text -#: user-manual.txt:182 +#: user-manual.txt:184 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 " @@ -463,13 +493,13 @@ msgstr "" "faut les enregistrer ou non avant de créer le nouveau carnet." #. type: Title == -#: user-manual.txt:184 +#: user-manual.txt:186 #, no-wrap msgid "Storing dive information in the logbook" msgstr "Enregistrement des informations de plongée dans le carnet" #. type: Plain text -#: user-manual.txt:187 +#: user-manual.txt:189 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." @@ -479,14 +509,14 @@ msgstr "" "données de plongée au carnet." #. type: Plain text -#: user-manual.txt:189 +#: user-manual.txt:191 msgid "If the user has a handwritten divelog, a spreadsheet or another form of" msgstr "" "Si l'utilisateur possède un carnet manuscrit, un tableur ou une autre forme " "de " #. type: Plain text -#: user-manual.txt:191 +#: user-manual.txt:193 msgid "" "manually maintained divelog, dive data can be added to the logbook using one " "of these approaches:" @@ -495,14 +525,14 @@ msgstr "" "au carnet en utilisant une des approches suivantes :" #. type: Plain text -#: user-manual.txt:193 +#: user-manual.txt:195 msgid "Enter dive information by hand. This is useful if the diver didn’t" msgstr "" "Entrer les informations de plongée à la main. Cela est utile si le plongeur " "n'a pas" #. type: Plain text -#: user-manual.txt:195 +#: user-manual.txt:197 msgid "" "use a dive computer and dives were recorded in a written logbook. See: xref:" "S_EnterData[Entering dive information by hand]" @@ -512,7 +542,7 @@ msgstr "" "à la main]" #. type: Plain text -#: user-manual.txt:197 +#: user-manual.txt:199 msgid "" "Import dive log information that has been maintained either as a spreadsheet" msgstr "" @@ -520,7 +550,7 @@ msgstr "" "tableur" #. type: Plain text -#: user-manual.txt:199 +#: user-manual.txt:201 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 " @@ -531,7 +561,7 @@ msgstr "" "S_ImportingCSVDives[Importer des plongées au format CSV]." #. type: Plain text -#: user-manual.txt:203 +#: user-manual.txt:205 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 " @@ -542,7 +572,7 @@ msgstr "" "obtenues. Ces plongées peuvent être importées à partir de :" #. type: Plain text -#: user-manual.txt:205 +#: user-manual.txt:207 msgid "" "The dive computer itself. See: xref:S_ImportDiveComputer[Importing new dive " "information from a Dive Computer];" @@ -551,7 +581,7 @@ msgstr "" "de nouvelles informations de plongée à partir de l'ordinateur de plongée];" #. type: Plain text -#: user-manual.txt:206 +#: user-manual.txt:208 msgid "" "Proprietary software distributed by manufacturers of dive computers. Refer" msgstr "" @@ -559,7 +589,7 @@ msgstr "" "Voir" #. type: Plain text -#: user-manual.txt:207 +#: user-manual.txt:209 msgid "" "to: xref:S_ImportingAlienDiveLogs[Importing dive information from other " "digital data sources or other data formats]." @@ -568,12 +598,12 @@ msgstr "" "sources de données numériques ou d'autres formats de données]." #. type: Plain text -#: user-manual.txt:208 +#: user-manual.txt:210 msgid "Spreadsheet or CSV files containing dive profiles." msgstr "Tableur ou de fichiers CSV contenant les profils de plongées." #. type: Plain text -#: user-manual.txt:209 +#: user-manual.txt:211 msgid "" "See: xref:S_ImportingCSVDives[Importing dives in CSV format from dive " "computers or other dive log software]" @@ -582,13 +612,13 @@ msgstr "" "des ordinateurs de plongées ou d'autres logiciels de carnet de plongée]" #. type: Title === -#: user-manual.txt:212 +#: user-manual.txt:214 #, no-wrap msgid "Entering dive information by hand" msgstr "Entrer les informations de plongée à la main" #. type: Plain text -#: user-manual.txt:227 +#: user-manual.txt:229 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 " @@ -605,13 +635,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:228 +#: user-manual.txt:230 #, no-wrap msgid "images/AddDive1_f22.jpg" msgstr "images/AddDive1_f22.jpg" #. type: Plain text -#: user-manual.txt:232 +#: user-manual.txt:234 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 " @@ -620,13 +650,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:233 user-manual.txt:787 +#: user-manual.txt:235 user-manual.txt:801 #, no-wrap msgid "images/BlueEditBar_f22.jpg" msgstr "images/BlueEditBar_f22.jpg" #. type: Plain text -#: user-manual.txt:242 +#: user-manual.txt:244 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_, " @@ -640,13 +670,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:244 +#: user-manual.txt:246 #, no-wrap msgid "Creating a Dive Profile" msgstr "" #. type: Plain text -#: user-manual.txt:251 +#: user-manual.txt:253 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 " @@ -656,13 +686,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:252 +#: user-manual.txt:254 #, no-wrap msgid "images/DiveProfile1_f20.jpg" msgstr "images/DiveProfile1_f20.jpg" #. type: Plain text -#: user-manual.txt:270 +#: user-manual.txt:272 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. " @@ -680,13 +710,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:271 +#: user-manual.txt:273 #, no-wrap msgid "images/DiveProfile2_f20.jpg" msgstr "images/DiveProfile2_f20.jpg" #. type: Plain text -#: user-manual.txt:283 +#: user-manual.txt:285 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 " @@ -700,13 +730,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:284 +#: user-manual.txt:286 #, no-wrap msgid "images/DiveProfile3_f20.jpg" msgstr "images/DiveProfile3_f20.jpg" #. type: Plain text -#: user-manual.txt:291 +#: user-manual.txt:293 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 " @@ -715,19 +745,19 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:292 +#: user-manual.txt:294 #, no-wrap msgid "Importing new dive information from a Dive Computer" msgstr "Importer de nouvelles informations de plongée à partir de l'ordinateur de plongée" #. type: Title ==== -#: user-manual.txt:294 +#: user-manual.txt:296 #, no-wrap msgid "Connecting and importing data from a dive computer." msgstr "" #. type: Plain text -#: user-manual.txt:304 +#: user-manual.txt:306 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, " @@ -739,13 +769,14 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:305 user-manual.txt:661 user-manual.txt:3216 +#: user-manual.txt:307 user-manual.txt:675 user-manual.txt:1098 +#: user-manual.txt:3383 #, no-wrap msgid "images/icons/warning2.png" msgstr "images/icons/warning2.png" #. type: Plain text -#: user-manual.txt:315 +#: user-manual.txt:317 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 " @@ -757,7 +788,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:331 +#: user-manual.txt:333 msgid "" "To import dive information from a dive computer to a computer with " "_Subsurface_, the two pieces of equipment must communicate with one " @@ -773,48 +804,48 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:333 +#: user-manual.txt:335 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:335 +#: user-manual.txt:337 msgid "" "The interface cable should be connected to a free USB port (or the Infra-red" msgstr "" #. type: Plain text -#: user-manual.txt:336 +#: user-manual.txt:338 msgid "or Bluetooth connection set up as described later in this manual)" msgstr "" #. type: Plain text -#: user-manual.txt:338 +#: user-manual.txt:340 msgid "The dive computer should be placed into PC Communication mode." msgstr "" #. type: Plain text -#: user-manual.txt:339 +#: user-manual.txt:341 msgid "(Refer to the manual of the specific dive computer)" msgstr "(Se reporter au manuel de l'ordinateur de plongée)" #. type: Plain text -#: user-manual.txt:343 +#: user-manual.txt:345 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:345 +#: user-manual.txt:347 #, no-wrap msgid "images/DC_import_f20.jpg" msgstr "images/DC_import_f20.jpg" #. type: Plain text -#: user-manual.txt:353 +#: user-manual.txt:355 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 " @@ -825,7 +856,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:360 +#: user-manual.txt:362 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, " @@ -835,7 +866,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:371 +#: user-manual.txt:373 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 " @@ -849,7 +880,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:381 +#: user-manual.txt:383 msgid "" "If all the dives on the dive computer need to be downloaded, check the " "checkbox _Force download of all dives_. Normally, _Subsurface_ only " @@ -864,7 +895,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:387 +#: user-manual.txt:389 msgid "" "If the checkbox _Always prefer downloaded dives_ has been checked and, " "during download, dives with identical date-times exist on the dive computer " @@ -873,14 +904,14 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:390 +#: user-manual.txt:392 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:394 +#: user-manual.txt:396 msgid "" "Do *not* check the checkboxes labelled _Save libdivecomputer logfile_ and " "_Save libdivecomputer dumpfile_. These are only used as diagnostic tools " @@ -888,7 +919,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:412 +#: user-manual.txt:414 msgid "" "Then select the _Download_ button. With communication established, you can " "see how the data are retrieved from the dive computer. Depending on the " @@ -909,7 +940,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:416 +#: user-manual.txt:418 msgid "" "If there is a problem in communicating with the dive computer, an error " "message is shown, similar to this text: \"Unable to open /dev/ttyUSB0 Mares " @@ -917,38 +948,38 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:420 +#: user-manual.txt:422 #, no-wrap 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:1152 user-manual.txt:1218 -#: user-manual.txt:1383 user-manual.txt:1458 user-manual.txt:1765 +#: user-manual.txt:422 user-manual.txt:529 user-manual.txt:573 +#: user-manual.txt:586 user-manual.txt:1239 user-manual.txt:1304 +#: user-manual.txt:1468 user-manual.txt:1543 user-manual.txt:1856 #, no-wrap msgid "images/icons/important.png" msgstr "images/icons/important.png" #. type: delimited block * -#: user-manual.txt:423 +#: user-manual.txt:425 msgid "Check the following:" msgstr "" #. type: delimited block * -#: user-manual.txt:426 +#: user-manual.txt:428 msgid "Is the dive computer still in PC-communication or Upload mode?" msgstr "" #. type: delimited block * -#: user-manual.txt:428 +#: user-manual.txt:430 msgid "" "Is the dive computer’s battery fully charged? If not then charge or replace " "it." msgstr "" #. type: delimited block * -#: user-manual.txt:432 +#: user-manual.txt:434 msgid "" "Is the connecting cable faulty? Does the cable work using other software? " "Has it worked before, or is this the first time the cable is being used? Are " @@ -956,7 +987,7 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:437 +#: user-manual.txt:439 msgid "" "Consult xref:" "_appendix_a_operating_system_specific_information_for_importing_dive_information_from_a_dive_computer[Appendix " @@ -964,7 +995,7 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:441 +#: user-manual.txt:443 msgid "" "On Unix-like operating systems, does the user have write permission to the " "USB port? If not, consult xref:" @@ -973,7 +1004,7 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:449 +#: user-manual.txt:451 msgid "" "If the _Subsurface_ computer does not recognize the USB adaptor by showing " "an appropriate device name next to the Mount Point, then there is a " @@ -985,7 +1016,7 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:452 +#: user-manual.txt:454 #, no-wrap msgid "" "\tSave libdivecomputer logfile\n" @@ -993,7 +1024,7 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:458 +#: user-manual.txt:460 #, no-wrap msgid "" "*Important*: These check boxes are only used when problems are encountered\n" @@ -1004,7 +1035,7 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:462 +#: user-manual.txt:464 #, no-wrap msgid "" "*Important:* _After downloading with the above checkboxes\n" @@ -1013,7 +1044,7 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:465 +#: user-manual.txt:467 #, no-wrap msgid "" "\tsubsurface.log\n" @@ -1021,7 +1052,7 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:471 +#: user-manual.txt:473 msgid "" "These files should be send to the _Subsurface_ mail list: " "_subsurface@subsurface-divelog.org_ with a request for the files to be " @@ -1030,19 +1061,19 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:474 +#: user-manual.txt:476 #, no-wrap 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:3782 +#: user-manual.txt:477 user-manual.txt:3995 #, no-wrap msgid "images/icons/bluetooth.jpg" msgstr "images/icons/bluetooth.jpg" #. type: Plain text -#: user-manual.txt:482 +#: user-manual.txt:484 msgid "" "Bluetooth is becoming a more common way of communication between dive " "computers and _Subsurface_, for or instance, the Shearwater Petrel Mk2 and " @@ -1052,30 +1083,30 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:484 +#: user-manual.txt:486 msgid "" "Ensure Bluetooth is activated on the host computer running _Subsurface_." msgstr "" #. type: Plain text -#: user-manual.txt:485 +#: user-manual.txt:487 msgid "Ensure _Subsurface_ sees the Bluetooth adapter on the host computer." msgstr "" #. type: Plain text -#: user-manual.txt:486 +#: user-manual.txt:488 msgid "" "Ensure the Bluetooth-enabled dive computer is Bluetooth-discoverable and in " "PC upload mode." msgstr "" #. type: Plain text -#: user-manual.txt:487 +#: user-manual.txt:489 msgid "Ensure _Subsurface_ is paired with the Bluetooth-enabled dive computer." msgstr "" #. type: Plain text -#: user-manual.txt:491 +#: user-manual.txt:493 msgid "" "Select the Download dialogue by selecting _Import -> Import from dive " "computer_ from the *Main Menu*. After checking the box labelled _\"Choose " @@ -1083,19 +1114,19 @@ msgid "" msgstr "" #. type: Title ===== -#: user-manual.txt:492 +#: user-manual.txt:494 #, no-wrap msgid "On Linux or MacOS:" msgstr "Sur Linux ou MacOS :" #. type: Target for macro image -#: user-manual.txt:494 +#: user-manual.txt:496 #, no-wrap msgid "images/DC_import_Bluetooth.jpg" msgstr "images/DC_import_Bluetooth.jpg" #. type: Plain text -#: user-manual.txt:525 +#: user-manual.txt:527 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 " @@ -1128,7 +1159,7 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:532 +#: user-manual.txt:534 msgid "" "Currently _Subsurface_ does not support Bluetooth pairing with dive " "computers that require a custom PIN code. In order to pair the devices, use " @@ -1136,12 +1167,12 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:534 +#: user-manual.txt:536 msgid "One way to achieve this is to use +bluetoothctl+:" msgstr "" #. type: delimited block * -#: user-manual.txt:545 +#: user-manual.txt:547 #, no-wrap msgid "" "\t$ bluetoothctl\n" @@ -1157,7 +1188,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:551 +#: user-manual.txt:553 msgid "" "After the devices are paired, press the _Save_ button of the dialogue. This " "closes the Bluetooth dialogue. Now select _Download_ in the _Download from " @@ -1166,19 +1197,19 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:552 user-manual.txt:3709 user-manual.txt:3797 +#: user-manual.txt:554 user-manual.txt:3922 user-manual.txt:4010 #, no-wrap msgid "On Windows:" msgstr "Sur Windows :" #. type: Target for macro image -#: user-manual.txt:553 +#: user-manual.txt:555 #, no-wrap msgid "images/DC_import_Bluetooth_Windows.png" msgstr "images/DC_import_Bluetooth_Windows.png" #. type: Plain text -#: user-manual.txt:563 +#: user-manual.txt:565 msgid "" "On _Windows_ platforms the _Local Bluetooth device details section_ on the " "right is not displayed as is the case on the Linux/Mac systems. To start a " @@ -1192,7 +1223,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:570 +#: user-manual.txt:572 msgid "" "The pairing step is checked and done automatically during the download " "process. If the devices have never been paired the system will ask " @@ -1203,7 +1234,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:578 +#: user-manual.txt:580 msgid "" "Currently _Subsurface_ works only with local Bluetooth adapters which use " "Microsoft Bluetooth Stack. If the local device uses _Widcomm_, _Stonestreet " @@ -1213,7 +1244,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:583 +#: user-manual.txt:585 msgid "" "A log message on the bottom left of the _Remote Bluetooth device selection_ " "shows details about the current status of the Bluetooth agent. To select " @@ -1223,7 +1254,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:593 +#: user-manual.txt:595 #, no-wrap msgid "" "*IN CASE OF PROBLEMS*: If the Bluetooth adapter from the _Subsurface_ computer\n" @@ -1235,13 +1266,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:596 +#: user-manual.txt:597 #, no-wrap msgid "Changing the name of a dive computer" msgstr "" #. type: Plain text -#: user-manual.txt:612 +#: user-manual.txt:613 msgid "" "It may be necessary to distinguish between different dive computers used to " "upload dive logs to _Subsurface_. For instance if a buddy’s dive computer is " @@ -1260,13 +1291,35 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:614 +#: user-manual.txt:615 +#, no-wrap +msgid "Uploading data for a specific dive from more than one dive computer" +msgstr "" + +#. type: Plain text +#: user-manual.txt:626 +msgid "" +"Some divers use more than one dive computer at the same time, e.g. during " +"technical diving. If you import the dive profiles from these different dive " +"computers into _Subsurface_, the profiles can be viewed independently. " +"During upload the data from the dive computers are automatically merged into " +"a single dive. The different profiles are presented on the _Profile_ panel " +"with the name of each dive computer indicated at the bottom left. *While " +"the dive is highlighted in the _Dive List_*, switch between the profiles of " +"the different dive computers by using either the left/right arrow keyboard " +"keys or by selecting _View -> Previous DC_ or _View -> Next DC_. The data in " +"the _Notes_ panel are not affected by the specific dive computer that is " +"selected." +msgstr "" + +#. type: Title ==== +#: user-manual.txt:628 #, no-wrap msgid "Updating the dive information imported from the dive computer." msgstr "" #. type: Plain text -#: user-manual.txt:621 +#: user-manual.txt:635 msgid "" "With the uploaded dives in the *Dive List*, the information from the dive " "computer is not complete and more details must be added to have a full " @@ -1275,13 +1328,13 @@ msgid "" msgstr "" #. type: Title ===== -#: user-manual.txt:623 +#: user-manual.txt:637 #, no-wrap msgid "Notes" msgstr "Notes" #. type: Plain text -#: user-manual.txt:628 +#: user-manual.txt:642 msgid "" "To have a more complete dive record, the user needs to add additional " "information by hand. The procedure below is virtually identical for hand-" @@ -1289,7 +1342,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:638 +#: user-manual.txt:652 msgid "" "In some cases, you must provide the date and time of the dive, for example " "when entering a dive by hand or when a dive computer doesn’t provide the " @@ -1302,13 +1355,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:639 +#: user-manual.txt:653 #, no-wrap msgid "images/AddDive3_f22.jpg" msgstr "images/AddDive3_f22.jpg" #. type: Plain text -#: user-manual.txt:648 +#: user-manual.txt:662 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 " @@ -1319,7 +1372,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:658 +#: user-manual.txt:672 #, no-wrap msgid "" "*Air/water temperatures*: Air and water temperatures during the dive are shown\n" @@ -1334,13 +1387,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:661 +#: user-manual.txt:675 #, no-wrap msgid "*Location*:\n" msgstr "" #. type: Plain text -#: user-manual.txt:669 +#: user-manual.txt:683 msgid "" "Dive locations are managed as a *separate* part of the dive log. The dive " "information in the *Notes* and *Equipment* tabs can therefore NOT be edited " @@ -1352,7 +1405,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:687 +#: user-manual.txt:701 msgid "" "Type in the name of the dive site, e.g. \"Tihany, Lake Balaton, Hungary\". " "If several dives are made at the same location, the site information for the " @@ -1372,13 +1425,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:688 +#: user-manual.txt:702 #, no-wrap msgid "images/Locations1_f22.jpg" msgstr "images/Locations1_f22.jpg" #. type: Plain text -#: user-manual.txt:693 +#: user-manual.txt:707 msgid "" "Doubleclick on the new dive site name. A panel appears to enter the " "coordinates and other information about the site (image *B*, above). The " @@ -1387,7 +1440,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:699 +#: user-manual.txt:713 msgid "" "Use the world map in the bottom right hand part of the _Subsurface_ window. " "The map displays an orange bar indicating \"No location data - Move the map " @@ -1396,7 +1449,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:704 +#: user-manual.txt:718 msgid "" "Use eiher the Subsurface-Mobile App or the _Subsurface_ Companion App on an " "Android or iPhone device with GPS and if the dive site coordinates were " @@ -1405,14 +1458,14 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:706 +#: user-manual.txt:720 msgid "" "Enter coordiantes by hand if they are known, using one of four formats with " "latitude followed by longitude:" msgstr "" #. type: Plain text -#: user-manual.txt:711 +#: user-manual.txt:725 msgid "" "ISO 6709 Annex D format e.g. 30°13'28.9\"N 30°49'1.5\"E Degrees and decimal " "minutes, e.g. N30° 13.49760' , E30° 49.30788' Degrees minutes seconds, e.g. " @@ -1420,7 +1473,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:719 +#: user-manual.txt:733 msgid "" "Southern hemisphere latitudes are given with a *S*, e.g. S30°, or with a " "negative value, e.g. -30.22496. Similarly western longitudes are given with " @@ -1432,7 +1485,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:725 +#: user-manual.txt:739 #, no-wrap msgid "" "*Important*: GPS coordinates of a dive site are linked to the location\n" @@ -1443,7 +1496,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:735 +#: user-manual.txt:749 #, no-wrap msgid "" "*Dive site name lookup:* If you typed coordinates into the appropriate\n" @@ -1458,7 +1511,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:740 +#: user-manual.txt:754 msgid "" "Enter any other contextual information about the dive site (Description and " "Notes), then select _Apply Changes_ to save the geolocation for this dive " @@ -1467,7 +1520,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:745 +#: user-manual.txt:759 #, no-wrap msgid "" "*Dive mode*: This is a dropdown box allowing you to choose the type of dive\n" @@ -1477,7 +1530,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:750 +#: user-manual.txt:764 #, no-wrap msgid "" "*Divemaster*: The name of the divemaster or dive guide should be\n" @@ -1487,7 +1540,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:755 +#: user-manual.txt:769 #, no-wrap msgid "" "*Buddy*: In this field, enter the name(s) of the buddy or buddies\n" @@ -1497,7 +1550,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:760 +#: user-manual.txt:774 #, no-wrap msgid "" "*Suit*: Here the type of dive suit used can be entered.\n" @@ -1507,7 +1560,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:763 +#: user-manual.txt:777 #, no-wrap msgid "" "*Rating*: Provide a subjective overall rating of the dive on a\n" @@ -1515,7 +1568,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:766 +#: user-manual.txt:780 #, no-wrap msgid "" "*Visibility*: Provide a rating of visibility during the\n" @@ -1523,7 +1576,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:773 +#: user-manual.txt:787 #, no-wrap msgid "" "*Tags*: Tags that describe the type of dive done can be entered\n" @@ -1535,13 +1588,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:775 +#: user-manual.txt:789 #, no-wrap msgid "*Notes*: Any additional information for the dive can be entered here.\n" msgstr "" #. type: Plain text -#: user-manual.txt:780 +#: user-manual.txt:794 msgid "" "The _Apply changes_ and _Discard changes_ buttons are used to save all the " "information for tabs in the *Info* panel and in the *Dive Profile* panel. " @@ -1551,13 +1604,13 @@ msgid "" msgstr "" #. type: Title ===== -#: user-manual.txt:781 +#: user-manual.txt:795 #, no-wrap msgid "Equipment" msgstr "" #. type: Plain text -#: user-manual.txt:786 +#: user-manual.txt:800 msgid "" "The Equipment tab allow entering information about the type of cylinder and " "gas used, as well as the weights used for the dive. The message in the blue " @@ -1565,7 +1618,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:793 +#: user-manual.txt:807 msgid "" "shows the equipment is being edited. This is a highly interactive part of " "_Subsurface_ and the information on cylinders and gases (entered here) " @@ -1573,7 +1626,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:797 +#: user-manual.txt:811 #, no-wrap msgid "" "*Cylinders*: The cylinder information is entered through a dialogue that looks\n" @@ -1581,13 +1634,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:798 +#: user-manual.txt:812 #, no-wrap msgid "images/DC_gas-dialogue1_f20.jpg" msgstr "images/DC_gas-dialogue1_f20.jpg" #. type: Plain text -#: user-manual.txt:811 +#: user-manual.txt:825 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 " @@ -1603,13 +1656,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:812 +#: user-manual.txt:826 #, no-wrap msgid "images/DC_gas-dialogue2_f20.jpg" msgstr "images/DC_gas-dialogue2_f20.jpg" #. type: Plain text -#: user-manual.txt:819 +#: user-manual.txt:833 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 " @@ -1619,7 +1672,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:823 +#: user-manual.txt:837 msgid "" "Next, indicate the starting pressure and the ending pressure of the " "specified gas during the dive. The unit of pressure (metric/imperial) " @@ -1627,7 +1680,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:834 +#: user-manual.txt:848 msgid "" "Finally, provide the gas mixture used. If air was used, the value of 21% can " "be entered into the oxygen box or this field can be left blank. If nitrox or " @@ -1641,13 +1694,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:835 +#: user-manual.txt:849 #, no-wrap msgid "images/CylinderDataEntry3_f20.jpg" msgstr "images/CylinderDataEntry3_f20.jpg" #. type: Plain text -#: user-manual.txt:841 +#: user-manual.txt:855 #, no-wrap msgid "" "*Weights*: Information about the weight system used can be entered\n" @@ -1657,26 +1710,26 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:842 +#: user-manual.txt:856 #, no-wrap msgid "images/WeightsDataEntry1_f20.jpg" msgstr "images/WeightsDataEntry1_f20.jpg" #. type: Plain text -#: user-manual.txt:846 +#: user-manual.txt:860 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:847 +#: user-manual.txt:861 #, no-wrap msgid "images/WeightsDataEntry2_f20.jpg" msgstr "images/WeightsDataEntry2_f20.jpg" #. type: Plain text -#: user-manual.txt:861 +#: user-manual.txt:875 msgid "" "This can be used to select the type of weight system used during the dive. " "You may start typing in the box to specify a different weighting mechanism " @@ -1691,19 +1744,19 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:862 +#: user-manual.txt:876 #, no-wrap msgid "images/WeightsDataEntry3_f20.jpg" msgstr "images/WeightsDataEntry3_f20.jpg" #. type: Title ==== -#: user-manual.txt:864 +#: user-manual.txt:878 #, no-wrap msgid "Editing several selected dives simultaneously" msgstr "" #. type: Plain text -#: user-manual.txt:880 +#: user-manual.txt:894 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 " @@ -1721,7 +1774,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:890 +#: user-manual.txt:904 msgid "" "Simultaneous editing only works with fields that do not already contain " "information. This means if some fields have been edited for a particular " @@ -1736,7 +1789,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:899 +#: user-manual.txt:913 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 " @@ -1751,13 +1804,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:900 +#: user-manual.txt:915 #, no-wrap msgid "Adding Bookmarks to a dive" msgstr "" #. type: Plain text -#: user-manual.txt:905 +#: user-manual.txt:920 msgid "" "Many divers wish to annotate dives with text that indicate particular " "events, e.g. \"Saw dolphins\", or \"Released surface buoy\". This is easily " @@ -1765,7 +1818,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:909 +#: user-manual.txt:924 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 " @@ -1773,40 +1826,40 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:911 +#: user-manual.txt:926 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:914 +#: user-manual.txt:929 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:917 +#: user-manual.txt:932 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:918 +#: user-manual.txt:933 #, no-wrap msgid "images/Bookmarks.jpg" msgstr "images/Bookmarks.jpg" #. type: Title ==== -#: user-manual.txt:921 +#: user-manual.txt:936 #, no-wrap msgid "Saving the updated dive information" msgstr "" #. type: Plain text -#: user-manual.txt:932 +#: user-manual.txt:947 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 " @@ -1819,13 +1872,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:933 +#: user-manual.txt:948 #, no-wrap msgid "Importing dive information from other digital data sources or other data formats" msgstr "Importer les informations à partir d'autres sources de données numériques ou d'autres formats de données" #. type: Plain text -#: user-manual.txt:956 +#: user-manual.txt:971 msgid "" "Many divers log their dives using the proprietary software provided by the " "manufacturers of their dive computers. _Subsurface_ can import dive logs " @@ -1846,7 +1899,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:966 +#: user-manual.txt:981 msgid "" "If the format of other software is supported natively on Subsurface, select " "either _Import -> Import log files_ or _File -> Open log file_. _Subsurface_ " @@ -1860,13 +1913,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:967 +#: user-manual.txt:982 #, no-wrap msgid "Using the universal import dialogue" msgstr "" #. type: Plain text -#: user-manual.txt:973 +#: user-manual.txt:988 msgid "" "Importing dives from other software is done through a universal interface " "activated by selecting _Import_ from the Main Menu, then clicking on _Import " @@ -1874,13 +1927,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:974 +#: user-manual.txt:989 #, no-wrap msgid "images/Import1_f20.jpg" msgstr "images/Import1_f20.jpg" #. type: Plain text -#: user-manual.txt:979 +#: user-manual.txt:994 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, " @@ -1888,70 +1941,80 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:981 +#: user-manual.txt:996 msgid "" "XML-formatted dive logs (DivingLog 5.0, MacDive and several other dive log " "systems)" msgstr "" #. type: Plain text -#: user-manual.txt:982 +#: user-manual.txt:997 msgid "Cochran dive logs" msgstr "" #. type: Plain text -#: user-manual.txt:983 -msgid "UDDF-formatted dive logs (e.g. Kenozoooid)" +#: user-manual.txt:998 +msgid "UDDF-formatted dive logs (e.g. Kenozooid)" msgstr "" #. type: Plain text -#: user-manual.txt:984 +#: user-manual.txt:999 msgid "UDCF-formatted dive logs" msgstr "" #. type: Plain text -#: user-manual.txt:985 +#: user-manual.txt:1000 msgid "Poseidon MkVI CCR logs" msgstr "" #. type: Plain text -#: user-manual.txt:986 +#: user-manual.txt:1001 msgid "APD Inspiration/Evolution CCR logs" msgstr "" #. type: Plain text -#: user-manual.txt:987 +#: user-manual.txt:1002 msgid "LiquiVision logs" msgstr "" #. type: Plain text -#: user-manual.txt:988 +#: user-manual.txt:1003 msgid "divelogs.de logs" msgstr "" #. type: Plain text -#: user-manual.txt:989 +#: user-manual.txt:1004 msgid "OSTC Tools logs" msgstr "" #. type: Plain text -#: user-manual.txt:990 +#: user-manual.txt:1005 msgid "JDiveLog" msgstr "" #. type: Plain text -#: user-manual.txt:991 +#: user-manual.txt:1006 msgid "Suunto Dive Manager (DM3, DM4, DM5)" msgstr "" #. type: Plain text -#: user-manual.txt:992 +#: user-manual.txt:1007 +msgid "DL7 files used by Diver's Alert network (DAN)" +msgstr "" + +#. type: Plain text +#: user-manual.txt:1008 +msgid "Underwater technologies AV1 dive logs" +msgstr "" + +#. type: Plain text +#: user-manual.txt:1009 msgid "" "CSV (text-based and spreadsheet-based) dive logs, including APD CCR logs" msgstr "" #. type: Plain text -#: user-manual.txt:997 +#: user-manual.txt:1014 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 " @@ -1961,13 +2024,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:998 +#: user-manual.txt:1015 #, no-wrap msgid "Importing from OSTCTools" msgstr "" #. type: Plain text -#: user-manual.txt:1007 +#: user-manual.txt:1024 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 " @@ -1980,7 +2043,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1011 +#: user-manual.txt:1028 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 " @@ -1988,7 +2051,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1016 +#: user-manual.txt:1033 msgid "" "Please remember that OSTCTools is *not* true diving log software, but rather " "a useful set of tools for analysis and management of OSTC devices. Only raw " @@ -1997,13 +2060,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:1018 +#: user-manual.txt:1035 #, no-wrap msgid "Importing from Mares Dive Organizer V2.1" msgstr "" #. type: Plain text -#: user-manual.txt:1025 +#: user-manual.txt:1042 msgid "" "Since Mares uses proprietary Windows software not compatible with multi-" "platform applications, these dive logs cannot be directly imported into " @@ -2013,7 +2076,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1030 +#: user-manual.txt:1047 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 " @@ -2021,7 +2084,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1036 +#: user-manual.txt:1053 msgid "" "Data should then be imported into _www.divelogs.de_. First, create a user " "account in _www.divelogs.de_ and Log into that web site, then select _Import " @@ -2031,20 +2094,171 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1038 +#: user-manual.txt:1055 msgid "" "Finally, import the dives from _divelogs.de_ to _Subsurface_, using the " "instructions below." msgstr "" #. type: Title ==== -#: user-manual.txt:1041 +#: user-manual.txt:1058 +#, no-wrap +msgid "Importing Scubapro _SmartTrak_ divelogs" +msgstr "" + +#. type: Plain text +#: user-manual.txt:1065 +msgid "" +"_SmartTrak_ stores the raw data from a Uwatec/Scubapro dive computer along " +"with a plethora of other data manually added by the user, ranging from dive " +"points to buddies data or DAN survey info. However, this is Microsoft " +"Windows-based propietary software by Uwatec (today Scubapro) using " +"Microsoft Access databases, preventing the integration the importer into the " +"_Subsurface_ core application." +msgstr "" + +#. type: Plain text +#: user-manual.txt:1070 +msgid "" +"A stand alone tool for Linux has been developed to import the _.slg_ files " +"generated by SmartTrak to Subsurface's _.xml_ format. It can be built " +"together with _Subsurface_ for Linux systems. Two dependencies need to be " +"installed in your system before building: _libglib2.0_ and _libmdb2_." +msgstr "" + +#. type: Plain text +#: user-manual.txt:1073 +msgid "" +"Feel free to contact the _Subsurface_ development team on mailto:" +"subsurface@subsurface-divelog.org[our mailing list] for assistance in " +"importing _SmartTrak_ dive logs." +msgstr "" + +#. type: Plain text +#: user-manual.txt:1076 +msgid "" +"Assuming the above dependencies have been installed and the _Subsurface_ " +"source tree is in the directory _~/src/subsurface_, then:" +msgstr "" + +#. type: Title ===== +#: user-manual.txt:1077 +#, no-wrap +msgid "Building _smtk2ssrf_" +msgstr "" + +#. type: Plain text +#: user-manual.txt:1080 +msgid "Move to the source tree directory." +msgstr "" + +#. type: Plain text +#: user-manual.txt:1082 +msgid "" +"Run \" $ ccmake build \" and set SMARTTRAK_IMPORT option to *on* (off by " +"default)." +msgstr "" + +#. type: Plain text +#: user-manual.txt:1083 +msgid "Generate with [c] and save and exit with [g]." +msgstr "" + +#. type: Plain text +#: user-manual.txt:1085 +msgid "" +"Build as you prefer, using the _build.sh_ script (recomended) or moving to " +"build directory and running _make_." +msgstr "" + +#. type: Plain text +#: user-manual.txt:1088 +msgid "" +"After a successful build, there will be an executable named _smtk2ssrf_ in " +"the _subsurface/build_ directory. Copy or move it to a directory in your " +"$PATH, e.g. _~/bin_." +msgstr "" + +#. type: Title ===== +#: user-manual.txt:1089 +#, no-wrap +msgid "Running" +msgstr "" + +#. type: Plain text +#: user-manual.txt:1095 +msgid "" +"_smtk2ssrf_ accepts 0, 2 or more parameters. If it is launched without " +"parameters in a graphical user interface, a simple window opens for choosing " +"the _.slg_ file(s) to import and a destination file to store the " +"_Subsurface_-formatted data into (see image below)." +msgstr "" + +#. type: Target for macro image +#: user-manual.txt:1096 +#, no-wrap +msgid "images/smtk2ssrf.jpg" +msgstr "images/smtk2ssrf.jpg" + +#. type: Plain text +#: user-manual.txt:1103 +msgid "" +"Existing data in the destination file will be erased, so *DO NOT* use a " +"regular subsurface divelog file as a destination: rather, specify a *new* " +"filename as a destination." +msgstr "" + +#. type: Plain text +#: user-manual.txt:1105 +msgid "" +"If launched from a command line with two or more parameters, the format is " +"as follows:" +msgstr "" + +#. type: Plain text +#: user-manual.txt:1107 +#, no-wrap +msgid "\t$ smrtk2ssrf /input/file_1.slg /input/file_2.slg /output/file3.xml\n" +msgstr "" + +#. type: Plain text +#: user-manual.txt:1115 +msgid "" +"where _input_ is the directory containing the .slg file(s) and _output_ is " +"the directory where the _Subsurface_-formatted output is written to. Files " +"_file_1.slg_ and _file_2.slg_ in the _input_ directory are imported and " +"stored in _file3.xml_ in the _output_ directory. Check any warning and error " +"messages in the console or in the graphical window: some may be relevant as " +"support for Galileo family of dive computers is still a work in progress." +msgstr "" + +#. type: Title ===== +#: user-manual.txt:1116 +#, no-wrap +msgid "Merging the imported dives with the existing divelog" +msgstr "" + +#. type: Plain text +#: user-manual.txt:1126 +msgid "" +"Open the new file (generated in the previous steps) using _Subsurface_ and " +"check the dives and data. If everything is fine, close the _.xml_ file and " +"open your regular divelog. Then from the *Main Menu* select _Import -> " +"Import log file_ and choose the _.xml_ file containing the imported dives: " +"these will show in the *Dive List*, time ordered, along with the existing " +"dives. The new dives, although time ordered, will keep the numbering system " +"from _SmartTrak_, so a renumbering action is needed. See the section on xref:" +"S_Renumber[Renumbering the dives] for instructions on this topic." +msgstr "" + +#. type: Title ==== +#: user-manual.txt:1128 #, no-wrap msgid "Importing dives from *divelogs.de*" msgstr "" #. type: Plain text -#: user-manual.txt:1054 +#: user-manual.txt:1141 msgid "" "Importing dive information from _divelogs.de_ is simple, using a single " "dialogue box. The _Import -> Import from Divelogs.de_ option should be " @@ -2058,19 +2272,19 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1055 +#: user-manual.txt:1142 #, no-wrap msgid "images/Divelogs1.jpg" msgstr "images/Divelogs1.jpg" #. type: Title ==== -#: user-manual.txt:1058 +#: user-manual.txt:1145 #, no-wrap msgid "Importing data in CSV format" msgstr "Importer des données au format CSV" #. type: Plain text -#: user-manual.txt:1069 +#: user-manual.txt:1156 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 " @@ -2086,29 +2300,29 @@ msgid "" msgstr "" #. type: Title ===== -#: user-manual.txt:1071 +#: user-manual.txt:1158 #, no-wrap msgid "Importing dives in CSV format from dive computers or other dive log software" msgstr "Importer les plongées au format CSV à partir des ordinateurs de plongées ou d'autres logiciels de carnet de plongée" #. type: Plain text -#: user-manual.txt:1076 -#, no-wrap +#: user-manual.txt:1163 msgid "" -" _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" +"_CSV_ files can be viewed using an ordinary text editor. A _CSV_ file is " +"normally organized into a single line that provides the headers (or _field " +"names_ or _column headings_) of the data columns, followed by the data, one " +"record per line." msgstr "" #. type: Plain text -#: user-manual.txt:1078 +#: user-manual.txt:1165 msgid "" "There are two types of _CSV_ dive logs that can be imported into " "_Subsurface_:" msgstr "" #. type: Plain text -#: user-manual.txt:1084 +#: user-manual.txt:1171 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, " @@ -2119,7 +2333,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1093 +#: user-manual.txt:1180 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 " @@ -2133,14 +2347,14 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1096 +#: user-manual.txt:1183 msgid "" "Before being able to import the _CSV_ data to _Subsurface_ *you need to know " "a few things about the data being imported*:" msgstr "" #. type: Plain text -#: user-manual.txt:1104 +#: user-manual.txt:1191 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 " @@ -2152,7 +2366,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1108 +#: user-manual.txt:1195 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 " @@ -2161,13 +2375,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1110 +#: user-manual.txt:1197 msgid "" "Is the numeric information (e.g. dive depth) in metric or in imperial units?" msgstr "" #. type: Plain text -#: user-manual.txt:1117 +#: user-manual.txt:1204 msgid "" "With this information, importing the data into _Subsurface_ is " "straightforward. Select _Import -> Import Log Files_ from the main menu. In " @@ -2177,13 +2391,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1118 +#: user-manual.txt:1205 #, no-wrap msgid "images/csv_import1_f20.jpg" msgstr "images/csv_import1_f20.jpg" #. type: Plain text -#: user-manual.txt:1129 +#: user-manual.txt:1216 #, no-wrap msgid "" "At the top left, there is a dropdown list containing pre- configured\n" @@ -2198,7 +2412,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1141 +#: user-manual.txt:1228 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 " @@ -2215,13 +2429,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1142 +#: user-manual.txt:1229 #, no-wrap msgid "images/csv_import2_f20.jpg" msgstr "images/csv_import2_f20.jpg" #. type: Plain text -#: user-manual.txt:1148 +#: user-manual.txt:1235 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. " @@ -2230,13 +2444,13 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:1152 +#: user-manual.txt:1239 #, no-wrap msgid "*A Diver's Introduction to _CSV_ Files*\n" msgstr "" #. type: delimited block * -#: user-manual.txt:1166 +#: user-manual.txt:1253 msgid "" "_CSV_ is an abbreviation for a data file format: _Comma-Separated Values_. " "It is a file format that allows you to view or edit information using a text " @@ -2253,7 +2467,7 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:1175 +#: user-manual.txt:1262 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 " @@ -2269,7 +2483,7 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:1181 +#: user-manual.txt:1268 #, no-wrap msgid "" "\tDive site,Dive date,Time,Dive_duration, Dive_depth,Dive buddy\n" @@ -2280,14 +2494,14 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:1183 +#: user-manual.txt:1270 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:1189 +#: user-manual.txt:1276 #, no-wrap msgid "" "\tDive site\tDive date\tTime\tDive_duration\tDive_depth\tDive buddy\n" @@ -2298,7 +2512,7 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:1197 +#: user-manual.txt:1284 msgid "" "It is clear why many people prefer the TAB-delimited format to the comma-" "delimited format. The disadvantage is that you cannot see the TAB " @@ -2312,7 +2526,7 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:1208 +#: user-manual.txt:1295 #, no-wrap msgid "" "\tDive Time (s)\tDepth (m)\tpO₂ - Setpoint (Bar) \tpO₂ - C1 Cell 1 (Bar)\tAmbient temp. (Celsius)\n" @@ -2328,7 +2542,7 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:1214 +#: user-manual.txt:1301 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_ " @@ -2339,7 +2553,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1228 +#: user-manual.txt:1314 msgid "" "But, the _CSV_ import has a couple of caveats. Avoid some special characters " "like ampersand (&), less than (<), greater than (>) and double quotes (\") " @@ -2352,56 +2566,56 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:1230 +#: user-manual.txt:1315 #, no-wrap msgid "Importing Dive coordinates from a mobile device with GPS." msgstr "" #. type: Plain text -#: user-manual.txt:1234 +#: user-manual.txt:1319 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:1237 +#: user-manual.txt:1322 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:1239 +#: user-manual.txt:1324 msgid "" "Uploading the coordinates from the mobile device to the _Subsurface_ " "Internet server." msgstr "" #. type: Plain text -#: user-manual.txt:1242 +#: user-manual.txt:1327 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:1244 +#: user-manual.txt:1329 msgid "_Subsurface has two tools for achieving this:" msgstr "" #. type: Plain text -#: user-manual.txt:1246 +#: user-manual.txt:1331 msgid "The _Subsurface Companion App_ (Android and iOS)." msgstr "" #. type: Plain text -#: user-manual.txt:1248 +#: user-manual.txt:1333 msgid "The _Subsurface-mobile_ app (Android and iOS)" msgstr "" #. type: Plain text -#: user-manual.txt:1257 +#: user-manual.txt:1342 msgid "" "Both of these applications perform the collection of dive site coordinates " "and the synchronisation with dives in the _Subsurface_ dive list. However, " @@ -2415,26 +2629,26 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1259 +#: user-manual.txt:1344 msgid "" "For information on using the _Subsurface Companion App_, click xref:" -"S_iCompanion[_here_]." +"S_Companion[_here_]." msgstr "" #. type: Title ==== -#: user-manual.txt:1260 +#: user-manual.txt:1345 #, no-wrap msgid "Storing and and using GPS locations using _Subsurface-mobile_" msgstr "" #. type: Title ===== -#: user-manual.txt:1262 +#: user-manual.txt:1347 #, no-wrap msgid "Install _Subsurface-mobile_" msgstr "" #. type: Plain text -#: user-manual.txt:1268 +#: user-manual.txt:1353 msgid "" "Find _Subsurface-mobile_ on Google Play and install it on an Android device. " "The app is free. The iOS version is currently experimental. _Subsurface-" @@ -2443,13 +2657,13 @@ msgid "" msgstr "" #. type: Title ===== -#: user-manual.txt:1269 +#: user-manual.txt:1354 #, no-wrap msgid "Create a _Subsurface-mobile_ account" msgstr "" #. type: Plain text -#: user-manual.txt:1277 +#: user-manual.txt:1362 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 " @@ -2461,7 +2675,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1280 +#: user-manual.txt:1365 #, no-wrap msgid "" "*N.B.:* To successfully create a user account, the mobile device must have Internet connectivity,\n" @@ -2469,19 +2683,19 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1281 +#: user-manual.txt:1366 #, no-wrap msgid "images/MobileCredentials.jpg" msgstr "images/MobileCredentials.jpg" #. type: Title ===== -#: user-manual.txt:1284 +#: user-manual.txt:1369 #, no-wrap msgid "Configure auto-collecting of GPS coordinates" msgstr "" #. type: Plain text -#: user-manual.txt:1290 +#: user-manual.txt:1375 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 " @@ -2491,19 +2705,19 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1292 +#: user-manual.txt:1377 msgid "" "_Time threshold._ (minutes). The app will try to get a location every X " "minutes" msgstr "" #. type: Plain text -#: user-manual.txt:1294 +#: user-manual.txt:1379 msgid "_Distance threshold._ (meters). Minimum distance between two locations." msgstr "" #. type: Plain text -#: user-manual.txt:1303 +#: user-manual.txt:1388 #, no-wrap msgid "" "*How are GPS coordinates collected?* Assuming the diver sets 5 minutes and 50\n" @@ -2517,13 +2731,13 @@ msgid "" msgstr "" #. type: Title ===== -#: user-manual.txt:1304 +#: user-manual.txt:1389 #, no-wrap msgid "Activate the automated recording of GPS locations" msgstr "" #. type: Plain text -#: user-manual.txt:1309 +#: user-manual.txt:1394 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 " @@ -2531,32 +2745,32 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1310 +#: user-manual.txt:1395 #, no-wrap msgid "images/MobileMenu.jpg" msgstr "images/MobileMenu.jpg" #. type: Title ===== -#: user-manual.txt:1312 +#: user-manual.txt:1397 #, no-wrap msgid "After the dive, stop the automated recording of GPS locations" msgstr "" #. type: Plain text -#: user-manual.txt:1315 +#: user-manual.txt:1400 msgid "" "Uncheck the check box at the bottom left of the _Subsurface-mobile_ main " "menu." msgstr "" #. type: Title ===== -#: user-manual.txt:1316 +#: user-manual.txt:1401 #, no-wrap msgid "Upload the GPS locations onto the _Subsurface_ Internet server." msgstr "" #. type: Plain text -#: user-manual.txt:1323 +#: user-manual.txt:1408 #, no-wrap msgid "" "*N.B.:* Uploading the GPS locations to the Internet can only take place if the mobile\n" @@ -2567,7 +2781,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1327 +#: user-manual.txt:1412 msgid "" "From the _Subsurface-mobile_ main menu, select _GPS_ -> _Upload GPS data_. " "The locations are uploaded. Check the indicator at the top of the mobile " @@ -2575,13 +2789,13 @@ msgid "" msgstr "" #. type: Title ===== -#: user-manual.txt:1328 +#: user-manual.txt:1413 #, no-wrap msgid "Apply the stored GPS locations to dives on the _Subsurface_ dive list." msgstr "" #. type: Plain text -#: user-manual.txt:1337 +#: user-manual.txt:1422 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 " @@ -2593,7 +2807,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1342 +#: user-manual.txt:1427 msgid "" "The https://subsurface-divelog.org/documentation/subsurface-mobile-user-" "manual[user manual for _Subsurface-mobile_] (accessible from within that " @@ -2602,13 +2816,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:1345 +#: user-manual.txt:1430 #, no-wrap msgid "Importing GPS coordinates with the _Subsurface Companion App_ for mobile phones" msgstr "" #. type: Plain text -#: user-manual.txt:1354 +#: user-manual.txt:1439 #, no-wrap msgid "" "Using the *Subsurface Companion App* on an _Android device_ or\n" @@ -2621,13 +2835,13 @@ msgid "" msgstr "" #. type: Title ===== -#: user-manual.txt:1355 +#: user-manual.txt:1440 #, no-wrap msgid "Create a Companion App account" msgstr "" #. type: Plain text -#: user-manual.txt:1360 +#: user-manual.txt:1445 msgid "" "Register on the http://api.hohndel.org/login/[_Subsurface companion web " "page_]. A confirmation email with instructions and a personal *DIVERID* " @@ -2636,7 +2850,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1365 +#: user-manual.txt:1450 msgid "" "Download the app from https://play.google.com/store/apps/details?id=org." "subsurface[Google Play Store] or from http://f-droid.org/repository/browse/?" @@ -2644,18 +2858,18 @@ msgid "" msgstr "" #. type: Title ===== -#: user-manual.txt:1366 +#: user-manual.txt:1451 #, no-wrap msgid "Using the Subsurface companion app on an Android smartphone" msgstr "" #. type: Plain text -#: user-manual.txt:1369 +#: user-manual.txt:1454 msgid "On first use the app has three options:" msgstr "" #. type: Plain text -#: user-manual.txt:1375 +#: user-manual.txt:1460 msgid "" "_Create a new account._ Equivalent to registering in the _Subsurface_ " "companion page using an Internet browser. You can request a *DIVERID* using " @@ -2665,14 +2879,14 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1378 +#: user-manual.txt:1463 msgid "" "_Retrieve an account._ If you forget your *DIVERID* you will receive an " "email to recover the ID string." msgstr "" #. type: Plain text -#: user-manual.txt:1382 +#: user-manual.txt:1467 msgid "" "_Use an existing account._ You are prompted for your *DIVERID*. The app " "saves this *DIVERID* and doesn’t ask for it again unless you use the " @@ -2680,7 +2894,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1390 +#: user-manual.txt:1475 msgid "" "In the _Subsurface_ main program, the *DIVERID* should also be entered on " "the Default Preferences panel, by selecting _File -> Preferences -> " @@ -2689,13 +2903,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1392 +#: user-manual.txt:1477 #, no-wrap msgid "*Creating new dive locations*\n" msgstr "*Créer de nouveaux emplacements de plongée*\n" #. type: Plain text -#: user-manual.txt:1396 +#: user-manual.txt:1481 msgid "" "Now you are ready to get a dive position and send it to the server. The " "Android display looks like the left hand image (*A*) below, but without any " @@ -2703,21 +2917,21 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1399 +#: user-manual.txt:1484 msgid "" "Touch the + icon at the top right to add a new dive site. A menu with 3 " "options shows:" msgstr "" #. type: Plain text -#: user-manual.txt:1402 +#: user-manual.txt:1487 msgid "" "Current: A prompt for a place name is shown (or a request to activate the " "GPS if it is turned off), after which the current location is saved." msgstr "" #. type: Plain text -#: user-manual.txt:1411 +#: user-manual.txt:1496 msgid "" "Use Map: This option allows you to fix a position by searching a world map. " "A world map is shown (see *B* below). Specify the desired position with a " @@ -2730,13 +2944,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1412 +#: user-manual.txt:1497 #, no-wrap msgid "images/Companion_5.jpg" msgstr "images/Companion_5.jpg" #. type: Plain text -#: user-manual.txt:1419 +#: user-manual.txt:1504 msgid "" "Import local GPX file: The Android device searches for .gpx files and " "located archives will be shown. The selected .gpx file is opened and its " @@ -2745,13 +2959,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1421 +#: user-manual.txt:1506 #, no-wrap msgid "*Dive lists of dive locations*\n" msgstr "" #. type: Plain text -#: user-manual.txt:1428 +#: user-manual.txt:1513 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 " @@ -2762,7 +2976,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1436 +#: user-manual.txt:1521 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 " @@ -2774,13 +2988,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1437 +#: user-manual.txt:1522 #, no-wrap msgid "images/Companion_4.jpg" msgstr "images/Companion_4.jpg" #. type: Plain text -#: user-manual.txt:1443 +#: user-manual.txt:1528 msgid "" "Upon selecting a dive (*not* selecting the check box), the name given to it, " "date/time and GPS coordinates are shown with two options at the top of the " @@ -2788,14 +3002,14 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1445 +#: user-manual.txt:1530 msgid "" "Edit (pencil): Change the text name or other characteristics of the dive " "location." msgstr "" #. type: Plain text -#: user-manual.txt:1450 +#: user-manual.txt:1535 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 " @@ -2803,13 +3017,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1452 +#: user-manual.txt:1537 #, no-wrap msgid "*Uploading dive locations*\n" msgstr "" #. type: Plain text -#: user-manual.txt:1457 +#: user-manual.txt:1542 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 " @@ -2817,50 +3031,50 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1462 +#: user-manual.txt:1547 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:1463 +#: user-manual.txt:1548 #, no-wrap msgid "images/Companion_1.jpg" msgstr "images/Companion_1.jpg" #. type: Plain text -#: user-manual.txt:1468 +#: user-manual.txt:1553 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:1471 +#: user-manual.txt:1556 #, no-wrap msgid "*Settings on the Companion App*\n" msgstr "" #. type: Plain text -#: user-manual.txt:1473 +#: user-manual.txt:1558 msgid "" "Selecting the _Settings_ menu option results in the right hand image above " "(*B*)." msgstr "" #. type: Plain text -#: user-manual.txt:1475 +#: user-manual.txt:1560 msgid "_Server and account_" msgstr "" #. type: Plain text -#: user-manual.txt:1477 +#: user-manual.txt:1562 msgid "_Web-service URL._ This is predefined (http://api.hohndel.org/)" msgstr "" #. type: Plain text -#: user-manual.txt:1480 +#: user-manual.txt:1565 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 " @@ -2868,66 +3082,66 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1482 +#: user-manual.txt:1567 msgid "_Synchronisation_" msgstr "" #. type: Plain text -#: user-manual.txt:1485 +#: user-manual.txt:1570 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:1488 +#: user-manual.txt:1573 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:1490 +#: user-manual.txt:1575 msgid "_Background service_" msgstr "" #. type: Plain text -#: user-manual.txt:1493 +#: user-manual.txt:1578 msgid "" "Instead of entering an unique dive location, you can leave the service " "running in the background, allowing a continuous collection of GPS locations." msgstr "" #. type: Plain text -#: user-manual.txt:1495 +#: user-manual.txt:1580 msgid "The settings below define the behavior of the service:" msgstr "" #. type: Plain text -#: user-manual.txt:1498 +#: user-manual.txt:1583 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:1500 +#: user-manual.txt:1585 msgid "_Min distance._ In meters. Minimum distance between two locations." msgstr "" #. type: Plain text -#: user-manual.txt:1502 +#: user-manual.txt:1587 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:1503 user-manual.txt:1604 user-manual.txt:2018 +#: user-manual.txt:1588 user-manual.txt:1689 user-manual.txt:2108 #, no-wrap msgid "images/icons/info.jpg" msgstr "images/icons/info.jpg" #. type: Plain text -#: user-manual.txt:1513 +#: user-manual.txt:1598 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 " @@ -2940,55 +3154,55 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1515 +#: user-manual.txt:1600 msgid "_Other_" msgstr "" #. type: Plain text -#: user-manual.txt:1518 +#: user-manual.txt:1603 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:1520 +#: user-manual.txt:1605 msgid "_Subsurface website._ A link to the URL of Subsurface web" msgstr "" #. type: Plain text -#: user-manual.txt:1522 +#: user-manual.txt:1607 msgid "_Version._ Displays the current version of the Companion App." msgstr "" #. type: Plain text -#: user-manual.txt:1524 +#: user-manual.txt:1609 msgid "_Search_" msgstr "" #. type: Plain text -#: user-manual.txt:1526 +#: user-manual.txt:1611 msgid "Search the saved dive locations by name or by date and time." msgstr "" #. type: Plain text -#: user-manual.txt:1528 +#: user-manual.txt:1613 msgid "_Start service_" msgstr "" #. type: Plain text -#: user-manual.txt:1530 +#: user-manual.txt:1615 msgid "" "Starts the _background service_ following the previously defined settings." msgstr "" #. type: Plain text -#: user-manual.txt:1532 +#: user-manual.txt:1617 msgid "_Disconnect_" msgstr "" #. type: Plain text -#: user-manual.txt:1539 +#: user-manual.txt:1624 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 " @@ -2998,24 +3212,24 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1541 +#: user-manual.txt:1626 msgid "_Send all locations_" msgstr "" #. type: Plain text -#: user-manual.txt:1543 +#: user-manual.txt:1628 msgid "" "This option sends all locations stored in the Android device to the server." msgstr "" #. type: Title ===== -#: user-manual.txt:1545 +#: user-manual.txt:1630 #, no-wrap msgid "Using the Subsurface companion app on an _iPhone_ to record dive locations" msgstr "" #. type: Plain text -#: user-manual.txt:1550 +#: user-manual.txt:1635 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 " @@ -3023,13 +3237,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1551 +#: user-manual.txt:1636 #, no-wrap msgid "images/iphone.jpg" msgstr "images/iphone.jpg" #. type: Plain text -#: user-manual.txt:1562 +#: user-manual.txt:1647 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 " @@ -3043,7 +3257,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1568 +#: user-manual.txt:1653 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 " @@ -3052,13 +3266,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1571 +#: user-manual.txt:1656 #, no-wrap msgid "*Downloading dive locations to the _Subsurface_ divelog*\n" msgstr "" #. type: Plain text -#: user-manual.txt:1579 +#: user-manual.txt:1664 msgid "" "Download dive(s) from a dive computer or enter them manually into " "_Subsurface_ before obtaining the GPS coordinates from the server. The " @@ -3070,13 +3284,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1580 +#: user-manual.txt:1665 #, no-wrap msgid "images/DownloadGPS.jpg" msgstr "images/DownloadGPS.jpg" #. type: Plain text -#: user-manual.txt:1588 +#: user-manual.txt:1673 msgid "" "Note that the _Apply_ button is now active: selecting it updates the " "locations of the newly entered or uploaded dives in _Subsurface_, i.e. it " @@ -3087,7 +3301,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1595 +#: user-manual.txt:1680 msgid "" "Since _Subsurface_ matches GPS locations from the mobile device and dive " "information from the dive computer based on date-time data, automatic " @@ -3099,7 +3313,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1603 +#: user-manual.txt:1688 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 " @@ -3112,12 +3326,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1607 +#: user-manual.txt:1692 msgid "TIPS:" msgstr "" #. type: Plain text -#: user-manual.txt:1610 +#: user-manual.txt:1695 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 " @@ -3125,14 +3339,14 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1611 +#: user-manual.txt:1696 msgid "" "Right now, these locations are difficult to delete from the server. In some " "situations it" msgstr "" #. type: Plain text -#: user-manual.txt:1614 +#: user-manual.txt:1699 msgid "" "is better to clean up the list on the mobile device before sending the dive " "points to the web server by simply deleting the inappropriate locations. " @@ -3141,7 +3355,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1617 +#: user-manual.txt:1702 msgid "" "It may also be useful to give informative names to the locations sent to the " "web server, or at least to use an informative name in the _Name Template_ " @@ -3150,13 +3364,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:1619 +#: user-manual.txt:1704 #, no-wrap msgid "Adding photographs to dives" msgstr "" #. type: Plain text -#: user-manual.txt:1625 +#: user-manual.txt:1710 msgid "" "Many (if not most) divers take photographs during a dive. _Subsurface_ " "allows the storage and display of photographs for each dive. Photos are " @@ -3165,13 +3379,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:1626 +#: user-manual.txt:1711 #, no-wrap msgid "Loading photos and synchronizing between dive computer and camera" msgstr "" #. type: Plain text -#: user-manual.txt:1632 +#: user-manual.txt:1717 msgid "" "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 " @@ -3181,13 +3395,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1633 +#: user-manual.txt:1718 #, no-wrap msgid "images/LoadImage2_f20.jpg" msgstr "images/LoadImage2_f20.jpg" #. type: Plain text -#: user-manual.txt:1641 +#: user-manual.txt:1726 msgid "" "This brings up the time synchronization dialog, shown below. The time " "synchronization is not perfect between the dive computer used during a dive, " @@ -3198,12 +3412,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1643 +#: user-manual.txt:1728 msgid "_Subsurface_ synchronizes camera with dive computer in three ways:" msgstr "" #. type: Plain text -#: user-manual.txt:1646 +#: user-manual.txt:1731 #, no-wrap msgid "" "*Pro-actively*: Before the dive, ensure synchronization of the dive computer time settings with\n" @@ -3211,7 +3425,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1657 +#: user-manual.txt:1742 #, no-wrap msgid "" "*Manually*: Writing down the exact camera time at the start of a dive allows using the\n" @@ -3228,13 +3442,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1658 +#: user-manual.txt:1743 #, no-wrap msgid "images/LoadImage3b_f23.jpg" msgstr "images/LoadImage3b_f23.jpg" #. type: Plain text -#: user-manual.txt:1676 +#: user-manual.txt:1761 #, no-wrap msgid "" "*By photograph*: There is a very slick way of achieving synchronization, requiring a\n" @@ -3255,13 +3469,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1677 +#: user-manual.txt:1762 #, no-wrap msgid "images/LoadImage3c_f23.jpg" msgstr "images/LoadImage3c_f23.jpg" #. type: Plain text -#: user-manual.txt:1681 +#: user-manual.txt:1766 msgid "" "If the timestamp of a photograph is more than 30 minutes before or after the " "dive, it is not placed on the dive profile (see the red warning in the image " @@ -3272,23 +3486,23 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:1682 +#: user-manual.txt:1767 #, no-wrap msgid "Viewing the photos" msgstr "" #. type: Plain text -#: user-manual.txt:1685 +#: user-manual.txt:1770 msgid "After the images have been loaded, they appear in two places:" msgstr "" #. type: Plain text -#: user-manual.txt:1687 +#: user-manual.txt:1772 msgid "the _Photos_ tab of the *Notes* panel (left part of image below)." msgstr "" #. type: Plain text -#: user-manual.txt:1691 +#: user-manual.txt:1776 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 " @@ -3297,37 +3511,37 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1692 +#: user-manual.txt:1777 #, no-wrap msgid "images/icons/ShowPhotos_f20.png" msgstr "images/icons/ShowPhotos_f20.png" #. type: Plain text -#: user-manual.txt:1695 +#: user-manual.txt:1780 msgid "This results in a profile display as in the image below:" msgstr "" #. type: Target for macro image -#: user-manual.txt:1696 +#: user-manual.txt:1781 #, no-wrap msgid "images/LoadImage4_f20.jpg" msgstr "images/LoadImage4_f20.jpg" #. type: Plain text -#: user-manual.txt:1700 +#: user-manual.txt:1785 msgid "" "Hover the mouse over any of the photo stubs. A thumbnail photo is shown of " "the appropriate photo. See the image below:" msgstr "" #. type: Target for macro image -#: user-manual.txt:1701 +#: user-manual.txt:1786 #, no-wrap msgid "images/LoadImage5_f20.jpg" msgstr "images/LoadImage5_f20.jpg" #. type: Plain text -#: user-manual.txt:1710 +#: user-manual.txt:1795 msgid "" "Clicking on the thumbnail brings up a full size photo overlaid on the " "_Subsurface_ window, allowing a good view of the photographs (see the image " @@ -3338,19 +3552,19 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1711 +#: user-manual.txt:1796 #, no-wrap msgid "images/LoadImage6_f20.jpg" msgstr "images/LoadImage6_f20.jpg" #. type: Title ==== -#: user-manual.txt:1713 +#: user-manual.txt:1798 #, no-wrap msgid "The _Photos_ tab" msgstr "" #. type: Plain text -#: user-manual.txt:1723 +#: user-manual.txt:1808 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 " @@ -3366,13 +3580,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:1724 +#: user-manual.txt:1809 #, no-wrap msgid "Photos on an external hard disk" msgstr "" #. type: Plain text -#: user-manual.txt:1734 +#: user-manual.txt:1819 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 " @@ -3389,13 +3603,33 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:1736 +#: user-manual.txt:1820 +#, no-wrap +msgid "Finding out which dives have associated photos." +msgstr "" + +#. type: Plain text +#: user-manual.txt:1825 +msgid "" +"Inspecting each individual dive in order to determine whether there are " +"associated photos can be time consuming. There is a rapid way of seeing " +"which dives have associated photos and which not: activate the _Photos_ " +"checkbox in the dropdown list obtained by right-clicking on the header bar " +"of the *Divelist*. In the *Divelist*, all dives with associated photographs " +"have an icon indicating whether the photographs were taken during the dive, " +"just before/after the dive or both during and before/after the dive. More " +"information is provided in the section dealing with <<S_Divelist_columns, " +"photo icons on the *Divelist*>>." +msgstr "" + +#. type: Title ==== +#: user-manual.txt:1827 #, no-wrap msgid "Moving photographs among directories, hard disks or computers" msgstr "" #. type: Plain text -#: user-manual.txt:1745 +#: user-manual.txt:1836 #, no-wrap msgid "" "After a photograph has been loaded into _Subsurface_ and associated with a specific dive,\n" @@ -3408,7 +3642,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1749 +#: user-manual.txt:1840 #, no-wrap msgid "" "When a photo is loaded into _Subsurface_, a fingerprint for the image is calculated and stored with the\n" @@ -3417,19 +3651,19 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1751 +#: user-manual.txt:1842 msgid "" "look through a particular directory (and all its subdirectories recursively) " "where photos have been moved to," msgstr "" #. type: Plain text -#: user-manual.txt:1752 +#: user-manual.txt:1843 msgid "calculate fingerprints for all photos in this directory, and" msgstr "" #. type: Plain text -#: user-manual.txt:1755 +#: user-manual.txt:1846 msgid "" "if there is a match between a calculated fingerprint and the one calculated " "when a photo was originally loaded into _Subsurface_ (even if the original " @@ -3438,7 +3672,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1760 +#: user-manual.txt:1851 #, no-wrap msgid "" "This is done by selecting from the Main Menu: _File -> Find moved images_. This brings up a window within\n" @@ -3448,13 +3682,13 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:1765 +#: user-manual.txt:1856 #, no-wrap msgid "*Upgrading legacy photo collections without fingerprints*\n" msgstr "" #. type: delimited block * -#: user-manual.txt:1770 +#: user-manual.txt:1861 msgid "" "_Subsurface_ automatically calculates fingerprints for all images that it " "can access. When manipulating images, ensure that all the images associated " @@ -3462,47 +3696,47 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:1772 +#: user-manual.txt:1863 msgid "" "_Subsurface_ automatically checks and, if necessary, updates the " "fingerprints associated with a single dive if:" msgstr "" #. type: delimited block * -#: user-manual.txt:1774 +#: user-manual.txt:1865 msgid "" "The images associated with that dive are visible as thumbnails on the *Dive " "Profile*." msgstr "" #. type: delimited block * -#: user-manual.txt:1776 +#: user-manual.txt:1867 msgid "" "If you edit anything in the *Notes* panel and save the edits by selecting " "_Apply changes_." msgstr "" #. type: Title === -#: user-manual.txt:1780 +#: user-manual.txt:1870 #, no-wrap msgid "Logging special types of dives" msgstr "" #. type: Plain text -#: user-manual.txt:1783 +#: user-manual.txt:1873 msgid "" "This section gives examples of the versatility of _Subsurface_ as a dive " "logging tool." msgstr "" #. type: Title ==== -#: user-manual.txt:1786 +#: user-manual.txt:1876 #, no-wrap msgid "Multicylinder dives" msgstr "" #. type: Plain text -#: user-manual.txt:1793 +#: user-manual.txt:1883 msgid "" "_Subsurface_ easily handles dives involving more than one cylinder. Multi-" "cylinder diving usually happens (a) if a diver doesn’t have enough gas for " @@ -3514,7 +3748,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1797 +#: user-manual.txt:1887 #, no-wrap msgid "" "*Describe the cylinders used during the dive* This is performed in the *Equipment tab* of\n" @@ -3523,7 +3757,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1803 +#: user-manual.txt:1893 #, no-wrap msgid "" "*Record the times at which the switch from one cylinder to another was done:* This is information\n" @@ -3534,7 +3768,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1811 +#: user-manual.txt:1901 #, no-wrap msgid "" "*Record the cylinder changes on the dive profile*: If the latter option\n" @@ -3547,7 +3781,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1815 +#: user-manual.txt:1905 msgid "" "When this is complete, _Subsurface_ indicates the appropriate use of " "cylinders in the dive profile. Below is a two-cylinder dive, starting off " @@ -3556,19 +3790,19 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1816 +#: user-manual.txt:1906 #, no-wrap msgid "images/multicylinder_dive.jpg" msgstr "images/multicylinder_dive.jpg" #. type: Title ==== -#: user-manual.txt:1818 +#: user-manual.txt:1908 #, no-wrap msgid "Sidemount dives" msgstr "" #. type: Plain text -#: user-manual.txt:1824 +#: user-manual.txt:1914 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 " @@ -3578,7 +3812,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1833 +#: user-manual.txt:1923 #, no-wrap msgid "" "*During the dive, record cylinder switch events*. Since sidemount diving normally involves two\n" @@ -3592,7 +3826,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1836 +#: user-manual.txt:1926 #, no-wrap msgid "" "*Within _Subsurface_ describe the cylinders used during the dive*. The diver needs to provide the\n" @@ -3601,7 +3835,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1846 +#: user-manual.txt:1936 #, no-wrap msgid "" "*Indicate cylinder change events on the _Subsurface_ dive profile*. Once the dive log has been imported\n" @@ -3617,25 +3851,25 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1847 +#: user-manual.txt:1937 #, no-wrap msgid "images/sidemount1.jpg" msgstr "images/sidemount1.jpg" #. type: Title ==== -#: user-manual.txt:1850 +#: user-manual.txt:1940 #, no-wrap msgid "Semi-closed circuit rebreather (SCR) dives" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:1852 +#: user-manual.txt:1942 #, no-wrap msgid "images/halcyon_RB80.jpg" msgstr "images/halcyon_RB80.jpg" #. type: Plain text -#: user-manual.txt:1862 +#: user-manual.txt:1952 msgid "" "Passive semi-closed rebreathers (pSCR) are a technical advance in diving " "equipment that recirculates the breathing gas a diver uses, while removing " @@ -3651,19 +3885,19 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1864 +#: user-manual.txt:1954 msgid "" "To log pSCR dives, no special procedures are required. Use the normal steps " "outlined above:" msgstr "" #. type: Plain text -#: user-manual.txt:1866 +#: user-manual.txt:1956 msgid "Select pSCR in the _Dive Mode_ dropdown list on the *Info* panel." msgstr "" #. type: Plain text -#: user-manual.txt:1870 +#: user-manual.txt:1960 msgid "" "pSCR diving often involves gas changes, requiring an additional cylinder. " "Define all the appropriate cylinders as described above and indicate the " @@ -3672,7 +3906,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1875 +#: user-manual.txt:1965 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 " @@ -3682,25 +3916,25 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1876 +#: user-manual.txt:1966 #, no-wrap msgid "images/pSCR_profile.jpg" msgstr "images/pSCR_profile.jpg" #. type: Title ==== -#: user-manual.txt:1881 +#: user-manual.txt:1971 #, no-wrap msgid "Closed circuit rebreather (CCR) dives" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:1883 +#: user-manual.txt:1973 #, no-wrap msgid "images/APD.jpg" msgstr "images/APD.jpg" #. type: Plain text -#: user-manual.txt:1888 +#: user-manual.txt:1978 msgid "" "Closed system rebreathers use advanced technology to recirculate gas that " "has been breathed. They also do two things to maintain a breathable oxygen " @@ -3708,12 +3942,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1889 +#: user-manual.txt:1979 msgid "remove carbon dioxide from the exhaled gas" msgstr "" #. type: Plain text -#: user-manual.txt:1898 +#: user-manual.txt:1988 msgid "" "regulate the oxygen concentration to remain within safe diving limits. The " "CCR interface of _Subsurface_ is currently experimental and under active " @@ -3727,13 +3961,13 @@ msgid "" msgstr "" #. type: Title ===== -#: user-manual.txt:1899 +#: user-manual.txt:1989 #, no-wrap msgid "Import a CCR dive" msgstr "" #. type: Plain text -#: user-manual.txt:1916 +#: user-manual.txt:2006 msgid "" "See the section dealing with xref:S_ImportingAlienDiveLogs[Importing dive " "information from other digital sources]. CCR dive data are currently " @@ -3756,13 +3990,13 @@ msgid "" msgstr "" #. type: Title ===== -#: user-manual.txt:1917 +#: user-manual.txt:2007 #, no-wrap msgid "Displayed information for a CCR dive" msgstr "" #. type: Plain text -#: user-manual.txt:1927 +#: user-manual.txt:2017 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 " @@ -3776,12 +4010,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1929 +#: user-manual.txt:2019 msgid "For TWO O~2~ sensors the mean value of the two sensors are given." msgstr "" #. type: Plain text -#: user-manual.txt:1933 +#: user-manual.txt:2023 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 " @@ -3790,19 +4024,19 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1935 +#: user-manual.txt:2025 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:1937 +#: user-manual.txt:2027 msgid "The mean pO~2~ of the sensors is indicated with a green line," msgstr "" #. type: Plain text -#: user-manual.txt:1945 +#: user-manual.txt:2035 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 " @@ -3814,13 +4048,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1946 +#: user-manual.txt:2036 #, no-wrap msgid "images/CCR_preferences_f20.jpg" msgstr "images/CCR_preferences_f20.jpg" #. type: Plain text -#: user-manual.txt:1953 +#: user-manual.txt:2043 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 " @@ -3831,13 +4065,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1954 +#: user-manual.txt:2044 #, no-wrap msgid "images/CCR_setpoint_f20.jpg" msgstr "images/CCR_setpoint_f20.jpg" #. type: Plain text -#: user-manual.txt:1958 +#: user-manual.txt:2048 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 " @@ -3845,22 +4079,22 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1960 +#: user-manual.txt:2050 msgid "Sensor 1: grey" msgstr "" #. type: Plain text -#: user-manual.txt:1961 +#: user-manual.txt:2051 msgid "Sensor 2: blue" msgstr "" #. type: Plain text -#: user-manual.txt:1962 +#: user-manual.txt:2052 msgid "Sensor 3: brown" msgstr "" #. type: Plain text -#: user-manual.txt:1966 +#: user-manual.txt:2056 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 " @@ -3868,13 +4102,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1967 +#: user-manual.txt:2057 #, no-wrap msgid "images/CCR_sensor_data_f20.jpg" msgstr "images/CCR_sensor_data_f20.jpg" #. type: Plain text -#: user-manual.txt:1972 +#: user-manual.txt:2062 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, " @@ -3882,7 +4116,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1976 +#: user-manual.txt:2066 msgid "" "_Events_: Several events are logged, e.g. switching the mouthpiece to open " "circuit. These events are indicated by yellow triangles and, if you hover " @@ -3891,7 +4125,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1984 +#: user-manual.txt:2074 msgid "" "_Cylinder pressures_: Some CCR dive computers like the Poseidon MkVI record " "the pressures of the oxygen and diluent cylinders. The pressures of these " @@ -3904,13 +4138,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1985 +#: user-manual.txt:2075 #, no-wrap msgid "images/CCR_dive_profile_f22.jpg" msgstr "images/CCR_dive_profile_f22.jpg" #. type: Plain text -#: user-manual.txt:1990 +#: user-manual.txt:2080 msgid "" "_Equipment-specific information_: Equipment-specific information gathered by " "_Subsurface_ is shown in the xref:S_ExtraDataTab[Extra data tab]. This may " @@ -3918,7 +4152,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1996 +#: user-manual.txt:2086 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 " @@ -3930,13 +4164,13 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:1997 user-manual.txt:2316 +#: user-manual.txt:2087 user-manual.txt:2430 #, no-wrap msgid "images/icons/cceiling.jpg" msgstr "images/icons/cceiling.jpg" #. type: Plain text -#: user-manual.txt:2002 +#: user-manual.txt:2092 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 -> " @@ -3945,13 +4179,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2003 +#: user-manual.txt:2093 #, no-wrap msgid "images/CCR_dive_ceilingF22.jpg" msgstr "images/CCR_dive_ceilingF22.jpg" #. type: Plain text -#: user-manual.txt:2007 +#: user-manual.txt:2097 msgid "" "More equipment-specific information for downloading CCR dive logs for " "Poseidon MkVI and APD equipment can be found in xref:" @@ -3960,19 +4194,19 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:2008 +#: user-manual.txt:2098 #, no-wrap msgid "Obtaining more information about dives entered into the logbook" msgstr "" #. type: Title === -#: user-manual.txt:2010 +#: user-manual.txt:2100 #, no-wrap msgid "The *Info* tab (for individual dives)" msgstr "" #. type: Plain text -#: user-manual.txt:2017 +#: user-manual.txt:2107 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 " @@ -3982,7 +4216,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2024 +#: user-manual.txt:2114 msgid "" "Gas consumption and SAC calculations: _Subsurface_ calculates SAC and Gas " "consumption taking in account gas incompressibility, particularly at tank " @@ -3991,13 +4225,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:2026 +#: user-manual.txt:2116 #, no-wrap msgid "The *Extra Data* tab (usually for individual dives)" msgstr "" #. type: Plain text -#: user-manual.txt:2034 +#: user-manual.txt:2124 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 " @@ -4009,19 +4243,19 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2035 +#: user-manual.txt:2125 #, no-wrap msgid "images/ExtraDataTab_f20.jpg" msgstr "images/ExtraDataTab_f20.jpg" #. type: Title === -#: user-manual.txt:2037 +#: user-manual.txt:2127 #, no-wrap msgid "The *Stats* tab (for groups of dives)" msgstr "" #. type: Plain text -#: user-manual.txt:2048 +#: user-manual.txt:2138 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 " @@ -4034,19 +4268,19 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:2050 +#: user-manual.txt:2140 #, no-wrap msgid "The *Dive Profile*" msgstr "" #. type: Target for macro image -#: user-manual.txt:2052 +#: user-manual.txt:2142 #, no-wrap msgid "images/Profile2.jpg" msgstr "images/Profile2.jpg" #. type: Plain text -#: user-manual.txt:2063 +#: user-manual.txt:2153 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 " @@ -4059,7 +4293,7 @@ msgid "" msgstr "" #. type: delimited block | -#: user-manual.txt:2070 +#: user-manual.txt:2160 #, no-wrap msgid "" "|*Color*|*Descent speed (m/min)*|*Ascent speed (m/min)*\n" @@ -4077,7 +4311,7 @@ msgstr "" "|Vert foncé|< 1.5|< 1.5\n" #. type: Plain text -#: user-manual.txt:2075 +#: user-manual.txt:2165 msgid "" "The profile also includes depth readings for the peaks and troughs in the " "graph. So users should see the depth of the deepest point and other peaks. " @@ -4086,13 +4320,13 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2076 +#: user-manual.txt:2166 #, no-wrap msgid "images/icons/scale.jpg" msgstr "images/icons/scale.jpg" #. type: Plain text -#: user-manual.txt:2081 +#: user-manual.txt:2171 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 " @@ -4101,7 +4335,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2084 +#: user-manual.txt:2174 #, no-wrap msgid "" "*Water temperature* is shown as a blue line with temperature values\n" @@ -4109,13 +4343,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2087 +#: user-manual.txt:2176 #, no-wrap msgid "The *Information Box*" msgstr "" #. type: Plain text -#: user-manual.txt:2096 +#: user-manual.txt:2185 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 " @@ -4128,13 +4362,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2097 +#: user-manual.txt:2186 #, no-wrap msgid "images/InfoBox2.jpg" msgstr "images/InfoBox2.jpg" #. type: Plain text -#: user-manual.txt:2113 +#: user-manual.txt:2202 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 " @@ -4154,13 +4388,13 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2114 +#: user-manual.txt:2203 #, no-wrap msgid "images/icons/MOD.jpg" msgstr "images/icons/MOD.jpg" #. type: Plain text -#: user-manual.txt:2121 +#: user-manual.txt:2210 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. " @@ -4172,13 +4406,13 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2122 +#: user-manual.txt:2211 #, no-wrap msgid "images/icons/NDL.jpg" msgstr "images/icons/NDL.jpg" #. type: Plain text -#: user-manual.txt:2134 +#: user-manual.txt:2223 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 " @@ -4194,13 +4428,13 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2135 +#: user-manual.txt:2224 #, no-wrap msgid "images/icons/SAC.jpg" msgstr "images/icons/SAC.jpg" #. type: Plain text -#: user-manual.txt:2143 +#: user-manual.txt:2232 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 " @@ -4212,13 +4446,13 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2144 +#: user-manual.txt:2233 #, no-wrap msgid "images/icons/EAD.jpg" msgstr "images/icons/EAD.jpg" #. type: Plain text -#: user-manual.txt:2159 +#: user-manual.txt:2248 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 " @@ -4234,20 +4468,20 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2161 +#: user-manual.txt:2250 msgid "" "Figure (*B*) above shows an information box with a nearly complete set of " "data." msgstr "" #. type: Title ===== -#: user-manual.txt:2163 +#: user-manual.txt:2253 #, no-wrap msgid "The Gas Pressure Bar Graph" msgstr "" #. type: Plain text -#: user-manual.txt:2170 +#: user-manual.txt:2260 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 " @@ -4258,13 +4492,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2171 +#: user-manual.txt:2261 #, no-wrap msgid "images/GasPressureBarGraph.jpg" msgstr "images/GasPressureBarGraph.jpg" #. type: Plain text -#: user-manual.txt:2177 +#: user-manual.txt:2267 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 " @@ -4274,7 +4508,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2183 +#: user-manual.txt:2273 msgid "" "The horizontal black line underneath the light green margin indicates the " "equilibrium pressure of the INERT gases inhaled by the diver, usually " @@ -4285,7 +4519,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2187 +#: user-manual.txt:2277 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 " @@ -4293,7 +4527,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2193 +#: user-manual.txt:2283 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 " @@ -4303,7 +4537,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2197 +#: user-manual.txt:2287 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 " @@ -4312,7 +4546,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2200 +#: user-manual.txt:2290 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 " @@ -4320,7 +4554,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2203 +#: user-manual.txt:2293 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 " @@ -4328,7 +4562,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2206 +#: user-manual.txt:2296 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 " @@ -4336,7 +4570,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2211 +#: user-manual.txt:2301 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 " @@ -4346,7 +4580,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2217 +#: user-manual.txt:2307 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 " @@ -4357,7 +4591,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2222 +#: user-manual.txt:2312 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 " @@ -4367,13 +4601,63 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2223 +#: user-manual.txt:2313 +#, no-wrap +msgid "Computer-reported events during dive" +msgstr "" + +#. type: Plain text +#: user-manual.txt:2325 +msgid "" +"Many dive computers record events during a dive. For instance, most dive " +"computers report alarms relating to high partial pressures of oxygen, to " +"rapid ascents or the exceeding of no-deco limits (NDL). On the other hand, " +"other events are classified as warnings and, for instance, occur when the " +"remaining gas in a cylinder falls below a predetermined limit, a deep stop " +"needs to be performed or the need to change gas during multicylinder dives. " +"Some dive computers also report notifications, e.g. when a safety stop is " +"initiated or terminated or when a predetermined amount of OTUs have been " +"incurred. The alarms, warnings and notifications differs from one dive " +"computer to another: some dive computers do not report any of the above " +"events, while others provide an extensive log of events. The reporting of " +"events is therefore a function of the dive computer used. In addition, " +"_Subsurface_ does not always have the ability to detect all the events " +"reported by a specific dive computer." +msgstr "" + +#. type: Plain text +#: user-manual.txt:2330 +msgid "" +"Events are indicated by symbols on the dive profile. Notifications are shown " +"as a white, round symbol with a letter _i_; warnings are indicated by a " +"yellow triangle and alarms by a red triangle. By moving the cursor over a " +"symbol, the explanation is given in the bottom-most line of the _Information " +"Box_ (see image below, where the cursor is positioned over the alarm that " +"was reported)." +msgstr "" + +#. type: Target for macro image +#: user-manual.txt:2331 +#, no-wrap +msgid "images/profile_symbols.jpg" +msgstr "images/profile_symbols.jpg" + +#. type: Plain text +#: user-manual.txt:2336 +msgid "" +"Some dive computers report _bookmarks_ that the diver has set during the " +"dive. These are indicated as a small red flag on the profile and are " +"discussed more fully in the section on <<S_Bookmarks,_inserting bookmarks_>>." +msgstr "" + +#. type: Title ==== +#: user-manual.txt:2337 #, no-wrap msgid "The Profile Toolbar" msgstr "" #. type: Plain text -#: user-manual.txt:2231 +#: user-manual.txt:2345 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 " @@ -4384,44 +4668,44 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2232 +#: user-manual.txt:2346 #, no-wrap msgid "images/icons/O2.jpg" msgstr "images/icons/O2.jpg" #. type: Plain text -#: user-manual.txt:2236 +#: user-manual.txt:2350 msgid "" "Show the partial pressure of *oxygen* during the dive. This is shown below " "the dive depth and water temperature graphs." msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2237 +#: user-manual.txt:2351 #, no-wrap msgid "images/icons/N2.jpg" msgstr "images/icons/N2.jpg" #. type: Plain text -#: user-manual.txt:2240 +#: user-manual.txt:2354 msgid "Show the partial pressure of *nitrogen* during the dive." msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2241 +#: user-manual.txt:2355 #, no-wrap msgid "images/icons/He.jpg" msgstr "images/icons/He.jpg" #. type: Plain text -#: user-manual.txt:2245 +#: user-manual.txt:2359 msgid "" "Display of the partial pressure of *helium* during the dive. This is only " "important to divers using Trimix, Helitrox or similar breathing gasses." msgstr "" #. type: Plain text -#: user-manual.txt:2258 +#: user-manual.txt:2372 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 " @@ -4436,20 +4720,20 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2259 +#: user-manual.txt:2373 #, no-wrap msgid "images/icons/Heartbutton.png" msgstr "images/icons/Heartbutton.png" #. type: Plain text -#: user-manual.txt:2263 +#: user-manual.txt:2377 msgid "" "Clicking on the heart rate button allows display of heart rate information " "during the dive if the dive computer was attached to a heart rate sensor." msgstr "" #. type: Plain text -#: user-manual.txt:2269 +#: user-manual.txt:2383 msgid "" "It is possible to *zoom* into the profile graph. This is done either by " "using the scroll wheel / scroll gesture of the mouse or trackpad. By default " @@ -4459,19 +4743,19 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2270 +#: user-manual.txt:2384 #, no-wrap msgid "images/MeasuringBar.png" msgstr "images/MeasuringBar.png" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2272 +#: user-manual.txt:2386 #, no-wrap msgid "images/icons/ruler.jpg" msgstr "images/icons/ruler.jpg" #. type: Plain text -#: user-manual.txt:2280 +#: user-manual.txt:2394 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 " @@ -4481,13 +4765,13 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2281 +#: user-manual.txt:2395 #, no-wrap msgid "images/icons/ShowPhotos.png" msgstr "images/icons/ShowPhotos.png" #. type: Plain text -#: user-manual.txt:2288 +#: user-manual.txt:2402 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 " @@ -4496,7 +4780,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2315 +#: user-manual.txt:2429 msgid "" "The profile can also include the dive computer reported *ceiling* (more " "precisely, the deepest deco stop that the dive computer calculated for each " @@ -4525,7 +4809,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2321 +#: user-manual.txt:2435 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 " @@ -4533,13 +4817,13 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2322 +#: user-manual.txt:2436 #, no-wrap msgid "images/icons/ceiling1.jpg" msgstr "images/icons/ceiling1.jpg" #. type: Plain text -#: user-manual.txt:2327 +#: user-manual.txt:2441 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 " @@ -4548,13 +4832,13 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2328 +#: user-manual.txt:2442 #, no-wrap msgid "images/icons/ceiling2.jpg" msgstr "images/icons/ceiling2.jpg" #. type: Plain text -#: user-manual.txt:2332 +#: user-manual.txt:2446 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 " @@ -4562,26 +4846,26 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2333 +#: user-manual.txt:2447 #, no-wrap msgid "images/icons/ceiling3.jpg" msgstr "images/icons/ceiling3.jpg" #. type: delimited block = -#: user-manual.txt:2338 +#: user-manual.txt:2452 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:2339 +#: user-manual.txt:2453 #, no-wrap msgid "images/Ceilings2.jpg" msgstr "images/Ceilings2.jpg" #. type: delimited block = -#: user-manual.txt:2342 +#: user-manual.txt:2456 msgid "" "Gradient Factor settings strongly affect the calculated ceilings and their " "depths. For more information about Gradient factors, see the section on xref:" @@ -4594,25 +4878,25 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2344 user-manual.txt:3126 +#: user-manual.txt:2458 user-manual.txt:3293 #, no-wrap msgid " *** http://www.tek-dive.com/portal/upload/M-Values.pdf[Understanding M-values by Erik Baker, _Immersed_ Vol. 3, No. 3.]\n" msgstr " *** http://www.tek-dive.com/portal/upload/M-Values.pdf[Understanding M-values by Erik Baker, _Immersed_ Vol. 3, No. 3.]\n" #. type: Plain text -#: user-manual.txt:2346 user-manual.txt:3128 +#: user-manual.txt:2460 user-manual.txt:3295 #, no-wrap msgid " *** link:http://www.rebreatherworld.com/general-and-new-to-rebreather-articles/5037-gradient-factors-for-dummies.html[Gradient factors for dummies, by Kevin Watts]\n" msgstr " *** link:http://www.rebreatherworld.com/general-and-new-to-rebreather-articles/5037-gradient-factors-for-dummies.html[Gradient factors for dummies, by Kevin Watts]\n" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2350 +#: user-manual.txt:2464 #, no-wrap msgid "images/icons/ShowCylindersButton.jpg" msgstr "images/icons/ShowCylindersButton.jpg" #. type: Plain text -#: user-manual.txt:2356 +#: user-manual.txt:2470 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 " @@ -4623,19 +4907,19 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2357 +#: user-manual.txt:2471 #, no-wrap msgid "images/ShowCylinders_f20.jpg" msgstr "images/ShowCylinders_f20.jpg" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2361 +#: user-manual.txt:2475 #, no-wrap msgid "images/icons/heatmap.png" msgstr "images/icons/heatmap.png" #. type: delimited block = -#: user-manual.txt:2368 +#: user-manual.txt:2482 msgid "" "Display the tissue heat-map. The heat map summarises, for the duration of " "the dive, the inert gas tissue pressures for each of the 16 tissue " @@ -4647,13 +4931,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2369 +#: user-manual.txt:2483 #, no-wrap msgid "images/Heatmap.jpg" msgstr "images/Heatmap.jpg" #. type: delimited block = -#: user-manual.txt:2377 +#: user-manual.txt:2491 msgid "" "Image *A* on the left shows the xref:S_gas_pressure_graph[Gas Pressure " "Graph] in the *Information box*, representing a snapshot of inert gas " @@ -4666,7 +4950,7 @@ msgid "" msgstr "" #. type: delimited block = -#: user-manual.txt:2385 +#: user-manual.txt:2499 msgid "" "Image *B* shows a gradient of unique colours, spanning the whole range of " "inert gas pressures. It is possible to map the height of each of the dark " @@ -4680,7 +4964,7 @@ msgid "" msgstr "" #. type: delimited block = -#: user-manual.txt:2393 +#: user-manual.txt:2507 msgid "" "The bottom range in *B* (marked _On-gassing_) includes colours from light " "blue to black, representing tissue gas pressures below the equilibrium " @@ -4695,7 +4979,7 @@ msgid "" msgstr "" #. type: delimited block = -#: user-manual.txt:2399 +#: user-manual.txt:2513 msgid "" "The central range in *B* includes the colours from black to light green, " "when the inert gas pressure of a tissue compartment is higher than the " @@ -4706,7 +4990,7 @@ msgid "" msgstr "" #. type: delimited block = -#: user-manual.txt:2408 +#: user-manual.txt:2522 msgid "" "The top range in *B* (marked _Off-gassing_) includes colours from light " "green to red and white, repesenting tissue gas pressures above that of the " @@ -4722,7 +5006,7 @@ msgid "" msgstr "" #. type: delimited block = -#: user-manual.txt:2416 +#: user-manual.txt:2530 msgid "" "Image *C* shows the colour mapping of each of the vertical bars in *A*, the " "fast tissues (on the left in *A*) depicted at the top and the slow tissue " @@ -4734,7 +5018,7 @@ msgid "" msgstr "" #. type: delimited block = -#: user-manual.txt:2423 +#: user-manual.txt:2537 msgid "" "Image *D* is a compilation of similar colour mappings of 16 tissue " "compartments during a 10-minute period of a dive, the colours representing " @@ -4745,7 +5029,7 @@ msgid "" msgstr "" #. type: delimited block = -#: user-manual.txt:2427 +#: user-manual.txt:2541 msgid "" "The colours of the heat map are not affected by the gradient factor " "settings. This is because the heat map indicates tissue pressures relative " @@ -4754,7 +5038,7 @@ msgid "" msgstr "" #. type: delimited block = -#: user-manual.txt:2429 +#: user-manual.txt:2543 msgid "" "http://www.tek-dive.com/portal/upload/M-Values.pdf[Understanding M-values by " "Erik Baker, _Immersed_ Vol. 3, No. 3.]" @@ -4763,7 +5047,7 @@ msgstr "" "Erik Baker, _Immersed_ Vol. 3, No. 3.]" #. type: delimited block = -#: user-manual.txt:2432 +#: user-manual.txt:2546 msgid "" "Since the colours of the heat map are not affected by the gradient " "factor(s), the heat map is also applicable when using the VPM-B " @@ -4771,7 +5055,7 @@ msgid "" msgstr "" #. type: delimited block = -#: user-manual.txt:2436 +#: user-manual.txt:2550 msgid "" "The image below compares the profiles and heat maps for two planned " "decompression dives to 60m: the first using the Bühlmann decompression " @@ -4781,7 +5065,7 @@ msgid "" msgstr "" #. type: delimited block = -#: user-manual.txt:2441 +#: user-manual.txt:2555 msgid "" "In both profiles, the inert gas pressures in the faster tissues rise much " "more rapidly than the slower tissues during the descent and bottom phase, " @@ -4792,7 +5076,7 @@ msgid "" msgstr "" #. type: delimited block = -#: user-manual.txt:2446 +#: user-manual.txt:2560 msgid "" "The comparison of the two profiles and heatmaps shows that by including deep " "stops, the oversaturation gradient in the faster tissues early in ascent " @@ -4802,19 +5086,19 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2447 +#: user-manual.txt:2561 #, no-wrap msgid "images/tissueHeatmap.jpg" msgstr "images/tissueHeatmap.jpg" #. type: Title ==== -#: user-manual.txt:2450 +#: user-manual.txt:2564 #, no-wrap msgid "The Dive Profile context menu" msgstr "" #. type: Plain text -#: user-manual.txt:2469 +#: user-manual.txt:2583 msgid "" "The context menu for the Dive Profile is accessed by right-clicking while " "the mouse cursor is over the Dive Profile panel. The menu allows creating " @@ -4835,19 +5119,19 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:2470 +#: user-manual.txt:2584 #, no-wrap msgid "Organizing the logbook (Manipulating groups of dives)" msgstr "" #. type: Title === -#: user-manual.txt:2473 +#: user-manual.txt:2587 #, no-wrap msgid "The Dive List context menu" msgstr "" #. type: Plain text -#: user-manual.txt:2477 +#: user-manual.txt:2591 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 " @@ -4856,50 +5140,97 @@ msgstr "" #. TODO: NEEDS REPLACEMENT #. type: Target for macro image -#: user-manual.txt:2479 +#: user-manual.txt:2593 #, no-wrap msgid "images/ContextMenu.jpg" msgstr "images/ContextMenu.jpg" #. type: Plain text -#: user-manual.txt:2482 +#: user-manual.txt:2596 msgid "The context menu is used in many functions described below." msgstr "" #. type: Title ==== -#: user-manual.txt:2483 +#: user-manual.txt:2598 #, no-wrap msgid "Customizing the columns showed in the *Dive List* panel" msgstr "" #. type: Target for macro image -#: user-manual.txt:2485 +#: user-manual.txt:2600 #, no-wrap msgid "images/DiveListOptions.jpg" msgstr "images/DiveListOptions.jpg" #. type: Plain text -#: user-manual.txt:2493 +#: user-manual.txt:2608 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 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." +"bar of the *Dive List*, bringing up a list of columns that can be shown in " +"the dive list (see above). Check an items to be included in the *Dive " +"List*. The list is immediately updated. Preferences for information shown " +"in the *Dive List* are saved and used when _Subsurface_ is re-opened." +msgstr "" + +#. type: Plain text +#: user-manual.txt:2613 +msgid "" +"By selecting the _Photos_ checkbox in the dropdown list, an icon is shown " +"indicating whether any photos are associated with a particular dive. There " +"are three icons:" +msgstr "" + +#. type: Named 'icon' AttributeList argument for style 'icon' +#: user-manual.txt:2614 +#, no-wrap +msgid "images/icons/duringPhoto.png" +msgstr "images/icons/duringPhoto.png" + +#. type: Plain text +#: user-manual.txt:2617 +msgid "" +"This dive has photographs taken during the dive, typically using an " +"underwater camera." +msgstr "" + +#. type: Named 'icon' AttributeList argument for style 'icon' +#: user-manual.txt:2618 +#, no-wrap +msgid "images/icons/outsidePhoto.png" +msgstr "images/icons/outsidePhoto.png" + +#. type: Plain text +#: user-manual.txt:2623 +msgid "" +"This dive has photographs taken immediately before or immediately after the " +"dive. This is useful for finding photos of dive teams or boats just before/" +"after the dive, whales or other surface animals seen just before or after " +"the dive, or of landscapes as seen from the boat." +msgstr "" + +#. type: Named 'icon' AttributeList argument for style 'icon' +#: user-manual.txt:2624 +#, no-wrap +msgid "images/icons/inAndOutPhoto.png" +msgstr "images/icons/inAndOutPhoto.png" + +#. type: Plain text +#: user-manual.txt:2627 +msgid "" +"This dive has photographs taken both during the dive and immdiately before " +"or after the dive." msgstr "" #. type: Title === -#: user-manual.txt:2495 +#: user-manual.txt:2629 #, no-wrap msgid "Renumbering the dives" msgstr "" #. type: Plain text -#: user-manual.txt:2507 +#: user-manual.txt:2641 msgid "" "Dives are normally numbered incrementally from non-recent dives (low " "sequence numbers) to recent dives (higher sequence numbers). Numbering of " @@ -4913,7 +5244,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2512 +#: user-manual.txt:2646 msgid "" "Renumber a few selected dives in the dive list by selecting only the dives " "that need renumbering. Right-click on the selected list and use the Dive " @@ -4922,13 +5253,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:2514 +#: user-manual.txt:2648 #, no-wrap msgid "Grouping dives into trips and manipulating trips" msgstr "" #. type: Plain text -#: user-manual.txt:2522 +#: user-manual.txt:2656 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/" @@ -4939,13 +5270,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2523 +#: user-manual.txt:2657 #, no-wrap msgid "images/Group2.jpg" msgstr "images/Group2.jpg" #. type: Plain text -#: user-manual.txt:2529 +#: user-manual.txt:2663 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, " @@ -4954,13 +5285,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2530 +#: user-manual.txt:2664 #, no-wrap msgid "Editing the title and associated information for a particular trip" msgstr "" #. type: Plain text -#: user-manual.txt:2543 +#: user-manual.txt:2677 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 " @@ -4974,13 +5305,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2544 +#: user-manual.txt:2678 #, no-wrap msgid "Viewing the dives during a particular trip" msgstr "" #. type: Plain text -#: user-manual.txt:2549 +#: user-manual.txt:2683 msgid "" "Once the dives have been grouped into trips, you can expand one or more " "trips by clicking the expansion button [+/-] on the left of each trip title. " @@ -4988,13 +5319,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2550 +#: user-manual.txt:2684 #, no-wrap msgid "Collapsing or expanding dive information for different trips" msgstr "" #. type: Plain text -#: user-manual.txt:2555 +#: user-manual.txt:2689 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 " @@ -5002,13 +5333,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2556 +#: user-manual.txt:2690 #, no-wrap msgid "Merging dives from more than one trip into a single trip" msgstr "" #. type: Plain text -#: user-manual.txt:2561 +#: user-manual.txt:2695 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 " @@ -5016,13 +5347,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2562 +#: user-manual.txt:2696 #, no-wrap msgid "Splitting a single trip into more than one trip" msgstr "" #. type: Plain text -#: user-manual.txt:2571 +#: user-manual.txt:2705 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 " @@ -5033,25 +5364,25 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2572 +#: user-manual.txt:2706 #, no-wrap msgid "images/SplitDive3a.jpg" msgstr "images/SplitDive3a.jpg" #. type: Title === -#: user-manual.txt:2574 +#: user-manual.txt:2708 #, no-wrap msgid "Manipulating single dives" msgstr "" #. type: Title ==== -#: user-manual.txt:2576 +#: user-manual.txt:2710 #, no-wrap msgid "Delete a dive from the dive log" msgstr "" #. type: Plain text -#: user-manual.txt:2583 +#: user-manual.txt:2717 msgid "" "Dives can be permanently deleted from the dive log by selecting and right-" "clicking them to bring up the context menu, then selecting *Delete dive(s)*. " @@ -5060,13 +5391,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2584 +#: user-manual.txt:2718 #, no-wrap msgid "Unlink a dive from a trip" msgstr "" #. type: Plain text -#: user-manual.txt:2591 +#: user-manual.txt:2725 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 " @@ -5076,13 +5407,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2592 +#: user-manual.txt:2726 #, no-wrap msgid "Add a dive to the trip immediately above" msgstr "" #. type: Plain text -#: user-manual.txt:2597 +#: user-manual.txt:2731 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 " @@ -5090,13 +5421,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2598 +#: user-manual.txt:2732 #, no-wrap msgid "Shift the start time of dive(s)" msgstr "" #. type: Plain text -#: user-manual.txt:2608 +#: user-manual.txt:2742 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 " @@ -5108,13 +5439,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2609 +#: user-manual.txt:2743 #, no-wrap msgid "Merge dives into a single dive" msgstr "" #. type: Plain text -#: user-manual.txt:2619 +#: user-manual.txt:2753 msgid "" "Sometimes a dive is briefly interrupted, for example, if a diver returns to " "the surface for a few minutes, resulting in two or more dives being recorded " @@ -5127,19 +5458,19 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2620 +#: user-manual.txt:2754 #, no-wrap msgid "images/MergedDive.png" msgstr "images/MergedDive.png" #. type: Title ==== -#: user-manual.txt:2622 +#: user-manual.txt:2756 #, no-wrap msgid "Undo dive manipulations" msgstr "" #. type: Plain text -#: user-manual.txt:2628 +#: user-manual.txt:2762 msgid "" "Important actions on dives or trips, described above, can be undone or " "redone. This includes: _delete dives_, _merge dives_, _renumber dives_ and " @@ -5149,13 +5480,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:2631 +#: user-manual.txt:2765 #, no-wrap msgid "Filtering the dive list" msgstr "" #. type: Plain text -#: user-manual.txt:2637 +#: user-manual.txt:2771 msgid "" "The dives in the *Dive List* panel can be filtered, selecting only some of " "the dives based on their attributes, e.g. dive tags, dive site, dive master, " @@ -5165,7 +5496,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2645 +#: user-manual.txt:2779 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 " @@ -5179,13 +5510,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2646 +#: user-manual.txt:2780 #, no-wrap msgid "images/Filterpanel.jpg" msgstr "images/Filterpanel.jpg" #. type: Plain text -#: user-manual.txt:2655 +#: user-manual.txt:2789 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 " @@ -5198,7 +5529,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2663 +#: user-manual.txt:2797 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 " @@ -5210,23 +5541,23 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:2665 +#: user-manual.txt:2799 #, no-wrap msgid "Exporting the dive log or parts of the dive log" msgstr "" #. type: Plain text -#: user-manual.txt:2668 +#: user-manual.txt:2802 msgid "There are two ways to export dive information from Subsurface:" msgstr "" #. type: Plain text -#: user-manual.txt:2670 +#: user-manual.txt:2804 msgid "Export dive information to _Facebook_" msgstr "Exporter les informations de plongée vers _Facebook_" #. type: Plain text -#: user-manual.txt:2672 +#: user-manual.txt:2806 msgid "" "xref:S_Export_other[Export dive information to other destinations or formats]" msgstr "" @@ -5234,21 +5565,34 @@ msgstr "" "destinations ou formats]" #. type: Title === -#: user-manual.txt:2674 +#: user-manual.txt:2808 #, no-wrap msgid "Exporting dive information to _Facebook_" msgstr "Export des informations de plongée vers _Facebook_" #. type: Plain text -#: user-manual.txt:2683 +#: user-manual.txt:2817 +#, fuzzy +#| msgid "" +#| "Export of dives to _Facebook_ is handled differently from other types of " +#| "export because a connection to _Facebook_ is required, needing a " +#| "_Facebook_ userID and password. If, from the *Main Menu*, 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." 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 _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." +"userID and password. From the *Main Menu*, select _Share on -> Connect to -" +"> Facebook_ (image *A* below) A _Facebook_ login screen appears (image *B* " +"below). Provide a _Facebook_ userID and password. From the _Subsurface_ " +"window it’s easy to determine whether _Subsurface_ has 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 "" "L'export des plongées vers _Facebook_ est géré différemment des autres types " "d'export car une connexion vers _Facebook_ est nécessaire, nécessitant un " @@ -5259,39 +5603,52 @@ msgstr "" "le panneau de l'image *B* ci dessous est affiché, avec un bouton " "_Déconnecter de Facebook_ pour fermer la connexion _Facebook_." -#. type: Target for macro image -#: user-manual.txt:2684 -#, no-wrap -msgid "images/facebook1_f20.jpg" -msgstr "images/facebook1_f20.jpg" - #. type: Plain text -#: user-manual.txt:2689 +#: user-manual.txt:2821 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_ " -"(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:2700 -msgid "" -"Having established a login to _Facebook_, transferring a dive profileto a " -"_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 " -"transferred along with the dive profile (image *B*, below). To transfer a " -"dive profile to _Facebook_, the name of a _Facebook_ album is needed. The " -"checkboxes on the left hand side let you decide how much additional " -"information should be transferred with the dive profile. This information is " -"shown in the text box on the right hand side of the panel (image *B*, " -"below). You can easily edit the message that will be posted with the dive " -"profile. After specifying the additional information and verifying the " -"text, select the _OK_ button that triggers the transfer to _Facebook_. After " -"the transfer is done, an acknowledgement dialogue appears, indicating it was " +"Once logged into to _Facebook_ , a panel is shown with a message: \"_To " +"disconnect Subsurface from your Facebook account, use the 'Share on' menu " +"entry_.\" Close this message panel." +msgstr "" + +#. type: Target for macro image +#: user-manual.txt:2822 +#, no-wrap +msgid "images/facebook1.jpg" +msgstr "images/facebook1.jpg" + +#. type: Plain text +#: user-manual.txt:2834 +#, fuzzy +#| msgid "" +#| "Having established a login to _Facebook_, transferring a dive profileto a " +#| "_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 " +#| "transferred along with the dive profile (image *B*, below). To transfer a " +#| "dive profile to _Facebook_, the name of a _Facebook_ album is needed. The " +#| "checkboxes on the left hand side let you decide how much additional " +#| "information should be transferred with the dive profile. This information " +#| "is shown in the text box on the right hand side of the panel (image *B*, " +#| "below). You can easily edit the message that will be posted with the dive " +#| "profile. After specifying the additional information and verifying the " +#| "text, select the _OK_ button that triggers the transfer to _Facebook_. " +#| "After the transfer is done, an acknowledgement dialogue appears, " +#| "indicating it was successful." +msgid "" +"Having established a login to _Facebook_, transferring a dive profile to a " +"_Facebook_ timeline is easy. In the _Subsurface_ *Dive Profile* panel, " +"highlight the dive to be transferred. A dialogue box is shown, determining " +"the amount of additional information to be transferred with the dive profile " +"(image *A*, below). To transfer a dive profile to _Facebook_, the name of a " +"_Facebook_ album is needed. The checkboxes on the left hand side determine " +"how much additional information is added to the dive profile, shown in the " +"text box on the right hand side of the panel (image *A*, below). Customise " +"the message that will be posted with the dive profile by editing any of the " +"information. After specifying additional information and verifying the text, " +"select the _OK_ button that triggers the transfer to _Facebook_. After the " +"transfer is done, an acknowledgement dialogue appears, indicating it was " "successful." msgstr "" "Une fois qu'une connexion à _Facebook_ est établie, transférer un profil de " @@ -5311,11 +5668,17 @@ msgstr "" "moment, une fenêtre apparait indiquant le succès du transfert." #. type: Plain text -#: user-manual.txt:2705 +#: user-manual.txt:2838 +#, fuzzy +#| msgid "" +#| "Both the album created and the post to your timeline will be marked as " +#| "private. In order for friends to be able to see it, change its " +#| "permissions from a regular Facebook login either in a browser or a " +#| "Facebook app." msgid "" -"Both the album created and the post to your timeline will be marked as " -"private. In order for friends to be able to see it, change its permissions " -"from a regular Facebook login either in a browser or a Facebook app." +"Both the album created and the post to your timeline are marked as private. " +"In order for friends to be able to see the post, log into _Facebook_ using a " +"browser or Facebook app and change its permissions." msgstr "" "À la fois l'album créé et la publication sur votre ligne temporelle seront " "marquées comme privés. Pour que vos amis puissent la voir, modifier les " @@ -5323,31 +5686,26 @@ msgstr "" "ou l'application Facebook." #. type: Target for macro image -#: user-manual.txt:2706 +#: user-manual.txt:2839 #, no-wrap -msgid "images/facebook2_f20.jpg" -msgstr "images/facebook2_f20.jpg" +msgid "images/facebook2.jpg" +msgstr "images/facebook2.jpg" #. type: Plain text -#: user-manual.txt:2710 +#: user-manual.txt:2843 msgid "" -"If required, then close the _Facebook_ connection by either closing " -"_Subsurface_ or by selecting _File -> Preferences -> Facebook_ from the Main " -"Menu, and clicking the appropriate button on the Facebook Preferences panel." +"If required, then close the _Facebook_ connection by selecting, from the " +"*Main Menu*, _Share on -> Disconnect from -> Facebook_ (image *B* above)." msgstr "" -"Si besoin, fermer la connexion _Facebook_ en fermant _Subsurface_ ou en " -"sélectionnant _Fichier -> Préférences -> Facebook, à partir du menu " -"principal et en cliquant sur le bouton approprié dans le panneau des " -"préférences Facebook." #. type: Title === -#: user-manual.txt:2712 +#: user-manual.txt:2845 #, no-wrap msgid "Export dive information to other destinations or formats" msgstr "Exporter des informations de plongée vers d'autres destinations ou formats" #. type: Plain text -#: user-manual.txt:2717 +#: user-manual.txt:2850 msgid "" "For non-_Facebook exports_, the export function can be found by selecting " "_File -> Export_, which brings up the Export dialog. This dialog always " @@ -5357,24 +5715,24 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2718 +#: user-manual.txt:2851 #, no-wrap msgid "images/Export_f20.jpg" msgstr "images/Export_f20.jpg" #. type: Plain text -#: user-manual.txt:2721 +#: user-manual.txt:2854 msgid "A dive log or part of it can be saved in several formats:" msgstr "" #. type: Plain text -#: user-manual.txt:2723 +#: user-manual.txt:2856 msgid "" "_Subsurface XML_ format. This is the native format used by _Subsurface_." msgstr "" #. type: Plain text -#: user-manual.txt:2727 +#: user-manual.txt:2860 msgid "" "Universal Dive Data Format (_UDDF_). Refer to _http://uddf.org_ for more " "information. UDDF is a generic format that enables communication among many " @@ -5382,7 +5740,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2731 +#: user-manual.txt:2864 msgid "" "_Divelogs.de_, an Internet-based dive log repository. In order to upload to " "_Divelogs.de_, you need a user-ID as well as a password for _Divelogs.de_. " @@ -5391,7 +5749,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2735 +#: user-manual.txt:2868 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 " @@ -5399,7 +5757,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2740 +#: user-manual.txt:2873 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, " @@ -5408,7 +5766,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2743 +#: user-manual.txt:2876 msgid "" "_CSV dive profile_, that includes a large amount of detail for each dive, " "including the depth profile, temperature and pressure information of each " @@ -5416,7 +5774,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2756 +#: user-manual.txt:2889 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 " @@ -5433,7 +5791,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2761 +#: user-manual.txt:2894 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 " @@ -5442,13 +5800,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2762 +#: user-manual.txt:2895 #, no-wrap msgid "images/mapview_f20.jpg" msgstr "images/mapview_f20.jpg" #. type: Plain text -#: user-manual.txt:2769 +#: user-manual.txt:2902 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 " @@ -5457,12 +5815,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2771 +#: user-manual.txt:2904 msgid "_General Settings_, under the HTML tab, provides the following options:" msgstr "" #. type: Plain text -#: user-manual.txt:2779 +#: user-manual.txt:2912 #, no-wrap msgid "" "** Subsurface Numbers: if this option is checked, the dive(s) are exported with the\n" @@ -5475,27 +5833,27 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2782 +#: user-manual.txt:2915 msgid "" "Under _Style Options_ some style-related options are available like font " "size and theme." msgstr "" #. type: Plain text -#: user-manual.txt:2785 +#: user-manual.txt:2918 msgid "" "Export to other formats can be done through third party facilities, for " "instance _www.divelogs.de_." msgstr "" #. type: Title == -#: user-manual.txt:2787 +#: user-manual.txt:2920 #, no-wrap msgid "Keeping a _Subsurface_ dive log in the Cloud" msgstr "" #. type: Plain text -#: user-manual.txt:2797 +#: user-manual.txt:2930 msgid "" "For each diver, dive log information is highly important. Not only is it a " "record of diving activities for your pleasure, but it’s important " @@ -5509,7 +5867,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2803 +#: user-manual.txt:2936 msgid "" "_Subsurface_ includes access to a transparently integrated cloud storage " "back end that is available to all Subsurface users. Storing and retrieving a " @@ -5519,13 +5877,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:2804 +#: user-manual.txt:2937 #, no-wrap msgid "Create a cloud storage account" msgstr "" #. type: Plain text -#: user-manual.txt:2821 +#: user-manual.txt:2954 #, no-wrap msgid "" "** Open the *Network Preferences* by selecting _File_ -> _Preferences_ -> _Network_.\n" @@ -5546,13 +5904,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:2822 +#: user-manual.txt:2955 #, no-wrap msgid "Using _Subsurface cloud storage_" msgstr "" #. type: Plain text -#: user-manual.txt:2832 +#: user-manual.txt:2965 #, no-wrap msgid "" "** Once the cloud storage has been initialized, two new items appear in the\n" @@ -5566,7 +5924,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2837 +#: user-manual.txt:2970 #, no-wrap msgid "" "** _Subsurface_ keeps a local copy of the data and the cloud facility remains fully\n" @@ -5576,13 +5934,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:2839 +#: user-manual.txt:2972 #, no-wrap msgid "Web access to _Subsurface cloud storage_" msgstr "" #. type: Plain text -#: user-manual.txt:2849 +#: user-manual.txt:2982 msgid "" "One of the nice side benefits of using _Subsurface cloud storage_ is that " "you can also access your dive data from any web browser. Simply open https://" @@ -5595,13 +5953,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:2850 +#: user-manual.txt:2983 #, no-wrap msgid "Other cloud services" msgstr "" #. type: Plain text -#: user-manual.txt:2860 +#: user-manual.txt:2993 msgid "" "If you prefer not to use the integrated cloud storage of dive logs (and " "don't need the web access), it’s simple to store dive logs in the cloud " @@ -5612,13 +5970,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2861 +#: user-manual.txt:2994 #, no-wrap msgid "images/Cloud.jpg" msgstr "images/Cloud.jpg" #. type: Plain text -#: user-manual.txt:2870 +#: user-manual.txt:3003 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, " @@ -5631,7 +5989,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2877 +#: user-manual.txt:3010 msgid "" "In this way a dive log in your _Dropbox_ folder can be accessed seamlessly " "from the Internet and can be accessed anywhere with Internet access. " @@ -5641,7 +5999,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2883 +#: user-manual.txt:3016 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 " @@ -5652,20 +6010,91 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2886 +#: user-manual.txt:3019 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:2889 +#: user-manual.txt:3021 +#, no-wrap +msgid "Several _Subsurface_ users on one desktop computer" +msgstr "" + +#. type: Plain text +#: user-manual.txt:3025 +msgid "" +"A frequent need is for two or more persons to use _Subsurface_ on the same " +"desktop computer. For instance members of a household may use the same " +"computer or one family member may perform dive uploads for other family " +"members/friends. There are two approaches for doing this." +msgstr "" + +#. type: Plain text +#: user-manual.txt:3037 +#, no-wrap +msgid "" +"*A)* If the different users of a desktop computer do not log onto the desktop/laptop under different user names\n" +" then the simplest way is for each person to use her/his own divelog file within Subsurface. In this case John\n" +" would work with the _Subsurface_ file _johns-divelog_ and Joan would use _joans-divelog_. Select\n" +" the appropriate dive log by selecting, from the *Main Menu*, _File -> Open logbook_ and then select your own\n" +" dive log file from the list of files lower down in the menu. However, a problem arises if the users\n" +" prefer different settings for _Subsurface_. For instance, one diver may prefer to see the dive ceiling in the\n" +" *Profile Panel* and photos icons in the *Dive List*, while the other may not have these preferences. In addition,\n" +" the cloud connection is normally unique for each _Subsurface_ installation and if more than one user wishes to save\n" +" dive data on the cloud, it is inconvenient to open the *Preferences* and change the user-ID data every time\n" +" the cloud is accessed. To solve these problems, launch _Subsurface_ with a _--user=<user name>_ command-line option.\n" +" John can then activate _Subsurface_ with this command-line instruction:\n" +msgstr "" + +#. type: Plain text +#: user-manual.txt:3039 +#, no-wrap +msgid "\tsubsurface --user=John\n" +msgstr "" + +#. type: Plain text +#: user-manual.txt:3041 +msgid "while Joan can launch _Subsurface_ using:" +msgstr "" + +#. type: Plain text +#: user-manual.txt:3043 +#, no-wrap +msgid "\tsubsurface --user=Joan\n" +msgstr "" + +#. type: Plain text +#: user-manual.txt:3051 +#, no-wrap +msgid "" +"In this case, each user's preferences, settings and cloud access information are stored separately, allowing\n" +" each diver to interact with _Subsurface_ in her/his preferred way and with individual cloud access. The above\n" +" process can be made user-friendly by creating a link/shortcut with a desktop icon that executes the above\n" +" command-line instruction. Use of the _--user=_ option therefore enables each user to create, maintain and\n" +" backup a separate dive log within a personalised user interface. This way, when each diver launches _Subsurface_,\n" +" it opens with the correct dive log as well as the appropriate display and backup preferences, and each diver\n" +" can access their own divelog on a mobile device using https://subsurface-divelog.org/documentation/subsurface-mobile-user-manual[_Subsurface-Mobile_].\n" +msgstr "" + +#. type: Plain text +#: user-manual.txt:3055 +#, no-wrap +msgid "" +"*B)* On the other hand, if the users log onto the same computer using different userIDs and passwords (i.e. users each\n" +"have a separate user space), _Subsurface_ is available independently to each user and every diver automatically has a separate\n" +"user profile and settings, including unique cloud and _Subsurface-Mobile_ access.\n" +msgstr "" + +#. type: Title == +#: user-manual.txt:3057 #, no-wrap msgid "Printing a dive log" msgstr "" #. type: Plain text -#: user-manual.txt:2893 +#: user-manual.txt:3061 #, no-wrap msgid "" "_Subsurface_ provides a simple and flexible way to print a whole dive log or only a few selected dives.\n" @@ -5673,19 +6102,19 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2895 +#: user-manual.txt:3063 msgid "Some decisions need to be made before printing:" msgstr "" #. type: Plain text -#: user-manual.txt:2898 +#: user-manual.txt:3066 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:2900 +#: user-manual.txt:3068 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 " @@ -5693,7 +6122,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2903 +#: user-manual.txt:3071 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 " @@ -5701,35 +6130,35 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2904 user-manual.txt:4366 +#: user-manual.txt:3072 user-manual.txt:4579 #, no-wrap msgid "images/Print1_f22.jpg" msgstr "images/Print1_f22.jpg" #. type: Plain text -#: user-manual.txt:2907 +#: user-manual.txt:3075 msgid "Under _Print type_ select one of two options:" msgstr "" #. type: Plain text -#: user-manual.txt:2909 +#: user-manual.txt:3077 msgid "" "_Dive list print_: Print dives from the *Dive List* panel with profiles and " "other information." msgstr "" #. type: Plain text -#: user-manual.txt:2910 +#: user-manual.txt:3078 msgid "_Statistics print_: Print yearly statistics of the dives." msgstr "" #. type: Plain text -#: user-manual.txt:2912 +#: user-manual.txt:3080 msgid "Under _Print options_ select:" msgstr "" #. type: Plain text -#: user-manual.txt:2917 +#: user-manual.txt:3085 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 " @@ -5737,73 +6166,73 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2919 +#: user-manual.txt:3087 msgid "" "Printing in color, done by checking the box with _Print in color_. If this " "check box is not checked, printing is in black and white." msgstr "" #. type: Plain text -#: user-manual.txt:2922 +#: user-manual.txt:3090 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:2924 +#: user-manual.txt:3092 msgid "_Table_: This prints a summary table of all dives selected (see below)." msgstr "" #. type: Target for macro image -#: user-manual.txt:2925 +#: user-manual.txt:3093 #, no-wrap msgid "images/Print_summarylist_f22.jpg" msgstr "images/Print_summarylist_f22.jpg" #. type: Plain text -#: user-manual.txt:2928 +#: user-manual.txt:3096 msgid "" "_Flow layout_: Print the text associated with each dive without printing the " "dive profiles" msgstr "" #. type: Plain text -#: user-manual.txt:2929 +#: user-manual.txt:3097 msgid "of each dive (see below):" msgstr "" #. type: Target for macro image -#: user-manual.txt:2930 +#: user-manual.txt:3098 #, no-wrap msgid "images/Print_flow_layout_f22.jpg" msgstr "images/Print_flow_layout_f22.jpg" #. type: Plain text -#: user-manual.txt:2933 +#: user-manual.txt:3101 msgid "" "_One Dive_: Print one dive per page, also showing the dive profile (see " "below)" msgstr "" #. type: Target for macro image -#: user-manual.txt:2934 +#: user-manual.txt:3102 #, no-wrap msgid "images/print2_f22.jpg" msgstr "images/print2_f22.jpg" #. type: Plain text -#: user-manual.txt:2938 +#: user-manual.txt:3106 msgid "_Two Dives_: Print two dives per page, also showing the dive profiles." msgstr "" #. type: Plain text -#: user-manual.txt:2939 +#: user-manual.txt:3107 msgid "_Six Dives_: Print six dives per page, also showing the dive profiles." msgstr "" #. type: Plain text -#: user-manual.txt:2943 +#: user-manual.txt:3111 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 " @@ -5812,7 +6241,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2947 +#: user-manual.txt:3115 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 " @@ -5821,13 +6250,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2948 +#: user-manual.txt:3116 #, no-wrap msgid "images/Print_print_f22.jpg" msgstr "images/Print_print_f22.jpg" #. type: Plain text -#: user-manual.txt:2953 +#: user-manual.txt:3121 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 " @@ -5836,19 +6265,19 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2954 +#: user-manual.txt:3122 #, no-wrap msgid "images/Printpreview.jpg" msgstr "images/Printpreview.jpg" #. type: Title === -#: user-manual.txt:2956 +#: user-manual.txt:3124 #, no-wrap msgid "Writing a custom print template (advanced)" msgstr "Créer un modèle d'impression personnalisé (avancé)" #. type: Plain text -#: user-manual.txt:2962 +#: user-manual.txt:3130 msgid "" "Writing a custom template is an effective way to produce highly customized " "printouts. Subsurface uses HTML templates to render printing. You can create " @@ -5859,13 +6288,25 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:2964 +#: user-manual.txt:3132 #, no-wrap msgid "Configuring a dive computer" msgstr "Configurer un ordinateur de plongée" #. type: Plain text -#: user-manual.txt:2973 +#: user-manual.txt:3140 +#, fuzzy +#| msgid "" +#| "_Subsurface_ lets you configure a dive computer. Currently the Heinrichs-" +#| "Weikamp (OSTC 2, OSTC 3) and Suunto Vyper (Stinger, Mosquito, D3, Vyper, " +#| "Vytec, Cobra, Gekko and Zoop) family of dive computers are supported. A " +#| "large number of settings of these dive computers can be read and changed " +#| "to different values. To begin, be sure the appropriate hardware driver is " +#| "installed for the dive computer (also required for downloading dives) and " +#| "the device name of the dive computer is known. See " +#| "<<_appendix_a_operating_system_specific_information_for_importing_dive " +#| "_information_from_a_dive_computer,APPENDIX A>> for information on how to " +#| "do this." msgid "" "_Subsurface_ lets you configure a dive computer. Currently the Heinrichs-" "Weikamp (OSTC 2, OSTC 3) and Suunto Vyper (Stinger, Mosquito, D3, Vyper, " @@ -5874,9 +6315,8 @@ msgid "" "different values. To begin, be sure the appropriate hardware driver is " "installed for the dive computer (also required for downloading dives) and " "the device name of the dive computer is known. See " -"<<_appendix_a_operating_system_specific_information_for_importing_dive " -"_information_from_a_dive_computer,APPENDIX A>> for information on how to do " -"this." +"<<_appendix_a_operating_system_specific_information_for_importing_dive_information_from_a_dive_computer," +"APPENDIX A>> for information on how to do this." msgstr "" "_Subsurface_ vous permet de configurer un ordinateur de plongée. " "Actuellement, les familles d'ordinateurs supportés sont Heinrichs-Weikamp " @@ -5890,7 +6330,7 @@ msgstr "" "ANNEXE A>> pour plus d'informations sur la manière de procéder." #. type: Plain text -#: user-manual.txt:2979 +#: user-manual.txt:3146 msgid "" "Once the dive computer is connected to the _Subsurface_ computer, select " "_File -> Configure dive computer_ from the _Main Menu_. Select the " @@ -5906,13 +6346,13 @@ msgstr "" "gauche (voir l'image ci-dessous)." #. type: Target for macro image -#: user-manual.txt:2980 +#: user-manual.txt:3147 #, no-wrap msgid "images/Configure_dc_f20.jpg" msgstr "images/Configure_dc_f20.jpg" #. type: Plain text -#: user-manual.txt:2983 +#: user-manual.txt:3150 msgid "" "Using the appropriate buttons on the configuration panel, the following " "actions can be done:" @@ -5921,7 +6361,7 @@ msgstr "" "suivantes peuvent être effectuées :" #. type: Plain text -#: user-manual.txt:2986 +#: user-manual.txt:3153 #, no-wrap msgid "" "*Retrieve available details*. This loads the existing configuration from the dive computer\n" @@ -5931,7 +6371,7 @@ msgstr "" "dans _Subsurface_, en l'affichant dans le panneau de configuration.\n" #. type: Plain text -#: user-manual.txt:2988 +#: user-manual.txt:3155 #, no-wrap msgid "" "*Save changes to device*. This changes the configuration of the\n" @@ -5941,7 +6381,7 @@ msgstr "" "de plongée pour correspondre aux informations affichées dans le panneau de configuration.\n" #. type: Plain text -#: user-manual.txt:2990 +#: user-manual.txt:3157 #, no-wrap msgid "" "*Backup*. This saves the configuration data to a file. _Subsurface_ asks for\n" @@ -5951,7 +6391,7 @@ msgstr "" "l'emplacement et le nom du fichier pour enregistrer les informations.\n" #. type: Plain text -#: user-manual.txt:2992 +#: user-manual.txt:3159 #, no-wrap msgid "" "*Restore backup*. This loads the information from a backup file and displays it\n" @@ -5961,7 +6401,7 @@ msgstr "" "dans le panneau de configuration.\n" #. type: Plain text -#: user-manual.txt:2994 +#: user-manual.txt:3161 #, no-wrap msgid "" "*Update firmware*. If new firmware is available for the dive computer, this is\n" @@ -5971,13 +6411,13 @@ msgstr "" "il sera chargé dans l'ordinateur de plongée.\n" #. type: Title == -#: user-manual.txt:2997 +#: user-manual.txt:3164 #, no-wrap msgid "Setting user _Preferences_ for _Subsurface_" msgstr "" #. type: Plain text -#: user-manual.txt:3008 +#: user-manual.txt:3175 msgid "" "There are several user-definable settings within _Subsurface_, found by " "selecting _File -> Preferences_, mostly affecting the way in which " @@ -5991,24 +6431,24 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3009 +#: user-manual.txt:3176 #, no-wrap msgid "Defaults" msgstr "" #. type: Plain text -#: user-manual.txt:3012 +#: user-manual.txt:3179 msgid "There are several headings in the *Defaults* panel:" msgstr "" #. type: Target for macro image -#: user-manual.txt:3013 +#: user-manual.txt:3180 #, no-wrap msgid "images/Pref1_f23.jpg" msgstr "images/Pref1_f23.jpg" #. type: Plain text -#: user-manual.txt:3017 +#: user-manual.txt:3184 #, no-wrap msgid "" " ** *Lists and tables*: Specify the font type and font size of the\n" @@ -6016,7 +6456,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3022 +#: user-manual.txt:3189 #, no-wrap msgid "" " ** *Dives*: For the _Default Dive Log File_ specify the directory and\n" @@ -6026,19 +6466,19 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3023 +#: user-manual.txt:3190 #, no-wrap msgid "_No default file_: When checked, _Subsurface_ does not automatically load a dive log at startup.\n" msgstr "" #. type: Plain text -#: user-manual.txt:3024 +#: user-manual.txt:3191 #, no-wrap msgid "_Local default file_: When checked, _Subsurface_ automatically loads a dive log from the local hard disk.\n" msgstr "" #. type: Plain text -#: user-manual.txt:3026 +#: user-manual.txt:3193 #, no-wrap msgid "" "_Cloud storage default file_: When checked, _Subsurface automatically loads the dive log from the cloud\n" @@ -6046,13 +6486,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3028 +#: user-manual.txt:3195 #, no-wrap msgid "** *Display invalid*: Dives can be marked as invalid (when a user wishes to hide\n" msgstr "" #. type: Plain text -#: user-manual.txt:3031 +#: user-manual.txt:3198 #, no-wrap msgid "" "dives that he/she doesn't consider valid dives, e.g. pool dives, but still want to\n" @@ -6061,25 +6501,25 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3033 +#: user-manual.txt:3200 #, no-wrap msgid "** *Default cylinder*: From the dropdown list, select the default cylinder to be used in\n" msgstr "" #. type: Plain text -#: user-manual.txt:3034 +#: user-manual.txt:3201 #, no-wrap msgid "the *Equipment* tab of the *Notes* panel.\n" msgstr "" #. type: Plain text -#: user-manual.txt:3036 +#: user-manual.txt:3203 #, no-wrap msgid "** *Animations*: Some actions in showing the dive profile are performed using\n" msgstr "" #. type: Plain text -#: user-manual.txt:3042 +#: user-manual.txt:3209 #, no-wrap msgid "" "animations. For instance, the axis values for depth and time change from dive to\n" @@ -6091,31 +6531,31 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3044 +#: user-manual.txt:3211 #, no-wrap msgid "** *Clear all settings*: As indicated in the button below this heading, all settings are\n" msgstr "" #. type: Plain text -#: user-manual.txt:3045 +#: user-manual.txt:3212 #, no-wrap msgid "cleared and set to default values.\n" msgstr "" #. type: Title === -#: user-manual.txt:3046 +#: user-manual.txt:3213 #, no-wrap msgid "Units" msgstr "" #. type: Target for macro image -#: user-manual.txt:3047 +#: user-manual.txt:3214 #, no-wrap msgid "images/Pref2_f23.jpg" msgstr "images/Pref2_f23.jpg" #. type: Plain text -#: user-manual.txt:3054 +#: user-manual.txt:3221 msgid "" "Choose between metric and imperial units of depth, pressure, volume, " "temperature and mass. By selecting the Metric or Imperial radio button at " @@ -6126,7 +6566,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3060 +#: user-manual.txt:3227 msgid "" "Regardless of the above settings, dive time measurements can be either in " "seconds or minutes. Choose the appropriate option. GPS coordinates can be " @@ -6135,24 +6575,24 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3061 +#: user-manual.txt:3228 #, no-wrap msgid "Graph" msgstr "" #. type: Plain text -#: user-manual.txt:3063 +#: user-manual.txt:3230 msgid "This panel has three sections:" msgstr "" #. type: Target for macro image -#: user-manual.txt:3065 +#: user-manual.txt:3232 #, no-wrap msgid "images/Pref4_f23.jpg" msgstr "images/Pref4_f23.jpg" #. type: Plain text -#: user-manual.txt:3078 +#: user-manual.txt:3245 #, no-wrap msgid "" "*Gas pressure display setup*. Even though nitrogen and helium pressures are also included here, these items mainly pertain to oxygen management:\n" @@ -6168,13 +6608,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3080 +#: user-manual.txt:3247 #, no-wrap msgid "** CCR Options: These options determine oxygen management for CCR dives:\n" msgstr "" #. type: Plain text -#: user-manual.txt:3085 +#: user-manual.txt:3252 #, no-wrap msgid "" "*** _Dive planner default setpoint_: Specify the O~2~ setpoint for a\n" @@ -6184,7 +6624,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3089 +#: user-manual.txt:3256 #, no-wrap msgid "" "*** _CCR: Show setpoints when viewing pO2:_ With this checkbox activated, the pO~2~\n" @@ -6193,7 +6633,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3093 +#: user-manual.txt:3260 #, no-wrap msgid "" "*** _CCR: Show individual O~2~ sensor values when viewing pO~2~:_ Show the pO~2~\n" @@ -6202,19 +6642,19 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3095 +#: user-manual.txt:3262 #, no-wrap msgid "*Ceiling display setup*. These settings mostly deal with nitrogen and helium management\n" msgstr "" #. type: Plain text -#: user-manual.txt:3096 +#: user-manual.txt:3263 #, no-wrap msgid "by determining how the decompression ceiling (ascent ceiling) is calculated and displayed:\n" msgstr "" #. type: Plain text -#: user-manual.txt:3103 +#: user-manual.txt:3270 #, no-wrap msgid "" "** _Draw dive computer reported ceiling red_: This checkbox does exactly what it says. By default\n" @@ -6226,7 +6666,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3108 +#: user-manual.txt:3275 #, no-wrap msgid "" "** _Algorithm for calculating ceiling_. Choose between the Bühlmann Z1H-L16\n" @@ -6236,7 +6676,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3124 +#: user-manual.txt:3291 #, no-wrap msgid "" "*** Bühlmann: Set the _gradient factors_ (GFlow and GFHigh) for calculcating the deco ceiling following\n" @@ -6255,7 +6695,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3131 +#: user-manual.txt:3298 #, no-wrap msgid "" " ** _pSCR options_. These preferences determine how passive semi-closed circuit (pSCR) dives\n" @@ -6263,7 +6703,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3135 +#: user-manual.txt:3302 #, no-wrap msgid "" " *** _Metabolic rate:_ this is the\n" @@ -6272,7 +6712,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3138 +#: user-manual.txt:3305 #, no-wrap msgid "" " *** _pSCR ratio:_ The dilution ratio (or dump ratio) is the ratio of gas released to the\n" @@ -6280,13 +6720,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3140 +#: user-manual.txt:3307 #, no-wrap msgid "*Misc*\n" msgstr "" #. type: Plain text -#: user-manual.txt:3147 +#: user-manual.txt:3314 #, no-wrap msgid "" "** _Show unused cylinders in Equipment Tab_: This checkbox allows display of information about unused cylinders when viewing the\n" @@ -6298,24 +6738,24 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3149 +#: user-manual.txt:3316 #, no-wrap msgid "Language" msgstr "" #. type: Plain text -#: user-manual.txt:3151 +#: user-manual.txt:3318 msgid "Choose a language that _Subsurface_ will use." msgstr "" #. type: Target for macro image -#: user-manual.txt:3152 +#: user-manual.txt:3319 #, no-wrap msgid "images/Pref3_f23.jpg" msgstr "images/Pref3_f23.jpg" #. type: Plain text -#: user-manual.txt:3161 +#: user-manual.txt:3328 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 " @@ -6327,20 +6767,20 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3163 +#: user-manual.txt:3330 msgid "" "In this section also specify appropriate date an time formats for showing " "dive details." msgstr "" #. type: Title === -#: user-manual.txt:3164 +#: user-manual.txt:3331 #, no-wrap msgid "Network" msgstr "" #. type: Plain text -#: user-manual.txt:3171 +#: user-manual.txt:3338 msgid "" "This panel facilitates communication between _Subsurface_ and data sources " "on the Internet. This is important, for instance, when _Subsurface_ needs " @@ -6351,18 +6791,18 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:3172 +#: user-manual.txt:3339 #, no-wrap msgid "images/Pref5_f23.jpg" msgstr "images/Pref5_f23.jpg" #. type: Plain text -#: user-manual.txt:3175 +#: user-manual.txt:3342 msgid "This dialogue has three sections:" msgstr "" #. type: Plain text -#: user-manual.txt:3183 +#: user-manual.txt:3350 #, no-wrap msgid "" "** _Proxy type_:\n" @@ -6375,7 +6815,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3188 +#: user-manual.txt:3355 #, no-wrap msgid "" "** _Subsurface cloud storage_: To store your dive log in the cloud, a valid email address\n" @@ -6385,31 +6825,31 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3189 +#: user-manual.txt:3356 #, no-wrap msgid "_Sync to cloud in the background_: This option allows saving of dive information to the cloud storage\n" msgstr "" #. type: Plain text -#: user-manual.txt:3190 +#: user-manual.txt:3357 #, no-wrap msgid "while you do other things within _Subsurface_.\n" msgstr "" #. type: Plain text -#: user-manual.txt:3191 +#: user-manual.txt:3358 #, no-wrap msgid "_Save password locally_: This allows local storage of the cloud storage password. Note that this\n" msgstr "" #. type: Plain text -#: user-manual.txt:3192 +#: user-manual.txt:3359 #, no-wrap msgid "information is saved in raw text form, not encoded in any way.\n" msgstr "" #. type: Plain text -#: user-manual.txt:3196 +#: user-manual.txt:3363 #, no-wrap msgid "" "** _Subsurface web service_: When you subscribe to the <<S_Companion,Subsurface web service>>, a very\n" @@ -6418,13 +6858,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3197 +#: user-manual.txt:3364 #, no-wrap msgid "Georeference" msgstr "" #. type: Plain text -#: user-manual.txt:3205 +#: user-manual.txt:3372 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 " @@ -6437,19 +6877,19 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:3206 +#: user-manual.txt:3373 #, no-wrap msgid "images/Pref7_f23.jpg" msgstr "images/Pref7_f23.jpg" #. type: Title == -#: user-manual.txt:3209 +#: user-manual.txt:3376 #, no-wrap msgid "The _Subsurface_ dive planner" msgstr "" #. type: Plain text -#: user-manual.txt:3214 +#: user-manual.txt:3381 msgid "" "Dive planning is an advanced feature of _Subsurface_, accessed by selecting " "_Log -> Plan Dive_ from the main menu. It allows calculation of inert gas " @@ -6458,7 +6898,7 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:3222 +#: user-manual.txt:3389 msgid "" "The _Subsurface_ dive planner IS CURRENTLY EXPERIMENTAL and assumes the user " "is already familiar with the _Subsurface_ user interface. It is explicitly " @@ -6466,19 +6906,19 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:3225 +#: user-manual.txt:3392 msgid "" "The user is conversant with dive planning and has the necessary training to " "perform dive planning." msgstr "" #. type: delimited block * -#: user-manual.txt:3226 +#: user-manual.txt:3393 msgid "The user plans dives within his/her certification limits." msgstr "" #. type: delimited block * -#: user-manual.txt:3229 +#: user-manual.txt:3396 msgid "" "Dive planning makes large assumptions about the characteristics of the " "_average person_ and cannot compensate for individual physiology or health " @@ -6486,32 +6926,32 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:3230 +#: user-manual.txt:3397 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:3231 +#: user-manual.txt:3398 msgid "The user is familiar with the user interface of _Subsurface_." msgstr "" #. type: delimited block * -#: user-manual.txt:3233 +#: user-manual.txt:3400 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:3235 +#: user-manual.txt:3402 #, no-wrap msgid "The _Subsurface_ dive planner screen" msgstr "" #. type: Plain text -#: user-manual.txt:3240 +#: user-manual.txt:3407 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 " @@ -6520,7 +6960,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3244 +#: user-manual.txt:3411 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 " @@ -6529,7 +6969,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3248 +#: user-manual.txt:3415 msgid "" "At the bottom right is a text panel with a heading of _Dive Plan Details_. " "This is where the details of the dive plan are provided in a way that can " @@ -6538,26 +6978,26 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:3249 +#: user-manual.txt:3416 #, no-wrap msgid "images/PlannerWindow1_f20.jpg" msgstr "images/PlannerWindow1_f20.jpg" #. type: Title === -#: user-manual.txt:3252 +#: user-manual.txt:3419 #, no-wrap msgid "Open circuit dives" msgstr "" #. type: Plain text -#: user-manual.txt:3255 +#: user-manual.txt:3422 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:3258 +#: user-manual.txt:3425 #, no-wrap msgid "" "** Open Circuit (the default)\n" @@ -6566,12 +7006,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3260 +#: user-manual.txt:3427 msgid "Choose the Open Circuit option." msgstr "" #. type: Plain text -#: user-manual.txt:3264 +#: user-manual.txt:3431 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 " @@ -6581,7 +7021,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3273 +#: user-manual.txt:3440 msgid "" "In the table labelled _Available Gases_, add the information of the " "cylinders to be used as well as the gas composition within that cylinder. " @@ -6596,30 +7036,30 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3275 +#: user-manual.txt:3442 msgid "The _Available Gases_ table includes three gas depth fields, labelled:" msgstr "" #. type: Plain text -#: user-manual.txt:3276 +#: user-manual.txt:3443 #, no-wrap msgid "** Deco switch at: the switch depth for deco gases. Unless overridden by the user, this will be\n" msgstr "" #. type: Plain text -#: user-manual.txt:3277 +#: user-manual.txt:3444 #, no-wrap msgid "automatically calculated based on the Deco pO₂ preference (default 1.6 bar)\n" msgstr "" #. type: Plain text -#: user-manual.txt:3278 +#: user-manual.txt:3445 #, no-wrap msgid "** Bot. MOD: the gas Maximum Operating Depth (MOD) if it is used as a bottom mix. Automatically\n" msgstr "" #. type: Plain text -#: user-manual.txt:3280 +#: user-manual.txt:3447 #, no-wrap msgid "" "calculated based on the Bottom pO₂ preference (default 1.4 bar). Editing this field will modify the\n" @@ -6627,13 +7067,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3281 +#: user-manual.txt:3448 #, no-wrap msgid "** MND: the gas Maximum Narcotic Depth (MND). Automatically calculated based on the Best Mix END\n" msgstr "" #. type: Plain text -#: user-manual.txt:3283 +#: user-manual.txt:3450 #, no-wrap msgid "" "preference (default 30m / 98 ft). Editing this field will modify the He% according to the depth set.\n" @@ -6641,12 +7081,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3285 +#: user-manual.txt:3452 msgid "The profile of the planned dive can be created in two ways:" msgstr "" #. type: Plain text -#: user-manual.txt:3290 +#: user-manual.txt:3457 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 " @@ -6656,7 +7096,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3298 +#: user-manual.txt:3465 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 " @@ -6670,13 +7110,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:3299 +#: user-manual.txt:3466 #, no-wrap msgid "Recreational dives" msgstr "" #. type: Plain text -#: user-manual.txt:3316 +#: user-manual.txt:3483 #, no-wrap msgid "" "Recreational mode is what comes closest to planning a dive based on the non-decompression limit (NDL).\n" @@ -6697,21 +7137,21 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3319 +#: user-manual.txt:3486 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:3322 +#: user-manual.txt:3489 msgid "" "Immediately under the heading _Planning_ are two checkboxes _Recreational_ " "and _Safety Stop_. Check these two boxes." msgstr "" #. type: Plain text -#: user-manual.txt:3326 +#: user-manual.txt:3493 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 " @@ -6719,7 +7159,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3331 +#: user-manual.txt:3498 msgid "" "The planner calculates whether the specified cylinder contains enough air/" "gas to complete the planned dive. In order for this to be accurate, under " @@ -6729,7 +7169,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3340 +#: user-manual.txt:3507 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 " @@ -6746,7 +7186,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3348 +#: user-manual.txt:3515 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 " @@ -6759,14 +7199,14 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3351 +#: user-manual.txt:3518 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:3359 +#: user-manual.txt:3526 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 " @@ -6782,7 +7222,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3363 +#: user-manual.txt:3530 msgid "" "Below is an image of a dive plan for a recreational dive at 30 meters. " "Although the no-deco limit (NDL) is 23 minutes, the duration of the dive is " @@ -6792,26 +7232,26 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:3364 +#: user-manual.txt:3531 #, no-wrap msgid "images/rec_diveplan.jpg" msgstr "images/rec_diveplan.jpg" #. type: Title ==== -#: user-manual.txt:3366 +#: user-manual.txt:3533 #, no-wrap msgid "Non-recreational open circuit dives, including decompression" msgstr "" #. type: Plain text -#: user-manual.txt:3370 +#: user-manual.txt:3537 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:3382 +#: user-manual.txt:3549 #, no-wrap msgid "" "*a) Nitrogen management*: This is done by specifying the rates for descent and ascent,\n" @@ -6828,7 +7268,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3388 +#: user-manual.txt:3555 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 " @@ -6841,12 +7281,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3390 +#: user-manual.txt:3557 msgid "For more information external to this manual see:" msgstr "" #. type: Plain text -#: user-manual.txt:3392 +#: user-manual.txt:3559 msgid "" "link:http://www.tek-dive.com/portal/upload/M-Values.pdf[Understanding M-" "values by Erik Baker, _Immersed_ Vol. 3, No. 3.]" @@ -6855,7 +7295,7 @@ msgstr "" "values by Erik Baker, _Immersed_ Vol. 3, No. 3.]" #. type: Plain text -#: user-manual.txt:3393 +#: user-manual.txt:3560 msgid "" "link:http://www.rebreatherworld.com/general-and-new-to-rebreather-" "articles/5037-gradient-factors-for-dummies.html[Gradient factors for " @@ -6866,7 +7306,7 @@ msgstr "" "dummies, by Kevin Watts]" #. type: Plain text -#: user-manual.txt:3395 +#: user-manual.txt:3562 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" @@ -6881,7 +7321,7 @@ msgstr "" "traite à la fois des modèles de décompression Bühlmann et VPM-B." #. type: Plain text -#: user-manual.txt:3403 +#: user-manual.txt:3570 msgid "" "The ascent rate is critical for nitrogen off-gassing at the end of the dive " "and is specified for several depth ranges, using the mean depth as a " @@ -6894,7 +7334,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3411 +#: user-manual.txt:3578 #, no-wrap msgid "" "*b) Oxygen management*: In the *Gas Options* part of the dive specification, the maximum partial\n" @@ -6907,7 +7347,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3428 +#: user-manual.txt:3595 #, no-wrap msgid "" "*c) Gas management*: With open-circuit dives this is a primary\n" @@ -6929,7 +7369,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3440 +#: user-manual.txt:3607 msgid "" "Now you can start the detailed time-depth planning of the dive. _Subsurface_ " "offers an unique graphical interface for doing planning. The mechanics are " @@ -6947,7 +7387,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3452 +#: user-manual.txt:3619 msgid "" "Each waypoint on the dive profile creates a _Dive Planner Point_ in the " "table on the left of the dive planner panel. Ensure the _Used Gas_ value in " @@ -6964,7 +7404,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3460 +#: user-manual.txt:3627 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 " @@ -6976,7 +7416,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3469 +#: user-manual.txt:3636 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 " @@ -6989,20 +7429,20 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3472 +#: user-manual.txt:3639 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:3473 +#: user-manual.txt:3640 #, no-wrap msgid "images/DivePlanner2_f20.jpg" msgstr "images/DivePlanner2_f20.jpg" #. type: Plain text -#: user-manual.txt:3478 +#: user-manual.txt:3645 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 " @@ -7010,13 +7450,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3480 +#: user-manual.txt:3647 #, no-wrap msgid "*The dive plan details*\n" msgstr "" #. type: Plain text -#: user-manual.txt:3488 +#: user-manual.txt:3655 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 " @@ -7029,7 +7469,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3493 +#: user-manual.txt:3660 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 " @@ -7039,13 +7479,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3494 +#: user-manual.txt:3661 #, no-wrap msgid "Planning pSCR dives" msgstr "" #. type: Plain text -#: user-manual.txt:3509 +#: user-manual.txt:3676 #, no-wrap msgid "" "To plan a dive using a passive semi-closed rebreather (pSCR), select _pSCR_ rather than\n" @@ -7064,26 +7504,26 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:3510 +#: user-manual.txt:3677 #, no-wrap msgid "images/Planner_pSCR1_f20.jpg" msgstr "images/Planner_pSCR1_f20.jpg" #. type: Title === -#: user-manual.txt:3513 +#: user-manual.txt:3680 #, no-wrap msgid "Planning CCR dives" msgstr "" #. type: Plain text -#: user-manual.txt:3517 +#: user-manual.txt:3684 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:3521 +#: user-manual.txt:3688 #, no-wrap msgid "" "*Available gases*: In the _Available gases_ table, enter the cylinder information for the\n" @@ -7092,7 +7532,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3531 +#: user-manual.txt:3698 #, no-wrap msgid "" "*Entering setpoints*: Specify a default setpoint in the Preferences tab, by selecting _File -> Preferences -> Graph_ from\n" @@ -7107,32 +7547,32 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3533 +#: user-manual.txt:3700 msgid "" "The dive profile for a CCR dive may look something like the image below." msgstr "" #. type: Target for macro image -#: user-manual.txt:3534 +#: user-manual.txt:3701 #, no-wrap msgid "images/Planner_CCR1_f20.jpg" msgstr "images/Planner_CCR1_f20.jpg" #. type: Plain text -#: user-manual.txt:3538 +#: user-manual.txt:3705 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:3540 +#: user-manual.txt:3707 #, no-wrap msgid "Modifying an existing dive plan" msgstr "" #. type: Plain text -#: user-manual.txt:3547 +#: user-manual.txt:3714 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 " @@ -7143,7 +7583,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3553 +#: user-manual.txt:3720 msgid "" "In addition, there is the option \"Save new\". This keeps the original " "planned dive and adds a (possibly modified, - earlier dives are now taken " @@ -7154,13 +7594,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3554 +#: user-manual.txt:3721 #, no-wrap msgid "Planning for repetitive dives" msgstr "" #. type: Plain text -#: user-manual.txt:3561 +#: user-manual.txt:3728 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 " @@ -7169,7 +7609,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3567 +#: user-manual.txt:3734 msgid "" "If you have just completed a long/deep dive and are planning another dive, " "then highlight, in the *Dive List*, the dive that has just been logged then " @@ -7179,7 +7619,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3572 +#: user-manual.txt:3739 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 " @@ -7189,13 +7629,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3573 +#: user-manual.txt:3740 #, no-wrap msgid "Printing the dive plan" msgstr "" #. type: Plain text -#: user-manual.txt:3578 +#: user-manual.txt:3745 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 " @@ -7203,7 +7643,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3588 +#: user-manual.txt:3755 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 " @@ -7218,14 +7658,110 @@ msgid "" "processor." msgstr "" +#. type: Title === +#: user-manual.txt:3757 +#, no-wrap +msgid "Saving a dive with its dive plan" +msgstr "" + +#. type: Plain text +#: user-manual.txt:3764 +msgid "" +"In the section dealing with <<S_MultipleDiveComputers, dives using more than " +"one dive computer>> we discussed the way in which multiple profiles for a " +"single dive can be viewed using the left-arrow and right-arrow keyboard " +"keys. A similar method can be used for saving a dive plan with the profile " +"of the actual dive, once this has been uploaded into _Subsurface_. In order " +"to do this:" +msgstr "" + +#. type: Plain text +#: user-manual.txt:3766 +msgid "Do the dive planning and save the final plan in the _Dive List_." +msgstr "" + +#. type: Plain text +#: user-manual.txt:3767 +#, fuzzy +#| msgid "Disconnect the USB cable from the dive computer" +msgid "After diving, upload the dive data from the dive computer." +msgstr "Déconnecter le cable USB de l'ordinateur de plongée" + +#. type: Plain text +#: user-manual.txt:3769 +msgid "" +"Change the date and time of the _dive plan_ to coincide with that of the " +"real-life dive from the _dive computer_." +msgstr "" + +#. type: Plain text +#: user-manual.txt:3772 +msgid "" +"In the _Dive List_, highlight the dive plan as well as the data for the real " +"dive and merge the two dives, making use of the Dive List Context Menu " +"(available by righ-clicking a dive)." +msgstr "" + +#. type: Plain text +#: user-manual.txt:3776 +msgid "" +"The text version of the dive plan is appended to the Notes in the _Notes " +"Tab_. With this merged dive highlighted in the _Dive List_, switch between " +"the planned profile and the real-life profile using the righ-arrow/left-" +"arrow keyboard keys." +msgstr "" + +#. type: Title == +#: user-manual.txt:3777 +#, no-wrap +msgid "Running _Subsurface_ from the command-line" +msgstr "" + +#. type: Plain text +#: user-manual.txt:3781 +msgid "" +"_Subsurface_ can be launched from the command-line to set some specialised " +"settings or as part of an script-based automated process for manipulating a " +"dive log. The format for launching _Subsurface_ from the command-line is:" +msgstr "" + +#. type: Plain text +#: user-manual.txt:3783 +#, no-wrap +msgid "\tsubsurface [options] [logfile ...] [--import logfile ...]\n" +msgstr "" + +#. type: Plain text +#: user-manual.txt:3785 +msgid "The options include:" +msgstr "" + +#. type: delimited block | +#: user-manual.txt:3798 +#, no-wrap +msgid "" +"|*Command-line option*|*Description*\n" +"|--help|Print a summary of the command-line options\n" +"| -h|Print a summary of the command-line options\n" +"|--import logfile ...|A file name before this option is treated as an existing dive log, everything after is imported into the existing dive log\n" +"|--verbose|Print debug information while running _Subsurface_\n" +"| -v|Print debug information while running _Subsurface_\n" +"| -v -v| Print even more debug information while running _Subsurface_\n" +"|--version|Prints the current version of _Subsurface_.\n" +"|--survey|Opens the xref:S_UserSurvey[user survey] immediately after starting _Subsurface_\n" +"|--user=<username>|Choose the xref:S_user_space[configuration space] of user <username>\n" +"|--cloud-timeout=<duration>|Set the timeout for cloud connection (0 < duration < 60). This enables longer timeouts for slow Internet connections\n" +"|--win32console|Create a dedicated console if needed (Windows only). Add this option before everything else\n" +msgstr "" + #. type: Title == -#: user-manual.txt:3589 +#: user-manual.txt:3800 #, no-wrap msgid "Description of the Subsurface Main Menu items" msgstr "Description des éléments du menu principal de Subsurface" #. type: Plain text -#: user-manual.txt:3594 +#: user-manual.txt:3805 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 " @@ -7236,13 +7772,13 @@ msgstr "" "des sections de ce manuel traitant des opérations relatives." #. type: Title === -#: user-manual.txt:3595 +#: user-manual.txt:3806 #, no-wrap msgid "File" msgstr "Fichier" #. type: Plain text -#: user-manual.txt:3598 +#: user-manual.txt:3809 msgid "" "<<S_NewLogbook,_New Logbook_>> - Close the currently open dive logbook and " "clear all dive information." @@ -7251,7 +7787,7 @@ msgstr "" "actuellement ouvert et supprime toutes les informations de plongées." #. type: Plain text -#: user-manual.txt:3600 +#: user-manual.txt:3811 msgid "" "_Open logbook_ - Open the file manager to select a dive logbook to open." msgstr "" @@ -7259,44 +7795,44 @@ msgstr "" "carnet de plongée à ouvrir." #. type: Plain text -#: user-manual.txt:3601 +#: user-manual.txt:3812 msgid "_Save_ - Save the dive logbook currently open." msgstr "_Sauvegarder_ - Enregistrer le carnet de plongée actuellement ouvert." #. type: Plain text -#: user-manual.txt:3602 +#: user-manual.txt:3813 msgid "_Save as_ - Save the current logbook under a different file name." msgstr "" "_Enregsitrer sous_ - Enregistrer le carnet actuel sous un nom différent." #. type: Plain text -#: user-manual.txt:3603 +#: user-manual.txt:3814 msgid "" "_Open cloud storage_ - Open the dive log previously saved in " "<<S_Cloud_storage,_Cloud storage_>>." msgstr "" #. type: Plain text -#: user-manual.txt:3604 +#: user-manual.txt:3815 msgid "" "_Save to cloud storage_ - Save the current dive log to <<S_Cloud_storage," "_Cloud storage_>>." msgstr "" #. type: Plain text -#: user-manual.txt:3605 +#: user-manual.txt:3816 msgid "" "_Take cloud storage online_ - " "******************************************************" msgstr "" #. type: Plain text -#: user-manual.txt:3606 +#: user-manual.txt:3817 msgid "_Close_ - Close the dive logbook currently open." msgstr "_Fermer_ - Fermer le carnet de plongée actuellement ouvert." #. type: Plain text -#: user-manual.txt:3608 +#: user-manual.txt:3819 msgid "" "<<S_ExportLog,_Export_>> - Export the currently open dive logbook (or the " "selected dives in the logbook) to one of several formats." @@ -7306,34 +7842,34 @@ msgstr "" "formats." #. type: Plain text -#: user-manual.txt:3609 +#: user-manual.txt:3820 msgid "<<S_PrintDivelog,_Print_>> - Print the currently open logbook." msgstr "" "<<S_PrintDivelog,_Imprimer_>> - Imprimer le carnet de plongée actuellement " "ouvert." #. type: Plain text -#: user-manual.txt:3610 +#: user-manual.txt:3821 msgid "<<S_Preferences,_Preferences_>> - Set the _Subsurface_ preferences." msgstr "" "<<S_Preferences,_Préférences_>> - Définir les préférences de _Subsurface_." #. type: Plain text -#: user-manual.txt:3611 +#: user-manual.txt:3822 msgid "" "<<S_FindMovedImages, _Find moved images_>> - If photos taken during dives " "have been moved to" msgstr "" #. type: Plain text -#: user-manual.txt:3612 +#: user-manual.txt:3823 msgid "" "a different disk or directory, locate them and link them to the appropriate " "dives." msgstr "" #. type: Plain text -#: user-manual.txt:3613 +#: user-manual.txt:3824 msgid "" "<<S_Configure,_Configure dive computer_>> - Edit the configuration of a dive " "computer." @@ -7342,30 +7878,30 @@ msgstr "" "configuration d'un ordinateur de plongée." #. type: Plain text -#: user-manual.txt:3614 +#: user-manual.txt:3825 msgid "_Quit_ - Quit _Subsurface_." msgstr "_Quitter_ - Quitter _Subsurface_." #. type: Title === -#: user-manual.txt:3616 +#: user-manual.txt:3827 #, no-wrap msgid "Edit" msgstr "" #. type: Plain text -#: user-manual.txt:3618 +#: user-manual.txt:3829 msgid "" "The Edit option allows one to undo or redo an action, e.g. deleting dives." msgstr "" #. type: Title === -#: user-manual.txt:3619 +#: user-manual.txt:3830 #, no-wrap msgid "Import" msgstr "Importer" #. type: Plain text -#: user-manual.txt:3622 +#: user-manual.txt:3833 msgid "" "<<S_ImportDiveComputer,_Import from dive computer_>> - Import dive " "information from a dive computer." @@ -7374,7 +7910,7 @@ msgstr "" "Importer des informations de plongées à partir de l'ordinateur de plongée." #. type: Plain text -#: user-manual.txt:3624 +#: user-manual.txt:3835 msgid "" "<<Unified_import,_Import Log Files_>> - Import dive information from a file " "in in a _Subsurface_-compatible format." @@ -7384,7 +7920,7 @@ msgstr "" "_Subsurface_." #. type: Plain text -#: user-manual.txt:3626 +#: user-manual.txt:3837 msgid "" "<<S_Companion,_Import GPS data from Subsurface web service_>> - Load GPS " "coordinates from the _Subsurface_ mobile phone app." @@ -7394,7 +7930,7 @@ msgstr "" "(téléphones et tablettes)." #. type: Plain text -#: user-manual.txt:3628 +#: user-manual.txt:3839 msgid "" "<<S_ImportingDivelogsDe,_Import from Divelogs.de_>> - Import dive " "information from _www.Divelogs.de_." @@ -7403,13 +7939,13 @@ msgstr "" "informations de plongées à partir de _www.Divelogs.de_." #. type: Title === -#: user-manual.txt:3629 +#: user-manual.txt:3840 #, no-wrap msgid "Log" msgstr "Journal (log)" #. type: Plain text -#: user-manual.txt:3631 +#: user-manual.txt:3842 msgid "" "<<S_EnterData,_Add Dive_>> - Manually add a new dive to the *Dive List* " "panel." @@ -7418,19 +7954,19 @@ msgstr "" "plongée au panneau de la *liste des plongées*." #. type: Plain text -#: user-manual.txt:3632 +#: user-manual.txt:3843 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:3633 +#: user-manual.txt:3844 msgid "<<S_DivePlanner,_Plan Dive_>> - Plan dives." msgstr "<<S_DivePlanner,_Planifier une plongée_>> - Planifier des plongées." #. type: Plain text -#: user-manual.txt:3634 +#: user-manual.txt:3845 msgid "" "<<S_Replan,_Edit dive in planner_>> - Edit a dive plan that has been saved " "into the *Dive List*." @@ -7439,7 +7975,7 @@ msgstr "" "plongée planifiée qui a été enregistrée dans la *liste des plongées*." #. type: Plain text -#: user-manual.txt:3636 +#: user-manual.txt:3847 msgid "" "<<S_CopyComponents,_Copy dive components_>> - Copy information from several " "fields of a dive log onto the clipboard." @@ -7449,7 +7985,7 @@ msgstr "" "papier." #. type: Plain text -#: user-manual.txt:3638 +#: user-manual.txt:3849 msgid "" "_Paste dive components_ - Paste, into the selected dives in the *Dive List*, " "the information copied using the _Copy dive components_ option." @@ -7459,7 +7995,7 @@ msgstr "" "préalable avec l'option _Copier les composants de la plongée_." #. type: Plain text -#: user-manual.txt:3640 +#: user-manual.txt:3851 msgid "" "<<S_Renumber,_Renumber_>> - Renumber the dives listed in the *Dive List* " "panel." @@ -7468,7 +8004,7 @@ msgstr "" "le panneau de la *liste des plongées*." #. type: Plain text -#: user-manual.txt:3642 +#: user-manual.txt:3853 msgid "" "<<S_Group,_Auto Group_>> - Group the dives in the *Dive List* panel into " "dive trips." @@ -7477,7 +8013,7 @@ msgstr "" "*liste des plongées* dans des voyages de plongées." #. type: Plain text -#: user-manual.txt:3643 +#: user-manual.txt:3854 msgid "" "<<S_DeviceNames,_Edit Device Names_>> - Edit the names of dive computers to " "coordinate your logs." @@ -7486,7 +8022,7 @@ msgstr "" "les noms des ordinateurs de plongée pour coordonner vos journaux (logs)." #. type: Plain text -#: user-manual.txt:3644 +#: user-manual.txt:3855 msgid "" "<<S_Filter,_Filter divelist_>> - Select only some dives, based on specific " "tags or dive criteria." @@ -7495,13 +8031,13 @@ msgstr "" "certaines plongées, à partir de tags ou de critères de plongées." #. type: Title === -#: user-manual.txt:3645 +#: user-manual.txt:3856 #, no-wrap msgid "View" msgstr "Vue" #. type: Plain text -#: user-manual.txt:3648 +#: user-manual.txt:3859 msgid "" "<<S_ViewPanels,_All_>> - View the four main _Subsurface_ panels all at once." msgstr "" @@ -7509,33 +8045,33 @@ msgstr "" "_Subsurface_ simultanément." #. type: Plain text -#: user-manual.txt:3649 +#: user-manual.txt:3860 msgid "<<S_ViewPanels,_Dive List_>> - View only the *Dive List* panel." msgstr "" "<<S_ViewPanels,_Liste des plongées_>> - Affiche uniquement le panneau de la " "*liste des plongées*." #. type: Plain text -#: user-manual.txt:3650 +#: user-manual.txt:3861 msgid "<<S_ViewPanels,_Profile_>> - View only the *Dive Profile* panel." msgstr "" "<<S_ViewPanels,_Profil_>> - Affiche uniquement le panneau du *profil de la " "plongée*." #. type: Plain text -#: user-manual.txt:3651 +#: user-manual.txt:3862 msgid "<<S_ViewPanels,_Info_>> - View only the *Notes* panel." msgstr "<<S_ViewPanels,_Info_>> - Affiche uniquement le panneau des *notes*." #. type: Plain text -#: user-manual.txt:3652 +#: user-manual.txt:3863 msgid "<<S_ViewPanels,_Globe_>> - View only the *World Map* panel." msgstr "" "<<S_ViewPanels,_Globe_>> - Affiche uniquement le panneau de la *carte " "mondiale*." #. type: Plain text -#: user-manual.txt:3654 +#: user-manual.txt:3865 msgid "" "_Yearly Statistics_ - Display summary statistics about dives during this and " "past years." @@ -7544,30 +8080,32 @@ msgstr "" "plongées effectuées." #. type: Plain text -#: user-manual.txt:3655 +#: user-manual.txt:3868 msgid "" "_Prev DC_ - Switch to data from previous dive computer, if a single dive was " -"logged from more than one." +"logged from more than one. See the sections on <<S_MultipleDiveComputers," +"using multiple dive computers for the same dive>> and <<S_MergeDivePlan, " +"Saving an uploaded dive with its dive plan>>." msgstr "" #. type: Plain text -#: user-manual.txt:3656 +#: user-manual.txt:3869 msgid "_Next DC_ - Switch to next dive computer." msgstr "_Ordinateur suivant_ - Passer à l'ordinateur de plongée suivant." #. type: Plain text -#: user-manual.txt:3657 +#: user-manual.txt:3870 msgid "_Full Screen_ - Toggles Full Screen mode." msgstr "_Plein écran_ - Passer en mode plein écran." #. type: Title === -#: user-manual.txt:3658 +#: user-manual.txt:3871 #, no-wrap msgid "Share on" msgstr "" #. type: Plain text -#: user-manual.txt:3660 +#: user-manual.txt:3873 msgid "" "<<S_Facebook,_Facebook_>> - Share the currently selected dive on your " "Facebook timeline." @@ -7576,13 +8114,13 @@ msgstr "" "Facebook." #. type: Title === -#: user-manual.txt:3661 +#: user-manual.txt:3874 #, no-wrap msgid "Help" msgstr "Aide" #. type: Plain text -#: user-manual.txt:3664 +#: user-manual.txt:3877 msgid "" "_About Subsurface_ - Show a panel with the version number of _Subsurface_ as " "well as licensing information." @@ -7591,7 +8129,7 @@ msgstr "" "_Subsurface_ ainsi que les informations de licence." #. type: Plain text -#: user-manual.txt:3666 +#: user-manual.txt:3879 msgid "" "_Check for updates_ - Find out whether a newer version of Subsurface is " "available on the http://subsurface-divelog.org/[_Subsurface_ web site]." @@ -7601,7 +8139,7 @@ msgstr "" "_Subsurface_ ]." #. type: Plain text -#: user-manual.txt:3668 +#: user-manual.txt:3881 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 " @@ -7612,31 +8150,31 @@ msgstr "" "sondage, si vos habitudes de plongées ont changées." #. type: Plain text -#: user-manual.txt:3669 +#: user-manual.txt:3882 msgid "_User manual_ - Open a window showing this user manual." msgstr "" "_Manuel utilisateur_ - Ouvre une fenêtre affichant ce manuel utilisateur." #. type: Title == -#: user-manual.txt:3672 +#: user-manual.txt:3885 #, no-wrap msgid "APPENDIX A: Operating system specific information for importing dive information from a dive computer." msgstr "ANNEXE A : informations spécifiques au système d'exploitation utilisé pour importer les informations de plongées depuis un ordinateur de plongée." #. type: Title === -#: user-manual.txt:3674 +#: user-manual.txt:3887 #, no-wrap msgid "Make sure that the OS has the required drivers installed" msgstr "Assurez-vous que les pilotes (drivers) nécessaires sont installés" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:3675 +#: user-manual.txt:3888 #, no-wrap msgid "images/icons/drivers.jpg" msgstr "images/icons/drivers.jpg" #. type: Plain text -#: user-manual.txt:3680 +#: user-manual.txt:3893 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 " @@ -7647,7 +8185,7 @@ msgstr "" "l'ordinateur de plongée (Bluetooth, USB, infra-rouge)." #. type: Plain text -#: user-manual.txt:3686 +#: user-manual.txt:3899 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 " @@ -7661,7 +8199,7 @@ msgstr "" "particulièrement pour certaines technologies telles que l'infra-rouge." #. type: Plain text -#: user-manual.txt:3690 +#: user-manual.txt:3903 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 " @@ -7672,7 +8210,7 @@ msgstr "" "port USB de son ordinateur de bureau." #. type: Plain text -#: user-manual.txt:3697 +#: user-manual.txt:3910 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 " @@ -7690,19 +8228,19 @@ msgstr "" "documents et logiciels Silicon Labs]." #. type: Title === -#: user-manual.txt:3699 +#: user-manual.txt:3912 #, no-wrap msgid "How to Find the Device Name for USB devices and set its write permission" msgstr "Comment trouver le nom du périphérique branché sur USB et paramétrer les permissions en écriture" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:3700 +#: user-manual.txt:3913 #, no-wrap msgid "images/icons/usb.jpg" msgstr "images/icons/usb.jpg" #. type: Plain text -#: user-manual.txt:3708 +#: user-manual.txt:3921 msgid "" "When connecting a dive computer by using a USB connector, usually " "_Subsurface_ will either propose a drop down list with the correct device " @@ -7718,7 +8256,7 @@ msgstr "" "de votre périphérique ;" #. type: Plain text -#: user-manual.txt:3713 +#: user-manual.txt:3926 msgid "" "Simply try COM1, COM2, etc. The drop down list should contain all connected " "COM devices." @@ -7727,56 +8265,56 @@ msgstr "" "tous les périphériques COM connectés." #. type: Title ==== -#: user-manual.txt:3714 user-manual.txt:3812 +#: user-manual.txt:3927 user-manual.txt:4025 #, no-wrap msgid "On MacOS:" msgstr "Sur MacOS :" #. type: Plain text -#: user-manual.txt:3717 +#: user-manual.txt:3930 msgid "The drop down box should find all connected dive computers." msgstr "" "La liste déroulante devrait contenir tous les ordinateurs de plongée " "connectés." #. type: Block title -#: user-manual.txt:3718 +#: user-manual.txt:3931 #, no-wrap msgid "On Linux:" msgstr "Sur Linux :" #. type: Plain text -#: user-manual.txt:3721 +#: user-manual.txt:3934 msgid "There is a definitive way to find the port:" msgstr "Il existe un moyen sûr de trouver le port :" #. type: Plain text -#: user-manual.txt:3723 +#: user-manual.txt:3936 msgid "Disconnect the USB cable from the dive computer" msgstr "Déconnecter le cable USB de l'ordinateur de plongée" #. type: Plain text -#: user-manual.txt:3724 +#: user-manual.txt:3937 msgid "Open a terminal" msgstr "Ouvrir un terminal" #. type: Plain text -#: user-manual.txt:3725 user-manual.txt:3727 +#: user-manual.txt:3938 user-manual.txt:3940 msgid "Type the command: 'dmesg' and press enter" msgstr "Taper la commande 'dmesg' et appuyer sur la touche Entrer" #. type: Plain text -#: user-manual.txt:3726 +#: user-manual.txt:3939 msgid "Plug in the USB cable of the dive computer" msgstr "Connecter le cable USB de l'ordinateur de plongée" #. type: Plain text -#: user-manual.txt:3729 +#: user-manual.txt:3942 msgid "A message similar to this one should appear:" msgstr "Un message similaire à celui-ci devrait apparaitre :" #. type: Plain text -#: user-manual.txt:3745 +#: user-manual.txt:3958 #, no-wrap msgid "" "\tusb 2-1.1: new full speed USB device number 14 using ehci_hcd\n" @@ -7812,7 +8350,7 @@ msgstr "" "\tftdi_sio: v1.6.0:USB FTDI Serial Converters Driver\n" #. type: Plain text -#: user-manual.txt:3750 +#: user-manual.txt:3963 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 " @@ -7824,14 +8362,14 @@ msgstr "" "que Subsurface utilise le bon port USB." #. type: Plain text -#: user-manual.txt:3752 +#: user-manual.txt:3965 msgid "Ensuring the user has write permission to the USB serial port:" msgstr "" "S'assurer que l'utilisateur possède les droits d'écriture sur le port série " "USB :" #. type: Plain text -#: user-manual.txt:3762 +#: user-manual.txt:3975 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 " @@ -7851,7 +8389,7 @@ msgstr "" "USB. Admettons que votre nom d'utilisateur soit 'johnB'." #. type: Plain text -#: user-manual.txt:3766 +#: user-manual.txt:3979 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." @@ -7861,7 +8399,7 @@ msgstr "" "+dialout+." #. type: Plain text -#: user-manual.txt:3771 +#: user-manual.txt:3984 #, no-wrap msgid "" "Type: +id johnB+ This lists all the groups that johnB belongs to and\n" @@ -7877,7 +8415,7 @@ msgstr "" "parmi les différents IDs.\n" #. type: Plain text -#: user-manual.txt:3773 +#: user-manual.txt:3986 #, no-wrap msgid "" "Under some circumstances this change takes only effect (eg. on Ubuntu) after\n" @@ -7887,7 +8425,7 @@ msgstr "" "puis reconnexion sur l'ordinateur (sous Ubuntu, par exemple).\n" #. type: Plain text -#: user-manual.txt:3778 +#: user-manual.txt:3991 msgid "" "With the appropriate device name (e.g. +dev/ttyUSB3+) and with write " "permission to the USB port, the dive computer interface can connect and you " @@ -7898,13 +8436,13 @@ msgstr "" "vous devriez pouvoir importer vos plongées." #. type: Title === -#: user-manual.txt:3781 +#: user-manual.txt:3994 #, no-wrap msgid "Manually setting up Bluetooth enabled devices" msgstr "" #. type: Plain text -#: user-manual.txt:3788 +#: user-manual.txt:4001 msgid "" "For dive computers communicating through Bluetooth like the Heinrichs " "Weikamp Frog or the Shearwater Predator, Petrel and Nerd there is a " @@ -7913,13 +8451,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3790 +#: user-manual.txt:4003 #, no-wrap msgid "*For the dive computer, after enabling Bluetooth, be sure it is in Upload mode.*\n" msgstr "" #. type: Plain text -#: user-manual.txt:3794 +#: user-manual.txt:4007 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 -> " @@ -7927,13 +8465,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3796 +#: user-manual.txt:4009 #, no-wrap msgid "*Pair the _Subsurface_ computer with the dive computer.*\n" msgstr "" #. type: Plain text -#: user-manual.txt:3805 +#: user-manual.txt:4018 msgid "" "Bluetooth is most likely already enabled. For pairing with the dive computer " "choose _Control Panel -> Bluetooth Devices -> Add Wireless Device_. This " @@ -7945,21 +8483,21 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3808 +#: user-manual.txt:4021 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:3811 +#: user-manual.txt:4024 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:3818 +#: user-manual.txt:4031 msgid "" "Click on the Bluetooth symbol in the menu bar and select _Set up Bluetooth " "Device..._. The dive computer should then show up in the list of devices. " @@ -7968,20 +8506,20 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3821 +#: user-manual.txt:4034 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:3822 +#: user-manual.txt:4035 #, no-wrap msgid "On Linux" msgstr "Sur Linux" #. type: Plain text -#: user-manual.txt:3830 +#: user-manual.txt:4043 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 " @@ -7993,7 +8531,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3834 +#: user-manual.txt:4047 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 " @@ -8002,23 +8540,23 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3836 +#: user-manual.txt:4049 msgid "Enable the Bluetooth controller and pair your dive computer" msgstr "" #. type: Plain text -#: user-manual.txt:3837 +#: user-manual.txt:4050 msgid "Establish an RFCOMM connection" msgstr "" #. type: Title ===== -#: user-manual.txt:3838 user-manual.txt:3978 +#: user-manual.txt:4051 user-manual.txt:4191 #, no-wrap msgid "Download the dives with Subsurface" msgstr "" #. type: Plain text -#: user-manual.txt:3844 +#: user-manual.txt:4057 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 " @@ -8029,7 +8567,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3849 +#: user-manual.txt:4062 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 " @@ -8039,23 +8577,23 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3851 +#: user-manual.txt:4064 msgid "+sudo usermod -a -G dialout username+" msgstr "" #. type: Plain text -#: user-manual.txt:3853 +#: user-manual.txt:4066 msgid "Then log out and log in for the change to take effect." msgstr "" #. type: Title ===== -#: user-manual.txt:3854 +#: user-manual.txt:4067 #, no-wrap msgid "Enabling the Bluetooth controller and pairing your dive computer" msgstr "" #. type: Plain text -#: user-manual.txt:3860 +#: user-manual.txt:4073 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 " @@ -8066,14 +8604,14 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3863 +#: user-manual.txt:4076 msgid "" "If the graphical method doesn't work, pair the device from the command line. " "Open a terminal and use +hciconfig+ to check the Bluetooth controller status" msgstr "" #. type: Plain text -#: user-manual.txt:3870 +#: user-manual.txt:4083 #, no-wrap msgid "" "\t$ hciconfig\n" @@ -8085,7 +8623,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3875 +#: user-manual.txt:4088 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 " @@ -8095,7 +8633,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3883 +#: user-manual.txt:4096 #, no-wrap msgid "" "\tsudo hciconfig hci0 up auth+ (enter password when prompted)\n" @@ -8108,25 +8646,25 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3885 +#: user-manual.txt:4098 msgid "Check that the status now includes +'UP', 'RUNNING' AND 'AUTH'+." msgstr "" #. type: Plain text -#: user-manual.txt:3887 +#: user-manual.txt:4100 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:3889 +#: user-manual.txt:4102 #, no-wrap msgid "\tsudo hciconfig hci1 down\n" msgstr "" #. type: Plain text -#: user-manual.txt:3892 +#: user-manual.txt:4105 msgid "" "Next step is to 'trust' and 'pair' the dive computer. On distros with Bluez " "5, such as Fedora 22, you can use a tool called +blutootctl+, which will " @@ -8134,7 +8672,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3913 +#: user-manual.txt:4126 #, no-wrap msgid "" "\tbluetoothctl\n" @@ -8160,14 +8698,14 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3916 +#: user-manual.txt:4129 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:3919 +#: user-manual.txt:4132 msgid "" "If the system has Bluez version 4 (e.g. Ubuntu 12.04 through to 15.04), " "there is probably not a +bluetoothctl+, but a script called +bluez-simple-" @@ -8175,7 +8713,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3924 +#: user-manual.txt:4137 #, no-wrap msgid "" "\thcitool -i hci0 scanning\n" @@ -8185,94 +8723,94 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3926 +#: user-manual.txt:4139 msgid "Once ther dive computer is pired, set up the RFCOMM connection" msgstr "" #. type: Title ===== -#: user-manual.txt:3927 +#: user-manual.txt:4140 #, no-wrap msgid "Establishing the RFCOMM connection" msgstr "" #. type: Plain text -#: user-manual.txt:3930 +#: user-manual.txt:4143 msgid "The command to establish an RFCOMM connection is:" msgstr "" #. type: Plain text -#: user-manual.txt:3932 +#: user-manual.txt:4145 msgid "+sudo rfcomm -i <controller> connect <dev> <bdaddr> [channel]+" msgstr "" #. type: Plain text -#: user-manual.txt:3934 +#: user-manual.txt:4147 msgid "+<controller>+ is the Bluetooth controller, +hci0+." msgstr "" #. type: Plain text -#: user-manual.txt:3935 +#: user-manual.txt:4148 msgid "+<dev>+ is the RFCOMM device file, +rfcomm0+" msgstr "" #. type: Plain text -#: user-manual.txt:3936 +#: user-manual.txt:4149 msgid "+<bdaddr>+ is the dive computer's MAC address, +00:11:22:33:44:55+" msgstr "" #. type: Plain text -#: user-manual.txt:3937 +#: user-manual.txt:4150 msgid "" "+[channel]+ is the dive computer's Bluetooth channel we need to connect to." msgstr "" #. type: Plain text -#: user-manual.txt:3940 +#: user-manual.txt:4153 msgid "" "If you omit it, channel 1 is assumed. Based on a limited number of user " "reports, the appropriate channel for the dive computer is probably:" msgstr "" #. type: Plain text -#: user-manual.txt:3942 +#: user-manual.txt:4155 msgid "_Shearwater Petrel 1_: channel 1" msgstr "" #. type: Plain text -#: user-manual.txt:3943 +#: user-manual.txt:4156 msgid "_Shearwater Petrel 2_: channel 5" msgstr "" #. type: Plain text -#: user-manual.txt:3944 +#: user-manual.txt:4157 msgid "_Shearwater Nerd_: channel 5" msgstr "" #. type: Plain text -#: user-manual.txt:3945 +#: user-manual.txt:4158 msgid "_Heinrichs-Weikamp OSTC Sport_: channel 1" msgstr "" #. type: Plain text -#: user-manual.txt:3947 +#: user-manual.txt:4160 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:3949 +#: user-manual.txt:4162 #, no-wrap msgid "\tsudo rfcomm -i hci0 connect rfcomm0 00:11:22:33:44:55 5 (enter a password, probably 0000, when prompted)\n" msgstr "" #. type: Plain text -#: user-manual.txt:3951 +#: user-manual.txt:4164 msgid "This gives the response:" msgstr "" #. type: Plain text -#: user-manual.txt:3954 +#: user-manual.txt:4167 #, no-wrap msgid "" "\tConnected /dev/rfcomm0 to 00:11:22:33:44:55 on channel 5\n" @@ -8280,14 +8818,14 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3956 +#: user-manual.txt:4169 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:3960 +#: user-manual.txt:4173 #, no-wrap msgid "" "\tsudo rfcomm -i hci0 connect rfcomm0 00:11:22:33:44:55 (enter a password, probably 0000, when prompted)\n" @@ -8296,7 +8834,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3964 +#: user-manual.txt:4177 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 " @@ -8305,7 +8843,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3974 +#: user-manual.txt:4187 #, no-wrap msgid "" "\tsdptool -i hci0 records 00:11:22:33:44:55\n" @@ -8320,7 +8858,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3977 +#: user-manual.txt:4190 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 " @@ -8328,7 +8866,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3980 +#: user-manual.txt:4193 msgid "" "After establishing the RFCOMM connection and while the dive computer's " "upload mode countdown is still running, go to_Subsurface_, select _Import-" @@ -8338,25 +8876,25 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:3986 +#: user-manual.txt:4199 #, no-wrap msgid "APPENDIX B: Dive Computer specific information for importing dive data." msgstr "" #. type: Title === -#: user-manual.txt:3989 +#: user-manual.txt:4202 #, no-wrap msgid "Importing from Uemis Zurich" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:3991 +#: user-manual.txt:4204 #, no-wrap msgid "images/icons/iumis.jpg" msgstr "images/icons/iumis.jpg" #. type: Plain text -#: user-manual.txt:4007 +#: user-manual.txt:4220 msgid "" "_Subsurface_ downloads the information stored on the SDA (the built-in file " "system of the Uemis) including information about dive spots and equipment. " @@ -8372,7 +8910,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4022 +#: user-manual.txt:4235 msgid "" "After selecting the above device name, download the dives from the Uemis " "Zurich. One technical issue with the Uemis Zurich download implementation " @@ -8389,19 +8927,19 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4024 +#: user-manual.txt:4237 #, no-wrap msgid "Importing from Uwatec Galileo" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4026 +#: user-manual.txt:4239 #, no-wrap msgid "images/icons/Galileo.jpg" msgstr "images/icons/Galileo.jpg" #. type: Plain text -#: user-manual.txt:4041 +#: user-manual.txt:4254 msgid "" "The Uwatec Galileo dive computers use infra red (IrDA) communication between " "the dive computer and Subsurface. The Uwatec hardware uses a USB dongle " @@ -8417,14 +8955,14 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4044 +#: user-manual.txt:4257 msgid "" "After executing this command, Subsurface will recognize the Galileo dive " "computer and download dive information." msgstr "" #. type: Plain text -#: user-manual.txt:4050 +#: user-manual.txt:4263 msgid "" "Under Windows, a similar situation exists. Drivers for the MCS7780 are " "available from some Internet web sites e.g. http://www.drivers-download.com/" @@ -8434,26 +8972,26 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4053 +#: user-manual.txt:4266 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:4055 +#: user-manual.txt:4268 #, no-wrap msgid "Importing from Heinrichs Weikamp DR5" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4057 +#: user-manual.txt:4270 #, no-wrap msgid "images/icons/HW_DR5.jpg" msgstr "images/icons/HW_DR5.jpg" #. type: Plain text -#: user-manual.txt:4067 +#: user-manual.txt:4280 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. " @@ -8466,19 +9004,19 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4070 +#: user-manual.txt:4283 #, no-wrap msgid "Importing from xDEEP BLACK" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4072 +#: user-manual.txt:4285 #, no-wrap msgid "images/icons/HW_xdeepblack.jpg" msgstr "images/icons/HW_xdeepblack.jpg" #. type: Plain text -#: user-manual.txt:4081 +#: user-manual.txt:4294 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 " @@ -8492,19 +9030,19 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4083 +#: user-manual.txt:4296 #, no-wrap msgid "Importing from Shearwater Predator/Petrel/Nerd using Bluetooth" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4085 +#: user-manual.txt:4298 #, no-wrap msgid "images/icons/predator.jpg" msgstr "images/icons/predator.jpg" #. type: Plain text -#: user-manual.txt:4088 +#: user-manual.txt:4301 msgid "" "Specific instructions for downloading dives using Bluetooth are given in the " "section above, <<S_Bluetooth,_Connecting Subsurface to a Bluetooth-enabled " @@ -8512,19 +9050,19 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4090 +#: user-manual.txt:4303 #, no-wrap msgid "Importing from Poseidon MkVI Discovery" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4092 +#: user-manual.txt:4305 #, no-wrap msgid "images/MkVI.jpeg" msgstr "images/MkVI.jpeg" #. type: Plain text -#: user-manual.txt:4100 +#: user-manual.txt:4313 msgid "" "Download of dive logs from the MkVI is performed using a custom " "communications adapter and the _Poseidon PC Configuration Software_, " @@ -8536,45 +9074,45 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4103 +#: user-manual.txt:4316 msgid "" "Setup configuration for the dive and key dive parameters (file with a .txt " "extension)" msgstr "" #. type: Plain text -#: user-manual.txt:4104 +#: user-manual.txt:4317 msgid "Dive log details (file with a .csv extension)" msgstr "" #. type: Plain text -#: user-manual.txt:4106 +#: user-manual.txt:4319 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:4108 +#: user-manual.txt:4321 msgid "" "_Subsurface_ accesses the .txt and the .csv files to get dive log " "information." msgstr "" #. type: Title === -#: user-manual.txt:4110 +#: user-manual.txt:4323 #, no-wrap msgid "Importing from APD Inspiration/Evolution CCR" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4112 +#: user-manual.txt:4325 #, no-wrap msgid "images/APDComputer.jpg" msgstr "images/APDComputer.jpg" #. type: Plain text -#: user-manual.txt:4120 +#: user-manual.txt:4333 msgid "" "The dive logs of an APD Inspiration or similar CCR dive computer are " "downloaded using a communications adapter and _AP Communicator_, obtained " @@ -8586,55 +9124,55 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4122 +#: user-manual.txt:4335 msgid "Download the dive using _AP Communicator_." msgstr "" #. type: Plain text -#: user-manual.txt:4123 +#: user-manual.txt:4336 msgid "Open a dive within the _AP Log Viewer_." msgstr "" #. type: Plain text -#: user-manual.txt:4124 +#: user-manual.txt:4337 msgid "Select the tab at the top of the screen, entitled \"_Data_\"." msgstr "" #. type: Plain text -#: user-manual.txt:4125 +#: user-manual.txt:4338 msgid "" "With the raw dive log data show on the screen, click on \"_Copy to Clipboard_" "\"." msgstr "" #. type: Plain text -#: user-manual.txt:4126 +#: user-manual.txt:4339 msgid "Open a text editor, e.g. Notepad (Windows) or TextWrangler (Mac)." msgstr "" #. type: Plain text -#: user-manual.txt:4128 +#: user-manual.txt:4341 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:4129 +#: user-manual.txt:4342 msgid "" "Within _Subsurface_, select _Import -> Import log files_ to open the xref:" "Unified_import[universal import dialogue]." msgstr "" #. type: Plain text -#: user-manual.txt:4130 +#: user-manual.txt:4343 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:4134 +#: user-manual.txt:4347 #, no-wrap msgid "" "On the list of file names select the _.apd_ file created. An import\n" @@ -8644,13 +9182,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:4135 +#: user-manual.txt:4348 #, no-wrap msgid "images/APD_CSVimportF22.jpg" msgstr "images/APD_CSVimportF22.jpg" #. type: Plain text -#: user-manual.txt:4143 +#: user-manual.txt:4356 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 " @@ -8662,12 +9200,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4144 +#: user-manual.txt:4357 msgid "Click the _Ok_ button at the bottom of the import panel." msgstr "" #. type: Plain text -#: user-manual.txt:4149 +#: user-manual.txt:4362 msgid "" "The APD dive log will appear within _Subsurface_. The dive computer- " "generated ceiling provided by the Inspiration can be viewed by selecting the " @@ -8677,13 +9215,13 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:4150 +#: user-manual.txt:4363 #, no-wrap msgid "APPENDIX C: Exporting Dive log information from external dive log software." msgstr "" #. type: Plain text -#: user-manual.txt:4159 +#: user-manual.txt:4372 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, " @@ -8693,22 +9231,22 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4161 +#: user-manual.txt:4374 msgid "Export the foreign dive log data to format that is accessible from" msgstr "" #. type: Plain text -#: user-manual.txt:4162 +#: user-manual.txt:4375 msgid "_Subsurface_." msgstr "" #. type: Plain text -#: user-manual.txt:4163 +#: user-manual.txt:4376 msgid "Import the accessible dive log data into _Subsurface_." msgstr "" #. type: Plain text -#: user-manual.txt:4167 +#: user-manual.txt:4380 msgid "" "This appendix provides some information about approaches to export dive log " "data from foreign dive log software. The procedures below mostly apply to " @@ -8716,19 +9254,19 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4169 +#: user-manual.txt:4382 #, no-wrap msgid "Exporting from *Suunto Divemanager (DM3, DM4 or DM5)*" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4170 +#: user-manual.txt:4383 #, no-wrap msgid "images/icons/suuntologo.jpg" msgstr "images/icons/suuntologo.jpg" #. type: Plain text -#: user-manual.txt:4177 +#: user-manual.txt:4390 msgid "" "DiveManager is a MS Windows application for Suunto dive computers. " "Divemanager 3 (DM3) is an older version of the Suunto software. More recent " @@ -8738,66 +9276,66 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4179 +#: user-manual.txt:4392 #, no-wrap msgid "*Divemanager 3 (DM3):*\n" msgstr "" #. type: Plain text -#: user-manual.txt:4181 +#: user-manual.txt:4394 msgid "" "Start 'Suunto Divemanager 3' and log in with the name containing the logs" msgstr "" #. type: Plain text -#: user-manual.txt:4182 +#: user-manual.txt:4395 msgid "Do not start the import wizard to import dives from the dive computer." msgstr "" #. type: Plain text -#: user-manual.txt:4184 +#: user-manual.txt:4397 msgid "" "In the navigation tree on the left side of the program-window, select the " "appropriate dives." msgstr "" #. type: Plain text -#: user-manual.txt:4185 +#: user-manual.txt:4398 msgid "" "Within the list of dives, select the dives you would like to import later:" msgstr "" #. type: Plain text -#: user-manual.txt:4186 +#: user-manual.txt:4399 msgid "To select certain dives: hold 'ctrl' and click the dive" msgstr "" #. type: Plain text -#: user-manual.txt:4188 +#: user-manual.txt:4401 msgid "" "To select all dives: Select the first dive, hold down shift and select the " "last dive" msgstr "" #. type: Plain text -#: user-manual.txt:4189 +#: user-manual.txt:4402 msgid "With the dives marked, use the program menu _File -> Export_" msgstr "" #. type: Plain text -#: user-manual.txt:4190 +#: user-manual.txt:4403 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:4191 +#: user-manual.txt:4404 msgid "Click the browse button next to the field Export Path" msgstr "" #. type: Plain text -#: user-manual.txt:4193 +#: user-manual.txt:4406 #, no-wrap msgid "" "** A file-manager like window pops up\n" @@ -8805,13 +9343,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4194 +#: user-manual.txt:4407 #, no-wrap msgid "Divelog.SDE file\n" msgstr "" #. type: Plain text -#: user-manual.txt:4196 +#: user-manual.txt:4409 #, no-wrap msgid "" "** Optionally change the name of the file for saving\n" @@ -8819,25 +9357,25 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4197 +#: user-manual.txt:4410 #, no-wrap msgid "Back in the Export pop-up, press the button 'Export'\n" msgstr "" #. type: Plain text -#: user-manual.txt:4198 +#: user-manual.txt:4411 #, no-wrap msgid "The dives are now exported to the file Divelog.SDE.\n" msgstr "" #. type: Plain text -#: user-manual.txt:4200 +#: user-manual.txt:4413 #, no-wrap msgid "*Divemanager 4 (DM4) and Divemanager 5 (DM5):*\n" msgstr "" #. type: Plain text -#: user-manual.txt:4205 +#: user-manual.txt:4418 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 " @@ -8846,81 +9384,81 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4207 +#: user-manual.txt:4420 msgid "Locating the Suunto DM4 (or DM5) database:" msgstr "" #. type: Plain text -#: user-manual.txt:4209 user-manual.txt:4218 +#: user-manual.txt:4422 user-manual.txt:4431 msgid "Start Suunto DM4/DM5" msgstr "" #. type: Plain text -#: user-manual.txt:4210 +#: user-manual.txt:4423 msgid "Select 'Help -> About'" msgstr "" #. type: Plain text -#: user-manual.txt:4211 +#: user-manual.txt:4424 msgid "Click 'Copy' after text 'Copy log folder path to clipboard'" msgstr "" #. type: Plain text -#: user-manual.txt:4212 +#: user-manual.txt:4425 msgid "Open Windows Explorer" msgstr "Ouvrir l'explorateur Windows" #. type: Plain text -#: user-manual.txt:4213 +#: user-manual.txt:4426 msgid "Paste the address to the path box at the top of the File Explorer" msgstr "" #. type: Plain text -#: user-manual.txt:4214 +#: user-manual.txt:4427 msgid "The database is called DM4.db or DM5.db" msgstr "" #. type: Plain text -#: user-manual.txt:4216 +#: user-manual.txt:4429 msgid "Making a backup copy of the Suunto DM4/DM5 database:" msgstr "" #. type: Plain text -#: user-manual.txt:4219 +#: user-manual.txt:4432 msgid "Select 'File - Create backup'" msgstr "" #. type: Plain text -#: user-manual.txt:4221 +#: user-manual.txt:4434 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:4222 +#: user-manual.txt:4435 msgid "Click 'Save'" msgstr "" #. type: Plain text -#: user-manual.txt:4223 +#: user-manual.txt:4436 msgid "The dives are now exported to the file DM4.bak (or DM5.bak)" msgstr "" #. type: Title === -#: user-manual.txt:4225 +#: user-manual.txt:4438 #, no-wrap msgid "Exporting from Atomic Logbook" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4228 +#: user-manual.txt:4441 #, no-wrap msgid "images/icons/atomiclogo.jpg" msgstr "images/icons/atomiclogo.jpg" #. type: Plain text -#: user-manual.txt:4235 +#: user-manual.txt:4448 msgid "" "Atomic Logbook is a Windows software by Atomic Aquatics. It allows " "downloading of dive information from Cobalt and Cobalt 2 dive computers. " @@ -8930,19 +9468,19 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4237 +#: user-manual.txt:4450 #, no-wrap msgid "Exporting from Mares Dive Organiser V2.1" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4240 +#: user-manual.txt:4453 #, no-wrap msgid "images/icons/mareslogo.jpg" msgstr "images/icons/mareslogo.jpg" #. type: Plain text -#: user-manual.txt:4248 +#: user-manual.txt:4461 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 " @@ -8953,7 +9491,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4253 +#: user-manual.txt:4466 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 " @@ -8961,36 +9499,36 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4256 +#: user-manual.txt:4469 msgid "" "Rename the file to DiveOrganizerxxxxx.zip. Inside the zipped directory is a " "file _DiveOrganizer.sdf_." msgstr "" #. type: Plain text -#: user-manual.txt:4257 +#: user-manual.txt:4470 msgid "Extract the _.sdf_ file from the zipped folder to your Desktop." msgstr "" #. type: Plain text -#: user-manual.txt:4258 +#: user-manual.txt:4471 msgid "The password for accessing the .zip file is _mares_." msgstr "" #. type: Title === -#: user-manual.txt:4260 +#: user-manual.txt:4473 #, no-wrap msgid "Exporting from *DivingLog 5.0 and 6.0*" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4262 +#: user-manual.txt:4475 #, no-wrap msgid "images/icons/divingloglogo.jpg" msgstr "images/icons/divingloglogo.jpg" #. type: Plain text -#: user-manual.txt:4269 +#: user-manual.txt:4482 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 " @@ -9000,37 +9538,37 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4271 +#: user-manual.txt:4484 msgid "To transfer all files from DivingLog to Subsurface:" msgstr "" #. type: Plain text -#: user-manual.txt:4273 +#: user-manual.txt:4486 msgid "In DivingLog open the 'File -> Export -> SQLite' menu" msgstr "" #. type: Plain text -#: user-manual.txt:4274 +#: user-manual.txt:4487 msgid "Select 'Settings' button" msgstr "" #. type: Plain text -#: user-manual.txt:4275 +#: user-manual.txt:4488 msgid "Set the 'RTF2Plaintext' to 'true'" msgstr "" #. type: Plain text -#: user-manual.txt:4276 +#: user-manual.txt:4489 msgid "Close the Settings dialog" msgstr "" #. type: Plain text -#: user-manual.txt:4277 +#: user-manual.txt:4490 msgid "Click 'Export' button and select the filename" msgstr "" #. type: Plain text -#: user-manual.txt:4281 +#: user-manual.txt:4494 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 " @@ -9038,13 +9576,13 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:4282 +#: user-manual.txt:4495 #, no-wrap msgid "APPENDIX D: Exporting a spreadsheet to CSV format" msgstr "ANNEXE D : Exporter un tableur vers le format CSV" #. type: Plain text -#: user-manual.txt:4292 +#: user-manual.txt:4505 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 " @@ -9064,7 +9602,7 @@ msgstr "" "tableur utilisé." #. type: Plain text -#: user-manual.txt:4298 +#: user-manual.txt:4511 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 " @@ -9080,19 +9618,19 @@ msgstr "" "plongées selon quelques règles simples :" #. type: Plain text -#: user-manual.txt:4300 +#: user-manual.txt:4513 msgid "" "Date: use one of the following formats: yyyy-mm-dd, dd.mm.yyyy, mm/dd/yyyy" msgstr "" "Date : utiliser un des formats suivants : aaaa-mm-jj, jj.mm.aaaa, mm/jj/aaaa" #. type: Plain text -#: user-manual.txt:4301 +#: user-manual.txt:4514 msgid "Duration: the format should be minutes:seconds." msgstr "Durée : le format est minutes:secondes." #. type: Plain text -#: user-manual.txt:4302 +#: user-manual.txt:4515 msgid "" "Unit system: only one unit system should be used (no mix of imperial and " "metric units)" @@ -9101,25 +9639,25 @@ msgstr "" "entre les unités impériales et métriques)" #. type: Plain text -#: user-manual.txt:4303 +#: user-manual.txt:4516 msgid "Tags and buddies: values should be separated using a comma." msgstr "" "Étiquettes et équipiers : les valeurs doivent être séparées par des virgules." #. type: Plain text -#: user-manual.txt:4304 +#: user-manual.txt:4517 msgid "GPS position: use decimal degrees, e.g. 30.22496 30.821798" msgstr "" "Position GPS : utilisez les degrés décimaux, par exemple : 30.22496 30.821798" #. type: Title === -#: user-manual.txt:4304 +#: user-manual.txt:4517 #, no-wrap msgid "_LibreOffice Calc_ and _OpenOffice Calc_" msgstr "_LibreOffice Calc_ et _OpenOffice Calc_" #. type: Plain text -#: user-manual.txt:4308 +#: user-manual.txt:4521 msgid "" "These are open source spreadsheet applications forming parts of larger open " "source office suite applications. The user interaction with _LibreOffice_ " @@ -9130,13 +9668,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:4309 +#: user-manual.txt:4522 #, no-wrap msgid "images/LOffice_spreadsheetdata.jpg" msgstr "images/LOffice_spreadsheetdata.jpg" #. type: Plain text -#: user-manual.txt:4312 +#: user-manual.txt:4525 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 " @@ -9144,13 +9682,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:4313 +#: user-manual.txt:4526 #, no-wrap msgid "images/LOffice_save_as_options.jpg" msgstr "images/LOffice_save_as_options.jpg" #. type: Plain text -#: user-manual.txt:4316 +#: user-manual.txt:4529 msgid "" "After selecting _Save_, select the appropriate field delimiter (choose _Tab_ " "to prevent conflicts with the comma when using this as a decimal point), " @@ -9158,13 +9696,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:4317 +#: user-manual.txt:4530 #, no-wrap msgid "images/LOffice_field_options.jpg" msgstr "images/LOffice_field_options.jpg" #. type: Plain text -#: user-manual.txt:4320 +#: user-manual.txt:4533 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 " @@ -9172,13 +9710,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4321 +#: user-manual.txt:4534 #, no-wrap msgid "Microsoft _Excel_" msgstr "Microsoft _Excel_" #. type: Plain text -#: user-manual.txt:4327 +#: user-manual.txt:4540 msgid "" "The field delimiter (called \"_list separator_\" in Microsoft manuals) is " "not accessible from within _Excel_ and needs to be set through the " @@ -9189,19 +9727,19 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4329 +#: user-manual.txt:4542 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:4330 +#: user-manual.txt:4543 msgid "Open the _Regional and Language Options_ dialog box." msgstr "" #. type: Plain text -#: user-manual.txt:4333 +#: user-manual.txt:4546 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 " @@ -9209,48 +9747,48 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4334 +#: user-manual.txt:4547 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:4335 +#: user-manual.txt:4548 msgid "Click _OK_ twice." msgstr "" #. type: Plain text -#: user-manual.txt:4337 +#: user-manual.txt:4550 msgid "Below is an image of the _Control Panel_:" msgstr "" #. type: Target for macro image -#: user-manual.txt:4338 +#: user-manual.txt:4551 #, no-wrap msgid "images/Win_SaveCSV2.jpg" msgstr "images/Win_SaveCSV2.jpg" #. type: Plain text -#: user-manual.txt:4341 +#: user-manual.txt:4554 msgid "To export the dive log in CSV format:" msgstr "" #. type: Plain text -#: user-manual.txt:4343 +#: user-manual.txt:4556 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:4344 +#: user-manual.txt:4557 #, no-wrap msgid "images/Win_SaveCSV1.jpg" msgstr "images/Win_SaveCSV1.jpg" #. type: Plain text -#: user-manual.txt:4350 +#: user-manual.txt:4563 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 " @@ -9260,13 +9798,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:4351 +#: user-manual.txt:4564 #, no-wrap msgid "images/Win_SaveCSV3.jpg" msgstr "images/Win_SaveCSV3.jpg" #. type: Plain text -#: user-manual.txt:4357 +#: user-manual.txt:4570 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 " @@ -9275,13 +9813,13 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:4358 +#: user-manual.txt:4571 #, no-wrap msgid "APPENDIX E: Writing a custom print template" msgstr "ANNEXE E : Créer un modèle d'impression personnalisé" #. type: Plain text -#: user-manual.txt:4363 +#: user-manual.txt:4576 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 " @@ -9290,12 +9828,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4365 +#: user-manual.txt:4578 msgid "Templates are accessed using the print dialogue (see image *B* below)." msgstr "" #. type: Plain text -#: user-manual.txt:4373 +#: user-manual.txt:4586 msgid "" "The buttons under the _Template_ dropdown box lets you _Edit_, _Delete_, " "_Import_ and _Export_ templates (see image *A* above). New or modified " @@ -9307,18 +9845,18 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4375 +#: user-manual.txt:4588 msgid "The Edit Panel has three tabs:" msgstr "" #. type: Target for macro image -#: user-manual.txt:4376 +#: user-manual.txt:4589 #, no-wrap msgid "images/Template1_f22.jpg" msgstr "images/Template1_f22.jpg" #. type: Plain text -#: user-manual.txt:4380 +#: user-manual.txt:4593 msgid "" "The _Style_ tab (image *A* above) controls the font, line spacing and color " "template used for printing the dive log. The style attributes are editable. " @@ -9326,7 +9864,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4384 +#: user-manual.txt:4597 msgid "" "The _Colors_ tab (image *B* above) allows editing the colors used for " "printing the dive log. The colors are highly customizable: the _Edit_ " @@ -9335,7 +9873,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4393 +#: user-manual.txt:4606 msgid "" "The _Template_ tab of the Edit Panel (see image below) allows creating a " "template using HTML as well as a few Grantlee programming primitives. " @@ -9351,13 +9889,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:4394 +#: user-manual.txt:4607 #, no-wrap msgid "images/Template2_f22.jpg" msgstr "images/Template2_f22.jpg" #. type: Plain text -#: user-manual.txt:4399 +#: user-manual.txt:4612 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 " @@ -9366,33 +9904,33 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4401 +#: user-manual.txt:4614 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:4402 +#: user-manual.txt:4615 #, no-wrap msgid "Main dive loop" msgstr "" #. type: Plain text -#: user-manual.txt:4404 +#: user-manual.txt:4617 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:4404 user-manual.txt:4469 user-manual.txt:4486 +#: user-manual.txt:4617 user-manual.txt:4682 user-manual.txt:4699 #, no-wrap msgid "template.html" msgstr "" #. type: delimited block . -#: user-manual.txt:4409 +#: user-manual.txt:4622 #, no-wrap msgid "" "\t{% for dive in dives %}\n" @@ -9401,13 +9939,13 @@ msgid "" msgstr "" #. type: Block title -#: user-manual.txt:4411 user-manual.txt:4474 user-manual.txt:4493 +#: user-manual.txt:4624 user-manual.txt:4687 user-manual.txt:4706 #, no-wrap msgid "output.html" msgstr "" #. type: delimited block . -#: user-manual.txt:4416 +#: user-manual.txt:4629 #, no-wrap msgid "" "\t<h1> 1 </h1>\n" @@ -9416,25 +9954,25 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4419 +#: user-manual.txt:4632 msgid "" "Additional information about _Grantlee_ can be found at http://www.grantlee." "org/apidox/for_themers.html[here]" msgstr "" #. type: Title === -#: user-manual.txt:4420 +#: user-manual.txt:4633 #, no-wrap msgid "Grantlee exported variables" msgstr "" #. type: Plain text -#: user-manual.txt:4422 +#: user-manual.txt:4635 msgid "Only a subset of the dive data is exported:" msgstr "" #. type: delimited block | -#: user-manual.txt:4451 +#: user-manual.txt:4664 #, no-wrap msgid "" "|*Name*|*Description*\n" @@ -9468,7 +10006,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4455 +#: user-manual.txt:4668 msgid "" "_Subsurface_ also exports *template_options* data. This data must be used as " "_CSS_ values to provide a dynamically editable template. The exported data " @@ -9476,7 +10014,7 @@ msgid "" msgstr "" #. type: delimited block | -#: user-manual.txt:4467 +#: user-manual.txt:4680 #, no-wrap msgid "" "|*Name*|*Description*\n" @@ -9493,26 +10031,26 @@ msgid "" msgstr "" #. type: delimited block . -#: user-manual.txt:4472 +#: user-manual.txt:4685 #, no-wrap msgid "\tborder-width: {{ template_options.borderwidth }}px;\n" msgstr "" #. type: delimited block . -#: user-manual.txt:4477 +#: user-manual.txt:4690 #, no-wrap msgid "\tborder-width: 3px;\n" msgstr "" #. type: Plain text -#: user-manual.txt:4480 +#: user-manual.txt:4693 msgid "" "Another variable that _Subsurface_ exports is *print_options*. This variable " "contains a single member:" msgstr "" #. type: delimited block | -#: user-manual.txt:4483 +#: user-manual.txt:4696 #, no-wrap msgid "" "|*Name*|*Description*\n" @@ -9520,7 +10058,7 @@ msgid "" msgstr "" #. type: delimited block . -#: user-manual.txt:4491 +#: user-manual.txt:4704 #, no-wrap msgid "" "\tbody {\n" @@ -9529,7 +10067,7 @@ msgid "" msgstr "" #. type: delimited block . -#: user-manual.txt:4498 +#: user-manual.txt:4711 #, no-wrap msgid "" "\tbody {\n" @@ -9538,13 +10076,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4500 +#: user-manual.txt:4713 #, no-wrap msgid "Defined CSS selectors" msgstr "" #. type: Plain text -#: user-manual.txt:4503 +#: user-manual.txt:4716 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 " @@ -9552,7 +10090,7 @@ msgid "" msgstr "" #. type: delimited block | -#: user-manual.txt:4510 +#: user-manual.txt:4723 #, no-wrap msgid "" "|*Selector*|*Type*|*Description*\n" @@ -9563,20 +10101,20 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4513 +#: user-manual.txt:4726 msgid "" "Rendering dive profiles is not supported for flow layout templates (when " "data-numberofdives = 0)." msgstr "" #. type: Title === -#: user-manual.txt:4514 +#: user-manual.txt:4727 #, no-wrap msgid "Special attributes" msgstr "" #. type: Plain text -#: user-manual.txt:4518 +#: user-manual.txt:4731 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 " @@ -9584,55 +10122,55 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4520 +#: user-manual.txt:4733 msgid "" "The *data-numberofdives* data attribute is added to the body tag to set the " "rendering mode." msgstr "" #. type: Plain text -#: user-manual.txt:4522 +#: user-manual.txt:4735 msgid "render 6 dives per page:" msgstr "" #. type: delimited block . -#: user-manual.txt:4525 +#: user-manual.txt:4738 #, no-wrap msgid "\t<body data-numberofdives = 6>\n" msgstr "" #. type: Plain text -#: user-manual.txt:4528 +#: user-manual.txt:4741 msgid "render as much dives as possible:" msgstr "" #. type: delimited block . -#: user-manual.txt:4531 +#: user-manual.txt:4744 #, no-wrap msgid "\t<body data-numberofdives = 0>\n" msgstr "" #. type: Plain text -#: user-manual.txt:4534 +#: user-manual.txt:4747 msgid "" "All CSS units should be in relative lengths only, to support printing on any " "page size." msgstr "" #. type: Title == -#: user-manual.txt:4535 +#: user-manual.txt:4748 #, no-wrap msgid "APPENDIX F: FAQs." msgstr "" #. type: Title === -#: user-manual.txt:4537 +#: user-manual.txt:4750 #, no-wrap msgid "Subsurface appears to miscalculate gas consumption and SAC" msgstr "" #. type: Plain text -#: user-manual.txt:4541 +#: user-manual.txt:4754 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_ " @@ -9640,7 +10178,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4547 +#: user-manual.txt:4760 msgid "" "'Answer': Not really. What happens is that _Subsurface_ actually calculates " "gas consumption differently - and better - than you expect. In particular, " @@ -9650,7 +10188,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4553 +#: user-manual.txt:4766 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 " @@ -9660,12 +10198,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4555 +#: user-manual.txt:4768 msgid "+consumption = (amount_of_air_at_beginning - amount_of_air_at_end)+" msgstr "" #. type: Plain text -#: user-manual.txt:4561 +#: user-manual.txt:4774 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 " @@ -9676,12 +10214,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4563 +#: user-manual.txt:4776 msgid "+12.2*((220-100)/1.013)+" msgstr "" #. type: Plain text -#: user-manual.txt:4568 +#: user-manual.txt:4781 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 " @@ -9691,7 +10229,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4574 +#: user-manual.txt:4787 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 " @@ -9702,13 +10240,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4575 +#: user-manual.txt:4788 #, no-wrap msgid "Some dive profiles have time discrepancies with the recorded samples from my dive computer..." msgstr "" #. type: Plain text -#: user-manual.txt:4579 +#: user-manual.txt:4792 msgid "" "_Subsurface_ ends up ignoring surface time for many things (average depth, " "divetime, SAC, etc). 'Question': Why do dive durations in my dive computer " @@ -9716,7 +10254,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4587 +#: user-manual.txt:4800 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 " @@ -9730,13 +10268,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4588 +#: user-manual.txt:4801 #, no-wrap msgid "Some dive profiles are missing from the download" msgstr "" #. type: Plain text -#: user-manual.txt:4602 +#: user-manual.txt:4815 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 " @@ -9751,7 +10289,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4606 +#: user-manual.txt:4819 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 " @@ -9759,6 +10297,17 @@ msgid "" "salvaged after being overwritten by new dives." msgstr "" +#~ msgid "" +#~ "If required, then close the _Facebook_ connection by either closing " +#~ "_Subsurface_ or by selecting _File -> Preferences -> Facebook_ from the " +#~ "Main Menu, and clicking the appropriate button on the Facebook " +#~ "Preferences panel." +#~ msgstr "" +#~ "Si besoin, fermer la connexion _Facebook_ en fermant _Subsurface_ ou en " +#~ "sélectionnant _Fichier -> Préférences -> Facebook, à partir du menu " +#~ "principal et en cliquant sur le bouton approprié dans le panneau des " +#~ "préférences Facebook." + #~ msgid "images/LoadImage1_f20.jpg" #~ msgstr "images/LoadImage1_f20.jpg" @@ -9805,15 +10354,6 @@ msgstr "" #~ msgstr "images/tissuesGraph.jpg" #~ msgid "" -#~ "Do you need a way of storing or backing up your dive log on the Internet, " -#~ "allowing you to view your dive log from anywhere, using an Internet " -#~ "browser?" -#~ msgstr "" -#~ "Avez-vous besoin d'un moyen d'enregistrer ou de sauvegarder votre carnet " -#~ "de plongée sur Internet, Vous permettant de visualiser votre carnet " -#~ "depuis n'importe où, en utilisant un navigateur Internet ?" - -#~ msgid "" #~ "If one has dives recorded using a dive computer, the depth profile of the" #~ msgstr "" #~ "Si les plongées ont été enregistrées en utilisant un ordinateur de " @@ -9859,9 +10399,6 @@ msgstr "" #~ msgid "images/PrintDiveLog.jpg" #~ msgstr "images/PrintDiveLog.jpg" -#~ msgid "images/Pref1.jpg" -#~ msgstr "images/Pref1.jpg" - #~ msgid "images/Pref2.jpg" #~ msgstr "images/Pref2.jpg" diff --git a/Documentation/mobile-manual_fr.html.git b/Documentation/mobile-manual_fr.html.git index d6163c428..ba1e7015b 100644 --- a/Documentation/mobile-manual_fr.html.git +++ b/Documentation/mobile-manual_fr.html.git @@ -826,7 +826,7 @@ the dive log.</p></div> <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2016-11-30 13:51:08 CET +Last updated 2017-01-11 10:48:03 CET </div> </div> </body> diff --git a/Documentation/user-manual_fr.html.git b/Documentation/user-manual_fr.html.git index ace427d3c..a5e7fc9c0 100644 --- a/Documentation/user-manual_fr.html.git +++ b/Documentation/user-manual_fr.html.git @@ -444,7 +444,7 @@ asciidoc.install(3); <div class="paragraph"><p><span class="big">MANUEL UTILISATEUR</span></p></div> <div class="paragraph"><p><strong>Auteurs du manuel</strong> : Willem Ferguson, Jacco van Koll, Dirk Hohndel, Reinout Hoornweg, Linus Torvalds, Miika Turkia, Amit Chaudhuri, Jan Schubert, Salvador Cuñat, Pedro Neves</p></div> -<div class="paragraph"><p><span class="blue"><em>Version 4.5, Octobre 2015</em></span></p></div> +<div class="paragraph"><p><span class="blue"><em>Version 4.6, January 2017</em></span></p></div> <div class="paragraph"><p>Bienvenue en tant qu’utilisateur de <em>Subsurface</em>, un programme avancé d’enregistrement de plongées (carnet de plongées) avec une bonne infrastructure pour décrire, organiser, interpréter et imprimer des plongées @@ -459,6 +459,12 @@ Avez-vous besoin d’une façon d’enregistrer vos plongées utilisant </li> <li> <p> +Souhaitez-vous inclure facilement les positions GPS des sites de plongées + dans votre carnet de plongée ? +</p> +</li> +<li> +<p> Utilisez-vous deux marques différentes d’ordinateurs de plongée, chacun avec son propre logiciel propriétaire pour télécharger les enregistrements des plongées ? Plongez-vous avec un recycleur ou un équipement en circuit ouvert @@ -473,38 +479,49 @@ Utilisez-vous deux marques différentes d’ordinateurs de plongée, chacun <p> Utilisez-vous plus d’un système d’exploitation ? <em>Subsurface</em> est intégralement compatible avec Mac, Linux et Windows, ce qui vous permet - d’accéder à vos enregistrements de plongées sur chaque système - d’exploitation en utilisant une application unique. + d’accéder à votre carnet de plongées sur chaque système d’exploitation en + utilisant une application unique. </p> </li> <li> <p> Utilisez-vous Linux ou Mac mais votre ordinateur de plongée n’a que des logiciels pour Windows pour télécharger les informations de plongées (par - exemple Mares) ? <em>Subsurface</em> fournit un moyen de télécharger et d’analyser - vos enregistrements de plongées sur d’autres systèmes d’exploitation. + exemple Mares ou scubapro) ? <em>Subsurface</em> fournit un moyen de télécharger et + d’analyser vos enregistrements de plongées sur d’autres systèmes + d’exploitation. </p> </li> <li> <p> Avez-vous besoin d’un planificateur de plongée graphique intuitif qui intègre et prend en compte les plongées qui ont déjà été enregistrées ? -Avez-vous besoin d’un moyen d’nregistrer et de sauvegarder vos plongées sur -Internet, vous permettant de les voir depuis n’importe où en utilisant un -navigateur Internet ? <em>Subsurface</em> est disponible pour Windows (Win XP ou -plus récent), les Macs basés sur processeurs Intel (OS/X) et de nombreuses -distributions Linux. <em>Subsurface</em> peut être compilé pour bien plus de -plateformes matérielles et d’environnements logiciels où Qt et -libdivecomputer sont disponibles. +</p> +</li> +<li> +<p> +Do you need a way of storing or backing up your dive log on the Internet, + letting you view your dive log from anywhere using an Internet browser? +</p> +</li> +<li> +<p> +Souhaitez-vous pouvoir accéder ou modifier votre carnet de plongée en + utilisant un smartphone ? </p> </li> </ul></div> +<div class="paragraph"><p><em>Subsurface</em> est disponible pour Windows (Win XP ou plus récent), les Macs +basés sur processeurs Intel (OS/X) et de nombreuses distributions +Linux. <em>Subsurface</em> peut être compilé pour bien plus de plateformes +matérielles et d’environnements logiciels où Qt et libdivecomputer sont +disponibles.</p></div> <div class="paragraph"><p>Ce manuel explique comment utiliser le programme <em>Subsurface</em>. Pour installer le logiciel, consultez la page <em>Téléchargement</em> sur le <a href="http://subsurface-divelog.org/">site web de <em>Subsurface</em></a>. En cas de problème, vous pouvez envoyer un e-mail sur <a href="mailto:subsurface@subsurface-divelog.org">notre liste de diffusion</a> et -rapportez les bogues sur <a href="https://github.com/Subsurface-divelog/subsurface/issues">notre bugtracker</a>. Pour +rapportez les bogues sur <a href="http://trac.hohndel.org">notre bugtracker</a>. Pour des instructions de compilation du logiciel et (si besoin) de ses dépendances, merci de consulter le fichier INSTALL inclus dans les sources logicielles.</p></div> @@ -1186,7 +1203,21 @@ the nickname for that particular device instead of the model name, allowing easy identification of devices.</p></div> </div> <div class="sect3"> -<h4 id="S_EditDiveInfo">5.2.4. Updating the dive information imported from the dive computer.</h4> +<h4 id="S_MultipleDiveComputers">5.2.4. Uploading data for a specific dive from more than one dive computer</h4> +<div class="paragraph"><p>Some divers use more than one dive computer at the same time, e.g. during +technical diving. If you import the dive profiles from these different dive +computers into <em>Subsurface</em>, the profiles can be viewed +independently. During upload the data from the dive computers are +automatically merged into a single dive. The different profiles are +presented on the <em>Profile</em> panel with the name of each dive computer +indicated at the bottom left. <strong>While the dive is highlighted in the <em>Dive +List</em></strong>, switch between the profiles of the different dive computers by using +either the left/right arrow keyboard keys or by selecting <em>View → Previous +DC</em> or <em>View → Next DC</em>. The data in the <em>Notes</em> panel are not affected by +the specific dive computer that is selected.</p></div> +</div> +<div class="sect3"> +<h4 id="S_EditDiveInfo">5.2.5. Updating the dive information imported from the dive computer.</h4> <div class="paragraph"><p>With the uploaded dives in the <strong>Dive List</strong>, the information from the dive computer is not complete and more details must be added to have a full record of the dives. To do this, the <strong>Notes</strong> and the <strong>Equipment</strong> tabs on the @@ -1445,7 +1476,7 @@ two types of weights: integrated as well as a weight belt:</p></div> </div> </div> <div class="sect3"> -<h4 id="_editing_several_selected_dives_simultaneously">5.2.5. Editing several selected dives simultaneously</h4> +<h4 id="_editing_several_selected_dives_simultaneously">5.2.6. Editing several selected dives simultaneously</h4> <div class="paragraph"><p><em>METHOD 1</em>: After uploading dives from a dive computer, the dive profiles of each is shown in the <strong>Dive profile</strong> tab, as well as a few items of information in the <strong>Notes</strong> tab (e.g. water temperature) and in the @@ -1481,7 +1512,7 @@ dives now contain the data initially selected in the original source dive log.</p></div> </div> <div class="sect3"> -<h4 id="_adding_bookmarks_to_a_dive">5.2.6. Adding Bookmarks to a dive</h4> +<h4 id="S_Bookmarks">5.2.7. Adding Bookmarks to a dive</h4> <div class="paragraph"><p>Many divers wish to annotate dives with text that indicate particular events, e.g. "Saw dolphins", or "Released surface buoy". This is easily done:</p></div> @@ -1519,7 +1550,7 @@ Hovering the mouse over the red bookmark, the appropriate text is shown at </div> </div> <div class="sect3"> -<h4 id="_saving_the_updated_dive_information">5.2.7. Saving the updated dive information</h4> +<h4 id="_saving_the_updated_dive_information">5.2.8. Saving the updated dive information</h4> <div class="paragraph"><p>The information entered in the <strong>Notes</strong> tab and the <strong>Equipment</strong> tab can be saved by using the two buttons on the top right hand of the <strong>Notes</strong> tab. If the <em>Apply changes</em> button is clicked, the dive data are saved in the memory @@ -1584,7 +1615,7 @@ Cochran dive logs </li> <li> <p> -UDDF-formatted dive logs (e.g. Kenozoooid) +UDDF-formatted dive logs (e.g. Kenozooid) </p> </li> <li> @@ -1629,6 +1660,16 @@ Suunto Dive Manager (DM3, DM4, DM5) </li> <li> <p> +DL7 files used by Diver’s Alert network (DAN) +</p> +</li> +<li> +<p> +Underwater technologies AV1 dive logs +</p> +</li> +<li> +<p> CSV (text-based and spreadsheet-based) dive logs, including APD CCR logs </p> </li> @@ -1690,7 +1731,104 @@ Finally, import the dives from <em>divelogs.de</em> to <em>Subsurface</em>, usin </ol></div> </div> <div class="sect3"> -<h4 id="S_ImportingDivelogsDe">5.3.4. Importing dives from <strong>divelogs.de</strong></h4> +<h4 id="S_SmartTrakImport">5.3.4. Importing Scubapro <em>SmartTrak</em> divelogs</h4> +<div class="paragraph"><p><em>SmartTrak</em> stores the raw data from a Uwatec/Scubapro dive computer along +with a plethora of other data manually added by the user, ranging from dive +points to buddies data or DAN survey info. However, this is Microsoft +Windows-based propietary software by Uwatec (today Scubapro) using +Microsoft Access databases, preventing the integration the importer into the +<em>Subsurface</em> core application.</p></div> +<div class="paragraph"><p>A stand alone tool for Linux has been developed to import the <em>.slg</em> files +generated by SmartTrak to Subsurface’s <em>.xml</em> format. It can be built +together with <em>Subsurface</em> for Linux systems. Two dependencies need to be +installed in your system before building: <em>libglib2.0</em> and <em>libmdb2</em>.</p></div> +<div class="paragraph"><p>Feel free to contact the <em>Subsurface</em> development team on +<a href="mailto:subsurface@subsurface-divelog.org">our mailing list</a> for assistance in +importing <em>SmartTrak</em> dive logs.</p></div> +<div class="paragraph"><p>Assuming the above dependencies have been installed and the <em>Subsurface</em> +source tree is in the directory <em>~/src/subsurface</em>, then:</p></div> +<div class="sect4"> +<h5 id="_building_em_smtk2ssrf_em">Building <em>smtk2ssrf</em></h5> +<div class="ulist"><ul> +<li> +<p> +Move to the source tree directory. +</p> +</li> +<li> +<p> +Run " $ ccmake build " and set SMARTTRAK_IMPORT option to <strong>on</strong> (off by + default). +</p> +</li> +<li> +<p> +Generate with [c] and save and exit with [g]. +</p> +</li> +<li> +<p> +Build as you prefer, using the <em>build.sh</em> script (recomended) or moving to + build directory and running <em>make</em>. +</p> +</li> +<li> +<p> +After a successful build, there will be an executable named <em>smtk2ssrf</em> in + the <em>subsurface/build</em> directory. Copy or move it to a directory in your + $PATH, e.g. <em>~/bin</em>. +</p> +</li> +</ul></div> +</div> +<div class="sect4"> +<h5 id="_running">Running</h5> +<div class="paragraph"><p><em>smtk2ssrf</em> accepts 0, 2 or more parameters. If it is launched without +parameters in a graphical user interface, a simple window opens for choosing +the <em>.slg</em> file(s) to import and a destination file to store the +<em>Subsurface</em>-formatted data into (see image below).</p></div> +<div class="imageblock" style="text-align:center;"> +<div class="content"> +<img src="images/smtk2ssrf.jpg" alt="FIGURE:Download from SmartTrak" /> +</div> +</div> +<div class="admonitionblock"> +<table><tr> +<td class="icon"> +<img src="images/icons/warning2.png" alt="Warning" /> +</td> +<td class="content">Existing data in the destination file will be erased, so <strong>DO NOT</strong> use a +regular subsurface divelog file as a destination: rather, specify a <strong>new</strong> +filename as a destination.</td> +</tr></table> +</div> +<div class="paragraph"><p>If launched from a command line with two or more parameters, the format is +as follows:</p></div> +<div class="literalblock"> +<div class="content"> +<pre><code>$ smrtk2ssrf /input/file_1.slg /input/file_2.slg /output/file3.xml</code></pre> +</div></div> +<div class="paragraph"><p>where <em>input</em> is the directory containing the .slg file(s) and <em>output</em> is +the directory where the <em>Subsurface</em>-formatted output is written to. Files +<em>file_1.slg</em> and <em>file_2.slg</em> in the <em>input</em> directory are imported and +stored in <em>file3.xml</em> in the <em>output</em> directory. Check any warning and error +messages in the console or in the graphical window: some may be relevant as +support for Galileo family of dive computers is still a work in progress.</p></div> +</div> +<div class="sect4"> +<h5 id="_merging_the_imported_dives_with_the_existing_divelog">Merging the imported dives with the existing divelog</h5> +<div class="paragraph"><p>Open the new file (generated in the previous steps) using <em>Subsurface</em> and +check the dives and data. If everything is fine, close the <em>.xml</em> file and +open your regular divelog. Then from the <strong>Main Menu</strong> select <em>Import → +Import log file</em> and choose the <em>.xml</em> file containing the imported dives: +these will show in the <strong>Dive List</strong>, time ordered, along with the existing +dives. The new dives, although time ordered, will keep the numbering system +from <em>SmartTrak</em>, so a renumbering action is needed. See the section on +<a href="#S_Renumber">Renumbering the dives</a> for instructions on this topic.</p></div> +</div> +</div> +<div class="sect3"> +<h4 id="S_ImportingDivelogsDe">5.3.5. Importing dives from <strong>divelogs.de</strong></h4> <div class="paragraph"><p>Importing dive information from <em>divelogs.de</em> is simple, using a single dialogue box. The <em>Import → Import from Divelogs.de</em> option should be selected from the Main Menu. This brings up a dialogue box (see image <strong>A</strong> @@ -1707,7 +1845,7 @@ should then be selected, after which the imported dives appear in the </div> </div> <div class="sect3"> -<h4 id="S_ImportingCSVData">5.3.5. Importer des données au format CSV</h4> +<h4 id="S_ImportingCSVData">5.3.6. Importer des données au format CSV</h4> <div class="paragraph"><p>A comma-separated file (.csv) can be used to import dive information either as dive profiles (as in the case of the APD Inspiration and Evolution closed circuit rebreathers) or as dive metadata (in case the user keeps dive data @@ -1721,12 +1859,10 @@ information that may be helpful for importing spreadsheet-based data into <em>Subsurface</em>.</p></div> <div class="sect4"> <h5 id="S_ImportingCSVDives">Importer les plongées au format CSV à partir des ordinateurs de plongées ou d’autres logiciels de carnet de plongée</h5> -<div class="literalblock"> -<div class="content"> -<pre><code> _CSV_ files can be viewed using an ordinary text editor. A _CSV_ file is normally organized into -a single line that provides the headers (or _field names_ or _column headings_) of the data -columns, followed by the data, one record per line.</code></pre> -</div></div> +<div class="paragraph"><p><em>CSV</em> files can be viewed using an ordinary text editor. A <em>CSV</em> file is +normally organized into a single line that provides the headers (or <em>field +names</em> or <em>column headings</em>) of the data columns, followed by the data, one +record per line.</p></div> <div class="paragraph"><p>There are two types of <em>CSV</em> dive logs that can be imported into <em>Subsurface</em>:</p></div> <div class="olist arabic"><ol class="arabic"> @@ -1954,7 +2090,7 @@ functions of the desktop version, including the management and viewing of dive information. Below, we describe how to perform the above three steps using each of the two mobile apps.</p></div> <div class="paragraph"><p>For information on using the <em>Subsurface Companion App</em>, click -<a href="#S_iCompanion"><em>here</em></a>.</p></div> +<a href="#S_Companion"><em>here</em></a>.</p></div> <div class="sect3"> <h4 id="_storing_and_and_using_gps_locations_using_em_subsurface_mobile_em">5.4.1. Storing and and using GPS locations using <em>Subsurface-mobile</em></h4> <div class="sect4"> @@ -2055,7 +2191,7 @@ managing, uploading and synchronising this information.</p></div> </div> </div> <div class="sect3"> -<h4 id="S_iCompanion">5.4.2. Importing GPS coordinates with the <em>Subsurface Companion App</em> for mobile phones</h4> +<h4 id="S_Companion">5.4.2. Importing GPS coordinates with the <em>Subsurface Companion App</em> for mobile phones</h4> <div class="paragraph"><p>Using the <strong>Subsurface Companion App</strong> on an <em>Android device</em> or <a href="#S_iphone"><em>iPhone</em></a> with GPS, the coordinates for the diving @@ -2571,7 +2707,18 @@ 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.</p></div> </div> <div class="sect3"> -<h4 id="S_FindMovedImages">5.5.5. Moving photographs among directories, hard disks or computers</h4> +<h4 id="_finding_out_which_dives_have_associated_photos">5.5.5. Finding out which dives have associated photos.</h4> +<div class="paragraph"><p>Inspecting each individual dive in order to determine whether there are +associated photos can be time consuming. There is a rapid way of seeing +which dives have associated photos and which not: activate the <em>Photos</em> +checkbox in the dropdown list obtained by right-clicking on the header bar +of the <strong>Divelist</strong>. In the <strong>Divelist</strong>, all dives with associated photographs +have an icon indicating whether the photographs were taken during the dive, +just before/after the dive or both during and before/after the dive. More +information is provided in the section dealing with <a href="#S_Divelist_columns">photo icons on the <strong>Divelist</strong></a>.</p></div> +</div> +<div class="sect3"> +<h4 id="S_FindMovedImages">5.5.6. Moving photographs among directories, hard disks or computers</h4> <div class="paragraph"><p>After a photograph has been loaded into <em>Subsurface</em> and associated with a specific dive, <em>Subsurface</em> saves the directory path where the photo lies as well as the file name of the photo, in order to find it when the dive is opened again. @@ -3290,7 +3437,38 @@ Graph <strong>E</strong> indicates the situation after remaining at 4.5 meters f </div> </div> <div class="sect3"> -<h4 id="_the_profile_toolbar">6.4.2. The Profile Toolbar</h4> +<h4 id="_computer_reported_events_during_dive">6.4.2. Computer-reported events during dive</h4> +<div class="paragraph"><p>Many dive computers record events during a dive. For instance, most dive +computers report alarms relating to high partial pressures of oxygen, to +rapid ascents or the exceeding of no-deco limits (NDL). On the other hand, +other events are classified as warnings and, for instance, occur when the +remaining gas in a cylinder falls below a predetermined limit, a deep stop +needs to be performed or the need to change gas during multicylinder +dives. Some dive computers also report notifications, e.g. when a safety +stop is initiated or terminated or when a predetermined amount of OTUs have +been incurred. The alarms, warnings and notifications differs from one dive +computer to another: some dive computers do not report any of the above +events, while others provide an extensive log of events. The reporting of +events is therefore a function of the dive computer used. In addition, +<em>Subsurface</em> does not always have the ability to detect all the events +reported by a specific dive computer.</p></div> +<div class="paragraph"><p>Events are indicated by symbols on the dive profile. Notifications are shown +as a white, round symbol with a letter <em>i</em>; warnings are indicated by a +yellow triangle and alarms by a red triangle. By moving the cursor over a +symbol, the explanation is given in the bottom-most line of the <em>Information +Box</em> (see image below, where the cursor is positioned over the alarm that +was reported).</p></div> +<div class="imageblock" style="text-align:center;"> +<div class="content"> +<img src="images/profile_symbols.jpg" alt="FIGURE: Profile notification symbols" /> +</div> +</div> +<div class="paragraph"><p>Some dive computers report <em>bookmarks</em> that the diver has set during the +dive. These are indicated as a small red flag on the profile and are +discussed more fully in the section on <a href="#S_Bookmarks"><em>inserting bookmarks</em></a>.</p></div> +</div> +<div class="sect3"> +<h4 id="_the_profile_toolbar">6.4.3. The Profile Toolbar</h4> <div class="paragraph"><p>The dive profile can include graphs of the <strong>partial pressures</strong> of O<sub>2</sub>, N<sub>2</sub>, and He during the dive (see figure above) as well as a calculated and dive computer reported deco ceilings (only visible for deep, long, or @@ -3608,7 +3786,7 @@ tissues at the end of the dive.</p></div> </div> </div> <div class="sect3"> -<h4 id="_the_dive_profile_context_menu">6.4.3. The Dive Profile context menu</h4> +<h4 id="_the_dive_profile_context_menu">6.4.4. The Dive Profile context menu</h4> <div class="paragraph"><p>The context menu for the Dive Profile is accessed by right-clicking while the mouse cursor is over the Dive Profile panel. The menu allows creating Bookmarks, Gas Change Event markers, or manual CCR set-point changes other @@ -3644,7 +3822,7 @@ a single dive or a group of dives and then right-clicking.</p></div> </div> <div class="paragraph"><p>The context menu is used in many functions described below.</p></div> <div class="sect3"> -<h4 id="_customizing_the_columns_showed_in_the_strong_dive_list_strong_panel">7.1.1. Customizing the columns showed in the <strong>Dive List</strong> panel</h4> +<h4 id="S_Divelist_columns">7.1.1. Customizing the columns showed in the <strong>Dive List</strong> panel</h4> <div class="imageblock" style="text-align:center;"> <div class="content"> <img src="images/DiveListOptions.jpg" alt="Example: Dive list info options" /> @@ -3653,12 +3831,42 @@ a single dive or a group of dives and then right-clicking.</p></div> <div class="paragraph"><p>The default information in the <strong>Dive List</strong> includes, for each dive, Dive_number, Date, Rating, Dive_depth, Dive_duration and Dive_location. This information can be controlled and changed by right-clicking on the header -bar of the <strong>Dive List</strong>. For instance, a right-click on the <em>Date</em> header -brings up a list of items that can be shown in the dive list (see -above). Select an item to be included in the <strong>Dive List</strong> or to be deleted -(reflected by the check symbols) and the list is immediately -updated. Preferences for information shown in the <strong>Dive List</strong> are saved and -used when <em>Subsurface</em> is re-opened.</p></div> +bar of the <strong>Dive List</strong>, bringing up a list of columns that can be shown in +the dive list (see above). Check an items to be included in the <strong>Dive +List</strong>. The list is immediately updated. Preferences for information shown +in the <strong>Dive List</strong> are saved and used when <em>Subsurface</em> is re-opened.</p></div> +<div class="paragraph" id="S_Photos_divelist"><p>By selecting the <em>Photos</em> checkbox in the dropdown list, an icon is shown +indicating whether any photos are associated with a particular dive. There +are three icons:</p></div> +<div class="admonitionblock"> +<table><tr> +<td class="icon"> +<img src="images/icons/duringPhoto.png" alt="Note" /> +</td> +<td class="content">This dive has photographs taken during the dive, typically using an +underwater camera.</td> +</tr></table> +</div> +<div class="admonitionblock"> +<table><tr> +<td class="icon"> +<img src="images/icons/outsidePhoto.png" alt="Note" /> +</td> +<td class="content">This dive has photographs taken immediately before or immediately after the +dive. This is useful for finding photos of dive teams or boats just +before/after the dive, whales or other surface animals seen just before or +after the dive, or of landscapes as seen from the boat.</td> +</tr></table> +</div> +<div class="admonitionblock"> +<table><tr> +<td class="icon"> +<img src="images/icons/inAndOutPhoto.png" alt="Note" /> +</td> +<td class="content">This dive has photographs taken both during the dive and immdiately before +or after the dive.</td> +</tr></table> +</div> </div> </div> <div class="sect2"> @@ -3857,53 +4065,48 @@ Exporter les informations de plongée vers <em>Facebook</em> </li> </ul></div> <div class="sect2"> -<h3 id="S_facebook">8.1. Export des informations de plongée vers <em>Facebook</em></h3> -<div class="paragraph"><p>L’export des plongées vers <em>Facebook</em> est géré différemment des autres types -d’export car une connexion vers <em>Facebook</em> est nécessaire, nécessitant un -identifiant et un mot de passe. À partir du menu principal, si vous -sélectionnez <em>Partager sur → Connecter à → Facebook</em>, un écran de -connexion s’affiche (image <strong>A</strong> sur la gauche, ci dessous). Entrez -l’identifiant et le mot de passe <em>Facebook</em>. Une fois connecté à <em>Facebook</em>, -le panneau de l’image <strong>B</strong> ci dessous est affiché, avec un bouton -<em>Déconnecter de Facebook</em> pour fermer la connexion <em>Facebook</em>.</p></div> +<h3 id="S_Facebook">8.1. Export des informations de plongée vers <em>Facebook</em></h3> +<div class="paragraph"><p>Export of dives to <em>Facebook</em> is handled differently from other types of +export because a connection to <em>Facebook</em> is required, needing a <em>Facebook</em> +userID and password. From the <strong>Main Menu</strong>, select <em>Share on → Connect to +→ Facebook</em> (image <strong>A</strong> below) A <em>Facebook</em> login screen appears (image <strong>B</strong> +below). Provide a <em>Facebook</em> userID and password. From the <em>Subsurface</em> +window it’s easy to determine whether <em>Subsurface</em> has a valid connection to +<em>Facebook</em>: from the <strong>Main Menu</strong>, select <em>Share on</em> (image <strong>A</strong>, +below). Normally, the <em>Facebook</em> option is greyed out. But if there is a +connection to <em>Facebook</em>, this option is active (i.e. in black color and can +be selected).</p></div> +<div class="paragraph"><p>Once logged into to <em>Facebook</em> , a panel is shown with a message: "<em>To +disconnect Subsurface from your Facebook account, use the <em>Share on</em> menu +entry</em>." Close this message panel.</p></div> <div class="imageblock" style="text-align:center;"> <div class="content"> -<img src="images/facebook1_f20.jpg" alt="Figure: Facebook login" /> -</div> -</div> -<div class="paragraph"><p>From the <em>Subsurface</em> window it’s easy to determine whether <em>Subsurface</em> has -a valid connection to <em>Facebook</em> From the <strong>Main Menu</strong>, select <em>Share on</em> -(image <strong>A</strong>, below). Normally, the <em>Facebook</em> option is greyed out. But if -there is a connection to <em>Facebook</em>, this option is active (i.e. in black -color and can be selected).</p></div> -<div class="paragraph"><p>Une fois qu’une connexion à <em>Facebook</em> est établie, transférer un profil de -plongée vers <em>Facebook</em> est facile. Assurez-vous que la plongée à transférer -est affichée dans le panneau <strong>Profil de plongée</strong> de <em>Subsurface</em>. Si, à -partir du <strong>menu principal</strong>, vous sélectionnez <em>Partager sur → Facebook</em>, -une fenêtre s’affiche, pour déterminer quelles informations seront -transférées avec le profil de plongée (voir l’image <strong>B</strong> ci-dessous). Pour -transférer un profil de plongée vers <em>Facebook</em>, le nom d’un album -<em>Facebook</em> doit être fourni. Les cases à cocher sur la partie gauche -permettent de sélectionner des informations supplémentaires à transférer -avec le profil de plongée. Ces informations sont affichées dans le champs de -texte sur la partie droite du panneau. (image <strong>B</strong> ci dessous). Vous pouvez -facilement modifier le message qui sera envoyé avec le profil de -plongée. Une fois les informations supplémentaires ajoutées et vérifiées, -sélectionner le bouton <em>OK</em> qui lance le transfert vers <em>Facebook</em>. Après un -moment, une fenêtre apparait indiquant le succès du transfert.</p></div> -<div class="paragraph"><p>À la fois l’album créé et la publication sur votre ligne temporelle seront -marquées comme privés. Pour que vos amis puissent la voir, modifier les -permissions à partir d’une connexion Facebook standard depuis un navigateur -ou l’application Facebook.</p></div> +<img src="images/facebook1.jpg" alt="Figure: Facebook login" /> +</div> +</div> +<div class="paragraph"><p>Having established a login to <em>Facebook</em>, transferring a dive profile to a +<em>Facebook</em> timeline is easy. In the <em>Subsurface</em> <strong>Dive Profile</strong> panel, +highlight the dive to be transferred. A dialogue box is shown, determining +the amount of additional information to be transferred with the dive profile +(image <strong>A</strong>, below). To transfer a dive profile to <em>Facebook</em>, the name of a +<em>Facebook</em> album is needed. The checkboxes on the left hand side determine +how much additional information is added to the dive profile, shown in the +text box on the right hand side of the panel (image <strong>A</strong>, below). Customise +the message that will be posted with the dive profile by editing any of the +information. After specifying additional information and verifying the text, +select the <em>OK</em> button that triggers the transfer to <em>Facebook</em>. After the +transfer is done, an acknowledgement dialogue appears, indicating it was +successful.</p></div> +<div class="paragraph"><p>Both the album created and the post to your timeline are marked as +private. In order for friends to be able to see the post, log into +<em>Facebook</em> using a browser or Facebook app and change its permissions.</p></div> <div class="imageblock" style="text-align:center;"> <div class="content"> -<img src="images/facebook2_f20.jpg" alt="Figure: Facebook login" /> +<img src="images/facebook2.jpg" alt="Figure: Facebook data submission" /> </div> </div> -<div class="paragraph"><p>Si besoin, fermer la connexion <em>Facebook</em> en fermant <em>Subsurface</em> ou en -sélectionnant _Fichier → Préférences → Facebook, à partir du menu -principal et en cliquant sur le bouton approprié dans le panneau des -préférences Facebook.</p></div> +<div class="paragraph"><p>If required, then close the <em>Facebook</em> connection by selecting, from the +<strong>Main Menu</strong>, <em>Share on → Disconnect from → Facebook</em> (image <strong>B</strong> above).</p></div> </div> <div class="sect2"> <h3 id="S_Export_other">8.2. Exporter des informations de plongée vers d’autres destinations ou formats</h3> @@ -4178,7 +4381,46 @@ same process could be used for the Cloud-based storage of dive logs.</p></div> </div> </div> <div class="sect1"> -<h2 id="S_PrintDivelog">10. Printing a dive log</h2> +<h2 id="S_user_space">10. Several <em>Subsurface</em> users on one desktop computer</h2> +<div class="sectionbody"> +<div class="paragraph"><p>A frequent need is for two or more persons to use <em>Subsurface</em> on the same +desktop computer. For instance members of a household may use the same +computer or one family member may perform dive uploads for other family +members/friends. There are two approaches for doing this.</p></div> +<div class="paragraph"><p><strong>A)</strong> If the different users of a desktop computer do not log onto the desktop/laptop under different user names + then the simplest way is for each person to use her/his own divelog file within Subsurface. In this case John + would work with the <em>Subsurface</em> file <em>johns-divelog</em> and Joan would use <em>joans-divelog</em>. Select + the appropriate dive log by selecting, from the <strong>Main Menu</strong>, <em>File → Open logbook</em> and then select your own + dive log file from the list of files lower down in the menu. However, a problem arises if the users + prefer different settings for <em>Subsurface</em>. For instance, one diver may prefer to see the dive ceiling in the + <strong>Profile Panel</strong> and photos icons in the <strong>Dive List</strong>, while the other may not have these preferences. In addition, + the cloud connection is normally unique for each <em>Subsurface</em> installation and if more than one user wishes to save + dive data on the cloud, it is inconvenient to open the <strong>Preferences</strong> and change the user-ID data every time + the cloud is accessed. To solve these problems, launch <em>Subsurface</em> with a <em>--user=<user name></em> command-line option. + John can then activate <em>Subsurface</em> with this command-line instruction:</p></div> +<div class="literalblock"> +<div class="content"> +<pre><code>subsurface --user=John</code></pre> +</div></div> +<div class="paragraph"><p>while Joan can launch <em>Subsurface</em> using:</p></div> +<div class="literalblock"> +<div class="content"> +<pre><code>subsurface --user=Joan</code></pre> +</div></div> +<div class="paragraph"><p>In this case, each user’s preferences, settings and cloud access information are stored separately, allowing + each diver to interact with <em>Subsurface</em> in her/his preferred way and with individual cloud access. The above + process can be made user-friendly by creating a link/shortcut with a desktop icon that executes the above + command-line instruction. Use of the <em>--user=</em> option therefore enables each user to create, maintain and + backup a separate dive log within a personalised user interface. This way, when each diver launches <em>Subsurface</em>, + it opens with the correct dive log as well as the appropriate display and backup preferences, and each diver + can access their own divelog on a mobile device using <a href="https://subsurface-divelog.org/documentation/subsurface-mobile-user-manual"><em>Subsurface-Mobile</em></a>.</p></div> +<div class="paragraph"><p><strong>B)</strong> On the other hand, if the users log onto the same computer using different userIDs and passwords (i.e. users each +have a separate user space), <em>Subsurface</em> is available independently to each user and every diver automatically has a separate +user profile and settings, including unique cloud and <em>Subsurface-Mobile</em> access.</p></div> +</div> +</div> +<div class="sect1"> +<h2 id="S_PrintDivelog">11. Printing a dive log</h2> <div class="sectionbody"> <div class="paragraph"><p><em>Subsurface</em> provides a simple and flexible way to print a whole dive log or only a few selected dives. Pre-installed templates or a custom written template can be used to choose where the data are fitted into the page.</p></div> @@ -4322,7 +4564,7 @@ page.</p></div> </div> </div> <div class="sect2"> -<h3 id="_créer_un_modèle_d_8217_impression_personnalisé_avancé">10.1. Créer un modèle d’impression personnalisé (avancé)</h3> +<h3 id="_créer_un_modèle_d_8217_impression_personnalisé_avancé">11.1. Créer un modèle d’impression personnalisé (avancé)</h3> <div class="paragraph"><p>Writing a custom template is an effective way to produce highly customized printouts. Subsurface uses HTML templates to render printing. You can create a template, export a new template, import an existing template and delete an @@ -4333,17 +4575,16 @@ information on how to write or modify a template.</p></div> </div> </div> <div class="sect1"> -<h2 id="S_Configure">11. Configurer un ordinateur de plongée</h2> +<h2 id="S_Configure">12. Configurer un ordinateur de plongée</h2> <div class="sectionbody"> -<div class="paragraph"><p><em>Subsurface</em> vous permet de configurer un ordinateur de -plongée. Actuellement, les familles d’ordinateurs supportés sont -Heinrichs-Weikamp (OSTC 2, OSTC 3) et Suunto Vyper (Stinger, Mosquito, D3, -Vyper, Vytec, Cobra, Gekko et Zoop). De nombreux paramètres de ces -ordinateurs de plongée peuvent être lues et modifiées. Pour s’assurer que -les pilotes pour votre ordinateur de plongée sont installés (également -nécessaire pour télécharger les plongées) et que le nom de périphérique de -l’ordinateur de plongée est connu. Voir -<a href="#_appendix_a_operating_system_specific_information_for_importing_dive_information_from_a_dive_computer">ANNEXE A</a> pour plus d’informations sur la manière de procéder.</p></div> +<div class="paragraph"><p><em>Subsurface</em> lets you configure a dive computer. Currently the +Heinrichs-Weikamp (OSTC 2, OSTC 3) and Suunto Vyper (Stinger, Mosquito, D3, +Vyper, Vytec, Cobra, Gekko and Zoop) family of dive computers are +supported. A large number of settings of these dive computers can be read +and changed to different values. To begin, be sure the appropriate hardware +driver is installed for the dive computer (also required for downloading +dives) and the device name of the dive computer is known. See +<a href="#_appendix_a_operating_system_specific_information_for_importing_dive_information_from_a_dive_computer">APPENDIX A</a> for information on how to do this.</p></div> <div class="paragraph"><p>Une fois que l’ordinateur de plongée est connecté à <em>Subsurface</em>, sélectionner <em>Fichier → Configurer l’ordinateur de plongée</em>, à partir du menu principal. Sélectionner le nom du périphérique (ou le point de montage) @@ -4392,7 +4633,7 @@ suivantes peuvent être effectuées :</p></div> </div> </div> <div class="sect1"> -<h2 id="S_Preferences">12. Setting user <em>Preferences</em> for <em>Subsurface</em></h2> +<h2 id="S_Preferences">13. Setting user <em>Preferences</em> for <em>Subsurface</em></h2> <div class="sectionbody"> <div class="paragraph"><p>There are several user-definable settings within <em>Subsurface</em>, found by selecting <em>File → Preferences</em>, mostly affecting the way in which @@ -4405,7 +4646,7 @@ and are not saved. In order to apply new settings permanently, select the <em>Save</em> button. If you do not wish to apply the new preferences, select <em>Cancel</em>.</p></div> <div class="sect2"> -<h3 id="_defaults">12.1. Defaults</h3> +<h3 id="_defaults">13.1. Defaults</h3> <div class="paragraph"><p>There are several headings in the <strong>Defaults</strong> panel:</p></div> <div class="imageblock" style="text-align:center;"> <div class="content"> @@ -4479,7 +4720,7 @@ and are not saved. In order to apply new settings permanently, select the </ul></div> </div> <div class="sect2"> -<h3 id="_units">12.2. Units</h3> +<h3 id="_units">13.2. Units</h3> <div class="imageblock" style="text-align:center;"> <div class="content"> <img src="images/Pref2_f23.jpg" alt="FIGURE: Preferences Units page" /> @@ -4497,7 +4738,7 @@ represented either as traditional coordinates (degrees, minutes, seconds) or as decimal degrees Choose the appropriate option.</p></div> </div> <div class="sect2"> -<h3 id="_graph">12.3. Graph</h3> +<h3 id="_graph">13.3. Graph</h3> <div class="paragraph"><p>This panel has three sections:</p></div> <div class="imageblock" id="S_CCR_options" style="text-align:center;"> <div class="content"> @@ -4648,7 +4889,7 @@ was no gas switch to such a cylinder), then these cylinders are omitted from tha </ul></div> </div> <div class="sect2"> -<h3 id="_language">12.4. Language</h3> +<h3 id="_language">13.4. Language</h3> <div class="paragraph"><p>Choose a language that <em>Subsurface</em> will use.</p></div> <div class="imageblock" style="text-align:center;"> <div class="content"> @@ -4666,7 +4907,7 @@ English or French. <strong>This particular preference requires a restart of dive details.</p></div> </div> <div class="sect2"> -<h3 id="_network">12.5. Network</h3> +<h3 id="_network">13.5. Network</h3> <div class="paragraph"><p>This panel facilitates communication between <em>Subsurface</em> and data sources on the Internet. This is important, for instance, when <em>Subsurface</em> needs to communicate with web services such as Cloud storage or the @@ -4724,7 +4965,7 @@ from your ISP. </ul></div> </div> <div class="sect2"> -<h3 id="_georeference">12.6. Georeference</h3> +<h3 id="_georeference">13.6. Georeference</h3> <div class="paragraph"><p><em>Subsurface</em> provides a geo-lookup service (that is, given the coordinates of a dive site) derived from a click on the <strong>Dive Map panel</strong> at the bottom right of the <em>Subsurface</em> window, or from a GPS instrument or from the @@ -4742,7 +4983,7 @@ below).</p></div> </div> </div> <div class="sect1"> -<h2 id="S_DivePlanner">13. The <em>Subsurface</em> dive planner</h2> +<h2 id="S_DivePlanner">14. The <em>Subsurface</em> dive planner</h2> <div class="sectionbody"> <div class="paragraph"><p>Dive planning is an advanced feature of <em>Subsurface</em>, accessed by selecting <em>Log → Plan Dive</em> from the main menu. It allows calculation of inert gas @@ -4799,7 +5040,7 @@ A user who is not absolutely sure about any of the above requirements should </ul></div> </div></div> <div class="sect2"> -<h3 id="_the_em_subsurface_em_dive_planner_screen">13.1. The <em>Subsurface</em> dive planner screen</h3> +<h3 id="_the_em_subsurface_em_dive_planner_screen">14.1. The <em>Subsurface</em> dive planner screen</h3> <div class="paragraph"><p>Like the <em>Subsurface</em> dive log, the planner screen is divided into several sections (see image below). The <strong>setup</strong> parameters for a dive are entered into the sections on the left hand side of the screen. They are: Available @@ -4819,7 +5060,7 @@ messages about the dive plan are printed.</p></div> </div> </div> <div class="sect2"> -<h3 id="_open_circuit_dives">13.2. Open circuit dives</h3> +<h3 id="_open_circuit_dives">14.2. Open circuit dives</h3> <div class="ulist"><ul> <li> <p> @@ -4930,7 +5171,7 @@ The most efficient way to create a dive profile is to enter the appropriate </li> </ul></div> <div class="sect3"> -<h4 id="_recreational_dives">13.2.1. Recreational dives</h4> +<h4 id="_recreational_dives">14.2.1. Recreational dives</h4> <div class="paragraph"><p>Recreational mode is what comes closest to planning a dive based on the non-decompression limit (NDL). It computes the maximum time a diver can stay at the current depth without needing mandatory decompression stops and without using more than the existing gas (minus a reserve). The planner automatically takes @@ -5029,7 +5270,7 @@ buddy-sharing during ascent.</p></div> </div> </div> <div class="sect3"> -<h4 id="_non_recreational_open_circuit_dives_including_decompression">13.2.2. Non-recreational open circuit dives, including decompression</h4> +<h4 id="_non_recreational_open_circuit_dives_including_decompression">14.2.2. Non-recreational open circuit dives, including decompression</h4> <div class="paragraph"><p>Non-recreational dive planning involves exceeding the no-deco limits and/or using multiple breathing gases. These dives are planned in three stages:</p></div> <div class="paragraph"><p><strong>a) Nitrogen management</strong>: This is done by specifying the rates for descent and ascent, @@ -5168,7 +5409,7 @@ from the segment durations at a particular level.</p></div> </div> </div> <div class="sect2"> -<h3 id="_planning_pscr_dives">13.3. Planning pSCR dives</h3> +<h3 id="_planning_pscr_dives">14.3. Planning pSCR dives</h3> <div class="paragraph"><p>To plan a dive using a passive semi-closed rebreather (pSCR), select <em>pSCR</em> rather than <em>Open circuit</em> in the dropdown list. The parameters of the pSCR dive can be set by selecting <em>File → Preferences → Graph</em> @@ -5189,7 +5430,7 @@ in the loop due to the oxygen drop across the mouthpiece of the pSCR equipment.< </div> </div> <div class="sect2"> -<h3 id="_planning_ccr_dives">13.4. Planning CCR dives</h3> +<h3 id="_planning_ccr_dives">14.4. Planning CCR dives</h3> <div class="paragraph"><p>To plan a dive using a closed circuit rebreather, select the <em>CCR</em> option in the dropdown list, circled in blue in the image below.</p></div> <div class="paragraph"><p><strong>Available gases</strong>: In the <em>Available gases</em> table, enter the cylinder information for the @@ -5214,7 +5455,7 @@ this is calculated for bail out ascents.</p></div> is not calculated, so gas consumptions of 0 liters are the norm.</p></div> </div> <div class="sect2"> -<h3 id="S_Replan">13.5. Modifying an existing dive plan</h3> +<h3 id="S_Replan">14.5. Modifying an existing dive plan</h3> <div class="paragraph"><p>Normally, when a dive plan has been saved, it is accessible from the <strong>Dive List</strong>, like any other dive log. Within the <strong>Dive List</strong> there is no way to change a saved dive plan. To change a dive plan, select it on the <strong>Dive @@ -5229,7 +5470,7 @@ dive and do not influence other each during decompression calculation (see next section).</p></div> </div> <div class="sect2"> -<h3 id="_planning_for_repetitive_dives">13.6. Planning for repetitive dives</h3> +<h3 id="_planning_for_repetitive_dives">14.6. Planning for repetitive dives</h3> <div class="paragraph"><p>Repetitive dives can easily be planned if the dates and start times of the repetitive dive set are specified appropriately in the top left-hand <em>Start Time</em> field. <em>Subsurface</em> calculates the gas loading figures and the affect @@ -5246,7 +5487,7 @@ the <strong>Dive List</strong> and activate the planner: the planner takes into configuration in the highlighted dive.</p></div> </div> <div class="sect2"> -<h3 id="_printing_the_dive_plan">13.7. Printing the dive plan</h3> +<h3 id="_printing_the_dive_plan">14.7. Printing the dive plan</h3> <div class="paragraph"><p>Selecting the <em>Print</em> button in the planner allows printing of the <em>Dive Plan Details</em> for wet notes. You can also cut and paste the <em>Dive Plan Details</em> to include in a text file or word processing document.</p></div> @@ -5262,16 +5503,125 @@ process. The only way to print the dive plan is to use the <em>File → Prin function on the main menu in the same way as for dive logs or by copy and paste to a word processor.</p></div> </div> +<div class="sect2"> +<h3 id="S_MergeDivePlan">14.8. Saving a dive with its dive plan</h3> +<div class="paragraph"><p>In the section dealing with <a href="#S_MultipleDiveComputers">dives using more than one dive computer</a> we discussed the way in which multiple profiles for a +single dive can be viewed using the left-arrow and right-arrow keyboard +keys. A similar method can be used for saving a dive plan with the profile +of the actual dive, once this has been uploaded into <em>Subsurface</em>. In order +to do this:</p></div> +<div class="ulist"><ul> +<li> +<p> +Do the dive planning and save the final plan in the <em>Dive List</em>. +</p> +</li> +<li> +<p> +After diving, upload the dive data from the dive computer. +</p> +</li> +<li> +<p> +Change the date and time of the <em>dive plan</em> to coincide with that of the + real-life dive from the <em>dive computer</em>. +</p> +</li> +<li> +<p> +In the <em>Dive List</em>, highlight the dive plan as well as the data for the real + dive and merge the two dives, making use of the Dive List Context Menu + (available by righ-clicking a dive). +</p> +</li> +</ul></div> +<div class="paragraph"><p>The text version of the dive plan is appended to the Notes in the <em>Notes +Tab</em>. With this merged dive highlighted in the <em>Dive List</em>, switch between +the planned profile and the real-life profile using the +righ-arrow/left-arrow keyboard keys.</p></div> +</div> +</div> +</div> +<div class="sect1"> +<h2 id="_running_em_subsurface_em_from_the_command_line">15. Running <em>Subsurface</em> from the command-line</h2> +<div class="sectionbody"> +<div class="paragraph"><p><em>Subsurface</em> can be launched from the command-line to set some specialised +settings or as part of an script-based automated process for manipulating a +dive log. The format for launching <em>Subsurface</em> from the command-line is:</p></div> +<div class="literalblock"> +<div class="content"> +<pre><code>subsurface [options] [logfile ...] [--import logfile ...]</code></pre> +</div></div> +<div class="paragraph"><p>The options include:</p></div> +<div class="tableblock"> +<table rules="all" +width="100%" +frame="border" +cellspacing="0" cellpadding="4"> +<col width="50%" /> +<col width="50%" /> +<tbody> +<tr> +<td align="left" valign="top"><p class="table"><strong>Command-line option</strong></p></td> +<td align="left" valign="top"><p class="table"><strong>Description</strong></p></td> +</tr> +<tr> +<td align="left" valign="top"><p class="table">--help</p></td> +<td align="left" valign="top"><p class="table">Print a summary of the command-line options</p></td> +</tr> +<tr> +<td align="left" valign="top"><p class="table">-h</p></td> +<td align="left" valign="top"><p class="table">Print a summary of the command-line options</p></td> +</tr> +<tr> +<td align="left" valign="top"><p class="table">--import logfile</p></td> +<td align="left" valign="top"><p class="table">A file name before this option is treated as an existing dive log, everything after is imported into the existing dive log</p></td> +</tr> +<tr> +<td align="left" valign="top"><p class="table">--verbose</p></td> +<td align="left" valign="top"><p class="table">Print debug information while running <em>Subsurface</em></p></td> +</tr> +<tr> +<td align="left" valign="top"><p class="table">-v</p></td> +<td align="left" valign="top"><p class="table">Print debug information while running <em>Subsurface</em></p></td> +</tr> +<tr> +<td align="left" valign="top"><p class="table">-v -v</p></td> +<td align="left" valign="top"><p class="table">Print even more debug information while running <em>Subsurface</em></p></td> +</tr> +<tr> +<td align="left" valign="top"><p class="table">--version</p></td> +<td align="left" valign="top"><p class="table">Prints the current version of <em>Subsurface</em>.</p></td> +</tr> +<tr> +<td align="left" valign="top"><p class="table">--survey</p></td> +<td align="left" valign="top"><p class="table">Opens the <a href="#S_UserSurvey">user survey</a> immediately after starting <em>Subsurface</em></p></td> +</tr> +<tr> +<td align="left" valign="top"><p class="table">--user=<username></p></td> +<td align="left" valign="top"><p class="table">Choose the <a href="#S_user_space">configuration space</a> of user <username></p></td> +</tr> +<tr> +<td align="left" valign="top"><p class="table">--cloud-timeout=<duration></p></td> +<td align="left" valign="top"><p class="table">Set the timeout for cloud connection (0 < duration < 60). This enables longer timeouts for slow Internet connections</p></td> +</tr> +<tr> +<td align="left" valign="top"><p class="table">--win32console</p></td> +<td align="left" valign="top"><p class="table">Create a dedicated console if needed (Windows only). Add this option before everything else</p></td> +</tr> +</tbody> +</table> +</div> </div> </div> <div class="sect1"> -<h2 id="_description_des_éléments_du_menu_principal_de_subsurface">14. Description des éléments du menu principal de Subsurface</h2> +<h2 id="_description_des_éléments_du_menu_principal_de_subsurface">16. Description des éléments du menu principal de Subsurface</h2> <div class="sectionbody"> <div class="paragraph"><p>Cette section décrit les fonctions et les opérations des éléments du menu principal de Subsurface. Plusieurs éléments ci-dessous sont des liens vers des sections de ce manuel traitant des opérations relatives.</p></div> <div class="sect2"> -<h3 id="_fichier">14.1. Fichier</h3> +<h3 id="_fichier">16.1. Fichier</h3> <div class="ulist"><ul> <li> <p> @@ -5358,7 +5708,7 @@ des sections de ce manuel traitant des opérations relatives.</p></div> </ul></div> </div> <div class="sect2"> -<h3 id="_edit">14.2. Edit</h3> +<h3 id="_edit">16.2. Edit</h3> <div class="ulist"><ul> <li> <p> @@ -5368,7 +5718,7 @@ The Edit option allows one to undo or redo an action, e.g. deleting dives. </ul></div> </div> <div class="sect2"> -<h3 id="_importer">14.3. Importer</h3> +<h3 id="_importer">16.3. Importer</h3> <div class="ulist"><ul> <li> <p> @@ -5399,7 +5749,7 @@ The Edit option allows one to undo or redo an action, e.g. deleting dives. </ul></div> </div> <div class="sect2"> -<h3 id="_journal_log">14.4. Journal (log)</h3> +<h3 id="_journal_log">16.4. Journal (log)</h3> <div class="ulist"><ul> <li> <p> @@ -5465,7 +5815,7 @@ The Edit option allows one to undo or redo an action, e.g. deleting dives. </ul></div> </div> <div class="sect2"> -<h3 id="_vue">14.5. Vue</h3> +<h3 id="_vue">16.5. Vue</h3> <div class="ulist"><ul> <li> <p> @@ -5505,7 +5855,9 @@ The Edit option allows one to undo or redo an action, e.g. deleting dives. <li> <p> <em>Prev DC</em> - Switch to data from previous dive computer, if a single dive was - logged from more than one. + logged from more than one. See the sections on + <a href="#S_MultipleDiveComputers">using multiple dive computers for the same dive</a> + and <a href="#S_MergeDivePlan">Saving an uploaded dive with its dive plan</a>. </p> </li> <li> @@ -5521,7 +5873,7 @@ The Edit option allows one to undo or redo an action, e.g. deleting dives. </ul></div> </div> <div class="sect2"> -<h3 id="_share_on">14.6. Share on</h3> +<h3 id="_share_on">16.6. Share on</h3> <div class="ulist"><ul> <li> <p> @@ -5532,7 +5884,7 @@ The Edit option allows one to undo or redo an action, e.g. deleting dives. </ul></div> </div> <div class="sect2"> -<h3 id="_aide">14.7. Aide</h3> +<h3 id="_aide">16.7. Aide</h3> <div class="ulist"><ul> <li> <p> @@ -5564,10 +5916,10 @@ The Edit option allows one to undo or redo an action, e.g. deleting dives. </div> </div> <div class="sect1"> -<h2 id="_annexe_a_informations_spécifiques_au_système_d_8217_exploitation_utilisé_pour_importer_les_informations_de_plongées_depuis_un_ordinateur_de_plongée">15. ANNEXE A : informations spécifiques au système d’exploitation utilisé pour importer les informations de plongées depuis un ordinateur de plongée.</h2> +<h2 id="_annexe_a_informations_spécifiques_au_système_d_8217_exploitation_utilisé_pour_importer_les_informations_de_plongées_depuis_un_ordinateur_de_plongée">17. ANNEXE A : informations spécifiques au système d’exploitation utilisé pour importer les informations de plongées depuis un ordinateur de plongée.</h2> <div class="sectionbody"> <div class="sect2"> -<h3 id="_assurez_vous_que_les_pilotes_drivers_nécessaires_sont_installés">15.1. Assurez-vous que les pilotes (drivers) nécessaires sont installés</h3> +<h3 id="_assurez_vous_que_les_pilotes_drivers_nécessaires_sont_installés">17.1. Assurez-vous que les pilotes (drivers) nécessaires sont installés</h3> <div class="admonitionblock"> <table><tr> <td class="icon"> @@ -5605,7 +5957,7 @@ sous <em>Mac_OSX_VCP_Driver.zip</em> sur le de documents et logiciels Silicon Labs</a>.</p></div> </div> <div class="sect2"> -<h3 id="S_HowFindDeviceName">15.2. Comment trouver le nom du périphérique branché sur USB et paramétrer les permissions en écriture</h3> +<h3 id="S_HowFindDeviceName">17.2. Comment trouver le nom du périphérique branché sur USB et paramétrer les permissions en écriture</h3> <div class="admonitionblock"> <table><tr> <td class="icon"> @@ -5699,7 +6051,7 @@ en écriture au port USB, l’ordinateur de plongée devrait se connecter et vous devriez pouvoir importer vos plongées.</p></div> </div> <div class="sect2"> -<h3 id="S_HowFindBluetoothDeviceName">15.3. Manually setting up Bluetooth enabled devices</h3> +<h3 id="S_HowFindBluetoothDeviceName">17.3. Manually setting up Bluetooth enabled devices</h3> <div class="admonitionblock"> <table><tr> <td class="icon"> @@ -5729,7 +6081,7 @@ Upload Log</em> and wait for the <em>Wait PC</em> message.</p></div> </li> </ul></div> <div class="sect3"> -<h4 id="_sur_windows_2">15.3.1. Sur Windows :</h4> +<h4 id="_sur_windows_2">17.3.1. Sur Windows :</h4> <div class="paragraph"><p>Bluetooth is most likely already enabled. For pairing with the dive computer choose <em>Control Panel → Bluetooth Devices → Add Wireless Device</em>. This should bring up a dialog showing your dive computer (which should be in @@ -5743,7 +6095,7 @@ contain this COM port already. If not, enter it manually.</p></div> using other software, remove the existing pairing with the dive computer.</p></div> </div> <div class="sect3"> -<h4 id="_sur_macos">15.3.2. Sur MacOS :</h4> +<h4 id="_sur_macos">17.3.2. Sur MacOS :</h4> <div class="paragraph"><p>Click on the Bluetooth symbol in the menu bar and select <em>Set up Bluetooth Device…</em>. The dive computer should then show up in the list of devices. Select it and go through the pairing process. This step should only @@ -5752,7 +6104,7 @@ be needed once for initial setup.</p></div> Mount Point</em> drop-down in the <em>Subsurface</em> <strong>Import</strong> dialog.</p></div> </div> <div class="sect3"> -<h4 id="_sur_linux">15.3.3. Sur Linux</h4> +<h4 id="_sur_linux">17.3.3. Sur Linux</h4> <div class="paragraph"><p>Be sure Bluetooth is enabled on the <em>Subsurface</em> computer. On most common distributions this should be true out of the box and pairing should be straightforward. For instance, Gnome3 shows a Bluetooth icon on the right of @@ -5979,10 +6331,10 @@ upload mode countdown is still running, go to_Subsurface_, select </div> </div> <div class="sect1"> -<h2 id="_appendix_b_dive_computer_specific_information_for_importing_dive_information">16. APPENDIX B: Dive Computer specific information for importing dive data.</h2> +<h2 id="_appendix_b_dive_computer_specific_information_for_importing_dive_information">18. APPENDIX B: Dive Computer specific information for importing dive data.</h2> <div class="sectionbody"> <div class="sect2"> -<h3 id="S_ImportUemis">16.1. Importing from Uemis Zurich</h3> +<h3 id="S_ImportUemis">18.1. Importing from Uemis Zurich</h3> <div class="admonitionblock"> <table><tr> <td class="icon"> @@ -6016,7 +6368,7 @@ download will continue where it stopped previously. You may have to do this more than once, depending on how many dives are stored on the dive computer.</p></div> </div> <div class="sect2"> -<h3 id="S_ImportingGalileo">16.2. Importing from Uwatec Galileo</h3> +<h3 id="S_ImportingGalileo">18.2. Importing from Uwatec Galileo</h3> <div class="admonitionblock"> <table><tr> <td class="icon"> @@ -6047,7 +6399,7 @@ ScubaPro SmartTrak software.</p></div> for OSX 10.6 or higher.</p></div> </div> <div class="sect2"> -<h3 id="S_ImportingDR5">16.3. Importing from Heinrichs Weikamp DR5</h3> +<h3 id="S_ImportingDR5">18.3. Importing from Heinrichs Weikamp DR5</h3> <div class="admonitionblock"> <table><tr> <td class="icon"> @@ -6065,7 +6417,7 @@ the DR5.</td> </div> </div> <div class="sect2"> -<h3 id="S_ImportingXDeep">16.4. Importing from xDEEP BLACK</h3> +<h3 id="S_ImportingXDeep">18.4. Importing from xDEEP BLACK</h3> <div class="admonitionblock"> <table><tr> <td class="icon"> @@ -6084,7 +6436,7 @@ BLACK.</td> </div> </div> <div class="sect2"> -<h3 id="_importing_from_shearwater_predator_petrel_nerd_using_bluetooth">16.5. Importing from Shearwater Predator/Petrel/Nerd using Bluetooth</h3> +<h3 id="_importing_from_shearwater_predator_petrel_nerd_using_bluetooth">18.5. Importing from Shearwater Predator/Petrel/Nerd using Bluetooth</h3> <div class="admonitionblock"> <table><tr> <td class="icon"> @@ -6096,7 +6448,7 @@ section above, <a href="#S_Bluetooth"><em>Connecting Subsurface to a Bluetooth-e </div> </div> <div class="sect2"> -<h3 id="S_PoseidonMkVI">16.6. Importing from Poseidon MkVI Discovery</h3> +<h3 id="S_PoseidonMkVI">18.6. Importing from Poseidon MkVI Discovery</h3> <div class="admonitionblock"> <table><tr> <td class="icon"> @@ -6134,7 +6486,7 @@ Redbook format dive log (file with .cvsr extension). This is a compressed information.</p></div> </div> <div class="sect2"> -<h3 id="_importing_from_apd_inspiration_evolution_ccr">16.7. Importing from APD Inspiration/Evolution CCR</h3> +<h3 id="_importing_from_apd_inspiration_evolution_ccr">18.7. Importing from APD Inspiration/Evolution CCR</h3> <div class="admonitionblock"> <table><tr> <td class="icon"> @@ -6231,7 +6583,7 @@ are not logged by the APD equipment but can be manually entered in the </div> </div> <div class="sect1"> -<h2 id="_appendix_c_exporting_dive_log_information_from_external_dive_log_software">17. APPENDIX C: Exporting Dive log information from external dive log software.</h2> +<h2 id="_appendix_c_exporting_dive_log_information_from_external_dive_log_software">19. APPENDIX C: Exporting Dive log information from external dive log software.</h2> <div class="sectionbody"> <div class="paragraph"><p>The import of dive log data from external dive log software is mostly performed using the dialogue found by selecting <em>Import</em> from the Main Menu, @@ -6255,7 +6607,7 @@ Import the accessible dive log data into <em>Subsurface</em>. data from foreign dive log software. The procedures below mostly apply to Linux and/or Windows.</p></div> <div class="sect2"> -<h3 id="S_ImportingDivesSuunto">17.1. Exporting from <strong>Suunto Divemanager (DM3, DM4 or DM5)</strong></h3> +<h3 id="S_ImportingDivesSuunto">19.1. Exporting from <strong>Suunto Divemanager (DM3, DM4 or DM5)</strong></h3> <div class="admonitionblock"> <table><tr> <td class="icon"> @@ -6425,7 +6777,7 @@ The dives are now exported to the file DM4.bak (or DM5.bak) </ol></div> </div> <div class="sect2"> -<h3 id="_exporting_from_atomic_logbook">17.2. Exporting from Atomic Logbook</h3> +<h3 id="_exporting_from_atomic_logbook">19.2. Exporting from Atomic Logbook</h3> <div class="admonitionblock" id="Atomic_Export"> <table><tr> <td class="icon"> @@ -6440,7 +6792,7 @@ directly imported to Subsurface.</td> </div> </div> <div class="sect2"> -<h3 id="_exporting_from_mares_dive_organiser_v2_1">17.3. Exporting from Mares Dive Organiser V2.1</h3> +<h3 id="_exporting_from_mares_dive_organiser_v2_1">19.3. Exporting from Mares Dive Organiser V2.1</h3> <div class="admonitionblock" id="Mares_Export"> <table><tr> <td class="icon"> @@ -6481,7 +6833,7 @@ The password for accessing the .zip file is <em>mares</em>. </ol></div> </div> <div class="sect2"> -<h3 id="S_ImportingDivingLog">17.4. Exporting from <strong>DivingLog 5.0 and 6.0</strong></h3> +<h3 id="S_ImportingDivingLog">19.4. Exporting from <strong>DivingLog 5.0 and 6.0</strong></h3> <div class="admonitionblock"> <table><tr> <td class="icon"> @@ -6529,7 +6881,7 @@ do is save the log file in Subsurface.</p></div> </div> </div> <div class="sect1"> -<h2 id="_annexe_d_exporter_un_tableur_vers_le_format_csv">18. ANNEXE D : Exporter un tableur vers le format CSV</h2> +<h2 id="_annexe_d_exporter_un_tableur_vers_le_format_csv">20. ANNEXE D : Exporter un tableur vers le format CSV</h2> <div class="sectionbody"> <div class="paragraph" id="S_Appendix_D"><p>De nombreux plongeurs conservent un carnet de plongée sous forme de fichier numérique, souvent un tableur avec différents champs et informations. Ces @@ -6607,7 +6959,7 @@ then select <em>OK</em>.</p></div> the dive data as explained on the section <a href="#S_ImportingCSVDives">Importing CSV dives</a>.</p></div> <div class="sect2"> -<h3 id="_microsoft_em_excel_em">18.1. Microsoft <em>Excel</em></h3> +<h3 id="_microsoft_em_excel_em">20.1. Microsoft <em>Excel</em></h3> <div class="paragraph"><p>The field delimiter (called "<em>list separator</em>" in Microsoft manuals) is not accessible from within <em>Excel</em> and needs to be set through the <em>Microsoft Control Panel</em>. After changing the separator character, all software on the @@ -6677,7 +7029,7 @@ text editor, then import the dive data as explained on the section </div> </div> <div class="sect1"> -<h2 id="S_APPENDIX_E">19. ANNEXE E : Créer un modèle d’impression personnalisé</h2> +<h2 id="S_APPENDIX_E">21. ANNEXE E : Créer un modèle d’impression personnalisé</h2> <div class="sectionbody"> <div class="paragraph"><p><em>Subsurface</em> has a way to create or modify templates for printing dive logs to produce customized printouts of them. Templates written in HTML, as well @@ -6732,7 +7084,7 @@ the print dialogue to save the new template using a new template name.</p></div> <div class="paragraph"><p>To write a custom template, the following elements must exist so the template will be correctly handled and rendered.</p></div> <div class="sect2"> -<h3 id="_main_dive_loop">19.1. Main dive loop</h3> +<h3 id="_main_dive_loop">21.1. Main dive loop</h3> <div class="paragraph"><p><em>Subsurface</em> exports a dive list called (<strong>dives</strong>) to the <em>Grantlee</em> back end. It is possible to iterate over the list as follows: .template.html</p></div> @@ -6753,7 +7105,7 @@ end. It is possible to iterate over the list as follows: <a href="http://www.grantlee.org/apidox/for_themers.html">here</a></p></div> </div> <div class="sect2"> -<h3 id="_grantlee_exported_variables">19.2. Grantlee exported variables</h3> +<h3 id="_grantlee_exported_variables">21.2. Grantlee exported variables</h3> <div class="paragraph"><p>Only a subset of the dive data is exported:</p></div> <div class="tableblock"> <table rules="all" @@ -6983,7 +7335,7 @@ cellspacing="0" cellpadding="4"> </div></div> </div> <div class="sect2"> -<h3 id="_defined_css_selectors">19.3. Defined CSS selectors</h3> +<h3 id="_defined_css_selectors">21.3. Defined CSS selectors</h3> <div class="paragraph"><p>As the dive profile is placed after rendering, <em>Subsurface</em> uses special <em>CSS</em> selectors to searche in the HTML output. The <em>CSS</em> selectors in the following table should be added.</p></div> @@ -7031,7 +7383,7 @@ data-numberofdives = 0).</td> </div> </div> <div class="sect2"> -<h3 id="_special_attributes">19.4. Special attributes</h3> +<h3 id="_special_attributes">21.4. Special attributes</h3> <div class="paragraph"><p>There are two ways of rendering- either rendering a specific number of dives in each page or make <em>Subsurface</em> try to fit as many dives as possible into one page (<em>flow</em> rendering).</p></div> @@ -7072,10 +7424,10 @@ page size.</td> </div> </div> <div class="sect1"> -<h2 id="_appendix_f_faqs">20. APPENDIX F: FAQs.</h2> +<h2 id="_appendix_f_faqs">22. APPENDIX F: FAQs.</h2> <div class="sectionbody"> <div class="sect2"> -<h3 id="S_APPENDIX_F">20.1. Subsurface appears to miscalculate gas consumption and SAC</h3> +<h3 id="S_APPENDIX_F">22.1. Subsurface appears to miscalculate gas consumption and SAC</h3> <div class="paragraph" id="SAC_CALCULATION"><p><em>Question</em>: I dived with a 12.2 l tank, starting with 220 bar and ending with 100 bar, and I calculate a different SAC compared what <em>Subsurface</em> calculates. Is <em>Subsurface</em> miscalculating?</p></div> @@ -7110,7 +7462,7 @@ contain twice as much air as a 200 bar one. At lower pressures, air acts pretty much like an ideal gas.</p></div> </div> <div class="sect2"> -<h3 id="_some_dive_profiles_have_time_discrepancies_with_the_recorded_samples_from_my_dive_computer_8230">20.2. Some dive profiles have time discrepancies with the recorded samples from my dive computer…</h3> +<h3 id="_some_dive_profiles_have_time_discrepancies_with_the_recorded_samples_from_my_dive_computer_8230">22.2. Some dive profiles have time discrepancies with the recorded samples from my dive computer…</h3> <div class="paragraph"><p><em>Subsurface</em> ends up ignoring surface time for many things (average depth, divetime, SAC, etc). <em>Question</em>: Why do dive durations in my dive computer differ from that given by <em>Subsurface</em>?</p></div> @@ -7125,7 +7477,7 @@ at the surface. And then you don’t want that to count as some kind of long dive”.</p></div> </div> <div class="sect2"> -<h3 id="_some_dive_profiles_are_missing_from_the_download">20.3. Some dive profiles are missing from the download</h3> +<h3 id="_some_dive_profiles_are_missing_from_the_download">22.3. Some dive profiles are missing from the download</h3> <div class="paragraph" id="DC_HISTORY"><p><em>Question</em>: I cannot download all my dives, only the most recent ones, even though my dive computer’s manual states that it records history of e.g. 999 dives? <em>Answer</em>: Dive history is different than the dive profiles on the @@ -7147,7 +7499,7 @@ salvaged after being overwritten by new dives.</p></div> <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2016-11-30 13:55:17 CET +Last updated 2017-01-11 10:48:04 CET </div> </div> </body> diff --git a/Documentation/user-manual_fr.txt b/Documentation/user-manual_fr.txt index 3fa856355..8c0612084 100644 --- a/Documentation/user-manual_fr.txt +++ b/Documentation/user-manual_fr.txt @@ -10,8 +10,7 @@ image::images/Subsurface4Banner.jpg["Banner", align="center"] *Auteurs du manuel* : Willem Ferguson, Jacco van Koll, Dirk Hohndel, Reinout Hoornweg, Linus Torvalds, Miika Turkia, Amit Chaudhuri, Jan Schubert, Salvador Cuñat, Pedro Neves -[blue]#_Version 4.5, Octobre 2015_# - +[blue]#_Version 4.6, January 2017_# Bienvenue en tant qu'utilisateur de _Subsurface_, un programme avancé d'enregistrement de plongées (carnet de plongées) avec une bonne @@ -21,6 +20,8 @@ rapport à d'autres solutions logicielles similaires : - Avez-vous besoin d'une façon d'enregistrer vos plongées utilisant des équipements loisirs, même sans utiliser d'ordinateur de plongée ? + - Souhaitez-vous inclure facilement les positions GPS des sites de plongées + dans votre carnet de plongée ? - Utilisez-vous deux marques différentes d'ordinateurs de plongée, chacun avec son propre logiciel propriétaire pour télécharger les enregistrements des plongées ? Plongez-vous avec un recycleur ou un équipement en circuit ouvert @@ -31,28 +32,32 @@ rapport à d'autres solutions logicielles similaires : ces enregistrements dans un système unique. - Utilisez-vous plus d'un système d'exploitation ? _Subsurface_ est intégralement compatible avec Mac, Linux et Windows, ce qui vous permet - d'accéder à vos enregistrements de plongées sur chaque système - d'exploitation en utilisant une application unique. + d'accéder à votre carnet de plongées sur chaque système d'exploitation en + utilisant une application unique. - Utilisez-vous Linux ou Mac mais votre ordinateur de plongée n'a que des logiciels pour Windows pour télécharger les informations de plongées (par - exemple Mares) ? _Subsurface_ fournit un moyen de télécharger et d'analyser - vos enregistrements de plongées sur d'autres systèmes d'exploitation. + exemple Mares ou scubapro) ? _Subsurface_ fournit un moyen de télécharger et + d'analyser vos enregistrements de plongées sur d'autres systèmes + d'exploitation. - Avez-vous besoin d'un planificateur de plongée graphique intuitif qui intègre et prend en compte les plongées qui ont déjà été enregistrées ? -Avez-vous besoin d'un moyen d'nregistrer et de sauvegarder vos plongées sur -Internet, vous permettant de les voir depuis n'importe où en utilisant un -navigateur Internet ? _Subsurface_ est disponible pour Windows (Win XP ou -plus récent), les Macs basés sur processeurs Intel (OS/X) et de nombreuses -distributions Linux. _Subsurface_ peut être compilé pour bien plus de -plateformes matérielles et d'environnements logiciels où Qt et -libdivecomputer sont disponibles. + - Do you need a way of storing or backing up your dive log on the Internet, + letting you view your dive log from anywhere using an Internet browser? + - Souhaitez-vous pouvoir accéder ou modifier votre carnet de plongée en + utilisant un smartphone ? + +_Subsurface_ est disponible pour Windows (Win XP ou plus récent), les Macs +basés sur processeurs Intel (OS/X) et de nombreuses distributions +Linux. _Subsurface_ peut être compilé pour bien plus de plateformes +matérielles et d'environnements logiciels où Qt et libdivecomputer sont +disponibles. Ce manuel explique comment utiliser le programme _Subsurface_. Pour installer le logiciel, consultez la page _Téléchargement_ sur le http://subsurface-divelog.org/[site web de _Subsurface_]. En cas de problème, vous pouvez envoyer un e-mail sur mailto:subsurface@subsurface-divelog.org[notre liste de diffusion] et -rapportez les bogues sur https://github.com/Subsurface-divelog/subsurface/issues[notre bugtracker]. Pour +rapportez les bogues sur http://trac.hohndel.org[notre bugtracker]. Pour des instructions de compilation du logiciel et (si besoin) de ses dépendances, merci de consulter le fichier INSTALL inclus dans les sources logicielles. @@ -604,7 +609,6 @@ gets stuck and the _Download_ process fails repeatedly, information for manually setting up and inspecting the Bluetooth connection with _Subsurface_. - [[S_DeviceNames]] ==== Changing the name of a dive computer @@ -623,6 +627,21 @@ the appropriate dive computer. After saving the Nickname, the dive logs show the nickname for that particular device instead of the model name, allowing easy identification of devices. +[[S_MultipleDiveComputers]] +==== Uploading data for a specific dive from more than one dive computer + +Some divers use more than one dive computer at the same time, e.g. during +technical diving. If you import the dive profiles from these different dive +computers into _Subsurface_, the profiles can be viewed +independently. During upload the data from the dive computers are +automatically merged into a single dive. The different profiles are +presented on the _Profile_ panel with the name of each dive computer +indicated at the bottom left. *While the dive is highlighted in the _Dive +List_*, switch between the profiles of the different dive computers by using +either the left/right arrow keyboard keys or by selecting _View -> Previous +DC_ or _View -> Next DC_. The data in the _Notes_ panel are not affected by +the specific dive computer that is selected. + [[S_EditDiveInfo]] ==== Updating the dive information imported from the dive computer. @@ -906,6 +925,7 @@ from the main menu, select _Log -> Paste dive components_. All the selected dives now contain the data initially selected in the original source dive log. +[[S_Bookmarks]] ==== Adding Bookmarks to a dive Many divers wish to annotate dives with text that indicate particular @@ -986,7 +1006,7 @@ as in dialogue *B*, above. Currently these are: - XML-formatted dive logs (DivingLog 5.0, MacDive and several other dive log systems) - Cochran dive logs - - UDDF-formatted dive logs (e.g. Kenozoooid) + - UDDF-formatted dive logs (e.g. Kenozooid) - UDCF-formatted dive logs - Poseidon MkVI CCR logs - APD Inspiration/Evolution CCR logs @@ -995,6 +1015,8 @@ as in dialogue *B*, above. Currently these are: - OSTC Tools logs - JDiveLog - Suunto Dive Manager (DM3, DM4, DM5) + - DL7 files used by Diver's Alert network (DAN) + - Underwater technologies AV1 dive logs - CSV (text-based and spreadsheet-based) dive logs, including APD CCR logs Selecting the appropriate format and then the specific log file in the large @@ -1044,6 +1066,78 @@ information. instructions below. +[[S_SmartTrakImport]] +==== Importing Scubapro _SmartTrak_ divelogs + +_SmartTrak_ stores the raw data from a Uwatec/Scubapro dive computer along +with a plethora of other data manually added by the user, ranging from dive +points to buddies data or DAN survey info. However, this is Microsoft +Windows-based propietary software by Uwatec (today Scubapro) using +Microsoft Access databases, preventing the integration the importer into the +_Subsurface_ core application. + +A stand alone tool for Linux has been developed to import the _.slg_ files +generated by SmartTrak to Subsurface's _.xml_ format. It can be built +together with _Subsurface_ for Linux systems. Two dependencies need to be +installed in your system before building: _libglib2.0_ and _libmdb2_. + +Feel free to contact the _Subsurface_ development team on +mailto:subsurface@subsurface-divelog.org[our mailing list] for assistance in +importing _SmartTrak_ dive logs. + +Assuming the above dependencies have been installed and the _Subsurface_ +source tree is in the directory _~/src/subsurface_, then: + +===== Building _smtk2ssrf_ + +- Move to the source tree directory. +- Run " $ ccmake build " and set SMARTTRAK_IMPORT option to *on* (off by + default). +- Generate with [c] and save and exit with [g]. +- Build as you prefer, using the _build.sh_ script (recomended) or moving to + build directory and running _make_. +- After a successful build, there will be an executable named _smtk2ssrf_ in + the _subsurface/build_ directory. Copy or move it to a directory in your + $PATH, e.g. _~/bin_. + +===== Running + +_smtk2ssrf_ accepts 0, 2 or more parameters. If it is launched without +parameters in a graphical user interface, a simple window opens for choosing +the _.slg_ file(s) to import and a destination file to store the +_Subsurface_-formatted data into (see image below). + +image::images/smtk2ssrf.jpg["FIGURE:Download from SmartTrak", align="center"] + +[icon="images/icons/warning2.png"] +[WARNING] +Existing data in the destination file will be erased, so *DO NOT* use a +regular subsurface divelog file as a destination: rather, specify a *new* +filename as a destination. + +If launched from a command line with two or more parameters, the format is +as follows: + + $ smrtk2ssrf /input/file_1.slg /input/file_2.slg /output/file3.xml + +where _input_ is the directory containing the .slg file(s) and _output_ is +the directory where the _Subsurface_-formatted output is written to. Files +_file_1.slg_ and _file_2.slg_ in the _input_ directory are imported and +stored in _file3.xml_ in the _output_ directory. Check any warning and error +messages in the console or in the graphical window: some may be relevant as +support for Galileo family of dive computers is still a work in progress. + +===== Merging the imported dives with the existing divelog + +Open the new file (generated in the previous steps) using _Subsurface_ and +check the dives and data. If everything is fine, close the _.xml_ file and +open your regular divelog. Then from the *Main Menu* select _Import -> +Import log file_ and choose the _.xml_ file containing the imported dives: +these will show in the *Dive List*, time ordered, along with the existing +dives. The new dives, although time ordered, will keep the numbering system +from _SmartTrak_, so a renumbering action is needed. See the section on +xref:S_Renumber[Renumbering the dives] for instructions on this topic. + [[S_ImportingDivelogsDe]] ==== Importing dives from *divelogs.de* @@ -1077,9 +1171,10 @@ _Subsurface_. [[S_ImportingCSVDives]] ===== Importer les plongées au format CSV à partir des ordinateurs de plongées ou d'autres logiciels de carnet de plongée - _CSV_ files can be viewed using an ordinary text editor. A _CSV_ file is normally organized into -a single line that provides the headers (or _field 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 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. There are two types of _CSV_ dive logs that can be imported into _Subsurface_: @@ -1234,7 +1329,6 @@ smooth import of the dives into _Subsurface_. **** - [icon="images/icons/important.png"] [IMPORTANT] But, the _CSV_ import has a couple of caveats. Avoid some special characters @@ -1246,7 +1340,6 @@ details_) works, but larger files might exceed the limits of the parser used. When encountering problems with _CSV_ imports, first try with a smaller file to make sure everything works. - === Importing Dive coordinates from a mobile device with GPS. A smartphone with built-in GPS facilities can be used to store the locations @@ -1278,7 +1371,7 @@ dive information. Below, we describe how to perform the above three steps using each of the two mobile apps. For information on using the _Subsurface Companion App_, click -xref:S_iCompanion[_here_]. +xref:S_Companion[_here_]. ==== Storing and and using GPS locations using _Subsurface-mobile_ @@ -1370,7 +1463,7 @@ detailed instructions for performing the collection of GPS data and for managing, uploading and synchronising this information. -[[S_iCompanion]] +[[S_Companion]] ==== Importing GPS coordinates with the _Subsurface Companion App_ for mobile phones Using the *Subsurface Companion App* on an _Android device_ or @@ -1778,6 +1871,17 @@ 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. +==== Finding out which dives have associated photos. +Inspecting each individual dive in order to determine whether there are +associated photos can be time consuming. There is a rapid way of seeing +which dives have associated photos and which not: activate the _Photos_ +checkbox in the dropdown list obtained by right-clicking on the header bar +of the *Divelist*. In the *Divelist*, all dives with associated photographs +have an icon indicating whether the photographs were taken during the dive, +just before/after the dive or both during and before/after the dive. More +information is provided in the section dealing with <<S_Divelist_columns, +photo icons on the *Divelist*>>. + [[S_FindMovedImages]] ==== Moving photographs among directories, hard disks or computers @@ -1829,7 +1933,6 @@ fingerprints associated with a single dive if: **** - === Logging special types of dives This section gives examples of the versatility of _Subsurface_ as a dive @@ -2163,7 +2266,6 @@ the panel. *Water temperature* is shown as a blue line with temperature values placed adjacent to significant changes. - [[S_InfoBox]] ==== The *Information Box* The Information box displays a large range of information about the dive @@ -2245,6 +2347,7 @@ diving at a depth equalling the END. Figure (*B*) above shows an information box with a nearly complete set of data. + [[S_gas_pressure_graph]] ===== The Gas Pressure Bar Graph @@ -2316,6 +2419,36 @@ of the above figure for a diver using EAN32. the fast compartments do not approach the GFHigh value any more and the diver is safer than in the situation indicated in graph *D*. +==== Computer-reported events during dive +Many dive computers record events during a dive. For instance, most dive +computers report alarms relating to high partial pressures of oxygen, to +rapid ascents or the exceeding of no-deco limits (NDL). On the other hand, +other events are classified as warnings and, for instance, occur when the +remaining gas in a cylinder falls below a predetermined limit, a deep stop +needs to be performed or the need to change gas during multicylinder +dives. Some dive computers also report notifications, e.g. when a safety +stop is initiated or terminated or when a predetermined amount of OTUs have +been incurred. The alarms, warnings and notifications differs from one dive +computer to another: some dive computers do not report any of the above +events, while others provide an extensive log of events. The reporting of +events is therefore a function of the dive computer used. In addition, +_Subsurface_ does not always have the ability to detect all the events +reported by a specific dive computer. + +Events are indicated by symbols on the dive profile. Notifications are shown +as a white, round symbol with a letter _i_; warnings are indicated by a +yellow triangle and alarms by a red triangle. By moving the cursor over a +symbol, the explanation is given in the bottom-most line of the _Information +Box_ (see image below, where the cursor is positioned over the alarm that +was reported). + +image::images/profile_symbols.jpg["FIGURE: Profile notification symbols", align="center"] + +Some dive computers report _bookmarks_ that the diver has set during the +dive. These are indicated as a small red flag on the profile and are +discussed more fully in the section on <<S_Bookmarks,_inserting +bookmarks_>>. + ==== The Profile Toolbar The dive profile can include graphs of the *partial pressures* of O~2~, @@ -2603,6 +2736,7 @@ image::images/ContextMenu.jpg["Figure: Context Menu", align="center"] The context menu is used in many functions described below. +[[S_Divelist_columns]] ==== Customizing the columns showed in the *Dive List* panel image::images/DiveListOptions.jpg["Example: Dive list info options", align="center"] @@ -2610,12 +2744,33 @@ image::images/DiveListOptions.jpg["Example: Dive list info options", align="cent 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 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. +bar of the *Dive List*, bringing up a list of columns that can be shown in +the dive list (see above). Check an items to be included in the *Dive +List*. The list is immediately updated. Preferences for information shown +in the *Dive List* are saved and used when _Subsurface_ is re-opened. + +[[S_Photos_divelist]] + +By selecting the _Photos_ checkbox in the dropdown list, an icon is shown +indicating whether any photos are associated with a particular dive. There +are three icons: + +[icon="images/icons/duringPhoto.png"] +[NOTE] +This dive has photographs taken during the dive, typically using an +underwater camera. + +[icon="images/icons/outsidePhoto.png"] +[NOTE] +This dive has photographs taken immediately before or immediately after the +dive. This is useful for finding photos of dive teams or boats just +before/after the dive, whales or other surface animals seen just before or +after the dive, or of landscapes as seen from the boat. + +[icon="images/icons/inAndOutPhoto.png"] +[NOTE] +This dive has photographs taken both during the dive and immdiately before +or after the dive. [[S_Renumber]] === Renumbering the dives @@ -2797,53 +2952,48 @@ There are two ways to export dive information from Subsurface: - xref:S_Export_other[Exporter des informations de plongée vers d'autres destinations ou formats] -[[S_facebook]] +[[S_Facebook]] === Export des informations de plongée vers _Facebook_ -L'export des plongées vers _Facebook_ est géré différemment des autres types -d'export car une connexion vers _Facebook_ est nécessaire, nécessitant un -identifiant et un mot de passe. À partir du menu principal, si vous -sélectionnez _Partager sur -> Connecter à -> Facebook_, un écran de -connexion s'affiche (image *A* sur la gauche, ci dessous). Entrez -l'identifiant et le mot de passe _Facebook_. Une fois connecté à _Facebook_, -le panneau de l'image *B* ci dessous est affiché, avec un bouton -_Déconnecter de Facebook_ pour fermer la connexion _Facebook_. - -image::images/facebook1_f20.jpg["Figure: Facebook login", align="center"] - -From the _Subsurface_ window it’s easy to determine whether _Subsurface_ has -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). - -Une fois qu'une connexion à _Facebook_ est établie, transférer un profil de -plongée vers _Facebook_ est facile. Assurez-vous que la plongée à transférer -est affichée dans le panneau *Profil de plongée* de _Subsurface_. Si, à -partir du *menu principal*, vous sélectionnez _Partager sur -> Facebook_, -une fenêtre s'affiche, pour déterminer quelles informations seront -transférées avec le profil de plongée (voir l'image *B* ci-dessous). Pour -transférer un profil de plongée vers _Facebook_, le nom d'un album -_Facebook_ doit être fourni. Les cases à cocher sur la partie gauche -permettent de sélectionner des informations supplémentaires à transférer -avec le profil de plongée. Ces informations sont affichées dans le champs de -texte sur la partie droite du panneau. (image *B* ci dessous). Vous pouvez -facilement modifier le message qui sera envoyé avec le profil de -plongée. Une fois les informations supplémentaires ajoutées et vérifiées, -sélectionner le bouton _OK_ qui lance le transfert vers _Facebook_. Après un -moment, une fenêtre apparait indiquant le succès du transfert. - -À la fois l'album créé et la publication sur votre ligne temporelle seront -marquées comme privés. Pour que vos amis puissent la voir, modifier les -permissions à partir d'une connexion Facebook standard depuis un navigateur -ou l'application Facebook. - -image::images/facebook2_f20.jpg["Figure: Facebook login", align="center"] - -Si besoin, fermer la connexion _Facebook_ en fermant _Subsurface_ ou en -sélectionnant _Fichier -> Préférences -> Facebook, à partir du menu -principal et en cliquant sur le bouton approprié dans le panneau des -préférences Facebook. +Export of dives to _Facebook_ is handled differently from other types of +export because a connection to _Facebook_ is required, needing a _Facebook_ +userID and password. From the *Main Menu*, select _Share on -> Connect to +-> Facebook_ (image *A* below) A _Facebook_ login screen appears (image *B* +below). Provide a _Facebook_ userID and password. From the _Subsurface_ +window it’s easy to determine whether _Subsurface_ has 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). + +Once logged into to _Facebook_ , a panel is shown with a message: "_To +disconnect Subsurface from your Facebook account, use the 'Share on' menu +entry_." Close this message panel. + +image::images/facebook1.jpg["Figure: Facebook login", align="center"] + +Having established a login to _Facebook_, transferring a dive profile to a +_Facebook_ timeline is easy. In the _Subsurface_ *Dive Profile* panel, +highlight the dive to be transferred. A dialogue box is shown, determining +the amount of additional information to be transferred with the dive profile +(image *A*, below). To transfer a dive profile to _Facebook_, the name of a +_Facebook_ album is needed. The checkboxes on the left hand side determine +how much additional information is added to the dive profile, shown in the +text box on the right hand side of the panel (image *A*, below). Customise +the message that will be posted with the dive profile by editing any of the +information. After specifying additional information and verifying the text, +select the _OK_ button that triggers the transfer to _Facebook_. After the +transfer is done, an acknowledgement dialogue appears, indicating it was +successful. + +Both the album created and the post to your timeline are marked as +private. In order for friends to be able to see the post, log into +_Facebook_ using a browser or Facebook app and change its permissions. + +image::images/facebook2.jpg["Figure: Facebook data submission", align="center"] + +If required, then close the _Facebook_ connection by selecting, from the +*Main Menu*, _Share on -> Disconnect from -> Facebook_ (image *B* above). [[S_Export_other]] === Exporter des informations de plongée vers d'autres destinations ou formats @@ -3024,6 +3174,42 @@ folder and select the _Open_ button. Several paid services exist on the Internet (e.g. Google, Amazon) where the same process could be used for the Cloud-based storage of dive logs. +[[S_user_space]] +== Several _Subsurface_ users on one desktop computer +A frequent need is for two or more persons to use _Subsurface_ on the same +desktop computer. For instance members of a household may use the same +computer or one family member may perform dive uploads for other family +members/friends. There are two approaches for doing this. + +*A)* If the different users of a desktop computer do not log onto the desktop/laptop under different user names + then the simplest way is for each person to use her/his own divelog file within Subsurface. In this case John + would work with the _Subsurface_ file _johns-divelog_ and Joan would use _joans-divelog_. Select + the appropriate dive log by selecting, from the *Main Menu*, _File -> Open logbook_ and then select your own + dive log file from the list of files lower down in the menu. However, a problem arises if the users + prefer different settings for _Subsurface_. For instance, one diver may prefer to see the dive ceiling in the + *Profile Panel* and photos icons in the *Dive List*, while the other may not have these preferences. In addition, + the cloud connection is normally unique for each _Subsurface_ installation and if more than one user wishes to save + dive data on the cloud, it is inconvenient to open the *Preferences* and change the user-ID data every time + the cloud is accessed. To solve these problems, launch _Subsurface_ with a _--user=<user name>_ command-line option. + John can then activate _Subsurface_ with this command-line instruction: + + subsurface --user=John + +while Joan can launch _Subsurface_ using: + + subsurface --user=Joan + +In this case, each user's preferences, settings and cloud access information are stored separately, allowing + each diver to interact with _Subsurface_ in her/his preferred way and with individual cloud access. The above + process can be made user-friendly by creating a link/shortcut with a desktop icon that executes the above + command-line instruction. Use of the _--user=_ option therefore enables each user to create, maintain and + backup a separate dive log within a personalised user interface. This way, when each diver launches _Subsurface_, + it opens with the correct dive log as well as the appropriate display and backup preferences, and each diver + can access their own divelog on a mobile device using https://subsurface-divelog.org/documentation/subsurface-mobile-user-manual[_Subsurface-Mobile_]. + +*B)* On the other hand, if the users log onto the same computer using different userIDs and passwords (i.e. users each +have a separate user space), _Subsurface_ is available independently to each user and every diver automatically has a separate +user profile and settings, including unique cloud and _Subsurface-Mobile_ access. [[S_PrintDivelog]] == Printing a dive log @@ -3112,16 +3298,15 @@ information on how to write or modify a template. [[S_Configure]] == Configurer un ordinateur de plongée -_Subsurface_ vous permet de configurer un ordinateur de -plongée. Actuellement, les familles d'ordinateurs supportés sont -Heinrichs-Weikamp (OSTC 2, OSTC 3) et Suunto Vyper (Stinger, Mosquito, D3, -Vyper, Vytec, Cobra, Gekko et Zoop). De nombreux paramètres de ces -ordinateurs de plongée peuvent être lues et modifiées. Pour s'assurer que -les pilotes pour votre ordinateur de plongée sont installés (également -nécessaire pour télécharger les plongées) et que le nom de périphérique de -l'ordinateur de plongée est connu. Voir -<<_appendix_a_operating_system_specific_information_for_importing_dive_information_from_a_dive_computer, -ANNEXE A>> pour plus d'informations sur la manière de procéder. +_Subsurface_ lets you configure a dive computer. Currently the +Heinrichs-Weikamp (OSTC 2, OSTC 3) and Suunto Vyper (Stinger, Mosquito, D3, +Vyper, Vytec, Cobra, Gekko and Zoop) family of dive computers are +supported. A large number of settings of these dive computers can be read +and changed to different values. To begin, be sure the appropriate hardware +driver is installed for the dive computer (also required for downloading +dives) and the device name of the dive computer is known. See +<<_appendix_a_operating_system_specific_information_for_importing_dive_information_from_a_dive_computer,APPENDIX +A>> for information on how to do this. Une fois que l'ordinateur de plongée est connecté à _Subsurface_, sélectionner _Fichier -> Configurer l'ordinateur de plongée_, à partir du @@ -3783,6 +3968,52 @@ process. The only way to print the dive plan is to use the _File -> Print_ function on the main menu in the same way as for dive logs or by copy and paste to a word processor. +[[S_MergeDivePlan]] +=== Saving a dive with its dive plan + +In the section dealing with <<S_MultipleDiveComputers, dives using more than +one dive computer>> we discussed the way in which multiple profiles for a +single dive can be viewed using the left-arrow and right-arrow keyboard +keys. A similar method can be used for saving a dive plan with the profile +of the actual dive, once this has been uploaded into _Subsurface_. In order +to do this: + +- Do the dive planning and save the final plan in the _Dive List_. +- After diving, upload the dive data from the dive computer. +- Change the date and time of the _dive plan_ to coincide with that of the + real-life dive from the _dive computer_. +- In the _Dive List_, highlight the dive plan as well as the data for the real + dive and merge the two dives, making use of the Dive List Context Menu + (available by righ-clicking a dive). + +The text version of the dive plan is appended to the Notes in the _Notes +Tab_. With this merged dive highlighted in the _Dive List_, switch between +the planned profile and the real-life profile using the +righ-arrow/left-arrow keyboard keys. + +== Running _Subsurface_ from the command-line +_Subsurface_ can be launched from the command-line to set some specialised +settings or as part of an script-based automated process for manipulating a +dive log. The format for launching _Subsurface_ from the command-line is: + + subsurface [options] [logfile ...] [--import logfile ...] + +The options include: +|==================== +|*Command-line option*|*Description* +|--help|Print a summary of the command-line options +| -h|Print a summary of the command-line options +|--import logfile ...|A file name before this option is treated as an existing dive log, everything after is imported into the existing dive log +|--verbose|Print debug information while running _Subsurface_ +| -v|Print debug information while running _Subsurface_ +| -v -v| Print even more debug information while running _Subsurface_ +|--version|Prints the current version of _Subsurface_. +|--survey|Opens the xref:S_UserSurvey[user survey] immediately after starting _Subsurface_ +|--user=<username>|Choose the xref:S_user_space[configuration space] of user <username> +|--cloud-timeout=<duration>|Set the timeout for cloud connection (0 < duration < 60). This enables longer timeouts for slow Internet connections +|--win32console|Create a dedicated console if needed (Windows only). Add this option before everything else +|==================== + == Description des éléments du menu principal de Subsurface Cette section décrit les fonctions et les opérations des éléments du menu @@ -3869,7 +4100,9 @@ des sections de ce manuel traitant des opérations relatives. - _Statistiques annuelles_ - Affiche par année le résumé des statistiques des plongées effectuées. - _Prev DC_ - Switch to data from previous dive computer, if a single dive was - logged from more than one. + logged from more than one. See the sections on + <<S_MultipleDiveComputers,using multiple dive computers for the same dive>> + and <<S_MergeDivePlan, Saving an uploaded dive with its dive plan>>. - _Ordinateur suivant_ - Passer à l'ordinateur de plongée suivant. - _Plein écran_ - Passer en mode plein écran. |