diff options
| author |  Guillaume GARDET <guillaume.gardet@free.fr> | 2018-11-05 09:25:51 +0100 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2018-11-05 07:49:40 -0800 |
| commit | 236373b6ba92b9a3935958a367e88b05d4f54854 (patch) | |
| tree | 4d1ba84e8d27211e10c1e29ca6fee06eb546a6ad | |
| parent | 83ed75f4ab7494bc4597246a8a50b9c54122843f (diff) | |
| download | subsurface-236373b6ba92b9a3935958a367e88b05d4f54854.tar.gz | |
Documentation: update and merge french manuals
Signed-off-by: Guillaume GARDET <guillaume.gardet@free.fr>
| -rw-r--r-- | Documentation/50-pot/subsurface-mobile-manual.pot | 234 | ||||
| -rw-r--r-- | Documentation/50-pot/subsurface-user-manual.pot | 4092 | ||||
| -rw-r--r-- | Documentation/fr/po/subsurface-mobile-manual.fr.po | 234 | ||||
| -rw-r--r-- | Documentation/fr/po/subsurface-user-manual.fr.po | 4212 | ||||
| -rw-r--r-- | Documentation/mobile-manual_fr.html.git | 45 | ||||
| -rw-r--r-- | Documentation/mobile-manual_fr.txt | 43 | ||||
| -rw-r--r-- | Documentation/user-manual_fr.html.git | 1182 | ||||
| -rw-r--r-- | Documentation/user-manual_fr.txt | 945 |
8 files changed, 4082 insertions, 6905 deletions
diff --git a/Documentation/50-pot/subsurface-mobile-manual.pot b/Documentation/50-pot/subsurface-mobile-manual.pot index 263f280b9..087f3d4bb 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: 2018-06-26 10:10+0200\n" +"POT-Creation-Date: 2018-11-05 09:14+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" @@ -18,13 +18,6 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" #. :website: http://subsurface-divelog.org -#. type: Positional ($1) AttributeList argument for macro 'image' -#: mobile-manual.txt:13 -#, no-wrap -msgid "Banner" -msgstr "" - -#. :website: http://subsurface-divelog.org #. type: Target for macro image #: mobile-manual.txt:13 #, no-wrap @@ -174,12 +167,6 @@ msgid "" "image below on left)." msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: mobile-manual.txt:81 -#, no-wrap -msgid "FIGURE: Mobile credentials screen" -msgstr "" - #. type: Target for macro image #: mobile-manual.txt:81 #, no-wrap @@ -311,12 +298,6 @@ msgid "" "is shown in the top left corner of the screen." msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: mobile-manual.txt:139 -#, no-wrap -msgid "FIGURE: Action Button" -msgstr "" - #. type: Target for macro image #: mobile-manual.txt:139 #, no-wrap @@ -351,12 +332,6 @@ msgstr "" msgid "Drag the action button visible on most screens to the right" msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: mobile-manual.txt:154 -#, no-wrap -msgid "FIGURE: Dive management sub-panel" -msgstr "" - #. type: Target for macro image #: mobile-manual.txt:154 #, no-wrap @@ -399,12 +374,6 @@ msgid "" "information and notes." msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: mobile-manual.txt:176 -#, no-wrap -msgid "FIGURE: Dive list screen" -msgstr "" - #. type: Target for macro image #: mobile-manual.txt:176 #, no-wrap @@ -449,12 +418,6 @@ msgid "" "button is hidden. Once you close the keyboard it is drawn again." msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: mobile-manual.txt:201 -#, no-wrap -msgid "FIGURE: Dive edit screen" -msgstr "" - #. type: Target for macro image #: mobile-manual.txt:201 #, no-wrap @@ -483,12 +446,6 @@ msgid "" "dive in _Details View_." msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: mobile-manual.txt:217 -#, no-wrap -msgid "FIGURE: Manual dive entry screen" -msgstr "" - #. type: Target for macro image #: mobile-manual.txt:217 #, no-wrap @@ -510,12 +467,6 @@ msgid "" "message that appears at the bottom of the screen (see image below)." msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: mobile-manual.txt:226 -#, no-wrap -msgid "FIGURE: Undo delete dive" -msgstr "" - #. type: Target for macro image #: mobile-manual.txt:226 #, no-wrap @@ -533,12 +484,6 @@ msgid "" "the dive." msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: mobile-manual.txt:234 -#, no-wrap -msgid "FIGURE: delete dive from list" -msgstr "" - #. type: Target for macro image #: mobile-manual.txt:234 #, no-wrap @@ -564,7 +509,16 @@ msgid "" msgstr "" #. type: Plain text -#: mobile-manual.txt:252 +#: mobile-manual.txt:250 +msgid "" +"Use the _Vendor name_ and _Dive Computer_ drop-downs to pick the correct " +"dive computer. When downloading from multiple different dive computers, " +"shortcut buttons to easily switch between them will appear below the " +"drop-downs." +msgstr "" + +#. type: Plain text +#: mobile-manual.txt:256 msgid "" "The process for download is slightly different between the two OSs. In our " "testing we got the best results on iOS when the dive computer was in " @@ -574,7 +528,7 @@ msgid "" msgstr "" #. type: Plain text -#: mobile-manual.txt:256 +#: mobile-manual.txt:260 msgid "" "On Android devices, you should first establish a link between the Bluetooth " "or Bluetooth LE dive computer and the mobile device using Android " @@ -582,7 +536,7 @@ msgid "" msgstr "" #. type: Plain text -#: mobile-manual.txt:265 +#: mobile-manual.txt:269 msgid "" "For USB dive computers, USB cables \"normally\" used for uploading dives to " "a desktop/laptop computer do NOT work: these cables usually have a " @@ -598,27 +552,21 @@ msgid "" msgstr "" #. type: Plain text -#: mobile-manual.txt:267 +#: mobile-manual.txt:271 msgid "" "Please note that not all Android devices support OTG cables. And even on " "some devices that do support those cables in general, _Subsurface-mobile_ " "still in some cases cannot access a dive computer through a serial port." msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: mobile-manual.txt:268 -#, no-wrap -msgid "FIGURE: USB-OTG cable" -msgstr "" - #. type: Target for macro image -#: mobile-manual.txt:268 +#: mobile-manual.txt:272 #, no-wrap msgid "mobile-images/USB-OTG.jpg" msgstr "" #. type: Plain text -#: mobile-manual.txt:276 +#: mobile-manual.txt:280 msgid "" "For Bluetooth-equipped dive computers and Android devices, establish a " "Bluetooth connection between the dive computer and the mobile device. Use " @@ -632,7 +580,7 @@ msgid "" msgstr "" #. type: Plain text -#: mobile-manual.txt:282 +#: mobile-manual.txt:286 msgid "" "With pairing between dive computer and _Subsurface-mobile_ having been set " "up, dive download is simple. From the main menu, tap _Manage dives -> " @@ -645,7 +593,7 @@ msgid "" msgstr "" #. type: Plain text -#: mobile-manual.txt:286 +#: mobile-manual.txt:290 msgid "" "Now tap the button labeled _Download_. The downloaded dives appear in the " "bottom part of the screen, the most recent dive at the top (see image on " @@ -655,7 +603,7 @@ msgid "" msgstr "" #. type: Plain text -#: mobile-manual.txt:292 +#: mobile-manual.txt:296 msgid "" "After the download, each dive has a check-box on the left hand side, used " "for selecting which dives you want to be added to the _Subsurface-mobile_ " @@ -666,26 +614,20 @@ msgid "" "the section above xref:S_Edit_Dive[Edit a dive]." msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: mobile-manual.txt:293 -#, no-wrap -msgid "FIGURE: DC download screen" -msgstr "" - #. type: Target for macro image -#: mobile-manual.txt:293 +#: mobile-manual.txt:297 #, no-wrap msgid "mobile-images/DC-Download.jpg" msgstr "" #. type: Title == -#: mobile-manual.txt:295 +#: mobile-manual.txt:299 #, no-wrap msgid "Viewing the dive location on Google Maps" msgstr "" #. type: Plain text -#: mobile-manual.txt:300 +#: mobile-manual.txt:304 msgid "" "In the _Details View_, the Action Bar at the bottom has a GPS pin on the " "left hand side. Tap that pin and the dive site is shown in Google " @@ -694,33 +636,27 @@ msgid "" msgstr "" #. type: Plain text -#: mobile-manual.txt:303 +#: mobile-manual.txt:307 msgid "" "Alternatively, the _Details View_ has a button at the top right hand marked " "_Map it_. Tap this button to open Google Maps showing the dive site (image " "below)." msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: mobile-manual.txt:304 -#, no-wrap -msgid "FIGURE: Map of dive site" -msgstr "" - #. type: Target for macro image -#: mobile-manual.txt:304 +#: mobile-manual.txt:308 #, no-wrap msgid "mobile-images/Map.jpg" msgstr "" #. type: Title == -#: mobile-manual.txt:306 +#: mobile-manual.txt:310 #, no-wrap msgid "Dive log management" msgstr "" #. type: Plain text -#: mobile-manual.txt:316 +#: mobile-manual.txt:320 msgid "" "A central part of _Subsurface-mobile_ is the ability to store the dive log " "using the _Subsurface_ cloud storage. This provides security against loss " @@ -732,50 +668,50 @@ msgid "" msgstr "" #. type: Title === -#: mobile-manual.txt:317 +#: mobile-manual.txt:321 #, no-wrap msgid "Add new dive manually" msgstr "" #. type: Plain text -#: mobile-manual.txt:320 +#: mobile-manual.txt:324 msgid "" "This is described above under the section dealing with " "xref:S_Add_Dive[Manually adding a new dive to the dive list]." msgstr "" #. type: Title === -#: mobile-manual.txt:321 +#: mobile-manual.txt:325 #, no-wrap msgid "Download from DC" msgstr "" #. type: Plain text -#: mobile-manual.txt:324 +#: mobile-manual.txt:328 msgid "" "This is described above under the section dealing with " "xref:S_Download[Download dives from a dive computer]." msgstr "" #. type: Title === -#: mobile-manual.txt:325 +#: mobile-manual.txt:329 #, no-wrap msgid "Apply GPS fixes" msgstr "" #. type: Plain text -#: mobile-manual.txt:328 +#: mobile-manual.txt:332 msgid "This is described in the following main section, below." msgstr "" #. type: Title === -#: mobile-manual.txt:329 +#: mobile-manual.txt:333 #, no-wrap msgid "Manually sync the dive log with the _Subsurface_ cloud storage" msgstr "" #. type: Plain text -#: mobile-manual.txt:336 +#: mobile-manual.txt:340 msgid "" "Upload the dives contained on the mobile device to the _Subsurface_ cloud " "storage by tapping the option _Manual sync with cloud_. This synchronizes " @@ -785,13 +721,13 @@ msgid "" msgstr "" #. type: Title === -#: mobile-manual.txt:337 +#: mobile-manual.txt:341 #, no-wrap msgid "Enable cloud auto sync" msgstr "" #. type: Plain text -#: mobile-manual.txt:349 +#: mobile-manual.txt:353 msgid "" "By default _Subsurface-mobile_ runs offline and only syncs the dive list " "with cloud storage when explicitly told to do so (see above). You can " @@ -806,13 +742,13 @@ msgid "" msgstr "" #. type: Title == -#: mobile-manual.txt:350 +#: mobile-manual.txt:354 #, no-wrap msgid "Recording dive locations using GPS" msgstr "" #. type: Plain text -#: mobile-manual.txt:357 +#: mobile-manual.txt:361 msgid "" "The fact that most smartphones have GPS facilities allows " "_Subsurface-mobile_ to record the locations of dives. If the smartphone is " @@ -822,13 +758,13 @@ msgid "" msgstr "" #. type: Title === -#: mobile-manual.txt:359 +#: mobile-manual.txt:363 #, no-wrap msgid "Configuring the GPS service" msgstr "" #. type: Plain text -#: mobile-manual.txt:367 +#: mobile-manual.txt:371 msgid "" "From the Main menu, select _Settings_. The Settings screen has a section for " "configuring the GPS service (image below). GPS location data are collected " @@ -838,26 +774,20 @@ msgid "" "button. The program is now ready to collect GPS positions." msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: mobile-manual.txt:368 -#, no-wrap -msgid "FIGURE: GPS configure" -msgstr "" - #. type: Target for macro image -#: mobile-manual.txt:368 +#: mobile-manual.txt:372 #, no-wrap msgid "mobile-images/GPS-config.jpg" msgstr "" #. type: Title === -#: mobile-manual.txt:370 +#: mobile-manual.txt:374 #, no-wrap msgid "Collecting GPS positions" msgstr "" #. type: Plain text -#: mobile-manual.txt:376 +#: mobile-manual.txt:380 msgid "" "Ensure that the GPS on the mobile device has been activated and that you " "have given the app permission to access your location data. Open the Main " @@ -865,20 +795,14 @@ msgid "" "of GPS locations." msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: mobile-manual.txt:377 -#, no-wrap -msgid "FIGURE: GPS start" -msgstr "" - #. type: Target for macro image -#: mobile-manual.txt:377 +#: mobile-manual.txt:381 #, no-wrap msgid "mobile-images/GPSstart.jpg" msgstr "" #. type: Plain text -#: mobile-manual.txt:386 +#: mobile-manual.txt:390 msgid "" "_Subsurface-mobile_ starts to collect GPS locations automatically, following " "the preferences specified as described above. While the GPS location service " @@ -889,13 +813,13 @@ msgid "" msgstr "" #. type: Title === -#: mobile-manual.txt:387 +#: mobile-manual.txt:391 #, no-wrap msgid "Storing the GPS data on the _Subsurface_ cloud" msgstr "" #. type: Plain text -#: mobile-manual.txt:394 +#: mobile-manual.txt:398 msgid "" "Activate the main menu and select the _GPS_ option that brings up the " "submenu of GPS-related actions. Tap _Upload GPS data_ that saves the GPS " @@ -905,26 +829,26 @@ msgid "" msgstr "" #. type: Title === -#: mobile-manual.txt:395 +#: mobile-manual.txt:399 #, no-wrap msgid "Downloading GPS data from the _Subsurface_ cloud" msgstr "" #. type: Plain text -#: mobile-manual.txt:400 +#: mobile-manual.txt:404 msgid "" "Download the GPS data that have been saved on the cloud (possibly by a " "different device) by selecting _Download GPS Data_ from the GPS sub-panel." msgstr "" #. type: Title === -#: mobile-manual.txt:401 +#: mobile-manual.txt:405 #, no-wrap msgid "Viewing GPS data" msgstr "" #. type: Plain text -#: mobile-manual.txt:411 +#: mobile-manual.txt:415 msgid "" "From the GPS submenu select _Show GPS fixes_. This brings up a list of GPS " "positions obtained by the location service (image below). Two actions are " @@ -937,26 +861,20 @@ msgid "" "right, again using the handle." msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: mobile-manual.txt:412 -#, no-wrap -msgid "FIGURE: GPS management" -msgstr "" - #. type: Target for macro image -#: mobile-manual.txt:412 +#: mobile-manual.txt:416 #, no-wrap msgid "mobile-images/gpsmanagement.jpg" msgstr "" #. type: Title === -#: mobile-manual.txt:414 +#: mobile-manual.txt:418 #, no-wrap msgid "Applying GPS data to dives in the dive log" msgstr "" #. type: Plain text -#: mobile-manual.txt:423 +#: mobile-manual.txt:427 msgid "" "Assuming that all the dives have been entered into the dive log or have been " "downloaded from the _Subsurface_ cloud, apply the GPS positions to these " @@ -969,13 +887,13 @@ msgid "" msgstr "" #. type: Title == -#: mobile-manual.txt:424 +#: mobile-manual.txt:428 #, no-wrap msgid "Using the settings for _Subsurface-mobile_." msgstr "" #. type: Plain text -#: mobile-manual.txt:427 +#: mobile-manual.txt:431 msgid "" "The Settings screen allows the customization of _Subsurface-mobile_. Many of " "the settings involve dragging a slider switch to activate or deactivate a " @@ -983,13 +901,13 @@ msgid "" msgstr "" #. type: Title === -#: mobile-manual.txt:429 +#: mobile-manual.txt:433 #, no-wrap msgid "Changing to a different _Subsurface_ cloud account" msgstr "" #. type: Plain text -#: mobile-manual.txt:434 +#: mobile-manual.txt:438 msgid "" "Some users have more than one _Subsurface_ cloud account and with a need to " "switch between accounts. Tap _Settings_ on the Main menu and scroll to the " @@ -999,26 +917,20 @@ msgid "" "list is shown." msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: mobile-manual.txt:435 -#, no-wrap -msgid "FIGURE: Settings: Cloud & Theme" -msgstr "" - #. type: Target for macro image -#: mobile-manual.txt:435 +#: mobile-manual.txt:439 #, no-wrap msgid "mobile-images/SettingsCloudTheme.jpg" msgstr "" #. type: Title === -#: mobile-manual.txt:437 +#: mobile-manual.txt:441 #, no-wrap msgid "Changing the color theme of _Subsurface-mobile_" msgstr "" #. type: Plain text -#: mobile-manual.txt:444 +#: mobile-manual.txt:448 msgid "" "_Subsurface-mobile_ has three color schemes to please users with different " "tastes. This user manual shows the default color scheme, comprising blue " @@ -1029,13 +941,13 @@ msgid "" msgstr "" #. type: Title === -#: mobile-manual.txt:445 +#: mobile-manual.txt:449 #, no-wrap msgid "Configuring the GPS webservice" msgstr "" #. type: Plain text -#: mobile-manual.txt:448 +#: mobile-manual.txt:452 msgid "" "The Settings screen allows one to set up the way in which GPS positions are " "collected during dives. See the section on xref:S_ConfigureGPS[Configuring " @@ -1043,13 +955,13 @@ msgid "" msgstr "" #. type: Title === -#: mobile-manual.txt:449 +#: mobile-manual.txt:453 #, no-wrap msgid "Saving a detailed dive computer dive log" msgstr "" #. type: Plain text -#: mobile-manual.txt:452 +#: mobile-manual.txt:456 msgid "" "Under the heading _Dive computer_, you will find a switch to save a detailed " "log each time dives are downloaded from a dive computer. This is important " @@ -1063,13 +975,13 @@ msgid "" msgstr "" #. type: Title === -#: mobile-manual.txt:453 +#: mobile-manual.txt:457 #, no-wrap msgid "Activating the Developer submenu" msgstr "" #. type: Plain text -#: mobile-manual.txt:456 +#: mobile-manual.txt:460 msgid "" "The information in subsurface.log plus some additional information for " "understanding the screen rendering of dive information as well as the way in " @@ -1080,13 +992,13 @@ msgid "" msgstr "" #. type: Title == -#: mobile-manual.txt:457 +#: mobile-manual.txt:461 #, no-wrap msgid "Developer submenu" msgstr "" #. type: Plain text -#: mobile-manual.txt:461 +#: mobile-manual.txt:465 msgid "" "If the Developer submenu has been activated in the Settings screen, the Main " "menu has a _Developer_ item. By tapping this one has two options that are " @@ -1094,13 +1006,13 @@ msgid "" msgstr "" #. type: Title === -#: mobile-manual.txt:462 +#: mobile-manual.txt:466 #, no-wrap msgid "App log" msgstr "" #. type: Plain text -#: mobile-manual.txt:467 +#: mobile-manual.txt:471 msgid "" "This option shows the messages that _Subsurface-mobile_ generates while " "running. While most users are not aware of these messages, they are often " @@ -1109,13 +1021,13 @@ msgid "" msgstr "" #. type: Title === -#: mobile-manual.txt:468 +#: mobile-manual.txt:472 #, no-wrap msgid "Theme information" msgstr "" #. type: Plain text -#: mobile-manual.txt:472 +#: mobile-manual.txt:476 msgid "" "This option provides a wealth of information about the screen " "characteristics of the mobile device and the font characteristics used by " diff --git a/Documentation/50-pot/subsurface-user-manual.pot b/Documentation/50-pot/subsurface-user-manual.pot index 7444c6a71..64f9e7ed3 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: 2018-06-26 10:10+0200\n" +"POT-Creation-Date: 2018-11-05 09:14+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" @@ -18,13 +18,6 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" #. :website: https://subsurface-divelog.org -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:14 -#, no-wrap -msgid "Banner" -msgstr "" - -#. :website: https://subsurface-divelog.org #. type: Target for macro image #: user-manual.txt:14 #, no-wrap @@ -49,7 +42,7 @@ msgstr "" #. type: Plain text #: user-manual.txt:23 -msgid "[blue]#_Version 4.7, May 2018_#" +msgid "[blue]#_Version 4.8, September 2018_#" msgstr "" #. type: Plain text @@ -184,12 +177,6 @@ msgid "" "the next occurrence of the search term." msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:83 user-manual.txt:96 -#, no-wrap -msgid "User manual functions" -msgstr "" - #. type: Target for macro image #: user-manual.txt:83 #, no-wrap @@ -306,12 +293,6 @@ msgid "" "selected)." msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:153 -#, no-wrap -msgid "The Main Window" -msgstr "" - #. type: Target for macro image #: user-manual.txt:153 #, no-wrap @@ -321,8 +302,8 @@ msgstr "" #. type: Plain text #: user-manual.txt:157 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:" +"Decide 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 @@ -503,12 +484,6 @@ msgid "" "explained for data entry." msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:231 -#, no-wrap -msgid "FIGURE: Add dive" -msgstr "" - #. type: Target for macro image #: user-manual.txt:231 #, no-wrap @@ -524,14 +499,8 @@ msgid "" "panels under Notes and Equipment when in *Editing Mode*." msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:236 -#, no-wrap -msgid "Blue edit bar" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:236 user-manual.txt:838 +#: user-manual.txt:236 user-manual.txt:855 #, no-wrap msgid "images/BlueEditBar_f22.jpg" msgstr "" @@ -566,12 +535,6 @@ msgid "" "best represent the dive described:" msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:255 -#, no-wrap -msgid "FIGURE: Initial dive profile" -msgstr "" - #. type: Target for macro image #: user-manual.txt:255 #, no-wrap @@ -597,12 +560,6 @@ msgid "" "20 m for 30 min, followed by a 5 minute safety stop at 5 m." msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:275 -#, no-wrap -msgid "FIGURE: Edited dive profile" -msgstr "" - #. type: Target for macro image #: user-manual.txt:275 #, no-wrap @@ -623,12 +580,6 @@ msgid "" "menu (see image below)." msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:288 -#, no-wrap -msgid "FIGURE: Gas composition context menu" -msgstr "" - #. type: Target for macro image #: user-manual.txt:288 #, no-wrap @@ -669,7 +620,7 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:309 user-manual.txt:694 user-manual.txt:769 user-manual.txt:1141 user-manual.txt:3561 user-manual.txt:3964 +#: user-manual.txt:309 user-manual.txt:712 user-manual.txt:786 user-manual.txt:1166 user-manual.txt:3305 user-manual.txt:3708 #, no-wrap msgid "images/icons/warning2.png" msgstr "" @@ -737,12 +688,6 @@ msgid "" "Computer_. Dialogue *A* in the figure below appears:" msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:349 -#, no-wrap -msgid "FIGURE: Download dialogue 1" -msgstr "" - #. type: Target for macro image #: user-manual.txt:349 #, no-wrap @@ -771,7 +716,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:375 +#: user-manual.txt:379 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 " @@ -781,11 +726,24 @@ msgid "" "xref:_appendix_b_dive_computer_specific_information_for_importing_dive_information[Appendix " "B] for technical details on how to find the appropriate port information for " "a specific dive computer and, in some cases, how to do the correct settings " -"to the operating system of the computer on which _Subsurface_ is running." +"to the operating system of the computer on which _Subsurface_ is running. " +"Some dive computers disable this drop-down as they use other means to find " +"and connect to the device. For some dive computers the data entered here is " +"actually the mount point of the USB storage device as which the dive " +"computer identifies itself." +msgstr "" + +#. type: Plain text +#: user-manual.txt:384 +msgid "" +"Below the three drop downs are up to four shortcut buttons that allow you to " +"easily switch between multiple dive computers that you are frequently " +"downloading from. These buttons only appear once you have downloaded from " +"different dive computers." msgstr "" #. type: Plain text -#: user-manual.txt:385 +#: user-manual.txt:394 msgid "" "If all the dives on the dive computer need to be downloaded, check the " "checkbox _Force download of all dives_. Normally, _Subsurface_ only " @@ -800,7 +758,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:391 +#: user-manual.txt:400 msgid "" "If the checkbox _Always prefer downloaded dives_ has been checked and, " "during download, dives with identical date-times exist on the dive computer " @@ -809,14 +767,14 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:394 +#: user-manual.txt:403 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:398 +#: user-manual.txt:407 msgid "" "Do *not* check the checkboxes labelled _Save libdivecomputer logfile_ and " "_Save libdivecomputer dumpfile_. These are only used as diagnostic tools " @@ -824,7 +782,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:416 +#: user-manual.txt:425 msgid "" "Then select the _Download_ button. With communication established, you can " "see how the data are retrieved from the dive computer. Depending on the " @@ -845,7 +803,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:420 +#: user-manual.txt:429 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 " @@ -853,36 +811,36 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:424 +#: user-manual.txt:433 #, no-wrap msgid "*PROBLEMS WITH DATA DOWNLOAD FROM A DIVE COMPUTER?*\n" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:424 user-manual.txt:548 user-manual.txt:592 user-manual.txt:605 user-manual.txt:1296 user-manual.txt:1361 user-manual.txt:1524 user-manual.txt:1600 user-manual.txt:1922 +#: user-manual.txt:433 user-manual.txt:557 user-manual.txt:601 user-manual.txt:614 user-manual.txt:623 user-manual.txt:1321 user-manual.txt:1386 user-manual.txt:1571 #, no-wrap msgid "images/icons/important.png" msgstr "" #. type: delimited block * -#: user-manual.txt:427 +#: user-manual.txt:436 msgid "Check the following:" msgstr "" #. type: delimited block * -#: user-manual.txt:430 +#: user-manual.txt:439 msgid "Is the dive computer still in PC-communication or Upload mode?" msgstr "" #. type: delimited block * -#: user-manual.txt:432 +#: user-manual.txt:441 msgid "" "Is the dive computer’s battery fully charged? If not then charge or replace " "it." msgstr "" #. type: delimited block * -#: user-manual.txt:436 +#: user-manual.txt:445 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 " @@ -890,7 +848,7 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:441 +#: user-manual.txt:450 msgid "" "Consult " "xref:_appendix_a_operating_system_specific_information_for_importing_dive_information_from_a_dive_computer[Appendix " @@ -898,7 +856,7 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:445 +#: user-manual.txt:454 msgid "" "On Unix-like operating systems, does the user have write permission to the " "USB port? If not, consult " @@ -907,7 +865,7 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:453 +#: user-manual.txt:462 msgid "" "If the _Subsurface_ computer does not recognize the USB adapter by showing " "an appropriate device name next to the Mount Point, then there is a " @@ -919,7 +877,7 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:456 +#: user-manual.txt:465 #, no-wrap msgid "" "\tSave libdivecomputer logfile\n" @@ -927,7 +885,7 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:462 +#: user-manual.txt:471 #, no-wrap msgid "" "*Important*: These check boxes are only used when problems are encountered\n" @@ -940,7 +898,7 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:466 +#: user-manual.txt:475 #, no-wrap msgid "" "*Important:* _After downloading with the above checkboxes\n" @@ -949,7 +907,7 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:469 +#: user-manual.txt:478 #, no-wrap msgid "" "\tsubsurface.log\n" @@ -957,7 +915,7 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:475 +#: user-manual.txt:484 msgid "" "These files should be send to the _Subsurface_ mail list: " "_subsurface@subsurface-divelog.org_ with a request for the files to be " @@ -966,19 +924,19 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:478 +#: user-manual.txt:487 #, no-wrap msgid "Connecting _Subsurface_ to a Bluetooth-enabled dive computer" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:479 user-manual.txt:4367 +#: user-manual.txt:488 user-manual.txt:4108 #, no-wrap msgid "images/icons/bluetooth.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:491 +#: user-manual.txt:500 msgid "" "Bluetooth is becoming a more common way of communication between dive " "computers and _Subsurface_. _Subsurface_ provides a largely operating system " @@ -995,34 +953,34 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:494 +#: user-manual.txt:503 msgid "Setting up _Subsurface_ for Bluetooth communication requires four steps:" msgstr "" #. type: Plain text -#: user-manual.txt:496 +#: user-manual.txt:505 msgid "Ensure Bluetooth is activated on the host computer running _Subsurface_." msgstr "" #. type: Plain text -#: user-manual.txt:497 +#: user-manual.txt:506 msgid "Ensure _Subsurface_ sees the Bluetooth adapter on the host computer." msgstr "" #. type: Plain text -#: user-manual.txt:498 +#: user-manual.txt:507 msgid "" "Ensure the Bluetooth-enabled dive computer is Bluetooth-discoverable and in " "PC upload mode." msgstr "" #. type: Plain text -#: user-manual.txt:499 +#: user-manual.txt:508 msgid "Ensure _Subsurface_ is paired with the Bluetooth-enabled dive computer." msgstr "" #. type: Plain text -#: user-manual.txt:503 +#: user-manual.txt:512 msgid "" "Select the Download dialogue by selecting _Import -> Import from dive " "computer_ from the *Main Menu*. After checking the box labeled _\"Choose " @@ -1030,25 +988,19 @@ msgid "" msgstr "" #. type: Title ===== -#: user-manual.txt:504 +#: user-manual.txt:513 #, no-wrap msgid "On Linux or MacOS:" msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:506 -#, no-wrap -msgid "FIGURE: Download Bluetooth" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:506 +#: user-manual.txt:515 #, no-wrap msgid "images/DC_import_Bluetooth.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:515 +#: user-manual.txt:524 msgid "" "Although the _Subsurface_ Bluetooth interface is intended to function " "without Bluetooth pairing at the operating system level, it is always " @@ -1061,7 +1013,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:546 +#: user-manual.txt:555 msgid "" "On the _Linux_ or _MacOS_ platforms the name of the _Subsurface_ computer " "and its Bluetooth address are shown on the right hand side. The power state " @@ -1094,7 +1046,7 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:553 +#: user-manual.txt:562 msgid "" "Currently _Subsurface_ does not support Bluetooth pairing with dive " "computers that require a custom PIN code. In order to pair the devices, use " @@ -1102,12 +1054,12 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:555 +#: user-manual.txt:564 msgid "One way to achieve this is to use +bluetoothctl+:" msgstr "" #. type: delimited block * -#: user-manual.txt:566 +#: user-manual.txt:575 #, no-wrap msgid "" "\t$ bluetoothctl\n" @@ -1123,7 +1075,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:572 +#: user-manual.txt:581 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 " @@ -1132,25 +1084,19 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:573 user-manual.txt:4294 user-manual.txt:4382 +#: user-manual.txt:582 user-manual.txt:4035 user-manual.txt:4123 #, no-wrap msgid "On Windows:" msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:574 -#, no-wrap -msgid "FIGURE: Download Bluetooth on Windows" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:574 +#: user-manual.txt:583 #, no-wrap msgid "images/DC_import_Bluetooth_Windows.png" msgstr "" #. type: Plain text -#: user-manual.txt:584 +#: user-manual.txt:593 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 " @@ -1164,7 +1110,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:591 +#: user-manual.txt:600 msgid "" "The pairing step is checked and done automatically during the download " "process. If the devices have never been paired the system will ask " @@ -1175,7 +1121,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:599 +#: user-manual.txt:608 msgid "" "Currently _Subsurface_ works only with local Bluetooth adapters which use " "Microsoft Bluetooth Stack. If the local device uses _Widcomm_, _Stonestreet " @@ -1185,7 +1131,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:604 +#: user-manual.txt:613 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 " @@ -1195,7 +1141,18 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:614 +#: user-manual.txt:622 +msgid "" +"The Subsurface support for BLTE dive computers on Windows is *EXPERIMENTAL* " +"and only supported on Windows 10. Please make sure that you have the latest " +"version of Windows 10. " +"link:https://en.wikipedia.org/wiki/Windows_10_version_history#Version_1803_(April_2018_Update)[Version " +"1803] is a minimum requirement. Also make sure that you have installed the " +"latest drivers for your motherboard and/or BTLE dongle." +msgstr "" + +#. type: Plain text +#: user-manual.txt:632 #, no-wrap msgid "" "*IN CASE OF PROBLEMS*: If the Bluetooth adapter from the _Subsurface_ " @@ -1210,13 +1167,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:616 +#: user-manual.txt:634 #, no-wrap msgid "Changing the name of a dive computer" msgstr "" #. type: Plain text -#: user-manual.txt:632 +#: user-manual.txt:650 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 " @@ -1235,13 +1192,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:634 +#: user-manual.txt:652 #, no-wrap msgid "Uploading data for a specific dive from more than one dive computer" msgstr "" #. type: Plain text -#: user-manual.txt:645 +#: user-manual.txt:663 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 " @@ -1257,13 +1214,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:647 +#: user-manual.txt:665 #, no-wrap msgid "Updating the dive information imported from the dive computer." msgstr "" #. type: Plain text -#: user-manual.txt:654 +#: user-manual.txt:672 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 " @@ -1272,13 +1229,13 @@ msgid "" msgstr "" #. type: Title ===== -#: user-manual.txt:656 +#: user-manual.txt:674 #, no-wrap msgid "Notes" msgstr "" #. type: Plain text -#: user-manual.txt:661 +#: user-manual.txt:679 msgid "" "To have a more complete dive record, the user needs to add additional " "information by hand. The procedure below is virtually identical for " @@ -1286,7 +1243,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:671 +#: user-manual.txt:689 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 " @@ -1298,20 +1255,14 @@ msgid "" "(left hand image, below):" msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:672 -#, no-wrap -msgid "FIGURE: The Notes tab" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:672 +#: user-manual.txt:690 #, no-wrap msgid "images/AddDive3_f22.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:681 +#: user-manual.txt:699 msgid "" "The right hand image, above, shows a *Notes tab* filled with dive " "information. The *Date* and *Time* fields reflects the date and time of the " @@ -1322,7 +1273,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:691 +#: user-manual.txt:709 #, no-wrap msgid "" "*Air/water temperatures*: Air and water temperatures during the dive are " @@ -1342,13 +1293,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:694 +#: user-manual.txt:712 #, no-wrap msgid "*Location*:\n" msgstr "" #. type: Plain text -#: user-manual.txt:702 +#: user-manual.txt:720 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 " @@ -1360,7 +1311,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:710 +#: user-manual.txt:728 #, no-wrap msgid "" "*Using existing dive locations:* Type in the name of the dive site, " @@ -1378,20 +1329,14 @@ msgid "" "geolocation for this dive site.\n" msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:711 -#, no-wrap -msgid "FIGURE:Location choice panel" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:711 +#: user-manual.txt:729 #, no-wrap msgid "images/Location1.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:717 +#: user-manual.txt:735 #, no-wrap msgid "" "*Entering a new dive location:* On the other hand, having dived at a new " @@ -1402,20 +1347,14 @@ msgid "" "(image A below).\n" msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:718 user-manual.txt:726 user-manual.txt:759 -#, no-wrap -msgid "FIGURE:Location creation panel" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:718 +#: user-manual.txt:736 #, no-wrap msgid "images/Globe_image1.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:725 +#: user-manual.txt:743 msgid "" "Double-click on the blue bar below the new dive location name. The blue bar " "disappears (image B above) and the globe icon on the right-hand of the " @@ -1429,18 +1368,18 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:726 +#: user-manual.txt:744 #, no-wrap msgid "images/Globe_image2.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:729 +#: user-manual.txt:747 msgid "There are three ways of adding the coordinates:" msgstr "" #. type: Plain text -#: user-manual.txt:732 +#: user-manual.txt:750 #, no-wrap msgid "" "*(1):* Enter coordinates by hand if they are known, using one of\n" @@ -1448,7 +1387,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:737 +#: user-manual.txt:755 #, no-wrap msgid "" "\tISO 6709 Annex D format e.g. 30°13'28.9\"N 30°49'1.5\"E\n" @@ -1458,7 +1397,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:746 +#: user-manual.txt:764 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 " @@ -1472,7 +1411,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:758 +#: user-manual.txt:776 #, no-wrap msgid "" "*(2):* Use the Dive Map to specify the coordinates. The Dive map now shows\n" @@ -1497,13 +1436,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:759 +#: user-manual.txt:777 #, no-wrap msgid "images/Globe_image3.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:763 +#: user-manual.txt:781 msgid "" "Once the dive location data have been saved, the dive on the Dive List has a " "globe icon immediately to the left of the location name of a particular " @@ -1511,18 +1450,16 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:768 +#: user-manual.txt:785 #, no-wrap msgid "" -"*(3):* Obtain the coordinates using either the Subsurface-Mobile App or the " -"_Subsurface_ Companion App on an\n" +"*(3):* Obtain the coordinates using the _Subsurface-mobile_ App on an\n" " Android or iPhone device with GPS and if the dive site coordinates\n" -" were stored using one of these apps.\n" -" xref:S_Companion[Click here for more information]\n" +" were stored using one of this app.\n" msgstr "" #. type: Plain text -#: user-manual.txt:776 +#: user-manual.txt:793 msgid "" "GPS coordinates of a dive site are linked to the location name - so *saving* " "a dive site with only coordinates and no name causes problems. (Subsurface " @@ -1531,7 +1468,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:786 +#: user-manual.txt:803 #, no-wrap msgid "" "*Dive site name lookup:* If you typed coordinates into the appropriate\n" @@ -1548,7 +1485,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:791 +#: user-manual.txt:808 msgid "" "Enter any other contextual information about the dive site (Description and " "Notes), then select _Apply Changes_ to save the geolocation for this dive " @@ -1557,7 +1494,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:796 +#: user-manual.txt:813 #, no-wrap msgid "" "*Dive mode*: This is a dropdown box allowing you to choose the type of " @@ -1569,7 +1506,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:801 +#: user-manual.txt:818 #, no-wrap msgid "" "*Divemaster*: The name of the divemaster or dive guide should be\n" @@ -1579,7 +1516,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:806 +#: user-manual.txt:823 #, no-wrap msgid "" "*Buddy*: In this field, enter the name(s) of the buddy or buddies\n" @@ -1590,7 +1527,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:811 +#: user-manual.txt:828 #, no-wrap msgid "" "*Suit*: Here the type of dive suit used can be entered.\n" @@ -1601,7 +1538,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:814 +#: user-manual.txt:831 #, no-wrap msgid "" "*Rating*: Provide a subjective overall rating of the dive on a\n" @@ -1609,7 +1546,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:817 +#: user-manual.txt:834 #, no-wrap msgid "" "*Visibility*: Provide a rating of visibility during the\n" @@ -1617,7 +1554,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:824 +#: user-manual.txt:841 #, no-wrap msgid "" "*Tags*: Tags that describe the type of dive done can be entered\n" @@ -1631,13 +1568,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:826 +#: user-manual.txt:843 #, no-wrap msgid "*Notes*: Any additional information for the dive can be entered here.\n" msgstr "" #. type: Plain text -#: user-manual.txt:831 +#: user-manual.txt:848 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* " @@ -1647,27 +1584,21 @@ msgid "" msgstr "" #. type: Title ===== -#: user-manual.txt:832 +#: user-manual.txt:849 #, no-wrap msgid "Equipment" msgstr "" #. type: Plain text -#: user-manual.txt:837 +#: user-manual.txt:854 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 " "box at the top of the panel:" msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:838 -#, no-wrap -msgid "FIGURE: Blue edit bar" -msgstr "" - #. type: Plain text -#: user-manual.txt:844 +#: user-manual.txt:861 msgid "" "shows the equipment is being edited. This is a highly interactive part of " "_Subsurface_ and the information on cylinders and gases (entered here) " @@ -1675,7 +1606,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:848 +#: user-manual.txt:865 #, no-wrap msgid "" "*Cylinders*: The cylinder information is entered through a dialogue that " @@ -1683,20 +1614,14 @@ msgid "" "like this:\n" msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:849 -#, no-wrap -msgid "FIGURE: Initial cylinder dialogue" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:849 +#: user-manual.txt:866 #, no-wrap msgid "images/DC_gas-dialogue1_f20.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:862 +#: user-manual.txt:879 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 " @@ -1711,20 +1636,14 @@ msgid "" "list of cylinders:" msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:863 -#, no-wrap -msgid "FIGURE: The cylinder drop-down list button" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:863 +#: user-manual.txt:880 #, no-wrap msgid "images/DC_gas-dialogue2_f20.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:870 +#: user-manual.txt:887 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 " @@ -1734,7 +1653,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:874 +#: user-manual.txt:891 msgid "" "Next, indicate the starting pressure and the ending pressure of the " "specified gas during the dive. The unit of pressure (metric/imperial) " @@ -1742,7 +1661,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:885 +#: user-manual.txt:902 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 " @@ -1755,20 +1674,14 @@ msgid "" "for a dive using two cylinders (air and EAN50):" msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:886 -#, no-wrap -msgid "FIGURE: a completed cylinder dive information table" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:886 +#: user-manual.txt:903 #, no-wrap msgid "images/CylinderDataEntry3_f20.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:892 +#: user-manual.txt:909 #, no-wrap msgid "" "*Weights*: Information about the weight system used can be entered\n" @@ -1778,39 +1691,27 @@ msgid "" "this:\n" msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:893 -#, no-wrap -msgid "FIGURE:The Weights dialogue" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:893 +#: user-manual.txt:910 #, no-wrap msgid "images/WeightsDataEntry1_f20.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:897 +#: user-manual.txt:914 msgid "" "By clicking on the _Type_ field, a drop-down list becomes accessible through " "a down-arrow:" msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:898 -#, no-wrap -msgid "FIGURE:Weights type drop-down list button" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:898 +#: user-manual.txt:915 #, no-wrap msgid "images/WeightsDataEntry2_f20.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:912 +#: user-manual.txt:929 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 " @@ -1824,26 +1725,20 @@ msgid "" "two types of weights: integrated as well as a weight belt:" msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:913 -#, no-wrap -msgid "FIGURE: A completed weights information table" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:913 +#: user-manual.txt:930 #, no-wrap msgid "images/WeightsDataEntry3_f20.jpg" msgstr "" #. type: Title ==== -#: user-manual.txt:915 +#: user-manual.txt:932 #, no-wrap msgid "Editing several selected dives simultaneously" msgstr "" #. type: Plain text -#: user-manual.txt:931 +#: user-manual.txt:948 msgid "" "_METHOD 1_: After downloading dives from a dive computer, the dive profiles " "of each is shown in the *Dive profile* tab, as well as a few items of " @@ -1861,7 +1756,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:941 +#: user-manual.txt:958 msgid "" "Simultaneous editing only works with fields that do not already contain " "information. This means if some fields have been edited for a particular " @@ -1876,7 +1771,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:950 +#: user-manual.txt:967 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 " @@ -1891,13 +1786,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:952 +#: user-manual.txt:969 #, no-wrap msgid "Adding Bookmarks to a dive" msgstr "" #. type: Plain text -#: user-manual.txt:957 +#: user-manual.txt:974 msgid "" "Many divers wish to annotate dives with text that indicate particular " "events, e.g. \"Saw dolphins\", or \"Released surface buoy\". This is easily " @@ -1905,7 +1800,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:961 +#: user-manual.txt:978 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 " @@ -1913,46 +1808,40 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:963 +#: user-manual.txt:980 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:966 +#: user-manual.txt:983 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:969 +#: user-manual.txt:986 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: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:970 -#, no-wrap -msgid "FIGURE: Bookmark dialog" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:970 +#: user-manual.txt:987 #, no-wrap msgid "images/Bookmarks.jpg" msgstr "" #. type: Title ==== -#: user-manual.txt:973 +#: user-manual.txt:990 #, no-wrap msgid "Saving the updated dive information" msgstr "" #. type: Plain text -#: user-manual.txt:984 +#: user-manual.txt:1001 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 " @@ -1965,7 +1854,7 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:985 +#: user-manual.txt:1002 #, no-wrap msgid "" "Importing dive information from other digital data sources or other data " @@ -1973,7 +1862,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1008 +#: user-manual.txt:1025 msgid "" "Many divers log their dives using the proprietary software provided by the " "manufacturers of their dive computers. _Subsurface_ can import dive logs " @@ -1994,7 +1883,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1020 +#: user-manual.txt:1037 msgid "" "If the format of other software is supported natively on Subsurface, select " "either _Import -> Import log files_ or _File -> Open log file_. Notice that " @@ -2009,33 +1898,27 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:1021 +#: user-manual.txt:1038 #, no-wrap msgid "Using the universal import dialogue" msgstr "" #. type: Plain text -#: user-manual.txt:1027 +#: user-manual.txt:1044 msgid "" "Importing dives from other software is done through a universal interface " "activated by selecting _Import_ from the Main Menu, then clicking on _Import " "Log Files_. This brings up dialogue *A*, below." msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:1028 -#, no-wrap -msgid "FIGURE: Import dialogue: step 1" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:1028 +#: user-manual.txt:1045 #, no-wrap msgid "images/Import1_f20.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:1033 +#: user-manual.txt:1050 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, " @@ -2043,89 +1926,89 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1035 +#: user-manual.txt:1052 msgid "" "XML-formatted dive logs (DivingLog 5.0, MacDive and several other dive log " "systems)" msgstr "" #. type: Plain text -#: user-manual.txt:1036 +#: user-manual.txt:1053 msgid "Cochran dive logs" msgstr "" #. type: Plain text -#: user-manual.txt:1037 +#: user-manual.txt:1054 msgid "UDDF-formatted dive logs (e.g. Kenozooid)" msgstr "" #. type: Plain text -#: user-manual.txt:1038 +#: user-manual.txt:1055 msgid "UDCF-formatted dive logs" msgstr "" #. type: Plain text -#: user-manual.txt:1039 +#: user-manual.txt:1056 msgid "Poseidon MkVI CCR logs" msgstr "" #. type: Plain text -#: user-manual.txt:1040 +#: user-manual.txt:1057 msgid "APD Inspiration/Evolution CCR logs" msgstr "" #. type: Plain text -#: user-manual.txt:1041 +#: user-manual.txt:1058 msgid "LiquiVision logs" msgstr "" #. type: Plain text -#: user-manual.txt:1042 +#: user-manual.txt:1059 msgid "divelogs.de logs" msgstr "" #. type: Plain text -#: user-manual.txt:1043 +#: user-manual.txt:1060 msgid "OSTC Tools logs" msgstr "" #. type: Plain text -#: user-manual.txt:1044 +#: user-manual.txt:1061 msgid "JDiveLog" msgstr "" #. type: Plain text -#: user-manual.txt:1045 +#: user-manual.txt:1062 msgid "Suunto Dive Manager (DM3, DM4, DM5)" msgstr "" #. type: Plain text -#: user-manual.txt:1046 +#: user-manual.txt:1063 msgid "DL7 files used by Diver's Alert network (DAN)" msgstr "" #. type: Plain text -#: user-manual.txt:1047 +#: user-manual.txt:1064 msgid "Underwater technologies AV1 dive logs" msgstr "" #. type: Plain text -#: user-manual.txt:1048 +#: user-manual.txt:1065 msgid "Divesoft dive logs" msgstr "" #. type: Plain text -#: user-manual.txt:1049 +#: user-manual.txt:1066 msgid "Poseidon MK VI eCCR dive logs" msgstr "" #. type: Plain text -#: user-manual.txt:1050 +#: user-manual.txt:1067 msgid "CSV (text-based and spreadsheet-based) dive logs, including APD CCR logs" msgstr "" #. type: Plain text -#: user-manual.txt:1055 +#: user-manual.txt:1072 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 " @@ -2135,13 +2018,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:1056 +#: user-manual.txt:1073 #, no-wrap msgid "Importing from OSTCTools" msgstr "" #. type: Plain text -#: user-manual.txt:1065 +#: user-manual.txt:1082 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 " @@ -2154,7 +2037,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1069 +#: user-manual.txt:1086 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 " @@ -2162,7 +2045,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1074 +#: user-manual.txt:1091 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 " @@ -2171,13 +2054,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:1076 +#: user-manual.txt:1093 #, no-wrap msgid "Importing from Mares Dive Organizer V2.1" msgstr "" #. type: Plain text -#: user-manual.txt:1083 +#: user-manual.txt:1100 msgid "" "Since Mares uses proprietary Windows software not compatible with " "multi-platform applications, these dive logs cannot be directly imported " @@ -2187,7 +2070,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1088 +#: user-manual.txt:1105 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 " @@ -2195,7 +2078,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1094 +#: user-manual.txt:1111 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 " @@ -2205,20 +2088,20 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1096 +#: user-manual.txt:1113 msgid "" "Finally, import the dives from _divelogs.de_ to _Subsurface_, using the " "instructions below." msgstr "" #. type: Title ==== -#: user-manual.txt:1099 +#: user-manual.txt:1116 #, no-wrap msgid "Importing Scubapro _SmartTrak_ divelogs" msgstr "" #. type: Plain text -#: user-manual.txt:1106 +#: user-manual.txt:1123 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 " @@ -2229,23 +2112,31 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1111 +#: user-manual.txt:1129 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_." +"generated by SmartTrak to Subsurface's _.xml_ format. It can be downloaded " +"from https://subsurface-divelog.org/downloads[the usual _Subsurface_ " +"repository], as a Windows installer or a Linux AppImage. The application is " +"not currently supported on Mac." msgstr "" #. type: Plain text -#: user-manual.txt:1113 +#: user-manual.txt:1132 +msgid "" +"It can also be built for Linux systems. Two dependencies need to be met in " +"your system before building: _glib2.0_ and _mdbtools_ (see below)." +msgstr "" + +#. type: Plain text +#: user-manual.txt:1134 msgid "" "In addition, a web service is available for divelog convertions from " "SmartTrak to _Subsurface_ (see below)." msgstr "" #. type: Plain text -#: user-manual.txt:1116 +#: user-manual.txt:1137 msgid "" "Feel free to contact the _Subsurface_ development team on " "mailto:subsurface@subsurface-divelog.org[our mailing list] for assistance in " @@ -2253,58 +2144,65 @@ msgid "" msgstr "" #. type: Title ===== -#: user-manual.txt:1117 +#: user-manual.txt:1138 #, no-wrap msgid "Building _smtk2ssrf_" msgstr "" #. type: Plain text -#: user-manual.txt:1121 +#: user-manual.txt:1142 msgid "" "Assuming the above dependencies have been installed and the _Subsurface_ " "source tree is in the directory _~/src/subsurface_, then:" msgstr "" #. type: Plain text -#: user-manual.txt:1123 -msgid "Move to the source tree directory." +#: user-manual.txt:1144 +msgid "Move to the source tree directory out of _Subsurface_ (e.g. ~/src)" msgstr "" #. type: Plain text -#: user-manual.txt:1125 +#: user-manual.txt:1147 msgid "" -"Run \" $ ccmake build \" and set SMARTTRAK_IMPORT option to *on* (off by " -"default)." +"Run \" $ ./subsurface/scripts/smtk2ssrf-build.sh \", if every thing has gone " +"fine, you will now have an executable named smtk2ssrf in " +"~/src/subsurface/smtk-import/build" msgstr "" #. type: Plain text -#: user-manual.txt:1126 -msgid "Generate with [c] and save and exit with [g]." +#: user-manual.txt:1150 +msgid "" +"You can run it from this directory, copy it to another one, e.g. _~/bin_ or " +"simply run \"sudo make install\", and the binary will be installed in " +"/usr/local/bin (which is commonly included in every $PATH)." msgstr "" #. type: Plain text -#: user-manual.txt:1128 +#: user-manual.txt:1152 msgid "" -"Build as you prefer, using the _build.sh_ script (recomended) or moving to " -"build directory and running _make_." +"The script has some options mostly useful for development pourposes. If you " +"think you may need them, please read comments on script header itself." msgstr "" #. type: Plain text -#: user-manual.txt:1131 +#: user-manual.txt:1156 +#, no-wrap 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_." +"*WARNING*: While building smtk2ssrf, a light version of _Subsurface_ is\n" +"built (usable but lacking a lot of features). So, if you commonly use the\n" +"built executable placed at ~/subsurface/build/, you will need to rebuild it " +"as\n" +"explained in this manual above.\n" msgstr "" #. type: Title ===== -#: user-manual.txt:1132 +#: user-manual.txt:1157 #, no-wrap msgid "Running" msgstr "" #. type: Plain text -#: user-manual.txt:1138 +#: user-manual.txt:1163 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 " @@ -2312,20 +2210,14 @@ msgid "" "_Subsurface_-formatted data into (see image below)." msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:1139 -#, no-wrap -msgid "FIGURE:Download from SmartTrak" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:1139 +#: user-manual.txt:1164 #, no-wrap msgid "images/smtk2ssrf.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:1146 +#: user-manual.txt:1171 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* " @@ -2333,20 +2225,20 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1148 +#: user-manual.txt:1173 msgid "" "If launched from a command line with two or more parameters, the format is " "as follows:" msgstr "" #. type: Plain text -#: user-manual.txt:1150 +#: user-manual.txt:1175 #, no-wrap msgid "\t$ smrtk2ssrf /input/file_1.slg /input/file_2.slg /output/file3.xml\n" msgstr "" #. type: Plain text -#: user-manual.txt:1158 +#: user-manual.txt:1183 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 " @@ -2357,23 +2249,23 @@ msgid "" msgstr "" #. type: Title ===== -#: user-manual.txt:1159 +#: user-manual.txt:1184 #, no-wrap msgid "For the lazy: a web service to convert _SmartTrak_ to _Subsurface_" msgstr "" #. type: Plain text -#: user-manual.txt:1162 +#: user-manual.txt:1187 msgid "Open the website at:" msgstr "" #. type: Plain text -#: user-manual.txt:1164 +#: user-manual.txt:1189 msgid "_https://thetheoreticaldiver.org/rch-cgi-bin/smtk2ssrf.pl_" msgstr "" #. type: Plain text -#: user-manual.txt:1170 +#: user-manual.txt:1195 msgid "" "This is a no-frills web service for converting _SmartTrak_ dive logs to " "_Subsurface_. Select the browse button. This allows you to browse your " @@ -2383,26 +2275,20 @@ msgid "" "file to the local computer." msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:1171 -#, no-wrap -msgid "FIGURE:Web service to convert SmartTrak divelog" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:1171 +#: user-manual.txt:1196 #, no-wrap msgid "images/strk2ssrf_web.jpg" msgstr "" #. type: Title ===== -#: user-manual.txt:1173 +#: user-manual.txt:1198 #, no-wrap msgid "Merging the imported dives with the existing divelog" msgstr "" #. type: Plain text -#: user-manual.txt:1183 +#: user-manual.txt:1208 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 " @@ -2415,13 +2301,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:1185 +#: user-manual.txt:1210 #, no-wrap msgid "Importing dives from *divelogs.de*" msgstr "" #. type: Plain text -#: user-manual.txt:1198 +#: user-manual.txt:1223 msgid "" "Importing dive information from _divelogs.de_ is simple, using a single " "dialogue box. The _Import -> Import from Divelogs.de_ option should be " @@ -2434,26 +2320,20 @@ msgid "" "_Subsurface_ *Dive List* panel." msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:1199 -#, no-wrap -msgid "FIGURE:Download from Divelogs.de" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:1199 +#: user-manual.txt:1224 #, no-wrap msgid "images/Divelogs1.jpg" msgstr "" #. type: Title ==== -#: user-manual.txt:1202 +#: user-manual.txt:1227 #, no-wrap msgid "Importing data in CSV format" msgstr "" #. type: Plain text -#: user-manual.txt:1213 +#: user-manual.txt:1238 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 " @@ -2469,13 +2349,13 @@ msgid "" msgstr "" #. type: Title ===== -#: user-manual.txt:1215 +#: user-manual.txt:1240 #, no-wrap msgid "Importing dives in CSV format from dive computers or other dive log software" msgstr "" #. type: Plain text -#: user-manual.txt:1220 +#: user-manual.txt:1245 msgid "" "_CSV_ files can be viewed using an ordinary text editor. A _CSV_ file is " "normally organized into a single line that provides the headers (or _field " @@ -2484,14 +2364,14 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1222 +#: user-manual.txt:1247 msgid "" "There are two types of _CSV_ dive logs that can be imported into " "_Subsurface_:" msgstr "" #. type: Plain text -#: user-manual.txt:1228 +#: user-manual.txt:1253 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, " @@ -2502,7 +2382,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1237 +#: user-manual.txt:1262 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 " @@ -2516,14 +2396,14 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1240 +#: user-manual.txt:1265 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:1248 +#: user-manual.txt:1273 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 " @@ -2535,7 +2415,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1252 +#: user-manual.txt:1277 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 " @@ -2544,12 +2424,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1254 +#: user-manual.txt:1279 msgid "Is the numeric information (e.g. dive depth) in metric or in imperial units?" msgstr "" #. type: Plain text -#: user-manual.txt:1261 +#: user-manual.txt:1286 msgid "" "With this information, importing the data into _Subsurface_ is " "straightforward. Select _Import -> Import Log Files_ from the main menu. In " @@ -2558,20 +2438,14 @@ msgid "" "that needs to be imported. A configuration panel appears as depicted below:" msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:1262 -#, no-wrap -msgid "FIGURE: CSV download dialogue 1" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:1262 +#: user-manual.txt:1287 #, no-wrap msgid "images/csv_import1_f20.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:1273 +#: user-manual.txt:1298 #, no-wrap msgid "" "At the top left, there is a dropdown list containing pre- configured\n" @@ -2590,7 +2464,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1285 +#: user-manual.txt:1310 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 " @@ -2606,20 +2480,14 @@ msgid "" "depicted in the image below." msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:1286 -#, no-wrap -msgid "FIGURE: CSV download dialogue 2" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:1286 +#: user-manual.txt:1311 #, no-wrap msgid "images/csv_import2_f20.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:1292 +#: user-manual.txt:1317 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. " @@ -2629,13 +2497,13 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:1296 +#: user-manual.txt:1321 #, no-wrap msgid "*A Diver's Introduction to _CSV_ Files*\n" msgstr "" #. type: delimited block * -#: user-manual.txt:1310 +#: user-manual.txt:1335 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 " @@ -2652,7 +2520,7 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:1319 +#: user-manual.txt:1344 msgid "" "The most important attribute of a _CSV_ file is the _field separator_, the " "character used to separate fields within a single line. The field separator " @@ -2667,7 +2535,7 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:1325 +#: user-manual.txt:1350 #, no-wrap msgid "" "\tDive site,Dive date,Time,Dive_duration, Dive_depth,Dive buddy\n" @@ -2678,14 +2546,14 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:1327 +#: user-manual.txt:1352 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:1333 +#: user-manual.txt:1358 #, no-wrap msgid "" "\tDive site Dive date\tTime\tDive_duration\tDive_depth\tDive buddy\n" @@ -2696,7 +2564,7 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:1341 +#: user-manual.txt:1366 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 " @@ -2710,7 +2578,7 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:1352 +#: user-manual.txt:1377 #, no-wrap msgid "" "\tDive Time (s)\tDepth (m)\tpO~2~ - Setpoint (Bar) \tpO~2~ - C1 Cell 1 " @@ -2727,7 +2595,7 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:1358 +#: user-manual.txt:1383 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_ " @@ -2738,7 +2606,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1371 +#: user-manual.txt:1396 msgid "" "But, the _CSV_ import has a couple of caveats. Avoid some special characters " "like ampersand (&), less than (<), greater than (>) and double quotes (\") " @@ -2751,89 +2619,65 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:1372 +#: user-manual.txt:1397 #, no-wrap msgid "Importing Dive coordinates from a mobile device with GPS." msgstr "" #. type: Plain text -#: user-manual.txt:1376 +#: user-manual.txt:1401 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:1379 +#: user-manual.txt:1404 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:1381 +#: user-manual.txt:1406 msgid "" -"Uploading the coordinates from the mobile device to the _Subsurface_ " -"Internet server." -msgstr "" - -#. type: Plain text -#: user-manual.txt:1384 -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:1386 -msgid "_Subsurface_ has two tools for achieving this:" -msgstr "" - -#. type: Plain text -#: user-manual.txt:1388 -msgid "The _Subsurface Companion App_ (Android and iOS)." -msgstr "" - -#. type: Plain text -#: user-manual.txt:1390 -msgid "The _Subsurface-mobile_ app (Android and iOS)" +"Adding collected coordinate information to the dives using the " +"_Subsurface-mobile_ app." msgstr "" #. type: Plain text -#: user-manual.txt:1399 +#: user-manual.txt:1408 msgid "" -"Both of these applications perform the collection of dive site coordinates " -"and the synchronisation with dives in the _Subsurface_ dive list. However, " -"the Companion App is not being further developed and has largely been " -"replaced by the _Subsurface-mobile_ app. While the _Companion app_ serves " -"exclusively to collect dive site coordinates and to make these available to " -"the _Subsurface_ desktop version, _Subsurface-mobile_ performs many of the " -"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." +"Syncronising the logbook with the _Subsurface_ cloud using the " +"_Subsurface-mobile_ app." msgstr "" #. type: Plain text -#: user-manual.txt:1401 +#: user-manual.txt:1414 msgid "" -"For information on using the _Subsurface Companion App_, click " -"xref:S_Companion[_here_]." +"Existing users might still be using the legacy _Companion app_. However, the " +"Companion App hasn't been under development in several years and has now " +"been removed from both Android and iOS app stores. The functionality is " +"fully integrated into _Subsurface-mobile_. Please note that the old GPS fix " +"internet service will be shut down by the end 2018 at which point the " +"_Companion app_ will no longer be usable. Please switch to " +"_Subsurface-mobile_ instead." msgstr "" #. type: Title ==== -#: user-manual.txt:1402 +#: user-manual.txt:1415 #, no-wrap msgid "Storing and and using GPS locations using _Subsurface-mobile_" msgstr "" #. type: Title ===== -#: user-manual.txt:1404 +#: user-manual.txt:1417 #, no-wrap msgid "Install _Subsurface-mobile_" msgstr "" #. type: Plain text -#: user-manual.txt:1410 +#: user-manual.txt:1423 msgid "" "Find _Subsurface-mobile_ on Google Play and install it on an Android " "device. The app is free. The iOS version is currently " @@ -2843,13 +2687,13 @@ msgid "" msgstr "" #. type: Title ===== -#: user-manual.txt:1411 +#: user-manual.txt:1424 #, no-wrap msgid "Create a _Subsurface-mobile_ account" msgstr "" #. type: Plain text -#: user-manual.txt:1419 +#: user-manual.txt:1432 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 " @@ -2861,7 +2705,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1422 +#: user-manual.txt:1435 #, no-wrap msgid "" "*N.B.:* To successfully create a user account, the mobile device must have " @@ -2869,26 +2713,20 @@ msgid "" "either through the cellular network or via wifi.\n" msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:1423 -#, no-wrap -msgid "FIGURE: Subsurface-mobile, credentials screen" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:1423 +#: user-manual.txt:1436 #, no-wrap msgid "images/MobileCredentials.jpg" msgstr "" #. type: Title ===== -#: user-manual.txt:1426 +#: user-manual.txt:1439 #, no-wrap msgid "Configure auto-collecting of GPS coordinates" msgstr "" #. type: Plain text -#: user-manual.txt:1432 +#: user-manual.txt:1445 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 " @@ -2898,19 +2736,19 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1434 +#: user-manual.txt:1447 msgid "" "_Time threshold._ (minutes). The app will try to get a location every X " "minutes" msgstr "" #. type: Plain text -#: user-manual.txt:1436 +#: user-manual.txt:1449 msgid "_Distance threshold._ (meters). Minimum distance between two locations." msgstr "" #. type: Plain text -#: user-manual.txt:1445 +#: user-manual.txt:1458 #, no-wrap msgid "" "*How are GPS coordinates collected?* Assuming the diver sets 5 minutes and " @@ -2930,80 +2768,46 @@ msgid "" msgstr "" #. type: Title ===== -#: user-manual.txt:1446 +#: user-manual.txt:1459 #, no-wrap msgid "Activate the automated recording of GPS locations" msgstr "" #. type: Plain text -#: user-manual.txt:1451 +#: user-manual.txt:1464 msgid "" "The _Subsurface-mobile_ GPS menu has an option at the bottom labled _Run " "location service_ (see image below). Selecting this starts the automated " "recording of GPS positions." msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:1452 -#, no-wrap -msgid "FIGURE: Subsurface-mobile GPS menu" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:1452 +#: user-manual.txt:1465 #, no-wrap msgid "images/MobileGpsMenu.jpg" msgstr "" #. type: Title ===== -#: user-manual.txt:1454 +#: user-manual.txt:1467 #, no-wrap msgid "After the dive, stop the automated recording of GPS locations" msgstr "" #. type: Plain text -#: user-manual.txt:1457 +#: user-manual.txt:1470 msgid "" "Select the menu option _Disable location service_ at the bottom of the " "_Subsurface-mobile_ GPS menu." msgstr "" #. type: Title ===== -#: user-manual.txt:1458 -#, no-wrap -msgid "Upload the GPS locations onto the _Subsurface_ Internet server." -msgstr "" - -#. type: Plain text -#: user-manual.txt:1465 -#, no-wrap -msgid "" -"*N.B.:* Uploading the GPS locations to the Internet can only take place if " -"the mobile\n" -"device has reliable access to the Internet, either via a cellular network " -"or\n" -"via a wifi connection. If the Internet is not accessible from the dive " -"site(s),\n" -"then GPS uploading can only take place after the dive or after the dive " -"trip,\n" -"when an Internet connection has been re-established.\n" -msgstr "" - -#. type: Plain text -#: user-manual.txt:1468 -msgid "" -"From the _Subsurface-mobile_ main menu, select _GPS_ -> _Upload GPS " -"data_. The locations are uploaded." -msgstr "" - -#. type: Title ===== -#: user-manual.txt:1469 +#: user-manual.txt:1472 #, no-wrap msgid "Apply the stored GPS locations to dives on the _Subsurface_ dive list." msgstr "" #. type: Plain text -#: user-manual.txt:1478 +#: user-manual.txt:1481 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 " @@ -3015,7 +2819,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1483 +#: user-manual.txt:1486 msgid "" "The " "https://subsurface-divelog.org/documentation/subsurface-mobile-user-manual[user " @@ -3024,653 +2828,77 @@ msgid "" "managing, uploading and synchronising this information." msgstr "" -#. type: Title ==== -#: user-manual.txt:1486 -#, no-wrap -msgid "" -"Importing GPS coordinates with the _Subsurface Companion App_ for mobile " -"phones" -msgstr "" - -#. type: Plain text -#: user-manual.txt:1495 -#, no-wrap -msgid "" -"Using the *Subsurface Companion App* on an _Android device_ or\n" -"xref:S_iphone[_iPhone_] with GPS, the coordinates\n" -"for the diving\n" -"location can be automatically passed to the _Subsurface_ dive log. The " -"Companion App\n" -"stores dive locations on a dedicated Internet server. _Subsurface_ can " -"collect\n" -"the locations from the server.\n" -"To do this:\n" -msgstr "" - -#. type: Title ===== -#: user-manual.txt:1496 -#, no-wrap -msgid "Create a Companion App account" -msgstr "" - -#. type: Plain text -#: user-manual.txt:1501 -msgid "" -"Register on the http://api.hohndel.org/login/[_Subsurface companion web " -"page_]. A confirmation email with instructions and a personal *DIVERID* " -"will be sent, a long number enabling access to the file server and Companion " -"App capabilities." -msgstr "" - -#. type: Plain text -#: user-manual.txt:1506 -msgid "" -"Download the app from " -"https://play.google.com/store/apps/details?id=org.subsurface[Google Play " -"Store] or from " -"https://f-droid.org/repository/browse/?fdfilter=subsurface&fdid=org.subsurface[F-Droid]." -msgstr "" - -#. type: Title ===== -#: user-manual.txt:1507 -#, no-wrap -msgid "Using the Subsurface companion app on an Android smartphone" -msgstr "" - -#. type: Plain text -#: user-manual.txt:1510 -msgid "On first use the app has three options:" -msgstr "" - -#. type: Plain text -#: user-manual.txt:1516 -msgid "" -"_Create a new account._ Equivalent to registering in the _Subsurface_ " -"companion page using an Internet browser. You can request a *DIVERID* using " -"this option, but it’s supplied via email and followed up by interaction with " -"the http://api.hohndel.org/login/[_Subsurface companion web page_] to " -"activate the account." -msgstr "" - -#. type: Plain text -#: user-manual.txt:1519 -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:1523 -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 " -"_Disconnect_ menu option (see below)." -msgstr "" - -#. type: Plain text -#: user-manual.txt:1531 -msgid "" -"In the _Subsurface_ main program, the *DIVERID* should also be entered on " -"the Default Preferences panel, by selecting _File -> Preferences -> General_ " -"from the main menu in _Subsurface_ itself. This helps synchronization " -"between _Subsurface_ and the Companion App." -msgstr "" - -#. type: Plain text -#: user-manual.txt:1533 -#, no-wrap -msgid "*Creating new dive locations*\n" -msgstr "" - -#. type: Plain text -#: user-manual.txt:1537 -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 " -"dives." -msgstr "" - -#. type: Plain text -#: user-manual.txt:1540 -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:1543 -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:1552 -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 _long press_ on the touch sensitive screen (if the marked location is " -"wrong, simply choose a new location) and select the check symbol in the " -"upper right. A dialog is shown allowing you to enter the name of the dive " -"location and the date and time of the dive (see *C* below). In order to " -"import this dive location in _Subsurface_, set the time to agree with the " -"time of that dive on the dive computer." -msgstr "" - -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:1553 user-manual.txt:1579 -#, no-wrap -msgid "FIGURE: Companion App, add location using map" -msgstr "" - -#. type: Target for macro image -#: user-manual.txt:1553 -#, no-wrap -msgid "images/Companion_5.jpg" -msgstr "" - -#. type: Plain text -#: user-manual.txt:1560 -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 " -"locations shown. Now select the appropriate locations, and select the check " -"symbol in the upper right to add them." -msgstr "" - -#. type: Plain text -#: user-manual.txt:1563 -#, no-wrap -msgid "*List of dive locations*\n" -msgstr "" - -#. type: Plain text -#: user-manual.txt:1570 -msgid "" -"The main screen shows a list of dive locations, each with a name, date and " -"time (see *A* below). Some locations may have an arrow-up icon over the " -"selection box to the left showing they need to be uploaded to the " -"server. You can select individual dive locations from the list. A selected " -"location has a check mark in the selection box on the left. Group operations " -"(like _Delete_ or _Send_) are performed on several selected locations." -msgstr "" - -#. type: Plain text -#: user-manual.txt:1578 -msgid "" -"Dive locations in this list can be viewed in two ways: a list of locations " -"or a map showing them. The display mode (List or Map) is changed by " -"selecting _Dives_ at the top left of the screen (see *A* below) and then " -"selecting the display mode. The display mode can be changed either from the " -"list of locations or from the map (see *B* below). Upon selecting a location " -"(on the list or on the map), an editing panel opens (see *C* below) where " -"the dive description or other details may be changed." -msgstr "" - -#. type: Target for macro image -#: user-manual.txt:1579 -#, no-wrap -msgid "images/Companion_4.jpg" -msgstr "" - -#. type: Plain text -#: user-manual.txt:1585 -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 " -"screen:" -msgstr "" - -#. type: Plain text -#: user-manual.txt:1587 -msgid "Edit (pencil): Change the name of the dive location." -msgstr "" - -#. type: Plain text -#: user-manual.txt:1592 -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 " -"below." -msgstr "" - -#. type: Plain text -#: user-manual.txt:1594 -#, no-wrap -msgid "*Uploading dive locations*\n" -msgstr "" - -#. type: Plain text -#: user-manual.txt:1599 -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 " -"arrow at the top right of the screen." -msgstr "" - -#. type: Plain text -#: user-manual.txt:1604 -msgid "" -"Be careful! The trash icon on the right means exactly what it should; it " -"deletes the selected dive location(s)." -msgstr "" - -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:1605 -#, no-wrap -msgid "FIGURE: Screen shots (A-B) of companion app" -msgstr "" - -#. type: Target for macro image -#: user-manual.txt:1605 -#, no-wrap -msgid "images/Companion_1.jpg" -msgstr "" - -#. type: Plain text -#: user-manual.txt:1610 -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:1613 -#, no-wrap -msgid "*Settings on the Companion App*\n" -msgstr "" - -#. type: Plain text -#: user-manual.txt:1615 -msgid "" -"Selecting the _Settings_ menu option results in the right hand image above " -"(*B*)." -msgstr "" - -#. type: Plain text -#: user-manual.txt:1617 -msgid "_Server and account_" -msgstr "" - -#. type: Plain text -#: user-manual.txt:1619 -msgid "_Web-service URL._ This is predefined (http://api.hohndel.org/)" -msgstr "" - -#. type: Plain text -#: user-manual.txt:1622 -msgid "" -"_User ID._ The DIVERID obtained by registering as described above. The " -"easiest way to get it is to copy and paste from the confirmation email or " -"just type it in." -msgstr "" - -#. type: Plain text -#: user-manual.txt:1624 -msgid "_Synchronisation_" -msgstr "" - -#. type: Plain text -#: user-manual.txt:1627 -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:1630 -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:1632 -msgid "_Background service_" -msgstr "" - -#. type: Plain text -#: user-manual.txt:1635 -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:1637 -msgid "The settings below define the behavior of the service:" -msgstr "" - -#. type: Plain text -#: user-manual.txt:1640 -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:1642 -msgid "_Min distance._ In meters. Minimum distance between two locations." -msgstr "" - -#. type: Plain text -#: user-manual.txt:1644 -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:1645 user-manual.txt:1746 user-manual.txt:2273 -#, no-wrap -msgid "images/icons/info.jpg" -msgstr "" - -#. type: Plain text -#: user-manual.txt:1655 -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 " -"location at the current location, followed by another one at every 5 minutes " -"*or* every time one moves 50 m from previous location. If subsequent " -"locations are within a radius of 50 meters from the previous one, a new " -"location is not saved. If the diver is not moving, only one location is " -"saved. If the diver is moving, a trace of the route is obtained by saving a " -"location every 50 meters." -msgstr "" - -#. type: Plain text -#: user-manual.txt:1657 -msgid "_Other_" -msgstr "" - -#. type: Plain text -#: user-manual.txt:1660 -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:1662 -msgid "_Subsurface website._ A link to the URL of Subsurface web" -msgstr "" - -#. type: Plain text -#: user-manual.txt:1664 -msgid "_Version._ Displays the current version of the Companion App." -msgstr "" - -#. type: Plain text -#: user-manual.txt:1666 -msgid "_Search_" -msgstr "" - -#. type: Plain text -#: user-manual.txt:1668 -msgid "Search the saved dive locations by name or by date and time." -msgstr "" - -#. type: Plain text -#: user-manual.txt:1670 -msgid "_Start service_" -msgstr "" - -#. type: Plain text -#: user-manual.txt:1672 -msgid "Starts the _background service_ following the previously defined settings." -msgstr "" - -#. type: Plain text -#: user-manual.txt:1674 -msgid "_Disconnect_" -msgstr "" - -#. type: Plain text -#: user-manual.txt:1681 -msgid "" -"This is admittedly a badly named option that disconnects the app from the " -"server. It resets the user ID in the app, showing the first screen where an " -"account can be created, retrieve the ID for an existing account or use the " -"users own ID. The _Disconnect_ option is useful if the Android device was " -"used to download the dive locations of another registered diver." -msgstr "" - -#. type: Plain text -#: user-manual.txt:1683 -msgid "_Send all locations_" -msgstr "" - -#. type: Plain text -#: user-manual.txt:1685 -msgid "This option sends all locations stored in the Android device to the server." -msgstr "" - -#. type: Title ===== -#: user-manual.txt:1687 -#, no-wrap -msgid "Using the Subsurface companion app on an _iPhone_ to record dive locations" -msgstr "" - -#. type: Plain text -#: user-manual.txt:1692 -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 " -"left part of the image below) and start collecting dive location " -"information." -msgstr "" - -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:1693 -#, no-wrap -msgid "FIGURE: Using iPhone companion application" -msgstr "" - -#. type: Target for macro image -#: user-manual.txt:1693 -#, no-wrap -msgid "images/iphone.jpg" -msgstr "" - -#. type: Plain text -#: user-manual.txt:1704 -msgid "" -"Dives can be added automatically or manually. In manual mode, a dive " -"location or waypoint is added to the GPS input stream. In automatic mode, a " -"continuous path of GPS locations is created from which, after import, " -"Subsurface can select the appropriate GPS locations based on the times of " -"dives. The default mode for the _iphone_ is automatic. When adding a dive, " -"the location service is started automatically and a red bar appears at the " -"bottom of the screen. After the dive, click on the red bar to end the " -"location service. While the location service is running you can only add " -"dives manually." -msgstr "" - -#. type: Plain text -#: user-manual.txt:1710 -msgid "" -"You can edit the site name afterwards by selecting the dive from the dive " -"list and clicking on the site name. There are no other editable fields. The " -"dive list is automatically uploaded from the iPhone to the web " -"service. There is no option to trigger upload manually." -msgstr "" - -#. type: Plain text -#: user-manual.txt:1713 -#, no-wrap -msgid "*Downloading dive locations to the _Subsurface_ divelog*\n" -msgstr "" - -#. type: Plain text -#: user-manual.txt:1721 -msgid "" -"Download dive(s) from a dive computer or enter them manually into " -"_Subsurface_ before obtaining the GPS coordinates from the server. The " -"download dialog can be reached via _Ctrl+G_ or from the _Subsurface_ Main " -"Menu _Import -> Import GPS data from Subsurface Service_, resulting in the " -"image on the left (*A*), below. On first use the DIVERID text box is " -"blank. Provide a DIVERID, then select the _Download_ button to start the " -"download process, after which the screen on the right (*B*) below appears:" -msgstr "" - -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:1722 -#, no-wrap -msgid "FIGURE: Downloading Companion app GPS data" -msgstr "" - -#. type: Target for macro image -#: user-manual.txt:1722 -#, no-wrap -msgid "images/DownloadGPS.jpg" -msgstr "" - -#. type: Plain text -#: user-manual.txt:1730 -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 " -"applies the coordinates and names entered on the app to all the new dives " -"that match the date-times of the uploaded GPS localities. The names of dive " -"locations entered within _Subsurface_ (i.e. before downloading the GPS " -"coordinates) have precedence over downloaded dive locations." -msgstr "" - -#. type: Plain text -#: user-manual.txt:1737 -msgid "" -"Since _Subsurface_ matches GPS locations from the mobile device and dive " -"information from the dive computer based on date-time data, automatic " -"assignment of GPS data to dives depends on agreeing date-time information " -"between the two devices. Although _Subsurface_ has a wide range tolerance, " -"it may not be able to identify the appropriate dive if there is a large " -"difference between the time in the dive computer and that of the Android " -"device. This results in no updates." -msgstr "" - -#. type: Plain text -#: user-manual.txt:1745 -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 " -"is the correct position for a dive (e.g. on repetitive dives while running " -"_background service_ there may be several locations that would be included " -"in the time range that fit not only the first dive, but one or more " -"subsequent dives as well). A workaround to manually edit the date-time of a " -"dive in the _Subsurface_ Dive List *before* downloading the GPS data and " -"then to change the date-time back again *after* downloading GPS data." -msgstr "" - -#. type: Plain text -#: user-manual.txt:1749 -msgid "TIPS:" -msgstr "" - -#. type: Plain text -#: user-manual.txt:1752 -msgid "" -"_Background service_ may fill the location list with unnecessary locations " -"that don’t correspond to the exact dive point but do correspond to the " -"boat's route." -msgstr "" - -#. type: Plain text -#: user-manual.txt:1753 -msgid "" -"Right now, these locations are difficult to delete from the server. In some " -"situations it" -msgstr "" - -#. type: Plain text -#: user-manual.txt:1756 -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. This might be necessary, for instance, to keep the location list " -"clear to see dives in the web service map display (see above)." -msgstr "" - -#. type: Plain text -#: user-manual.txt:1759 -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_ " -"setting while running the _background service_, especially on a dive trip " -"with many dives and dive locations." -msgstr "" - #. type: Title === -#: user-manual.txt:1761 +#: user-manual.txt:1489 #, no-wrap -msgid "Adding photographs to dives" +msgid "Adding photographs or videos to dives" msgstr "" #. type: Plain text -#: user-manual.txt:1767 +#: user-manual.txt:1497 msgid "" -"Many (if not most) divers take photographs during a dive. _Subsurface_ " -"allows the storage and display of photographs for each dive. Photos are " -"superimposed on the dive profile at the times during the dive when they were " -"taken. They can also be viewed from the dive profile." +"Many (if not most) divers take photographs or videos during a dive. We term " +"these as _media_, meaning either photos or videos. _Subsurface_ allows the " +"storage and display of these media for each dive. Images are superimposed on " +"the dive profile at the times during the dive when they were taken. Media " +"can be viewed either from the dive profile or from the _Media_ tab in the " +"*Notes Panel*. _Subsurface_ allows viewing of photographs as well as video " +"files in a unified interface." msgstr "" #. type: Title ==== -#: user-manual.txt:1768 +#: user-manual.txt:1498 #, no-wrap -msgid "Loading photos and synchronizing between dive computer and camera" +msgid "Loading media and synchronizing between dive computer and camera" msgstr "" #. type: Plain text -#: user-manual.txt:1774 +#: user-manual.txt:1506 msgid "" "Right-click on a dive or on a group of dives on the dive list, bringing up " "the xref:S_DiveListContextMenu[Dive list context Menu]. Select the " -"appropriate option to import images either from file or from the " -"Internet. The system file browser appears. Select the folder and photographs " -"that need to be loaded into _Subsurface_ and click the _Open_ button." -msgstr "" - -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:1775 -#, no-wrap -msgid "FIGURE: Load images option" +"appropriate option to import media either from file or from the " +"Internet. The system file browser appears. Select the folder and media that " +"need to be loaded into _Subsurface_ and click the _Open_ button. Towards the " +"bottom of the file browser is a filter that allows showing media (photos and " +"videos), only photographs, only videos, or all files. Choose the appropriate " +"option." msgstr "" #. type: Target for macro image -#: user-manual.txt:1775 +#: user-manual.txt:1507 #, no-wrap msgid "images/LoadImage2_f20.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:1782 +#: user-manual.txt:1514 msgid "" -"If photos are imported from the Internet, provide a URL pointing to a single " -"photograph. If the URL points to a directory, no images are imported: " -"photos from the Internet need to be imported one at a time. If photos are " -"loaded from the Internet, _Subsurface_ assumes there is an Internet " -"connection each time this photo is viewed within _Subsurface_." +"If media are imported from the Internet, provide a URL pointing to a single " +"media. If the URL points to a directory, no images are imported: images " +"from the Internet need to be imported one at a time. If media are loaded " +"from the Internet, _Subsurface_ assumes there is an Internet connection each " +"time this item is viewed within _Subsurface_." msgstr "" #. type: Plain text -#: user-manual.txt:1789 +#: user-manual.txt:1522 msgid "" "Having selected the local folder or Internet image to be imported, the time " "synchronization dialog appears (see image below). The time synchronization " "is not perfect between the dive computer used during a dive and the camera " "used during that same dive. These two devices often differ by several " -"minutes. _Subsurface_ attempts to synchronize these two devices so that the " -"exact times of photographs can be used to position photographs on the dive " -"profile." +"minutes. _Subsurface_ attempts to synchronize them so that the exact times " +"of media can be used to position media on the dive profile." msgstr "" #. type: Plain text -#: user-manual.txt:1791 +#: user-manual.txt:1524 msgid "_Subsurface_ synchronizes camera with dive computer in three ways:" msgstr "" #. type: Plain text -#: user-manual.txt:1794 +#: user-manual.txt:1527 #, no-wrap msgid "" "*Pro-actively*: Before the dive, ensure synchronization of the dive computer " @@ -3680,7 +2908,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1805 +#: user-manual.txt:1538 #, no-wrap msgid "" "*Manually*: Writing down the exact camera time at the start of a dive allows " @@ -3696,26 +2924,20 @@ msgid "" "If the camera time is 7 minutes later than that of the dive computer, set " "the time setting\n" "tool to a value of 00:07 and select the _Earlier_ radio button.\n" -"This is appropriate, since the photos need to be shifted\n" +"This is appropriate, since the media need to be shifted\n" "7 minutes earlier (camera is 7 minutes ahead of dive computer). Ignore any " "\"AM\" or \"PM\" suffix\n" "in that tool. Click the _OK_ button and synchronization is done.\n" msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:1806 user-manual.txt:1825 -#, no-wrap -msgid "FIGURE: Synchronization dialog" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:1806 +#: user-manual.txt:1539 #, no-wrap msgid "images/LoadImage3b_f23.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:1824 +#: user-manual.txt:1557 #, no-wrap msgid "" "*By photograph*: There is a very slick way of achieving synchronization, " @@ -3750,313 +2972,273 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1825 +#: user-manual.txt:1558 #, no-wrap msgid "images/LoadImage3c_f23.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:1829 +#: user-manual.txt:1564 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 " -"above). However, If the appropriate checkbox is selected (see image above) " -"these images can still be placed on the _Photos_ tab of the *Notes* panel so " -"that all photos associated with a dive are visible, including photos taken " -"before or after the dive." +"If the timestamp of a photograph or video 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 above). However, If the appropriate checkbox is selected (see " +"image above) these images can still be placed on the _Media_ tab of the " +"*Notes* panel so that all media associated with a dive are visible, " +"including images taken before or after the dive." msgstr "" #. type: Title ==== -#: user-manual.txt:1830 +#: user-manual.txt:1567 +#, no-wrap +msgid "Viewing the media" +msgstr "" + +#. type: delimited block * +#: user-manual.txt:1571 #, no-wrap -msgid "Viewing the photos" +msgid "*Ensuring that thumbnails are created for video files*\n" +msgstr "" + +#. type: delimited block * +#: user-manual.txt:1578 +msgid "" +"Within a panel _Subsurface_ represents media by means of thumbnails " +"(i.e. small versions of images that allows listing many images. For a " +"photograph, a thumbnail can easily be created because the image is well " +"defined. But, since a video comprises many images, the question arises of " +"which image should be used for the thumbnail. Two actions are required to " +"create thumbnails of videos:" +msgstr "" + +#. type: delimited block * +#: user-manual.txt:1580 +msgid "The appropriate settings need to be set in the _Preferences_." +msgstr "" + +#. type: delimited block * +#: user-manual.txt:1582 +msgid "" +"The program _ffmpeg_ needs to be installed in the computer that runs " +"Subsurface." +msgstr "" + +#. type: delimited block * +#: user-manual.txt:1584 +msgid "Full details are provided in <<S_APPENDIX_F,APPENDIX F>>." msgstr "" #. type: Plain text -#: user-manual.txt:1833 -msgid "After the images have been loaded, they appear in two places:" +#: user-manual.txt:1587 +msgid "After the media have been loaded, they appear in two places:" msgstr "" #. type: Plain text -#: user-manual.txt:1835 -msgid "the _Photos_ tab of the *Notes* panel (left part of image below)." +#: user-manual.txt:1589 +msgid "the _Media_ tab of the *Notes Panel* (left part of image below)." msgstr "" #. type: Plain text -#: user-manual.txt:1839 +#: user-manual.txt:1593 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 " -"dive profile, activate the _show-photos_ button in the tool bar to the left " -"of the dive profile:" -msgstr "" - -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:1840 -#, no-wrap -msgid "FIGURE:Show photos toolbar button" +"reflecting the time each photograph or video was taken. To view the media " +"on the dive profile, activate the _Toggle media_ button in the tool bar to " +"the left of the dive profile:" msgstr "" #. type: Target for macro image -#: user-manual.txt:1840 +#: user-manual.txt:1594 #, no-wrap msgid "images/icons/ShowPhotos_f20.png" msgstr "" #. type: Plain text -#: user-manual.txt:1843 +#: user-manual.txt:1597 msgid "This results in a profile display as in the image below:" msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:1844 -#, no-wrap -msgid "FIGURE: Photos on dive profile" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:1844 +#: user-manual.txt:1598 #, no-wrap -msgid "images/LoadImage4_f20.jpg" +msgid "images/LoadImage4.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:1848 +#: user-manual.txt:1602 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: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:1849 -#, no-wrap -msgid "FIGURE:Thumbnail photo on dive profile" +"Hover the mouse over any of the media stubs. A thumbnail image is shown of " +"the appropriate media. See the image below:" msgstr "" #. type: Target for macro image -#: user-manual.txt:1849 +#: user-manual.txt:1603 #, no-wrap -msgid "images/LoadImage5_f20.jpg" +msgid "images/LoadImage5.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:1858 +#: user-manual.txt:1612 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 " -"below). *Note* that the thumbnail has a small dustbin icon in the bottom " -"right hand corner (see image above). Selecting the dustbin removes the image " -"from the dive. Be careful when clicking on a thumbnail. Images can also be " -"deleted using the _Photos_ tab (see text below)." -msgstr "" - -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:1859 -#, no-wrap -msgid "FIGURE: Full-screen photo on dive profile" +"Clicking on the thumbnail brings up a full size photo or video overlaid on " +"the _Subsurface_ window, allowing a good view of the media (see the image " +"below). *Note* that the thumbnail on the dive profile has a small dustbin " +"icon in the bottom right hand corner (see image above). Selecting the " +"dustbin removes the image from the dive. Be careful when clicking on a " +"thumbnail. Images can also be deleted using the _Media_ tab (see text " +"below)." msgstr "" #. type: Target for macro image -#: user-manual.txt:1859 +#: user-manual.txt:1613 #, no-wrap msgid "images/LoadImage6_f20.jpg" msgstr "" #. type: Title ==== -#: user-manual.txt:1861 +#: user-manual.txt:1615 #, no-wrap -msgid "The _Photos_ tab" +msgid "The _Media_ tab" msgstr "" #. type: Plain text -#: user-manual.txt:1873 +#: user-manual.txt:1627 msgid "" -"Photographs associated with a dive are shown as thumbnails in the _Photos_ " -"tab of the _Notes_ panel. Photos taken in rapid succession during a dive " -"(therefore sometimes with large overlap on the dive profile) can easily be " -"accessed in the _Photos_ tab. This tab serves as a tool for individually " -"accessing the photos of a dive, while the stubs on the dive profile show " -"when during a dive a photo was taken. The size of the thumbnails in the " -"_Photos_ tab can be changed using the _Zoom level_ slider at the bottom of " -"the panel. Single-click a thumbnail in the _Photos_ panel to select a " -"photo. Double-click a thumbnail to view the full-sized image, overlaying the " -"_Subsurface_ window. Delete a photo from the _Photos_ panel by selecting it " -"(single-click) and then by pressing the _Del_ key on the keyboard. This " -"removes the photo BOTH from the _Photos_ tab as well as the dive profile." +"Media associated with a dive are shown as thumbnails in the _Media_ tab of " +"the *Notes Panel*. Media taken in rapid succession during a dive (therefore " +"sometimes with large overlap on the dive profile) can easily be accessed in " +"the _Media_ tab. This tab serves as a tool for individually accessing the " +"media of a dive, while the stubs on the dive profile show when during a dive " +"when a photo/video was taken. The size of the thumbnails in the _Media_ tab " +"can be changed using the _Zoom level_ slider at the bottom of the " +"panel. Single-click a thumbnail in the _Media_ panel to select a " +"photo/video. Double-click a thumbnail to view the full-sized image or play " +"the video, overlaying the _Subsurface_ window. Delete media from the _Media_ " +"panel by selecting it (single-click) and then by pressing the _Del_ key on " +"the keyboard. This removes it BOTH from the _Media_ tab as well as the dive " +"profile." msgstr "" #. type: Title ==== -#: user-manual.txt:1874 +#: user-manual.txt:1628 #, no-wrap -msgid "Photos on an external hard disk" +msgid "Media on an external hard disk" msgstr "" #. type: Plain text -#: user-manual.txt:1884 +#: user-manual.txt:1637 msgid "" -"Most underwater photographers store photos on an external drive. If such a " +"Most underwater photographers store media on an external drive. If such a " "drive can be mapped by the operating system (almost always the case) the " -"photos can be directly accessed by _Subsurface_. This eases the interaction " -"between _Subsurface_ and an external repository of photos. When associating " -"a dive profile with photos from an external drive, the normal procedure of " +"media can be directly accessed by _Subsurface_. This eases the interaction " +"between _Subsurface_ and an external repository of media. When associating a " +"dive profile with media from an external drive, the normal procedure of " "selection and synchronization (see text above) is used. After the external " -"drive has been disconnected, _Subsurface_ cannot access these photos any " -"more. If the display of photos is activated (using the toolbox icon to the " -"left of the _Dive Profile_), the program shows a small white dot where each " -"photo should be on the dive profile. In addition the _Photos_ tab shows " -"only the file names of the photos. If the external drive with the photos is " -"re-connected, the photos can be seen in the normal way." +"drive has been disconnected, _Subsurface_ cannot access these media any " +"more. If the display of media is activated (using the toolbox icon to the " +"left of the _Dive Profile_), the program shows only the thumbnails and the " +"images cannot be viewed at full-screen size. If the external drive with the " +"media is re-connected, the media can be seen in the normal way." msgstr "" #. type: Title ==== -#: user-manual.txt:1885 +#: user-manual.txt:1638 #, no-wrap -msgid "Finding out which dives have associated photos." +msgid "Finding out which dives have associated media." msgstr "" #. type: Plain text -#: user-manual.txt:1891 +#: user-manual.txt:1644 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*>>." +"associated media can be time consuming. There is a rapid way of seeing which " +"dives have associated media and which not: activate the _Media_ checkbox in " +"the dropdown list obtained by right-clicking on the header bar of the " +"*Divelist*. In the *Divelist*, all dives with associated media have an icon " +"indicating whether the media 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:1893 +#: user-manual.txt:1646 #, no-wrap -msgid "Moving photographs among directories, hard disks or computers" +msgid "Moving media among directories, hard disks or computers" msgstr "" #. type: Plain text -#: user-manual.txt:1902 +#: user-manual.txt:1655 #, no-wrap msgid "" -"After a photograph has been loaded into _Subsurface_ and associated with a " -"specific dive,\n" -"_Subsurface_ saves the directory path where the photo lies as well as the " -"file name of the photo,\n" +"After a photograph or video has been loaded into _Subsurface_ and associated " +"with a specific dive,\n" +"_Subsurface_ saves the path to the directory where the media lie as well as " +"the file name of the each photo/video,\n" "in order to find it when the dive is opened again.\n" -"If the photo or the whole photo collection is moved to another drive or to a " +"If the media or the whole media collection is moved to another drive or to a " "different\n" -" machine, the path to the photo changes. Now, _Subsurface_ looks for the " -"photos at their original location before they were moved,\n" -" cannot find them and cannot display them. Because, after moving photos, " -"large numbers of photos\n" -" may need to be deleted and re-imported from the new location, _Subsurface_ " -"has a mechanism to ease this inconvenience: automatic updates using " -"fingerprints.\n" +" machine, the path to the media changes. Now, _Subsurface_ looks for the " +"photos/videos at their original location before they were moved,\n" +"cannot find them and cannot display them. Because, after moving media, large " +"numbers of files\n" +" may need to be deleted and re-imported from the new disk, _Subsurface_ can " +"locate the media based on their filename and path.\n" msgstr "" #. type: Plain text -#: user-manual.txt:1906 -#, no-wrap -msgid "" -"When a photo is loaded into _Subsurface_, a fingerprint for the image is " -"calculated and stored with the\n" -" other reference information for that photo. After moving a photo collection " -"(that has already been loaded\n" -" into _Subsurface_) to a different directory, disk or computer, _Subsurface_ " -"can:\n" -msgstr "" - -#. type: Plain text -#: user-manual.txt:1908 -msgid "" -"look through a particular directory (and all its subdirectories recursively) " -"where photos have been moved to," -msgstr "" - -#. type: Plain text -#: user-manual.txt:1909 -msgid "calculate fingerprints for all photos in this directory, and" -msgstr "" - -#. type: Plain text -#: user-manual.txt:1912 -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 " -"file name has changed), automatically update the directory information so " -"that _Subsurface_ can find the photo in the new moved directory." -msgstr "" - -#. type: Plain text -#: user-manual.txt:1917 +#: user-manual.txt:1661 #, no-wrap msgid "" "This is done by selecting from the Main Menu: _File -> Find moved " "images_. This brings up a window within\n" -" which the NEW directory of the photos needs to be specified. Select the " -"appropriate directory and click\n" -" the _Scan_ button towards the bottom right of the panel. The process may " -"require several minutes to\n" -" complete, after which _Subsurface_ will show the appropriate photographs " -"when a particular dive is opened.\n" -msgstr "" - -#. type: delimited block * -#: user-manual.txt:1922 -#, no-wrap -msgid "*Upgrading legacy photo collections without fingerprints*\n" -msgstr "" - -#. type: delimited block * -#: user-manual.txt:1927 -msgid "" -"_Subsurface_ automatically calculates fingerprints for all images that it " -"can access. When manipulating images, ensure that all the images associated " -"with the dive log can be accessed by _Subsurface_." +"which the searching of the images can be controlled. The search is started " +"by clicking on _Select folder and scan_.\n" +"Since recorded during different dive trips might have the same filename, the " +"names of the parent folders are likewise compared.\n" +"Therefore, the root folder of the NEW picture collection should be " +"chosen. For finer control, it is possible to search\n" +"only for media of the currently selected dive(s) by selecting the " +"appropriate option.\n" msgstr "" -#. type: delimited block * -#: user-manual.txt:1929 -msgid "" -"_Subsurface_ automatically checks and, if necessary, updates the " -"fingerprints associated with a single dive if:" -msgstr "" - -#. type: delimited block * -#: user-manual.txt:1931 +#. type: Plain text +#: user-manual.txt:1665 msgid "" -"The images associated with that dive are visible as thumbnails on the *Dive " -"Profile*." +"After the searching has completed, the original filenames and the new " +"locations of the photographs will be shown. The matching parts of the paths " +"are emphasized. Media that are found at their known positions are not " +"listed. The proposed changes can be applied by clicking _Apply_ or rejected " +"by clicking _Cancel_." msgstr "" -#. type: delimited block * -#: user-manual.txt:1933 -msgid "" -"If you edit anything in the *Notes* panel and save the edits by selecting " -"_Apply changes_." +#. type: Target for macro image +#: user-manual.txt:1666 +#, no-wrap +msgid "images/FindMovedImages1.jpg" msgstr "" #. type: Title === -#: user-manual.txt:1936 +#: user-manual.txt:1668 #, no-wrap msgid "Logging special types of dives" msgstr "" #. type: Plain text -#: user-manual.txt:1939 +#: user-manual.txt:1671 msgid "" "This section gives examples of the versatility of _Subsurface_ as a dive " "logging tool." msgstr "" #. type: Title ==== -#: user-manual.txt:1942 +#: user-manual.txt:1674 #, no-wrap msgid "Multicylinder dives" msgstr "" #. type: Plain text -#: user-manual.txt:1949 +#: user-manual.txt:1681 msgid "" "_Subsurface_ easily handles dives involving more than one " "cylinder. Multi-cylinder diving usually happens (a) if a diver doesn’t have " @@ -4068,7 +3250,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1953 +#: user-manual.txt:1685 #, no-wrap msgid "" "*Describe the cylinders used during the dive* This is performed in the " @@ -4080,7 +3262,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1959 +#: user-manual.txt:1691 #, no-wrap msgid "" "*Record the times at which the switch from one cylinder to another was " @@ -4095,7 +3277,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1967 +#: user-manual.txt:1699 #, no-wrap msgid "" "*Record the cylinder changes on the dive profile*: If the latter option\n" @@ -4112,7 +3294,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1971 +#: user-manual.txt:1703 msgid "" "When this is complete, _Subsurface_ indicates the appropriate use of " "cylinders in the dive profile. Below is a two-cylinder dive, starting off " @@ -4120,20 +3302,14 @@ msgid "" "decompression." msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:1972 -#, no-wrap -msgid "FIGURE: Multicylinder profile" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:1972 +#: user-manual.txt:1704 #, no-wrap msgid "images/multicylinder_dive.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:1981 +#: user-manual.txt:1713 msgid "" "Several dive computers perform automatic recording of cylinder pressure. In " "this case no manual intervention is needed. Older dive computers " @@ -4156,13 +3332,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:1982 +#: user-manual.txt:1714 #, no-wrap msgid "Sidemount dives" msgstr "" #. type: Plain text -#: user-manual.txt:1989 +#: user-manual.txt:1721 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 " @@ -4174,7 +3350,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1998 +#: user-manual.txt:1730 #, no-wrap msgid "" "*During the dive, record cylinder switch events*. Since sidemount diving " @@ -4196,7 +3372,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2001 +#: user-manual.txt:1733 #, no-wrap msgid "" "*Within _Subsurface_ describe the cylinders used during the dive*. The diver " @@ -4207,7 +3383,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2011 +#: user-manual.txt:1743 #, no-wrap msgid "" "*Indicate cylinder change events on the _Subsurface_ dive profile*. Once the " @@ -4231,32 +3407,26 @@ msgid "" "for both cylinders are shown on the dive profile, as in the image below.\n" msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:2012 -#, no-wrap -msgid "FIGURE: Sidemount profile" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:2012 +#: user-manual.txt:1744 #, no-wrap msgid "images/sidemount1.jpg" msgstr "" #. type: Title ==== -#: user-manual.txt:2015 +#: user-manual.txt:1747 #, no-wrap msgid "Passive semi-closed circuit rebreather (pSCR) dives" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2017 +#: user-manual.txt:1749 #, no-wrap msgid "images/halcyon_RB80.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2027 +#: user-manual.txt:1759 msgid "" "Passive semi-closed rebreathers (pSCR) are a technical advance in diving " "equipment that recirculates the breathing gas a diver uses, while removing " @@ -4271,19 +3441,19 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2029 +#: user-manual.txt:1761 msgid "" "To log pSCR dives, no special procedures are required. Use the normal steps " "outlined above:" msgstr "" #. type: Plain text -#: user-manual.txt:2031 +#: user-manual.txt:1763 msgid "Select pSCR in the _Dive Mode_ dropdown list on the *Info* panel." msgstr "" #. type: Plain text -#: user-manual.txt:2035 +#: user-manual.txt:1767 msgid "" "pSCR diving often involves gas changes, requiring an additional cylinder. " "Define all the appropriate cylinders as described above and indicate the " @@ -4292,7 +3462,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2042 +#: user-manual.txt:1774 msgid "" "In pSCR diving, the inspired gas often has a pO~2~ below that of the fresh " "gas from cylinder. This is because fresh gas is only supplied at a slow rate " @@ -4304,20 +3474,14 @@ msgid "" "dive lasted over two hours." msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:2043 -#, no-wrap -msgid "FIGURE: pSCR profile" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:2043 +#: user-manual.txt:1775 #, no-wrap msgid "images/pSCR_profile.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2059 +#: user-manual.txt:1791 msgid "" "_Visualising the pO~2~ drop_: The difference between the pO~2~ of the fresh " "cylinder gas and the pO~2~ in the loop can be visualised in _Subsurface_ by " @@ -4343,13 +3507,13 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2060 +#: user-manual.txt:1792 #, no-wrap msgid "images/DiveModeChange.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2074 +#: user-manual.txt:1806 msgid "" "_pSCR and bailout_: Gases used in pSCR often yield very low pO~2~ values in " "shallow water. For this reason the diver often completes the shallow " @@ -4367,32 +3531,26 @@ msgid "" "section, the pO~2~ (green line) differs from the OC-pO~2~ (orange line)." msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:2075 -#, no-wrap -msgid "FIGURE: pSCR profile with bailout" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:2075 +#: user-manual.txt:1807 #, no-wrap msgid "images/pSCR_profile_bailout.jpg" msgstr "" #. type: Title ==== -#: user-manual.txt:2078 +#: user-manual.txt:1810 #, no-wrap msgid "Closed circuit rebreather (CCR) dives" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2080 +#: user-manual.txt:1812 #, no-wrap msgid "images/APD.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2085 +#: user-manual.txt:1817 msgid "" "Closed system rebreathers also recirculate gas that has been " "breathed. However, they use advanced technology to maintain a breathable " @@ -4400,12 +3558,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2086 +#: user-manual.txt:1818 msgid "remove carbon dioxide from the exhaled gas." msgstr "" #. type: Plain text -#: user-manual.txt:2097 +#: user-manual.txt:1829 msgid "" "regulate the oxygen concentration to remain within safe diving limits. The " "CCR interface of _Subsurface_ is currently experimental and under active " @@ -4422,13 +3580,13 @@ msgid "" msgstr "" #. type: Title ===== -#: user-manual.txt:2098 +#: user-manual.txt:1830 #, no-wrap msgid "Import a CCR dive" msgstr "" #. type: Plain text -#: user-manual.txt:2117 +#: user-manual.txt:1849 msgid "" "For Shearwater CCR controllers, or independent Shearwater CCR logs, just " "download the dive log as would be the case for non-CCR dives. _Subsurface_ " @@ -4454,13 +3612,13 @@ msgid "" msgstr "" #. type: Title ===== -#: user-manual.txt:2118 +#: user-manual.txt:1850 #, no-wrap msgid "Displayed information for a CCR dive" msgstr "" #. type: Plain text -#: user-manual.txt:2128 +#: user-manual.txt:1860 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 " @@ -4474,12 +3632,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2130 +#: user-manual.txt:1862 msgid "For TWO O~2~ sensors the mean value of the two sensors are given." msgstr "" #. type: Plain text -#: user-manual.txt:2134 +#: user-manual.txt:1866 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 " @@ -4488,19 +3646,19 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2136 +#: user-manual.txt:1868 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:2138 +#: user-manual.txt:1870 msgid "The mean pO~2~ of the sensors is indicated with a green line," msgstr "" #. type: Plain text -#: user-manual.txt:2146 +#: user-manual.txt:1878 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 " @@ -4511,20 +3669,14 @@ msgid "" "appropriate toolbar button on the Dive Profile has been checked." msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:2147 -#, no-wrap -msgid "FIGURE: CCR preferences panel" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:2147 +#: user-manual.txt:1879 #, no-wrap msgid "images/CCR_preferences_f20.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2154 +#: user-manual.txt:1886 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 " @@ -4534,20 +3686,14 @@ msgid "" "pressure and the setpoint values, as shown below." msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:2155 -#, no-wrap -msgid "FIGURE: CCR setpoint and pO~2~ graph" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:2155 +#: user-manual.txt:1887 #, no-wrap msgid "images/CCR_setpoint_f20.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2159 +#: user-manual.txt:1891 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 color-coded " @@ -4555,42 +3701,36 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2161 +#: user-manual.txt:1893 msgid "Sensor 1: grey" msgstr "" #. type: Plain text -#: user-manual.txt:2162 +#: user-manual.txt:1894 msgid "Sensor 2: blue" msgstr "" #. type: Plain text -#: user-manual.txt:2163 +#: user-manual.txt:1895 msgid "Sensor 3: brown" msgstr "" #. type: Plain text -#: user-manual.txt:2167 +#: user-manual.txt:1899 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 " "abnormally low or erratic readings from a particular sensor." msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:2168 -#, no-wrap -msgid "FIGURE: CCR sensor data graph" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:2168 +#: user-manual.txt:1900 #, no-wrap msgid "images/CCR_sensor_data_f20.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2173 +#: user-manual.txt:1905 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, " @@ -4598,7 +3738,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2177 +#: user-manual.txt:1909 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 " @@ -4607,7 +3747,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2197 +#: user-manual.txt:1929 msgid "" "_Bailout_: Bailout events during a CCR dive can be recorded in a " "_Subsurface_ divelog. Right-click on the dive profile to generate a dive " @@ -4634,20 +3774,14 @@ msgid "" "the events are shown automatically in the dive log." msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:2198 -#, no-wrap -msgid "FIGURE: CCR bailout profileh" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:2198 +#: user-manual.txt:1930 #, no-wrap msgid "images/CCR_bailout.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2205 +#: user-manual.txt:1937 msgid "" "_Deco ceiling_: The deco ceiling calculated by Subsurface is not very " "accurate because the precise pressure of nitrogen in the loop can usually " @@ -4658,20 +3792,14 @@ msgid "" "the left of the dive profile:" msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:2206 -#, no-wrap -msgid "DC ceiling icon" -msgstr "" - #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2206 user-manual.txt:2603 +#: user-manual.txt:1938 user-manual.txt:2337 #, no-wrap msgid "images/icons/cceiling.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2211 +#: user-manual.txt:1943 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 -> " @@ -4680,7 +3808,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2219 +#: user-manual.txt:1951 msgid "" "_Cylinder pressures_: Some CCR dive computers like Poseidon record the " "pressures of the oxygen and diluent cylinders. The pressures of these two " @@ -4692,20 +3820,14 @@ msgid "" "the two oxygen sensors." msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:2220 -#, no-wrap -msgid "FIGURE: CCR dive profile" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:2220 +#: user-manual.txt:1952 #, no-wrap msgid "images/CCR_dive_profile_f22.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2225 +#: user-manual.txt:1957 msgid "" "_Equipment-specific information_: Equipment-specific information gathered by " "_Subsurface_ is shown in the xref:S_ExtraDataTab[Extra data tab]. This may " @@ -4713,7 +3835,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2228 +#: user-manual.txt:1960 msgid "" "More equipment-specific procedures and information for downloading CCR dive " "logs for Poseidon and APD equipment can be found in " @@ -4722,80 +3844,74 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:2229 +#: user-manual.txt:1961 #, no-wrap msgid "Obtaining more information about dives entered into the logbook" msgstr "" #. type: Title === -#: user-manual.txt:2231 +#: user-manual.txt:1963 #, no-wrap msgid "Using the Dive Map to obtain more dive information" msgstr "" #. type: Plain text -#: user-manual.txt:2234 +#: user-manual.txt:1966 msgid "" "The Dive Map has a number of buttons useful for manipulation several aspects " "of a dive. These are:" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2235 +#: user-manual.txt:1967 #, no-wrap msgid "images/icons/MapViewMode.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2239 +#: user-manual.txt:1971 msgid "" "Select this button to show the Dive Map as a satellite image or as a Google " "Maps representation." msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2240 +#: user-manual.txt:1972 #, no-wrap msgid "images/icons/MapViewPlus.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2243 +#: user-manual.txt:1975 msgid "Zoom in. Select a smaller area of the map." msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2244 +#: user-manual.txt:1976 #, no-wrap msgid "images/icons/MapViewMinus.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2247 +#: user-manual.txt:1979 msgid "Zoom out. Select a larger area of the map." msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:2248 -#, no-wrap -msgid "FIGURE: Map menu" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:2248 +#: user-manual.txt:1980 #, no-wrap msgid "images/MapMenu.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2252 +#: user-manual.txt:1984 msgid "" "The \"Hamburger\" button on the top right-hand of the Dive Map activates the " "Map menu. The items are:" msgstr "" #. type: Plain text -#: user-manual.txt:2255 +#: user-manual.txt:1987 msgid "" "Open location in _Google Maps_. Open the location of the active dive in a " "separate Google Maps window with the dive site indicated by a Google Maps " @@ -4803,21 +3919,21 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2258 +#: user-manual.txt:1990 msgid "" "Copy location to clipboard (decimal). Copy the coordinates of the active " "dive to the clipboard in decimal degrees e.g. -25.933905 30.710572" msgstr "" #. type: Plain text -#: user-manual.txt:2261 +#: user-manual.txt:1993 msgid "" "Copy location to clipboard (sexagesimal). Copy the coordinates of the active " "dive to the clipboard in sexagecimal, e.g. 25°56'02.058\"S 30°42'38.059\"E" msgstr "" #. type: Plain text -#: user-manual.txt:2264 +#: user-manual.txt:1996 msgid "" "Select visible dive locations. In the Dive List panel, highlight all the " "dive sites visible in the Dive Map. This allows easy selection of the dives " @@ -4826,13 +3942,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:2265 +#: user-manual.txt:1997 #, no-wrap msgid "The *Info* tab (for individual dives)" msgstr "" #. type: Plain text -#: user-manual.txt:2272 +#: user-manual.txt:2004 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 " @@ -4841,8 +3957,14 @@ msgid "" "oxygen toxicity units (OTU) incurred." msgstr "" +#. type: Named 'icon' AttributeList argument for style 'icon' +#: user-manual.txt:2005 +#, no-wrap +msgid "images/icons/info.jpg" +msgstr "" + #. type: Plain text -#: user-manual.txt:2279 +#: user-manual.txt:2011 msgid "" "Gas consumption and SAC calculations: _Subsurface_ calculates SAC and Gas " "consumption taking in account gas incompressibility, particularly at tank " @@ -4851,13 +3973,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:2281 +#: user-manual.txt:2013 #, no-wrap msgid "The *Extra Data* tab (usually for individual dives)" msgstr "" #. type: Plain text -#: user-manual.txt:2289 +#: user-manual.txt:2021 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 " @@ -4868,26 +3990,20 @@ msgid "" "extra data for a dive using a Poseidon rebreather." msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:2290 -#, no-wrap -msgid "FIGURE: Extra Data tab" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:2290 +#: user-manual.txt:2022 #, no-wrap msgid "images/ExtraDataTab_f20.jpg" msgstr "" #. type: Title === -#: user-manual.txt:2292 +#: user-manual.txt:2024 #, no-wrap msgid "The *Stats* tab (for groups of dives)" msgstr "" #. type: Plain text -#: user-manual.txt:2303 +#: user-manual.txt:2035 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 " @@ -4900,25 +4016,19 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:2305 +#: user-manual.txt:2037 #, no-wrap msgid "The *Dive Profile*" msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:2307 -#, no-wrap -msgid "Typical dive profile" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:2307 +#: user-manual.txt:2039 #, no-wrap msgid "images/Profile2.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2318 +#: user-manual.txt:2050 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 " @@ -4931,7 +4041,7 @@ msgid "" msgstr "" #. type: delimited block | -#: user-manual.txt:2325 +#: user-manual.txt:2057 #, no-wrap msgid "" "|*Color*|*Descent speed (m/min)*|*Ascent speed (m/min)*\n" @@ -4943,7 +4053,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2330 +#: user-manual.txt:2062 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 " @@ -4952,13 +4062,13 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2331 +#: user-manual.txt:2063 #, no-wrap msgid "images/icons/scale.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2336 +#: user-manual.txt:2068 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 " @@ -4967,7 +4077,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2339 +#: user-manual.txt:2071 #, no-wrap msgid "" "*Water temperature* is shown as a blue line with temperature values\n" @@ -4975,13 +4085,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2341 +#: user-manual.txt:2073 #, no-wrap msgid "The *Information Box*" msgstr "" #. type: Plain text -#: user-manual.txt:2348 +#: user-manual.txt:2080 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 " @@ -4991,20 +4101,14 @@ msgid "" "and used again during subsequent dive analyses." msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:2349 -#, no-wrap -msgid "Figure: Information Box" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:2349 +#: user-manual.txt:2081 #, no-wrap msgid "images/InfoBox2.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2365 +#: user-manual.txt:2097 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 " @@ -5025,13 +4129,13 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2366 +#: user-manual.txt:2098 #, no-wrap msgid "images/icons/MOD.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2373 +#: user-manual.txt:2105 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. " @@ -5043,13 +4147,13 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2374 +#: user-manual.txt:2106 #, no-wrap msgid "images/icons/NDL.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2385 +#: user-manual.txt:2117 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, " @@ -5064,13 +4168,13 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2386 +#: user-manual.txt:2118 #, no-wrap msgid "images/icons/SAC.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2394 +#: user-manual.txt:2126 msgid "" "Show the *Surface Air Consumption (SAC)*, an indication of the " "surface-normalized respiration rate of a diver. The value of SAC is less " @@ -5082,13 +4186,13 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2395 +#: user-manual.txt:2127 #, no-wrap msgid "images/icons/EAD.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2410 +#: user-manual.txt:2142 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 " @@ -5104,7 +4208,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2417 +#: user-manual.txt:2149 msgid "" "If at some point a isobaric counter diffusion situation is encountered in " "the leading tissue (defined to be a moment in time where helium is " @@ -5115,20 +4219,20 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2419 +#: user-manual.txt:2151 msgid "" "Figure (*B*) above shows an information box with a nearly complete set of " "data." msgstr "" #. type: Title ===== -#: user-manual.txt:2422 +#: user-manual.txt:2154 #, no-wrap msgid "The Gas Pressure Bar Graph" msgstr "" #. type: Plain text -#: user-manual.txt:2429 +#: user-manual.txt:2161 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 " @@ -5138,20 +4242,14 @@ msgid "" "the Gas Pressure Bar Graph." msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:2430 -#, no-wrap -msgid "FIGURE:Gas Pressure bar Graph" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:2430 +#: user-manual.txt:2162 #, no-wrap msgid "images/GasPressureBarGraph.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2436 +#: user-manual.txt:2168 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 " @@ -5161,7 +4259,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2442 +#: user-manual.txt:2174 msgid "" "The horizontal black line underneath the light green margin indicates the " "equilibrium pressure of the INERT gases inhaled by the diver, usually " @@ -5172,7 +4270,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2446 +#: user-manual.txt:2178 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 " @@ -5180,7 +4278,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2452 +#: user-manual.txt:2184 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 " @@ -5190,7 +4288,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2456 +#: user-manual.txt:2188 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 " @@ -5199,7 +4297,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2459 +#: user-manual.txt:2191 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 " @@ -5207,7 +4305,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2462 +#: user-manual.txt:2194 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 " @@ -5215,7 +4313,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2465 +#: user-manual.txt:2197 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 " @@ -5223,7 +4321,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2470 +#: user-manual.txt:2202 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 " @@ -5233,7 +4331,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2476 +#: user-manual.txt:2208 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 " @@ -5244,7 +4342,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2481 +#: user-manual.txt:2213 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 " @@ -5254,13 +4352,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2482 +#: user-manual.txt:2214 #, no-wrap msgid "Computer-reported events during dive" msgstr "" #. type: Plain text -#: user-manual.txt:2494 +#: user-manual.txt:2226 msgid "" "Many dive computers record events during a dive. For instance, most dive " "computers report alarms relating to high partial pressures of oxygen, to " @@ -5279,7 +4377,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2499 +#: user-manual.txt:2231 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 " @@ -5289,20 +4387,14 @@ msgid "" "was reported)." msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:2500 -#, no-wrap -msgid "FIGURE: Profile notification symbols" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:2500 +#: user-manual.txt:2232 #, no-wrap msgid "images/profile_symbols.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2505 +#: user-manual.txt:2237 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 " @@ -5311,13 +4403,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2506 +#: user-manual.txt:2238 #, no-wrap msgid "The Profile Toolbar" msgstr "" #. type: Plain text -#: user-manual.txt:2514 +#: user-manual.txt:2246 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 " @@ -5328,44 +4420,44 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2515 +#: user-manual.txt:2247 #, no-wrap msgid "images/icons/O2.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2519 +#: user-manual.txt:2251 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:2520 +#: user-manual.txt:2252 #, no-wrap msgid "images/icons/N2.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2523 +#: user-manual.txt:2255 msgid "Show the partial pressure of *nitrogen* during the dive." msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2524 +#: user-manual.txt:2256 #, no-wrap msgid "images/icons/He.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2528 +#: user-manual.txt:2260 msgid "" "Display of the partial pressure of *helium* during the dive. This is only " "important to divers using Trimix, Helitrox or similar breathing gases." msgstr "" #. type: Plain text -#: user-manual.txt:2541 +#: user-manual.txt:2273 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 " @@ -5380,7 +4472,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2545 +#: user-manual.txt:2277 msgid "" "When in planner mode, the SAC is set to be constant during the bottom part " "of the dive as well during decompression. Therefore, when planning a dive, " @@ -5388,20 +4480,20 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2546 +#: user-manual.txt:2278 #, no-wrap msgid "images/icons/Heartbutton.png" msgstr "" #. type: Plain text -#: user-manual.txt:2550 +#: user-manual.txt:2282 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:2556 +#: user-manual.txt:2288 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 " @@ -5410,26 +4502,20 @@ msgid "" "recognizable; something free divers won’t care about." msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:2557 -#, no-wrap -msgid "FIGURE: Measuring Bar" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:2557 +#: user-manual.txt:2289 #, no-wrap msgid "images/MeasuringBar.png" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2559 +#: user-manual.txt:2291 #, no-wrap msgid "images/icons/ruler.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2567 +#: user-manual.txt:2299 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 " @@ -5439,22 +4525,24 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2568 +#: user-manual.txt:2300 #, no-wrap msgid "images/icons/ShowPhotos.png" msgstr "" #. type: Plain text -#: user-manual.txt:2575 +#: user-manual.txt:2309 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 " -"shows the exact time when this photo was taken. If this button is not " -"active, the photos are hidden." +"Photographs and videos that have been added to a dive can be shown on the " +"profile by selecting the *Show-media* button. The position of a photo or " +"video on the profile shows the exact time when it was taken. The runtime of " +"videos is represented by a bar if _Subsurface_ was able to extract this " +"information from the video file. If this button is not active, the media " +"are hidden." msgstr "" #. type: Plain text -#: user-manual.txt:2602 +#: user-manual.txt:2336 msgid "" "The profile can also include the dive computer reported *ceiling* (more " "precisely, the deepest deco stop that the dive computer calculated for each " @@ -5483,7 +4571,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2608 +#: user-manual.txt:2342 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 " @@ -5491,13 +4579,13 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2609 +#: user-manual.txt:2343 #, no-wrap msgid "images/icons/ceiling1.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2614 +#: user-manual.txt:2348 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 " @@ -5506,13 +4594,13 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2615 +#: user-manual.txt:2349 #, no-wrap msgid "images/icons/ceiling2.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2619 +#: user-manual.txt:2353 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 " @@ -5520,32 +4608,26 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2620 +#: user-manual.txt:2354 #, no-wrap msgid "images/icons/ceiling3.jpg" msgstr "" #. type: delimited block = -#: user-manual.txt:2625 +#: user-manual.txt:2359 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: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:2626 -#, no-wrap -msgid "Figure: Ceiling with 3m resolution" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:2626 +#: user-manual.txt:2360 #, no-wrap msgid "images/Ceilings2.jpg" msgstr "" #. type: delimited block = -#: user-manual.txt:2629 +#: user-manual.txt:2363 msgid "" "Gradient Factor settings strongly affect the calculated ceilings and their " "depths. For more information about Gradient factors, see the section on " @@ -5558,7 +4640,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2631 user-manual.txt:3481 +#: user-manual.txt:2365 user-manual.txt:3229 #, no-wrap msgid "" " *** http://www.tek-dive.com/portal/upload/M-Values.pdf[Understanding " @@ -5566,7 +4648,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2633 user-manual.txt:3483 +#: user-manual.txt:2367 user-manual.txt:3231 #, no-wrap msgid "" " *** " @@ -5575,13 +4657,13 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2637 +#: user-manual.txt:2371 #, no-wrap msgid "images/icons/ShowCylindersButton.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2643 +#: user-manual.txt:2377 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 " @@ -5591,26 +4673,20 @@ msgid "" "after 23 minutes. Cylinders with air are shown as a light blue bar." msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:2644 -#, no-wrap -msgid "Figure: Cylinder use graph" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:2644 +#: user-manual.txt:2378 #, no-wrap msgid "images/ShowCylinders_f20.jpg" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2648 +#: user-manual.txt:2382 #, no-wrap msgid "images/icons/heatmap.png" msgstr "" #. type: delimited block = -#: user-manual.txt:2655 +#: user-manual.txt:2389 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 " @@ -5621,20 +4697,14 @@ msgid "" "interpreted." msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:2656 user-manual.txt:2734 -#, no-wrap -msgid "Figure: Inert gas tissue pressure heat-map" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:2656 +#: user-manual.txt:2390 #, no-wrap msgid "images/Heatmap.jpg" msgstr "" #. type: delimited block = -#: user-manual.txt:2664 +#: user-manual.txt:2398 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 " @@ -5647,7 +4717,7 @@ msgid "" msgstr "" #. type: delimited block = -#: user-manual.txt:2672 +#: user-manual.txt:2406 msgid "" "Image *B* shows a gradient of unique colors, spanning the whole range of " "inert gas pressures. It is possible to map the height of each of the dark " @@ -5661,7 +4731,7 @@ msgid "" msgstr "" #. type: delimited block = -#: user-manual.txt:2680 +#: user-manual.txt:2414 msgid "" "The bottom range in *B* (marked _On-gassing_) includes colors from light " "blue to black, representing tissue gas pressures below the equilibrium " @@ -5676,7 +4746,7 @@ msgid "" msgstr "" #. type: delimited block = -#: user-manual.txt:2686 +#: user-manual.txt:2420 msgid "" "The central range in *B* includes the colors from black to light green, when " "the inert gas pressure of a tissue compartment is higher than the " @@ -5687,7 +4757,7 @@ msgid "" msgstr "" #. type: delimited block = -#: user-manual.txt:2695 +#: user-manual.txt:2429 msgid "" "The top range in *B* (marked _Off-gassing_) includes colors from light green " "to red and white, repesenting tissue gas pressures above that of the total " @@ -5703,7 +4773,7 @@ msgid "" msgstr "" #. type: delimited block = -#: user-manual.txt:2703 +#: user-manual.txt:2437 msgid "" "Image *C* shows the color 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 " @@ -5715,7 +4785,7 @@ msgid "" msgstr "" #. type: delimited block = -#: user-manual.txt:2710 +#: user-manual.txt:2444 msgid "" "Image *D* is a compilation of similar color mappings of 16 tissue " "compartments during a 10-minute period of a dive, the colors representing " @@ -5726,7 +4796,7 @@ msgid "" msgstr "" #. type: delimited block = -#: user-manual.txt:2714 +#: user-manual.txt:2448 msgid "" "The colors of the heat map are not affected by the gradient factor " "settings. This is because the heat map indicates tissue pressures relative " @@ -5735,21 +4805,21 @@ msgid "" msgstr "" #. type: delimited block = -#: user-manual.txt:2716 +#: user-manual.txt:2450 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:2719 +#: user-manual.txt:2453 msgid "" "Since the colors of the heat map are not affected by the gradient factor(s), " "the heat map is also applicable when using the VPM-B decompression model." msgstr "" #. type: delimited block = -#: user-manual.txt:2723 +#: user-manual.txt:2457 msgid "" "The image below compares the profiles and heat maps for two planned " "decompression dives to 60m: the first using the Bühlmann decompression " @@ -5759,7 +4829,7 @@ msgid "" msgstr "" #. type: delimited block = -#: user-manual.txt:2728 +#: user-manual.txt:2462 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, " @@ -5770,7 +4840,7 @@ msgid "" msgstr "" #. type: delimited block = -#: user-manual.txt:2733 +#: user-manual.txt:2467 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 " @@ -5780,19 +4850,19 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2734 +#: user-manual.txt:2468 #, no-wrap msgid "images/tissueHeatmap.jpg" msgstr "" #. type: Title ==== -#: user-manual.txt:2737 +#: user-manual.txt:2471 #, no-wrap msgid "The Dive Profile context menu" msgstr "" #. type: Plain text -#: user-manual.txt:2756 +#: user-manual.txt:2490 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 " @@ -5813,62 +4883,50 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:2757 +#: user-manual.txt:2491 #, no-wrap msgid "Organizing the logbook (Manipulating groups of dives)" msgstr "" #. type: Title === -#: user-manual.txt:2760 +#: user-manual.txt:2494 #, no-wrap msgid "The Dive List context menu" msgstr "" #. type: Plain text -#: user-manual.txt:2764 +#: user-manual.txt:2498 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 " "a single dive or a group of dives and then right-clicking." msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:2765 -#, no-wrap -msgid "Figure: Context Menu" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:2765 +#: user-manual.txt:2499 #, no-wrap msgid "images/ContextMenu.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2768 +#: user-manual.txt:2502 msgid "The context menu is used in many functions described below." msgstr "" #. type: Title ==== -#: user-manual.txt:2770 +#: user-manual.txt:2504 #, no-wrap msgid "Customizing the columns showed in the *Dive List* panel" msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:2772 -#, no-wrap -msgid "Example: Dive list info options" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:2772 +#: user-manual.txt:2506 #, no-wrap msgid "images/DiveListOptions.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2780 +#: user-manual.txt:2514 msgid "" "The default information in the *Dive List* includes, for each dive, " "Dive_number, Date, Rating, Dive_depth, Dive_duration and Dive_location. This " @@ -5880,62 +4938,62 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2785 +#: user-manual.txt:2519 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 " +"By selecting the _Media_ checkbox in the dropdown list, an icon is shown " +"indicating whether any media are associated with a particular dive. There " "are three icons:" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2786 +#: user-manual.txt:2520 #, no-wrap msgid "images/icons/duringPhoto.png" msgstr "" #. type: Plain text -#: user-manual.txt:2789 +#: user-manual.txt:2523 msgid "" -"This dive has photographs taken during the dive, typically using an " -"underwater camera." +"This dive has photographs or videos taken during the dive, typically using " +"an underwater camera." msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2790 +#: user-manual.txt:2524 #, no-wrap msgid "images/icons/outsidePhoto.png" msgstr "" #. type: Plain text -#: user-manual.txt:2795 +#: user-manual.txt:2529 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." +"This dive has photographs or videos taken immediately before or immediately " +"after the dive. This is useful for finding photos/media 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:2796 +#: user-manual.txt:2530 #, no-wrap msgid "images/icons/inAndOutPhoto.png" msgstr "" #. type: Plain text -#: user-manual.txt:2799 +#: user-manual.txt:2533 msgid "" -"This dive has photographs taken both during the dive and immediately before " -"or after the dive." +"This dive has photographs or videos taken both during the dive and " +"immediately before or after the dive." msgstr "" #. type: Title === -#: user-manual.txt:2801 +#: user-manual.txt:2535 #, no-wrap msgid "Renumbering the dives" msgstr "" #. type: Plain text -#: user-manual.txt:2813 +#: user-manual.txt:2547 msgid "" "Dives are normally numbered incrementally from non-recent dives (low " "sequence numbers) to recent dives (higher sequence numbers). Numbering of " @@ -5949,7 +5007,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2818 +#: user-manual.txt:2552 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 " @@ -5958,13 +5016,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:2820 +#: user-manual.txt:2554 #, no-wrap msgid "Grouping dives into trips and manipulating trips" msgstr "" #. type: Plain text -#: user-manual.txt:2828 +#: user-manual.txt:2562 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 " @@ -5974,20 +5032,14 @@ msgid "" "five dive trips (*B*, on the right):" msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:2829 -#, no-wrap -msgid "Figure: Grouping dives" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:2829 +#: user-manual.txt:2563 #, no-wrap msgid "images/Group2.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2835 +#: user-manual.txt:2569 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, " @@ -5996,13 +5048,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2836 +#: user-manual.txt:2570 #, no-wrap msgid "Editing the title and associated information for a particular trip" msgstr "" #. type: Plain text -#: user-manual.txt:2849 +#: user-manual.txt:2583 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 " @@ -6016,13 +5068,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2850 +#: user-manual.txt:2584 #, no-wrap msgid "Viewing the dives during a particular trip" msgstr "" #. type: Plain text -#: user-manual.txt:2855 +#: user-manual.txt:2589 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 " @@ -6031,13 +5083,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2856 +#: user-manual.txt:2590 #, no-wrap msgid "Merging dives from more than one trip into a single trip" msgstr "" #. type: Plain text -#: user-manual.txt:2861 +#: user-manual.txt:2595 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 " @@ -6045,13 +5097,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2862 +#: user-manual.txt:2596 #, no-wrap msgid "Splitting a single trip into more than one trip" msgstr "" #. type: Plain text -#: user-manual.txt:2871 +#: user-manual.txt:2605 msgid "" "If a trip includes, for example, ten dives, you can split this trip into two " "trips (trip 1: top four dives; trip 2: bottom six dives) by selecting and " @@ -6062,32 +5114,26 @@ msgid "" "right (B):" msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:2872 -#, no-wrap -msgid "FIGURE: Split a trip into 2 trips" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:2872 +#: user-manual.txt:2606 #, no-wrap msgid "images/SplitDive3a.jpg" msgstr "" #. type: Title === -#: user-manual.txt:2874 +#: user-manual.txt:2608 #, no-wrap msgid "Manipulating single dives" msgstr "" #. type: Title ==== -#: user-manual.txt:2876 +#: user-manual.txt:2610 #, no-wrap msgid "Delete a dive from the dive log" msgstr "" #. type: Plain text -#: user-manual.txt:2883 +#: user-manual.txt:2617 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 " @@ -6097,13 +5143,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2884 +#: user-manual.txt:2618 #, no-wrap msgid "Unlink a dive from a trip" msgstr "" #. type: Plain text -#: user-manual.txt:2891 +#: user-manual.txt:2625 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 " @@ -6113,13 +5159,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2892 +#: user-manual.txt:2626 #, no-wrap msgid "Add a dive to the trip immediately above" msgstr "" #. type: Plain text -#: user-manual.txt:2897 +#: user-manual.txt:2631 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 " @@ -6127,13 +5173,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2898 +#: user-manual.txt:2632 #, no-wrap msgid "Shift the start time of dive(s)" msgstr "" #. type: Plain text -#: user-manual.txt:2908 +#: user-manual.txt:2642 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 " @@ -6145,13 +5191,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2909 +#: user-manual.txt:2643 #, no-wrap msgid "Merge dives into a single dive" msgstr "" #. type: Plain text -#: user-manual.txt:2919 +#: user-manual.txt:2653 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 " @@ -6164,26 +5210,20 @@ msgid "" "merged:" msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:2920 -#, no-wrap -msgid "Example: Merged dive" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:2920 +#: user-manual.txt:2654 #, no-wrap msgid "images/MergedDive.png" msgstr "" #. type: Title ==== -#: user-manual.txt:2922 +#: user-manual.txt:2656 #, no-wrap msgid "Split selected dives" msgstr "" #. type: Plain text -#: user-manual.txt:2930 +#: user-manual.txt:2664 msgid "" "On some occasions, a diver reaches the surface and immediately dives " "again. However, it may happen that the dive computer does not register a new " @@ -6195,32 +5235,32 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2931 +#: user-manual.txt:2665 #, no-wrap msgid "Load image(s) from file(s)" msgstr "" #. type: Plain text -#: user-manual.txt:2933 user-manual.txt:2936 +#: user-manual.txt:2667 user-manual.txt:2670 msgid "" "This topic is discussed in the section: xref:S_LoadImage[Adding photographs " -"to dives]." +"or videos to dives]." msgstr "" #. type: Title ==== -#: user-manual.txt:2934 +#: user-manual.txt:2668 #, no-wrap msgid "Load image from web" msgstr "" #. type: Title ==== -#: user-manual.txt:2937 +#: user-manual.txt:2671 #, no-wrap msgid "Undo dive manipulations" msgstr "" #. type: Plain text -#: user-manual.txt:2943 +#: user-manual.txt:2677 msgid "" "Important actions on dives or trips, described above, can be undone or " "redone. This includes: _delete dives_, _merge dives_, _split selected " @@ -6230,13 +5270,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:2946 +#: user-manual.txt:2680 #, no-wrap msgid "Filtering the dive list" msgstr "" #. type: Plain text -#: user-manual.txt:2952 +#: user-manual.txt:2686 msgid "" "The dives in the *Dive List* panel can be filtered, selecting only some of " "the dives based on their attributes, e.g. dive tags, dive site, divemaster, " @@ -6246,7 +5286,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2960 +#: user-manual.txt:2694 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 " @@ -6259,20 +5299,14 @@ msgid "" "with the white cross." msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:2961 -#, no-wrap -msgid "Figure: Filter panel" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:2961 +#: user-manual.txt:2695 #, no-wrap msgid "images/Filterpanel.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2970 +#: user-manual.txt:2704 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 " @@ -6285,7 +5319,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2978 +#: user-manual.txt:2712 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 " @@ -6297,36 +5331,36 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:2980 +#: user-manual.txt:2714 #, no-wrap msgid "Exporting the dive log or parts of the dive log" msgstr "" #. type: Plain text -#: user-manual.txt:2983 +#: user-manual.txt:2717 msgid "There are two ways to export dive information from Subsurface:" msgstr "" #. type: Plain text -#: user-manual.txt:2985 +#: user-manual.txt:2719 msgid "Export dive information to _Facebook_" msgstr "" #. type: Plain text -#: user-manual.txt:2987 +#: user-manual.txt:2721 msgid "" "xref:S_Export_other[Export dive information to other destinations or " "formats]" msgstr "" #. type: Title === -#: user-manual.txt:2989 +#: user-manual.txt:2723 #, no-wrap msgid "Exporting dive information to _Facebook_" msgstr "" #. type: Plain text -#: user-manual.txt:2998 +#: user-manual.txt:2732 msgid "" "Export of dives to _Facebook_ is handled differently from other types of " "export because a connection to _Facebook_ is required, needing a _Facebook_ " @@ -6341,27 +5375,21 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3002 +#: user-manual.txt:2736 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: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:3003 -#, no-wrap -msgid "Figure: Facebook login" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:3003 +#: user-manual.txt:2737 #, no-wrap msgid "images/facebook1.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:3016 +#: user-manual.txt:2750 msgid "" "Having established a login to _Facebook_, transferring a dive profile to a " "_Facebook_ timeline is easy. In the _Subsurface_ *Dive List* panel, " @@ -6380,40 +5408,34 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3020 +#: user-manual.txt:2754 msgid "" "Both the album created and the post to your timeline are marked as " "private. In order for friends to be able to see the post, log into " "_Facebook_ using a browser or Facebook app and change its permissions." msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:3021 -#, no-wrap -msgid "Figure: Facebook data submission" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:3021 +#: user-manual.txt:2755 #, no-wrap msgid "images/facebook2.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:3025 +#: user-manual.txt:2759 msgid "" "If required, then close the _Facebook_ connection by selecting, from the " "*Main Menu*, _Share on -> Disconnect from -> Facebook_ (image *B* above)." msgstr "" #. type: Title === -#: user-manual.txt:3027 +#: user-manual.txt:2761 #, no-wrap msgid "Export dive information to other destinations or formats" msgstr "" #. type: Plain text -#: user-manual.txt:3032 +#: user-manual.txt:2766 msgid "" "For non-_Facebook exports_, the export function can be found by selecting " "_File -> Export_, which brings up the Export dialog. This dialog always " @@ -6422,30 +5444,24 @@ msgid "" "below)." msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:3033 -#, no-wrap -msgid "Figure: Export dialog" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:3033 +#: user-manual.txt:2767 #, no-wrap msgid "images/Export_f20.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:3036 +#: user-manual.txt:2770 msgid "A dive log or part of it can be saved in several formats:" msgstr "" #. type: Plain text -#: user-manual.txt:3038 +#: user-manual.txt:2772 msgid "_Subsurface XML_ format. This is the native format used by _Subsurface_." msgstr "" #. type: Plain text -#: user-manual.txt:3042 +#: user-manual.txt:2776 msgid "" "Universal Dive Data Format (_UDDF_). Refer to _http://uddf.org_ for more " "information. UDDF is a generic format that enables communication among many " @@ -6453,7 +5469,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3046 +#: user-manual.txt:2780 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 " @@ -6462,7 +5478,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3050 +#: user-manual.txt:2784 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 " @@ -6470,7 +5486,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3055 +#: user-manual.txt:2789 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, " @@ -6479,7 +5495,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3058 +#: user-manual.txt:2792 msgid "" "_CSV dive profile_, that includes a large amount of detail for each dive, " "including the depth profile, temperature and pressure information of each " @@ -6487,7 +5503,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3071 +#: user-manual.txt:2805 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 " @@ -6504,7 +5520,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3076 +#: user-manual.txt:2810 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 " @@ -6512,20 +5528,14 @@ msgid "" "in text, as shown in the image below." msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:3077 -#, no-wrap -msgid "Figure: HTML Map export view" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:3077 +#: user-manual.txt:2811 #, no-wrap msgid "images/mapview_f20.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:3086 +#: user-manual.txt:2820 msgid "" "_TeX_ format, a file for printing using the TeX typesetting software. Choose " "a filename with a '.tex' extension. You will also need a template file, that " @@ -6536,34 +5546,40 @@ msgid "" "the command line." msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:3087 -#, no-wrap -msgid "Figure: Export to TeX" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:3087 +#: user-manual.txt:2821 #, no-wrap msgid "images/texexample.png" msgstr "" #. type: Plain text -#: user-manual.txt:3094 +#: user-manual.txt:2828 msgid "" "_Image depths_, which creates a text file that contains the file names of " -"all photos or images attached to any of the selected dives in the _Dive " -"List_, together with the depth underwater where of each of those photos was " -"taken." +"all photos or videos attached to any of the selected dives in the _Dive " +"List_, together with the depth underwater where of each of those " +"photos/videos was taken." +msgstr "" + +#. type: Plain text +#: user-manual.txt:2835 +msgid "" +"When the \"Anonymize\" option is selected for xml-based file formats, the " +"letters A-Z are all replaced by the letter 'X' in the notes, buddy, " +"divemaster, divesite name and divesite description fields. This way, you can " +"share dive log files for debugging purposes without revealing personal " +"information. Please note, though, that other characters are not replaced, so " +"this is not useful for languages with non-latin characters and GPS " +"coordinates of dive sites are preserved as well." msgstr "" #. type: Plain text -#: user-manual.txt:3096 +#: user-manual.txt:2838 msgid "_General Settings_, under the HTML tab, provides the following options:" msgstr "" #. type: Plain text -#: user-manual.txt:3104 +#: user-manual.txt:2846 #, no-wrap msgid "" "** Subsurface Numbers: if this option is checked, the dive(s) are exported " @@ -6581,27 +5597,27 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3107 +#: user-manual.txt:2849 msgid "" "Under _Style Options_ some style-related options are available like font " "size and theme." msgstr "" #. type: Plain text -#: user-manual.txt:3110 +#: user-manual.txt:2852 msgid "" "Export to other formats can be done through third party facilities, for " "instance _www.divelogs.de_." msgstr "" #. type: Title == -#: user-manual.txt:3112 +#: user-manual.txt:2854 #, no-wrap msgid "Keeping a _Subsurface_ dive log in the Cloud" msgstr "" #. type: Plain text -#: user-manual.txt:3122 +#: user-manual.txt:2864 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 " @@ -6615,7 +5631,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3128 +#: user-manual.txt:2870 msgid "" "_Subsurface_ includes access to a transparently integrated cloud storage " "back end that is available to all Subsurface users. Storing and retrieving a " @@ -6626,13 +5642,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3129 +#: user-manual.txt:2871 #, no-wrap msgid "Create a cloud storage account" msgstr "" #. type: Plain text -#: user-manual.txt:3146 +#: user-manual.txt:2888 #, no-wrap msgid "" "** Open the *Network Preferences* by selecting _File_ -> _Preferences_ -> " @@ -6660,13 +5676,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3147 +#: user-manual.txt:2889 #, no-wrap msgid "Using _Subsurface cloud storage_" msgstr "" #. type: Plain text -#: user-manual.txt:3157 +#: user-manual.txt:2899 #, no-wrap msgid "" "** Once the cloud storage has been initialized, two new items appear in " @@ -6685,7 +5701,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3162 +#: user-manual.txt:2904 #, no-wrap msgid "" "** _Subsurface_ keeps a local copy of the data and the cloud facility " @@ -6698,13 +5714,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3164 +#: user-manual.txt:2906 #, no-wrap msgid "Web access to _Subsurface cloud storage_" msgstr "" #. type: Plain text -#: user-manual.txt:3174 +#: user-manual.txt:2916 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 " @@ -6717,13 +5733,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3175 +#: user-manual.txt:2917 #, no-wrap msgid "Other cloud services" msgstr "" #. type: Plain text -#: user-manual.txt:3185 +#: user-manual.txt:2927 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 " @@ -6733,20 +5749,14 @@ msgid "" "computer." msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:3186 -#, no-wrap -msgid "FIGURE: Dropbox folder" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:3186 +#: user-manual.txt:2928 #, no-wrap msgid "images/Cloud.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:3195 +#: user-manual.txt:2937 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, " @@ -6759,13 +5769,13 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:3198 +#: user-manual.txt:2940 #, no-wrap msgid "Several _Subsurface_ users on one desktop computer" msgstr "" #. type: Plain text -#: user-manual.txt:3202 +#: user-manual.txt:2944 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 " @@ -6774,7 +5784,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3214 +#: user-manual.txt:2956 #, no-wrap msgid "" "*A)* If the different users of a desktop computer do not log onto the " @@ -6789,7 +5799,7 @@ msgid "" "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 " +" *Profile Panel* and media 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" @@ -6801,24 +5811,24 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3216 +#: user-manual.txt:2958 #, no-wrap msgid "\tsubsurface --user=John\n" msgstr "" #. type: Plain text -#: user-manual.txt:3218 +#: user-manual.txt:2960 msgid "while Joan can launch _Subsurface_ using:" msgstr "" #. type: Plain text -#: user-manual.txt:3220 +#: user-manual.txt:2962 #, no-wrap msgid "\tsubsurface --user=Joan\n" msgstr "" #. type: Plain text -#: user-manual.txt:3228 +#: user-manual.txt:2970 #, no-wrap msgid "" "In this case, each user's preferences, settings and cloud access information " @@ -6838,7 +5848,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3232 +#: user-manual.txt:2974 #, no-wrap msgid "" "*B)* On the other hand, if the users log onto the same computer using " @@ -6850,13 +5860,13 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:3234 +#: user-manual.txt:2976 #, no-wrap msgid "Printing a dive log" msgstr "" #. type: Plain text -#: user-manual.txt:3238 +#: user-manual.txt:2980 #, no-wrap msgid "" "_Subsurface_ provides a simple and flexible way to print a whole dive log or " @@ -6866,19 +5876,19 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3240 +#: user-manual.txt:2982 msgid "Some decisions need to be made before printing:" msgstr "" #. type: Plain text -#: user-manual.txt:3243 +#: user-manual.txt:2985 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:3245 +#: user-manual.txt:2987 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 " @@ -6886,49 +5896,43 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3248 +#: user-manual.txt:2990 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 " "and page layout:" msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:3249 user-manual.txt:4951 -#, no-wrap -msgid "FIGURE: Print dialogue" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:3249 user-manual.txt:4951 +#: user-manual.txt:2991 user-manual.txt:4692 #, no-wrap msgid "images/Print1_f22.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:3252 +#: user-manual.txt:2994 msgid "Under _Print type_ select one of two options:" msgstr "" #. type: Plain text -#: user-manual.txt:3254 +#: user-manual.txt:2996 msgid "" "_Dive list print_: Print dives from the *Dive List* panel with profiles and " "other information." msgstr "" #. type: Plain text -#: user-manual.txt:3255 +#: user-manual.txt:2997 msgid "_Statistics print_: Print yearly statistics of the dives." msgstr "" #. type: Plain text -#: user-manual.txt:3257 +#: user-manual.txt:2999 msgid "Under _Print options_ select:" msgstr "" #. type: Plain text -#: user-manual.txt:3262 +#: user-manual.txt:3004 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 " @@ -6936,91 +5940,73 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3264 +#: user-manual.txt:3006 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:3267 +#: user-manual.txt:3009 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:3269 +#: user-manual.txt:3011 msgid "_Table_: This prints a summary table of all dives selected (see below)." msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:3270 -#, no-wrap -msgid "FIGURE: Print summary table" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:3270 +#: user-manual.txt:3012 #, no-wrap msgid "images/Print_summarylist_f22.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:3273 +#: user-manual.txt:3015 msgid "" "_Flow layout_: Print the text associated with each dive without printing the " "dive profiles" msgstr "" #. type: Plain text -#: user-manual.txt:3274 +#: user-manual.txt:3016 msgid "of each dive (see below):" msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:3275 -#, no-wrap -msgid "FIGURE: Print flow layout" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:3275 +#: user-manual.txt:3017 #, no-wrap msgid "images/Print_flow_layout_f22.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:3278 +#: user-manual.txt:3020 msgid "" "_One Dive_: Print one dive per page, also showing the dive profile (see " "below)" msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:3279 -#, no-wrap -msgid "FIGURE: Print one dive / page" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:3279 +#: user-manual.txt:3021 #, no-wrap msgid "images/print2_f22.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:3283 +#: user-manual.txt:3025 msgid "_Two Dives_: Print two dives per page, also showing the dive profiles." msgstr "" #. type: Plain text -#: user-manual.txt:3284 +#: user-manual.txt:3026 msgid "_Six Dives_: Print six dives per page, also showing the dive profiles." msgstr "" #. type: Plain text -#: user-manual.txt:3288 +#: user-manual.txt:3030 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 " @@ -7029,7 +6015,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3292 +#: user-manual.txt:3034 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 " @@ -7037,20 +6023,14 @@ msgid "" "below):" msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:3293 -#, no-wrap -msgid "FIGURE: Print dialog" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:3293 +#: user-manual.txt:3035 #, no-wrap msgid "images/Print_print_f22.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:3298 +#: user-manual.txt:3040 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 " @@ -7058,26 +6038,20 @@ msgid "" "page." msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:3299 -#, no-wrap -msgid "FIGURE: Print preview page" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:3299 +#: user-manual.txt:3041 #, no-wrap msgid "images/Printpreview.jpg" msgstr "" #. type: Title === -#: user-manual.txt:3301 +#: user-manual.txt:3043 #, no-wrap msgid "Writing a custom print template (advanced)" msgstr "" #. type: Plain text -#: user-manual.txt:3307 +#: user-manual.txt:3049 msgid "" "Writing a custom template is an effective way to produce highly customized " "printouts. Subsurface uses HTML templates to render printing. You can create " @@ -7088,13 +6062,13 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:3309 +#: user-manual.txt:3051 #, no-wrap msgid "Configuring a dive computer" msgstr "" #. type: Plain text -#: user-manual.txt:3317 +#: user-manual.txt:3059 msgid "" "_Subsurface_ lets you configure a dive computer. Currently, the " "Heinrichs-Weikamp (OSTC 2/2N/2C, OSTC 3, Sport) and Suunto Vyper (Stinger, " @@ -7108,7 +6082,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3323 +#: user-manual.txt:3065 msgid "" "Once the dive computer is connected to the _Subsurface_ computer, select " "_File -> Configure dive computer_ from the _Main Menu_. Select the " @@ -7117,27 +6091,21 @@ msgid "" "the panel on the left-hand (see image below)." msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:3324 -#, no-wrap -msgid "FIGURE: Configure dive computer" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:3324 +#: user-manual.txt:3066 #, no-wrap msgid "images/Configure_dc_f20.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:3327 +#: user-manual.txt:3069 msgid "" "Using the appropriate buttons on the configuration panel, the following " "actions can be done:" msgstr "" #. type: Plain text -#: user-manual.txt:3330 +#: user-manual.txt:3072 #, no-wrap msgid "" "*Retrieve available details*. This loads the existing configuration from the " @@ -7146,7 +6114,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3332 +#: user-manual.txt:3074 #, no-wrap msgid "" "*Save changes to device*. This changes the configuration of the\n" @@ -7155,7 +6123,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3334 +#: user-manual.txt:3076 #, no-wrap msgid "" "*Backup*. This saves the configuration data to a file. _Subsurface_ asks " @@ -7164,7 +6132,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3336 +#: user-manual.txt:3078 #, no-wrap msgid "" "*Restore backup*. This loads the information from a backup file and displays " @@ -7173,7 +6141,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3338 +#: user-manual.txt:3080 #, no-wrap msgid "" "*Update firmware*. If new firmware is available for the dive computer, this " @@ -7182,13 +6150,13 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:3341 +#: user-manual.txt:3083 #, no-wrap msgid "Setting user _Preferences_ for _Subsurface_" msgstr "" #. type: Plain text -#: user-manual.txt:3352 +#: user-manual.txt:3094 msgid "" "There are several user-definable settings within _Subsurface_, found by " "selecting _File -> Preferences_, mostly affecting the way in which " @@ -7203,30 +6171,24 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3353 +#: user-manual.txt:3095 #, no-wrap msgid "General" msgstr "" #. type: Plain text -#: user-manual.txt:3356 +#: user-manual.txt:3098 msgid "There are several headings in the *General* panel:" msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:3357 -#, no-wrap -msgid "FIGURE: Preferences general page" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:3357 +#: user-manual.txt:3099 #, no-wrap -msgid "images/Pref1_f23.jpg" +msgid "images/Pref1.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:3361 +#: user-manual.txt:3103 #, no-wrap msgid "" " ** *Lists and tables*: Specify the font type and font size of the\n" @@ -7235,7 +6197,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3366 +#: user-manual.txt:3108 #, no-wrap msgid "" " ** *Dives*: For the _Default Dive Log File_ specify the directory and\n" @@ -7247,7 +6209,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3367 +#: user-manual.txt:3109 #, no-wrap msgid "" "_No default file_: When checked, _Subsurface_ does not automatically load a " @@ -7255,7 +6217,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3368 +#: user-manual.txt:3110 #, no-wrap msgid "" "_Local default file_: When checked, _Subsurface_ automatically loads a dive " @@ -7263,7 +6225,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3370 +#: user-manual.txt:3112 #, no-wrap msgid "" "_Cloud storage default file_: When checked, _Subsurface automatically loads " @@ -7273,7 +6235,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3372 +#: user-manual.txt:3114 #, no-wrap msgid "" "** *Display invalid*: Dives can be marked as invalid (when a user wishes to " @@ -7281,7 +6243,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3375 +#: user-manual.txt:3117 #, no-wrap msgid "" "dives that he/she doesn't consider valid dives, e.g. pool dives, but still " @@ -7292,7 +6254,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3377 +#: user-manual.txt:3119 #, no-wrap msgid "" "** *Default cylinder*: From the dropdown list, select the default cylinder " @@ -7300,13 +6262,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3378 +#: user-manual.txt:3120 #, no-wrap msgid "the *Equipment* tab of the *Notes* panel.\n" msgstr "" #. type: Plain text -#: user-manual.txt:3380 +#: user-manual.txt:3122 #, no-wrap msgid "" "** *Animations*: Some actions in showing the dive profile are performed " @@ -7314,7 +6276,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3386 +#: user-manual.txt:3128 #, no-wrap msgid "" "animations. For instance, the axis values for depth and time change from " @@ -7330,7 +6292,28 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3388 +#: user-manual.txt:3130 +#, no-wrap +msgid "" +"** *Video thumbnails*: In generating thumbnails for videos associated with " +"dives, _Subsurface_\n" +msgstr "" + +#. type: Plain text +#: user-manual.txt:3134 +#, no-wrap +msgid "" +"needs to have the appropriate information (see section on <<S_ViewMedia,View " +"Images>>). Three preferences need to be set\n" +"as explained in <<S_APPENDIX_F, APPENDIX F>>. These are: a) switch on " +"thumbnails, b) specify\n" +"the location of the _ffmpeg_ program and c) set the place within video where " +"the thumbnail needs\n" +"to be obtained from.\n" +msgstr "" + +#. type: Plain text +#: user-manual.txt:3136 #, no-wrap msgid "" "** *Clear all settings*: As indicated in the button below this heading, all " @@ -7338,31 +6321,25 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3389 +#: user-manual.txt:3137 #, no-wrap msgid "cleared and set to default values.\n" msgstr "" #. type: Title === -#: user-manual.txt:3390 +#: user-manual.txt:3138 #, no-wrap msgid "Units" msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:3391 -#, no-wrap -msgid "FIGURE: Preferences Units page" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:3391 +#: user-manual.txt:3139 #, no-wrap msgid "images/Pref2_f23.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:3398 +#: user-manual.txt:3146 msgid "" "Choose between metric and imperial units of depth, pressure, volume, " "temperature and mass. By selecting the Metric or Imperial radio button at " @@ -7373,7 +6350,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3404 +#: user-manual.txt:3152 msgid "" "Regardless of the above settings, dive time measurements can be either in " "seconds or minutes. Choose the appropriate option. GPS coordinates can be " @@ -7382,64 +6359,52 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3405 +#: user-manual.txt:3153 #, no-wrap msgid "Profile" msgstr "" #. type: Plain text -#: user-manual.txt:3407 +#: user-manual.txt:3155 msgid "This panel has three sections:" msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:3409 -#, no-wrap -msgid "FIGURE: Preferences Graph page" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:3409 +#: user-manual.txt:3157 #, no-wrap msgid "images/Pref4_f23.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:3414 +#: user-manual.txt:3170 #, no-wrap msgid "" "*Gas pressure display setup*. Even though nitrogen and helium pressures are " "also included here, these items mainly pertain to oxygen management:\n" "** _Thresholds_: _Subsurface_ can display graphs of the nitrogen, oxygen and " "the helium\n" -msgstr "" - -#. type: Plain text -#: user-manual.txt:3422 -#, no-wrap -msgid "" -"partial pressures during\n" -"the dive, activated using the toolbar on the left of the *Dive Profile*\n" -"panel. For each of these graphs, specify a threshold value. If any of the " +" partial pressures during\n" +" the dive, activated using the toolbar on the left of the *Dive Profile*\n" +" panel. For each of these graphs, specify a threshold value. If any of the " "graphs go\n" -"above the specified threshold, the graph is\n" -"highlighted in red, indicating the particular partial pressure threshold has " -"been exceeded.\n" -"The pO~2~ threshold is probably the most important one and a value of 1.6 is " -"commonly used.\n" +" above the specified threshold, the graph is\n" +" highlighted in red, indicating the particular partial pressure threshold " +"has been exceeded.\n" +" The pO~2~ threshold is probably the most important one and a value of 1.6 " +"is commonly used.\n" "** _pO~2~ in calculating MOD_ is used for calculating the maximum operative " "depth for a particular\n" " nitrox or trimix gas mixture. A value of 1.4 is commonly used.\n" msgstr "" #. type: Plain text -#: user-manual.txt:3424 +#: user-manual.txt:3172 #, no-wrap msgid "** CCR Options: These options determine oxygen management for CCR dives:\n" msgstr "" #. type: Plain text -#: user-manual.txt:3429 +#: user-manual.txt:3177 #, no-wrap msgid "" "*** _Dive planner default setpoint_: Specify the O~2~ setpoint for a\n" @@ -7450,7 +6415,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3433 +#: user-manual.txt:3181 #, no-wrap msgid "" "*** _CCR: Show O~2~ sensor values when viewing pO~2~:_ Show the pO~2~\n" @@ -7460,7 +6425,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3437 +#: user-manual.txt:3185 #, no-wrap msgid "" "*** _CCR: Show setpoints when viewing pO~2~:_ With this checkbox activated, " @@ -7472,7 +6437,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3440 +#: user-manual.txt:3188 #, no-wrap msgid "" "** _pSCR options_. These preferences determine how passive semi-closed " @@ -7481,7 +6446,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3444 +#: user-manual.txt:3192 #, no-wrap msgid "" "*** _Metabolic rate:_ this is the\n" @@ -7491,7 +6456,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3447 +#: user-manual.txt:3195 #, no-wrap msgid "" "*** _pSCR ratio:_ The dilution ratio (or dump ratio) is the ratio of gas " @@ -7501,7 +6466,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3451 +#: user-manual.txt:3199 #, no-wrap msgid "" "*** _Show equivalent OC with pSCR pO~2~_: The pO~2~ in the pSCR loop is " @@ -7513,7 +6478,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3453 +#: user-manual.txt:3201 #, no-wrap msgid "" "*Ceiling display setup*. These settings mostly deal with nitrogen and helium " @@ -7521,7 +6486,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3454 +#: user-manual.txt:3202 #, no-wrap msgid "" "by determining how the decompression ceiling (ascent ceiling) is calculated " @@ -7529,7 +6494,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3461 +#: user-manual.txt:3209 #, no-wrap msgid "" "** _Draw dive computer reported ceiling red_: This checkbox does exactly " @@ -7544,7 +6509,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3466 +#: user-manual.txt:3214 #, no-wrap msgid "" "** _Algorithm for calculating ceiling_. Choose between the Bühlmann " @@ -7556,7 +6521,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3479 +#: user-manual.txt:3227 #, no-wrap msgid "" "*** Bühlmann: Set the _gradient factors_ (GFLow and GFHigh) for calculcating " @@ -7579,13 +6544,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3486 +#: user-manual.txt:3234 #, no-wrap msgid "*Misc*\n" msgstr "" #. type: Plain text -#: user-manual.txt:3493 +#: user-manual.txt:3241 #, no-wrap msgid "" "** _Show unused cylinders in Equipment Tab_: This checkbox allows display of " @@ -7603,30 +6568,24 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3495 +#: user-manual.txt:3243 #, no-wrap msgid "Language" msgstr "" #. type: Plain text -#: user-manual.txt:3497 +#: user-manual.txt:3245 msgid "Choose a language that _Subsurface_ will use." msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:3498 -#, no-wrap -msgid "FIGURE: Preferences Language page" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:3498 +#: user-manual.txt:3246 #, no-wrap msgid "images/Pref3_f23.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:3507 +#: user-manual.txt:3255 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 " @@ -7638,47 +6597,40 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3509 +#: user-manual.txt:3257 msgid "" "In this section also specify appropriate date and time formats for showing " "dive details." msgstr "" #. type: Title === -#: user-manual.txt:3510 +#: user-manual.txt:3258 #, no-wrap msgid "Network" msgstr "" #. type: Plain text -#: user-manual.txt:3515 +#: user-manual.txt:3262 msgid "" "This panel facilitates communication between _Subsurface_ and data sources " "on the Internet. This is important, for instance, when _Subsurface_ needs " -"to communicate with web services such as Cloud storage, the " -"<<S_Companion,_Subsurface Companion app_>> or when you want to communicate " -"through a proxy." -msgstr "" - -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:3517 -#, no-wrap -msgid "FIGURE: Preferences Network page" +"to communicate with web services such as Cloud storage, or when you want to " +"communicate through a proxy." msgstr "" #. type: Target for macro image -#: user-manual.txt:3517 +#: user-manual.txt:3264 #, no-wrap msgid "images/Pref5_f23.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:3520 +#: user-manual.txt:3267 msgid "This dialogue has three sections:" msgstr "" #. type: Plain text -#: user-manual.txt:3528 +#: user-manual.txt:3275 #, no-wrap msgid "" "** _Proxy_:\n" @@ -7695,7 +6647,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3533 +#: user-manual.txt:3280 #, no-wrap msgid "" "** _Subsurface cloud storage_: To store your dive log in the cloud, a valid " @@ -7708,7 +6660,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3534 +#: user-manual.txt:3281 #, no-wrap msgid "" "_Sync to cloud in the background_: This option allows saving of dive " @@ -7716,13 +6668,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3535 +#: user-manual.txt:3282 #, no-wrap msgid "while you do other things within _Subsurface_.\n" msgstr "" #. type: Plain text -#: user-manual.txt:3536 +#: user-manual.txt:3283 #, no-wrap msgid "" "_Save password locally_: This allows local storage of the cloud storage " @@ -7730,62 +6682,44 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3537 +#: user-manual.txt:3284 #, no-wrap msgid "information is saved in raw text form, not encoded in any way.\n" msgstr "" -#. type: Plain text -#: user-manual.txt:3541 -#, no-wrap -msgid "" -"** _Subsurface web service_: When you subscribe to the " -"<<S_Companion,Subsurface web service>>, a very\n" -" long and hard-to-remember userID is issued. This is the place to save " -"that userID. By\n" -" checking the option _Save User ID locally?_, you ensure a local copy of " -"that userID is saved.\n" -msgstr "" - #. type: Title === -#: user-manual.txt:3542 +#: user-manual.txt:3286 #, no-wrap msgid "Georeference" msgstr "" #. type: Plain text -#: user-manual.txt:3550 +#: user-manual.txt:3294 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 " "right of the _Subsurface_ window, or from a GPS instrument or from the " -"_Subsurface_ Companion app). A search on the Internet is done to find the " -"name of the closest known location. This function only works if _Subsurface_ " -"has an Internet connection. The preference of the dive site name can be " +"_Subsurface-Mobile_ app). A search on the Internet is done to find the name " +"of the closest known location. This function only works if _Subsurface_ has " +"an Internet connection. The preference of the dive site name can be " "configured, e.g. _Country/State/City_ or _City/State/Country_ (see image " "below)." msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:3551 -#, no-wrap -msgid "FIGURE: Georeference panel" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:3551 +#: user-manual.txt:3295 #, no-wrap msgid "images/Pref7_f23.jpg" msgstr "" #. type: Title == -#: user-manual.txt:3554 +#: user-manual.txt:3298 #, no-wrap msgid "The _Subsurface_ dive planner" msgstr "" #. type: Plain text -#: user-manual.txt:3559 +#: user-manual.txt:3303 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 " @@ -7794,7 +6728,7 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:3567 +#: user-manual.txt:3311 msgid "" "The _Subsurface_ dive planner IS EXPERIMENTAL and assumes the user is " "already familiar with the _Subsurface_ user interface. It is explicitly used " @@ -7802,19 +6736,19 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:3570 +#: user-manual.txt:3314 msgid "" "The user is conversant with dive planning and has the necessary training to " "perform dive planning." msgstr "" #. type: delimited block * -#: user-manual.txt:3571 +#: user-manual.txt:3315 msgid "The user plans dives within his/her certification limits." msgstr "" #. type: delimited block * -#: user-manual.txt:3574 +#: user-manual.txt:3318 msgid "" "Dive planning makes large assumptions about the characteristics of the " "_average person_ and cannot compensate for individual physiology or health " @@ -7822,32 +6756,32 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:3575 +#: user-manual.txt:3319 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:3576 +#: user-manual.txt:3320 msgid "The user is familiar with the user interface of _Subsurface_." msgstr "" #. type: delimited block * -#: user-manual.txt:3578 +#: user-manual.txt:3322 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:3580 +#: user-manual.txt:3324 #, no-wrap msgid "The _Subsurface_ dive planner screen" msgstr "" #. type: Plain text -#: user-manual.txt:3585 +#: user-manual.txt:3329 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 " @@ -7856,7 +6790,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3589 +#: user-manual.txt:3333 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 " @@ -7865,7 +6799,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3593 +#: user-manual.txt:3337 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 " @@ -7873,33 +6807,27 @@ msgid "" "messages about the dive plan are printed." msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:3594 -#, no-wrap -msgid "FIGURE: Dive planner startup window" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:3594 +#: user-manual.txt:3338 #, no-wrap msgid "images/PlannerWindow1.jpg" msgstr "" #. type: Title === -#: user-manual.txt:3597 +#: user-manual.txt:3341 #, no-wrap msgid "Open circuit dives" msgstr "" #. type: Plain text -#: user-manual.txt:3600 +#: user-manual.txt:3344 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:3603 +#: user-manual.txt:3347 #, no-wrap msgid "" "** Open Circuit (the default)\n" @@ -7908,12 +6836,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3605 +#: user-manual.txt:3349 msgid "Choose the Open Circuit option." msgstr "" #. type: Plain text -#: user-manual.txt:3609 +#: user-manual.txt:3353 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 " @@ -7923,7 +6851,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3618 +#: user-manual.txt:3362 msgid "" "In the table labelled _Available Gases_, add the information of the " "cylinders to be used as well as the gas composition within that " @@ -7938,12 +6866,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3620 +#: user-manual.txt:3364 msgid "The _Available Gases_ table includes three gas depth fields, labelled:" msgstr "" #. type: Plain text -#: user-manual.txt:3621 +#: user-manual.txt:3365 #, no-wrap msgid "" "** Deco switch at: the switch depth for deco gases. Unless overridden by the " @@ -7951,7 +6879,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3622 +#: user-manual.txt:3366 #, no-wrap msgid "" "automatically calculated based on the Deco pO~2~ preference (default 1.6 " @@ -7959,7 +6887,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3623 +#: user-manual.txt:3367 #, no-wrap msgid "" "** Bot. MOD: the gas Maximum Operating Depth (MOD) if it is used as a bottom " @@ -7967,7 +6895,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3625 +#: user-manual.txt:3369 #, no-wrap msgid "" "calculated based on the Bottom pO~2~ preference (default 1.4 bar). Editing " @@ -7977,7 +6905,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3626 +#: user-manual.txt:3370 #, no-wrap msgid "" "** MND: the gas Maximum Narcotic Depth (MND). Automatically calculated based " @@ -7985,7 +6913,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3628 +#: user-manual.txt:3372 #, no-wrap msgid "" "preference (default 30m / 98 ft). Editing this field will modify the He% " @@ -7994,12 +6922,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3630 +#: user-manual.txt:3374 msgid "The profile of the planned dive can be created in two ways:" msgstr "" #. type: Plain text -#: user-manual.txt:3635 +#: user-manual.txt:3379 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 " @@ -8009,7 +6937,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3643 +#: user-manual.txt:3387 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 " @@ -8023,13 +6951,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:3644 +#: user-manual.txt:3388 #, no-wrap msgid "Recreational dives" msgstr "" #. type: Plain text -#: user-manual.txt:3653 +#: user-manual.txt:3397 msgid "" "Recreational mode is intended for what most divers would call " "\"recreational\", \"sports\"or \"nontechnical\" dives, remaining within " @@ -8044,7 +6972,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3663 +#: user-manual.txt:3407 msgid "" "Firstly, using recreational dive tables, the maximum depth of each previous " "dive is taken into account. But few dives are done at a constant depth " @@ -8060,7 +6988,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3669 +#: user-manual.txt:3413 msgid "" "Secondly, recreational dive tables are not designed to build additional " "safety features into a dive. NDL times derived from dive tables often take " @@ -8072,26 +7000,26 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3671 +#: user-manual.txt:3415 msgid "To plan a dive, the appropriate settings need to be defined." msgstr "" #. type: Plain text -#: user-manual.txt:3674 +#: user-manual.txt:3418 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:3677 +#: user-manual.txt:3421 msgid "" "Immediately under the heading _Planning_ are two checkboxes _Recreational_ " "and _Safety Stop_. Check these two boxes." msgstr "" #. type: Plain text -#: user-manual.txt:3681 +#: user-manual.txt:3425 msgid "" "Then define the cylinder size, the gas mixture (air or % oxygen) and the " "working cylinder pressure in the top left-hand section of the planner under " @@ -8099,7 +7027,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3686 +#: user-manual.txt:3430 msgid "" "The planner calculates whether the specified cylinder contains enough " "air/gas to complete the planned dive. In order for this to be accurate, " @@ -8109,7 +7037,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3693 +#: user-manual.txt:3437 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 " @@ -8123,7 +7051,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3701 +#: user-manual.txt:3445 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 " @@ -8136,14 +7064,14 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3704 +#: user-manual.txt:3448 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:3715 +#: user-manual.txt:3459 msgid "" "To build additional safety into the dive plan (over and above those of " "recreational dive tables), specify gradient factors less than 100% (_GFHigh_ " @@ -8161,7 +7089,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3718 +#: user-manual.txt:3462 msgid "" "Below is an image of a dive plan for a recreational dive at 30 meters with " "gradient factors of 100. Because the no-deco limit (NDL) is 22 minutes, " @@ -8169,20 +7097,14 @@ msgid "" "dive." msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:3719 -#, no-wrap -msgid "FIGURE: A recreational dive plan: setup" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:3719 +#: user-manual.txt:3463 #, no-wrap msgid "images/Planner_OC_rec1.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:3728 +#: user-manual.txt:3472 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 " @@ -8198,39 +7120,33 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3731 +#: user-manual.txt:3475 msgid "" "Below is the same dive plan as above, but with a safety stop and reduced " "gradient factors for a larger safety margin." msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:3732 -#, no-wrap -msgid "FIGURE: A recreational dive plan: gradient factors setup" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:3732 +#: user-manual.txt:3476 #, no-wrap msgid "images/Planner_OC_rec2.jpg" msgstr "" #. type: Title ==== -#: user-manual.txt:3734 +#: user-manual.txt:3478 #, no-wrap msgid "Non-recreational open circuit dives, including decompression" msgstr "" #. type: Plain text -#: user-manual.txt:3738 +#: user-manual.txt:3482 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:3749 +#: user-manual.txt:3493 #, no-wrap msgid "" "*a) Nitrogen management*: This is done by specifying the rates for descent " @@ -8254,7 +7170,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3751 +#: user-manual.txt:3495 #, no-wrap msgid "" " ** For more information about Gradient factors, see the section on " @@ -8262,7 +7178,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3757 +#: user-manual.txt:3501 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 " @@ -8275,7 +7191,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3768 +#: user-manual.txt:3512 msgid "" "Please note as well that there is an intrinsic assumption of the VPM-B model " "that off-gassing only happens during the ascent phase of the dive (which is " @@ -8290,26 +7206,26 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3770 +#: user-manual.txt:3514 msgid "For more information external to this manual see:" msgstr "" #. type: Plain text -#: user-manual.txt:3772 +#: user-manual.txt:3516 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:3773 +#: user-manual.txt:3517 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:3775 +#: user-manual.txt:3519 msgid "" "link:https://www.amazon.com/Deco-Divers-Decompression-Theory-Physiology/dp/1905492073/ref=sr_1_1?s=books&ie=UTF8&qid=1403932320&sr=1-1&keywords=deco+for+divers[_Deco " "for Divers_, by Mark Powell (2008). Aquapress] Southend-on-Sea, UK. ISBN 10: " @@ -8318,7 +7234,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3783 +#: user-manual.txt:3527 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 " @@ -8331,7 +7247,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3792 +#: user-manual.txt:3536 #, no-wrap msgid "" "*b) Oxygen management*: In the *Gas Options* part of the dive specification, " @@ -8350,7 +7266,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3814 +#: user-manual.txt:3558 #, no-wrap msgid "" "*c) Gas management*: With open-circuit dives this is a primary\n" @@ -8390,7 +7306,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3826 +#: user-manual.txt:3570 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 " @@ -8408,7 +7324,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3837 +#: user-manual.txt:3581 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 " @@ -8425,7 +7341,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3843 +#: user-manual.txt:3587 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 " @@ -8435,7 +7351,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3857 +#: user-manual.txt:3601 msgid "" "Cylinders used for the plan need to be entered in the table of _Available " "gases_. In the column _Type_ select the appropriate cylinder size by using " @@ -8455,7 +7371,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3867 +#: user-manual.txt:3611 msgid "" "Enter dive profile segments in the _Dive planner points_ table by providing " "a time duration for a segment as well as its final depth. If more than one " @@ -8472,40 +7388,28 @@ msgid "" "B below)." msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:3868 -#, no-wrap -msgid "FIGURE: Planning a dive: segments" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:3868 +#: user-manual.txt:3612 #, no-wrap msgid "images/planner1.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:3872 +#: user-manual.txt:3616 msgid "" "Below is an example of a dive plan to 55m using Tx20/30 and the Bühlmann " "algorithm, followed by an ascent using EAN50 and using the settings as " "described above." msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:3873 -#, no-wrap -msgid "FIGURE: Planning a dive: setup" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:3873 +#: user-manual.txt:3617 #, no-wrap msgid "images/Planner_OC_deco.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:3878 +#: user-manual.txt:3622 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 " @@ -8513,13 +7417,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3880 +#: user-manual.txt:3624 #, no-wrap msgid "*The dive plan details*\n" msgstr "" #. type: Plain text -#: user-manual.txt:3888 +#: user-manual.txt:3632 msgid "" "On the bottom right panel of the dive planner, under _Dive Plan Details_, " "the details of the dive plan are provided. These may be modified by checking " @@ -8532,7 +7436,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3893 +#: user-manual.txt:3637 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 " @@ -8542,7 +7446,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3913 +#: user-manual.txt:3657 #, no-wrap msgid "" "*Dive plan variations*: The planner has a check box _Display plan " @@ -8575,16 +7479,15 @@ msgid "" "duration of the decompression phase and do not include the extended bottom " "time!\n" "This way of altering dive plans becomes inaccurate for large deviations from " -"the original \n" -"plan. So it should not be trusted for more than a few minutes or meters of " -"\n" +"the original\n" +"plan. So it should not be trusted for more than a few minutes or meters of\n" "deviations from the planned bottom time. Checking this option creates a lot " "of additional computation,\n" -"to such a degree that the planner is slower than otherwise. \n" +"to such a degree that the planner is slower than otherwise.\n" msgstr "" #. type: Plain text -#: user-manual.txt:3923 +#: user-manual.txt:3667 #, no-wrap msgid "" "*Minimum gas requirements*: The planner also estimates the _minimum gas_ " @@ -8605,7 +7508,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3927 +#: user-manual.txt:3671 msgid "" "_SAC factor_. This is an estimate of the degree to which your SAC increases " "if a critical problem arises underwater, e.g. gas sharing or " @@ -8614,7 +7517,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3929 +#: user-manual.txt:3673 msgid "" "_Problem solving time_. This is an estimate of how long you would take to " "solve the problem before starting the ascent to terminate the dive. The " @@ -8622,7 +7525,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3933 +#: user-manual.txt:3677 msgid "" "Using the above information, the planner then estimates what the minimum " "bottom gas cylinder pressure needs to be for a safe ascent. This information " @@ -8632,37 +7535,37 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3935 +#: user-manual.txt:3679 #, no-wrap msgid " Minimum gas (based on 2.0xSAC/+1min@81m): 2130 l/90bar/Δ:+80bar\n" msgstr "" #. type: Plain text -#: user-manual.txt:3937 +#: user-manual.txt:3681 msgid "This indicates:" msgstr "" #. type: Plain text -#: user-manual.txt:3939 +#: user-manual.txt:3683 msgid "Within parentheses, the _SAC factor_ and _Problem solving time_ specified." msgstr "" #. type: Plain text -#: user-manual.txt:3940 +#: user-manual.txt:3684 msgid "" "The number of liters of back gas required for a safe ascent (2130 litres in " "the example above)" msgstr "" #. type: Plain text -#: user-manual.txt:3941 +#: user-manual.txt:3685 msgid "" "The number of bars of back gas required for a safe ascent (90 bars in the " "example above)." msgstr "" #. type: Plain text -#: user-manual.txt:3944 +#: user-manual.txt:3688 msgid "" "The delta-value: number of bars of back gas available at the end of the " "bottom section of the dive, _over and above_ the minimum gas requirement (80 " @@ -8671,7 +7574,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3948 +#: user-manual.txt:3692 msgid "" "No automatic checks are performed based on this result. The feature only " "gives valid results for simple, rectangular shaped single level dive " @@ -8680,7 +7583,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3962 +#: user-manual.txt:3706 #, no-wrap msgid "" "*Isobaric counterdiffusion information*: For gas switches during the ascent " @@ -8711,7 +7614,7 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:3971 +#: user-manual.txt:3715 msgid "" "The *plan variations* and *minimum gas* estimates are only guidelines for a " "diver performing dive planning, intended to enhance the safety of executing " @@ -8722,13 +7625,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3973 +#: user-manual.txt:3717 #, no-wrap msgid "Planning pSCR dives" msgstr "" #. type: Plain text -#: user-manual.txt:3993 +#: user-manual.txt:3737 #, no-wrap msgid "" "To plan a dive using a passive semi-closed rebreather (pSCR), select _pSCR_ " @@ -8764,32 +7667,26 @@ msgid "" "equipment.\n" msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:3994 user-manual.txt:4024 -#, no-wrap -msgid "FIGURE: Planning a pSCR dive: setup" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:3994 +#: user-manual.txt:3738 #, no-wrap msgid "images/Planner_pSCR.jpg" msgstr "" #. type: Title ==== -#: user-manual.txt:3996 +#: user-manual.txt:3740 #, no-wrap msgid "Planning for pSCR bailout" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:3998 +#: user-manual.txt:3742 #, no-wrap msgid "images/pscr_b1.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4023 +#: user-manual.txt:3767 msgid "" "Open circuit diving is often part of a pSCR dive because, at shallow depths, " "the pO~2~ in the loop is often too low for breathing and the shallow parts " @@ -8822,13 +7719,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:4024 +#: user-manual.txt:3768 #, no-wrap msgid "images/pscr_b2.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4030 +#: user-manual.txt:3774 msgid "" "In the case of a pSCR dive plan for open water, the worst-case scenario is " "probably bailout at the end of the deepest part of the dive. Create a " @@ -8840,20 +7737,20 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4031 +#: user-manual.txt:3775 #, no-wrap msgid "Planning CCR dives" msgstr "" #. type: Plain text -#: user-manual.txt:4035 +#: user-manual.txt:3779 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:4039 +#: user-manual.txt:3783 #, no-wrap msgid "" "*Available gases*: In the _Available gases_ table, enter the cylinder " @@ -8864,7 +7761,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4049 +#: user-manual.txt:3793 #, no-wrap msgid "" "*Entering setpoints*: Specify a default setpoint in the Preferences tab, by " @@ -8886,43 +7783,37 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4051 +#: user-manual.txt:3795 msgid "The dive profile for a CCR dive may look something like the image below." msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:4052 -#, no-wrap -msgid "FIGURE: Planning a CCR dive: setup" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:4052 +#: user-manual.txt:3796 #, no-wrap msgid "images/Planner_CCR.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4056 +#: user-manual.txt:3800 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:4057 +#: user-manual.txt:3801 #, no-wrap msgid "Planning for CCR bailout" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4059 +#: user-manual.txt:3803 #, no-wrap msgid "images/CCR_b1.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4064 +#: user-manual.txt:3808 msgid "" "It is often necessary to plan for a worst-case bailout event in order to " "ensure sufficient bailout gas to reach the surface, taking into account " @@ -8932,13 +7823,13 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4066 +#: user-manual.txt:3810 #, no-wrap msgid "images/CCR_b2.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4073 +#: user-manual.txt:3817 msgid "" "In the dive planner points table, change the _Dive mode_ of this 1-minute " "segment to _OC_. This signifies bailout. In this case there is bailout to " @@ -8949,13 +7840,13 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4075 +#: user-manual.txt:3819 #, no-wrap msgid "images/CCR_b3.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4080 +#: user-manual.txt:3824 msgid "" "In order to plan for bailout to an external bailout cylinder, change the " "_Used gas_ for the 1-minute segment to the appropriate cylinder, as in the " @@ -8964,20 +7855,20 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4082 +#: user-manual.txt:3826 msgid "" "The volumes of gases required for bailout can be found at the bottom of the " "*Dive plan details* panel." msgstr "" #. type: Title === -#: user-manual.txt:4084 +#: user-manual.txt:3828 #, no-wrap msgid "Modifying an existing dive plan" msgstr "" #. type: Plain text -#: user-manual.txt:4091 +#: user-manual.txt:3835 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 " @@ -8988,7 +7879,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4097 +#: user-manual.txt:3841 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 " @@ -8999,13 +7890,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4098 +#: user-manual.txt:3842 #, no-wrap msgid "Planning for repetitive dives" msgstr "" #. type: Plain text -#: user-manual.txt:4105 +#: user-manual.txt:3849 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 " @@ -9014,7 +7905,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4111 +#: user-manual.txt:3855 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 " @@ -9024,7 +7915,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4116 +#: user-manual.txt:3860 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 " @@ -9034,13 +7925,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4117 +#: user-manual.txt:3861 #, no-wrap msgid "Printing the dive plan" msgstr "" #. type: Plain text -#: user-manual.txt:4122 +#: user-manual.txt:3866 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 " @@ -9048,7 +7939,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4128 +#: user-manual.txt:3872 msgid "" "However, after the plan has been saved, it is represented in a way very " "similar to a dive log and the gas calculations cannot be accessed in the " @@ -9058,13 +7949,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4130 +#: user-manual.txt:3874 #, no-wrap msgid "Saving a dive with its dive plan" msgstr "" #. type: Plain text -#: user-manual.txt:4137 +#: user-manual.txt:3881 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 " @@ -9075,24 +7966,24 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4139 +#: user-manual.txt:3883 msgid "Do the dive planning and save the final plan in the _Dive List_." msgstr "" #. type: Plain text -#: user-manual.txt:4140 +#: user-manual.txt:3884 msgid "After diving, upload the dive data from the dive computer." msgstr "" #. type: Plain text -#: user-manual.txt:4142 +#: user-manual.txt:3886 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:4145 +#: user-manual.txt:3889 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 " @@ -9100,7 +7991,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4149 +#: user-manual.txt:3893 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 " @@ -9109,13 +8000,13 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:4150 +#: user-manual.txt:3894 #, no-wrap msgid "Running _Subsurface_ from the command-line" msgstr "" #. type: Plain text -#: user-manual.txt:4154 +#: user-manual.txt:3898 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 " @@ -9123,18 +8014,18 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4156 +#: user-manual.txt:3900 #, no-wrap msgid "\tsubsurface [options] [logfile ...] [--import logfile ...]\n" msgstr "" #. type: Plain text -#: user-manual.txt:4158 +#: user-manual.txt:3902 msgid "The options include:" msgstr "" #. type: delimited block | -#: user-manual.txt:4170 +#: user-manual.txt:3914 #, no-wrap msgid "" "|*Command-line option*|*Description*\n" @@ -9155,13 +8046,13 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:4172 +#: user-manual.txt:3916 #, no-wrap msgid "Description of the Subsurface Main Menu items" msgstr "" #. type: Plain text -#: user-manual.txt:4177 +#: user-manual.txt:3921 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 " @@ -9169,261 +8060,247 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4178 +#: user-manual.txt:3922 #, no-wrap msgid "File" msgstr "" #. type: Plain text -#: user-manual.txt:4181 +#: user-manual.txt:3925 msgid "" "<<S_NewLogbook,_New Logbook_>> - Close the currently open dive logbook and " "clear all dive information." msgstr "" #. type: Plain text -#: user-manual.txt:4183 +#: user-manual.txt:3927 msgid "_Open logbook_ - Open the file manager to select a dive logbook to open." msgstr "" #. type: Plain text -#: user-manual.txt:4184 +#: user-manual.txt:3928 msgid "_Save_ - Save the dive logbook currently open." msgstr "" #. type: Plain text -#: user-manual.txt:4185 +#: user-manual.txt:3929 msgid "_Save as_ - Save the current logbook under a different file name." msgstr "" #. type: Plain text -#: user-manual.txt:4186 +#: user-manual.txt:3930 msgid "" "_Open cloud storage_ - Open the dive log previously saved in " "<<S_Cloud_storage,_Cloud storage_>>." msgstr "" #. type: Plain text -#: user-manual.txt:4187 +#: user-manual.txt:3931 msgid "" "_Save to cloud storage_ - Save the current dive log to " "<<S_Cloud_storage,_Cloud storage_>>." msgstr "" #. type: Plain text -#: user-manual.txt:4188 +#: user-manual.txt:3932 msgid "" -"_Take cloud storage online_ - " -"******************************************************" +"_Cloud storage online_ - Switch between the online version of the logbook, " +"and the locally stored one." msgstr "" #. type: Plain text -#: user-manual.txt:4189 +#: user-manual.txt:3933 msgid "_Close_ - Close the dive logbook currently open." msgstr "" #. type: Plain text -#: user-manual.txt:4191 +#: user-manual.txt:3935 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:4192 +#: user-manual.txt:3936 msgid "<<S_PrintDivelog,_Print_>> - Print the currently open logbook." msgstr "" #. type: Plain text -#: user-manual.txt:4193 +#: user-manual.txt:3937 msgid "<<S_Preferences,_Preferences_>> - Set the _Subsurface_ preferences." msgstr "" #. type: Plain text -#: user-manual.txt:4194 +#: user-manual.txt:3938 msgid "" -"<<S_FindMovedImages, _Find moved images_>> - If photos taken during dives " -"have been moved to" +"<<S_FindMovedImages, _Find moved media_>> - If photos/videos taken during " +"dives have been moved to" msgstr "" #. type: Plain text -#: user-manual.txt:4195 +#: user-manual.txt:3939 msgid "" "a different disk or directory, locate them and link them to the appropriate " "dives." msgstr "" #. type: Plain text -#: user-manual.txt:4196 +#: user-manual.txt:3940 msgid "" "<<S_Configure,_Configure dive computer_>> - Edit the configuration of a dive " "computer." msgstr "" #. type: Plain text -#: user-manual.txt:4197 +#: user-manual.txt:3941 msgid "_Quit_ - Quit _Subsurface_." msgstr "" #. type: Title === -#: user-manual.txt:4199 +#: user-manual.txt:3943 #, no-wrap msgid "Edit" msgstr "" #. type: Plain text -#: user-manual.txt:4201 +#: user-manual.txt:3945 msgid "The Edit option allows one to undo or redo an action, e.g. deleting dives." msgstr "" #. type: Title === -#: user-manual.txt:4202 +#: user-manual.txt:3946 #, no-wrap msgid "Import" msgstr "" #. type: Plain text -#: user-manual.txt:4205 +#: user-manual.txt:3949 msgid "" "<<S_ImportDiveComputer,_Import from dive computer_>> - Import dive " "information from a dive computer." msgstr "" #. type: Plain text -#: user-manual.txt:4207 +#: user-manual.txt:3951 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:4209 -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:4211 +#: user-manual.txt:3953 msgid "" "<<S_ImportingDivelogsDe,_Import from Divelogs.de_>> - Import dive " "information from _www.Divelogs.de_." msgstr "" #. type: Title === -#: user-manual.txt:4212 +#: user-manual.txt:3954 #, no-wrap msgid "Log" msgstr "" #. type: Plain text -#: user-manual.txt:4214 +#: user-manual.txt:3956 msgid "" "<<S_EnterData,_Add Dive_>> - Manually add a new dive to the *Dive List* " "panel." msgstr "" #. type: Plain text -#: user-manual.txt:4215 -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:4216 +#: user-manual.txt:3957 msgid "<<S_DivePlanner,_Plan Dive_>> - Plan dives." msgstr "" #. type: Plain text -#: user-manual.txt:4217 +#: user-manual.txt:3958 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:4219 +#: user-manual.txt:3960 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:4221 +#: user-manual.txt:3962 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:4223 +#: user-manual.txt:3964 msgid "" "<<S_Renumber,_Renumber_>> - Renumber the dives listed in the *Dive List* " "panel." msgstr "" #. type: Plain text -#: user-manual.txt:4225 +#: user-manual.txt:3966 msgid "" "<<S_Group,_Auto Group_>> - Group the dives in the *Dive List* panel into " "dive trips." msgstr "" #. type: Plain text -#: user-manual.txt:4226 +#: user-manual.txt:3967 msgid "" "<<S_DeviceNames,_Edit Device Names_>> - Edit the names of dive computers to " "coordinate your logs." msgstr "" #. type: Plain text -#: user-manual.txt:4227 +#: user-manual.txt:3968 msgid "" "<<S_Filter,_Filter divelist_>> - Select only some dives, based on specific " "tags or dive criteria." msgstr "" #. type: Title === -#: user-manual.txt:4228 +#: user-manual.txt:3969 #, no-wrap msgid "View" msgstr "" #. type: Plain text -#: user-manual.txt:4231 +#: user-manual.txt:3972 msgid "<<S_ViewPanels,_All_>> - View the four main _Subsurface_ panels all at once." msgstr "" #. type: Plain text -#: user-manual.txt:4232 +#: user-manual.txt:3973 msgid "<<S_ViewPanels,_Dive List_>> - View only the *Dive List* panel." msgstr "" #. type: Plain text -#: user-manual.txt:4233 +#: user-manual.txt:3974 msgid "<<S_ViewPanels,_Profile_>> - View only the *Dive Profile* panel." msgstr "" #. type: Plain text -#: user-manual.txt:4234 +#: user-manual.txt:3975 msgid "<<S_ViewPanels,_Info_>> - View only the *Notes* panel." msgstr "" #. type: Plain text -#: user-manual.txt:4235 +#: user-manual.txt:3976 msgid "<<S_ViewPanels,_Globe_>> - View only the *World Map* panel." msgstr "" #. type: Plain text -#: user-manual.txt:4237 +#: user-manual.txt:3978 msgid "" "_Yearly Statistics_ - Display summary statistics about dives during this and " "past years." msgstr "" #. type: Plain text -#: user-manual.txt:4240 +#: user-manual.txt:3981 msgid "" "_Prev DC_ - Switch to data from previous dive computer, if a single dive was " "logged from more than one. See the sections on " @@ -9432,50 +8309,50 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4241 +#: user-manual.txt:3982 msgid "_Next DC_ - Switch to next dive computer." msgstr "" #. type: Plain text -#: user-manual.txt:4242 +#: user-manual.txt:3983 msgid "_Full Screen_ - Toggles Full Screen mode." msgstr "" #. type: Title === -#: user-manual.txt:4243 +#: user-manual.txt:3984 #, no-wrap msgid "Share on" msgstr "" #. type: Plain text -#: user-manual.txt:4245 +#: user-manual.txt:3986 msgid "" "<<S_Facebook,_Facebook_>> - Share the currently selected dive on your " "Facebook timeline." msgstr "" #. type: Title === -#: user-manual.txt:4246 +#: user-manual.txt:3987 #, no-wrap msgid "Help" msgstr "" #. type: Plain text -#: user-manual.txt:4249 +#: user-manual.txt:3990 msgid "" "_About Subsurface_ - Show a panel with the version number of _Subsurface_ as " "well as licensing information." msgstr "" #. type: Plain text -#: user-manual.txt:4251 +#: user-manual.txt:3992 msgid "" "_Check for updates_ - Find out whether a newer version of Subsurface is " "available on the https://subsurface-divelog.org/[_Subsurface_ web site]." msgstr "" #. type: Plain text -#: user-manual.txt:4253 +#: user-manual.txt:3994 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 " @@ -9483,12 +8360,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4254 +#: user-manual.txt:3995 msgid "_User manual_ - Open a window showing this user manual." msgstr "" #. type: Title == -#: user-manual.txt:4257 +#: user-manual.txt:3998 #, no-wrap msgid "" "APPENDIX A: Operating system specific information for importing dive " @@ -9496,19 +8373,19 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4259 +#: user-manual.txt:4000 #, 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:4260 +#: user-manual.txt:4001 #, no-wrap msgid "images/icons/drivers.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4265 +#: user-manual.txt:4006 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 " @@ -9516,7 +8393,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4271 +#: user-manual.txt:4012 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 " @@ -9525,7 +8402,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4275 +#: user-manual.txt:4016 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 " @@ -9533,7 +8410,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4282 +#: user-manual.txt:4023 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 " @@ -9544,19 +8421,19 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4284 +#: user-manual.txt:4025 #, 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:4285 +#: user-manual.txt:4026 #, no-wrap msgid "images/icons/usb.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4293 +#: user-manual.txt:4034 msgid "" "When connecting a dive computer by using a USB connector, usually " "_Subsurface_ will either propose a drop down list with the correct device " @@ -9566,61 +8443,61 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4298 +#: user-manual.txt:4039 msgid "" "Simply try COM1, COM2, etc. The drop down list should contain all connected " "COM devices." msgstr "" #. type: Title ==== -#: user-manual.txt:4299 user-manual.txt:4397 +#: user-manual.txt:4040 user-manual.txt:4138 #, no-wrap msgid "On MacOS:" msgstr "" #. type: Plain text -#: user-manual.txt:4302 +#: user-manual.txt:4043 msgid "The drop down box should find all connected dive computers." msgstr "" #. type: Block title -#: user-manual.txt:4303 +#: user-manual.txt:4044 #, no-wrap msgid "On Linux:" msgstr "" #. type: Plain text -#: user-manual.txt:4306 +#: user-manual.txt:4047 msgid "There is a definitive way to find the port:" msgstr "" #. type: Plain text -#: user-manual.txt:4308 +#: user-manual.txt:4049 msgid "Disconnect the USB cable from the dive computer" msgstr "" #. type: Plain text -#: user-manual.txt:4309 +#: user-manual.txt:4050 msgid "Open a terminal" msgstr "" #. type: Plain text -#: user-manual.txt:4310 user-manual.txt:4312 +#: user-manual.txt:4051 user-manual.txt:4053 msgid "Type the command: 'dmesg' and press enter" msgstr "" #. type: Plain text -#: user-manual.txt:4311 +#: user-manual.txt:4052 msgid "Plug in the USB cable of the dive computer" msgstr "" #. type: Plain text -#: user-manual.txt:4314 +#: user-manual.txt:4055 msgid "A message similar to this one should appear:" msgstr "" #. type: Plain text -#: user-manual.txt:4330 +#: user-manual.txt:4071 #, no-wrap msgid "" "\tusb 2-1.1: new full speed USB device number 14 using ehci_hcd\n" @@ -9641,7 +8518,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4335 +#: user-manual.txt:4076 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 " @@ -9649,12 +8526,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4337 +#: user-manual.txt:4078 msgid "Ensuring the user has write permission to the USB serial port:" msgstr "" #. type: Plain text -#: user-manual.txt:4347 +#: user-manual.txt:4088 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 " @@ -9666,14 +8543,14 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4351 +#: user-manual.txt:4092 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:4356 +#: user-manual.txt:4097 #, no-wrap msgid "" "Type: +id johnB+ This lists all the groups that johnB belongs to and\n" @@ -9685,7 +8562,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4358 +#: user-manual.txt:4099 #, no-wrap msgid "" "Under some circumstances this change takes only effect (eg. on Ubuntu) " @@ -9694,7 +8571,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4363 +#: user-manual.txt:4104 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 " @@ -9702,13 +8579,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4366 +#: user-manual.txt:4107 #, no-wrap msgid "Manually setting up Bluetooth enabled devices" msgstr "" #. type: Plain text -#: user-manual.txt:4373 +#: user-manual.txt:4114 msgid "" "For dive computers communicating through Bluetooth like the Heinrichs " "Weikamp Frog or the Shearwater Predator, Petrel and Nerd there is a " @@ -9717,7 +8594,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4375 +#: user-manual.txt:4116 #, no-wrap msgid "" "*For the dive computer, after enabling Bluetooth, be sure it is in Upload " @@ -9725,7 +8602,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4379 +#: user-manual.txt:4120 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 -> " @@ -9733,13 +8610,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4381 +#: user-manual.txt:4122 #, no-wrap msgid "*Pair the _Subsurface_ computer with the dive computer.*\n" msgstr "" #. type: Plain text -#: user-manual.txt:4390 +#: user-manual.txt:4131 msgid "" "Bluetooth is most likely already enabled. For pairing with the dive computer " "choose _Control Panel -> Bluetooth Devices -> Add Wireless Device_. This " @@ -9751,21 +8628,21 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4393 +#: user-manual.txt:4134 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:4396 +#: user-manual.txt:4137 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:4403 +#: user-manual.txt:4144 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 " @@ -9774,20 +8651,20 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4406 +#: user-manual.txt:4147 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:4407 +#: user-manual.txt:4148 #, no-wrap msgid "On Linux" msgstr "" #. type: Plain text -#: user-manual.txt:4415 +#: user-manual.txt:4156 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 " @@ -9799,7 +8676,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4419 +#: user-manual.txt:4160 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 " @@ -9808,23 +8685,23 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4421 +#: user-manual.txt:4162 msgid "Enable the Bluetooth controller and pair your dive computer" msgstr "" #. type: Plain text -#: user-manual.txt:4422 +#: user-manual.txt:4163 msgid "Establish an RFCOMM connection" msgstr "" #. type: Title ===== -#: user-manual.txt:4423 user-manual.txt:4563 +#: user-manual.txt:4164 user-manual.txt:4304 #, no-wrap msgid "Download the dives with Subsurface" msgstr "" #. type: Plain text -#: user-manual.txt:4429 +#: user-manual.txt:4170 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 " @@ -9835,7 +8712,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4434 +#: user-manual.txt:4175 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 " @@ -9845,23 +8722,23 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4436 +#: user-manual.txt:4177 msgid "+sudo usermod -a -G dialout username+" msgstr "" #. type: Plain text -#: user-manual.txt:4438 +#: user-manual.txt:4179 msgid "Then log out and log in for the change to take effect." msgstr "" #. type: Title ===== -#: user-manual.txt:4439 +#: user-manual.txt:4180 #, no-wrap msgid "Enabling the Bluetooth controller and pairing your dive computer" msgstr "" #. type: Plain text -#: user-manual.txt:4445 +#: user-manual.txt:4186 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 " @@ -9872,7 +8749,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4448 +#: user-manual.txt:4189 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 " @@ -9880,7 +8757,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4455 +#: user-manual.txt:4196 #, no-wrap msgid "" "\t$ hciconfig\n" @@ -9892,7 +8769,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4460 +#: user-manual.txt:4201 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 " @@ -9902,7 +8779,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4468 +#: user-manual.txt:4209 #, no-wrap msgid "" "\tsudo hciconfig hci0 up auth+ (enter password when prompted)\n" @@ -9915,25 +8792,25 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4470 +#: user-manual.txt:4211 msgid "Check that the status now includes '+UP+', '+RUNNING+' AND '+AUTH+'." msgstr "" #. type: Plain text -#: user-manual.txt:4472 +#: user-manual.txt:4213 msgid "" "If there are multiple controllers running, it's easiest to turn off the " "unused controller(s). For example, for +hci1+:" msgstr "" #. type: Plain text -#: user-manual.txt:4474 +#: user-manual.txt:4215 #, no-wrap msgid "\tsudo hciconfig hci1 down\n" msgstr "" #. type: Plain text -#: user-manual.txt:4477 +#: user-manual.txt:4218 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 " @@ -9941,7 +8818,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4498 +#: user-manual.txt:4239 #, no-wrap msgid "" "\tbluetoothctl\n" @@ -9970,14 +8847,14 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4501 +#: user-manual.txt:4242 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:4504 +#: user-manual.txt:4245 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 " @@ -9985,7 +8862,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4509 +#: user-manual.txt:4250 #, no-wrap msgid "" "\thcitool -i hci0 scanning\n" @@ -9995,82 +8872,82 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4511 +#: user-manual.txt:4252 msgid "Once the dive computer is paired, set up the RFCOMM connection." msgstr "" #. type: Title ===== -#: user-manual.txt:4512 +#: user-manual.txt:4253 #, no-wrap msgid "Establishing the RFCOMM connection" msgstr "" #. type: Plain text -#: user-manual.txt:4515 +#: user-manual.txt:4256 msgid "The command to establish an RFCOMM connection is:" msgstr "" #. type: Plain text -#: user-manual.txt:4517 +#: user-manual.txt:4258 msgid "+sudo rfcomm -i <controller> connect <dev> <bdaddr> [channel]+" msgstr "" #. type: Plain text -#: user-manual.txt:4519 +#: user-manual.txt:4260 msgid "+<controller>+ is the Bluetooth controller, +hci0+." msgstr "" #. type: Plain text -#: user-manual.txt:4520 +#: user-manual.txt:4261 msgid "+<dev>+ is the RFCOMM device file, +rfcomm0+" msgstr "" #. type: Plain text -#: user-manual.txt:4521 +#: user-manual.txt:4262 msgid "+<bdaddr>+ is the dive computer's MAC address, +00:11:22:33:44:55+" msgstr "" #. type: Plain text -#: user-manual.txt:4522 +#: user-manual.txt:4263 msgid "+[channel]+ is the dive computer's Bluetooth channel we need to connect to." msgstr "" #. type: Plain text -#: user-manual.txt:4525 +#: user-manual.txt:4266 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:4527 +#: user-manual.txt:4268 msgid "_Shearwater Petrel 1_: channel 1" msgstr "" #. type: Plain text -#: user-manual.txt:4528 +#: user-manual.txt:4269 msgid "_Shearwater Petrel 2_: channel 5" msgstr "" #. type: Plain text -#: user-manual.txt:4529 +#: user-manual.txt:4270 msgid "_Shearwater Nerd_: channel 5" msgstr "" #. type: Plain text -#: user-manual.txt:4530 +#: user-manual.txt:4271 msgid "_Heinrichs-Weikamp OSTC Sport_: channel 1" msgstr "" #. type: Plain text -#: user-manual.txt:4532 +#: user-manual.txt:4273 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:4534 +#: user-manual.txt:4275 #, no-wrap msgid "" "\tsudo rfcomm -i hci0 connect rfcomm0 00:11:22:33:44:55 5 (enter a password, " @@ -10078,12 +8955,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4536 +#: user-manual.txt:4277 msgid "This gives the response:" msgstr "" #. type: Plain text -#: user-manual.txt:4539 +#: user-manual.txt:4280 #, no-wrap msgid "" "\tConnected /dev/rfcomm0 to 00:11:22:33:44:55 on channel 5\n" @@ -10091,14 +8968,14 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4541 +#: user-manual.txt:4282 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:4545 +#: user-manual.txt:4286 #, no-wrap msgid "" "\tsudo rfcomm -i hci0 connect rfcomm0 00:11:22:33:44:55 (enter a password, " @@ -10108,7 +8985,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4549 +#: user-manual.txt:4290 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 " @@ -10117,7 +8994,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4559 +#: user-manual.txt:4300 #, no-wrap msgid "" "\tsdptool -i hci0 records 00:11:22:33:44:55\n" @@ -10132,7 +9009,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4562 +#: user-manual.txt:4303 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 " @@ -10140,7 +9017,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4565 +#: user-manual.txt:4306 msgid "" "After establishing the RFCOMM connection and while the dive computer's " "upload mode countdown is still running, go to_Subsurface_, select " @@ -10150,25 +9027,25 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:4571 +#: user-manual.txt:4312 #, no-wrap msgid "APPENDIX B: Dive Computer specific information for importing dive data." msgstr "" #. type: Title === -#: user-manual.txt:4574 +#: user-manual.txt:4315 #, no-wrap msgid "Importing from Uemis Zurich" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4576 +#: user-manual.txt:4317 #, no-wrap msgid "images/icons/iumis.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4592 +#: user-manual.txt:4333 msgid "" "_Subsurface_ downloads the information stored on the SDA (the built-in file " "system of the Uemis) including information about dive spots and " @@ -10185,7 +9062,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4607 +#: user-manual.txt:4348 msgid "" "After selecting the above device name, download the dives from the Uemis " "Zurich. One technical issue with the Uemis Zurich download implementation " @@ -10202,19 +9079,19 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4609 +#: user-manual.txt:4350 #, no-wrap msgid "Importing from Uwatec Galileo" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4611 +#: user-manual.txt:4352 #, no-wrap msgid "images/icons/Galileo.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4626 +#: user-manual.txt:4367 msgid "" "The Uwatec Galileo dive computers use infra red (IrDA) communication between " "the dive computer and Subsurface. The Uwatec hardware uses a USB dongle " @@ -10230,14 +9107,14 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4629 +#: user-manual.txt:4370 msgid "" "After executing this command, Subsurface will recognize the Galileo dive " "computer and download dive information." msgstr "" #. type: Plain text -#: user-manual.txt:4635 +#: user-manual.txt:4376 msgid "" "Under Windows, a similar situation exists. Drivers for the MCS7780 are " "available from some Internet web sites e.g. " @@ -10248,26 +9125,26 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4638 +#: user-manual.txt:4379 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:4640 +#: user-manual.txt:4381 #, no-wrap msgid "Importing from Heinrichs Weikamp DR5" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4642 +#: user-manual.txt:4383 #, no-wrap msgid "images/icons/HW_DR5.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4652 +#: user-manual.txt:4393 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. " @@ -10280,19 +9157,19 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4655 +#: user-manual.txt:4396 #, no-wrap msgid "Importing from xDEEP BLACK" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4657 +#: user-manual.txt:4398 #, no-wrap msgid "images/icons/HW_xdeepblack.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4666 +#: user-manual.txt:4407 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 " @@ -10306,19 +9183,19 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4668 +#: user-manual.txt:4409 #, no-wrap msgid "Importing from Shearwater Predator/Petrel/Nerd using Bluetooth" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4670 +#: user-manual.txt:4411 #, no-wrap msgid "images/icons/predator.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4673 +#: user-manual.txt:4414 msgid "" "Specific instructions for downloading dives using Bluetooth are given in the " "section above, <<S_Bluetooth,_Connecting Subsurface to a Bluetooth-enabled " @@ -10326,19 +9203,19 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4675 +#: user-manual.txt:4416 #, no-wrap msgid "Importing from Poseidon MkVI Discovery" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4677 +#: user-manual.txt:4418 #, no-wrap msgid "images/MkVI.jpeg" msgstr "" #. type: Plain text -#: user-manual.txt:4685 +#: user-manual.txt:4426 msgid "" "Download of dive logs from the MkVI is performed using a custom " "communications adapter and the _Poseidon PC Configuration Software_, " @@ -10350,45 +9227,45 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4688 +#: user-manual.txt:4429 msgid "" "Setup configuration for the dive and key dive parameters (file with a .txt " "extension)" msgstr "" #. type: Plain text -#: user-manual.txt:4689 +#: user-manual.txt:4430 msgid "Dive log details (file with a .csv extension)" msgstr "" #. type: Plain text -#: user-manual.txt:4691 +#: user-manual.txt:4432 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:4693 +#: user-manual.txt:4434 msgid "" "_Subsurface_ accesses the .txt and the .csv files to get dive log " "information." msgstr "" #. type: Title === -#: user-manual.txt:4695 +#: user-manual.txt:4436 #, no-wrap msgid "Importing from APD Inspiration/Evolution CCR" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4697 +#: user-manual.txt:4438 #, no-wrap msgid "images/APDComputer.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4705 +#: user-manual.txt:4446 msgid "" "The dive logs of an APD Inspiration or similar CCR dive computer are " "downloaded using a communications adapter and _AP Communicator_, obtained " @@ -10400,75 +9277,71 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4707 +#: user-manual.txt:4448 msgid "Download the dive using _AP Communicator_." msgstr "" #. type: Plain text -#: user-manual.txt:4708 +#: user-manual.txt:4449 msgid "Open a dive within the _AP Log Viewer_." msgstr "" #. type: Plain text -#: user-manual.txt:4709 +#: user-manual.txt:4450 msgid "Select the tab at the top of the screen, entitled \"_Data_\"." msgstr "" #. type: Plain text -#: user-manual.txt:4710 +#: user-manual.txt:4451 msgid "" "With the raw dive log data show on the screen, click on \"_Copy to " "Clipboard_\"." msgstr "" #. type: Plain text -#: user-manual.txt:4711 +#: user-manual.txt:4452 msgid "Open a text editor, e.g. Notepad (Windows) or TextWrangler (Mac)." msgstr "" #. type: Plain text -#: user-manual.txt:4713 +#: user-manual.txt:4454 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:4714 +#: user-manual.txt:4455 msgid "" "Within _Subsurface_, select _Import -> Import log files_ to open the " "xref:Unified_import[universal import dialogue]." msgstr "" #. type: Plain text -#: user-manual.txt:4715 +#: user-manual.txt:4456 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:4719 -msgid "" -"On the list of file names select the _.apd_ file created. An import dialogue " -"opens showing the default settings for the data in the _.apd_ file. If " -"changes are required, do this as for xref:S_ImportingCSVDives[CSV imports]." -msgstr "" - -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:4720 +#: user-manual.txt:4460 #, no-wrap -msgid "Figure: APD log viewer import" +msgid "" +"On the list of file names select the _.apd_ file created. An import\n" +"dialogue opens showing the default settings for the data in the\n" +"_.apd_ file. If changes are required,\n" +" do this as for xref:S_ImportingCSVDives[CSV imports].\n" msgstr "" #. type: Target for macro image -#: user-manual.txt:4720 +#: user-manual.txt:4461 #, no-wrap msgid "images/APD_CSVimportF22.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4728 +#: user-manual.txt:4469 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 " @@ -10480,12 +9353,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4729 +#: user-manual.txt:4470 msgid "Click the _Ok_ button at the bottom of the import panel." msgstr "" #. type: Plain text -#: user-manual.txt:4734 +#: user-manual.txt:4475 msgid "" "The APD dive log will appear within _Subsurface_. The dive computer- " "generated ceiling provided by the Inspiration can be viewed by selecting the " @@ -10495,13 +9368,13 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:4735 +#: user-manual.txt:4476 #, no-wrap msgid "APPENDIX C: Exporting Dive log information from external dive log software." msgstr "" #. type: Plain text -#: user-manual.txt:4744 +#: user-manual.txt:4485 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, " @@ -10511,22 +9384,22 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4746 +#: user-manual.txt:4487 msgid "Export the foreign dive log data to format that is accessible from" msgstr "" #. type: Plain text -#: user-manual.txt:4747 +#: user-manual.txt:4488 msgid "_Subsurface_." msgstr "" #. type: Plain text -#: user-manual.txt:4748 +#: user-manual.txt:4489 msgid "Import the accessible dive log data into _Subsurface_." msgstr "" #. type: Plain text -#: user-manual.txt:4752 +#: user-manual.txt:4493 msgid "" "This appendix provides some information about approaches to export dive log " "data from foreign dive log software. The procedures below mostly apply to " @@ -10534,19 +9407,19 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4754 +#: user-manual.txt:4495 #, no-wrap msgid "Exporting from *Suunto Divemanager (DM3, DM4 or DM5)*" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4755 +#: user-manual.txt:4496 #, no-wrap msgid "images/icons/suuntologo.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4762 +#: user-manual.txt:4503 msgid "" "DiveManager is a Windows application for Suunto dive computers. Divemanager " "3 (DM3) is an older version of the Suunto software. More recent Suunto dive " @@ -10556,64 +9429,64 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4764 +#: user-manual.txt:4505 #, no-wrap msgid "*Divemanager 3 (DM3):*\n" msgstr "" #. type: Plain text -#: user-manual.txt:4766 +#: user-manual.txt:4507 msgid "Start 'Suunto Divemanager 3' and log in with the name containing the logs" msgstr "" #. type: Plain text -#: user-manual.txt:4767 +#: user-manual.txt:4508 msgid "Do not start the import wizard to import dives from the dive computer." msgstr "" #. type: Plain text -#: user-manual.txt:4769 +#: user-manual.txt:4510 msgid "" "In the navigation tree on the left side of the program-window, select the " "appropriate dives." msgstr "" #. type: Plain text -#: user-manual.txt:4770 +#: user-manual.txt:4511 msgid "Within the list of dives, select the dives you would like to import later:" msgstr "" #. type: Plain text -#: user-manual.txt:4771 +#: user-manual.txt:4512 msgid "To select certain dives: hold 'ctrl' and click the dive" msgstr "" #. type: Plain text -#: user-manual.txt:4773 +#: user-manual.txt:4514 msgid "" "To select all dives: Select the first dive, hold down shift and select the " "last dive" msgstr "" #. type: Plain text -#: user-manual.txt:4774 +#: user-manual.txt:4515 msgid "With the dives marked, use the program menu _File -> Export_" msgstr "" #. type: Plain text -#: user-manual.txt:4775 +#: user-manual.txt:4516 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:4776 +#: user-manual.txt:4517 msgid "Click the browse button next to the field Export Path" msgstr "" #. type: Plain text -#: user-manual.txt:4778 +#: user-manual.txt:4519 #, no-wrap msgid "" "** A file-manager like window pops up\n" @@ -10621,13 +9494,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4779 +#: user-manual.txt:4520 #, no-wrap msgid "Divelog.SDE file\n" msgstr "" #. type: Plain text -#: user-manual.txt:4781 +#: user-manual.txt:4522 #, no-wrap msgid "" "** Optionally change the name of the file for saving\n" @@ -10635,25 +9508,25 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4782 +#: user-manual.txt:4523 #, no-wrap msgid "Back in the Export pop-up, press the button 'Export'\n" msgstr "" #. type: Plain text -#: user-manual.txt:4783 +#: user-manual.txt:4524 #, no-wrap msgid "The dives are now exported to the file Divelog.SDE.\n" msgstr "" #. type: Plain text -#: user-manual.txt:4785 +#: user-manual.txt:4526 #, no-wrap msgid "*Divemanager 4 (DM4) and Divemanager 5 (DM5):*\n" msgstr "" #. type: Plain text -#: user-manual.txt:4790 +#: user-manual.txt:4531 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 " @@ -10662,81 +9535,81 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4792 +#: user-manual.txt:4533 msgid "Locating the Suunto DM4 (or DM5) database:" msgstr "" #. type: Plain text -#: user-manual.txt:4794 user-manual.txt:4803 +#: user-manual.txt:4535 user-manual.txt:4544 msgid "Start Suunto DM4/DM5" msgstr "" #. type: Plain text -#: user-manual.txt:4795 +#: user-manual.txt:4536 msgid "Select 'Help -> About'" msgstr "" #. type: Plain text -#: user-manual.txt:4796 +#: user-manual.txt:4537 msgid "Click 'Copy' after text 'Copy log folder path to clipboard'" msgstr "" #. type: Plain text -#: user-manual.txt:4797 +#: user-manual.txt:4538 msgid "Open Windows Explorer" msgstr "" #. type: Plain text -#: user-manual.txt:4798 +#: user-manual.txt:4539 msgid "Paste the address to the path box at the top of the File Explorer" msgstr "" #. type: Plain text -#: user-manual.txt:4799 +#: user-manual.txt:4540 msgid "The database is called DM4.db or DM5.db" msgstr "" #. type: Plain text -#: user-manual.txt:4801 +#: user-manual.txt:4542 msgid "Making a backup copy of the Suunto DM4/DM5 database:" msgstr "" #. type: Plain text -#: user-manual.txt:4804 +#: user-manual.txt:4545 msgid "Select 'File - Create backup'" msgstr "" #. type: Plain text -#: user-manual.txt:4806 +#: user-manual.txt:4547 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:4807 +#: user-manual.txt:4548 msgid "Click 'Save'" msgstr "" #. type: Plain text -#: user-manual.txt:4808 +#: user-manual.txt:4549 msgid "The dives are now exported to the file DM4.bak (or DM5.bak)" msgstr "" #. type: Title === -#: user-manual.txt:4810 +#: user-manual.txt:4551 #, no-wrap msgid "Exporting from Atomic Logbook" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4813 +#: user-manual.txt:4554 #, no-wrap msgid "images/icons/atomiclogo.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4820 +#: user-manual.txt:4561 msgid "" "Atomic Logbook is Windows software by Atomic Aquatics. It allows downloading " "of dive information from Cobalt and Cobalt 2 dive computers. The divelog is " @@ -10746,19 +9619,19 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4822 +#: user-manual.txt:4563 #, no-wrap msgid "Exporting from Mares Dive Organiser V2.1" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4825 +#: user-manual.txt:4566 #, no-wrap msgid "images/icons/mareslogo.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4833 +#: user-manual.txt:4574 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 " @@ -10769,7 +9642,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4838 +#: user-manual.txt:4579 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 " @@ -10777,36 +9650,36 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4841 +#: user-manual.txt:4582 msgid "" "Rename the file to DiveOrganizerxxxxx.zip. Inside the zipped directory is a " "file _DiveOrganizer.sdf_." msgstr "" #. type: Plain text -#: user-manual.txt:4842 +#: user-manual.txt:4583 msgid "Extract the _.sdf_ file from the zipped folder to your Desktop." msgstr "" #. type: Plain text -#: user-manual.txt:4843 +#: user-manual.txt:4584 msgid "The password for accessing the .zip file is _mares_." msgstr "" #. type: Title === -#: user-manual.txt:4845 +#: user-manual.txt:4586 #, no-wrap msgid "Exporting from *DivingLog 5.0 and 6.0*" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4847 +#: user-manual.txt:4588 #, no-wrap msgid "images/icons/divingloglogo.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4854 +#: user-manual.txt:4595 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 " @@ -10816,37 +9689,37 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4856 +#: user-manual.txt:4597 msgid "To transfer all files from DivingLog to Subsurface:" msgstr "" #. type: Plain text -#: user-manual.txt:4858 +#: user-manual.txt:4599 msgid "In DivingLog open the 'File -> Export -> SQLite' menu" msgstr "" #. type: Plain text -#: user-manual.txt:4859 +#: user-manual.txt:4600 msgid "Select 'Settings' button" msgstr "" #. type: Plain text -#: user-manual.txt:4860 +#: user-manual.txt:4601 msgid "Set the 'RTF2Plaintext' to 'true'" msgstr "" #. type: Plain text -#: user-manual.txt:4861 +#: user-manual.txt:4602 msgid "Close the Settings dialog" msgstr "" #. type: Plain text -#: user-manual.txt:4862 +#: user-manual.txt:4603 msgid "Click 'Export' button and select the filename" msgstr "" #. type: Plain text -#: user-manual.txt:4866 +#: user-manual.txt:4607 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 " @@ -10854,13 +9727,13 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:4867 +#: user-manual.txt:4608 #, no-wrap msgid "APPENDIX D: Exporting a spreadsheet to CSV format" msgstr "" #. type: Plain text -#: user-manual.txt:4877 +#: user-manual.txt:4618 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 " @@ -10872,7 +9745,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4883 +#: user-manual.txt:4624 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 " @@ -10882,40 +9755,40 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4885 +#: user-manual.txt:4626 msgid "Date: use one of the following formats: yyyy-mm-dd, dd.mm.yyyy, mm/dd/yyyy" msgstr "" #. type: Plain text -#: user-manual.txt:4886 +#: user-manual.txt:4627 msgid "Duration: the format should be minutes:seconds." msgstr "" #. type: Plain text -#: user-manual.txt:4887 +#: user-manual.txt:4628 msgid "" "Unit system: only one unit system should be used (no mix of imperial and " "metric units)" msgstr "" #. type: Plain text -#: user-manual.txt:4888 +#: user-manual.txt:4629 msgid "Tags and buddies: values should be separated using a comma." msgstr "" #. type: Plain text -#: user-manual.txt:4889 +#: user-manual.txt:4630 msgid "GPS position: use decimal degrees, e.g. 30.22496 30.821798" msgstr "" #. type: Title === -#: user-manual.txt:4890 +#: user-manual.txt:4631 #, no-wrap msgid "_LibreOffice Calc_ and _OpenOffice Calc_" msgstr "" #. type: Plain text -#: user-manual.txt:4894 +#: user-manual.txt:4635 msgid "" "These are open source spreadsheet applications forming parts of larger open " "source office suite applications. The user interaction with _LibreOffice_ " @@ -10925,60 +9798,42 @@ msgid "" "this:" msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:4895 -#, no-wrap -msgid "FIGURE: Spreadsheet data" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:4895 +#: user-manual.txt:4636 #, no-wrap msgid "images/LOffice_spreadsheetdata.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4898 +#: user-manual.txt:4639 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 " "file type and select the option _Edit filter settings_." msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:4899 -#, no-wrap -msgid "FIGURE: Save as options" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:4899 +#: user-manual.txt:4640 #, no-wrap msgid "images/LOffice_save_as_options.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4902 +#: user-manual.txt:4643 msgid "" "After selecting _Save_, select the appropriate field delimiter (choose _Tab_ " "to prevent conflicts with the comma when using this as a decimal point), " "then select _OK_." msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:4903 -#, no-wrap -msgid "FIGURE: Field options" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:4903 +#: user-manual.txt:4644 #, no-wrap msgid "images/LOffice_field_options.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4906 +#: user-manual.txt:4647 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 " @@ -10986,13 +9841,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4907 +#: user-manual.txt:4648 #, no-wrap msgid "Microsoft _Excel_" msgstr "" #. type: Plain text -#: user-manual.txt:4913 +#: user-manual.txt:4654 msgid "" "The field delimiter (called \"_list separator_\" in Microsoft manuals) is " "not accessible from within _Excel_ and needs to be set through the " @@ -11003,79 +9858,67 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4915 +#: user-manual.txt:4656 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:4916 +#: user-manual.txt:4657 msgid "Open the _Regional and Language Options_ dialog box." msgstr "" #. type: Plain text -#: user-manual.txt:4918 +#: user-manual.txt:4659 msgid "" "Do the following: ** In Windows 7, click the _Formats_ tab, and then click " "_Customize this format_." msgstr "" #. type: Plain text -#: user-manual.txt:4919 +#: user-manual.txt:4660 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:4920 +#: user-manual.txt:4661 msgid "Click _OK_ twice." msgstr "" #. type: Plain text -#: user-manual.txt:4922 +#: user-manual.txt:4663 msgid "Below is an image of the _Control Panel_:" msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:4923 -#, no-wrap -msgid "FIGURE: Win List separator" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:4923 +#: user-manual.txt:4664 #, no-wrap msgid "images/Win_SaveCSV2.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4926 +#: user-manual.txt:4667 msgid "To export the dive log in CSV format:" msgstr "" #. type: Plain text -#: user-manual.txt:4928 +#: user-manual.txt:4669 msgid "" "With the dive log opened in _Excel_, select the round Windows button at the " "top left, then _Save As_." msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:4929 -#, no-wrap -msgid "FIGURE: Excel save as option" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:4929 +#: user-manual.txt:4670 #, no-wrap msgid "images/Win_SaveCSV1.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4935 +#: user-manual.txt:4676 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 " @@ -11084,20 +9927,14 @@ msgid "" "appropriate folder has been selected to save the CSV file into." msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:4936 -#, no-wrap -msgid "FIGURE: Excel save CSV dialogue" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:4936 +#: user-manual.txt:4677 #, no-wrap msgid "images/Win_SaveCSV3.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4942 +#: user-manual.txt:4683 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 " @@ -11106,13 +9943,13 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:4943 +#: user-manual.txt:4684 #, no-wrap msgid "APPENDIX E: Writing a custom print template" msgstr "" #. type: Plain text -#: user-manual.txt:4948 +#: user-manual.txt:4689 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 " @@ -11121,12 +9958,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4950 +#: user-manual.txt:4691 msgid "Templates are accessed using the print dialogue (see image *B* below)." msgstr "" #. type: Plain text -#: user-manual.txt:4958 +#: user-manual.txt:4699 msgid "" "The buttons under the _Template_ dropdown box lets you _Edit_, _Delete_, " "_Import_ and _Export_ templates (see image *A* above). New or modified " @@ -11138,24 +9975,18 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4960 +#: user-manual.txt:4701 msgid "The Edit Panel has three tabs:" msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:4961 -#, no-wrap -msgid "FIGURE: template edit dialogue" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:4961 +#: user-manual.txt:4702 #, no-wrap msgid "images/Template1_f22.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4965 +#: user-manual.txt:4706 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 " @@ -11163,7 +9994,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4969 +#: user-manual.txt:4710 msgid "" "The _Colors_ tab (image *B* above) allows editing the colors used for " "printing the dive log. The colors are highly customizable: the _Edit_ " @@ -11172,7 +10003,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4978 +#: user-manual.txt:4719 msgid "" "The _Template_ tab of the Edit Panel (see image below) allows creating a " "template using HTML as well as a few Grantlee programming " @@ -11187,20 +10018,14 @@ msgid "" "should be rendered." msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:4979 -#, no-wrap -msgid "FIGURE:Template tab" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:4979 +#: user-manual.txt:4720 #, no-wrap msgid "images/Template2_f22.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4984 +#: user-manual.txt:4725 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 " @@ -11209,33 +10034,33 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4986 +#: user-manual.txt:4727 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:4987 +#: user-manual.txt:4728 #, no-wrap msgid "Main dive loop" msgstr "" #. type: Plain text -#: user-manual.txt:4989 +#: user-manual.txt:4730 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:4989 user-manual.txt:5060 user-manual.txt:5077 +#: user-manual.txt:4730 user-manual.txt:4801 user-manual.txt:4818 #, no-wrap msgid "template.html" msgstr "" #. type: delimited block . -#: user-manual.txt:4994 +#: user-manual.txt:4735 #, no-wrap msgid "" "\t{% for dive in dives %}\n" @@ -11244,13 +10069,13 @@ msgid "" msgstr "" #. type: Block title -#: user-manual.txt:4996 user-manual.txt:5065 user-manual.txt:5084 +#: user-manual.txt:4737 user-manual.txt:4806 user-manual.txt:4825 #, no-wrap msgid "output.html" msgstr "" #. type: delimited block . -#: user-manual.txt:5001 +#: user-manual.txt:4742 #, no-wrap msgid "" "\t<h1> 1 </h1>\n" @@ -11259,25 +10084,25 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:5004 +#: user-manual.txt:4745 msgid "" "Additional information about _Grantlee_ can be found " "http://www.grantlee.org/apidox/for_themers.html[here]" msgstr "" #. type: Title === -#: user-manual.txt:5005 +#: user-manual.txt:4746 #, no-wrap msgid "Grantlee exported variables" msgstr "" #. type: Plain text -#: user-manual.txt:5007 +#: user-manual.txt:4748 msgid "Only a subset of the dive data is exported:" msgstr "" #. type: delimited block | -#: user-manual.txt:5036 +#: user-manual.txt:4777 #, no-wrap msgid "" "|*Name*|*Description*\n" @@ -11311,25 +10136,25 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:5039 +#: user-manual.txt:4780 msgid "" "Please note that some of the variables like 'notes' need to be extended with " "'|safe' to support HTML tags:" msgstr "" #. type: delimited block . -#: user-manual.txt:5041 +#: user-manual.txt:4782 #, no-wrap msgid "\t<p> {{ dive.notes|safe }} </p>\n" msgstr "" #. type: Plain text -#: user-manual.txt:5043 +#: user-manual.txt:4784 msgid "Otherwise tags like 'br' would not be converted to line breaks." msgstr "" #. type: Plain text -#: user-manual.txt:5046 +#: user-manual.txt:4787 msgid "" "_Subsurface_ also exports *template_options* data. This data must be used as " "_CSS_ values to provide a dynamically editable template. The exported data " @@ -11337,7 +10162,7 @@ msgid "" msgstr "" #. type: delimited block | -#: user-manual.txt:5058 +#: user-manual.txt:4799 #, no-wrap msgid "" "|*Name*|*Description*\n" @@ -11356,26 +10181,26 @@ msgid "" msgstr "" #. type: delimited block . -#: user-manual.txt:5063 +#: user-manual.txt:4804 #, no-wrap msgid "\tborder-width: {{ template_options.borderwidth }}px;\n" msgstr "" #. type: delimited block . -#: user-manual.txt:5068 +#: user-manual.txt:4809 #, no-wrap msgid "\tborder-width: 3px;\n" msgstr "" #. type: Plain text -#: user-manual.txt:5071 +#: user-manual.txt:4812 msgid "" "Another variable that _Subsurface_ exports is *print_options*. This variable " "contains a single member:" msgstr "" #. type: delimited block | -#: user-manual.txt:5074 +#: user-manual.txt:4815 #, no-wrap msgid "" "|*Name*|*Description*\n" @@ -11384,7 +10209,7 @@ msgid "" msgstr "" #. type: delimited block . -#: user-manual.txt:5082 +#: user-manual.txt:4823 #, no-wrap msgid "" "\tbody {\n" @@ -11393,7 +10218,7 @@ msgid "" msgstr "" #. type: delimited block . -#: user-manual.txt:5089 +#: user-manual.txt:4830 #, no-wrap msgid "" "\tbody {\n" @@ -11402,13 +10227,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:5091 +#: user-manual.txt:4832 #, no-wrap msgid "Defined CSS selectors" msgstr "" #. type: Plain text -#: user-manual.txt:5094 +#: user-manual.txt:4835 msgid "" "As the dive profile is placed after rendering, _Subsurface_ uses special " "_CSS_ selectors to search in the HTML output. The _CSS_ selectors in the " @@ -11416,7 +10241,7 @@ msgid "" msgstr "" #. type: delimited block | -#: user-manual.txt:5101 +#: user-manual.txt:4842 #, no-wrap msgid "" "|*Selector*|*Type*|*Description*\n" @@ -11429,20 +10254,20 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:5104 +#: user-manual.txt:4845 msgid "" "Rendering dive profiles is not supported for flow layout templates (when " "data-numberofdives = 0)." msgstr "" #. type: Title === -#: user-manual.txt:5105 +#: user-manual.txt:4846 #, no-wrap msgid "Special attributes" msgstr "" #. type: Plain text -#: user-manual.txt:5109 +#: user-manual.txt:4850 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 " @@ -11450,55 +10275,144 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:5111 +#: user-manual.txt:4852 msgid "" "The *data-numberofdives* data attribute is added to the body tag to set the " "rendering mode." msgstr "" #. type: Plain text -#: user-manual.txt:5113 +#: user-manual.txt:4854 msgid "render 6 dives per page:" msgstr "" #. type: delimited block . -#: user-manual.txt:5116 +#: user-manual.txt:4857 #, no-wrap msgid "\t<body data-numberofdives = 6>\n" msgstr "" #. type: Plain text -#: user-manual.txt:5119 +#: user-manual.txt:4860 msgid "render as much dives as possible:" msgstr "" #. type: delimited block . -#: user-manual.txt:5122 +#: user-manual.txt:4863 #, no-wrap msgid "\t<body data-numberofdives = 0>\n" msgstr "" #. type: Plain text -#: user-manual.txt:5125 +#: user-manual.txt:4866 msgid "" "All CSS units should be in relative lengths only, to support printing on any " "page size." msgstr "" #. type: Title == -#: user-manual.txt:5126 +#: user-manual.txt:4869 +#, no-wrap +msgid "APPENDIX F: Setting up video thumbnails." +msgstr "" + +#. type: Title === +#: user-manual.txt:4871 +#, no-wrap +msgid "" +"Setting up the appropriate thumbnails for videos that are associated with " +"dives." +msgstr "" + +#. type: Plain text +#: user-manual.txt:4877 +msgid "" +"In handling video associated with dives, _Subsurface_ needs to create a " +"thumbnail for each video that can be shown either on the dive profile or in " +"the _Media_ tab. By default this is a nonspecific placeholder thumbnail. To " +"see thumbnails that represent individual videos, _Subsurface_ uses an " +"external program calle _FFmpeg_. To create thumbnails for videos, do two " +"things:" +msgstr "" + +#. type: Plain text +#: user-manual.txt:4880 +msgid "" +"Install _FFmpeg_ on the computer that runs _Subsurface_. The program can be " +"downloaded from the FFmpeg web site: " +"https://www.ffmpeg.org/download.html. Most Linux distributions ship with an " +"_ffmpeg_ package and therefore do not need an additional download." +msgstr "" + +#. type: Plain text +#: user-manual.txt:4884 +#, no-wrap +msgid "" +"** On Windows, put the _ffmpeg.exe_ file in the directory containing the " +"_Subsurface_ executable.\n" +"On Mac and Linux, make sure the _ffmpeg_ command is in the path. This should " +"be the case for\n" +"_FFmpeg_ installed from official packages.\n" +msgstr "" + +#. type: Plain text +#: user-manual.txt:4887 +msgid "" +"In the _General_ tab of the <<S_Preferences, _Preferences_>>, set the " +"preferences for generating video thumbnails. This is achieved by:" +msgstr "" + +#. type: Plain text +#: user-manual.txt:4890 +#, no-wrap +msgid "" +"** Checking the _Extract video thumbnails_ box. If _Subsurface_ fails to " +"load the _FFmpeg_ executable,\n" +"this option will be turned off. Re-enable it after successfully installing " +"_FFmpeg_.\n" +msgstr "" + +#. type: Plain text +#: user-manual.txt:4892 +#, no-wrap +msgid "** Specifying the path to the _FFmpeg_ executable.\n" +msgstr "" + +#. type: Plain text +#: user-manual.txt:4898 +#, no-wrap +msgid "" +"** Choose the position in the video where _Subsurface_\n" +"should try to extract the thumbnail. The left-most and right-most positions " +"of the _Extract at position_\n" +"slider signify the beginning and the end of the video, respectively. Note " +"that if _Subsurface_ cannot\n" +"determine the length of the video (this can be the case for AVI files), the " +"first frame\n" +"of the video will be used.\n" +msgstr "" + +#. type: Plain text +#: user-manual.txt:4900 +msgid "" +"This should complete the setup of video thumbnails and they should now " +"appear on the dive profile and in the _Media_ tab." +msgstr "" + +#. type: Title == +#: user-manual.txt:4901 #, no-wrap -msgid "APPENDIX F: FAQs." +msgid "APPENDIX G: FAQs." msgstr "" #. type: Title === -#: user-manual.txt:5128 +#: user-manual.txt:4903 #, no-wrap msgid "Subsurface appears to miscalculate gas consumption and SAC" msgstr "" #. type: Plain text -#: user-manual.txt:5132 +#: user-manual.txt:4907 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_ " @@ -11506,7 +10420,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:5138 +#: user-manual.txt:4913 msgid "" "'Answer': Not really. What happens is that _Subsurface_ actually calculates " "gas consumption differently - and better - than you expect. In particular, " @@ -11516,7 +10430,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:5144 +#: user-manual.txt:4919 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 " @@ -11526,12 +10440,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:5146 +#: user-manual.txt:4921 msgid "+consumption = (amount_of_air_at_beginning - amount_of_air_at_end)+" msgstr "" #. type: Plain text -#: user-manual.txt:5152 +#: user-manual.txt:4927 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 " @@ -11542,12 +10456,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:5154 +#: user-manual.txt:4929 msgid "+12.2*((220-100)/1.013)+" msgstr "" #. type: Plain text -#: user-manual.txt:5159 +#: user-manual.txt:4934 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 " @@ -11557,7 +10471,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:5165 +#: user-manual.txt:4940 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 " @@ -11568,7 +10482,7 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:5166 +#: user-manual.txt:4941 #, no-wrap msgid "" "Some dive profiles have time discrepancies with the recorded samples from my " @@ -11576,7 +10490,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:5170 +#: user-manual.txt:4945 msgid "" "_Subsurface_ ends up ignoring surface time for many things (average depth, " "divetime, SAC, etc). 'Question': Why do dive durations in my dive computer " @@ -11584,7 +10498,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:5178 +#: user-manual.txt:4953 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 " @@ -11598,13 +10512,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:5179 +#: user-manual.txt:4954 #, no-wrap msgid "Some dive profiles are missing from the download" msgstr "" #. type: Plain text -#: user-manual.txt:5193 +#: user-manual.txt:4968 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 " @@ -11619,7 +10533,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:5197 +#: user-manual.txt:4972 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-mobile-manual.fr.po b/Documentation/fr/po/subsurface-mobile-manual.fr.po index ffa8de6d1..7c60065b6 100644 --- a/Documentation/fr/po/subsurface-mobile-manual.fr.po +++ b/Documentation/fr/po/subsurface-mobile-manual.fr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: subsurface-manual VERSION\n" "Report-Msgid-Bugs-To: subsurface@subsurface-divelog.org\n" -"POT-Creation-Date: 2018-06-26 10:10+0200\n" +"POT-Creation-Date: 2018-11-05 09:14+0100\n" "PO-Revision-Date: 2018-02-07 17:48+0100\n" "Last-Translator: Guillaume GARDET <guillaume.gardet@free.fr>\n" "Language-Team: French <kde-i18n-doc@kde.org>\n" @@ -19,13 +19,6 @@ msgstr "" "X-Generator: Lokalize 2.0\n" #. :website: http://subsurface-divelog.org -#. type: Positional ($1) AttributeList argument for macro 'image' -#: mobile-manual.txt:13 -#, no-wrap -msgid "Banner" -msgstr "" - -#. :website: http://subsurface-divelog.org #. type: Target for macro image #: mobile-manual.txt:13 #, no-wrap @@ -219,12 +212,6 @@ msgstr "" "l'_écran d'informations de connexion au cloud_ apparait (voir l'image ci-" "dessous, à gauche)." -#. type: Positional ($1) AttributeList argument for macro 'image' -#: mobile-manual.txt:81 -#, no-wrap -msgid "FIGURE: Mobile credentials screen" -msgstr "" - #. type: Target for macro image #: mobile-manual.txt:81 #, no-wrap @@ -354,12 +341,6 @@ msgid "" "is shown in the top left corner of the screen." msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: mobile-manual.txt:139 -#, no-wrap -msgid "FIGURE: Action Button" -msgstr "" - #. type: Target for macro image #: mobile-manual.txt:139 #, no-wrap @@ -394,12 +375,6 @@ msgstr "" msgid "Drag the action button visible on most screens to the right" msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: mobile-manual.txt:154 -#, no-wrap -msgid "FIGURE: Dive management sub-panel" -msgstr "" - #. type: Target for macro image #: mobile-manual.txt:154 #, no-wrap @@ -442,12 +417,6 @@ msgid "" "information and notes." msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: mobile-manual.txt:176 -#, no-wrap -msgid "FIGURE: Dive list screen" -msgstr "" - #. type: Target for macro image #: mobile-manual.txt:176 #, no-wrap @@ -492,12 +461,6 @@ msgid "" "button is hidden. Once you close the keyboard it is drawn again." msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: mobile-manual.txt:201 -#, no-wrap -msgid "FIGURE: Dive edit screen" -msgstr "" - #. type: Target for macro image #: mobile-manual.txt:201 #, no-wrap @@ -526,12 +489,6 @@ msgid "" "dive in _Details View_." msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: mobile-manual.txt:217 -#, no-wrap -msgid "FIGURE: Manual dive entry screen" -msgstr "" - #. type: Target for macro image #: mobile-manual.txt:217 #, no-wrap @@ -553,12 +510,6 @@ msgid "" "message that appears at the bottom of the screen (see image below)." msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: mobile-manual.txt:226 -#, no-wrap -msgid "FIGURE: Undo delete dive" -msgstr "" - #. type: Target for macro image #: mobile-manual.txt:226 #, no-wrap @@ -576,12 +527,6 @@ msgid "" "the dive." msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: mobile-manual.txt:234 -#, no-wrap -msgid "FIGURE: delete dive from list" -msgstr "" - #. type: Target for macro image #: mobile-manual.txt:234 #, no-wrap @@ -607,7 +552,16 @@ msgid "" msgstr "" #. type: Plain text -#: mobile-manual.txt:252 +#: mobile-manual.txt:250 +msgid "" +"Use the _Vendor name_ and _Dive Computer_ drop-downs to pick the correct " +"dive computer. When downloading from multiple different dive computers, " +"shortcut buttons to easily switch between them will appear below the drop-" +"downs." +msgstr "" + +#. type: Plain text +#: mobile-manual.txt:256 msgid "" "The process for download is slightly different between the two OSs. In our " "testing we got the best results on iOS when the dive computer was in " @@ -617,7 +571,7 @@ msgid "" msgstr "" #. type: Plain text -#: mobile-manual.txt:256 +#: mobile-manual.txt:260 msgid "" "On Android devices, you should first establish a link between the Bluetooth " "or Bluetooth LE dive computer and the mobile device using Android utilities. " @@ -625,7 +579,7 @@ msgid "" msgstr "" #. type: Plain text -#: mobile-manual.txt:265 +#: mobile-manual.txt:269 msgid "" "For USB dive computers, USB cables \"normally\" used for uploading dives to " "a desktop/laptop computer do NOT work: these cables usually have a full-" @@ -641,27 +595,21 @@ msgid "" msgstr "" #. type: Plain text -#: mobile-manual.txt:267 +#: mobile-manual.txt:271 msgid "" "Please note that not all Android devices support OTG cables. And even on " "some devices that do support those cables in general, _Subsurface-mobile_ " "still in some cases cannot access a dive computer through a serial port." msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: mobile-manual.txt:268 -#, no-wrap -msgid "FIGURE: USB-OTG cable" -msgstr "" - #. type: Target for macro image -#: mobile-manual.txt:268 +#: mobile-manual.txt:272 #, no-wrap msgid "mobile-images/USB-OTG.jpg" msgstr "mobile-images/USB-OTG.jpg" #. type: Plain text -#: mobile-manual.txt:276 +#: mobile-manual.txt:280 msgid "" "For Bluetooth-equipped dive computers and Android devices, establish a " "Bluetooth connection between the dive computer and the mobile device. Use " @@ -675,7 +623,7 @@ msgid "" msgstr "" #. type: Plain text -#: mobile-manual.txt:282 +#: mobile-manual.txt:286 msgid "" "With pairing between dive computer and _Subsurface-mobile_ having been set " "up, dive download is simple. From the main menu, tap _Manage dives -> " @@ -688,7 +636,7 @@ msgid "" msgstr "" #. type: Plain text -#: mobile-manual.txt:286 +#: mobile-manual.txt:290 msgid "" "Now tap the button labeled _Download_. The downloaded dives appear in the " "bottom part of the screen, the most recent dive at the top (see image on " @@ -698,7 +646,7 @@ msgid "" msgstr "" #. type: Plain text -#: mobile-manual.txt:292 +#: mobile-manual.txt:296 msgid "" "After the download, each dive has a check-box on the left hand side, used " "for selecting which dives you want to be added to the _Subsurface-mobile_ " @@ -709,26 +657,20 @@ msgid "" "the section above xref:S_Edit_Dive[Edit a dive]." msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: mobile-manual.txt:293 -#, no-wrap -msgid "FIGURE: DC download screen" -msgstr "" - #. type: Target for macro image -#: mobile-manual.txt:293 +#: mobile-manual.txt:297 #, no-wrap msgid "mobile-images/DC-Download.jpg" msgstr "mobile-images/DC-Download.jpg" #. type: Title == -#: mobile-manual.txt:295 +#: mobile-manual.txt:299 #, no-wrap msgid "Viewing the dive location on Google Maps" msgstr "" #. type: Plain text -#: mobile-manual.txt:300 +#: mobile-manual.txt:304 msgid "" "In the _Details View_, the Action Bar at the bottom has a GPS pin on the " "left hand side. Tap that pin and the dive site is shown in Google Maps. " @@ -737,33 +679,27 @@ msgid "" msgstr "" #. type: Plain text -#: mobile-manual.txt:303 +#: mobile-manual.txt:307 msgid "" "Alternatively, the _Details View_ has a button at the top right hand marked " "_Map it_. Tap this button to open Google Maps showing the dive site (image " "below)." msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: mobile-manual.txt:304 -#, no-wrap -msgid "FIGURE: Map of dive site" -msgstr "" - #. type: Target for macro image -#: mobile-manual.txt:304 +#: mobile-manual.txt:308 #, no-wrap msgid "mobile-images/Map.jpg" msgstr "mobile-images/Map.jpg" #. type: Title == -#: mobile-manual.txt:306 +#: mobile-manual.txt:310 #, no-wrap msgid "Dive log management" msgstr "" #. type: Plain text -#: mobile-manual.txt:316 +#: mobile-manual.txt:320 msgid "" "A central part of _Subsurface-mobile_ is the ability to store the dive log " "using the _Subsurface_ cloud storage. This provides security against loss " @@ -775,50 +711,50 @@ msgid "" msgstr "" #. type: Title === -#: mobile-manual.txt:317 +#: mobile-manual.txt:321 #, no-wrap msgid "Add new dive manually" msgstr "" #. type: Plain text -#: mobile-manual.txt:320 +#: mobile-manual.txt:324 msgid "" "This is described above under the section dealing with xref:" "S_Add_Dive[Manually adding a new dive to the dive list]." msgstr "" #. type: Title === -#: mobile-manual.txt:321 +#: mobile-manual.txt:325 #, no-wrap msgid "Download from DC" msgstr "" #. type: Plain text -#: mobile-manual.txt:324 +#: mobile-manual.txt:328 msgid "" "This is described above under the section dealing with xref:" "S_Download[Download dives from a dive computer]." msgstr "" #. type: Title === -#: mobile-manual.txt:325 +#: mobile-manual.txt:329 #, no-wrap msgid "Apply GPS fixes" msgstr "" #. type: Plain text -#: mobile-manual.txt:328 +#: mobile-manual.txt:332 msgid "This is described in the following main section, below." msgstr "" #. type: Title === -#: mobile-manual.txt:329 +#: mobile-manual.txt:333 #, no-wrap msgid "Manually sync the dive log with the _Subsurface_ cloud storage" msgstr "" #. type: Plain text -#: mobile-manual.txt:336 +#: mobile-manual.txt:340 msgid "" "Upload the dives contained on the mobile device to the _Subsurface_ cloud " "storage by tapping the option _Manual sync with cloud_. This synchronizes " @@ -828,13 +764,13 @@ msgid "" msgstr "" #. type: Title === -#: mobile-manual.txt:337 +#: mobile-manual.txt:341 #, no-wrap msgid "Enable cloud auto sync" msgstr "" #. type: Plain text -#: mobile-manual.txt:349 +#: mobile-manual.txt:353 msgid "" "By default _Subsurface-mobile_ runs offline and only syncs the dive list " "with cloud storage when explicitly told to do so (see above). You can " @@ -849,13 +785,13 @@ msgid "" msgstr "" #. type: Title == -#: mobile-manual.txt:350 +#: mobile-manual.txt:354 #, no-wrap msgid "Recording dive locations using GPS" msgstr "" #. type: Plain text -#: mobile-manual.txt:357 +#: mobile-manual.txt:361 msgid "" "The fact that most smartphones have GPS facilities allows _Subsurface-" "mobile_ to record the locations of dives. If the smartphone is taken on the " @@ -865,13 +801,13 @@ msgid "" msgstr "" #. type: Title === -#: mobile-manual.txt:359 +#: mobile-manual.txt:363 #, no-wrap msgid "Configuring the GPS service" msgstr "" #. type: Plain text -#: mobile-manual.txt:367 +#: mobile-manual.txt:371 msgid "" "From the Main menu, select _Settings_. The Settings screen has a section for " "configuring the GPS service (image below). GPS location data are collected " @@ -881,26 +817,20 @@ msgid "" "The program is now ready to collect GPS positions." msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: mobile-manual.txt:368 -#, no-wrap -msgid "FIGURE: GPS configure" -msgstr "" - #. type: Target for macro image -#: mobile-manual.txt:368 +#: mobile-manual.txt:372 #, no-wrap msgid "mobile-images/GPS-config.jpg" msgstr "mobile-images/GPS-config.jpg" #. type: Title === -#: mobile-manual.txt:370 +#: mobile-manual.txt:374 #, no-wrap msgid "Collecting GPS positions" msgstr "" #. type: Plain text -#: mobile-manual.txt:376 +#: mobile-manual.txt:380 msgid "" "Ensure that the GPS on the mobile device has been activated and that you " "have given the app permission to access your location data. Open the Main " @@ -908,20 +838,14 @@ msgid "" "of GPS locations." msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: mobile-manual.txt:377 -#, no-wrap -msgid "FIGURE: GPS start" -msgstr "" - #. type: Target for macro image -#: mobile-manual.txt:377 +#: mobile-manual.txt:381 #, no-wrap msgid "mobile-images/GPSstart.jpg" msgstr "mobile-images/GPSstart.jpg" #. type: Plain text -#: mobile-manual.txt:386 +#: mobile-manual.txt:390 msgid "" "_Subsurface-mobile_ starts to collect GPS locations automatically, following " "the preferences specified as described above. While the GPS location service " @@ -932,13 +856,13 @@ msgid "" msgstr "" #. type: Title === -#: mobile-manual.txt:387 +#: mobile-manual.txt:391 #, no-wrap msgid "Storing the GPS data on the _Subsurface_ cloud" msgstr "" #. type: Plain text -#: mobile-manual.txt:394 +#: mobile-manual.txt:398 msgid "" "Activate the main menu and select the _GPS_ option that brings up the " "submenu of GPS-related actions. Tap _Upload GPS data_ that saves the GPS " @@ -948,26 +872,26 @@ msgid "" msgstr "" #. type: Title === -#: mobile-manual.txt:395 +#: mobile-manual.txt:399 #, no-wrap msgid "Downloading GPS data from the _Subsurface_ cloud" msgstr "" #. type: Plain text -#: mobile-manual.txt:400 +#: mobile-manual.txt:404 msgid "" "Download the GPS data that have been saved on the cloud (possibly by a " "different device) by selecting _Download GPS Data_ from the GPS sub-panel." msgstr "" #. type: Title === -#: mobile-manual.txt:401 +#: mobile-manual.txt:405 #, no-wrap msgid "Viewing GPS data" msgstr "" #. type: Plain text -#: mobile-manual.txt:411 +#: mobile-manual.txt:415 msgid "" "From the GPS submenu select _Show GPS fixes_. This brings up a list of GPS " "positions obtained by the location service (image below). Two actions are " @@ -980,26 +904,20 @@ msgid "" "again using the handle." msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: mobile-manual.txt:412 -#, no-wrap -msgid "FIGURE: GPS management" -msgstr "" - #. type: Target for macro image -#: mobile-manual.txt:412 +#: mobile-manual.txt:416 #, no-wrap msgid "mobile-images/gpsmanagement.jpg" msgstr "mobile-images/gpsmanagement.jpg" #. type: Title === -#: mobile-manual.txt:414 +#: mobile-manual.txt:418 #, no-wrap msgid "Applying GPS data to dives in the dive log" msgstr "" #. type: Plain text -#: mobile-manual.txt:423 +#: mobile-manual.txt:427 msgid "" "Assuming that all the dives have been entered into the dive log or have been " "downloaded from the _Subsurface_ cloud, apply the GPS positions to these " @@ -1012,13 +930,13 @@ msgid "" msgstr "" #. type: Title == -#: mobile-manual.txt:424 +#: mobile-manual.txt:428 #, no-wrap msgid "Using the settings for _Subsurface-mobile_." msgstr "Utilisation des paramètres pour _Subsurface-mobile_." #. type: Plain text -#: mobile-manual.txt:427 +#: mobile-manual.txt:431 msgid "" "The Settings screen allows the customization of _Subsurface-mobile_. Many of " "the settings involve dragging a slider switch to activate or deactivate a " @@ -1026,13 +944,13 @@ msgid "" msgstr "" #. type: Title === -#: mobile-manual.txt:429 +#: mobile-manual.txt:433 #, no-wrap msgid "Changing to a different _Subsurface_ cloud account" msgstr "" #. type: Plain text -#: mobile-manual.txt:434 +#: mobile-manual.txt:438 msgid "" "Some users have more than one _Subsurface_ cloud account and with a need to " "switch between accounts. Tap _Settings_ on the Main menu and scroll to the " @@ -1042,26 +960,20 @@ msgid "" "list is shown." msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: mobile-manual.txt:435 -#, no-wrap -msgid "FIGURE: Settings: Cloud & Theme" -msgstr "" - #. type: Target for macro image -#: mobile-manual.txt:435 +#: mobile-manual.txt:439 #, no-wrap msgid "mobile-images/SettingsCloudTheme.jpg" msgstr "mobile-images/SettingsCloudTheme.jpg" #. type: Title === -#: mobile-manual.txt:437 +#: mobile-manual.txt:441 #, no-wrap msgid "Changing the color theme of _Subsurface-mobile_" msgstr "" #. type: Plain text -#: mobile-manual.txt:444 +#: mobile-manual.txt:448 msgid "" "_Subsurface-mobile_ has three color schemes to please users with different " "tastes. This user manual shows the default color scheme, comprising blue " @@ -1072,13 +984,13 @@ msgid "" msgstr "" #. type: Title === -#: mobile-manual.txt:445 +#: mobile-manual.txt:449 #, no-wrap msgid "Configuring the GPS webservice" msgstr "" #. type: Plain text -#: mobile-manual.txt:448 +#: mobile-manual.txt:452 msgid "" "The Settings screen allows one to set up the way in which GPS positions are " "collected during dives. See the section on xref:S_ConfigureGPS[Configuring " @@ -1086,13 +998,13 @@ msgid "" msgstr "" #. type: Title === -#: mobile-manual.txt:449 +#: mobile-manual.txt:453 #, no-wrap msgid "Saving a detailed dive computer dive log" msgstr "" #. type: Plain text -#: mobile-manual.txt:452 +#: mobile-manual.txt:456 msgid "" "Under the heading _Dive computer_, you will find a switch to save a detailed " "log each time dives are downloaded from a dive computer. This is important " @@ -1106,13 +1018,13 @@ msgid "" msgstr "" #. type: Title === -#: mobile-manual.txt:453 +#: mobile-manual.txt:457 #, no-wrap msgid "Activating the Developer submenu" msgstr "" #. type: Plain text -#: mobile-manual.txt:456 +#: mobile-manual.txt:460 msgid "" "The information in subsurface.log plus some additional information for " "understanding the screen rendering of dive information as well as the way in " @@ -1123,13 +1035,13 @@ msgid "" msgstr "" #. type: Title == -#: mobile-manual.txt:457 +#: mobile-manual.txt:461 #, no-wrap msgid "Developer submenu" msgstr "" #. type: Plain text -#: mobile-manual.txt:461 +#: mobile-manual.txt:465 msgid "" "If the Developer submenu has been activated in the Settings screen, the Main " "menu has a _Developer_ item. By tapping this one has two options that are " @@ -1137,13 +1049,13 @@ msgid "" msgstr "" #. type: Title === -#: mobile-manual.txt:462 +#: mobile-manual.txt:466 #, no-wrap msgid "App log" msgstr "" #. type: Plain text -#: mobile-manual.txt:467 +#: mobile-manual.txt:471 msgid "" "This option shows the messages that _Subsurface-mobile_ generates while " "running. While most users are not aware of these messages, they are often " @@ -1152,13 +1064,13 @@ msgid "" msgstr "" #. type: Title === -#: mobile-manual.txt:468 +#: mobile-manual.txt:472 #, no-wrap msgid "Theme information" msgstr "" #. type: Plain text -#: mobile-manual.txt:472 +#: mobile-manual.txt:476 msgid "" "This option provides a wealth of information about the screen " "characteristics of the mobile device and the font characteristics used by " diff --git a/Documentation/fr/po/subsurface-user-manual.fr.po b/Documentation/fr/po/subsurface-user-manual.fr.po index 7f79c6c73..f15741e4b 100644 --- a/Documentation/fr/po/subsurface-user-manual.fr.po +++ b/Documentation/fr/po/subsurface-user-manual.fr.po @@ -7,9 +7,9 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: subsurface@subsurface-divelog.org\n" -"POT-Creation-Date: 2018-06-26 10:10+0200\n" -"PO-Revision-Date: 2018-06-26 10:17+0100\n" -"Last-Translator: Guillaume GARDET <guillaume.gardet@opensuse.org>\n" +"POT-Creation-Date: 2018-11-05 09:14+0100\n" +"PO-Revision-Date: 2018-11-05 09:24+0100\n" +"Last-Translator: Guillaume GARDET <guillaume.gardet@free.fr>\n" "Language-Team: French <kde-i18n-doc@kde.org>\n" "Language: fr\n" "MIME-Version: 1.0\n" @@ -21,13 +21,6 @@ msgstr "" "X-Source-Language: C\n" #. :website: https://subsurface-divelog.org -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:14 -#, no-wrap -msgid "Banner" -msgstr "" - -#. :website: https://subsurface-divelog.org #. type: Target for macro image #: user-manual.txt:14 #, no-wrap @@ -53,8 +46,8 @@ msgstr "" #. type: Plain text #: user-manual.txt:23 -msgid "[blue]#_Version 4.7, May 2018_#" -msgstr "[blue]#_Version 4.7, Mai 2018_#" +msgid "[blue]#_Version 4.8, September 2018_#" +msgstr "[blue]#_Version 4.8, Septembre 2018_#" #. type: Plain text #: user-manual.txt:28 @@ -244,12 +237,6 @@ msgstr "" "l'autre vers le bas. Elles mènent respectivement vers l'occurence précédente " "et suivante du terme recherché." -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:83 user-manual.txt:96 -#, no-wrap -msgid "User manual functions" -msgstr "" - #. type: Target for macro image #: user-manual.txt:83 #, no-wrap @@ -424,12 +411,6 @@ msgstr "" "températures de l'eau et le SAC (air consommé); temps total et nombre de " "plongées sélectionnées)." -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:153 -#, no-wrap -msgid "The Main Window" -msgstr "La fenêtre principale" - #. type: Target for macro image #: user-manual.txt:153 #, no-wrap @@ -439,12 +420,12 @@ msgstr "images/main_window_f22.jpg" #. type: Plain text #: user-manual.txt:157 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:" +"Decide which of the four panels are displayed by selecting the *View* option " +"on the main menu. This feature has several choices of display:" msgstr "" -"L'utilisateur décide quels panneaux sont affichés, parmi les 4, en " -"sélectionnant l'option *Vue* dans le menu principal. Cette fonctionnalité " -"permet plusieurs choix d'affichage :" +"Décider quels panneaux sont affichés, parmi les 4, en sélectionnant l'option " +"*Vue* dans le menu principal. Cette fonctionnalité permet plusieurs choix " +"d'affichage :" #. type: Plain text #: user-manual.txt:159 @@ -683,12 +664,6 @@ msgstr "" "marqués [red]#A#, [red]#B# et [red]#C# dans l'llustration ci-dessous. Chaque " "de ces onglets sera expliqué pour l'entrée de données." -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:231 -#, no-wrap -msgid "FIGURE: Add dive" -msgstr "" - #. type: Target for macro image #: user-manual.txt:231 #, no-wrap @@ -708,14 +683,8 @@ msgstr "" "panneau *Notes* (voir image ci-dessous). Ce message est affiché dans tous " "les panneau sous Notes et Équipement en *Mode édition*." -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:236 -#, no-wrap -msgid "Blue edit bar" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:236 user-manual.txt:838 +#: user-manual.txt:236 user-manual.txt:855 #, no-wrap msgid "images/BlueEditBar_f22.jpg" msgstr "images/BlueEditBar_f22.jpg" @@ -765,12 +734,6 @@ msgstr "" "_Subsurface_ affiche un profil de plongée par défaut qui nécessite d'être " "modifié pour représenter au mieux la plongée décrite:" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:255 -#, no-wrap -msgid "FIGURE: Initial dive profile" -msgstr "" - #. type: Target for macro image #: user-manual.txt:255 #, no-wrap @@ -815,12 +778,6 @@ msgstr "" "trouve un profil pour une plongée à 20m durant 30min, suivie d'un palier de " "sécurité de 5 minutes à 5 m." -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:275 -#, no-wrap -msgid "FIGURE: Edited dive profile" -msgstr "" - #. type: Target for macro image #: user-manual.txt:275 #, no-wrap @@ -851,12 +808,6 @@ msgstr "" "gaz définis dans l'onglet *Équipement* apparaissent dans le menu contextuel " "(voir image ci-dessous)." -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:288 -#, no-wrap -msgid "FIGURE: Gas composition context menu" -msgstr "" - #. type: Target for macro image #: user-manual.txt:288 #, no-wrap @@ -910,8 +861,8 @@ msgstr "" "computers/[Ordinateurs de plongée supportés]." #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:309 user-manual.txt:694 user-manual.txt:769 -#: user-manual.txt:1141 user-manual.txt:3561 user-manual.txt:3964 +#: user-manual.txt:309 user-manual.txt:712 user-manual.txt:786 +#: user-manual.txt:1166 user-manual.txt:3305 user-manual.txt:3708 #, no-wrap msgid "images/icons/warning2.png" msgstr "images/icons/warning2.png" @@ -1009,12 +960,6 @@ msgstr "" "Importer depuis l'ordinateur de plongée_. La boîte de dialogue *A* apparaît " "comme sur la figure ci-dessous:" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:349 -#, no-wrap -msgid "FIGURE: Download dialogue 1" -msgstr "" - #. type: Target for macro image #: user-manual.txt:349 #, no-wrap @@ -1055,7 +1000,7 @@ msgstr "" "sélectionné, p. ex. D4 (Suunto), Veo200 (Oceanic), ou Puck (Mares)." #. type: Plain text -#: user-manual.txt:375 +#: user-manual.txt:379 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 " @@ -1065,7 +1010,11 @@ msgid "" "_appendix_b_dive_computer_specific_information_for_importing_dive_information[Appendix " "B] for technical details on how to find the appropriate port information for " "a specific dive computer and, in some cases, how to do the correct settings " -"to the operating system of the computer on which _Subsurface_ is running." +"to the operating system of the computer on which _Subsurface_ is running. " +"Some dive computers disable this drop-down as they use other means to find " +"and connect to the device. For some dive computers the data entered here is " +"actually the mount point of the USB storage device as which the dive " +"computer identifies itself." msgstr "" "Le menu déroulant *Périphérique ou point de montage* le nom du port USB ou " "Bluetooth dont _Subsurface_ a besoin pour communiquer avec l'ordinateur de " @@ -1076,10 +1025,23 @@ msgstr "" "B] pour obtenir des détails techniques sur la façon de trouver des " "informations sur le port approprié à chaque ordinateur de plongée et, dans " "certains cas, sur les réglages requis pour le système d'exploitation de " -"l'ordinateur sur lequel _Subsurface_ fonctionne." +"l'ordinateur sur lequel _Subsurface_ fonctionne. Certains ordinateurs de " +"plongée désactivent ce menu déroulant puisqu'ils utilisent d'autres moyens " +"pour trouver et se connecter au périphérique. Pour certains, les données " +"entrées ici sont en fait le point de montage USB tel que s'identifie " +"l'ordinateur de plongée lui-même." #. type: Plain text -#: user-manual.txt:385 +#: user-manual.txt:384 +msgid "" +"Below the three drop downs are up to four shortcut buttons that allow you to " +"easily switch between multiple dive computers that you are frequently " +"downloading from. These buttons only appear once you have downloaded from " +"different dive computers." +msgstr "" + +#. type: Plain text +#: user-manual.txt:394 msgid "" "If all the dives on the dive computer need to be downloaded, check the " "checkbox _Force download of all dives_. Normally, _Subsurface_ only " @@ -1106,7 +1068,7 @@ msgstr "" "cette case à cocher." #. type: Plain text -#: user-manual.txt:391 +#: user-manual.txt:400 msgid "" "If the checkbox _Always prefer downloaded dives_ has been checked and, " "during download, dives with identical date-times exist on the dive computer " @@ -1120,7 +1082,7 @@ msgstr "" "l'enregistrement de l'ordinateur de plongée." #. type: Plain text -#: user-manual.txt:394 +#: user-manual.txt:403 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*." @@ -1130,7 +1092,7 @@ msgstr "" "nouveau voyage dans la *Liste des plongées*." #. type: Plain text -#: user-manual.txt:398 +#: user-manual.txt:407 msgid "" "Do *not* check the checkboxes labelled _Save libdivecomputer logfile_ and " "_Save libdivecomputer dumpfile_. These are only used as diagnostic tools " @@ -1142,7 +1104,7 @@ msgstr "" "lorsque des problèmes de téléchargement se présentent (voir ci-dessous)." #. type: Plain text -#: user-manual.txt:416 +#: user-manual.txt:425 msgid "" "Then select the _Download_ button. With communication established, you can " "see how the data are retrieved from the dive computer. Depending on the " @@ -1182,7 +1144,7 @@ msgstr "" "éteignez l'ordinateur de plongée pour économiser sa batterie." #. type: Plain text -#: user-manual.txt:420 +#: user-manual.txt:429 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 " @@ -1194,32 +1156,32 @@ msgstr "" "dialogue ci-dessous." #. type: delimited block * -#: user-manual.txt:424 +#: user-manual.txt:433 #, no-wrap msgid "*PROBLEMS WITH DATA DOWNLOAD FROM A DIVE COMPUTER?*\n" msgstr "*PROBLÈMES AVEC LE TÉLÉCHARGEMENT DES DONNÉS DE L'ORDINATEUR DE PLONGÉE?*\n" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:424 user-manual.txt:548 user-manual.txt:592 -#: user-manual.txt:605 user-manual.txt:1296 user-manual.txt:1361 -#: user-manual.txt:1524 user-manual.txt:1600 user-manual.txt:1922 +#: user-manual.txt:433 user-manual.txt:557 user-manual.txt:601 +#: user-manual.txt:614 user-manual.txt:623 user-manual.txt:1321 +#: user-manual.txt:1386 user-manual.txt:1571 #, no-wrap msgid "images/icons/important.png" msgstr "images/icons/important.png" #. type: delimited block * -#: user-manual.txt:427 +#: user-manual.txt:436 msgid "Check the following:" msgstr "Vérifiez les éléments suivants:" #. type: delimited block * -#: user-manual.txt:430 +#: user-manual.txt:439 msgid "Is the dive computer still in PC-communication or Upload mode?" msgstr "" "L'ordinateur de plongée est-il en mode Communication PC ou Téléchargement?" #. type: delimited block * -#: user-manual.txt:432 +#: user-manual.txt:441 msgid "" "Is the dive computer’s battery fully charged? If not then charge or replace " "it." @@ -1228,7 +1190,7 @@ msgstr "" "n'est pas le cas, chargez-la ou remplacez-la." #. type: delimited block * -#: user-manual.txt:436 +#: user-manual.txt:445 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 " @@ -1240,7 +1202,7 @@ msgstr "" "ils propres ?" #. type: delimited block * -#: user-manual.txt:441 +#: user-manual.txt:450 msgid "" "Consult xref:" "_appendix_a_operating_system_specific_information_for_importing_dive_information_from_a_dive_computer[Appendix " @@ -1252,7 +1214,7 @@ msgstr "" "dessus)." #. type: delimited block * -#: user-manual.txt:445 +#: user-manual.txt:454 msgid "" "On Unix-like operating systems, does the user have write permission to the " "USB port? If not, consult xref:" @@ -1265,7 +1227,7 @@ msgstr "" "A]" #. type: delimited block * -#: user-manual.txt:453 +#: user-manual.txt:462 msgid "" "If the _Subsurface_ computer does not recognize the USB adapter by showing " "an appropriate device name next to the Mount Point, then there is a " @@ -1285,7 +1247,7 @@ msgstr "" "boîte de dialogue de téléchargement décrite ci-dessus:" #. type: delimited block * -#: user-manual.txt:456 +#: user-manual.txt:465 #, no-wrap msgid "" "\tSave libdivecomputer logfile\n" @@ -1295,7 +1257,7 @@ msgstr "" "\tSave libdivecomputer dumpfile\n" #. type: delimited block * -#: user-manual.txt:462 +#: user-manual.txt:471 #, no-wrap msgid "" "*Important*: These check boxes are only used when problems are encountered\n" @@ -1311,7 +1273,7 @@ msgstr "" "_Subsurface_ est stocké.\n" #. type: delimited block * -#: user-manual.txt:466 +#: user-manual.txt:475 #, no-wrap msgid "" "*Important:* _After downloading with the above checkboxes\n" @@ -1323,7 +1285,7 @@ msgstr "" "*Liste des plongées* mais deux fichiers sont créés dans le dossier sélectionné précédemment_:\n" #. type: delimited block * -#: user-manual.txt:469 +#: user-manual.txt:478 #, no-wrap msgid "" "\tsubsurface.log\n" @@ -1333,7 +1295,7 @@ msgstr "" "\tsubsurface.bin\n" #. type: delimited block * -#: user-manual.txt:475 +#: user-manual.txt:484 msgid "" "These files should be send to the _Subsurface_ mail list: " "_subsurface@subsurface-divelog.org_ with a request for the files to be " @@ -1346,19 +1308,19 @@ msgstr "" "informations relatives aux plongées enregistrées sur l'ordinateur de plongée." #. type: Title ==== -#: user-manual.txt:478 +#: user-manual.txt:487 #, no-wrap msgid "Connecting _Subsurface_ to a Bluetooth-enabled dive computer" msgstr "Connexion de _Subsurface_ à un ordinateur de plongée équipé de Bluetooth" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:479 user-manual.txt:4367 +#: user-manual.txt:488 user-manual.txt:4108 #, no-wrap msgid "images/icons/bluetooth.jpg" msgstr "images/icons/bluetooth.jpg" #. type: Plain text -#: user-manual.txt:491 +#: user-manual.txt:500 msgid "" "Bluetooth is becoming a more common way of communication between dive " "computers and _Subsurface_. _Subsurface_ provides a largely operating system " @@ -1375,7 +1337,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:494 +#: user-manual.txt:503 msgid "" "Setting up _Subsurface_ for Bluetooth communication requires four steps:" msgstr "" @@ -1383,7 +1345,7 @@ msgstr "" "4 étapes :" #. type: Plain text -#: user-manual.txt:496 +#: user-manual.txt:505 msgid "" "Ensure Bluetooth is activated on the host computer running _Subsurface_." msgstr "" @@ -1391,13 +1353,13 @@ msgstr "" "est actif." #. type: Plain text -#: user-manual.txt:497 +#: user-manual.txt:506 msgid "Ensure _Subsurface_ sees the Bluetooth adapter on the host computer." msgstr "" "Vérifiez que _Subsurface_ détecte l'adaptateur Bluetooth de l'ordinateur." #. type: Plain text -#: user-manual.txt:498 +#: user-manual.txt:507 msgid "" "Ensure the Bluetooth-enabled dive computer is Bluetooth-discoverable and in " "PC upload mode." @@ -1406,13 +1368,13 @@ msgstr "" "Connection PC." #. type: Plain text -#: user-manual.txt:499 +#: user-manual.txt:508 msgid "Ensure _Subsurface_ is paired with the Bluetooth-enabled dive computer." msgstr "" "Vérifiez que _Subsurface_ est jumelé avec l'ordinateur de plongée Bluetooth." #. type: Plain text -#: user-manual.txt:503 +#: user-manual.txt:512 msgid "" "Select the Download dialogue by selecting _Import -> Import from dive " "computer_ from the *Main Menu*. After checking the box labeled _\"Choose " @@ -1424,25 +1386,19 @@ msgstr "" "Bluetooth\"_, la boîte de dialogue ci-dessous apparaît." #. type: Title ===== -#: user-manual.txt:504 +#: user-manual.txt:513 #, no-wrap msgid "On Linux or MacOS:" msgstr "Sur Linux ou MacOS :" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:506 -#, no-wrap -msgid "FIGURE: Download Bluetooth" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:506 +#: user-manual.txt:515 #, no-wrap msgid "images/DC_import_Bluetooth.jpg" msgstr "images/DC_import_Bluetooth.jpg" #. type: Plain text -#: user-manual.txt:515 +#: user-manual.txt:524 msgid "" "Although the _Subsurface_ Bluetooth interface is intended to function " "without Bluetooth pairing at the operating system level, it is always " @@ -1455,7 +1411,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:546 +#: user-manual.txt:555 msgid "" "On the _Linux_ or _MacOS_ platforms the name of the _Subsurface_ computer " "and its Bluetooth address are shown on the right hand side. The power state " @@ -1517,7 +1473,7 @@ msgstr "" "que vous utilisez." #. type: delimited block * -#: user-manual.txt:553 +#: user-manual.txt:562 msgid "" "Currently _Subsurface_ does not support Bluetooth pairing with dive " "computers that require a custom PIN code. In order to pair the devices, use " @@ -1529,12 +1485,12 @@ msgstr "" "d'exploitation comme suggéré ci-dessous." #. type: delimited block * -#: user-manual.txt:555 +#: user-manual.txt:564 msgid "One way to achieve this is to use +bluetoothctl+:" msgstr "Une façon d'y parvenir est d'utiliser +bluetoothctl+:" #. type: delimited block * -#: user-manual.txt:566 +#: user-manual.txt:575 #, no-wrap msgid "" "\t$ bluetoothctl\n" @@ -1560,7 +1516,7 @@ msgstr "" "\t[agent] Enter PIN code: 0000\n" #. type: Plain text -#: user-manual.txt:572 +#: user-manual.txt:581 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 " @@ -1575,25 +1531,19 @@ msgstr "" "la boîte de dialogue de téléchargement." #. type: Title ==== -#: user-manual.txt:573 user-manual.txt:4294 user-manual.txt:4382 +#: user-manual.txt:582 user-manual.txt:4035 user-manual.txt:4123 #, no-wrap msgid "On Windows:" msgstr "Sur Windows :" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:574 -#, no-wrap -msgid "FIGURE: Download Bluetooth on Windows" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:574 +#: user-manual.txt:583 #, no-wrap msgid "images/DC_import_Bluetooth_Windows.png" msgstr "images/DC_import_Bluetooth_Windows.png" #. type: Plain text -#: user-manual.txt:584 +#: user-manual.txt:593 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 " @@ -1616,7 +1566,7 @@ msgstr "" "plongée. Un code ou PIN de 0000 est souvent le code par défaut." #. type: Plain text -#: user-manual.txt:591 +#: user-manual.txt:600 msgid "" "The pairing step is checked and done automatically during the download " "process. If the devices have never been paired the system will ask " @@ -1635,7 +1585,7 @@ msgstr "" "téléchargement et attendez la fin du processus." #. type: Plain text -#: user-manual.txt:599 +#: user-manual.txt:608 msgid "" "Currently _Subsurface_ works only with local Bluetooth adapters which use " "Microsoft Bluetooth Stack. If the local device uses _Widcomm_, _Stonestreet " @@ -1651,7 +1601,7 @@ msgstr "" "fonctionneront." #. type: Plain text -#: user-manual.txt:604 +#: user-manual.txt:613 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 " @@ -1667,7 +1617,18 @@ msgstr "" "Bluetooth\"_." #. type: Plain text -#: user-manual.txt:614 +#: user-manual.txt:622 +msgid "" +"The Subsurface support for BLTE dive computers on Windows is *EXPERIMENTAL* " +"and only supported on Windows 10. Please make sure that you have the latest " +"version of Windows 10. link:https://en.wikipedia.org/wiki/" +"Windows_10_version_history#Version_1803_(April_2018_Update)[Version 1803] is " +"a minimum requirement. Also make sure that you have installed the latest " +"drivers for your motherboard and/or BTLE dongle." +msgstr "" + +#. type: Plain text +#: user-manual.txt:632 #, no-wrap msgid "" "*IN CASE OF PROBLEMS*: If the Bluetooth adapter from the _Subsurface_ computer\n" @@ -1685,13 +1646,13 @@ msgstr "" "avec _Subsurface_.\n" #. type: Title ==== -#: user-manual.txt:616 +#: user-manual.txt:634 #, no-wrap msgid "Changing the name of a dive computer" msgstr "Changement du nom d'un ordinateur de plongée" #. type: Plain text -#: user-manual.txt:632 +#: user-manual.txt:650 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 " @@ -1726,13 +1687,13 @@ msgstr "" "modèle, permettant une identification plus facile des périphériques." #. type: Title ==== -#: user-manual.txt:634 +#: user-manual.txt:652 #, no-wrap msgid "Uploading data for a specific dive from more than one dive computer" msgstr "Chargement des données d'une plongée spécifique depuis plusieurs ordinateurs de plongée" #. type: Plain text -#: user-manual.txt:645 +#: user-manual.txt:663 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 " @@ -1760,13 +1721,13 @@ msgstr "" "par le choix de l'un ou l'autre ordinateur de plongée." #. type: Title ==== -#: user-manual.txt:647 +#: user-manual.txt:665 #, no-wrap msgid "Updating the dive information imported from the dive computer." msgstr "Mise à jour de l'information importée depuis un ordinateur de plongée." #. type: Plain text -#: user-manual.txt:654 +#: user-manual.txt:672 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 " @@ -1780,13 +1741,13 @@ msgstr "" "fenêtre de _Subsurface_ doivent être utilisés." #. type: Title ===== -#: user-manual.txt:656 +#: user-manual.txt:674 #, no-wrap msgid "Notes" msgstr "Notes" #. type: Plain text -#: user-manual.txt:661 +#: user-manual.txt:679 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-" @@ -1798,7 +1759,7 @@ msgstr "" "celles qui sont téléchargées depuis un ordinateur de plongée." #. type: Plain text -#: user-manual.txt:671 +#: user-manual.txt:689 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 " @@ -1819,20 +1780,14 @@ msgstr "" "cliquez sur l'onglet *Notes*, les champs suivants sont visibles (voir image " "en bas à gauche):" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:672 -#, no-wrap -msgid "FIGURE: The Notes tab" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:672 +#: user-manual.txt:690 #, no-wrap msgid "images/AddDive3_f22.jpg" msgstr "images/AddDive3_f22.jpg" #. type: Plain text -#: user-manual.txt:681 +#: user-manual.txt:699 msgid "" "The right hand image, above, shows a *Notes tab* filled with dive " "information. The *Date* and *Time* fields reflects the date and time of the " @@ -1850,7 +1805,7 @@ msgstr "" "texte et en remplaçant l'information qui s'y trouve." #. type: Plain text -#: user-manual.txt:691 +#: user-manual.txt:709 #, no-wrap msgid "" "*Air/water temperatures*: Air and water temperatures during the dive are shown\n" @@ -1874,13 +1829,13 @@ msgstr "" "seront utilisées).\n" #. type: Plain text -#: user-manual.txt:694 +#: user-manual.txt:712 #, no-wrap msgid "*Location*:\n" msgstr "*Lieu*:\n" #. type: Plain text -#: user-manual.txt:702 +#: user-manual.txt:720 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 " @@ -1901,7 +1856,7 @@ msgstr "" "*Notes*." #. type: Plain text -#: user-manual.txt:710 +#: user-manual.txt:728 #, no-wrap msgid "" "*Using existing dive locations:* Type in the name of the dive site, e.g. \"Tihany, Lake Balaton, Hungary\".\n" @@ -1913,20 +1868,14 @@ msgid "" "dive being entered. Then select _Apply Changes_ (image below) to save the geolocation for this dive site.\n" msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:711 -#, no-wrap -msgid "FIGURE:Location choice panel" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:711 +#: user-manual.txt:729 #, no-wrap msgid "images/Location1.jpg" msgstr "images/Location1.jpg" #. type: Plain text -#: user-manual.txt:717 +#: user-manual.txt:735 #, no-wrap msgid "" "*Entering a new dive location:* On the other hand, having dived at a new dive location,\n" @@ -1935,20 +1884,14 @@ msgid "" "(image A below).\n" msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:718 user-manual.txt:726 user-manual.txt:759 -#, no-wrap -msgid "FIGURE:Location creation panel" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:718 +#: user-manual.txt:736 #, no-wrap msgid "images/Globe_image1.jpg" msgstr "images/Globe_image1.jpg" #. type: Plain text -#: user-manual.txt:725 +#: user-manual.txt:743 msgid "" "Double-click on the blue bar below the new dive location name. The blue bar " "disappears (image B above) and the globe icon on the right-hand of the " @@ -1962,18 +1905,18 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:726 +#: user-manual.txt:744 #, no-wrap msgid "images/Globe_image2.jpg" msgstr "images/Globe_image2.jpg" #. type: Plain text -#: user-manual.txt:729 +#: user-manual.txt:747 msgid "There are three ways of adding the coordinates:" msgstr "Il existe trois façons d'ajouter des coordonnées :" #. type: Plain text -#: user-manual.txt:732 +#: user-manual.txt:750 #, no-wrap msgid "" "*(1):* Enter coordinates by hand if they are known, using one of\n" @@ -1983,7 +1926,7 @@ msgstr "" " en utilisant un des quatre formats avec la latitude suivie de la longitude :\n" #. type: Plain text -#: user-manual.txt:737 +#: user-manual.txt:755 #, no-wrap msgid "" "\tISO 6709 Annex D format e.g. 30°13'28.9\"N 30°49'1.5\"E\n" @@ -1997,7 +1940,7 @@ msgstr "" "\tDegrés décimaux, ex. 30.22496 , 30.821798\n" #. type: Plain text -#: user-manual.txt:746 +#: user-manual.txt:764 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 " @@ -2021,7 +1964,7 @@ msgstr "" "nom du site de plongée, dans l'\"onglet notes\"." #. type: Plain text -#: user-manual.txt:758 +#: user-manual.txt:776 #, no-wrap msgid "" "*(2):* Use the Dive Map to specify the coordinates. The Dive map now shows\n" @@ -2038,34 +1981,32 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:759 +#: user-manual.txt:777 #, no-wrap msgid "images/Globe_image3.jpg" msgstr "images/Globe_image3.jpg" #. type: Plain text -#: user-manual.txt:763 +#: user-manual.txt:781 msgid "" "Once the dive location data have been saved, the dive on the Dive List has a " "globe icon immediately to the left of the location name of a particular dive." msgstr "" #. type: Plain text -#: user-manual.txt:768 +#: user-manual.txt:785 #, no-wrap msgid "" -"*(3):* Obtain the coordinates using either the Subsurface-Mobile App or the _Subsurface_ Companion App on an\n" +"*(3):* Obtain the coordinates using the _Subsurface-mobile_ App on an\n" " Android or iPhone device with GPS and if the dive site coordinates\n" -" were stored using one of these apps.\n" -" xref:S_Companion[Click here for more information]\n" +" were stored using one of this app.\n" msgstr "" -"*(3):* Obtenir les coordonnées en utilisant soit l'application Subsurface-Mobile, soit l'application _Subsurface_ Companion avec un \n" -"périphérique Android ou un iPhone avec GPS si les coordonnées du site de plongée ont été stockées \n" +"*(3):* Obtenir les coordonnées en utilisant l'application _Subsurface-Mobile_ avec un \n" +"périphérique Android ou un iPhone avec GPS et si les coordonnées du site de plongée ont été stockées \n" "en utilisant une de ces applications. \n" -"xref:S_Companion[Cliquez ici pour plus d'information]\n" #. type: Plain text -#: user-manual.txt:776 +#: user-manual.txt:793 msgid "" "GPS coordinates of a dive site are linked to the location name - so *saving* " "a dive site with only coordinates and no name causes problems. (Subsurface " @@ -2078,7 +2019,7 @@ msgstr "" "même lieu et tentera de garder leurs coordonnées GPSidentiques)." #. type: Plain text -#: user-manual.txt:786 +#: user-manual.txt:803 #, no-wrap msgid "" "*Dive site name lookup:* If you typed coordinates into the appropriate\n" @@ -2101,7 +2042,7 @@ msgstr "" "sites nommés \"Blue Hole\", ils seront tous listés.\n" #. type: Plain text -#: user-manual.txt:791 +#: user-manual.txt:808 msgid "" "Enter any other contextual information about the dive site (Description and " "Notes), then select _Apply Changes_ to save the geolocation for this dive " @@ -2115,7 +2056,7 @@ msgstr "" "en forme de globe à droite du nom du site de plongée dans l'onglet *Notes*." #. type: Plain text -#: user-manual.txt:796 +#: user-manual.txt:813 #, no-wrap msgid "" "*Dive mode*: This is a dropdown box allowing you to choose the type of dive\n" @@ -2129,7 +2070,7 @@ msgstr "" "en circuit fermé) et pSCR (recycleur passif semi-fermé).\n" #. type: Plain text -#: user-manual.txt:801 +#: user-manual.txt:818 #, no-wrap msgid "" "*Divemaster*: The name of the divemaster or dive guide should be\n" @@ -2143,7 +2084,7 @@ msgstr "" "déjà présents dans le carnet en cours.\n" #. type: Plain text -#: user-manual.txt:806 +#: user-manual.txt:823 #, no-wrap msgid "" "*Buddy*: In this field, enter the name(s) of the buddy or buddies\n" @@ -2157,7 +2098,7 @@ msgstr "" "carnet en cours.\n" #. type: Plain text -#: user-manual.txt:811 +#: user-manual.txt:828 #, no-wrap msgid "" "*Suit*: Here the type of dive suit used can be entered.\n" @@ -2171,7 +2112,7 @@ msgstr "" "combinaison et souris ils ont utilisé.\n" #. type: Plain text -#: user-manual.txt:814 +#: user-manual.txt:831 #, no-wrap msgid "" "*Rating*: Provide a subjective overall rating of the dive on a\n" @@ -2181,7 +2122,7 @@ msgstr "" "échelle de 5 points en cliquant sur l'étoile correspondante.\n" #. type: Plain text -#: user-manual.txt:817 +#: user-manual.txt:834 #, no-wrap msgid "" "*Visibility*: Provide a rating of visibility during the\n" @@ -2191,7 +2132,7 @@ msgstr "" "échelle de 5 points en cliquant sur l'étoile correspondante.\n" #. type: Plain text -#: user-manual.txt:824 +#: user-manual.txt:841 #, no-wrap msgid "" "*Tags*: Tags that describe the type of dive done can be entered\n" @@ -2209,13 +2150,13 @@ msgstr "" "+cav+, les étiquettes *cave* et *caverne* sont proposées.\n" #. type: Plain text -#: user-manual.txt:826 +#: user-manual.txt:843 #, no-wrap msgid "*Notes*: Any additional information for the dive can be entered here.\n" msgstr "*Notes*: toute information supplémentaire concernant une plongée peut être entrée ici.\n" #. type: Plain text -#: user-manual.txt:831 +#: user-manual.txt:848 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. " @@ -2231,13 +2172,13 @@ msgstr "" "*Notes* après avoir complété les informations d'une plongée." #. type: Title ===== -#: user-manual.txt:832 +#: user-manual.txt:849 #, no-wrap msgid "Equipment" msgstr "Équipement" #. type: Plain text -#: user-manual.txt:837 +#: user-manual.txt:854 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 " @@ -2247,14 +2188,8 @@ msgstr "" "bloc et le gaz utilisé, ainsi que le lestage utilisé pour la plongée. Le " "message dans la boîte bleue en haut du panneau:" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:838 -#, no-wrap -msgid "FIGURE: Blue edit bar" -msgstr "" - #. type: Plain text -#: user-manual.txt:844 +#: user-manual.txt:861 msgid "" "shows the equipment is being edited. This is a highly interactive part of " "_Subsurface_ and the information on cylinders and gases (entered here) " @@ -2266,7 +2201,7 @@ msgstr "" "droite)." #. type: Plain text -#: user-manual.txt:848 +#: user-manual.txt:865 #, no-wrap msgid "" "*Cylinders*: The cylinder information is entered through a dialogue that looks\n" @@ -2275,20 +2210,14 @@ msgstr "" "*Blocs*: les informations concernant les blocs sont entrées via une boîte de dialogue\n" "qui ressemble à ceci:\n" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:849 -#, no-wrap -msgid "FIGURE: Initial cylinder dialogue" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:849 +#: user-manual.txt:866 #, no-wrap msgid "images/DC_gas-dialogue1_f20.jpg" msgstr "images/DC_gas-dialogue1_f20.jpg" #. type: Plain text -#: user-manual.txt:862 +#: user-manual.txt:879 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 " @@ -2315,20 +2244,14 @@ msgstr "" "boîte _Type_. Cela fera apparaître un bouton permettant d'afficher une liste " "déroulante de blocs:" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:863 -#, no-wrap -msgid "FIGURE: The cylinder drop-down list button" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:863 +#: user-manual.txt:880 #, no-wrap msgid "images/DC_gas-dialogue2_f20.jpg" msgstr "images/DC_gas-dialogue2_f20.jpg" #. type: Plain text -#: user-manual.txt:870 +#: user-manual.txt:887 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 " @@ -2343,7 +2266,7 @@ msgstr "" "automatiquement affichées dans la boîte de dialogue." #. type: Plain text -#: user-manual.txt:874 +#: user-manual.txt:891 msgid "" "Next, indicate the starting pressure and the ending pressure of the " "specified gas during the dive. The unit of pressure (metric/imperial) " @@ -2354,7 +2277,7 @@ msgstr "" "correspond au réglage choisi dans les _Préférences_." #. type: Plain text -#: user-manual.txt:885 +#: user-manual.txt:902 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 " @@ -2377,20 +2300,14 @@ msgstr "" "à droite. Voici un exemple d'une description complète pour une plongée " "utilisant deux blocs (air et EAN50):" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:886 -#, no-wrap -msgid "FIGURE: a completed cylinder dive information table" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:886 +#: user-manual.txt:903 #, no-wrap msgid "images/CylinderDataEntry3_f20.jpg" msgstr "images/CylinderDataEntry3_f20.jpg" #. type: Plain text -#: user-manual.txt:892 +#: user-manual.txt:909 #, no-wrap msgid "" "*Weights*: Information about the weight system used can be entered\n" @@ -2403,20 +2320,14 @@ msgstr "" "sur le bouton + en haut à droite , le tableau apparaît\n" "comme suit:\n" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:893 -#, no-wrap -msgid "FIGURE:The Weights dialogue" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:893 +#: user-manual.txt:910 #, no-wrap msgid "images/WeightsDataEntry1_f20.jpg" msgstr "images/WeightsDataEntry1_f20.jpg" #. type: Plain text -#: user-manual.txt:897 +#: user-manual.txt:914 msgid "" "By clicking on the _Type_ field, a drop-down list becomes accessible through " "a down-arrow:" @@ -2424,20 +2335,14 @@ msgstr "" "En cliquant sur le champ: _Type_, une liste déroulante devient accessible " "via une flèche vers le bas:" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:898 -#, no-wrap -msgid "FIGURE:Weights type drop-down list button" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:898 +#: user-manual.txt:915 #, no-wrap msgid "images/WeightsDataEntry2_f20.jpg" msgstr "images/WeightsDataEntry2_f20.jpg" #. type: Plain text -#: user-manual.txt:912 +#: user-manual.txt:929 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 " @@ -2462,26 +2367,20 @@ msgstr "" "gauche. Voici un exemple d'informations pour une plongée avec deux systèmes " "de lestage: des poids intégrés et une ceinture:" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:913 -#, no-wrap -msgid "FIGURE: A completed weights information table" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:913 +#: user-manual.txt:930 #, no-wrap msgid "images/WeightsDataEntry3_f20.jpg" msgstr "images/WeightsDataEntry3_f20.jpg" #. type: Title ==== -#: user-manual.txt:915 +#: user-manual.txt:932 #, no-wrap msgid "Editing several selected dives simultaneously" msgstr "Éditer simultanément une sélection de plusieurs plongées" #. type: Plain text -#: user-manual.txt:931 +#: user-manual.txt:948 msgid "" "_METHOD 1_: After downloading dives from a dive computer, the dive profiles " "of each is shown in the *Dive profile* tab, as well as a few items of " @@ -2499,7 +2398,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:941 +#: user-manual.txt:958 msgid "" "Simultaneous editing only works with fields that do not already contain " "information. This means if some fields have been edited for a particular " @@ -2514,7 +2413,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:950 +#: user-manual.txt:967 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 " @@ -2529,13 +2428,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:952 +#: user-manual.txt:969 #, no-wrap msgid "Adding Bookmarks to a dive" msgstr "Ajout des signets à une plongée" #. type: Plain text -#: user-manual.txt:957 +#: user-manual.txt:974 msgid "" "Many divers wish to annotate dives with text that indicate particular " "events, e.g. \"Saw dolphins\", or \"Released surface buoy\". This is easily " @@ -2546,7 +2445,7 @@ msgstr "" "\"Déploiement de parachute de palier\". Ceci peut ^être facilement réalisé:" #. type: Plain text -#: user-manual.txt:961 +#: user-manual.txt:978 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 " @@ -2558,7 +2457,7 @@ msgstr "" "plongée (voir *A* ci-dessous)." #. type: Plain text -#: user-manual.txt:963 +#: user-manual.txt:980 msgid "" "Right-click on the red flag. This brings up the context menu (see *B* " "below). Select _Edit name_." @@ -2567,7 +2466,7 @@ msgstr "" "(voir *B* ci-dessous). Sélectionnez _Modifier le nom_." #. type: Plain text -#: user-manual.txt:966 +#: user-manual.txt:983 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." @@ -2577,7 +2476,7 @@ msgstr "" "au signet." #. type: Plain text -#: user-manual.txt:969 +#: user-manual.txt:986 msgid "" "Hovering the mouse over the red bookmark, the appropriate text is shown at " "the bottom of the information box (see *D* below)." @@ -2585,26 +2484,20 @@ msgstr "" "En survolant le signet rouge avec la souris, le texte associé est affiché " "dans le bas de la boîte d'information (voir *D* ci-dessous)." -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:970 -#, no-wrap -msgid "FIGURE: Bookmark dialog" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:970 +#: user-manual.txt:987 #, no-wrap msgid "images/Bookmarks.jpg" msgstr "images/Bookmarks.jpg" #. type: Title ==== -#: user-manual.txt:973 +#: user-manual.txt:990 #, no-wrap msgid "Saving the updated dive information" msgstr "Enregistrer les informations de plongée mises à jour" #. type: Plain text -#: user-manual.txt:984 +#: user-manual.txt:1001 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 " @@ -2627,13 +2520,13 @@ msgstr "" "disque de l'ordinateur." #. type: Title === -#: user-manual.txt:985 +#: user-manual.txt:1002 #, 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:1008 +#: user-manual.txt:1025 msgid "" "Many divers log their dives using the proprietary software provided by the " "manufacturers of their dive computers. _Subsurface_ can import dive logs " @@ -2653,7 +2546,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1020 +#: user-manual.txt:1037 msgid "" "If the format of other software is supported natively on Subsurface, select " "either _Import -> Import log files_ or _File -> Open log file_. Notice that " @@ -2668,13 +2561,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:1021 +#: user-manual.txt:1038 #, no-wrap msgid "Using the universal import dialogue" msgstr "Utilisation de la boîte de dialogue universelle d'importation" #. type: Plain text -#: user-manual.txt:1027 +#: user-manual.txt:1044 msgid "" "Importing dives from other software is done through a universal interface " "activated by selecting _Import_ from the Main Menu, then clicking on _Import " @@ -2685,20 +2578,14 @@ msgstr "" "puis en cliquant sur _Importer des fichiers de plongée_. Ceci fera " "apparaître la boîte de dialogue *A*, comme ci-dessous." -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:1028 -#, no-wrap -msgid "FIGURE: Import dialogue: step 1" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:1028 +#: user-manual.txt:1045 #, no-wrap msgid "images/Import1_f20.jpg" msgstr "images/Import1_f20.jpg" #. type: Plain text -#: user-manual.txt:1033 +#: user-manual.txt:1050 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, " @@ -2710,7 +2597,7 @@ msgstr "" "s'agit de:" #. type: Plain text -#: user-manual.txt:1035 +#: user-manual.txt:1052 msgid "" "XML-formatted dive logs (DivingLog 5.0, MacDive and several other dive log " "systems)" @@ -2719,84 +2606,84 @@ msgstr "" "systèmes de carnet de plongée)" #. type: Plain text -#: user-manual.txt:1036 +#: user-manual.txt:1053 msgid "Cochran dive logs" msgstr "Carnets de plongée Cochran" #. type: Plain text -#: user-manual.txt:1037 +#: user-manual.txt:1054 msgid "UDDF-formatted dive logs (e.g. Kenozooid)" msgstr "Carnets de plongée formatés en UDDF (p. ex. Kenozooid)" #. type: Plain text -#: user-manual.txt:1038 +#: user-manual.txt:1055 msgid "UDCF-formatted dive logs" msgstr "Carnets de plongée formatés en UDCF" #. type: Plain text -#: user-manual.txt:1039 +#: user-manual.txt:1056 msgid "Poseidon MkVI CCR logs" msgstr "Logs Poseidon MkVI CCR" #. type: Plain text -#: user-manual.txt:1040 +#: user-manual.txt:1057 msgid "APD Inspiration/Evolution CCR logs" msgstr "Logs APD Inspiration/Evolution CCR" #. type: Plain text -#: user-manual.txt:1041 +#: user-manual.txt:1058 msgid "LiquiVision logs" msgstr "Logs LiquiVision" #. type: Plain text -#: user-manual.txt:1042 +#: user-manual.txt:1059 msgid "divelogs.de logs" msgstr "Logs divelogs.de" #. type: Plain text -#: user-manual.txt:1043 +#: user-manual.txt:1060 msgid "OSTC Tools logs" msgstr "Logs OSTC Tools" #. type: Plain text -#: user-manual.txt:1044 +#: user-manual.txt:1061 msgid "JDiveLog" msgstr "JDiveLog" #. type: Plain text -#: user-manual.txt:1045 +#: user-manual.txt:1062 msgid "Suunto Dive Manager (DM3, DM4, DM5)" msgstr "Suunto Dive Manager (DM3, DM4, DM5)" #. type: Plain text -#: user-manual.txt:1046 +#: user-manual.txt:1063 msgid "DL7 files used by Diver's Alert network (DAN)" msgstr "Fichers DL7 utilisés par Diver's Alert network (DAN)" #. type: Plain text -#: user-manual.txt:1047 +#: user-manual.txt:1064 msgid "Underwater technologies AV1 dive logs" msgstr "Logs Underwater technologies AV1" #. type: Plain text -#: user-manual.txt:1048 +#: user-manual.txt:1065 msgid "Divesoft dive logs" msgstr "Logs Divesoft" #. type: Plain text -#: user-manual.txt:1049 +#: user-manual.txt:1066 msgid "Poseidon MK VI eCCR dive logs" msgstr "Logs Poseidon MK VI eCCR" #. type: Plain text -#: user-manual.txt:1050 +#: user-manual.txt:1067 msgid "" "CSV (text-based and spreadsheet-based) dive logs, including APD CCR logs" msgstr "" "Carnet de plongée CSV (format texte ou tableau), y compris les logs APD CCR" #. type: Plain text -#: user-manual.txt:1055 +#: user-manual.txt:1072 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 " @@ -2811,13 +2698,13 @@ msgstr "" "dialogue d'importation, sont également supportés, comme expliqué ci-dessous." #. type: Title ==== -#: user-manual.txt:1056 +#: user-manual.txt:1073 #, no-wrap msgid "Importing from OSTCTools" msgstr "Importation depuis OSTCTools" #. type: Plain text -#: user-manual.txt:1065 +#: user-manual.txt:1082 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 " @@ -2830,7 +2717,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1069 +#: user-manual.txt:1086 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 " @@ -2842,7 +2729,7 @@ msgstr "" "CR." #. type: Plain text -#: user-manual.txt:1074 +#: user-manual.txt:1091 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 " @@ -2856,13 +2743,13 @@ msgstr "" "équipement, notes, etc.) doit être complété manuellement." #. type: Title ==== -#: user-manual.txt:1076 +#: user-manual.txt:1093 #, no-wrap msgid "Importing from Mares Dive Organizer V2.1" msgstr "Importation depuis Mares Dive Organizer V2.1" #. type: Plain text -#: user-manual.txt:1083 +#: user-manual.txt:1100 msgid "" "Since Mares uses proprietary Windows software not compatible with multi-" "platform applications, these dive logs cannot be directly imported into " @@ -2877,7 +2764,7 @@ msgstr "" "comme passerelle pour extraire les informations du carnet de plongée." #. type: Plain text -#: user-manual.txt:1088 +#: user-manual.txt:1105 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 " @@ -2888,7 +2775,7 @@ msgstr "" "vous à l'xref:Mares_Export[Annexe C] pour plus d'information." #. type: Plain text -#: user-manual.txt:1094 +#: user-manual.txt:1111 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 " @@ -2898,7 +2785,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1096 +#: user-manual.txt:1113 msgid "" "Finally, import the dives from _divelogs.de_ to _Subsurface_, using the " "instructions below." @@ -2907,13 +2794,13 @@ msgstr "" "suivant les instructions ci-dessous." #. type: Title ==== -#: user-manual.txt:1099 +#: user-manual.txt:1116 #, no-wrap msgid "Importing Scubapro _SmartTrak_ divelogs" msgstr "Importer les logs Scubapro _SmartTrak_" #. type: Plain text -#: user-manual.txt:1106 +#: user-manual.txt:1123 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 " @@ -2924,23 +2811,31 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1111 +#: user-manual.txt:1129 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_." +"generated by SmartTrak to Subsurface's _.xml_ format. It can be downloaded " +"from https://subsurface-divelog.org/downloads[the usual _Subsurface_ " +"repository], as a Windows installer or a Linux AppImage. The application is " +"not currently supported on Mac." msgstr "" #. type: Plain text -#: user-manual.txt:1113 +#: user-manual.txt:1132 +msgid "" +"It can also be built for Linux systems. Two dependencies need to be met in " +"your system before building: _glib2.0_ and _mdbtools_ (see below)." +msgstr "" + +#. type: Plain text +#: user-manual.txt:1134 msgid "" "In addition, a web service is available for divelog convertions from " "SmartTrak to _Subsurface_ (see below)." msgstr "" #. type: Plain text -#: user-manual.txt:1116 +#: user-manual.txt:1137 msgid "" "Feel free to contact the _Subsurface_ development team on mailto:" "subsurface@subsurface-divelog.org[our mailing list] for assistance in " @@ -2951,58 +2846,64 @@ msgstr "" "l'aide à l'importation des lofs _SmartTrak_." #. type: Title ===== -#: user-manual.txt:1117 +#: user-manual.txt:1138 #, no-wrap msgid "Building _smtk2ssrf_" msgstr "Compiler _smtk2ssrf_" #. type: Plain text -#: user-manual.txt:1121 +#: user-manual.txt:1142 msgid "" "Assuming the above dependencies have been installed and the _Subsurface_ " "source tree is in the directory _~/src/subsurface_, then:" msgstr "" #. type: Plain text -#: user-manual.txt:1123 -msgid "Move to the source tree directory." +#: user-manual.txt:1144 +msgid "Move to the source tree directory out of _Subsurface_ (e.g. ~/src)" msgstr "" #. type: Plain text -#: user-manual.txt:1125 +#: user-manual.txt:1147 msgid "" -"Run \" $ ccmake build \" and set SMARTTRAK_IMPORT option to *on* (off by " -"default)." +"Run \" $ ./subsurface/scripts/smtk2ssrf-build.sh \", if every thing has gone " +"fine, you will now have an executable named smtk2ssrf in ~/src/subsurface/" +"smtk-import/build" msgstr "" #. type: Plain text -#: user-manual.txt:1126 -msgid "Generate with [c] and save and exit with [g]." +#: user-manual.txt:1150 +msgid "" +"You can run it from this directory, copy it to another one, e.g. _~/bin_ or " +"simply run \"sudo make install\", and the binary will be installed in /usr/" +"local/bin (which is commonly included in every $PATH)." msgstr "" #. type: Plain text -#: user-manual.txt:1128 +#: user-manual.txt:1152 msgid "" -"Build as you prefer, using the _build.sh_ script (recomended) or moving to " -"build directory and running _make_." +"The script has some options mostly useful for development pourposes. If you " +"think you may need them, please read comments on script header itself." msgstr "" #. type: Plain text -#: user-manual.txt:1131 +#: user-manual.txt:1156 +#, no-wrap 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_." +"*WARNING*: While building smtk2ssrf, a light version of _Subsurface_ is\n" +"built (usable but lacking a lot of features). So, if you commonly use the\n" +"built executable placed at ~/subsurface/build/, you will need to rebuild it as\n" +"explained in this manual above.\n" msgstr "" #. type: Title ===== -#: user-manual.txt:1132 +#: user-manual.txt:1157 #, no-wrap msgid "Running" msgstr "Utilisation" #. type: Plain text -#: user-manual.txt:1138 +#: user-manual.txt:1163 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 " @@ -3010,20 +2911,14 @@ msgid "" "_Subsurface_-formatted data into (see image below)." msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:1139 -#, no-wrap -msgid "FIGURE:Download from SmartTrak" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:1139 +#: user-manual.txt:1164 #, no-wrap msgid "images/smtk2ssrf.jpg" msgstr "images/smtk2ssrf.jpg" #. type: Plain text -#: user-manual.txt:1146 +#: user-manual.txt:1171 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* " @@ -3031,20 +2926,20 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1148 +#: user-manual.txt:1173 msgid "" "If launched from a command line with two or more parameters, the format is " "as follows:" msgstr "" #. type: Plain text -#: user-manual.txt:1150 +#: user-manual.txt:1175 #, no-wrap msgid "\t$ smrtk2ssrf /input/file_1.slg /input/file_2.slg /output/file3.xml\n" msgstr "\t$ smrtk2ssrf /input/file_1.slg /input/file_2.slg /output/file3.xml\n" #. type: Plain text -#: user-manual.txt:1158 +#: user-manual.txt:1183 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 " @@ -3055,23 +2950,23 @@ msgid "" msgstr "" #. type: Title ===== -#: user-manual.txt:1159 +#: user-manual.txt:1184 #, no-wrap msgid "For the lazy: a web service to convert _SmartTrak_ to _Subsurface_" msgstr "" #. type: Plain text -#: user-manual.txt:1162 +#: user-manual.txt:1187 msgid "Open the website at:" msgstr "" #. type: Plain text -#: user-manual.txt:1164 +#: user-manual.txt:1189 msgid "_https://thetheoreticaldiver.org/rch-cgi-bin/smtk2ssrf.pl_" msgstr "" #. type: Plain text -#: user-manual.txt:1170 +#: user-manual.txt:1195 msgid "" "This is a no-frills web service for converting _SmartTrak_ dive logs to " "_Subsurface_. Select the browse button. This allows you to browse your " @@ -3081,26 +2976,20 @@ msgid "" "the local computer." msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:1171 -#, no-wrap -msgid "FIGURE:Web service to convert SmartTrak divelog" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:1171 +#: user-manual.txt:1196 #, no-wrap msgid "images/strk2ssrf_web.jpg" msgstr "images/strk2ssrf_web.jpg" #. type: Title ===== -#: user-manual.txt:1173 +#: user-manual.txt:1198 #, no-wrap msgid "Merging the imported dives with the existing divelog" msgstr "Fusionner les plongées importées dans un carnet de plongée existant" #. type: Plain text -#: user-manual.txt:1183 +#: user-manual.txt:1208 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 " @@ -3113,13 +3002,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:1185 +#: user-manual.txt:1210 #, no-wrap msgid "Importing dives from *divelogs.de*" msgstr "Importer des plongées depuis *divelogs.de*" #. type: Plain text -#: user-manual.txt:1198 +#: user-manual.txt:1223 msgid "" "Importing dive information from _divelogs.de_ is simple, using a single " "dialogue box. The _Import -> Import from Divelogs.de_ option should be " @@ -3132,26 +3021,20 @@ msgid "" "_Subsurface_ *Dive List* panel." msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:1199 -#, no-wrap -msgid "FIGURE:Download from Divelogs.de" -msgstr "FIGURE: Télécharger depuis Divelogs.de" - #. type: Target for macro image -#: user-manual.txt:1199 +#: user-manual.txt:1224 #, no-wrap msgid "images/Divelogs1.jpg" msgstr "images/Divelogs1.jpg" #. type: Title ==== -#: user-manual.txt:1202 +#: user-manual.txt:1227 #, no-wrap msgid "Importing data in CSV format" msgstr "Importer des données au format CSV" #. type: Plain text -#: user-manual.txt:1213 +#: user-manual.txt:1238 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 " @@ -3167,13 +3050,13 @@ msgid "" msgstr "" #. type: Title ===== -#: user-manual.txt:1215 +#: user-manual.txt:1240 #, 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:1220 +#: user-manual.txt:1245 msgid "" "_CSV_ files can be viewed using an ordinary text editor. A _CSV_ file is " "normally organized into a single line that provides the headers (or _field " @@ -3182,7 +3065,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1222 +#: user-manual.txt:1247 msgid "" "There are two types of _CSV_ dive logs that can be imported into " "_Subsurface_:" @@ -3191,7 +3074,7 @@ msgstr "" "importées dans _Subsurface_:" #. type: Plain text -#: user-manual.txt:1228 +#: user-manual.txt:1253 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, " @@ -3202,7 +3085,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1237 +#: user-manual.txt:1262 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 " @@ -3216,14 +3099,14 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1240 +#: user-manual.txt:1265 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:1248 +#: user-manual.txt:1273 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 " @@ -3235,7 +3118,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1252 +#: user-manual.txt:1277 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 " @@ -3244,7 +3127,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1254 +#: user-manual.txt:1279 msgid "" "Is the numeric information (e.g. dive depth) in metric or in imperial units?" msgstr "" @@ -3252,7 +3135,7 @@ msgstr "" "système métrique ou mesures impériales?" #. type: Plain text -#: user-manual.txt:1261 +#: user-manual.txt:1286 msgid "" "With this information, importing the data into _Subsurface_ is " "straightforward. Select _Import -> Import Log Files_ from the main menu. In " @@ -3261,20 +3144,14 @@ msgid "" "that needs to be imported. A configuration panel appears as depicted below:" msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:1262 -#, no-wrap -msgid "FIGURE: CSV download dialogue 1" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:1262 +#: user-manual.txt:1287 #, no-wrap msgid "images/csv_import1_f20.jpg" msgstr "images/csv_import1_f20.jpg" #. type: Plain text -#: user-manual.txt:1273 +#: user-manual.txt:1298 #, no-wrap msgid "" "At the top left, there is a dropdown list containing pre- configured\n" @@ -3289,7 +3166,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1285 +#: user-manual.txt:1310 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 " @@ -3305,20 +3182,14 @@ msgid "" "depicted in the image below." msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:1286 -#, no-wrap -msgid "FIGURE: CSV download dialogue 2" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:1286 +#: user-manual.txt:1311 #, no-wrap msgid "images/csv_import2_f20.jpg" msgstr "images/csv_import2_f20.jpg" #. type: Plain text -#: user-manual.txt:1292 +#: user-manual.txt:1317 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. " @@ -3327,13 +3198,13 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:1296 +#: user-manual.txt:1321 #, no-wrap msgid "*A Diver's Introduction to _CSV_ Files*\n" msgstr "*Introduction aux fichiers _CSV_ pour la plongée*\n" #. type: delimited block * -#: user-manual.txt:1310 +#: user-manual.txt:1335 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 " @@ -3350,7 +3221,7 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:1319 +#: user-manual.txt:1344 msgid "" "The most important attribute of a _CSV_ file is the _field separator_, the " "character used to separate fields within a single line. The field separator " @@ -3365,7 +3236,7 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:1325 +#: user-manual.txt:1350 #, no-wrap msgid "" "\tDive site,Dive date,Time,Dive_duration, Dive_depth,Dive buddy\n" @@ -3376,7 +3247,7 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:1327 +#: user-manual.txt:1352 msgid "" "The above data are not easily read by a human. Here is the same information " "in TAB-delimited format:" @@ -3385,7 +3256,7 @@ msgstr "" "Voici les mêmes informations dans un format séparé par des tabulations :" #. type: delimited block * -#: user-manual.txt:1333 +#: user-manual.txt:1358 #, no-wrap msgid "" "\tDive site Dive date\tTime\tDive_duration\tDive_depth\tDive buddy\n" @@ -3396,7 +3267,7 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:1341 +#: user-manual.txt:1366 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 " @@ -3410,7 +3281,7 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:1352 +#: user-manual.txt:1377 #, no-wrap msgid "" "\tDive Time (s)\tDepth (m)\tpO~2~ - Setpoint (Bar) \tpO~2~ - C1 Cell 1 (Bar)\tAmbient temp. (Celsius)\n" @@ -3426,7 +3297,7 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:1358 +#: user-manual.txt:1383 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_ " @@ -3437,7 +3308,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1371 +#: user-manual.txt:1396 msgid "" "But, the _CSV_ import has a couple of caveats. Avoid some special characters " "like ampersand (&), less than (<), greater than (>) and double quotes (\") " @@ -3450,13 +3321,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:1372 +#: user-manual.txt:1397 #, no-wrap msgid "Importing Dive coordinates from a mobile device with GPS." msgstr "Importation des coordonnées de plongée depuis un appareil mobile avec GPS." #. type: Plain text -#: user-manual.txt:1376 +#: user-manual.txt:1401 msgid "" "A smartphone with built-in GPS facilities can be used to store the locations " "of dives. This is performed by:" @@ -3465,78 +3336,52 @@ msgstr "" "Ceci est réalisé comme suit:" #. type: Plain text -#: user-manual.txt:1379 +#: user-manual.txt:1404 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:1381 -msgid "" -"Uploading the coordinates from the mobile device to the _Subsurface_ " -"Internet server." -msgstr "" - -#. type: Plain text -#: user-manual.txt:1384 +#: user-manual.txt:1406 msgid "" -"Syncronising the dives in the _Subsurface_ dive list with the coordinates " -"stored on the _Subsurface_ Internet server." +"Adding collected coordinate information to the dives using the _Subsurface-" +"mobile_ app." msgstr "" #. type: Plain text -#: user-manual.txt:1386 -msgid "_Subsurface_ has two tools for achieving this:" -msgstr "_Subsurface_ comporte deux outils pour réaliser cela :" - -#. type: Plain text -#: user-manual.txt:1388 -msgid "The _Subsurface Companion App_ (Android and iOS)." -msgstr "L'application _Subsurface Companion_ (Android et iOS)." - -#. type: Plain text -#: user-manual.txt:1390 -msgid "The _Subsurface-mobile_ app (Android and iOS)" -msgstr "L'application _Subsurface-mobile_ (Android et iOS)" - -#. type: Plain text -#: user-manual.txt:1399 +#: user-manual.txt:1408 msgid "" -"Both of these applications perform the collection of dive site coordinates " -"and the synchronisation with dives in the _Subsurface_ dive list. However, " -"the Companion App is not being further developed and has largely been " -"replaced by the _Subsurface-mobile_ app. While the _Companion app_ serves " -"exclusively to collect dive site coordinates and to make these available to " -"the _Subsurface_ desktop version, _Subsurface-mobile_ performs many of the " -"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." +"Syncronising the logbook with the _Subsurface_ cloud using the _Subsurface-" +"mobile_ app." msgstr "" #. type: Plain text -#: user-manual.txt:1401 +#: user-manual.txt:1414 msgid "" -"For information on using the _Subsurface Companion App_, click xref:" -"S_Companion[_here_]." +"Existing users might still be using the legacy _Companion app_. However, the " +"Companion App hasn't been under development in several years and has now " +"been removed from both Android and iOS app stores. The functionality is " +"fully integrated into _Subsurface-mobile_. Please note that the old GPS fix " +"internet service will be shut down by the end 2018 at which point the " +"_Companion app_ will no longer be usable. Please switch to _Subsurface-" +"mobile_ instead." msgstr "" -"Pour plus d'information sur l'utilisation de l'application _Subsurface " -"Companion_, cliquez xref:S_Companion[_ici_]." #. type: Title ==== -#: user-manual.txt:1402 +#: user-manual.txt:1415 #, no-wrap msgid "Storing and and using GPS locations using _Subsurface-mobile_" msgstr "" #. type: Title ===== -#: user-manual.txt:1404 +#: user-manual.txt:1417 #, no-wrap msgid "Install _Subsurface-mobile_" msgstr "" #. type: Plain text -#: user-manual.txt:1410 +#: user-manual.txt:1423 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-" @@ -3545,13 +3390,13 @@ msgid "" msgstr "" #. type: Title ===== -#: user-manual.txt:1411 +#: user-manual.txt:1424 #, no-wrap msgid "Create a _Subsurface-mobile_ account" msgstr "" #. type: Plain text -#: user-manual.txt:1419 +#: user-manual.txt:1432 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 " @@ -3563,33 +3408,27 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1422 +#: user-manual.txt:1435 #, no-wrap msgid "" "*N.B.:* To successfully create a user account, the mobile device must have Internet connectivity,\n" "either through the cellular network or via wifi.\n" msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:1423 -#, no-wrap -msgid "FIGURE: Subsurface-mobile, credentials screen" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:1423 +#: user-manual.txt:1436 #, no-wrap msgid "images/MobileCredentials.jpg" msgstr "images/MobileCredentials.jpg" #. type: Title ===== -#: user-manual.txt:1426 +#: user-manual.txt:1439 #, no-wrap msgid "Configure auto-collecting of GPS coordinates" msgstr "" #. type: Plain text -#: user-manual.txt:1432 +#: user-manual.txt:1445 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 " @@ -3599,19 +3438,19 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1434 +#: user-manual.txt:1447 msgid "" "_Time threshold._ (minutes). The app will try to get a location every X " "minutes" msgstr "" #. type: Plain text -#: user-manual.txt:1436 +#: user-manual.txt:1449 msgid "_Distance threshold._ (meters). Minimum distance between two locations." msgstr "" #. type: Plain text -#: user-manual.txt:1445 +#: user-manual.txt:1458 #, no-wrap msgid "" "*How are GPS coordinates collected?* Assuming the diver sets 5 minutes and 50\n" @@ -3625,76 +3464,46 @@ msgid "" msgstr "" #. type: Title ===== -#: user-manual.txt:1446 +#: user-manual.txt:1459 #, no-wrap msgid "Activate the automated recording of GPS locations" msgstr "" #. type: Plain text -#: user-manual.txt:1451 +#: user-manual.txt:1464 msgid "" "The _Subsurface-mobile_ GPS menu has an option at the bottom labled _Run " "location service_ (see image below). Selecting this starts the automated " "recording of GPS positions." msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:1452 -#, no-wrap -msgid "FIGURE: Subsurface-mobile GPS menu" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:1452 +#: user-manual.txt:1465 #, no-wrap msgid "images/MobileGpsMenu.jpg" msgstr "images/MobileGpsMenu.jpg" #. type: Title ===== -#: user-manual.txt:1454 +#: user-manual.txt:1467 #, no-wrap msgid "After the dive, stop the automated recording of GPS locations" msgstr "" #. type: Plain text -#: user-manual.txt:1457 +#: user-manual.txt:1470 msgid "" "Select the menu option _Disable location service_ at the bottom of the " "_Subsurface-mobile_ GPS menu." msgstr "" #. type: Title ===== -#: user-manual.txt:1458 -#, no-wrap -msgid "Upload the GPS locations onto the _Subsurface_ Internet server." -msgstr "" - -#. type: Plain text -#: user-manual.txt:1465 -#, no-wrap -msgid "" -"*N.B.:* Uploading the GPS locations to the Internet can only take place if the mobile\n" -"device has reliable access to the Internet, either via a cellular network or\n" -"via a wifi connection. If the Internet is not accessible from the dive site(s),\n" -"then GPS uploading can only take place after the dive or after the dive trip,\n" -"when an Internet connection has been re-established.\n" -msgstr "" - -#. type: Plain text -#: user-manual.txt:1468 -msgid "" -"From the _Subsurface-mobile_ main menu, select _GPS_ -> _Upload GPS data_. " -"The locations are uploaded." -msgstr "" - -#. type: Title ===== -#: user-manual.txt:1469 +#: user-manual.txt:1472 #, no-wrap msgid "Apply the stored GPS locations to dives on the _Subsurface_ dive list." msgstr "" #. type: Plain text -#: user-manual.txt:1478 +#: user-manual.txt:1481 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 " @@ -3706,7 +3515,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1483 +#: user-manual.txt:1486 msgid "" "The https://subsurface-divelog.org/documentation/subsurface-mobile-user-" "manual[user manual for _Subsurface-mobile_] (accessible from within that " @@ -3714,650 +3523,78 @@ msgid "" "data and for managing, uploading and synchronising this information." msgstr "" -#. type: Title ==== -#: user-manual.txt:1486 -#, no-wrap -msgid "Importing GPS coordinates with the _Subsurface Companion App_ for mobile phones" -msgstr "" - -#. type: Plain text -#: user-manual.txt:1495 -#, no-wrap -msgid "" -"Using the *Subsurface Companion App* on an _Android device_ or\n" -"xref:S_iphone[_iPhone_] with GPS, the coordinates\n" -"for the diving\n" -"location can be automatically passed to the _Subsurface_ dive log. The Companion App\n" -"stores dive locations on a dedicated Internet server. _Subsurface_ can collect\n" -"the locations from the server.\n" -"To do this:\n" -msgstr "" - -#. type: Title ===== -#: user-manual.txt:1496 -#, no-wrap -msgid "Create a Companion App account" -msgstr "" - -#. type: Plain text -#: user-manual.txt:1501 -msgid "" -"Register on the http://api.hohndel.org/login/[_Subsurface companion web " -"page_]. A confirmation email with instructions and a personal *DIVERID* " -"will be sent, a long number enabling access to the file server and Companion " -"App capabilities." -msgstr "" - -#. type: Plain text -#: user-manual.txt:1506 -msgid "" -"Download the app from https://play.google.com/store/apps/details?id=org." -"subsurface[Google Play Store] or from https://f-droid.org/repository/browse/?" -"fdfilter=subsurface&fdid=org.subsurface[F-Droid]." -msgstr "" - -#. type: Title ===== -#: user-manual.txt:1507 -#, no-wrap -msgid "Using the Subsurface companion app on an Android smartphone" -msgstr "" - -#. type: Plain text -#: user-manual.txt:1510 -msgid "On first use the app has three options:" -msgstr "" - -#. type: Plain text -#: user-manual.txt:1516 -msgid "" -"_Create a new account._ Equivalent to registering in the _Subsurface_ " -"companion page using an Internet browser. You can request a *DIVERID* using " -"this option, but it’s supplied via email and followed up by interaction with " -"the http://api.hohndel.org/login/[_Subsurface companion web page_] to " -"activate the account." -msgstr "" - -#. type: Plain text -#: user-manual.txt:1519 -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:1523 -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 " -"_Disconnect_ menu option (see below)." -msgstr "" - -#. type: Plain text -#: user-manual.txt:1531 -msgid "" -"In the _Subsurface_ main program, the *DIVERID* should also be entered on " -"the Default Preferences panel, by selecting _File -> Preferences -> General_ " -"from the main menu in _Subsurface_ itself. This helps synchronization " -"between _Subsurface_ and the Companion App." -msgstr "" - -#. type: Plain text -#: user-manual.txt:1533 -#, no-wrap -msgid "*Creating new dive locations*\n" -msgstr "*Créer de nouveaux emplacements de plongée*\n" - -#. type: Plain text -#: user-manual.txt:1537 -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 " -"dives." -msgstr "" - -#. type: Plain text -#: user-manual.txt:1540 -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:1543 -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:1552 -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 " -"_long press_ on the touch sensitive screen (if the marked location is wrong, " -"simply choose a new location) and select the check symbol in the upper " -"right. A dialog is shown allowing you to enter the name of the dive location " -"and the date and time of the dive (see *C* below). In order to import this " -"dive location in _Subsurface_, set the time to agree with the time of that " -"dive on the dive computer." -msgstr "" - -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:1553 user-manual.txt:1579 -#, no-wrap -msgid "FIGURE: Companion App, add location using map" -msgstr "" - -#. type: Target for macro image -#: user-manual.txt:1553 -#, no-wrap -msgid "images/Companion_5.jpg" -msgstr "images/Companion_5.jpg" - -#. type: Plain text -#: user-manual.txt:1560 -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 " -"locations shown. Now select the appropriate locations, and select the check " -"symbol in the upper right to add them." -msgstr "" - -#. type: Plain text -#: user-manual.txt:1563 -#, no-wrap -msgid "*List of dive locations*\n" -msgstr "*Liste des emplacements de plongée*\n" - -#. type: Plain text -#: user-manual.txt:1570 -msgid "" -"The main screen shows a list of dive locations, each with a name, date and " -"time (see *A* below). Some locations may have an arrow-up icon over the " -"selection box to the left showing they need to be uploaded to the server. " -"You can select individual dive locations from the list. A selected location " -"has a check mark in the selection box on the left. Group operations (like " -"_Delete_ or _Send_) are performed on several selected locations." -msgstr "" - -#. type: Plain text -#: user-manual.txt:1578 -msgid "" -"Dive locations in this list can be viewed in two ways: a list of locations " -"or a map showing them. The display mode (List or Map) is changed by " -"selecting _Dives_ at the top left of the screen (see *A* below) and then " -"selecting the display mode. The display mode can be changed either from the " -"list of locations or from the map (see *B* below). Upon selecting a location " -"(on the list or on the map), an editing panel opens (see *C* below) where " -"the dive description or other details may be changed." -msgstr "" - -#. type: Target for macro image -#: user-manual.txt:1579 -#, no-wrap -msgid "images/Companion_4.jpg" -msgstr "images/Companion_4.jpg" - -#. type: Plain text -#: user-manual.txt:1585 -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 " -"screen:" -msgstr "" - -#. type: Plain text -#: user-manual.txt:1587 -msgid "Edit (pencil): Change the name of the dive location." -msgstr "" - -#. type: Plain text -#: user-manual.txt:1592 -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 " -"below." -msgstr "" - -#. type: Plain text -#: user-manual.txt:1594 -#, no-wrap -msgid "*Uploading dive locations*\n" -msgstr "" - -#. type: Plain text -#: user-manual.txt:1599 -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 " -"arrow at the top right of the screen." -msgstr "" - -#. type: Plain text -#: user-manual.txt:1604 -msgid "" -"Be careful! The trash icon on the right means exactly what it should; it " -"deletes the selected dive location(s)." -msgstr "" - -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:1605 -#, no-wrap -msgid "FIGURE: Screen shots (A-B) of companion app" -msgstr "" - -#. type: Target for macro image -#: user-manual.txt:1605 -#, no-wrap -msgid "images/Companion_1.jpg" -msgstr "images/Companion_1.jpg" - -#. type: Plain text -#: user-manual.txt:1610 -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:1613 -#, no-wrap -msgid "*Settings on the Companion App*\n" -msgstr "" - -#. type: Plain text -#: user-manual.txt:1615 -msgid "" -"Selecting the _Settings_ menu option results in the right hand image above " -"(*B*)." -msgstr "" - -#. type: Plain text -#: user-manual.txt:1617 -msgid "_Server and account_" -msgstr "" - -#. type: Plain text -#: user-manual.txt:1619 -msgid "_Web-service URL._ This is predefined (http://api.hohndel.org/)" -msgstr "" - -#. type: Plain text -#: user-manual.txt:1622 -msgid "" -"_User ID._ The DIVERID obtained by registering as described above. The " -"easiest way to get it is to copy and paste from the confirmation email or " -"just type it in." -msgstr "" - -#. type: Plain text -#: user-manual.txt:1624 -msgid "_Synchronisation_" -msgstr "_Synchronisation_" - -#. type: Plain text -#: user-manual.txt:1627 -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:1630 -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:1632 -msgid "_Background service_" -msgstr "" - -#. type: Plain text -#: user-manual.txt:1635 -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:1637 -msgid "The settings below define the behavior of the service:" -msgstr "" - -#. type: Plain text -#: user-manual.txt:1640 -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:1642 -msgid "_Min distance._ In meters. Minimum distance between two locations." -msgstr "" - -#. type: Plain text -#: user-manual.txt:1644 -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:1645 user-manual.txt:1746 user-manual.txt:2273 -#, no-wrap -msgid "images/icons/info.jpg" -msgstr "images/icons/info.jpg" - -#. type: Plain text -#: user-manual.txt:1655 -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 " -"location at the current location, followed by another one at every 5 minutes " -"*or* every time one moves 50 m from previous location. If subsequent " -"locations are within a radius of 50 meters from the previous one, a new " -"location is not saved. If the diver is not moving, only one location is " -"saved. If the diver is moving, a trace of the route is obtained by saving a " -"location every 50 meters." -msgstr "" - -#. type: Plain text -#: user-manual.txt:1657 -msgid "_Other_" -msgstr "" - -#. type: Plain text -#: user-manual.txt:1660 -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:1662 -msgid "_Subsurface website._ A link to the URL of Subsurface web" -msgstr "" - -#. type: Plain text -#: user-manual.txt:1664 -msgid "_Version._ Displays the current version of the Companion App." -msgstr "" - -#. type: Plain text -#: user-manual.txt:1666 -msgid "_Search_" -msgstr "" - -#. type: Plain text -#: user-manual.txt:1668 -msgid "Search the saved dive locations by name or by date and time." -msgstr "" - -#. type: Plain text -#: user-manual.txt:1670 -msgid "_Start service_" -msgstr "" - -#. type: Plain text -#: user-manual.txt:1672 -msgid "" -"Starts the _background service_ following the previously defined settings." -msgstr "" - -#. type: Plain text -#: user-manual.txt:1674 -msgid "_Disconnect_" -msgstr "" - -#. type: Plain text -#: user-manual.txt:1681 -msgid "" -"This is admittedly a badly named option that disconnects the app from the " -"server. It resets the user ID in the app, showing the first screen where an " -"account can be created, retrieve the ID for an existing account or use the " -"users own ID. The _Disconnect_ option is useful if the Android device was " -"used to download the dive locations of another registered diver." -msgstr "" - -#. type: Plain text -#: user-manual.txt:1683 -msgid "_Send all locations_" -msgstr "" - -#. type: Plain text -#: user-manual.txt:1685 -msgid "" -"This option sends all locations stored in the Android device to the server." -msgstr "" - -#. type: Title ===== -#: user-manual.txt:1687 -#, no-wrap -msgid "Using the Subsurface companion app on an _iPhone_ to record dive locations" -msgstr "" - -#. type: Plain text -#: user-manual.txt:1692 -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 " -"left part of the image below) and start collecting dive location information." -msgstr "" - -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:1693 -#, no-wrap -msgid "FIGURE: Using iPhone companion application" -msgstr "" - -#. type: Target for macro image -#: user-manual.txt:1693 -#, no-wrap -msgid "images/iphone.jpg" -msgstr "images/iphone.jpg" - -#. type: Plain text -#: user-manual.txt:1704 -msgid "" -"Dives can be added automatically or manually. In manual mode, a dive " -"location or waypoint is added to the GPS input stream. In automatic mode, a " -"continuous path of GPS locations is created from which, after import, " -"Subsurface can select the appropriate GPS locations based on the times of " -"dives. The default mode for the _iphone_ is automatic. When adding a dive, " -"the location service is started automatically and a red bar appears at the " -"bottom of the screen. After the dive, click on the red bar to end the " -"location service. While the location service is running you can only add " -"dives manually." -msgstr "" - -#. type: Plain text -#: user-manual.txt:1710 -msgid "" -"You can edit the site name afterwards by selecting the dive from the dive " -"list and clicking on the site name. There are no other editable fields. The " -"dive list is automatically uploaded from the iPhone to the web service. " -"There is no option to trigger upload manually." -msgstr "" - -#. type: Plain text -#: user-manual.txt:1713 -#, no-wrap -msgid "*Downloading dive locations to the _Subsurface_ divelog*\n" -msgstr "" - -#. type: Plain text -#: user-manual.txt:1721 -msgid "" -"Download dive(s) from a dive computer or enter them manually into " -"_Subsurface_ before obtaining the GPS coordinates from the server. The " -"download dialog can be reached via _Ctrl+G_ or from the _Subsurface_ Main " -"Menu _Import -> Import GPS data from Subsurface Service_, resulting in the " -"image on the left (*A*), below. On first use the DIVERID text box is blank. " -"Provide a DIVERID, then select the _Download_ button to start the download " -"process, after which the screen on the right (*B*) below appears:" -msgstr "" - -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:1722 -#, no-wrap -msgid "FIGURE: Downloading Companion app GPS data" -msgstr "" - -#. type: Target for macro image -#: user-manual.txt:1722 -#, no-wrap -msgid "images/DownloadGPS.jpg" -msgstr "images/DownloadGPS.jpg" - -#. type: Plain text -#: user-manual.txt:1730 -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 " -"applies the coordinates and names entered on the app to all the new dives " -"that match the date-times of the uploaded GPS localities. The names of dive " -"locations entered within _Subsurface_ (i.e. before downloading the GPS " -"coordinates) have precedence over downloaded dive locations." -msgstr "" - -#. type: Plain text -#: user-manual.txt:1737 -msgid "" -"Since _Subsurface_ matches GPS locations from the mobile device and dive " -"information from the dive computer based on date-time data, automatic " -"assignment of GPS data to dives depends on agreeing date-time information " -"between the two devices. Although _Subsurface_ has a wide range tolerance, " -"it may not be able to identify the appropriate dive if there is a large " -"difference between the time in the dive computer and that of the Android " -"device. This results in no updates." -msgstr "" - -#. type: Plain text -#: user-manual.txt:1745 -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 " -"is the correct position for a dive (e.g. on repetitive dives while running " -"_background service_ there may be several locations that would be included " -"in the time range that fit not only the first dive, but one or more " -"subsequent dives as well). A workaround to manually edit the date-time of a " -"dive in the _Subsurface_ Dive List *before* downloading the GPS data and " -"then to change the date-time back again *after* downloading GPS data." -msgstr "" - -#. type: Plain text -#: user-manual.txt:1749 -msgid "TIPS:" -msgstr "CONSEILS:" - -#. type: Plain text -#: user-manual.txt:1752 -msgid "" -"_Background service_ may fill the location list with unnecessary locations " -"that don’t correspond to the exact dive point but do correspond to the " -"boat's route." -msgstr "" - -#. type: Plain text -#: user-manual.txt:1753 -msgid "" -"Right now, these locations are difficult to delete from the server. In some " -"situations it" -msgstr "" - -#. type: Plain text -#: user-manual.txt:1756 -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. " -"This might be necessary, for instance, to keep the location list clear to " -"see dives in the web service map display (see above)." -msgstr "" - -#. type: Plain text -#: user-manual.txt:1759 -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_ " -"setting while running the _background service_, especially on a dive trip " -"with many dives and dive locations." -msgstr "" - #. type: Title === -#: user-manual.txt:1761 +#: user-manual.txt:1489 #, no-wrap -msgid "Adding photographs to dives" -msgstr "Ajouter des photos aux plongées" +msgid "Adding photographs or videos to dives" +msgstr "Ajouter des photos ou des vidéos aux plongées" #. type: Plain text -#: user-manual.txt:1767 +#: user-manual.txt:1497 msgid "" -"Many (if not most) divers take photographs during a dive. _Subsurface_ " -"allows the storage and display of photographs for each dive. Photos are " -"superimposed on the dive profile at the times during the dive when they were " -"taken. They can also be viewed from the dive profile." +"Many (if not most) divers take photographs or videos during a dive. We term " +"these as _media_, meaning either photos or videos. _Subsurface_ allows the " +"storage and display of these media for each dive. Images are superimposed on " +"the dive profile at the times during the dive when they were taken. Media " +"can be viewed either from the dive profile or from the _Media_ tab in the " +"*Notes Panel*. _Subsurface_ allows viewing of photographs as well as video " +"files in a unified interface." msgstr "" #. type: Title ==== -#: user-manual.txt:1768 +#: user-manual.txt:1498 #, no-wrap -msgid "Loading photos and synchronizing between dive computer and camera" -msgstr "Chargement des photos et synchronisation entre l'ordinateur de plongée et l'appareil photo" +msgid "Loading media and synchronizing between dive computer and camera" +msgstr "Chargement des médias et synchronisation entre l'ordinateur de plongée et l'appareil photo" #. type: Plain text -#: user-manual.txt:1774 +#: user-manual.txt:1506 msgid "" "Right-click on a dive or on a group of dives on the dive list, bringing up " "the xref:S_DiveListContextMenu[Dive list context Menu]. Select the " -"appropriate option to import images either from file or from the Internet. " -"The system file browser appears. Select the folder and photographs that need " -"to be loaded into _Subsurface_ and click the _Open_ button." -msgstr "" - -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:1775 -#, no-wrap -msgid "FIGURE: Load images option" +"appropriate option to import media either from file or from the Internet. " +"The system file browser appears. Select the folder and media that need to be " +"loaded into _Subsurface_ and click the _Open_ button. Towards the bottom of " +"the file browser is a filter that allows showing media (photos and videos), " +"only photographs, only videos, or all files. Choose the appropriate option." msgstr "" #. type: Target for macro image -#: user-manual.txt:1775 +#: user-manual.txt:1507 #, no-wrap msgid "images/LoadImage2_f20.jpg" msgstr "images/LoadImage2_f20.jpg" #. type: Plain text -#: user-manual.txt:1782 +#: user-manual.txt:1514 msgid "" -"If photos are imported from the Internet, provide a URL pointing to a single " -"photograph. If the URL points to a directory, no images are imported: " -"photos from the Internet need to be imported one at a time. If photos are " -"loaded from the Internet, _Subsurface_ assumes there is an Internet " -"connection each time this photo is viewed within _Subsurface_." +"If media are imported from the Internet, provide a URL pointing to a single " +"media. If the URL points to a directory, no images are imported: images " +"from the Internet need to be imported one at a time. If media are loaded " +"from the Internet, _Subsurface_ assumes there is an Internet connection each " +"time this item is viewed within _Subsurface_." msgstr "" #. type: Plain text -#: user-manual.txt:1789 +#: user-manual.txt:1522 msgid "" "Having selected the local folder or Internet image to be imported, the time " "synchronization dialog appears (see image below). The time synchronization " "is not perfect between the dive computer used during a dive and the camera " "used during that same dive. These two devices often differ by several " -"minutes. _Subsurface_ attempts to synchronize these two devices so that the " -"exact times of photographs can be used to position photographs on the dive " -"profile." +"minutes. _Subsurface_ attempts to synchronize them so that the exact times " +"of media can be used to position media on the dive profile." msgstr "" #. type: Plain text -#: user-manual.txt:1791 +#: user-manual.txt:1524 msgid "_Subsurface_ synchronizes camera with dive computer in three ways:" msgstr "" "_Subsurface_ synchronise l'appareil photo avec l'ordinateur de plongée de " "trois façons:" #. type: Plain text -#: user-manual.txt:1794 +#: user-manual.txt:1527 #, no-wrap msgid "" "*Pro-actively*: Before the dive, ensure synchronization of the dive computer time settings with\n" @@ -4365,7 +3602,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1805 +#: user-manual.txt:1538 #, no-wrap msgid "" "*Manually*: Writing down the exact camera time at the start of a dive allows using the\n" @@ -4376,25 +3613,19 @@ msgid "" "setting tool immediately under the heading _Shift times of image(s) by_, in the image below.\n" "If the camera time is 7 minutes later than that of the dive computer, set the time setting\n" "tool to a value of 00:07 and select the _Earlier_ radio button.\n" -"This is appropriate, since the photos need to be shifted\n" +"This is appropriate, since the media need to be shifted\n" "7 minutes earlier (camera is 7 minutes ahead of dive computer). Ignore any \"AM\" or \"PM\" suffix\n" "in that tool. Click the _OK_ button and synchronization is done.\n" msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:1806 user-manual.txt:1825 -#, no-wrap -msgid "FIGURE: Synchronization dialog" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:1806 +#: user-manual.txt:1539 #, no-wrap msgid "images/LoadImage3b_f23.jpg" msgstr "images/LoadImage3b_f23.jpg" #. type: Plain text -#: user-manual.txt:1824 +#: user-manual.txt:1557 #, no-wrap msgid "" "*By photograph*: There is a very slick way of achieving synchronization, requiring a\n" @@ -4415,299 +3646,261 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1825 +#: user-manual.txt:1558 #, no-wrap msgid "images/LoadImage3c_f23.jpg" msgstr "images/LoadImage3c_f23.jpg" #. type: Plain text -#: user-manual.txt:1829 +#: user-manual.txt:1564 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 " -"above). However, If the appropriate checkbox is selected (see image above) " -"these images can still be placed on the _Photos_ tab of the *Notes* panel so " -"that all photos associated with a dive are visible, including photos taken " -"before or after the dive." +"If the timestamp of a photograph or video 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 above). However, If the appropriate checkbox is selected (see " +"image above) these images can still be placed on the _Media_ tab of the " +"*Notes* panel so that all media associated with a dive are visible, " +"including images taken before or after the dive." msgstr "" #. type: Title ==== -#: user-manual.txt:1830 +#: user-manual.txt:1567 #, no-wrap -msgid "Viewing the photos" -msgstr "Visualiser les photos" +msgid "Viewing the media" +msgstr "Visualiser les médias" + +#. type: delimited block * +#: user-manual.txt:1571 +#, no-wrap +msgid "*Ensuring that thumbnails are created for video files*\n" +msgstr "" + +#. type: delimited block * +#: user-manual.txt:1578 +msgid "" +"Within a panel _Subsurface_ represents media by means of thumbnails (i.e. " +"small versions of images that allows listing many images. For a photograph, " +"a thumbnail can easily be created because the image is well defined. But, " +"since a video comprises many images, the question arises of which image " +"should be used for the thumbnail. Two actions are required to create " +"thumbnails of videos:" +msgstr "" + +#. type: delimited block * +#: user-manual.txt:1580 +msgid "The appropriate settings need to be set in the _Preferences_." +msgstr "" + +#. type: delimited block * +#: user-manual.txt:1582 +msgid "" +"The program _ffmpeg_ needs to be installed in the computer that runs " +"Subsurface." +msgstr "" + +#. type: delimited block * +#: user-manual.txt:1584 +msgid "Full details are provided in <<S_APPENDIX_F,APPENDIX F>>." +msgstr "" #. type: Plain text -#: user-manual.txt:1833 -msgid "After the images have been loaded, they appear in two places:" -msgstr "Après avoir été chargées, les images apparaissent à deux endroits:" +#: user-manual.txt:1587 +msgid "After the media have been loaded, they appear in two places:" +msgstr "Après avoir été chargées, les médias apparaissent à deux endroits:" #. type: Plain text -#: user-manual.txt:1835 -msgid "the _Photos_ tab of the *Notes* panel (left part of image below)." +#: user-manual.txt:1589 +msgid "the _Media_ tab of the *Notes Panel* (left part of image below)." msgstr "" #. type: Plain text -#: user-manual.txt:1839 +#: user-manual.txt:1593 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 " -"dive profile, activate the _show-photos_ button in the tool bar to the left " -"of the dive profile:" -msgstr "" - -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:1840 -#, no-wrap -msgid "FIGURE:Show photos toolbar button" +"reflecting the time each photograph or video was taken. To view the media " +"on the dive profile, activate the _Toggle media_ button in the tool bar to " +"the left of the dive profile:" msgstr "" #. type: Target for macro image -#: user-manual.txt:1840 +#: user-manual.txt:1594 #, no-wrap msgid "images/icons/ShowPhotos_f20.png" msgstr "images/icons/ShowPhotos_f20.png" #. type: Plain text -#: user-manual.txt:1843 +#: user-manual.txt:1597 msgid "This results in a profile display as in the image below:" msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:1844 -#, no-wrap -msgid "FIGURE: Photos on dive profile" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:1844 +#: user-manual.txt:1598 #, no-wrap -msgid "images/LoadImage4_f20.jpg" -msgstr "images/LoadImage4_f20.jpg" +msgid "images/LoadImage4.jpg" +msgstr "images/LoadImage4.jpg" #. type: Plain text -#: user-manual.txt:1848 +#: user-manual.txt:1602 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: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:1849 -#, no-wrap -msgid "FIGURE:Thumbnail photo on dive profile" +"Hover the mouse over any of the media stubs. A thumbnail image is shown of " +"the appropriate media. See the image below:" msgstr "" #. type: Target for macro image -#: user-manual.txt:1849 +#: user-manual.txt:1603 #, no-wrap -msgid "images/LoadImage5_f20.jpg" -msgstr "images/LoadImage5_f20.jpg" +msgid "images/LoadImage5.jpg" +msgstr "images/LoadImage5.jpg" #. type: Plain text -#: user-manual.txt:1858 +#: user-manual.txt:1612 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 " -"below). *Note* that the thumbnail has a small dustbin icon in the bottom " -"right hand corner (see image above). Selecting the dustbin removes the image " -"from the dive. Be careful when clicking on a thumbnail. Images can also be " -"deleted using the _Photos_ tab (see text below)." -msgstr "" - -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:1859 -#, no-wrap -msgid "FIGURE: Full-screen photo on dive profile" +"Clicking on the thumbnail brings up a full size photo or video overlaid on " +"the _Subsurface_ window, allowing a good view of the media (see the image " +"below). *Note* that the thumbnail on the dive profile has a small dustbin " +"icon in the bottom right hand corner (see image above). Selecting the " +"dustbin removes the image from the dive. Be careful when clicking on a " +"thumbnail. Images can also be deleted using the _Media_ tab (see text below)." msgstr "" #. type: Target for macro image -#: user-manual.txt:1859 +#: user-manual.txt:1613 #, no-wrap msgid "images/LoadImage6_f20.jpg" msgstr "images/LoadImage6_f20.jpg" #. type: Title ==== -#: user-manual.txt:1861 +#: user-manual.txt:1615 #, no-wrap -msgid "The _Photos_ tab" -msgstr "L'onglet _Photos_" +msgid "The _Media_ tab" +msgstr "L'onglet _Media_" #. type: Plain text -#: user-manual.txt:1873 +#: user-manual.txt:1627 msgid "" -"Photographs associated with a dive are shown as thumbnails in the _Photos_ " -"tab of the _Notes_ panel. Photos taken in rapid succession during a dive " -"(therefore sometimes with large overlap on the dive profile) can easily be " -"accessed in the _Photos_ tab. This tab serves as a tool for individually " -"accessing the photos of a dive, while the stubs on the dive profile show " -"when during a dive a photo was taken. The size of the thumbnails in the " -"_Photos_ tab can be changed using the _Zoom level_ slider at the bottom of " -"the panel. Single-click a thumbnail in the _Photos_ panel to select a photo. " -"Double-click a thumbnail to view the full-sized image, overlaying the " -"_Subsurface_ window. Delete a photo from the _Photos_ panel by selecting it " -"(single-click) and then by pressing the _Del_ key on the keyboard. This " -"removes the photo BOTH from the _Photos_ tab as well as the dive profile." +"Media associated with a dive are shown as thumbnails in the _Media_ tab of " +"the *Notes Panel*. Media taken in rapid succession during a dive (therefore " +"sometimes with large overlap on the dive profile) can easily be accessed in " +"the _Media_ tab. This tab serves as a tool for individually accessing the " +"media of a dive, while the stubs on the dive profile show when during a dive " +"when a photo/video was taken. The size of the thumbnails in the _Media_ tab " +"can be changed using the _Zoom level_ slider at the bottom of the panel. " +"Single-click a thumbnail in the _Media_ panel to select a photo/video. " +"Double-click a thumbnail to view the full-sized image or play the video, " +"overlaying the _Subsurface_ window. Delete media from the _Media_ panel by " +"selecting it (single-click) and then by pressing the _Del_ key on the " +"keyboard. This removes it BOTH from the _Media_ tab as well as the dive " +"profile." msgstr "" #. type: Title ==== -#: user-manual.txt:1874 +#: user-manual.txt:1628 #, no-wrap -msgid "Photos on an external hard disk" -msgstr "Photos stockées sur un disque dur externe" +msgid "Media on an external hard disk" +msgstr "Médias stockés sur un disque dur externe" #. type: Plain text -#: user-manual.txt:1884 +#: user-manual.txt:1637 msgid "" -"Most underwater photographers store photos on an external drive. If such a " +"Most underwater photographers store media on an external drive. If such a " "drive can be mapped by the operating system (almost always the case) the " -"photos can be directly accessed by _Subsurface_. This eases the interaction " -"between _Subsurface_ and an external repository of photos. When associating " -"a dive profile with photos from an external drive, the normal procedure of " +"media can be directly accessed by _Subsurface_. This eases the interaction " +"between _Subsurface_ and an external repository of media. When associating a " +"dive profile with media from an external drive, the normal procedure of " "selection and synchronization (see text above) is used. After the external " -"drive has been disconnected, _Subsurface_ cannot access these photos any " -"more. If the display of photos is activated (using the toolbox icon to the " -"left of the _Dive Profile_), the program shows a small white dot where each " -"photo should be on the dive profile. In addition the _Photos_ tab shows " -"only the file names of the photos. If the external drive with the photos is " -"re-connected, the photos can be seen in the normal way." +"drive has been disconnected, _Subsurface_ cannot access these media any " +"more. If the display of media is activated (using the toolbox icon to the " +"left of the _Dive Profile_), the program shows only the thumbnails and the " +"images cannot be viewed at full-screen size. If the external drive with the " +"media is re-connected, the media can be seen in the normal way." msgstr "" #. type: Title ==== -#: user-manual.txt:1885 +#: user-manual.txt:1638 #, no-wrap -msgid "Finding out which dives have associated photos." -msgstr "Trouver quelles plongées ont des photos associées." +msgid "Finding out which dives have associated media." +msgstr "Trouver quelles plongées ont des médias associés." #. type: Plain text -#: user-manual.txt:1891 +#: user-manual.txt:1644 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*>>." +"associated media can be time consuming. There is a rapid way of seeing which " +"dives have associated media and which not: activate the _Media_ checkbox in " +"the dropdown list obtained by right-clicking on the header bar of the " +"*Divelist*. In the *Divelist*, all dives with associated media have an icon " +"indicating whether the media 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:1893 +#: user-manual.txt:1646 #, no-wrap -msgid "Moving photographs among directories, hard disks or computers" -msgstr "Déplacer des photos entre dossiers, disques durs ou ordinateurs" +msgid "Moving media among directories, hard disks or computers" +msgstr "Déplacer des médias entre dossiers, disques durs ou ordinateurs" #. type: Plain text -#: user-manual.txt:1902 +#: user-manual.txt:1655 #, no-wrap msgid "" -"After a photograph has been loaded into _Subsurface_ and associated with a specific dive,\n" -"_Subsurface_ saves the directory path where the photo lies as well as the file name of the photo,\n" +"After a photograph or video has been loaded into _Subsurface_ and associated with a specific dive,\n" +"_Subsurface_ saves the path to the directory where the media lie as well as the file name of the each photo/video,\n" "in order to find it when the dive is opened again.\n" -"If the photo or the whole photo collection is moved to another drive or to a different\n" -" machine, the path to the photo changes. Now, _Subsurface_ looks for the photos at their original location before they were moved,\n" -" cannot find them and cannot display them. Because, after moving photos, large numbers of photos\n" -" may need to be deleted and re-imported from the new location, _Subsurface_ has a mechanism to ease this inconvenience: automatic updates using fingerprints.\n" +"If the media or the whole media collection is moved to another drive or to a different\n" +" machine, the path to the media changes. Now, _Subsurface_ looks for the photos/videos at their original location before they were moved,\n" +"cannot find them and cannot display them. Because, after moving media, large numbers of files\n" +" may need to be deleted and re-imported from the new disk, _Subsurface_ can locate the media based on their filename and path.\n" msgstr "" #. type: Plain text -#: user-manual.txt:1906 +#: user-manual.txt:1661 #, no-wrap msgid "" -"When a photo is loaded into _Subsurface_, a fingerprint for the image is calculated and stored with the\n" -" other reference information for that photo. After moving a photo collection (that has already been loaded\n" -" into _Subsurface_) to a different directory, disk or computer, _Subsurface_ can:\n" -msgstr "" - -#. type: Plain text -#: user-manual.txt:1908 -msgid "" -"look through a particular directory (and all its subdirectories recursively) " -"where photos have been moved to," -msgstr "" - -#. type: Plain text -#: user-manual.txt:1909 -msgid "calculate fingerprints for all photos in this directory, and" -msgstr "" - -#. type: Plain text -#: user-manual.txt:1912 -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 " -"file name has changed), automatically update the directory information so " -"that _Subsurface_ can find the photo in the new moved directory." +"This is done by selecting from the Main Menu: _File -> Find moved images_. This brings up a window within\n" +"which the searching of the images can be controlled. The search is started by clicking on _Select folder and scan_.\n" +"Since recorded during different dive trips might have the same filename, the names of the parent folders are likewise compared.\n" +"Therefore, the root folder of the NEW picture collection should be chosen. For finer control, it is possible to search\n" +"only for media of the currently selected dive(s) by selecting the appropriate option.\n" msgstr "" #. type: Plain text -#: user-manual.txt:1917 -#, no-wrap +#: user-manual.txt:1665 msgid "" -"This is done by selecting from the Main Menu: _File -> Find moved images_. This brings up a window within\n" -" which the NEW directory of the photos needs to be specified. Select the appropriate directory and click\n" -" the _Scan_ button towards the bottom right of the panel. The process may require several minutes to\n" -" complete, after which _Subsurface_ will show the appropriate photographs when a particular dive is opened.\n" +"After the searching has completed, the original filenames and the new " +"locations of the photographs will be shown. The matching parts of the paths " +"are emphasized. Media that are found at their known positions are not " +"listed. The proposed changes can be applied by clicking _Apply_ or rejected " +"by clicking _Cancel_." msgstr "" -#. type: delimited block * -#: user-manual.txt:1922 +#. type: Target for macro image +#: user-manual.txt:1666 #, no-wrap -msgid "*Upgrading legacy photo collections without fingerprints*\n" -msgstr "" - -#. type: delimited block * -#: user-manual.txt:1927 -msgid "" -"_Subsurface_ automatically calculates fingerprints for all images that it " -"can access. When manipulating images, ensure that all the images associated " -"with the dive log can be accessed by _Subsurface_." -msgstr "" - -#. type: delimited block * -#: user-manual.txt:1929 -msgid "" -"_Subsurface_ automatically checks and, if necessary, updates the " -"fingerprints associated with a single dive if:" -msgstr "" - -#. type: delimited block * -#: user-manual.txt:1931 -msgid "" -"The images associated with that dive are visible as thumbnails on the *Dive " -"Profile*." -msgstr "" - -#. type: delimited block * -#: user-manual.txt:1933 -msgid "" -"If you edit anything in the *Notes* panel and save the edits by selecting " -"_Apply changes_." -msgstr "" +msgid "images/FindMovedImages1.jpg" +msgstr "images/FindMovedImages1.jpg" #. type: Title === -#: user-manual.txt:1936 +#: user-manual.txt:1668 #, no-wrap msgid "Logging special types of dives" msgstr "" #. type: Plain text -#: user-manual.txt:1939 +#: user-manual.txt:1671 msgid "" "This section gives examples of the versatility of _Subsurface_ as a dive " "logging tool." msgstr "" #. type: Title ==== -#: user-manual.txt:1942 +#: user-manual.txt:1674 #, no-wrap msgid "Multicylinder dives" msgstr "" #. type: Plain text -#: user-manual.txt:1949 +#: user-manual.txt:1681 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 " @@ -4719,7 +3912,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1953 +#: user-manual.txt:1685 #, no-wrap msgid "" "*Describe the cylinders used during the dive* This is performed in the *Equipment tab* of\n" @@ -4728,7 +3921,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1959 +#: user-manual.txt:1691 #, no-wrap msgid "" "*Record the times at which the switch from one cylinder to another was done:* This is information\n" @@ -4739,7 +3932,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1967 +#: user-manual.txt:1699 #, no-wrap msgid "" "*Record the cylinder changes on the dive profile*: If the latter option\n" @@ -4752,7 +3945,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1971 +#: user-manual.txt:1703 msgid "" "When this is complete, _Subsurface_ indicates the appropriate use of " "cylinders in the dive profile. Below is a two-cylinder dive, starting off " @@ -4760,20 +3953,14 @@ msgid "" "decompression." msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:1972 -#, no-wrap -msgid "FIGURE: Multicylinder profile" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:1972 +#: user-manual.txt:1704 #, no-wrap msgid "images/multicylinder_dive.jpg" msgstr "images/multicylinder_dive.jpg" #. type: Plain text -#: user-manual.txt:1981 +#: user-manual.txt:1713 msgid "" "Several dive computers perform automatic recording of cylinder pressure. In " "this case no manual intervention is needed. Older dive computers (e.g. " @@ -4795,13 +3982,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:1982 +#: user-manual.txt:1714 #, no-wrap msgid "Sidemount dives" msgstr "Plongées Sidemount" #. type: Plain text -#: user-manual.txt:1989 +#: user-manual.txt:1721 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 " @@ -4813,7 +4000,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1998 +#: user-manual.txt:1730 #, no-wrap msgid "" "*During the dive, record cylinder switch events*. Since sidemount diving normally involves two\n" @@ -4827,7 +4014,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2001 +#: user-manual.txt:1733 #, no-wrap msgid "" "*Within _Subsurface_ describe the cylinders used during the dive*. The diver needs to provide the\n" @@ -4836,7 +4023,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2011 +#: user-manual.txt:1743 #, no-wrap msgid "" "*Indicate cylinder change events on the _Subsurface_ dive profile*. Once the dive log has been imported\n" @@ -4851,32 +4038,26 @@ msgid "" "for both cylinders are shown on the dive profile, as in the image below.\n" msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:2012 -#, no-wrap -msgid "FIGURE: Sidemount profile" -msgstr "FIGURE: Profil Sidemount" - #. type: Target for macro image -#: user-manual.txt:2012 +#: user-manual.txt:1744 #, no-wrap msgid "images/sidemount1.jpg" msgstr "images/sidemount1.jpg" #. type: Title ==== -#: user-manual.txt:2015 +#: user-manual.txt:1747 #, no-wrap msgid "Passive semi-closed circuit rebreather (pSCR) dives" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2017 +#: user-manual.txt:1749 #, no-wrap msgid "images/halcyon_RB80.jpg" msgstr "images/halcyon_RB80.jpg" #. type: Plain text -#: user-manual.txt:2027 +#: user-manual.txt:1759 msgid "" "Passive semi-closed rebreathers (pSCR) are a technical advance in diving " "equipment that recirculates the breathing gas a diver uses, while removing " @@ -4891,19 +4072,19 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2029 +#: user-manual.txt:1761 msgid "" "To log pSCR dives, no special procedures are required. Use the normal steps " "outlined above:" msgstr "" #. type: Plain text -#: user-manual.txt:2031 +#: user-manual.txt:1763 msgid "Select pSCR in the _Dive Mode_ dropdown list on the *Info* panel." msgstr "" #. type: Plain text -#: user-manual.txt:2035 +#: user-manual.txt:1767 msgid "" "pSCR diving often involves gas changes, requiring an additional cylinder. " "Define all the appropriate cylinders as described above and indicate the " @@ -4912,7 +4093,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2042 +#: user-manual.txt:1774 msgid "" "In pSCR diving, the inspired gas often has a pO~2~ below that of the fresh " "gas from cylinder. This is because fresh gas is only supplied at a slow rate " @@ -4924,20 +4105,14 @@ msgid "" "dive lasted over two hours." msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:2043 -#, no-wrap -msgid "FIGURE: pSCR profile" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:2043 +#: user-manual.txt:1775 #, no-wrap msgid "images/pSCR_profile.jpg" msgstr "images/pSCR_profile.jpg" #. type: Plain text -#: user-manual.txt:2059 +#: user-manual.txt:1791 msgid "" "_Visualising the pO~2~ drop_: The difference between the pO~2~ of the fresh " "cylinder gas and the pO~2~ in the loop can be visualised in _Subsurface_ by " @@ -4963,13 +4138,13 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2060 +#: user-manual.txt:1792 #, no-wrap msgid "images/DiveModeChange.jpg" msgstr "images/DiveModeChange.jpg" #. type: Plain text -#: user-manual.txt:2074 +#: user-manual.txt:1806 msgid "" "_pSCR and bailout_: Gases used in pSCR often yield very low pO~2~ values in " "shallow water. For this reason the diver often completes the shallow " @@ -4987,32 +4162,26 @@ msgid "" "section, the pO~2~ (green line) differs from the OC-pO~2~ (orange line)." msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:2075 -#, no-wrap -msgid "FIGURE: pSCR profile with bailout" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:2075 +#: user-manual.txt:1807 #, no-wrap msgid "images/pSCR_profile_bailout.jpg" msgstr "images/pSCR_profile_bailout.jpg" #. type: Title ==== -#: user-manual.txt:2078 +#: user-manual.txt:1810 #, no-wrap msgid "Closed circuit rebreather (CCR) dives" msgstr "Plongées en recycleur circuit fermé (CCR)" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2080 +#: user-manual.txt:1812 #, no-wrap msgid "images/APD.jpg" msgstr "images/APD.jpg" #. type: Plain text -#: user-manual.txt:2085 +#: user-manual.txt:1817 msgid "" "Closed system rebreathers also recirculate gas that has been breathed. " "However, they use advanced technology to maintain a breathable oxygen " @@ -5020,12 +4189,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2086 +#: user-manual.txt:1818 msgid "remove carbon dioxide from the exhaled gas." msgstr "" #. type: Plain text -#: user-manual.txt:2097 +#: user-manual.txt:1829 msgid "" "regulate the oxygen concentration to remain within safe diving limits. The " "CCR interface of _Subsurface_ is currently experimental and under active " @@ -5042,13 +4211,13 @@ msgid "" msgstr "" #. type: Title ===== -#: user-manual.txt:2098 +#: user-manual.txt:1830 #, no-wrap msgid "Import a CCR dive" msgstr "Importer une plongée CCR" #. type: Plain text -#: user-manual.txt:2117 +#: user-manual.txt:1849 msgid "" "For Shearwater CCR controllers, or independent Shearwater CCR logs, just " "download the dive log as would be the case for non-CCR dives. _Subsurface_ " @@ -5074,13 +4243,13 @@ msgid "" msgstr "" #. type: Title ===== -#: user-manual.txt:2118 +#: user-manual.txt:1850 #, no-wrap msgid "Displayed information for a CCR dive" msgstr "" #. type: Plain text -#: user-manual.txt:2128 +#: user-manual.txt:1860 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 " @@ -5094,12 +4263,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2130 +#: user-manual.txt:1862 msgid "For TWO O~2~ sensors the mean value of the two sensors are given." msgstr "" #. type: Plain text -#: user-manual.txt:2134 +#: user-manual.txt:1866 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 " @@ -5108,19 +4277,19 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2136 +#: user-manual.txt:1868 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:2138 +#: user-manual.txt:1870 msgid "The mean pO~2~ of the sensors is indicated with a green line," msgstr "" #. type: Plain text -#: user-manual.txt:2146 +#: user-manual.txt:1878 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 " @@ -5131,20 +4300,14 @@ msgid "" "appropriate toolbar button on the Dive Profile has been checked." msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:2147 -#, no-wrap -msgid "FIGURE: CCR preferences panel" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:2147 +#: user-manual.txt:1879 #, no-wrap msgid "images/CCR_preferences_f20.jpg" msgstr "images/CCR_preferences_f20.jpg" #. type: Plain text -#: user-manual.txt:2154 +#: user-manual.txt:1886 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 " @@ -5154,20 +4317,14 @@ msgid "" "and the setpoint values, as shown below." msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:2155 -#, no-wrap -msgid "FIGURE: CCR setpoint and pO~2~ graph" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:2155 +#: user-manual.txt:1887 #, no-wrap msgid "images/CCR_setpoint_f20.jpg" msgstr "images/CCR_setpoint_f20.jpg" #. type: Plain text -#: user-manual.txt:2159 +#: user-manual.txt:1891 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 color-coded " @@ -5175,42 +4332,36 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2161 +#: user-manual.txt:1893 msgid "Sensor 1: grey" msgstr "" #. type: Plain text -#: user-manual.txt:2162 +#: user-manual.txt:1894 msgid "Sensor 2: blue" msgstr "" #. type: Plain text -#: user-manual.txt:2163 +#: user-manual.txt:1895 msgid "Sensor 3: brown" msgstr "" #. type: Plain text -#: user-manual.txt:2167 +#: user-manual.txt:1899 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 " "abnormally low or erratic readings from a particular sensor." msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:2168 -#, no-wrap -msgid "FIGURE: CCR sensor data graph" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:2168 +#: user-manual.txt:1900 #, no-wrap msgid "images/CCR_sensor_data_f20.jpg" msgstr "images/CCR_sensor_data_f20.jpg" #. type: Plain text -#: user-manual.txt:2173 +#: user-manual.txt:1905 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, " @@ -5218,7 +4369,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2177 +#: user-manual.txt:1909 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 " @@ -5227,7 +4378,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2197 +#: user-manual.txt:1929 msgid "" "_Bailout_: Bailout events during a CCR dive can be recorded in a " "_Subsurface_ divelog. Right-click on the dive profile to generate a dive " @@ -5254,20 +4405,14 @@ msgid "" "the events are shown automatically in the dive log." msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:2198 -#, no-wrap -msgid "FIGURE: CCR bailout profileh" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:2198 +#: user-manual.txt:1930 #, no-wrap msgid "images/CCR_bailout.jpg" msgstr "images/CCR_bailout.jpg" #. type: Plain text -#: user-manual.txt:2205 +#: user-manual.txt:1937 msgid "" "_Deco ceiling_: The deco ceiling calculated by Subsurface is not very " "accurate because the precise pressure of nitrogen in the loop can usually " @@ -5278,20 +4423,14 @@ msgid "" "the left of the dive profile:" msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:2206 -#, no-wrap -msgid "DC ceiling icon" -msgstr "" - #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2206 user-manual.txt:2603 +#: user-manual.txt:1938 user-manual.txt:2337 #, no-wrap msgid "images/icons/cceiling.jpg" msgstr "images/icons/cceiling.jpg" #. type: Plain text -#: user-manual.txt:2211 +#: user-manual.txt:1943 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 -> " @@ -5300,7 +4439,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2219 +#: user-manual.txt:1951 msgid "" "_Cylinder pressures_: Some CCR dive computers like Poseidon record the " "pressures of the oxygen and diluent cylinders. The pressures of these two " @@ -5312,20 +4451,14 @@ msgid "" "the two oxygen sensors." msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:2220 -#, no-wrap -msgid "FIGURE: CCR dive profile" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:2220 +#: user-manual.txt:1952 #, no-wrap msgid "images/CCR_dive_profile_f22.jpg" msgstr "images/CCR_dive_profile_f22.jpg" #. type: Plain text -#: user-manual.txt:2225 +#: user-manual.txt:1957 msgid "" "_Equipment-specific information_: Equipment-specific information gathered by " "_Subsurface_ is shown in the xref:S_ExtraDataTab[Extra data tab]. This may " @@ -5333,7 +4466,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2228 +#: user-manual.txt:1960 msgid "" "More equipment-specific procedures and information for downloading CCR dive " "logs for Poseidon and APD equipment can be found in xref:" @@ -5342,80 +4475,74 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:2229 +#: user-manual.txt:1961 #, no-wrap msgid "Obtaining more information about dives entered into the logbook" msgstr "" #. type: Title === -#: user-manual.txt:2231 +#: user-manual.txt:1963 #, no-wrap msgid "Using the Dive Map to obtain more dive information" msgstr "Utiliser la carte des plongées pour obtenir plus d'informations sur les plongées" #. type: Plain text -#: user-manual.txt:2234 +#: user-manual.txt:1966 msgid "" "The Dive Map has a number of buttons useful for manipulation several aspects " "of a dive. These are:" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2235 +#: user-manual.txt:1967 #, no-wrap msgid "images/icons/MapViewMode.jpg" msgstr "images/icons/MapViewMode.jpg" #. type: Plain text -#: user-manual.txt:2239 +#: user-manual.txt:1971 msgid "" "Select this button to show the Dive Map as a satellite image or as a Google " "Maps representation." msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2240 +#: user-manual.txt:1972 #, no-wrap msgid "images/icons/MapViewPlus.jpg" msgstr "images/icons/MapViewPlus.jpg" #. type: Plain text -#: user-manual.txt:2243 +#: user-manual.txt:1975 msgid "Zoom in. Select a smaller area of the map." msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2244 +#: user-manual.txt:1976 #, no-wrap msgid "images/icons/MapViewMinus.jpg" msgstr "images/icons/MapViewMinus.jpg" #. type: Plain text -#: user-manual.txt:2247 +#: user-manual.txt:1979 msgid "Zoom out. Select a larger area of the map." msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:2248 -#, no-wrap -msgid "FIGURE: Map menu" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:2248 +#: user-manual.txt:1980 #, no-wrap msgid "images/MapMenu.jpg" msgstr "images/MapMenu.jpg" #. type: Plain text -#: user-manual.txt:2252 +#: user-manual.txt:1984 msgid "" "The \"Hamburger\" button on the top right-hand of the Dive Map activates the " "Map menu. The items are:" msgstr "" #. type: Plain text -#: user-manual.txt:2255 +#: user-manual.txt:1987 msgid "" "Open location in _Google Maps_. Open the location of the active dive in a " "separate Google Maps window with the dive site indicated by a Google Maps " @@ -5423,21 +4550,21 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2258 +#: user-manual.txt:1990 msgid "" "Copy location to clipboard (decimal). Copy the coordinates of the active " "dive to the clipboard in decimal degrees e.g. -25.933905 30.710572" msgstr "" #. type: Plain text -#: user-manual.txt:2261 +#: user-manual.txt:1993 msgid "" "Copy location to clipboard (sexagesimal). Copy the coordinates of the active " "dive to the clipboard in sexagecimal, e.g. 25°56'02.058\"S 30°42'38.059\"E" msgstr "" #. type: Plain text -#: user-manual.txt:2264 +#: user-manual.txt:1996 msgid "" "Select visible dive locations. In the Dive List panel, highlight all the " "dive sites visible in the Dive Map. This allows easy selection of the dives " @@ -5446,13 +4573,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:2265 +#: user-manual.txt:1997 #, no-wrap msgid "The *Info* tab (for individual dives)" msgstr "L'onglet *Informations* (pour une seule plongée)" #. type: Plain text -#: user-manual.txt:2272 +#: user-manual.txt:2004 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 " @@ -5467,8 +4594,14 @@ msgstr "" "consommation équivalente à l'air (SAC) et le nombre d'unités de toxicité de " "l'oxygène (OTU) atteint." +#. type: Named 'icon' AttributeList argument for style 'icon' +#: user-manual.txt:2005 +#, no-wrap +msgid "images/icons/info.jpg" +msgstr "images/icons/info.jpg" + #. type: Plain text -#: user-manual.txt:2279 +#: user-manual.txt:2011 msgid "" "Gas consumption and SAC calculations: _Subsurface_ calculates SAC and Gas " "consumption taking in account gas incompressibility, particularly at tank " @@ -5482,13 +4615,13 @@ msgstr "" "SAC_CALCULATION[l'Annexe F] pour plus d'information." #. type: Title === -#: user-manual.txt:2281 +#: user-manual.txt:2013 #, no-wrap msgid "The *Extra Data* tab (usually for individual dives)" msgstr "L'onglet *Extra info* (généralement pour des plongées séparées)" #. type: Plain text -#: user-manual.txt:2289 +#: user-manual.txt:2021 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 " @@ -5508,26 +4641,20 @@ msgstr "" "dessous, vous trouverez une image affichant des données supplémentaires pour " "une plongée utilisant un recycleur Poseidon." -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:2290 -#, no-wrap -msgid "FIGURE: Extra Data tab" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:2290 +#: user-manual.txt:2022 #, no-wrap msgid "images/ExtraDataTab_f20.jpg" msgstr "images/ExtraDataTab_f20.jpg" #. type: Title === -#: user-manual.txt:2292 +#: user-manual.txt:2024 #, no-wrap msgid "The *Stats* tab (for groups of dives)" msgstr "L'onglet *Statistiques* (pour un groupe de plongées)" #. type: Plain text -#: user-manual.txt:2303 +#: user-manual.txt:2035 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 " @@ -5549,25 +4676,19 @@ msgstr "" "plus petite et la plus grande profondeur atteinte pour ces plongées." #. type: Title === -#: user-manual.txt:2305 +#: user-manual.txt:2037 #, no-wrap msgid "The *Dive Profile*" msgstr "Le *Profil de plongée*" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:2307 -#, no-wrap -msgid "Typical dive profile" -msgstr "Profil de plongée typique" - #. type: Target for macro image -#: user-manual.txt:2307 +#: user-manual.txt:2039 #, no-wrap msgid "images/Profile2.jpg" msgstr "images/Profile2.jpg" #. type: Plain text -#: user-manual.txt:2318 +#: user-manual.txt:2050 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 " @@ -5589,7 +4710,7 @@ msgstr "" "donnée en utilisant différentes couleurs:" #. type: delimited block | -#: user-manual.txt:2325 +#: user-manual.txt:2057 #, no-wrap msgid "" "|*Color*|*Descent speed (m/min)*|*Ascent speed (m/min)*\n" @@ -5607,7 +4728,7 @@ msgstr "" "|Vert foncé|< 1.5|< 1.5\n" #. type: Plain text -#: user-manual.txt:2330 +#: user-manual.txt:2062 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. " @@ -5621,13 +4742,13 @@ msgstr "" "profondeur à un moment précis de la plongée." #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2331 +#: user-manual.txt:2063 #, no-wrap msgid "images/icons/scale.jpg" msgstr "images/icons/scale.jpg" #. type: Plain text -#: user-manual.txt:2336 +#: user-manual.txt:2068 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 " @@ -5640,7 +4761,7 @@ msgstr "" "augmente la taille du profil de plongée pour remplir la zone du panneau." #. type: Plain text -#: user-manual.txt:2339 +#: user-manual.txt:2071 #, no-wrap msgid "" "*Water temperature* is shown as a blue line with temperature values\n" @@ -5650,13 +4771,13 @@ msgstr "" "température placées lors de changements significatifs.\n" #. type: Title ==== -#: user-manual.txt:2341 +#: user-manual.txt:2073 #, no-wrap msgid "The *Information Box*" msgstr "La boîte *Information*" #. type: Plain text -#: user-manual.txt:2348 +#: user-manual.txt:2080 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 " @@ -5673,20 +4794,14 @@ msgstr "" "position de la boîte Information est enregistrée ré-utilisée pour les " "analyses de plongée suivantes." -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:2349 -#, no-wrap -msgid "Figure: Information Box" -msgstr "FIGURE: La boîte Information" - #. type: Target for macro image -#: user-manual.txt:2349 +#: user-manual.txt:2081 #, no-wrap msgid "images/InfoBox2.jpg" msgstr "images/InfoBox2.jpg" #. type: Plain text -#: user-manual.txt:2365 +#: user-manual.txt:2097 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 " @@ -5707,13 +4822,13 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2366 +#: user-manual.txt:2098 #, no-wrap msgid "images/icons/MOD.jpg" msgstr "images/icons/MOD.jpg" #. type: Plain text -#: user-manual.txt:2373 +#: user-manual.txt:2105 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. " @@ -5732,13 +4847,13 @@ msgstr "" "important d'exposition aux dangers liés à la toxicité de l'oxygène." #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2374 +#: user-manual.txt:2106 #, no-wrap msgid "images/icons/NDL.jpg" msgstr "images/icons/NDL.jpg" #. type: Plain text -#: user-manual.txt:2385 +#: user-manual.txt:2117 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 " @@ -5753,13 +4868,13 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2386 +#: user-manual.txt:2118 #, no-wrap msgid "images/icons/SAC.jpg" msgstr "images/icons/SAC.jpg" #. type: Plain text -#: user-manual.txt:2394 +#: user-manual.txt:2126 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 " @@ -5771,13 +4886,13 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2395 +#: user-manual.txt:2127 #, no-wrap msgid "images/icons/EAD.jpg" msgstr "images/icons/EAD.jpg" #. type: Plain text -#: user-manual.txt:2410 +#: user-manual.txt:2142 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 " @@ -5793,7 +4908,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2417 +#: user-manual.txt:2149 msgid "" "If at some point a isobaric counter diffusion situation is encountered in " "the leading tissue (defined to be a moment in time where helium is off-" @@ -5804,7 +4919,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2419 +#: user-manual.txt:2151 msgid "" "Figure (*B*) above shows an information box with a nearly complete set of " "data." @@ -5814,13 +4929,13 @@ msgstr "" # "graphique à barres"? #. type: Title ===== -#: user-manual.txt:2422 +#: user-manual.txt:2154 #, no-wrap msgid "The Gas Pressure Bar Graph" msgstr "Le graphique de pression gazeuse" #. type: Plain text -#: user-manual.txt:2429 +#: user-manual.txt:2161 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 " @@ -5830,21 +4945,14 @@ msgid "" "the Gas Pressure Bar Graph." msgstr "" -# "graphique à barres"? -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:2430 -#, no-wrap -msgid "FIGURE:Gas Pressure bar Graph" -msgstr "FIGURE: Le graphique de pression gazeuse" - #. type: Target for macro image -#: user-manual.txt:2430 +#: user-manual.txt:2162 #, no-wrap msgid "images/GasPressureBarGraph.jpg" msgstr "images/GasPressureBarGraph.jpg" #. type: Plain text -#: user-manual.txt:2436 +#: user-manual.txt:2168 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 " @@ -5854,7 +4962,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2442 +#: user-manual.txt:2174 msgid "" "The horizontal black line underneath the light green margin indicates the " "equilibrium pressure of the INERT gases inhaled by the diver, usually " @@ -5865,7 +4973,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2446 +#: user-manual.txt:2178 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 " @@ -5873,7 +4981,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2452 +#: user-manual.txt:2184 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 " @@ -5883,7 +4991,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2456 +#: user-manual.txt:2188 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 " @@ -5892,7 +5000,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2459 +#: user-manual.txt:2191 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 " @@ -5900,7 +5008,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2462 +#: user-manual.txt:2194 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 " @@ -5908,7 +5016,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2465 +#: user-manual.txt:2197 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 " @@ -5916,7 +5024,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2470 +#: user-manual.txt:2202 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 " @@ -5926,7 +5034,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2476 +#: user-manual.txt:2208 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 " @@ -5937,7 +5045,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2481 +#: user-manual.txt:2213 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 " @@ -5947,13 +5055,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2482 +#: user-manual.txt:2214 #, no-wrap msgid "Computer-reported events during dive" msgstr "Événements rapportés par l'ordinateur durant la plongée" #. type: Plain text -#: user-manual.txt:2494 +#: user-manual.txt:2226 msgid "" "Many dive computers record events during a dive. For instance, most dive " "computers report alarms relating to high partial pressures of oxygen, to " @@ -5972,7 +5080,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2499 +#: user-manual.txt:2231 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 " @@ -5982,20 +5090,14 @@ msgid "" "was reported)." msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:2500 -#, no-wrap -msgid "FIGURE: Profile notification symbols" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:2500 +#: user-manual.txt:2232 #, no-wrap msgid "images/profile_symbols.jpg" msgstr "images/profile_symbols.jpg" #. type: Plain text -#: user-manual.txt:2505 +#: user-manual.txt:2237 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 " @@ -6003,13 +5105,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2506 +#: user-manual.txt:2238 #, no-wrap msgid "The Profile Toolbar" msgstr "La barre d'outils du profil" #. type: Plain text -#: user-manual.txt:2514 +#: user-manual.txt:2246 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 " @@ -6020,13 +5122,13 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2515 +#: user-manual.txt:2247 #, no-wrap msgid "images/icons/O2.jpg" msgstr "images/icons/O2.jpg" #. type: Plain text -#: user-manual.txt:2519 +#: user-manual.txt:2251 msgid "" "Show the partial pressure of *oxygen* during the dive. This is shown below " "the dive depth and water temperature graphs." @@ -6035,24 +5137,24 @@ msgstr "" "affiché sous les graphiques de profondeur et de température de l'eau." #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2520 +#: user-manual.txt:2252 #, no-wrap msgid "images/icons/N2.jpg" msgstr "images/icons/N2.jpg" #. type: Plain text -#: user-manual.txt:2523 +#: user-manual.txt:2255 msgid "Show the partial pressure of *nitrogen* during the dive." msgstr "Affiche la pression partielle d'*azote* durant la plongée." #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2524 +#: user-manual.txt:2256 #, no-wrap msgid "images/icons/He.jpg" msgstr "images/icons/He.jpg" #. type: Plain text -#: user-manual.txt:2528 +#: user-manual.txt:2260 msgid "" "Display of the partial pressure of *helium* during the dive. This is only " "important to divers using Trimix, Helitrox or similar breathing gases." @@ -6062,7 +5164,7 @@ msgstr "" "(Helitrox) ou d'autres mélanges gazeux similaires." #. type: Plain text -#: user-manual.txt:2541 +#: user-manual.txt:2273 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 " @@ -6077,7 +5179,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2545 +#: user-manual.txt:2277 msgid "" "When in planner mode, the SAC is set to be constant during the bottom part " "of the dive as well during decompression. Therefore, when planning a dive, " @@ -6085,13 +5187,13 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2546 +#: user-manual.txt:2278 #, no-wrap msgid "images/icons/Heartbutton.png" msgstr "images/icons/Heartbutton.png" #. type: Plain text -#: user-manual.txt:2550 +#: user-manual.txt:2282 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." @@ -6101,7 +5203,7 @@ msgstr "" "plongée est jumelé avec un détecteur de rythme cardique." #. type: Plain text -#: user-manual.txt:2556 +#: user-manual.txt:2288 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 " @@ -6110,26 +5212,20 @@ msgid "" "recognizable; something free divers won’t care about." msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:2557 -#, no-wrap -msgid "FIGURE: Measuring Bar" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:2557 +#: user-manual.txt:2289 #, no-wrap msgid "images/MeasuringBar.png" msgstr "images/MeasuringBar.png" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2559 +#: user-manual.txt:2291 #, no-wrap msgid "images/icons/ruler.jpg" msgstr "images/icons/ruler.jpg" #. type: Plain text -#: user-manual.txt:2567 +#: user-manual.txt:2299 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 " @@ -6139,26 +5235,30 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2568 +#: user-manual.txt:2300 #, no-wrap msgid "images/icons/ShowPhotos.png" msgstr "images/icons/ShowPhotos.png" #. type: Plain text -#: user-manual.txt:2575 +#: user-manual.txt:2309 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 " -"shows the exact time when this photo was taken. If this button is not " -"active, the photos are hidden." +"Photographs and videos that have been added to a dive can be shown on the " +"profile by selecting the *Show-media* button. The position of a photo or " +"video on the profile shows the exact time when it was taken. The runtime of " +"videos is represented by a bar if _Subsurface_ was able to extract this " +"information from the video file. If this button is not active, the media " +"are hidden." msgstr "" -"Les photos qui ont été ajoutées à une plongée peuvent être affichées sur le " -"profil en sélectionnant le bouton *Communer l'affichage des images*. La " -"position d'une photo sur le profil indique le moment exact où la photo a été " -"prise. Si le bouton n'est pas actif, les photos sont masquées." +"Les photos et vidéos qui ont été ajoutées à une plongée peuvent être " +"affichées sur le profil en sélectionnant le bouton *Afficher les médias*. La " +"position d'une photo ou vidéo sur le profil indique le moment exact où elle " +"a été prise. La durée de la vidéo est représentée par une bar si " +"_Subsurface_ a pu extraire cette information du fichier vidéo. Si le bouton " +"n'est pas actif, les photos sont masquées." #. type: Plain text -#: user-manual.txt:2602 +#: user-manual.txt:2336 msgid "" "The profile can also include the dive computer reported *ceiling* (more " "precisely, the deepest deco stop that the dive computer calculated for each " @@ -6187,7 +5287,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2608 +#: user-manual.txt:2342 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 " @@ -6199,13 +5299,13 @@ msgstr "" "par l'ordinateur de plongée\" dans le panneau Profil." #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2609 +#: user-manual.txt:2343 #, no-wrap msgid "images/icons/ceiling1.jpg" msgstr "images/icons/ceiling1.jpg" #. type: Plain text -#: user-manual.txt:2614 +#: user-manual.txt:2348 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 " @@ -6218,13 +5318,13 @@ msgstr "" "façons:" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2615 +#: user-manual.txt:2349 #, no-wrap msgid "images/icons/ceiling2.jpg" msgstr "images/icons/ceiling2.jpg" #. type: Plain text -#: user-manual.txt:2619 +#: user-manual.txt:2353 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 " @@ -6235,13 +5335,13 @@ msgstr "" "modèle Bühlmann (*B* dans l'image ci-dessous)." #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2620 +#: user-manual.txt:2354 #, no-wrap msgid "images/icons/ceiling3.jpg" msgstr "images/icons/ceiling3.jpg" #. type: delimited block = -#: user-manual.txt:2625 +#: user-manual.txt:2359 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)." @@ -6250,20 +5350,14 @@ msgstr "" "3m* est cliqué, le plafond est affiché avec des incréments de 3m (*C* dans " "l'image ci-dessous)." -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:2626 -#, no-wrap -msgid "Figure: Ceiling with 3m resolution" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:2626 +#: user-manual.txt:2360 #, no-wrap msgid "images/Ceilings2.jpg" msgstr "images/Ceilings2.jpg" #. type: delimited block = -#: user-manual.txt:2629 +#: user-manual.txt:2363 msgid "" "Gradient Factor settings strongly affect the calculated ceilings and their " "depths. For more information about Gradient factors, see the section on xref:" @@ -6276,25 +5370,25 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2631 user-manual.txt:3481 +#: user-manual.txt:2365 user-manual.txt:3229 #, 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:2633 user-manual.txt:3483 +#: user-manual.txt:2367 user-manual.txt:3231 #, 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:2637 +#: user-manual.txt:2371 #, no-wrap msgid "images/icons/ShowCylindersButton.jpg" msgstr "images/icons/ShowCylindersButton.jpg" #. type: Plain text -#: user-manual.txt:2643 +#: user-manual.txt:2377 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 " @@ -6304,26 +5398,20 @@ msgid "" "after 23 minutes. Cylinders with air are shown as a light blue bar." msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:2644 -#, no-wrap -msgid "Figure: Cylinder use graph" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:2644 +#: user-manual.txt:2378 #, no-wrap msgid "images/ShowCylinders_f20.jpg" msgstr "images/ShowCylinders_f20.jpg" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2648 +#: user-manual.txt:2382 #, no-wrap msgid "images/icons/heatmap.png" msgstr "images/icons/heatmap.png" #. type: delimited block = -#: user-manual.txt:2655 +#: user-manual.txt:2389 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 " @@ -6334,20 +5422,14 @@ msgid "" "interpreted." msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:2656 user-manual.txt:2734 -#, no-wrap -msgid "Figure: Inert gas tissue pressure heat-map" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:2656 +#: user-manual.txt:2390 #, no-wrap msgid "images/Heatmap.jpg" msgstr "images/Heatmap.jpg" #. type: delimited block = -#: user-manual.txt:2664 +#: user-manual.txt:2398 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 " @@ -6360,7 +5442,7 @@ msgid "" msgstr "" #. type: delimited block = -#: user-manual.txt:2672 +#: user-manual.txt:2406 msgid "" "Image *B* shows a gradient of unique colors, spanning the whole range of " "inert gas pressures. It is possible to map the height of each of the dark " @@ -6374,7 +5456,7 @@ msgid "" msgstr "" #. type: delimited block = -#: user-manual.txt:2680 +#: user-manual.txt:2414 msgid "" "The bottom range in *B* (marked _On-gassing_) includes colors from light " "blue to black, representing tissue gas pressures below the equilibrium " @@ -6389,7 +5471,7 @@ msgid "" msgstr "" #. type: delimited block = -#: user-manual.txt:2686 +#: user-manual.txt:2420 msgid "" "The central range in *B* includes the colors from black to light green, when " "the inert gas pressure of a tissue compartment is higher than the " @@ -6400,7 +5482,7 @@ msgid "" msgstr "" #. type: delimited block = -#: user-manual.txt:2695 +#: user-manual.txt:2429 msgid "" "The top range in *B* (marked _Off-gassing_) includes colors from light green " "to red and white, repesenting tissue gas pressures above that of the total " @@ -6416,7 +5498,7 @@ msgid "" msgstr "" #. type: delimited block = -#: user-manual.txt:2703 +#: user-manual.txt:2437 msgid "" "Image *C* shows the color 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 " @@ -6428,7 +5510,7 @@ msgid "" msgstr "" #. type: delimited block = -#: user-manual.txt:2710 +#: user-manual.txt:2444 msgid "" "Image *D* is a compilation of similar color mappings of 16 tissue " "compartments during a 10-minute period of a dive, the colors representing " @@ -6439,7 +5521,7 @@ msgid "" msgstr "" #. type: delimited block = -#: user-manual.txt:2714 +#: user-manual.txt:2448 msgid "" "The colors of the heat map are not affected by the gradient factor " "settings. This is because the heat map indicates tissue pressures relative " @@ -6448,7 +5530,7 @@ msgid "" msgstr "" #. type: delimited block = -#: user-manual.txt:2716 +#: user-manual.txt:2450 msgid "" "http://www.tek-dive.com/portal/upload/M-Values.pdf[Understanding M-values by " "Erik Baker, _Immersed_ Vol. 3, No. 3.]" @@ -6457,14 +5539,14 @@ msgstr "" "Erik Baker, _Immersed_ Vol. 3, No. 3.]" #. type: delimited block = -#: user-manual.txt:2719 +#: user-manual.txt:2453 msgid "" "Since the colors of the heat map are not affected by the gradient factor(s), " "the heat map is also applicable when using the VPM-B decompression model." msgstr "" #. type: delimited block = -#: user-manual.txt:2723 +#: user-manual.txt:2457 msgid "" "The image below compares the profiles and heat maps for two planned " "decompression dives to 60m: the first using the Bühlmann decompression " @@ -6474,7 +5556,7 @@ msgid "" msgstr "" #. type: delimited block = -#: user-manual.txt:2728 +#: user-manual.txt:2462 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, " @@ -6485,7 +5567,7 @@ msgid "" msgstr "" #. type: delimited block = -#: user-manual.txt:2733 +#: user-manual.txt:2467 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 " @@ -6495,19 +5577,19 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2734 +#: user-manual.txt:2468 #, no-wrap msgid "images/tissueHeatmap.jpg" msgstr "images/tissueHeatmap.jpg" #. type: Title ==== -#: user-manual.txt:2737 +#: user-manual.txt:2471 #, no-wrap msgid "The Dive Profile context menu" msgstr "Le menu contextuel du Profil de plongée" #. type: Plain text -#: user-manual.txt:2756 +#: user-manual.txt:2490 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 " @@ -6528,64 +5610,52 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:2757 +#: user-manual.txt:2491 #, no-wrap msgid "Organizing the logbook (Manipulating groups of dives)" msgstr "Organiser le carnet de plongée (manipuler des groupes de plongées)" #. type: Title === -#: user-manual.txt:2760 +#: user-manual.txt:2494 #, no-wrap msgid "The Dive List context menu" msgstr "Le menu contextuel de la Liste des plongées" #. type: Plain text -#: user-manual.txt:2764 +#: user-manual.txt:2498 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 " "a single dive or a group of dives and then right-clicking." msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:2765 -#, no-wrap -msgid "Figure: Context Menu" -msgstr "Figure: Menu contextuel" - #. type: Target for macro image -#: user-manual.txt:2765 +#: user-manual.txt:2499 #, no-wrap msgid "images/ContextMenu.jpg" msgstr "images/ContextMenu.jpg" #. type: Plain text -#: user-manual.txt:2768 +#: user-manual.txt:2502 msgid "The context menu is used in many functions described below." msgstr "" "Le menu contextuel est utilisé pour de nombreuses fonctions décrites ci-" "dessous." #. type: Title ==== -#: user-manual.txt:2770 +#: user-manual.txt:2504 #, no-wrap msgid "Customizing the columns showed in the *Dive List* panel" msgstr "Personnaliser les colonnes affichées dans le panneau *Liste des plongées*" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:2772 -#, no-wrap -msgid "Example: Dive list info options" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:2772 +#: user-manual.txt:2506 #, no-wrap msgid "images/DiveListOptions.jpg" msgstr "images/DiveListOptions.jpg" #. type: Plain text -#: user-manual.txt:2780 +#: user-manual.txt:2514 msgid "" "The default information in the *Dive List* includes, for each dive, " "Dive_number, Date, Rating, Dive_depth, Dive_duration and Dive_location. This " @@ -6597,66 +5667,66 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2785 +#: user-manual.txt:2519 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 " +"By selecting the _Media_ checkbox in the dropdown list, an icon is shown " +"indicating whether any media are associated with a particular dive. There " "are three icons:" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2786 +#: user-manual.txt:2520 #, no-wrap msgid "images/icons/duringPhoto.png" msgstr "images/icons/duringPhoto.png" #. type: Plain text -#: user-manual.txt:2789 +#: user-manual.txt:2523 msgid "" -"This dive has photographs taken during the dive, typically using an " -"underwater camera." +"This dive has photographs or videos taken during the dive, typically using " +"an underwater camera." msgstr "" -"Cette plongée contient des photos prises durant la plongée, généralement " -"prises avec un appareil ou caméra submersible." +"Cette plongée contient des photos ou vidéos prises durant la plongée, " +"généralement prises avec un appareil ou caméra submersible." #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2790 +#: user-manual.txt:2524 #, no-wrap msgid "images/icons/outsidePhoto.png" msgstr "images/icons/outsidePhoto.png" #. type: Plain text -#: user-manual.txt:2795 +#: user-manual.txt:2529 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." +"This dive has photographs or videos taken immediately before or immediately " +"after the dive. This is useful for finding photos/media 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:2796 +#: user-manual.txt:2530 #, no-wrap msgid "images/icons/inAndOutPhoto.png" msgstr "images/icons/inAndOutPhoto.png" #. type: Plain text -#: user-manual.txt:2799 +#: user-manual.txt:2533 msgid "" -"This dive has photographs taken both during the dive and immediately before " -"or after the dive." +"This dive has photographs or videos taken both during the dive and " +"immediately before or after the dive." msgstr "" -"Cette plongée contient à la fois des photos prises pendant la plongée, et " -"juste avant ou juste après la plongée." +"Cette plongée contient à la fois des photos ou vidéos prises pendant la " +"plongée, et juste avant ou juste après la plongée." #. type: Title === -#: user-manual.txt:2801 +#: user-manual.txt:2535 #, no-wrap msgid "Renumbering the dives" msgstr "Renuméroter les plongées" #. type: Plain text -#: user-manual.txt:2813 +#: user-manual.txt:2547 msgid "" "Dives are normally numbered incrementally from non-recent dives (low " "sequence numbers) to recent dives (higher sequence numbers). Numbering of " @@ -6670,7 +5740,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2818 +#: user-manual.txt:2552 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 " @@ -6679,13 +5749,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:2820 +#: user-manual.txt:2554 #, no-wrap msgid "Grouping dives into trips and manipulating trips" msgstr "Grouper des plongées en voyages et manipuler les voyages" #. type: Plain text -#: user-manual.txt:2828 +#: user-manual.txt:2562 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/" @@ -6695,20 +5765,14 @@ msgid "" "five dive trips (*B*, on the right):" msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:2829 -#, no-wrap -msgid "Figure: Grouping dives" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:2829 +#: user-manual.txt:2563 #, no-wrap msgid "images/Group2.jpg" msgstr "images/Group2.jpg" #. type: Plain text -#: user-manual.txt:2835 +#: user-manual.txt:2569 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, " @@ -6717,13 +5781,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2836 +#: user-manual.txt:2570 #, no-wrap msgid "Editing the title and associated information for a particular trip" msgstr "Éditer le titre et l'information associée à un voyage déterminé" #. type: Plain text -#: user-manual.txt:2849 +#: user-manual.txt:2583 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 " @@ -6737,13 +5801,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2850 +#: user-manual.txt:2584 #, no-wrap msgid "Viewing the dives during a particular trip" msgstr "Visualiser les plongées d'un voyage déterminé" #. type: Plain text -#: user-manual.txt:2855 +#: user-manual.txt:2589 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. " @@ -6751,13 +5815,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2856 +#: user-manual.txt:2590 #, no-wrap msgid "Merging dives from more than one trip into a single trip" msgstr "Fusionner des plongées venant des voyages différents en un seul voyage" #. type: Plain text -#: user-manual.txt:2861 +#: user-manual.txt:2595 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 " @@ -6765,13 +5829,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2862 +#: user-manual.txt:2596 #, no-wrap msgid "Splitting a single trip into more than one trip" msgstr "Diviser un voyage en plusieurs voyages" #. type: Plain text -#: user-manual.txt:2871 +#: user-manual.txt:2605 msgid "" "If a trip includes, for example, ten dives, you can split this trip into two " "trips (trip 1: top four dives; trip 2: bottom six dives) by selecting and " @@ -6782,32 +5846,26 @@ msgid "" "right (B):" msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:2872 -#, no-wrap -msgid "FIGURE: Split a trip into 2 trips" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:2872 +#: user-manual.txt:2606 #, no-wrap msgid "images/SplitDive3a.jpg" msgstr "images/SplitDive3a.jpg" #. type: Title === -#: user-manual.txt:2874 +#: user-manual.txt:2608 #, no-wrap msgid "Manipulating single dives" msgstr "Manipuler des plongées uniques" #. type: Title ==== -#: user-manual.txt:2876 +#: user-manual.txt:2610 #, no-wrap msgid "Delete a dive from the dive log" msgstr "Effacer une plongée du carnet de plongée" #. type: Plain text -#: user-manual.txt:2883 +#: user-manual.txt:2617 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)*. " @@ -6816,13 +5874,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2884 +#: user-manual.txt:2618 #, no-wrap msgid "Unlink a dive from a trip" msgstr "" #. type: Plain text -#: user-manual.txt:2891 +#: user-manual.txt:2625 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 " @@ -6832,13 +5890,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2892 +#: user-manual.txt:2626 #, no-wrap msgid "Add a dive to the trip immediately above" msgstr "" #. type: Plain text -#: user-manual.txt:2897 +#: user-manual.txt:2631 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 " @@ -6846,13 +5904,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2898 +#: user-manual.txt:2632 #, no-wrap msgid "Shift the start time of dive(s)" msgstr "Décaler l'heure de début d'une ou plusieurs plongées" #. type: Plain text -#: user-manual.txt:2908 +#: user-manual.txt:2642 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 " @@ -6864,13 +5922,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2909 +#: user-manual.txt:2643 #, no-wrap msgid "Merge dives into a single dive" msgstr "Fusionner plusieurs plongées en une seule" #. type: Plain text -#: user-manual.txt:2919 +#: user-manual.txt:2653 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 " @@ -6882,26 +5940,20 @@ msgid "" "dive. The figure below shows the depth profile of two dives that were merged:" msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:2920 -#, no-wrap -msgid "Example: Merged dive" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:2920 +#: user-manual.txt:2654 #, no-wrap msgid "images/MergedDive.png" msgstr "images/MergedDive.png" #. type: Title ==== -#: user-manual.txt:2922 +#: user-manual.txt:2656 #, no-wrap msgid "Split selected dives" msgstr "Diviser les plongées sélectionnées" #. type: Plain text -#: user-manual.txt:2930 +#: user-manual.txt:2664 msgid "" "On some occasions, a diver reaches the surface and immediately dives again. " "However, it may happen that the dive computer does not register a new dive, " @@ -6913,32 +5965,32 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2931 +#: user-manual.txt:2665 #, no-wrap msgid "Load image(s) from file(s)" msgstr "" #. type: Plain text -#: user-manual.txt:2933 user-manual.txt:2936 +#: user-manual.txt:2667 user-manual.txt:2670 msgid "" "This topic is discussed in the section: xref:S_LoadImage[Adding photographs " -"to dives]." +"or videos to dives]." msgstr "" #. type: Title ==== -#: user-manual.txt:2934 +#: user-manual.txt:2668 #, no-wrap msgid "Load image from web" msgstr "" #. type: Title ==== -#: user-manual.txt:2937 +#: user-manual.txt:2671 #, no-wrap msgid "Undo dive manipulations" msgstr "Annuler les manipuations sur les plongées" #. type: Plain text -#: user-manual.txt:2943 +#: user-manual.txt:2677 msgid "" "Important actions on dives or trips, described above, can be undone or " "redone. This includes: _delete dives_, _merge dives_, _split selected " @@ -6948,13 +6000,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:2946 +#: user-manual.txt:2680 #, no-wrap msgid "Filtering the dive list" msgstr "Filtrer la liste des plongées" #. type: Plain text -#: user-manual.txt:2952 +#: user-manual.txt:2686 msgid "" "The dives in the *Dive List* panel can be filtered, selecting only some of " "the dives based on their attributes, e.g. dive tags, dive site, divemaster, " @@ -6964,7 +6016,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2960 +#: user-manual.txt:2694 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 " @@ -6977,20 +6029,14 @@ msgid "" "with the white cross." msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:2961 -#, no-wrap -msgid "Figure: Filter panel" -msgstr "Figure: panneau des filtres" - #. type: Target for macro image -#: user-manual.txt:2961 +#: user-manual.txt:2695 #, no-wrap msgid "images/Filterpanel.jpg" msgstr "images/Filterpanel.jpg" #. type: Plain text -#: user-manual.txt:2970 +#: user-manual.txt:2704 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 " @@ -7003,7 +6049,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2978 +#: user-manual.txt:2712 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 " @@ -7015,24 +6061,24 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:2980 +#: user-manual.txt:2714 #, no-wrap msgid "Exporting the dive log or parts of the dive log" msgstr "Export le carnet de plongée ou des parties de celui-ci" #. type: Plain text -#: user-manual.txt:2983 +#: user-manual.txt:2717 msgid "There are two ways to export dive information from Subsurface:" msgstr "" "Il y a deux façons d'exporter des informations de plongée depuis Subsurface:" #. type: Plain text -#: user-manual.txt:2985 +#: user-manual.txt:2719 msgid "Export dive information to _Facebook_" msgstr "Exporter les informations de plongée vers _Facebook_" #. type: Plain text -#: user-manual.txt:2987 +#: user-manual.txt:2721 msgid "" "xref:S_Export_other[Export dive information to other destinations or formats]" msgstr "" @@ -7040,13 +6086,13 @@ msgstr "" "destinations ou formats]" #. type: Title === -#: user-manual.txt:2989 +#: user-manual.txt:2723 #, no-wrap msgid "Exporting dive information to _Facebook_" msgstr "Export des informations de plongée vers _Facebook_" #. type: Plain text -#: user-manual.txt:2998 +#: user-manual.txt:2732 msgid "" "Export of dives to _Facebook_ is handled differently from other types of " "export because a connection to _Facebook_ is required, needing a _Facebook_ " @@ -7072,27 +6118,21 @@ msgstr "" "sélectionnable)." #. type: Plain text -#: user-manual.txt:3002 +#: user-manual.txt:2736 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: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:3003 -#, no-wrap -msgid "Figure: Facebook login" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:3003 +#: user-manual.txt:2737 #, no-wrap msgid "images/facebook1.jpg" msgstr "images/facebook1.jpg" #. type: Plain text -#: user-manual.txt:3016 +#: user-manual.txt:2750 msgid "" "Having established a login to _Facebook_, transferring a dive profile to a " "_Facebook_ timeline is easy. In the _Subsurface_ *Dive List* panel, " @@ -7126,7 +6166,7 @@ msgstr "" "fenêtre de confirmation apparait ,indiquant le succès du transfert." #. type: Plain text -#: user-manual.txt:3020 +#: user-manual.txt:2754 msgid "" "Both the album created and the post to your timeline are marked as private. " "In order for friends to be able to see the post, log into _Facebook_ using a " @@ -7137,33 +6177,27 @@ msgstr "" "_Facebook_ depuis un navigateur ou l'application Facebook et modifiez les " "permissions." -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:3021 -#, no-wrap -msgid "Figure: Facebook data submission" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:3021 +#: user-manual.txt:2755 #, no-wrap msgid "images/facebook2.jpg" msgstr "images/facebook2.jpg" #. type: Plain text -#: user-manual.txt:3025 +#: user-manual.txt:2759 msgid "" "If required, then close the _Facebook_ connection by selecting, from the " "*Main Menu*, _Share on -> Disconnect from -> Facebook_ (image *B* above)." msgstr "" #. type: Title === -#: user-manual.txt:3027 +#: user-manual.txt:2761 #, 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:3032 +#: user-manual.txt:2766 msgid "" "For non-_Facebook exports_, the export function can be found by selecting " "_File -> Export_, which brings up the Export dialog. This dialog always " @@ -7172,34 +6206,28 @@ msgid "" "below)." msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:3033 -#, no-wrap -msgid "Figure: Export dialog" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:3033 +#: user-manual.txt:2767 #, no-wrap msgid "images/Export_f20.jpg" msgstr "images/Export_f20.jpg" #. type: Plain text -#: user-manual.txt:3036 +#: user-manual.txt:2770 msgid "A dive log or part of it can be saved in several formats:" msgstr "" "Un carnet de plongée ou une partie de celui-ci peut être enregistré dans " "différents formats:" #. type: Plain text -#: user-manual.txt:3038 +#: user-manual.txt:2772 msgid "" "_Subsurface XML_ format. This is the native format used by _Subsurface_." msgstr "" "Format _Subsurface XML_. C'est le format utilisé nativement par _Subsurface_." #. type: Plain text -#: user-manual.txt:3042 +#: user-manual.txt:2776 msgid "" "Universal Dive Data Format (_UDDF_). Refer to _http://uddf.org_ for more " "information. UDDF is a generic format that enables communication among many " @@ -7207,7 +6235,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3046 +#: user-manual.txt:2780 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_. " @@ -7216,7 +6244,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3050 +#: user-manual.txt:2784 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 " @@ -7224,7 +6252,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3055 +#: user-manual.txt:2789 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, " @@ -7233,7 +6261,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3058 +#: user-manual.txt:2792 msgid "" "_CSV dive profile_, that includes a large amount of detail for each dive, " "including the depth profile, temperature and pressure information of each " @@ -7241,7 +6269,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3071 +#: user-manual.txt:2805 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 " @@ -7258,7 +6286,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3076 +#: user-manual.txt:2810 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 " @@ -7266,20 +6294,14 @@ msgid "" "in text, as shown in the image below." msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:3077 -#, no-wrap -msgid "Figure: HTML Map export view" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:3077 +#: user-manual.txt:2811 #, no-wrap msgid "images/mapview_f20.jpg" msgstr "images/mapview_f20.jpg" #. type: Plain text -#: user-manual.txt:3086 +#: user-manual.txt:2820 msgid "" "_TeX_ format, a file for printing using the TeX typesetting software. Choose " "a filename with a '.tex' extension. You will also need a template file, that " @@ -7289,34 +6311,40 @@ msgid "" "for example by running 'pdftex filename.tex' on the command line." msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:3087 -#, no-wrap -msgid "Figure: Export to TeX" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:3087 +#: user-manual.txt:2821 #, no-wrap msgid "images/texexample.png" msgstr "images/texexample.png" #. type: Plain text -#: user-manual.txt:3094 +#: user-manual.txt:2828 msgid "" "_Image depths_, which creates a text file that contains the file names of " -"all photos or images attached to any of the selected dives in the _Dive " -"List_, together with the depth underwater where of each of those photos was " -"taken." +"all photos or videos attached to any of the selected dives in the _Dive " +"List_, together with the depth underwater where of each of those photos/" +"videos was taken." +msgstr "" + +#. type: Plain text +#: user-manual.txt:2835 +msgid "" +"When the \"Anonymize\" option is selected for xml-based file formats, the " +"letters A-Z are all replaced by the letter 'X' in the notes, buddy, " +"divemaster, divesite name and divesite description fields. This way, you can " +"share dive log files for debugging purposes without revealing personal " +"information. Please note, though, that other characters are not replaced, so " +"this is not useful for languages with non-latin characters and GPS " +"coordinates of dive sites are preserved as well." msgstr "" #. type: Plain text -#: user-manual.txt:3096 +#: user-manual.txt:2838 msgid "_General Settings_, under the HTML tab, provides the following options:" msgstr "" #. type: Plain text -#: user-manual.txt:3104 +#: user-manual.txt:2846 #, no-wrap msgid "" "** Subsurface Numbers: if this option is checked, the dive(s) are exported with the\n" @@ -7329,27 +6357,27 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3107 +#: user-manual.txt:2849 msgid "" "Under _Style Options_ some style-related options are available like font " "size and theme." msgstr "" #. type: Plain text -#: user-manual.txt:3110 +#: user-manual.txt:2852 msgid "" "Export to other formats can be done through third party facilities, for " "instance _www.divelogs.de_." msgstr "" #. type: Title == -#: user-manual.txt:3112 +#: user-manual.txt:2854 #, no-wrap msgid "Keeping a _Subsurface_ dive log in the Cloud" msgstr "" #. type: Plain text -#: user-manual.txt:3122 +#: user-manual.txt:2864 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 " @@ -7363,7 +6391,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3128 +#: user-manual.txt:2870 msgid "" "_Subsurface_ includes access to a transparently integrated cloud storage " "back end that is available to all Subsurface users. Storing and retrieving a " @@ -7373,13 +6401,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3129 +#: user-manual.txt:2871 #, no-wrap msgid "Create a cloud storage account" msgstr "" #. type: Plain text -#: user-manual.txt:3146 +#: user-manual.txt:2888 #, no-wrap msgid "" "** Open the *Network Preferences* by selecting _File_ -> _Preferences_ -> _Network_.\n" @@ -7400,13 +6428,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3147 +#: user-manual.txt:2889 #, no-wrap msgid "Using _Subsurface cloud storage_" msgstr "" #. type: Plain text -#: user-manual.txt:3157 +#: user-manual.txt:2899 #, no-wrap msgid "" "** Once the cloud storage has been initialized, two new items appear in the\n" @@ -7420,7 +6448,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3162 +#: user-manual.txt:2904 #, no-wrap msgid "" "** _Subsurface_ keeps a local copy of the data and the cloud facility remains fully\n" @@ -7430,13 +6458,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3164 +#: user-manual.txt:2906 #, no-wrap msgid "Web access to _Subsurface cloud storage_" msgstr "" #. type: Plain text -#: user-manual.txt:3174 +#: user-manual.txt:2916 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://" @@ -7449,13 +6477,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3175 +#: user-manual.txt:2917 #, no-wrap msgid "Other cloud services" msgstr "" #. type: Plain text -#: user-manual.txt:3185 +#: user-manual.txt:2927 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 " @@ -7465,20 +6493,14 @@ msgid "" "computer." msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:3186 -#, no-wrap -msgid "FIGURE: Dropbox folder" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:3186 +#: user-manual.txt:2928 #, no-wrap msgid "images/Cloud.jpg" msgstr "images/Cloud.jpg" #. type: Plain text -#: user-manual.txt:3195 +#: user-manual.txt:2937 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, " @@ -7491,13 +6513,13 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:3198 +#: user-manual.txt:2940 #, no-wrap msgid "Several _Subsurface_ users on one desktop computer" msgstr "" #. type: Plain text -#: user-manual.txt:3202 +#: user-manual.txt:2944 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 " @@ -7506,7 +6528,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3214 +#: user-manual.txt:2956 #, no-wrap msgid "" "*A)* If the different users of a desktop computer do not log onto the desktop/laptop under different user names\n" @@ -7515,7 +6537,7 @@ msgid "" " 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" +" *Profile Panel* and media 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" @@ -7523,24 +6545,24 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3216 +#: user-manual.txt:2958 #, no-wrap msgid "\tsubsurface --user=John\n" msgstr "" #. type: Plain text -#: user-manual.txt:3218 +#: user-manual.txt:2960 msgid "while Joan can launch _Subsurface_ using:" msgstr "" #. type: Plain text -#: user-manual.txt:3220 +#: user-manual.txt:2962 #, no-wrap msgid "\tsubsurface --user=Joan\n" msgstr "" #. type: Plain text -#: user-manual.txt:3228 +#: user-manual.txt:2970 #, no-wrap msgid "" "In this case, each user's preferences, settings and cloud access information are stored separately, allowing\n" @@ -7553,7 +6575,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3232 +#: user-manual.txt:2974 #, 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" @@ -7562,13 +6584,13 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:3234 +#: user-manual.txt:2976 #, no-wrap msgid "Printing a dive log" msgstr "Imprimer un carnet de plongée" #. type: Plain text -#: user-manual.txt:3238 +#: user-manual.txt:2980 #, no-wrap msgid "" "_Subsurface_ provides a simple and flexible way to print a whole dive log or only a few selected dives.\n" @@ -7576,19 +6598,19 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3240 +#: user-manual.txt:2982 msgid "Some decisions need to be made before printing:" msgstr "Certains choix doivent être fait avant l'impression:" #. type: Plain text -#: user-manual.txt:3243 +#: user-manual.txt:2985 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:3245 +#: user-manual.txt:2987 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 " @@ -7596,49 +6618,43 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3248 +#: user-manual.txt:2990 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 " "and page layout:" msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:3249 user-manual.txt:4951 -#, no-wrap -msgid "FIGURE: Print dialogue" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:3249 user-manual.txt:4951 +#: user-manual.txt:2991 user-manual.txt:4692 #, no-wrap msgid "images/Print1_f22.jpg" msgstr "images/Print1_f22.jpg" #. type: Plain text -#: user-manual.txt:3252 +#: user-manual.txt:2994 msgid "Under _Print type_ select one of two options:" msgstr "" #. type: Plain text -#: user-manual.txt:3254 +#: user-manual.txt:2996 msgid "" "_Dive list print_: Print dives from the *Dive List* panel with profiles and " "other information." msgstr "" #. type: Plain text -#: user-manual.txt:3255 +#: user-manual.txt:2997 msgid "_Statistics print_: Print yearly statistics of the dives." msgstr "" #. type: Plain text -#: user-manual.txt:3257 +#: user-manual.txt:2999 msgid "Under _Print options_ select:" msgstr "" #. type: Plain text -#: user-manual.txt:3262 +#: user-manual.txt:3004 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 " @@ -7646,91 +6662,73 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3264 +#: user-manual.txt:3006 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:3267 +#: user-manual.txt:3009 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:3269 +#: user-manual.txt:3011 msgid "_Table_: This prints a summary table of all dives selected (see below)." msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:3270 -#, no-wrap -msgid "FIGURE: Print summary table" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:3270 +#: user-manual.txt:3012 #, no-wrap msgid "images/Print_summarylist_f22.jpg" msgstr "images/Print_summarylist_f22.jpg" #. type: Plain text -#: user-manual.txt:3273 +#: user-manual.txt:3015 msgid "" "_Flow layout_: Print the text associated with each dive without printing the " "dive profiles" msgstr "" #. type: Plain text -#: user-manual.txt:3274 +#: user-manual.txt:3016 msgid "of each dive (see below):" msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:3275 -#, no-wrap -msgid "FIGURE: Print flow layout" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:3275 +#: user-manual.txt:3017 #, no-wrap msgid "images/Print_flow_layout_f22.jpg" msgstr "images/Print_flow_layout_f22.jpg" #. type: Plain text -#: user-manual.txt:3278 +#: user-manual.txt:3020 msgid "" "_One Dive_: Print one dive per page, also showing the dive profile (see " "below)" msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:3279 -#, no-wrap -msgid "FIGURE: Print one dive / page" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:3279 +#: user-manual.txt:3021 #, no-wrap msgid "images/print2_f22.jpg" msgstr "images/print2_f22.jpg" #. type: Plain text -#: user-manual.txt:3283 +#: user-manual.txt:3025 msgid "_Two Dives_: Print two dives per page, also showing the dive profiles." msgstr "" #. type: Plain text -#: user-manual.txt:3284 +#: user-manual.txt:3026 msgid "_Six Dives_: Print six dives per page, also showing the dive profiles." msgstr "" #. type: Plain text -#: user-manual.txt:3288 +#: user-manual.txt:3030 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 " @@ -7739,7 +6737,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3292 +#: user-manual.txt:3034 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 " @@ -7747,20 +6745,14 @@ msgid "" "below):" msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:3293 -#, no-wrap -msgid "FIGURE: Print dialog" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:3293 +#: user-manual.txt:3035 #, no-wrap msgid "images/Print_print_f22.jpg" msgstr "images/Print_print_f22.jpg" #. type: Plain text -#: user-manual.txt:3298 +#: user-manual.txt:3040 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 " @@ -7768,26 +6760,20 @@ msgid "" "page." msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:3299 -#, no-wrap -msgid "FIGURE: Print preview page" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:3299 +#: user-manual.txt:3041 #, no-wrap msgid "images/Printpreview.jpg" msgstr "images/Printpreview.jpg" #. type: Title === -#: user-manual.txt:3301 +#: user-manual.txt:3043 #, 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:3307 +#: user-manual.txt:3049 msgid "" "Writing a custom template is an effective way to produce highly customized " "printouts. Subsurface uses HTML templates to render printing. You can create " @@ -7798,13 +6784,13 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:3309 +#: user-manual.txt:3051 #, no-wrap msgid "Configuring a dive computer" msgstr "Configurer un ordinateur de plongée" #. type: Plain text -#: user-manual.txt:3317 +#: user-manual.txt:3059 msgid "" "_Subsurface_ lets you configure a dive computer. Currently, the Heinrichs-" "Weikamp (OSTC 2/2N/2C, OSTC 3, Sport) and Suunto Vyper (Stinger, Mosquito, " @@ -7828,7 +6814,7 @@ msgstr "" "ANNEXE A>> pour plus d'informations sur la manière de procéder." #. type: Plain text -#: user-manual.txt:3323 +#: user-manual.txt:3065 msgid "" "Once the dive computer is connected to the _Subsurface_ computer, select " "_File -> Configure dive computer_ from the _Main Menu_. Select the " @@ -7843,20 +6829,14 @@ msgstr "" "sélectionner le bon modèle d'ordinateur de plongée à partir du panneau à " "gauche (voir l'image ci-dessous)." -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:3324 -#, no-wrap -msgid "FIGURE: Configure dive computer" -msgstr "FIGURE: Configurer un ordinateur de plongée" - #. type: Target for macro image -#: user-manual.txt:3324 +#: user-manual.txt:3066 #, no-wrap msgid "images/Configure_dc_f20.jpg" msgstr "images/Configure_dc_f20.jpg" #. type: Plain text -#: user-manual.txt:3327 +#: user-manual.txt:3069 msgid "" "Using the appropriate buttons on the configuration panel, the following " "actions can be done:" @@ -7865,7 +6845,7 @@ msgstr "" "suivantes peuvent être effectuées :" #. type: Plain text -#: user-manual.txt:3330 +#: user-manual.txt:3072 #, no-wrap msgid "" "*Retrieve available details*. This loads the existing configuration from the dive computer\n" @@ -7875,7 +6855,7 @@ msgstr "" "dans _Subsurface_, en l'affichant dans le panneau de configuration.\n" #. type: Plain text -#: user-manual.txt:3332 +#: user-manual.txt:3074 #, no-wrap msgid "" "*Save changes to device*. This changes the configuration of the\n" @@ -7885,7 +6865,7 @@ msgstr "" "de plongée pour correspondre aux informations affichées dans le panneau de configuration.\n" #. type: Plain text -#: user-manual.txt:3334 +#: user-manual.txt:3076 #, no-wrap msgid "" "*Backup*. This saves the configuration data to a file. _Subsurface_ asks for\n" @@ -7895,7 +6875,7 @@ msgstr "" "l'emplacement et le nom du fichier pour enregistrer les informations.\n" #. type: Plain text -#: user-manual.txt:3336 +#: user-manual.txt:3078 #, no-wrap msgid "" "*Restore backup*. This loads the information from a backup file and displays it\n" @@ -7905,7 +6885,7 @@ msgstr "" "dans le panneau de configuration.\n" #. type: Plain text -#: user-manual.txt:3338 +#: user-manual.txt:3080 #, no-wrap msgid "" "*Update firmware*. If new firmware is available for the dive computer, this is\n" @@ -7915,13 +6895,13 @@ msgstr "" "il sera chargé dans l'ordinateur de plongée.\n" #. type: Title == -#: user-manual.txt:3341 +#: user-manual.txt:3083 #, no-wrap msgid "Setting user _Preferences_ for _Subsurface_" msgstr "" #. type: Plain text -#: user-manual.txt:3352 +#: user-manual.txt:3094 msgid "" "There are several user-definable settings within _Subsurface_, found by " "selecting _File -> Preferences_, mostly affecting the way in which " @@ -7935,30 +6915,24 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3353 +#: user-manual.txt:3095 #, no-wrap msgid "General" msgstr "" #. type: Plain text -#: user-manual.txt:3356 +#: user-manual.txt:3098 msgid "There are several headings in the *General* panel:" msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:3357 -#, no-wrap -msgid "FIGURE: Preferences general page" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:3357 +#: user-manual.txt:3099 #, no-wrap -msgid "images/Pref1_f23.jpg" -msgstr "images/Pref1_f23.jpg" +msgid "images/Pref1.jpg" +msgstr "images/Pref1.jpg" #. type: Plain text -#: user-manual.txt:3361 +#: user-manual.txt:3103 #, no-wrap msgid "" " ** *Lists and tables*: Specify the font type and font size of the\n" @@ -7966,7 +6940,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3366 +#: user-manual.txt:3108 #, no-wrap msgid "" " ** *Dives*: For the _Default Dive Log File_ specify the directory and\n" @@ -7976,19 +6950,19 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3367 +#: user-manual.txt:3109 #, 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:3368 +#: user-manual.txt:3110 #, 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:3370 +#: user-manual.txt:3112 #, no-wrap msgid "" "_Cloud storage default file_: When checked, _Subsurface automatically loads the dive log from the cloud\n" @@ -7996,13 +6970,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3372 +#: user-manual.txt:3114 #, 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:3375 +#: user-manual.txt:3117 #, no-wrap msgid "" "dives that he/she doesn't consider valid dives, e.g. pool dives, but still want to\n" @@ -8011,25 +6985,25 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3377 +#: user-manual.txt:3119 #, 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:3378 +#: user-manual.txt:3120 #, no-wrap msgid "the *Equipment* tab of the *Notes* panel.\n" msgstr "" #. type: Plain text -#: user-manual.txt:3380 +#: user-manual.txt:3122 #, no-wrap msgid "** *Animations*: Some actions in showing the dive profile are performed using\n" msgstr "" #. type: Plain text -#: user-manual.txt:3386 +#: user-manual.txt:3128 #, no-wrap msgid "" "animations. For instance, the axis values for depth and time change from dive to\n" @@ -8041,37 +7015,47 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3388 +#: user-manual.txt:3130 +#, no-wrap +msgid "** *Video thumbnails*: In generating thumbnails for videos associated with dives, _Subsurface_\n" +msgstr "" + +#. type: Plain text +#: user-manual.txt:3134 +#, no-wrap +msgid "" +"needs to have the appropriate information (see section on <<S_ViewMedia,View Images>>). Three preferences need to be set\n" +"as explained in <<S_APPENDIX_F, APPENDIX F>>. These are: a) switch on thumbnails, b) specify\n" +"the location of the _ffmpeg_ program and c) set the place within video where the thumbnail needs\n" +"to be obtained from.\n" +msgstr "" + +#. type: Plain text +#: user-manual.txt:3136 #, 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:3389 +#: user-manual.txt:3137 #, no-wrap msgid "cleared and set to default values.\n" msgstr "" #. type: Title === -#: user-manual.txt:3390 +#: user-manual.txt:3138 #, no-wrap msgid "Units" msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:3391 -#, no-wrap -msgid "FIGURE: Preferences Units page" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:3391 +#: user-manual.txt:3139 #, no-wrap msgid "images/Pref2_f23.jpg" msgstr "images/Pref2_f23.jpg" #. type: Plain text -#: user-manual.txt:3398 +#: user-manual.txt:3146 msgid "" "Choose between metric and imperial units of depth, pressure, volume, " "temperature and mass. By selecting the Metric or Imperial radio button at " @@ -8082,7 +7066,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3404 +#: user-manual.txt:3152 msgid "" "Regardless of the above settings, dive time measurements can be either in " "seconds or minutes. Choose the appropriate option. GPS coordinates can be " @@ -8091,58 +7075,46 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3405 +#: user-manual.txt:3153 #, no-wrap msgid "Profile" msgstr "Profil" #. type: Plain text -#: user-manual.txt:3407 +#: user-manual.txt:3155 msgid "This panel has three sections:" msgstr "Ce panneau comporte trois sections:" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:3409 -#, no-wrap -msgid "FIGURE: Preferences Graph page" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:3409 +#: user-manual.txt:3157 #, no-wrap msgid "images/Pref4_f23.jpg" msgstr "images/Pref4_f23.jpg" #. type: Plain text -#: user-manual.txt:3414 +#: user-manual.txt:3170 #, no-wrap msgid "" "*Gas pressure display setup*. Even though nitrogen and helium pressures are also included here, these items mainly pertain to oxygen management:\n" "** _Thresholds_: _Subsurface_ can display graphs of the nitrogen, oxygen and the helium\n" -msgstr "" - -#. type: Plain text -#: user-manual.txt:3422 -#, no-wrap -msgid "" -"partial pressures during\n" -"the dive, activated using the toolbar on the left of the *Dive Profile*\n" -"panel. For each of these graphs, specify a threshold value. If any of the graphs go\n" -"above the specified threshold, the graph is\n" -"highlighted in red, indicating the particular partial pressure threshold has been exceeded.\n" -"The pO~2~ threshold is probably the most important one and a value of 1.6 is commonly used.\n" +" partial pressures during\n" +" the dive, activated using the toolbar on the left of the *Dive Profile*\n" +" panel. For each of these graphs, specify a threshold value. If any of the graphs go\n" +" above the specified threshold, the graph is\n" +" highlighted in red, indicating the particular partial pressure threshold has been exceeded.\n" +" The pO~2~ threshold is probably the most important one and a value of 1.6 is commonly used.\n" "** _pO~2~ in calculating MOD_ is used for calculating the maximum operative depth for a particular\n" " nitrox or trimix gas mixture. A value of 1.4 is commonly used.\n" msgstr "" #. type: Plain text -#: user-manual.txt:3424 +#: user-manual.txt:3172 #, no-wrap msgid "** CCR Options: These options determine oxygen management for CCR dives:\n" msgstr "" #. type: Plain text -#: user-manual.txt:3429 +#: user-manual.txt:3177 #, no-wrap msgid "" "*** _Dive planner default setpoint_: Specify the O~2~ setpoint for a\n" @@ -8152,7 +7124,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3433 +#: user-manual.txt:3181 #, no-wrap msgid "" "*** _CCR: Show O~2~ sensor values when viewing pO~2~:_ Show the pO~2~\n" @@ -8161,7 +7133,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3437 +#: user-manual.txt:3185 #, no-wrap msgid "" "*** _CCR: Show setpoints when viewing pO~2~:_ With this checkbox activated, the pO~2~\n" @@ -8170,7 +7142,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3440 +#: user-manual.txt:3188 #, no-wrap msgid "" "** _pSCR options_. These preferences determine how passive semi-closed circuit (pSCR) dives\n" @@ -8178,7 +7150,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3444 +#: user-manual.txt:3192 #, no-wrap msgid "" "*** _Metabolic rate:_ this is the\n" @@ -8187,7 +7159,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3447 +#: user-manual.txt:3195 #, no-wrap msgid "" "*** _pSCR ratio:_ The dilution ratio (or dump ratio) is the ratio of gas released to the\n" @@ -8195,7 +7167,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3451 +#: user-manual.txt:3199 #, no-wrap msgid "" "*** _Show equivalent OC with pSCR pO~2~_: The pO~2~ in the pSCR loop is usually lower than the\n" @@ -8204,19 +7176,19 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3453 +#: user-manual.txt:3201 #, no-wrap msgid "*Ceiling display setup*. These settings mostly deal with nitrogen and helium management\n" msgstr "" #. type: Plain text -#: user-manual.txt:3454 +#: user-manual.txt:3202 #, no-wrap msgid "by determining how the decompression ceiling (ascent ceiling) is calculated and displayed:\n" msgstr "" #. type: Plain text -#: user-manual.txt:3461 +#: user-manual.txt:3209 #, no-wrap msgid "" "** _Draw dive computer reported ceiling red_: This checkbox does exactly what it says. By default\n" @@ -8228,7 +7200,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3466 +#: user-manual.txt:3214 #, no-wrap msgid "" "** _Algorithm for calculating ceiling_. Choose between the Bühlmann Z1H-L16\n" @@ -8238,7 +7210,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3479 +#: user-manual.txt:3227 #, no-wrap msgid "" "*** Bühlmann: Set the _gradient factors_ (GFLow and GFHigh) for calculcating the deco ceiling following\n" @@ -8254,13 +7226,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3486 +#: user-manual.txt:3234 #, no-wrap msgid "*Misc*\n" msgstr "" #. type: Plain text -#: user-manual.txt:3493 +#: user-manual.txt:3241 #, no-wrap msgid "" "** _Show unused cylinders in Equipment Tab_: This checkbox allows display of information about unused cylinders when viewing the\n" @@ -8272,30 +7244,24 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3495 +#: user-manual.txt:3243 #, no-wrap msgid "Language" msgstr "Langue" #. type: Plain text -#: user-manual.txt:3497 +#: user-manual.txt:3245 msgid "Choose a language that _Subsurface_ will use." msgstr "Choisissez une langue que _Subsurface_ utilisera." -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:3498 -#, no-wrap -msgid "FIGURE: Preferences Language page" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:3498 +#: user-manual.txt:3246 #, no-wrap msgid "images/Pref3_f23.jpg" msgstr "images/Pref3_f23.jpg" #. type: Plain text -#: user-manual.txt:3507 +#: user-manual.txt:3255 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 " @@ -8307,7 +7273,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3509 +#: user-manual.txt:3257 msgid "" "In this section also specify appropriate date and time formats for showing " "dive details." @@ -8316,39 +7282,33 @@ msgstr "" "l'affiche des détails de plongée." #. type: Title === -#: user-manual.txt:3510 +#: user-manual.txt:3258 #, no-wrap msgid "Network" msgstr "Réseau" #. type: Plain text -#: user-manual.txt:3515 +#: user-manual.txt:3262 msgid "" "This panel facilitates communication between _Subsurface_ and data sources " "on the Internet. This is important, for instance, when _Subsurface_ needs " -"to communicate with web services such as Cloud storage, the <<S_Companion," -"_Subsurface Companion app_>> or when you want to communicate through a proxy." -msgstr "" - -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:3517 -#, no-wrap -msgid "FIGURE: Preferences Network page" +"to communicate with web services such as Cloud storage, or when you want to " +"communicate through a proxy." msgstr "" #. type: Target for macro image -#: user-manual.txt:3517 +#: user-manual.txt:3264 #, no-wrap msgid "images/Pref5_f23.jpg" msgstr "images/Pref5_f23.jpg" #. type: Plain text -#: user-manual.txt:3520 +#: user-manual.txt:3267 msgid "This dialogue has three sections:" msgstr "" #. type: Plain text -#: user-manual.txt:3528 +#: user-manual.txt:3275 #, no-wrap msgid "" "** _Proxy_:\n" @@ -8361,7 +7321,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3533 +#: user-manual.txt:3280 #, no-wrap msgid "" "** _Subsurface cloud storage_: To store your dive log in the cloud, a valid email address\n" @@ -8371,77 +7331,62 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3534 +#: user-manual.txt:3281 #, 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:3535 +#: user-manual.txt:3282 #, no-wrap msgid "while you do other things within _Subsurface_.\n" msgstr "" #. type: Plain text -#: user-manual.txt:3536 +#: user-manual.txt:3283 #, 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:3537 +#: user-manual.txt:3284 #, no-wrap msgid "information is saved in raw text form, not encoded in any way.\n" msgstr "" -#. type: Plain text -#: user-manual.txt:3541 -#, no-wrap -msgid "" -"** _Subsurface web service_: When you subscribe to the <<S_Companion,Subsurface web service>>, a very\n" -" long and hard-to-remember userID is issued. This is the place to save that userID. By\n" -" checking the option _Save User ID locally?_, you ensure a local copy of that userID is saved.\n" -msgstr "" - #. type: Title === -#: user-manual.txt:3542 +#: user-manual.txt:3286 #, no-wrap msgid "Georeference" msgstr "Géoréférencement" #. type: Plain text -#: user-manual.txt:3550 +#: user-manual.txt:3294 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 " "right of the _Subsurface_ window, or from a GPS instrument or from the " -"_Subsurface_ Companion app). A search on the Internet is done to find the " -"name of the closest known location. This function only works if _Subsurface_ " -"has an Internet connection. The preference of the dive site name can be " +"_Subsurface-Mobile_ app). A search on the Internet is done to find the name " +"of the closest known location. This function only works if _Subsurface_ has " +"an Internet connection. The preference of the dive site name can be " "configured, e.g. _Country/State/City_ or _City/State/Country_ (see image " "below)." msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:3551 -#, no-wrap -msgid "FIGURE: Georeference panel" -msgstr "FIGURE: panneau de géoréférencement" - #. type: Target for macro image -#: user-manual.txt:3551 +#: user-manual.txt:3295 #, no-wrap msgid "images/Pref7_f23.jpg" msgstr "images/Pref7_f23.jpg" #. type: Title == -#: user-manual.txt:3554 +#: user-manual.txt:3298 #, no-wrap msgid "The _Subsurface_ dive planner" msgstr "Le planificateur de plongée de _Subsurface_" #. type: Plain text -#: user-manual.txt:3559 +#: user-manual.txt:3303 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 " @@ -8450,7 +7395,7 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:3567 +#: user-manual.txt:3311 msgid "" "The _Subsurface_ dive planner IS EXPERIMENTAL and assumes the user is " "already familiar with the _Subsurface_ user interface. It is explicitly used " @@ -8461,7 +7406,7 @@ msgstr "" "_Subsurface_. Il est utilisé explicitement aux conditions suivantes :" #. type: delimited block * -#: user-manual.txt:3570 +#: user-manual.txt:3314 msgid "" "The user is conversant with dive planning and has the necessary training to " "perform dive planning." @@ -8470,13 +7415,13 @@ msgstr "" "la formation nécessaire pour faire une planification de plongée." #. type: delimited block * -#: user-manual.txt:3571 +#: user-manual.txt:3315 msgid "The user plans dives within his/her certification limits." msgstr "" "L'utilisateur planifie des plongées dans les limites de sa certification." #. type: delimited block * -#: user-manual.txt:3574 +#: user-manual.txt:3318 msgid "" "Dive planning makes large assumptions about the characteristics of the " "_average person_ and cannot compensate for individual physiology or health " @@ -8487,7 +7432,7 @@ msgstr "" "santé, l'historique personnel et les caractéristiques du mode de vie." #. type: delimited block * -#: user-manual.txt:3575 +#: user-manual.txt:3319 msgid "" "The safety of a dive plan depends heavily on the way in which the planner is " "used." @@ -8496,12 +7441,12 @@ msgstr "" "façon dont le planificateur est utilisé." #. type: delimited block * -#: user-manual.txt:3576 +#: user-manual.txt:3320 msgid "The user is familiar with the user interface of _Subsurface_." msgstr "L'utilisateur est familier avec l'interface de _Subsurface_." #. type: delimited block * -#: user-manual.txt:3578 +#: user-manual.txt:3322 msgid "" "A user who is not absolutely sure about any of the above requirements should " "not use this feature." @@ -8510,13 +7455,13 @@ msgstr "" "ne devrait pas utiliser cette fonction." #. type: Title === -#: user-manual.txt:3580 +#: user-manual.txt:3324 #, no-wrap msgid "The _Subsurface_ dive planner screen" msgstr "L'écran du planificateur de plongée _Subsurface_" #. type: Plain text -#: user-manual.txt:3585 +#: user-manual.txt:3329 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 " @@ -8525,7 +7470,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3589 +#: user-manual.txt:3333 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 " @@ -8534,7 +7479,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3593 +#: user-manual.txt:3337 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 " @@ -8542,33 +7487,27 @@ msgid "" "about the dive plan are printed." msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:3594 -#, no-wrap -msgid "FIGURE: Dive planner startup window" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:3594 +#: user-manual.txt:3338 #, no-wrap msgid "images/PlannerWindow1.jpg" msgstr "images/PlannerWindow1.jpg" #. type: Title === -#: user-manual.txt:3597 +#: user-manual.txt:3341 #, no-wrap msgid "Open circuit dives" msgstr "Plongées en circuit ouvert" #. type: Plain text -#: user-manual.txt:3600 +#: user-manual.txt:3344 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:3603 +#: user-manual.txt:3347 #, no-wrap msgid "" "** Open Circuit (the default)\n" @@ -8580,12 +7519,12 @@ msgstr "" "** pSCR\n" #. type: Plain text -#: user-manual.txt:3605 +#: user-manual.txt:3349 msgid "Choose the Open Circuit option." msgstr "Choisissez l'option Circuit ouvert." #. type: Plain text -#: user-manual.txt:3609 +#: user-manual.txt:3353 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 " @@ -8595,7 +7534,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3618 +#: user-manual.txt:3362 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. " @@ -8610,32 +7549,32 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3620 +#: user-manual.txt:3364 msgid "The _Available Gases_ table includes three gas depth fields, labelled:" msgstr "" "Le tableau _Gaz disponibles_ inclut trois champs de profondeur de gaz, " "nommés:" #. type: Plain text -#: user-manual.txt:3621 +#: user-manual.txt:3365 #, 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:3622 +#: user-manual.txt:3366 #, no-wrap msgid "automatically calculated based on the Deco pO~2~ preference (default 1.6 bar)\n" msgstr "" #. type: Plain text -#: user-manual.txt:3623 +#: user-manual.txt:3367 #, 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:3625 +#: user-manual.txt:3369 #, no-wrap msgid "" "calculated based on the Bottom pO~2~ preference (default 1.4 bar). Editing this field will modify the\n" @@ -8643,13 +7582,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3626 +#: user-manual.txt:3370 #, 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:3628 +#: user-manual.txt:3372 #, no-wrap msgid "" "preference (default 30m / 98 ft). Editing this field will modify the He% according to the depth set.\n" @@ -8657,12 +7596,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3630 +#: user-manual.txt:3374 msgid "The profile of the planned dive can be created in two ways:" msgstr "Le profil d'une plongée planifiée peut être créé de deux façons:" #. type: Plain text -#: user-manual.txt:3635 +#: user-manual.txt:3379 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 " @@ -8672,7 +7611,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3643 +#: user-manual.txt:3387 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 " @@ -8686,13 +7625,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:3644 +#: user-manual.txt:3388 #, no-wrap msgid "Recreational dives" msgstr "Plongées loisir" #. type: Plain text -#: user-manual.txt:3653 +#: user-manual.txt:3397 msgid "" "Recreational mode is intended for what most divers would call \"recreational" "\", \"sports\"or \"nontechnical\" dives, remaining within no-deco limits " @@ -8707,7 +7646,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3663 +#: user-manual.txt:3407 msgid "" "Firstly, using recreational dive tables, the maximum depth of each previous " "dive is taken into account. But few dives are done at a constant depth " @@ -8723,7 +7662,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3669 +#: user-manual.txt:3413 msgid "" "Secondly, recreational dive tables are not designed to build additional " "safety features into a dive. NDL times derived from dive tables often take " @@ -8735,26 +7674,26 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3671 +#: user-manual.txt:3415 msgid "To plan a dive, the appropriate settings need to be defined." msgstr "" #. type: Plain text -#: user-manual.txt:3674 +#: user-manual.txt:3418 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:3677 +#: user-manual.txt:3421 msgid "" "Immediately under the heading _Planning_ are two checkboxes _Recreational_ " "and _Safety Stop_. Check these two boxes." msgstr "" #. type: Plain text -#: user-manual.txt:3681 +#: user-manual.txt:3425 msgid "" "Then define the cylinder size, the gas mixture (air or % oxygen) and the " "working cylinder pressure in the top left-hand section of the planner under " @@ -8762,7 +7701,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3686 +#: user-manual.txt:3430 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 " @@ -8772,7 +7711,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3693 +#: user-manual.txt:3437 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 " @@ -8786,7 +7725,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3701 +#: user-manual.txt:3445 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 " @@ -8799,7 +7738,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3704 +#: user-manual.txt:3448 msgid "" "The ascent speed can be changed. The default ascent speeds are those " "considered safe for recreational divers." @@ -8808,7 +7747,7 @@ msgstr "" "défaut sont celles qui sont considérées comme sûres pour les plongées loisir." #. type: Plain text -#: user-manual.txt:3715 +#: user-manual.txt:3459 msgid "" "To build additional safety into the dive plan (over and above those of " "recreational dive tables), specify gradient factors less than 100% (_GFHigh_ " @@ -8826,7 +7765,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3718 +#: user-manual.txt:3462 msgid "" "Below is an image of a dive plan for a recreational dive at 30 meters with " "gradient factors of 100. Because the no-deco limit (NDL) is 22 minutes, " @@ -8834,20 +7773,14 @@ msgid "" "dive." msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:3719 -#, no-wrap -msgid "FIGURE: A recreational dive plan: setup" -msgstr "FIGURE: une planification de plongée loisir : configuration" - #. type: Target for macro image -#: user-manual.txt:3719 +#: user-manual.txt:3463 #, no-wrap msgid "images/Planner_OC_rec1.jpg" msgstr "images/Planner_OC_rec1.jpg" #. type: Plain text -#: user-manual.txt:3728 +#: user-manual.txt:3472 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 " @@ -8863,40 +7796,34 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3731 +#: user-manual.txt:3475 msgid "" "Below is the same dive plan as above, but with a safety stop and reduced " "gradient factors for a larger safety margin." msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:3732 -#, no-wrap -msgid "FIGURE: A recreational dive plan: gradient factors setup" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:3732 +#: user-manual.txt:3476 #, no-wrap msgid "images/Planner_OC_rec2.jpg" msgstr "images/Planner_OC_rec2.jpg" # Une autre idée de traduction pour "non-recreational"? #. type: Title ==== -#: user-manual.txt:3734 +#: user-manual.txt:3478 #, no-wrap msgid "Non-recreational open circuit dives, including decompression" msgstr "Plongées en circuit ouvert non loisir, incluant une décompression" #. type: Plain text -#: user-manual.txt:3738 +#: user-manual.txt:3482 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:3749 +#: user-manual.txt:3493 #, no-wrap msgid "" "*a) Nitrogen management*: This is done by specifying the rates for descent and ascent,\n" @@ -8912,13 +7839,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3751 +#: user-manual.txt:3495 #, no-wrap msgid " ** For more information about Gradient factors, see the section on xref:S_GradientFactors[Gradient Factor Preference settings].\n" msgstr "" #. type: Plain text -#: user-manual.txt:3757 +#: user-manual.txt:3501 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 " @@ -8931,7 +7858,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3768 +#: user-manual.txt:3512 msgid "" "Please note as well that there is an intrinsic assumption of the VPM-B model " "that off-gassing only happens during the ascent phase of the dive (which is " @@ -8946,12 +7873,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3770 +#: user-manual.txt:3514 msgid "For more information external to this manual see:" msgstr "Pour plus d'information en dehors de ce manuel, voir:" #. type: Plain text -#: user-manual.txt:3772 +#: user-manual.txt:3516 msgid "" "link:http://www.tek-dive.com/portal/upload/M-Values.pdf[Understanding M-" "values by Erik Baker, _Immersed_ Vol. 3, No. 3.]" @@ -8960,7 +7887,7 @@ msgstr "" "values by Erik Baker, _Immersed_ Vol. 3, No. 3.]" #. type: Plain text -#: user-manual.txt:3773 +#: user-manual.txt:3517 msgid "" "link:http://www.rebreatherworld.com/general-and-new-to-rebreather-" "articles/5037-gradient-factors-for-dummies.html[Gradient factors for " @@ -8971,7 +7898,7 @@ msgstr "" "dummies, by Kevin Watts]" #. type: Plain text -#: user-manual.txt:3775 +#: user-manual.txt:3519 msgid "" "link:https://www.amazon.com/Deco-Divers-Decompression-Theory-Physiology/" "dp/1905492073/ref=sr_1_1?s=books&ie=UTF8&qid=1403932320&sr=1-1&keywords=deco" @@ -8986,7 +7913,7 @@ msgstr "" "traite à la fois des modèles de décompression Bühlmann et VPM-B." #. type: Plain text -#: user-manual.txt:3783 +#: user-manual.txt:3527 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 " @@ -8999,7 +7926,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3792 +#: user-manual.txt:3536 #, no-wrap msgid "" "*b) Oxygen management*: In the *Gas Options* part of the dive specification, the maximum partial\n" @@ -9013,7 +7940,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3814 +#: user-manual.txt:3558 #, no-wrap msgid "" "*c) Gas management*: With open-circuit dives this is a primary\n" @@ -9040,7 +7967,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3826 +#: user-manual.txt:3570 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 " @@ -9058,7 +7985,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3837 +#: user-manual.txt:3581 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 " @@ -9075,7 +8002,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3843 +#: user-manual.txt:3587 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 " @@ -9085,7 +8012,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3857 +#: user-manual.txt:3601 msgid "" "Cylinders used for the plan need to be entered in the table of _Available " "gases_. In the column _Type_ select the appropriate cylinder size by using " @@ -9105,7 +8032,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3867 +#: user-manual.txt:3611 msgid "" "Enter dive profile segments in the _Dive planner points_ table by providing " "a time duration for a segment as well as its final depth. If more than one " @@ -9122,20 +8049,14 @@ msgid "" "B below)." msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:3868 -#, no-wrap -msgid "FIGURE: Planning a dive: segments" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:3868 +#: user-manual.txt:3612 #, no-wrap msgid "images/planner1.jpg" msgstr "images/planner1.jpg" #. type: Plain text -#: user-manual.txt:3872 +#: user-manual.txt:3616 msgid "" "Below is an example of a dive plan to 55m using Tx20/30 and the Bühlmann " "algorithm, followed by an ascent using EAN50 and using the settings as " @@ -9145,20 +8066,14 @@ msgstr "" "utilisant du Tx20/30 et l'algorithme Bühlmann, suivie d'une remontée " "utilisant du EAN50 et utilisant les réglages décrits ci-dessous." -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:3873 -#, no-wrap -msgid "FIGURE: Planning a dive: setup" -msgstr "FIGURE: Planifier des plongées : configuration" - #. type: Target for macro image -#: user-manual.txt:3873 +#: user-manual.txt:3617 #, no-wrap msgid "images/Planner_OC_deco.jpg" msgstr "images/Planner_OC_deco.jpg" #. type: Plain text -#: user-manual.txt:3878 +#: user-manual.txt:3622 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 " @@ -9166,13 +8081,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3880 +#: user-manual.txt:3624 #, no-wrap msgid "*The dive plan details*\n" msgstr "*Les détails du plan de plongée*\n" #. type: Plain text -#: user-manual.txt:3888 +#: user-manual.txt:3632 msgid "" "On the bottom right panel of the dive planner, under _Dive Plan Details_, " "the details of the dive plan are provided. These may be modified by checking " @@ -9185,7 +8100,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3893 +#: user-manual.txt:3637 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 " @@ -9195,7 +8110,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3913 +#: user-manual.txt:3657 #, no-wrap msgid "" "*Dive plan variations*: The planner has a check box _Display plan variations_. By checking this box, the planner\n" @@ -9213,14 +8128,14 @@ msgid "" "over the differnent stops in a way proportional to the stop length, i.e. add more of the\n" "additional minutes to the longer, shallower stops. The given times refer to the\n" "duration of the decompression phase and do not include the extended bottom time!\n" -"This way of altering dive plans becomes inaccurate for large deviations from the original \n" -"plan. So it should not be trusted for more than a few minutes or meters of \n" +"This way of altering dive plans becomes inaccurate for large deviations from the original\n" +"plan. So it should not be trusted for more than a few minutes or meters of\n" "deviations from the planned bottom time. Checking this option creates a lot of additional computation,\n" -"to such a degree that the planner is slower than otherwise. \n" +"to such a degree that the planner is slower than otherwise.\n" msgstr "" #. type: Plain text -#: user-manual.txt:3923 +#: user-manual.txt:3667 #, no-wrap msgid "" "*Minimum gas requirements*: The planner also estimates the _minimum gas_ pressure\n" @@ -9235,7 +8150,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3927 +#: user-manual.txt:3671 msgid "" "_SAC factor_. This is an estimate of the degree to which your SAC increases " "if a critical problem arises underwater, e.g. gas sharing or entanglement. " @@ -9244,7 +8159,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3929 +#: user-manual.txt:3673 msgid "" "_Problem solving time_. This is an estimate of how long you would take to " "solve the problem before starting the ascent to terminate the dive. The " @@ -9252,7 +8167,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3933 +#: user-manual.txt:3677 msgid "" "Using the above information, the planner then estimates what the minimum " "bottom gas cylinder pressure needs to be for a safe ascent. This information " @@ -9262,38 +8177,38 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3935 +#: user-manual.txt:3679 #, no-wrap msgid " Minimum gas (based on 2.0xSAC/+1min@81m): 2130 l/90bar/Δ:+80bar\n" msgstr "" #. type: Plain text -#: user-manual.txt:3937 +#: user-manual.txt:3681 msgid "This indicates:" msgstr "" #. type: Plain text -#: user-manual.txt:3939 +#: user-manual.txt:3683 msgid "" "Within parentheses, the _SAC factor_ and _Problem solving time_ specified." msgstr "" #. type: Plain text -#: user-manual.txt:3940 +#: user-manual.txt:3684 msgid "" "The number of liters of back gas required for a safe ascent (2130 litres in " "the example above)" msgstr "" #. type: Plain text -#: user-manual.txt:3941 +#: user-manual.txt:3685 msgid "" "The number of bars of back gas required for a safe ascent (90 bars in the " "example above)." msgstr "" #. type: Plain text -#: user-manual.txt:3944 +#: user-manual.txt:3688 msgid "" "The delta-value: number of bars of back gas available at the end of the " "bottom section of the dive, _over and above_ the minimum gas requirement (80 " @@ -9302,7 +8217,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3948 +#: user-manual.txt:3692 msgid "" "No automatic checks are performed based on this result. The feature only " "gives valid results for simple, rectangular shaped single level dive " @@ -9311,7 +8226,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3962 +#: user-manual.txt:3706 #, no-wrap msgid "" "*Isobaric counterdiffusion information*: For gas switches during the ascent in hypoxic open-circuit trimix dives information\n" @@ -9330,7 +8245,7 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:3971 +#: user-manual.txt:3715 msgid "" "The *plan variations* and *minimum gas* estimates are only guidelines for a " "diver performing dive planning, intended to enhance the safety of executing " @@ -9341,13 +8256,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3973 +#: user-manual.txt:3717 #, no-wrap msgid "Planning pSCR dives" msgstr "" #. type: Plain text -#: user-manual.txt:3993 +#: user-manual.txt:3737 #, no-wrap msgid "" "To plan a dive using a passive semi-closed rebreather (pSCR), select _pSCR_ rather than\n" @@ -9370,32 +8285,26 @@ msgid "" "in the loop due to the oxygen drop across the mouthpiece of the pSCR equipment.\n" msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:3994 user-manual.txt:4024 -#, no-wrap -msgid "FIGURE: Planning a pSCR dive: setup" -msgstr "FIGURE: Planifier des plongées pSCR : configuration" - #. type: Target for macro image -#: user-manual.txt:3994 +#: user-manual.txt:3738 #, no-wrap msgid "images/Planner_pSCR.jpg" msgstr "images/Planner_pSCR.jpg" #. type: Title ==== -#: user-manual.txt:3996 +#: user-manual.txt:3740 #, no-wrap msgid "Planning for pSCR bailout" msgstr "Planification pour bailout pSCR" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:3998 +#: user-manual.txt:3742 #, no-wrap msgid "images/pscr_b1.jpg" msgstr "images/pscr_b1.jpg" #. type: Plain text -#: user-manual.txt:4023 +#: user-manual.txt:3767 msgid "" "Open circuit diving is often part of a pSCR dive because, at shallow depths, " "the pO~2~ in the loop is often too low for breathing and the shallow parts " @@ -9428,13 +8337,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:4024 +#: user-manual.txt:3768 #, no-wrap msgid "images/pscr_b2.jpg" msgstr "images/pscr_b2.jpg" #. type: Plain text -#: user-manual.txt:4030 +#: user-manual.txt:3774 msgid "" "In the case of a pSCR dive plan for open water, the worst-case scenario is " "probably bailout at the end of the deepest part of the dive. Create a 1-" @@ -9446,20 +8355,20 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4031 +#: user-manual.txt:3775 #, no-wrap msgid "Planning CCR dives" msgstr "Planifier des plongées CCR (recycleur)" #. type: Plain text -#: user-manual.txt:4035 +#: user-manual.txt:3779 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:4039 +#: user-manual.txt:3783 #, no-wrap msgid "" "*Available gases*: In the _Available gases_ table, enter the cylinder information for the\n" @@ -9468,7 +8377,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4049 +#: user-manual.txt:3793 #, no-wrap msgid "" "*Entering setpoints*: Specify a default setpoint in the Preferences tab, by selecting _File -> Preferences -> Profile_ from\n" @@ -9483,44 +8392,38 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4051 +#: user-manual.txt:3795 msgid "" "The dive profile for a CCR dive may look something like the image below." msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:4052 -#, no-wrap -msgid "FIGURE: Planning a CCR dive: setup" -msgstr "FIGURE: Planifier des plongées CCR : configuration" - #. type: Target for macro image -#: user-manual.txt:4052 +#: user-manual.txt:3796 #, no-wrap msgid "images/Planner_CCR.jpg" msgstr "images/Planner_CCR.jpg" #. type: Plain text -#: user-manual.txt:4056 +#: user-manual.txt:3800 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:4057 +#: user-manual.txt:3801 #, no-wrap msgid "Planning for CCR bailout" msgstr "Planification pour bailout CCR" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4059 +#: user-manual.txt:3803 #, no-wrap msgid "images/CCR_b1.jpg" msgstr "images/CCR_b1.jpg" #. type: Plain text -#: user-manual.txt:4064 +#: user-manual.txt:3808 msgid "" "It is often necessary to plan for a worst-case bailout event in order to " "ensure sufficient bailout gas to reach the surface, taking into account " @@ -9530,13 +8433,13 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4066 +#: user-manual.txt:3810 #, no-wrap msgid "images/CCR_b2.jpg" msgstr "images/CCR_b2.jpg" #. type: Plain text -#: user-manual.txt:4073 +#: user-manual.txt:3817 msgid "" "In the dive planner points table, change the _Dive mode_ of this 1-minute " "segment to _OC_. This signifies bailout. In this case there is bailout to " @@ -9547,13 +8450,13 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4075 +#: user-manual.txt:3819 #, no-wrap msgid "images/CCR_b3.jpg" msgstr "images/CCR_b3.jpg" #. type: Plain text -#: user-manual.txt:4080 +#: user-manual.txt:3824 msgid "" "In order to plan for bailout to an external bailout cylinder, change the " "_Used gas_ for the 1-minute segment to the appropriate cylinder, as in the " @@ -9562,20 +8465,20 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4082 +#: user-manual.txt:3826 msgid "" "The volumes of gases required for bailout can be found at the bottom of the " "*Dive plan details* panel." msgstr "" #. type: Title === -#: user-manual.txt:4084 +#: user-manual.txt:3828 #, no-wrap msgid "Modifying an existing dive plan" msgstr "Modifier une planification existante" #. type: Plain text -#: user-manual.txt:4091 +#: user-manual.txt:3835 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 " @@ -9586,7 +8489,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4097 +#: user-manual.txt:3841 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 " @@ -9597,13 +8500,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4098 +#: user-manual.txt:3842 #, no-wrap msgid "Planning for repetitive dives" msgstr "Planifier des plongées successives" #. type: Plain text -#: user-manual.txt:4105 +#: user-manual.txt:3849 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 " @@ -9612,7 +8515,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4111 +#: user-manual.txt:3855 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 " @@ -9622,7 +8525,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4116 +#: user-manual.txt:3860 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 " @@ -9632,13 +8535,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4117 +#: user-manual.txt:3861 #, no-wrap msgid "Printing the dive plan" msgstr "Imprimer un plan de plongée" #. type: Plain text -#: user-manual.txt:4122 +#: user-manual.txt:3866 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 " @@ -9646,7 +8549,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4128 +#: user-manual.txt:3872 msgid "" "However, after the plan has been saved, it is represented in a way very " "similar to a dive log and the gas calculations cannot be accessed in the " @@ -9656,13 +8559,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4130 +#: user-manual.txt:3874 #, no-wrap msgid "Saving a dive with its dive plan" msgstr "Enregistrer une plongée avec sa planification" #. type: Plain text -#: user-manual.txt:4137 +#: user-manual.txt:3881 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 " @@ -9673,25 +8576,25 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4139 +#: user-manual.txt:3883 msgid "Do the dive planning and save the final plan in the _Dive List_." msgstr "" #. type: Plain text -#: user-manual.txt:4140 +#: user-manual.txt:3884 msgid "After diving, upload the dive data from the dive computer." msgstr "" "Après la plongée, télécharger les données depuis l'ordinateur de plongée." #. type: Plain text -#: user-manual.txt:4142 +#: user-manual.txt:3886 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:4145 +#: user-manual.txt:3889 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 " @@ -9699,7 +8602,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4149 +#: user-manual.txt:3893 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 " @@ -9708,13 +8611,13 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:4150 +#: user-manual.txt:3894 #, no-wrap msgid "Running _Subsurface_ from the command-line" msgstr "Lancer _Subsurface_ depuis la ligne de commande" #. type: Plain text -#: user-manual.txt:4154 +#: user-manual.txt:3898 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 " @@ -9722,18 +8625,18 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4156 +#: user-manual.txt:3900 #, no-wrap msgid "\tsubsurface [options] [logfile ...] [--import logfile ...]\n" msgstr "" #. type: Plain text -#: user-manual.txt:4158 +#: user-manual.txt:3902 msgid "The options include:" msgstr "Ces options incluent:" #. type: delimited block | -#: user-manual.txt:4170 +#: user-manual.txt:3914 #, no-wrap msgid "" "|*Command-line option*|*Description*\n" @@ -9750,13 +8653,13 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:4172 +#: user-manual.txt:3916 #, 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:4177 +#: user-manual.txt:3921 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 " @@ -9767,13 +8670,13 @@ msgstr "" "des sections de ce manuel traitant des opérations relatives." #. type: Title === -#: user-manual.txt:4178 +#: user-manual.txt:3922 #, no-wrap msgid "File" msgstr "Fichier" #. type: Plain text -#: user-manual.txt:4181 +#: user-manual.txt:3925 msgid "" "<<S_NewLogbook,_New Logbook_>> - Close the currently open dive logbook and " "clear all dive information." @@ -9782,7 +8685,7 @@ msgstr "" "actuellement ouvert et supprime toutes les informations de plongées." #. type: Plain text -#: user-manual.txt:4183 +#: user-manual.txt:3927 msgid "" "_Open logbook_ - Open the file manager to select a dive logbook to open." msgstr "" @@ -9790,44 +8693,44 @@ msgstr "" "carnet de plongée à ouvrir." #. type: Plain text -#: user-manual.txt:4184 +#: user-manual.txt:3928 msgid "_Save_ - Save the dive logbook currently open." msgstr "_Sauvegarder_ - Enregistrer le carnet de plongée actuellement ouvert." #. type: Plain text -#: user-manual.txt:4185 +#: user-manual.txt:3929 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:4186 +#: user-manual.txt:3930 msgid "" "_Open cloud storage_ - Open the dive log previously saved in " "<<S_Cloud_storage,_Cloud storage_>>." msgstr "" #. type: Plain text -#: user-manual.txt:4187 +#: user-manual.txt:3931 msgid "" "_Save to cloud storage_ - Save the current dive log to <<S_Cloud_storage," "_Cloud storage_>>." msgstr "" #. type: Plain text -#: user-manual.txt:4188 +#: user-manual.txt:3932 msgid "" -"_Take cloud storage online_ - " -"******************************************************" +"_Cloud storage online_ - Switch between the online version of the logbook, " +"and the locally stored one." msgstr "" #. type: Plain text -#: user-manual.txt:4189 +#: user-manual.txt:3933 msgid "_Close_ - Close the dive logbook currently open." msgstr "_Fermer_ - Fermer le carnet de plongée actuellement ouvert." #. type: Plain text -#: user-manual.txt:4191 +#: user-manual.txt:3935 msgid "" "<<S_ExportLog,_Export_>> - Export the currently open dive logbook (or the " "selected dives in the logbook) to one of several formats." @@ -9837,34 +8740,34 @@ msgstr "" "formats." #. type: Plain text -#: user-manual.txt:4192 +#: user-manual.txt:3936 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:4193 +#: user-manual.txt:3937 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:4194 +#: user-manual.txt:3938 msgid "" -"<<S_FindMovedImages, _Find moved images_>> - If photos taken during dives " -"have been moved to" +"<<S_FindMovedImages, _Find moved media_>> - If photos/videos taken during " +"dives have been moved to" msgstr "" #. type: Plain text -#: user-manual.txt:4195 +#: user-manual.txt:3939 msgid "" "a different disk or directory, locate them and link them to the appropriate " "dives." msgstr "" #. type: Plain text -#: user-manual.txt:4196 +#: user-manual.txt:3940 msgid "" "<<S_Configure,_Configure dive computer_>> - Edit the configuration of a dive " "computer." @@ -9873,30 +8776,30 @@ msgstr "" "configuration d'un ordinateur de plongée." #. type: Plain text -#: user-manual.txt:4197 +#: user-manual.txt:3941 msgid "_Quit_ - Quit _Subsurface_." msgstr "_Quitter_ - Quitter _Subsurface_." #. type: Title === -#: user-manual.txt:4199 +#: user-manual.txt:3943 #, no-wrap msgid "Edit" msgstr "Édition" #. type: Plain text -#: user-manual.txt:4201 +#: user-manual.txt:3945 msgid "" "The Edit option allows one to undo or redo an action, e.g. deleting dives." msgstr "" #. type: Title === -#: user-manual.txt:4202 +#: user-manual.txt:3946 #, no-wrap msgid "Import" msgstr "Importer" #. type: Plain text -#: user-manual.txt:4205 +#: user-manual.txt:3949 msgid "" "<<S_ImportDiveComputer,_Import from dive computer_>> - Import dive " "information from a dive computer." @@ -9905,7 +8808,7 @@ msgstr "" "Importer des informations de plongées à partir de l'ordinateur de plongée." #. type: Plain text -#: user-manual.txt:4207 +#: user-manual.txt:3951 msgid "" "<<Unified_import,_Import Log Files_>> - Import dive information from a file " "in in a _Subsurface_-compatible format." @@ -9915,17 +8818,7 @@ msgstr "" "_Subsurface_." #. type: Plain text -#: user-manual.txt:4209 -msgid "" -"<<S_Companion,_Import GPS data from Subsurface web service_>> - Load GPS " -"coordinates from the _Subsurface_ mobile phone app." -msgstr "" -"<<S_Companion,_Importer les données GPS depis le service web Subsurface_>> - " -"Charge les coordonnées GPS à partir de l'application mobile _Subsurface_ " -"(téléphones et tablettes)." - -#. type: Plain text -#: user-manual.txt:4211 +#: user-manual.txt:3953 msgid "" "<<S_ImportingDivelogsDe,_Import from Divelogs.de_>> - Import dive " "information from _www.Divelogs.de_." @@ -9934,13 +8827,13 @@ msgstr "" "informations de plongées à partir de _www.Divelogs.de_." #. type: Title === -#: user-manual.txt:4212 +#: user-manual.txt:3954 #, no-wrap msgid "Log" msgstr "Journal (log)" #. type: Plain text -#: user-manual.txt:4214 +#: user-manual.txt:3956 msgid "" "<<S_EnterData,_Add Dive_>> - Manually add a new dive to the *Dive List* " "panel." @@ -9949,19 +8842,12 @@ msgstr "" "plongée au panneau de la *liste des plongées*." #. type: Plain text -#: user-manual.txt:4215 -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:4216 +#: user-manual.txt:3957 msgid "<<S_DivePlanner,_Plan Dive_>> - Plan dives." msgstr "<<S_DivePlanner,_Planifier une plongée_>> - Planifier des plongées." #. type: Plain text -#: user-manual.txt:4217 +#: user-manual.txt:3958 msgid "" "<<S_Replan,_Edit dive in planner_>> - Edit a dive plan that has been saved " "into the *Dive List*." @@ -9970,7 +8856,7 @@ msgstr "" "plongée planifiée qui a été enregistrée dans la *liste des plongées*." #. type: Plain text -#: user-manual.txt:4219 +#: user-manual.txt:3960 msgid "" "<<S_CopyComponents,_Copy dive components_>> - Copy information from several " "fields of a dive log onto the clipboard." @@ -9980,7 +8866,7 @@ msgstr "" "papier." #. type: Plain text -#: user-manual.txt:4221 +#: user-manual.txt:3962 msgid "" "_Paste dive components_ - Paste, into the selected dives in the *Dive List*, " "the information copied using the _Copy dive components_ option." @@ -9990,7 +8876,7 @@ msgstr "" "préalable avec l'option _Copier les composants de la plongée_." #. type: Plain text -#: user-manual.txt:4223 +#: user-manual.txt:3964 msgid "" "<<S_Renumber,_Renumber_>> - Renumber the dives listed in the *Dive List* " "panel." @@ -9999,7 +8885,7 @@ msgstr "" "le panneau de la *liste des plongées*." #. type: Plain text -#: user-manual.txt:4225 +#: user-manual.txt:3966 msgid "" "<<S_Group,_Auto Group_>> - Group the dives in the *Dive List* panel into " "dive trips." @@ -10008,7 +8894,7 @@ msgstr "" "*liste des plongées* dans des voyages de plongées." #. type: Plain text -#: user-manual.txt:4226 +#: user-manual.txt:3967 msgid "" "<<S_DeviceNames,_Edit Device Names_>> - Edit the names of dive computers to " "coordinate your logs." @@ -10017,7 +8903,7 @@ msgstr "" "les noms des ordinateurs de plongée pour coordonner vos journaux (logs)." #. type: Plain text -#: user-manual.txt:4227 +#: user-manual.txt:3968 msgid "" "<<S_Filter,_Filter divelist_>> - Select only some dives, based on specific " "tags or dive criteria." @@ -10026,13 +8912,13 @@ msgstr "" "certaines plongées, à partir de tags ou de critères de plongées." #. type: Title === -#: user-manual.txt:4228 +#: user-manual.txt:3969 #, no-wrap msgid "View" msgstr "Vue" #. type: Plain text -#: user-manual.txt:4231 +#: user-manual.txt:3972 msgid "" "<<S_ViewPanels,_All_>> - View the four main _Subsurface_ panels all at once." msgstr "" @@ -10040,33 +8926,33 @@ msgstr "" "_Subsurface_ simultanément." #. type: Plain text -#: user-manual.txt:4232 +#: user-manual.txt:3973 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:4233 +#: user-manual.txt:3974 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:4234 +#: user-manual.txt:3975 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:4235 +#: user-manual.txt:3976 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:4237 +#: user-manual.txt:3978 msgid "" "_Yearly Statistics_ - Display summary statistics about dives during this and " "past years." @@ -10075,7 +8961,7 @@ msgstr "" "plongées effectuées." #. type: Plain text -#: user-manual.txt:4240 +#: user-manual.txt:3981 msgid "" "_Prev DC_ - Switch to data from previous dive computer, if a single dive was " "logged from more than one. See the sections on <<S_MultipleDiveComputers," @@ -10084,23 +8970,23 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4241 +#: user-manual.txt:3982 msgid "_Next DC_ - Switch to next dive computer." msgstr "_Ordinateur suivant_ - Passer à l'ordinateur de plongée suivant." #. type: Plain text -#: user-manual.txt:4242 +#: user-manual.txt:3983 msgid "_Full Screen_ - Toggles Full Screen mode." msgstr "_Plein écran_ - Passer en mode plein écran." #. type: Title === -#: user-manual.txt:4243 +#: user-manual.txt:3984 #, no-wrap msgid "Share on" msgstr "" #. type: Plain text -#: user-manual.txt:4245 +#: user-manual.txt:3986 msgid "" "<<S_Facebook,_Facebook_>> - Share the currently selected dive on your " "Facebook timeline." @@ -10109,13 +8995,13 @@ msgstr "" "Facebook." #. type: Title === -#: user-manual.txt:4246 +#: user-manual.txt:3987 #, no-wrap msgid "Help" msgstr "Aide" #. type: Plain text -#: user-manual.txt:4249 +#: user-manual.txt:3990 msgid "" "_About Subsurface_ - Show a panel with the version number of _Subsurface_ as " "well as licensing information." @@ -10124,7 +9010,7 @@ msgstr "" "_Subsurface_ ainsi que les informations de licence." #. type: Plain text -#: user-manual.txt:4251 +#: user-manual.txt:3992 msgid "" "_Check for updates_ - Find out whether a newer version of Subsurface is " "available on the https://subsurface-divelog.org/[_Subsurface_ web site]." @@ -10134,7 +9020,7 @@ msgstr "" "_Subsurface_ ]." #. type: Plain text -#: user-manual.txt:4253 +#: user-manual.txt:3994 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 " @@ -10145,31 +9031,31 @@ msgstr "" "sondage, si vos habitudes de plongées ont changées." #. type: Plain text -#: user-manual.txt:4254 +#: user-manual.txt:3995 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:4257 +#: user-manual.txt:3998 #, 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:4259 +#: user-manual.txt:4000 #, 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:4260 +#: user-manual.txt:4001 #, no-wrap msgid "images/icons/drivers.jpg" msgstr "images/icons/drivers.jpg" #. type: Plain text -#: user-manual.txt:4265 +#: user-manual.txt:4006 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 " @@ -10180,7 +9066,7 @@ msgstr "" "l'ordinateur de plongée (Bluetooth, USB, infra-rouge)." #. type: Plain text -#: user-manual.txt:4271 +#: user-manual.txt:4012 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 " @@ -10194,7 +9080,7 @@ msgstr "" "particulièrement pour certaines technologies telles que l'infra-rouge." #. type: Plain text -#: user-manual.txt:4275 +#: user-manual.txt:4016 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 " @@ -10205,7 +9091,7 @@ msgstr "" "port USB de son ordinateur de bureau." #. type: Plain text -#: user-manual.txt:4282 +#: user-manual.txt:4023 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 " @@ -10223,19 +9109,19 @@ msgstr "" "documents et logiciels Silicon Labs]." #. type: Title === -#: user-manual.txt:4284 +#: user-manual.txt:4025 #, 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:4285 +#: user-manual.txt:4026 #, no-wrap msgid "images/icons/usb.jpg" msgstr "images/icons/usb.jpg" #. type: Plain text -#: user-manual.txt:4293 +#: user-manual.txt:4034 msgid "" "When connecting a dive computer by using a USB connector, usually " "_Subsurface_ will either propose a drop down list with the correct device " @@ -10251,7 +9137,7 @@ msgstr "" "de votre périphérique ;" #. type: Plain text -#: user-manual.txt:4298 +#: user-manual.txt:4039 msgid "" "Simply try COM1, COM2, etc. The drop down list should contain all connected " "COM devices." @@ -10260,56 +9146,56 @@ msgstr "" "tous les périphériques COM connectés." #. type: Title ==== -#: user-manual.txt:4299 user-manual.txt:4397 +#: user-manual.txt:4040 user-manual.txt:4138 #, no-wrap msgid "On MacOS:" msgstr "Sur MacOS :" #. type: Plain text -#: user-manual.txt:4302 +#: user-manual.txt:4043 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:4303 +#: user-manual.txt:4044 #, no-wrap msgid "On Linux:" msgstr "Sur Linux :" #. type: Plain text -#: user-manual.txt:4306 +#: user-manual.txt:4047 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:4308 +#: user-manual.txt:4049 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:4309 +#: user-manual.txt:4050 msgid "Open a terminal" msgstr "Ouvrir un terminal" #. type: Plain text -#: user-manual.txt:4310 user-manual.txt:4312 +#: user-manual.txt:4051 user-manual.txt:4053 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:4311 +#: user-manual.txt:4052 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:4314 +#: user-manual.txt:4055 msgid "A message similar to this one should appear:" msgstr "Un message similaire à celui-ci devrait apparaitre :" #. type: Plain text -#: user-manual.txt:4330 +#: user-manual.txt:4071 #, no-wrap msgid "" "\tusb 2-1.1: new full speed USB device number 14 using ehci_hcd\n" @@ -10345,7 +9231,7 @@ msgstr "" "\tftdi_sio: v1.6.0:USB FTDI Serial Converters Driver\n" #. type: Plain text -#: user-manual.txt:4335 +#: user-manual.txt:4076 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 " @@ -10357,14 +9243,14 @@ msgstr "" "que Subsurface utilise le bon port USB." #. type: Plain text -#: user-manual.txt:4337 +#: user-manual.txt:4078 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:4347 +#: user-manual.txt:4088 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 " @@ -10384,7 +9270,7 @@ msgstr "" "USB. Admettons que votre nom d'utilisateur soit 'johnB'." #. type: Plain text -#: user-manual.txt:4351 +#: user-manual.txt:4092 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." @@ -10394,7 +9280,7 @@ msgstr "" "+dialout+." #. type: Plain text -#: user-manual.txt:4356 +#: user-manual.txt:4097 #, no-wrap msgid "" "Type: +id johnB+ This lists all the groups that johnB belongs to and\n" @@ -10410,7 +9296,7 @@ msgstr "" "parmi les différents IDs.\n" #. type: Plain text -#: user-manual.txt:4358 +#: user-manual.txt:4099 #, no-wrap msgid "" "Under some circumstances this change takes only effect (eg. on Ubuntu) after\n" @@ -10420,7 +9306,7 @@ msgstr "" "puis reconnexion sur l'ordinateur (sous Ubuntu, par exemple).\n" #. type: Plain text -#: user-manual.txt:4363 +#: user-manual.txt:4104 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 " @@ -10431,13 +9317,13 @@ msgstr "" "vous devriez pouvoir importer vos plongées." #. type: Title === -#: user-manual.txt:4366 +#: user-manual.txt:4107 #, no-wrap msgid "Manually setting up Bluetooth enabled devices" msgstr "" #. type: Plain text -#: user-manual.txt:4373 +#: user-manual.txt:4114 msgid "" "For dive computers communicating through Bluetooth like the Heinrichs " "Weikamp Frog or the Shearwater Predator, Petrel and Nerd there is a " @@ -10446,13 +9332,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4375 +#: user-manual.txt:4116 #, 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:4379 +#: user-manual.txt:4120 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 -> " @@ -10460,13 +9346,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4381 +#: user-manual.txt:4122 #, no-wrap msgid "*Pair the _Subsurface_ computer with the dive computer.*\n" msgstr "*Jumeler l'ordinateur utilisant _Subsurface_ avec l'ordinateur de plongée.*\n" #. type: Plain text -#: user-manual.txt:4390 +#: user-manual.txt:4131 msgid "" "Bluetooth is most likely already enabled. For pairing with the dive computer " "choose _Control Panel -> Bluetooth Devices -> Add Wireless Device_. This " @@ -10478,21 +9364,21 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4393 +#: user-manual.txt:4134 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:4396 +#: user-manual.txt:4137 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:4403 +#: user-manual.txt:4144 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. " @@ -10501,20 +9387,20 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4406 +#: user-manual.txt:4147 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:4407 +#: user-manual.txt:4148 #, no-wrap msgid "On Linux" msgstr "Sur Linux" #. type: Plain text -#: user-manual.txt:4415 +#: user-manual.txt:4156 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 " @@ -10526,7 +9412,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4419 +#: user-manual.txt:4160 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 " @@ -10535,23 +9421,23 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4421 +#: user-manual.txt:4162 msgid "Enable the Bluetooth controller and pair your dive computer" msgstr "Activez le contrôleur Bluetooth et jumelez votre ordinateur de plongée" #. type: Plain text -#: user-manual.txt:4422 +#: user-manual.txt:4163 msgid "Establish an RFCOMM connection" msgstr "" #. type: Title ===== -#: user-manual.txt:4423 user-manual.txt:4563 +#: user-manual.txt:4164 user-manual.txt:4304 #, no-wrap msgid "Download the dives with Subsurface" msgstr "" #. type: Plain text -#: user-manual.txt:4429 +#: user-manual.txt:4170 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 " @@ -10562,7 +9448,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4434 +#: user-manual.txt:4175 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 " @@ -10572,23 +9458,23 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4436 +#: user-manual.txt:4177 msgid "+sudo usermod -a -G dialout username+" msgstr "" #. type: Plain text -#: user-manual.txt:4438 +#: user-manual.txt:4179 msgid "Then log out and log in for the change to take effect." msgstr "" #. type: Title ===== -#: user-manual.txt:4439 +#: user-manual.txt:4180 #, no-wrap msgid "Enabling the Bluetooth controller and pairing your dive computer" msgstr "" #. type: Plain text -#: user-manual.txt:4445 +#: user-manual.txt:4186 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 " @@ -10599,14 +9485,14 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4448 +#: user-manual.txt:4189 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:4455 +#: user-manual.txt:4196 #, no-wrap msgid "" "\t$ hciconfig\n" @@ -10618,7 +9504,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4460 +#: user-manual.txt:4201 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 " @@ -10628,7 +9514,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4468 +#: user-manual.txt:4209 #, no-wrap msgid "" "\tsudo hciconfig hci0 up auth+ (enter password when prompted)\n" @@ -10641,25 +9527,25 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4470 +#: user-manual.txt:4211 msgid "Check that the status now includes '+UP+', '+RUNNING+' AND '+AUTH+'." msgstr "" #. type: Plain text -#: user-manual.txt:4472 +#: user-manual.txt:4213 msgid "" "If there are multiple controllers running, it's easiest to turn off the " "unused controller(s). For example, for +hci1+:" msgstr "" #. type: Plain text -#: user-manual.txt:4474 +#: user-manual.txt:4215 #, no-wrap msgid "\tsudo hciconfig hci1 down\n" msgstr "" #. type: Plain text -#: user-manual.txt:4477 +#: user-manual.txt:4218 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 " @@ -10667,7 +9553,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4498 +#: user-manual.txt:4239 #, no-wrap msgid "" "\tbluetoothctl\n" @@ -10693,14 +9579,14 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4501 +#: user-manual.txt:4242 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:4504 +#: user-manual.txt:4245 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-" @@ -10708,7 +9594,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4509 +#: user-manual.txt:4250 #, no-wrap msgid "" "\thcitool -i hci0 scanning\n" @@ -10718,94 +9604,94 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4511 +#: user-manual.txt:4252 msgid "Once the dive computer is paired, set up the RFCOMM connection." msgstr "" #. type: Title ===== -#: user-manual.txt:4512 +#: user-manual.txt:4253 #, no-wrap msgid "Establishing the RFCOMM connection" msgstr "" #. type: Plain text -#: user-manual.txt:4515 +#: user-manual.txt:4256 msgid "The command to establish an RFCOMM connection is:" msgstr "" #. type: Plain text -#: user-manual.txt:4517 +#: user-manual.txt:4258 msgid "+sudo rfcomm -i <controller> connect <dev> <bdaddr> [channel]+" msgstr "" #. type: Plain text -#: user-manual.txt:4519 +#: user-manual.txt:4260 msgid "+<controller>+ is the Bluetooth controller, +hci0+." msgstr "" #. type: Plain text -#: user-manual.txt:4520 +#: user-manual.txt:4261 msgid "+<dev>+ is the RFCOMM device file, +rfcomm0+" msgstr "" #. type: Plain text -#: user-manual.txt:4521 +#: user-manual.txt:4262 msgid "+<bdaddr>+ is the dive computer's MAC address, +00:11:22:33:44:55+" msgstr "" #. type: Plain text -#: user-manual.txt:4522 +#: user-manual.txt:4263 msgid "" "+[channel]+ is the dive computer's Bluetooth channel we need to connect to." msgstr "" #. type: Plain text -#: user-manual.txt:4525 +#: user-manual.txt:4266 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:4527 +#: user-manual.txt:4268 msgid "_Shearwater Petrel 1_: channel 1" msgstr "" #. type: Plain text -#: user-manual.txt:4528 +#: user-manual.txt:4269 msgid "_Shearwater Petrel 2_: channel 5" msgstr "" #. type: Plain text -#: user-manual.txt:4529 +#: user-manual.txt:4270 msgid "_Shearwater Nerd_: channel 5" msgstr "" #. type: Plain text -#: user-manual.txt:4530 +#: user-manual.txt:4271 msgid "_Heinrichs-Weikamp OSTC Sport_: channel 1" msgstr "" #. type: Plain text -#: user-manual.txt:4532 +#: user-manual.txt:4273 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:4534 +#: user-manual.txt:4275 #, 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:4536 +#: user-manual.txt:4277 msgid "This gives the response:" msgstr "" #. type: Plain text -#: user-manual.txt:4539 +#: user-manual.txt:4280 #, no-wrap msgid "" "\tConnected /dev/rfcomm0 to 00:11:22:33:44:55 on channel 5\n" @@ -10813,14 +9699,14 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4541 +#: user-manual.txt:4282 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:4545 +#: user-manual.txt:4286 #, no-wrap msgid "" "\tsudo rfcomm -i hci0 connect rfcomm0 00:11:22:33:44:55 (enter a password, probably 0000, when prompted)\n" @@ -10829,7 +9715,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4549 +#: user-manual.txt:4290 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 " @@ -10838,7 +9724,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4559 +#: user-manual.txt:4300 #, no-wrap msgid "" "\tsdptool -i hci0 records 00:11:22:33:44:55\n" @@ -10853,7 +9739,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4562 +#: user-manual.txt:4303 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 " @@ -10861,7 +9747,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4565 +#: user-manual.txt:4306 msgid "" "After establishing the RFCOMM connection and while the dive computer's " "upload mode countdown is still running, go to_Subsurface_, select _Import-" @@ -10871,25 +9757,25 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:4571 +#: user-manual.txt:4312 #, no-wrap msgid "APPENDIX B: Dive Computer specific information for importing dive data." msgstr "" #. type: Title === -#: user-manual.txt:4574 +#: user-manual.txt:4315 #, no-wrap msgid "Importing from Uemis Zurich" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4576 +#: user-manual.txt:4317 #, no-wrap msgid "images/icons/iumis.jpg" msgstr "images/icons/iumis.jpg" #. type: Plain text -#: user-manual.txt:4592 +#: user-manual.txt:4333 msgid "" "_Subsurface_ downloads the information stored on the SDA (the built-in file " "system of the Uemis) including information about dive spots and equipment. " @@ -10905,7 +9791,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4607 +#: user-manual.txt:4348 msgid "" "After selecting the above device name, download the dives from the Uemis " "Zurich. One technical issue with the Uemis Zurich download implementation " @@ -10922,19 +9808,19 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4609 +#: user-manual.txt:4350 #, no-wrap msgid "Importing from Uwatec Galileo" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4611 +#: user-manual.txt:4352 #, no-wrap msgid "images/icons/Galileo.jpg" msgstr "images/icons/Galileo.jpg" #. type: Plain text -#: user-manual.txt:4626 +#: user-manual.txt:4367 msgid "" "The Uwatec Galileo dive computers use infra red (IrDA) communication between " "the dive computer and Subsurface. The Uwatec hardware uses a USB dongle " @@ -10950,14 +9836,14 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4629 +#: user-manual.txt:4370 msgid "" "After executing this command, Subsurface will recognize the Galileo dive " "computer and download dive information." msgstr "" #. type: Plain text -#: user-manual.txt:4635 +#: user-manual.txt:4376 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/" @@ -10967,7 +9853,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4638 +#: user-manual.txt:4379 msgid "" "For the Apple Mac, IrDA communication via the MCS7780 link is not available " "for OSX 10.6 or higher." @@ -10976,19 +9862,19 @@ msgstr "" "n'est plus disponible depuis OSX 10.6 ou supérieur." #. type: Title === -#: user-manual.txt:4640 +#: user-manual.txt:4381 #, no-wrap msgid "Importing from Heinrichs Weikamp DR5" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4642 +#: user-manual.txt:4383 #, no-wrap msgid "images/icons/HW_DR5.jpg" msgstr "images/icons/HW_DR5.jpg" #. type: Plain text -#: user-manual.txt:4652 +#: user-manual.txt:4393 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. " @@ -11001,19 +9887,19 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4655 +#: user-manual.txt:4396 #, no-wrap msgid "Importing from xDEEP BLACK" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4657 +#: user-manual.txt:4398 #, no-wrap msgid "images/icons/HW_xdeepblack.jpg" msgstr "images/icons/HW_xdeepblack.jpg" #. type: Plain text -#: user-manual.txt:4666 +#: user-manual.txt:4407 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 " @@ -11027,19 +9913,19 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4668 +#: user-manual.txt:4409 #, no-wrap msgid "Importing from Shearwater Predator/Petrel/Nerd using Bluetooth" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4670 +#: user-manual.txt:4411 #, no-wrap msgid "images/icons/predator.jpg" msgstr "images/icons/predator.jpg" #. type: Plain text -#: user-manual.txt:4673 +#: user-manual.txt:4414 msgid "" "Specific instructions for downloading dives using Bluetooth are given in the " "section above, <<S_Bluetooth,_Connecting Subsurface to a Bluetooth-enabled " @@ -11047,19 +9933,19 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4675 +#: user-manual.txt:4416 #, no-wrap msgid "Importing from Poseidon MkVI Discovery" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4677 +#: user-manual.txt:4418 #, no-wrap msgid "images/MkVI.jpeg" msgstr "images/MkVI.jpeg" #. type: Plain text -#: user-manual.txt:4685 +#: user-manual.txt:4426 msgid "" "Download of dive logs from the MkVI is performed using a custom " "communications adapter and the _Poseidon PC Configuration Software_, " @@ -11071,45 +9957,45 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4688 +#: user-manual.txt:4429 msgid "" "Setup configuration for the dive and key dive parameters (file with a .txt " "extension)" msgstr "" #. type: Plain text -#: user-manual.txt:4689 +#: user-manual.txt:4430 msgid "Dive log details (file with a .csv extension)" msgstr "" #. type: Plain text -#: user-manual.txt:4691 +#: user-manual.txt:4432 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:4693 +#: user-manual.txt:4434 msgid "" "_Subsurface_ accesses the .txt and the .csv files to get dive log " "information." msgstr "" #. type: Title === -#: user-manual.txt:4695 +#: user-manual.txt:4436 #, no-wrap msgid "Importing from APD Inspiration/Evolution CCR" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4697 +#: user-manual.txt:4438 #, no-wrap msgid "images/APDComputer.jpg" msgstr "images/APDComputer.jpg" #. type: Plain text -#: user-manual.txt:4705 +#: user-manual.txt:4446 msgid "" "The dive logs of an APD Inspiration or similar CCR dive computer are " "downloaded using a communications adapter and _AP Communicator_, obtained " @@ -11121,75 +10007,71 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4707 +#: user-manual.txt:4448 msgid "Download the dive using _AP Communicator_." msgstr "" #. type: Plain text -#: user-manual.txt:4708 +#: user-manual.txt:4449 msgid "Open a dive within the _AP Log Viewer_." msgstr "" #. type: Plain text -#: user-manual.txt:4709 +#: user-manual.txt:4450 msgid "Select the tab at the top of the screen, entitled \"_Data_\"." msgstr "" #. type: Plain text -#: user-manual.txt:4710 +#: user-manual.txt:4451 msgid "" "With the raw dive log data show on the screen, click on \"_Copy to Clipboard_" "\"." msgstr "" #. type: Plain text -#: user-manual.txt:4711 +#: user-manual.txt:4452 msgid "Open a text editor, e.g. Notepad (Windows) or TextWrangler (Mac)." msgstr "" #. type: Plain text -#: user-manual.txt:4713 +#: user-manual.txt:4454 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:4714 +#: user-manual.txt:4455 msgid "" "Within _Subsurface_, select _Import -> Import log files_ to open the xref:" "Unified_import[universal import dialogue]." msgstr "" #. type: Plain text -#: user-manual.txt:4715 +#: user-manual.txt:4456 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:4719 -msgid "" -"On the list of file names select the _.apd_ file created. An import dialogue " -"opens showing the default settings for the data in the _.apd_ file. If " -"changes are required, do this as for xref:S_ImportingCSVDives[CSV imports]." -msgstr "" - -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:4720 +#: user-manual.txt:4460 #, no-wrap -msgid "Figure: APD log viewer import" +msgid "" +"On the list of file names select the _.apd_ file created. An import\n" +"dialogue opens showing the default settings for the data in the\n" +"_.apd_ file. If changes are required,\n" +" do this as for xref:S_ImportingCSVDives[CSV imports].\n" msgstr "" #. type: Target for macro image -#: user-manual.txt:4720 +#: user-manual.txt:4461 #, no-wrap msgid "images/APD_CSVimportF22.jpg" msgstr "images/APD_CSVimportF22.jpg" #. type: Plain text -#: user-manual.txt:4728 +#: user-manual.txt:4469 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 " @@ -11201,12 +10083,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4729 +#: user-manual.txt:4470 msgid "Click the _Ok_ button at the bottom of the import panel." msgstr "" #. type: Plain text -#: user-manual.txt:4734 +#: user-manual.txt:4475 msgid "" "The APD dive log will appear within _Subsurface_. The dive computer- " "generated ceiling provided by the Inspiration can be viewed by selecting the " @@ -11216,13 +10098,13 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:4735 +#: user-manual.txt:4476 #, no-wrap msgid "APPENDIX C: Exporting Dive log information from external dive log software." msgstr "" #. type: Plain text -#: user-manual.txt:4744 +#: user-manual.txt:4485 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, " @@ -11232,22 +10114,22 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4746 +#: user-manual.txt:4487 msgid "Export the foreign dive log data to format that is accessible from" msgstr "" #. type: Plain text -#: user-manual.txt:4747 +#: user-manual.txt:4488 msgid "_Subsurface_." msgstr "" #. type: Plain text -#: user-manual.txt:4748 +#: user-manual.txt:4489 msgid "Import the accessible dive log data into _Subsurface_." msgstr "" #. type: Plain text -#: user-manual.txt:4752 +#: user-manual.txt:4493 msgid "" "This appendix provides some information about approaches to export dive log " "data from foreign dive log software. The procedures below mostly apply to " @@ -11255,19 +10137,19 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4754 +#: user-manual.txt:4495 #, no-wrap msgid "Exporting from *Suunto Divemanager (DM3, DM4 or DM5)*" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4755 +#: user-manual.txt:4496 #, no-wrap msgid "images/icons/suuntologo.jpg" msgstr "images/icons/suuntologo.jpg" #. type: Plain text -#: user-manual.txt:4762 +#: user-manual.txt:4503 msgid "" "DiveManager is a Windows application for Suunto dive computers. Divemanager " "3 (DM3) is an older version of the Suunto software. More recent Suunto dive " @@ -11277,66 +10159,66 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4764 +#: user-manual.txt:4505 #, no-wrap msgid "*Divemanager 3 (DM3):*\n" msgstr "" #. type: Plain text -#: user-manual.txt:4766 +#: user-manual.txt:4507 msgid "" "Start 'Suunto Divemanager 3' and log in with the name containing the logs" msgstr "" #. type: Plain text -#: user-manual.txt:4767 +#: user-manual.txt:4508 msgid "Do not start the import wizard to import dives from the dive computer." msgstr "" #. type: Plain text -#: user-manual.txt:4769 +#: user-manual.txt:4510 msgid "" "In the navigation tree on the left side of the program-window, select the " "appropriate dives." msgstr "" #. type: Plain text -#: user-manual.txt:4770 +#: user-manual.txt:4511 msgid "" "Within the list of dives, select the dives you would like to import later:" msgstr "" #. type: Plain text -#: user-manual.txt:4771 +#: user-manual.txt:4512 msgid "To select certain dives: hold 'ctrl' and click the dive" msgstr "" #. type: Plain text -#: user-manual.txt:4773 +#: user-manual.txt:4514 msgid "" "To select all dives: Select the first dive, hold down shift and select the " "last dive" msgstr "" #. type: Plain text -#: user-manual.txt:4774 +#: user-manual.txt:4515 msgid "With the dives marked, use the program menu _File -> Export_" msgstr "" #. type: Plain text -#: user-manual.txt:4775 +#: user-manual.txt:4516 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:4776 +#: user-manual.txt:4517 msgid "Click the browse button next to the field Export Path" msgstr "" #. type: Plain text -#: user-manual.txt:4778 +#: user-manual.txt:4519 #, no-wrap msgid "" "** A file-manager like window pops up\n" @@ -11344,13 +10226,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4779 +#: user-manual.txt:4520 #, no-wrap msgid "Divelog.SDE file\n" msgstr "" #. type: Plain text -#: user-manual.txt:4781 +#: user-manual.txt:4522 #, no-wrap msgid "" "** Optionally change the name of the file for saving\n" @@ -11358,25 +10240,25 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4782 +#: user-manual.txt:4523 #, no-wrap msgid "Back in the Export pop-up, press the button 'Export'\n" msgstr "" #. type: Plain text -#: user-manual.txt:4783 +#: user-manual.txt:4524 #, no-wrap msgid "The dives are now exported to the file Divelog.SDE.\n" msgstr "" #. type: Plain text -#: user-manual.txt:4785 +#: user-manual.txt:4526 #, no-wrap msgid "*Divemanager 4 (DM4) and Divemanager 5 (DM5):*\n" msgstr "" #. type: Plain text -#: user-manual.txt:4790 +#: user-manual.txt:4531 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 " @@ -11385,81 +10267,81 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4792 +#: user-manual.txt:4533 msgid "Locating the Suunto DM4 (or DM5) database:" msgstr "" #. type: Plain text -#: user-manual.txt:4794 user-manual.txt:4803 +#: user-manual.txt:4535 user-manual.txt:4544 msgid "Start Suunto DM4/DM5" msgstr "" #. type: Plain text -#: user-manual.txt:4795 +#: user-manual.txt:4536 msgid "Select 'Help -> About'" msgstr "" #. type: Plain text -#: user-manual.txt:4796 +#: user-manual.txt:4537 msgid "Click 'Copy' after text 'Copy log folder path to clipboard'" msgstr "" #. type: Plain text -#: user-manual.txt:4797 +#: user-manual.txt:4538 msgid "Open Windows Explorer" msgstr "Ouvrir l'explorateur Windows" #. type: Plain text -#: user-manual.txt:4798 +#: user-manual.txt:4539 msgid "Paste the address to the path box at the top of the File Explorer" msgstr "" #. type: Plain text -#: user-manual.txt:4799 +#: user-manual.txt:4540 msgid "The database is called DM4.db or DM5.db" msgstr "" #. type: Plain text -#: user-manual.txt:4801 +#: user-manual.txt:4542 msgid "Making a backup copy of the Suunto DM4/DM5 database:" msgstr "" #. type: Plain text -#: user-manual.txt:4804 +#: user-manual.txt:4545 msgid "Select 'File - Create backup'" msgstr "" #. type: Plain text -#: user-manual.txt:4806 +#: user-manual.txt:4547 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:4807 +#: user-manual.txt:4548 msgid "Click 'Save'" msgstr "" #. type: Plain text -#: user-manual.txt:4808 +#: user-manual.txt:4549 msgid "The dives are now exported to the file DM4.bak (or DM5.bak)" msgstr "" #. type: Title === -#: user-manual.txt:4810 +#: user-manual.txt:4551 #, no-wrap msgid "Exporting from Atomic Logbook" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4813 +#: user-manual.txt:4554 #, no-wrap msgid "images/icons/atomiclogo.jpg" msgstr "images/icons/atomiclogo.jpg" #. type: Plain text -#: user-manual.txt:4820 +#: user-manual.txt:4561 msgid "" "Atomic Logbook is Windows software by Atomic Aquatics. It allows downloading " "of dive information from Cobalt and Cobalt 2 dive computers. The divelog is " @@ -11468,19 +10350,19 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4822 +#: user-manual.txt:4563 #, no-wrap msgid "Exporting from Mares Dive Organiser V2.1" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4825 +#: user-manual.txt:4566 #, no-wrap msgid "images/icons/mareslogo.jpg" msgstr "images/icons/mareslogo.jpg" #. type: Plain text -#: user-manual.txt:4833 +#: user-manual.txt:4574 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 " @@ -11491,7 +10373,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4838 +#: user-manual.txt:4579 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 " @@ -11499,36 +10381,36 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4841 +#: user-manual.txt:4582 msgid "" "Rename the file to DiveOrganizerxxxxx.zip. Inside the zipped directory is a " "file _DiveOrganizer.sdf_." msgstr "" #. type: Plain text -#: user-manual.txt:4842 +#: user-manual.txt:4583 msgid "Extract the _.sdf_ file from the zipped folder to your Desktop." msgstr "" #. type: Plain text -#: user-manual.txt:4843 +#: user-manual.txt:4584 msgid "The password for accessing the .zip file is _mares_." msgstr "" #. type: Title === -#: user-manual.txt:4845 +#: user-manual.txt:4586 #, no-wrap msgid "Exporting from *DivingLog 5.0 and 6.0*" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4847 +#: user-manual.txt:4588 #, no-wrap msgid "images/icons/divingloglogo.jpg" msgstr "images/icons/divingloglogo.jpg" #. type: Plain text -#: user-manual.txt:4854 +#: user-manual.txt:4595 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 " @@ -11538,37 +10420,37 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4856 +#: user-manual.txt:4597 msgid "To transfer all files from DivingLog to Subsurface:" msgstr "" #. type: Plain text -#: user-manual.txt:4858 +#: user-manual.txt:4599 msgid "In DivingLog open the 'File -> Export -> SQLite' menu" msgstr "" #. type: Plain text -#: user-manual.txt:4859 +#: user-manual.txt:4600 msgid "Select 'Settings' button" msgstr "" #. type: Plain text -#: user-manual.txt:4860 +#: user-manual.txt:4601 msgid "Set the 'RTF2Plaintext' to 'true'" msgstr "" #. type: Plain text -#: user-manual.txt:4861 +#: user-manual.txt:4602 msgid "Close the Settings dialog" msgstr "" #. type: Plain text -#: user-manual.txt:4862 +#: user-manual.txt:4603 msgid "Click 'Export' button and select the filename" msgstr "" #. type: Plain text -#: user-manual.txt:4866 +#: user-manual.txt:4607 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 " @@ -11576,13 +10458,13 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:4867 +#: user-manual.txt:4608 #, 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:4877 +#: user-manual.txt:4618 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 " @@ -11602,7 +10484,7 @@ msgstr "" "tableur utilisé." #. type: Plain text -#: user-manual.txt:4883 +#: user-manual.txt:4624 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 " @@ -11618,19 +10500,19 @@ msgstr "" "plongées selon quelques règles simples :" #. type: Plain text -#: user-manual.txt:4885 +#: user-manual.txt:4626 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:4886 +#: user-manual.txt:4627 msgid "Duration: the format should be minutes:seconds." msgstr "Durée : le format est minutes:secondes." #. type: Plain text -#: user-manual.txt:4887 +#: user-manual.txt:4628 msgid "" "Unit system: only one unit system should be used (no mix of imperial and " "metric units)" @@ -11639,25 +10521,25 @@ msgstr "" "entre les unités impériales et métriques)" #. type: Plain text -#: user-manual.txt:4888 +#: user-manual.txt:4629 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:4889 +#: user-manual.txt:4630 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:4890 +#: user-manual.txt:4631 #, no-wrap msgid "_LibreOffice Calc_ and _OpenOffice Calc_" msgstr "_LibreOffice Calc_ et _OpenOffice Calc_" #. type: Plain text -#: user-manual.txt:4894 +#: user-manual.txt:4635 msgid "" "These are open source spreadsheet applications forming parts of larger open " "source office suite applications. The user interaction with _LibreOffice_ " @@ -11667,60 +10549,42 @@ msgid "" "this:" msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:4895 -#, no-wrap -msgid "FIGURE: Spreadsheet data" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:4895 +#: user-manual.txt:4636 #, no-wrap msgid "images/LOffice_spreadsheetdata.jpg" msgstr "images/LOffice_spreadsheetdata.jpg" #. type: Plain text -#: user-manual.txt:4898 +#: user-manual.txt:4639 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 " "file type and select the option _Edit filter settings_." msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:4899 -#, no-wrap -msgid "FIGURE: Save as options" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:4899 +#: user-manual.txt:4640 #, no-wrap msgid "images/LOffice_save_as_options.jpg" msgstr "images/LOffice_save_as_options.jpg" #. type: Plain text -#: user-manual.txt:4902 +#: user-manual.txt:4643 msgid "" "After selecting _Save_, select the appropriate field delimiter (choose _Tab_ " "to prevent conflicts with the comma when using this as a decimal point), " "then select _OK_." msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:4903 -#, no-wrap -msgid "FIGURE: Field options" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:4903 +#: user-manual.txt:4644 #, no-wrap msgid "images/LOffice_field_options.jpg" msgstr "images/LOffice_field_options.jpg" #. type: Plain text -#: user-manual.txt:4906 +#: user-manual.txt:4647 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 " @@ -11728,13 +10592,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4907 +#: user-manual.txt:4648 #, no-wrap msgid "Microsoft _Excel_" msgstr "Microsoft _Excel_" #. type: Plain text -#: user-manual.txt:4913 +#: user-manual.txt:4654 msgid "" "The field delimiter (called \"_list separator_\" in Microsoft manuals) is " "not accessible from within _Excel_ and needs to be set through the " @@ -11745,79 +10609,67 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4915 +#: user-manual.txt:4656 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:4916 +#: user-manual.txt:4657 msgid "Open the _Regional and Language Options_ dialog box." msgstr "" #. type: Plain text -#: user-manual.txt:4918 +#: user-manual.txt:4659 msgid "" "Do the following: ** In Windows 7, click the _Formats_ tab, and then click " "_Customize this format_." msgstr "" #. type: Plain text -#: user-manual.txt:4919 +#: user-manual.txt:4660 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:4920 +#: user-manual.txt:4661 msgid "Click _OK_ twice." msgstr "" #. type: Plain text -#: user-manual.txt:4922 +#: user-manual.txt:4663 msgid "Below is an image of the _Control Panel_:" msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:4923 -#, no-wrap -msgid "FIGURE: Win List separator" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:4923 +#: user-manual.txt:4664 #, no-wrap msgid "images/Win_SaveCSV2.jpg" msgstr "images/Win_SaveCSV2.jpg" #. type: Plain text -#: user-manual.txt:4926 +#: user-manual.txt:4667 msgid "To export the dive log in CSV format:" msgstr "" #. type: Plain text -#: user-manual.txt:4928 +#: user-manual.txt:4669 msgid "" "With the dive log opened in _Excel_, select the round Windows button at the " "top left, then _Save As_." msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:4929 -#, no-wrap -msgid "FIGURE: Excel save as option" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:4929 +#: user-manual.txt:4670 #, no-wrap msgid "images/Win_SaveCSV1.jpg" msgstr "images/Win_SaveCSV1.jpg" #. type: Plain text -#: user-manual.txt:4935 +#: user-manual.txt:4676 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 " @@ -11826,20 +10678,14 @@ msgid "" "appropriate folder has been selected to save the CSV file into." msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:4936 -#, no-wrap -msgid "FIGURE: Excel save CSV dialogue" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:4936 +#: user-manual.txt:4677 #, no-wrap msgid "images/Win_SaveCSV3.jpg" msgstr "images/Win_SaveCSV3.jpg" #. type: Plain text -#: user-manual.txt:4942 +#: user-manual.txt:4683 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 " @@ -11848,13 +10694,13 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:4943 +#: user-manual.txt:4684 #, 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:4948 +#: user-manual.txt:4689 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 " @@ -11863,12 +10709,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4950 +#: user-manual.txt:4691 msgid "Templates are accessed using the print dialogue (see image *B* below)." msgstr "" #. type: Plain text -#: user-manual.txt:4958 +#: user-manual.txt:4699 msgid "" "The buttons under the _Template_ dropdown box lets you _Edit_, _Delete_, " "_Import_ and _Export_ templates (see image *A* above). New or modified " @@ -11880,24 +10726,18 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4960 +#: user-manual.txt:4701 msgid "The Edit Panel has three tabs:" msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:4961 -#, no-wrap -msgid "FIGURE: template edit dialogue" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:4961 +#: user-manual.txt:4702 #, no-wrap msgid "images/Template1_f22.jpg" msgstr "images/Template1_f22.jpg" #. type: Plain text -#: user-manual.txt:4965 +#: user-manual.txt:4706 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. " @@ -11905,7 +10745,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4969 +#: user-manual.txt:4710 msgid "" "The _Colors_ tab (image *B* above) allows editing the colors used for " "printing the dive log. The colors are highly customizable: the _Edit_ " @@ -11914,7 +10754,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4978 +#: user-manual.txt:4719 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. " @@ -11929,20 +10769,14 @@ msgid "" "rendered." msgstr "" -#. type: Positional ($1) AttributeList argument for macro 'image' -#: user-manual.txt:4979 -#, no-wrap -msgid "FIGURE:Template tab" -msgstr "" - #. type: Target for macro image -#: user-manual.txt:4979 +#: user-manual.txt:4720 #, no-wrap msgid "images/Template2_f22.jpg" msgstr "images/Template2_f22.jpg" #. type: Plain text -#: user-manual.txt:4984 +#: user-manual.txt:4725 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 " @@ -11951,33 +10785,33 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4986 +#: user-manual.txt:4727 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:4987 +#: user-manual.txt:4728 #, no-wrap msgid "Main dive loop" msgstr "" #. type: Plain text -#: user-manual.txt:4989 +#: user-manual.txt:4730 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:4989 user-manual.txt:5060 user-manual.txt:5077 +#: user-manual.txt:4730 user-manual.txt:4801 user-manual.txt:4818 #, no-wrap msgid "template.html" msgstr "" #. type: delimited block . -#: user-manual.txt:4994 +#: user-manual.txt:4735 #, no-wrap msgid "" "\t{% for dive in dives %}\n" @@ -11986,13 +10820,13 @@ msgid "" msgstr "" #. type: Block title -#: user-manual.txt:4996 user-manual.txt:5065 user-manual.txt:5084 +#: user-manual.txt:4737 user-manual.txt:4806 user-manual.txt:4825 #, no-wrap msgid "output.html" msgstr "" #. type: delimited block . -#: user-manual.txt:5001 +#: user-manual.txt:4742 #, no-wrap msgid "" "\t<h1> 1 </h1>\n" @@ -12001,25 +10835,25 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:5004 +#: user-manual.txt:4745 msgid "" "Additional information about _Grantlee_ can be found http://www.grantlee.org/" "apidox/for_themers.html[here]" msgstr "" #. type: Title === -#: user-manual.txt:5005 +#: user-manual.txt:4746 #, no-wrap msgid "Grantlee exported variables" msgstr "" #. type: Plain text -#: user-manual.txt:5007 +#: user-manual.txt:4748 msgid "Only a subset of the dive data is exported:" msgstr "" #. type: delimited block | -#: user-manual.txt:5036 +#: user-manual.txt:4777 #, no-wrap msgid "" "|*Name*|*Description*\n" @@ -12053,25 +10887,25 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:5039 +#: user-manual.txt:4780 msgid "" "Please note that some of the variables like 'notes' need to be extended with " "'|safe' to support HTML tags:" msgstr "" #. type: delimited block . -#: user-manual.txt:5041 +#: user-manual.txt:4782 #, no-wrap msgid "\t<p> {{ dive.notes|safe }} </p>\n" msgstr "" #. type: Plain text -#: user-manual.txt:5043 +#: user-manual.txt:4784 msgid "Otherwise tags like 'br' would not be converted to line breaks." msgstr "" #. type: Plain text -#: user-manual.txt:5046 +#: user-manual.txt:4787 msgid "" "_Subsurface_ also exports *template_options* data. This data must be used as " "_CSS_ values to provide a dynamically editable template. The exported data " @@ -12079,7 +10913,7 @@ msgid "" msgstr "" #. type: delimited block | -#: user-manual.txt:5058 +#: user-manual.txt:4799 #, no-wrap msgid "" "|*Name*|*Description*\n" @@ -12096,26 +10930,26 @@ msgid "" msgstr "" #. type: delimited block . -#: user-manual.txt:5063 +#: user-manual.txt:4804 #, no-wrap msgid "\tborder-width: {{ template_options.borderwidth }}px;\n" msgstr "" #. type: delimited block . -#: user-manual.txt:5068 +#: user-manual.txt:4809 #, no-wrap msgid "\tborder-width: 3px;\n" msgstr "" #. type: Plain text -#: user-manual.txt:5071 +#: user-manual.txt:4812 msgid "" "Another variable that _Subsurface_ exports is *print_options*. This variable " "contains a single member:" msgstr "" #. type: delimited block | -#: user-manual.txt:5074 +#: user-manual.txt:4815 #, no-wrap msgid "" "|*Name*|*Description*\n" @@ -12123,7 +10957,7 @@ msgid "" msgstr "" #. type: delimited block . -#: user-manual.txt:5082 +#: user-manual.txt:4823 #, no-wrap msgid "" "\tbody {\n" @@ -12132,7 +10966,7 @@ msgid "" msgstr "" #. type: delimited block . -#: user-manual.txt:5089 +#: user-manual.txt:4830 #, no-wrap msgid "" "\tbody {\n" @@ -12141,13 +10975,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:5091 +#: user-manual.txt:4832 #, no-wrap msgid "Defined CSS selectors" msgstr "" #. type: Plain text -#: user-manual.txt:5094 +#: user-manual.txt:4835 msgid "" "As the dive profile is placed after rendering, _Subsurface_ uses special " "_CSS_ selectors to search in the HTML output. The _CSS_ selectors in the " @@ -12155,7 +10989,7 @@ msgid "" msgstr "" #. type: delimited block | -#: user-manual.txt:5101 +#: user-manual.txt:4842 #, no-wrap msgid "" "|*Selector*|*Type*|*Description*\n" @@ -12166,20 +11000,20 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:5104 +#: user-manual.txt:4845 msgid "" "Rendering dive profiles is not supported for flow layout templates (when " "data-numberofdives = 0)." msgstr "" #. type: Title === -#: user-manual.txt:5105 +#: user-manual.txt:4846 #, no-wrap msgid "Special attributes" msgstr "" #. type: Plain text -#: user-manual.txt:5109 +#: user-manual.txt:4850 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 " @@ -12187,56 +11021,136 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:5111 +#: user-manual.txt:4852 msgid "" "The *data-numberofdives* data attribute is added to the body tag to set the " "rendering mode." msgstr "" #. type: Plain text -#: user-manual.txt:5113 +#: user-manual.txt:4854 msgid "render 6 dives per page:" msgstr "" #. type: delimited block . -#: user-manual.txt:5116 +#: user-manual.txt:4857 #, no-wrap msgid "\t<body data-numberofdives = 6>\n" msgstr "" #. type: Plain text -#: user-manual.txt:5119 +#: user-manual.txt:4860 msgid "render as much dives as possible:" msgstr "" #. type: delimited block . -#: user-manual.txt:5122 +#: user-manual.txt:4863 #, no-wrap msgid "\t<body data-numberofdives = 0>\n" msgstr "" #. type: Plain text -#: user-manual.txt:5125 +#: user-manual.txt:4866 msgid "" "All CSS units should be in relative lengths only, to support printing on any " "page size." msgstr "" +#. type: Title == +#: user-manual.txt:4869 +#, no-wrap +msgid "APPENDIX F: Setting up video thumbnails." +msgstr "" + +#. type: Title === +#: user-manual.txt:4871 +#, no-wrap +msgid "Setting up the appropriate thumbnails for videos that are associated with dives." +msgstr "" + +#. type: Plain text +#: user-manual.txt:4877 +msgid "" +"In handling video associated with dives, _Subsurface_ needs to create a " +"thumbnail for each video that can be shown either on the dive profile or in " +"the _Media_ tab. By default this is a nonspecific placeholder thumbnail. To " +"see thumbnails that represent individual videos, _Subsurface_ uses an " +"external program calle _FFmpeg_. To create thumbnails for videos, do two " +"things:" +msgstr "" + +#. type: Plain text +#: user-manual.txt:4880 +msgid "" +"Install _FFmpeg_ on the computer that runs _Subsurface_. The program can be " +"downloaded from the FFmpeg web site: https://www.ffmpeg.org/download.html. " +"Most Linux distributions ship with an _ffmpeg_ package and therefore do not " +"need an additional download." +msgstr "" + +#. type: Plain text +#: user-manual.txt:4884 +#, no-wrap +msgid "" +"** On Windows, put the _ffmpeg.exe_ file in the directory containing the _Subsurface_ executable.\n" +"On Mac and Linux, make sure the _ffmpeg_ command is in the path. This should be the case for\n" +"_FFmpeg_ installed from official packages.\n" +msgstr "" + +#. type: Plain text +#: user-manual.txt:4887 +msgid "" +"In the _General_ tab of the <<S_Preferences, _Preferences_>>, set the " +"preferences for generating video thumbnails. This is achieved by:" +msgstr "" + +#. type: Plain text +#: user-manual.txt:4890 +#, no-wrap +msgid "" +"** Checking the _Extract video thumbnails_ box. If _Subsurface_ fails to load the _FFmpeg_ executable,\n" +"this option will be turned off. Re-enable it after successfully installing _FFmpeg_.\n" +msgstr "" + +#. type: Plain text +#: user-manual.txt:4892 +#, no-wrap +msgid "** Specifying the path to the _FFmpeg_ executable.\n" +msgstr "" + +#. type: Plain text +#: user-manual.txt:4898 +#, no-wrap +msgid "" +"** Choose the position in the video where _Subsurface_\n" +"should try to extract the thumbnail. The left-most and right-most positions of the _Extract at position_\n" +"slider signify the beginning and the end of the video, respectively. Note that if _Subsurface_ cannot\n" +"determine the length of the video (this can be the case for AVI files), the first frame\n" +"of the video will be used.\n" +msgstr "" + +#. type: Plain text +#: user-manual.txt:4900 +msgid "" +"This should complete the setup of video thumbnails and they should now " +"appear on the dive profile and in the _Media_ tab." +msgstr "" + # ANNEXE F: FAQs. #. type: Title == -#: user-manual.txt:5126 +#: user-manual.txt:4901 #, no-wrap -msgid "APPENDIX F: FAQs." -msgstr "ANNEXE F: FAQs." +msgid "APPENDIX G: FAQs." +msgstr "APPENDIX G: FAQs." #. type: Title === -#: user-manual.txt:5128 +#: user-manual.txt:4903 #, no-wrap msgid "Subsurface appears to miscalculate gas consumption and SAC" msgstr "" #. type: Plain text -#: user-manual.txt:5132 +#: user-manual.txt:4907 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_ " @@ -12244,7 +11158,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:5138 +#: user-manual.txt:4913 msgid "" "'Answer': Not really. What happens is that _Subsurface_ actually calculates " "gas consumption differently - and better - than you expect. In particular, " @@ -12254,7 +11168,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:5144 +#: user-manual.txt:4919 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 " @@ -12264,12 +11178,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:5146 +#: user-manual.txt:4921 msgid "+consumption = (amount_of_air_at_beginning - amount_of_air_at_end)+" msgstr "" #. type: Plain text -#: user-manual.txt:5152 +#: user-manual.txt:4927 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 " @@ -12280,12 +11194,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:5154 +#: user-manual.txt:4929 msgid "+12.2*((220-100)/1.013)+" msgstr "" #. type: Plain text -#: user-manual.txt:5159 +#: user-manual.txt:4934 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 " @@ -12295,7 +11209,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:5165 +#: user-manual.txt:4940 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 " @@ -12306,13 +11220,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:5166 +#: user-manual.txt:4941 #, no-wrap msgid "Some dive profiles have time discrepancies with the recorded samples from my dive computer..." msgstr "" #. type: Plain text -#: user-manual.txt:5170 +#: user-manual.txt:4945 msgid "" "_Subsurface_ ends up ignoring surface time for many things (average depth, " "divetime, SAC, etc). 'Question': Why do dive durations in my dive computer " @@ -12320,7 +11234,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:5178 +#: user-manual.txt:4953 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 " @@ -12334,13 +11248,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:5179 +#: user-manual.txt:4954 #, no-wrap msgid "Some dive profiles are missing from the download" msgstr "" #. type: Plain text -#: user-manual.txt:5193 +#: user-manual.txt:4968 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 " @@ -12355,7 +11269,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:5197 +#: user-manual.txt:4972 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 " @@ -12363,6 +11277,103 @@ msgid "" "salvaged after being overwritten by new dives." msgstr "" +#~ msgid "The Main Window" +#~ msgstr "La fenêtre principale" + +#~ msgid "FIGURE:Download from Divelogs.de" +#~ msgstr "FIGURE: Télécharger depuis Divelogs.de" + +#~ msgid "_Subsurface_ has two tools for achieving this:" +#~ msgstr "_Subsurface_ comporte deux outils pour réaliser cela :" + +#~ msgid "The _Subsurface Companion App_ (Android and iOS)." +#~ msgstr "L'application _Subsurface Companion_ (Android et iOS)." + +#~ msgid "The _Subsurface-mobile_ app (Android and iOS)" +#~ msgstr "L'application _Subsurface-mobile_ (Android et iOS)" + +#~ msgid "" +#~ "For information on using the _Subsurface Companion App_, click xref:" +#~ "S_Companion[_here_]." +#~ msgstr "" +#~ "Pour plus d'information sur l'utilisation de l'application _Subsurface " +#~ "Companion_, cliquez xref:S_Companion[_ici_]." + +#~ msgid "*Creating new dive locations*\n" +#~ msgstr "*Créer de nouveaux emplacements de plongée*\n" + +#~ msgid "images/Companion_5.jpg" +#~ msgstr "images/Companion_5.jpg" + +#~ msgid "*List of dive locations*\n" +#~ msgstr "*Liste des emplacements de plongée*\n" + +#~ msgid "images/Companion_4.jpg" +#~ msgstr "images/Companion_4.jpg" + +#~ msgid "images/Companion_1.jpg" +#~ msgstr "images/Companion_1.jpg" + +#~ msgid "_Synchronisation_" +#~ msgstr "_Synchronisation_" + +#~ msgid "images/iphone.jpg" +#~ msgstr "images/iphone.jpg" + +#~ msgid "images/DownloadGPS.jpg" +#~ msgstr "images/DownloadGPS.jpg" + +#~ msgid "TIPS:" +#~ msgstr "CONSEILS:" + +#~ msgid "FIGURE: Sidemount profile" +#~ msgstr "FIGURE: Profil Sidemount" + +#~ msgid "Typical dive profile" +#~ msgstr "Profil de plongée typique" + +#~ msgid "Figure: Information Box" +#~ msgstr "FIGURE: La boîte Information" + +# "graphique à barres"? +#~ msgid "FIGURE:Gas Pressure bar Graph" +#~ msgstr "FIGURE: Le graphique de pression gazeuse" + +#~ msgid "Figure: Context Menu" +#~ msgstr "Figure: Menu contextuel" + +#~ msgid "Figure: Filter panel" +#~ msgstr "Figure: panneau des filtres" + +#~ msgid "FIGURE: Configure dive computer" +#~ msgstr "FIGURE: Configurer un ordinateur de plongée" + +#~ msgid "images/Pref1_f23.jpg" +#~ msgstr "images/Pref1_f23.jpg" + +#~ msgid "FIGURE: Georeference panel" +#~ msgstr "FIGURE: panneau de géoréférencement" + +#~ msgid "FIGURE: A recreational dive plan: setup" +#~ msgstr "FIGURE: une planification de plongée loisir : configuration" + +#~ msgid "FIGURE: Planning a dive: setup" +#~ msgstr "FIGURE: Planifier des plongées : configuration" + +#~ msgid "FIGURE: Planning a pSCR dive: setup" +#~ msgstr "FIGURE: Planifier des plongées pSCR : configuration" + +#~ msgid "FIGURE: Planning a CCR dive: setup" +#~ msgstr "FIGURE: Planifier des plongées CCR : configuration" + +#~ msgid "" +#~ "<<S_Companion,_Import GPS data from Subsurface web service_>> - Load GPS " +#~ "coordinates from the _Subsurface_ mobile phone app." +#~ msgstr "" +#~ "<<S_Companion,_Importer les données GPS depis le service web " +#~ "Subsurface_>> - Charge les coordonnées GPS à partir de l'application " +#~ "mobile _Subsurface_ (téléphones et tablettes)." + #~ msgid "images/CCR_dive_ceilingF22.jpg" #~ msgstr "images/CCR_dive_ceilingF22.jpg" @@ -12547,9 +11558,6 @@ msgstr "" #~ msgid "images/PrintDiveLog.jpg" #~ msgstr "images/PrintDiveLog.jpg" -#~ msgid "images/Pref2.jpg" -#~ msgstr "images/Pref2.jpg" - #~ msgid "images/Pref4.jpg" #~ msgstr "images/Pref4.jpg" diff --git a/Documentation/mobile-manual_fr.html.git b/Documentation/mobile-manual_fr.html.git index f17b20e3d..91b2772da 100644 --- a/Documentation/mobile-manual_fr.html.git +++ b/Documentation/mobile-manual_fr.html.git @@ -1,10 +1,9 @@ -<?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 8.6.10" /> +<meta name="generator" content="AsciiDoc 8.6.9" /> <title></title> <style type="text/css"> /* @@ -538,23 +537,23 @@ connection. The Subsurface team never accesses a user’s dive data without explicit permission to do so, the data are not used for any purpose other than providing them to the user who created them. There are no ads and no harvesting / analysis of the data stored in the Subsurface cloud storage.</p></div> -<div class="paragraph"><p>1) Enter an e-mail address and a password in the fields indicated on the - screen. The e-mail address should be in lower case and the password should - contain a combination of letters from the alphabet (upper and lower case) - and/or numbers. Tap the "Sign-in or Register" button. If you have already - set up an account from the <em>Subsurface</em> desktop application, enter the same - credentials here. Once the dive list has been downloaded from the cloud, - <em>Subsurface-mobile</em> usually works only with the the local copy on the mobile - device. This avoids long delays or even failure of operations if there is a - bad (or no) internet connection, a situation fairly common at many dive - sites.</p></div> -<div class="paragraph"><p>3) If this is a new account, a PIN screen will open (see image on right, - above). A PIN is e-mailed to the email address entered in the previous - step. Enter this PIN into the field indicated and tap the <em>Register</em> - button. The user information is stored on the cloud server and access to the - cloud is enabled. In this case the dive list is initially empty. Start - entering dives in the dive log or download dive information from a supported - dive computer.</p></div> +<div class="paragraph"><p>Enter an e-mail address and a password in the fields indicated on the +screen. The e-mail address should be in lower case and the password should +contain a combination of letters from the alphabet (upper and lower case) +and/or numbers. Tap the "Sign-in or Register" button. If you have already +set up an account from the <em>Subsurface</em> desktop application, enter the same +credentials here. Once the dive list has been downloaded from the cloud, +<em>Subsurface-mobile</em> usually works only with the the local copy on the mobile +device. This avoids long delays or even failure of operations if there is a +bad (or no) internet connection, a situation fairly common at many dive +sites.</p></div> +<div class="paragraph"><p>If this is a new account, a PIN screen will open (see image on right, +above). A PIN is e-mailed to the email address entered in the previous +step. Enter this PIN into the field indicated and tap the <em>Register</em> +button. The user information is stored on the cloud server and access to the +cloud is enabled. In this case the dive list is initially empty. Start +entering dives in the dive log or download dive information from a supported +dive computer.</p></div> <div class="paragraph"><p>The dive log can be updated automatically. If there is Internet connectivity, <em>Subsurface-mobile</em> accesses the cloud-based dive log to verify that the local copy of the dive log is still the same as the log in @@ -726,6 +725,10 @@ settings). Android devices also support all Bluetooth dive computers that are supported in Subsurface. And both Android and iOS devices allow direct download of dive data from a hand full of Bluetooth LE enabled dive computers.</p></div> +<div class="paragraph"><p>Use the <em>Vendor name</em> and <em>Dive Computer</em> drop-downs to pick the correct +dive computer. When downloading from multiple different dive computers, +shortcut buttons to easily switch between them will appear below the +drop-downs.</p></div> <div class="paragraph"><p>The process for download is slightly different between the two OSs. In our testing we got the best results on iOS when the dive computer was in Bluetooth mode before <em>Subsurface-mobile</em> is started. On most dive computers @@ -952,7 +955,7 @@ information, then tap the button <em>Sign-in or register</em>. The appropriate d list is shown.</p></div> <div class="imageblock" style="text-align:center;"> <div class="content"> -<img src="mobile-images/SettingsCloudTheme.jpg" alt="FIGURE: Settings: Cloud & Theme" /> +<img src="mobile-images/SettingsCloudTheme.jpg" alt="FIGURE: Settings: Cloud & Theme" /> </div> </div> </div> @@ -1020,7 +1023,7 @@ characteristics of the mobile device and the font characteristics used by <div id="footer"> <div id="footer-text"> Last updated - 2018-09-15 09:39:06 PDT + 2018-11-05 09:24:27 CET </div> </div> </body> diff --git a/Documentation/mobile-manual_fr.txt b/Documentation/mobile-manual_fr.txt index bec81de17..2331e2458 100644 --- a/Documentation/mobile-manual_fr.txt +++ b/Documentation/mobile-manual_fr.txt @@ -109,24 +109,24 @@ explicit permission to do so, the data are not used for any purpose other than providing them to the user who created them. There are no ads and no harvesting / analysis of the data stored in the Subsurface cloud storage. -1) Enter an e-mail address and a password in the fields indicated on the - screen. The e-mail address should be in lower case and the password should - contain a combination of letters from the alphabet (upper and lower case) - and/or numbers. Tap the "Sign-in or Register" button. If you have already - set up an account from the _Subsurface_ desktop application, enter the same - credentials here. Once the dive list has been downloaded from the cloud, - _Subsurface-mobile_ usually works only with the the local copy on the mobile - device. This avoids long delays or even failure of operations if there is a - bad (or no) internet connection, a situation fairly common at many dive - sites. - -3) If this is a new account, a PIN screen will open (see image on right, - above). A PIN is e-mailed to the email address entered in the previous - step. Enter this PIN into the field indicated and tap the _Register_ - button. The user information is stored on the cloud server and access to the - cloud is enabled. In this case the dive list is initially empty. Start - entering dives in the dive log or download dive information from a supported - dive computer. +Enter an e-mail address and a password in the fields indicated on the +screen. The e-mail address should be in lower case and the password should +contain a combination of letters from the alphabet (upper and lower case) +and/or numbers. Tap the "Sign-in or Register" button. If you have already +set up an account from the _Subsurface_ desktop application, enter the same +credentials here. Once the dive list has been downloaded from the cloud, +_Subsurface-mobile_ usually works only with the the local copy on the mobile +device. This avoids long delays or even failure of operations if there is a +bad (or no) internet connection, a situation fairly common at many dive +sites. + +If this is a new account, a PIN screen will open (see image on right, +above). A PIN is e-mailed to the email address entered in the previous +step. Enter this PIN into the field indicated and tap the _Register_ +button. The user information is stored on the cloud server and access to the +cloud is enabled. In this case the dive list is initially empty. Start +entering dives in the dive log or download dive information from a supported +dive computer. The dive log can be updated automatically. If there is Internet connectivity, _Subsurface-mobile_ accesses the cloud-based dive log to @@ -263,6 +263,11 @@ are supported in Subsurface. And both Android and iOS devices allow direct download of dive data from a hand full of Bluetooth LE enabled dive computers. +Use the _Vendor name_ and _Dive Computer_ drop-downs to pick the correct +dive computer. When downloading from multiple different dive computers, +shortcut buttons to easily switch between them will appear below the +drop-downs. + The process for download is slightly different between the two OSs. In our testing we got the best results on iOS when the dive computer was in Bluetooth mode before _Subsurface-mobile_ is started. On most dive computers @@ -474,7 +479,7 @@ button. This opens the _Cloud credentials_ screen. change the credential information, then tap the button _Sign-in or register_. The appropriate dive list is shown. -image::mobile-images/SettingsCloudTheme.jpg["FIGURE: Settings: Cloud & Theme", align="center"] +image::mobile-images/SettingsCloudTheme.jpg["FIGURE: Settings: Cloud & Theme", align="center"] === Changing the color theme of _Subsurface-mobile_ diff --git a/Documentation/user-manual_fr.html.git b/Documentation/user-manual_fr.html.git index 8bc80e052..612478b43 100644 --- a/Documentation/user-manual_fr.html.git +++ b/Documentation/user-manual_fr.html.git @@ -1,10 +1,9 @@ -<?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 8.6.10" /> +<meta name="generator" content="AsciiDoc 8.6.9" /> <title></title> <style type="text/css"> /* @@ -446,7 +445,7 @@ asciidoc.install(3); <div class="paragraph"><p><strong>Auteurs du manuel</strong> : Willem Ferguson, Jacco van Koll, Dirk Hohndel, Reinout Hoornweg, Linus Torvalds, Miika Turkia, Amit Chaudhuri, Jan Schubert, Salvador Cuñat, Pedro Neves, Stefan Fuchs</p></div> -<div class="paragraph"><p><span class="blue"><em>Version 4.7, Mai 2018</em></span></p></div> +<div class="paragraph"><p><span class="blue"><em>Version 4.8, Septembre 2018</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 @@ -540,40 +539,28 @@ professionnels</p></div> <div class="paragraph"><p>Lorsqu’il est ouvert depuis <em>Subsurface</em>, ce manuel ne dispose pas de contrôles externes pour la pagination ou la sélection des pages précédentes. Cependant, deux options sont disponibles:</p></div> -<div class="ulist"><ul> -<li> -<p> -La fonction <em>RECHERCHE</em> est activée avec le raccourci clavier Contrôle-F ou - Commande-F. Une boîte de texte apparaît en bas à droite de la fenêtre (voir - image ci-dessous). Par exemple, entrer le mot "<em>weights</em>" dans la boîte de - texte de recherche lancera la recherche dans tout le manuel utilisateur. À - droite de la boîte de recherche se trouvent deux flèches, l’une vers le haut - l’autre vers le bas. Elles mènent respectivement vers l’occurence précédente - et suivante du terme recherché. -</p> -</li> -</ul></div> +<div class="paragraph"><p>La fonction <em>RECHERCHE</em> est activée avec le raccourci clavier Contrôle-F ou +Commande-F. Une boîte de texte apparaît en bas à droite de la fenêtre (voir +image ci-dessous). Par exemple, entrer le mot "<em>weights</em>" dans la boîte de +texte de recherche lancera la recherche dans tout le manuel utilisateur. À +droite de la boîte de recherche se trouvent deux flèches, l’une vers le haut +l’autre vers le bas. Elles mènent respectivement vers l’occurence précédente +et suivante du terme recherché.</p></div> <div class="imageblock" style="text-align:center;"> <div class="content"> <img src="images/UserManualSearch.jpg" alt="User manual functions" /> </div> </div> -<div class="ulist"><ul> -<li> -<p> -<em>LIEN PRÉCÉDENT/SUIVANT</em>. Naviguez entre les liens (les mots soulignés qui - vous conduisent vers des sections précises du manuel utilisateur) en - cliquant-droit sur le texte du manuel. Cela fera apparaître un menu - contextuel vers les liens PRÉCÉDENTS sélectionnés (voir image - ci-dessous). Par exemple, si un lien a été sélectionné, l’option <em>Retour - lien précédent</em> affiche le texte au lien précédent sélectionné (comme le - fait le bouton Page Précédente d’un navigateur). Inversement, l’option - <em>Aller au lien suivant</em> navigue vers le texte vu avant l’utilisation de - l’option <em>Retour lien précédent</em>. L’option <em>Recharger</em> recharge le manuel - utilisateur complet dans la fenêtre. -</p> -</li> -</ul></div> +<div class="paragraph"><p><em>LIEN PRÉCÉDENT/SUIVANT</em>. Naviguez entre les liens (les mots soulignés qui +vous conduisent vers des sections précises du manuel utilisateur) en +cliquant-droit sur le texte du manuel. Cela fera apparaître un menu +contextuel vers les liens PRÉCÉDENTS sélectionnés (voir image +ci-dessous). Par exemple, si un lien a été sélectionné, l’option <em>Retour +lien précédent</em> affiche le texte au lien précédent sélectionné (comme le +fait le bouton Page Précédente d’un navigateur). Inversement, l’option +<em>Aller au lien suivant</em> navigue vers le texte vu avant l’utilisation de +l’option <em>Retour lien précédent</em>. L’option <em>Recharger</em> recharge le manuel +utilisateur complet dans la fenêtre.</p></div> <div class="imageblock" style="text-align:center;"> <div class="content"> <img src="images/UserManualLinksBack.jpg" alt="User manual functions" /> @@ -607,41 +594,23 @@ envoyer un nouveau sondage en démarrant <em>Subsurface</em> avec l’option principal</strong> (Fichier Édition Importer Journal Vue Partager Aide) en haut de la fenêtre (pour Windows et Linux) ou en haut de l'écran (pour Mac et Ubuntu Unity). Les quatre panneaux sont :</p></div> -<div class="olist arabic"><ol class="arabic"> -<li> -<p> -La <strong>liste des plongées</strong> en bas à gauche, affichant toutes les plongées du - journal (carnet) de plongées de l’utilisateur. Une plongée peut être - sélectionnée et mise en surbrillance dans la liste en cliquant dessus. Dans - la plupart des cas, les touches haut/bas peuvent être utilisées pour passer - d’une plongée à l’autre. La <strong>liste des plongées</strong> est un outil important pour - manipuler un journal (carnet) de plongée. -</p> -</li> -<li> -<p> -La <strong>carte de plongée</strong> en bas à droite, affiche les sites de plongées de - l’utilisateur, sur une carte mondiale et centrée sur le site de la dernière - plongée sélectionnée dans la <strong>liste des plongées</strong>. L'échelle de la carte - peut être augmentée ou réduite. -</p> -</li> -<li> -<p> -Les <strong>informations</strong> en haut à gauche, fournissent des informations détaillées - sur la plongée sélectionnée dans la <strong>liste des plongées</strong>, dont des - statistiques pour la plongée sélectionnée ou pour toutes les plongées mises - en surbrillance. -</p> -</li> -<li> -<p> -Le <strong>profil de plongée</strong> en haut à droite, affiche un profil de plongée - graphique de la plongée sélectionnée dans la <strong>liste des plongées</strong>. Vous - pouvez zoomer sur le profil de plongée pour une vue plus détaillée. -</p> -</li> -</ol></div> +<div class="paragraph"><p>La <strong>liste des plongées</strong> en bas à gauche, affichant toutes les plongées du +journal (carnet) de plongées de l’utilisateur. Une plongée peut être +sélectionnée et mise en surbrillance dans la liste en cliquant dessus. Dans +la plupart des cas, les touches haut/bas peuvent être utilisées pour passer +d’une plongée à l’autre. La <strong>liste des plongées</strong> est un outil important pour +manipuler un journal (carnet) de plongée.</p></div> +<div class="paragraph"><p>La <strong>carte de plongée</strong> en bas à droite, affiche les sites de plongées de +l’utilisateur, sur une carte mondiale et centrée sur le site de la dernière +plongée sélectionnée dans la <strong>liste des plongées</strong>. L'échelle de la carte +peut être augmentée ou réduite.</p></div> +<div class="paragraph"><p>Les <strong>informations</strong> en haut à gauche, fournissent des informations détaillées +sur la plongée sélectionnée dans la <strong>liste des plongées</strong>, dont des +statistiques pour la plongée sélectionnée ou pour toutes les plongées mises +en surbrillance.</p></div> +<div class="paragraph"><p>Le <strong>profil de plongée</strong> en haut à droite, affiche un profil de plongée +graphique de la plongée sélectionnée dans la <strong>liste des plongées</strong>. Vous +pouvez zoomer sur le profil de plongée pour une vue plus détaillée.</p></div> <div class="paragraph"><p>Les séparateurs entre ces panneaux peuvent être déplacés pour modifier la taille de chaque panneau. <em>Subsurface</em> mémorise la position de ces séparateurs, pour qu’au prochain lancement <em>Subsurface</em> utilise ces @@ -657,12 +626,12 @@ températures de l’eau et le SAC (air consommé); temps total et nombre de plongées sélectionnées).</p></div> <div class="imageblock" id="S_ViewPanels" style="text-align:center;"> <div class="content"> -<img src="images/main_window_f22.jpg" alt="La fenêtre principale" /> +<img src="images/main_window_f22.jpg" alt="The Main Window" /> </div> </div> -<div class="paragraph"><p>L’utilisateur décide quels panneaux sont affichés, parmi les 4, en -sélectionnant l’option <strong>Vue</strong> dans le menu principal. Cette fonctionnalité -permet plusieurs choix d’affichage :</p></div> +<div class="paragraph"><p>Décider quels panneaux sont affichés, parmi les 4, en sélectionnant l’option +<strong>Vue</strong> dans le menu principal. Cette fonctionnalité permet plusieurs choix +d’affichage :</p></div> <div class="paragraph"><p><strong>Tout</strong> : affiche les quatre panneaux tels que sur la capture d'écran ci-dessus.</p></div> <div class="paragraph"><p><strong>Liste des plongées</strong> : affiche uniquement la liste des plongées.</p></div> <div class="paragraph"><p><strong>Profil</strong> : affiche uniquement le profile de plongée de la plongée sélectionnée.</p></div> @@ -721,9 +690,9 @@ Importer les informations de plongée qui ont été maintenues soit dans un </p> </li> </ul></div> -<div class="paragraph"><p>2) Si une plongée est enregistrée par un ordinateur de plongée, le profil de - profondeur et de nombreuses informations supplémentaires peuvent être - obtenues. Ces plongées peuvent être importées à partir de :</p></div> +<div class="paragraph"><p>Si une plongée est enregistrée par un ordinateur de plongée, le profil de +profondeur et de nombreuses informations supplémentaires peuvent être +obtenues. Ces plongées peuvent être importées à partir de :</p></div> <div class="ulist"><ul> <li> <p> @@ -882,7 +851,8 @@ cette communication, les utilisateurs doivent trouver l’information appropriée pour renseigner à <em>Subsurface</em> d’où et comment importer les informations de plongée. -<a href="#S_Appendix_A">Annexe A</a> donne les informations techniques pour aider l’utilisateur à configurer +<a href="#_appendix_a_operating_system_specific_information_for_importing_dive_information_from_a_dive_computer">Annexe +A</a> donne les informations techniques pour aider l’utilisateur à configurer ceci pour les différents systèmes d’exploitation et <a href="#_appendix_b_dive_computer_specific_information_for_importing_dive_information">Annexe B</a> contient des informations spécifiques à chaque ordinateur de plongée.</p></div> @@ -938,12 +908,25 @@ La boîte de dialogue propose deux menus déroulants, <strong>Fournisseur</stron Le menu déroulant <strong>Périphérique ou point de montage</strong> le nom du port USB ou Bluetooth dont <em>Subsurface</em> a besoin pour communiquer avec l’ordinateur de plongée. Le port approprié doit être sélectionné. Consultez - <a href="#S_Appendix_A">Annexe A</a> et + <a href="#_appendix_a_operating_system_specific_information_for_importing_dive_information_from_a_dive_computer">Annexe + A</a> et <a href="#_appendix_b_dive_computer_specific_information_for_importing_dive_information">Annexe B</a> pour obtenir des détails techniques sur la façon de trouver des informations sur le port approprié à chaque ordinateur de plongée et, dans certains cas, sur les réglages requis pour le système d’exploitation de - l’ordinateur sur lequel <em>Subsurface</em> fonctionne. + l’ordinateur sur lequel <em>Subsurface</em> fonctionne. Certains ordinateurs de + plongée désactivent ce menu déroulant puisqu’ils utilisent d’autres moyens + pour trouver et se connecter au périphérique. Pour certains, les données + entrées ici sont en fait le point de montage USB tel que s’identifie + l’ordinateur de plongée lui-même. +</p> +</li> +<li> +<p> +Below the three drop downs are up to four shortcut buttons that allow you to + easily switch between multiple dive computers that you are frequently + downloading from. These buttons only appear once you have downloaded from + different dive computers. </p> </li> <li> @@ -1052,14 +1035,17 @@ Le câble de connexion est-il fautif ? Le câble fonctionne-t-il avec d’au <li> <p> Consultez - <a href="#S_Appendix_A">Annexe A</a> pour être certain que le point de montage correct a été spécifié (voir + <a href="#_appendix_a_operating_system_specific_information_for_importing_dive_information_from_a_dive_computer">Annexe + A</a> pour être certain que le point de montage correct a été spécifié (voir ci-dessus). </p> </li> <li> <p> Sur les systèmes d’exploitation de type Unix, l’utilisateur a-t-il les - droits d'écriture sur le port USB? Si non, consultez <a href="#S_Appendix_A">Annexe A</a> + droits d'écriture sur le port USB? Si non, consultez + <a href="#_appendix_a_operating_system_specific_information_for_importing_dive_information_from_a_dive_computer">Annexe + A</a> </p> </li> </ul></div> @@ -1267,6 +1253,19 @@ Bluetooth"</em>.</p></div> <td class="icon"> <img src="images/icons/important.png" alt="Important" /> </td> +<td class="content">The Subsurface support for BLTE dive computers on Windows is <strong>EXPERIMENTAL</strong> +and only supported on Windows 10. Please make sure that you have the latest +version of Windows 10. +<a href="https://en.wikipedia.org/wiki/Windows_10_version_history#Version_1803_(April_2018_Update)">Version +1803</a> is a minimum requirement. Also make sure that you have installed the +latest drivers for your motherboard and/or BTLE dongle.</td> +</tr></table> +</div> +<div class="admonitionblock"> +<table><tr> +<td class="icon"> +<img src="images/icons/important.png" alt="Important" /> +</td> <td class="content"><strong>EN CAS DE PROBLÈMES</strong>: si l’adaptateur Bluetooth de l’ordinateur utilisant <em>Subsurface</em> se bloque et que le processus de <em>téléchargement</em> échoue de façon répétée, <em>dissociez</em> les périphériques et répétez les étapes ci-dessus. Si cela ne fonctionne pas, @@ -1445,10 +1444,9 @@ dive site name in the <strong>Notes tab</strong>.</p></div> <div class="paragraph"><p>Once the dive location data have been saved, the dive on the Dive List has a globe icon immediately to the left of the location name of a particular dive.</p></div> -<div class="paragraph"><p><strong>(3):</strong> Obtenir les coordonnées en utilisant soit l’application Subsurface-Mobile, soit l’application <em>Subsurface</em> Companion avec un -périphérique Android ou un iPhone avec GPS si les coordonnées du site de plongée ont été stockées -en utilisant une de ces applications. -<a href="#S_Companion">Cliquez ici pour plus d’information</a></p></div> +<div class="paragraph"><p><strong>(3):</strong> Obtenir les coordonnées en utilisant l’application <em>Subsurface-Mobile</em> avec un +périphérique Android ou un iPhone avec GPS et si les coordonnées du site de plongée ont été stockées +en utilisant une de ces applications.</p></div> <div class="admonitionblock"> <table><tr> <td class="icon"> @@ -1886,9 +1884,12 @@ 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> +generated by SmartTrak to Subsurface’s <em>.xml</em> format. It can be downloaded +from <a href="https://subsurface-divelog.org/downloads">the usual <em>Subsurface</em> +repository</a>, as a Windows installer or a Linux AppImage. The application is +not currently supported on Mac.</p></div> +<div class="paragraph"><p>It can also be built for Linux systems. Two dependencies need to be met in +your system before building: <em>glib2.0</em> and <em>mdbtools</em> (see below).</p></div> <div class="paragraph"><p>In addition, a web service is available for divelog convertions from SmartTrak to <em>Subsurface</em> (see below).</p></div> <div class="paragraph"><p>N’hésitez pas à contacter l'équipe de développement de <em>Subsurface</em> via @@ -1901,31 +1902,35 @@ source tree is in the directory <em>~/src/subsurface</em>, then:</p></div> <div class="ulist"><ul> <li> <p> -Move to the source tree directory. +Move to the source tree directory out of <em>Subsurface</em> (e.g. ~/src) </p> </li> <li> <p> -Run " $ ccmake build " and set SMARTTRAK_IMPORT option to <strong>on</strong> (off by - default). +Run " $ ./subsurface/scripts/smtk2ssrf-build.sh ", if every thing has gone + fine, you will now have an executable named smtk2ssrf in + ~/src/subsurface/smtk-import/build </p> </li> <li> <p> -Generate with [c] and save and exit with [g]. +You can run it from this directory, copy it to another one, e.g. <em>~/bin</em> or + simply run "sudo make install", and the binary will be installed in + /usr/local/bin (which is commonly included in every $PATH). </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>. +The script has some options mostly useful for development pourposes. If you + think you may need them, please read comments on script header itself. </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>. +<strong>WARNING</strong>: While building smtk2ssrf, a light version of <em>Subsurface</em> is + built (usable but lacking a lot of features). So, if you commonly use the + built executable placed at ~/subsurface/build/, you will need to rebuild it as + explained in this manual above. </p> </li> </ul></div> @@ -2005,7 +2010,7 @@ should then be selected, after which the imported dives appear in the <em>Subsurface</em> <strong>Dive List</strong> panel.</p></div> <div class="imageblock" style="text-align:center;"> <div class="content"> -<img src="images/Divelogs1.jpg" alt="FIGURE: Télécharger depuis Divelogs.de" /> +<img src="images/Divelogs1.jpg" alt="FIGURE:Download from Divelogs.de" /> </div> </div> </div> @@ -2227,36 +2232,19 @@ smaller file to make sure everything works.</td> <h3 id="_importation_des_coordonnées_de_plongée_depuis_un_appareil_mobile_avec_gps">5.4. Importation des coordonnées de plongée depuis un appareil mobile avec GPS.</h3> <div class="paragraph"><p>Un smartphone avec GPS peut être utilisé pour stocker les lieux de plongées. Ceci est réalisé comme suit:</p></div> -<div class="paragraph"><p>1) Taking the mobile device along on the dive boat / liveabord while - automatically collecting dive site coordinate information.</p></div> -<div class="paragraph"><p>2) Uploading the coordinates from the mobile device to the <em>Subsurface</em> - Internet server.</p></div> -<div class="paragraph"><p>3) Syncronising the dives in the <em>Subsurface</em> dive list with the coordinates - stored on the <em>Subsurface</em> Internet server.</p></div> -<div class="paragraph"><p><em>Subsurface</em> comporte deux outils pour réaliser cela :</p></div> -<div class="ulist"><ul> -<li> -<p> -L’application <em>Subsurface Companion</em> (Android et iOS). -</p> -</li> -<li> -<p> -L’application <em>Subsurface-mobile</em> (Android et iOS) -</p> -</li> -</ul></div> -<div class="paragraph"><p>Both of these applications perform the collection of dive site coordinates -and the synchronisation with dives in the <em>Subsurface</em> dive list. However, -the Companion App is not being further developed and has largely been -replaced by the <em>Subsurface-mobile</em> app. While the <em>Companion app</em> serves -exclusively to collect dive site coordinates and to make these available to -the <em>Subsurface</em> desktop version, <em>Subsurface-mobile</em> performs many of the -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>Pour plus d’information sur l’utilisation de l’application <em>Subsurface -Companion</em>, cliquez <a href="#S_Companion"><em>ici</em></a>.</p></div> +<div class="paragraph"><p>Taking the mobile device along on the dive boat / liveabord while +automatically collecting dive site coordinate information.</p></div> +<div class="paragraph"><p>2) Adding collected coordinate information to the dives using the + <em>Subsurface-mobile</em> app.</p></div> +<div class="paragraph"><p>3) Syncronising the logbook with the <em>Subsurface</em> cloud using the + <em>Subsurface-mobile</em> app.</p></div> +<div class="paragraph"><p>Existing users might still be using the legacy <em>Companion app</em>. However, the +Companion App hasn’t been under development in several years and has now +been removed from both Android and iOS app stores. The functionality is +fully integrated into <em>Subsurface-mobile</em>. Please note that the old GPS fix +internet service will be shut down by the end 2018 at which point the +<em>Companion app</em> will no longer be usable. Please switch to +<em>Subsurface-mobile</em> instead.</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"> @@ -2330,16 +2318,6 @@ recording of GPS positions.</p></div> <em>Subsurface-mobile</em> GPS menu.</p></div> </div> <div class="sect4"> -<h5 id="_upload_the_gps_locations_onto_the_em_subsurface_em_internet_server">Upload the GPS locations onto the <em>Subsurface</em> Internet server.</h5> -<div class="paragraph"><p><strong>N.B.:</strong> Uploading the GPS locations to the Internet can only take place if the mobile -device has reliable access to the Internet, either via a cellular network or -via a wifi connection. If the Internet is not accessible from the dive site(s), -then GPS uploading can only take place after the dive or after the dive trip, -when an Internet connection has been re-established.</p></div> -<div class="paragraph"><p>From the <em>Subsurface-mobile</em> main menu, select <em>GPS</em> → <em>Upload GPS -data</em>. The locations are uploaded.</p></div> -</div> -<div class="sect4"> <h5 id="_apply_the_stored_gps_locations_to_dives_on_the_em_subsurface_em_dive_list">Apply the stored GPS locations to dives on the <em>Subsurface</em> dive list.</h5> <div class="paragraph"><p><em>Subsurface</em> collects the first GPS location recorded after the start of a dive (obtained within <em>Subsurface</em> from either the dive computer or from the @@ -2355,396 +2333,42 @@ detailed instructions for performing the collection of GPS data and for managing, uploading and synchronising this information.</p></div> </div> </div> -<div class="sect3"> -<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 -location can be automatically passed to the <em>Subsurface</em> dive log. The Companion App -stores dive locations on a dedicated Internet server. <em>Subsurface</em> can collect -the locations from the server. -To do this:</p></div> -<div class="sect4"> -<h5 id="_create_a_companion_app_account">Create a Companion App account</h5> -<div class="ulist"><ul> -<li> -<p> -Register on the <a href="http://api.hohndel.org/login/"><em>Subsurface companion web - page</em></a>. A confirmation email with instructions and a personal <strong>DIVERID</strong> - will be sent, a long number enabling access to the file server and Companion - App capabilities. -</p> -</li> -<li> -<p> -Download the app from - <a href="https://play.google.com/store/apps/details?id=org.subsurface">Google Play - Store</a> or from - <a href="https://f-droid.org/repository/browse/?fdfilter=subsurface&fdid=org.subsurface">F-Droid</a>. -</p> -</li> -</ul></div> -</div> -<div class="sect4"> -<h5 id="_using_the_subsurface_companion_app_on_an_android_smartphone">Using the Subsurface companion app on an Android smartphone</h5> -<div class="paragraph"><p>On first use the app has three options:</p></div> -<div class="ulist"><ul> -<li> -<p> -<em>Create a new account.</em> Equivalent to registering in the <em>Subsurface</em> - companion page using an Internet browser. You can request a <strong>DIVERID</strong> using - this option, but it’s supplied via email and followed up by interaction with - the <a href="http://api.hohndel.org/login/"><em>Subsurface companion web page</em></a> to - activate the account. -</p> -</li> -<li> -<p> -<em>Retrieve an account.</em> If you forget your <strong>DIVERID</strong> you will receive an - email to recover the ID string. -</p> -</li> -<li> -<p> -<em>Use an existing account.</em> You are prompted for your <strong>DIVERID</strong>. The app - saves this <strong>DIVERID</strong> and doesn’t ask for it again unless you use the - <em>Disconnect</em> menu option (see below). -</p> -</li> -</ul></div> -<div class="admonitionblock"> -<table><tr> -<td class="icon"> -<img src="images/icons/important.png" alt="Important" /> -</td> -<td class="content">In the <em>Subsurface</em> main program, the <strong>DIVERID</strong> should also be entered on -the Default Preferences panel, by selecting <em>File → Preferences → General</em> -from the main menu in <em>Subsurface</em> itself. This helps synchronization -between <em>Subsurface</em> and the Companion App.</td> -</tr></table> -</div> -<div class="paragraph"><p><strong>Créer de nouveaux emplacements de plongée</strong></p></div> -<div class="paragraph"><p>Now you are ready to get a dive position and send it to the server. The -Android display looks like the left hand image (<strong>A</strong>) below, but without any -dives.</p></div> -<div class="paragraph"><p>Touch the + icon at the top right to add a new dive site. A menu with 3 -options shows:</p></div> -<div class="ulist"><ul> -<li> -<p> -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. -</p> -</li> -<li> -<p> -Use Map: This option allows you to fix a position by searching a world - map. A world map is shown (see <strong>B</strong> below). Specify the desired position with - a <em>long press</em> on the touch sensitive screen (if the marked location is - wrong, simply choose a new location) and select the check symbol in the - upper right. A dialog is shown allowing you to enter the name of the dive - location and the date and time of the dive (see <strong>C</strong> below). In order to - import this dive location in <em>Subsurface</em>, set the time to agree with the - time of that dive on the dive computer. -</p> -</li> -</ul></div> -<div class="imageblock" style="text-align:center;"> -<div class="content"> -<img src="images/Companion_5.jpg" alt="FIGURE: Companion App, add location using map" /> -</div> -</div> -<div class="ulist"><ul> -<li> -<p> -Import local GPX file: The Android device searches for .gpx files and - located archives will be shown. The selected .gpx file is opened and its - locations shown. Now select the appropriate locations, and select the check - symbol in the upper right to add them. -</p> -</li> -</ul></div> -<div class="paragraph"><p><strong>Liste des emplacements de plongée</strong></p></div> -<div class="paragraph"><p>The main screen shows a list of dive locations, each with a name, date and -time (see <strong>A</strong> below). Some locations may have an arrow-up icon over the -selection box to the left showing they need to be uploaded to the -server. You can select individual dive locations from the list. A selected -location has a check mark in the selection box on the left. Group operations -(like <em>Delete</em> or <em>Send</em>) are performed on several selected locations.</p></div> -<div class="paragraph"><p>Dive locations in this list can be viewed in two ways: a list of locations -or a map showing them. The display mode (List or Map) is changed by -selecting <em>Dives</em> at the top left of the screen (see <strong>A</strong> below) and then -selecting the display mode. The display mode can be changed either from the -list of locations or from the map (see <strong>B</strong> below). Upon selecting a location -(on the list or on the map), an editing panel opens (see <strong>C</strong> below) where -the dive description or other details may be changed.</p></div> -<div class="imageblock" style="text-align:center;"> -<div class="content"> -<img src="images/Companion_4.jpg" alt="FIGURE: Companion App, add location using map" /> -</div> -</div> -<div class="paragraph"><p>Upon selecting a dive (<strong>not</strong> selecting the check box), the name given to it, -date/time and GPS coordinates are shown with two options at the top of the -screen:</p></div> -<div class="ulist"><ul> -<li> -<p> -Edit (pencil): Change the name of the dive location. -</p> -</li> -<li> -<p> -Maps: Display a map showing the dive location. After editing and saving a - dive location (see <strong>C</strong> above), upload it to the web service, as explained - below. -</p> -</li> -</ul></div> -<div class="paragraph"><p><strong>Uploading dive locations</strong></p></div> -<div class="paragraph"><p>There are several ways to send locations to the server. The easiest is -simply selecting the locations (See <strong>A</strong> below) and then touching the right -arrow at the top right of the screen.</p></div> -<div class="admonitionblock"> -<table><tr> -<td class="icon"> -<img src="images/icons/important.png" alt="Important" /> -</td> -<td class="content">Be careful! The trash icon on the right means exactly what it should; it -deletes the selected dive location(s).</td> -</tr></table> -</div> -<div class="imageblock" style="text-align:center;"> -<div class="content"> -<img src="images/Companion_1.jpg" alt="FIGURE: Screen shots (A-B) of companion app" /> -</div> -</div> -<div class="paragraph"><p>After a dive trip using the Companion App, all dive locations are ready to -be downloaded to a <em>Subsurface</em> dive log (see below).</p></div> -<div class="paragraph"><p><strong>Settings on the Companion App</strong></p></div> -<div class="paragraph"><p>Selecting the <em>Settings</em> menu option results in the right hand image above -(<strong>B</strong>).</p></div> -<div class="paragraph"><p><em>Server and account</em></p></div> -<div class="ulist"><ul> -<li> -<p> -<em>Web-service URL.</em> This is predefined (<a href="http://api.hohndel.org/">http://api.hohndel.org/</a>) -</p> -</li> -<li> -<p> -<em>User ID.</em> The DIVERID obtained by registering as described above. The - easiest way to get it is to copy and paste from the confirmation email or - just type it in. -</p> -</li> -</ul></div> -<div class="paragraph"><p><em>Synchronisation</em></p></div> -<div class="ulist"><ul> -<li> -<p> -<em>Synchronize on startup</em>. If selected, dive locations in the Android device - and those on the web service synchronize each time the app is started. -</p> -</li> -<li> -<p> -<em>Upload new dives.</em> If selected, each time the user adds a dive location it - is automatically sent to the server. -</p> -</li> -</ul></div> -<div class="paragraph"><p><em>Background service</em></p></div> -<div class="paragraph"><p>Instead of entering an unique dive location, you can leave the service -running in the background, allowing a continuous collection of GPS -locations.</p></div> -<div class="paragraph"><p>The settings below define the behavior of the service:</p></div> -<div class="ulist"><ul> -<li> -<p> -<em>Min duration.</em> In minutes. The app will try to get a location every X - minutes until stopped by the user. -</p> -</li> -<li> -<p> -<em>Min distance.</em> In meters. Minimum distance between two locations. -</p> -</li> -<li> -<p> -<em>Name template.</em> The name the app will use when saving the locations. -</p> -</li> -</ul></div> -<div class="admonitionblock"> -<table><tr> -<td class="icon"> -<img src="images/icons/info.jpg" alt="Tip" /> -</td> -<td class="content"><em>How does the background service work?</em> Assuming the diver sets 5 minutes -and 50 meters in the settings above, the app will start by recording a -location at the current location, followed by another one at every 5 minutes -<strong>or</strong> every time one moves 50 m from previous location. If subsequent -locations are within a radius of 50 meters from the previous one, a new -location is not saved. If the diver is not moving, only one location is -saved. If the diver is moving, a trace of the route is obtained by saving a -location every 50 meters.</td> -</tr></table> -</div> -<div class="paragraph"><p><em>Other</em></p></div> -<div class="ulist"><ul> -<li> -<p> -<em>Mailing List.</em> The mail box for <em>Subsurface</em>. Users can send an email to - the Subsurface mailing list. -</p> -</li> -<li> -<p> -<em>Subsurface website.</em> A link to the URL of Subsurface web -</p> -</li> -<li> -<p> -<em>Version.</em> Displays the current version of the Companion App. -</p> -</li> -</ul></div> -<div class="paragraph"><p><em>Search</em></p></div> -<div class="paragraph"><p>Search the saved dive locations by name or by date and time.</p></div> -<div class="paragraph"><p><em>Start service</em></p></div> -<div class="paragraph"><p>Starts the <em>background service</em> following the previously defined settings.</p></div> -<div class="paragraph"><p><em>Disconnect</em></p></div> -<div class="paragraph"><p>This is admittedly a badly named option that disconnects the app from the -server. It resets the user ID in the app, showing the first screen where an -account can be created, retrieve the ID for an existing account or use the -users own ID. The <em>Disconnect</em> option is useful if the Android device was -used to download the dive locations of another registered diver.</p></div> -<div class="paragraph"><p><em>Send all locations</em></p></div> -<div class="paragraph"><p>This option sends all locations stored in the Android device to the server.</p></div> -</div> -<div class="sect4"> -<h5 id="S_iphone">Using the Subsurface companion app on an <em>iPhone</em> to record dive locations</h5> -<div class="paragraph"><p>The iPhone interface is quite simple. Type the user ID (obtained during -registration) into the space reserved for it, then select "Dive in" (see -left part of the image below) and start collecting dive location -information.</p></div> -<div class="imageblock" style="text-align:center;"> -<div class="content"> -<img src="images/iphone.jpg" alt="FIGURE: Using iPhone companion application" width="640" /> -</div> -</div> -<div class="paragraph"><p>Dives can be added automatically or manually. In manual mode, a dive -location or waypoint is added to the GPS input stream. In automatic mode, a -continuous path of GPS locations is created from which, after import, -Subsurface can select the appropriate GPS locations based on the times of -dives. The default mode for the <em>iphone</em> is automatic. When adding a dive, -the location service is started automatically and a red bar appears at the -bottom of the screen. After the dive, click on the red bar to end the -location service. While the location service is running you can only add -dives manually.</p></div> -<div class="paragraph"><p>You can edit the site name afterwards by selecting the dive from the dive -list and clicking on the site name. There are no other editable fields. The -dive list is automatically uploaded from the iPhone to the web -service. There is no option to trigger upload manually.</p></div> -<div class="paragraph"><p><strong>Downloading dive locations to the <em>Subsurface</em> divelog</strong></p></div> -<div class="paragraph"><p>Download dive(s) from a dive computer or enter them manually into -<em>Subsurface</em> before obtaining the GPS coordinates from the server. The -download dialog can be reached via <em>Ctrl+G</em> or from the <em>Subsurface</em> Main -Menu <em>Import → Import GPS data from Subsurface Service</em>, resulting in the -image on the left (<strong>A</strong>), below. On first use the DIVERID text box is -blank. Provide a DIVERID, then select the <em>Download</em> button to start the -download process, after which the screen on the right (<strong>B</strong>) below appears:</p></div> -<div class="imageblock" style="text-align:center;"> -<div class="content"> -<img src="images/DownloadGPS.jpg" alt="FIGURE: Downloading Companion app GPS data" /> -</div> -</div> -<div class="paragraph"><p>Note that the <em>Apply</em> button is now active: selecting it updates the -locations of the newly entered or uploaded dives in <em>Subsurface</em>, i.e. it -applies the coordinates and names entered on the app to all the new dives -that match the date-times of the uploaded GPS localities. The names of dive -locations entered within <em>Subsurface</em> (i.e. before downloading the GPS -coordinates) have precedence over downloaded dive locations.</p></div> -<div class="paragraph"><p>Since <em>Subsurface</em> matches GPS locations from the mobile device and dive -information from the dive computer based on date-time data, automatic -assignment of GPS data to dives depends on agreeing date-time information -between the two devices. Although <em>Subsurface</em> has a wide range tolerance, -it may not be able to identify the appropriate dive if there is a large -difference between the time in the dive computer and that of the Android -device. This results in no updates.</p></div> -<div class="paragraph"><p>Similar date-times may not always be possible and there may be many reasons -for this (e.g. time zones). <em>Subsurface</em> may also be unable to decide which -is the correct position for a dive (e.g. on repetitive dives while running -<em>background service</em> there may be several locations that would be included -in the time range that fit not only the first dive, but one or more -subsequent dives as well). A workaround to manually edit the date-time of a -dive in the <em>Subsurface</em> Dive List <strong>before</strong> downloading the GPS data and -then to change the date-time back again <strong>after</strong> downloading GPS data.</p></div> -<div class="admonitionblock"> -<table><tr> -<td class="icon"> -<img src="images/icons/info.jpg" alt="Note" /> -</td> -<td class="content">CONSEILS:</td> -</tr></table> -</div> -<div class="ulist"><ul> -<li> -<p> -<em>Background service</em> may fill the location list with unnecessary locations - that don’t correspond to the exact dive point but do correspond to the - boat’s route. - Right now, these locations are difficult to delete from the server. In some - situations it - is better to clean up the list on the mobile device before sending the dive - points to the web server by simply deleting the inappropriate - locations. This might be necessary, for instance, to keep the location list - clear to see dives in the web service map display (see above). -</p> -</li> -<li> -<p> -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 <em>Name Template</em> - setting while running the <em>background service</em>, especially on a dive trip - with many dives and dive locations. -</p> -</li> -</ul></div> -</div> -</div> </div> <div class="sect2"> -<h3 id="S_LoadImage">5.5. Ajouter des photos aux plongées</h3> -<div class="paragraph"><p>Many (if not most) divers take photographs during a dive. <em>Subsurface</em> -allows the storage and display of photographs for each dive. Photos are -superimposed on the dive profile at the times during the dive when they were -taken. They can also be viewed from the dive profile.</p></div> +<h3 id="S_LoadImage">5.5. Ajouter des photos ou des vidéos aux plongées</h3> +<div class="paragraph"><p>Many (if not most) divers take photographs or videos during a dive. We term +these as <em>media</em>, meaning either photos or videos. <em>Subsurface</em> allows the +storage and display of these media for each dive. Images are superimposed on +the dive profile at the times during the dive when they were taken. Media +can be viewed either from the dive profile or from the <em>Media</em> tab in the +<strong>Notes Panel</strong>. <em>Subsurface</em> allows viewing of photographs as well as video +files in a unified interface.</p></div> <div class="sect3"> -<h4 id="_chargement_des_photos_et_synchronisation_entre_l_8217_ordinateur_de_plongée_et_l_8217_appareil_photo">5.5.1. Chargement des photos et synchronisation entre l’ordinateur de plongée et l’appareil photo</h4> +<h4 id="_chargement_des_médias_et_synchronisation_entre_l_8217_ordinateur_de_plongée_et_l_8217_appareil_photo">5.5.1. Chargement des médias et synchronisation entre l’ordinateur de plongée et l’appareil photo</h4> <div class="paragraph"><p>Right-click on a dive or on a group of dives on the dive list, bringing up the <a href="#S_DiveListContextMenu">Dive list context Menu</a>. Select the -appropriate option to import images either from file or from the -Internet. The system file browser appears. Select the folder and photographs -that need to be loaded into <em>Subsurface</em> and click the <em>Open</em> button.</p></div> +appropriate option to import media either from file or from the +Internet. The system file browser appears. Select the folder and media that +need to be loaded into <em>Subsurface</em> and click the <em>Open</em> button. Towards the +bottom of the file browser is a filter that allows showing media (photos and +videos), only photographs, only videos, or all files. Choose the appropriate +option.</p></div> <div class="imageblock" style="text-align:center;"> <div class="content"> <img src="images/LoadImage2_f20.jpg" alt="FIGURE: Load images option" /> </div> </div> -<div class="paragraph"><p>If photos are imported from the Internet, provide a URL pointing to a single -photograph. If the URL points to a directory, no images are imported: -photos from the Internet need to be imported one at a time. If photos are -loaded from the Internet, <em>Subsurface</em> assumes there is an Internet -connection each time this photo is viewed within <em>Subsurface</em>.</p></div> +<div class="paragraph"><p>If media are imported from the Internet, provide a URL pointing to a single +media. If the URL points to a directory, no images are imported: images +from the Internet need to be imported one at a time. If media are loaded +from the Internet, <em>Subsurface</em> assumes there is an Internet connection each +time this item is viewed within <em>Subsurface</em>.</p></div> <div class="paragraph"><p>Having selected the local folder or Internet image to be imported, the time synchronization dialog appears (see image below). The time synchronization is not perfect between the dive computer used during a dive and the camera used during that same dive. These two devices often differ by several -minutes. <em>Subsurface</em> attempts to synchronize these two devices so that the -exact times of photographs can be used to position photographs on the dive -profile.</p></div> +minutes. <em>Subsurface</em> attempts to synchronize them so that the exact times +of media can be used to position media on the dive profile.</p></div> <div class="paragraph"><p><em>Subsurface</em> synchronise l’appareil photo avec l’ordinateur de plongée de trois façons:</p></div> <div class="ulist"><ul> @@ -2764,7 +2388,7 @@ trois façons:</p></div> setting tool immediately under the heading <em>Shift times of image(s) by</em>, in the image below. If the camera time is 7 minutes later than that of the dive computer, set the time setting tool to a value of 00:07 and select the <em>Earlier</em> radio button. - This is appropriate, since the photos need to be shifted + This is appropriate, since the media need to be shifted 7 minutes earlier (camera is 7 minutes ahead of dive computer). Ignore any "AM" or "PM" suffix in that tool. Click the <em>OK</em> button and synchronization is done. </p> @@ -2801,28 +2425,59 @@ trois façons:</p></div> <img src="images/LoadImage3c_f23.jpg" alt="FIGURE: Synchronization dialog" /> </div> </div> -<div class="paragraph"><p>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 -above). However, If the appropriate checkbox is selected (see image above) -these images can still be placed on the <em>Photos</em> tab of the <strong>Notes</strong> panel so -that all photos associated with a dive are visible, including photos taken -before or after the dive.</p></div> +<div class="paragraph"><p>If the timestamp of a photograph or video 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 above). However, If the appropriate checkbox is selected (see +image above) these images can still be placed on the <em>Media</em> tab of the +<strong>Notes</strong> panel so that all media associated with a dive are visible, +including images taken before or after the dive.</p></div> </div> <div class="sect3"> -<h4 id="_visualiser_les_photos">5.5.2. Visualiser les photos</h4> -<div class="paragraph"><p>Après avoir été chargées, les images apparaissent à deux endroits:</p></div> +<h4 id="S_ViewMedia">5.5.2. Visualiser les médias</h4> +<div class="sidebarblock"> +<div class="content"> +<div class="paragraph"><p><strong>Ensuring that thumbnails are created for video files</strong></p></div> +<div class="admonitionblock"> +<table><tr> +<td class="icon"> +<img src="images/icons/important.png" alt="Important" /> +</td> +<td class="content">Within a panel <em>Subsurface</em> represents media by means of thumbnails +(i.e. small versions of images that allows listing many images. For a +photograph, a thumbnail can easily be created because the image is well +defined. But, since a video comprises many images, the question arises of +which image should be used for the thumbnail. Two actions are required to +create thumbnails of videos:</td> +</tr></table> +</div> +<div class="ulist"><ul> +<li> +<p> +The appropriate settings need to be set in the <em>Preferences</em>. +</p> +</li> +<li> +<p> +The program <em>ffmpeg</em> needs to be installed in the computer that runs + Subsurface. +</p> +</li> +</ul></div> +<div class="paragraph"><p>Full details are provided in <a href="#S_APPENDIX_F">APPENDIX F</a>.</p></div> +</div></div> +<div class="paragraph"><p>Après avoir été chargées, les médias apparaissent à deux endroits:</p></div> <div class="ulist"><ul> <li> <p> -the <em>Photos</em> tab of the <strong>Notes</strong> panel (left part of image below). +the <em>Media</em> tab of the <strong>Notes Panel</strong> (left part of image below). </p> </li> <li> <p> as tiny icons (stubs) on the dive profile at the appropriate positions - reflecting the time each photograph was taken. To view the photos on the - dive profile, activate the <em>show-photos</em> button in the tool bar to the left - of the dive profile: + reflecting the time each photograph or video was taken. To view the media + on the dive profile, activate the <em>Toggle media</em> button in the tool bar to + the left of the dive profile: </p> </li> </ul></div> @@ -2834,22 +2489,23 @@ as tiny icons (stubs) on the dive profile at the appropriate positions <div class="paragraph"><p>This results in a profile display as in the image below:</p></div> <div class="imageblock" style="text-align:center;"> <div class="content"> -<img src="images/LoadImage4_f20.jpg" alt="FIGURE: Photos on dive profile" /> +<img src="images/LoadImage4.jpg" alt="FIGURE: Media on dive profile" /> </div> </div> -<div class="paragraph"><p>Hover the mouse over any of the photo stubs. A thumbnail photo is shown of -the appropriate photo. See the image below:</p></div> +<div class="paragraph"><p>Hover the mouse over any of the media stubs. A thumbnail image is shown of +the appropriate media. See the image below:</p></div> <div class="imageblock" style="text-align:center;"> <div class="content"> -<img src="images/LoadImage5_f20.jpg" alt="FIGURE:Thumbnail photo on dive profile" /> +<img src="images/LoadImage5.jpg" alt="FIGURE:Thumbnail photo on dive profile" /> </div> </div> -<div class="paragraph"><p>Clicking on the thumbnail brings up a full size photo overlaid on the -<em>Subsurface</em> window, allowing a good view of the photographs (see the image -below). <strong>Note</strong> that the thumbnail has a small dustbin icon in the bottom -right hand corner (see image above). Selecting the dustbin removes the image -from the dive. Be careful when clicking on a thumbnail. Images can also be -deleted using the <em>Photos</em> tab (see text below).</p></div> +<div class="paragraph"><p>Clicking on the thumbnail brings up a full size photo or video overlaid on +the <em>Subsurface</em> window, allowing a good view of the media (see the image +below). <strong>Note</strong> that the thumbnail on the dive profile has a small dustbin +icon in the bottom right hand corner (see image above). Selecting the +dustbin removes the image from the dive. Be careful when clicking on a +thumbnail. Images can also be deleted using the <em>Media</em> tab (see text +below).</p></div> <div class="imageblock" style="text-align:center;"> <div class="content"> <img src="images/LoadImage6_f20.jpg" alt="FIGURE: Full-screen photo on dive profile" /> @@ -2857,113 +2513,70 @@ deleted using the <em>Photos</em> tab (see text below).</p></div> </div> </div> <div class="sect3"> -<h4 id="_l_8217_onglet_em_photos_em">5.5.3. L’onglet <em>Photos</em></h4> -<div class="paragraph"><p>Photographs associated with a dive are shown as thumbnails in the <em>Photos</em> -tab of the <em>Notes</em> panel. Photos taken in rapid succession during a dive -(therefore sometimes with large overlap on the dive profile) can easily be -accessed in the <em>Photos</em> tab. This tab serves as a tool for individually -accessing the photos of a dive, while the stubs on the dive profile show -when during a dive a photo was taken. The size of the thumbnails in the -<em>Photos</em> tab can be changed using the <em>Zoom level</em> slider at the bottom of -the panel. Single-click a thumbnail in the <em>Photos</em> panel to select a -photo. Double-click a thumbnail to view the full-sized image, overlaying the -<em>Subsurface</em> window. Delete a photo from the <em>Photos</em> panel by selecting it -(single-click) and then by pressing the <em>Del</em> key on the keyboard. This -removes the photo BOTH from the <em>Photos</em> tab as well as the dive profile.</p></div> +<h4 id="_l_8217_onglet_em_media_em">5.5.3. L’onglet <em>Media</em></h4> +<div class="paragraph"><p>Media associated with a dive are shown as thumbnails in the <em>Media</em> tab of +the <strong>Notes Panel</strong>. Media taken in rapid succession during a dive (therefore +sometimes with large overlap on the dive profile) can easily be accessed in +the <em>Media</em> tab. This tab serves as a tool for individually accessing the +media of a dive, while the stubs on the dive profile show when during a dive +when a photo/video was taken. The size of the thumbnails in the <em>Media</em> tab +can be changed using the <em>Zoom level</em> slider at the bottom of the +panel. Single-click a thumbnail in the <em>Media</em> panel to select a +photo/video. Double-click a thumbnail to view the full-sized image or play +the video, overlaying the <em>Subsurface</em> window. Delete media from the <em>Media</em> +panel by selecting it (single-click) and then by pressing the <em>Del</em> key on +the keyboard. This removes it BOTH from the <em>Media</em> tab as well as the dive +profile.</p></div> </div> <div class="sect3"> -<h4 id="_photos_stockées_sur_un_disque_dur_externe">5.5.4. Photos stockées sur un disque dur externe</h4> -<div class="paragraph"><p>Most underwater photographers store photos on an external drive. If such a +<h4 id="_médias_stockés_sur_un_disque_dur_externe">5.5.4. Médias stockés sur un disque dur externe</h4> +<div class="paragraph"><p>Most underwater photographers store media on an external drive. If such a drive can be mapped by the operating system (almost always the case) the -photos can be directly accessed by <em>Subsurface</em>. This eases the interaction -between <em>Subsurface</em> and an external repository of photos. When associating -a dive profile with photos from an external drive, the normal procedure of +media can be directly accessed by <em>Subsurface</em>. This eases the interaction +between <em>Subsurface</em> and an external repository of media. When associating a +dive profile with media from an external drive, the normal procedure of selection and synchronization (see text above) is used. After the external -drive has been disconnected, <em>Subsurface</em> cannot access these photos any -more. If the display of photos is activated (using the toolbox icon to the -left of the <em>Dive Profile</em>), the program shows a small white dot where each -photo should be on the dive profile. In addition the <em>Photos</em> 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.</p></div> +drive has been disconnected, <em>Subsurface</em> cannot access these media any +more. If the display of media is activated (using the toolbox icon to the +left of the <em>Dive Profile</em>), the program shows only the thumbnails and the +images cannot be viewed at full-screen size. If the external drive with the +media is re-connected, the media can be seen in the normal way.</p></div> </div> <div class="sect3"> -<h4 id="_trouver_quelles_plongées_ont_des_photos_associées">5.5.5. Trouver quelles plongées ont des photos associées.</h4> +<h4 id="_trouver_quelles_plongées_ont_des_médias_associés">5.5.5. Trouver quelles plongées ont des médias associés.</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> +associated media can be time consuming. There is a rapid way of seeing which +dives have associated media and which not: activate the <em>Media</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 media have an icon +indicating whether the media 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. Déplacer des photos entre dossiers, disques durs ou ordinateurs</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, +<h4 id="S_FindMovedImages">5.5.6. Déplacer des médias entre dossiers, disques durs ou ordinateurs</h4> +<div class="paragraph"><p>After a photograph or video has been loaded into <em>Subsurface</em> and associated with a specific dive, +<em>Subsurface</em> saves the path to the directory where the media lie as well as the file name of the each photo/video, in order to find it when the dive is opened again. -If the photo or the whole photo collection is moved to another drive or to a different - machine, the path to the photo changes. Now, <em>Subsurface</em> looks for the photos at their original location before they were moved, - cannot find them and cannot display them. Because, after moving photos, large numbers of photos - may need to be deleted and re-imported from the new location, <em>Subsurface</em> has a mechanism to ease this inconvenience: automatic updates using fingerprints.</p></div> -<div class="paragraph"><p>When a photo is loaded into <em>Subsurface</em>, a fingerprint for the image is calculated and stored with the - other reference information for that photo. After moving a photo collection (that has already been loaded - into <em>Subsurface</em>) to a different directory, disk or computer, <em>Subsurface</em> can:</p></div> -<div class="ulist"><ul> -<li> -<p> -look through a particular directory (and all its subdirectories recursively) - where photos have been moved to, -</p> -</li> -<li> -<p> -calculate fingerprints for all photos in this directory, and -</p> -</li> -<li> -<p> -if there is a match between a calculated fingerprint and the one calculated - when a photo was originally loaded into <em>Subsurface</em> (even if the original - file name has changed), automatically update the directory information so - that <em>Subsurface</em> can find the photo in the new moved directory. -</p> -</li> -</ul></div> +If the media or the whole media collection is moved to another drive or to a different + machine, the path to the media changes. Now, <em>Subsurface</em> looks for the photos/videos at their original location before they were moved, +cannot find them and cannot display them. Because, after moving media, large numbers of files + may need to be deleted and re-imported from the new disk, <em>Subsurface</em> can locate the media based on their filename and path.</p></div> <div class="paragraph"><p>This is done by selecting from the Main Menu: <em>File → Find moved images</em>. This brings up a window within - which the NEW directory of the photos needs to be specified. Select the appropriate directory and click - the <em>Scan</em> button towards the bottom right of the panel. The process may require several minutes to - complete, after which <em>Subsurface</em> will show the appropriate photographs when a particular dive is opened.</p></div> -<div class="sidebarblock" id="Image_fingerprint_upgrade"> +which the searching of the images can be controlled. The search is started by clicking on <em>Select folder and scan</em>. +Since recorded during different dive trips might have the same filename, the names of the parent folders are likewise compared. +Therefore, the root folder of the NEW picture collection should be chosen. For finer control, it is possible to search +only for media of the currently selected dive(s) by selecting the appropriate option.</p></div> +<div class="paragraph"><p>After the searching has completed, the original filenames and the new +locations of the photographs will be shown. The matching parts of the paths +are emphasized. Media that are found at their known positions are not +listed. The proposed changes can be applied by clicking <em>Apply</em> or rejected +by clicking <em>Cancel</em>.</p></div> +<div class="imageblock" style="text-align:center;"> <div class="content"> -<div class="paragraph"><p><strong>Upgrading legacy photo collections without fingerprints</strong></p></div> -<div class="admonitionblock"> -<table><tr> -<td class="icon"> -<img src="images/icons/important.png" alt="Important" /> -</td> -<td class="content"><em>Subsurface</em> automatically calculates fingerprints for all images that it -can access. When manipulating images, ensure that all the images associated -with the dive log can be accessed by <em>Subsurface</em>.</td> -</tr></table> +<img src="images/FindMovedImages1.jpg" alt="FIGURE:Find moved images" /> +</div> </div> -<div class="paragraph"><p><em>Subsurface</em> automatically checks and, if necessary, updates the -fingerprints associated with a single dive if:</p></div> -<div class="ulist"><ul> -<li> -<p> -The images associated with that dive are visible as thumbnails on the <strong>Dive - Profile</strong>. -</p> -</li> -<li> -<p> -If you edit anything in the <strong>Notes</strong> panel and save the edits by selecting - <em>Apply changes</em>. -</p> -</li> -</ul></div> -</div></div> </div> </div> <div class="sect2"> @@ -3082,7 +2695,7 @@ three steps, exactly as with multi-cylinder dives above:</p></div> </ul></div> <div class="imageblock" style="text-align:center;"> <div class="content"> -<img src="images/sidemount1.jpg" alt="FIGURE: Profil Sidemount" /> +<img src="images/sidemount1.jpg" alt="FIGURE: Sidemount profile" /> </div> </div> </div> @@ -3194,18 +2807,18 @@ section, the pO<sub>2</sub> (green line) differs from the OC-pO<sub>2</sub> (or breathed. However, they use advanced technology to maintain a breathable oxygen concentration: a) remove carbon dioxide from the exhaled gas. -b) regulate the oxygen concentration to remain within safe diving limits. The - CCR interface of <em>Subsurface</em> is currently experimental and under active - development. Subsurface currently supports Poseidon MkVI and APD - Discovery/Evolution dive computers, as well as Shearwater dive computers - connected to CCR systems. In contrast to a conventional recreational dive - computer, a CCR system computer usually does not allow the download of a log - containing multiple dives. Rather, each dive is stored independently. This - means that <em>Subsurface</em> cannot download a dive log directly from a CCR dive - computer, but that it imports individual CCR dive profiles in the same way - it imports dive log data from other digital databases: one dive at a - time. However, the Shearwater based CCR systems are different in this - respect and allow multi-dive downloads.</td> +regulate the oxygen concentration to remain within safe diving limits. The +CCR interface of <em>Subsurface</em> is currently experimental and under active +development. Subsurface currently supports Poseidon MkVI and APD +Discovery/Evolution dive computers, as well as Shearwater dive computers +connected to CCR systems. In contrast to a conventional recreational dive +computer, a CCR system computer usually does not allow the download of a log +containing multiple dives. Rather, each dive is stored independently. This +means that <em>Subsurface</em> cannot download a dive log directly from a CCR dive +computer, but that it imports individual CCR dive profiles in the same way +it imports dive log data from other digital databases: one dive at a +time. However, the Shearwater based CCR systems are different in this +respect and allow multi-dive downloads.</td> </tr></table> </div> <div class="sect4"> @@ -3514,7 +3127,7 @@ plus petite et la plus grande profondeur atteinte pour ces plongées.</p></div> <h3 id="S_DiveProfile">6.5. Le <strong>Profil de plongée</strong></h3> <div class="imageblock" style="text-align:center;"> <div class="content"> -<img src="images/Profile2.jpg" alt="Profil de plongée typique" /> +<img src="images/Profile2.jpg" alt="Typical dive profile" /> </div> </div> <div class="paragraph"><p>Parmi toutes les panneaux de <em>Subsurface</em>, le profil de plongée contient les @@ -3597,7 +3210,7 @@ position de la boîte Information est enregistrée ré-utilisée pour les analyses de plongée suivantes.</p></div> <div class="imageblock" style="text-align:center;"> <div class="content"> -<img src="images/InfoBox2.jpg" alt="FIGURE: La boîte Information" /> +<img src="images/InfoBox2.jpg" alt="Figure: Information Box" /> </div> </div> <div class="paragraph"><p>When the mouse points inside the <strong>Dive Profile</strong> panel, the information box @@ -3624,8 +3237,8 @@ panel. These are:</p></div> <td class="content">Affiche la <strong>Profondeur maximale d’utilisation (MOD)</strong> d’une plongée, en fonction du mélange gazeux utilisé. La MOD dépend de la concentration en oxygène du gaz respiré. Pour l’air (21% d’oxygène), il vaut envuron 57m si -une pO<sub>2</sub> maximale de 1.4 est choisie dans la section <strong>Préférences</strong> -(sélectionnez <em>Fichier → Préférences → Profil</em> et éditez le champ <em>pO~2 +une pO<sub>2 maximale de 1.4 est choisie dans la section <strong>Préférences</strong> +(sélectionnez <em>Fichier → Préférences → Profil</em> et éditez le champ <em>pO</sub>2 dans le calcul de MOD</em>). En plongeant sous la MOD, il y a un risque important d’exposition aux dangers liés à la toxicité de l’oxygène.</td> </tr></table> @@ -3697,7 +3310,7 @@ drawing on the left below indicates the meaning of the different parts of the Gas Pressure Bar Graph.</p></div> <div class="imageblock" style="text-align:center;"> <div class="content"> -<img src="images/GasPressureBarGraph.jpg" alt="FIGURE: Le graphique de pression gazeuse" /> +<img src="images/GasPressureBarGraph.jpg" alt="FIGURE:Gas Pressure bar Graph" /> </div> </div> <div class="ulist"><ul> @@ -3910,10 +3523,12 @@ underneath the two red dots.</td> <td class="icon"> <img src="images/icons/ShowPhotos.png" alt="Note" /> </td> -<td class="content">Les photos qui ont été ajoutées à une plongée peuvent être affichées sur le -profil en sélectionnant le bouton <strong>Communer l’affichage des images</strong>. La -position d’une photo sur le profil indique le moment exact où la photo a été -prise. Si le bouton n’est pas actif, les photos sont masquées.</td> +<td class="content">Les photos et vidéos qui ont été ajoutées à une plongée peuvent être +affichées sur le profil en sélectionnant le bouton <strong>Afficher les médias</strong>. La +position d’une photo ou vidéo sur le profil indique le moment exact où elle +a été prise. La durée de la vidéo est représentée par une bar si +<em>Subsurface</em> a pu extraire cette information du fichier vidéo. Si le bouton +n’est pas actif, les photos sont masquées.</td> </tr></table> </div> <div class="paragraph"><p>The profile can also include the dive computer reported <strong>ceiling</strong> (more @@ -4181,7 +3796,7 @@ performed using the Dive List Context Menu. It is found by selecting either a single dive or a group of dives and then right-clicking.</p></div> <div class="imageblock" style="text-align:center;"> <div class="content"> -<img src="images/ContextMenu.jpg" alt="Figure: Menu contextuel" /> +<img src="images/ContextMenu.jpg" alt="Figure: Context Menu" /> </div> </div> <div class="paragraph"><p>Le menu contextuel est utilisé pour de nombreuses fonctions décrites @@ -4200,16 +3815,16 @@ bar of the <strong>Dive List</strong>, bringing up a list of columns that can be 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 +<div class="paragraph" id="S_Photos_divelist"><p>By selecting the <em>Media</em> checkbox in the dropdown list, an icon is shown +indicating whether any media 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">Cette plongée contient des photos prises durant la plongée, généralement -prises avec un appareil ou caméra submersible.</td> +<td class="content">Cette plongée contient des photos ou vidéos prises durant la plongée, +généralement prises avec un appareil ou caméra submersible.</td> </tr></table> </div> <div class="admonitionblock"> @@ -4217,10 +3832,10 @@ prises avec un appareil ou caméra submersible.</td> <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> +<td class="content">This dive has photographs or videos taken immediately before or immediately +after the dive. This is useful for finding photos/media 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"> @@ -4228,8 +3843,8 @@ after the dive, or of landscapes as seen from the boat.</td> <td class="icon"> <img src="images/icons/inAndOutPhoto.png" alt="Note" /> </td> -<td class="content">Cette plongée contient à la fois des photos prises pendant la plongée, et -juste avant ou juste après la plongée.</td> +<td class="content">Cette plongée contient à la fois des photos ou vidéos prises pendant la +plongée, et juste avant ou juste après la plongée.</td> </tr></table> </div> </div> @@ -4372,12 +3987,12 @@ the dive where the depth is less than a metre.</p></div> <div class="sect3"> <h4 id="_load_image_s_from_file_s">7.4.7. Load image(s) from file(s)</h4> <div class="paragraph"><p>This topic is discussed in the section: <a href="#S_LoadImage">Adding photographs -to dives</a>.</p></div> +or videos to dives</a>.</p></div> </div> <div class="sect3"> <h4 id="_load_image_from_web">7.4.8. Load image from web</h4> <div class="paragraph"><p>This topic is discussed in the section: <a href="#S_LoadImage">Adding photographs -to dives</a>.</p></div> +or videos to dives</a>.</p></div> </div> <div class="sect3"> <h4 id="_annuler_les_manipuations_sur_les_plongées">7.4.9. Annuler les manipuations sur les plongées</h4> @@ -4406,7 +4021,7 @@ it. The filter may also be reset and closed by selecting the <strong>red button< with the white cross.</p></div> <div class="imageblock" style="text-align:center;"> <div class="content"> -<img src="images/Filterpanel.jpg" alt="Figure: panneau des filtres" /> +<img src="images/Filterpanel.jpg" alt="Figure: Filter panel" /> </div> </div> <div class="paragraph"><p>Four filter criteria may be used to filter the dive list: dive tags, person @@ -4602,11 +4217,20 @@ Universal Dive Data Format (<em>UDDF</em>). Refer to <em>http://uddf.org</em> fo <li> <p> <em>Image depths</em>, which creates a text file that contains the file names of - all photos or images attached to any of the selected dives in the <em>Dive - List</em>, together with the depth underwater where of each of those photos was - taken. + all photos or videos attached to any of the selected dives in the <em>Dive + List</em>, together with the depth underwater where of each of those + photos/videos was taken. </p> </li> +</ul></div> +<div class="paragraph"><p>When the "Anonymize" option is selected for xml-based file formats, the +letters A-Z are all replaced by the letter <em>X</em> in the notes, buddy, +divemaster, divesite name and divesite description fields. This way, you can +share dive log files for debugging purposes without revealing personal +information. Please note, though, that other characters are not replaced, so +this is not useful for languages with non-latin characters and GPS +coordinates of dive sites are preserved as well.</p></div> +<div class="ulist"><ul> <li> <p> <em>General Settings</em>, under the HTML tab, provides the following options: @@ -4784,7 +4408,7 @@ members/friends. There are two approaches for doing this.</p></div> 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, + <strong>Profile Panel</strong> and media 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. @@ -4878,11 +4502,9 @@ Printing in color, done by checking the box with <em>Print in color</em>. If thi </li> </ul></div> </li> -<li> -<p> -Under <em>Template</em> select a template to be used as the page layout. There are - several choices. (see image <strong>B</strong>, above). -</p> +</ol></div> +<div class="paragraph"><p>Under <em>Template</em> select a template to be used as the page layout. There are +several choices. (see image <strong>B</strong>, above).</p></div> <div class="ulist"><ul> <li> <p> @@ -4890,8 +4512,6 @@ Under <em>Template</em> select a template to be used as the page layout. There a </p> </li> </ul></div> -</li> -</ol></div> <div class="imageblock" style="text-align:center;"> <div class="content"> <img src="images/Print_summarylist_f22.jpg" alt="FIGURE: Print summary table" /> @@ -4980,7 +4600,7 @@ ces ordinateurs de plongée peuvent être lues et modifiées. Pour commencer, assurez vous 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="#S_Appendix_A">ANNEXE A</a> pour plus d’informations sur la manière de procéder.</p></div> +<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>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) @@ -4989,7 +4609,7 @@ sélectionner le bon modèle d’ordinateur de plongée à partir du panneau gauche (voir l’image ci-dessous).</p></div> <div class="imageblock" style="text-align:center;"> <div class="content"> -<img src="images/Configure_dc_f20.jpg" alt="FIGURE: Configurer un ordinateur de plongée" /> +<img src="images/Configure_dc_f20.jpg" alt="FIGURE: Configure dive computer" /> </div> </div> <div class="paragraph"><p>En utilisant les boutons appropriés du panneau de configuration, les actions @@ -5046,7 +4666,7 @@ and are not saved. In order to apply new settings permanently, select the <div class="paragraph"><p>There are several headings in the <strong>General</strong> panel:</p></div> <div class="imageblock" style="text-align:center;"> <div class="content"> -<img src="images/Pref1_f23.jpg" alt="FIGURE: Preferences general page" /> +<img src="images/Pref1.jpg" alt="FIGURE: Preferences general page" /> </div> </div> <div class="ulist"><ul> @@ -5109,6 +4729,15 @@ and are not saved. In order to apply new settings permanently, select the </li> <li> <p> +<strong>Video thumbnails</strong>: In generating thumbnails for videos associated with dives, <em>Subsurface</em> + needs to have the appropriate information (see section on <a href="#S_ViewMedia">View Images</a>). Three preferences need to be set + as explained in <a href="#S_APPENDIX_F">APPENDIX F</a>. These are: a) switch on thumbnails, b) specify + the location of the <em>ffmpeg</em> program and c) set the place within video where the thumbnail needs + to be obtained from. +</p> +</li> +<li> +<p> <strong>Clear all settings</strong>: As indicated in the button below this heading, all settings are cleared and set to default values. </p> @@ -5141,31 +4770,19 @@ as decimal degrees Choose the appropriate option.</p></div> <img src="images/Pref4_f23.jpg" alt="FIGURE: Preferences Graph page" /> </div> </div> -<div class="ulist" id="S_GradientFactors"><ul> -<li> -<p> -<strong>Gas pressure display setup</strong>. Even though nitrogen and helium pressures are also included here, these items mainly pertain to oxygen management: -</p> +<div class="paragraph" id="S_GradientFactors"><p><strong>Gas pressure display setup</strong>. Even though nitrogen and helium pressures are also included here, these items mainly pertain to oxygen management: +<strong> <em>Thresholds</em>: <em>Subsurface</em> can display graphs of the nitrogen, oxygen and the helium + partial pressures during + the dive, activated using the toolbar on the left of the <strong>Dive Profile</strong> + panel. For each of these graphs, specify a threshold value. If any of the graphs go + above the specified threshold, the graph is + highlighted in red, indicating the particular partial pressure threshold has been exceeded. + The pO<sub>2</sub> threshold is probably the most important one and a value of 1.6 is commonly used. +</strong> <em>pO<sub>2</sub> in calculating MOD</em> is used for calculating the maximum operative depth for a particular + nitrox or trimix gas mixture. A value of 1.4 is commonly used.</p></div> <div class="ulist"><ul> <li> <p> -<em>Thresholds</em>: <em>Subsurface</em> can display graphs of the nitrogen, oxygen and the helium -partial pressures during -the dive, activated using the toolbar on the left of the <strong>Dive Profile</strong> -panel. For each of these graphs, specify a threshold value. If any of the graphs go -above the specified threshold, the graph is -highlighted in red, indicating the particular partial pressure threshold has been exceeded. -The pO<sub>2</sub> threshold is probably the most important one and a value of 1.6 is commonly used. -</p> -</li> -<li> -<p> -<em>pO<sub>2</sub> in calculating MOD</em> is used for calculating the maximum operative depth for a particular - nitrox or trimix gas mixture. A value of 1.4 is commonly used. -</p> -</li> -<li> -<p> CCR Options: These options determine oxygen management for CCR dives: </p> <div class="ulist"><ul> @@ -5218,17 +4835,17 @@ CCR Options: These options determine oxygen management for CCR dives: pO<sub>2</sub> of the fresh gas from the cylinder. Activating this checkbox allows the pO<sub>2</sub> graph in the dive profile to also show the pO<sub>2</sub> of the fresh gas entering the loop. </p> -</li> -</ul></div> -</li> -</ul></div> -</li> +<div class="ulist"><ul> <li> <p> <strong>Ceiling display setup</strong>. These settings mostly deal with nitrogen and helium management by determining how the decompression ceiling (ascent ceiling) is calculated and displayed: </p> -<div class="ulist"><ul> +</li> +</ul></div> +</li> +</ul></div> +</li> <li> <p> <em>Draw dive computer reported ceiling red</em>: This checkbox does exactly what it says. By default @@ -5274,6 +4891,11 @@ Bühlmann: Set the <em>gradient factors</em> (GFLow and GFHigh) for calculcating <p> <a href="http://www.rebreatherworld.com/general-and-new-to-rebreather-articles/5037-gradient-factors-for-dummies.html">Gradient factors for dummies, by Kevin Watts</a> </p> +<div class="ulist" id="GradientFactors_Ref"><ul> +<li> +<p> +<strong>Misc</strong> +</p> </li> </ul></div> </li> @@ -5281,11 +4903,6 @@ Bühlmann: Set the <em>gradient factors</em> (GFLow and GFHigh) for calculcating </li> <li> <p> -<strong>Misc</strong> -</p> -<div class="ulist" id="GradientFactors_Ref"><ul> -<li> -<p> <em>Show unused cylinders in Equipment Tab</em>: This checkbox allows display of information about unused cylinders when viewing the <strong>Equipment Tab</strong>. If this box is not checked, and if any cylinders entered using the <strong>Equipment Tab</strong> are not used (e.g. there was no gas switch to such a cylinder), then these cylinders are omitted from that list. @@ -5299,8 +4916,6 @@ was no gas switch to such a cylinder), then these cylinders are omitted from tha </p> </li> </ul></div> -</li> -</ul></div> </div> <div class="sect2"> <h3 id="_langue">13.4. Langue</h3> @@ -5324,9 +4939,8 @@ l’affiche des détails de plongée.</p></div> <h3 id="_réseau">13.5. Réseau</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, the -<a href="#S_Companion"><em>Subsurface Companion app</em></a> or when you want to communicate -through a proxy.</p></div> +to communicate with web services such as Cloud storage, or when you want to +communicate through a proxy.</p></div> <div class="imageblock" style="text-align:center;"> <div class="content"> <img src="images/Pref5_f23.jpg" alt="FIGURE: Preferences Network page" /> @@ -5367,13 +4981,6 @@ from your ISP. </li> </ul></div> </li> -<li> -<p> -<em>Subsurface web service</em>: When you subscribe to the <a href="#S_Companion">Subsurface web service</a>, a very - long and hard-to-remember userID is issued. This is the place to save that userID. By - checking the option <em>Save User ID locally?</em>, you ensure a local copy of that userID is saved. -</p> -</li> </ul></div> </div> <div class="sect2"> @@ -5381,14 +4988,14 @@ from your ISP. <div class="paragraph"><p><em>Subsurface</em> provides a geo-lookup service (that is, given the coordinates of a dive site) derived from a click on the <strong>Dive Map panel</strong> at the bottom right of the <em>Subsurface</em> window, or from a GPS instrument or from the -<em>Subsurface</em> Companion app). A search on the Internet is done to find the -name of the closest known location. This function only works if <em>Subsurface</em> -has an Internet connection. The preference of the dive site name can be +<em>Subsurface-Mobile</em> app). A search on the Internet is done to find the name +of the closest known location. This function only works if <em>Subsurface</em> has +an Internet connection. The preference of the dive site name can be configured, e.g. <em>Country/State/City</em> or <em>City/State/Country</em> (see image below).</p></div> <div class="imageblock" style="text-align:center;"> <div class="content"> -<img src="images/Pref7_f23.jpg" alt="FIGURE: panneau de géoréférencement" /> +<img src="images/Pref7_f23.jpg" alt="FIGURE: Georeference panel" /> </div> </div> </div> @@ -5614,15 +5221,11 @@ dive plan, preventing recreational divers from getting close to the limits of getting a DCS hit. This is performed by specifying appropriate gradient factors for a dive plan, as explained below.</p></div> <div class="paragraph"><p>To plan a dive, the appropriate settings need to be defined.</p></div> +<div class="paragraph"><p>Ensure the date and time is set to that of the intended dive. This allows +calculation of the nitrogen load incurred during previous dives.</p></div> <div class="ulist"><ul> <li> <p> -Ensure the date and time is set to that of the intended dive. This allows - calculation of the nitrogen load incurred during previous dives. -</p> -</li> -<li> -<p> Immediately under the heading <em>Planning</em> are two checkboxes <em>Recreational</em> and <em>Safety Stop</em>. Check these two boxes. </p> @@ -5699,7 +5302,7 @@ there remains a significant amount of air in the cylinder at the end of the dive.</p></div> <div class="imageblock" style="text-align:center;"> <div class="content"> -<img src="images/Planner_OC_rec1.jpg" alt="FIGURE: une planification de plongée loisir : configuration" /> +<img src="images/Planner_OC_rec1.jpg" alt="FIGURE: A recreational dive plan: setup" /> </div> </div> <div class="paragraph"><p>The dive profile in the planner shows the maximum dive time within no-deco @@ -5884,7 +5487,7 @@ utilisant du Tx20/30 et l’algorithme Bühlmann, suivie d’une remont utilisant du EAN50 et utilisant les réglages décrits ci-dessous.</p></div> <div class="imageblock" style="text-align:center;"> <div class="content"> -<img src="images/Planner_OC_deco.jpg" alt="FIGURE: Planifier des plongées : configuration" /> +<img src="images/Planner_OC_deco.jpg" alt="FIGURE: Planning a dive: setup" /> </div> </div> <div class="paragraph"><p>Once the above steps have been completed, save by clicking the <em>Save</em> button @@ -6043,7 +5646,7 @@ to that of the CCR dive below, but note the longer ascent duration due to the lo in the loop due to the oxygen drop across the mouthpiece of the pSCR equipment.</p></div> <div class="imageblock" style="text-align:center;"> <div class="content"> -<img src="images/Planner_pSCR.jpg" alt="FIGURE: Planifier des plongées pSCR : configuration" /> +<img src="images/Planner_pSCR.jpg" alt="FIGURE: Planning a pSCR dive: setup" /> </div> </div> <div class="sect3"> @@ -6085,7 +5688,7 @@ gas required can be obtained at the bottom of the <strong>Dive plan details</str </div> <div class="imageblock" style="text-align:center;"> <div class="content"> -<img src="images/pscr_b2.jpg" alt="FIGURE: Planifier des plongées pSCR : configuration" /> +<img src="images/pscr_b2.jpg" alt="FIGURE: Planning a pSCR dive: setup" /> </div> </div> <div class="paragraph"><p>In the case of a pSCR dive plan for open water, the worst-case scenario is @@ -6116,7 +5719,7 @@ this is calculated for bail out ascents.</p></div> <div class="paragraph"><p>The dive profile for a CCR dive may look something like the image below.</p></div> <div class="imageblock" style="text-align:center;"> <div class="content"> -<img src="images/Planner_CCR.jpg" alt="FIGURE: Planifier des plongées CCR : configuration" /> +<img src="images/Planner_CCR.jpg" alt="FIGURE: Planning a CCR dive: setup" /> </div> </div> <div class="paragraph"><p>Note that, in the <em>Dive plan details</em>, the gas consumption for a CCR segment @@ -6358,8 +5961,8 @@ des sections de ce manuel traitant des opérations relatives.</p></div> </li> <li> <p> -<em>Take cloud storage online</em> - - <strong><strong></strong></strong><strong><strong></strong></strong><strong><strong></strong></strong><strong><strong></strong></strong><strong><strong></strong></strong><strong><strong></strong></strong><strong><strong></strong></strong><strong><strong></strong></strong><strong><strong></strong></strong> +<em>Cloud storage online</em> - Switch between the online version of the logbook, + and the locally stored one. </p> </li> <li> @@ -6387,8 +5990,8 @@ des sections de ce manuel traitant des opérations relatives.</p></div> </li> <li> <p> -<a href="#S_FindMovedImages"><em>Find moved images</em></a> - If photos taken during dives - have been moved to +<a href="#S_FindMovedImages"><em>Find moved media</em></a> - If photos/videos taken during + dives have been moved to a different disk or directory, locate them and link them to the appropriate dives. </p> @@ -6434,13 +6037,6 @@ The Edit option allows one to undo or redo an action, e.g. deleting dives. </li> <li> <p> -<a href="#S_Companion"><em>Importer les données GPS depis le service web Subsurface</em></a> - - Charge les coordonnées GPS à partir de l’application mobile <em>Subsurface</em> - (téléphones et tablettes). -</p> -</li> -<li> -<p> <a href="#S_ImportingDivelogsDe"><em>Importer depuis Divelogs.de</em></a> - Importer des informations de plongées à partir de <em>www.Divelogs.de</em>. </p> @@ -6458,12 +6054,6 @@ The Edit option allows one to undo or redo an action, e.g. deleting dives. </li> <li> <p> -<em>Edit dive</em> - Edit a dive where the profile was entered by hand and not from - a dive computer. -</p> -</li> -<li> -<p> <a href="#S_DivePlanner"><em>Planifier une plongée</em></a> - Planifier des plongées. </p> </li> @@ -6618,7 +6208,7 @@ The Edit option allows one to undo or redo an action, e.g. deleting dives. <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="S_Appendix_A">17.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"> @@ -7243,13 +6833,10 @@ Within <em>Subsurface</em>, select <em>Import → Import log files</em> to o <p> In the dropdown list towards the bottom right of the dialogue (labeled <em>Filter:</em>), select "APD log viewer". -</p> -</li> -<li> -<p> -On the list of file names select the <em>.apd</em> file created. An import dialogue - opens showing the default settings for the data in the <em>.apd</em> file. If - changes are required, do this as for <a href="#S_ImportingCSVDives">CSV imports</a>. +On the list of file names select the <em>.apd</em> file created. An import +dialogue opens showing the default settings for the data in the +<em>.apd</em> file. If changes are required, + do this as for <a href="#S_ImportingCSVDives">CSV imports</a>. </p> </li> </ul></div> @@ -8134,10 +7721,67 @@ page size.</td> </div> </div> <div class="sect1"> -<h2 id="_annexe_f_faqs">22. ANNEXE F: FAQs.</h2> +<h2 id="S_APPENDIX_F">22. APPENDIX F: Setting up video thumbnails.</h2> +<div class="sectionbody"> +<div class="sect2"> +<h3 id="_setting_up_the_appropriate_thumbnails_for_videos_that_are_associated_with_dives">22.1. Setting up the appropriate thumbnails for videos that are associated with dives.</h3> +<div class="paragraph"><p>In handling video associated with dives, <em>Subsurface</em> needs to create a +thumbnail for each video that can be shown either on the dive profile or in +the <em>Media</em> tab. By default this is a nonspecific placeholder thumbnail. To +see thumbnails that represent individual videos, <em>Subsurface</em> uses an +external program calle <em>FFmpeg</em>. To create thumbnails for videos, do two +things:</p></div> +<div class="paragraph"><p>Install <em>FFmpeg</em> on the computer that runs <em>Subsurface</em>. The program can be +downloaded from the FFmpeg web site: +<a href="https://www.ffmpeg.org/download.html">https://www.ffmpeg.org/download.html</a>. Most Linux distributions ship with an +<em>ffmpeg</em> package and therefore do not need an additional download.</p></div> +<div class="ulist"><ul> +<li> +<p> +On Windows, put the <em>ffmpeg.exe</em> file in the directory containing the <em>Subsurface</em> executable. +On Mac and Linux, make sure the <em>ffmpeg</em> command is in the path. This should be the case for +<em>FFmpeg</em> installed from official packages. +</p> +<div class="olist arabic"><ol class="arabic"> +<li> +<p> +In the <em>General</em> tab of the <a href="#S_Preferences"><em>Preferences</em></a>, set the + preferences for generating video thumbnails. This is achieved by: +</p> +</li> +</ol></div> +</li> +<li> +<p> +Checking the <em>Extract video thumbnails</em> box. If <em>Subsurface</em> fails to load the <em>FFmpeg</em> executable, +this option will be turned off. Re-enable it after successfully installing <em>FFmpeg</em>. +</p> +</li> +<li> +<p> +Specifying the path to the <em>FFmpeg</em> executable. +</p> +</li> +<li> +<p> +Choose the position in the video where <em>Subsurface</em> +should try to extract the thumbnail. The left-most and right-most positions of the <em>Extract at position</em> +slider signify the beginning and the end of the video, respectively. Note that if <em>Subsurface</em> cannot +determine the length of the video (this can be the case for AVI files), the first frame +of the video will be used. +</p> +</li> +</ul></div> +<div class="paragraph"><p>This should complete the setup of video thumbnails and they should now +appear on the dive profile and in the <em>Media</em> tab.</p></div> +</div> +</div> +</div> +<div class="sect1"> +<h2 id="_appendix_g_faqs">23. APPENDIX G: FAQs.</h2> <div class="sectionbody"> <div class="sect2"> -<h3 id="S_APPENDIX_F">22.1. Subsurface appears to miscalculate gas consumption and SAC</h3> +<h3 id="S_APPENDIX_G">23.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> @@ -8172,7 +7816,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">22.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">23.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> @@ -8187,7 +7831,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">22.3. Some dive profiles are missing from the download</h3> +<h3 id="_some_dive_profiles_are_missing_from_the_download">23.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 @@ -8210,7 +7854,7 @@ salvaged after being overwritten by new dives.</p></div> <div id="footer"> <div id="footer-text"> Last updated - 2018-09-15 10:07:35 PDT + 2018-11-05 09:24:27 CET </div> </div> </body> diff --git a/Documentation/user-manual_fr.txt b/Documentation/user-manual_fr.txt index b3878b400..3a8db3e2a 100644 --- a/Documentation/user-manual_fr.txt +++ b/Documentation/user-manual_fr.txt @@ -11,7 +11,7 @@ image::images/Subsurface4Banner.jpg["Banner", align="center"] Linus Torvalds, Miika Turkia, Amit Chaudhuri, Jan Schubert, Salvador Cuñat, Pedro Neves, Stefan Fuchs -[blue]#_Version 4.7, Mai 2018_# +[blue]#_Version 4.8, Septembre 2018_# Bienvenue en tant qu'utilisateur de _Subsurface_, un programme avancé d'enregistrement de plongées (carnet de plongées) avec une bonne @@ -76,27 +76,27 @@ Lorsqu'il est ouvert depuis _Subsurface_, ce manuel ne dispose pas de contrôles externes pour la pagination ou la sélection des pages précédentes. Cependant, deux options sont disponibles: -- La fonction _RECHERCHE_ est activée avec le raccourci clavier Contrôle-F ou - Commande-F. Une boîte de texte apparaît en bas à droite de la fenêtre (voir - image ci-dessous). Par exemple, entrer le mot "_weights_" dans la boîte de - texte de recherche lancera la recherche dans tout le manuel utilisateur. À - droite de la boîte de recherche se trouvent deux flèches, l'une vers le haut - l'autre vers le bas. Elles mènent respectivement vers l'occurence précédente - et suivante du terme recherché. +La fonction _RECHERCHE_ est activée avec le raccourci clavier Contrôle-F ou +Commande-F. Une boîte de texte apparaît en bas à droite de la fenêtre (voir +image ci-dessous). Par exemple, entrer le mot "_weights_" dans la boîte de +texte de recherche lancera la recherche dans tout le manuel utilisateur. À +droite de la boîte de recherche se trouvent deux flèches, l'une vers le haut +l'autre vers le bas. Elles mènent respectivement vers l'occurence précédente +et suivante du terme recherché. image::images/UserManualSearch.jpg["User manual functions", align="center"] -- _LIEN PRÉCÉDENT/SUIVANT_. Naviguez entre les liens (les mots soulignés qui - vous conduisent vers des sections précises du manuel utilisateur) en - cliquant-droit sur le texte du manuel. Cela fera apparaître un menu - contextuel vers les liens PRÉCÉDENTS sélectionnés (voir image - ci-dessous). Par exemple, si un lien a été sélectionné, l'option _Retour - lien précédent_ affiche le texte au lien précédent sélectionné (comme le - fait le bouton Page Précédente d'un navigateur). Inversement, l'option - _Aller au lien suivant_ navigue vers le texte vu avant l'utilisation de - l'option _Retour lien précédent_. L'option _Recharger_ recharge le manuel - utilisateur complet dans la fenêtre. +_LIEN PRÉCÉDENT/SUIVANT_. Naviguez entre les liens (les mots soulignés qui +vous conduisent vers des sections précises du manuel utilisateur) en +cliquant-droit sur le texte du manuel. Cela fera apparaître un menu +contextuel vers les liens PRÉCÉDENTS sélectionnés (voir image +ci-dessous). Par exemple, si un lien a été sélectionné, l'option _Retour +lien précédent_ affiche le texte au lien précédent sélectionné (comme le +fait le bouton Page Précédente d'un navigateur). Inversement, l'option +_Aller au lien suivant_ navigue vers le texte vu avant l'utilisation de +l'option _Retour lien précédent_. L'option _Recharger_ recharge le manuel +utilisateur complet dans la fenêtre. image::images/UserManualLinksBack.jpg["User manual functions", align="center"] @@ -128,26 +128,26 @@ principal* (Fichier Édition Importer Journal Vue Partager Aide) en haut de la fenêtre (pour Windows et Linux) ou en haut de l'écran (pour Mac et Ubuntu Unity). Les quatre panneaux sont : -1. La *liste des plongées* en bas à gauche, affichant toutes les plongées du - journal (carnet) de plongées de l'utilisateur. Une plongée peut être - sélectionnée et mise en surbrillance dans la liste en cliquant dessus. Dans - la plupart des cas, les touches haut/bas peuvent être utilisées pour passer - d'une plongée à l'autre. La *liste des plongées* est un outil important pour - manipuler un journal (carnet) de plongée. +La *liste des plongées* en bas à gauche, affichant toutes les plongées du +journal (carnet) de plongées de l'utilisateur. Une plongée peut être +sélectionnée et mise en surbrillance dans la liste en cliquant dessus. Dans +la plupart des cas, les touches haut/bas peuvent être utilisées pour passer +d'une plongée à l'autre. La *liste des plongées* est un outil important pour +manipuler un journal (carnet) de plongée. -2. La *carte de plongée* en bas à droite, affiche les sites de plongées de - l'utilisateur, sur une carte mondiale et centrée sur le site de la dernière - plongée sélectionnée dans la *liste des plongées*. L'échelle de la carte - peut être augmentée ou réduite. +La *carte de plongée* en bas à droite, affiche les sites de plongées de +l'utilisateur, sur une carte mondiale et centrée sur le site de la dernière +plongée sélectionnée dans la *liste des plongées*. L'échelle de la carte +peut être augmentée ou réduite. -3. Les *informations* en haut à gauche, fournissent des informations détaillées - sur la plongée sélectionnée dans la *liste des plongées*, dont des - statistiques pour la plongée sélectionnée ou pour toutes les plongées mises - en surbrillance. +Les *informations* en haut à gauche, fournissent des informations détaillées +sur la plongée sélectionnée dans la *liste des plongées*, dont des +statistiques pour la plongée sélectionnée ou pour toutes les plongées mises +en surbrillance. -4. Le *profil de plongée* en haut à droite, affiche un profil de plongée - graphique de la plongée sélectionnée dans la *liste des plongées*. Vous - pouvez zoomer sur le profil de plongée pour une vue plus détaillée. +Le *profil de plongée* en haut à droite, affiche un profil de plongée +graphique de la plongée sélectionnée dans la *liste des plongées*. Vous +pouvez zoomer sur le profil de plongée pour une vue plus détaillée. Les séparateurs entre ces panneaux peuvent être déplacés pour modifier la taille de chaque panneau. _Subsurface_ mémorise la position de ces @@ -166,11 +166,11 @@ plongées sélectionnées). [[S_ViewPanels]] -image::images/main_window_f22.jpg["La fenêtre principale", align="center"] +image::images/main_window_f22.jpg["The Main Window", align="center"] -L'utilisateur décide quels panneaux sont affichés, parmi les 4, en -sélectionnant l'option *Vue* dans le menu principal. Cette fonctionnalité -permet plusieurs choix d'affichage : +Décider quels panneaux sont affichés, parmi les 4, en sélectionnant l'option +*Vue* dans le menu principal. Cette fonctionnalité permet plusieurs choix +d'affichage : *Tout* : affiche les quatre panneaux tels que sur la capture d'écran ci-dessus. @@ -227,9 +227,9 @@ données de plongée au carnet. Exporter un tableur vers le format CSV] et à xref:S_ImportingCSVDives[Importer des plongées au format CSV]. -2) Si une plongée est enregistrée par un ordinateur de plongée, le profil de - profondeur et de nombreuses informations supplémentaires peuvent être - obtenues. Ces plongées peuvent être importées à partir de : +Si une plongée est enregistrée par un ordinateur de plongée, le profil de +profondeur et de nombreuses informations supplémentaires peuvent être +obtenues. Ces plongées peuvent être importées à partir de : - L'ordinateur de plongée lui-même. Voir : xref:S_ImportDiveComputer[Importer de nouvelles informations de plongée à partir de l'ordinateur de plongée]; @@ -365,7 +365,8 @@ cette communication, les utilisateurs doivent trouver l'information appropriée pour renseigner à _Subsurface_ d'où et comment importer les informations de plongée. -xref:S_Appendix_A[Annexe A] donne les informations techniques pour aider l'utilisateur à configurer +xref:_appendix_a_operating_system_specific_information_for_importing_dive_information_from_a_dive_computer[Annexe +A] donne les informations techniques pour aider l'utilisateur à configurer ceci pour les différents systèmes d'exploitation et xref:_appendix_b_dive_computer_specific_information_for_importing_dive_information[Annexe B] contient des informations spécifiques à chaque ordinateur de plongée. @@ -405,12 +406,22 @@ plongée (en tout cas pour ceux qui ne se rechargent pas via USB). - Le menu déroulant *Périphérique ou point de montage* le nom du port USB ou Bluetooth dont _Subsurface_ a besoin pour communiquer avec l'ordinateur de plongée. Le port approprié doit être sélectionné. Consultez - xref:S_Appendix_A[Annexe A] et + xref:_appendix_a_operating_system_specific_information_for_importing_dive_information_from_a_dive_computer[Annexe + A] et xref:_appendix_b_dive_computer_specific_information_for_importing_dive_information[Annexe B] pour obtenir des détails techniques sur la façon de trouver des informations sur le port approprié à chaque ordinateur de plongée et, dans certains cas, sur les réglages requis pour le système d'exploitation de - l'ordinateur sur lequel _Subsurface_ fonctionne. + l'ordinateur sur lequel _Subsurface_ fonctionne. Certains ordinateurs de + plongée désactivent ce menu déroulant puisqu'ils utilisent d'autres moyens + pour trouver et se connecter au périphérique. Pour certains, les données + entrées ici sont en fait le point de montage USB tel que s'identifie + l'ordinateur de plongée lui-même. + + - Below the three drop downs are up to four shortcut buttons that allow you to + easily switch between multiple dive computers that you are frequently + downloading from. These buttons only appear once you have downloaded from + different dive computers. - Si toutes les plongées de l'ordinateur de plongée doivent être téléchargées, cochez la case _Forcer le téléchargement de toutes les @@ -482,11 +493,14 @@ Vérifiez les éléments suivants: sont-ils propres ? - Consultez - xref:S_Appendix_A[Annexe A] pour être certain que le point de montage correct a été spécifié (voir + xref:_appendix_a_operating_system_specific_information_for_importing_dive_information_from_a_dive_computer[Annexe + A] pour être certain que le point de montage correct a été spécifié (voir ci-dessus). - Sur les systèmes d'exploitation de type Unix, l'utilisateur a-t-il les - droits d'écriture sur le port USB? Si non, consultez xref:S_Appendix_A[Annexe A] + droits d'écriture sur le port USB? Si non, consultez + xref:_appendix_a_operating_system_specific_information_for_importing_dive_information_from_a_dive_computer[Annexe + A] Si l'ordinateur utilisant _Subsurface_ ne reconnaît pas l'adaptateur USB en ne montrant pas le bon nom de périphérique à côté du Point de montage, il @@ -664,6 +678,15 @@ Bluetooth"_. [icon="images/icons/important.png"] [IMPORTANT] +The Subsurface support for BLTE dive computers on Windows is *EXPERIMENTAL* +and only supported on Windows 10. Please make sure that you have the latest +version of Windows 10. +link:https://en.wikipedia.org/wiki/Windows_10_version_history#Version_1803_(April_2018_Update)[Version +1803] is a minimum requirement. Also make sure that you have installed the +latest drivers for your motherboard and/or BTLE dongle. + +[icon="images/icons/important.png"] +[IMPORTANT] *EN CAS DE PROBLÈMES*: si l'adaptateur Bluetooth de l'ordinateur utilisant _Subsurface_ se bloque et que le processus de _téléchargement_ échoue de façon répétée, @@ -837,10 +860,9 @@ Once the dive location data have been saved, the dive on the Dive List has a globe icon immediately to the left of the location name of a particular dive. -*(3):* Obtenir les coordonnées en utilisant soit l'application Subsurface-Mobile, soit l'application _Subsurface_ Companion avec un -périphérique Android ou un iPhone avec GPS si les coordonnées du site de plongée ont été stockées +*(3):* Obtenir les coordonnées en utilisant l'application _Subsurface-Mobile_ avec un +périphérique Android ou un iPhone avec GPS et si les coordonnées du site de plongée ont été stockées en utilisant une de ces applications. -xref:S_Companion[Cliquez ici pour plus d'information] [icon="images/icons/warning2.png"] [WARNING] @@ -1191,9 +1213,13 @@ 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_. +generated by SmartTrak to Subsurface's _.xml_ format. It can be downloaded +from https://subsurface-divelog.org/downloads[the usual _Subsurface_ +repository], as a Windows installer or a Linux AppImage. The application is +not currently supported on Mac. + +It can also be built for Linux systems. Two dependencies need to be met in +your system before building: _glib2.0_ and _mdbtools_ (see below). In addition, a web service is available for divelog convertions from SmartTrak to _Subsurface_ (see below). @@ -1207,15 +1233,19 @@ l'aide à l'importation des lofs _SmartTrak_. Assuming the above dependencies have been installed and the _Subsurface_ source tree is in the directory _~/src/subsurface_, then: -- 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_. +- Move to the source tree directory out of _Subsurface_ (e.g. ~/src) +- Run " $ ./subsurface/scripts/smtk2ssrf-build.sh ", if every thing has gone + fine, you will now have an executable named smtk2ssrf in + ~/src/subsurface/smtk-import/build +- You can run it from this directory, copy it to another one, e.g. _~/bin_ or + simply run "sudo make install", and the binary will be installed in + /usr/local/bin (which is commonly included in every $PATH). +- The script has some options mostly useful for development pourposes. If you + think you may need them, please read comments on script header itself. +- *WARNING*: While building smtk2ssrf, a light version of _Subsurface_ is + built (usable but lacking a lot of features). So, if you commonly use the + built executable placed at ~/subsurface/build/, you will need to rebuild it as + explained in this manual above. ===== Utilisation @@ -1283,7 +1313,7 @@ the success status is shown (see image *B*, below). The _Apply_ button should then be selected, after which the imported dives appear in the _Subsurface_ *Dive List* panel. -image::images/Divelogs1.jpg["FIGURE: Télécharger depuis Divelogs.de", align="center"] +image::images/Divelogs1.jpg["FIGURE:Download from Divelogs.de", align="center"] [[S_ImportingCSVData]] ==== Importer des données au format CSV @@ -1478,33 +1508,22 @@ smaller file to make sure everything works. Un smartphone avec GPS peut être utilisé pour stocker les lieux de plongées. Ceci est réalisé comme suit: -1) Taking the mobile device along on the dive boat / liveabord while - automatically collecting dive site coordinate information. - -2) Uploading the coordinates from the mobile device to the _Subsurface_ - Internet server. - -3) Syncronising the dives in the _Subsurface_ dive list with the coordinates - stored on the _Subsurface_ Internet server. - -_Subsurface_ comporte deux outils pour réaliser cela : +Taking the mobile device along on the dive boat / liveabord while +automatically collecting dive site coordinate information. -- L'application _Subsurface Companion_ (Android et iOS). +2) Adding collected coordinate information to the dives using the + _Subsurface-mobile_ app. -- L'application _Subsurface-mobile_ (Android et iOS) +3) Syncronising the logbook with the _Subsurface_ cloud using the + _Subsurface-mobile_ app. -Both of these applications perform the collection of dive site coordinates -and the synchronisation with dives in the _Subsurface_ dive list. However, -the Companion App is not being further developed and has largely been -replaced by the _Subsurface-mobile_ app. While the _Companion app_ serves -exclusively to collect dive site coordinates and to make these available to -the _Subsurface_ desktop version, _Subsurface-mobile_ performs many of the -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. - -Pour plus d'information sur l'utilisation de l'application _Subsurface -Companion_, cliquez xref:S_Companion[_ici_]. +Existing users might still be using the legacy _Companion app_. However, the +Companion App hasn't been under development in several years and has now +been removed from both Android and iOS app stores. The functionality is +fully integrated into _Subsurface-mobile_. Please note that the old GPS fix +internet service will be shut down by the end 2018 at which point the +_Companion app_ will no longer be usable. Please switch to +_Subsurface-mobile_ instead. ==== Storing and and using GPS locations using _Subsurface-mobile_ @@ -1567,16 +1586,6 @@ image::images/MobileGpsMenu.jpg["FIGURE: Subsurface-mobile GPS menu", align="cen Select the menu option _Disable location service_ at the bottom of the _Subsurface-mobile_ GPS menu. -===== Upload the GPS locations onto the _Subsurface_ Internet server. - -*N.B.:* Uploading the GPS locations to the Internet can only take place if the mobile -device has reliable access to the Internet, either via a cellular network or -via a wifi connection. If the Internet is not accessible from the dive site(s), -then GPS uploading can only take place after the dive or after the dive trip, -when an Internet connection has been re-established. - -From the _Subsurface-mobile_ main menu, select _GPS_ -> _Upload GPS -data_. The locations are uploaded. ===== Apply the stored GPS locations to dives on the _Subsurface_ dive list. @@ -1595,318 +1604,42 @@ detailed instructions for performing the collection of GPS data and for managing, uploading and synchronising this information. -[[S_Companion]] -==== Importing GPS coordinates with the _Subsurface Companion App_ for mobile phones - -Using the *Subsurface Companion App* on an _Android device_ or -xref:S_iphone[_iPhone_] with GPS, the coordinates -for the diving -location can be automatically passed to the _Subsurface_ dive log. The Companion App -stores dive locations on a dedicated Internet server. _Subsurface_ can collect -the locations from the server. -To do this: - -===== Create a Companion App account - -- Register on the http://api.hohndel.org/login/[_Subsurface companion web - page_]. A confirmation email with instructions and a personal *DIVERID* - will be sent, a long number enabling access to the file server and Companion - App capabilities. - -- Download the app from - https://play.google.com/store/apps/details?id=org.subsurface[Google Play - Store] or from - https://f-droid.org/repository/browse/?fdfilter=subsurface&fdid=org.subsurface[F-Droid]. - -===== Using the Subsurface companion app on an Android smartphone - -On first use the app has three options: - -* _Create a new account._ Equivalent to registering in the _Subsurface_ - companion page using an Internet browser. You can request a *DIVERID* using - this option, but it’s supplied via email and followed up by interaction with - the http://api.hohndel.org/login/[_Subsurface companion web page_] to - activate the account. - -* _Retrieve an account._ If you forget your *DIVERID* you will receive an - email to recover the ID string. - -* _Use an existing account._ You are prompted for your *DIVERID*. The app - saves this *DIVERID* and doesn’t ask for it again unless you use the - _Disconnect_ menu option (see below). - -[icon="images/icons/important.png"] -[IMPORTANT] -In the _Subsurface_ main program, the *DIVERID* should also be entered on -the Default Preferences panel, by selecting _File -> Preferences -> General_ -from the main menu in _Subsurface_ itself. This helps synchronization -between _Subsurface_ and the Companion App. - -*Créer de nouveaux emplacements de plongée* - -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 -dives. - -Touch the + icon at the top right to add a new dive site. A menu with 3 -options shows: - -* 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. - -* Use Map: This option allows you to fix a position by searching a world - map. A world map is shown (see *B* below). Specify the desired position with - a _long press_ on the touch sensitive screen (if the marked location is - wrong, simply choose a new location) and select the check symbol in the - upper right. A dialog is shown allowing you to enter the name of the dive - location and the date and time of the dive (see *C* below). In order to - import this dive location in _Subsurface_, set the time to agree with the - time of that dive on the dive computer. - -image::images/Companion_5.jpg["FIGURE: Companion App, add location using map", align="center"] - - -* Import local GPX file: The Android device searches for .gpx files and - located archives will be shown. The selected .gpx file is opened and its - locations shown. Now select the appropriate locations, and select the check - symbol in the upper right to add them. - - -*Liste des emplacements de plongée* - -The main screen shows a list of dive locations, each with a name, date and -time (see *A* below). Some locations may have an arrow-up icon over the -selection box to the left showing they need to be uploaded to the -server. You can select individual dive locations from the list. A selected -location has a check mark in the selection box on the left. Group operations -(like _Delete_ or _Send_) are performed on several selected locations. - -Dive locations in this list can be viewed in two ways: a list of locations -or a map showing them. The display mode (List or Map) is changed by -selecting _Dives_ at the top left of the screen (see *A* below) and then -selecting the display mode. The display mode can be changed either from the -list of locations or from the map (see *B* below). Upon selecting a location -(on the list or on the map), an editing panel opens (see *C* below) where -the dive description or other details may be changed. - -image::images/Companion_4.jpg["FIGURE: Companion App, add location using map", align="center"] - - -Upon selecting a dive (*not* selecting the check box), the name given to it, -date/time and GPS coordinates are shown with two options at the top of the -screen: - -- Edit (pencil): Change the name of the dive location. - -- Maps: Display a map showing the dive location. After editing and saving a - dive location (see *C* above), upload it to the web service, as explained - below. - -*Uploading dive locations* - -There are several ways to send locations to the server. The easiest is -simply selecting the locations (See *A* below) and then touching the right -arrow at the top right of the screen. - -[icon="images/icons/important.png"] -[IMPORTANT] -Be careful! The trash icon on the right means exactly what it should; it -deletes the selected dive location(s). - -image::images/Companion_1.jpg["FIGURE: Screen shots (A-B) of companion app", align="center"] - - -After a dive trip using the Companion App, all dive locations are ready to -be downloaded to a _Subsurface_ dive log (see below). - - -*Settings on the Companion App* - -Selecting the _Settings_ menu option results in the right hand image above -(*B*). - -_Server and account_ - -- _Web-service URL._ This is predefined (http://api.hohndel.org/) - -- _User ID._ The DIVERID obtained by registering as described above. The - easiest way to get it is to copy and paste from the confirmation email or - just type it in. - -_Synchronisation_ - -- _Synchronize on startup_. If selected, dive locations in the Android device - and those on the web service synchronize each time the app is started. - -- _Upload new dives._ If selected, each time the user adds a dive location it - is automatically sent to the server. - -_Background service_ - -Instead of entering an unique dive location, you can leave the service -running in the background, allowing a continuous collection of GPS -locations. - -The settings below define the behavior of the service: - -- _Min duration._ In minutes. The app will try to get a location every X - minutes until stopped by the user. - -- _Min distance._ In meters. Minimum distance between two locations. - -- _Name template._ The name the app will use when saving the locations. - -[icon="images/icons/info.jpg"] -[TIP] -_How does the background service work?_ Assuming the diver sets 5 minutes -and 50 meters in the settings above, the app will start by recording a -location at the current location, followed by another one at every 5 minutes -*or* every time one moves 50 m from previous location. If subsequent -locations are within a radius of 50 meters from the previous one, a new -location is not saved. If the diver is not moving, only one location is -saved. If the diver is moving, a trace of the route is obtained by saving a -location every 50 meters. - -_Other_ - -- _Mailing List._ The mail box for _Subsurface_. Users can send an email to - the Subsurface mailing list. - -- _Subsurface website._ A link to the URL of Subsurface web - -- _Version._ Displays the current version of the Companion App. - -_Search_ - -Search the saved dive locations by name or by date and time. - -_Start service_ - -Starts the _background service_ following the previously defined settings. - -_Disconnect_ - -This is admittedly a badly named option that disconnects the app from the -server. It resets the user ID in the app, showing the first screen where an -account can be created, retrieve the ID for an existing account or use the -users own ID. The _Disconnect_ option is useful if the Android device was -used to download the dive locations of another registered diver. - -_Send all locations_ - -This option sends all locations stored in the Android device to the server. - -[[S_iphone]] -===== Using the Subsurface companion app on an _iPhone_ to record dive locations - -The iPhone interface is quite simple. Type the user ID (obtained during -registration) into the space reserved for it, then select "Dive in" (see -left part of the image below) and start collecting dive location -information. - -image::images/iphone.jpg["FIGURE: Using iPhone companion application", align="center", width=640] - -Dives can be added automatically or manually. In manual mode, a dive -location or waypoint is added to the GPS input stream. In automatic mode, a -continuous path of GPS locations is created from which, after import, -Subsurface can select the appropriate GPS locations based on the times of -dives. The default mode for the _iphone_ is automatic. When adding a dive, -the location service is started automatically and a red bar appears at the -bottom of the screen. After the dive, click on the red bar to end the -location service. While the location service is running you can only add -dives manually. - -You can edit the site name afterwards by selecting the dive from the dive -list and clicking on the site name. There are no other editable fields. The -dive list is automatically uploaded from the iPhone to the web -service. There is no option to trigger upload manually. - - -*Downloading dive locations to the _Subsurface_ divelog* - -Download dive(s) from a dive computer or enter them manually into -_Subsurface_ before obtaining the GPS coordinates from the server. The -download dialog can be reached via _Ctrl+G_ or from the _Subsurface_ Main -Menu _Import -> Import GPS data from Subsurface Service_, resulting in the -image on the left (*A*), below. On first use the DIVERID text box is -blank. Provide a DIVERID, then select the _Download_ button to start the -download process, after which the screen on the right (*B*) below appears: - -image::images/DownloadGPS.jpg["FIGURE: Downloading Companion app GPS data", align="center"] - -Note that the _Apply_ button is now active: selecting it updates the -locations of the newly entered or uploaded dives in _Subsurface_, i.e. it -applies the coordinates and names entered on the app to all the new dives -that match the date-times of the uploaded GPS localities. The names of dive -locations entered within _Subsurface_ (i.e. before downloading the GPS -coordinates) have precedence over downloaded dive locations. - -Since _Subsurface_ matches GPS locations from the mobile device and dive -information from the dive computer based on date-time data, automatic -assignment of GPS data to dives depends on agreeing date-time information -between the two devices. Although _Subsurface_ has a wide range tolerance, -it may not be able to identify the appropriate dive if there is a large -difference between the time in the dive computer and that of the Android -device. This results in no updates. - -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 -is the correct position for a dive (e.g. on repetitive dives while running -_background service_ there may be several locations that would be included -in the time range that fit not only the first dive, but one or more -subsequent dives as well). A workaround to manually edit the date-time of a -dive in the _Subsurface_ Dive List *before* downloading the GPS data and -then to change the date-time back again *after* downloading GPS data. - -[icon="images/icons/info.jpg"] -[NOTE] -CONSEILS: - -- _Background service_ may fill the location list with unnecessary locations - that don’t correspond to the exact dive point but do correspond to the - boat's route. - Right now, these locations are difficult to delete from the server. In some - situations it - is better to clean up the list on the mobile device before sending the dive - points to the web server by simply deleting the inappropriate - locations. This might be necessary, for instance, to keep the location list - clear to see dives in the web service map display (see above). -- It may also be useful to give informative names to the locations sent to the - web server, or at least to use an informative name in the _Name Template_ - setting while running the _background service_, especially on a dive trip - with many dives and dive locations. - [[S_LoadImage]] -=== Ajouter des photos aux plongées +=== Ajouter des photos ou des vidéos aux plongées -Many (if not most) divers take photographs during a dive. _Subsurface_ -allows the storage and display of photographs for each dive. Photos are -superimposed on the dive profile at the times during the dive when they were -taken. They can also be viewed from the dive profile. +Many (if not most) divers take photographs or videos during a dive. We term +these as _media_, meaning either photos or videos. _Subsurface_ allows the +storage and display of these media for each dive. Images are superimposed on +the dive profile at the times during the dive when they were taken. Media +can be viewed either from the dive profile or from the _Media_ tab in the +*Notes Panel*. _Subsurface_ allows viewing of photographs as well as video +files in a unified interface. -==== Chargement des photos et synchronisation entre l'ordinateur de plongée et l'appareil photo +==== Chargement des médias et synchronisation entre l'ordinateur de plongée et l'appareil photo Right-click on a dive or on a group of dives on the dive list, bringing up the xref:S_DiveListContextMenu[Dive list context Menu]. Select the -appropriate option to import images either from file or from the -Internet. The system file browser appears. Select the folder and photographs -that need to be loaded into _Subsurface_ and click the _Open_ button. +appropriate option to import media either from file or from the +Internet. The system file browser appears. Select the folder and media that +need to be loaded into _Subsurface_ and click the _Open_ button. Towards the +bottom of the file browser is a filter that allows showing media (photos and +videos), only photographs, only videos, or all files. Choose the appropriate +option. image::images/LoadImage2_f20.jpg["FIGURE: Load images option", align="center"] -If photos are imported from the Internet, provide a URL pointing to a single -photograph. If the URL points to a directory, no images are imported: -photos from the Internet need to be imported one at a time. If photos are -loaded from the Internet, _Subsurface_ assumes there is an Internet -connection each time this photo is viewed within _Subsurface_. +If media are imported from the Internet, provide a URL pointing to a single +media. If the URL points to a directory, no images are imported: images +from the Internet need to be imported one at a time. If media are loaded +from the Internet, _Subsurface_ assumes there is an Internet connection each +time this item is viewed within _Subsurface_. Having selected the local folder or Internet image to be imported, the time synchronization dialog appears (see image below). The time synchronization is not perfect between the dive computer used during a dive and the camera used during that same dive. These two devices often differ by several -minutes. _Subsurface_ attempts to synchronize these two devices so that the -exact times of photographs can be used to position photographs on the dive -profile. +minutes. _Subsurface_ attempts to synchronize them so that the exact times +of media can be used to position media on the dive profile. _Subsurface_ synchronise l'appareil photo avec l'ordinateur de plongée de trois façons: @@ -1921,7 +1654,7 @@ trois façons: setting tool immediately under the heading _Shift times of image(s) by_, in the image below. If the camera time is 7 minutes later than that of the dive computer, set the time setting tool to a value of 00:07 and select the _Earlier_ radio button. - This is appropriate, since the photos need to be shifted + This is appropriate, since the media need to be shifted 7 minutes earlier (camera is 7 minutes ahead of dive computer). Ignore any "AM" or "PM" suffix in that tool. Click the _OK_ button and synchronization is done. @@ -1946,133 +1679,130 @@ image::images/LoadImage3b_f23.jpg["FIGURE: Synchronization dialog", align="cente image::images/LoadImage3c_f23.jpg["FIGURE: Synchronization dialog", align="center"] -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 -above). However, If the appropriate checkbox is selected (see image above) -these images can still be placed on the _Photos_ tab of the *Notes* panel so -that all photos associated with a dive are visible, including photos taken -before or after the dive. +If the timestamp of a photograph or video 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 above). However, If the appropriate checkbox is selected (see +image above) these images can still be placed on the _Media_ tab of the +*Notes* panel so that all media associated with a dive are visible, +including images taken before or after the dive. + +[[S_ViewMedia]] + +==== Visualiser les médias -==== Visualiser les photos +**** +*Ensuring that thumbnails are created for video files* +[icon="images/icons/important.png"] +[IMPORTANT] + +Within a panel _Subsurface_ represents media by means of thumbnails +(i.e. small versions of images that allows listing many images. For a +photograph, a thumbnail can easily be created because the image is well +defined. But, since a video comprises many images, the question arises of +which image should be used for the thumbnail. Two actions are required to +create thumbnails of videos: + +* The appropriate settings need to be set in the _Preferences_. + +* The program _ffmpeg_ needs to be installed in the computer that runs + Subsurface. + +Full details are provided in <<S_APPENDIX_F,APPENDIX F>>. +**** -Après avoir été chargées, les images apparaissent à deux endroits: +Après avoir été chargées, les médias apparaissent à deux endroits: - - the _Photos_ tab of the *Notes* panel (left part of image below). + - the _Media_ tab of the *Notes Panel* (left part of image below). - as tiny icons (stubs) on the dive profile at the appropriate positions - reflecting the time each photograph was taken. To view the photos on the - dive profile, activate the _show-photos_ button in the tool bar to the left - of the dive profile: + reflecting the time each photograph or video was taken. To view the media + on the dive profile, activate the _Toggle media_ button in the tool bar to + the left of the dive profile: image::images/icons/ShowPhotos_f20.png["FIGURE:Show photos toolbar button", align="left"] This results in a profile display as in the image below: -image::images/LoadImage4_f20.jpg["FIGURE: Photos on dive profile", align="center"] +image::images/LoadImage4.jpg["FIGURE: Media on dive profile", align="center"] -Hover the mouse over any of the photo stubs. A thumbnail photo is shown of -the appropriate photo. See the image below: +Hover the mouse over any of the media stubs. A thumbnail image is shown of +the appropriate media. See the image below: -image::images/LoadImage5_f20.jpg["FIGURE:Thumbnail photo on dive profile", align="center"] +image::images/LoadImage5.jpg["FIGURE:Thumbnail photo on dive profile", align="center"] -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 -below). *Note* that the thumbnail has a small dustbin icon in the bottom -right hand corner (see image above). Selecting the dustbin removes the image -from the dive. Be careful when clicking on a thumbnail. Images can also be -deleted using the _Photos_ tab (see text below). +Clicking on the thumbnail brings up a full size photo or video overlaid on +the _Subsurface_ window, allowing a good view of the media (see the image +below). *Note* that the thumbnail on the dive profile has a small dustbin +icon in the bottom right hand corner (see image above). Selecting the +dustbin removes the image from the dive. Be careful when clicking on a +thumbnail. Images can also be deleted using the _Media_ tab (see text +below). image::images/LoadImage6_f20.jpg["FIGURE: Full-screen photo on dive profile", align="center"] -==== L'onglet _Photos_ - -Photographs associated with a dive are shown as thumbnails in the _Photos_ -tab of the _Notes_ panel. Photos taken in rapid succession during a dive -(therefore sometimes with large overlap on the dive profile) can easily be -accessed in the _Photos_ tab. This tab serves as a tool for individually -accessing the photos of a dive, while the stubs on the dive profile show -when during a dive a photo was taken. The size of the thumbnails in the -_Photos_ tab can be changed using the _Zoom level_ slider at the bottom of -the panel. Single-click a thumbnail in the _Photos_ panel to select a -photo. Double-click a thumbnail to view the full-sized image, overlaying the -_Subsurface_ window. Delete a photo from the _Photos_ panel by selecting it -(single-click) and then by pressing the _Del_ key on the keyboard. This -removes the photo BOTH from the _Photos_ tab as well as the dive profile. - -==== Photos stockées sur un disque dur externe -Most underwater photographers store photos on an external drive. If such a +==== L'onglet _Media_ + +Media associated with a dive are shown as thumbnails in the _Media_ tab of +the *Notes Panel*. Media taken in rapid succession during a dive (therefore +sometimes with large overlap on the dive profile) can easily be accessed in +the _Media_ tab. This tab serves as a tool for individually accessing the +media of a dive, while the stubs on the dive profile show when during a dive +when a photo/video was taken. The size of the thumbnails in the _Media_ tab +can be changed using the _Zoom level_ slider at the bottom of the +panel. Single-click a thumbnail in the _Media_ panel to select a +photo/video. Double-click a thumbnail to view the full-sized image or play +the video, overlaying the _Subsurface_ window. Delete media from the _Media_ +panel by selecting it (single-click) and then by pressing the _Del_ key on +the keyboard. This removes it BOTH from the _Media_ tab as well as the dive +profile. + +==== Médias stockés sur un disque dur externe +Most underwater photographers store media on an external drive. If such a drive can be mapped by the operating system (almost always the case) the -photos can be directly accessed by _Subsurface_. This eases the interaction -between _Subsurface_ and an external repository of photos. When associating -a dive profile with photos from an external drive, the normal procedure of +media can be directly accessed by _Subsurface_. This eases the interaction +between _Subsurface_ and an external repository of media. When associating a +dive profile with media from an external drive, the normal procedure of selection and synchronization (see text above) is used. After the external -drive has been disconnected, _Subsurface_ cannot access these photos any -more. If the display of photos is activated (using the toolbox icon to the -left of the _Dive Profile_), the program shows a small white dot where each -photo should be on the dive profile. In addition the _Photos_ tab shows -only the file names of the photos. If the external drive with the photos is -re-connected, the photos can be seen in the normal way. - -==== Trouver quelles plongées ont des photos associées. +drive has been disconnected, _Subsurface_ cannot access these media any +more. If the display of media is activated (using the toolbox icon to the +left of the _Dive Profile_), the program shows only the thumbnails and the +images cannot be viewed at full-screen size. If the external drive with the +media is re-connected, the media can be seen in the normal way. + +==== Trouver quelles plongées ont des médias associés. 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*>>. +associated media can be time consuming. There is a rapid way of seeing which +dives have associated media and which not: activate the _Media_ checkbox in +the dropdown list obtained by right-clicking on the header bar of the +*Divelist*. In the *Divelist*, all dives with associated media have an icon +indicating whether the media 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]] -==== Déplacer des photos entre dossiers, disques durs ou ordinateurs +==== Déplacer des médias entre dossiers, disques durs ou ordinateurs -After a photograph has been loaded into _Subsurface_ and associated with a specific dive, -_Subsurface_ saves the directory path where the photo lies as well as the file name of the photo, +After a photograph or video has been loaded into _Subsurface_ and associated with a specific dive, +_Subsurface_ saves the path to the directory where the media lie as well as the file name of the each photo/video, in order to find it when the dive is opened again. -If the photo or the whole photo collection is moved to another drive or to a different - machine, the path to the photo changes. Now, _Subsurface_ looks for the photos at their original location before they were moved, - cannot find them and cannot display them. Because, after moving photos, large numbers of photos - may need to be deleted and re-imported from the new location, _Subsurface_ has a mechanism to ease this inconvenience: automatic updates using fingerprints. - -When a photo is loaded into _Subsurface_, a fingerprint for the image is calculated and stored with the - other reference information for that photo. After moving a photo collection (that has already been loaded - into _Subsurface_) to a different directory, disk or computer, _Subsurface_ can: - -- look through a particular directory (and all its subdirectories recursively) - where photos have been moved to, -- calculate fingerprints for all photos in this directory, and - -- if there is a match between a calculated fingerprint and the one calculated - when a photo was originally loaded into _Subsurface_ (even if the original - file name has changed), automatically update the directory information so - that _Subsurface_ can find the photo in the new moved directory. +If the media or the whole media collection is moved to another drive or to a different + machine, the path to the media changes. Now, _Subsurface_ looks for the photos/videos at their original location before they were moved, +cannot find them and cannot display them. Because, after moving media, large numbers of files + may need to be deleted and re-imported from the new disk, _Subsurface_ can locate the media based on their filename and path. This is done by selecting from the Main Menu: _File -> Find moved images_. This brings up a window within - which the NEW directory of the photos needs to be specified. Select the appropriate directory and click - the _Scan_ button towards the bottom right of the panel. The process may require several minutes to - complete, after which _Subsurface_ will show the appropriate photographs when a particular dive is opened. - +which the searching of the images can be controlled. The search is started by clicking on _Select folder and scan_. +Since recorded during different dive trips might have the same filename, the names of the parent folders are likewise compared. +Therefore, the root folder of the NEW picture collection should be chosen. For finer control, it is possible to search +only for media of the currently selected dive(s) by selecting the appropriate option. -[[Image_fingerprint_upgrade]] -**** -*Upgrading legacy photo collections without fingerprints* -[icon="images/icons/important.png"] -[IMPORTANT] - -_Subsurface_ automatically calculates fingerprints for all images that it -can access. When manipulating images, ensure that all the images associated -with the dive log can be accessed by _Subsurface_. +After the searching has completed, the original filenames and the new +locations of the photographs will be shown. The matching parts of the paths +are emphasized. Media that are found at their known positions are not +listed. The proposed changes can be applied by clicking _Apply_ or rejected +by clicking _Cancel_. -_Subsurface_ automatically checks and, if necessary, updates the -fingerprints associated with a single dive if: - -- The images associated with that dive are visible as thumbnails on the *Dive - Profile*. - -- If you edit anything in the *Notes* panel and save the edits by selecting - _Apply changes_. - -**** +image::images/FindMovedImages1.jpg["FIGURE:Find moved images", align="center"] === Logging special types of dives @@ -2167,7 +1897,7 @@ three steps, exactly as with multi-cylinder dives above: the cylinder change events have been recorded on the dive profile, the correct cylinder pressures for both cylinders are shown on the dive profile, as in the image below. -image::images/sidemount1.jpg["FIGURE: Profil Sidemount", align="center"] +image::images/sidemount1.jpg["FIGURE: Sidemount profile", align="center"] [[S_sSCR_dives]] ==== Passive semi-closed circuit rebreather (pSCR) dives @@ -2256,18 +1986,18 @@ Closed system rebreathers also recirculate gas that has been breathed. However, they use advanced technology to maintain a breathable oxygen concentration: a) remove carbon dioxide from the exhaled gas. -b) regulate the oxygen concentration to remain within safe diving limits. The - CCR interface of _Subsurface_ is currently experimental and under active - development. Subsurface currently supports Poseidon MkVI and APD - Discovery/Evolution dive computers, as well as Shearwater dive computers - connected to CCR systems. In contrast to a conventional recreational dive - computer, a CCR system computer usually does not allow the download of a log - containing multiple dives. Rather, each dive is stored independently. This - means that _Subsurface_ cannot download a dive log directly from a CCR dive - computer, but that it imports individual CCR dive profiles in the same way - it imports dive log data from other digital databases: one dive at a - time. However, the Shearwater based CCR systems are different in this - respect and allow multi-dive downloads. +regulate the oxygen concentration to remain within safe diving limits. The +CCR interface of _Subsurface_ is currently experimental and under active +development. Subsurface currently supports Poseidon MkVI and APD +Discovery/Evolution dive computers, as well as Shearwater dive computers +connected to CCR systems. In contrast to a conventional recreational dive +computer, a CCR system computer usually does not allow the download of a log +containing multiple dives. Rather, each dive is stored independently. This +means that _Subsurface_ cannot download a dive log directly from a CCR dive +computer, but that it imports individual CCR dive profiles in the same way +it imports dive log data from other digital databases: one dive at a +time. However, the Shearwater based CCR systems are different in this +respect and allow multi-dive downloads. ===== Importer une plongée CCR @@ -2507,7 +2237,7 @@ plus petite et la plus grande profondeur atteinte pour ces plongées. [[S_DiveProfile]] === Le *Profil de plongée* -image::images/Profile2.jpg["Profil de plongée typique", align="center"] +image::images/Profile2.jpg["Typical dive profile", align="center"] Parmi toutes les panneaux de _Subsurface_, le profil de plongée contient les informations les plus détaillées concernant chaque plongée. Le profil de @@ -2553,7 +2283,7 @@ souris à un endroit où elle ne masquera pas d'information importante. La position de la boîte Information est enregistrée ré-utilisée pour les analyses de plongée suivantes. -image::images/InfoBox2.jpg["FIGURE: La boîte Information", align="center"] +image::images/InfoBox2.jpg["Figure: Information Box", align="center"] 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 @@ -2577,7 +2307,7 @@ panel. These are: Affiche la *Profondeur maximale d'utilisation (MOD)* d'une plongée, en fonction du mélange gazeux utilisé. La MOD dépend de la concentration en oxygène du gaz respiré. Pour l'air (21% d'oxygène), il vaut envuron 57m si -une pO~2~ maximale de 1.4 est choisie dans la section *Préférences* +une pO~2 maximale de 1.4 est choisie dans la section *Préférences* (sélectionnez _Fichier -> Préférences -> Profil_ et éditez le champ _pO~2 dans le calcul de MOD_). En plongeant sous la MOD, il y a un risque important d'exposition aux dangers liés à la toxicité de l'oxygène. @@ -2640,7 +2370,7 @@ dive_, shown by the position of the cursor on the *Dive Profile*. The drawing on the left below indicates the meaning of the different parts of the Gas Pressure Bar Graph. -image::images/GasPressureBarGraph.jpg["FIGURE: Le graphique de pression gazeuse", align="center"] +image::images/GasPressureBarGraph.jpg["FIGURE:Gas Pressure bar Graph", align="center"] - 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 @@ -2794,10 +2524,12 @@ underneath the two red dots. [icon="images/icons/ShowPhotos.png"] [NOTE] -Les photos qui ont été ajoutées à une plongée peuvent être affichées sur le -profil en sélectionnant le bouton *Communer l'affichage des images*. La -position d'une photo sur le profil indique le moment exact où la photo a été -prise. Si le bouton n'est pas actif, les photos sont masquées. +Les photos et vidéos qui ont été ajoutées à une plongée peuvent être +affichées sur le profil en sélectionnant le bouton *Afficher les médias*. La +position d'une photo ou vidéo sur le profil indique le moment exact où elle +a été prise. La durée de la vidéo est représentée par une bar si +_Subsurface_ a pu extraire cette information du fichier vidéo. Si le bouton +n'est pas actif, les photos sont masquées. The profile can also include the dive computer reported *ceiling* (more @@ -3021,7 +2753,7 @@ Several actions on either a single dive, or a group of dives, can be performed using the Dive List Context Menu. It is found by selecting either a single dive or a group of dives and then right-clicking. -image::images/ContextMenu.jpg["Figure: Menu contextuel", align="center"] +image::images/ContextMenu.jpg["Figure: Context Menu", align="center"] Le menu contextuel est utilisé pour de nombreuses fonctions décrites ci-dessous. @@ -3041,26 +2773,26 @@ 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 +By selecting the _Media_ checkbox in the dropdown list, an icon is shown +indicating whether any media are associated with a particular dive. There are three icons: [icon="images/icons/duringPhoto.png"] [NOTE] -Cette plongée contient des photos prises durant la plongée, généralement -prises avec un appareil ou caméra submersible. +Cette plongée contient des photos ou vidéos prises durant la plongée, +généralement prises avec un appareil ou caméra submersible. [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. +This dive has photographs or videos taken immediately before or immediately +after the dive. This is useful for finding photos/media 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] -Cette plongée contient à la fois des photos prises pendant la plongée, et -juste avant ou juste après la plongée. +Cette plongée contient à la fois des photos ou vidéos prises pendant la +plongée, et juste avant ou juste après la plongée. [[S_Renumber]] === Renuméroter les plongées @@ -3192,11 +2924,11 @@ the dive where the depth is less than a metre. ==== Load image(s) from file(s) This topic is discussed in the section: xref:S_LoadImage[Adding photographs -to dives]. +or videos to dives]. ==== Load image from web This topic is discussed in the section: xref:S_LoadImage[Adding photographs -to dives]. +or videos to dives]. ==== Annuler les manipuations sur les plongées @@ -3226,7 +2958,7 @@ shown. The panel can be maximized by clicking the same icon that minimized it. The filter may also be reset and closed by selecting the *red button* with the white cross. -image::images/Filterpanel.jpg["Figure: panneau des filtres", align="center"] +image::images/Filterpanel.jpg["Figure: Filter panel", align="center"] 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 @@ -3372,9 +3104,18 @@ image::images/texexample.png["Figure: Export to TeX", align="center"] * _Image depths_, which creates a text file that contains the file names of - all photos or images attached to any of the selected dives in the _Dive - List_, together with the depth underwater where of each of those photos was - taken. + all photos or videos attached to any of the selected dives in the _Dive + List_, together with the depth underwater where of each of those + photos/videos was taken. + +When the "Anonymize" option is selected for xml-based file formats, the +letters A-Z are all replaced by the letter 'X' in the notes, buddy, +divemaster, divesite name and divesite description fields. This way, you can +share dive log files for debugging purposes without revealing personal +information. Please note, though, that other characters are not replaced, so +this is not useful for languages with non-latin characters and GPS +coordinates of dive sites are preserved as well. + * _General Settings_, under the HTML tab, provides the following options: @@ -3492,7 +3233,7 @@ members/friends. There are two approaches for doing this. 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, + *Profile Panel* and media 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. @@ -3550,8 +3291,8 @@ image::images/Print1_f22.jpg["FIGURE: Print dialogue", align="center"] - 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. -3. Under _Template_ select a template to be used as the page layout. There are - several choices. (see image *B*, above). +Under _Template_ select a template to be used as the page layout. There are +several choices. (see image *B*, above). - _Table_: This prints a summary table of all dives selected (see below). @@ -3611,7 +3352,8 @@ ces ordinateurs de plongée peuvent être lues et modifiées. Pour commencer, assurez vous 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 -<<S_Appendix_A, ANNEXE A>> pour plus d'informations sur la manière de procéder. +<<_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. Une fois que l'ordinateur de plongée est connecté à _Subsurface_, sélectionner _Fichier -> Configurer l'ordinateur de plongée_, à partir du @@ -3620,7 +3362,7 @@ dans la liste déroulante, en haut du panneau de configuration et sélectionner le bon modèle d'ordinateur de plongée à partir du panneau à gauche (voir l'image ci-dessous). -image::images/Configure_dc_f20.jpg["FIGURE: Configurer un ordinateur de plongée", align="center"] +image::images/Configure_dc_f20.jpg["FIGURE: Configure dive computer", align="center"] En utilisant les boutons appropriés du panneau de configuration, les actions suivantes peuvent être effectuées : @@ -3655,7 +3397,7 @@ _Cancel_. There are several headings in the *General* panel: -image::images/Pref1_f23.jpg["FIGURE: Preferences general page", align="center"] +image::images/Pref1.jpg["FIGURE: Preferences general page", align="center"] ** *Lists and tables*: Specify the font type and font size of the *Dive Table* panel: decreasing the font size allows one to see more dives on a screen. @@ -3685,6 +3427,12 @@ image::images/Pref1_f23.jpg["FIGURE: Preferences general page", align="center"] with faster animation speed to the left, and a 0 value representing no animation at all. + ** *Video thumbnails*: In generating thumbnails for videos associated with dives, _Subsurface_ + needs to have the appropriate information (see section on <<S_ViewMedia,View Images>>). Three preferences need to be set + as explained in <<S_APPENDIX_F, APPENDIX F>>. These are: a) switch on thumbnails, b) specify + the location of the _ffmpeg_ program and c) set the place within video where the thumbnail needs + to be obtained from. + ** *Clear all settings*: As indicated in the button below this heading, all settings are cleared and set to default values. @@ -3710,14 +3458,14 @@ Ce panneau comporte trois sections: image::images/Pref4_f23.jpg["FIGURE: Preferences Graph page", align="center"] [[S_GradientFactors]] -* *Gas pressure display setup*. Even though nitrogen and helium pressures are also included here, these items mainly pertain to oxygen management: - ** _Thresholds_: _Subsurface_ can display graphs of the nitrogen, oxygen and the helium -partial pressures during -the dive, activated using the toolbar on the left of the *Dive Profile* -panel. For each of these graphs, specify a threshold value. If any of the graphs go -above the specified threshold, the graph is -highlighted in red, indicating the particular partial pressure threshold has been exceeded. -The pO~2~ threshold is probably the most important one and a value of 1.6 is commonly used. +*Gas pressure display setup*. Even though nitrogen and helium pressures are also included here, these items mainly pertain to oxygen management: +** _Thresholds_: _Subsurface_ can display graphs of the nitrogen, oxygen and the helium + partial pressures during + the dive, activated using the toolbar on the left of the *Dive Profile* + panel. For each of these graphs, specify a threshold value. If any of the graphs go + above the specified threshold, the graph is + highlighted in red, indicating the particular partial pressure threshold has been exceeded. + The pO~2~ threshold is probably the most important one and a value of 1.6 is commonly used. ** _pO~2~ in calculating MOD_ is used for calculating the maximum operative depth for a particular nitrox or trimix gas mixture. A value of 1.4 is commonly used. @@ -3812,9 +3560,8 @@ l'affiche des détails de plongée. === Réseau This panel facilitates communication between _Subsurface_ and data sources on the Internet. This is important, for instance, when _Subsurface_ needs -to communicate with web services such as Cloud storage, the -<<S_Companion,_Subsurface Companion app_>> or when you want to communicate -through a proxy. +to communicate with web services such as Cloud storage, or when you want to +communicate through a proxy. image::images/Pref5_f23.jpg["FIGURE: Preferences Network page", align="center"] @@ -3838,22 +3585,19 @@ from your ISP. - _Save password locally_: This allows local storage of the cloud storage password. Note that this information is saved in raw text form, not encoded in any way. -** _Subsurface web service_: When you subscribe to the <<S_Companion,Subsurface web service>>, a very - long and hard-to-remember userID is issued. This is the place to save that userID. By - checking the option _Save User ID locally?_, you ensure a local copy of that userID is saved. === Géoréférencement _Subsurface_ provides a geo-lookup service (that is, given the coordinates of a dive site) derived from a click on the *Dive Map panel* at the bottom right of the _Subsurface_ window, or from a GPS instrument or from the -_Subsurface_ Companion app). A search on the Internet is done to find the -name of the closest known location. This function only works if _Subsurface_ -has an Internet connection. The preference of the dive site name can be +_Subsurface-Mobile_ app). A search on the Internet is done to find the name +of the closest known location. This function only works if _Subsurface_ has +an Internet connection. The preference of the dive site name can be configured, e.g. _Country/State/City_ or _City/State/Country_ (see image below). -image::images/Pref7_f23.jpg["FIGURE: panneau de géoréférencement", align="center"] +image::images/Pref7_f23.jpg["FIGURE: Georeference panel", align="center"] [[S_DivePlanner]] == Le planificateur de plongée de _Subsurface_ @@ -3991,8 +3735,8 @@ factors for a dive plan, as explained below. To plan a dive, the appropriate settings need to be defined. -- Ensure the date and time is set to that of the intended dive. This allows - calculation of the nitrogen load incurred during previous dives. +Ensure the date and time is set to that of the intended dive. This allows +calculation of the nitrogen load incurred during previous dives. - Immediately under the heading _Planning_ are two checkboxes _Recreational_ and _Safety Stop_. Check these two boxes. @@ -4049,7 +3793,7 @@ gradient factors of 100. Because the no-deco limit (NDL) is 22 minutes, there remains a significant amount of air in the cylinder at the end of the dive. -image::images/Planner_OC_rec1.jpg["FIGURE: une planification de plongée loisir : configuration", align="center"] +image::images/Planner_OC_rec1.jpg["FIGURE: A recreational dive plan: setup", align="center"] 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 @@ -4226,7 +3970,7 @@ Ci-dessous, vous trouverez un exemple d'une planification de plongée utilisant du Tx20/30 et l'algorithme Bühlmann, suivie d'une remontée utilisant du EAN50 et utilisant les réglages décrits ci-dessous. -image::images/Planner_OC_deco.jpg["FIGURE: Planifier des plongées : configuration", align="center"] +image::images/Planner_OC_deco.jpg["FIGURE: Planning a dive: setup", align="center"] Once the above steps have been completed, save by clicking the _Save_ button towards the top middle of the planner. The saved dive plan will appear in @@ -4264,10 +4008,10 @@ dive (not necessarily the deepest). The additional minutes should be distributed over the differnent stops in a way proportional to the stop length, i.e. add more of the additional minutes to the longer, shallower stops. The given times refer to the duration of the decompression phase and do not include the extended bottom time! -This way of altering dive plans becomes inaccurate for large deviations from the original -plan. So it should not be trusted for more than a few minutes or meters of +This way of altering dive plans becomes inaccurate for large deviations from the original +plan. So it should not be trusted for more than a few minutes or meters of deviations from the planned bottom time. Checking this option creates a lot of additional computation, -to such a degree that the planner is slower than otherwise. +to such a degree that the planner is slower than otherwise. *Minimum gas requirements*: The planner also estimates the _minimum gas_ pressure required for safe ascent after an event that causes the dive to be aborted. The @@ -4358,7 +4102,7 @@ are specified for pSCR dives. Below is a dive plan for a pSCR dive. The dive is to that of the CCR dive below, but note the longer ascent duration due to the lower oxygen in the loop due to the oxygen drop across the mouthpiece of the pSCR equipment. -image::images/Planner_pSCR.jpg["FIGURE: Planifier des plongées pSCR : configuration", align="center"] +image::images/Planner_pSCR.jpg["FIGURE: Planning a pSCR dive: setup", align="center"] ==== Planification pour bailout pSCR @@ -4393,7 +4137,7 @@ overlapping bailout event with cylinder change. As in the graph on the left, the appropriate pO~2~ values are shown in the pO~2~ graphs. The volumes of gas required can be obtained at the bottom of the *Dive plan details* panel. -image::images/pscr_b2.jpg["FIGURE: Planifier des plongées pSCR : configuration", align="center"] +image::images/pscr_b2.jpg["FIGURE: Planning a pSCR dive: setup", align="center"] In the case of a pSCR dive plan for open water, the worst-case scenario is probably bailout at the end of the deepest part of the dive. Create a @@ -4424,7 +4168,7 @@ this is calculated for bail out ascents. The dive profile for a CCR dive may look something like the image below. -image::images/Planner_CCR.jpg["FIGURE: Planifier des plongées CCR : configuration", align="center"] +image::images/Planner_CCR.jpg["FIGURE: Planning a CCR dive: setup", align="center"] Note that, in the _Dive plan details_, the gas consumption for a CCR segment is not calculated, so gas consumptions of 0 liters are the norm. @@ -4570,8 +4314,8 @@ des sections de ce manuel traitant des opérations relatives. <<S_Cloud_storage,_Cloud storage_>>. - _Save to cloud storage_ - Save the current dive log to <<S_Cloud_storage,_Cloud storage_>>. -- _Take cloud storage online_ - - ****************************************************** +- _Cloud storage online_ - Switch between the online version of the logbook, + and the locally stored one. - _Fermer_ - Fermer le carnet de plongée actuellement ouvert. - <<S_ExportLog,_Exporter_>> - Exporter le carnet de plongée actuellement ouvert (ou les plongées sélectionnées dans le carnet) vers un des nombreux @@ -4579,8 +4323,8 @@ des sections de ce manuel traitant des opérations relatives. - <<S_PrintDivelog,_Imprimer_>> - Imprimer le carnet de plongée actuellement ouvert. - <<S_Preferences,_Préférences_>> - Définir les préférences de _Subsurface_. -- <<S_FindMovedImages, _Find moved images_>> - If photos taken during dives - have been moved to +- <<S_FindMovedImages, _Find moved media_>> - If photos/videos taken during + dives have been moved to a different disk or directory, locate them and link them to the appropriate dives. - <<S_Configure,_Configurer l'ordinateur de plongée_>> - Modifier la @@ -4597,17 +4341,12 @@ des sections de ce manuel traitant des opérations relatives. - <<Unified_import,_Importer des fichiers de log_>> - Importer des informations de plongées à partir d'un fichier d'un format compatible avec _Subsurface_. -- <<S_Companion,_Importer les données GPS depis le service web Subsurface_>> - - Charge les coordonnées GPS à partir de l'application mobile _Subsurface_ - (téléphones et tablettes). - <<S_ImportingDivelogsDe,_Importer depuis Divelogs.de_>> - Importer des informations de plongées à partir de _www.Divelogs.de_. === Journal (log) - <<S_EnterData,_Ajouter une plongée_>> - Ajouter manuellement une nouvelle plongée au panneau de la *liste des plongées*. -- _Edit dive_ - Edit a dive where the profile was entered by hand and not from - a dive computer. - <<S_DivePlanner,_Planifier une plongée_>> - Planifier des plongées. - <<S_Replan,_Modifier la plongée dans le planificateur_>> - Modifier une plongée planifiée qui a été enregistrée dans la *liste des plongées*. @@ -4663,7 +4402,6 @@ des sections de ce manuel traitant des opérations relatives. == ANNEXE A : informations spécifiques au système d'exploitation utilisé pour importer les informations de plongées depuis un ordinateur de plongée. -[[S_Appendix_A]] === Assurez-vous que les pilotes (drivers) nécessaires sont installés [icon="images/icons/drivers.jpg"] @@ -5146,9 +4884,10 @@ _Subsurface_ as follows: xref:Unified_import[universal import dialogue]. - In the dropdown list towards the bottom right of the dialogue (labeled 'Filter:'), select "APD log viewer". -- On the list of file names select the _.apd_ file created. An import dialogue - opens showing the default settings for the data in the _.apd_ file. If - changes are required, do this as for xref:S_ImportingCSVDives[CSV imports]. +On the list of file names select the _.apd_ file created. An import +dialogue opens showing the default settings for the data in the +_.apd_ file. If changes are required, + do this as for xref:S_ImportingCSVDives[CSV imports]. image::images/APD_CSVimportF22.jpg["Figure: APD log viewer import", align="center"] @@ -5596,8 +5335,48 @@ rendering mode. IMPORTANT: All CSS units should be in relative lengths only, to support printing on any page size. -== ANNEXE F: FAQs. [[S_APPENDIX_F]] + +== APPENDIX F: Setting up video thumbnails. + +=== Setting up the appropriate thumbnails for videos that are associated with dives. + +In handling video associated with dives, _Subsurface_ needs to create a +thumbnail for each video that can be shown either on the dive profile or in +the _Media_ tab. By default this is a nonspecific placeholder thumbnail. To +see thumbnails that represent individual videos, _Subsurface_ uses an +external program calle _FFmpeg_. To create thumbnails for videos, do two +things: + +Install _FFmpeg_ on the computer that runs _Subsurface_. The program can be +downloaded from the FFmpeg web site: +https://www.ffmpeg.org/download.html. Most Linux distributions ship with an +_ffmpeg_ package and therefore do not need an additional download. + +** On Windows, put the _ffmpeg.exe_ file in the directory containing the _Subsurface_ executable. +On Mac and Linux, make sure the _ffmpeg_ command is in the path. This should be the case for +_FFmpeg_ installed from official packages. + + +2. In the _General_ tab of the <<S_Preferences, _Preferences_>>, set the + preferences for generating video thumbnails. This is achieved by: + +** Checking the _Extract video thumbnails_ box. If _Subsurface_ fails to load the _FFmpeg_ executable, +this option will be turned off. Re-enable it after successfully installing _FFmpeg_. + +** Specifying the path to the _FFmpeg_ executable. + +** Choose the position in the video where _Subsurface_ +should try to extract the thumbnail. The left-most and right-most positions of the _Extract at position_ +slider signify the beginning and the end of the video, respectively. Note that if _Subsurface_ cannot +determine the length of the video (this can be the case for AVI files), the first frame +of the video will be used. + +This should complete the setup of video thumbnails and they should now +appear on the dive profile and in the _Media_ tab. + +== APPENDIX G: FAQs. +[[S_APPENDIX_G]] === Subsurface appears to miscalculate gas consumption and SAC [[SAC_CALCULATION]] 'Question': I dived with a 12.2 l tank, starting with 220 bar and ending |