diff options
| author |  Guillaume GARDET <guillaume.gardet@free.fr> | 2017-07-04 13:53:33 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2017-07-04 07:48:28 -0700 |
| commit | 2693735bb7ee511265df0088a8f54db9e24dcc00 (patch) | |
| tree | 9ffe3217468aa350a5c78efff818f71541d17517 | |
| parent | 3cde4f594d31993603b2e2909a3eadd06ad6ff8f (diff) | |
| download | subsurface-2693735bb7ee511265df0088a8f54db9e24dcc00.tar.gz | |
Documentation: Merge and update french translations
Signed-off-by: Guillaume GARDET <guillaume.gardet@free.fr>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rw-r--r-- | Documentation/50-pot/subsurface-mobile-manual.pot | 2 | ||||
| -rw-r--r-- | Documentation/50-pot/subsurface-user-manual.pot | 2772 | ||||
| -rw-r--r-- | Documentation/fr/po/subsurface-user-manual.fr.po | 3906 | ||||
| -rw-r--r-- | Documentation/mobile-manual_fr.html.git | 2 | ||||
| -rw-r--r-- | Documentation/user-manual_fr.html.git | 531 | ||||
| -rw-r--r-- | Documentation/user-manual_fr.txt | 503 |
6 files changed, 4065 insertions, 3651 deletions
diff --git a/Documentation/50-pot/subsurface-mobile-manual.pot b/Documentation/50-pot/subsurface-mobile-manual.pot index a527d3d19..f2aa4c1be 100644 --- a/Documentation/50-pot/subsurface-mobile-manual.pot +++ b/Documentation/50-pot/subsurface-mobile-manual.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: subsurface-manual VERSION\n" "Report-Msgid-Bugs-To: subsurface@subsurface-divelog.org\n" -"POT-Creation-Date: 2017-02-03 10:32+0100\n" +"POT-Creation-Date: 2017-07-04 13:37+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/Documentation/50-pot/subsurface-user-manual.pot b/Documentation/50-pot/subsurface-user-manual.pot index 138354bb2..a081cd0d5 100644 --- a/Documentation/50-pot/subsurface-user-manual.pot +++ b/Documentation/50-pot/subsurface-user-manual.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: subsurface-manual VERSION\n" "Report-Msgid-Bugs-To: subsurface@subsurface-divelog.org\n" -"POT-Creation-Date: 2017-02-03 10:32+0100\n" +"POT-Creation-Date: 2017-07-04 13:37+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -17,7 +17,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#. :website: http://subsurface-divelog.org +#. :website: https://subsurface-divelog.org #. type: Target for macro image #: user-manual.txt:14 #, no-wrap @@ -30,22 +30,23 @@ msgid "[big]#USER MANUAL#" msgstr "" #. type: Plain text -#: user-manual.txt:20 +#: user-manual.txt:21 #, no-wrap msgid "" "*Manual authors*: Willem Ferguson, Jacco van Koll, Dirk Hohndel, Reinout " "Hoornweg,\n" "Linus Torvalds, Miika Turkia, Amit Chaudhuri, Jan Schubert, Salvador Cuñat, " -"Pedro Neves\n" +"Pedro Neves,\n" +"Stefan Fuchs\n" msgstr "" #. type: Plain text -#: user-manual.txt:22 -msgid "[blue]#_Version 4.6, January 2017_#" +#: user-manual.txt:23 +msgid "[blue]#_Version 4.6, March 2017_#" msgstr "" #. type: Plain text -#: user-manual.txt:27 +#: user-manual.txt:28 msgid "" "Welcome as a user of _Subsurface_, an advanced dive logging program with " "extensive infrastructure to describe, organize, interpret and print scuba " @@ -54,21 +55,21 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:30 +#: user-manual.txt:31 msgid "" "Do you need a flexible way of logging dives using recreational equipment, " "even without a dive computer?" msgstr "" #. type: Plain text -#: user-manual.txt:31 +#: user-manual.txt:32 msgid "" "Do you wish to seamlessly include GPS locations of dive sites into your dive " "log?" msgstr "" #. type: Plain text -#: user-manual.txt:37 +#: user-manual.txt:38 msgid "" "Do you use two different dive computer brands, each with its own proprietary " "software for downloading dive logs? Do you dive with rebreathers as well as " @@ -80,7 +81,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:40 +#: user-manual.txt:41 msgid "" "Do you use more than one operating system? _Subsurface_ is fully compatible " "with Mac, Linux and Windows, letting you access your dive log on a range of " @@ -88,7 +89,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:43 +#: user-manual.txt:44 msgid "" "Do you use Linux or Mac, but your dive computer has only Windows-based " "software for downloading dive information (e.g. Mares or Scubapro)? " @@ -97,39 +98,39 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:45 +#: user-manual.txt:46 msgid "" "Do you need an intuitive graphical dive planner that integrates with, and " "takes into account, dives you’ve already logged?" msgstr "" #. type: Plain text -#: user-manual.txt:47 +#: user-manual.txt:48 msgid "" "Do you need a way of storing or backing up your dive log on the Internet, " "letting you view your dive log from anywhere using an Internet browser?" msgstr "" #. type: Plain text -#: user-manual.txt:48 +#: user-manual.txt:49 msgid "Do you wish to access or modify your dive log using a mobile phone?" msgstr "" #. type: Plain text -#: user-manual.txt:53 +#: user-manual.txt:55 msgid "" -"_Subsurface_ binaries are available for Windows PCs (Win XP or later), Intel " -"based Macs (OS/X) and many Linux distributions. _Subsurface_ can be built " -"for many more hardware platforms and software environments where Qt and " -"libdivecomputer are available." +"_Subsurface_ binaries are available for Windows PCs (Win 7 or later from " +"version 4.6 of _Subsurface_ onwards), Intel based Macs (OS/X) and many Linux " +"distributions. _Subsurface_ can be built for many more hardware platforms " +"and software environments where Qt and libdivecomputer are available." msgstr "" #. type: Plain text -#: user-manual.txt:62 +#: user-manual.txt:64 msgid "" "This manual explains how to use the _Subsurface_ program. To install the " "software, consult the _Downloads_ page on the " -"http://subsurface-divelog.org/[_Subsurface_ web site]. Please discuss " +"https://subsurface-divelog.org/[_Subsurface_ web site]. Please discuss " "issues with this program by sending an email to " "mailto:subsurface@subsurface-divelog.org[our mailing list] and report bugs " "at https://github.com/Subsurface-divelog/subsurface/issues[our bugtracker]. " @@ -138,7 +139,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:65 +#: user-manual.txt:67 #, no-wrap msgid "" "*Audience*: Recreational Scuba Divers, Free Divers, Tec Divers, " @@ -147,18 +148,18 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:67 +#: user-manual.txt:69 msgid "toc::[]" msgstr "" #. type: Title - -#: user-manual.txt:70 +#: user-manual.txt:72 #, no-wrap msgid "Using this manual" msgstr "" #. type: Plain text -#: user-manual.txt:73 +#: user-manual.txt:75 msgid "" "When opened from within _Subsurface_, this manual does not have external " "controls for paging or selecting previous pages. However, two facilities are " @@ -166,7 +167,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:80 +#: user-manual.txt:82 msgid "" "The _SEARCH_ function is activated by pressing control-F or command-F on the " "keyboard. A text box appears at the bottom right-hand of the window (see " @@ -177,13 +178,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:81 +#: user-manual.txt:83 #, no-wrap msgid "images/UserManualSearch.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:93 +#: user-manual.txt:95 msgid "" "_PREVIOUS/NEXT LINK_. Move between links (underlined words that jump to " "specific sections in the user manual) by right-clicking on the text of the " @@ -196,19 +197,19 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:94 +#: user-manual.txt:96 #, no-wrap msgid "images/UserManualLinksBack.jpg" msgstr "" #. type: Title - -#: user-manual.txt:99 +#: user-manual.txt:101 #, no-wrap msgid "The user survey" msgstr "" #. type: Plain text -#: user-manual.txt:110 +#: user-manual.txt:112 msgid "" "In order to develop _Subsurface_ to serve its users in the best possible " "way, it’s important to have user information. Upon launching _Subsurface_ " @@ -224,22 +225,22 @@ msgid "" msgstr "" #. type: Title - -#: user-manual.txt:113 +#: user-manual.txt:115 #, no-wrap msgid "Start Using the Program" msgstr "" #. type: Plain text -#: user-manual.txt:118 +#: user-manual.txt:120 msgid "" "The _Subsurface_ window is usually divided into four panels with a *Main " -"Menu* (File Import Log View Help) at the top of the window (for Windows and " -"Linux) or the top of the screen (for Mac and Ubuntu Unity). The four panels " -"are:" +"Menu* (File Edit Import Log View Share Help) at the top of the window (for " +"Windows and Linux) or the top of the screen (for Mac and Ubuntu Unity). The " +"four panels are:" msgstr "" #. type: Plain text -#: user-manual.txt:124 +#: user-manual.txt:126 msgid "" "The *Dive List* on the bottom left, showing all the dives in the user's dive " "log. A dive can be selected and highlighted on the dive list by clicking on " @@ -248,7 +249,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:128 +#: user-manual.txt:130 msgid "" "The *Dive Map* on the bottom right, showing the user's dive sites on a world " "map and centered on the site of the last dive selected in the *Dive " @@ -256,7 +257,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:132 +#: user-manual.txt:134 msgid "" "The *Info* on the top left, giving more detailed information on the dive " "selected in the *Dive List*, including some statistics for the selected dive " @@ -264,7 +265,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:136 +#: user-manual.txt:138 msgid "" "The *Dive Profile* on the top right, showing a graphical dive profile of the " "selected dive in the *Dive List*. You can zoom into the dive profile for a " @@ -272,7 +273,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:140 +#: user-manual.txt:142 msgid "" "The dividers between panels can be dragged to change the size of any of the " "panels. _Subsurface_ remembers the position of the dividers, so the next " @@ -281,7 +282,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:148 +#: user-manual.txt:150 msgid "" "If a single dive is selected in the *Dive List*, the dive location, detailed " "information and profile of the _selected dive_ are shown in the respective " @@ -293,38 +294,38 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:151 +#: user-manual.txt:153 #, no-wrap msgid "images/main_window_f22.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:155 +#: 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:" msgstr "" #. type: Plain text -#: user-manual.txt:157 +#: user-manual.txt:159 #, no-wrap msgid "*All*: show all four of the panels as in the screenshot above.\n" msgstr "" #. type: Plain text -#: user-manual.txt:159 +#: user-manual.txt:161 #, no-wrap msgid "*Divelist*: Show only the Dive List.\n" msgstr "" #. type: Plain text -#: user-manual.txt:161 +#: user-manual.txt:163 #, no-wrap msgid "*Profile*: Show only the Dive Profile of the selected dive.\n" msgstr "" #. type: Plain text -#: user-manual.txt:164 +#: user-manual.txt:166 #, no-wrap msgid "" "*Info*: Show only the Notes about the last selected dive and statistics " @@ -333,24 +334,22 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:166 +#: user-manual.txt:168 #, no-wrap msgid "*Globe*: Show only the world map, centered on the last selected dive.\n" msgstr "" #. type: Plain text -#: user-manual.txt:172 +#: user-manual.txt:173 msgid "" "Like other functions that can be accessed via the Main Menu, these options " -"can also be triggered using keyboard shortcuts. The shortcuts for a " -"particular system are shown with an underline in the main menu " -"entries. Since different Operating Systems and the user’s chosen language " -"may cause _Subsurface_ to use different shortcut keys, they are not listed " -"in this user manual." +"can also be triggered using keyboard shortcuts. The shortcuts are shown with " +"an underline in the main menu entries, with the Alt-key pressed, or are " +"denoted after the menu item." msgstr "" #. type: Plain text -#: user-manual.txt:176 +#: user-manual.txt:177 msgid "" "When the program is started for the first time, it shows no information at " "all, because it does not have any dive information available. In the " @@ -359,13 +358,13 @@ msgid "" msgstr "" #. type: Title - -#: user-manual.txt:179 +#: user-manual.txt:180 #, no-wrap msgid "Creating a new logbook" msgstr "" #. type: Plain text -#: user-manual.txt:184 +#: user-manual.txt:185 msgid "" "Select _File -> New Logbook_ from the main menu. All existing dive data are " "cleared so new information can be added. If there are unsaved data in an " @@ -374,49 +373,49 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:186 +#: user-manual.txt:187 #, no-wrap msgid "Storing dive information in the logbook" msgstr "" #. type: Plain text -#: user-manual.txt:189 +#: user-manual.txt:190 msgid "" "Now that a new logbook is created, it is simple to add dive data it. " "_Subsurface_ allows several ways of adding dive data to a logbook." msgstr "" #. type: Plain text -#: user-manual.txt:191 +#: user-manual.txt:192 msgid "If the user has a handwritten divelog, a spreadsheet or another form of" msgstr "" #. type: Plain text -#: user-manual.txt:193 +#: user-manual.txt:194 msgid "" "manually maintained divelog, dive data can be added to the logbook using one " "of these approaches:" msgstr "" #. type: Plain text -#: user-manual.txt:195 +#: user-manual.txt:196 msgid "Enter dive information by hand. This is useful if the diver didn’t" msgstr "" #. type: Plain text -#: user-manual.txt:197 +#: user-manual.txt:198 msgid "" "use a dive computer and dives were recorded in a written logbook. See: " "xref:S_EnterData[Entering dive information by hand]" msgstr "" #. type: Plain text -#: user-manual.txt:199 +#: user-manual.txt:200 msgid "Import dive log information that has been maintained either as a spreadsheet" msgstr "" #. type: Plain text -#: user-manual.txt:201 +#: user-manual.txt:202 msgid "" "or as a CSV file. Refer to: xref:S_Appendix_D[APPENDIX D: Exporting a " "spreadsheet to CSV format] and to xref:S_ImportingCSVDives[Importing dives " @@ -424,7 +423,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:205 +#: user-manual.txt:206 msgid "" "If a dive is recorded using a dive computer, the depth profile and a large " "amount of additional information can be accessed. These dives can be " @@ -432,49 +431,49 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:207 +#: user-manual.txt:208 msgid "" "The dive computer itself. See: xref:S_ImportDiveComputer[Importing new dive " "information from a Dive Computer];" msgstr "" #. type: Plain text -#: user-manual.txt:208 +#: user-manual.txt:209 msgid "Proprietary software distributed by manufacturers of dive computers. Refer" msgstr "" #. type: Plain text -#: user-manual.txt:209 +#: user-manual.txt:210 msgid "" "to: xref:S_ImportingAlienDiveLogs[Importing dive information from other " "digital data sources or other data formats]." msgstr "" #. type: Plain text -#: user-manual.txt:210 +#: user-manual.txt:211 msgid "Spreadsheet or CSV files containing dive profiles." msgstr "" #. type: Plain text -#: user-manual.txt:211 +#: user-manual.txt:212 msgid "" "See: xref:S_ImportingCSVDives[Importing dives in CSV format from dive " "computers or other dive log software]" msgstr "" #. type: Title === -#: user-manual.txt:214 +#: user-manual.txt:215 #, no-wrap msgid "Entering dive information by hand" msgstr "" #. type: Plain text -#: user-manual.txt:229 +#: user-manual.txt:230 msgid "" "This is usually the approach for dives without a dive computer. The basic " "record of information within _Subsurface_ is a dive. The most important " "information in a simple dive logbook usually includes dive type, date, time, " -"duration, depth, the names of your dive buddy and the dive master or dive " +"duration, depth, the names of your dive buddy and the divemaster or dive " "guide, and some remarks about the dive. _Subsurface_ can store much more " "information for each dive. To add a dive to a dive log, select _Log -> Add " "Dive_ from the Main Menu. The program then shows three panels on which to " @@ -486,13 +485,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:230 +#: user-manual.txt:231 #, no-wrap msgid "images/AddDive1_f22.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:234 +#: user-manual.txt:235 msgid "" "When you edit a field in Notes or Equipment panels, _Subsurface_ enters " "*Editing Mode*, indicated by the message in the blue box at the top of the " @@ -501,13 +500,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:235 user-manual.txt:801 +#: user-manual.txt:236 user-manual.txt:802 #, no-wrap msgid "images/BlueEditBar_f22.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:244 +#: user-manual.txt:245 msgid "" "The _Apply changes_ button should only be selected after all the parts of a " "dive have been entered. When entering dives by hand, the _Info_, " @@ -521,13 +520,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:246 +#: user-manual.txt:247 #, no-wrap msgid "Creating a Dive Profile" msgstr "" #. type: Plain text -#: user-manual.txt:253 +#: user-manual.txt:254 msgid "" "The *Dive Profile* (a graphical representation of the depth of the dive as a " "function of time) is shown in the panel on the top right hand of the " @@ -537,13 +536,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:254 +#: user-manual.txt:255 #, no-wrap msgid "images/DiveProfile1_f20.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:272 +#: user-manual.txt:274 msgid "" "_Modifying the dive profile_: When the cursor is moved around the dive " "profile, its position is shown by two right-angled red lines as seen below. " @@ -554,20 +553,21 @@ msgid "" "shown above). The default dive depth is 15 m. If the dive depth was 20 m " "then you need to drag the appropriate waypoints downward to 20 m. To add a " "waypoint, double-click on any line segment. To move an additional waypoint, " -"drag it. To remove a waypoint, right-click on it and choose \"Remove this " -"point\" from the context menu. Drag the waypoints to represent an accurate " -"time duration for the dive. Below is a dive profile for a dive to 20 m for " -"30 min, followed by a 5 minute safety stop at 5 m." +"drag it. Moving can also be done by selecting the waypoint and using the " +"arrow keys. To remove a waypoint, right-click on it and choose \"Remove " +"this point\" from the context menu. Drag the waypoints to represent an " +"accurate time duration for the dive. Below is a dive profile for a dive to " +"20 m for 30 min, followed by a 5 minute safety stop at 5 m." msgstr "" #. type: Target for macro image -#: user-manual.txt:273 +#: user-manual.txt:275 #, no-wrap msgid "images/DiveProfile2_f20.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:285 +#: user-manual.txt:287 msgid "" "_Specifying the gas composition:_ The gas composition used is indicated " "along the line segments of the dive profile. This defaults to the first gas " @@ -575,19 +575,19 @@ msgid "" "profile above. The gas mixtures of segments of the dive profile can be " "changed by right-clicking on the particular waypoint and selecting the " "appropriate gas from the context menu. Changing the gas for a waypoint " -"affects the gas shown in the segment _to the left_ of that waypoint. Note " +"affects the gas shown in the segment _to the right_ of that waypoint. Note " "that only the gases defined in the *Equipment* tab appear in the context " "menu (see image below)." msgstr "" #. type: Target for macro image -#: user-manual.txt:286 +#: user-manual.txt:288 #, no-wrap msgid "images/DiveProfile3_f20.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:293 +#: user-manual.txt:295 msgid "" "With the profile now defined, more details must be added to have a fuller " "record of the dive. To do this, the *Notes* and the *Equipment* tabs on the " @@ -596,37 +596,37 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:294 +#: user-manual.txt:296 #, no-wrap msgid "Importing new dive information from a Dive Computer" msgstr "" #. type: Title ==== -#: user-manual.txt:296 +#: user-manual.txt:298 #, no-wrap msgid "Connecting and importing data from a dive computer." msgstr "" #. type: Plain text -#: user-manual.txt:306 +#: user-manual.txt:308 msgid "" "The use of dive computers allows the collection of a large amount of " "information about each dive, e.g. a detailed record of depth, duration, " "rates of ascent/descent and of gas partial pressures. _Subsurface_ can " "capture this information, using dive details from a wide range of dive " "computers. The latest list of supported dive computers can be found at: " -"link:http://subsurface-divelog.org/documentation/supported-dive-computers/[ " +"link:https://subsurface-divelog.org/documentation/supported-dive-computers/[ " "Supported dive computers]." msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:307 user-manual.txt:675 user-manual.txt:1098 user-manual.txt:3414 +#: user-manual.txt:309 user-manual.txt:677 user-manual.txt:1103 user-manual.txt:3398 #, no-wrap msgid "images/icons/warning2.png" msgstr "" #. type: Plain text -#: user-manual.txt:317 +#: user-manual.txt:319 msgid "" "Several dive computers consume more power when they are in PC-Communication " "mode. **This could drain the dive computer's battery**. We recommend the " @@ -638,7 +638,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:333 +#: user-manual.txt:335 msgid "" "To import dive information from a dive computer to a computer with " "_Subsurface_, the two pieces of equipment must communicate with one " @@ -655,58 +655,58 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:335 +#: user-manual.txt:337 msgid "" "After this, the dive computer can be hooked up to the user's PC using these " "steps:" msgstr "" #. type: Plain text -#: user-manual.txt:337 +#: user-manual.txt:339 msgid "The interface cable should be connected to a free USB port (or the Infra-red" msgstr "" #. type: Plain text -#: user-manual.txt:338 +#: user-manual.txt:340 msgid "or Bluetooth connection set up as described later in this manual)" msgstr "" #. type: Plain text -#: user-manual.txt:340 +#: user-manual.txt:342 msgid "The dive computer should be placed into PC Communication mode." msgstr "" #. type: Plain text -#: user-manual.txt:341 +#: user-manual.txt:343 msgid "(Refer to the manual of the specific dive computer)" msgstr "" #. type: Plain text -#: user-manual.txt:345 +#: user-manual.txt:347 msgid "" "In _Subsurface_, from the Main Menu, select _Import -> Import From Dive " "Computer_. Dialogue *A* in the figure below appears:" msgstr "" #. type: Target for macro image -#: user-manual.txt:347 +#: user-manual.txt:349 #, no-wrap msgid "images/DC_import_f20.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:355 +#: user-manual.txt:357 msgid "" "Dive computers tend to keep a certain number of dives in memory, even though " "these dives have already been imported to _Subsurface_. For that reason, if " "the dive computer allows this, _Subsurface_ only imports dives that have not " -"been uploaded before. This makes the download process faster on most dive " +"been downloaded before. This makes the download process faster on most dive " "computers and also saves battery power of the dive computer (at least for " "those not charging while connected via USB)." msgstr "" #. type: Plain text -#: user-manual.txt:362 +#: user-manual.txt:364 msgid "" "The dialogue has two drop-down lists, *Vendor* and *Dive Computer*. On the " "*vendor* drop-down list select the make of the computer, e.g. Suunto, " @@ -716,7 +716,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:373 +#: user-manual.txt:375 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 " @@ -730,7 +730,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:383 +#: user-manual.txt:385 msgid "" "If all the dives on the dive computer need to be downloaded, check the " "checkbox _Force download of all dives_. Normally, _Subsurface_ only " @@ -745,7 +745,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:389 +#: user-manual.txt:391 msgid "" "If the checkbox _Always prefer downloaded dives_ has been checked and, " "during download, dives with identical date-times exist on the dive computer " @@ -754,14 +754,14 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:392 +#: user-manual.txt:394 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:396 +#: user-manual.txt:398 msgid "" "Do *not* check the checkboxes labelled _Save libdivecomputer logfile_ and " "_Save libdivecomputer dumpfile_. These are only used as diagnostic tools " @@ -769,7 +769,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:414 +#: user-manual.txt:416 msgid "" "Then select the _Download_ button. With communication established, you can " "see how the data are retrieved from the dive computer. Depending on the " @@ -790,7 +790,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:418 +#: user-manual.txt:420 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 " @@ -798,36 +798,36 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:422 +#: user-manual.txt:424 #, no-wrap msgid "*PROBLEMS WITH DATA DOWNLOAD FROM A DIVE COMPUTER?*\n" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:422 user-manual.txt:529 user-manual.txt:573 user-manual.txt:586 user-manual.txt:1239 user-manual.txt:1304 user-manual.txt:1468 user-manual.txt:1543 user-manual.txt:1862 +#: user-manual.txt:424 user-manual.txt:531 user-manual.txt:575 user-manual.txt:588 user-manual.txt:1244 user-manual.txt:1309 user-manual.txt:1472 user-manual.txt:1548 user-manual.txt:1867 #, no-wrap msgid "images/icons/important.png" msgstr "" #. type: delimited block * -#: user-manual.txt:425 +#: user-manual.txt:427 msgid "Check the following:" msgstr "" #. type: delimited block * -#: user-manual.txt:428 +#: user-manual.txt:430 msgid "Is the dive computer still in PC-communication or Upload mode?" msgstr "" #. type: delimited block * -#: user-manual.txt:430 +#: user-manual.txt:432 msgid "" "Is the dive computer’s battery fully charged? If not then charge or replace " "it." msgstr "" #. type: delimited block * -#: user-manual.txt:434 +#: user-manual.txt:436 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 " @@ -835,7 +835,7 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:439 +#: user-manual.txt:441 msgid "" "Consult " "xref:_appendix_a_operating_system_specific_information_for_importing_dive_information_from_a_dive_computer[Appendix " @@ -843,7 +843,7 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:443 +#: user-manual.txt:445 msgid "" "On Unix-like operating systems, does the user have write permission to the " "USB port? If not, consult " @@ -852,7 +852,7 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:451 +#: user-manual.txt:453 msgid "" "If the _Subsurface_ computer does not recognize the USB adaptor by showing " "an appropriate device name next to the Mount Point, then there is a " @@ -864,7 +864,7 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:454 +#: user-manual.txt:456 #, no-wrap msgid "" "\tSave libdivecomputer logfile\n" @@ -872,7 +872,7 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:460 +#: user-manual.txt:462 #, no-wrap msgid "" "*Important*: These check boxes are only used when problems are encountered\n" @@ -885,7 +885,7 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:464 +#: user-manual.txt:466 #, no-wrap msgid "" "*Important:* _After downloading with the above checkboxes\n" @@ -894,7 +894,7 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:467 +#: user-manual.txt:469 #, no-wrap msgid "" "\tsubsurface.log\n" @@ -902,7 +902,7 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:473 +#: user-manual.txt:475 msgid "" "These files should be send to the _Subsurface_ mail list: " "_subsurface@subsurface-divelog.org_ with a request for the files to be " @@ -911,19 +911,19 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:476 +#: user-manual.txt:478 #, no-wrap msgid "Connecting _Subsurface_ to a Bluetooth-enabled dive computer" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:477 user-manual.txt:4026 +#: user-manual.txt:479 user-manual.txt:4022 #, no-wrap msgid "images/icons/bluetooth.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:484 +#: user-manual.txt:486 msgid "" "Bluetooth is becoming a more common way of communication between dive " "computers and _Subsurface_, for or instance, the Shearwater Petrel Mk2 and " @@ -933,29 +933,29 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:486 +#: user-manual.txt:488 msgid "Ensure Bluetooth is activated on the host computer running _Subsurface_." msgstr "" #. type: Plain text -#: user-manual.txt:487 +#: user-manual.txt:489 msgid "Ensure _Subsurface_ sees the Bluetooth adapter on the host computer." msgstr "" #. type: Plain text -#: user-manual.txt:488 +#: user-manual.txt:490 msgid "" "Ensure the Bluetooth-enabled dive computer is Bluetooth-discoverable and in " "PC upload mode." msgstr "" #. type: Plain text -#: user-manual.txt:489 +#: user-manual.txt:491 msgid "Ensure _Subsurface_ is paired with the Bluetooth-enabled dive computer." msgstr "" #. type: Plain text -#: user-manual.txt:493 +#: user-manual.txt:495 msgid "" "Select the Download dialogue by selecting _Import -> Import from dive " "computer_ from the *Main Menu*. After checking the box labelled _\"Choose " @@ -963,19 +963,19 @@ msgid "" msgstr "" #. type: Title ===== -#: user-manual.txt:494 +#: user-manual.txt:496 #, no-wrap msgid "On Linux or MacOS:" msgstr "" #. type: Target for macro image -#: user-manual.txt:496 +#: user-manual.txt:498 #, no-wrap msgid "images/DC_import_Bluetooth.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:527 +#: user-manual.txt:529 msgid "" "On the _Linux_ or _MacOS_ platforms the name of the _Subsurface_ computer " "and its Bluetooth address are shown on the right hand side, On the left hand " @@ -1008,7 +1008,7 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:534 +#: user-manual.txt:536 msgid "" "Currently _Subsurface_ does not support Bluetooth pairing with dive " "computers that require a custom PIN code. In order to pair the devices, use " @@ -1016,12 +1016,12 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:536 +#: user-manual.txt:538 msgid "One way to achieve this is to use +bluetoothctl+:" msgstr "" #. type: delimited block * -#: user-manual.txt:547 +#: user-manual.txt:549 #, no-wrap msgid "" "\t$ bluetoothctl\n" @@ -1037,7 +1037,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:553 +#: user-manual.txt:555 msgid "" "After the devices are paired, press the _Save_ button of the dialogue. This " "closes the Bluetooth dialogue. Now select _Download_ in the _Download from " @@ -1046,19 +1046,19 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:554 user-manual.txt:3953 user-manual.txt:4041 +#: user-manual.txt:556 user-manual.txt:3949 user-manual.txt:4037 #, no-wrap msgid "On Windows:" msgstr "" #. type: Target for macro image -#: user-manual.txt:555 +#: user-manual.txt:557 #, no-wrap msgid "images/DC_import_Bluetooth_Windows.png" msgstr "" #. type: Plain text -#: user-manual.txt:565 +#: user-manual.txt:567 msgid "" "On _Windows_ platforms the _Local Bluetooth device details section_ on the " "right is not displayed as is the case on the Linux/Mac systems. To start a " @@ -1072,7 +1072,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:572 +#: user-manual.txt:574 msgid "" "The pairing step is checked and done automatically during the download " "process. If the devices have never been paired the system will ask " @@ -1083,7 +1083,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:580 +#: user-manual.txt:582 msgid "" "Currently _Subsurface_ works only with local Bluetooth adapters which use " "Microsoft Bluetooth Stack. If the local device uses _Widcomm_, _Stonestreet " @@ -1093,7 +1093,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:585 +#: user-manual.txt:587 msgid "" "A log message on the bottom left of the _Remote Bluetooth device selection_ " "shows details about the current status of the Bluetooth agent. To select " @@ -1103,7 +1103,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:595 +#: user-manual.txt:597 #, no-wrap msgid "" "*IN CASE OF PROBLEMS*: If the Bluetooth adapter from the _Subsurface_ " @@ -1118,13 +1118,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:597 +#: user-manual.txt:599 #, no-wrap msgid "Changing the name of a dive computer" msgstr "" #. type: Plain text -#: user-manual.txt:613 +#: user-manual.txt:615 msgid "" "It may be necessary to distinguish between different dive computers used to " "upload dive logs to _Subsurface_. For instance if a buddy’s dive computer is " @@ -1143,13 +1143,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:615 +#: user-manual.txt:617 #, no-wrap msgid "Uploading data for a specific dive from more than one dive computer" msgstr "" #. type: Plain text -#: user-manual.txt:626 +#: user-manual.txt:628 msgid "" "Some divers use more than one dive computer at the same time, e.g. during " "technical diving. If you import the dive profiles from these different dive " @@ -1165,13 +1165,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:628 +#: user-manual.txt:630 #, no-wrap msgid "Updating the dive information imported from the dive computer." msgstr "" #. type: Plain text -#: user-manual.txt:635 +#: user-manual.txt:637 msgid "" "With the uploaded dives in the *Dive List*, the information from the dive " "computer is not complete and more details must be added to have a full " @@ -1180,13 +1180,13 @@ msgid "" msgstr "" #. type: Title ===== -#: user-manual.txt:637 +#: user-manual.txt:639 #, no-wrap msgid "Notes" msgstr "" #. type: Plain text -#: user-manual.txt:642 +#: user-manual.txt:644 msgid "" "To have a more complete dive record, the user needs to add additional " "information by hand. The procedure below is virtually identical for " @@ -1194,7 +1194,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:652 +#: user-manual.txt:654 msgid "" "In some cases, you must provide the date and time of the dive, for example " "when entering a dive by hand or when a dive computer doesn’t provide the " @@ -1207,24 +1207,24 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:653 +#: user-manual.txt:655 #, no-wrap msgid "images/AddDive3_f22.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:662 +#: user-manual.txt:664 msgid "" "The right hand image, above, shows a *Notes tab* filled with dive " -"information. The *Time* field reflects the date and time of the dive. By " -"clicking the date, a calendar is displayed for selecting the correct " -"date. Press ESC to close the calendar. The time values (hour and minutes) " -"can also be edited directly by clicking on each of them in the text box and " -"by over-typing the information displayed." +"information. The *Date* and *Time* fields reflects the date and time of the " +"dive. By clicking the date, a calendar is displayed for selecting the " +"correct date. Press ESC to close the calendar. The time values (hour and " +"minutes) can also be edited directly by clicking on each of them in the text " +"box and by over-typing the information displayed." msgstr "" #. type: Plain text -#: user-manual.txt:672 +#: user-manual.txt:674 #, no-wrap msgid "" "*Air/water temperatures*: Air and water temperatures during the dive are " @@ -1244,13 +1244,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:675 +#: user-manual.txt:677 #, no-wrap msgid "*Location*:\n" msgstr "" #. type: Plain text -#: user-manual.txt:683 +#: user-manual.txt:685 msgid "" "Dive locations are managed as a *separate* part of the dive log. The dive " "information in the *Notes* and *Equipment* tabs can therefore NOT be edited " @@ -1262,42 +1262,41 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:701 +#: user-manual.txt:702 msgid "" "Type in the name of the dive site, e.g. \"Tihany, Lake Balaton, Hungary\". " "If several dives are made at the same location, the site information for the " "first dive is re-used. Existing dive locations can be edited by selecting " "(on the *Dive List* panel) a dive done at that site and by opening the " "location information. Click the globe button on the right of the location " -"name (see image on the right, above). When entering a dive location name, " -"auto location of dive site names makes it easy to select an existing dive " -"site name. When typing the name of a dive site, a dropdown list appears " -"showing all sites with similar names. If the dive site has been used before, " -"click on the already-existing name. The dive site names in the dropdown " -"list contain either a globe symbol (indicating existing dive sites in the " -"_Subsurface_ database) or a *+* symbol (indicating dive site names that " -"appear consistent with the current dive site name but which haven’t been " -"added to the dive site database). If the present dive site has not been " -"used before, a message appears as follows (image *A* below):" +"name (see image image *A* below). When typing the name of a dive site, a " +"dropdown list appears showing all sites with similar names. If the dive site " +"has been used before, click on the already-existing name. The dive site " +"names in the dropdown list contain either a globe symbol (indicating " +"existing dive sites in the _Subsurface_ database) or a *+* symbol " +"(indicating dive site names that appear consistent with the current dive " +"site name but which haven’t been added to the dive site database). If the " +"present dive site has not been used before, a message appears as follows " +"(image *A* below):" msgstr "" #. type: Target for macro image -#: user-manual.txt:702 +#: user-manual.txt:703 #, no-wrap msgid "images/Locations1_f22.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:707 +#: user-manual.txt:708 msgid "" -"Doubleclick on the new dive site name. A panel appears to enter the " -"coordinates and other information about the site (image *B*, above). The " -"most important items are the coordinates of the site. There are three ways " -"to specify coordinates:" +"Click the globe button and a panel appears to enter the coordinates and " +"other information about the site (image *B*, above). The most important " +"items are the coordinates of the site. There are three ways to specify " +"coordinates:" msgstr "" #. type: Plain text -#: user-manual.txt:713 +#: user-manual.txt:714 msgid "" "Use the world map in the bottom right hand part of the _Subsurface_ " "window. The map displays an orange bar indicating \"No location data - Move " @@ -1307,7 +1306,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:718 +#: user-manual.txt:719 msgid "" "Use eiher the Subsurface-Mobile App or the _Subsurface_ Companion App on an " "Android or iPhone device with GPS and if the dive site coordinates were " @@ -1316,14 +1315,14 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:720 +#: user-manual.txt:721 msgid "" "Enter coordiantes by hand if they are known, using one of four formats with " "latitude followed by longitude:" msgstr "" #. type: Plain text -#: user-manual.txt:725 +#: user-manual.txt:726 msgid "" "ISO 6709 Annex D format e.g. 30°13'28.9\"N 30°49'1.5\"E Degrees and decimal " "minutes, e.g. N30° 13.49760' , E30° 49.30788' Degrees minutes seconds, " @@ -1332,7 +1331,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:733 +#: user-manual.txt:734 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 " @@ -1344,7 +1343,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:739 +#: user-manual.txt:740 #, no-wrap msgid "" "*Important*: GPS coordinates of a dive site are linked to the location\n" @@ -1355,7 +1354,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:749 +#: user-manual.txt:750 #, no-wrap msgid "" "*Dive site name lookup:* If you typed coordinates into the appropriate\n" @@ -1372,7 +1371,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:754 +#: user-manual.txt:755 msgid "" "Enter any other contextual information about the dive site (Description and " "Notes), then select _Apply Changes_ to save the geolocation for this dive " @@ -1381,7 +1380,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:759 +#: user-manual.txt:760 #, no-wrap msgid "" "*Dive mode*: This is a dropdown box allowing you to choose the type of " @@ -1393,17 +1392,17 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:764 +#: user-manual.txt:765 #, no-wrap msgid "" "*Divemaster*: The name of the divemaster or dive guide should be\n" "entered in this field\n" -"which offers auto selection based on the list of dive masters in\n" +"which offers auto selection based on the list of divemasters in\n" "the current logbook.\n" msgstr "" #. type: Plain text -#: user-manual.txt:769 +#: user-manual.txt:770 #, no-wrap msgid "" "*Buddy*: In this field, enter the name(s) of the buddy or buddies\n" @@ -1414,7 +1413,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:774 +#: user-manual.txt:775 #, no-wrap msgid "" "*Suit*: Here the type of dive suit used can be entered.\n" @@ -1425,7 +1424,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:777 +#: user-manual.txt:778 #, no-wrap msgid "" "*Rating*: Provide a subjective overall rating of the dive on a\n" @@ -1433,7 +1432,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:780 +#: user-manual.txt:781 #, no-wrap msgid "" "*Visibility*: Provide a rating of visibility during the\n" @@ -1441,7 +1440,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:787 +#: user-manual.txt:788 #, no-wrap msgid "" "*Tags*: Tags that describe the type of dive done can be entered\n" @@ -1455,13 +1454,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:789 +#: user-manual.txt:790 #, no-wrap msgid "*Notes*: Any additional information for the dive can be entered here.\n" msgstr "" #. type: Plain text -#: user-manual.txt:794 +#: user-manual.txt:795 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* " @@ -1471,13 +1470,13 @@ msgid "" msgstr "" #. type: Title ===== -#: user-manual.txt:795 +#: user-manual.txt:796 #, no-wrap msgid "Equipment" msgstr "" #. type: Plain text -#: user-manual.txt:800 +#: user-manual.txt:801 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 " @@ -1485,7 +1484,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:807 +#: user-manual.txt:808 msgid "" "shows the equipment is being edited. This is a highly interactive part of " "_Subsurface_ and the information on cylinders and gases (entered here) " @@ -1493,7 +1492,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:811 +#: user-manual.txt:812 #, no-wrap msgid "" "*Cylinders*: The cylinder information is entered through a dialogue that " @@ -1502,13 +1501,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:812 +#: user-manual.txt:813 #, no-wrap msgid "images/DC_gas-dialogue1_f20.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:825 +#: user-manual.txt:826 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 " @@ -1524,13 +1523,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:826 +#: user-manual.txt:827 #, no-wrap msgid "images/DC_gas-dialogue2_f20.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:833 +#: user-manual.txt:834 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 " @@ -1540,7 +1539,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:837 +#: user-manual.txt:838 msgid "" "Next, indicate the starting pressure and the ending pressure of the " "specified gas during the dive. The unit of pressure (metric/imperial) " @@ -1548,7 +1547,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:848 +#: user-manual.txt:849 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 " @@ -1562,13 +1561,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:849 +#: user-manual.txt:850 #, no-wrap msgid "images/CylinderDataEntry3_f20.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:855 +#: user-manual.txt:856 #, no-wrap msgid "" "*Weights*: Information about the weight system used can be entered\n" @@ -1579,26 +1578,26 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:856 +#: user-manual.txt:857 #, no-wrap msgid "images/WeightsDataEntry1_f20.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:860 +#: user-manual.txt:861 msgid "" "By clicking on the _Type_ field, a drop-down list becomes accessible through " "a down-arrow:" msgstr "" #. type: Target for macro image -#: user-manual.txt:861 +#: user-manual.txt:862 #, no-wrap msgid "images/WeightsDataEntry2_f20.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:875 +#: user-manual.txt:876 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 " @@ -1613,22 +1612,22 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:876 +#: user-manual.txt:877 #, no-wrap msgid "images/WeightsDataEntry3_f20.jpg" msgstr "" #. type: Title ==== -#: user-manual.txt:878 +#: user-manual.txt:879 #, no-wrap msgid "Editing several selected dives simultaneously" msgstr "" #. type: Plain text -#: user-manual.txt:894 +#: user-manual.txt:895 msgid "" -"_METHOD 1_: After uploading dives from a dive computer, the dive profiles of " -"each is shown in the *Dive profile* tab, as well as a few items of " +"_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 " "information in the *Notes* tab (e.g. water temperature) and in the " "*Equipment* tab (e.g. gas pressures and gas composition). Other fields " "remain empty. It may be useful to simultaneously edit some of the fields in " @@ -1643,7 +1642,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:904 +#: user-manual.txt:905 msgid "" "Simultaneous editing only works with fields that do not already contain " "information. This means if some fields have been edited for a particular " @@ -1658,7 +1657,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:913 +#: user-manual.txt:914 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 " @@ -1673,13 +1672,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:915 +#: user-manual.txt:916 #, no-wrap msgid "Adding Bookmarks to a dive" msgstr "" #. type: Plain text -#: user-manual.txt:920 +#: user-manual.txt:921 msgid "" "Many divers wish to annotate dives with text that indicate particular " "events, e.g. \"Saw dolphins\", or \"Released surface buoy\". This is easily " @@ -1687,7 +1686,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:924 +#: user-manual.txt:925 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 " @@ -1695,40 +1694,40 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:926 +#: user-manual.txt:927 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:929 +#: user-manual.txt:930 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:932 +#: user-manual.txt:933 msgid "" "Hovering the mouse over the red bookmark, the appropriate text is shown at " "the bottom of the information box (see *D* below)." msgstr "" #. type: Target for macro image -#: user-manual.txt:933 +#: user-manual.txt:934 #, no-wrap msgid "images/Bookmarks.jpg" msgstr "" #. type: Title ==== -#: user-manual.txt:936 +#: user-manual.txt:937 #, no-wrap msgid "Saving the updated dive information" msgstr "" #. type: Plain text -#: user-manual.txt:947 +#: user-manual.txt:948 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 " @@ -1741,7 +1740,7 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:948 +#: user-manual.txt:949 #, no-wrap msgid "" "Importing dive information from other digital data sources or other data " @@ -1749,7 +1748,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:971 +#: user-manual.txt:972 msgid "" "Many divers log their dives using the proprietary software provided by the " "manufacturers of their dive computers. _Subsurface_ can import dive logs " @@ -1770,27 +1769,28 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:981 +#: user-manual.txt:984 msgid "" "If the format of other software is supported natively on Subsurface, select " -"either _Import -> Import log files_ or _File -> Open log file_. _Subsurface_ " -"supports the data formats of many dive computers, including Suunto, " -"Shearwater and some CCR equipment. When importing dives, _Subsurface_ tries " -"to detect multiple records for the same dive and merges the information as " -"best as it can. If there are no time zone issues (or other reasons that " -"would cause the beginning time of the dives to be significantly different) " -"_Subsurface_ will not create duplicate entries. Below is more specific " -"information to import data to _Subsurface_." +"either _Import -> Import log files_ or _File -> Open log file_. Notice that " +"the import adds the imported data to the current *Dive list*, and the open " +"style starts a new dive list. _Subsurface_ supports the data formats of many " +"dive computers, including Suunto, Shearwater and some CCR equipment. When " +"importing dives, _Subsurface_ tries to detect multiple records for the same " +"dive and merges the information as best as it can. If there are no time zone " +"issues (or other reasons that would cause the beginning time of the dives to " +"be significantly different) _Subsurface_ will not create duplicate " +"entries. Below is more specific information to import data to _Subsurface_." msgstr "" #. type: Title ==== -#: user-manual.txt:982 +#: user-manual.txt:985 #, no-wrap msgid "Using the universal import dialogue" msgstr "" #. type: Plain text -#: user-manual.txt:988 +#: user-manual.txt:991 msgid "" "Importing dives from other software is done through a universal interface " "activated by selecting _Import_ from the Main Menu, then clicking on _Import " @@ -1798,13 +1798,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:989 +#: user-manual.txt:992 #, no-wrap msgid "images/Import1_f20.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:994 +#: user-manual.txt:997 msgid "" "Towards the bottom right is a dropdown selector with a default label of " "_Dive Log Files_ which accesses different types of direct imports available, " @@ -1812,79 +1812,89 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:996 +#: user-manual.txt:999 msgid "" "XML-formatted dive logs (DivingLog 5.0, MacDive and several other dive log " "systems)" msgstr "" #. type: Plain text -#: user-manual.txt:997 +#: user-manual.txt:1000 msgid "Cochran dive logs" msgstr "" #. type: Plain text -#: user-manual.txt:998 +#: user-manual.txt:1001 msgid "UDDF-formatted dive logs (e.g. Kenozooid)" msgstr "" #. type: Plain text -#: user-manual.txt:999 +#: user-manual.txt:1002 msgid "UDCF-formatted dive logs" msgstr "" #. type: Plain text -#: user-manual.txt:1000 +#: user-manual.txt:1003 msgid "Poseidon MkVI CCR logs" msgstr "" #. type: Plain text -#: user-manual.txt:1001 +#: user-manual.txt:1004 msgid "APD Inspiration/Evolution CCR logs" msgstr "" #. type: Plain text -#: user-manual.txt:1002 +#: user-manual.txt:1005 msgid "LiquiVision logs" msgstr "" #. type: Plain text -#: user-manual.txt:1003 +#: user-manual.txt:1006 msgid "divelogs.de logs" msgstr "" #. type: Plain text -#: user-manual.txt:1004 +#: user-manual.txt:1007 msgid "OSTC Tools logs" msgstr "" #. type: Plain text -#: user-manual.txt:1005 +#: user-manual.txt:1008 msgid "JDiveLog" msgstr "" #. type: Plain text -#: user-manual.txt:1006 +#: user-manual.txt:1009 msgid "Suunto Dive Manager (DM3, DM4, DM5)" msgstr "" #. type: Plain text -#: user-manual.txt:1007 +#: user-manual.txt:1010 msgid "DL7 files used by Diver's Alert network (DAN)" msgstr "" #. type: Plain text -#: user-manual.txt:1008 +#: user-manual.txt:1011 msgid "Underwater technologies AV1 dive logs" msgstr "" #. type: Plain text -#: user-manual.txt:1009 -msgid "CSV (text-based and spreadsheet-based) dive logs, including APD CCR logs" +#: user-manual.txt:1012 +msgid "Divesoft dive logs" +msgstr "" + +#. type: Plain text +#: user-manual.txt:1013 +msgid "Poseidon MK VI eCCR dive logs" msgstr "" #. type: Plain text #: user-manual.txt:1014 +msgid "CSV (text-based and spreadsheet-based) dive logs, including APD CCR logs" +msgstr "" + +#. type: Plain text +#: user-manual.txt:1019 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 " @@ -1894,13 +1904,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:1015 +#: user-manual.txt:1020 #, no-wrap msgid "Importing from OSTCTools" msgstr "" #. type: Plain text -#: user-manual.txt:1024 +#: user-manual.txt:1029 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 " @@ -1913,7 +1923,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1028 +#: user-manual.txt:1033 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 " @@ -1921,7 +1931,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1033 +#: user-manual.txt:1038 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 " @@ -1930,13 +1940,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:1035 +#: user-manual.txt:1040 #, no-wrap msgid "Importing from Mares Dive Organizer V2.1" msgstr "" #. type: Plain text -#: user-manual.txt:1042 +#: user-manual.txt:1047 msgid "" "Since Mares uses proprietary Windows software not compatible with " "multi-platform applications, these dive logs cannot be directly imported " @@ -1946,7 +1956,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1047 +#: user-manual.txt:1052 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 " @@ -1954,7 +1964,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1053 +#: user-manual.txt:1058 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 " @@ -1964,20 +1974,20 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1055 +#: user-manual.txt:1060 msgid "" "Finally, import the dives from _divelogs.de_ to _Subsurface_, using the " "instructions below." msgstr "" #. type: Title ==== -#: user-manual.txt:1058 +#: user-manual.txt:1063 #, no-wrap msgid "Importing Scubapro _SmartTrak_ divelogs" msgstr "" #. type: Plain text -#: user-manual.txt:1065 +#: user-manual.txt:1070 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 " @@ -1988,7 +1998,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1070 +#: user-manual.txt:1075 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 " @@ -1997,7 +2007,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1073 +#: user-manual.txt:1078 msgid "" "Feel free to contact the _Subsurface_ development team on " "mailto:subsurface@subsurface-divelog.org[our mailing list] for assistance in " @@ -2005,44 +2015,44 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1076 +#: user-manual.txt:1081 msgid "" "Assuming the above dependencies have been installed and the _Subsurface_ " "source tree is in the directory _~/src/subsurface_, then:" msgstr "" #. type: Title ===== -#: user-manual.txt:1077 +#: user-manual.txt:1082 #, no-wrap msgid "Building _smtk2ssrf_" msgstr "" #. type: Plain text -#: user-manual.txt:1080 +#: user-manual.txt:1085 msgid "Move to the source tree directory." msgstr "" #. type: Plain text -#: user-manual.txt:1082 +#: user-manual.txt:1087 msgid "" "Run \" $ ccmake build \" and set SMARTTRAK_IMPORT option to *on* (off by " "default)." msgstr "" #. type: Plain text -#: user-manual.txt:1083 +#: user-manual.txt:1088 msgid "Generate with [c] and save and exit with [g]." msgstr "" #. type: Plain text -#: user-manual.txt:1085 +#: user-manual.txt:1090 msgid "" "Build as you prefer, using the _build.sh_ script (recomended) or moving to " "build directory and running _make_." msgstr "" #. type: Plain text -#: user-manual.txt:1088 +#: user-manual.txt:1093 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 " @@ -2050,13 +2060,13 @@ msgid "" msgstr "" #. type: Title ===== -#: user-manual.txt:1089 +#: user-manual.txt:1094 #, no-wrap msgid "Running" msgstr "" #. type: Plain text -#: user-manual.txt:1095 +#: user-manual.txt:1100 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 " @@ -2065,13 +2075,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1096 +#: user-manual.txt:1101 #, no-wrap msgid "images/smtk2ssrf.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:1103 +#: user-manual.txt:1108 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* " @@ -2079,20 +2089,20 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1105 +#: user-manual.txt:1110 msgid "" "If launched from a command line with two or more parameters, the format is " "as follows:" msgstr "" #. type: Plain text -#: user-manual.txt:1107 +#: user-manual.txt:1112 #, no-wrap msgid "\t$ smrtk2ssrf /input/file_1.slg /input/file_2.slg /output/file3.xml\n" msgstr "" #. type: Plain text -#: user-manual.txt:1115 +#: user-manual.txt:1120 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 " @@ -2103,13 +2113,13 @@ msgid "" msgstr "" #. type: Title ===== -#: user-manual.txt:1116 +#: user-manual.txt:1121 #, no-wrap msgid "Merging the imported dives with the existing divelog" msgstr "" #. type: Plain text -#: user-manual.txt:1126 +#: user-manual.txt:1131 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 " @@ -2122,13 +2132,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:1128 +#: user-manual.txt:1133 #, no-wrap msgid "Importing dives from *divelogs.de*" msgstr "" #. type: Plain text -#: user-manual.txt:1141 +#: user-manual.txt:1146 msgid "" "Importing dive information from _divelogs.de_ is simple, using a single " "dialogue box. The _Import -> Import from Divelogs.de_ option should be " @@ -2142,19 +2152,19 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1142 +#: user-manual.txt:1147 #, no-wrap msgid "images/Divelogs1.jpg" msgstr "" #. type: Title ==== -#: user-manual.txt:1145 +#: user-manual.txt:1150 #, no-wrap msgid "Importing data in CSV format" msgstr "" #. type: Plain text -#: user-manual.txt:1156 +#: user-manual.txt:1161 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 " @@ -2170,13 +2180,13 @@ msgid "" msgstr "" #. type: Title ===== -#: user-manual.txt:1158 +#: user-manual.txt:1163 #, no-wrap msgid "Importing dives in CSV format from dive computers or other dive log software" msgstr "" #. type: Plain text -#: user-manual.txt:1163 +#: user-manual.txt:1168 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 " @@ -2185,14 +2195,14 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1165 +#: user-manual.txt:1170 msgid "" "There are two types of _CSV_ dive logs that can be imported into " "_Subsurface_:" msgstr "" #. type: Plain text -#: user-manual.txt:1171 +#: user-manual.txt:1176 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, " @@ -2203,7 +2213,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1180 +#: user-manual.txt:1185 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 " @@ -2217,14 +2227,14 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1183 +#: user-manual.txt:1188 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:1191 +#: user-manual.txt:1196 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 " @@ -2236,7 +2246,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1195 +#: user-manual.txt:1200 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 " @@ -2245,12 +2255,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1197 +#: user-manual.txt:1202 msgid "Is the numeric information (e.g. dive depth) in metric or in imperial units?" msgstr "" #. type: Plain text -#: user-manual.txt:1204 +#: user-manual.txt:1209 msgid "" "With this information, importing the data into _Subsurface_ is " "straightforward. Select _Import -> Import Log Files_ from the main menu. In " @@ -2260,13 +2270,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1205 +#: user-manual.txt:1210 #, no-wrap msgid "images/csv_import1_f20.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:1216 +#: user-manual.txt:1221 #, no-wrap msgid "" "At the top left, there is a dropdown list containing pre- configured\n" @@ -2285,7 +2295,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1228 +#: user-manual.txt:1233 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 " @@ -2302,13 +2312,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1229 +#: user-manual.txt:1234 #, no-wrap msgid "images/csv_import2_f20.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:1235 +#: user-manual.txt:1240 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. " @@ -2318,13 +2328,13 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:1239 +#: user-manual.txt:1244 #, no-wrap msgid "*A Diver's Introduction to _CSV_ Files*\n" msgstr "" #. type: delimited block * -#: user-manual.txt:1253 +#: user-manual.txt:1258 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 " @@ -2341,12 +2351,11 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:1262 +#: user-manual.txt:1267 msgid "" -"_CSV_ files can be created or edited with a normal text editor. The most " -"important attribute of a _CSV_ file is the _field separator_, the character " -"used to separate fields within a single line. The field separator is " -"frequently a comma, a colon, a SPACE character or a TAB character. When " +"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 " +"is frequently a comma, a colon, a SPACE character or a TAB character. When " "exporting data from spreadsheet software, the field separator needs to be " "specified in order to create the _CSV_ file. _CSV_ files are normally " "organized into a single line that provides the headers (or _field names_) of " @@ -2357,7 +2366,7 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:1268 +#: user-manual.txt:1273 #, no-wrap msgid "" "\tDive site,Dive date,Time,Dive_duration, Dive_depth,Dive buddy\n" @@ -2368,14 +2377,14 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:1270 +#: user-manual.txt:1275 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:1276 +#: user-manual.txt:1281 #, no-wrap msgid "" "\tDive site\tDive date\tTime\tDive_duration\tDive_depth\tDive buddy\n" @@ -2386,7 +2395,7 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:1284 +#: user-manual.txt:1289 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 " @@ -2400,10 +2409,10 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:1295 +#: user-manual.txt:1300 #, no-wrap msgid "" -"\tDive Time (s)\tDepth (m)\tpO₂ - Setpoint (Bar) \tpO₂ - C1 Cell 1 " +"\tDive Time (s)\tDepth (m)\tpO~2~ - Setpoint (Bar) \tpO~2~ - C1 Cell 1 " "(Bar)\tAmbient temp. (Celsius)\n" "\t0 0.0 0.70 0.81 13.1\n" "\t0 1.2 0.70 0.71 13.1\n" @@ -2417,7 +2426,7 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:1301 +#: user-manual.txt:1306 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_ " @@ -2428,7 +2437,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1314 +#: user-manual.txt:1319 msgid "" "But, the _CSV_ import has a couple of caveats. Avoid some special characters " "like ampersand (&), less than (<), greater than (>) and double quotes (\") " @@ -2441,56 +2450,56 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:1315 +#: user-manual.txt:1320 #, no-wrap msgid "Importing Dive coordinates from a mobile device with GPS." msgstr "" #. type: Plain text -#: user-manual.txt:1319 +#: user-manual.txt:1324 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:1322 +#: user-manual.txt:1327 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:1324 +#: user-manual.txt:1329 msgid "" "Uploading the coordinates from the mobile device to the _Subsurface_ " "Internet server." msgstr "" #. type: Plain text -#: user-manual.txt:1327 +#: user-manual.txt:1332 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:1329 +#: user-manual.txt:1334 msgid "_Subsurface has two tools for achieving this:" msgstr "" #. type: Plain text -#: user-manual.txt:1331 +#: user-manual.txt:1336 msgid "The _Subsurface Companion App_ (Android and iOS)." msgstr "" #. type: Plain text -#: user-manual.txt:1333 +#: user-manual.txt:1338 msgid "The _Subsurface-mobile_ app (Android and iOS)" msgstr "" #. type: Plain text -#: user-manual.txt:1342 +#: user-manual.txt:1347 msgid "" "Both of these applications perform the collection of dive site coordinates " "and the synchronisation with dives in the _Subsurface_ dive list. However, " @@ -2504,26 +2513,26 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1344 +#: user-manual.txt:1349 msgid "" "For information on using the _Subsurface Companion App_, click " "xref:S_Companion[_here_]." msgstr "" #. type: Title ==== -#: user-manual.txt:1345 +#: user-manual.txt:1350 #, no-wrap msgid "Storing and and using GPS locations using _Subsurface-mobile_" msgstr "" #. type: Title ===== -#: user-manual.txt:1347 +#: user-manual.txt:1352 #, no-wrap msgid "Install _Subsurface-mobile_" msgstr "" #. type: Plain text -#: user-manual.txt:1353 +#: user-manual.txt:1358 msgid "" "Find _Subsurface-mobile_ on Google Play and install it on an Android " "device. The app is free. The iOS version is currently " @@ -2533,13 +2542,13 @@ msgid "" msgstr "" #. type: Title ===== -#: user-manual.txt:1354 +#: user-manual.txt:1359 #, no-wrap msgid "Create a _Subsurface-mobile_ account" msgstr "" #. type: Plain text -#: user-manual.txt:1362 +#: user-manual.txt:1367 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 " @@ -2551,7 +2560,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1365 +#: user-manual.txt:1370 #, no-wrap msgid "" "*N.B.:* To successfully create a user account, the mobile device must have " @@ -2560,19 +2569,19 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1366 +#: user-manual.txt:1371 #, no-wrap msgid "images/MobileCredentials.jpg" msgstr "" #. type: Title ===== -#: user-manual.txt:1369 +#: user-manual.txt:1374 #, no-wrap msgid "Configure auto-collecting of GPS coordinates" msgstr "" #. type: Plain text -#: user-manual.txt:1375 +#: user-manual.txt:1380 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 " @@ -2582,19 +2591,19 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1377 +#: user-manual.txt:1382 msgid "" "_Time threshold._ (minutes). The app will try to get a location every X " "minutes" msgstr "" #. type: Plain text -#: user-manual.txt:1379 +#: user-manual.txt:1384 msgid "_Distance threshold._ (meters). Minimum distance between two locations." msgstr "" #. type: Plain text -#: user-manual.txt:1388 +#: user-manual.txt:1393 #, no-wrap msgid "" "*How are GPS coordinates collected?* Assuming the diver sets 5 minutes and " @@ -2614,13 +2623,13 @@ msgid "" msgstr "" #. type: Title ===== -#: user-manual.txt:1389 +#: user-manual.txt:1394 #, no-wrap msgid "Activate the automated recording of GPS locations" msgstr "" #. type: Plain text -#: user-manual.txt:1394 +#: user-manual.txt:1399 msgid "" "The _Subsurface-mobile_ main menu has a checkbox at the bottom left labled " "_Run location service_ (see image below). Checking the box starts the " @@ -2628,32 +2637,32 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1395 +#: user-manual.txt:1400 #, no-wrap msgid "images/MobileMenu.jpg" msgstr "" #. type: Title ===== -#: user-manual.txt:1397 +#: user-manual.txt:1402 #, no-wrap msgid "After the dive, stop the automated recording of GPS locations" msgstr "" #. type: Plain text -#: user-manual.txt:1400 +#: user-manual.txt:1405 msgid "" "Uncheck the check box at the bottom left of the _Subsurface-mobile_ main " "menu." msgstr "" #. type: Title ===== -#: user-manual.txt:1401 +#: user-manual.txt:1406 #, no-wrap msgid "Upload the GPS locations onto the _Subsurface_ Internet server." msgstr "" #. type: Plain text -#: user-manual.txt:1408 +#: user-manual.txt:1413 #, no-wrap msgid "" "*N.B.:* Uploading the GPS locations to the Internet can only take place if " @@ -2668,21 +2677,20 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1412 +#: user-manual.txt:1416 msgid "" "From the _Subsurface-mobile_ main menu, select _GPS_ -> _Upload GPS " -"data_. The locations are uploaded. Check the indicator at the top of the " -"mobile screen for internet activity, indicating the transfer of information." +"data_. The locations are uploaded." msgstr "" #. type: Title ===== -#: user-manual.txt:1413 +#: user-manual.txt:1417 #, no-wrap msgid "Apply the stored GPS locations to dives on the _Subsurface_ dive list." msgstr "" #. type: Plain text -#: user-manual.txt:1422 +#: user-manual.txt:1426 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 " @@ -2694,7 +2702,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1427 +#: user-manual.txt:1431 msgid "" "The " "https://subsurface-divelog.org/documentation/subsurface-mobile-user-manual[user " @@ -2704,7 +2712,7 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:1430 +#: user-manual.txt:1434 #, no-wrap msgid "" "Importing GPS coordinates with the _Subsurface Companion App_ for mobile " @@ -2712,7 +2720,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1439 +#: user-manual.txt:1443 #, no-wrap msgid "" "Using the *Subsurface Companion App* on an _Android device_ or\n" @@ -2727,13 +2735,13 @@ msgid "" msgstr "" #. type: Title ===== -#: user-manual.txt:1440 +#: user-manual.txt:1444 #, no-wrap msgid "Create a Companion App account" msgstr "" #. type: Plain text -#: user-manual.txt:1445 +#: user-manual.txt:1449 msgid "" "Register on the http://api.hohndel.org/login/[_Subsurface companion web " "page_]. A confirmation email with instructions and a personal *DIVERID* " @@ -2742,27 +2750,27 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1450 +#: user-manual.txt:1454 msgid "" "Download the app from " "https://play.google.com/store/apps/details?id=org.subsurface[Google Play " "Store] or from " -"http://f-droid.org/repository/browse/?fdfilter=subsurface&fdid=org.subsurface[F-Droid]." +"https://f-droid.org/repository/browse/?fdfilter=subsurface&fdid=org.subsurface[F-Droid]." msgstr "" #. type: Title ===== -#: user-manual.txt:1451 +#: user-manual.txt:1455 #, no-wrap msgid "Using the Subsurface companion app on an Android smartphone" msgstr "" #. type: Plain text -#: user-manual.txt:1454 +#: user-manual.txt:1458 msgid "On first use the app has three options:" msgstr "" #. type: Plain text -#: user-manual.txt:1460 +#: user-manual.txt:1464 msgid "" "_Create a new account._ Equivalent to registering in the _Subsurface_ " "companion page using an Internet browser. You can request a *DIVERID* using " @@ -2772,14 +2780,14 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1463 +#: user-manual.txt:1467 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:1467 +#: user-manual.txt:1471 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 " @@ -2787,22 +2795,22 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1475 +#: user-manual.txt:1479 msgid "" "In the _Subsurface_ main program, the *DIVERID* should also be entered on " -"the Default Preferences panel, by selecting _File -> Preferences -> " -"Defaults_ from the main menu in _Subsurface_ itself. This helps " -"synchronization between _Subsurface_ and the Companion App." +"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:1477 +#: user-manual.txt:1481 #, no-wrap msgid "*Creating new dive locations*\n" msgstr "" #. type: Plain text -#: user-manual.txt:1481 +#: user-manual.txt:1485 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 " @@ -2810,21 +2818,21 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1484 +#: user-manual.txt:1488 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:1487 +#: user-manual.txt:1491 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:1496 +#: user-manual.txt:1500 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 " @@ -2837,28 +2845,28 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1497 +#: user-manual.txt:1501 #, no-wrap msgid "images/Companion_5.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:1504 +#: user-manual.txt:1508 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, then select the tab " -"in the upper right, afterAndroid device." +"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:1506 +#: user-manual.txt:1511 #, no-wrap -msgid "*Dive lists of dive locations*\n" +msgid "*List of dive locations*\n" msgstr "" #. type: Plain text -#: user-manual.txt:1513 +#: user-manual.txt:1518 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 " @@ -2869,7 +2877,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1521 +#: user-manual.txt:1526 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 " @@ -2881,13 +2889,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1522 +#: user-manual.txt:1527 #, no-wrap msgid "images/Companion_4.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:1528 +#: user-manual.txt:1533 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 " @@ -2895,14 +2903,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1530 -msgid "" -"Edit (pencil): Change the text name or other characteristics of the dive " -"location." +#: user-manual.txt:1535 +msgid "Edit (pencil): Change the name of the dive location." msgstr "" #. type: Plain text -#: user-manual.txt:1535 +#: user-manual.txt:1540 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 " @@ -2910,13 +2916,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1537 +#: user-manual.txt:1542 #, no-wrap msgid "*Uploading dive locations*\n" msgstr "" #. type: Plain text -#: user-manual.txt:1542 +#: user-manual.txt:1547 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 " @@ -2924,50 +2930,50 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1547 +#: user-manual.txt:1552 msgid "" "Be careful! The trash icon on the right means exactly what it should; it " "deletes the selected dive location(s)." msgstr "" #. type: Target for macro image -#: user-manual.txt:1548 +#: user-manual.txt:1553 #, no-wrap msgid "images/Companion_1.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:1553 +#: user-manual.txt:1558 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:1556 +#: user-manual.txt:1561 #, no-wrap msgid "*Settings on the Companion App*\n" msgstr "" #. type: Plain text -#: user-manual.txt:1558 +#: user-manual.txt:1563 msgid "" "Selecting the _Settings_ menu option results in the right hand image above " "(*B*)." msgstr "" #. type: Plain text -#: user-manual.txt:1560 +#: user-manual.txt:1565 msgid "_Server and account_" msgstr "" #. type: Plain text -#: user-manual.txt:1562 +#: user-manual.txt:1567 msgid "_Web-service URL._ This is predefined (http://api.hohndel.org/)" msgstr "" #. type: Plain text -#: user-manual.txt:1565 +#: user-manual.txt:1570 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 " @@ -2975,31 +2981,31 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1567 +#: user-manual.txt:1572 msgid "_Synchronisation_" msgstr "" #. type: Plain text -#: user-manual.txt:1570 +#: user-manual.txt:1575 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:1573 +#: user-manual.txt:1578 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:1575 +#: user-manual.txt:1580 msgid "_Background service_" msgstr "" #. type: Plain text -#: user-manual.txt:1578 +#: user-manual.txt:1583 msgid "" "Instead of entering an unique dive location, you can leave the service " "running in the background, allowing a continuous collection of GPS " @@ -3007,35 +3013,35 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1580 +#: user-manual.txt:1585 msgid "The settings below define the behavior of the service:" msgstr "" #. type: Plain text -#: user-manual.txt:1583 +#: user-manual.txt:1588 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:1585 +#: user-manual.txt:1590 msgid "_Min distance._ In meters. Minimum distance between two locations." msgstr "" #. type: Plain text -#: user-manual.txt:1587 +#: user-manual.txt:1592 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:1588 user-manual.txt:1689 user-manual.txt:2114 +#: user-manual.txt:1593 user-manual.txt:1694 user-manual.txt:2119 #, no-wrap msgid "images/icons/info.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:1598 +#: user-manual.txt:1603 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 " @@ -3048,54 +3054,54 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1600 +#: user-manual.txt:1605 msgid "_Other_" msgstr "" #. type: Plain text -#: user-manual.txt:1603 +#: user-manual.txt:1608 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:1605 +#: user-manual.txt:1610 msgid "_Subsurface website._ A link to the URL of Subsurface web" msgstr "" #. type: Plain text -#: user-manual.txt:1607 +#: user-manual.txt:1612 msgid "_Version._ Displays the current version of the Companion App." msgstr "" #. type: Plain text -#: user-manual.txt:1609 +#: user-manual.txt:1614 msgid "_Search_" msgstr "" #. type: Plain text -#: user-manual.txt:1611 +#: user-manual.txt:1616 msgid "Search the saved dive locations by name or by date and time." msgstr "" #. type: Plain text -#: user-manual.txt:1613 +#: user-manual.txt:1618 msgid "_Start service_" msgstr "" #. type: Plain text -#: user-manual.txt:1615 +#: user-manual.txt:1620 msgid "Starts the _background service_ following the previously defined settings." msgstr "" #. type: Plain text -#: user-manual.txt:1617 +#: user-manual.txt:1622 msgid "_Disconnect_" msgstr "" #. type: Plain text -#: user-manual.txt:1624 +#: user-manual.txt:1629 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 " @@ -3105,23 +3111,23 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1626 +#: user-manual.txt:1631 msgid "_Send all locations_" msgstr "" #. type: Plain text -#: user-manual.txt:1628 +#: user-manual.txt:1633 msgid "This option sends all locations stored in the Android device to the server." msgstr "" #. type: Title ===== -#: user-manual.txt:1630 +#: user-manual.txt:1635 #, no-wrap msgid "Using the Subsurface companion app on an _iPhone_ to record dive locations" msgstr "" #. type: Plain text -#: user-manual.txt:1635 +#: user-manual.txt:1640 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 " @@ -3130,13 +3136,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1636 +#: user-manual.txt:1641 #, no-wrap msgid "images/iphone.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:1647 +#: user-manual.txt:1652 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 " @@ -3150,7 +3156,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1653 +#: user-manual.txt:1658 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 " @@ -3159,13 +3165,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1656 +#: user-manual.txt:1661 #, no-wrap msgid "*Downloading dive locations to the _Subsurface_ divelog*\n" msgstr "" #. type: Plain text -#: user-manual.txt:1664 +#: user-manual.txt:1669 msgid "" "Download dive(s) from a dive computer or enter them manually into " "_Subsurface_ before obtaining the GPS coordinates from the server. The " @@ -3177,13 +3183,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1665 +#: user-manual.txt:1670 #, no-wrap msgid "images/DownloadGPS.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:1673 +#: user-manual.txt:1678 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 " @@ -3194,7 +3200,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1680 +#: user-manual.txt:1685 msgid "" "Since _Subsurface_ matches GPS locations from the mobile device and dive " "information from the dive computer based on date-time data, automatic " @@ -3206,7 +3212,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1688 +#: user-manual.txt:1693 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 " @@ -3219,12 +3225,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1692 +#: user-manual.txt:1697 msgid "TIPS:" msgstr "" #. type: Plain text -#: user-manual.txt:1695 +#: user-manual.txt:1700 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 " @@ -3232,14 +3238,14 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1696 +#: user-manual.txt:1701 msgid "" "Right now, these locations are difficult to delete from the server. In some " "situations it" msgstr "" #. type: Plain text -#: user-manual.txt:1699 +#: user-manual.txt:1704 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 " @@ -3248,7 +3254,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1702 +#: user-manual.txt:1707 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_ " @@ -3257,13 +3263,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:1704 +#: user-manual.txt:1709 #, no-wrap msgid "Adding photographs to dives" msgstr "" #. type: Plain text -#: user-manual.txt:1710 +#: user-manual.txt:1715 msgid "" "Many (if not most) divers take photographs during a dive. _Subsurface_ " "allows the storage and display of photographs for each dive. Photos are " @@ -3272,29 +3278,29 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:1711 +#: user-manual.txt:1716 #, no-wrap msgid "Loading photos and synchronizing between dive computer and camera" msgstr "" #. type: Plain text -#: user-manual.txt:1717 +#: user-manual.txt:1722 msgid "" -"Left-lick on a dive or on a group of dives on the dive list, bringing up the " -"xref:S_DiveListContextMenu[Dive list context Menu]. Right-click the " +"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: Target for macro image -#: user-manual.txt:1718 +#: user-manual.txt:1723 #, no-wrap msgid "images/LoadImage2_f20.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:1725 +#: user-manual.txt:1730 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: " @@ -3304,9 +3310,9 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1732 +#: user-manual.txt:1737 msgid "" -"Having selected the local folder ot Internet image to be imported, the time " +"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 " @@ -3316,12 +3322,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1734 +#: user-manual.txt:1739 msgid "_Subsurface_ synchronizes camera with dive computer in three ways:" msgstr "" #. type: Plain text -#: user-manual.txt:1737 +#: user-manual.txt:1742 #, no-wrap msgid "" "*Pro-actively*: Before the dive, ensure synchronization of the dive computer " @@ -3331,7 +3337,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1748 +#: user-manual.txt:1753 #, no-wrap msgid "" "*Manually*: Writing down the exact camera time at the start of a dive allows " @@ -3354,13 +3360,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1749 +#: user-manual.txt:1754 #, no-wrap msgid "images/LoadImage3b_f23.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:1767 +#: user-manual.txt:1772 #, no-wrap msgid "" "*By photograph*: There is a very slick way of achieving synchronization, " @@ -3395,13 +3401,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1768 +#: user-manual.txt:1773 #, no-wrap msgid "images/LoadImage3c_f23.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:1772 +#: user-manual.txt:1777 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 " @@ -3412,23 +3418,23 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:1773 +#: user-manual.txt:1778 #, no-wrap msgid "Viewing the photos" msgstr "" #. type: Plain text -#: user-manual.txt:1776 +#: user-manual.txt:1781 msgid "After the images have been loaded, they appear in two places:" msgstr "" #. type: Plain text -#: user-manual.txt:1778 +#: user-manual.txt:1783 msgid "the _Photos_ tab of the *Notes* panel (left part of image below)." msgstr "" #. type: Plain text -#: user-manual.txt:1782 +#: user-manual.txt:1787 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 " @@ -3437,37 +3443,37 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1783 +#: user-manual.txt:1788 #, no-wrap msgid "images/icons/ShowPhotos_f20.png" msgstr "" #. type: Plain text -#: user-manual.txt:1786 +#: user-manual.txt:1791 msgid "This results in a profile display as in the image below:" msgstr "" #. type: Target for macro image -#: user-manual.txt:1787 +#: user-manual.txt:1792 #, no-wrap msgid "images/LoadImage4_f20.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:1791 +#: user-manual.txt:1796 msgid "" "Hover the mouse over any of the photo stubs. A thumbnail photo is shown of " "the appropriate photo. See the image below:" msgstr "" #. type: Target for macro image -#: user-manual.txt:1792 +#: user-manual.txt:1797 #, no-wrap msgid "images/LoadImage5_f20.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:1801 +#: user-manual.txt:1806 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 " @@ -3478,19 +3484,19 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1802 +#: user-manual.txt:1807 #, no-wrap msgid "images/LoadImage6_f20.jpg" msgstr "" #. type: Title ==== -#: user-manual.txt:1804 +#: user-manual.txt:1809 #, no-wrap msgid "The _Photos_ tab" msgstr "" #. type: Plain text -#: user-manual.txt:1814 +#: user-manual.txt:1819 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 " @@ -3506,13 +3512,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:1815 +#: user-manual.txt:1820 #, no-wrap msgid "Photos on an external hard disk" msgstr "" #. type: Plain text -#: user-manual.txt:1825 +#: user-manual.txt:1830 msgid "" "Most underwater photographers store photos on an external drive. If such a " "drive can be mapped by the operating system (almost always the case) the " @@ -3529,13 +3535,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:1826 +#: user-manual.txt:1831 #, no-wrap msgid "Finding out which dives have associated photos." msgstr "" #. type: Plain text -#: user-manual.txt:1831 +#: user-manual.txt:1836 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 " @@ -3549,13 +3555,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:1833 +#: user-manual.txt:1838 #, no-wrap msgid "Moving photographs among directories, hard disks or computers" msgstr "" #. type: Plain text -#: user-manual.txt:1842 +#: user-manual.txt:1847 #, no-wrap msgid "" "After a photograph has been loaded into _Subsurface_ and associated with a " @@ -3575,7 +3581,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1846 +#: user-manual.txt:1851 #, no-wrap msgid "" "When a photo is loaded into _Subsurface_, a fingerprint for the image is " @@ -3587,19 +3593,19 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1848 +#: user-manual.txt:1853 msgid "" "look through a particular directory (and all its subdirectories recursively) " "where photos have been moved to," msgstr "" #. type: Plain text -#: user-manual.txt:1849 +#: user-manual.txt:1854 msgid "calculate fingerprints for all photos in this directory, and" msgstr "" #. type: Plain text -#: user-manual.txt:1852 +#: user-manual.txt:1857 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 " @@ -3608,7 +3614,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1857 +#: user-manual.txt:1862 #, no-wrap msgid "" "This is done by selecting from the Main Menu: _File -> Find moved " @@ -3622,13 +3628,13 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:1862 +#: user-manual.txt:1867 #, no-wrap msgid "*Upgrading legacy photo collections without fingerprints*\n" msgstr "" #. type: delimited block * -#: user-manual.txt:1867 +#: user-manual.txt:1872 msgid "" "_Subsurface_ automatically calculates fingerprints for all images that it " "can access. When manipulating images, ensure that all the images associated " @@ -3636,47 +3642,47 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:1869 +#: user-manual.txt:1874 msgid "" "_Subsurface_ automatically checks and, if necessary, updates the " "fingerprints associated with a single dive if:" msgstr "" #. type: delimited block * -#: user-manual.txt:1871 +#: user-manual.txt:1876 msgid "" "The images associated with that dive are visible as thumbnails on the *Dive " "Profile*." msgstr "" #. type: delimited block * -#: user-manual.txt:1873 +#: user-manual.txt:1878 msgid "" "If you edit anything in the *Notes* panel and save the edits by selecting " "_Apply changes_." msgstr "" #. type: Title === -#: user-manual.txt:1876 +#: user-manual.txt:1881 #, no-wrap msgid "Logging special types of dives" msgstr "" #. type: Plain text -#: user-manual.txt:1879 +#: user-manual.txt:1884 msgid "" "This section gives examples of the versatility of _Subsurface_ as a dive " "logging tool." msgstr "" #. type: Title ==== -#: user-manual.txt:1882 +#: user-manual.txt:1887 #, no-wrap msgid "Multicylinder dives" msgstr "" #. type: Plain text -#: user-manual.txt:1889 +#: user-manual.txt:1894 msgid "" "_Subsurface_ easily handles dives involving more than one " "cylinder. Multi-cylinder diving usually happens (a) if a diver doesn’t have " @@ -3688,7 +3694,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1893 +#: user-manual.txt:1898 #, no-wrap msgid "" "*Describe the cylinders used during the dive* This is performed in the " @@ -3700,7 +3706,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1899 +#: user-manual.txt:1904 #, no-wrap msgid "" "*Record the times at which the switch from one cylinder to another was " @@ -3715,7 +3721,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1907 +#: user-manual.txt:1912 #, no-wrap msgid "" "*Record the cylinder changes on the dive profile*: If the latter option\n" @@ -3732,7 +3738,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1911 +#: user-manual.txt:1916 msgid "" "When this is complete, _Subsurface_ indicates the appropriate use of " "cylinders in the dive profile. Below is a two-cylinder dive, starting off " @@ -3741,19 +3747,19 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1912 +#: user-manual.txt:1917 #, no-wrap msgid "images/multicylinder_dive.jpg" msgstr "" #. type: Title ==== -#: user-manual.txt:1914 +#: user-manual.txt:1919 #, no-wrap msgid "Sidemount dives" msgstr "" #. type: Plain text -#: user-manual.txt:1920 +#: user-manual.txt:1925 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 " @@ -3763,7 +3769,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1929 +#: user-manual.txt:1934 #, no-wrap msgid "" "*During the dive, record cylinder switch events*. Since sidemount diving " @@ -3785,7 +3791,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1932 +#: user-manual.txt:1937 #, no-wrap msgid "" "*Within _Subsurface_ describe the cylinders used during the dive*. The diver " @@ -3796,7 +3802,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1942 +#: user-manual.txt:1947 #, no-wrap msgid "" "*Indicate cylinder change events on the _Subsurface_ dive profile*. Once the " @@ -3821,53 +3827,52 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1943 +#: user-manual.txt:1948 #, no-wrap msgid "images/sidemount1.jpg" msgstr "" #. type: Title ==== -#: user-manual.txt:1946 +#: user-manual.txt:1951 #, no-wrap -msgid "Semi-closed circuit rebreather (SCR) dives" +msgid "Passive semi-closed circuit rebreather (pSCR) dives" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:1948 +#: user-manual.txt:1953 #, no-wrap msgid "images/halcyon_RB80.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:1958 +#: user-manual.txt:1963 msgid "" "Passive semi-closed rebreathers (pSCR) are a technical advance in diving " "equipment that recirculates the breathing gas a diver uses, while removing " "carbon dioxide from the exhaled gas. While a small amount (typically a " "tenth) of the exhaled breathing gas is released into the water, a small " -"amount of fresh gas is released from the back gas cylinder (typically " -"containing nitrox). A diver using a single cylinder of breathing gas can " -"therefore dive for much longer periods than using a recreational " -"open-circuit configuration. With pSCR equipment, a very small amount of " -"breathing gas is released every time the diver inhales. With active SCR " -"(aSCR) equipment, in contrast, a small amount of breathing gas is released " -"continuously from the back cylinder." +"amount of fresh gas is released from the driving gas cylinder. A diver " +"using a single cylinder of breathing gas can therefore dive for much longer " +"periods than using a recreational open-circuit configuration. With pSCR " +"equipment, a very small amount of breathing gas is released every time the " +"diver inhales. With active SCR (aSCR) equipment, in contrast, a small amount " +"of breathing gas is released continuously from the driving cylinder." msgstr "" #. type: Plain text -#: user-manual.txt:1960 +#: user-manual.txt:1965 msgid "" "To log pSCR dives, no special procedures are required. Use the normal steps " "outlined above:" msgstr "" #. type: Plain text -#: user-manual.txt:1962 +#: user-manual.txt:1967 msgid "Select pSCR in the _Dive Mode_ dropdown list on the *Info* panel." msgstr "" #. type: Plain text -#: user-manual.txt:1966 +#: user-manual.txt:1971 msgid "" "pSCR diving often involves gas changes, requiring an additional cylinder. " "Define all the appropriate cylinders as described above and indicate the " @@ -3876,35 +3881,35 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1971 +#: user-manual.txt:1976 msgid "" "If a pSCR _Dive Mode_ has been selected, the dive ceiling for that is " "adjusted for the oxygen drop across the mouthpiece, which often requires " "longer decompression periods. Below is a dive profile of a pSCR dive using " -"EAN36 on the back cylinder and oxygen for decompression. Note that this dive " -"lasted over two hours." +"EAN36 as bottom gas and oxygen for decompression. Note that this dive lasted " +"over two hours." msgstr "" #. type: Target for macro image -#: user-manual.txt:1972 +#: user-manual.txt:1977 #, no-wrap msgid "images/pSCR_profile.jpg" msgstr "" #. type: Title ==== -#: user-manual.txt:1977 +#: user-manual.txt:1982 #, no-wrap msgid "Closed circuit rebreather (CCR) dives" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:1979 +#: user-manual.txt:1984 #, no-wrap msgid "images/APD.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:1984 +#: user-manual.txt:1989 msgid "" "Closed system rebreathers use advanced technology to recirculate gas that " "has been breathed. They also do two things to maintain a breathable oxygen " @@ -3912,12 +3917,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1985 +#: user-manual.txt:1990 msgid "remove carbon dioxide from the exhaled gas" msgstr "" #. type: Plain text -#: user-manual.txt:1994 +#: user-manual.txt:1999 msgid "" "regulate the oxygen concentration to remain within safe diving limits. The " "CCR interface of _Subsurface_ is currently experimental and under active " @@ -3932,13 +3937,13 @@ msgid "" msgstr "" #. type: Title ===== -#: user-manual.txt:1995 +#: user-manual.txt:2000 #, no-wrap msgid "Import a CCR dive" msgstr "" #. type: Plain text -#: user-manual.txt:2012 +#: user-manual.txt:2017 msgid "" "See the section dealing with xref:S_ImportingAlienDiveLogs[Importing dive " "information from other digital sources]. CCR dive data are currently " @@ -3961,13 +3966,13 @@ msgid "" msgstr "" #. type: Title ===== -#: user-manual.txt:2013 +#: user-manual.txt:2018 #, no-wrap msgid "Displayed information for a CCR dive" msgstr "" #. type: Plain text -#: user-manual.txt:2023 +#: user-manual.txt:2028 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 " @@ -3981,12 +3986,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2025 +#: user-manual.txt:2030 msgid "For TWO O~2~ sensors the mean value of the two sensors are given." msgstr "" #. type: Plain text -#: user-manual.txt:2029 +#: user-manual.txt:2034 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 " @@ -3995,37 +4000,37 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2031 +#: user-manual.txt:2036 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:2033 +#: user-manual.txt:2038 msgid "The mean pO~2~ of the sensors is indicated with a green line," msgstr "" #. type: Plain text -#: user-manual.txt:2041 +#: user-manual.txt:2046 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 " "turned on by checking the appropriate boxes in the _Preferences_ panel " "(accessible by selecting xref:S_CCR_options[_File -> Preferences -> " -"Graph_]). This part of the _Preferences_ panel is shown in the image below, " -"representing two checkboxes that modify the display of pO~2~ when the " +"Profile_]). This part of the _Preferences_ panel is shown in the image " +"below, representing two checkboxes that modify the display of pO~2~ when the " "appropriate toolbar button on the Dive Profile has been checked." msgstr "" #. type: Target for macro image -#: user-manual.txt:2042 +#: user-manual.txt:2047 #, no-wrap msgid "images/CCR_preferences_f20.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2049 +#: user-manual.txt:2054 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 " @@ -4036,13 +4041,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2050 +#: user-manual.txt:2055 #, no-wrap msgid "images/CCR_setpoint_f20.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2054 +#: user-manual.txt:2059 msgid "" "The second checkbox allows the display of the data from each individual " "oxygen sensor of the CCR equipment. The data for each sensor is colour-coded " @@ -4050,22 +4055,22 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2056 +#: user-manual.txt:2061 msgid "Sensor 1: grey" msgstr "" #. type: Plain text -#: user-manual.txt:2057 +#: user-manual.txt:2062 msgid "Sensor 2: blue" msgstr "" #. type: Plain text -#: user-manual.txt:2058 +#: user-manual.txt:2063 msgid "Sensor 3: brown" msgstr "" #. type: Plain text -#: user-manual.txt:2062 +#: user-manual.txt:2067 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 " @@ -4073,13 +4078,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2063 +#: user-manual.txt:2068 #, no-wrap msgid "images/CCR_sensor_data_f20.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2068 +#: user-manual.txt:2073 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, " @@ -4087,7 +4092,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2072 +#: user-manual.txt:2077 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 " @@ -4096,7 +4101,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2080 +#: user-manual.txt:2085 msgid "" "_Cylinder pressures_: Some CCR dive computers like the Poseidon MkVI record " "the pressures of the oxygen and diluent cylinders. The pressures of these " @@ -4109,13 +4114,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2081 +#: user-manual.txt:2086 #, no-wrap msgid "images/CCR_dive_profile_f22.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2086 +#: user-manual.txt:2091 msgid "" "_Equipment-specific information_: Equipment-specific information gathered by " "_Subsurface_ is shown in the xref:S_ExtraDataTab[Extra data tab]. This may " @@ -4123,7 +4128,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2092 +#: user-manual.txt:2097 msgid "" "The deco ceiling calculated by Subsurface is not very accurate because the " "precise pressure of nitrogen in the loop can usually not be determined from " @@ -4135,28 +4140,28 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2093 user-manual.txt:2436 +#: user-manual.txt:2098 user-manual.txt:2442 #, no-wrap msgid "images/icons/cceiling.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2098 +#: user-manual.txt:2103 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 -> " -"Preferences -> Graph_. Below is a dive profile indicating the dive " +"Preferences -> Profile_. Below is a dive profile indicating the dive " "computer-generated deco ceiling:" msgstr "" #. type: Target for macro image -#: user-manual.txt:2099 +#: user-manual.txt:2104 #, no-wrap msgid "images/CCR_dive_ceilingF22.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2103 +#: user-manual.txt:2108 msgid "" "More equipment-specific information for downloading CCR dive logs for " "Poseidon MkVI and APD equipment can be found in " @@ -4165,19 +4170,19 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:2104 +#: user-manual.txt:2109 #, no-wrap msgid "Obtaining more information about dives entered into the logbook" msgstr "" #. type: Title === -#: user-manual.txt:2106 +#: user-manual.txt:2111 #, no-wrap msgid "The *Info* tab (for individual dives)" msgstr "" #. type: Plain text -#: user-manual.txt:2113 +#: user-manual.txt:2118 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 " @@ -4187,7 +4192,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2120 +#: user-manual.txt:2125 msgid "" "Gas consumption and SAC calculations: _Subsurface_ calculates SAC and Gas " "consumption taking in account gas incompressibility, particularly at tank " @@ -4196,13 +4201,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:2122 +#: user-manual.txt:2127 #, no-wrap msgid "The *Extra Data* tab (usually for individual dives)" msgstr "" #. type: Plain text -#: user-manual.txt:2130 +#: user-manual.txt:2135 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 " @@ -4214,19 +4219,19 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2131 +#: user-manual.txt:2136 #, no-wrap msgid "images/ExtraDataTab_f20.jpg" msgstr "" #. type: Title === -#: user-manual.txt:2133 +#: user-manual.txt:2138 #, no-wrap msgid "The *Stats* tab (for groups of dives)" msgstr "" #. type: Plain text -#: user-manual.txt:2144 +#: user-manual.txt:2149 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 " @@ -4239,19 +4244,19 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:2146 +#: user-manual.txt:2151 #, no-wrap msgid "The *Dive Profile*" msgstr "" #. type: Target for macro image -#: user-manual.txt:2148 +#: user-manual.txt:2153 #, no-wrap msgid "images/Profile2.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2159 +#: user-manual.txt:2164 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 " @@ -4264,7 +4269,7 @@ msgid "" msgstr "" #. type: delimited block | -#: user-manual.txt:2166 +#: user-manual.txt:2171 #, no-wrap msgid "" "|*Color*|*Descent speed (m/min)*|*Ascent speed (m/min)*\n" @@ -4276,7 +4281,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2171 +#: user-manual.txt:2176 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 " @@ -4285,13 +4290,13 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2172 +#: user-manual.txt:2177 #, no-wrap msgid "images/icons/scale.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2177 +#: user-manual.txt:2182 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 " @@ -4300,7 +4305,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2180 +#: user-manual.txt:2185 #, no-wrap msgid "" "*Water temperature* is shown as a blue line with temperature values\n" @@ -4308,32 +4313,30 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2182 +#: user-manual.txt:2187 #, no-wrap msgid "The *Information Box*" msgstr "" #. type: Plain text -#: user-manual.txt:2191 +#: user-manual.txt:2194 msgid "" "The Information box displays a large range of information about the dive " "profile. Normally the Information Box is located to the top left of the " -"*Dive Profile* panel. If the mouse points outside of the *Dive Profile* " -"panel, then only the top line of the Information Box is visible (see " -"left-hand part of figure (*A*) below). The Information Box can be moved " -"around in the *Dive Profile* panel by click-dragging it with the mouse so " -"that it is not obstructing important detail. The position of the Information " -"Box is saved and used again during subsequent dive analyses." +"*Dive Profile* panel. The Information Box can be moved around in the *Dive " +"Profile* panel by click-dragging it with the mouse so that it is not " +"obstructing important detail. The position of the Information Box is saved " +"and used again during subsequent dive analyses." msgstr "" #. type: Target for macro image -#: user-manual.txt:2192 +#: user-manual.txt:2195 #, no-wrap msgid "images/InfoBox2.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2208 +#: user-manual.txt:2211 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 " @@ -4346,38 +4349,39 @@ msgid "" "dive (indicated by a @), depth, cylinder pressure (P), temperature, " "ascent/descent rate, surface air consumption (SAC), oxygen partial pressure, " "maximum operating depth, equivalent air depth (EAD), equivalent narcotic " -"depth (END), equivalent air density depth (EADD), decompression requirements " -"at that instant in time (Deco), time to surface (TTS), the calculated " -"ceiling, as well as of the statistics in the Information Box, shown as four " -"buttons on the left of the profile panel. These are:" +"depth (END), equivalent air density depth (EADD, also as gas density in " +"g/l), decompression requirements at that instant in time (Deco), time to " +"surface (TTS), the calculated ceiling, as well as of the statistics in the " +"Information Box, shown as four buttons on the left of the profile " +"panel. These are:" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2209 +#: user-manual.txt:2212 #, no-wrap msgid "images/icons/MOD.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2216 +#: user-manual.txt:2219 msgid "" "Show the *Maximum Operating Depth (MOD)* of the dive, given the gas mixture " "used. MOD is dependent on the oxygen concentration in the breathing gas. " "For air (21% oxygen) it is around 57 m if a maximum pO~2~ of 1.4 is " "specified in the *Preferences* section (select _File -> Preferences -> " -"Graph_ and edit the text box _pO~2~ in calculating MOD_. When diving below " -"the MOD there is a markedly increased risk of exposure to the dangers of " -"oxygen toxicity." +"Profile_ and edit the text box _pO~2~ in calculating MOD_. When diving " +"below the MOD there is a markedly increased risk of exposure to the dangers " +"of oxygen toxicity." msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2217 +#: user-manual.txt:2220 #, no-wrap msgid "images/icons/NDL.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2229 +#: user-manual.txt:2231 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, " @@ -4385,22 +4389,20 @@ msgid "" "before an ascent ceiling appears). Once a diver has exceeded the NDL and " "decompression is required (that is, there is an ascent ceiling above the " "diver) then TTS gives the number of minutes required before the diver can " -"surface. TTS includes ascent time as well as decompression time. TTS is " -"calculated assuming an ascent surface air consumption (SAC) for the gas " -"currently used. Even if the profile contains several gas switches, TTS at a " -"specific moment during the dive is calculated using the current gas. TTS " -"longer than 2 hours is not accurately calculated and Subsurface only " -"indicates _TTS > 2h_." +"surface. TTS includes ascent time as well as decompression time. Even if the " +"profile contains several gas switches, TTS at a specific moment during the " +"dive is calculated using the current gas. TTS longer than 2 hours is not " +"accurately calculated and Subsurface only indicates _TTS > 2h_." msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2230 +#: user-manual.txt:2232 #, no-wrap msgid "images/icons/SAC.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2238 +#: user-manual.txt:2240 msgid "" "Show the *Surface Air Consumption (SAC)*, an indication of the " "surface-normalized respiration rate of a diver. The value of SAC is less " @@ -4412,13 +4414,13 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2239 +#: user-manual.txt:2241 #, no-wrap msgid "images/icons/EAD.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2254 +#: user-manual.txt:2256 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 " @@ -4434,20 +4436,20 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2256 +#: user-manual.txt:2258 msgid "" "Figure (*B*) above shows an information box with a nearly complete set of " "data." msgstr "" #. type: Title ===== -#: user-manual.txt:2259 +#: user-manual.txt:2261 #, no-wrap msgid "The Gas Pressure Bar Graph" msgstr "" #. type: Plain text -#: user-manual.txt:2266 +#: user-manual.txt:2268 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 " @@ -4458,13 +4460,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2267 +#: user-manual.txt:2269 #, no-wrap msgid "images/GasPressureBarGraph.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2273 +#: user-manual.txt:2275 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 " @@ -4474,7 +4476,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2279 +#: user-manual.txt:2281 msgid "" "The horizontal black line underneath the light green margin indicates the " "equilibrium pressure of the INERT gases inhaled by the diver, usually " @@ -4485,7 +4487,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2283 +#: user-manual.txt:2285 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 " @@ -4493,17 +4495,17 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2289 +#: user-manual.txt:2291 msgid "" "The top black horizontal line indicates the inert gas pressure limit " "determined by the gradient factor that applies to the depth of the diver at " "the particular point on the *Dive Profile*. The gradient factor shown is an " -"interpolation between the GFLow and GFHigh values specified in the _Graph_ " +"interpolation between the GFLow and GFHigh values specified in the _Profile_ " "tab of the *Preferences Panel* of _Subsurface_." msgstr "" #. type: Plain text -#: user-manual.txt:2293 +#: user-manual.txt:2295 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 " @@ -4512,7 +4514,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2296 +#: user-manual.txt:2298 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 " @@ -4520,7 +4522,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2299 +#: user-manual.txt:2301 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 " @@ -4528,7 +4530,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2302 +#: user-manual.txt:2304 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 " @@ -4536,7 +4538,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2307 +#: user-manual.txt:2309 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 " @@ -4546,7 +4548,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2313 +#: user-manual.txt:2315 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 " @@ -4557,7 +4559,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2318 +#: user-manual.txt:2320 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 " @@ -4567,13 +4569,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2319 +#: user-manual.txt:2321 #, no-wrap msgid "Computer-reported events during dive" msgstr "" #. type: Plain text -#: user-manual.txt:2331 +#: user-manual.txt:2333 msgid "" "Many dive computers record events during a dive. For instance, most dive " "computers report alarms relating to high partial pressures of oxygen, to " @@ -4592,7 +4594,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2336 +#: user-manual.txt:2338 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 " @@ -4603,13 +4605,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2337 +#: user-manual.txt:2339 #, no-wrap msgid "images/profile_symbols.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2342 +#: user-manual.txt:2344 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 " @@ -4618,13 +4620,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2343 +#: user-manual.txt:2345 #, no-wrap msgid "The Profile Toolbar" msgstr "" #. type: Plain text -#: user-manual.txt:2351 +#: user-manual.txt:2353 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 " @@ -4635,44 +4637,44 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2352 +#: user-manual.txt:2354 #, no-wrap msgid "images/icons/O2.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2356 +#: user-manual.txt:2358 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:2357 +#: user-manual.txt:2359 #, no-wrap msgid "images/icons/N2.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2360 +#: user-manual.txt:2362 msgid "Show the partial pressure of *nitrogen* during the dive." msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2361 +#: user-manual.txt:2363 #, no-wrap msgid "images/icons/He.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2365 +#: user-manual.txt:2367 msgid "" "Display of the partial pressure of *helium* during the dive. This is only " "important to divers using Trimix, Helitrox or similar breathing gasses." msgstr "" #. type: Plain text -#: user-manual.txt:2378 +#: user-manual.txt:2380 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 " @@ -4686,21 +4688,29 @@ msgid "" "the diver was using less gas than average." msgstr "" +#. type: Plain text +#: user-manual.txt:2384 +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, " +"the color is a representation of the breathing gas density." +msgstr "" + #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2379 +#: user-manual.txt:2385 #, no-wrap msgid "images/icons/Heartbutton.png" msgstr "" #. type: Plain text -#: user-manual.txt:2383 +#: user-manual.txt:2389 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:2389 +#: user-manual.txt:2395 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 " @@ -4710,19 +4720,19 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2390 +#: user-manual.txt:2396 #, no-wrap msgid "images/MeasuringBar.png" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2392 +#: user-manual.txt:2398 #, no-wrap msgid "images/icons/ruler.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2400 +#: user-manual.txt:2406 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 " @@ -4732,13 +4742,13 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2401 +#: user-manual.txt:2407 #, no-wrap msgid "images/icons/ShowPhotos.png" msgstr "" #. type: Plain text -#: user-manual.txt:2408 +#: user-manual.txt:2414 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 " @@ -4747,7 +4757,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2435 +#: user-manual.txt:2441 msgid "" "The profile can also include the dive computer reported *ceiling* (more " "precisely, the deepest deco stop that the dive computer calculated for each " @@ -4776,7 +4786,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2441 +#: user-manual.txt:2447 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 " @@ -4784,13 +4794,13 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2442 +#: user-manual.txt:2448 #, no-wrap msgid "images/icons/ceiling1.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2447 +#: user-manual.txt:2453 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 " @@ -4799,13 +4809,13 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2448 +#: user-manual.txt:2454 #, no-wrap msgid "images/icons/ceiling2.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2452 +#: user-manual.txt:2458 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 " @@ -4813,26 +4823,26 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2453 +#: user-manual.txt:2459 #, no-wrap msgid "images/icons/ceiling3.jpg" msgstr "" #. type: delimited block = -#: user-manual.txt:2458 +#: user-manual.txt:2464 msgid "" "If, in addition, the *3m increments* button on the Profile Panel is clicked, " "then the ceiling is indicated in 3 m increments (*C* in figure below)." msgstr "" #. type: Target for macro image -#: user-manual.txt:2459 +#: user-manual.txt:2465 #, no-wrap msgid "images/Ceilings2.jpg" msgstr "" #. type: delimited block = -#: user-manual.txt:2462 +#: user-manual.txt:2468 msgid "" "Gradient Factor settings strongly affect the calculated ceilings and their " "depths. For more information about Gradient factors, see the section on " @@ -4845,7 +4855,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2464 user-manual.txt:3324 +#: user-manual.txt:2470 user-manual.txt:3309 #, no-wrap msgid "" " *** http://www.tek-dive.com/portal/upload/M-Values.pdf[Understanding " @@ -4853,7 +4863,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2466 user-manual.txt:3326 +#: user-manual.txt:2472 user-manual.txt:3311 #, no-wrap msgid "" " *** " @@ -4862,13 +4872,13 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2470 +#: user-manual.txt:2476 #, no-wrap msgid "images/icons/ShowCylindersButton.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2476 +#: user-manual.txt:2482 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 " @@ -4879,19 +4889,19 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2477 +#: user-manual.txt:2483 #, no-wrap msgid "images/ShowCylinders_f20.jpg" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2481 +#: user-manual.txt:2487 #, no-wrap msgid "images/icons/heatmap.png" msgstr "" #. type: delimited block = -#: user-manual.txt:2488 +#: user-manual.txt:2494 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 " @@ -4903,13 +4913,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2489 +#: user-manual.txt:2495 #, no-wrap msgid "images/Heatmap.jpg" msgstr "" #. type: delimited block = -#: user-manual.txt:2497 +#: user-manual.txt:2503 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 " @@ -4922,7 +4932,7 @@ msgid "" msgstr "" #. type: delimited block = -#: user-manual.txt:2505 +#: user-manual.txt:2511 msgid "" "Image *B* shows a gradient of unique colours, spanning the whole range of " "inert gas pressures. It is possible to map the height of each of the dark " @@ -4936,7 +4946,7 @@ msgid "" msgstr "" #. type: delimited block = -#: user-manual.txt:2513 +#: user-manual.txt:2519 msgid "" "The bottom range in *B* (marked _On-gassing_) includes colours from light " "blue to black, representing tissue gas pressures below the equilibrium " @@ -4951,7 +4961,7 @@ msgid "" msgstr "" #. type: delimited block = -#: user-manual.txt:2519 +#: user-manual.txt:2525 msgid "" "The central range in *B* includes the colours from black to light green, " "when the inert gas pressure of a tissue compartment is higher than the " @@ -4962,7 +4972,7 @@ msgid "" msgstr "" #. type: delimited block = -#: user-manual.txt:2528 +#: user-manual.txt:2534 msgid "" "The top range in *B* (marked _Off-gassing_) includes colours from light " "green to red and white, repesenting tissue gas pressures above that of the " @@ -4978,7 +4988,7 @@ msgid "" msgstr "" #. type: delimited block = -#: user-manual.txt:2536 +#: user-manual.txt:2542 msgid "" "Image *C* shows the colour mapping of each of the vertical bars in *A*, the " "fast tissues (on the left in *A*) depicted at the top and the slow tissue " @@ -4990,7 +5000,7 @@ msgid "" msgstr "" #. type: delimited block = -#: user-manual.txt:2543 +#: user-manual.txt:2549 msgid "" "Image *D* is a compilation of similar colour mappings of 16 tissue " "compartments during a 10-minute period of a dive, the colours representing " @@ -5001,7 +5011,7 @@ msgid "" msgstr "" #. type: delimited block = -#: user-manual.txt:2547 +#: user-manual.txt:2553 msgid "" "The colours of the heat map are not affected by the gradient factor " "settings. This is because the heat map indicates tissue pressures relative " @@ -5010,14 +5020,14 @@ msgid "" msgstr "" #. type: delimited block = -#: user-manual.txt:2549 +#: user-manual.txt:2555 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:2552 +#: user-manual.txt:2558 msgid "" "Since the colours of the heat map are not affected by the gradient " "factor(s), the heat map is also applicable when using the VPM-B " @@ -5025,7 +5035,7 @@ msgid "" msgstr "" #. type: delimited block = -#: user-manual.txt:2556 +#: user-manual.txt:2562 msgid "" "The image below compares the profiles and heat maps for two planned " "decompression dives to 60m: the first using the Bühlmann decompression " @@ -5035,7 +5045,7 @@ msgid "" msgstr "" #. type: delimited block = -#: user-manual.txt:2561 +#: user-manual.txt:2567 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, " @@ -5046,7 +5056,7 @@ msgid "" msgstr "" #. type: delimited block = -#: user-manual.txt:2566 +#: user-manual.txt:2572 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 " @@ -5056,19 +5066,19 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2567 +#: user-manual.txt:2573 #, no-wrap msgid "images/tissueHeatmap.jpg" msgstr "" #. type: Title ==== -#: user-manual.txt:2570 +#: user-manual.txt:2576 #, no-wrap msgid "The Dive Profile context menu" msgstr "" #. type: Plain text -#: user-manual.txt:2589 +#: user-manual.txt:2595 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 " @@ -5089,19 +5099,19 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:2590 +#: user-manual.txt:2596 #, no-wrap msgid "Organizing the logbook (Manipulating groups of dives)" msgstr "" #. type: Title === -#: user-manual.txt:2593 +#: user-manual.txt:2599 #, no-wrap msgid "The Dive List context menu" msgstr "" #. type: Plain text -#: user-manual.txt:2597 +#: user-manual.txt:2603 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 " @@ -5109,30 +5119,30 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2598 +#: user-manual.txt:2604 #, no-wrap msgid "images/ContextMenu.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2601 +#: user-manual.txt:2607 msgid "The context menu is used in many functions described below." msgstr "" #. type: Title ==== -#: user-manual.txt:2603 +#: user-manual.txt:2609 #, no-wrap msgid "Customizing the columns showed in the *Dive List* panel" msgstr "" #. type: Target for macro image -#: user-manual.txt:2605 +#: user-manual.txt:2611 #, no-wrap msgid "images/DiveListOptions.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2613 +#: user-manual.txt:2619 msgid "" "The default information in the *Dive List* includes, for each dive, " "Dive_number, Date, Rating, Dive_depth, Dive_duration and Dive_location. This " @@ -5144,7 +5154,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2618 +#: user-manual.txt:2624 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 " @@ -5152,26 +5162,26 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2619 +#: user-manual.txt:2625 #, no-wrap msgid "images/icons/duringPhoto.png" msgstr "" #. type: Plain text -#: user-manual.txt:2622 +#: user-manual.txt:2628 msgid "" "This dive has photographs taken during the dive, typically using an " "underwater camera." msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2623 +#: user-manual.txt:2629 #, no-wrap msgid "images/icons/outsidePhoto.png" msgstr "" #. type: Plain text -#: user-manual.txt:2628 +#: user-manual.txt:2634 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 " @@ -5180,26 +5190,26 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2629 +#: user-manual.txt:2635 #, no-wrap msgid "images/icons/inAndOutPhoto.png" msgstr "" #. type: Plain text -#: user-manual.txt:2632 +#: user-manual.txt:2638 msgid "" "This dive has photographs taken both during the dive and immdiately before " "or after the dive." msgstr "" #. type: Title === -#: user-manual.txt:2634 +#: user-manual.txt:2640 #, no-wrap msgid "Renumbering the dives" msgstr "" #. type: Plain text -#: user-manual.txt:2646 +#: user-manual.txt:2652 msgid "" "Dives are normally numbered incrementally from non-recent dives (low " "sequence numbers) to recent dives (higher sequence numbers). Numbering of " @@ -5213,7 +5223,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2651 +#: user-manual.txt:2657 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 " @@ -5222,13 +5232,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:2653 +#: user-manual.txt:2659 #, no-wrap msgid "Grouping dives into trips and manipulating trips" msgstr "" #. type: Plain text -#: user-manual.txt:2661 +#: user-manual.txt:2667 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 " @@ -5239,13 +5249,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2662 +#: user-manual.txt:2668 #, no-wrap msgid "images/Group2.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:2668 +#: user-manual.txt:2674 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, " @@ -5254,13 +5264,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2669 +#: user-manual.txt:2675 #, no-wrap msgid "Editing the title and associated information for a particular trip" msgstr "" #. type: Plain text -#: user-manual.txt:2682 +#: user-manual.txt:2688 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 " @@ -5274,13 +5284,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2683 +#: user-manual.txt:2689 #, no-wrap msgid "Viewing the dives during a particular trip" msgstr "" #. type: Plain text -#: user-manual.txt:2688 +#: user-manual.txt:2694 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 " @@ -5289,20 +5299,6 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2689 -#, no-wrap -msgid "Collapsing or expanding dive information for different trips" -msgstr "" - -#. type: Plain text -#: user-manual.txt:2694 -msgid "" -"After selecting a particular trip in the dive list, the context menu allows " -"several options to expand or collapse dives within trips. This includes " -"expanding all trips and collapsing all trips." -msgstr "" - -#. type: Title ==== #: user-manual.txt:2695 #, no-wrap msgid "Merging dives from more than one trip into a single trip" @@ -5325,12 +5321,13 @@ msgstr "" #. type: Plain text #: user-manual.txt:2710 msgid "" -"If a trip includes ten dives, you can split this trip into two trips (trip " -"1: top 4 dives; trip 2: bottom 6 dives) by selecting and right-clicking the " -"top four dives. The resulting context menu lets the user create a new trip " -"by choosing the option *Create new trip above*. The top four dives are then " -"grouped into a separate trip. The figures below show the selection and " -"context menu on the left (A) and the completed action on the right (B):" +"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 " +"right-clicking the top four dives. The resulting context menu lets the user " +"create a new trip by choosing the option *Create new trip above*. The top " +"four dives are then grouped into a separate trip. The figures below show the " +"selection and context menu on the left (A) and the completed action on the " +"right (B):" msgstr "" #. type: Target for macro image @@ -5498,7 +5495,7 @@ msgstr "" #: user-manual.txt:2791 msgid "" "The dives in the *Dive List* panel can be filtered, selecting only some of " -"the dives based on their attributes, e.g. dive tags, dive site, dive master, " +"the dives based on their attributes, e.g. dive tags, dive site, divemaster, " "buddy or protective clothing. For instance, filtering lets you list the deep " "dives at a particular dive site, or otherwise the cave dives with a " "particular buddy." @@ -5611,7 +5608,7 @@ msgstr "" #: user-manual.txt:2855 msgid "" "Having established a login to _Facebook_, transferring a dive profile to a " -"_Facebook_ timeline is easy. In the _Subsurface_ *Dive Profile* panel, " +"_Facebook_ timeline is easy. In the _Subsurface_ *Dive List* panel, " "highlight the dive to be transferred. Then, from the *Main Menu*, select " "_Share on -> Facebook_. A dialogue box is shown, determining the amount of " "additional information to be transferred with the dive profile (image *A*, " @@ -5951,7 +5948,7 @@ 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 " "using several of the existing facilities on the Internet. For instance " -"http://www.dropbox.com/[_Dropbox_] offers a free application that allows " +"https://www.dropbox.com/[_Dropbox_] offers a free application that allows " "files on the Dropbox servers to be seen as a local folder on a desktop " "computer." msgstr "" @@ -5975,42 +5972,14 @@ msgid "" "whenever Internet access is available." msgstr "" -#. type: Plain text -#: user-manual.txt:3041 -msgid "" -"In this way a dive log in your _Dropbox_ folder can be accessed seamlessly " -"from the Internet and can be accessed anywhere with Internet " -"access. Currently there are no costs involved for this service. Dropbox " -"(Windows, Mac and Linux) can be installed by accessing the " -"http://www.dropbox.com/install[_Install Page on the Dropbox website_]" -msgstr "" - -#. type: Plain text -#: user-manual.txt:3047 -msgid "" -"Alternatively you can use _Dropbox_ as a way back up your dive log. To Store " -"a dive log on _Dropbox_, select _File -> Save as_ from the _Subsurface_ main " -"menu, navigate to the _Dropbox_ folder and select the _Save_ button. To " -"access the dive log in _Dropbox_, select _File -> Open Logbook_ from the " -"_Subsurface_ main menu and navigate to the dive log file in the _Dropbox_ " -"folder and select the _Open_ button." -msgstr "" - -#. type: Plain text -#: user-manual.txt:3050 -msgid "" -"Several paid services exist on the Internet (e.g. Google, Amazon) where the " -"same process could be used for the Cloud-based storage of dive logs." -msgstr "" - #. type: Title == -#: user-manual.txt:3052 +#: user-manual.txt:3037 #, no-wrap msgid "Several _Subsurface_ users on one desktop computer" msgstr "" #. type: Plain text -#: user-manual.txt:3056 +#: user-manual.txt:3041 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 " @@ -6019,7 +5988,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3068 +#: user-manual.txt:3053 #, no-wrap msgid "" "*A)* If the different users of a desktop computer do not log onto the " @@ -6046,24 +6015,24 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3070 +#: user-manual.txt:3055 #, no-wrap msgid "\tsubsurface --user=John\n" msgstr "" #. type: Plain text -#: user-manual.txt:3072 +#: user-manual.txt:3057 msgid "while Joan can launch _Subsurface_ using:" msgstr "" #. type: Plain text -#: user-manual.txt:3074 +#: user-manual.txt:3059 #, no-wrap msgid "\tsubsurface --user=Joan\n" msgstr "" #. type: Plain text -#: user-manual.txt:3082 +#: user-manual.txt:3067 #, no-wrap msgid "" "In this case, each user's preferences, settings and cloud access information " @@ -6083,7 +6052,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3086 +#: user-manual.txt:3071 #, no-wrap msgid "" "*B)* On the other hand, if the users log onto the same computer using " @@ -6095,13 +6064,13 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:3088 +#: user-manual.txt:3073 #, no-wrap msgid "Printing a dive log" msgstr "" #. type: Plain text -#: user-manual.txt:3092 +#: user-manual.txt:3077 #, no-wrap msgid "" "_Subsurface_ provides a simple and flexible way to print a whole dive log or " @@ -6111,19 +6080,19 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3094 +#: user-manual.txt:3079 msgid "Some decisions need to be made before printing:" msgstr "" #. type: Plain text -#: user-manual.txt:3097 +#: user-manual.txt:3082 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:3099 +#: user-manual.txt:3084 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 " @@ -6131,7 +6100,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3102 +#: user-manual.txt:3087 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 " @@ -6139,35 +6108,35 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:3103 user-manual.txt:4610 +#: user-manual.txt:3088 user-manual.txt:4605 #, no-wrap msgid "images/Print1_f22.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:3106 +#: user-manual.txt:3091 msgid "Under _Print type_ select one of two options:" msgstr "" #. type: Plain text -#: user-manual.txt:3108 +#: user-manual.txt:3093 msgid "" "_Dive list print_: Print dives from the *Dive List* panel with profiles and " "other information." msgstr "" #. type: Plain text -#: user-manual.txt:3109 +#: user-manual.txt:3094 msgid "_Statistics print_: Print yearly statistics of the dives." msgstr "" #. type: Plain text -#: user-manual.txt:3111 +#: user-manual.txt:3096 msgid "Under _Print options_ select:" msgstr "" #. type: Plain text -#: user-manual.txt:3116 +#: user-manual.txt:3101 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 " @@ -6175,73 +6144,73 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3118 +#: user-manual.txt:3103 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:3121 +#: user-manual.txt:3106 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:3123 +#: user-manual.txt:3108 msgid "_Table_: This prints a summary table of all dives selected (see below)." msgstr "" #. type: Target for macro image -#: user-manual.txt:3124 +#: user-manual.txt:3109 #, no-wrap msgid "images/Print_summarylist_f22.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:3127 +#: user-manual.txt:3112 msgid "" "_Flow layout_: Print the text associated with each dive without printing the " "dive profiles" msgstr "" #. type: Plain text -#: user-manual.txt:3128 +#: user-manual.txt:3113 msgid "of each dive (see below):" msgstr "" #. type: Target for macro image -#: user-manual.txt:3129 +#: user-manual.txt:3114 #, no-wrap msgid "images/Print_flow_layout_f22.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:3132 +#: user-manual.txt:3117 msgid "" "_One Dive_: Print one dive per page, also showing the dive profile (see " "below)" msgstr "" #. type: Target for macro image -#: user-manual.txt:3133 +#: user-manual.txt:3118 #, no-wrap msgid "images/print2_f22.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:3137 +#: user-manual.txt:3122 msgid "_Two Dives_: Print two dives per page, also showing the dive profiles." msgstr "" #. type: Plain text -#: user-manual.txt:3138 +#: user-manual.txt:3123 msgid "_Six Dives_: Print six dives per page, also showing the dive profiles." msgstr "" #. type: Plain text -#: user-manual.txt:3142 +#: user-manual.txt:3127 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 " @@ -6250,7 +6219,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3146 +#: user-manual.txt:3131 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 " @@ -6259,13 +6228,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:3147 +#: user-manual.txt:3132 #, no-wrap msgid "images/Print_print_f22.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:3152 +#: user-manual.txt:3137 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 " @@ -6274,19 +6243,19 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:3153 +#: user-manual.txt:3138 #, no-wrap msgid "images/Printpreview.jpg" msgstr "" #. type: Title === -#: user-manual.txt:3155 +#: user-manual.txt:3140 #, no-wrap msgid "Writing a custom print template (advanced)" msgstr "" #. type: Plain text -#: user-manual.txt:3161 +#: user-manual.txt:3146 msgid "" "Writing a custom template is an effective way to produce highly customized " "printouts. Subsurface uses HTML templates to render printing. You can create " @@ -6297,27 +6266,27 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:3163 +#: user-manual.txt:3148 #, no-wrap msgid "Configuring a dive computer" msgstr "" #. type: Plain text -#: user-manual.txt:3171 +#: user-manual.txt:3156 msgid "" -"_Subsurface_ lets you configure a dive computer. Currently the " -"Heinrichs-Weikamp (OSTC 2, OSTC 3) and Suunto Vyper (Stinger, Mosquito, D3, " -"Vyper, Vytec, Cobra, Gekko and Zoop) family of dive computers are " -"supported. A large number of settings of these dive computers can be read " -"and changed to different values. To begin, be sure the appropriate hardware " -"driver is installed for the dive computer (also required for downloading " -"dives) and the device name of the dive computer is known. See " +"_Subsurface_ lets you configure a dive computer. Currently, the " +"Heinrichs-Weikamp (OSTC 2/2N/2C, OSTC 3, Sport) and Suunto Vyper (Stinger, " +"Mosquito, D3, Vyper, Vytec, Cobra, Gekko and Zoop) family of dive computers " +"are supported. A large number of settings of these dive computers can be " +"read and changed to different values. To begin, be sure the appropriate " +"hardware driver is installed for the dive computer (also required for " +"downloading dives) and the device name of the dive computer is known. See " "<<_appendix_a_operating_system_specific_information_for_importing_dive_information_from_a_dive_computer,APPENDIX " "A>> for information on how to do this." msgstr "" #. type: Plain text -#: user-manual.txt:3177 +#: user-manual.txt:3162 msgid "" "Once the dive computer is connected to the _Subsurface_ computer, select " "_File -> Configure dive computer_ from the _Main Menu_. Select the " @@ -6327,20 +6296,20 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:3178 +#: user-manual.txt:3163 #, no-wrap msgid "images/Configure_dc_f20.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:3181 +#: user-manual.txt:3166 msgid "" "Using the appropriate buttons on the configuration panel, the following " "actions can be done:" msgstr "" #. type: Plain text -#: user-manual.txt:3184 +#: user-manual.txt:3169 #, no-wrap msgid "" "*Retrieve available details*. This loads the existing configuration from the " @@ -6349,7 +6318,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3186 +#: user-manual.txt:3171 #, no-wrap msgid "" "*Save changes to device*. This changes the configuration of the\n" @@ -6358,7 +6327,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3188 +#: user-manual.txt:3173 #, no-wrap msgid "" "*Backup*. This saves the configuration data to a file. _Subsurface_ asks " @@ -6367,7 +6336,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3190 +#: user-manual.txt:3175 #, no-wrap msgid "" "*Restore backup*. This loads the information from a backup file and displays " @@ -6376,7 +6345,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3192 +#: user-manual.txt:3177 #, no-wrap msgid "" "*Update firmware*. If new firmware is available for the dive computer, this " @@ -6385,18 +6354,18 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:3195 +#: user-manual.txt:3180 #, no-wrap msgid "Setting user _Preferences_ for _Subsurface_" msgstr "" #. type: Plain text -#: user-manual.txt:3206 +#: user-manual.txt:3191 msgid "" "There are several user-definable settings within _Subsurface_, found by " "selecting _File -> Preferences_, mostly affecting the way in which " "_Subsurface_ shows dive information to the user. The settings are in six " -"panels: _Defaults_, _Units_, _Graph_, _Language_, _Network_, and " +"panels: _General_, _Units_, _Profile_, _Language_, _Network_, and " "_Georeference_, all of which operate on the same principles: specified " "settings can be applied to the display of the dive log by selecting " "_Apply_. At this stage, any new settings only apply to the present session " @@ -6406,24 +6375,24 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3207 +#: user-manual.txt:3192 #, no-wrap -msgid "Defaults" +msgid "General" msgstr "" #. type: Plain text -#: user-manual.txt:3210 -msgid "There are several headings in the *Defaults* panel:" +#: user-manual.txt:3195 +msgid "There are several headings in the *General* panel:" msgstr "" #. type: Target for macro image -#: user-manual.txt:3211 +#: user-manual.txt:3196 #, no-wrap msgid "images/Pref1_f23.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:3215 +#: user-manual.txt:3200 #, no-wrap msgid "" " ** *Lists and tables*: Specify the font type and font size of the\n" @@ -6432,7 +6401,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3220 +#: user-manual.txt:3205 #, no-wrap msgid "" " ** *Dives*: For the _Default Dive Log File_ specify the directory and\n" @@ -6444,7 +6413,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3221 +#: user-manual.txt:3206 #, no-wrap msgid "" "_No default file_: When checked, _Subsurface_ does not automatically load a " @@ -6452,7 +6421,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3222 +#: user-manual.txt:3207 #, no-wrap msgid "" "_Local default file_: When checked, _Subsurface_ automatically loads a dive " @@ -6460,7 +6429,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3224 +#: user-manual.txt:3209 #, no-wrap msgid "" "_Cloud storage default file_: When checked, _Subsurface automatically loads " @@ -6470,7 +6439,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3226 +#: user-manual.txt:3211 #, no-wrap msgid "" "** *Display invalid*: Dives can be marked as invalid (when a user wishes to " @@ -6478,7 +6447,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3229 +#: user-manual.txt:3214 #, no-wrap msgid "" "dives that he/she doesn't consider valid dives, e.g. pool dives, but still " @@ -6489,7 +6458,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3231 +#: user-manual.txt:3216 #, no-wrap msgid "" "** *Default cylinder*: From the dropdown list, select the default cylinder " @@ -6497,13 +6466,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3232 +#: user-manual.txt:3217 #, no-wrap msgid "the *Equipment* tab of the *Notes* panel.\n" msgstr "" #. type: Plain text -#: user-manual.txt:3234 +#: user-manual.txt:3219 #, no-wrap msgid "" "** *Animations*: Some actions in showing the dive profile are performed " @@ -6511,7 +6480,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3240 +#: user-manual.txt:3225 #, no-wrap msgid "" "animations. For instance, the axis values for depth and time change from " @@ -6527,7 +6496,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3242 +#: user-manual.txt:3227 #, no-wrap msgid "" "** *Clear all settings*: As indicated in the button below this heading, all " @@ -6535,25 +6504,25 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3243 +#: user-manual.txt:3228 #, no-wrap msgid "cleared and set to default values.\n" msgstr "" #. type: Title === -#: user-manual.txt:3244 +#: user-manual.txt:3229 #, no-wrap msgid "Units" msgstr "" #. type: Target for macro image -#: user-manual.txt:3245 +#: user-manual.txt:3230 #, no-wrap msgid "images/Pref2_f23.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:3252 +#: user-manual.txt:3237 msgid "" "Choose between metric and imperial units of depth, pressure, volume, " "temperature and mass. By selecting the Metric or Imperial radio button at " @@ -6564,7 +6533,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3258 +#: user-manual.txt:3243 msgid "" "Regardless of the above settings, dive time measurements can be either in " "seconds or minutes. Choose the appropriate option. GPS coordinates can be " @@ -6573,24 +6542,24 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3259 +#: user-manual.txt:3244 #, no-wrap -msgid "Graph" +msgid "Profile" msgstr "" #. type: Plain text -#: user-manual.txt:3261 +#: user-manual.txt:3246 msgid "This panel has three sections:" msgstr "" #. type: Target for macro image -#: user-manual.txt:3263 +#: user-manual.txt:3248 #, no-wrap msgid "images/Pref4_f23.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:3276 +#: user-manual.txt:3261 #, no-wrap msgid "" "*Gas pressure display setup*. Even though nitrogen and helium pressures are " @@ -6612,13 +6581,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3278 +#: user-manual.txt:3263 #, no-wrap msgid "** CCR Options: These options determine oxygen management for CCR dives:\n" msgstr "" #. type: Plain text -#: user-manual.txt:3283 +#: user-manual.txt:3268 #, no-wrap msgid "" "*** _Dive planner default setpoint_: Specify the O~2~ setpoint for a\n" @@ -6629,10 +6598,10 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3287 +#: user-manual.txt:3272 #, no-wrap msgid "" -"*** _CCR: Show setpoints when viewing pO2:_ With this checkbox activated, " +"*** _CCR: Show setpoints when viewing pO~2~:_ With this checkbox activated, " "the pO~2~\n" " graph on the dive profile has an overlay in red which indicates the CCR " "setpoint\n" @@ -6641,7 +6610,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3291 +#: user-manual.txt:3276 #, no-wrap msgid "" "*** _CCR: Show individual O~2~ sensor values when viewing pO~2~:_ Show the " @@ -6652,7 +6621,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3293 +#: user-manual.txt:3278 #, no-wrap msgid "" "*Ceiling display setup*. These settings mostly deal with nitrogen and helium " @@ -6660,7 +6629,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3294 +#: user-manual.txt:3279 #, no-wrap msgid "" "by determining how the decompression ceiling (ascent ceiling) is calculated " @@ -6668,7 +6637,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3301 +#: user-manual.txt:3286 #, no-wrap msgid "" "** _Draw dive computer reported ceiling red_: This checkbox does exactly " @@ -6683,7 +6652,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3306 +#: user-manual.txt:3291 #, no-wrap msgid "" "** _Algorithm for calculating ceiling_. Choose between the Bühlmann " @@ -6695,10 +6664,10 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3322 +#: user-manual.txt:3307 #, no-wrap msgid "" -"*** Bühlmann: Set the _gradient factors_ (GFlow and GFHigh) for calculcating " +"*** Bühlmann: Set the _gradient factors_ (GFLow and GFHigh) for calculcating " "the deco ceiling following\n" " the ZH-L16 algorithm. GF_Low is the gradient factor at depth and GF_High " "is used at the surface.\n" @@ -6714,7 +6683,7 @@ msgid "" " factors of 20/60 are considered conservative and values of 70/90 are " "considered\n" " harsh.\n" -" In addition decide whether to check the _GFLow at max depth_ box. If " +" In addition decide whether to check the _GFLow at max. depth_ box. If " "checked, GF_Low is used for the\n" " deepest dive depth and linearly increased up to the GF_High value at the " "surface. If unchecked,\n" @@ -6725,7 +6694,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3329 +#: user-manual.txt:3314 #, no-wrap msgid "" " ** _pSCR options_. These preferences determine how passive semi-closed " @@ -6734,7 +6703,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3333 +#: user-manual.txt:3318 #, no-wrap msgid "" " *** _Metabolic rate:_ this is the\n" @@ -6744,7 +6713,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3336 +#: user-manual.txt:3321 #, no-wrap msgid "" " *** _pSCR ratio:_ The dilution ratio (or dump ratio) is the ratio of gas " @@ -6754,13 +6723,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3338 +#: user-manual.txt:3323 #, no-wrap msgid "*Misc*\n" msgstr "" #. type: Plain text -#: user-manual.txt:3345 +#: user-manual.txt:3330 #, no-wrap msgid "" "** _Show unused cylinders in Equipment Tab_: This checkbox allows display of " @@ -6778,24 +6747,24 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3347 +#: user-manual.txt:3332 #, no-wrap msgid "Language" msgstr "" #. type: Plain text -#: user-manual.txt:3349 +#: user-manual.txt:3334 msgid "Choose a language that _Subsurface_ will use." msgstr "" #. type: Target for macro image -#: user-manual.txt:3350 +#: user-manual.txt:3335 #, no-wrap msgid "images/Pref3_f23.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:3359 +#: user-manual.txt:3344 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 " @@ -6807,46 +6776,44 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3361 +#: user-manual.txt:3346 msgid "" -"In this section also specify appropriate date an time formats for showing " +"In this section also specify appropriate date and time formats for showing " "dive details." msgstr "" #. type: Title === -#: user-manual.txt:3362 +#: user-manual.txt:3347 #, no-wrap msgid "Network" msgstr "" #. type: Plain text -#: user-manual.txt:3369 +#: user-manual.txt:3352 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 or the " -"<<S_Companion,_Subsurface Companion app_>>. These Internet requirements are " -"determined by your type of connection to the Internet and by the Internet " -"Service Provider (ISP) used. Your ISP should provide the appropriate " -"information." +"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: Target for macro image -#: user-manual.txt:3370 +#: user-manual.txt:3354 #, no-wrap msgid "images/Pref5_f23.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:3373 +#: user-manual.txt:3357 msgid "This dialogue has three sections:" msgstr "" #. type: Plain text -#: user-manual.txt:3381 +#: user-manual.txt:3365 #, no-wrap msgid "" -"** _Proxy type_:\n" +"** _Proxy_:\n" "If a proxy server is used for Internet access, the type of proxy needs to be " "selected from the dropdown list,\n" "after which the IP address of the host and the appropriate port number " @@ -6860,7 +6827,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3386 +#: user-manual.txt:3370 #, no-wrap msgid "" "** _Subsurface cloud storage_: To store your dive log in the cloud, a valid " @@ -6873,7 +6840,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3387 +#: user-manual.txt:3371 #, no-wrap msgid "" "_Sync to cloud in the background_: This option allows saving of dive " @@ -6881,13 +6848,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3388 +#: user-manual.txt:3372 #, no-wrap msgid "while you do other things within _Subsurface_.\n" msgstr "" #. type: Plain text -#: user-manual.txt:3389 +#: user-manual.txt:3373 #, no-wrap msgid "" "_Save password locally_: This allows local storage of the cloud storage " @@ -6895,13 +6862,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3390 +#: user-manual.txt:3374 #, no-wrap msgid "information is saved in raw text form, not encoded in any way.\n" msgstr "" #. type: Plain text -#: user-manual.txt:3394 +#: user-manual.txt:3378 #, no-wrap msgid "" "** _Subsurface web service_: When you subscribe to the " @@ -6913,13 +6880,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3395 +#: user-manual.txt:3379 #, no-wrap msgid "Georeference" msgstr "" #. type: Plain text -#: user-manual.txt:3403 +#: user-manual.txt:3387 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 " @@ -6932,28 +6899,28 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:3404 +#: user-manual.txt:3388 #, no-wrap msgid "images/Pref7_f23.jpg" msgstr "" #. type: Title == -#: user-manual.txt:3407 +#: user-manual.txt:3391 #, no-wrap msgid "The _Subsurface_ dive planner" msgstr "" #. type: Plain text -#: user-manual.txt:3412 +#: user-manual.txt:3396 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 " "load during a dive by using the Bühlmann ZH-L16 algorithm with the addition " -"of gradient factors as implemented by Erik Baker." +"of gradient factors as implemented by Erik Baker, or using the VPM-B model." msgstr "" #. type: delimited block * -#: user-manual.txt:3420 +#: user-manual.txt:3404 msgid "" "The _Subsurface_ dive planner IS CURRENTLY EXPERIMENTAL and assumes the user " "is already familiar with the _Subsurface_ user interface. It is explicitly " @@ -6961,19 +6928,19 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:3423 +#: user-manual.txt:3407 msgid "" "The user is conversant with dive planning and has the necessary training to " "perform dive planning." msgstr "" #. type: delimited block * -#: user-manual.txt:3424 +#: user-manual.txt:3408 msgid "The user plans dives within his/her certification limits." msgstr "" #. type: delimited block * -#: user-manual.txt:3427 +#: user-manual.txt:3411 msgid "" "Dive planning makes large assumptions about the characteristics of the " "_average person_ and cannot compensate for individual physiology or health " @@ -6981,41 +6948,41 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:3428 +#: user-manual.txt:3412 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:3429 +#: user-manual.txt:3413 msgid "The user is familiar with the user interface of _Subsurface_." msgstr "" #. type: delimited block * -#: user-manual.txt:3431 +#: user-manual.txt:3415 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:3433 +#: user-manual.txt:3417 #, no-wrap msgid "The _Subsurface_ dive planner screen" msgstr "" #. type: Plain text -#: user-manual.txt:3438 +#: user-manual.txt:3422 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 " -"into the sections on the left hand side of the screen. They are: Available " -"Gases, Rates, Planning, Gas Options and Notes." +"into the sections on the left hand and bottom side of the screen. They are: " +"Available Gases, Rates, Planning, Gas Options and Notes." msgstr "" #. type: Plain text -#: user-manual.txt:3442 +#: user-manual.txt:3426 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 " @@ -7024,7 +6991,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3446 +#: user-manual.txt:3430 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 " @@ -7033,26 +7000,26 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:3447 +#: user-manual.txt:3431 #, no-wrap msgid "images/PlannerWindow1_f20.jpg" msgstr "" #. type: Title === -#: user-manual.txt:3450 +#: user-manual.txt:3434 #, no-wrap msgid "Open circuit dives" msgstr "" #. type: Plain text -#: user-manual.txt:3453 +#: user-manual.txt:3437 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:3456 +#: user-manual.txt:3440 #, no-wrap msgid "" "** Open Circuit (the default)\n" @@ -7061,12 +7028,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3458 +#: user-manual.txt:3442 msgid "Choose the Open Circuit option." msgstr "" #. type: Plain text -#: user-manual.txt:3462 +#: user-manual.txt:3446 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 " @@ -7076,27 +7043,27 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3471 +#: user-manual.txt:3455 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. This is done in a similar way as for " "<<cylinder_definitions,providing cylinder data for dive logs>>. Choose the " "cylinder type by double clicking the cylinder type and using the dropdown " -"list, then specify the work pressure of this cylinder. By leaving the oxygen " -"concentration (O2%) field empty, the cylinder is assumed to contain " +"list, then specify the start pressure of this cylinder. By leaving the " +"oxygen concentration (O~2~%) field empty, the cylinder is assumed to contain " "air. Otherwise enter the oxygen and/or helium concentration in the boxes " "provided in this dialogue. Add additional cylinders by using the \"+\" icon " "to the top right-hand of the dialogue." msgstr "" #. type: Plain text -#: user-manual.txt:3473 +#: user-manual.txt:3457 msgid "The _Available Gases_ table includes three gas depth fields, labelled:" msgstr "" #. type: Plain text -#: user-manual.txt:3474 +#: user-manual.txt:3458 #, no-wrap msgid "" "** Deco switch at: the switch depth for deco gases. Unless overridden by the " @@ -7104,15 +7071,15 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3475 +#: user-manual.txt:3459 #, no-wrap msgid "" -"automatically calculated based on the Deco pO₂ preference (default 1.6 " +"automatically calculated based on the Deco pO~2~ preference (default 1.6 " "bar)\n" msgstr "" #. type: Plain text -#: user-manual.txt:3476 +#: user-manual.txt:3460 #, no-wrap msgid "" "** Bot. MOD: the gas Maximum Operating Depth (MOD) if it is used as a bottom " @@ -7120,17 +7087,17 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3478 +#: user-manual.txt:3462 #, no-wrap msgid "" -"calculated based on the Bottom pO₂ preference (default 1.4 bar). Editing " +"calculated based on the Bottom pO~2~ preference (default 1.4 bar). Editing " "this field will modify the\n" -"O₂% according to the depth set. Set to ''*'' to calculate the best O₂% for " -"the dive maximum depth.\n" +"O~2~% according to the depth set. Set to ''*'' to calculate the best O~2~% " +"for the dive maximum depth.\n" msgstr "" #. type: Plain text -#: user-manual.txt:3479 +#: user-manual.txt:3463 #, no-wrap msgid "" "** MND: the gas Maximum Narcotic Depth (MND). Automatically calculated based " @@ -7138,7 +7105,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3481 +#: user-manual.txt:3465 #, no-wrap msgid "" "preference (default 30m / 98 ft). Editing this field will modify the He% " @@ -7147,12 +7114,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3483 +#: user-manual.txt:3467 msgid "The profile of the planned dive can be created in two ways:" msgstr "" #. type: Plain text -#: user-manual.txt:3488 +#: user-manual.txt:3472 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 " @@ -7162,13 +7129,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3496 +#: user-manual.txt:3480 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 " "table represents the duration and the final depth of the descent from the " "surface. Subsequent segments describe the bottom phase of the dive. The _CC " -"set point_ column is only relevant for closed circuit divers. The ascent is " +"setpoint_ column is only relevant for closed circuit divers. The ascent is " "usually not specified because this is what the planner is supposed to " "calculate. Add additional segments to the profile by selecting the \"+\" " "icon at the top right hand of the table. Segments entered into the _Dive " @@ -7176,13 +7143,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:3497 +#: user-manual.txt:3481 #, no-wrap msgid "Recreational dives" msgstr "" #. type: Plain text -#: user-manual.txt:3514 +#: user-manual.txt:3498 #, no-wrap msgid "" "Recreational mode is what comes closest to planning a dive based on the " @@ -7213,29 +7180,29 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3517 +#: user-manual.txt:3501 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:3520 +#: user-manual.txt:3504 msgid "" "Immediately under the heading _Planning_ are two checkboxes _Recreational_ " "and _Safety Stop_. Check these two boxes." msgstr "" #. type: Plain text -#: user-manual.txt:3524 +#: user-manual.txt:3508 msgid "" "Then define the cylinder size, the gas mixture (air or % oxygen) and the " -"starting cylinder pressure in the top left-hand section of the planner under " +"working cylinder pressure in the top left-hand section of the planner under " "_Available gases_." msgstr "" #. type: Plain text -#: user-manual.txt:3529 +#: user-manual.txt:3513 msgid "" "The planner calculates whether the specified cylinder contains enough " "air/gas to complete the planned dive. In order for this to be accurate, " @@ -7245,7 +7212,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3538 +#: user-manual.txt:3522 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 " @@ -7262,7 +7229,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3546 +#: user-manual.txt:3530 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 " @@ -7275,14 +7242,14 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3549 +#: user-manual.txt:3533 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:3557 +#: user-manual.txt:3541 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 " @@ -7298,7 +7265,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3561 +#: user-manual.txt:3545 msgid "" "Below is an image of a dive plan for a recreational dive at 30 " "meters. Although the no-deco limit (NDL) is 23 minutes, the duration of the " @@ -7308,26 +7275,26 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:3562 +#: user-manual.txt:3546 #, no-wrap -msgid "images/rec_diveplan.jpg" +msgid "images/Planner_OC_rec.jpg" msgstr "" #. type: Title ==== -#: user-manual.txt:3564 +#: user-manual.txt:3548 #, no-wrap msgid "Non-recreational open circuit dives, including decompression" msgstr "" #. type: Plain text -#: user-manual.txt:3568 +#: user-manual.txt:3552 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:3580 +#: user-manual.txt:3564 #, no-wrap msgid "" "*a) Nitrogen management*: This is done by specifying the rates for descent " @@ -7337,7 +7304,7 @@ msgid "" "to the bottom left of the planning screen. Two deco models are supported the " "Bühlmann model and the VPM-B\n" "model. Select one of the two models. When selecting the Bühlmann model, the " -"gradient factors (GFhigh and GFlow\n" +"gradient factors (GFHigh and GFLow\n" "need to be specified. Initially, the GFHigh and GFLow values in the " "_Preferences_\n" "panel of _Subsurface_ is used. If these are changed within the planner (see " @@ -7353,7 +7320,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3586 +#: user-manual.txt:3570 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 " @@ -7366,35 +7333,35 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3588 +#: user-manual.txt:3572 msgid "For more information external to this manual see:" msgstr "" #. type: Plain text -#: user-manual.txt:3590 +#: user-manual.txt:3574 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:3591 +#: user-manual.txt:3575 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:3593 +#: user-manual.txt:3577 msgid "" -"link:http://www.amazon.com/Deco-Divers-Decompression-Theory-Physiology/dp/1905492073/ref=sr_1_1?s=books&ie=UTF8&qid=1403932320&sr=1-1&keywords=deco+for+divers[_Deco " +"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: " "1-905492-07-3. An excellent non-technical review that discusses both the " "Bühlmann deco model and the VPM-B model." msgstr "" #. type: Plain text -#: user-manual.txt:3601 +#: user-manual.txt:3585 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 " @@ -7407,7 +7374,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3609 +#: user-manual.txt:3594 #, no-wrap msgid "" "*b) Oxygen management*: In the *Gas Options* part of the dive specification, " @@ -7417,16 +7384,16 @@ msgid "" "of the dive (_deco po2_).\n" "Commonly used values are 1.4 bar for the bottom part of the dive and 1.6 bar " "for any decompression\n" -"stages. Normally, a partial pressure of 1.6 bar is not exceeded. PO2 " -"settings and the depth at which switching to a gas takes place can also be " -"edited in the\n" -"_Available Gases_ dialog. Normally the planner decides on switching to a new " -"gas when, during\n" +"stages. Normally, a partial pressure of 1.6 bar is not exceeded. The depth " +"at which switching to a gas\n" +"takes place can be edited in the\n" +"_Available Gases_ dialog. Normally, the planner decides on switching to a " +"new gas when, during\n" "ascent, the partial pressure of the new gas has decreased to 1.6 bar.\n" msgstr "" #. type: Plain text -#: user-manual.txt:3626 +#: user-manual.txt:3625 #, no-wrap msgid "" "*c) Gas management*: With open-circuit dives this is a primary\n" @@ -7454,6 +7421,32 @@ msgid "" "for unforeseen circumstances.\n" "For technical diving, this reserve can be up to 66% of the total available " "gas.\n" +"In addition to calculating the total gas consumption for every cylinder the " +"planner provides one way\n" +"of calculating the recommended volume of bottom gas which is needed for safe " +"asscent to the\n" +"first deco gas change depth or the surface. This procedure is called the " +"\"minimum gas\" or \"rock bottom\"\n" +"consideration and it is used by various (but not all)\n" +"technical diving organisations. The calculation assumes that in worst case " +"an out of gas (OoG)\n" +"situation could occur at the end of the planned bottom time at maximum " +"depth. This OoG event forces\n" +"the buddy team the share the gas of one diver and to stay at maximum depth " +"for an additional\n" +"time of n minutes (preferences option \"problem solving time\").\n" +"At the same moment the combined SAC of both divers is increased by a " +"estimated factor (preferences option\n" +"\"SAC factor\") compared to the SAC factor of a single diver under normal " +"conditions.\n" +"The result of the minimum gas calculation for the bottom gas is printed to " +"the planner output as an\n" +"additional information. No automatic checks are performed based on this " +"result.\n" +"Please take care that the feature only gives valid results for simple, " +"rectengular shaped single\n" +"level dive profiles. For multi level dives one would need to check every leg " +"of the profile independently.\n" msgstr "" #. type: Plain text @@ -7475,38 +7468,36 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3650 +#: user-manual.txt:3649 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 " "each row of that table corresponds to one of the gas mixtures specified in " "the _Available Gases_ table. Add new waypoints until the main features of " "the dive have been completed, e.g. the bottom time segment and deep stops " -"(if these are implemented). Leave the remaining waypoints on the ascent to " -"_Subsurface_. In most cases _Subsurface_ computes additional way points in " -"order to fulfill decompression requirements for that dive. A waypoint can be " -"moved by selecting it and by using the arrow keys. The waypoints listed in " -"the _Dive Planner Points_ dialogue can be edited by hand in order to get a " -"precise presentation of the dive plan. In fact, it is sometimes more easy to " -"create the whole dive profile by editing the _Dive Planner Points_ dialog." +"(if these are implemented). In most cases _Subsurface_ computes additional " +"way points in order to fulfill decompression requirements for that dive. A " +"waypoint can also be moved by selecting it and by using the arrow keys. The " +"waypoints listed in the _Dive Planner Points_ dialogue can be edited by hand " +"in order to get a precise presentation of the dive plan. In fact, it is " +"sometimes more easy to create the whole dive profile by editing the _Dive " +"Planner Points_ dialog." msgstr "" #. type: Plain text -#: user-manual.txt:3658 +#: user-manual.txt:3655 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 " "changes should reflect the cylinders and gas compositions defined in the " "table with _Available Gases_. If two or more gases are used, automatic gas " -"switches will be suggested during the ascent to the surface. These changes " -"can be deleted by right-clicking the gas change and manually creating a gas " -"change by right-clicking on the appropriate waypoint." +"switches will be planned during the ascent to the surface." msgstr "" #. type: Plain text -#: user-manual.txt:3667 +#: user-manual.txt:3664 msgid "" -"A non-zero value in the \"CC set point\" column of the table of dive planner " +"A non-zero value in the \"CC setpoint\" column of the table of dive planner " "points indicates a valid setpoint for oxygen partial pressure and that the " "segment is dived using a closed circuit rebreather (CCR). If the last " "manually entered segment is a CCR segment, the decompression phase is " @@ -7517,20 +7508,20 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3670 +#: user-manual.txt:3667 msgid "" -"Below is an example of a dive plan to 45m using EAN26, followed by an ascent " -"using EAN50 and using the settings as described above." +"Below is an example of a dive plan to 45m using Tx21/35, followed by an " +"ascent using EAN50 and oxygen and using the settings as described above." msgstr "" #. type: Target for macro image -#: user-manual.txt:3671 +#: user-manual.txt:3668 #, no-wrap -msgid "images/DivePlanner2_f20.jpg" +msgid "images/Planner_OC_deco_VPM.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:3676 +#: user-manual.txt:3673 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 " @@ -7538,13 +7529,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3678 +#: user-manual.txt:3675 #, no-wrap msgid "*The dive plan details*\n" msgstr "" #. type: Plain text -#: user-manual.txt:3686 +#: user-manual.txt:3683 msgid "" "On the bottom right of the dive planner, under _Dive Plan Details_, the " "exact details of the dive plan are provided. These details may be modified " @@ -7557,7 +7548,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3691 +#: user-manual.txt:3688 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 " @@ -7567,20 +7558,20 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3692 +#: user-manual.txt:3689 #, no-wrap msgid "Planning pSCR dives" msgstr "" #. type: Plain text -#: user-manual.txt:3707 +#: user-manual.txt:3706 #, no-wrap msgid "" "To plan a dive using a passive semi-closed rebreather (pSCR), select _pSCR_ " "rather than\n" "_Open circuit_ in the dropdown list.\n" "The parameters of the pSCR dive can be set by selecting _File -> " -"Preferences -> Graph_\n" +"Preferences -> Profile_\n" "from the main menu, where the gas consumption calculation takes into account " "the pSCR dump\n" "ratio (default 1:10) as well as the metabolic rate. The calculation also " @@ -7588,12 +7579,16 @@ msgid "" "accross the mouthpiece of the rebreather into account. If the\n" "pO~2~ drops below what is considered safe, a warning appears in the _Dive " "plan\n" -"details_. A typical pSCR configuration is with a single cylinder and one or " -"more bail-out\n" -"cylinders. Therefore the setup of the _Available gases_ and the _Dive " -"planner points_ tables\n" -"are very similar to that of a CCR dive plan, described below. However, no " -"oxygen setpoints\n" +"details_. A typical pSCR cylinder setup is very similar to an open circuit " +"dive;\n" +"one or more drive cilinders, possibly with different bottom and " +"decompression\n" +"gasses, including gas switches during the dive like in open circuit " +"diving.\n" +"Therefore, the setup of the _Available gases_ and the _Dive planner points_ " +"tables\n" +"are very similar to that of a open circuit dive plan, described " +"above. However, no oxygen setpoints\n" "are specified for pSCR dives. Below is a dive plan for a pSCR dive. The dive " "is comparable\n" "to that of the CCR dive below, but note the longer ascent duration due to " @@ -7603,26 +7598,26 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:3708 +#: user-manual.txt:3707 #, no-wrap msgid "images/Planner_pSCR1_f20.jpg" msgstr "" #. type: Title === -#: user-manual.txt:3711 +#: user-manual.txt:3710 #, no-wrap msgid "Planning CCR dives" msgstr "" #. type: Plain text -#: user-manual.txt:3715 +#: user-manual.txt:3714 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:3719 +#: user-manual.txt:3718 #, no-wrap msgid "" "*Available gases*: In the _Available gases_ table, enter the cylinder " @@ -7633,11 +7628,11 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3729 +#: user-manual.txt:3728 #, no-wrap msgid "" "*Entering setpoints*: Specify a default setpoint in the Preferences tab, by " -"selecting _File -> Preferences -> Graph_ from\n" +"selecting _File -> Preferences -> Profile_ from\n" "the main menu. All user-entered segments in the _Dive planner points_ " "table\n" "use the default setpoint value. Then, different setpoints can be specified " @@ -7655,31 +7650,31 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3731 +#: user-manual.txt:3730 msgid "The dive profile for a CCR dive may look something like the image below." msgstr "" #. type: Target for macro image -#: user-manual.txt:3732 +#: user-manual.txt:3731 #, no-wrap msgid "images/Planner_CCR1_f20.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:3736 +#: user-manual.txt:3735 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:3738 +#: user-manual.txt:3737 #, no-wrap msgid "Modifying an existing dive plan" msgstr "" #. type: Plain text -#: user-manual.txt:3745 +#: user-manual.txt:3744 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 " @@ -7690,7 +7685,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3751 +#: user-manual.txt:3750 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 " @@ -7701,13 +7696,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3752 +#: user-manual.txt:3751 #, no-wrap msgid "Planning for repetitive dives" msgstr "" #. type: Plain text -#: user-manual.txt:3759 +#: user-manual.txt:3758 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 " @@ -7716,7 +7711,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3765 +#: user-manual.txt:3764 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 " @@ -7726,7 +7721,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3770 +#: user-manual.txt:3769 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 " @@ -7736,13 +7731,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3771 +#: user-manual.txt:3770 #, no-wrap msgid "Printing the dive plan" msgstr "" #. type: Plain text -#: user-manual.txt:3776 +#: user-manual.txt:3775 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 " @@ -7750,29 +7745,23 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3786 +#: user-manual.txt:3781 msgid "" -"Dive plans have many characteristics in common with dive logs (dive profile, " -"dive notes, etc). After a dive plan has been saved, the dive details and " -"gas calculations are saved in the *Notes* tab. While a dive plan is being " -"designed, it can be printed using the _Print_ button in the dive " -"planner. This prints the dive details and gas calculations in the _Dive Plan " -"Details_ panel of the dive planner. 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 same way as during the planning " -"process. The only way to print the dive plan is to use the _File -> Print_ " -"function on the main menu in the same way as for dive logs or by copy and " -"paste to a word processor." +"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 " +"same way as during the planning process. The only way to print the dive plan " +"is to use the _File -> Print_ function on the main menu in the same way as " +"for dive logs or by copy and paste to a word processor." msgstr "" #. type: Title === -#: user-manual.txt:3788 +#: user-manual.txt:3783 #, no-wrap msgid "Saving a dive with its dive plan" msgstr "" #. type: Plain text -#: user-manual.txt:3795 +#: user-manual.txt:3790 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 " @@ -7783,24 +7772,24 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3797 +#: user-manual.txt:3792 msgid "Do the dive planning and save the final plan in the _Dive List_." msgstr "" #. type: Plain text -#: user-manual.txt:3798 +#: user-manual.txt:3793 msgid "After diving, upload the dive data from the dive computer." msgstr "" #. type: Plain text -#: user-manual.txt:3800 +#: user-manual.txt:3795 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:3803 +#: user-manual.txt:3798 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 " @@ -7808,7 +7797,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3807 +#: user-manual.txt:3802 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 " @@ -7817,13 +7806,13 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:3808 +#: user-manual.txt:3803 #, no-wrap msgid "Running _Subsurface_ from the command-line" msgstr "" #. type: Plain text -#: user-manual.txt:3812 +#: user-manual.txt:3807 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 " @@ -7831,18 +7820,18 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3814 +#: user-manual.txt:3809 #, no-wrap msgid "\tsubsurface [options] [logfile ...] [--import logfile ...]\n" msgstr "" #. type: Plain text -#: user-manual.txt:3816 +#: user-manual.txt:3811 msgid "The options include:" msgstr "" #. type: delimited block | -#: user-manual.txt:3829 +#: user-manual.txt:3825 #, no-wrap msgid "" "|*Command-line option*|*Description*\n" @@ -7853,7 +7842,7 @@ msgid "" "|--verbose|Print debug information while running _Subsurface_\n" "| -v|Print debug information while running _Subsurface_\n" "| -v -v| Print even more debug information while running _Subsurface_\n" -"|--version|Prints the current version of _Subsurface_.\n" +"|--version|Prints the current version of _Subsurface_\n" "|--survey|Opens the xref:S_UserSurvey[user survey] immediately after " "starting _Subsurface_\n" "|--user=<username>|Choose the xref:S_user_space[configuration space] of user " @@ -7862,16 +7851,18 @@ msgid "" "duration < 60). This enables longer timeouts for slow Internet connections\n" "|--win32console|Create a dedicated console if needed (Windows only). Add " "this option before everything else\n" +"|--win32log|Write the program output to subsurface.log (Windows only). Add " +"option before everything else\n" msgstr "" #. type: Title == -#: user-manual.txt:3831 +#: user-manual.txt:3827 #, no-wrap msgid "Description of the Subsurface Main Menu items" msgstr "" #. type: Plain text -#: user-manual.txt:3836 +#: user-manual.txt:3832 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 " @@ -7879,261 +7870,261 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3837 +#: user-manual.txt:3833 #, no-wrap msgid "File" msgstr "" #. type: Plain text -#: user-manual.txt:3840 +#: user-manual.txt:3836 msgid "" "<<S_NewLogbook,_New Logbook_>> - Close the currently open dive logbook and " "clear all dive information." msgstr "" #. type: Plain text -#: user-manual.txt:3842 +#: user-manual.txt:3838 msgid "_Open logbook_ - Open the file manager to select a dive logbook to open." msgstr "" #. type: Plain text -#: user-manual.txt:3843 +#: user-manual.txt:3839 msgid "_Save_ - Save the dive logbook currently open." msgstr "" #. type: Plain text -#: user-manual.txt:3844 +#: user-manual.txt:3840 msgid "_Save as_ - Save the current logbook under a different file name." msgstr "" #. type: Plain text -#: user-manual.txt:3845 +#: user-manual.txt:3841 msgid "" "_Open cloud storage_ - Open the dive log previously saved in " "<<S_Cloud_storage,_Cloud storage_>>." msgstr "" #. type: Plain text -#: user-manual.txt:3846 +#: user-manual.txt:3842 msgid "" "_Save to cloud storage_ - Save the current dive log to " "<<S_Cloud_storage,_Cloud storage_>>." msgstr "" #. type: Plain text -#: user-manual.txt:3847 +#: user-manual.txt:3843 msgid "" "_Take cloud storage online_ - " "******************************************************" msgstr "" #. type: Plain text -#: user-manual.txt:3848 +#: user-manual.txt:3844 msgid "_Close_ - Close the dive logbook currently open." msgstr "" #. type: Plain text -#: user-manual.txt:3850 +#: user-manual.txt:3846 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:3851 +#: user-manual.txt:3847 msgid "<<S_PrintDivelog,_Print_>> - Print the currently open logbook." msgstr "" #. type: Plain text -#: user-manual.txt:3852 +#: user-manual.txt:3848 msgid "<<S_Preferences,_Preferences_>> - Set the _Subsurface_ preferences." msgstr "" #. type: Plain text -#: user-manual.txt:3853 +#: user-manual.txt:3849 msgid "" "<<S_FindMovedImages, _Find moved images_>> - If photos taken during dives " "have been moved to" msgstr "" #. type: Plain text -#: user-manual.txt:3854 +#: user-manual.txt:3850 msgid "" "a different disk or directory, locate them and link them to the appropriate " "dives." msgstr "" #. type: Plain text -#: user-manual.txt:3855 +#: user-manual.txt:3851 msgid "" "<<S_Configure,_Configure dive computer_>> - Edit the configuration of a dive " "computer." msgstr "" #. type: Plain text -#: user-manual.txt:3856 +#: user-manual.txt:3852 msgid "_Quit_ - Quit _Subsurface_." msgstr "" #. type: Title === -#: user-manual.txt:3858 +#: user-manual.txt:3854 #, no-wrap msgid "Edit" msgstr "" #. type: Plain text -#: user-manual.txt:3860 +#: user-manual.txt:3856 msgid "The Edit option allows one to undo or redo an action, e.g. deleting dives." msgstr "" #. type: Title === -#: user-manual.txt:3861 +#: user-manual.txt:3857 #, no-wrap msgid "Import" msgstr "" #. type: Plain text -#: user-manual.txt:3864 +#: user-manual.txt:3860 msgid "" "<<S_ImportDiveComputer,_Import from dive computer_>> - Import dive " "information from a dive computer." msgstr "" #. type: Plain text -#: user-manual.txt:3866 +#: user-manual.txt:3862 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:3868 +#: user-manual.txt:3864 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:3870 +#: user-manual.txt:3866 msgid "" "<<S_ImportingDivelogsDe,_Import from Divelogs.de_>> - Import dive " "information from _www.Divelogs.de_." msgstr "" #. type: Title === -#: user-manual.txt:3871 +#: user-manual.txt:3867 #, no-wrap msgid "Log" msgstr "" #. type: Plain text -#: user-manual.txt:3873 +#: user-manual.txt:3869 msgid "" "<<S_EnterData,_Add Dive_>> - Manually add a new dive to the *Dive List* " "panel." msgstr "" #. type: Plain text -#: user-manual.txt:3874 +#: user-manual.txt:3870 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:3875 +#: user-manual.txt:3871 msgid "<<S_DivePlanner,_Plan Dive_>> - Plan dives." msgstr "" #. type: Plain text -#: user-manual.txt:3876 +#: user-manual.txt:3872 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:3878 +#: user-manual.txt:3874 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:3880 +#: user-manual.txt:3876 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:3882 +#: user-manual.txt:3878 msgid "" "<<S_Renumber,_Renumber_>> - Renumber the dives listed in the *Dive List* " "panel." msgstr "" #. type: Plain text -#: user-manual.txt:3884 +#: user-manual.txt:3880 msgid "" "<<S_Group,_Auto Group_>> - Group the dives in the *Dive List* panel into " "dive trips." msgstr "" #. type: Plain text -#: user-manual.txt:3885 +#: user-manual.txt:3881 msgid "" "<<S_DeviceNames,_Edit Device Names_>> - Edit the names of dive computers to " "coordinate your logs." msgstr "" #. type: Plain text -#: user-manual.txt:3886 +#: user-manual.txt:3882 msgid "" "<<S_Filter,_Filter divelist_>> - Select only some dives, based on specific " "tags or dive criteria." msgstr "" #. type: Title === -#: user-manual.txt:3887 +#: user-manual.txt:3883 #, no-wrap msgid "View" msgstr "" #. type: Plain text -#: user-manual.txt:3890 +#: user-manual.txt:3886 msgid "<<S_ViewPanels,_All_>> - View the four main _Subsurface_ panels all at once." msgstr "" #. type: Plain text -#: user-manual.txt:3891 +#: user-manual.txt:3887 msgid "<<S_ViewPanels,_Dive List_>> - View only the *Dive List* panel." msgstr "" #. type: Plain text -#: user-manual.txt:3892 +#: user-manual.txt:3888 msgid "<<S_ViewPanels,_Profile_>> - View only the *Dive Profile* panel." msgstr "" #. type: Plain text -#: user-manual.txt:3893 +#: user-manual.txt:3889 msgid "<<S_ViewPanels,_Info_>> - View only the *Notes* panel." msgstr "" #. type: Plain text -#: user-manual.txt:3894 +#: user-manual.txt:3890 msgid "<<S_ViewPanels,_Globe_>> - View only the *World Map* panel." msgstr "" #. type: Plain text -#: user-manual.txt:3896 +#: user-manual.txt:3892 msgid "" "_Yearly Statistics_ - Display summary statistics about dives during this and " "past years." msgstr "" #. type: Plain text -#: user-manual.txt:3899 +#: user-manual.txt:3895 msgid "" "_Prev DC_ - Switch to data from previous dive computer, if a single dive was " "logged from more than one. See the sections on " @@ -8142,50 +8133,50 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3900 +#: user-manual.txt:3896 msgid "_Next DC_ - Switch to next dive computer." msgstr "" #. type: Plain text -#: user-manual.txt:3901 +#: user-manual.txt:3897 msgid "_Full Screen_ - Toggles Full Screen mode." msgstr "" #. type: Title === -#: user-manual.txt:3902 +#: user-manual.txt:3898 #, no-wrap msgid "Share on" msgstr "" #. type: Plain text -#: user-manual.txt:3904 +#: user-manual.txt:3900 msgid "" "<<S_Facebook,_Facebook_>> - Share the currently selected dive on your " "Facebook timeline." msgstr "" #. type: Title === -#: user-manual.txt:3905 +#: user-manual.txt:3901 #, no-wrap msgid "Help" msgstr "" #. type: Plain text -#: user-manual.txt:3908 +#: user-manual.txt:3904 msgid "" "_About Subsurface_ - Show a panel with the version number of _Subsurface_ as " "well as licensing information." msgstr "" #. type: Plain text -#: user-manual.txt:3910 +#: user-manual.txt:3906 msgid "" "_Check for updates_ - Find out whether a newer version of Subsurface is " -"available on the http://subsurface-divelog.org/[_Subsurface_ web site]." +"available on the https://subsurface-divelog.org/[_Subsurface_ web site]." msgstr "" #. type: Plain text -#: user-manual.txt:3912 +#: user-manual.txt:3908 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 " @@ -8193,12 +8184,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3913 +#: user-manual.txt:3909 msgid "_User manual_ - Open a window showing this user manual." msgstr "" #. type: Title == -#: user-manual.txt:3916 +#: user-manual.txt:3912 #, no-wrap msgid "" "APPENDIX A: Operating system specific information for importing dive " @@ -8206,19 +8197,19 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3918 +#: user-manual.txt:3914 #, 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:3919 +#: user-manual.txt:3915 #, no-wrap msgid "images/icons/drivers.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:3924 +#: user-manual.txt:3920 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 " @@ -8226,7 +8217,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3930 +#: user-manual.txt:3926 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 " @@ -8235,7 +8226,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3934 +#: user-manual.txt:3930 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 " @@ -8243,30 +8234,30 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3941 +#: user-manual.txt:3937 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 " "computer using a USB-to-serial interface based on the Silicon Labs CP2101 or " "similar chip can be found as _Mac_OSX_VCP_Driver.zip_ at the " -"http://www.silabs.com/support/pages/document-library.aspx?p=Interface&f=USB%20Bridges&pn=CP2101[Silicon " +"https://www.silabs.com/support/pages/document-library.aspx?p=Interface&f=USB%20Bridges&pn=CP2101[Silicon " "Labs document and software repository]." msgstr "" #. type: Title === -#: user-manual.txt:3943 +#: user-manual.txt:3939 #, 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:3944 +#: user-manual.txt:3940 #, no-wrap msgid "images/icons/usb.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:3952 +#: user-manual.txt:3948 msgid "" "When connecting a dive computer by using a USB connector, usually " "_Subsurface_ will either propose a drop down list with the correct device " @@ -8276,61 +8267,61 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3957 +#: user-manual.txt:3953 msgid "" "Simply try COM1, COM2, etc. The drop down list should contain all connected " "COM devices." msgstr "" #. type: Title ==== -#: user-manual.txt:3958 user-manual.txt:4056 +#: user-manual.txt:3954 user-manual.txt:4052 #, no-wrap msgid "On MacOS:" msgstr "" #. type: Plain text -#: user-manual.txt:3961 +#: user-manual.txt:3957 msgid "The drop down box should find all connected dive computers." msgstr "" #. type: Block title -#: user-manual.txt:3962 +#: user-manual.txt:3958 #, no-wrap msgid "On Linux:" msgstr "" #. type: Plain text -#: user-manual.txt:3965 +#: user-manual.txt:3961 msgid "There is a definitive way to find the port:" msgstr "" #. type: Plain text -#: user-manual.txt:3967 +#: user-manual.txt:3963 msgid "Disconnect the USB cable from the dive computer" msgstr "" #. type: Plain text -#: user-manual.txt:3968 +#: user-manual.txt:3964 msgid "Open a terminal" msgstr "" #. type: Plain text -#: user-manual.txt:3969 user-manual.txt:3971 +#: user-manual.txt:3965 user-manual.txt:3967 msgid "Type the command: 'dmesg' and press enter" msgstr "" #. type: Plain text -#: user-manual.txt:3970 +#: user-manual.txt:3966 msgid "Plug in the USB cable of the dive computer" msgstr "" #. type: Plain text -#: user-manual.txt:3973 +#: user-manual.txt:3969 msgid "A message similar to this one should appear:" msgstr "" #. type: Plain text -#: user-manual.txt:3989 +#: user-manual.txt:3985 #, no-wrap msgid "" "\tusb 2-1.1: new full speed USB device number 14 using ehci_hcd\n" @@ -8351,7 +8342,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3994 +#: user-manual.txt:3990 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 " @@ -8359,12 +8350,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3996 +#: user-manual.txt:3992 msgid "Ensuring the user has write permission to the USB serial port:" msgstr "" #. type: Plain text -#: user-manual.txt:4006 +#: user-manual.txt:4002 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 " @@ -8376,14 +8367,14 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4010 +#: user-manual.txt:4006 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:4015 +#: user-manual.txt:4011 #, no-wrap msgid "" "Type: +id johnB+ This lists all the groups that johnB belongs to and\n" @@ -8395,7 +8386,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4017 +#: user-manual.txt:4013 #, no-wrap msgid "" "Under some circumstances this change takes only effect (eg. on Ubuntu) " @@ -8404,7 +8395,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4022 +#: user-manual.txt:4018 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 " @@ -8412,13 +8403,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4025 +#: user-manual.txt:4021 #, no-wrap msgid "Manually setting up Bluetooth enabled devices" msgstr "" #. type: Plain text -#: user-manual.txt:4032 +#: user-manual.txt:4028 msgid "" "For dive computers communicating through Bluetooth like the Heinrichs " "Weikamp Frog or the Shearwater Predator, Petrel and Nerd there is a " @@ -8427,7 +8418,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4034 +#: user-manual.txt:4030 #, no-wrap msgid "" "*For the dive computer, after enabling Bluetooth, be sure it is in Upload " @@ -8435,7 +8426,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4038 +#: user-manual.txt:4034 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 -> " @@ -8443,13 +8434,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4040 +#: user-manual.txt:4036 #, no-wrap msgid "*Pair the _Subsurface_ computer with the dive computer.*\n" msgstr "" #. type: Plain text -#: user-manual.txt:4049 +#: user-manual.txt:4045 msgid "" "Bluetooth is most likely already enabled. For pairing with the dive computer " "choose _Control Panel -> Bluetooth Devices -> Add Wireless Device_. This " @@ -8461,21 +8452,21 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4052 +#: user-manual.txt:4048 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:4055 +#: user-manual.txt:4051 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:4062 +#: user-manual.txt:4058 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 " @@ -8484,20 +8475,20 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4065 +#: user-manual.txt:4061 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:4066 +#: user-manual.txt:4062 #, no-wrap msgid "On Linux" msgstr "" #. type: Plain text -#: user-manual.txt:4074 +#: user-manual.txt:4070 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 " @@ -8509,7 +8500,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4078 +#: user-manual.txt:4074 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 " @@ -8518,23 +8509,23 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4080 +#: user-manual.txt:4076 msgid "Enable the Bluetooth controller and pair your dive computer" msgstr "" #. type: Plain text -#: user-manual.txt:4081 +#: user-manual.txt:4077 msgid "Establish an RFCOMM connection" msgstr "" #. type: Title ===== -#: user-manual.txt:4082 user-manual.txt:4222 +#: user-manual.txt:4078 user-manual.txt:4218 #, no-wrap msgid "Download the dives with Subsurface" msgstr "" #. type: Plain text -#: user-manual.txt:4088 +#: user-manual.txt:4084 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 " @@ -8545,7 +8536,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4093 +#: user-manual.txt:4089 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 " @@ -8555,23 +8546,23 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4095 +#: user-manual.txt:4091 msgid "+sudo usermod -a -G dialout username+" msgstr "" #. type: Plain text -#: user-manual.txt:4097 +#: user-manual.txt:4093 msgid "Then log out and log in for the change to take effect." msgstr "" #. type: Title ===== -#: user-manual.txt:4098 +#: user-manual.txt:4094 #, no-wrap msgid "Enabling the Bluetooth controller and pairing your dive computer" msgstr "" #. type: Plain text -#: user-manual.txt:4104 +#: user-manual.txt:4100 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 " @@ -8582,15 +8573,15 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4107 +#: user-manual.txt:4103 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" +"status." msgstr "" #. type: Plain text -#: user-manual.txt:4114 +#: user-manual.txt:4110 #, no-wrap msgid "" "\t$ hciconfig\n" @@ -8602,7 +8593,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4119 +#: user-manual.txt:4115 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 " @@ -8612,7 +8603,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4127 +#: user-manual.txt:4123 #, no-wrap msgid "" "\tsudo hciconfig hci0 up auth+ (enter password when prompted)\n" @@ -8625,25 +8616,25 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4129 +#: user-manual.txt:4125 msgid "Check that the status now includes +'UP', 'RUNNING' AND 'AUTH'+." msgstr "" #. type: Plain text -#: user-manual.txt:4131 +#: user-manual.txt:4127 msgid "" -"If there are multiple controllers running, it's easiest to off the unused " -"controller(s). For example, for +hci1+:" +"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:4133 +#: user-manual.txt:4129 #, no-wrap msgid "\tsudo hciconfig hci1 down\n" msgstr "" #. type: Plain text -#: user-manual.txt:4136 +#: user-manual.txt:4132 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 " @@ -8651,7 +8642,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4157 +#: user-manual.txt:4153 #, no-wrap msgid "" "\tbluetoothctl\n" @@ -8680,14 +8671,14 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4160 +#: user-manual.txt:4156 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:4163 +#: user-manual.txt:4159 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 " @@ -8695,7 +8686,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4168 +#: user-manual.txt:4164 #, no-wrap msgid "" "\thcitool -i hci0 scanning\n" @@ -8705,82 +8696,82 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4170 -msgid "Once ther dive computer is pired, set up the RFCOMM connection" +#: user-manual.txt:4166 +msgid "Once the dive computer is paired, set up the RFCOMM connection." msgstr "" #. type: Title ===== -#: user-manual.txt:4171 +#: user-manual.txt:4167 #, no-wrap msgid "Establishing the RFCOMM connection" msgstr "" #. type: Plain text -#: user-manual.txt:4174 +#: user-manual.txt:4170 msgid "The command to establish an RFCOMM connection is:" msgstr "" #. type: Plain text -#: user-manual.txt:4176 +#: user-manual.txt:4172 msgid "+sudo rfcomm -i <controller> connect <dev> <bdaddr> [channel]+" msgstr "" #. type: Plain text -#: user-manual.txt:4178 +#: user-manual.txt:4174 msgid "+<controller>+ is the Bluetooth controller, +hci0+." msgstr "" #. type: Plain text -#: user-manual.txt:4179 +#: user-manual.txt:4175 msgid "+<dev>+ is the RFCOMM device file, +rfcomm0+" msgstr "" #. type: Plain text -#: user-manual.txt:4180 +#: user-manual.txt:4176 msgid "+<bdaddr>+ is the dive computer's MAC address, +00:11:22:33:44:55+" msgstr "" #. type: Plain text -#: user-manual.txt:4181 +#: user-manual.txt:4177 msgid "+[channel]+ is the dive computer's Bluetooth channel we need to connect to." msgstr "" #. type: Plain text -#: user-manual.txt:4184 +#: user-manual.txt:4180 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:4186 +#: user-manual.txt:4182 msgid "_Shearwater Petrel 1_: channel 1" msgstr "" #. type: Plain text -#: user-manual.txt:4187 +#: user-manual.txt:4183 msgid "_Shearwater Petrel 2_: channel 5" msgstr "" #. type: Plain text -#: user-manual.txt:4188 +#: user-manual.txt:4184 msgid "_Shearwater Nerd_: channel 5" msgstr "" #. type: Plain text -#: user-manual.txt:4189 +#: user-manual.txt:4185 msgid "_Heinrichs-Weikamp OSTC Sport_: channel 1" msgstr "" #. type: Plain text -#: user-manual.txt:4191 +#: user-manual.txt:4187 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:4193 +#: user-manual.txt:4189 #, no-wrap msgid "" "\tsudo rfcomm -i hci0 connect rfcomm0 00:11:22:33:44:55 5 (enter a password, " @@ -8788,12 +8779,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4195 +#: user-manual.txt:4191 msgid "This gives the response:" msgstr "" #. type: Plain text -#: user-manual.txt:4198 +#: user-manual.txt:4194 #, no-wrap msgid "" "\tConnected /dev/rfcomm0 to 00:11:22:33:44:55 on channel 5\n" @@ -8801,14 +8792,14 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4200 +#: user-manual.txt:4196 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:4204 +#: user-manual.txt:4200 #, no-wrap msgid "" "\tsudo rfcomm -i hci0 connect rfcomm0 00:11:22:33:44:55 (enter a password, " @@ -8818,7 +8809,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4208 +#: user-manual.txt:4204 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 " @@ -8827,7 +8818,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4218 +#: user-manual.txt:4214 #, no-wrap msgid "" "\tsdptool -i hci0 records 00:11:22:33:44:55\n" @@ -8842,7 +8833,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4221 +#: user-manual.txt:4217 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 " @@ -8850,7 +8841,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4224 +#: user-manual.txt:4220 msgid "" "After establishing the RFCOMM connection and while the dive computer's " "upload mode countdown is still running, go to_Subsurface_, select " @@ -8860,25 +8851,25 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:4230 +#: user-manual.txt:4226 #, no-wrap msgid "APPENDIX B: Dive Computer specific information for importing dive data." msgstr "" #. type: Title === -#: user-manual.txt:4233 +#: user-manual.txt:4229 #, no-wrap msgid "Importing from Uemis Zurich" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4235 +#: user-manual.txt:4231 #, no-wrap msgid "images/icons/iumis.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4251 +#: user-manual.txt:4247 msgid "" "_Subsurface_ downloads the information stored on the SDA (the built-in file " "system of the Uemis) including information about dive spots and " @@ -8895,7 +8886,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4266 +#: user-manual.txt:4262 msgid "" "After selecting the above device name, download the dives from the Uemis " "Zurich. One technical issue with the Uemis Zurich download implementation " @@ -8912,19 +8903,19 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4268 +#: user-manual.txt:4264 #, no-wrap msgid "Importing from Uwatec Galileo" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4270 +#: user-manual.txt:4266 #, no-wrap msgid "images/icons/Galileo.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4285 +#: user-manual.txt:4281 msgid "" "The Uwatec Galileo dive computers use infra red (IrDA) communication between " "the dive computer and Subsurface. The Uwatec hardware uses a USB dongle " @@ -8940,14 +8931,14 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4288 +#: user-manual.txt:4284 msgid "" "After executing this command, Subsurface will recognize the Galileo dive " "computer and download dive information." msgstr "" #. type: Plain text -#: user-manual.txt:4294 +#: user-manual.txt:4290 msgid "" "Under Windows, a similar situation exists. Drivers for the MCS7780 are " "available from some Internet web sites e.g. " @@ -8958,77 +8949,77 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4297 +#: user-manual.txt:4293 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:4299 +#: user-manual.txt:4295 #, no-wrap msgid "Importing from Heinrichs Weikamp DR5" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4301 +#: user-manual.txt:4297 #, no-wrap msgid "images/icons/HW_DR5.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4311 +#: user-manual.txt:4307 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. " "Note: The DR5 does not seem to store gradient factors nor deco information, " "so for _Subsurface_ it is not possible to display them. Adjust the gradient " -"factors in the _Graph Settings_ in _Subsurface_ to generate a deco overlay " +"factors in the _Profile Settings_ in _Subsurface_ to generate a deco overlay " "in the _Subsurface_ *Dive Profile* panel but please note that the deco " "calculated by _Subsurface_ will most likely differ from the one displayed on " "the DR5." msgstr "" #. type: Title === -#: user-manual.txt:4314 +#: user-manual.txt:4310 #, no-wrap msgid "Importing from xDEEP BLACK" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4316 +#: user-manual.txt:4312 #, no-wrap msgid "images/icons/HW_xdeepblack.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4325 +#: user-manual.txt:4321 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 " "available in LOGBOOK directory. Note: The xDEEP BLACK saves NDL time but " "does not seem to store gradient factors nor deco information, so for " "_Subsurface_ it is not possible to display them. Adjust the gradient factors " -"in the _Graph Settings_ in _Subsurface_ to generate a deco overlay in the " +"in the _Profile Settings_ in _Subsurface_ to generate a deco overlay in the " "_Subsurface_ *Dive Profile* panel but please note that the deco calculated " "by _Subsurface_ will most likely differ from the one displayed on the xDEEP " "BLACK." msgstr "" #. type: Title === -#: user-manual.txt:4327 +#: user-manual.txt:4323 #, no-wrap msgid "Importing from Shearwater Predator/Petrel/Nerd using Bluetooth" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4329 +#: user-manual.txt:4325 #, no-wrap msgid "images/icons/predator.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4332 +#: user-manual.txt:4328 msgid "" "Specific instructions for downloading dives using Bluetooth are given in the " "section above, <<S_Bluetooth,_Connecting Subsurface to a Bluetooth-enabled " @@ -9036,19 +9027,19 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4334 +#: user-manual.txt:4330 #, no-wrap msgid "Importing from Poseidon MkVI Discovery" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4336 +#: user-manual.txt:4332 #, no-wrap msgid "images/MkVI.jpeg" msgstr "" #. type: Plain text -#: user-manual.txt:4344 +#: user-manual.txt:4340 msgid "" "Download of dive logs from the MkVI is performed using a custom " "communications adapter and the _Poseidon PC Configuration Software_, " @@ -9060,45 +9051,45 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4347 +#: user-manual.txt:4343 msgid "" "Setup configuration for the dive and key dive parameters (file with a .txt " "extension)" msgstr "" #. type: Plain text -#: user-manual.txt:4348 +#: user-manual.txt:4344 msgid "Dive log details (file with a .csv extension)" msgstr "" #. type: Plain text -#: user-manual.txt:4350 +#: user-manual.txt:4346 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:4352 +#: user-manual.txt:4348 msgid "" "_Subsurface_ accesses the .txt and the .csv files to get dive log " "information." msgstr "" #. type: Title === -#: user-manual.txt:4354 +#: user-manual.txt:4350 #, no-wrap msgid "Importing from APD Inspiration/Evolution CCR" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4356 +#: user-manual.txt:4352 #, no-wrap msgid "images/APDComputer.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4364 +#: user-manual.txt:4360 msgid "" "The dive logs of an APD Inspiration or similar CCR dive computer are " "downloaded using a communications adapter and _AP Communicator_, obtained " @@ -9110,55 +9101,55 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4366 +#: user-manual.txt:4362 msgid "Download the dive using _AP Communicator_." msgstr "" #. type: Plain text -#: user-manual.txt:4367 +#: user-manual.txt:4363 msgid "Open a dive within the _AP Log Viewer_." msgstr "" #. type: Plain text -#: user-manual.txt:4368 +#: user-manual.txt:4364 msgid "Select the tab at the top of the screen, entitled \"_Data_\"." msgstr "" #. type: Plain text -#: user-manual.txt:4369 +#: user-manual.txt:4365 msgid "" "With the raw dive log data show on the screen, click on \"_Copy to " "Clipboard_\"." msgstr "" #. type: Plain text -#: user-manual.txt:4370 +#: user-manual.txt:4366 msgid "Open a text editor, e.g. Notepad (Windows) or TextWrangler (Mac)." msgstr "" #. type: Plain text -#: user-manual.txt:4372 +#: user-manual.txt:4368 msgid "" "Copy the contents of the clipboard into the text editor and save the text " -"file with a filename extension of _.apd_" +"file with a filename extension of _.apd_." msgstr "" #. type: Plain text -#: user-manual.txt:4373 +#: user-manual.txt:4369 msgid "" "Within _Subsurface_, select _Import -> Import log files_ to open the " "xref:Unified_import[universal import dialogue]." msgstr "" #. type: Plain text -#: user-manual.txt:4374 +#: user-manual.txt:4370 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:4378 +#: user-manual.txt:4374 #, no-wrap msgid "" "On the list of file names select the _.apd_ file created. An import\n" @@ -9168,13 +9159,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:4379 +#: user-manual.txt:4375 #, no-wrap msgid "images/APD_CSVimportF22.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4387 +#: user-manual.txt:4383 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 " @@ -9186,12 +9177,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4388 +#: user-manual.txt:4384 msgid "Click the _Ok_ button at the bottom of the import panel." msgstr "" #. type: Plain text -#: user-manual.txt:4393 +#: user-manual.txt:4389 msgid "" "The APD dive log will appear within _Subsurface_. The dive computer- " "generated ceiling provided by the Inspiration can be viewed by selecting the " @@ -9201,13 +9192,13 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:4394 +#: user-manual.txt:4390 #, no-wrap msgid "APPENDIX C: Exporting Dive log information from external dive log software." msgstr "" #. type: Plain text -#: user-manual.txt:4403 +#: user-manual.txt:4399 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, " @@ -9217,22 +9208,22 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4405 +#: user-manual.txt:4401 msgid "Export the foreign dive log data to format that is accessible from" msgstr "" #. type: Plain text -#: user-manual.txt:4406 +#: user-manual.txt:4402 msgid "_Subsurface_." msgstr "" #. type: Plain text -#: user-manual.txt:4407 +#: user-manual.txt:4403 msgid "Import the accessible dive log data into _Subsurface_." msgstr "" #. type: Plain text -#: user-manual.txt:4411 +#: user-manual.txt:4407 msgid "" "This appendix provides some information about approaches to export dive log " "data from foreign dive log software. The procedures below mostly apply to " @@ -9240,86 +9231,86 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4413 +#: user-manual.txt:4409 #, no-wrap msgid "Exporting from *Suunto Divemanager (DM3, DM4 or DM5)*" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4414 +#: user-manual.txt:4410 #, no-wrap msgid "images/icons/suuntologo.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4421 +#: user-manual.txt:4417 msgid "" -"DiveManager is a MS Windows application for Suunto dive computers. " -"Divemanager 3 (DM3) is an older version of the Suunto software. More recent " -"Suunto dive computers use Divemanager version 4 or 5 (DM4 or DM5). The " -"different versions of Divemanager use different methods and different file " -"naming conventions to export dive log data." +"DiveManager is a Windows application for Suunto dive computers. Divemanager " +"3 (DM3) is an older version of the Suunto software. More recent Suunto dive " +"computers use Divemanager version 4 or 5 (DM4 or DM5). The different " +"versions of Divemanager use different methods and different file naming " +"conventions to export dive log data." msgstr "" #. type: Plain text -#: user-manual.txt:4423 +#: user-manual.txt:4419 #, no-wrap msgid "*Divemanager 3 (DM3):*\n" msgstr "" #. type: Plain text -#: user-manual.txt:4425 +#: user-manual.txt:4421 msgid "Start 'Suunto Divemanager 3' and log in with the name containing the logs" msgstr "" #. type: Plain text -#: user-manual.txt:4426 +#: user-manual.txt:4422 msgid "Do not start the import wizard to import dives from the dive computer." msgstr "" #. type: Plain text -#: user-manual.txt:4428 +#: user-manual.txt:4424 msgid "" "In the navigation tree on the left side of the program-window, select the " "appropriate dives." msgstr "" #. type: Plain text -#: user-manual.txt:4429 +#: user-manual.txt:4425 msgid "Within the list of dives, select the dives you would like to import later:" msgstr "" #. type: Plain text -#: user-manual.txt:4430 +#: user-manual.txt:4426 msgid "To select certain dives: hold 'ctrl' and click the dive" msgstr "" #. type: Plain text -#: user-manual.txt:4432 +#: user-manual.txt:4428 msgid "" "To select all dives: Select the first dive, hold down shift and select the " "last dive" msgstr "" #. type: Plain text -#: user-manual.txt:4433 +#: user-manual.txt:4429 msgid "With the dives marked, use the program menu _File -> Export_" msgstr "" #. type: Plain text -#: user-manual.txt:4434 +#: user-manual.txt:4430 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:4435 +#: user-manual.txt:4431 msgid "Click the browse button next to the field Export Path" msgstr "" #. type: Plain text -#: user-manual.txt:4437 +#: user-manual.txt:4433 #, no-wrap msgid "" "** A file-manager like window pops up\n" @@ -9327,13 +9318,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4438 +#: user-manual.txt:4434 #, no-wrap msgid "Divelog.SDE file\n" msgstr "" #. type: Plain text -#: user-manual.txt:4440 +#: user-manual.txt:4436 #, no-wrap msgid "" "** Optionally change the name of the file for saving\n" @@ -9341,25 +9332,25 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4441 +#: user-manual.txt:4437 #, no-wrap msgid "Back in the Export pop-up, press the button 'Export'\n" msgstr "" #. type: Plain text -#: user-manual.txt:4442 +#: user-manual.txt:4438 #, no-wrap msgid "The dives are now exported to the file Divelog.SDE.\n" msgstr "" #. type: Plain text -#: user-manual.txt:4444 +#: user-manual.txt:4440 #, no-wrap msgid "*Divemanager 4 (DM4) and Divemanager 5 (DM5):*\n" msgstr "" #. type: Plain text -#: user-manual.txt:4449 +#: user-manual.txt:4445 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 " @@ -9368,103 +9359,103 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4451 +#: user-manual.txt:4447 msgid "Locating the Suunto DM4 (or DM5) database:" msgstr "" #. type: Plain text -#: user-manual.txt:4453 user-manual.txt:4462 +#: user-manual.txt:4449 user-manual.txt:4458 msgid "Start Suunto DM4/DM5" msgstr "" #. type: Plain text -#: user-manual.txt:4454 +#: user-manual.txt:4450 msgid "Select 'Help -> About'" msgstr "" #. type: Plain text -#: user-manual.txt:4455 +#: user-manual.txt:4451 msgid "Click 'Copy' after text 'Copy log folder path to clipboard'" msgstr "" #. type: Plain text -#: user-manual.txt:4456 +#: user-manual.txt:4452 msgid "Open Windows Explorer" msgstr "" #. type: Plain text -#: user-manual.txt:4457 +#: user-manual.txt:4453 msgid "Paste the address to the path box at the top of the File Explorer" msgstr "" #. type: Plain text -#: user-manual.txt:4458 +#: user-manual.txt:4454 msgid "The database is called DM4.db or DM5.db" msgstr "" #. type: Plain text -#: user-manual.txt:4460 +#: user-manual.txt:4456 msgid "Making a backup copy of the Suunto DM4/DM5 database:" msgstr "" #. type: Plain text -#: user-manual.txt:4463 +#: user-manual.txt:4459 msgid "Select 'File - Create backup'" msgstr "" #. type: Plain text -#: user-manual.txt:4465 +#: user-manual.txt:4461 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:4466 +#: user-manual.txt:4462 msgid "Click 'Save'" msgstr "" #. type: Plain text -#: user-manual.txt:4467 +#: user-manual.txt:4463 msgid "The dives are now exported to the file DM4.bak (or DM5.bak)" msgstr "" #. type: Title === -#: user-manual.txt:4469 +#: user-manual.txt:4465 #, no-wrap msgid "Exporting from Atomic Logbook" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4472 +#: user-manual.txt:4468 #, no-wrap msgid "images/icons/atomiclogo.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4479 +#: user-manual.txt:4475 msgid "" -"Atomic Logbook is a Windows software by Atomic Aquatics. It allows " -"downloading of dive information from Cobalt and Cobalt 2 dive computers. " -"The divelog is kept in a SQLite database at " +"Atomic Logbook is Windows software by Atomic Aquatics. It allows downloading " +"of dive information from Cobalt and Cobalt 2 dive computers. The divelog is " +"kept in a SQLite database at " "C:\\ProgramData\\AtomicsAquatics\\Cobalt-Logbook\\Cobalt.db. This file can " "be directly imported to Subsurface." msgstr "" #. type: Title === -#: user-manual.txt:4481 +#: user-manual.txt:4477 #, no-wrap msgid "Exporting from Mares Dive Organiser V2.1" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4484 +#: user-manual.txt:4480 #, no-wrap msgid "images/icons/mareslogo.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4492 +#: user-manual.txt:4488 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 " @@ -9475,7 +9466,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4497 +#: user-manual.txt:4493 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 " @@ -9483,36 +9474,36 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4500 +#: user-manual.txt:4496 msgid "" "Rename the file to DiveOrganizerxxxxx.zip. Inside the zipped directory is a " "file _DiveOrganizer.sdf_." msgstr "" #. type: Plain text -#: user-manual.txt:4501 +#: user-manual.txt:4497 msgid "Extract the _.sdf_ file from the zipped folder to your Desktop." msgstr "" #. type: Plain text -#: user-manual.txt:4502 +#: user-manual.txt:4498 msgid "The password for accessing the .zip file is _mares_." msgstr "" #. type: Title === -#: user-manual.txt:4504 +#: user-manual.txt:4500 #, no-wrap msgid "Exporting from *DivingLog 5.0 and 6.0*" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4506 +#: user-manual.txt:4502 #, no-wrap msgid "images/icons/divingloglogo.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4513 +#: user-manual.txt:4509 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 " @@ -9522,37 +9513,37 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4515 +#: user-manual.txt:4511 msgid "To transfer all files from DivingLog to Subsurface:" msgstr "" #. type: Plain text -#: user-manual.txt:4517 +#: user-manual.txt:4513 msgid "In DivingLog open the 'File -> Export -> SQLite' menu" msgstr "" #. type: Plain text -#: user-manual.txt:4518 +#: user-manual.txt:4514 msgid "Select 'Settings' button" msgstr "" #. type: Plain text -#: user-manual.txt:4519 +#: user-manual.txt:4515 msgid "Set the 'RTF2Plaintext' to 'true'" msgstr "" #. type: Plain text -#: user-manual.txt:4520 +#: user-manual.txt:4516 msgid "Close the Settings dialog" msgstr "" #. type: Plain text -#: user-manual.txt:4521 +#: user-manual.txt:4517 msgid "Click 'Export' button and select the filename" msgstr "" #. type: Plain text -#: user-manual.txt:4525 +#: user-manual.txt:4521 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 " @@ -9560,13 +9551,13 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:4526 +#: user-manual.txt:4522 #, no-wrap msgid "APPENDIX D: Exporting a spreadsheet to CSV format" msgstr "" #. type: Plain text -#: user-manual.txt:4536 +#: user-manual.txt:4532 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 " @@ -9578,50 +9569,50 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4542 +#: user-manual.txt:4538 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 " "in a single row. _Subsurface_ supports many data items (Dive number, Date, " -"Time, Duration, Location, GPS, Max Depth, Mean Depth, Buddy, Notes, Weight " +"Time, Duration, Location, GPS, Max. Depth, Mean Depth, Buddy, Notes, Weight " "and Tags). Organize dive data following a few simple rules:" msgstr "" #. type: Plain text -#: user-manual.txt:4544 +#: user-manual.txt:4540 msgid "Date: use one of the following formats: yyyy-mm-dd, dd.mm.yyyy, mm/dd/yyyy" msgstr "" #. type: Plain text -#: user-manual.txt:4545 +#: user-manual.txt:4541 msgid "Duration: the format should be minutes:seconds." msgstr "" #. type: Plain text -#: user-manual.txt:4546 +#: user-manual.txt:4542 msgid "" "Unit system: only one unit system should be used (no mix of imperial and " "metric units)" msgstr "" #. type: Plain text -#: user-manual.txt:4547 +#: user-manual.txt:4543 msgid "Tags and buddies: values should be separated using a comma." msgstr "" #. type: Plain text -#: user-manual.txt:4548 +#: user-manual.txt:4544 msgid "GPS position: use decimal degrees, e.g. 30.22496 30.821798" msgstr "" #. type: Title === -#: user-manual.txt:4548 +#: user-manual.txt:4544 #, no-wrap msgid "_LibreOffice Calc_ and _OpenOffice Calc_" msgstr "" #. type: Plain text -#: user-manual.txt:4552 +#: user-manual.txt:4548 msgid "" "These are open source spreadsheet applications forming parts of larger open " "source office suite applications. The user interaction with _LibreOffice_ " @@ -9632,13 +9623,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:4553 +#: user-manual.txt:4549 #, no-wrap msgid "images/LOffice_spreadsheetdata.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4556 +#: user-manual.txt:4552 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 " @@ -9646,13 +9637,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:4557 +#: user-manual.txt:4553 #, no-wrap msgid "images/LOffice_save_as_options.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4560 +#: user-manual.txt:4556 msgid "" "After selecting _Save_, select the appropriate field delimiter (choose _Tab_ " "to prevent conflicts with the comma when using this as a decimal point), " @@ -9660,13 +9651,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:4561 +#: user-manual.txt:4557 #, no-wrap msgid "images/LOffice_field_options.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4564 +#: user-manual.txt:4560 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 " @@ -9674,13 +9665,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4565 +#: user-manual.txt:4561 #, no-wrap msgid "Microsoft _Excel_" msgstr "" #. type: Plain text -#: user-manual.txt:4571 +#: user-manual.txt:4567 msgid "" "The field delimiter (called \"_list separator_\" in Microsoft manuals) is " "not accessible from within _Excel_ and needs to be set through the " @@ -9691,68 +9682,67 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4573 +#: user-manual.txt:4569 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:4574 +#: user-manual.txt:4570 msgid "Open the _Regional and Language Options_ dialog box." msgstr "" #. type: Plain text -#: user-manual.txt:4577 +#: user-manual.txt:4572 msgid "" -"Do one of the following: ** In Windows 7, click the _Formats_ tab, and then " -"click _Customize this format_. ** In Windows XP, click the _Regional " -"Options_ tab, and then click _Customize_." +"Do the following: ** In Windows 7, click the _Formats_ tab, and then click " +"_Customize this format_." msgstr "" #. type: Plain text -#: user-manual.txt:4578 +#: user-manual.txt:4573 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:4579 +#: user-manual.txt:4574 msgid "Click _OK_ twice." msgstr "" #. type: Plain text -#: user-manual.txt:4581 +#: user-manual.txt:4576 msgid "Below is an image of the _Control Panel_:" msgstr "" #. type: Target for macro image -#: user-manual.txt:4582 +#: user-manual.txt:4577 #, no-wrap msgid "images/Win_SaveCSV2.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4585 +#: user-manual.txt:4580 msgid "To export the dive log in CSV format:" msgstr "" #. type: Plain text -#: user-manual.txt:4587 +#: user-manual.txt:4582 msgid "" "With the dive log opened in _Excel_, select the round Windows button at the " "top left, then _Save As_." msgstr "" #. type: Target for macro image -#: user-manual.txt:4588 +#: user-manual.txt:4583 #, no-wrap msgid "images/Win_SaveCSV1.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4594 +#: user-manual.txt:4589 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 " @@ -9762,13 +9752,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:4595 +#: user-manual.txt:4590 #, no-wrap msgid "images/Win_SaveCSV3.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4601 +#: user-manual.txt:4596 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 " @@ -9777,13 +9767,13 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:4602 +#: user-manual.txt:4597 #, no-wrap msgid "APPENDIX E: Writing a custom print template" msgstr "" #. type: Plain text -#: user-manual.txt:4607 +#: user-manual.txt:4602 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 " @@ -9792,12 +9782,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4609 +#: user-manual.txt:4604 msgid "Templates are accessed using the print dialogue (see image *B* below)." msgstr "" #. type: Plain text -#: user-manual.txt:4617 +#: user-manual.txt:4612 msgid "" "The buttons under the _Template_ dropdown box lets you _Edit_, _Delete_, " "_Import_ and _Export_ templates (see image *A* above). New or modified " @@ -9809,18 +9799,18 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4619 +#: user-manual.txt:4614 msgid "The Edit Panel has three tabs:" msgstr "" #. type: Target for macro image -#: user-manual.txt:4620 +#: user-manual.txt:4615 #, no-wrap msgid "images/Template1_f22.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4624 +#: user-manual.txt:4619 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 " @@ -9828,7 +9818,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4628 +#: user-manual.txt:4623 msgid "" "The _Colors_ tab (image *B* above) allows editing the colors used for " "printing the dive log. The colors are highly customizable: the _Edit_ " @@ -9837,7 +9827,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4637 +#: user-manual.txt:4632 msgid "" "The _Template_ tab of the Edit Panel (see image below) allows creating a " "template using HTML as well as a few Grantlee programming " @@ -9853,13 +9843,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:4638 +#: user-manual.txt:4633 #, no-wrap msgid "images/Template2_f22.jpg" msgstr "" #. type: Plain text -#: user-manual.txt:4643 +#: user-manual.txt:4638 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 " @@ -9868,33 +9858,33 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4645 +#: user-manual.txt:4640 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:4646 +#: user-manual.txt:4641 #, no-wrap msgid "Main dive loop" msgstr "" #. type: Plain text -#: user-manual.txt:4648 +#: user-manual.txt:4643 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:4648 user-manual.txt:4713 user-manual.txt:4730 +#: user-manual.txt:4643 user-manual.txt:4708 user-manual.txt:4725 #, no-wrap msgid "template.html" msgstr "" #. type: delimited block . -#: user-manual.txt:4653 +#: user-manual.txt:4648 #, no-wrap msgid "" "\t{% for dive in dives %}\n" @@ -9903,13 +9893,13 @@ msgid "" msgstr "" #. type: Block title -#: user-manual.txt:4655 user-manual.txt:4718 user-manual.txt:4737 +#: user-manual.txt:4650 user-manual.txt:4713 user-manual.txt:4732 #, no-wrap msgid "output.html" msgstr "" #. type: delimited block . -#: user-manual.txt:4660 +#: user-manual.txt:4655 #, no-wrap msgid "" "\t<h1> 1 </h1>\n" @@ -9918,25 +9908,25 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4663 +#: user-manual.txt:4658 msgid "" -"Additional information about _Grantlee_ can be found at " +"Additional information about _Grantlee_ can be found " "http://www.grantlee.org/apidox/for_themers.html[here]" msgstr "" #. type: Title === -#: user-manual.txt:4664 +#: user-manual.txt:4659 #, no-wrap msgid "Grantlee exported variables" msgstr "" #. type: Plain text -#: user-manual.txt:4666 +#: user-manual.txt:4661 msgid "Only a subset of the dive data is exported:" msgstr "" #. type: delimited block | -#: user-manual.txt:4695 +#: user-manual.txt:4690 #, no-wrap msgid "" "|*Name*|*Description*\n" @@ -9947,7 +9937,7 @@ msgid "" "|location| (*string*) location of the dive\n" "|duration| (*string*) duration of the dive\n" "|depth| (*string*) depth of the dive\n" -"|divemaster| (*string*) dive master for the dive\n" +"|divemaster| (*string*) divemaster for the dive\n" "|buddy| (*string*) buddy for the dive\n" "|airTemp| (*string*) air temperature of the dive\n" "|waterTemp| (*string*) water temperature of the dive\n" @@ -9970,7 +9960,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4699 +#: user-manual.txt:4694 msgid "" "_Subsurface_ also exports *template_options* data. This data must be used as " "_CSS_ values to provide a dynamically editable template. The exported data " @@ -9978,7 +9968,7 @@ msgid "" msgstr "" #. type: delimited block | -#: user-manual.txt:4711 +#: user-manual.txt:4706 #, no-wrap msgid "" "|*Name*|*Description*\n" @@ -9997,26 +9987,26 @@ msgid "" msgstr "" #. type: delimited block . -#: user-manual.txt:4716 +#: user-manual.txt:4711 #, no-wrap msgid "\tborder-width: {{ template_options.borderwidth }}px;\n" msgstr "" #. type: delimited block . -#: user-manual.txt:4721 +#: user-manual.txt:4716 #, no-wrap msgid "\tborder-width: 3px;\n" msgstr "" #. type: Plain text -#: user-manual.txt:4724 +#: user-manual.txt:4719 msgid "" "Another variable that _Subsurface_ exports is *print_options*. This variable " "contains a single member:" msgstr "" #. type: delimited block | -#: user-manual.txt:4727 +#: user-manual.txt:4722 #, no-wrap msgid "" "|*Name*|*Description*\n" @@ -10025,7 +10015,7 @@ msgid "" msgstr "" #. type: delimited block . -#: user-manual.txt:4735 +#: user-manual.txt:4730 #, no-wrap msgid "" "\tbody {\n" @@ -10034,7 +10024,7 @@ msgid "" msgstr "" #. type: delimited block . -#: user-manual.txt:4742 +#: user-manual.txt:4737 #, no-wrap msgid "" "\tbody {\n" @@ -10043,21 +10033,21 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4744 +#: user-manual.txt:4739 #, no-wrap msgid "Defined CSS selectors" msgstr "" #. type: Plain text -#: user-manual.txt:4747 +#: user-manual.txt:4742 msgid "" "As the dive profile is placed after rendering, _Subsurface_ uses special " -"_CSS_ selectors to searche in the HTML output. The _CSS_ selectors in the " +"_CSS_ selectors to search in the HTML output. The _CSS_ selectors in the " "following table should be added." msgstr "" #. type: delimited block | -#: user-manual.txt:4754 +#: user-manual.txt:4749 #, no-wrap msgid "" "|*Selector*|*Type*|*Description*\n" @@ -10070,20 +10060,20 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4757 +#: user-manual.txt:4752 msgid "" "Rendering dive profiles is not supported for flow layout templates (when " "data-numberofdives = 0)." msgstr "" #. type: Title === -#: user-manual.txt:4758 +#: user-manual.txt:4753 #, no-wrap msgid "Special attributes" msgstr "" #. type: Plain text -#: user-manual.txt:4762 +#: user-manual.txt:4757 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 " @@ -10091,55 +10081,55 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4764 +#: user-manual.txt:4759 msgid "" "The *data-numberofdives* data attribute is added to the body tag to set the " "rendering mode." msgstr "" #. type: Plain text -#: user-manual.txt:4766 +#: user-manual.txt:4761 msgid "render 6 dives per page:" msgstr "" #. type: delimited block . -#: user-manual.txt:4769 +#: user-manual.txt:4764 #, no-wrap msgid "\t<body data-numberofdives = 6>\n" msgstr "" #. type: Plain text -#: user-manual.txt:4772 +#: user-manual.txt:4767 msgid "render as much dives as possible:" msgstr "" #. type: delimited block . -#: user-manual.txt:4775 +#: user-manual.txt:4770 #, no-wrap msgid "\t<body data-numberofdives = 0>\n" msgstr "" #. type: Plain text -#: user-manual.txt:4778 +#: user-manual.txt:4773 msgid "" "All CSS units should be in relative lengths only, to support printing on any " "page size." msgstr "" #. type: Title == -#: user-manual.txt:4779 +#: user-manual.txt:4774 #, no-wrap msgid "APPENDIX F: FAQs." msgstr "" #. type: Title === -#: user-manual.txt:4781 +#: user-manual.txt:4776 #, no-wrap msgid "Subsurface appears to miscalculate gas consumption and SAC" msgstr "" #. type: Plain text -#: user-manual.txt:4785 +#: user-manual.txt:4780 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_ " @@ -10147,7 +10137,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4791 +#: user-manual.txt:4786 msgid "" "'Answer': Not really. What happens is that _Subsurface_ actually calculates " "gas consumption differently - and better - than you expect. In particular, " @@ -10157,7 +10147,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4797 +#: user-manual.txt:4792 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 " @@ -10167,12 +10157,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4799 +#: user-manual.txt:4794 msgid "+consumption = (amount_of_air_at_beginning - amount_of_air_at_end)+" msgstr "" #. type: Plain text -#: user-manual.txt:4805 +#: user-manual.txt:4800 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 " @@ -10183,12 +10173,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4807 +#: user-manual.txt:4802 msgid "+12.2*((220-100)/1.013)+" msgstr "" #. type: Plain text -#: user-manual.txt:4812 +#: user-manual.txt:4807 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 " @@ -10198,7 +10188,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4818 +#: user-manual.txt:4813 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 " @@ -10209,7 +10199,7 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4819 +#: user-manual.txt:4814 #, no-wrap msgid "" "Some dive profiles have time discrepancies with the recorded samples from my " @@ -10217,7 +10207,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4823 +#: user-manual.txt:4818 msgid "" "_Subsurface_ ends up ignoring surface time for many things (average depth, " "divetime, SAC, etc). 'Question': Why do dive durations in my dive computer " @@ -10225,7 +10215,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4831 +#: user-manual.txt:4826 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 " @@ -10239,13 +10229,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4832 +#: user-manual.txt:4827 #, no-wrap msgid "Some dive profiles are missing from the download" msgstr "" #. type: Plain text -#: user-manual.txt:4846 +#: user-manual.txt:4841 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 " @@ -10260,7 +10250,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4850 +#: user-manual.txt:4845 msgid "" "If you have downloaded your dives to different dive logging software before " "they were overwritten, there is a good chance that Subsurface can import " diff --git a/Documentation/fr/po/subsurface-user-manual.fr.po b/Documentation/fr/po/subsurface-user-manual.fr.po index 9a182e846..b8fe9c9e1 100644 --- a/Documentation/fr/po/subsurface-user-manual.fr.po +++ b/Documentation/fr/po/subsurface-user-manual.fr.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: subsurface@subsurface-divelog.org\n" -"POT-Creation-Date: 2017-02-03 10:32+0100\n" -"PO-Revision-Date: 2017-02-03 12:06+0100\n" +"POT-Creation-Date: 2017-07-04 13:37+0200\n" +"PO-Revision-Date: 2017-07-04 13:47+0100\n" "Last-Translator: Guillaume GARDET <guillaume.gardet@free.fr>\n" "Language-Team: French <kde-i18n-doc@kde.org>\n" "Language: fr\n" @@ -18,7 +18,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Generator: Lokalize 2.0\n" -#. :website: http://subsurface-divelog.org +#. :website: https://subsurface-divelog.org #. type: Target for macro image #: user-manual.txt:14 #, no-wrap @@ -31,22 +31,32 @@ msgid "[big]#USER MANUAL#" msgstr "[big]#MANUEL UTILISATEUR#" #. type: Plain text -#: user-manual.txt:20 +#: user-manual.txt:21 #, no-wrap +#| msgid "" +#| "*Manual authors*: Willem Ferguson, Jacco van Koll, Dirk Hohndel, Reinout Hoornweg,\n" +#| "Linus Torvalds, Miika Turkia, Amit Chaudhuri, Jan Schubert, Salvador Cuñat, Pedro Neves\n" msgid "" -"*Manual authors*: Willem Ferguson, Jacco van Koll, Dirk Hohndel, Reinout Hoornweg,\n" -"Linus Torvalds, Miika Turkia, Amit Chaudhuri, Jan Schubert, Salvador Cuñat, Pedro Neves\n" +"*Manual authors*: Willem Ferguson, Jacco van Koll, Dirk Hohndel, Reinout" +" Hoornweg,\n" +"Linus Torvalds, Miika Turkia, Amit Chaudhuri, Jan Schubert, Salvador Cuñat," +" Pedro Neves,\n" +"Stefan Fuchs\n" msgstr "" -"*Auteurs du manuel* : Willem Ferguson, Jacco van Koll, Dirk Hohndel, Reinout Hoornweg,\n" -"Linus Torvalds, Miika Turkia, Amit Chaudhuri, Jan Schubert, Salvador Cuñat, Pedro Neves\n" +"*Auteurs du manuel* : Willem Ferguson, Jacco van Koll, Dirk Hohndel, Reinout" +" Hoornweg,\n" +"Linus Torvalds, Miika Turkia, Amit Chaudhuri, Jan Schubert, Salvador Cuñat," +" Pedro Neves,\n" +"Stefan Fuchs\n" #. type: Plain text -#: user-manual.txt:22 -msgid "[blue]#_Version 4.6, January 2017_#" -msgstr "[blue]#_Version 4.6, janvier 2017_#" +#: user-manual.txt:23 +#| msgid "[blue]#_Version 4.6, January 2017_#" +msgid "[blue]#_Version 4.6, March 2017_#" +msgstr "[blue]#_Version 4.6, mars 2017_#" #. type: Plain text -#: user-manual.txt:27 +#: user-manual.txt:28 msgid "" "Welcome as a user of _Subsurface_, an advanced dive logging program with " "extensive infrastructure to describe, organize, interpret and print scuba " @@ -60,7 +70,7 @@ msgstr "" "rapport à d'autres solutions logicielles similaires :" #. type: Plain text -#: user-manual.txt:30 +#: user-manual.txt:31 msgid "" "Do you need a flexible way of logging dives using recreational equipment, " "even without a dive computer?" @@ -69,7 +79,7 @@ msgstr "" "équipements loisirs, même sans utiliser d'ordinateur de plongée ?" #. type: Plain text -#: user-manual.txt:31 +#: user-manual.txt:32 msgid "" "Do you wish to seamlessly include GPS locations of dive sites into your dive " "log?" @@ -78,7 +88,7 @@ msgstr "" "dans votre carnet de plongée ?" #. type: Plain text -#: user-manual.txt:37 +#: user-manual.txt:38 msgid "" "Do you use two different dive computer brands, each with its own proprietary " "software for downloading dive logs? Do you dive with rebreathers as well as " @@ -97,7 +107,7 @@ msgstr "" "ces enregistrements dans un système unique." #. type: Plain text -#: user-manual.txt:40 +#: user-manual.txt:41 msgid "" "Do you use more than one operating system? _Subsurface_ is fully compatible " "with Mac, Linux and Windows, letting you access your dive log on a range of " @@ -109,7 +119,7 @@ msgstr "" "utilisant une application unique." #. type: Plain text -#: user-manual.txt:43 +#: user-manual.txt:44 msgid "" "Do you use Linux or Mac, but your dive computer has only Windows-based " "software for downloading dive information (e.g. Mares or Scubapro)? " @@ -123,7 +133,7 @@ msgstr "" "d'exploitation." #. type: Plain text -#: user-manual.txt:45 +#: user-manual.txt:46 msgid "" "Do you need an intuitive graphical dive planner that integrates with, and " "takes into account, dives you’ve already logged?" @@ -132,7 +142,7 @@ msgstr "" "intègre et prend en compte les plongées qui ont déjà été enregistrées ?" #. type: Plain text -#: user-manual.txt:47 +#: user-manual.txt:48 msgid "" "Do you need a way of storing or backing up your dive log on the Internet, " "letting you view your dive log from anywhere using an Internet browser?" @@ -142,30 +152,47 @@ msgstr "" "n'importe où, en utilisant un navigateur Internet ?" #. type: Plain text -#: user-manual.txt:48 +#: user-manual.txt:49 msgid "Do you wish to access or modify your dive log using a mobile phone?" msgstr "" "Souhaitez-vous pouvoir accéder ou modifier votre carnet de plongée en " "utilisant un smartphone ?" #. type: Plain text -#: user-manual.txt:53 -msgid "" -"_Subsurface_ binaries are available for Windows PCs (Win XP or later), Intel " -"based Macs (OS/X) and many Linux distributions. _Subsurface_ can be built " -"for many more hardware platforms and software environments where Qt and " -"libdivecomputer are available." -msgstr "" -"_Subsurface_ est disponible pour Windows (Win XP ou plus récent), les Macs " -"basés sur processeurs Intel (OS/X) et de nombreuses distributions Linux. " -"_Subsurface_ peut être compilé pour bien plus de plateformes matérielles et " -"d'environnements logiciels où Qt et libdivecomputer sont disponibles." - -#. type: Plain text -#: user-manual.txt:62 +#: user-manual.txt:55 +#| msgid "" +#| "_Subsurface_ binaries are available for Windows PCs (Win XP or later), " +#| "Intel based Macs (OS/X) and many Linux distributions. _Subsurface_ can be " +#| "built for many more hardware platforms and software environments where Qt " +#| "and libdivecomputer are available." +msgid "" +"_Subsurface_ binaries are available for Windows PCs (Win 7 or later from " +"version 4.6 of _Subsurface_ onwards), Intel based Macs (OS/X) and many Linux " +"distributions. _Subsurface_ can be built for many more hardware platforms " +"and software environments where Qt and libdivecomputer are available." +msgstr "" +"_Subsurface_ est disponible pour Windows (Win 7 ou plus récent, à partir de " +"la version 4.6 de _Subsurface_), les Macs basés sur processeurs Intel (OS/X)" +" et de " +"nombreuses distributions Linux. _Subsurface_ peut être compilé pour bien" +" plus " +"de plateformes matérielles et d'environnements logiciels où Qt et" +" libdivecomputer sont disponibles." + +#. type: Plain text +#: user-manual.txt:64 +#| msgid "" +#| "This manual explains how to use the _Subsurface_ program. To install the " +#| "software, consult the _Downloads_ page on the http://subsurface-divelog." +#| "org/[_Subsurface_ web site]. Please discuss issues with this program by " +#| "sending an email to mailto:subsurface@subsurface-divelog.org[our mailing " +#| "list] and report bugs at https://github.com/Subsurface-divelog/subsurface/" +#| "issues[our bugtracker]. For instructions on how to build the software " +#| "and (if needed) its dependencies please consult the INSTALL file included " +#| "with the source code." msgid "" "This manual explains how to use the _Subsurface_ program. To install the " -"software, consult the _Downloads_ page on the http://subsurface-divelog.org/" +"software, consult the _Downloads_ page on the https://subsurface-divelog.org/" "[_Subsurface_ web site]. Please discuss issues with this program by sending " "an email to mailto:subsurface@subsurface-divelog.org[our mailing list] and " "report bugs at https://github.com/Subsurface-divelog/subsurface/issues[our " @@ -174,7 +201,7 @@ msgid "" "code." msgstr "" "Ce manuel explique comment utiliser le programme _Subsurface_. Pour " -"installer le logiciel, consultez la page _Téléchargement_ sur le http://" +"installer le logiciel, consultez la page _Téléchargement_ sur le https://" "subsurface-divelog.org/[site web de _Subsurface_]. En cas de problème, vous " "pouvez envoyer un e-mail sur mailto:subsurface@subsurface-divelog.org[notre " "liste de diffusion] et rapportez les bogues sur http://trac.hohndel." @@ -183,7 +210,7 @@ msgstr "" "dans les sources logicielles." #. type: Plain text -#: user-manual.txt:65 +#: user-manual.txt:67 #, no-wrap msgid "" "*Audience*: Recreational Scuba Divers, Free Divers, Tec Divers, Professional\n" @@ -193,18 +220,18 @@ msgstr "" "professionnels\n" #. type: Plain text -#: user-manual.txt:67 +#: user-manual.txt:69 msgid "toc::[]" msgstr "toc::[]" #. type: Title - -#: user-manual.txt:70 +#: user-manual.txt:72 #, no-wrap msgid "Using this manual" msgstr "Utilisation de ce manuel" #. type: Plain text -#: user-manual.txt:73 +#: user-manual.txt:75 msgid "" "When opened from within _Subsurface_, this manual does not have external " "controls for paging or selecting previous pages. However, two facilities are " @@ -212,7 +239,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:80 +#: user-manual.txt:82 msgid "" "The _SEARCH_ function is activated by pressing control-F or command-F on the " "keyboard. A text box appears at the bottom right-hand of the window (see " @@ -223,13 +250,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:81 +#: user-manual.txt:83 #, no-wrap msgid "images/UserManualSearch.jpg" msgstr "images/UserManualSearch.jpg" #. type: Plain text -#: user-manual.txt:93 +#: user-manual.txt:95 msgid "" "_PREVIOUS/NEXT LINK_. Move between links (underlined words that jump to " "specific sections in the user manual) by right-clicking on the text of the " @@ -242,19 +269,19 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:94 +#: user-manual.txt:96 #, no-wrap msgid "images/UserManualLinksBack.jpg" msgstr "images/UserManualLinksBack.jpg" #. type: Title - -#: user-manual.txt:99 +#: user-manual.txt:101 #, no-wrap msgid "The user survey" msgstr "Le sondage utilisateur" #. type: Plain text -#: user-manual.txt:110 +#: user-manual.txt:112 msgid "" "In order to develop _Subsurface_ to serve its users in the best possible " "way, it’s important to have user information. Upon launching _Subsurface_ " @@ -284,26 +311,32 @@ msgstr "" "survey_ sur la ligne de commande." #. type: Title - -#: user-manual.txt:113 +#: user-manual.txt:115 #, no-wrap msgid "Start Using the Program" msgstr "Commencer à utiliser le programme" #. type: Plain text -#: user-manual.txt:118 +#: user-manual.txt:120 +#| msgid "" +#| "The _Subsurface_ window is usually divided into four panels with a *Main " +#| "Menu* (File Import Log View Help) at the top of the window (for Windows " +#| "and Linux) or the top of the screen (for Mac and Ubuntu Unity). The four " +#| "panels are:" msgid "" "The _Subsurface_ window is usually divided into four panels with a *Main " -"Menu* (File Import Log View Help) at the top of the window (for Windows and " -"Linux) or the top of the screen (for Mac and Ubuntu Unity). The four panels " -"are:" +"Menu* (File Edit Import Log View Share Help) at the top of the window (for " +"Windows and Linux) or the top of the screen (for Mac and Ubuntu Unity). The " +"four panels are:" msgstr "" "La fenêtre _Subsurface_ est généralement divisée en 4 panneaux avec un *Menu " -"principal* (Fichier Importer Journal Vue Aide) en haut de la fenêtre (pour " +"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 :" #. type: Plain text -#: user-manual.txt:124 +#: user-manual.txt:126 msgid "" "The *Dive List* on the bottom left, showing all the dives in the user's dive " "log. A dive can be selected and highlighted on the dive list by clicking on " @@ -318,7 +351,7 @@ msgstr "" "manipuler un journal (carnet) de plongée." #. type: Plain text -#: user-manual.txt:128 +#: user-manual.txt:130 msgid "" "The *Dive Map* on the bottom right, showing the user's dive sites on a world " "map and centered on the site of the last dive selected in the *Dive List*. " @@ -330,7 +363,7 @@ msgstr "" "peut être augmentée ou réduite." #. type: Plain text -#: user-manual.txt:132 +#: user-manual.txt:134 msgid "" "The *Info* on the top left, giving more detailed information on the dive " "selected in the *Dive List*, including some statistics for the selected dive " @@ -342,7 +375,7 @@ msgstr "" "en surbrillance." #. type: Plain text -#: user-manual.txt:136 +#: user-manual.txt:138 msgid "" "The *Dive Profile* on the top right, showing a graphical dive profile of the " "selected dive in the *Dive List*. You can zoom into the dive profile for a " @@ -353,7 +386,7 @@ msgstr "" "pouvez zoomer sur le profil de plongée pour une vue plus détaillée." #. type: Plain text -#: user-manual.txt:140 +#: user-manual.txt:142 msgid "" "The dividers between panels can be dragged to change the size of any of the " "panels. _Subsurface_ remembers the position of the dividers, so the next " @@ -366,7 +399,7 @@ msgstr "" "positions." #. type: Plain text -#: user-manual.txt:148 +#: user-manual.txt:150 msgid "" "If a single dive is selected in the *Dive List*, the dive location, detailed " "information and profile of the _selected dive_ are shown in the respective " @@ -387,13 +420,13 @@ msgstr "" "plongées sélectionnées)." #. type: Target for macro image -#: user-manual.txt:151 +#: user-manual.txt:153 #, no-wrap msgid "images/main_window_f22.jpg" msgstr "images/main_window_f22.jpg" #. type: Plain text -#: user-manual.txt:155 +#: 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:" @@ -403,48 +436,61 @@ msgstr "" "permet plusieurs choix d'affichage :" #. type: Plain text -#: user-manual.txt:157 +#: user-manual.txt:159 #, no-wrap msgid "*All*: show all four of the panels as in the screenshot above.\n" -msgstr "*Tout* : affiche les quatre panneaux tels que sur la capture d'écran ci-dessus.\n" +msgstr "" +"*Tout* : affiche les quatre panneaux tels que sur la capture d'écran" +" ci-dessus.\n" #. type: Plain text -#: user-manual.txt:159 +#: user-manual.txt:161 #, no-wrap msgid "*Divelist*: Show only the Dive List.\n" msgstr "*Liste des plongées* : affiche uniquement la liste des plongées.\n" #. type: Plain text -#: user-manual.txt:161 +#: user-manual.txt:163 #, no-wrap msgid "*Profile*: Show only the Dive Profile of the selected dive.\n" -msgstr "*Profil* : affiche uniquement le profile de plongée de la plongée sélectionnée.\n" +msgstr "" +"*Profil* : affiche uniquement le profile de plongée de la plongée" +" sélectionnée.\n" #. type: Plain text -#: user-manual.txt:164 +#: user-manual.txt:166 #, no-wrap msgid "" "*Info*: Show only the Notes about the last selected dive and statistics for\n" "all highlighted dives.\n" msgstr "" -"*Info* : affiche uniquement les notes de plongées de la dernière plongée sélectionnée et les statistiques pour\n" +"*Info* : affiche uniquement les notes de plongées de la dernière plongée" +" sélectionnée et les statistiques pour\n" "toutes les plongées mises en surbrillance.\n" #. type: Plain text -#: user-manual.txt:166 +#: user-manual.txt:168 #, no-wrap msgid "*Globe*: Show only the world map, centered on the last selected dive.\n" -msgstr "*Globe* : affiche uniquement la carte mondiale, centrée sur la dernière plongée sélectionnée.\n" +msgstr "" +"*Globe* : affiche uniquement la carte mondiale, centrée sur la dernière" +" plongée sélectionnée.\n" #. type: Plain text -#: user-manual.txt:172 +#: user-manual.txt:173 +#, fuzzy +#| msgid "" +#| "Like other functions that can be accessed via the Main Menu, these " +#| "options can also be triggered using keyboard shortcuts. The shortcuts for " +#| "a particular system are shown with an underline in the main menu entries. " +#| "Since different Operating Systems and the user’s chosen language may " +#| "cause _Subsurface_ to use different shortcut keys, they are not listed in " +#| "this user manual." msgid "" "Like other functions that can be accessed via the Main Menu, these options " -"can also be triggered using keyboard shortcuts. The shortcuts for a " -"particular system are shown with an underline in the main menu entries. " -"Since different Operating Systems and the user’s chosen language may cause " -"_Subsurface_ to use different shortcut keys, they are not listed in this " -"user manual." +"can also be triggered using keyboard shortcuts. The shortcuts are shown with " +"an underline in the main menu entries, with the Alt-key pressed, or are " +"denoted after the menu item." msgstr "" "Comme d'autres fonctions qui peuvent être accédée via le menu principal, ces " "options peuvent aussi être utilisées par des raccourcis clavier. Les " @@ -454,7 +500,7 @@ msgstr "" "et ne sont donc pas détaillées ici." #. type: Plain text -#: user-manual.txt:176 +#: user-manual.txt:177 msgid "" "When the program is started for the first time, it shows no information at " "all, because it does not have any dive information available. In the " @@ -466,13 +512,13 @@ msgstr "" "sera détaillée." #. type: Title - -#: user-manual.txt:179 +#: user-manual.txt:180 #, no-wrap msgid "Creating a new logbook" msgstr "Créer un nouveau carnet de plongée" #. type: Plain text -#: user-manual.txt:184 +#: user-manual.txt:185 msgid "" "Select _File -> New Logbook_ from the main menu. All existing dive data are " "cleared so new information can be added. If there are unsaved data in an " @@ -486,13 +532,13 @@ msgstr "" "faut les enregistrer ou non avant de créer le nouveau carnet." #. type: Title == -#: user-manual.txt:186 +#: user-manual.txt:187 #, no-wrap msgid "Storing dive information in the logbook" msgstr "Enregistrement des informations de plongée dans le carnet" #. type: Plain text -#: user-manual.txt:189 +#: user-manual.txt:190 msgid "" "Now that a new logbook is created, it is simple to add dive data it. " "_Subsurface_ allows several ways of adding dive data to a logbook." @@ -502,14 +548,14 @@ msgstr "" "données de plongée au carnet." #. type: Plain text -#: user-manual.txt:191 +#: user-manual.txt:192 msgid "If the user has a handwritten divelog, a spreadsheet or another form of" msgstr "" "Si l'utilisateur possède un carnet manuscrit, un tableur ou une autre forme " "de " #. type: Plain text -#: user-manual.txt:193 +#: user-manual.txt:194 msgid "" "manually maintained divelog, dive data can be added to the logbook using one " "of these approaches:" @@ -518,14 +564,14 @@ msgstr "" "au carnet en utilisant une des approches suivantes :" #. type: Plain text -#: user-manual.txt:195 +#: user-manual.txt:196 msgid "Enter dive information by hand. This is useful if the diver didn’t" msgstr "" "Entrer les informations de plongée à la main. Cela est utile si le plongeur " "n'a pas" #. type: Plain text -#: user-manual.txt:197 +#: user-manual.txt:198 msgid "" "use a dive computer and dives were recorded in a written logbook. See: xref:" "S_EnterData[Entering dive information by hand]" @@ -535,7 +581,7 @@ msgstr "" "à la main]" #. type: Plain text -#: user-manual.txt:199 +#: user-manual.txt:200 msgid "" "Import dive log information that has been maintained either as a spreadsheet" msgstr "" @@ -543,7 +589,7 @@ msgstr "" "tableur" #. type: Plain text -#: user-manual.txt:201 +#: user-manual.txt:202 msgid "" "or as a CSV file. Refer to: xref:S_Appendix_D[APPENDIX D: Exporting a " "spreadsheet to CSV format] and to xref:S_ImportingCSVDives[Importing dives " @@ -554,7 +600,7 @@ msgstr "" "S_ImportingCSVDives[Importer des plongées au format CSV]." #. type: Plain text -#: user-manual.txt:205 +#: user-manual.txt:206 msgid "" "If a dive is recorded using a dive computer, the depth profile and a large " "amount of additional information can be accessed. These dives can be " @@ -565,7 +611,7 @@ msgstr "" "obtenues. Ces plongées peuvent être importées à partir de :" #. type: Plain text -#: user-manual.txt:207 +#: user-manual.txt:208 msgid "" "The dive computer itself. See: xref:S_ImportDiveComputer[Importing new dive " "information from a Dive Computer];" @@ -574,7 +620,7 @@ msgstr "" "de nouvelles informations de plongée à partir de l'ordinateur de plongée];" #. type: Plain text -#: user-manual.txt:208 +#: user-manual.txt:209 msgid "" "Proprietary software distributed by manufacturers of dive computers. Refer" msgstr "" @@ -582,7 +628,7 @@ msgstr "" "Voir" #. type: Plain text -#: user-manual.txt:209 +#: user-manual.txt:210 msgid "" "to: xref:S_ImportingAlienDiveLogs[Importing dive information from other " "digital data sources or other data formats]." @@ -591,12 +637,12 @@ msgstr "" "sources de données numériques ou d'autres formats de données]." #. type: Plain text -#: user-manual.txt:210 +#: user-manual.txt:211 msgid "Spreadsheet or CSV files containing dive profiles." msgstr "Tableur ou de fichiers CSV contenant les profils de plongées." #. type: Plain text -#: user-manual.txt:211 +#: user-manual.txt:212 msgid "" "See: xref:S_ImportingCSVDives[Importing dives in CSV format from dive " "computers or other dive log software]" @@ -605,18 +651,18 @@ msgstr "" "des ordinateurs de plongées ou d'autres logiciels de carnet de plongée]" #. type: Title === -#: user-manual.txt:214 +#: user-manual.txt:215 #, no-wrap msgid "Entering dive information by hand" msgstr "Entrer les informations de plongée à la main" #. type: Plain text -#: user-manual.txt:229 +#: user-manual.txt:230 msgid "" "This is usually the approach for dives without a dive computer. The basic " "record of information within _Subsurface_ is a dive. The most important " "information in a simple dive logbook usually includes dive type, date, time, " -"duration, depth, the names of your dive buddy and the dive master or dive " +"duration, depth, the names of your dive buddy and the divemaster or dive " "guide, and some remarks about the dive. _Subsurface_ can store much more " "information for each dive. To add a dive to a dive log, select _Log -> Add " "Dive_ from the Main Menu. The program then shows three panels on which to " @@ -628,13 +674,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:230 +#: user-manual.txt:231 #, no-wrap msgid "images/AddDive1_f22.jpg" msgstr "images/AddDive1_f22.jpg" #. type: Plain text -#: user-manual.txt:234 +#: user-manual.txt:235 msgid "" "When you edit a field in Notes or Equipment panels, _Subsurface_ enters " "*Editing Mode*, indicated by the message in the blue box at the top of the " @@ -643,13 +689,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:235 user-manual.txt:801 +#: user-manual.txt:236 user-manual.txt:802 #, no-wrap msgid "images/BlueEditBar_f22.jpg" msgstr "images/BlueEditBar_f22.jpg" #. type: Plain text -#: user-manual.txt:244 +#: user-manual.txt:245 msgid "" "The _Apply changes_ button should only be selected after all the parts of a " "dive have been entered. When entering dives by hand, the _Info_, " @@ -663,13 +709,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:246 +#: user-manual.txt:247 #, no-wrap msgid "Creating a Dive Profile" msgstr "" #. type: Plain text -#: user-manual.txt:253 +#: user-manual.txt:254 msgid "" "The *Dive Profile* (a graphical representation of the depth of the dive as a " "function of time) is shown in the panel on the top right hand of the " @@ -679,13 +725,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:254 +#: user-manual.txt:255 #, no-wrap msgid "images/DiveProfile1_f20.jpg" msgstr "images/DiveProfile1_f20.jpg" #. type: Plain text -#: user-manual.txt:272 +#: user-manual.txt:274 msgid "" "_Modifying the dive profile_: When the cursor is moved around the dive " "profile, its position is shown by two right-angled red lines as seen below. " @@ -696,20 +742,21 @@ msgid "" "shown above). The default dive depth is 15 m. If the dive depth was 20 m " "then you need to drag the appropriate waypoints downward to 20 m. To add a " "waypoint, double-click on any line segment. To move an additional waypoint, " -"drag it. To remove a waypoint, right-click on it and choose \"Remove this " -"point\" from the context menu. Drag the waypoints to represent an accurate " -"time duration for the dive. Below is a dive profile for a dive to 20 m for " -"30 min, followed by a 5 minute safety stop at 5 m." +"drag it. Moving can also be done by selecting the waypoint and using the " +"arrow keys. To remove a waypoint, right-click on it and choose \"Remove " +"this point\" from the context menu. Drag the waypoints to represent an " +"accurate time duration for the dive. Below is a dive profile for a dive to " +"20 m for 30 min, followed by a 5 minute safety stop at 5 m." msgstr "" #. type: Target for macro image -#: user-manual.txt:273 +#: user-manual.txt:275 #, no-wrap msgid "images/DiveProfile2_f20.jpg" msgstr "images/DiveProfile2_f20.jpg" #. type: Plain text -#: user-manual.txt:285 +#: user-manual.txt:287 msgid "" "_Specifying the gas composition:_ The gas composition used is indicated " "along the line segments of the dive profile. This defaults to the first gas " @@ -717,19 +764,19 @@ msgid "" "profile above. The gas mixtures of segments of the dive profile can be " "changed by right-clicking on the particular waypoint and selecting the " "appropriate gas from the context menu. Changing the gas for a waypoint " -"affects the gas shown in the segment _to the left_ of that waypoint. Note " +"affects the gas shown in the segment _to the right_ of that waypoint. Note " "that only the gases defined in the *Equipment* tab appear in the context " "menu (see image below)." msgstr "" #. type: Target for macro image -#: user-manual.txt:286 +#: user-manual.txt:288 #, no-wrap msgid "images/DiveProfile3_f20.jpg" msgstr "images/DiveProfile3_f20.jpg" #. type: Plain text -#: user-manual.txt:293 +#: user-manual.txt:295 msgid "" "With the profile now defined, more details must be added to have a fuller " "record of the dive. To do this, the *Notes* and the *Equipment* tabs on the " @@ -738,38 +785,40 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:294 +#: user-manual.txt:296 #, no-wrap msgid "Importing new dive information from a Dive Computer" -msgstr "Importer de nouvelles informations de plongée à partir de l'ordinateur de plongée" +msgstr "" +"Importer de nouvelles informations de plongée à partir de l'ordinateur de" +" plongée" #. type: Title ==== -#: user-manual.txt:296 +#: user-manual.txt:298 #, no-wrap msgid "Connecting and importing data from a dive computer." msgstr "" #. type: Plain text -#: user-manual.txt:306 +#: user-manual.txt:308 msgid "" "The use of dive computers allows the collection of a large amount of " "information about each dive, e.g. a detailed record of depth, duration, " "rates of ascent/descent and of gas partial pressures. _Subsurface_ can " "capture this information, using dive details from a wide range of dive " "computers. The latest list of supported dive computers can be found at: link:" -"http://subsurface-divelog.org/documentation/supported-dive-computers/" +"https://subsurface-divelog.org/documentation/supported-dive-computers/" "[ Supported dive computers]." msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:307 user-manual.txt:675 user-manual.txt:1098 -#: user-manual.txt:3414 +#: user-manual.txt:309 user-manual.txt:677 user-manual.txt:1103 +#: user-manual.txt:3398 #, no-wrap msgid "images/icons/warning2.png" msgstr "images/icons/warning2.png" #. type: Plain text -#: user-manual.txt:317 +#: user-manual.txt:319 msgid "" "Several dive computers consume more power when they are in PC-Communication " "mode. **This could drain the dive computer's battery**. We recommend the " @@ -781,7 +830,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:333 +#: user-manual.txt:335 msgid "" "To import dive information from a dive computer to a computer with " "_Subsurface_, the two pieces of equipment must communicate with one " @@ -789,67 +838,69 @@ msgid "" "of the computer with _Subsurface_ that communicates with the dive computer. " "To set up this communication, users need to find the appropriate information " "to instruct _Subsurface_ where and how to import the dive information. xref:" -"_appendix_a_operating_system_specific_information_for_importing_dive_information_from_a_dive_computer[Appendix " +"_appendix_a_operating_system_specific_information_for_importing_dive_informati" +"on_from_a_dive_computer[Appendix " "A] provides the technical information to help the user achieve this for " "different operating systems and xref:" -"_appendix_b_dive_computer_specific_information_for_importing_dive_information[Appendix " +"_appendix_b_dive_computer_specific_information_for_importing_dive_information[" +"Appendix " "B] has dive computer specific information." msgstr "" #. type: Plain text -#: user-manual.txt:335 +#: user-manual.txt:337 msgid "" "After this, the dive computer can be hooked up to the user's PC using these " "steps:" msgstr "" #. type: Plain text -#: user-manual.txt:337 +#: user-manual.txt:339 msgid "" "The interface cable should be connected to a free USB port (or the Infra-red" msgstr "" #. type: Plain text -#: user-manual.txt:338 +#: user-manual.txt:340 msgid "or Bluetooth connection set up as described later in this manual)" msgstr "" #. type: Plain text -#: user-manual.txt:340 +#: user-manual.txt:342 msgid "The dive computer should be placed into PC Communication mode." msgstr "" #. type: Plain text -#: user-manual.txt:341 +#: user-manual.txt:343 msgid "(Refer to the manual of the specific dive computer)" msgstr "(Se reporter au manuel de l'ordinateur de plongée)" #. type: Plain text -#: user-manual.txt:345 +#: user-manual.txt:347 msgid "" "In _Subsurface_, from the Main Menu, select _Import -> Import From Dive " "Computer_. Dialogue *A* in the figure below appears:" msgstr "" #. type: Target for macro image -#: user-manual.txt:347 +#: user-manual.txt:349 #, no-wrap msgid "images/DC_import_f20.jpg" msgstr "images/DC_import_f20.jpg" #. type: Plain text -#: user-manual.txt:355 +#: user-manual.txt:357 msgid "" "Dive computers tend to keep a certain number of dives in memory, even though " "these dives have already been imported to _Subsurface_. For that reason, if " "the dive computer allows this, _Subsurface_ only imports dives that have not " -"been uploaded before. This makes the download process faster on most dive " +"been downloaded before. This makes the download process faster on most dive " "computers and also saves battery power of the dive computer (at least for " "those not charging while connected via USB)." msgstr "" #. type: Plain text -#: user-manual.txt:362 +#: user-manual.txt:364 msgid "" "The dialogue has two drop-down lists, *Vendor* and *Dive Computer*. On the " "*vendor* drop-down list select the make of the computer, e.g. Suunto, " @@ -859,21 +910,23 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:373 +#: user-manual.txt:375 msgid "" "The *Device or Mount Point* drop-down list contains the USB or Bluetooth " "port name that _Subsurface_ needs in order to communicate with the dive " "computer. The appropriate port name must be selected. Consult xref:" -"_appendix_a_operating_system_specific_information_for_importing_dive_information_from_a_dive_computer[Appendix " +"_appendix_a_operating_system_specific_information_for_importing_dive_informati" +"on_from_a_dive_computer[Appendix " "A] and xref:" -"_appendix_b_dive_computer_specific_information_for_importing_dive_information[Appendix " +"_appendix_b_dive_computer_specific_information_for_importing_dive_information[" +"Appendix " "B] for technical details on how to find the appropriate port information for " "a specific dive computer and, in some cases, how to do the correct settings " "to the operating system of the computer on which _Subsurface_ is running." msgstr "" #. type: Plain text -#: user-manual.txt:383 +#: user-manual.txt:385 msgid "" "If all the dives on the dive computer need to be downloaded, check the " "checkbox _Force download of all dives_. Normally, _Subsurface_ only " @@ -888,7 +941,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:389 +#: user-manual.txt:391 msgid "" "If the checkbox _Always prefer downloaded dives_ has been checked and, " "during download, dives with identical date-times exist on the dive computer " @@ -897,14 +950,14 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:392 +#: user-manual.txt:394 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:396 +#: user-manual.txt:398 msgid "" "Do *not* check the checkboxes labelled _Save libdivecomputer logfile_ and " "_Save libdivecomputer dumpfile_. These are only used as diagnostic tools " @@ -912,7 +965,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:414 +#: user-manual.txt:416 msgid "" "Then select the _Download_ button. With communication established, you can " "see how the data are retrieved from the dive computer. Depending on the " @@ -933,7 +986,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:418 +#: user-manual.txt:420 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 " @@ -941,38 +994,38 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:422 +#: user-manual.txt:424 #, no-wrap msgid "*PROBLEMS WITH DATA DOWNLOAD FROM A DIVE COMPUTER?*\n" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:422 user-manual.txt:529 user-manual.txt:573 -#: user-manual.txt:586 user-manual.txt:1239 user-manual.txt:1304 -#: user-manual.txt:1468 user-manual.txt:1543 user-manual.txt:1862 +#: user-manual.txt:424 user-manual.txt:531 user-manual.txt:575 +#: user-manual.txt:588 user-manual.txt:1244 user-manual.txt:1309 +#: user-manual.txt:1472 user-manual.txt:1548 user-manual.txt:1867 #, no-wrap msgid "images/icons/important.png" msgstr "images/icons/important.png" #. type: delimited block * -#: user-manual.txt:425 +#: user-manual.txt:427 msgid "Check the following:" msgstr "" #. type: delimited block * -#: user-manual.txt:428 +#: user-manual.txt:430 msgid "Is the dive computer still in PC-communication or Upload mode?" msgstr "" #. type: delimited block * -#: user-manual.txt:430 +#: user-manual.txt:432 msgid "" "Is the dive computer’s battery fully charged? If not then charge or replace " "it." msgstr "" #. type: delimited block * -#: user-manual.txt:434 +#: user-manual.txt:436 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 " @@ -980,24 +1033,26 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:439 +#: user-manual.txt:441 msgid "" "Consult xref:" -"_appendix_a_operating_system_specific_information_for_importing_dive_information_from_a_dive_computer[Appendix " +"_appendix_a_operating_system_specific_information_for_importing_dive_informati" +"on_from_a_dive_computer[Appendix " "A] to be sure the correct Mount Point was specified (see above)." msgstr "" #. type: delimited block * -#: user-manual.txt:443 +#: user-manual.txt:445 msgid "" "On Unix-like operating systems, does the user have write permission to the " "USB port? If not, consult xref:" -"_appendix_a_operating_system_specific_information_for_importing_dive_information_from_a_dive_computer[Appendix " +"_appendix_a_operating_system_specific_information_for_importing_dive_informati" +"on_from_a_dive_computer[Appendix " "A]" msgstr "" #. type: delimited block * -#: user-manual.txt:451 +#: user-manual.txt:453 msgid "" "If the _Subsurface_ computer does not recognize the USB adaptor by showing " "an appropriate device name next to the Mount Point, then there is a " @@ -1009,7 +1064,7 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:454 +#: user-manual.txt:456 #, no-wrap msgid "" "\tSave libdivecomputer logfile\n" @@ -1017,18 +1072,20 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:460 +#: user-manual.txt:462 #, no-wrap msgid "" "*Important*: These check boxes are only used when problems are encountered\n" -"during the download process. Under normal circumstances they should not be checked.\n" -"When checking these boxes, the user is prompted to select a folder where the information will be saved. The default folder is the one in which the\n" +"during the download process. Under normal circumstances they should not be" +" checked.\n" +"When checking these boxes, the user is prompted to select a folder where the" +" information will be saved. The default folder is the one in which the\n" "_Subsurface_\n" "dive log is kept.\n" msgstr "" #. type: delimited block * -#: user-manual.txt:464 +#: user-manual.txt:466 #, no-wrap msgid "" "*Important:* _After downloading with the above checkboxes\n" @@ -1037,7 +1094,7 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:467 +#: user-manual.txt:469 #, no-wrap msgid "" "\tsubsurface.log\n" @@ -1045,7 +1102,7 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:473 +#: user-manual.txt:475 msgid "" "These files should be send to the _Subsurface_ mail list: " "_subsurface@subsurface-divelog.org_ with a request for the files to be " @@ -1054,19 +1111,19 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:476 +#: user-manual.txt:478 #, no-wrap msgid "Connecting _Subsurface_ to a Bluetooth-enabled dive computer" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:477 user-manual.txt:4026 +#: user-manual.txt:479 user-manual.txt:4022 #, no-wrap msgid "images/icons/bluetooth.jpg" msgstr "images/icons/bluetooth.jpg" #. type: Plain text -#: user-manual.txt:484 +#: user-manual.txt:486 msgid "" "Bluetooth is becoming a more common way of communication between dive " "computers and _Subsurface_, for or instance, the Shearwater Petrel Mk2 and " @@ -1076,30 +1133,30 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:486 +#: user-manual.txt:488 msgid "" "Ensure Bluetooth is activated on the host computer running _Subsurface_." msgstr "" #. type: Plain text -#: user-manual.txt:487 +#: user-manual.txt:489 msgid "Ensure _Subsurface_ sees the Bluetooth adapter on the host computer." msgstr "" #. type: Plain text -#: user-manual.txt:488 +#: user-manual.txt:490 msgid "" "Ensure the Bluetooth-enabled dive computer is Bluetooth-discoverable and in " "PC upload mode." msgstr "" #. type: Plain text -#: user-manual.txt:489 +#: user-manual.txt:491 msgid "Ensure _Subsurface_ is paired with the Bluetooth-enabled dive computer." msgstr "" #. type: Plain text -#: user-manual.txt:493 +#: user-manual.txt:495 msgid "" "Select the Download dialogue by selecting _Import -> Import from dive " "computer_ from the *Main Menu*. After checking the box labelled _\"Choose " @@ -1107,19 +1164,19 @@ msgid "" msgstr "" #. type: Title ===== -#: user-manual.txt:494 +#: user-manual.txt:496 #, no-wrap msgid "On Linux or MacOS:" msgstr "Sur Linux ou MacOS :" #. type: Target for macro image -#: user-manual.txt:496 +#: user-manual.txt:498 #, no-wrap msgid "images/DC_import_Bluetooth.jpg" msgstr "images/DC_import_Bluetooth.jpg" #. type: Plain text -#: user-manual.txt:527 +#: user-manual.txt:529 msgid "" "On the _Linux_ or _MacOS_ platforms the name of the _Subsurface_ computer " "and its Bluetooth address are shown on the right hand side, On the left hand " @@ -1152,7 +1209,7 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:534 +#: user-manual.txt:536 msgid "" "Currently _Subsurface_ does not support Bluetooth pairing with dive " "computers that require a custom PIN code. In order to pair the devices, use " @@ -1160,12 +1217,12 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:536 +#: user-manual.txt:538 msgid "One way to achieve this is to use +bluetoothctl+:" msgstr "" #. type: delimited block * -#: user-manual.txt:547 +#: user-manual.txt:549 #, no-wrap msgid "" "\t$ bluetoothctl\n" @@ -1181,7 +1238,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:553 +#: user-manual.txt:555 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 " @@ -1190,19 +1247,19 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:554 user-manual.txt:3953 user-manual.txt:4041 +#: user-manual.txt:556 user-manual.txt:3949 user-manual.txt:4037 #, no-wrap msgid "On Windows:" msgstr "Sur Windows :" #. type: Target for macro image -#: user-manual.txt:555 +#: user-manual.txt:557 #, no-wrap msgid "images/DC_import_Bluetooth_Windows.png" msgstr "images/DC_import_Bluetooth_Windows.png" #. type: Plain text -#: user-manual.txt:565 +#: user-manual.txt:567 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 " @@ -1216,7 +1273,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:572 +#: user-manual.txt:574 msgid "" "The pairing step is checked and done automatically during the download " "process. If the devices have never been paired the system will ask " @@ -1227,7 +1284,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:580 +#: user-manual.txt:582 msgid "" "Currently _Subsurface_ works only with local Bluetooth adapters which use " "Microsoft Bluetooth Stack. If the local device uses _Widcomm_, _Stonestreet " @@ -1237,7 +1294,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:585 +#: user-manual.txt:587 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 " @@ -1247,25 +1304,27 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:595 +#: user-manual.txt:597 #, no-wrap msgid "" -"*IN CASE OF PROBLEMS*: If the Bluetooth adapter from the _Subsurface_ computer\n" +"*IN CASE OF PROBLEMS*: If the Bluetooth adapter from the _Subsurface_" +" computer\n" "gets stuck and the _Download_ process fails repeatedly,\n" -" _unpair_ the devices and then repeat the above steps. If this is not successful,\n" +" _unpair_ the devices and then repeat the above steps. If this is not" +" successful,\n" " xref:S_HowFindBluetoothDeviceName[_Appendix A_] contains\n" "information for manually setting up and inspecting the Bluetooth connection\n" "with _Subsurface_.\n" msgstr "" #. type: Title ==== -#: user-manual.txt:597 +#: user-manual.txt:599 #, no-wrap msgid "Changing the name of a dive computer" msgstr "" #. type: Plain text -#: user-manual.txt:613 +#: user-manual.txt:615 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 " @@ -1284,13 +1343,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:615 +#: user-manual.txt:617 #, no-wrap msgid "Uploading data for a specific dive from more than one dive computer" msgstr "" #. type: Plain text -#: user-manual.txt:626 +#: user-manual.txt:628 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 " @@ -1306,13 +1365,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:628 +#: user-manual.txt:630 #, no-wrap msgid "Updating the dive information imported from the dive computer." msgstr "" #. type: Plain text -#: user-manual.txt:635 +#: user-manual.txt:637 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 " @@ -1321,13 +1380,13 @@ msgid "" msgstr "" #. type: Title ===== -#: user-manual.txt:637 +#: user-manual.txt:639 #, no-wrap msgid "Notes" msgstr "Notes" #. type: Plain text -#: user-manual.txt:642 +#: user-manual.txt:644 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-" @@ -1335,7 +1394,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:652 +#: user-manual.txt:654 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 " @@ -1348,45 +1407,50 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:653 +#: user-manual.txt:655 #, no-wrap msgid "images/AddDive3_f22.jpg" msgstr "images/AddDive3_f22.jpg" #. type: Plain text -#: user-manual.txt:662 +#: user-manual.txt:664 msgid "" "The right hand image, above, shows a *Notes tab* filled with dive " -"information. The *Time* field reflects the date and time of the dive. By " -"clicking the date, a calendar is displayed for selecting the correct date. " -"Press ESC to close the calendar. The time values (hour and minutes) can " -"also be edited directly by clicking on each of them in the text box and by " -"over-typing the information displayed." +"information. The *Date* and *Time* fields reflects the date and time of the " +"dive. By clicking the date, a calendar is displayed for selecting the " +"correct date. Press ESC to close the calendar. The time values (hour and " +"minutes) can also be edited directly by clicking on each of them in the text " +"box and by over-typing the information displayed." msgstr "" #. type: Plain text -#: user-manual.txt:672 +#: user-manual.txt:674 #, no-wrap msgid "" -"*Air/water temperatures*: Air and water temperatures during the dive are shown\n" -"in text boxes to the right of the Start time. Many dive computers supply water\n" +"*Air/water temperatures*: Air and water temperatures during the dive are" +" shown\n" +"in text boxes to the right of the Start time. Many dive computers supply" +" water\n" "temperature information and this box may have information.\n" -"If air temperature isn’t provided by the dive computer, the first temperature reading\n" -"might be used for the air temperature. Generally this is close to the real air temperature.\n" -"If editing is required, only a value is required, the units of temperature will be\n" +"If air temperature isn’t provided by the dive computer, the first temperature" +" reading\n" +"might be used for the air temperature. Generally this is close to the real" +" air temperature.\n" +"If editing is required, only a value is required, the units of temperature" +" will be\n" "automatically supplied by\n" "_Subsurface_ (following the _Preferences_, metric or imperial units will\n" "be used).\n" msgstr "" #. type: Plain text -#: user-manual.txt:675 +#: user-manual.txt:677 #, no-wrap msgid "*Location*:\n" msgstr "" #. type: Plain text -#: user-manual.txt:683 +#: user-manual.txt:685 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 " @@ -1398,42 +1462,41 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:701 +#: user-manual.txt:702 msgid "" "Type in the name of the dive site, e.g. \"Tihany, Lake Balaton, Hungary\". " "If several dives are made at the same location, the site information for the " "first dive is re-used. Existing dive locations can be edited by selecting " "(on the *Dive List* panel) a dive done at that site and by opening the " "location information. Click the globe button on the right of the location " -"name (see image on the right, above). When entering a dive location name, " -"auto location of dive site names makes it easy to select an existing dive " -"site name. When typing the name of a dive site, a dropdown list appears " -"showing all sites with similar names. If the dive site has been used before, " -"click on the already-existing name. The dive site names in the dropdown " -"list contain either a globe symbol (indicating existing dive sites in the " -"_Subsurface_ database) or a *+* symbol (indicating dive site names that " -"appear consistent with the current dive site name but which haven’t been " -"added to the dive site database). If the present dive site has not been " -"used before, a message appears as follows (image *A* below):" +"name (see image image *A* below). When typing the name of a dive site, a " +"dropdown list appears showing all sites with similar names. If the dive site " +"has been used before, click on the already-existing name. The dive site " +"names in the dropdown list contain either a globe symbol (indicating " +"existing dive sites in the _Subsurface_ database) or a *+* symbol " +"(indicating dive site names that appear consistent with the current dive " +"site name but which haven’t been added to the dive site database). If the " +"present dive site has not been used before, a message appears as follows " +"(image *A* below):" msgstr "" #. type: Target for macro image -#: user-manual.txt:702 +#: user-manual.txt:703 #, no-wrap msgid "images/Locations1_f22.jpg" msgstr "images/Locations1_f22.jpg" #. type: Plain text -#: user-manual.txt:707 +#: user-manual.txt:708 msgid "" -"Doubleclick on the new dive site name. A panel appears to enter the " -"coordinates and other information about the site (image *B*, above). The " -"most important items are the coordinates of the site. There are three ways " -"to specify coordinates:" +"Click the globe button and a panel appears to enter the coordinates and " +"other information about the site (image *B*, above). The most important " +"items are the coordinates of the site. There are three ways to specify " +"coordinates:" msgstr "" #. type: Plain text -#: user-manual.txt:713 +#: user-manual.txt:714 msgid "" "Use the world map in the bottom right hand part of the _Subsurface_ window. " "The map displays an orange bar indicating \"No location data - Move the map " @@ -1442,7 +1505,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:718 +#: user-manual.txt:719 msgid "" "Use eiher the Subsurface-Mobile App or the _Subsurface_ Companion App on an " "Android or iPhone device with GPS and if the dive site coordinates were " @@ -1451,14 +1514,14 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:720 +#: user-manual.txt:721 msgid "" "Enter coordiantes by hand if they are known, using one of four formats with " "latitude followed by longitude:" msgstr "" #. type: Plain text -#: user-manual.txt:725 +#: user-manual.txt:726 msgid "" "ISO 6709 Annex D format e.g. 30°13'28.9\"N 30°49'1.5\"E Degrees and decimal " "minutes, e.g. N30° 13.49760' , E30° 49.30788' Degrees minutes seconds, e.g. " @@ -1466,7 +1529,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:733 +#: user-manual.txt:734 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 " @@ -1478,7 +1541,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:739 +#: user-manual.txt:740 #, no-wrap msgid "" "*Important*: GPS coordinates of a dive site are linked to the location\n" @@ -1489,22 +1552,24 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:749 +#: user-manual.txt:750 #, no-wrap msgid "" "*Dive site name lookup:* If you typed coordinates into the appropriate\n" "text box, you can do an automated name lookup based on the coordinates.\n" -"This is done when _Subsurface_ uses the Internet to find the name of the dive site\n" +"This is done when _Subsurface_ uses the Internet to find the name of the dive" +" site\n" "based on the coordinates that were typed. If a name has been found, it is\n" "automatically inserted into the tags box. The list box\n" "(Titled _Dive sites on same coordinates_\") at the bottom\n" "of the dive site panel contains the names of other dives sites used at the\n" -"current location. For instance if the dive site is \"Blue Hole\" and there are several\n" +"current location. For instance if the dive site is \"Blue Hole\" and there" +" are several\n" "sites named \"Blue Hole\", all of them are listed.\n" msgstr "" #. type: Plain text -#: user-manual.txt:754 +#: user-manual.txt:755 msgid "" "Enter any other contextual information about the dive site (Description and " "Notes), then select _Apply Changes_ to save the geolocation for this dive " @@ -1513,27 +1578,28 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:759 +#: user-manual.txt:760 #, no-wrap msgid "" "*Dive mode*: This is a dropdown box allowing you to choose the type of dive\n" -"performed. The options are OC (Open Circuit SCUBA, the default setting, for most recreational dives),\n" +"performed. The options are OC (Open Circuit SCUBA, the default setting, for" +" most recreational dives),\n" "Freedive (dive without SCUBA equipment), CCR (Closed-circuit\n" "rebreather) and pSCR (Passive semi-closed rebreather).\n" msgstr "" #. type: Plain text -#: user-manual.txt:764 +#: user-manual.txt:765 #, no-wrap msgid "" "*Divemaster*: The name of the divemaster or dive guide should be\n" "entered in this field\n" -"which offers auto selection based on the list of dive masters in\n" +"which offers auto selection based on the list of divemasters in\n" "the current logbook.\n" msgstr "" #. type: Plain text -#: user-manual.txt:769 +#: user-manual.txt:770 #, no-wrap msgid "" "*Buddy*: In this field, enter the name(s) of the buddy or buddies\n" @@ -1543,17 +1609,18 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:774 +#: user-manual.txt:775 #, no-wrap msgid "" "*Suit*: Here the type of dive suit used can be entered.\n" "Auto selection of the suit description is available.\n" -"Some dry-suit users may choose to use this field to record what combination of\n" +"Some dry-suit users may choose to use this field to record what combination" +" of\n" "suit and thermal under suit was used.\n" msgstr "" #. type: Plain text -#: user-manual.txt:777 +#: user-manual.txt:778 #, no-wrap msgid "" "*Rating*: Provide a subjective overall rating of the dive on a\n" @@ -1561,7 +1628,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:780 +#: user-manual.txt:781 #, no-wrap msgid "" "*Visibility*: Provide a rating of visibility during the\n" @@ -1569,25 +1636,27 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:787 +#: user-manual.txt:788 #, no-wrap msgid "" "*Tags*: Tags that describe the type of dive done can be entered\n" -"here (separated by commas). Examples of common tags are boat, drift, training,\n" +"here (separated by commas). Examples of common tags are boat, drift," +" training,\n" "cave, etc.\n" -"_Subsurface_ has many built-in tags. By starting to type a tag, _Subsurface_ lists\n" +"_Subsurface_ has many built-in tags. By starting to type a tag, _Subsurface_" +" lists\n" "the tags that correspond to the typing. For instance, by typing\n" "+cav+, the tags *cave* and *cavern* are shown to choose from.\n" msgstr "" #. type: Plain text -#: user-manual.txt:789 +#: user-manual.txt:790 #, no-wrap msgid "*Notes*: Any additional information for the dive can be entered here.\n" msgstr "" #. type: Plain text -#: user-manual.txt:794 +#: user-manual.txt:795 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. " @@ -1597,13 +1666,13 @@ msgid "" msgstr "" #. type: Title ===== -#: user-manual.txt:795 +#: user-manual.txt:796 #, no-wrap msgid "Equipment" msgstr "" #. type: Plain text -#: user-manual.txt:800 +#: user-manual.txt:801 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 " @@ -1611,7 +1680,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:807 +#: user-manual.txt:808 msgid "" "shows the equipment is being edited. This is a highly interactive part of " "_Subsurface_ and the information on cylinders and gases (entered here) " @@ -1619,21 +1688,22 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:811 +#: user-manual.txt:812 #, no-wrap msgid "" -"*Cylinders*: The cylinder information is entered through a dialogue that looks\n" +"*Cylinders*: The cylinder information is entered through a dialogue that" +" looks\n" "like this:\n" msgstr "" #. type: Target for macro image -#: user-manual.txt:812 +#: user-manual.txt:813 #, no-wrap msgid "images/DC_gas-dialogue1_f20.jpg" msgstr "images/DC_gas-dialogue1_f20.jpg" #. type: Plain text -#: user-manual.txt:825 +#: user-manual.txt:826 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 " @@ -1649,13 +1719,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:826 +#: user-manual.txt:827 #, no-wrap msgid "images/DC_gas-dialogue2_f20.jpg" msgstr "images/DC_gas-dialogue2_f20.jpg" #. type: Plain text -#: user-manual.txt:833 +#: user-manual.txt:834 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 " @@ -1665,7 +1735,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:837 +#: user-manual.txt:838 msgid "" "Next, indicate the starting pressure and the ending pressure of the " "specified gas during the dive. The unit of pressure (metric/imperial) " @@ -1673,7 +1743,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:848 +#: user-manual.txt:849 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 " @@ -1687,13 +1757,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:849 +#: user-manual.txt:850 #, no-wrap msgid "images/CylinderDataEntry3_f20.jpg" msgstr "images/CylinderDataEntry3_f20.jpg" #. type: Plain text -#: user-manual.txt:855 +#: user-manual.txt:856 #, no-wrap msgid "" "*Weights*: Information about the weight system used can be entered\n" @@ -1703,26 +1773,26 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:856 +#: user-manual.txt:857 #, no-wrap msgid "images/WeightsDataEntry1_f20.jpg" msgstr "images/WeightsDataEntry1_f20.jpg" #. type: Plain text -#: user-manual.txt:860 +#: user-manual.txt:861 msgid "" "By clicking on the _Type_ field, a drop-down list becomes accessible through " "a down-arrow:" msgstr "" #. type: Target for macro image -#: user-manual.txt:861 +#: user-manual.txt:862 #, no-wrap msgid "images/WeightsDataEntry2_f20.jpg" msgstr "images/WeightsDataEntry2_f20.jpg" #. type: Plain text -#: user-manual.txt:875 +#: user-manual.txt:876 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 " @@ -1737,22 +1807,22 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:876 +#: user-manual.txt:877 #, no-wrap msgid "images/WeightsDataEntry3_f20.jpg" msgstr "images/WeightsDataEntry3_f20.jpg" #. type: Title ==== -#: user-manual.txt:878 +#: user-manual.txt:879 #, no-wrap msgid "Editing several selected dives simultaneously" msgstr "" #. type: Plain text -#: user-manual.txt:894 +#: user-manual.txt:895 msgid "" -"_METHOD 1_: After uploading dives from a dive computer, the dive profiles of " -"each is shown in the *Dive profile* tab, as well as a few items of " +"_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 " "information in the *Notes* tab (e.g. water temperature) and in the " "*Equipment* tab (e.g. gas pressures and gas composition). Other fields " "remain empty. It may be useful to simultaneously edit some of the fields in " @@ -1767,7 +1837,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:904 +#: user-manual.txt:905 msgid "" "Simultaneous editing only works with fields that do not already contain " "information. This means if some fields have been edited for a particular " @@ -1782,7 +1852,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:913 +#: user-manual.txt:914 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 " @@ -1797,13 +1867,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:915 +#: user-manual.txt:916 #, no-wrap msgid "Adding Bookmarks to a dive" msgstr "" #. type: Plain text -#: user-manual.txt:920 +#: user-manual.txt:921 msgid "" "Many divers wish to annotate dives with text that indicate particular " "events, e.g. \"Saw dolphins\", or \"Released surface buoy\". This is easily " @@ -1811,7 +1881,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:924 +#: user-manual.txt:925 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 " @@ -1819,40 +1889,40 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:926 +#: user-manual.txt:927 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:929 +#: user-manual.txt:930 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:932 +#: user-manual.txt:933 msgid "" "Hovering the mouse over the red bookmark, the appropriate text is shown at " "the bottom of the information box (see *D* below)." msgstr "" #. type: Target for macro image -#: user-manual.txt:933 +#: user-manual.txt:934 #, no-wrap msgid "images/Bookmarks.jpg" msgstr "images/Bookmarks.jpg" #. type: Title ==== -#: user-manual.txt:936 +#: user-manual.txt:937 #, no-wrap msgid "Saving the updated dive information" msgstr "" #. type: Plain text -#: user-manual.txt:947 +#: user-manual.txt:948 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 " @@ -1865,13 +1935,17 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:948 +#: user-manual.txt:949 #, no-wrap -msgid "Importing dive information from other digital data sources or other data formats" -msgstr "Importer les informations à partir d'autres sources de données numériques ou d'autres formats de données" +msgid "" +"Importing dive information from other digital data sources or other data" +" formats" +msgstr "" +"Importer les informations à partir d'autres sources de données numériques ou" +" d'autres formats de données" #. type: Plain text -#: user-manual.txt:971 +#: user-manual.txt:972 msgid "" "Many divers log their dives using the proprietary software provided by the " "manufacturers of their dive computers. _Subsurface_ can import dive logs " @@ -1892,27 +1966,28 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:981 +#: user-manual.txt:984 msgid "" "If the format of other software is supported natively on Subsurface, select " -"either _Import -> Import log files_ or _File -> Open log file_. _Subsurface_ " -"supports the data formats of many dive computers, including Suunto, " -"Shearwater and some CCR equipment. When importing dives, _Subsurface_ tries " -"to detect multiple records for the same dive and merges the information as " -"best as it can. If there are no time zone issues (or other reasons that " -"would cause the beginning time of the dives to be significantly different) " -"_Subsurface_ will not create duplicate entries. Below is more specific " -"information to import data to _Subsurface_." +"either _Import -> Import log files_ or _File -> Open log file_. Notice that " +"the import adds the imported data to the current *Dive list*, and the open " +"style starts a new dive list. _Subsurface_ supports the data formats of many " +"dive computers, including Suunto, Shearwater and some CCR equipment. When " +"importing dives, _Subsurface_ tries to detect multiple records for the same " +"dive and merges the information as best as it can. If there are no time zone " +"issues (or other reasons that would cause the beginning time of the dives to " +"be significantly different) _Subsurface_ will not create duplicate entries. " +"Below is more specific information to import data to _Subsurface_." msgstr "" #. type: Title ==== -#: user-manual.txt:982 +#: user-manual.txt:985 #, no-wrap msgid "Using the universal import dialogue" msgstr "" #. type: Plain text -#: user-manual.txt:988 +#: user-manual.txt:991 msgid "" "Importing dives from other software is done through a universal interface " "activated by selecting _Import_ from the Main Menu, then clicking on _Import " @@ -1920,13 +1995,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:989 +#: user-manual.txt:992 #, no-wrap msgid "images/Import1_f20.jpg" msgstr "images/Import1_f20.jpg" #. type: Plain text -#: user-manual.txt:994 +#: user-manual.txt:997 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, " @@ -1934,80 +2009,90 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:996 +#: user-manual.txt:999 msgid "" "XML-formatted dive logs (DivingLog 5.0, MacDive and several other dive log " "systems)" msgstr "" #. type: Plain text -#: user-manual.txt:997 +#: user-manual.txt:1000 msgid "Cochran dive logs" msgstr "" #. type: Plain text -#: user-manual.txt:998 +#: user-manual.txt:1001 msgid "UDDF-formatted dive logs (e.g. Kenozooid)" msgstr "" #. type: Plain text -#: user-manual.txt:999 +#: user-manual.txt:1002 msgid "UDCF-formatted dive logs" msgstr "" #. type: Plain text -#: user-manual.txt:1000 +#: user-manual.txt:1003 msgid "Poseidon MkVI CCR logs" msgstr "" #. type: Plain text -#: user-manual.txt:1001 +#: user-manual.txt:1004 msgid "APD Inspiration/Evolution CCR logs" msgstr "" #. type: Plain text -#: user-manual.txt:1002 +#: user-manual.txt:1005 msgid "LiquiVision logs" msgstr "" #. type: Plain text -#: user-manual.txt:1003 +#: user-manual.txt:1006 msgid "divelogs.de logs" msgstr "" #. type: Plain text -#: user-manual.txt:1004 +#: user-manual.txt:1007 msgid "OSTC Tools logs" msgstr "" #. type: Plain text -#: user-manual.txt:1005 +#: user-manual.txt:1008 msgid "JDiveLog" msgstr "" #. type: Plain text -#: user-manual.txt:1006 +#: user-manual.txt:1009 msgid "Suunto Dive Manager (DM3, DM4, DM5)" msgstr "" #. type: Plain text -#: user-manual.txt:1007 +#: user-manual.txt:1010 msgid "DL7 files used by Diver's Alert network (DAN)" msgstr "" #. type: Plain text -#: user-manual.txt:1008 +#: user-manual.txt:1011 msgid "Underwater technologies AV1 dive logs" msgstr "" #. type: Plain text -#: user-manual.txt:1009 +#: user-manual.txt:1012 +msgid "Divesoft dive logs" +msgstr "" + +#. type: Plain text +#: user-manual.txt:1013 +msgid "Poseidon MK VI eCCR dive logs" +msgstr "" + +#. type: Plain text +#: user-manual.txt:1014 msgid "" "CSV (text-based and spreadsheet-based) dive logs, including APD CCR logs" msgstr "" #. type: Plain text -#: user-manual.txt:1014 +#: user-manual.txt:1019 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 " @@ -2017,13 +2102,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:1015 +#: user-manual.txt:1020 #, no-wrap msgid "Importing from OSTCTools" msgstr "" #. type: Plain text -#: user-manual.txt:1024 +#: user-manual.txt:1029 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 " @@ -2036,7 +2121,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1028 +#: user-manual.txt:1033 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 " @@ -2044,7 +2129,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1033 +#: user-manual.txt:1038 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 " @@ -2053,13 +2138,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:1035 +#: user-manual.txt:1040 #, no-wrap msgid "Importing from Mares Dive Organizer V2.1" msgstr "" #. type: Plain text -#: user-manual.txt:1042 +#: user-manual.txt:1047 msgid "" "Since Mares uses proprietary Windows software not compatible with multi-" "platform applications, these dive logs cannot be directly imported into " @@ -2069,7 +2154,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1047 +#: user-manual.txt:1052 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 " @@ -2077,7 +2162,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1053 +#: user-manual.txt:1058 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 " @@ -2087,20 +2172,20 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1055 +#: user-manual.txt:1060 msgid "" "Finally, import the dives from _divelogs.de_ to _Subsurface_, using the " "instructions below." msgstr "" #. type: Title ==== -#: user-manual.txt:1058 +#: user-manual.txt:1063 #, no-wrap msgid "Importing Scubapro _SmartTrak_ divelogs" msgstr "" #. type: Plain text -#: user-manual.txt:1065 +#: user-manual.txt:1070 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 " @@ -2111,7 +2196,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1070 +#: user-manual.txt:1075 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 " @@ -2120,7 +2205,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1073 +#: user-manual.txt:1078 msgid "" "Feel free to contact the _Subsurface_ development team on mailto:" "subsurface@subsurface-divelog.org[our mailing list] for assistance in " @@ -2128,44 +2213,44 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1076 +#: user-manual.txt:1081 msgid "" "Assuming the above dependencies have been installed and the _Subsurface_ " "source tree is in the directory _~/src/subsurface_, then:" msgstr "" #. type: Title ===== -#: user-manual.txt:1077 +#: user-manual.txt:1082 #, no-wrap msgid "Building _smtk2ssrf_" msgstr "" #. type: Plain text -#: user-manual.txt:1080 +#: user-manual.txt:1085 msgid "Move to the source tree directory." msgstr "" #. type: Plain text -#: user-manual.txt:1082 +#: user-manual.txt:1087 msgid "" "Run \" $ ccmake build \" and set SMARTTRAK_IMPORT option to *on* (off by " "default)." msgstr "" #. type: Plain text -#: user-manual.txt:1083 +#: user-manual.txt:1088 msgid "Generate with [c] and save and exit with [g]." msgstr "" #. type: Plain text -#: user-manual.txt:1085 +#: user-manual.txt:1090 msgid "" "Build as you prefer, using the _build.sh_ script (recomended) or moving to " "build directory and running _make_." msgstr "" #. type: Plain text -#: user-manual.txt:1088 +#: user-manual.txt:1093 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 " @@ -2173,13 +2258,13 @@ msgid "" msgstr "" #. type: Title ===== -#: user-manual.txt:1089 +#: user-manual.txt:1094 #, no-wrap msgid "Running" msgstr "" #. type: Plain text -#: user-manual.txt:1095 +#: user-manual.txt:1100 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 " @@ -2188,13 +2273,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1096 +#: user-manual.txt:1101 #, no-wrap msgid "images/smtk2ssrf.jpg" msgstr "images/smtk2ssrf.jpg" #. type: Plain text -#: user-manual.txt:1103 +#: user-manual.txt:1108 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* " @@ -2202,20 +2287,20 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1105 +#: user-manual.txt:1110 msgid "" "If launched from a command line with two or more parameters, the format is " "as follows:" msgstr "" #. type: Plain text -#: user-manual.txt:1107 +#: user-manual.txt:1112 #, no-wrap msgid "\t$ smrtk2ssrf /input/file_1.slg /input/file_2.slg /output/file3.xml\n" msgstr "" #. type: Plain text -#: user-manual.txt:1115 +#: user-manual.txt:1120 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 " @@ -2226,13 +2311,13 @@ msgid "" msgstr "" #. type: Title ===== -#: user-manual.txt:1116 +#: user-manual.txt:1121 #, no-wrap msgid "Merging the imported dives with the existing divelog" msgstr "" #. type: Plain text -#: user-manual.txt:1126 +#: user-manual.txt:1131 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 " @@ -2245,13 +2330,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:1128 +#: user-manual.txt:1133 #, no-wrap msgid "Importing dives from *divelogs.de*" msgstr "" #. type: Plain text -#: user-manual.txt:1141 +#: user-manual.txt:1146 msgid "" "Importing dive information from _divelogs.de_ is simple, using a single " "dialogue box. The _Import -> Import from Divelogs.de_ option should be " @@ -2265,19 +2350,19 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1142 +#: user-manual.txt:1147 #, no-wrap msgid "images/Divelogs1.jpg" msgstr "images/Divelogs1.jpg" #. type: Title ==== -#: user-manual.txt:1145 +#: user-manual.txt:1150 #, no-wrap msgid "Importing data in CSV format" msgstr "Importer des données au format CSV" #. type: Plain text -#: user-manual.txt:1156 +#: user-manual.txt:1161 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 " @@ -2293,13 +2378,16 @@ msgid "" msgstr "" #. type: Title ===== -#: user-manual.txt:1158 +#: user-manual.txt:1163 #, no-wrap -msgid "Importing dives in CSV format from dive computers or other dive log software" -msgstr "Importer les plongées au format CSV à partir des ordinateurs de plongées ou d'autres logiciels de carnet de plongée" +msgid "" +"Importing dives in CSV format from dive computers or other dive log software" +msgstr "" +"Importer les plongées au format CSV à partir des ordinateurs de plongées ou" +" d'autres logiciels de carnet de plongée" #. type: Plain text -#: user-manual.txt:1163 +#: user-manual.txt:1168 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 " @@ -2308,14 +2396,14 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1165 +#: user-manual.txt:1170 msgid "" "There are two types of _CSV_ dive logs that can be imported into " "_Subsurface_:" msgstr "" #. type: Plain text -#: user-manual.txt:1171 +#: user-manual.txt:1176 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, " @@ -2326,7 +2414,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1180 +#: user-manual.txt:1185 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 " @@ -2340,14 +2428,14 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1183 +#: user-manual.txt:1188 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:1191 +#: user-manual.txt:1196 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 " @@ -2359,7 +2447,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1195 +#: user-manual.txt:1200 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 " @@ -2368,13 +2456,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1197 +#: user-manual.txt:1202 msgid "" "Is the numeric information (e.g. dive depth) in metric or in imperial units?" msgstr "" #. type: Plain text -#: user-manual.txt:1204 +#: user-manual.txt:1209 msgid "" "With this information, importing the data into _Subsurface_ is " "straightforward. Select _Import -> Import Log Files_ from the main menu. In " @@ -2384,28 +2472,32 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1205 +#: user-manual.txt:1210 #, no-wrap msgid "images/csv_import1_f20.jpg" msgstr "images/csv_import1_f20.jpg" #. type: Plain text -#: user-manual.txt:1216 +#: user-manual.txt:1221 #, no-wrap msgid "" "At the top left, there is a dropdown list containing pre- configured\n" "settings for common dive computers and software packages.\n" " If the _CSV_ file being imported originated from any of\n" "these pre-configured items, select it. Otherwise use the _Manual Import_\n" -"option. The configuration panel also has dropdown lists for the specification of the appropriate\n" -"field separator (Tab, comma or semicolon), the date format used in the _CSV_ file,\n" -"the time units (seconds, minutes or minutes:seconds), as well as the unit system\n" -"(metric or imperial). Selecting the appropriate options among these is critical for\n" +"option. The configuration panel also has dropdown lists for the specification" +" of the appropriate\n" +"field separator (Tab, comma or semicolon), the date format used in the _CSV_" +" file,\n" +"the time units (seconds, minutes or minutes:seconds), as well as the unit" +" system\n" +"(metric or imperial). Selecting the appropriate options among these is" +" critical for\n" "successful data import.\n" msgstr "" #. type: Plain text -#: user-manual.txt:1228 +#: user-manual.txt:1233 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 " @@ -2422,13 +2514,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1229 +#: user-manual.txt:1234 #, no-wrap msgid "images/csv_import2_f20.jpg" msgstr "images/csv_import2_f20.jpg" #. type: Plain text -#: user-manual.txt:1235 +#: user-manual.txt:1240 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. " @@ -2437,13 +2529,13 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:1239 +#: user-manual.txt:1244 #, no-wrap msgid "*A Diver's Introduction to _CSV_ Files*\n" msgstr "" #. type: delimited block * -#: user-manual.txt:1253 +#: user-manual.txt:1258 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 " @@ -2460,12 +2552,11 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:1262 +#: user-manual.txt:1267 msgid "" -"_CSV_ files can be created or edited with a normal text editor. The most " -"important attribute of a _CSV_ file is the _field separator_, the character " -"used to separate fields within a single line. The field separator is " -"frequently a comma, a colon, a SPACE character or a TAB character. When " +"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 " +"is frequently a comma, a colon, a SPACE character or a TAB character. When " "exporting data from spreadsheet software, the field separator needs to be " "specified in order to create the _CSV_ file. _CSV_ files are normally " "organized into a single line that provides the headers (or _field names_) of " @@ -2476,7 +2567,7 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:1268 +#: user-manual.txt:1273 #, no-wrap msgid "" "\tDive site,Dive date,Time,Dive_duration, Dive_depth,Dive buddy\n" @@ -2487,14 +2578,14 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:1270 +#: user-manual.txt:1275 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:1276 +#: user-manual.txt:1281 #, no-wrap msgid "" "\tDive site\tDive date\tTime\tDive_duration\tDive_depth\tDive buddy\n" @@ -2505,7 +2596,7 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:1284 +#: user-manual.txt:1289 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 " @@ -2519,10 +2610,11 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:1295 +#: user-manual.txt:1300 #, no-wrap msgid "" -"\tDive Time (s)\tDepth (m)\tpO₂ - Setpoint (Bar) \tpO₂ - C1 Cell 1 (Bar)\tAmbient temp. (Celsius)\n" +"\tDive Time (s)\tDepth (m)\tpO~2~ - Setpoint (Bar) \tpO~2~ - C1 Cell 1" +" (Bar)\tAmbient temp. (Celsius)\n" "\t0 0.0 0.70 0.81 13.1\n" "\t0 1.2 0.70 0.71 13.1\n" "\t0 0.0 0.70 0.71 13.1\n" @@ -2535,7 +2627,7 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:1301 +#: user-manual.txt:1306 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_ " @@ -2546,7 +2638,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1314 +#: user-manual.txt:1319 msgid "" "But, the _CSV_ import has a couple of caveats. Avoid some special characters " "like ampersand (&), less than (<), greater than (>) and double quotes (\") " @@ -2559,56 +2651,56 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:1315 +#: user-manual.txt:1320 #, no-wrap msgid "Importing Dive coordinates from a mobile device with GPS." msgstr "" #. type: Plain text -#: user-manual.txt:1319 +#: user-manual.txt:1324 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:1322 +#: user-manual.txt:1327 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:1324 +#: user-manual.txt:1329 msgid "" "Uploading the coordinates from the mobile device to the _Subsurface_ " "Internet server." msgstr "" #. type: Plain text -#: user-manual.txt:1327 +#: user-manual.txt:1332 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:1329 +#: user-manual.txt:1334 msgid "_Subsurface has two tools for achieving this:" msgstr "" #. type: Plain text -#: user-manual.txt:1331 +#: user-manual.txt:1336 msgid "The _Subsurface Companion App_ (Android and iOS)." msgstr "" #. type: Plain text -#: user-manual.txt:1333 +#: user-manual.txt:1338 msgid "The _Subsurface-mobile_ app (Android and iOS)" msgstr "" #. type: Plain text -#: user-manual.txt:1342 +#: user-manual.txt:1347 msgid "" "Both of these applications perform the collection of dive site coordinates " "and the synchronisation with dives in the _Subsurface_ dive list. However, " @@ -2622,26 +2714,26 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1344 +#: user-manual.txt:1349 msgid "" "For information on using the _Subsurface Companion App_, click xref:" "S_Companion[_here_]." msgstr "" #. type: Title ==== -#: user-manual.txt:1345 +#: user-manual.txt:1350 #, no-wrap msgid "Storing and and using GPS locations using _Subsurface-mobile_" msgstr "" #. type: Title ===== -#: user-manual.txt:1347 +#: user-manual.txt:1352 #, no-wrap msgid "Install _Subsurface-mobile_" msgstr "" #. type: Plain text -#: user-manual.txt:1353 +#: user-manual.txt:1358 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-" @@ -2650,13 +2742,13 @@ msgid "" msgstr "" #. type: Title ===== -#: user-manual.txt:1354 +#: user-manual.txt:1359 #, no-wrap msgid "Create a _Subsurface-mobile_ account" msgstr "" #. type: Plain text -#: user-manual.txt:1362 +#: user-manual.txt:1367 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 " @@ -2668,27 +2760,28 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1365 +#: user-manual.txt:1370 #, no-wrap msgid "" -"*N.B.:* To successfully create a user account, the mobile device must have Internet connectivity,\n" +"*N.B.:* To successfully create a user account, the mobile device must have" +" Internet connectivity,\n" "either through the cellular network or via wifi.\n" msgstr "" #. type: Target for macro image -#: user-manual.txt:1366 +#: user-manual.txt:1371 #, no-wrap msgid "images/MobileCredentials.jpg" msgstr "images/MobileCredentials.jpg" #. type: Title ===== -#: user-manual.txt:1369 +#: user-manual.txt:1374 #, no-wrap msgid "Configure auto-collecting of GPS coordinates" msgstr "" #. type: Plain text -#: user-manual.txt:1375 +#: user-manual.txt:1380 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 " @@ -2698,39 +2791,45 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1377 +#: user-manual.txt:1382 msgid "" "_Time threshold._ (minutes). The app will try to get a location every X " "minutes" msgstr "" #. type: Plain text -#: user-manual.txt:1379 +#: user-manual.txt:1384 msgid "_Distance threshold._ (meters). Minimum distance between two locations." msgstr "" #. type: Plain text -#: user-manual.txt:1388 +#: user-manual.txt:1393 #, no-wrap msgid "" -"*How are GPS coordinates collected?* Assuming the diver sets 5 minutes and 50\n" -"meters in the settings above, the app will start by recording a location at the current\n" -"location, followed by another one at every 5 minutes *or* every time you move 50 m\n" +"*How are GPS coordinates collected?* Assuming the diver sets 5 minutes and" +" 50\n" +"meters in the settings above, the app will start by recording a location at" +" the current\n" +"location, followed by another one at every 5 minutes *or* every time you move" +" 50 m\n" "from previous location, whichever happens first.\n" -"If subsequent locations are within a radius of 50 meters from the previous one,\n" -"a new location is not saved. If the diver is not moving, only one location is\n" +"If subsequent locations are within a radius of 50 meters from the previous" +" one,\n" +"a new location is not saved. If the diver is not moving, only one location" +" is\n" "saved, at least until the _Time-threshold_ period has elapsed.\n" -"If the diver moves, a trace of the route is obtained by saving a location every 50 meters.\n" +"If the diver moves, a trace of the route is obtained by saving a location" +" every 50 meters.\n" msgstr "" #. type: Title ===== -#: user-manual.txt:1389 +#: user-manual.txt:1394 #, no-wrap msgid "Activate the automated recording of GPS locations" msgstr "" #. type: Plain text -#: user-manual.txt:1394 +#: user-manual.txt:1399 msgid "" "The _Subsurface-mobile_ main menu has a checkbox at the bottom left labled " "_Run location service_ (see image below). Checking the box starts the " @@ -2738,57 +2837,59 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1395 +#: user-manual.txt:1400 #, no-wrap msgid "images/MobileMenu.jpg" msgstr "images/MobileMenu.jpg" #. type: Title ===== -#: user-manual.txt:1397 +#: user-manual.txt:1402 #, no-wrap msgid "After the dive, stop the automated recording of GPS locations" msgstr "" #. type: Plain text -#: user-manual.txt:1400 +#: user-manual.txt:1405 msgid "" "Uncheck the check box at the bottom left of the _Subsurface-mobile_ main " "menu." msgstr "" #. type: Title ===== -#: user-manual.txt:1401 +#: user-manual.txt:1406 #, no-wrap msgid "Upload the GPS locations onto the _Subsurface_ Internet server." msgstr "" #. type: Plain text -#: user-manual.txt:1408 +#: user-manual.txt:1413 #, no-wrap msgid "" -"*N.B.:* Uploading the GPS locations to the Internet can only take place if the mobile\n" +"*N.B.:* Uploading the GPS locations to the Internet can only take place if" +" the mobile\n" "device has reliable access to the Internet, either via a cellular network or\n" -"via a wifi connection. If the Internet is not accessible from the dive site(s),\n" -"then GPS uploading can only take place after the dive or after the dive trip,\n" +"via a wifi connection. If the Internet is not accessible from the dive" +" site(s),\n" +"then GPS uploading can only take place after the dive or after the dive" +" trip,\n" "when an Internet connection has been re-established.\n" msgstr "" #. type: Plain text -#: user-manual.txt:1412 +#: user-manual.txt:1416 msgid "" "From the _Subsurface-mobile_ main menu, select _GPS_ -> _Upload GPS data_. " -"The locations are uploaded. Check the indicator at the top of the mobile " -"screen for internet activity, indicating the transfer of information." +"The locations are uploaded." msgstr "" #. type: Title ===== -#: user-manual.txt:1413 +#: user-manual.txt:1417 #, no-wrap msgid "Apply the stored GPS locations to dives on the _Subsurface_ dive list." msgstr "" #. type: Plain text -#: user-manual.txt:1422 +#: user-manual.txt:1426 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 " @@ -2800,7 +2901,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1427 +#: user-manual.txt:1431 msgid "" "The https://subsurface-divelog.org/documentation/subsurface-mobile-user-" "manual[user manual for _Subsurface-mobile_] (accessible from within that " @@ -2809,32 +2910,36 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:1430 +#: user-manual.txt:1434 #, no-wrap -msgid "Importing GPS coordinates with the _Subsurface Companion App_ for mobile phones" +msgid "" +"Importing GPS coordinates with the _Subsurface Companion App_ for mobile" +" phones" msgstr "" #. type: Plain text -#: user-manual.txt:1439 +#: user-manual.txt:1443 #, no-wrap msgid "" "Using the *Subsurface Companion App* on an _Android device_ or\n" "xref:S_iphone[_iPhone_] with GPS, the coordinates\n" "for the diving\n" -"location can be automatically passed to the _Subsurface_ dive log. The Companion App\n" -"stores dive locations on a dedicated Internet server. _Subsurface_ can collect\n" +"location can be automatically passed to the _Subsurface_ dive log. The" +" Companion App\n" +"stores dive locations on a dedicated Internet server. _Subsurface_ can" +" collect\n" "the locations from the server.\n" "To do this:\n" msgstr "" #. type: Title ===== -#: user-manual.txt:1440 +#: user-manual.txt:1444 #, no-wrap msgid "Create a Companion App account" msgstr "" #. type: Plain text -#: user-manual.txt:1445 +#: user-manual.txt:1449 msgid "" "Register on the http://api.hohndel.org/login/[_Subsurface companion web " "page_]. A confirmation email with instructions and a personal *DIVERID* " @@ -2843,26 +2948,26 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1450 +#: user-manual.txt:1454 msgid "" "Download the app from https://play.google.com/store/apps/details?id=org." -"subsurface[Google Play Store] or from http://f-droid.org/repository/browse/?" +"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:1451 +#: user-manual.txt:1455 #, no-wrap msgid "Using the Subsurface companion app on an Android smartphone" msgstr "" #. type: Plain text -#: user-manual.txt:1454 +#: user-manual.txt:1458 msgid "On first use the app has three options:" msgstr "" #. type: Plain text -#: user-manual.txt:1460 +#: user-manual.txt:1464 msgid "" "_Create a new account._ Equivalent to registering in the _Subsurface_ " "companion page using an Internet browser. You can request a *DIVERID* using " @@ -2872,14 +2977,14 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1463 +#: user-manual.txt:1467 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:1467 +#: user-manual.txt:1471 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 " @@ -2887,22 +2992,22 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1475 +#: user-manual.txt:1479 msgid "" "In the _Subsurface_ main program, the *DIVERID* should also be entered on " -"the Default Preferences panel, by selecting _File -> Preferences -> " -"Defaults_ from the main menu in _Subsurface_ itself. This helps " -"synchronization between _Subsurface_ and the Companion App." +"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:1477 +#: user-manual.txt:1481 #, no-wrap msgid "*Creating new dive locations*\n" msgstr "*Créer de nouveaux emplacements de plongée*\n" #. type: Plain text -#: user-manual.txt:1481 +#: user-manual.txt:1485 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 " @@ -2910,21 +3015,21 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1484 +#: user-manual.txt:1488 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:1487 +#: user-manual.txt:1491 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:1496 +#: user-manual.txt:1500 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 " @@ -2937,28 +3042,29 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1497 +#: user-manual.txt:1501 #, no-wrap msgid "images/Companion_5.jpg" msgstr "images/Companion_5.jpg" #. type: Plain text -#: user-manual.txt:1504 +#: user-manual.txt:1508 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, then select the tab " -"in the upper right, afterAndroid device." +"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:1506 +#: user-manual.txt:1511 #, no-wrap -msgid "*Dive lists of dive locations*\n" -msgstr "" +#| msgid "*Creating new dive locations*\n" +msgid "*List of dive locations*\n" +msgstr "*Liste des emplacements de plongée*\n" #. type: Plain text -#: user-manual.txt:1513 +#: user-manual.txt:1518 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 " @@ -2969,7 +3075,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1521 +#: user-manual.txt:1526 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 " @@ -2981,13 +3087,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1522 +#: user-manual.txt:1527 #, no-wrap msgid "images/Companion_4.jpg" msgstr "images/Companion_4.jpg" #. type: Plain text -#: user-manual.txt:1528 +#: user-manual.txt:1533 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 " @@ -2995,14 +3101,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1530 -msgid "" -"Edit (pencil): Change the text name or other characteristics of the dive " -"location." +#: user-manual.txt:1535 +msgid "Edit (pencil): Change the name of the dive location." msgstr "" #. type: Plain text -#: user-manual.txt:1535 +#: user-manual.txt:1540 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 " @@ -3010,13 +3114,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1537 +#: user-manual.txt:1542 #, no-wrap msgid "*Uploading dive locations*\n" msgstr "" #. type: Plain text -#: user-manual.txt:1542 +#: user-manual.txt:1547 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 " @@ -3024,50 +3128,50 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1547 +#: user-manual.txt:1552 msgid "" "Be careful! The trash icon on the right means exactly what it should; it " "deletes the selected dive location(s)." msgstr "" #. type: Target for macro image -#: user-manual.txt:1548 +#: user-manual.txt:1553 #, no-wrap msgid "images/Companion_1.jpg" msgstr "images/Companion_1.jpg" #. type: Plain text -#: user-manual.txt:1553 +#: user-manual.txt:1558 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:1556 +#: user-manual.txt:1561 #, no-wrap msgid "*Settings on the Companion App*\n" msgstr "" #. type: Plain text -#: user-manual.txt:1558 +#: user-manual.txt:1563 msgid "" "Selecting the _Settings_ menu option results in the right hand image above " "(*B*)." msgstr "" #. type: Plain text -#: user-manual.txt:1560 +#: user-manual.txt:1565 msgid "_Server and account_" msgstr "" #. type: Plain text -#: user-manual.txt:1562 +#: user-manual.txt:1567 msgid "_Web-service URL._ This is predefined (http://api.hohndel.org/)" msgstr "" #. type: Plain text -#: user-manual.txt:1565 +#: user-manual.txt:1570 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 " @@ -3075,66 +3179,66 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1567 +#: user-manual.txt:1572 msgid "_Synchronisation_" msgstr "" #. type: Plain text -#: user-manual.txt:1570 +#: user-manual.txt:1575 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:1573 +#: user-manual.txt:1578 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:1575 +#: user-manual.txt:1580 msgid "_Background service_" msgstr "" #. type: Plain text -#: user-manual.txt:1578 +#: user-manual.txt:1583 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:1580 +#: user-manual.txt:1585 msgid "The settings below define the behavior of the service:" msgstr "" #. type: Plain text -#: user-manual.txt:1583 +#: user-manual.txt:1588 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:1585 +#: user-manual.txt:1590 msgid "_Min distance._ In meters. Minimum distance between two locations." msgstr "" #. type: Plain text -#: user-manual.txt:1587 +#: user-manual.txt:1592 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:1588 user-manual.txt:1689 user-manual.txt:2114 +#: user-manual.txt:1593 user-manual.txt:1694 user-manual.txt:2119 #, no-wrap msgid "images/icons/info.jpg" msgstr "images/icons/info.jpg" #. type: Plain text -#: user-manual.txt:1598 +#: user-manual.txt:1603 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 " @@ -3147,55 +3251,55 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1600 +#: user-manual.txt:1605 msgid "_Other_" msgstr "" #. type: Plain text -#: user-manual.txt:1603 +#: user-manual.txt:1608 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:1605 +#: user-manual.txt:1610 msgid "_Subsurface website._ A link to the URL of Subsurface web" msgstr "" #. type: Plain text -#: user-manual.txt:1607 +#: user-manual.txt:1612 msgid "_Version._ Displays the current version of the Companion App." msgstr "" #. type: Plain text -#: user-manual.txt:1609 +#: user-manual.txt:1614 msgid "_Search_" msgstr "" #. type: Plain text -#: user-manual.txt:1611 +#: user-manual.txt:1616 msgid "Search the saved dive locations by name or by date and time." msgstr "" #. type: Plain text -#: user-manual.txt:1613 +#: user-manual.txt:1618 msgid "_Start service_" msgstr "" #. type: Plain text -#: user-manual.txt:1615 +#: user-manual.txt:1620 msgid "" "Starts the _background service_ following the previously defined settings." msgstr "" #. type: Plain text -#: user-manual.txt:1617 +#: user-manual.txt:1622 msgid "_Disconnect_" msgstr "" #. type: Plain text -#: user-manual.txt:1624 +#: user-manual.txt:1629 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 " @@ -3205,24 +3309,25 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1626 +#: user-manual.txt:1631 msgid "_Send all locations_" msgstr "" #. type: Plain text -#: user-manual.txt:1628 +#: user-manual.txt:1633 msgid "" "This option sends all locations stored in the Android device to the server." msgstr "" #. type: Title ===== -#: user-manual.txt:1630 +#: user-manual.txt:1635 #, no-wrap -msgid "Using the Subsurface companion app on an _iPhone_ to record dive locations" +msgid "" +"Using the Subsurface companion app on an _iPhone_ to record dive locations" msgstr "" #. type: Plain text -#: user-manual.txt:1635 +#: user-manual.txt:1640 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 " @@ -3230,13 +3335,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1636 +#: user-manual.txt:1641 #, no-wrap msgid "images/iphone.jpg" msgstr "images/iphone.jpg" #. type: Plain text -#: user-manual.txt:1647 +#: user-manual.txt:1652 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 " @@ -3250,7 +3355,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1653 +#: user-manual.txt:1658 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 " @@ -3259,13 +3364,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1656 +#: user-manual.txt:1661 #, no-wrap msgid "*Downloading dive locations to the _Subsurface_ divelog*\n" msgstr "" #. type: Plain text -#: user-manual.txt:1664 +#: user-manual.txt:1669 msgid "" "Download dive(s) from a dive computer or enter them manually into " "_Subsurface_ before obtaining the GPS coordinates from the server. The " @@ -3277,13 +3382,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1665 +#: user-manual.txt:1670 #, no-wrap msgid "images/DownloadGPS.jpg" msgstr "images/DownloadGPS.jpg" #. type: Plain text -#: user-manual.txt:1673 +#: user-manual.txt:1678 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 " @@ -3294,7 +3399,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1680 +#: user-manual.txt:1685 msgid "" "Since _Subsurface_ matches GPS locations from the mobile device and dive " "information from the dive computer based on date-time data, automatic " @@ -3306,7 +3411,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1688 +#: user-manual.txt:1693 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 " @@ -3319,12 +3424,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1692 +#: user-manual.txt:1697 msgid "TIPS:" msgstr "" #. type: Plain text -#: user-manual.txt:1695 +#: user-manual.txt:1700 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 " @@ -3332,14 +3437,14 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1696 +#: user-manual.txt:1701 msgid "" "Right now, these locations are difficult to delete from the server. In some " "situations it" msgstr "" #. type: Plain text -#: user-manual.txt:1699 +#: user-manual.txt:1704 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. " @@ -3348,7 +3453,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1702 +#: user-manual.txt:1707 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_ " @@ -3357,13 +3462,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:1704 +#: user-manual.txt:1709 #, no-wrap msgid "Adding photographs to dives" msgstr "" #. type: Plain text -#: user-manual.txt:1710 +#: user-manual.txt:1715 msgid "" "Many (if not most) divers take photographs during a dive. _Subsurface_ " "allows the storage and display of photographs for each dive. Photos are " @@ -3372,29 +3477,29 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:1711 +#: user-manual.txt:1716 #, no-wrap msgid "Loading photos and synchronizing between dive computer and camera" msgstr "" #. type: Plain text -#: user-manual.txt:1717 +#: user-manual.txt:1722 msgid "" -"Left-lick on a dive or on a group of dives on the dive list, bringing up the " -"xref:S_DiveListContextMenu[Dive list context Menu]. Right-click the " +"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: Target for macro image -#: user-manual.txt:1718 +#: user-manual.txt:1723 #, no-wrap msgid "images/LoadImage2_f20.jpg" msgstr "images/LoadImage2_f20.jpg" #. type: Plain text -#: user-manual.txt:1725 +#: user-manual.txt:1730 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: " @@ -3404,9 +3509,9 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1732 +#: user-manual.txt:1737 msgid "" -"Having selected the local folder ot Internet image to be imported, the time " +"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 " @@ -3416,70 +3521,91 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1734 +#: user-manual.txt:1739 msgid "_Subsurface_ synchronizes camera with dive computer in three ways:" msgstr "" #. type: Plain text -#: user-manual.txt:1737 +#: user-manual.txt:1742 #, no-wrap msgid "" -"*Pro-actively*: Before the dive, ensure synchronization of the dive computer time settings with\n" -"the time settings of the camera by changing the date-time settings on one or both of these devices.\n" +"*Pro-actively*: Before the dive, ensure synchronization of the dive computer" +" time settings with\n" +"the time settings of the camera by changing the date-time settings on one or" +" both of these devices.\n" msgstr "" #. type: Plain text -#: user-manual.txt:1748 +#: user-manual.txt:1753 #, no-wrap msgid "" -"*Manually*: Writing down the exact camera time at the start of a dive allows using the\n" +"*Manually*: Writing down the exact camera time at the start of a dive allows" +" using the\n" "difference in time between the two devices. As long as the device\n" "settings for time has not been changed in either device, the times of\n" -"both devices after the dive or even at the end of the day allows manually setting the time\n" -"difference in the _Time shift_ dialog (see image below). Towards the top of the dialog is a time\n" -"setting tool immediately under the heading _Shift times of image(s) by_, in the image below.\n" -"If the camera time is 7 minutes later than that of the dive computer, set the time setting\n" +"both devices after the dive or even at the end of the day allows manually" +" setting the time\n" +"difference in the _Time shift_ dialog (see image below). Towards the top of" +" the dialog is a time\n" +"setting tool immediately under the heading _Shift times of image(s) by_, in" +" the image below.\n" +"If the camera time is 7 minutes later than that of the dive computer, set the" +" time setting\n" "tool to a value of 00:07 and select the _Earlier_ radio button.\n" "This is appropriate, since the photos need to be shifted\n" -"7 minutes earlier (camera is 7 minutes ahead of dive computer). Ignore any \"AM\" or \"PM\" suffix\n" +"7 minutes earlier (camera is 7 minutes ahead of dive computer). Ignore any" +" \"AM\" or \"PM\" suffix\n" "in that tool. Click the _OK_ button and synchronization is done.\n" msgstr "" #. type: Target for macro image -#: user-manual.txt:1749 +#: user-manual.txt:1754 #, no-wrap msgid "images/LoadImage3b_f23.jpg" msgstr "images/LoadImage3b_f23.jpg" #. type: Plain text -#: user-manual.txt:1767 +#: user-manual.txt:1772 #, no-wrap msgid "" -"*By photograph*: There is a very slick way of achieving synchronization, requiring a\n" -"photograph of the face of the dive computer showing the time. _Subsurface_ gets\n" -"the exact time the photograph was taken, using the metadata the camera stores within\n" -"each photo and compares this with the time visible on the photo. To do this, use the\n" -"bottom half of the _Time shift_ dialog. In this case the top part of the dialog is ignored. Click on\n" -"the horizontal bar called _Select image of dive computer showing time_. This brings up\n" -"a file browser for selecting the photograph of the dive computer time. Select the\n" -"photograph using the file browser and click on _OK_. This photograph of the dive computer\n" -"appears in the bottom panel of the _Shift times_ dialog. Now _Subsurface_ knows exactly\n" -"when the photograph was taken. Now set the date-time dialog to the left of the photo\n" +"*By photograph*: There is a very slick way of achieving synchronization," +" requiring a\n" +"photograph of the face of the dive computer showing the time. _Subsurface_" +" gets\n" +"the exact time the photograph was taken, using the metadata the camera stores" +" within\n" +"each photo and compares this with the time visible on the photo. To do this," +" use the\n" +"bottom half of the _Time shift_ dialog. In this case the top part of the" +" dialog is ignored. Click on\n" +"the horizontal bar called _Select image of dive computer showing time_. This" +" brings up\n" +"a file browser for selecting the photograph of the dive computer time. Select" +" the\n" +"photograph using the file browser and click on _OK_. This photograph of the" +" dive computer\n" +"appears in the bottom panel of the _Shift times_ dialog. Now _Subsurface_" +" knows exactly\n" +"when the photograph was taken. Now set the date-time dialog to the left of" +" the photo\n" "so it reflects the date and time of the dive computer in the photo. When the\n" -"date-time tool has been set, _Subsurface_ knows exactly what the time difference between\n" -"camera and dive computer is, and it can synchronize the devices. The image below shows\n" -"a photograph of the face of the dive computer and with the date-time tool set to the\n" +"date-time tool has been set, _Subsurface_ knows exactly what the time" +" difference between\n" +"camera and dive computer is, and it can synchronize the devices. The image" +" below shows\n" +"a photograph of the face of the dive computer and with the date-time tool set" +" to the\n" "date-time.\n" msgstr "" #. type: Target for macro image -#: user-manual.txt:1768 +#: user-manual.txt:1773 #, no-wrap msgid "images/LoadImage3c_f23.jpg" msgstr "images/LoadImage3c_f23.jpg" #. type: Plain text -#: user-manual.txt:1772 +#: user-manual.txt:1777 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 " @@ -3490,23 +3616,23 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:1773 +#: user-manual.txt:1778 #, no-wrap msgid "Viewing the photos" msgstr "" #. type: Plain text -#: user-manual.txt:1776 +#: user-manual.txt:1781 msgid "After the images have been loaded, they appear in two places:" msgstr "" #. type: Plain text -#: user-manual.txt:1778 +#: user-manual.txt:1783 msgid "the _Photos_ tab of the *Notes* panel (left part of image below)." msgstr "" #. type: Plain text -#: user-manual.txt:1782 +#: user-manual.txt:1787 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 " @@ -3515,37 +3641,37 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1783 +#: user-manual.txt:1788 #, no-wrap msgid "images/icons/ShowPhotos_f20.png" msgstr "images/icons/ShowPhotos_f20.png" #. type: Plain text -#: user-manual.txt:1786 +#: user-manual.txt:1791 msgid "This results in a profile display as in the image below:" msgstr "" #. type: Target for macro image -#: user-manual.txt:1787 +#: user-manual.txt:1792 #, no-wrap msgid "images/LoadImage4_f20.jpg" msgstr "images/LoadImage4_f20.jpg" #. type: Plain text -#: user-manual.txt:1791 +#: user-manual.txt:1796 msgid "" "Hover the mouse over any of the photo stubs. A thumbnail photo is shown of " "the appropriate photo. See the image below:" msgstr "" #. type: Target for macro image -#: user-manual.txt:1792 +#: user-manual.txt:1797 #, no-wrap msgid "images/LoadImage5_f20.jpg" msgstr "images/LoadImage5_f20.jpg" #. type: Plain text -#: user-manual.txt:1801 +#: user-manual.txt:1806 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 " @@ -3556,19 +3682,19 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1802 +#: user-manual.txt:1807 #, no-wrap msgid "images/LoadImage6_f20.jpg" msgstr "images/LoadImage6_f20.jpg" #. type: Title ==== -#: user-manual.txt:1804 +#: user-manual.txt:1809 #, no-wrap msgid "The _Photos_ tab" msgstr "" #. type: Plain text -#: user-manual.txt:1814 +#: user-manual.txt:1819 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 " @@ -3584,13 +3710,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:1815 +#: user-manual.txt:1820 #, no-wrap msgid "Photos on an external hard disk" msgstr "" #. type: Plain text -#: user-manual.txt:1825 +#: user-manual.txt:1830 msgid "" "Most underwater photographers store photos on an external drive. If such a " "drive can be mapped by the operating system (almost always the case) the " @@ -3607,13 +3733,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:1826 +#: user-manual.txt:1831 #, no-wrap msgid "Finding out which dives have associated photos." msgstr "" #. type: Plain text -#: user-manual.txt:1831 +#: user-manual.txt:1836 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 " @@ -3627,47 +3753,57 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:1833 +#: user-manual.txt:1838 #, no-wrap msgid "Moving photographs among directories, hard disks or computers" msgstr "" #. type: Plain text -#: user-manual.txt:1842 +#: user-manual.txt:1847 #, no-wrap msgid "" -"After a photograph has been loaded into _Subsurface_ and associated with a specific dive,\n" -"_Subsurface_ saves the directory path where the photo lies as well as the file name of the photo,\n" +"After a photograph has been loaded into _Subsurface_ and associated with a" +" specific dive,\n" +"_Subsurface_ saves the directory path where the photo lies as well as the" +" file name of the photo,\n" "in order to find it when the dive is opened again.\n" -"If the photo or the whole photo collection is moved to another drive or to a different\n" -" machine, the path to the photo changes. Now, _Subsurface_ looks for the photos at their original location before they were moved,\n" -" cannot find them and cannot display them. Because, after moving photos, large numbers of photos\n" -" may need to be deleted and re-imported from the new location, _Subsurface_ has a mechanism to ease this inconvenience: automatic updates using fingerprints.\n" +"If the photo or the whole photo collection is moved to another drive or to a" +" different\n" +" machine, the path to the photo changes. Now, _Subsurface_ looks for the" +" photos at their original location before they were moved,\n" +" cannot find them and cannot display them. Because, after moving photos," +" large numbers of photos\n" +" may need to be deleted and re-imported from the new location, _Subsurface_" +" has a mechanism to ease this inconvenience: automatic updates using" +" fingerprints.\n" msgstr "" #. type: Plain text -#: user-manual.txt:1846 +#: user-manual.txt:1851 #, no-wrap msgid "" -"When a photo is loaded into _Subsurface_, a fingerprint for the image is calculated and stored with the\n" -" other reference information for that photo. After moving a photo collection (that has already been loaded\n" -" into _Subsurface_) to a different directory, disk or computer, _Subsurface_ can:\n" +"When a photo is loaded into _Subsurface_, a fingerprint for the image is" +" calculated and stored with the\n" +" other reference information for that photo. After moving a photo collection" +" (that has already been loaded\n" +" into _Subsurface_) to a different directory, disk or computer, _Subsurface_" +" can:\n" msgstr "" #. type: Plain text -#: user-manual.txt:1848 +#: user-manual.txt:1853 msgid "" "look through a particular directory (and all its subdirectories recursively) " "where photos have been moved to," msgstr "" #. type: Plain text -#: user-manual.txt:1849 +#: user-manual.txt:1854 msgid "calculate fingerprints for all photos in this directory, and" msgstr "" #. type: Plain text -#: user-manual.txt:1852 +#: user-manual.txt:1857 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 " @@ -3676,23 +3812,27 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1857 +#: user-manual.txt:1862 #, no-wrap msgid "" -"This is done by selecting from the Main Menu: _File -> Find moved images_. This brings up a window within\n" -" which the NEW directory of the photos needs to be specified. Select the appropriate directory and click\n" -" the _Scan_ button towards the bottom right of the panel. The process may require several minutes to\n" -" complete, after which _Subsurface_ will show the appropriate photographs when a particular dive is opened.\n" +"This is done by selecting from the Main Menu: _File -> Find moved" +" images_. This brings up a window within\n" +" which the NEW directory of the photos needs to be specified. Select the" +" appropriate directory and click\n" +" the _Scan_ button towards the bottom right of the panel. The process may" +" require several minutes to\n" +" complete, after which _Subsurface_ will show the appropriate photographs" +" when a particular dive is opened.\n" msgstr "" #. type: delimited block * -#: user-manual.txt:1862 +#: user-manual.txt:1867 #, no-wrap msgid "*Upgrading legacy photo collections without fingerprints*\n" msgstr "" #. type: delimited block * -#: user-manual.txt:1867 +#: user-manual.txt:1872 msgid "" "_Subsurface_ automatically calculates fingerprints for all images that it " "can access. When manipulating images, ensure that all the images associated " @@ -3700,47 +3840,47 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:1869 +#: user-manual.txt:1874 msgid "" "_Subsurface_ automatically checks and, if necessary, updates the " "fingerprints associated with a single dive if:" msgstr "" #. type: delimited block * -#: user-manual.txt:1871 +#: user-manual.txt:1876 msgid "" "The images associated with that dive are visible as thumbnails on the *Dive " "Profile*." msgstr "" #. type: delimited block * -#: user-manual.txt:1873 +#: user-manual.txt:1878 msgid "" "If you edit anything in the *Notes* panel and save the edits by selecting " "_Apply changes_." msgstr "" #. type: Title === -#: user-manual.txt:1876 +#: user-manual.txt:1881 #, no-wrap msgid "Logging special types of dives" msgstr "" #. type: Plain text -#: user-manual.txt:1879 +#: user-manual.txt:1884 msgid "" "This section gives examples of the versatility of _Subsurface_ as a dive " "logging tool." msgstr "" #. type: Title ==== -#: user-manual.txt:1882 +#: user-manual.txt:1887 #, no-wrap msgid "Multicylinder dives" msgstr "" #. type: Plain text -#: user-manual.txt:1889 +#: user-manual.txt:1894 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 " @@ -3752,40 +3892,50 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1893 +#: user-manual.txt:1898 #, no-wrap msgid "" -"*Describe the cylinders used during the dive* This is performed in the *Equipment tab* of\n" -"the *Info* panel, as xref:cylinder_definitions[described above]. Enter the cylinders one by one,\n" +"*Describe the cylinders used during the dive* This is performed in the" +" *Equipment tab* of\n" +"the *Info* panel, as xref:cylinder_definitions[described above]. Enter the" +" cylinders one by one,\n" "specifying its size and pressure, as well as the gas composition within it.\n" msgstr "" #. type: Plain text -#: user-manual.txt:1899 +#: user-manual.txt:1904 #, no-wrap msgid "" -"*Record the times at which the switch from one cylinder to another was done:* This is information\n" -"tracked by some dive computers (provided the diver indicated these changes to the dive computer\n" -"by pressing specific buttons). If the dive computer does not provide the information, the diver has to\n" -"record these changes using a different method, e.g. writing it on a slate or by creating a bookmark on the dive\n" +"*Record the times at which the switch from one cylinder to another was done:*" +" This is information\n" +"tracked by some dive computers (provided the diver indicated these changes to" +" the dive computer\n" +"by pressing specific buttons). If the dive computer does not provide the" +" information, the diver has to\n" +"record these changes using a different method, e.g. writing it on a slate or" +" by creating a bookmark on the dive\n" "computer.\n" msgstr "" #. type: Plain text -#: user-manual.txt:1907 +#: user-manual.txt:1912 #, no-wrap msgid "" "*Record the cylinder changes on the dive profile*: If the latter option\n" -"was followed, the diver needs to indicate the gas change event by right-clicking at the appropriate point\n" -"in time on the *Dive Profile* panel and indicating the cylinder to which the change was made. After\n" -"right-clicking, follow the context menu to \"Add gas change\" and select the appropriate cylinder from\n" +"was followed, the diver needs to indicate the gas change event by" +" right-clicking at the appropriate point\n" +"in time on the *Dive Profile* panel and indicating the cylinder to which the" +" change was made. After\n" +"right-clicking, follow the context menu to \"Add gas change\" and select the" +" appropriate cylinder from\n" "those defined during the first step, above (see image below). If the\n" -"*tank bar* button in the toolbar has been activated, the cylinder switches are also indicated in the\n" +"*tank bar* button in the toolbar has been activated, the cylinder switches" +" are also indicated in the\n" "tank bar (image below).\n" msgstr "" #. type: Plain text -#: user-manual.txt:1911 +#: user-manual.txt:1916 msgid "" "When this is complete, _Subsurface_ indicates the appropriate use of " "cylinders in the dive profile. Below is a two-cylinder dive, starting off " @@ -3794,19 +3944,19 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1912 +#: user-manual.txt:1917 #, no-wrap msgid "images/multicylinder_dive.jpg" msgstr "images/multicylinder_dive.jpg" #. type: Title ==== -#: user-manual.txt:1914 +#: user-manual.txt:1919 #, no-wrap msgid "Sidemount dives" msgstr "" #. type: Plain text -#: user-manual.txt:1920 +#: user-manual.txt:1925 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 " @@ -3816,92 +3966,110 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1929 +#: user-manual.txt:1934 #, no-wrap msgid "" -"*During the dive, record cylinder switch events*. Since sidemount diving normally involves two\n" -"cylinders with air or with the same gas mixture, _Subsurface_ distinguishes between these different\n" -"cylinders. In contrast, many dive computers that allow gas switching only distinguish between different\n" -"_gases_ used, not among different _cylinders_ used. This means when sidemount dives are downloaded\n" -"from these dive computers, the switching event between cylinders with the same gas is not downloaded. This may mean\n" -"that a diver may have to keep a written log of cylinder switch times using a slate, or (if the dive computer\n" -"has the capability) marking each cylinder switch with a bookmark that can be retrieved later. Returning\n" -"from a dive with the times of cylinder changes is the only tedious part of logging sidemount dives.\n" +"*During the dive, record cylinder switch events*. Since sidemount diving" +" normally involves two\n" +"cylinders with air or with the same gas mixture, _Subsurface_ distinguishes" +" between these different\n" +"cylinders. In contrast, many dive computers that allow gas switching only" +" distinguish between different\n" +"_gases_ used, not among different _cylinders_ used. This means when sidemount" +" dives are downloaded\n" +"from these dive computers, the switching event between cylinders with the" +" same gas is not downloaded. This may mean\n" +"that a diver may have to keep a written log of cylinder switch times using a" +" slate, or (if the dive computer\n" +"has the capability) marking each cylinder switch with a bookmark that can be" +" retrieved later. Returning\n" +"from a dive with the times of cylinder changes is the only tedious part of" +" logging sidemount dives.\n" msgstr "" #. type: Plain text -#: user-manual.txt:1932 +#: user-manual.txt:1937 #, no-wrap msgid "" -"*Within _Subsurface_ describe the cylinders used during the dive*. The diver needs to provide the\n" -"specifications of the different cylinders, using the *Equipment* tab of the *Info Panel* (see\n" +"*Within _Subsurface_ describe the cylinders used during the dive*. The diver" +" needs to provide the\n" +"specifications of the different cylinders, using the *Equipment* tab of the" +" *Info Panel* (see\n" "image below where two 12 litre cylinders were used).\n" msgstr "" #. type: Plain text -#: user-manual.txt:1942 -#, no-wrap -msgid "" -"*Indicate cylinder change events on the _Subsurface_ dive profile*. Once the dive log has been imported\n" -"from a dive computer into _Subsurface_, the cylinder switch events need to be shown on the dive profile.\n" -"Cylinder changes are recorded by right-clicking at the appropriate point on the dive profile, then\n" -"selecting _Add gas change_. A list of the appropriate cylinders is shown with the\n" -"currently used cylinder greyed out. In the image below Tank 1 is greyed out, leaving only Tank 2\n" -"to be selected. Select the appropriate cylinder. The cylinder change is then shown on the dive\n" -"profile with a cylinder symbol. If the *Tank Bar* is activated using the toolbar to the left of the\n" -"profile, then the cylinder change is also shown on the Tank Bar (see image below). After all\n" -"the cylinder change events have been recorded on the dive profile, the correct cylinder pressures\n" +#: user-manual.txt:1947 +#, no-wrap +msgid "" +"*Indicate cylinder change events on the _Subsurface_ dive profile*. Once the" +" dive log has been imported\n" +"from a dive computer into _Subsurface_, the cylinder switch events need to be" +" shown on the dive profile.\n" +"Cylinder changes are recorded by right-clicking at the appropriate point on" +" the dive profile, then\n" +"selecting _Add gas change_. A list of the appropriate cylinders is shown with" +" the\n" +"currently used cylinder greyed out. In the image below Tank 1 is greyed out," +" leaving only Tank 2\n" +"to be selected. Select the appropriate cylinder. The cylinder change is then" +" shown on the dive\n" +"profile with a cylinder symbol. If the *Tank Bar* is activated using the" +" toolbar to the left of the\n" +"profile, then the cylinder change is also shown on the Tank Bar (see image" +" below). After all\n" +"the cylinder change events have been recorded on the dive profile, the" +" correct cylinder pressures\n" "for both cylinders are shown on the dive profile, as in the image below.\n" msgstr "" #. type: Target for macro image -#: user-manual.txt:1943 +#: user-manual.txt:1948 #, no-wrap msgid "images/sidemount1.jpg" msgstr "images/sidemount1.jpg" #. type: Title ==== -#: user-manual.txt:1946 +#: user-manual.txt:1951 #, no-wrap -msgid "Semi-closed circuit rebreather (SCR) dives" +msgid "Passive semi-closed circuit rebreather (pSCR) dives" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:1948 +#: user-manual.txt:1953 #, no-wrap msgid "images/halcyon_RB80.jpg" msgstr "images/halcyon_RB80.jpg" #. type: Plain text -#: user-manual.txt:1958 +#: user-manual.txt:1963 msgid "" "Passive semi-closed rebreathers (pSCR) are a technical advance in diving " "equipment that recirculates the breathing gas a diver uses, while removing " "carbon dioxide from the exhaled gas. While a small amount (typically a " "tenth) of the exhaled breathing gas is released into the water, a small " -"amount of fresh gas is released from the back gas cylinder (typically " -"containing nitrox). A diver using a single cylinder of breathing gas can " -"therefore dive for much longer periods than using a recreational open-" -"circuit configuration. With pSCR equipment, a very small amount of breathing " -"gas is released every time the diver inhales. With active SCR (aSCR) " -"equipment, in contrast, a small amount of breathing gas is released " -"continuously from the back cylinder." +"amount of fresh gas is released from the driving gas cylinder. A diver " +"using a single cylinder of breathing gas can therefore dive for much longer " +"periods than using a recreational open-circuit configuration. With pSCR " +"equipment, a very small amount of breathing gas is released every time the " +"diver inhales. With active SCR (aSCR) equipment, in contrast, a small amount " +"of breathing gas is released continuously from the driving cylinder." msgstr "" #. type: Plain text -#: user-manual.txt:1960 +#: user-manual.txt:1965 msgid "" "To log pSCR dives, no special procedures are required. Use the normal steps " "outlined above:" msgstr "" #. type: Plain text -#: user-manual.txt:1962 +#: user-manual.txt:1967 msgid "Select pSCR in the _Dive Mode_ dropdown list on the *Info* panel." msgstr "" #. type: Plain text -#: user-manual.txt:1966 +#: user-manual.txt:1971 msgid "" "pSCR diving often involves gas changes, requiring an additional cylinder. " "Define all the appropriate cylinders as described above and indicate the " @@ -3910,35 +4078,35 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1971 +#: user-manual.txt:1976 msgid "" "If a pSCR _Dive Mode_ has been selected, the dive ceiling for that is " "adjusted for the oxygen drop across the mouthpiece, which often requires " "longer decompression periods. Below is a dive profile of a pSCR dive using " -"EAN36 on the back cylinder and oxygen for decompression. Note that this dive " -"lasted over two hours." +"EAN36 as bottom gas and oxygen for decompression. Note that this dive lasted " +"over two hours." msgstr "" #. type: Target for macro image -#: user-manual.txt:1972 +#: user-manual.txt:1977 #, no-wrap msgid "images/pSCR_profile.jpg" msgstr "images/pSCR_profile.jpg" #. type: Title ==== -#: user-manual.txt:1977 +#: user-manual.txt:1982 #, no-wrap msgid "Closed circuit rebreather (CCR) dives" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:1979 +#: user-manual.txt:1984 #, no-wrap msgid "images/APD.jpg" msgstr "images/APD.jpg" #. type: Plain text -#: user-manual.txt:1984 +#: user-manual.txt:1989 msgid "" "Closed system rebreathers use advanced technology to recirculate gas that " "has been breathed. They also do two things to maintain a breathable oxygen " @@ -3946,12 +4114,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1985 +#: user-manual.txt:1990 msgid "remove carbon dioxide from the exhaled gas" msgstr "" #. type: Plain text -#: user-manual.txt:1994 +#: user-manual.txt:1999 msgid "" "regulate the oxygen concentration to remain within safe diving limits. The " "CCR interface of _Subsurface_ is currently experimental and under active " @@ -3965,19 +4133,20 @@ msgid "" msgstr "" #. type: Title ===== -#: user-manual.txt:1995 +#: user-manual.txt:2000 #, no-wrap msgid "Import a CCR dive" msgstr "" #. type: Plain text -#: user-manual.txt:2012 +#: user-manual.txt:2017 msgid "" "See the section dealing with xref:S_ImportingAlienDiveLogs[Importing dive " "information from other digital sources]. CCR dive data are currently " "obtained from the proprietary software provided when purchasing CCR dice " "equipment. See " -"<<_appendix_b_dive_computer_specific_information_for_importing_dive_information," +"<<_appendix_b_dive_computer_specific_information_for_importing_dive_informatio" +"n," "Appendix B>> for more complete information. Use that software to download " "the dive data into a known directory. From the main menu of _Subsurface_, " "select _Import -> Import log files_ to bring up the xref:" @@ -3994,13 +4163,13 @@ msgid "" msgstr "" #. type: Title ===== -#: user-manual.txt:2013 +#: user-manual.txt:2018 #, no-wrap msgid "Displayed information for a CCR dive" msgstr "" #. type: Plain text -#: user-manual.txt:2023 +#: user-manual.txt:2028 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 " @@ -4014,12 +4183,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2025 +#: user-manual.txt:2030 msgid "For TWO O~2~ sensors the mean value of the two sensors are given." msgstr "" #. type: Plain text -#: user-manual.txt:2029 +#: user-manual.txt:2034 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 " @@ -4028,37 +4197,37 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2031 +#: user-manual.txt:2036 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:2033 +#: user-manual.txt:2038 msgid "The mean pO~2~ of the sensors is indicated with a green line," msgstr "" #. type: Plain text -#: user-manual.txt:2041 +#: user-manual.txt:2046 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 " "turned on by checking the appropriate boxes in the _Preferences_ panel " "(accessible by selecting xref:S_CCR_options[_File -> Preferences -> " -"Graph_]). This part of the _Preferences_ panel is shown in the image below, " -"representing two checkboxes that modify the display of pO~2~ when the " +"Profile_]). This part of the _Preferences_ panel is shown in the image " +"below, representing two checkboxes that modify the display of pO~2~ when the " "appropriate toolbar button on the Dive Profile has been checked." msgstr "" #. type: Target for macro image -#: user-manual.txt:2042 +#: user-manual.txt:2047 #, no-wrap msgid "images/CCR_preferences_f20.jpg" msgstr "images/CCR_preferences_f20.jpg" #. type: Plain text -#: user-manual.txt:2049 +#: user-manual.txt:2054 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 " @@ -4069,13 +4238,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2050 +#: user-manual.txt:2055 #, no-wrap msgid "images/CCR_setpoint_f20.jpg" msgstr "images/CCR_setpoint_f20.jpg" #. type: Plain text -#: user-manual.txt:2054 +#: user-manual.txt:2059 msgid "" "The second checkbox allows the display of the data from each individual " "oxygen sensor of the CCR equipment. The data for each sensor is colour-coded " @@ -4083,22 +4252,22 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2056 +#: user-manual.txt:2061 msgid "Sensor 1: grey" msgstr "" #. type: Plain text -#: user-manual.txt:2057 +#: user-manual.txt:2062 msgid "Sensor 2: blue" msgstr "" #. type: Plain text -#: user-manual.txt:2058 +#: user-manual.txt:2063 msgid "Sensor 3: brown" msgstr "" #. type: Plain text -#: user-manual.txt:2062 +#: user-manual.txt:2067 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 " @@ -4106,13 +4275,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2063 +#: user-manual.txt:2068 #, no-wrap msgid "images/CCR_sensor_data_f20.jpg" msgstr "images/CCR_sensor_data_f20.jpg" #. type: Plain text -#: user-manual.txt:2068 +#: user-manual.txt:2073 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, " @@ -4120,7 +4289,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2072 +#: user-manual.txt:2077 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 " @@ -4129,7 +4298,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2080 +#: user-manual.txt:2085 msgid "" "_Cylinder pressures_: Some CCR dive computers like the Poseidon MkVI record " "the pressures of the oxygen and diluent cylinders. The pressures of these " @@ -4142,13 +4311,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2081 +#: user-manual.txt:2086 #, no-wrap msgid "images/CCR_dive_profile_f22.jpg" msgstr "images/CCR_dive_profile_f22.jpg" #. type: Plain text -#: user-manual.txt:2086 +#: user-manual.txt:2091 msgid "" "_Equipment-specific information_: Equipment-specific information gathered by " "_Subsurface_ is shown in the xref:S_ExtraDataTab[Extra data tab]. This may " @@ -4156,7 +4325,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2092 +#: user-manual.txt:2097 msgid "" "The deco ceiling calculated by Subsurface is not very accurate because the " "precise pressure of nitrogen in the loop can usually not be determined from " @@ -4168,49 +4337,50 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2093 user-manual.txt:2436 +#: user-manual.txt:2098 user-manual.txt:2442 #, no-wrap msgid "images/icons/cceiling.jpg" msgstr "images/icons/cceiling.jpg" #. type: Plain text -#: user-manual.txt:2098 +#: user-manual.txt:2103 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 -> " -"Preferences -> Graph_. Below is a dive profile indicating the dive computer-" -"generated deco ceiling:" +"Preferences -> Profile_. Below is a dive profile indicating the dive " +"computer-generated deco ceiling:" msgstr "" #. type: Target for macro image -#: user-manual.txt:2099 +#: user-manual.txt:2104 #, no-wrap msgid "images/CCR_dive_ceilingF22.jpg" msgstr "images/CCR_dive_ceilingF22.jpg" #. type: Plain text -#: user-manual.txt:2103 +#: user-manual.txt:2108 msgid "" "More equipment-specific information for downloading CCR dive logs for " "Poseidon MkVI and APD equipment can be found in xref:" -"_appendix_b_dive_computer_specific_information_for_importing_dive_information[Appendix " +"_appendix_b_dive_computer_specific_information_for_importing_dive_information[" +"Appendix " "B]." msgstr "" #. type: Title == -#: user-manual.txt:2104 +#: user-manual.txt:2109 #, no-wrap msgid "Obtaining more information about dives entered into the logbook" msgstr "" #. type: Title === -#: user-manual.txt:2106 +#: user-manual.txt:2111 #, no-wrap msgid "The *Info* tab (for individual dives)" msgstr "" #. type: Plain text -#: user-manual.txt:2113 +#: user-manual.txt:2118 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 " @@ -4220,7 +4390,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2120 +#: user-manual.txt:2125 msgid "" "Gas consumption and SAC calculations: _Subsurface_ calculates SAC and Gas " "consumption taking in account gas incompressibility, particularly at tank " @@ -4229,13 +4399,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:2122 +#: user-manual.txt:2127 #, no-wrap msgid "The *Extra Data* tab (usually for individual dives)" msgstr "" #. type: Plain text -#: user-manual.txt:2130 +#: user-manual.txt:2135 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 " @@ -4247,19 +4417,19 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2131 +#: user-manual.txt:2136 #, no-wrap msgid "images/ExtraDataTab_f20.jpg" msgstr "images/ExtraDataTab_f20.jpg" #. type: Title === -#: user-manual.txt:2133 +#: user-manual.txt:2138 #, no-wrap msgid "The *Stats* tab (for groups of dives)" msgstr "" #. type: Plain text -#: user-manual.txt:2144 +#: user-manual.txt:2149 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 " @@ -4272,19 +4442,19 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:2146 +#: user-manual.txt:2151 #, no-wrap msgid "The *Dive Profile*" msgstr "" #. type: Target for macro image -#: user-manual.txt:2148 +#: user-manual.txt:2153 #, no-wrap msgid "images/Profile2.jpg" msgstr "images/Profile2.jpg" #. type: Plain text -#: user-manual.txt:2159 +#: user-manual.txt:2164 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 " @@ -4297,7 +4467,7 @@ msgid "" msgstr "" #. type: delimited block | -#: user-manual.txt:2166 +#: user-manual.txt:2171 #, no-wrap msgid "" "|*Color*|*Descent speed (m/min)*|*Ascent speed (m/min)*\n" @@ -4315,7 +4485,7 @@ msgstr "" "|Vert foncé|< 1.5|< 1.5\n" #. type: Plain text -#: user-manual.txt:2171 +#: user-manual.txt:2176 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. " @@ -4324,13 +4494,13 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2172 +#: user-manual.txt:2177 #, no-wrap msgid "images/icons/scale.jpg" msgstr "images/icons/scale.jpg" #. type: Plain text -#: user-manual.txt:2177 +#: user-manual.txt:2182 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 " @@ -4339,7 +4509,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2180 +#: user-manual.txt:2185 #, no-wrap msgid "" "*Water temperature* is shown as a blue line with temperature values\n" @@ -4347,32 +4517,30 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2182 +#: user-manual.txt:2187 #, no-wrap msgid "The *Information Box*" msgstr "" #. type: Plain text -#: user-manual.txt:2191 +#: user-manual.txt:2194 msgid "" "The Information box displays a large range of information about the dive " "profile. Normally the Information Box is located to the top left of the " -"*Dive Profile* panel. If the mouse points outside of the *Dive Profile* " -"panel, then only the top line of the Information Box is visible (see left-" -"hand part of figure (*A*) below). The Information Box can be moved around in " -"the *Dive Profile* panel by click-dragging it with the mouse so that it is " -"not obstructing important detail. The position of the Information Box is " -"saved and used again during subsequent dive analyses." +"*Dive Profile* panel. The Information Box can be moved around in the *Dive " +"Profile* panel by click-dragging it with the mouse so that it is not " +"obstructing important detail. The position of the Information Box is saved " +"and used again during subsequent dive analyses." msgstr "" #. type: Target for macro image -#: user-manual.txt:2192 +#: user-manual.txt:2195 #, no-wrap msgid "images/InfoBox2.jpg" msgstr "images/InfoBox2.jpg" #. type: Plain text -#: user-manual.txt:2208 +#: user-manual.txt:2211 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 " @@ -4385,38 +4553,39 @@ msgid "" "dive (indicated by a @), depth, cylinder pressure (P), temperature, ascent/" "descent rate, surface air consumption (SAC), oxygen partial pressure, " "maximum operating depth, equivalent air depth (EAD), equivalent narcotic " -"depth (END), equivalent air density depth (EADD), decompression requirements " -"at that instant in time (Deco), time to surface (TTS), the calculated " -"ceiling, as well as of the statistics in the Information Box, shown as four " -"buttons on the left of the profile panel. These are:" +"depth (END), equivalent air density depth (EADD, also as gas density in g/" +"l), decompression requirements at that instant in time (Deco), time to " +"surface (TTS), the calculated ceiling, as well as of the statistics in the " +"Information Box, shown as four buttons on the left of the profile panel. " +"These are:" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2209 +#: user-manual.txt:2212 #, no-wrap msgid "images/icons/MOD.jpg" msgstr "images/icons/MOD.jpg" #. type: Plain text -#: user-manual.txt:2216 +#: user-manual.txt:2219 msgid "" "Show the *Maximum Operating Depth (MOD)* of the dive, given the gas mixture " "used. MOD is dependent on the oxygen concentration in the breathing gas. " "For air (21% oxygen) it is around 57 m if a maximum pO~2~ of 1.4 is " "specified in the *Preferences* section (select _File -> Preferences -> " -"Graph_ and edit the text box _pO~2~ in calculating MOD_. When diving below " -"the MOD there is a markedly increased risk of exposure to the dangers of " -"oxygen toxicity." +"Profile_ and edit the text box _pO~2~ in calculating MOD_. When diving " +"below the MOD there is a markedly increased risk of exposure to the dangers " +"of oxygen toxicity." msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2217 +#: user-manual.txt:2220 #, no-wrap msgid "images/icons/NDL.jpg" msgstr "images/icons/NDL.jpg" #. type: Plain text -#: user-manual.txt:2229 +#: user-manual.txt:2231 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 " @@ -4424,21 +4593,20 @@ msgid "" "ascent ceiling appears). Once a diver has exceeded the NDL and decompression " "is required (that is, there is an ascent ceiling above the diver) then TTS " "gives the number of minutes required before the diver can surface. TTS " -"includes ascent time as well as decompression time. TTS is calculated " -"assuming an ascent surface air consumption (SAC) for the gas currently used. " -"Even if the profile contains several gas switches, TTS at a specific moment " -"during the dive is calculated using the current gas. TTS longer than 2 " -"hours is not accurately calculated and Subsurface only indicates _TTS > 2h_." +"includes ascent time as well as decompression time. Even if the profile " +"contains several gas switches, TTS at a specific moment during the dive is " +"calculated using the current gas. TTS longer than 2 hours is not accurately " +"calculated and Subsurface only indicates _TTS > 2h_." msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2230 +#: user-manual.txt:2232 #, no-wrap msgid "images/icons/SAC.jpg" msgstr "images/icons/SAC.jpg" #. type: Plain text -#: user-manual.txt:2238 +#: user-manual.txt:2240 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 " @@ -4450,13 +4618,13 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2239 +#: user-manual.txt:2241 #, no-wrap msgid "images/icons/EAD.jpg" msgstr "images/icons/EAD.jpg" #. type: Plain text -#: user-manual.txt:2254 +#: user-manual.txt:2256 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 " @@ -4472,20 +4640,20 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2256 +#: user-manual.txt:2258 msgid "" "Figure (*B*) above shows an information box with a nearly complete set of " "data." msgstr "" #. type: Title ===== -#: user-manual.txt:2259 +#: user-manual.txt:2261 #, no-wrap msgid "The Gas Pressure Bar Graph" msgstr "" #. type: Plain text -#: user-manual.txt:2266 +#: user-manual.txt:2268 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 " @@ -4496,13 +4664,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2267 +#: user-manual.txt:2269 #, no-wrap msgid "images/GasPressureBarGraph.jpg" msgstr "images/GasPressureBarGraph.jpg" #. type: Plain text -#: user-manual.txt:2273 +#: user-manual.txt:2275 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 " @@ -4512,7 +4680,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2279 +#: user-manual.txt:2281 msgid "" "The horizontal black line underneath the light green margin indicates the " "equilibrium pressure of the INERT gases inhaled by the diver, usually " @@ -4523,7 +4691,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2283 +#: user-manual.txt:2285 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 " @@ -4531,17 +4699,17 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2289 +#: user-manual.txt:2291 msgid "" "The top black horizontal line indicates the inert gas pressure limit " "determined by the gradient factor that applies to the depth of the diver at " "the particular point on the *Dive Profile*. The gradient factor shown is an " -"interpolation between the GFLow and GFHigh values specified in the _Graph_ " +"interpolation between the GFLow and GFHigh values specified in the _Profile_ " "tab of the *Preferences Panel* of _Subsurface_." msgstr "" #. type: Plain text -#: user-manual.txt:2293 +#: user-manual.txt:2295 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 " @@ -4550,7 +4718,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2296 +#: user-manual.txt:2298 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 " @@ -4558,7 +4726,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2299 +#: user-manual.txt:2301 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 " @@ -4566,7 +4734,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2302 +#: user-manual.txt:2304 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 " @@ -4574,7 +4742,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2307 +#: user-manual.txt:2309 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 " @@ -4584,7 +4752,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2313 +#: user-manual.txt:2315 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 " @@ -4595,7 +4763,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2318 +#: user-manual.txt:2320 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 " @@ -4605,13 +4773,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2319 +#: user-manual.txt:2321 #, no-wrap msgid "Computer-reported events during dive" msgstr "" #. type: Plain text -#: user-manual.txt:2331 +#: user-manual.txt:2333 msgid "" "Many dive computers record events during a dive. For instance, most dive " "computers report alarms relating to high partial pressures of oxygen, to " @@ -4630,7 +4798,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2336 +#: user-manual.txt:2338 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 " @@ -4641,13 +4809,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2337 +#: user-manual.txt:2339 #, no-wrap msgid "images/profile_symbols.jpg" msgstr "images/profile_symbols.jpg" #. type: Plain text -#: user-manual.txt:2342 +#: user-manual.txt:2344 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 " @@ -4655,13 +4823,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2343 +#: user-manual.txt:2345 #, no-wrap msgid "The Profile Toolbar" msgstr "" #. type: Plain text -#: user-manual.txt:2351 +#: user-manual.txt:2353 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 " @@ -4672,44 +4840,44 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2352 +#: user-manual.txt:2354 #, no-wrap msgid "images/icons/O2.jpg" msgstr "images/icons/O2.jpg" #. type: Plain text -#: user-manual.txt:2356 +#: user-manual.txt:2358 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:2357 +#: user-manual.txt:2359 #, no-wrap msgid "images/icons/N2.jpg" msgstr "images/icons/N2.jpg" #. type: Plain text -#: user-manual.txt:2360 +#: user-manual.txt:2362 msgid "Show the partial pressure of *nitrogen* during the dive." msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2361 +#: user-manual.txt:2363 #, no-wrap msgid "images/icons/He.jpg" msgstr "images/icons/He.jpg" #. type: Plain text -#: user-manual.txt:2365 +#: user-manual.txt:2367 msgid "" "Display of the partial pressure of *helium* during the dive. This is only " "important to divers using Trimix, Helitrox or similar breathing gasses." msgstr "" #. type: Plain text -#: user-manual.txt:2378 +#: user-manual.txt:2380 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 " @@ -4723,21 +4891,29 @@ msgid "" "the diver was using less gas than average." msgstr "" +#. type: Plain text +#: user-manual.txt:2384 +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, " +"the color is a representation of the breathing gas density." +msgstr "" + #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2379 +#: user-manual.txt:2385 #, no-wrap msgid "images/icons/Heartbutton.png" msgstr "images/icons/Heartbutton.png" #. type: Plain text -#: user-manual.txt:2383 +#: user-manual.txt:2389 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:2389 +#: user-manual.txt:2395 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 " @@ -4747,19 +4923,19 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2390 +#: user-manual.txt:2396 #, no-wrap msgid "images/MeasuringBar.png" msgstr "images/MeasuringBar.png" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2392 +#: user-manual.txt:2398 #, no-wrap msgid "images/icons/ruler.jpg" msgstr "images/icons/ruler.jpg" #. type: Plain text -#: user-manual.txt:2400 +#: user-manual.txt:2406 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 " @@ -4769,13 +4945,13 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2401 +#: user-manual.txt:2407 #, no-wrap msgid "images/icons/ShowPhotos.png" msgstr "images/icons/ShowPhotos.png" #. type: Plain text -#: user-manual.txt:2408 +#: user-manual.txt:2414 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 " @@ -4784,7 +4960,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2435 +#: user-manual.txt:2441 msgid "" "The profile can also include the dive computer reported *ceiling* (more " "precisely, the deepest deco stop that the dive computer calculated for each " @@ -4813,7 +4989,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2441 +#: user-manual.txt:2447 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 " @@ -4821,13 +4997,13 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2442 +#: user-manual.txt:2448 #, no-wrap msgid "images/icons/ceiling1.jpg" msgstr "images/icons/ceiling1.jpg" #. type: Plain text -#: user-manual.txt:2447 +#: user-manual.txt:2453 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 " @@ -4836,13 +5012,13 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2448 +#: user-manual.txt:2454 #, no-wrap msgid "images/icons/ceiling2.jpg" msgstr "images/icons/ceiling2.jpg" #. type: Plain text -#: user-manual.txt:2452 +#: user-manual.txt:2458 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 " @@ -4850,26 +5026,26 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2453 +#: user-manual.txt:2459 #, no-wrap msgid "images/icons/ceiling3.jpg" msgstr "images/icons/ceiling3.jpg" #. type: delimited block = -#: user-manual.txt:2458 +#: user-manual.txt:2464 msgid "" "If, in addition, the *3m increments* button on the Profile Panel is clicked, " "then the ceiling is indicated in 3 m increments (*C* in figure below)." msgstr "" #. type: Target for macro image -#: user-manual.txt:2459 +#: user-manual.txt:2465 #, no-wrap msgid "images/Ceilings2.jpg" msgstr "images/Ceilings2.jpg" #. type: delimited block = -#: user-manual.txt:2462 +#: user-manual.txt:2468 msgid "" "Gradient Factor settings strongly affect the calculated ceilings and their " "depths. For more information about Gradient factors, see the section on xref:" @@ -4882,25 +5058,35 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2464 user-manual.txt:3324 +#: user-manual.txt:2470 user-manual.txt:3309 #, no-wrap -msgid " *** http://www.tek-dive.com/portal/upload/M-Values.pdf[Understanding M-values by Erik Baker, _Immersed_ Vol. 3, No. 3.]\n" -msgstr " *** http://www.tek-dive.com/portal/upload/M-Values.pdf[Understanding M-values by Erik Baker, _Immersed_ Vol. 3, No. 3.]\n" +msgid "" +" *** http://www.tek-dive.com/portal/upload/M-Values.pdf[Understanding" +" M-values by Erik Baker, _Immersed_ Vol. 3, No. 3.]\n" +msgstr "" +" *** http://www.tek-dive.com/portal/upload/M-Values.pdf[Understanding" +" M-values by Erik Baker, _Immersed_ Vol. 3, No. 3.]\n" #. type: Plain text -#: user-manual.txt:2466 user-manual.txt:3326 +#: user-manual.txt:2472 user-manual.txt:3311 #, 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" +msgid "" +" *** link:http://www.rebreatherworld.com/general-and-new-to-rebreather-article" +"s/5037-gradient-factors-for-dummies.html[Gradient factors for dummies, by" +" Kevin Watts]\n" +msgstr "" +" *** link:http://www.rebreatherworld.com/general-and-new-to-rebreather-article" +"s/5037-gradient-factors-for-dummies.html[Gradient factors for dummies, by" +" Kevin Watts]\n" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2470 +#: user-manual.txt:2476 #, no-wrap msgid "images/icons/ShowCylindersButton.jpg" msgstr "images/icons/ShowCylindersButton.jpg" #. type: Plain text -#: user-manual.txt:2476 +#: user-manual.txt:2482 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 " @@ -4911,19 +5097,19 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2477 +#: user-manual.txt:2483 #, no-wrap msgid "images/ShowCylinders_f20.jpg" msgstr "images/ShowCylinders_f20.jpg" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2481 +#: user-manual.txt:2487 #, no-wrap msgid "images/icons/heatmap.png" msgstr "images/icons/heatmap.png" #. type: delimited block = -#: user-manual.txt:2488 +#: user-manual.txt:2494 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 " @@ -4935,13 +5121,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2489 +#: user-manual.txt:2495 #, no-wrap msgid "images/Heatmap.jpg" msgstr "images/Heatmap.jpg" #. type: delimited block = -#: user-manual.txt:2497 +#: user-manual.txt:2503 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 " @@ -4954,7 +5140,7 @@ msgid "" msgstr "" #. type: delimited block = -#: user-manual.txt:2505 +#: user-manual.txt:2511 msgid "" "Image *B* shows a gradient of unique colours, spanning the whole range of " "inert gas pressures. It is possible to map the height of each of the dark " @@ -4968,7 +5154,7 @@ msgid "" msgstr "" #. type: delimited block = -#: user-manual.txt:2513 +#: user-manual.txt:2519 msgid "" "The bottom range in *B* (marked _On-gassing_) includes colours from light " "blue to black, representing tissue gas pressures below the equilibrium " @@ -4983,7 +5169,7 @@ msgid "" msgstr "" #. type: delimited block = -#: user-manual.txt:2519 +#: user-manual.txt:2525 msgid "" "The central range in *B* includes the colours from black to light green, " "when the inert gas pressure of a tissue compartment is higher than the " @@ -4994,7 +5180,7 @@ msgid "" msgstr "" #. type: delimited block = -#: user-manual.txt:2528 +#: user-manual.txt:2534 msgid "" "The top range in *B* (marked _Off-gassing_) includes colours from light " "green to red and white, repesenting tissue gas pressures above that of the " @@ -5010,7 +5196,7 @@ msgid "" msgstr "" #. type: delimited block = -#: user-manual.txt:2536 +#: user-manual.txt:2542 msgid "" "Image *C* shows the colour mapping of each of the vertical bars in *A*, the " "fast tissues (on the left in *A*) depicted at the top and the slow tissue " @@ -5022,7 +5208,7 @@ msgid "" msgstr "" #. type: delimited block = -#: user-manual.txt:2543 +#: user-manual.txt:2549 msgid "" "Image *D* is a compilation of similar colour mappings of 16 tissue " "compartments during a 10-minute period of a dive, the colours representing " @@ -5033,7 +5219,7 @@ msgid "" msgstr "" #. type: delimited block = -#: user-manual.txt:2547 +#: user-manual.txt:2553 msgid "" "The colours of the heat map are not affected by the gradient factor " "settings. This is because the heat map indicates tissue pressures relative " @@ -5042,7 +5228,7 @@ msgid "" msgstr "" #. type: delimited block = -#: user-manual.txt:2549 +#: user-manual.txt:2555 msgid "" "http://www.tek-dive.com/portal/upload/M-Values.pdf[Understanding M-values by " "Erik Baker, _Immersed_ Vol. 3, No. 3.]" @@ -5051,7 +5237,7 @@ msgstr "" "Erik Baker, _Immersed_ Vol. 3, No. 3.]" #. type: delimited block = -#: user-manual.txt:2552 +#: user-manual.txt:2558 msgid "" "Since the colours of the heat map are not affected by the gradient " "factor(s), the heat map is also applicable when using the VPM-B " @@ -5059,7 +5245,7 @@ msgid "" msgstr "" #. type: delimited block = -#: user-manual.txt:2556 +#: user-manual.txt:2562 msgid "" "The image below compares the profiles and heat maps for two planned " "decompression dives to 60m: the first using the Bühlmann decompression " @@ -5069,7 +5255,7 @@ msgid "" msgstr "" #. type: delimited block = -#: user-manual.txt:2561 +#: user-manual.txt:2567 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, " @@ -5080,7 +5266,7 @@ msgid "" msgstr "" #. type: delimited block = -#: user-manual.txt:2566 +#: user-manual.txt:2572 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 " @@ -5090,19 +5276,19 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2567 +#: user-manual.txt:2573 #, no-wrap msgid "images/tissueHeatmap.jpg" msgstr "images/tissueHeatmap.jpg" #. type: Title ==== -#: user-manual.txt:2570 +#: user-manual.txt:2576 #, no-wrap msgid "The Dive Profile context menu" msgstr "" #. type: Plain text -#: user-manual.txt:2589 +#: user-manual.txt:2595 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 " @@ -5123,19 +5309,19 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:2590 +#: user-manual.txt:2596 #, no-wrap msgid "Organizing the logbook (Manipulating groups of dives)" msgstr "" #. type: Title === -#: user-manual.txt:2593 +#: user-manual.txt:2599 #, no-wrap msgid "The Dive List context menu" msgstr "" #. type: Plain text -#: user-manual.txt:2597 +#: user-manual.txt:2603 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 " @@ -5143,30 +5329,30 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2598 +#: user-manual.txt:2604 #, no-wrap msgid "images/ContextMenu.jpg" msgstr "images/ContextMenu.jpg" #. type: Plain text -#: user-manual.txt:2601 +#: user-manual.txt:2607 msgid "The context menu is used in many functions described below." msgstr "" #. type: Title ==== -#: user-manual.txt:2603 +#: user-manual.txt:2609 #, no-wrap msgid "Customizing the columns showed in the *Dive List* panel" msgstr "" #. type: Target for macro image -#: user-manual.txt:2605 +#: user-manual.txt:2611 #, no-wrap msgid "images/DiveListOptions.jpg" msgstr "images/DiveListOptions.jpg" #. type: Plain text -#: user-manual.txt:2613 +#: user-manual.txt:2619 msgid "" "The default information in the *Dive List* includes, for each dive, " "Dive_number, Date, Rating, Dive_depth, Dive_duration and Dive_location. This " @@ -5178,7 +5364,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2618 +#: user-manual.txt:2624 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 " @@ -5186,26 +5372,26 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2619 +#: user-manual.txt:2625 #, no-wrap msgid "images/icons/duringPhoto.png" msgstr "images/icons/duringPhoto.png" #. type: Plain text -#: user-manual.txt:2622 +#: user-manual.txt:2628 msgid "" "This dive has photographs taken during the dive, typically using an " "underwater camera." msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2623 +#: user-manual.txt:2629 #, no-wrap msgid "images/icons/outsidePhoto.png" msgstr "images/icons/outsidePhoto.png" #. type: Plain text -#: user-manual.txt:2628 +#: user-manual.txt:2634 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/" @@ -5214,26 +5400,26 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2629 +#: user-manual.txt:2635 #, no-wrap msgid "images/icons/inAndOutPhoto.png" msgstr "images/icons/inAndOutPhoto.png" #. type: Plain text -#: user-manual.txt:2632 +#: user-manual.txt:2638 msgid "" "This dive has photographs taken both during the dive and immdiately before " "or after the dive." msgstr "" #. type: Title === -#: user-manual.txt:2634 +#: user-manual.txt:2640 #, no-wrap msgid "Renumbering the dives" msgstr "" #. type: Plain text -#: user-manual.txt:2646 +#: user-manual.txt:2652 msgid "" "Dives are normally numbered incrementally from non-recent dives (low " "sequence numbers) to recent dives (higher sequence numbers). Numbering of " @@ -5247,7 +5433,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2651 +#: user-manual.txt:2657 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 " @@ -5256,13 +5442,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:2653 +#: user-manual.txt:2659 #, no-wrap msgid "Grouping dives into trips and manipulating trips" msgstr "" #. type: Plain text -#: user-manual.txt:2661 +#: user-manual.txt:2667 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/" @@ -5273,13 +5459,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2662 +#: user-manual.txt:2668 #, no-wrap msgid "images/Group2.jpg" msgstr "images/Group2.jpg" #. type: Plain text -#: user-manual.txt:2668 +#: user-manual.txt:2674 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, " @@ -5288,13 +5474,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2669 +#: user-manual.txt:2675 #, no-wrap msgid "Editing the title and associated information for a particular trip" msgstr "" #. type: Plain text -#: user-manual.txt:2682 +#: user-manual.txt:2688 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 " @@ -5308,13 +5494,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2683 +#: user-manual.txt:2689 #, no-wrap msgid "Viewing the dives during a particular trip" msgstr "" #. type: Plain text -#: user-manual.txt:2688 +#: user-manual.txt:2694 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. " @@ -5322,20 +5508,6 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2689 -#, no-wrap -msgid "Collapsing or expanding dive information for different trips" -msgstr "" - -#. type: Plain text -#: user-manual.txt:2694 -msgid "" -"After selecting a particular trip in the dive list, the context menu allows " -"several options to expand or collapse dives within trips. This includes " -"expanding all trips and collapsing all trips." -msgstr "" - -#. type: Title ==== #: user-manual.txt:2695 #, no-wrap msgid "Merging dives from more than one trip into a single trip" @@ -5358,12 +5530,13 @@ msgstr "" #. type: Plain text #: user-manual.txt:2710 msgid "" -"If a trip includes ten dives, you can split this trip into two trips (trip " -"1: top 4 dives; trip 2: bottom 6 dives) by selecting and right-clicking the " -"top four dives. The resulting context menu lets the user create a new trip " -"by choosing the option *Create new trip above*. The top four dives are then " -"grouped into a separate trip. The figures below show the selection and " -"context menu on the left (A) and the completed action on the right (B):" +"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 " +"right-clicking the top four dives. The resulting context menu lets the user " +"create a new trip by choosing the option *Create new trip above*. The top " +"four dives are then grouped into a separate trip. The figures below show the " +"selection and context menu on the left (A) and the completed action on the " +"right (B):" msgstr "" #. type: Target for macro image @@ -5529,7 +5702,7 @@ msgstr "" #: user-manual.txt:2791 msgid "" "The dives in the *Dive List* panel can be filtered, selecting only some of " -"the dives based on their attributes, e.g. dive tags, dive site, dive master, " +"the dives based on their attributes, e.g. dive tags, dive site, divemaster, " "buddy or protective clothing. For instance, filtering lets you list the deep " "dives at a particular dive site, or otherwise the cave dives with a " "particular buddy." @@ -5652,9 +5825,24 @@ msgstr "images/facebook1.jpg" #. type: Plain text #: user-manual.txt:2855 +#| msgid "" +#| "Having established a login to _Facebook_, transferring a dive profile to " +#| "a _Facebook_ timeline is easy. In the _Subsurface_ *Dive Profile* panel, " +#| "highlight the dive to be transferred. Then, from the *Main Menu*, select " +#| "_Share on -> Facebook_. A dialogue box is shown, determining the amount " +#| "of additional information to be transferred with the dive profile (image " +#| "*A*, below). To transfer a dive profile to _Facebook_, the name of a " +#| "_Facebook_ album is needed. The checkboxes on the left hand side " +#| "determine how much additional information is added to the dive profile, " +#| "shown in the text box on the right hand side of the panel (image *A*, " +#| "below). Customise the message that will be posted with the dive profile " +#| "by editing any of the information. After specifying additional " +#| "information and verifying the text, select the _OK_ button that triggers " +#| "the transfer to _Facebook_. After the transfer is done, an " +#| "acknowledgement dialogue appears, indicating it was successful." msgid "" "Having established a login to _Facebook_, transferring a dive profile to a " -"_Facebook_ timeline is easy. In the _Subsurface_ *Dive Profile* panel, " +"_Facebook_ timeline is easy. In the _Subsurface_ *Dive List* panel, " "highlight the dive to be transferred. Then, from the *Main Menu*, select " "_Share on -> Facebook_. A dialogue box is shown, determining the amount of " "additional information to be transferred with the dive profile (image *A*, " @@ -5669,7 +5857,7 @@ msgid "" "successful." msgstr "" "Une fois qu'une connexion à _Facebook_ est établie, transférer un profil de " -"plongée vers _Facebook_ est facile. Dans le panneau *Profil de plongée* de " +"plongée vers _Facebook_ est facile. Dans le panneau *Liste des plongées* de " "_Subsurface_, sélectionnez la plongée à transférer. Ensuite, à partir du " "*menu principal*, sélectionnez _Partager sur -> Facebook_. Une fenêtre " "s'affiche, pour déterminer quelles informations seront transférées avec le " @@ -5713,7 +5901,8 @@ msgstr "" #: user-manual.txt:2866 #, no-wrap msgid "Export dive information to other destinations or formats" -msgstr "Exporter des informations de plongée vers d'autres destinations ou formats" +msgstr "" +"Exporter des informations de plongée vers d'autres destinations ou formats" #. type: Plain text #: user-manual.txt:2871 @@ -5851,13 +6040,18 @@ msgstr "" #: user-manual.txt:2943 #, no-wrap msgid "" -"** Subsurface Numbers: if this option is checked, the dive(s) are exported with the\n" -" numbers associated with them in Subsurface, Otherwise the dive(s) will be numbered\n" +"** Subsurface Numbers: if this option is checked, the dive(s) are exported" +" with the\n" +" numbers associated with them in Subsurface, Otherwise the dive(s) will be" +" numbered\n" " starting from 1.\n" -"** Export Yearly Statistics: if this option is checked, a yearly statistics table will\n" +"** Export Yearly Statistics: if this option is checked, a yearly statistics" +" table will\n" " be attached to the HTML exports.\n" -"** Export List only: a list of dives only (date, time, depth, duration) will be exported\n" -" and the detailed dive information, e.g. dive profile, will not be available.\n" +"** Export List only: a list of dives only (date, time, depth, duration) will" +" be exported\n" +" and the detailed dive information, e.g. dive profile, will not be" +" available.\n" msgstr "" #. type: Plain text @@ -5914,21 +6108,28 @@ msgstr "" #: user-manual.txt:2985 #, no-wrap msgid "" -"** Open the *Network Preferences* by selecting _File_ -> _Preferences_ -> _Network_.\n" -"** In the section headed _Subsurface cloud storage_, enter an email address that\n" +"** Open the *Network Preferences* by selecting _File_ -> _Preferences_ ->" +" _Network_.\n" +"** In the section headed _Subsurface cloud storage_, enter an email address" +" that\n" " _Subsurface_ can use for user registration.\n" "** Enter a novel password that _Subsurface_ will use to store the\n" " dive log in the cloud.\n" "** Click _Apply_ to send the above email address and password to the\n" -" (remote) cloud server. The server responds by sending a verification PIN to\n" -" the above email address (This is the *only* occasion that _Subsurface_ uses the\n" -" email address provided above). The *Network Preferences* dialog now has a new PIN text\n" +" (remote) cloud server. The server responds by sending a verification PIN" +" to\n" +" the above email address (This is the *only* occasion that _Subsurface_ uses" +" the\n" +" email address provided above). The *Network Preferences* dialog now has a" +" new PIN text\n" " box, not visible previously.\n" -"** Enter the PIN in the corresponding text box in the *Network Preferences* dialog\n" +"** Enter the PIN in the corresponding text box in the *Network Preferences*" +" dialog\n" "(this field is only visible while the server is waiting for email\n" "address confirmation)\n" "** Click _Apply_ again. The _Subsurface cloud storage_ account\n" -"will be marked as verified and the _Subsurface cloud storage_ service is initialised for use.\n" +"will be marked as verified and the _Subsurface cloud storage_ service is" +" initialised for use.\n" msgstr "" #. type: Title === @@ -5942,22 +6143,29 @@ msgstr "" #, no-wrap msgid "" "** Once the cloud storage has been initialized, two new items appear in the\n" -" _File_ menu of the main menu system: _Open cloud storage_ and _Save to cloud storage_.\n" +" _File_ menu of the main menu system: _Open cloud storage_ and _Save to" +" cloud storage_.\n" "These options let you load and save data to the _Subsurface\n" "cloud storage_ server.\n" -"** In the _Defaults Preferences_ tab, you can select to use the _Subsurface cloud\n" -"storage_ data as the default data file by checking the box marked _Cloud storage default file_.\n" +"** In the _Defaults Preferences_ tab, you can select to use the _Subsurface" +" cloud\n" +"storage_ data as the default data file by checking the box marked _Cloud" +" storage default file_.\n" " This means the data from\n" -"the _Subsurface cloud storage_ is loaded when _Subsurface_ starts and saved there when _Subsurface_ closes.\n" +"the _Subsurface cloud storage_ is loaded when _Subsurface_ starts and saved" +" there when _Subsurface_ closes.\n" msgstr "" #. type: Plain text #: user-manual.txt:3001 #, no-wrap msgid "" -"** _Subsurface_ keeps a local copy of the data and the cloud facility remains fully\n" -"functional even if used while disconnected to the Internet. _Subsurface_ simply synchronizes the\n" -"data with the cloud server the next time the program is used while the computer is\n" +"** _Subsurface_ keeps a local copy of the data and the cloud facility remains" +" fully\n" +"functional even if used while disconnected to the Internet. _Subsurface_" +" simply synchronizes the\n" +"data with the cloud server the next time the program is used while the" +" computer is\n" "connected to the Internet.\n" msgstr "" @@ -5992,7 +6200,7 @@ 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 " "using several of the existing facilities on the Internet. For instance " -"http://www.dropbox.com/[_Dropbox_] offers a free application that allows " +"https://www.dropbox.com/[_Dropbox_] offers a free application that allows " "files on the Dropbox servers to be seen as a local folder on a desktop " "computer." msgstr "" @@ -6016,42 +6224,14 @@ msgid "" "Internet access is available." msgstr "" -#. type: Plain text -#: user-manual.txt:3041 -msgid "" -"In this way a dive log in your _Dropbox_ folder can be accessed seamlessly " -"from the Internet and can be accessed anywhere with Internet access. " -"Currently there are no costs involved for this service. Dropbox (Windows, " -"Mac and Linux) can be installed by accessing the http://www.dropbox.com/" -"install[_Install Page on the Dropbox website_]" -msgstr "" - -#. type: Plain text -#: user-manual.txt:3047 -msgid "" -"Alternatively you can use _Dropbox_ as a way back up your dive log. To Store " -"a dive log on _Dropbox_, select _File -> Save as_ from the _Subsurface_ main " -"menu, navigate to the _Dropbox_ folder and select the _Save_ button. To " -"access the dive log in _Dropbox_, select _File -> Open Logbook_ from the " -"_Subsurface_ main menu and navigate to the dive log file in the _Dropbox_ " -"folder and select the _Open_ button." -msgstr "" - -#. type: Plain text -#: user-manual.txt:3050 -msgid "" -"Several paid services exist on the Internet (e.g. Google, Amazon) where the " -"same process could be used for the Cloud-based storage of dive logs." -msgstr "" - #. type: Title == -#: user-manual.txt:3052 +#: user-manual.txt:3037 #, no-wrap msgid "Several _Subsurface_ users on one desktop computer" msgstr "" #. type: Plain text -#: user-manual.txt:3056 +#: user-manual.txt:3041 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 " @@ -6060,89 +6240,112 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3068 -#, no-wrap -msgid "" -"*A)* If the different users of a desktop computer do not log onto the desktop/laptop under different user names\n" -" then the simplest way is for each person to use her/his own divelog file within Subsurface. In this case John\n" -" would work with the _Subsurface_ file _johns-divelog_ and Joan would use _joans-divelog_. Select\n" -" the appropriate dive log by selecting, from the *Main Menu*, _File -> Open logbook_ and then select your own\n" -" dive log file from the list of files lower down in the menu. However, a problem arises if the users\n" -" prefer different settings for _Subsurface_. For instance, one diver may prefer to see the dive ceiling in the\n" -" *Profile Panel* and photos icons in the *Dive List*, while the other may not have these preferences. In addition,\n" -" the cloud connection is normally unique for each _Subsurface_ installation and if more than one user wishes to save\n" -" dive data on the cloud, it is inconvenient to open the *Preferences* and change the user-ID data every time\n" -" the cloud is accessed. To solve these problems, launch _Subsurface_ with a _--user=<user name>_ command-line option.\n" +#: user-manual.txt:3053 +#, no-wrap +msgid "" +"*A)* If the different users of a desktop computer do not log onto the" +" desktop/laptop under different user names\n" +" then the simplest way is for each person to use her/his own divelog file" +" within Subsurface. In this case John\n" +" would work with the _Subsurface_ file _johns-divelog_ and Joan would use" +" _joans-divelog_. Select\n" +" the appropriate dive log by selecting, from the *Main Menu*, _File -> Open" +" logbook_ and then select your own\n" +" dive log file from the list of files lower down in the menu. However, a" +" problem arises if the users\n" +" prefer different settings for _Subsurface_. For instance, one diver may" +" prefer to see the dive ceiling in the\n" +" *Profile Panel* and photos icons in the *Dive List*, while the other may" +" not have these preferences. In addition,\n" +" the cloud connection is normally unique for each _Subsurface_ installation" +" and if more than one user wishes to save\n" +" dive data on the cloud, it is inconvenient to open the *Preferences* and" +" change the user-ID data every time\n" +" the cloud is accessed. To solve these problems, launch _Subsurface_ with a" +" _--user=<user name>_ command-line option.\n" " John can then activate _Subsurface_ with this command-line instruction:\n" msgstr "" #. type: Plain text -#: user-manual.txt:3070 +#: user-manual.txt:3055 #, no-wrap msgid "\tsubsurface --user=John\n" msgstr "" #. type: Plain text -#: user-manual.txt:3072 +#: user-manual.txt:3057 msgid "while Joan can launch _Subsurface_ using:" msgstr "" #. type: Plain text -#: user-manual.txt:3074 +#: user-manual.txt:3059 #, no-wrap msgid "\tsubsurface --user=Joan\n" msgstr "" #. type: Plain text -#: user-manual.txt:3082 +#: user-manual.txt:3067 #, no-wrap msgid "" -"In this case, each user's preferences, settings and cloud access information are stored separately, allowing\n" -" each diver to interact with _Subsurface_ in her/his preferred way and with individual cloud access. The above\n" -" process can be made user-friendly by creating a link/shortcut with a desktop icon that executes the above\n" -" command-line instruction. Use of the _--user=_ option therefore enables each user to create, maintain and\n" -" backup a separate dive log within a personalised user interface. This way, when each diver launches _Subsurface_,\n" -" it opens with the correct dive log as well as the appropriate display and backup preferences, and each diver\n" -" can access their own divelog on a mobile device using https://subsurface-divelog.org/documentation/subsurface-mobile-user-manual[_Subsurface-Mobile_].\n" +"In this case, each user's preferences, settings and cloud access information" +" are stored separately, allowing\n" +" each diver to interact with _Subsurface_ in her/his preferred way and with" +" individual cloud access. The above\n" +" process can be made user-friendly by creating a link/shortcut with a" +" desktop icon that executes the above\n" +" command-line instruction. Use of the _--user=_ option therefore enables" +" each user to create, maintain and\n" +" backup a separate dive log within a personalised user interface. This way," +" when each diver launches _Subsurface_,\n" +" it opens with the correct dive log as well as the appropriate display and" +" backup preferences, and each diver\n" +" can access their own divelog on a mobile device using" +" https://subsurface-divelog.org/documentation/subsurface-mobile-user-manual[_S" +"ubsurface-Mobile_].\n" msgstr "" #. type: Plain text -#: user-manual.txt:3086 +#: user-manual.txt:3071 #, no-wrap msgid "" -"*B)* On the other hand, if the users log onto the same computer using different userIDs and passwords (i.e. users each\n" -"have a separate user space), _Subsurface_ is available independently to each user and every diver automatically has a separate\n" -"user profile and settings, including unique cloud and _Subsurface-Mobile_ access.\n" +"*B)* On the other hand, if the users log onto the same computer using" +" different userIDs and passwords (i.e. users each\n" +"have a separate user space), _Subsurface_ is available independently to each" +" user and every diver automatically has a separate\n" +"user profile and settings, including unique cloud and _Subsurface-Mobile_" +" access.\n" msgstr "" #. type: Title == -#: user-manual.txt:3088 +#: user-manual.txt:3073 #, no-wrap msgid "Printing a dive log" msgstr "" #. type: Plain text -#: user-manual.txt:3092 +#: user-manual.txt:3077 #, no-wrap msgid "" -"_Subsurface_ provides a simple and flexible way to print a whole dive log or only a few selected dives.\n" -" Pre-installed templates or a custom written template can be used to choose where the data are fitted into the page.\n" +"_Subsurface_ provides a simple and flexible way to print a whole dive log or" +" only a few selected dives.\n" +" Pre-installed templates or a custom written template can be used to choose" +" where the data are fitted into the page.\n" msgstr "" #. type: Plain text -#: user-manual.txt:3094 +#: user-manual.txt:3079 msgid "Some decisions need to be made before printing:" msgstr "" #. type: Plain text -#: user-manual.txt:3097 +#: user-manual.txt:3082 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:3099 +#: user-manual.txt:3084 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 " @@ -6150,7 +6353,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3102 +#: user-manual.txt:3087 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 " @@ -6158,35 +6361,35 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:3103 user-manual.txt:4610 +#: user-manual.txt:3088 user-manual.txt:4605 #, no-wrap msgid "images/Print1_f22.jpg" msgstr "images/Print1_f22.jpg" #. type: Plain text -#: user-manual.txt:3106 +#: user-manual.txt:3091 msgid "Under _Print type_ select one of two options:" msgstr "" #. type: Plain text -#: user-manual.txt:3108 +#: user-manual.txt:3093 msgid "" "_Dive list print_: Print dives from the *Dive List* panel with profiles and " "other information." msgstr "" #. type: Plain text -#: user-manual.txt:3109 +#: user-manual.txt:3094 msgid "_Statistics print_: Print yearly statistics of the dives." msgstr "" #. type: Plain text -#: user-manual.txt:3111 +#: user-manual.txt:3096 msgid "Under _Print options_ select:" msgstr "" #. type: Plain text -#: user-manual.txt:3116 +#: user-manual.txt:3101 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 " @@ -6194,73 +6397,73 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3118 +#: user-manual.txt:3103 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:3121 +#: user-manual.txt:3106 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:3123 +#: user-manual.txt:3108 msgid "_Table_: This prints a summary table of all dives selected (see below)." msgstr "" #. type: Target for macro image -#: user-manual.txt:3124 +#: user-manual.txt:3109 #, no-wrap msgid "images/Print_summarylist_f22.jpg" msgstr "images/Print_summarylist_f22.jpg" #. type: Plain text -#: user-manual.txt:3127 +#: user-manual.txt:3112 msgid "" "_Flow layout_: Print the text associated with each dive without printing the " "dive profiles" msgstr "" #. type: Plain text -#: user-manual.txt:3128 +#: user-manual.txt:3113 msgid "of each dive (see below):" msgstr "" #. type: Target for macro image -#: user-manual.txt:3129 +#: user-manual.txt:3114 #, no-wrap msgid "images/Print_flow_layout_f22.jpg" msgstr "images/Print_flow_layout_f22.jpg" #. type: Plain text -#: user-manual.txt:3132 +#: user-manual.txt:3117 msgid "" "_One Dive_: Print one dive per page, also showing the dive profile (see " "below)" msgstr "" #. type: Target for macro image -#: user-manual.txt:3133 +#: user-manual.txt:3118 #, no-wrap msgid "images/print2_f22.jpg" msgstr "images/print2_f22.jpg" #. type: Plain text -#: user-manual.txt:3137 +#: user-manual.txt:3122 msgid "_Two Dives_: Print two dives per page, also showing the dive profiles." msgstr "" #. type: Plain text -#: user-manual.txt:3138 +#: user-manual.txt:3123 msgid "_Six Dives_: Print six dives per page, also showing the dive profiles." msgstr "" #. type: Plain text -#: user-manual.txt:3142 +#: user-manual.txt:3127 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 " @@ -6269,7 +6472,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3146 +#: user-manual.txt:3131 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 " @@ -6278,13 +6481,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:3147 +#: user-manual.txt:3132 #, no-wrap msgid "images/Print_print_f22.jpg" msgstr "images/Print_print_f22.jpg" #. type: Plain text -#: user-manual.txt:3152 +#: user-manual.txt:3137 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 " @@ -6293,19 +6496,19 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:3153 +#: user-manual.txt:3138 #, no-wrap msgid "images/Printpreview.jpg" msgstr "images/Printpreview.jpg" #. type: Title === -#: user-manual.txt:3155 +#: user-manual.txt:3140 #, 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:3161 +#: user-manual.txt:3146 msgid "" "Writing a custom template is an effective way to produce highly customized " "printouts. Subsurface uses HTML templates to render printing. You can create " @@ -6316,37 +6519,50 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:3163 +#: user-manual.txt:3148 #, no-wrap msgid "Configuring a dive computer" msgstr "Configurer un ordinateur de plongée" #. type: Plain text -#: user-manual.txt:3171 -msgid "" -"_Subsurface_ lets you configure a dive computer. Currently the Heinrichs-" -"Weikamp (OSTC 2, OSTC 3) and Suunto Vyper (Stinger, Mosquito, D3, Vyper, " -"Vytec, Cobra, Gekko and Zoop) family of dive computers are supported. A " -"large number of settings of these dive computers can be read and changed to " -"different values. To begin, be sure the appropriate hardware driver is " -"installed for the dive computer (also required for downloading dives) and " -"the device name of the dive computer is known. See " -"<<_appendix_a_operating_system_specific_information_for_importing_dive_information_from_a_dive_computer," +#: user-manual.txt:3156 +#| msgid "" +#| "_Subsurface_ lets you configure a dive computer. Currently the Heinrichs-" +#| "Weikamp (OSTC 2, OSTC 3) and Suunto Vyper (Stinger, Mosquito, D3, Vyper, " +#| "Vytec, Cobra, Gekko and Zoop) family of dive computers are supported. A " +#| "large number of settings of these dive computers can be read and changed " +#| "to different values. To begin, be sure the appropriate hardware driver is " +#| "installed for the dive computer (also required for downloading dives) and " +#| "the device name of the dive computer is known. See " +#| "<<_appendix_a_operating_system_specific_information_for_importing_dive_information_from_a_dive_computer," +#| "APPENDIX A>> for information on how to do this." +msgid "" +"_Subsurface_ lets you configure a dive computer. Currently, the Heinrichs-" +"Weikamp (OSTC 2/2N/2C, OSTC 3, Sport) and Suunto Vyper (Stinger, Mosquito, " +"D3, Vyper, Vytec, Cobra, Gekko and Zoop) family of dive computers are " +"supported. A large number of settings of these dive computers can be read " +"and changed to different values. To begin, be sure the appropriate hardware " +"driver is installed for the dive computer (also required for downloading " +"dives) and the device name of the dive computer is known. See " +"<<_appendix_a_operating_system_specific_information_for_importing_dive_informa" +"tion_from_a_dive_computer," "APPENDIX A>> for information on how to do this." msgstr "" "_Subsurface_ vous permet de configurer un ordinateur de plongée. " "Actuellement, les familles d'ordinateurs supportés sont Heinrichs-Weikamp " -"(OSTC 2, OSTC 3) et Suunto Vyper (Stinger, Mosquito, D3, Vyper, Vytec, " +"(OSTC 2/2N/2C, OSTC 3, Sport) et Suunto Vyper (Stinger, Mosquito, D3, Vyper," +" Vytec, " "Cobra, Gekko et Zoop). De nombreux paramètres de ces ordinateurs de plongée " "peuvent être lues et modifiées. Pour 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 " -"<<_appendix_a_operating_system_specific_information_for_importing_dive_information_from_a_dive_computer, " +"<<_appendix_a_operating_system_specific_information_for_importing_dive_informa" +"tion_from_a_dive_computer, " "ANNEXE A>> pour plus d'informations sur la manière de procéder." #. type: Plain text -#: user-manual.txt:3177 +#: user-manual.txt:3162 msgid "" "Once the dive computer is connected to the _Subsurface_ computer, select " "_File -> Configure dive computer_ from the _Main Menu_. Select the " @@ -6362,13 +6578,13 @@ msgstr "" "gauche (voir l'image ci-dessous)." #. type: Target for macro image -#: user-manual.txt:3178 +#: user-manual.txt:3163 #, no-wrap msgid "images/Configure_dc_f20.jpg" msgstr "images/Configure_dc_f20.jpg" #. type: Plain text -#: user-manual.txt:3181 +#: user-manual.txt:3166 msgid "" "Using the appropriate buttons on the configuration panel, the following " "actions can be done:" @@ -6377,68 +6593,78 @@ msgstr "" "suivantes peuvent être effectuées :" #. type: Plain text -#: user-manual.txt:3184 +#: user-manual.txt:3169 #, no-wrap msgid "" -"*Retrieve available details*. This loads the existing configuration from the dive computer\n" +"*Retrieve available details*. This loads the existing configuration from the" +" dive computer\n" "to _Subsurface_, showing it in the configuration panel.\n" msgstr "" -"*Récupérer les détails disponibles*. Cela charge la configuration existante à partir de l'ordinateur de plongée\n" +"*Récupérer les détails disponibles*. Cela charge la configuration existante à" +" partir de l'ordinateur de plongée\n" "dans _Subsurface_, en l'affichant dans le panneau de configuration.\n" #. type: Plain text -#: user-manual.txt:3186 +#: user-manual.txt:3171 #, no-wrap msgid "" "*Save changes to device*. This changes the configuration of the\n" -"dive computer to correspond to the information shown in the configuration panel.\n" +"dive computer to correspond to the information shown in the configuration" +" panel.\n" msgstr "" -"*Enregistrer les modifications sur le périphérique*. Cela change la configuration de l'ordinateur\n" -"de plongée pour correspondre aux informations affichées dans le panneau de configuration.\n" +"*Enregistrer les modifications sur le périphérique*. Cela change la" +" configuration de l'ordinateur\n" +"de plongée pour correspondre aux informations affichées dans le panneau de" +" configuration.\n" #. type: Plain text -#: user-manual.txt:3188 +#: user-manual.txt:3173 #, no-wrap msgid "" "*Backup*. This saves the configuration data to a file. _Subsurface_ asks for\n" "a file location and file name for the saved information.\n" msgstr "" -"*Sauvegarder*. Cela enregistre la configuration dans un fichier. _Subsurface_ demande\n" +"*Sauvegarder*. Cela enregistre la configuration dans un fichier. _Subsurface_" +" demande\n" "l'emplacement et le nom du fichier pour enregistrer les informations.\n" #. type: Plain text -#: user-manual.txt:3190 +#: user-manual.txt:3175 #, no-wrap msgid "" -"*Restore backup*. This loads the information from a backup file and displays it\n" +"*Restore backup*. This loads the information from a backup file and displays" +" it\n" "in the configuration panel.\n" msgstr "" -"*Restaurer une sauvegarde*. Cela charge les informations à partir d'un fichier de sauvegarde et l'affiche\n" +"*Restaurer une sauvegarde*. Cela charge les informations à partir d'un" +" fichier de sauvegarde et l'affiche\n" "dans le panneau de configuration.\n" #. type: Plain text -#: user-manual.txt:3192 +#: user-manual.txt:3177 #, no-wrap msgid "" -"*Update firmware*. If new firmware is available for the dive computer, this is\n" +"*Update firmware*. If new firmware is available for the dive computer, this" +" is\n" "loaded into the dive computer.\n" msgstr "" -"*Mettre à jour le firmware*. Si un nouveau firmware est disponible pour l'ordinateur de plongée,\n" +"*Mettre à jour le firmware*. Si un nouveau firmware est disponible pour" +" l'ordinateur de plongée,\n" "il sera chargé dans l'ordinateur de plongée.\n" #. type: Title == -#: user-manual.txt:3195 +#: user-manual.txt:3180 #, no-wrap msgid "Setting user _Preferences_ for _Subsurface_" msgstr "" #. type: Plain text -#: user-manual.txt:3206 +#: user-manual.txt:3191 msgid "" "There are several user-definable settings within _Subsurface_, found by " "selecting _File -> Preferences_, mostly affecting the way in which " "_Subsurface_ shows dive information to the user. The settings are in six " -"panels: _Defaults_, _Units_, _Graph_, _Language_, _Network_, and " +"panels: _General_, _Units_, _Profile_, _Language_, _Network_, and " "_Georeference_, all of which operate on the same principles: specified " "settings can be applied to the display of the dive log by selecting _Apply_. " "At this stage, any new settings only apply to the present session and are " @@ -6447,131 +6673,154 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3207 +#: user-manual.txt:3192 #, no-wrap -msgid "Defaults" +msgid "General" msgstr "" #. type: Plain text -#: user-manual.txt:3210 -msgid "There are several headings in the *Defaults* panel:" +#: user-manual.txt:3195 +msgid "There are several headings in the *General* panel:" msgstr "" #. type: Target for macro image -#: user-manual.txt:3211 +#: user-manual.txt:3196 #, no-wrap msgid "images/Pref1_f23.jpg" msgstr "images/Pref1_f23.jpg" #. type: Plain text -#: user-manual.txt:3215 +#: user-manual.txt:3200 #, no-wrap msgid "" " ** *Lists and tables*: Specify the font type and font size of the\n" -" *Dive Table* panel: decreasing the font size allows one to see more dives on a screen.\n" +" *Dive Table* panel: decreasing the font size allows one to see more" +" dives on a screen.\n" msgstr "" #. type: Plain text -#: user-manual.txt:3220 +#: user-manual.txt:3205 #, no-wrap msgid "" " ** *Dives*: For the _Default Dive Log File_ specify the directory and\n" " file name of your\n" -" electronic dive log book. This is a file with filename extension of either _.xml_ or _.ssrf_. When\n" -" launched, _Subsurface_ will automatically load the specified dive log book. There are three options:\n" +" electronic dive log book. This is a file with filename extension of" +" either _.xml_ or _.ssrf_. When\n" +" launched, _Subsurface_ will automatically load the specified dive log" +" book. There are three options:\n" msgstr "" #. type: Plain text -#: user-manual.txt:3221 +#: user-manual.txt:3206 #, no-wrap -msgid "_No default file_: When checked, _Subsurface_ does not automatically load a dive log at startup.\n" +msgid "" +"_No default file_: When checked, _Subsurface_ does not automatically load a" +" dive log at startup.\n" msgstr "" #. type: Plain text -#: user-manual.txt:3222 +#: user-manual.txt:3207 #, no-wrap -msgid "_Local default file_: When checked, _Subsurface_ automatically loads a dive log from the local hard disk.\n" +msgid "" +"_Local default file_: When checked, _Subsurface_ automatically loads a dive" +" log from the local hard disk.\n" msgstr "" #. type: Plain text -#: user-manual.txt:3224 +#: user-manual.txt:3209 #, no-wrap msgid "" -"_Cloud storage default file_: When checked, _Subsurface automatically loads the dive log from the cloud\n" -"device that was initialized using the *Preferences* _Network_ tab (see below).\n" +"_Cloud storage default file_: When checked, _Subsurface automatically loads" +" the dive log from the cloud\n" +"device that was initialized using the *Preferences* _Network_ tab (see" +" below).\n" msgstr "" #. type: Plain text -#: user-manual.txt:3226 +#: user-manual.txt:3211 #, no-wrap -msgid "** *Display invalid*: Dives can be marked as invalid (when a user wishes to hide\n" +msgid "" +"** *Display invalid*: Dives can be marked as invalid (when a user wishes to" +" hide\n" msgstr "" #. type: Plain text -#: user-manual.txt:3229 +#: user-manual.txt:3214 #, no-wrap msgid "" -"dives that he/she doesn't consider valid dives, e.g. pool dives, but still want to\n" -"keep them in the dive log). This controls whether those dives are displayed in\n" +"dives that he/she doesn't consider valid dives, e.g. pool dives, but still" +" want to\n" +"keep them in the dive log). This controls whether those dives are displayed" +" in\n" "the dive list.\n" msgstr "" #. type: Plain text -#: user-manual.txt:3231 +#: user-manual.txt:3216 #, no-wrap -msgid "** *Default cylinder*: From the dropdown list, select the default cylinder to be used in\n" +msgid "" +"** *Default cylinder*: From the dropdown list, select the default cylinder to" +" be used in\n" msgstr "" #. type: Plain text -#: user-manual.txt:3232 +#: user-manual.txt:3217 #, no-wrap msgid "the *Equipment* tab of the *Notes* panel.\n" msgstr "" #. type: Plain text -#: user-manual.txt:3234 +#: user-manual.txt:3219 #, no-wrap -msgid "** *Animations*: Some actions in showing the dive profile are performed using\n" +msgid "" +"** *Animations*: Some actions in showing the dive profile are performed" +" using\n" msgstr "" #. type: Plain text -#: user-manual.txt:3240 +#: user-manual.txt:3225 #, no-wrap msgid "" -"animations. For instance, the axis values for depth and time change from dive to\n" -"dive. When viewing a different dive, these changes in axis characteristics do not\n" -"happen instantaneously, but are animated. The _Speed_ of animations can be controlled\n" +"animations. For instance, the axis values for depth and time change from dive" +" to\n" +"dive. When viewing a different dive, these changes in axis characteristics do" +" not\n" +"happen instantaneously, but are animated. The _Speed_ of animations can be" +" controlled\n" "by setting this slider\n" -"with faster animation speed to the left, and a 0 value representing no animation\n" +"with faster animation speed to the left, and a 0 value representing no" +" animation\n" "at all.\n" msgstr "" #. type: Plain text -#: user-manual.txt:3242 +#: user-manual.txt:3227 #, no-wrap -msgid "** *Clear all settings*: As indicated in the button below this heading, all settings are\n" +msgid "" +"** *Clear all settings*: As indicated in the button below this heading, all" +" settings are\n" msgstr "" #. type: Plain text -#: user-manual.txt:3243 +#: user-manual.txt:3228 #, no-wrap msgid "cleared and set to default values.\n" msgstr "" #. type: Title === -#: user-manual.txt:3244 +#: user-manual.txt:3229 #, no-wrap msgid "Units" msgstr "" #. type: Target for macro image -#: user-manual.txt:3245 +#: user-manual.txt:3230 #, no-wrap msgid "images/Pref2_f23.jpg" msgstr "images/Pref2_f23.jpg" #. type: Plain text -#: user-manual.txt:3252 +#: user-manual.txt:3237 msgid "" "Choose between metric and imperial units of depth, pressure, volume, " "temperature and mass. By selecting the Metric or Imperial radio button at " @@ -6582,7 +6831,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3258 +#: user-manual.txt:3243 msgid "" "Regardless of the above settings, dive time measurements can be either in " "seconds or minutes. Choose the appropriate option. GPS coordinates can be " @@ -6591,187 +6840,229 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3259 +#: user-manual.txt:3244 #, no-wrap -msgid "Graph" +msgid "Profile" msgstr "" #. type: Plain text -#: user-manual.txt:3261 +#: user-manual.txt:3246 msgid "This panel has three sections:" msgstr "" #. type: Target for macro image -#: user-manual.txt:3263 +#: user-manual.txt:3248 #, no-wrap msgid "images/Pref4_f23.jpg" msgstr "images/Pref4_f23.jpg" #. type: Plain text -#: user-manual.txt:3276 +#: user-manual.txt:3261 #, no-wrap msgid "" -"*Gas pressure display setup*. Even though nitrogen and helium pressures are also included here, these items mainly pertain to oxygen management:\n" -"** _Thresholds_: _Subsurface_ can display graphs of the nitrogen, oxygen and the helium\n" +"*Gas pressure display setup*. Even though nitrogen and helium pressures are" +" also included here, these items mainly pertain to oxygen management:\n" +"** _Thresholds_: _Subsurface_ can display graphs of the nitrogen, oxygen and" +" the helium\n" " partial pressures during\n" " the dive, activated using the toolbar on the left of the *Dive Profile*\n" -" panel. For each of these graphs, specify a threshold value. If any of the graphs go\n" +" panel. For each of these graphs, specify a threshold value. If any of the" +" graphs go\n" " above the specified threshold, the graph is\n" -" highlighted in red, indicating the particular partial pressure threshold has been exceeded.\n" -" The pO~2~ threshold is probably the most important one and a value of 1.6 is commonly used.\n" -"** _pO~2~ in calculating MOD_ is used for calculating the maximum operative depth for a particular\n" +" highlighted in red, indicating the particular partial pressure threshold" +" has been exceeded.\n" +" The pO~2~ threshold is probably the most important one and a value of 1.6" +" is commonly used.\n" +"** _pO~2~ in calculating MOD_ is used for calculating the maximum operative" +" depth for a particular\n" " nitrox or trimix gas mixture. A value of 1.4 is commonly used.\n" msgstr "" #. type: Plain text -#: user-manual.txt:3278 +#: user-manual.txt:3263 #, no-wrap -msgid "** CCR Options: These options determine oxygen management for CCR dives:\n" +msgid "" +"** CCR Options: These options determine oxygen management for CCR dives:\n" msgstr "" #. type: Plain text -#: user-manual.txt:3283 +#: user-manual.txt:3268 #, no-wrap msgid "" "*** _Dive planner default setpoint_: Specify the O~2~ setpoint for a\n" " CCR dive plan. This determines the pO~2~ maintained\n" -" during a particular dive. Setpoint changes during the dive can be added via the\n" +" during a particular dive. Setpoint changes during the dive can be added" +" via the\n" " profile context menu.\n" msgstr "" #. type: Plain text -#: user-manual.txt:3287 +#: user-manual.txt:3272 #, no-wrap msgid "" -"*** _CCR: Show setpoints when viewing pO2:_ With this checkbox activated, the pO~2~\n" -" graph on the dive profile has an overlay in red which indicates the CCR setpoint\n" -" values. See the section on xref:S_CCR_dives[Closed Circuit Rebreather dives].\n" +"*** _CCR: Show setpoints when viewing pO~2~:_ With this checkbox activated," +" the pO~2~\n" +" graph on the dive profile has an overlay in red which indicates the CCR" +" setpoint\n" +" values. See the section on xref:S_CCR_dives[Closed Circuit Rebreather" +" dives].\n" msgstr "" #. type: Plain text -#: user-manual.txt:3291 +#: user-manual.txt:3276 #, no-wrap msgid "" -"*** _CCR: Show individual O~2~ sensor values when viewing pO~2~:_ Show the pO~2~\n" -" values associated with each of the individual oxygen sensors of a CCR system.\n" +"*** _CCR: Show individual O~2~ sensor values when viewing pO~2~:_ Show the" +" pO~2~\n" +" values associated with each of the individual oxygen sensors of a CCR" +" system.\n" " See the section on xref:S_CCR_dives[Closed Circuit Rebreather dives].\n" msgstr "" #. type: Plain text -#: user-manual.txt:3293 +#: user-manual.txt:3278 #, no-wrap -msgid "*Ceiling display setup*. These settings mostly deal with nitrogen and helium management\n" +msgid "" +"*Ceiling display setup*. These settings mostly deal with nitrogen and helium" +" management\n" msgstr "" #. type: Plain text -#: user-manual.txt:3294 +#: user-manual.txt:3279 #, no-wrap -msgid "by determining how the decompression ceiling (ascent ceiling) is calculated and displayed:\n" +msgid "" +"by determining how the decompression ceiling (ascent ceiling) is calculated" +" and displayed:\n" msgstr "" #. type: Plain text -#: user-manual.txt:3301 +#: user-manual.txt:3286 #, no-wrap msgid "" -"** _Draw dive computer reported ceiling red_: This checkbox does exactly what it says. By default\n" +"** _Draw dive computer reported ceiling red_: This checkbox does exactly what" +" it says. By default\n" " the computer reported ceiling is shown in white.\n" -" Not all dive computers report ceiling values. If the dive computer does report it, it may differ\n" -" from the ceilings calculated by _Subsurface_ because of the different algorithms and\n" +" Not all dive computers report ceiling values. If the dive computer does" +" report it, it may differ\n" +" from the ceilings calculated by _Subsurface_ because of the different" +" algorithms and\n" " gradient factors, as well as the dynamic way a\n" " dive computer calculates ceilings during a dive.\n" msgstr "" #. type: Plain text -#: user-manual.txt:3306 +#: user-manual.txt:3291 #, no-wrap msgid "" "** _Algorithm for calculating ceiling_. Choose between the Bühlmann Z1H-L16\n" " decompression model and the VPM-B model:\n" -"*** _VPM-B_: Provide a conservatism level for calculating the VPM-B ceiling. Values between 0\n" +"*** _VPM-B_: Provide a conservatism level for calculating the VPM-B ceiling." +" Values between 0\n" " (least conservative) and 4 (most conservative) are valid.\n" msgstr "" #. type: Plain text -#: user-manual.txt:3322 +#: user-manual.txt:3307 #, no-wrap msgid "" -"*** Bühlmann: Set the _gradient factors_ (GFlow and GFHigh) for calculcating the deco ceiling following\n" -" the ZH-L16 algorithm. GF_Low is the gradient factor at depth and GF_High is used at the surface.\n" -" At intermediate depths gradient factors between GF_Low and GF_High are used.\n" -" Gradient factors add conservatism to nitrogen and helium exposure during a dive, in a\n" -" similar way that many dive computers have a conservatism setting. The lower\n" -" the value of a gradient factor, the more conservative the calculations are with\n" +"*** Bühlmann: Set the _gradient factors_ (GFLow and GFHigh) for calculcating" +" the deco ceiling following\n" +" the ZH-L16 algorithm. GF_Low is the gradient factor at depth and GF_High" +" is used at the surface.\n" +" At intermediate depths gradient factors between GF_Low and GF_High are" +" used.\n" +" Gradient factors add conservatism to nitrogen and helium exposure during a" +" dive, in a\n" +" similar way that many dive computers have a conservatism setting. The" +" lower\n" +" the value of a gradient factor, the more conservative the calculations are" +" with\n" " respect to inert gas loading and the deeper the ceilings are. Gradient\n" -" factors of 20/60 are considered conservative and values of 70/90 are considered\n" +" factors of 20/60 are considered conservative and values of 70/90 are" +" considered\n" " harsh.\n" -" In addition decide whether to check the _GFLow at max depth_ box. If checked, GF_Low is used for the\n" -" deepest dive depth and linearly increased up to the GF_High value at the surface. If unchecked,\n" -" GF_Low is used between the deepest dive depth and the first deco stop, after which the\n" -" gradient factor linearly increases up to the GF_High value at the surface. For more information see:\n" +" In addition decide whether to check the _GFLow at max. depth_ box. If" +" checked, GF_Low is used for the\n" +" deepest dive depth and linearly increased up to the GF_High value at the" +" surface. If unchecked,\n" +" GF_Low is used between the deepest dive depth and the first deco stop," +" after which the\n" +" gradient factor linearly increases up to the GF_High value at the surface." +" For more information see:\n" msgstr "" #. type: Plain text -#: user-manual.txt:3329 +#: user-manual.txt:3314 #, no-wrap msgid "" -" ** _pSCR options_. These preferences determine how passive semi-closed circuit (pSCR) dives\n" +" ** _pSCR options_. These preferences determine how passive semi-closed" +" circuit (pSCR) dives\n" " are planned and how the pSCR deco ceiling is calculated:\n" msgstr "" #. type: Plain text -#: user-manual.txt:3333 +#: user-manual.txt:3318 #, no-wrap msgid "" " *** _Metabolic rate:_ this is the\n" -" volume of oxygen used by a diver during a minute. Set this value for pSCR dive planning\n" +" volume of oxygen used by a diver during a minute. Set this value for pSCR" +" dive planning\n" " and decompression calculations.\n" msgstr "" #. type: Plain text -#: user-manual.txt:3336 +#: user-manual.txt:3321 #, no-wrap msgid "" -" *** _pSCR ratio:_ The dilution ratio (or dump ratio) is the ratio of gas released to the\n" -" environment to that of the gas recirculated to the diver. A 1:10 ratio is commonly used.\n" +" *** _pSCR ratio:_ The dilution ratio (or dump ratio) is the ratio of gas" +" released to the\n" +" environment to that of the gas recirculated to the diver. A 1:10 ratio is" +" commonly used.\n" msgstr "" #. type: Plain text -#: user-manual.txt:3338 +#: user-manual.txt:3323 #, no-wrap msgid "*Misc*\n" msgstr "" #. type: Plain text -#: user-manual.txt:3345 +#: user-manual.txt:3330 #, no-wrap msgid "" -"** _Show unused cylinders in Equipment Tab_: This checkbox allows display of information about unused cylinders when viewing the\n" -"*Equipment Tab*. If this box is not checked, and if any cylinders entered using the *Equipment Tab* are not used (e.g. there\n" -"was no gas switch to such a cylinder), then these cylinders are omitted from that list.\n" -"** _Show mean depth_: If this box is checked, the *Dive Profile* panel contains a grey line that shows\n" -" the mean depth of the dive, up to any time instant during the dive. Normally this is a u-shaped line indicating the deepest mean depth just before\n" +"** _Show unused cylinders in Equipment Tab_: This checkbox allows display of" +" information about unused cylinders when viewing the\n" +"*Equipment Tab*. If this box is not checked, and if any cylinders entered" +" using the *Equipment Tab* are not used (e.g. there\n" +"was no gas switch to such a cylinder), then these cylinders are omitted from" +" that list.\n" +"** _Show mean depth_: If this box is checked, the *Dive Profile* panel" +" contains a grey line that shows\n" +" the mean depth of the dive, up to any time instant during the dive." +" Normally this is a u-shaped line indicating the deepest mean depth just" +" before\n" " ascent.\n" msgstr "" #. type: Title === -#: user-manual.txt:3347 +#: user-manual.txt:3332 #, no-wrap msgid "Language" msgstr "" #. type: Plain text -#: user-manual.txt:3349 +#: user-manual.txt:3334 msgid "Choose a language that _Subsurface_ will use." msgstr "" #. type: Target for macro image -#: user-manual.txt:3350 +#: user-manual.txt:3335 #, no-wrap msgid "images/Pref3_f23.jpg" msgstr "images/Pref3_f23.jpg" #. type: Plain text -#: user-manual.txt:3359 +#: user-manual.txt:3344 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 " @@ -6783,104 +7074,116 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3361 +#: user-manual.txt:3346 msgid "" -"In this section also specify appropriate date an time formats for showing " +"In this section also specify appropriate date and time formats for showing " "dive details." msgstr "" #. type: Title === -#: user-manual.txt:3362 +#: user-manual.txt:3347 #, no-wrap msgid "Network" msgstr "" #. type: Plain text -#: user-manual.txt:3369 +#: user-manual.txt:3352 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 or the <<S_Companion," -"_Subsurface Companion app_>>. These Internet requirements are determined by " -"your type of connection to the Internet and by the Internet Service Provider " -"(ISP) used. Your ISP should provide the appropriate information." +"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: Target for macro image -#: user-manual.txt:3370 +#: user-manual.txt:3354 #, no-wrap msgid "images/Pref5_f23.jpg" msgstr "images/Pref5_f23.jpg" #. type: Plain text -#: user-manual.txt:3373 +#: user-manual.txt:3357 msgid "This dialogue has three sections:" msgstr "" #. type: Plain text -#: user-manual.txt:3381 +#: user-manual.txt:3365 #, no-wrap msgid "" -"** _Proxy type_:\n" -"If a proxy server is used for Internet access, the type of proxy needs to be selected from the dropdown list,\n" -"after which the IP address of the host and the appropriate port number should\n" -"be provided. If the proxy server uses authentication, the appropriate userID and\n" +"** _Proxy_:\n" +"If a proxy server is used for Internet access, the type of proxy needs to be" +" selected from the dropdown list,\n" +"after which the IP address of the host and the appropriate port number" +" should\n" +"be provided. If the proxy server uses authentication, the appropriate userID" +" and\n" "password are required so that _Subsurface_ can automatically pass\n" -"through the proxy server to access the Internet. This information is usually obtained\n" +"through the proxy server to access the Internet. This information is usually" +" obtained\n" "from your ISP.\n" msgstr "" #. type: Plain text -#: user-manual.txt:3386 +#: user-manual.txt:3370 #, no-wrap msgid "" -"** _Subsurface cloud storage_: To store your dive log in the cloud, a valid email address\n" -" and password are required. This lets _Subsurface_ email security information\n" -" regarding cloud storage to you, and to set up cloud storage appropriately.\n" +"** _Subsurface cloud storage_: To store your dive log in the cloud, a valid" +" email address\n" +" and password are required. This lets _Subsurface_ email security" +" information\n" +" regarding cloud storage to you, and to set up cloud storage" +" appropriately.\n" " Two additional options are given:\n" msgstr "" #. type: Plain text -#: user-manual.txt:3387 +#: user-manual.txt:3371 #, no-wrap -msgid "_Sync to cloud in the background_: This option allows saving of dive information to the cloud storage\n" +msgid "" +"_Sync to cloud in the background_: This option allows saving of dive" +" information to the cloud storage\n" msgstr "" #. type: Plain text -#: user-manual.txt:3388 +#: user-manual.txt:3372 #, no-wrap msgid "while you do other things within _Subsurface_.\n" msgstr "" #. type: Plain text -#: user-manual.txt:3389 +#: user-manual.txt:3373 #, no-wrap -msgid "_Save password locally_: This allows local storage of the cloud storage password. Note that this\n" +msgid "" +"_Save password locally_: This allows local storage of the cloud storage" +" password. Note that this\n" msgstr "" #. type: Plain text -#: user-manual.txt:3390 +#: user-manual.txt:3374 #, no-wrap msgid "information is saved in raw text form, not encoded in any way.\n" msgstr "" #. type: Plain text -#: user-manual.txt:3394 +#: user-manual.txt:3378 #, no-wrap msgid "" -"** _Subsurface web service_: When you subscribe to the <<S_Companion,Subsurface web service>>, a very\n" -" long and hard-to-remember userID is issued. This is the place to save that userID. By\n" -" checking the option _Save User ID locally?_, you ensure a local copy of that userID is saved.\n" +"** _Subsurface web service_: When you subscribe to the <" +"<S_Companion,Subsurface web service>>, a very\n" +" long and hard-to-remember userID is issued. This is the place to save" +" that userID. By\n" +" checking the option _Save User ID locally?_, you ensure a local copy of" +" that userID is saved.\n" msgstr "" #. type: Title === -#: user-manual.txt:3395 +#: user-manual.txt:3379 #, no-wrap msgid "Georeference" msgstr "" #. type: Plain text -#: user-manual.txt:3403 +#: user-manual.txt:3387 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 " @@ -6893,28 +7196,28 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:3404 +#: user-manual.txt:3388 #, no-wrap msgid "images/Pref7_f23.jpg" msgstr "images/Pref7_f23.jpg" #. type: Title == -#: user-manual.txt:3407 +#: user-manual.txt:3391 #, no-wrap msgid "The _Subsurface_ dive planner" msgstr "" #. type: Plain text -#: user-manual.txt:3412 +#: user-manual.txt:3396 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 " "load during a dive by using the Bühlmann ZH-L16 algorithm with the addition " -"of gradient factors as implemented by Erik Baker." +"of gradient factors as implemented by Erik Baker, or using the VPM-B model." msgstr "" #. type: delimited block * -#: user-manual.txt:3420 +#: user-manual.txt:3404 msgid "" "The _Subsurface_ dive planner IS CURRENTLY EXPERIMENTAL and assumes the user " "is already familiar with the _Subsurface_ user interface. It is explicitly " @@ -6922,19 +7225,19 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:3423 +#: user-manual.txt:3407 msgid "" "The user is conversant with dive planning and has the necessary training to " "perform dive planning." msgstr "" #. type: delimited block * -#: user-manual.txt:3424 +#: user-manual.txt:3408 msgid "The user plans dives within his/her certification limits." msgstr "" #. type: delimited block * -#: user-manual.txt:3427 +#: user-manual.txt:3411 msgid "" "Dive planning makes large assumptions about the characteristics of the " "_average person_ and cannot compensate for individual physiology or health " @@ -6942,41 +7245,41 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:3428 +#: user-manual.txt:3412 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:3429 +#: user-manual.txt:3413 msgid "The user is familiar with the user interface of _Subsurface_." msgstr "" #. type: delimited block * -#: user-manual.txt:3431 +#: user-manual.txt:3415 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:3433 +#: user-manual.txt:3417 #, no-wrap msgid "The _Subsurface_ dive planner screen" msgstr "" #. type: Plain text -#: user-manual.txt:3438 +#: user-manual.txt:3422 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 " -"into the sections on the left hand side of the screen. They are: Available " -"Gases, Rates, Planning, Gas Options and Notes." +"into the sections on the left hand and bottom side of the screen. They are: " +"Available Gases, Rates, Planning, Gas Options and Notes." msgstr "" #. type: Plain text -#: user-manual.txt:3442 +#: user-manual.txt:3426 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 " @@ -6985,7 +7288,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3446 +#: user-manual.txt:3430 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 " @@ -6994,26 +7297,26 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:3447 +#: user-manual.txt:3431 #, no-wrap msgid "images/PlannerWindow1_f20.jpg" msgstr "images/PlannerWindow1_f20.jpg" #. type: Title === -#: user-manual.txt:3450 +#: user-manual.txt:3434 #, no-wrap msgid "Open circuit dives" msgstr "" #. type: Plain text -#: user-manual.txt:3453 +#: user-manual.txt:3437 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:3456 +#: user-manual.txt:3440 #, no-wrap msgid "" "** Open Circuit (the default)\n" @@ -7022,12 +7325,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3458 +#: user-manual.txt:3442 msgid "Choose the Open Circuit option." msgstr "" #. type: Plain text -#: user-manual.txt:3462 +#: user-manual.txt:3446 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 " @@ -7037,14 +7340,14 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3471 +#: user-manual.txt:3455 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. " "This is done in a similar way as for <<cylinder_definitions,providing " "cylinder data for dive logs>>. Choose the cylinder type by double clicking " -"the cylinder type and using the dropdown list, then specify the work " -"pressure of this cylinder. By leaving the oxygen concentration (O2%) field " +"the cylinder type and using the dropdown list, then specify the start " +"pressure of this cylinder. By leaving the oxygen concentration (O~2~%) field " "empty, the cylinder is assumed to contain air. Otherwise enter the oxygen " "and/or helium concentration in the boxes provided in this dialogue. Add " "additional cylinders by using the \"+\" icon to the top right-hand of the " @@ -7052,57 +7355,68 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3473 +#: user-manual.txt:3457 msgid "The _Available Gases_ table includes three gas depth fields, labelled:" msgstr "" #. type: Plain text -#: user-manual.txt:3474 +#: user-manual.txt:3458 #, no-wrap -msgid "** Deco switch at: the switch depth for deco gases. Unless overridden by the user, this will be\n" +msgid "" +"** Deco switch at: the switch depth for deco gases. Unless overridden by the" +" user, this will be\n" msgstr "" #. type: Plain text -#: user-manual.txt:3475 +#: user-manual.txt:3459 #, no-wrap -msgid "automatically calculated based on the Deco pO₂ preference (default 1.6 bar)\n" +msgid "" +"automatically calculated based on the Deco pO~2~ preference (default 1.6" +" bar)\n" msgstr "" #. type: Plain text -#: user-manual.txt:3476 +#: user-manual.txt:3460 #, no-wrap -msgid "** Bot. MOD: the gas Maximum Operating Depth (MOD) if it is used as a bottom mix. Automatically\n" +msgid "" +"** Bot. MOD: the gas Maximum Operating Depth (MOD) if it is used as a bottom" +" mix. Automatically\n" msgstr "" #. type: Plain text -#: user-manual.txt:3478 +#: user-manual.txt:3462 #, no-wrap msgid "" -"calculated based on the Bottom pO₂ preference (default 1.4 bar). Editing this field will modify the\n" -"O₂% according to the depth set. Set to ''*'' to calculate the best O₂% for the dive maximum depth.\n" +"calculated based on the Bottom pO~2~ preference (default 1.4 bar). Editing" +" this field will modify the\n" +"O~2~% according to the depth set. Set to ''*'' to calculate the best O~2~%" +" for the dive maximum depth.\n" msgstr "" #. type: Plain text -#: user-manual.txt:3479 +#: user-manual.txt:3463 #, no-wrap -msgid "** MND: the gas Maximum Narcotic Depth (MND). Automatically calculated based on the Best Mix END\n" +msgid "" +"** MND: the gas Maximum Narcotic Depth (MND). Automatically calculated based" +" on the Best Mix END\n" msgstr "" #. type: Plain text -#: user-manual.txt:3481 +#: user-manual.txt:3465 #, no-wrap msgid "" -"preference (default 30m / 98 ft). Editing this field will modify the He% according to the depth set.\n" +"preference (default 30m / 98 ft). Editing this field will modify the He%" +" according to the depth set.\n" "Set to ''*'' to calculate the best He% for the dive maximum depth.\n" msgstr "" #. type: Plain text -#: user-manual.txt:3483 +#: user-manual.txt:3467 msgid "The profile of the planned dive can be created in two ways:" msgstr "" #. type: Plain text -#: user-manual.txt:3488 +#: user-manual.txt:3472 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 " @@ -7112,13 +7426,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3496 +#: user-manual.txt:3480 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 " "table represents the duration and the final depth of the descent from the " "surface. Subsequent segments describe the bottom phase of the dive. The _CC " -"set point_ column is only relevant for closed circuit divers. The ascent is " +"setpoint_ column is only relevant for closed circuit divers. The ascent is " "usually not specified because this is what the planner is supposed to " "calculate. Add additional segments to the profile by selecting the \"+\" " "icon at the top right hand of the table. Segments entered into the _Dive " @@ -7126,25 +7440,35 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:3497 +#: user-manual.txt:3481 #, no-wrap msgid "Recreational dives" msgstr "" #. type: Plain text -#: user-manual.txt:3514 -#, no-wrap -msgid "" -"Recreational mode is what comes closest to planning a dive based on the non-decompression limit (NDL).\n" -"It computes the maximum time a diver can stay at the current depth without needing mandatory decompression\n" -"stops and without using more than the existing gas (minus a reserve). The planner automatically takes\n" -"into account the nitrogen load incurred in previous dives. But conventional dive tables are also used in a\n" -"way that can take into account previous dives. Why use a dive planner for recreational dives? Using\n" -"recreational dive tables, the maximum depth of a dive is taken into account. But few dives are\n" -"done at a constant depth corresponding to the maximum depth (i.e. a \"square\" dive profile). This means\n" -"dive tables overestimate the nitrogen load incurred during previous dives. The _Subsurface_\n" -"dive planner calculates nitrogen load according to the real dive profiles of all uploaded previous dives,\n" -"in a similar way as dive computers calculate nitrogen load during a dive. This means that the diver gets 'credit,'\n" +#: user-manual.txt:3498 +#, no-wrap +msgid "" +"Recreational mode is what comes closest to planning a dive based on the" +" non-decompression limit (NDL).\n" +"It computes the maximum time a diver can stay at the current depth without" +" needing mandatory decompression\n" +"stops and without using more than the existing gas (minus a reserve). The" +" planner automatically takes\n" +"into account the nitrogen load incurred in previous dives. But conventional" +" dive tables are also used in a\n" +"way that can take into account previous dives. Why use a dive planner for" +" recreational dives? Using\n" +"recreational dive tables, the maximum depth of a dive is taken into account." +" But few dives are\n" +"done at a constant depth corresponding to the maximum depth (i.e. a" +" \"square\" dive profile). This means\n" +"dive tables overestimate the nitrogen load incurred during previous dives." +" The _Subsurface_\n" +"dive planner calculates nitrogen load according to the real dive profiles of" +" all uploaded previous dives,\n" +"in a similar way as dive computers calculate nitrogen load during a dive." +" This means that the diver gets 'credit,'\n" "in terms of nitrogen load, for not remaining at maximum depth during\n" "previous dives, so a longer subsequent dive can be planned.\n" " For the planner to work it's crucial to upload all previous dives\n" @@ -7153,29 +7477,29 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3517 +#: user-manual.txt:3501 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:3520 +#: user-manual.txt:3504 msgid "" "Immediately under the heading _Planning_ are two checkboxes _Recreational_ " "and _Safety Stop_. Check these two boxes." msgstr "" #. type: Plain text -#: user-manual.txt:3524 +#: user-manual.txt:3508 msgid "" "Then define the cylinder size, the gas mixture (air or % oxygen) and the " -"starting cylinder pressure in the top left-hand section of the planner under " +"working cylinder pressure in the top left-hand section of the planner under " "_Available gases_." msgstr "" #. type: Plain text -#: user-manual.txt:3529 +#: user-manual.txt:3513 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 " @@ -7185,7 +7509,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3538 +#: user-manual.txt:3522 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 " @@ -7202,7 +7526,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3546 +#: user-manual.txt:3530 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 " @@ -7215,14 +7539,14 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3549 +#: user-manual.txt:3533 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:3557 +#: user-manual.txt:3541 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 " @@ -7238,7 +7562,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3561 +#: user-manual.txt:3545 msgid "" "Below is an image of a dive plan for a recreational dive at 30 meters. " "Although the no-deco limit (NDL) is 23 minutes, the duration of the dive is " @@ -7248,43 +7572,52 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:3562 +#: user-manual.txt:3546 #, no-wrap -msgid "images/rec_diveplan.jpg" -msgstr "images/rec_diveplan.jpg" +#| msgid "images/Planner_CCR1_f20.jpg" +msgid "images/Planner_OC_rec.jpg" +msgstr "images/Planner_OC_rec.jpg" #. type: Title ==== -#: user-manual.txt:3564 +#: user-manual.txt:3548 #, no-wrap msgid "Non-recreational open circuit dives, including decompression" msgstr "" #. type: Plain text -#: user-manual.txt:3568 +#: user-manual.txt:3552 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:3580 +#: user-manual.txt:3564 #, no-wrap msgid "" -"*a) Nitrogen management*: This is done by specifying the rates for descent and ascent,\n" -"as well as the deco model (GFLow, GFHigh or Conservatism level) under the headings _Rates_ and _Planning_\n" -"to the bottom left of the planning screen. Two deco models are supported the Bühlmann model and the VPM-B\n" -"model. Select one of the two models. When selecting the Bühlmann model, the gradient factors (GFhigh and GFlow\n" -"need to be specified. Initially, the GFHigh and GFLow values in the _Preferences_\n" -"panel of _Subsurface_ is used. If these are changed within the planner (see _Gas Options_ within\n" +"*a) Nitrogen management*: This is done by specifying the rates for descent" +" and ascent,\n" +"as well as the deco model (GFLow, GFHigh or Conservatism level) under the" +" headings _Rates_ and _Planning_\n" +"to the bottom left of the planning screen. Two deco models are supported the" +" Bühlmann model and the VPM-B\n" +"model. Select one of the two models. When selecting the Bühlmann model, the" +" gradient factors (GFHigh and GFLow\n" +"need to be specified. Initially, the GFHigh and GFLow values in the" +" _Preferences_\n" +"panel of _Subsurface_ is used. If these are changed within the planner (see" +" _Gas Options_ within\n" "the planner), the new values are\n" "used without changing the original values in the _Preferences_.\n" -"Gradient Factor settings strongly affect the calculated ceilings and their depths.\n" +"Gradient Factor settings strongly affect the calculated ceilings and their" +" depths.\n" "A very low GFLow value brings on decompression stops early during the dive.\n" -" ** For more information about Gradient factors, see the section on xref:S_GradientFactors[Gradient Factor Preference settings].\n" +" ** For more information about Gradient factors, see the section on" +" xref:S_GradientFactors[Gradient Factor Preference settings].\n" msgstr "" #. type: Plain text -#: user-manual.txt:3586 +#: user-manual.txt:3570 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 " @@ -7297,12 +7630,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3588 +#: user-manual.txt:3572 msgid "For more information external to this manual see:" msgstr "" #. type: Plain text -#: user-manual.txt:3590 +#: user-manual.txt:3574 msgid "" "link:http://www.tek-dive.com/portal/upload/M-Values.pdf[Understanding M-" "values by Erik Baker, _Immersed_ Vol. 3, No. 3.]" @@ -7311,7 +7644,7 @@ msgstr "" "values by Erik Baker, _Immersed_ Vol. 3, No. 3.]" #. type: Plain text -#: user-manual.txt:3591 +#: user-manual.txt:3575 msgid "" "link:http://www.rebreatherworld.com/general-and-new-to-rebreather-" "articles/5037-gradient-factors-for-dummies.html[Gradient factors for " @@ -7322,22 +7655,29 @@ msgstr "" "dummies, by Kevin Watts]" #. type: Plain text -#: user-manual.txt:3593 +#: user-manual.txt:3577 +#| msgid "" +#| "link:http://www.amazon.com/Deco-Divers-Decompression-Theory-Physiology/" +#| "dp/1905492073/ref=sr_1_1?" +#| "s=books&ie=UTF8&qid=1403932320&sr=1-1&keywords=deco+for+divers[_Deco for " +#| "Divers_, by Mark Powell (2008). Aquapress] Southend-on-Sea, UK. ISBN 10: " +#| "1-905492-07-3. An excellent non-technical review that discusses both the " +#| "Bühlmann deco model and the VPM-B model." msgid "" -"link:http://www.amazon.com/Deco-Divers-Decompression-Theory-Physiology/" +"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: 1-905492-07-3. An excellent non-technical review that " "discusses both the Bühlmann deco model and the VPM-B model." msgstr "" -"link:http://www.amazon.com/Deco-Divers-Decompression-Theory-Physiology/" +"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: 1-905492-07-3. Un excellent livre non technique qui " "traite à la fois des modèles de décompression Bühlmann et VPM-B." #. type: Plain text -#: user-manual.txt:3601 +#: user-manual.txt:3585 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 " @@ -7350,38 +7690,79 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3609 +#: user-manual.txt:3594 #, no-wrap msgid "" -"*b) Oxygen management*: In the *Gas Options* part of the dive specification, the maximum partial\n" +"*b) Oxygen management*: In the *Gas Options* part of the dive specification," +" the maximum partial\n" "pressure for oxygen needs to be specified for the\n" -"bottom part of the dive (_bottom po2_) as well as for the decompression part of the dive (_deco po2_).\n" -"Commonly used values are 1.4 bar for the bottom part of the dive and 1.6 bar for any decompression\n" -"stages. Normally, a partial pressure of 1.6 bar is not exceeded. PO2 settings and the depth at which switching to a gas takes place can also be edited in the\n" -"_Available Gases_ dialog. Normally the planner decides on switching to a new gas when, during\n" +"bottom part of the dive (_bottom po2_) as well as for the decompression part" +" of the dive (_deco po2_).\n" +"Commonly used values are 1.4 bar for the bottom part of the dive and 1.6 bar" +" for any decompression\n" +"stages. Normally, a partial pressure of 1.6 bar is not exceeded. The depth at" +" which switching to a gas\n" +"takes place can be edited in the\n" +"_Available Gases_ dialog. Normally, the planner decides on switching to a new" +" gas when, during\n" "ascent, the partial pressure of the new gas has decreased to 1.6 bar.\n" msgstr "" #. type: Plain text -#: user-manual.txt:3626 +#: user-manual.txt:3625 #, no-wrap msgid "" "*c) Gas management*: With open-circuit dives this is a primary\n" "consideration. Divers need to keep within the limits of the amount of\n" "gas within the dive\n" -"cylinder(s), allowing for an appropriate margin for a safe return to the surface, possibly\n" -"sharing with a buddy. Under the _Gas Options_ heading, specify the best (but conservative) estimate\n" +"cylinder(s), allowing for an appropriate margin for a safe return to the" +" surface, possibly\n" +"sharing with a buddy. Under the _Gas Options_ heading, specify the best (but" +" conservative) estimate\n" "of your surface-equivalent air consumption (SAC, also termed RMV) in\n" -"liters/min (for the time being, only SI units are supported). Specify the SAC during the\n" -"bottom part of the dive (_bottom SAC_) as well as during the decompression or safety stops of the\n" -"dive (_deco SAC_). Values of 15-30 l/min are common. For good gas management, a guess\n" +"liters/min (for the time being, only SI units are supported). Specify the SAC" +" during the\n" +"bottom part of the dive (_bottom SAC_) as well as during the decompression or" +" safety stops of the\n" +"dive (_deco SAC_). Values of 15-30 l/min are common. For good gas management," +" a guess\n" "is not sufficient and you needs to\n" -"monitor gas consumption on a regular basis, dependent on different dive conditions and/or equipment.\n" -"The planner calculates the total volume of gas used during the dive and issues a warning\n" -"if you exceeds the total amount of gas available. Good practice demands that divers not dive to\n" +"monitor gas consumption on a regular basis, dependent on different dive" +" conditions and/or equipment.\n" +"The planner calculates the total volume of gas used during the dive and" +" issues a warning\n" +"if you exceeds the total amount of gas available. Good practice demands that" +" divers not dive to\n" "the limit of the gas supply but that an appropriate reserve is kept\n" "for unforeseen circumstances.\n" -"For technical diving, this reserve can be up to 66% of the total available gas.\n" +"For technical diving, this reserve can be up to 66% of the total available" +" gas.\n" +"In addition to calculating the total gas consumption for every cylinder the" +" planner provides one way\n" +"of calculating the recommended volume of bottom gas which is needed for safe" +" asscent to the\n" +"first deco gas change depth or the surface. This procedure is called the" +" \"minimum gas\" or \"rock bottom\"\n" +"consideration and it is used by various (but not all)\n" +"technical diving organisations. The calculation assumes that in worst case an" +" out of gas (OoG)\n" +"situation could occur at the end of the planned bottom time at maximum depth." +" This OoG event forces\n" +"the buddy team the share the gas of one diver and to stay at maximum depth" +" for an additional\n" +"time of n minutes (preferences option \"problem solving time\").\n" +"At the same moment the combined SAC of both divers is increased by a" +" estimated factor (preferences option\n" +"\"SAC factor\") compared to the SAC factor of a single diver under normal" +" conditions.\n" +"The result of the minimum gas calculation for the bottom gas is printed to" +" the planner output as an\n" +"additional information. No automatic checks are performed based on this" +" result.\n" +"Please take care that the feature only gives valid results for simple," +" rectengular shaped single\n" +"level dive profiles. For multi level dives one would need to check every leg" +" of the profile independently.\n" msgstr "" #. type: Plain text @@ -7403,38 +7784,36 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3650 +#: user-manual.txt:3649 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 " "each row of that table corresponds to one of the gas mixtures specified in " "the _Available Gases_ table. Add new waypoints until the main features of " "the dive have been completed, e.g. the bottom time segment and deep stops " -"(if these are implemented). Leave the remaining waypoints on the ascent to " -"_Subsurface_. In most cases _Subsurface_ computes additional way points in " -"order to fulfill decompression requirements for that dive. A waypoint can be " -"moved by selecting it and by using the arrow keys. The waypoints listed in " -"the _Dive Planner Points_ dialogue can be edited by hand in order to get a " -"precise presentation of the dive plan. In fact, it is sometimes more easy to " -"create the whole dive profile by editing the _Dive Planner Points_ dialog." +"(if these are implemented). In most cases _Subsurface_ computes additional " +"way points in order to fulfill decompression requirements for that dive. A " +"waypoint can also be moved by selecting it and by using the arrow keys. The " +"waypoints listed in the _Dive Planner Points_ dialogue can be edited by hand " +"in order to get a precise presentation of the dive plan. In fact, it is " +"sometimes more easy to create the whole dive profile by editing the _Dive " +"Planner Points_ dialog." msgstr "" #. type: Plain text -#: user-manual.txt:3658 +#: user-manual.txt:3655 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 " "changes should reflect the cylinders and gas compositions defined in the " "table with _Available Gases_. If two or more gases are used, automatic gas " -"switches will be suggested during the ascent to the surface. These changes " -"can be deleted by right-clicking the gas change and manually creating a gas " -"change by right-clicking on the appropriate waypoint." +"switches will be planned during the ascent to the surface." msgstr "" #. type: Plain text -#: user-manual.txt:3667 +#: user-manual.txt:3664 msgid "" -"A non-zero value in the \"CC set point\" column of the table of dive planner " +"A non-zero value in the \"CC setpoint\" column of the table of dive planner " "points indicates a valid setpoint for oxygen partial pressure and that the " "segment is dived using a closed circuit rebreather (CCR). If the last " "manually entered segment is a CCR segment, the decompression phase is " @@ -7445,20 +7824,21 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3670 +#: user-manual.txt:3667 msgid "" -"Below is an example of a dive plan to 45m using EAN26, followed by an ascent " -"using EAN50 and using the settings as described above." +"Below is an example of a dive plan to 45m using Tx21/35, followed by an " +"ascent using EAN50 and oxygen and using the settings as described above." msgstr "" #. type: Target for macro image -#: user-manual.txt:3671 +#: user-manual.txt:3668 #, no-wrap -msgid "images/DivePlanner2_f20.jpg" -msgstr "images/DivePlanner2_f20.jpg" +#| msgid "images/Planner_CCR1_f20.jpg" +msgid "images/Planner_OC_deco_VPM.jpg" +msgstr "images/Planner_OC_deco_VPM.jpg" #. type: Plain text -#: user-manual.txt:3676 +#: user-manual.txt:3673 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 " @@ -7466,13 +7846,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3678 +#: user-manual.txt:3675 #, no-wrap msgid "*The dive plan details*\n" msgstr "" #. type: Plain text -#: user-manual.txt:3686 +#: user-manual.txt:3683 msgid "" "On the bottom right of the dive planner, under _Dive Plan Details_, the " "exact details of the dive plan are provided. These details may be modified " @@ -7485,7 +7865,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3691 +#: user-manual.txt:3688 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 " @@ -7495,100 +7875,122 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3692 +#: user-manual.txt:3689 #, no-wrap msgid "Planning pSCR dives" msgstr "" #. type: Plain text -#: user-manual.txt:3707 +#: user-manual.txt:3706 #, no-wrap msgid "" -"To plan a dive using a passive semi-closed rebreather (pSCR), select _pSCR_ rather than\n" +"To plan a dive using a passive semi-closed rebreather (pSCR), select _pSCR_" +" rather than\n" "_Open circuit_ in the dropdown list.\n" -"The parameters of the pSCR dive can be set by selecting _File -> Preferences -> Graph_\n" -"from the main menu, where the gas consumption calculation takes into account the pSCR dump\n" -"ratio (default 1:10) as well as the metabolic rate. The calculation also takes the oxygen drop\n" +"The parameters of the pSCR dive can be set by selecting _File -> " +" Preferences -> Profile_\n" +"from the main menu, where the gas consumption calculation takes into account" +" the pSCR dump\n" +"ratio (default 1:10) as well as the metabolic rate. The calculation also" +" takes the oxygen drop\n" "accross the mouthpiece of the rebreather into account. If the\n" -"pO~2~ drops below what is considered safe, a warning appears in the _Dive plan\n" -"details_. A typical pSCR configuration is with a single cylinder and one or more bail-out\n" -"cylinders. Therefore the setup of the _Available gases_ and the _Dive planner points_ tables\n" -"are very similar to that of a CCR dive plan, described below. However, no oxygen setpoints\n" -"are specified for pSCR dives. Below is a dive plan for a pSCR dive. The dive is comparable\n" -"to that of the CCR dive below, but note the longer ascent duration due to the lower oxygen\n" -"in the loop due to the oxygen drop across the mouthpiece of the pSCR equipment.\n" +"pO~2~ drops below what is considered safe, a warning appears in the _Dive" +" plan\n" +"details_. A typical pSCR cylinder setup is very similar to an open circuit" +" dive;\n" +"one or more drive cilinders, possibly with different bottom and" +" decompression\n" +"gasses, including gas switches during the dive like in open circuit diving.\n" +"Therefore, the setup of the _Available gases_ and the _Dive planner points_" +" tables\n" +"are very similar to that of a open circuit dive plan, described above." +" However, no oxygen setpoints\n" +"are specified for pSCR dives. Below is a dive plan for a pSCR dive. The dive" +" is comparable\n" +"to that of the CCR dive below, but note the longer ascent duration due to the" +" lower oxygen\n" +"in the loop due to the oxygen drop across the mouthpiece of the pSCR" +" equipment.\n" msgstr "" #. type: Target for macro image -#: user-manual.txt:3708 +#: user-manual.txt:3707 #, no-wrap msgid "images/Planner_pSCR1_f20.jpg" msgstr "images/Planner_pSCR1_f20.jpg" #. type: Title === -#: user-manual.txt:3711 +#: user-manual.txt:3710 #, no-wrap msgid "Planning CCR dives" msgstr "" #. type: Plain text -#: user-manual.txt:3715 +#: user-manual.txt:3714 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:3719 +#: user-manual.txt:3718 #, no-wrap msgid "" -"*Available gases*: In the _Available gases_ table, enter the cylinder information for the\n" -"diluent cylinder and for any bail-out cylinders. Do NOT enter the information for the oxygen\n" +"*Available gases*: In the _Available gases_ table, enter the cylinder" +" information for the\n" +"diluent cylinder and for any bail-out cylinders. Do NOT enter the information" +" for the oxygen\n" "cylinder since it is implied when the _CCR_ dropdown selection is made.\n" msgstr "" #. type: Plain text -#: user-manual.txt:3729 +#: user-manual.txt:3728 #, no-wrap msgid "" -"*Entering setpoints*: Specify a default setpoint in the Preferences tab, by selecting _File -> Preferences -> Graph_ from\n" +"*Entering setpoints*: Specify a default setpoint in the Preferences tab, by" +" selecting _File -> Preferences -> Profile_ from\n" "the main menu. All user-entered segments in the _Dive planner points_ table\n" -"use the default setpoint value. Then, different setpoints can be specified for dive segments\n" +"use the default setpoint value. Then, different setpoints can be specified" +" for dive segments\n" "in the _Dive planner points_ table. A zero setpoint\n" -"means the diver bails out to open circuit mode for that segment. Decompression is always calculated\n" -"using the setpoint of the last manually entered segment. So, to plan a bail out ascent for a\n" -"CCR dive, add a one-minute dive segment to the end with a setpoint value of 0. The decompression\n" -"algorithm does not switch deco-gases automatically while in CCR mode (i.e. when a positive setpoint is specified) but\n" +"means the diver bails out to open circuit mode for that segment." +" Decompression is always calculated\n" +"using the setpoint of the last manually entered segment. So, to plan a bail" +" out ascent for a\n" +"CCR dive, add a one-minute dive segment to the end with a setpoint value of" +" 0. The decompression\n" +"algorithm does not switch deco-gases automatically while in CCR mode (i.e." +" when a positive setpoint is specified) but\n" "this is calculated for bail out ascents.\n" msgstr "" #. type: Plain text -#: user-manual.txt:3731 +#: user-manual.txt:3730 msgid "" "The dive profile for a CCR dive may look something like the image below." msgstr "" #. type: Target for macro image -#: user-manual.txt:3732 +#: user-manual.txt:3731 #, no-wrap msgid "images/Planner_CCR1_f20.jpg" msgstr "images/Planner_CCR1_f20.jpg" #. type: Plain text -#: user-manual.txt:3736 +#: user-manual.txt:3735 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:3738 +#: user-manual.txt:3737 #, no-wrap msgid "Modifying an existing dive plan" msgstr "" #. type: Plain text -#: user-manual.txt:3745 +#: user-manual.txt:3744 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 " @@ -7599,7 +8001,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3751 +#: user-manual.txt:3750 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 " @@ -7610,13 +8012,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3752 +#: user-manual.txt:3751 #, no-wrap msgid "Planning for repetitive dives" msgstr "" #. type: Plain text -#: user-manual.txt:3759 +#: user-manual.txt:3758 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 " @@ -7625,7 +8027,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3765 +#: user-manual.txt:3764 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 " @@ -7635,7 +8037,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3770 +#: user-manual.txt:3769 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 " @@ -7645,13 +8047,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3771 +#: user-manual.txt:3770 #, no-wrap msgid "Printing the dive plan" msgstr "" #. type: Plain text -#: user-manual.txt:3776 +#: user-manual.txt:3775 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 " @@ -7659,29 +8061,23 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3786 +#: user-manual.txt:3781 msgid "" -"Dive plans have many characteristics in common with dive logs (dive profile, " -"dive notes, etc). After a dive plan has been saved, the dive details and " -"gas calculations are saved in the *Notes* tab. While a dive plan is being " -"designed, it can be printed using the _Print_ button in the dive planner. " -"This prints the dive details and gas calculations in the _Dive Plan Details_ " -"panel of the dive planner. 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 same way as during the planning process. The only " -"way to print the dive plan is to use the _File -> Print_ function on the " -"main menu in the same way as for dive logs or by copy and paste to a word " -"processor." +"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 " +"same way as during the planning process. The only way to print the dive plan " +"is to use the _File -> Print_ function on the main menu in the same way as " +"for dive logs or by copy and paste to a word processor." msgstr "" #. type: Title === -#: user-manual.txt:3788 +#: user-manual.txt:3783 #, no-wrap msgid "Saving a dive with its dive plan" msgstr "" #. type: Plain text -#: user-manual.txt:3795 +#: user-manual.txt:3790 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 " @@ -7692,25 +8088,25 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3797 +#: user-manual.txt:3792 msgid "Do the dive planning and save the final plan in the _Dive List_." msgstr "" #. type: Plain text -#: user-manual.txt:3798 +#: user-manual.txt:3793 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:3800 +#: user-manual.txt:3795 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:3803 +#: user-manual.txt:3798 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 " @@ -7718,7 +8114,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3807 +#: user-manual.txt:3802 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 " @@ -7727,13 +8123,13 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:3808 +#: user-manual.txt:3803 #, no-wrap msgid "Running _Subsurface_ from the command-line" msgstr "" #. type: Plain text -#: user-manual.txt:3812 +#: user-manual.txt:3807 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 " @@ -7741,42 +8137,49 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3814 +#: user-manual.txt:3809 #, no-wrap msgid "\tsubsurface [options] [logfile ...] [--import logfile ...]\n" msgstr "" #. type: Plain text -#: user-manual.txt:3816 +#: user-manual.txt:3811 msgid "The options include:" msgstr "" #. type: delimited block | -#: user-manual.txt:3829 +#: user-manual.txt:3825 #, no-wrap msgid "" "|*Command-line option*|*Description*\n" "|--help|Print a summary of the command-line options\n" "| -h|Print a summary of the command-line options\n" -"|--import logfile ...|A file name before this option is treated as an existing dive log, everything after is imported into the existing dive log\n" +"|--import logfile ...|A file name before this option is treated as an" +" existing dive log, everything after is imported into the existing dive log\n" "|--verbose|Print debug information while running _Subsurface_\n" "| -v|Print debug information while running _Subsurface_\n" "| -v -v| Print even more debug information while running _Subsurface_\n" -"|--version|Prints the current version of _Subsurface_.\n" -"|--survey|Opens the xref:S_UserSurvey[user survey] immediately after starting _Subsurface_\n" -"|--user=<username>|Choose the xref:S_user_space[configuration space] of user <username>\n" -"|--cloud-timeout=<duration>|Set the timeout for cloud connection (0 < duration < 60). This enables longer timeouts for slow Internet connections\n" -"|--win32console|Create a dedicated console if needed (Windows only). Add this option before everything else\n" +"|--version|Prints the current version of _Subsurface_\n" +"|--survey|Opens the xref:S_UserSurvey[user survey] immediately after starting" +" _Subsurface_\n" +"|--user=<username>|Choose the xref:S_user_space[configuration space] of user" +" <username>\n" +"|--cloud-timeout=<duration>|Set the timeout for cloud connection (0 <" +" duration < 60). This enables longer timeouts for slow Internet connections\n" +"|--win32console|Create a dedicated console if needed (Windows only). Add this" +" option before everything else\n" +"|--win32log|Write the program output to subsurface.log (Windows only). Add" +" option before everything else\n" msgstr "" #. type: Title == -#: user-manual.txt:3831 +#: user-manual.txt:3827 #, 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:3836 +#: user-manual.txt:3832 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 " @@ -7787,13 +8190,13 @@ msgstr "" "des sections de ce manuel traitant des opérations relatives." #. type: Title === -#: user-manual.txt:3837 +#: user-manual.txt:3833 #, no-wrap msgid "File" msgstr "Fichier" #. type: Plain text -#: user-manual.txt:3840 +#: user-manual.txt:3836 msgid "" "<<S_NewLogbook,_New Logbook_>> - Close the currently open dive logbook and " "clear all dive information." @@ -7802,7 +8205,7 @@ msgstr "" "actuellement ouvert et supprime toutes les informations de plongées." #. type: Plain text -#: user-manual.txt:3842 +#: user-manual.txt:3838 msgid "" "_Open logbook_ - Open the file manager to select a dive logbook to open." msgstr "" @@ -7810,44 +8213,44 @@ msgstr "" "carnet de plongée à ouvrir." #. type: Plain text -#: user-manual.txt:3843 +#: user-manual.txt:3839 msgid "_Save_ - Save the dive logbook currently open." msgstr "_Sauvegarder_ - Enregistrer le carnet de plongée actuellement ouvert." #. type: Plain text -#: user-manual.txt:3844 +#: user-manual.txt:3840 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:3845 +#: user-manual.txt:3841 msgid "" "_Open cloud storage_ - Open the dive log previously saved in " "<<S_Cloud_storage,_Cloud storage_>>." msgstr "" #. type: Plain text -#: user-manual.txt:3846 +#: user-manual.txt:3842 msgid "" "_Save to cloud storage_ - Save the current dive log to <<S_Cloud_storage," "_Cloud storage_>>." msgstr "" #. type: Plain text -#: user-manual.txt:3847 +#: user-manual.txt:3843 msgid "" "_Take cloud storage online_ - " "******************************************************" msgstr "" #. type: Plain text -#: user-manual.txt:3848 +#: user-manual.txt:3844 msgid "_Close_ - Close the dive logbook currently open." msgstr "_Fermer_ - Fermer le carnet de plongée actuellement ouvert." #. type: Plain text -#: user-manual.txt:3850 +#: user-manual.txt:3846 msgid "" "<<S_ExportLog,_Export_>> - Export the currently open dive logbook (or the " "selected dives in the logbook) to one of several formats." @@ -7857,34 +8260,34 @@ msgstr "" "formats." #. type: Plain text -#: user-manual.txt:3851 +#: user-manual.txt:3847 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:3852 +#: user-manual.txt:3848 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:3853 +#: user-manual.txt:3849 msgid "" "<<S_FindMovedImages, _Find moved images_>> - If photos taken during dives " "have been moved to" msgstr "" #. type: Plain text -#: user-manual.txt:3854 +#: user-manual.txt:3850 msgid "" "a different disk or directory, locate them and link them to the appropriate " "dives." msgstr "" #. type: Plain text -#: user-manual.txt:3855 +#: user-manual.txt:3851 msgid "" "<<S_Configure,_Configure dive computer_>> - Edit the configuration of a dive " "computer." @@ -7893,30 +8296,30 @@ msgstr "" "configuration d'un ordinateur de plongée." #. type: Plain text -#: user-manual.txt:3856 +#: user-manual.txt:3852 msgid "_Quit_ - Quit _Subsurface_." msgstr "_Quitter_ - Quitter _Subsurface_." #. type: Title === -#: user-manual.txt:3858 +#: user-manual.txt:3854 #, no-wrap msgid "Edit" msgstr "" #. type: Plain text -#: user-manual.txt:3860 +#: user-manual.txt:3856 msgid "" "The Edit option allows one to undo or redo an action, e.g. deleting dives." msgstr "" #. type: Title === -#: user-manual.txt:3861 +#: user-manual.txt:3857 #, no-wrap msgid "Import" msgstr "Importer" #. type: Plain text -#: user-manual.txt:3864 +#: user-manual.txt:3860 msgid "" "<<S_ImportDiveComputer,_Import from dive computer_>> - Import dive " "information from a dive computer." @@ -7925,7 +8328,7 @@ msgstr "" "Importer des informations de plongées à partir de l'ordinateur de plongée." #. type: Plain text -#: user-manual.txt:3866 +#: user-manual.txt:3862 msgid "" "<<Unified_import,_Import Log Files_>> - Import dive information from a file " "in in a _Subsurface_-compatible format." @@ -7935,7 +8338,7 @@ msgstr "" "_Subsurface_." #. type: Plain text -#: user-manual.txt:3868 +#: user-manual.txt:3864 msgid "" "<<S_Companion,_Import GPS data from Subsurface web service_>> - Load GPS " "coordinates from the _Subsurface_ mobile phone app." @@ -7945,7 +8348,7 @@ msgstr "" "(téléphones et tablettes)." #. type: Plain text -#: user-manual.txt:3870 +#: user-manual.txt:3866 msgid "" "<<S_ImportingDivelogsDe,_Import from Divelogs.de_>> - Import dive " "information from _www.Divelogs.de_." @@ -7954,13 +8357,13 @@ msgstr "" "informations de plongées à partir de _www.Divelogs.de_." #. type: Title === -#: user-manual.txt:3871 +#: user-manual.txt:3867 #, no-wrap msgid "Log" msgstr "Journal (log)" #. type: Plain text -#: user-manual.txt:3873 +#: user-manual.txt:3869 msgid "" "<<S_EnterData,_Add Dive_>> - Manually add a new dive to the *Dive List* " "panel." @@ -7969,19 +8372,19 @@ msgstr "" "plongée au panneau de la *liste des plongées*." #. type: Plain text -#: user-manual.txt:3874 +#: user-manual.txt:3870 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:3875 +#: user-manual.txt:3871 msgid "<<S_DivePlanner,_Plan Dive_>> - Plan dives." msgstr "<<S_DivePlanner,_Planifier une plongée_>> - Planifier des plongées." #. type: Plain text -#: user-manual.txt:3876 +#: user-manual.txt:3872 msgid "" "<<S_Replan,_Edit dive in planner_>> - Edit a dive plan that has been saved " "into the *Dive List*." @@ -7990,7 +8393,7 @@ msgstr "" "plongée planifiée qui a été enregistrée dans la *liste des plongées*." #. type: Plain text -#: user-manual.txt:3878 +#: user-manual.txt:3874 msgid "" "<<S_CopyComponents,_Copy dive components_>> - Copy information from several " "fields of a dive log onto the clipboard." @@ -8000,7 +8403,7 @@ msgstr "" "papier." #. type: Plain text -#: user-manual.txt:3880 +#: user-manual.txt:3876 msgid "" "_Paste dive components_ - Paste, into the selected dives in the *Dive List*, " "the information copied using the _Copy dive components_ option." @@ -8010,7 +8413,7 @@ msgstr "" "préalable avec l'option _Copier les composants de la plongée_." #. type: Plain text -#: user-manual.txt:3882 +#: user-manual.txt:3878 msgid "" "<<S_Renumber,_Renumber_>> - Renumber the dives listed in the *Dive List* " "panel." @@ -8019,7 +8422,7 @@ msgstr "" "le panneau de la *liste des plongées*." #. type: Plain text -#: user-manual.txt:3884 +#: user-manual.txt:3880 msgid "" "<<S_Group,_Auto Group_>> - Group the dives in the *Dive List* panel into " "dive trips." @@ -8028,7 +8431,7 @@ msgstr "" "*liste des plongées* dans des voyages de plongées." #. type: Plain text -#: user-manual.txt:3885 +#: user-manual.txt:3881 msgid "" "<<S_DeviceNames,_Edit Device Names_>> - Edit the names of dive computers to " "coordinate your logs." @@ -8037,7 +8440,7 @@ msgstr "" "les noms des ordinateurs de plongée pour coordonner vos journaux (logs)." #. type: Plain text -#: user-manual.txt:3886 +#: user-manual.txt:3882 msgid "" "<<S_Filter,_Filter divelist_>> - Select only some dives, based on specific " "tags or dive criteria." @@ -8046,13 +8449,13 @@ msgstr "" "certaines plongées, à partir de tags ou de critères de plongées." #. type: Title === -#: user-manual.txt:3887 +#: user-manual.txt:3883 #, no-wrap msgid "View" msgstr "Vue" #. type: Plain text -#: user-manual.txt:3890 +#: user-manual.txt:3886 msgid "" "<<S_ViewPanels,_All_>> - View the four main _Subsurface_ panels all at once." msgstr "" @@ -8060,33 +8463,33 @@ msgstr "" "_Subsurface_ simultanément." #. type: Plain text -#: user-manual.txt:3891 +#: user-manual.txt:3887 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:3892 +#: user-manual.txt:3888 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:3893 +#: user-manual.txt:3889 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:3894 +#: user-manual.txt:3890 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:3896 +#: user-manual.txt:3892 msgid "" "_Yearly Statistics_ - Display summary statistics about dives during this and " "past years." @@ -8095,7 +8498,7 @@ msgstr "" "plongées effectuées." #. type: Plain text -#: user-manual.txt:3899 +#: user-manual.txt:3895 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," @@ -8104,23 +8507,23 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3900 +#: user-manual.txt:3896 msgid "_Next DC_ - Switch to next dive computer." msgstr "_Ordinateur suivant_ - Passer à l'ordinateur de plongée suivant." #. type: Plain text -#: user-manual.txt:3901 +#: user-manual.txt:3897 msgid "_Full Screen_ - Toggles Full Screen mode." msgstr "_Plein écran_ - Passer en mode plein écran." #. type: Title === -#: user-manual.txt:3902 +#: user-manual.txt:3898 #, no-wrap msgid "Share on" msgstr "" #. type: Plain text -#: user-manual.txt:3904 +#: user-manual.txt:3900 msgid "" "<<S_Facebook,_Facebook_>> - Share the currently selected dive on your " "Facebook timeline." @@ -8129,13 +8532,13 @@ msgstr "" "Facebook." #. type: Title === -#: user-manual.txt:3905 +#: user-manual.txt:3901 #, no-wrap msgid "Help" msgstr "Aide" #. type: Plain text -#: user-manual.txt:3908 +#: user-manual.txt:3904 msgid "" "_About Subsurface_ - Show a panel with the version number of _Subsurface_ as " "well as licensing information." @@ -8144,17 +8547,20 @@ msgstr "" "_Subsurface_ ainsi que les informations de licence." #. type: Plain text -#: user-manual.txt:3910 +#: user-manual.txt:3906 +#| msgid "" +#| "_Check for updates_ - Find out whether a newer version of Subsurface is " +#| "available on the http://subsurface-divelog.org/[_Subsurface_ web site]." msgid "" "_Check for updates_ - Find out whether a newer version of Subsurface is " -"available on the http://subsurface-divelog.org/[_Subsurface_ web site]." +"available on the https://subsurface-divelog.org/[_Subsurface_ web site]." msgstr "" "_Vérifier les mises à jour_ - Vérifier si une nouvelle version de " -"Subsurface est disponible sur le http://subsurface-divelog.org/[site web de " +"Subsurface est disponible sur le https://subsurface-divelog.org/[site web de " "_Subsurface_ ]." #. type: Plain text -#: user-manual.txt:3912 +#: user-manual.txt:3908 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 " @@ -8165,31 +8571,35 @@ msgstr "" "sondage, si vos habitudes de plongées ont changées." #. type: Plain text -#: user-manual.txt:3913 +#: user-manual.txt:3909 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:3916 +#: user-manual.txt:3912 #, no-wrap -msgid "APPENDIX A: Operating system specific information for importing dive information from a dive computer." -msgstr "ANNEXE A : informations spécifiques au système d'exploitation utilisé pour importer les informations de plongées depuis un ordinateur de plongée." +msgid "" +"APPENDIX A: Operating system specific information for importing dive" +" information from a dive computer." +msgstr "" +"ANNEXE A : informations spécifiques au système d'exploitation utilisé pour" +" importer les informations de plongées depuis un ordinateur de plongée." #. type: Title === -#: user-manual.txt:3918 +#: user-manual.txt:3914 #, 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:3919 +#: user-manual.txt:3915 #, no-wrap msgid "images/icons/drivers.jpg" msgstr "images/icons/drivers.jpg" #. type: Plain text -#: user-manual.txt:3924 +#: user-manual.txt:3920 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 " @@ -8200,7 +8610,7 @@ msgstr "" "l'ordinateur de plongée (Bluetooth, USB, infra-rouge)." #. type: Plain text -#: user-manual.txt:3930 +#: user-manual.txt:3926 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 " @@ -8214,7 +8624,7 @@ msgstr "" "particulièrement pour certaines technologies telles que l'infra-rouge." #. type: Plain text -#: user-manual.txt:3934 +#: user-manual.txt:3930 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 " @@ -8225,12 +8635,20 @@ msgstr "" "port USB de son ordinateur de bureau." #. type: Plain text -#: user-manual.txt:3941 +#: user-manual.txt:3937 +#| 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 computer using a USB-to-serial interface based on the Silicon Labs " +#| "CP2101 or similar chip can be found as _Mac_OSX_VCP_Driver.zip_ at the " +#| "http://www.silabs.com/support/pages/document-library.aspx?" +#| "p=Interface&f=USB%20Bridges&pn=CP2101[Silicon Labs document and software " +#| "repository]." 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 " "computer using a USB-to-serial interface based on the Silicon Labs CP2101 or " -"similar chip can be found as _Mac_OSX_VCP_Driver.zip_ at the http://www." +"similar chip can be found as _Mac_OSX_VCP_Driver.zip_ at the https://www." "silabs.com/support/pages/document-library.aspx?p=Interface&f=USB" "%20Bridges&pn=CP2101[Silicon Labs document and software repository]." msgstr "" @@ -8238,24 +8656,27 @@ msgstr "" "manuellement le bon pilote. Par exemple, pour le Mares Puck ou n'importe " "quel autre ordinateur de plongée utilisant une interface USB-série basé sur " "le composant Silicon Labs CP2101 ou similaire, le bon pilote est disponible " -"sous _Mac_OSX_VCP_Driver.zip_ sur le http://www.silabs.com/support/pages/" +"sous _Mac_OSX_VCP_Driver.zip_ sur le https://www.silabs.com/support/pages/" "document-library.aspx?p=Interface&f=USB%20Bridges&pn=CP2101[dépôt de " "documents et logiciels Silicon Labs]." #. type: Title === -#: user-manual.txt:3943 +#: user-manual.txt:3939 #, no-wrap -msgid "How to Find the Device Name for USB devices and set its write permission" -msgstr "Comment trouver le nom du périphérique branché sur USB et paramétrer les permissions en écriture" +msgid "" +"How to Find the Device Name for USB devices and set its write permission" +msgstr "" +"Comment trouver le nom du périphérique branché sur USB et paramétrer les" +" permissions en écriture" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:3944 +#: user-manual.txt:3940 #, no-wrap msgid "images/icons/usb.jpg" msgstr "images/icons/usb.jpg" #. type: Plain text -#: user-manual.txt:3952 +#: user-manual.txt:3948 msgid "" "When connecting a dive computer by using a USB connector, usually " "_Subsurface_ will either propose a drop down list with the correct device " @@ -8271,7 +8692,7 @@ msgstr "" "de votre périphérique ;" #. type: Plain text -#: user-manual.txt:3957 +#: user-manual.txt:3953 msgid "" "Simply try COM1, COM2, etc. The drop down list should contain all connected " "COM devices." @@ -8280,56 +8701,56 @@ msgstr "" "tous les périphériques COM connectés." #. type: Title ==== -#: user-manual.txt:3958 user-manual.txt:4056 +#: user-manual.txt:3954 user-manual.txt:4052 #, no-wrap msgid "On MacOS:" msgstr "Sur MacOS :" #. type: Plain text -#: user-manual.txt:3961 +#: user-manual.txt:3957 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:3962 +#: user-manual.txt:3958 #, no-wrap msgid "On Linux:" msgstr "Sur Linux :" #. type: Plain text -#: user-manual.txt:3965 +#: user-manual.txt:3961 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:3967 +#: user-manual.txt:3963 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:3968 +#: user-manual.txt:3964 msgid "Open a terminal" msgstr "Ouvrir un terminal" #. type: Plain text -#: user-manual.txt:3969 user-manual.txt:3971 +#: user-manual.txt:3965 user-manual.txt:3967 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:3970 +#: user-manual.txt:3966 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:3973 +#: user-manual.txt:3969 msgid "A message similar to this one should appear:" msgstr "Un message similaire à celui-ci devrait apparaitre :" #. type: Plain text -#: user-manual.txt:3989 +#: user-manual.txt:3985 #, no-wrap msgid "" "\tusb 2-1.1: new full speed USB device number 14 using ehci_hcd\n" @@ -8365,7 +8786,7 @@ msgstr "" "\tftdi_sio: v1.6.0:USB FTDI Serial Converters Driver\n" #. type: Plain text -#: user-manual.txt:3994 +#: user-manual.txt:3990 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 " @@ -8377,14 +8798,14 @@ msgstr "" "que Subsurface utilise le bon port USB." #. type: Plain text -#: user-manual.txt:3996 +#: user-manual.txt:3992 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:4006 +#: user-manual.txt:4002 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 " @@ -8404,7 +8825,7 @@ msgstr "" "USB. Admettons que votre nom d'utilisateur soit 'johnB'." #. type: Plain text -#: user-manual.txt:4010 +#: user-manual.txt:4006 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." @@ -8414,33 +8835,36 @@ msgstr "" "+dialout+." #. type: Plain text -#: user-manual.txt:4015 +#: user-manual.txt:4011 #, no-wrap msgid "" "Type: +id johnB+ This lists all the groups that johnB belongs to and\n" "verifies that\n" -"the appropriate group membership has been created. The +dialout+ group should\n" +"the appropriate group membership has been created. The +dialout+ group" +" should\n" "be listed\n" "among the different IDs.\n" msgstr "" -"Tapez : +id johnB+ Cela liste tous les groupes auquel johnB appartient et\n" +"Tapez : +id johnB+ Cela liste tous les groupes auquel johnB appartient" +" et\n" "vérifiez que \n" "l'appartenance au groupe est bien effectif. Le groupe +dialout+ devrait \n" "être listé\n" "parmi les différents IDs.\n" #. type: Plain text -#: user-manual.txt:4017 +#: user-manual.txt:4013 #, no-wrap msgid "" "Under some circumstances this change takes only effect (eg. on Ubuntu) after\n" "you log out and then log in again.\n" msgstr "" -"Sous certaines circonstances, les modifications ne prennent effet qu'après une déconnexion\n" +"Sous certaines circonstances, les modifications ne prennent effet qu'après" +" une déconnexion\n" "puis reconnexion sur l'ordinateur (sous Ubuntu, par exemple).\n" #. type: Plain text -#: user-manual.txt:4022 +#: user-manual.txt:4018 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 " @@ -8451,13 +8875,13 @@ msgstr "" "vous devriez pouvoir importer vos plongées." #. type: Title === -#: user-manual.txt:4025 +#: user-manual.txt:4021 #, no-wrap msgid "Manually setting up Bluetooth enabled devices" msgstr "" #. type: Plain text -#: user-manual.txt:4032 +#: user-manual.txt:4028 msgid "" "For dive computers communicating through Bluetooth like the Heinrichs " "Weikamp Frog or the Shearwater Predator, Petrel and Nerd there is a " @@ -8466,13 +8890,15 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4034 +#: user-manual.txt:4030 #, no-wrap -msgid "*For the dive computer, after enabling Bluetooth, be sure it is in Upload mode.*\n" +msgid "" +"*For the dive computer, after enabling Bluetooth, be sure it is in Upload" +" mode.*\n" msgstr "" #. type: Plain text -#: user-manual.txt:4038 +#: user-manual.txt:4034 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 -> " @@ -8480,13 +8906,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4040 +#: user-manual.txt:4036 #, no-wrap msgid "*Pair the _Subsurface_ computer with the dive computer.*\n" msgstr "" #. type: Plain text -#: user-manual.txt:4049 +#: user-manual.txt:4045 msgid "" "Bluetooth is most likely already enabled. For pairing with the dive computer " "choose _Control Panel -> Bluetooth Devices -> Add Wireless Device_. This " @@ -8498,21 +8924,21 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4052 +#: user-manual.txt:4048 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:4055 +#: user-manual.txt:4051 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:4062 +#: user-manual.txt:4058 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. " @@ -8521,20 +8947,20 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4065 +#: user-manual.txt:4061 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:4066 +#: user-manual.txt:4062 #, no-wrap msgid "On Linux" msgstr "Sur Linux" #. type: Plain text -#: user-manual.txt:4074 +#: user-manual.txt:4070 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 " @@ -8546,7 +8972,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4078 +#: user-manual.txt:4074 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 " @@ -8555,23 +8981,23 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4080 +#: user-manual.txt:4076 msgid "Enable the Bluetooth controller and pair your dive computer" msgstr "" #. type: Plain text -#: user-manual.txt:4081 +#: user-manual.txt:4077 msgid "Establish an RFCOMM connection" msgstr "" #. type: Title ===== -#: user-manual.txt:4082 user-manual.txt:4222 +#: user-manual.txt:4078 user-manual.txt:4218 #, no-wrap msgid "Download the dives with Subsurface" msgstr "" #. type: Plain text -#: user-manual.txt:4088 +#: user-manual.txt:4084 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 " @@ -8582,7 +9008,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4093 +#: user-manual.txt:4089 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 " @@ -8592,23 +9018,23 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4095 +#: user-manual.txt:4091 msgid "+sudo usermod -a -G dialout username+" msgstr "" #. type: Plain text -#: user-manual.txt:4097 +#: user-manual.txt:4093 msgid "Then log out and log in for the change to take effect." msgstr "" #. type: Title ===== -#: user-manual.txt:4098 +#: user-manual.txt:4094 #, no-wrap msgid "Enabling the Bluetooth controller and pairing your dive computer" msgstr "" #. type: Plain text -#: user-manual.txt:4104 +#: user-manual.txt:4100 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 " @@ -8619,14 +9045,14 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4107 +#: user-manual.txt:4103 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" +"Open a terminal and use +hciconfig+ to check the Bluetooth controller status." msgstr "" #. type: Plain text -#: user-manual.txt:4114 +#: user-manual.txt:4110 #, no-wrap msgid "" "\t$ hciconfig\n" @@ -8638,7 +9064,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4119 +#: user-manual.txt:4115 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 " @@ -8648,7 +9074,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4127 +#: user-manual.txt:4123 #, no-wrap msgid "" "\tsudo hciconfig hci0 up auth+ (enter password when prompted)\n" @@ -8661,25 +9087,25 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4129 +#: user-manual.txt:4125 msgid "Check that the status now includes +'UP', 'RUNNING' AND 'AUTH'+." msgstr "" #. type: Plain text -#: user-manual.txt:4131 +#: user-manual.txt:4127 msgid "" -"If there are multiple controllers running, it's easiest to off the unused " -"controller(s). For example, for +hci1+:" +"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:4133 +#: user-manual.txt:4129 #, no-wrap msgid "\tsudo hciconfig hci1 down\n" msgstr "" #. type: Plain text -#: user-manual.txt:4136 +#: user-manual.txt:4132 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 " @@ -8687,7 +9113,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4157 +#: user-manual.txt:4153 #, no-wrap msgid "" "\tbluetoothctl\n" @@ -8696,11 +9122,13 @@ msgid "" "\tAgent registered\n" "\t[bluetooth]# default-agent\n" "\tDefault agent request successful\n" -"\t[bluetooth]# scan on <----now set your dive computer to upload mode\n" +"\t[bluetooth]# scan on <----now set your dive computer" +" to upload mode\n" "\tDiscovery started\n" "\t[CHG] Controller 01:23:45:67:89:AB Discovering: yes\n" "\t[NEW] Device 00:11:22:33:44:55 Petrel\n" -"\t[bluetooth]# trust 00:11:22:33:44:55 <----you can use the tab key to autocomplete the MAC address\n" +"\t[bluetooth]# trust 00:11:22:33:44:55 <----you can use the tab key to" +" autocomplete the MAC address\n" "\t[CHG] Device 00:11:22:33:44:55 Trusted: yes\n" "\tChanging 00:11:22:33:44:55 trust succeeded\n" "\t[bluetooth]# pair 00:11:22:33:44:55\n" @@ -8713,14 +9141,14 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4160 +#: user-manual.txt:4156 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:4163 +#: user-manual.txt:4159 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-" @@ -8728,7 +9156,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4168 +#: user-manual.txt:4164 #, no-wrap msgid "" "\thcitool -i hci0 scanning\n" @@ -8738,94 +9166,96 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4170 -msgid "Once ther dive computer is pired, set up the RFCOMM connection" +#: user-manual.txt:4166 +msgid "Once the dive computer is paired, set up the RFCOMM connection." msgstr "" #. type: Title ===== -#: user-manual.txt:4171 +#: user-manual.txt:4167 #, no-wrap msgid "Establishing the RFCOMM connection" msgstr "" #. type: Plain text -#: user-manual.txt:4174 +#: user-manual.txt:4170 msgid "The command to establish an RFCOMM connection is:" msgstr "" #. type: Plain text -#: user-manual.txt:4176 +#: user-manual.txt:4172 msgid "+sudo rfcomm -i <controller> connect <dev> <bdaddr> [channel]+" msgstr "" #. type: Plain text -#: user-manual.txt:4178 +#: user-manual.txt:4174 msgid "+<controller>+ is the Bluetooth controller, +hci0+." msgstr "" #. type: Plain text -#: user-manual.txt:4179 +#: user-manual.txt:4175 msgid "+<dev>+ is the RFCOMM device file, +rfcomm0+" msgstr "" #. type: Plain text -#: user-manual.txt:4180 +#: user-manual.txt:4176 msgid "+<bdaddr>+ is the dive computer's MAC address, +00:11:22:33:44:55+" msgstr "" #. type: Plain text -#: user-manual.txt:4181 +#: user-manual.txt:4177 msgid "" "+[channel]+ is the dive computer's Bluetooth channel we need to connect to." msgstr "" #. type: Plain text -#: user-manual.txt:4184 +#: user-manual.txt:4180 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:4186 +#: user-manual.txt:4182 msgid "_Shearwater Petrel 1_: channel 1" msgstr "" #. type: Plain text -#: user-manual.txt:4187 +#: user-manual.txt:4183 msgid "_Shearwater Petrel 2_: channel 5" msgstr "" #. type: Plain text -#: user-manual.txt:4188 +#: user-manual.txt:4184 msgid "_Shearwater Nerd_: channel 5" msgstr "" #. type: Plain text -#: user-manual.txt:4189 +#: user-manual.txt:4185 msgid "_Heinrichs-Weikamp OSTC Sport_: channel 1" msgstr "" #. type: Plain text -#: user-manual.txt:4191 +#: user-manual.txt:4187 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:4193 +#: user-manual.txt:4189 #, no-wrap -msgid "\tsudo rfcomm -i hci0 connect rfcomm0 00:11:22:33:44:55 5 (enter a password, probably 0000, when prompted)\n" +msgid "" +"\tsudo rfcomm -i hci0 connect rfcomm0 00:11:22:33:44:55 5 (enter a password," +" probably 0000, when prompted)\n" msgstr "" #. type: Plain text -#: user-manual.txt:4195 +#: user-manual.txt:4191 msgid "This gives the response:" msgstr "" #. type: Plain text -#: user-manual.txt:4198 +#: user-manual.txt:4194 #, no-wrap msgid "" "\tConnected /dev/rfcomm0 to 00:11:22:33:44:55 on channel 5\n" @@ -8833,23 +9263,24 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4200 +#: user-manual.txt:4196 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:4204 +#: user-manual.txt:4200 #, no-wrap msgid "" -"\tsudo rfcomm -i hci0 connect rfcomm0 00:11:22:33:44:55 (enter a password, probably 0000, when prompted)\n" +"\tsudo rfcomm -i hci0 connect rfcomm0 00:11:22:33:44:55 (enter a password," +" probably 0000, when prompted)\n" "\tConnected /dev/rfcomm0 to 00:11:22:33:44:55 on channel 1\n" "\tPress CTRL-C for hangup\n" msgstr "" #. type: Plain text -#: user-manual.txt:4208 +#: user-manual.txt:4204 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 " @@ -8858,7 +9289,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4218 +#: user-manual.txt:4214 #, no-wrap msgid "" "\tsdptool -i hci0 records 00:11:22:33:44:55\n" @@ -8873,7 +9304,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4221 +#: user-manual.txt:4217 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 " @@ -8881,7 +9312,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4224 +#: user-manual.txt:4220 msgid "" "After establishing the RFCOMM connection and while the dive computer's " "upload mode countdown is still running, go to_Subsurface_, select _Import-" @@ -8891,25 +9322,25 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:4230 +#: user-manual.txt:4226 #, no-wrap msgid "APPENDIX B: Dive Computer specific information for importing dive data." msgstr "" #. type: Title === -#: user-manual.txt:4233 +#: user-manual.txt:4229 #, no-wrap msgid "Importing from Uemis Zurich" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4235 +#: user-manual.txt:4231 #, no-wrap msgid "images/icons/iumis.jpg" msgstr "images/icons/iumis.jpg" #. type: Plain text -#: user-manual.txt:4251 +#: user-manual.txt:4247 msgid "" "_Subsurface_ downloads the information stored on the SDA (the built-in file " "system of the Uemis) including information about dive spots and equipment. " @@ -8925,7 +9356,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4266 +#: user-manual.txt:4262 msgid "" "After selecting the above device name, download the dives from the Uemis " "Zurich. One technical issue with the Uemis Zurich download implementation " @@ -8942,19 +9373,19 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4268 +#: user-manual.txt:4264 #, no-wrap msgid "Importing from Uwatec Galileo" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4270 +#: user-manual.txt:4266 #, no-wrap msgid "images/icons/Galileo.jpg" msgstr "images/icons/Galileo.jpg" #. type: Plain text -#: user-manual.txt:4285 +#: user-manual.txt:4281 msgid "" "The Uwatec Galileo dive computers use infra red (IrDA) communication between " "the dive computer and Subsurface. The Uwatec hardware uses a USB dongle " @@ -8970,14 +9401,14 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4288 +#: user-manual.txt:4284 msgid "" "After executing this command, Subsurface will recognize the Galileo dive " "computer and download dive information." msgstr "" #. type: Plain text -#: user-manual.txt:4294 +#: user-manual.txt:4290 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/" @@ -8987,77 +9418,77 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4297 +#: user-manual.txt:4293 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:4299 +#: user-manual.txt:4295 #, no-wrap msgid "Importing from Heinrichs Weikamp DR5" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4301 +#: user-manual.txt:4297 #, no-wrap msgid "images/icons/HW_DR5.jpg" msgstr "images/icons/HW_DR5.jpg" #. type: Plain text -#: user-manual.txt:4311 +#: user-manual.txt:4307 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. " "Note: The DR5 does not seem to store gradient factors nor deco information, " "so for _Subsurface_ it is not possible to display them. Adjust the gradient " -"factors in the _Graph Settings_ in _Subsurface_ to generate a deco overlay " +"factors in the _Profile Settings_ in _Subsurface_ to generate a deco overlay " "in the _Subsurface_ *Dive Profile* panel but please note that the deco " "calculated by _Subsurface_ will most likely differ from the one displayed on " "the DR5." msgstr "" #. type: Title === -#: user-manual.txt:4314 +#: user-manual.txt:4310 #, no-wrap msgid "Importing from xDEEP BLACK" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4316 +#: user-manual.txt:4312 #, no-wrap msgid "images/icons/HW_xdeepblack.jpg" msgstr "images/icons/HW_xdeepblack.jpg" #. type: Plain text -#: user-manual.txt:4325 +#: user-manual.txt:4321 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 " "available in LOGBOOK directory. Note: The xDEEP BLACK saves NDL time but " "does not seem to store gradient factors nor deco information, so for " "_Subsurface_ it is not possible to display them. Adjust the gradient factors " -"in the _Graph Settings_ in _Subsurface_ to generate a deco overlay in the " +"in the _Profile Settings_ in _Subsurface_ to generate a deco overlay in the " "_Subsurface_ *Dive Profile* panel but please note that the deco calculated " "by _Subsurface_ will most likely differ from the one displayed on the xDEEP " "BLACK." msgstr "" #. type: Title === -#: user-manual.txt:4327 +#: user-manual.txt:4323 #, no-wrap msgid "Importing from Shearwater Predator/Petrel/Nerd using Bluetooth" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4329 +#: user-manual.txt:4325 #, no-wrap msgid "images/icons/predator.jpg" msgstr "images/icons/predator.jpg" #. type: Plain text -#: user-manual.txt:4332 +#: user-manual.txt:4328 msgid "" "Specific instructions for downloading dives using Bluetooth are given in the " "section above, <<S_Bluetooth,_Connecting Subsurface to a Bluetooth-enabled " @@ -9065,19 +9496,19 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4334 +#: user-manual.txt:4330 #, no-wrap msgid "Importing from Poseidon MkVI Discovery" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4336 +#: user-manual.txt:4332 #, no-wrap msgid "images/MkVI.jpeg" msgstr "images/MkVI.jpeg" #. type: Plain text -#: user-manual.txt:4344 +#: user-manual.txt:4340 msgid "" "Download of dive logs from the MkVI is performed using a custom " "communications adapter and the _Poseidon PC Configuration Software_, " @@ -9089,45 +9520,45 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4347 +#: user-manual.txt:4343 msgid "" "Setup configuration for the dive and key dive parameters (file with a .txt " "extension)" msgstr "" #. type: Plain text -#: user-manual.txt:4348 +#: user-manual.txt:4344 msgid "Dive log details (file with a .csv extension)" msgstr "" #. type: Plain text -#: user-manual.txt:4350 +#: user-manual.txt:4346 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:4352 +#: user-manual.txt:4348 msgid "" "_Subsurface_ accesses the .txt and the .csv files to get dive log " "information." msgstr "" #. type: Title === -#: user-manual.txt:4354 +#: user-manual.txt:4350 #, no-wrap msgid "Importing from APD Inspiration/Evolution CCR" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4356 +#: user-manual.txt:4352 #, no-wrap msgid "images/APDComputer.jpg" msgstr "images/APDComputer.jpg" #. type: Plain text -#: user-manual.txt:4364 +#: user-manual.txt:4360 msgid "" "The dive logs of an APD Inspiration or similar CCR dive computer are " "downloaded using a communications adapter and _AP Communicator_, obtained " @@ -9139,55 +9570,55 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4366 +#: user-manual.txt:4362 msgid "Download the dive using _AP Communicator_." msgstr "" #. type: Plain text -#: user-manual.txt:4367 +#: user-manual.txt:4363 msgid "Open a dive within the _AP Log Viewer_." msgstr "" #. type: Plain text -#: user-manual.txt:4368 +#: user-manual.txt:4364 msgid "Select the tab at the top of the screen, entitled \"_Data_\"." msgstr "" #. type: Plain text -#: user-manual.txt:4369 +#: user-manual.txt:4365 msgid "" "With the raw dive log data show on the screen, click on \"_Copy to Clipboard_" "\"." msgstr "" #. type: Plain text -#: user-manual.txt:4370 +#: user-manual.txt:4366 msgid "Open a text editor, e.g. Notepad (Windows) or TextWrangler (Mac)." msgstr "" #. type: Plain text -#: user-manual.txt:4372 +#: user-manual.txt:4368 msgid "" "Copy the contents of the clipboard into the text editor and save the text " -"file with a filename extension of _.apd_" +"file with a filename extension of _.apd_." msgstr "" #. type: Plain text -#: user-manual.txt:4373 +#: user-manual.txt:4369 msgid "" "Within _Subsurface_, select _Import -> Import log files_ to open the xref:" "Unified_import[universal import dialogue]." msgstr "" #. type: Plain text -#: user-manual.txt:4374 +#: user-manual.txt:4370 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:4378 +#: user-manual.txt:4374 #, no-wrap msgid "" "On the list of file names select the _.apd_ file created. An import\n" @@ -9197,13 +9628,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:4379 +#: user-manual.txt:4375 #, no-wrap msgid "images/APD_CSVimportF22.jpg" msgstr "images/APD_CSVimportF22.jpg" #. type: Plain text -#: user-manual.txt:4387 +#: user-manual.txt:4383 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 " @@ -9215,12 +9646,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4388 +#: user-manual.txt:4384 msgid "Click the _Ok_ button at the bottom of the import panel." msgstr "" #. type: Plain text -#: user-manual.txt:4393 +#: user-manual.txt:4389 msgid "" "The APD dive log will appear within _Subsurface_. The dive computer- " "generated ceiling provided by the Inspiration can be viewed by selecting the " @@ -9230,13 +9661,14 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:4394 +#: user-manual.txt:4390 #, no-wrap -msgid "APPENDIX C: Exporting Dive log information from external dive log software." +msgid "" +"APPENDIX C: Exporting Dive log information from external dive log software." msgstr "" #. type: Plain text -#: user-manual.txt:4403 +#: user-manual.txt:4399 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, " @@ -9246,22 +9678,22 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4405 +#: user-manual.txt:4401 msgid "Export the foreign dive log data to format that is accessible from" msgstr "" #. type: Plain text -#: user-manual.txt:4406 +#: user-manual.txt:4402 msgid "_Subsurface_." msgstr "" #. type: Plain text -#: user-manual.txt:4407 +#: user-manual.txt:4403 msgid "Import the accessible dive log data into _Subsurface_." msgstr "" #. type: Plain text -#: user-manual.txt:4411 +#: user-manual.txt:4407 msgid "" "This appendix provides some information about approaches to export dive log " "data from foreign dive log software. The procedures below mostly apply to " @@ -9269,88 +9701,88 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4413 +#: user-manual.txt:4409 #, no-wrap msgid "Exporting from *Suunto Divemanager (DM3, DM4 or DM5)*" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4414 +#: user-manual.txt:4410 #, no-wrap msgid "images/icons/suuntologo.jpg" msgstr "images/icons/suuntologo.jpg" #. type: Plain text -#: user-manual.txt:4421 +#: user-manual.txt:4417 msgid "" -"DiveManager is a MS Windows application for Suunto dive computers. " -"Divemanager 3 (DM3) is an older version of the Suunto software. More recent " -"Suunto dive computers use Divemanager version 4 or 5 (DM4 or DM5). The " -"different versions of Divemanager use different methods and different file " -"naming conventions to export dive log data." +"DiveManager is a Windows application for Suunto dive computers. Divemanager " +"3 (DM3) is an older version of the Suunto software. More recent Suunto dive " +"computers use Divemanager version 4 or 5 (DM4 or DM5). The different " +"versions of Divemanager use different methods and different file naming " +"conventions to export dive log data." msgstr "" #. type: Plain text -#: user-manual.txt:4423 +#: user-manual.txt:4419 #, no-wrap msgid "*Divemanager 3 (DM3):*\n" msgstr "" #. type: Plain text -#: user-manual.txt:4425 +#: user-manual.txt:4421 msgid "" "Start 'Suunto Divemanager 3' and log in with the name containing the logs" msgstr "" #. type: Plain text -#: user-manual.txt:4426 +#: user-manual.txt:4422 msgid "Do not start the import wizard to import dives from the dive computer." msgstr "" #. type: Plain text -#: user-manual.txt:4428 +#: user-manual.txt:4424 msgid "" "In the navigation tree on the left side of the program-window, select the " "appropriate dives." msgstr "" #. type: Plain text -#: user-manual.txt:4429 +#: user-manual.txt:4425 msgid "" "Within the list of dives, select the dives you would like to import later:" msgstr "" #. type: Plain text -#: user-manual.txt:4430 +#: user-manual.txt:4426 msgid "To select certain dives: hold 'ctrl' and click the dive" msgstr "" #. type: Plain text -#: user-manual.txt:4432 +#: user-manual.txt:4428 msgid "" "To select all dives: Select the first dive, hold down shift and select the " "last dive" msgstr "" #. type: Plain text -#: user-manual.txt:4433 +#: user-manual.txt:4429 msgid "With the dives marked, use the program menu _File -> Export_" msgstr "" #. type: Plain text -#: user-manual.txt:4434 +#: user-manual.txt:4430 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:4435 +#: user-manual.txt:4431 msgid "Click the browse button next to the field Export Path" msgstr "" #. type: Plain text -#: user-manual.txt:4437 +#: user-manual.txt:4433 #, no-wrap msgid "" "** A file-manager like window pops up\n" @@ -9358,13 +9790,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4438 +#: user-manual.txt:4434 #, no-wrap msgid "Divelog.SDE file\n" msgstr "" #. type: Plain text -#: user-manual.txt:4440 +#: user-manual.txt:4436 #, no-wrap msgid "" "** Optionally change the name of the file for saving\n" @@ -9372,25 +9804,25 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4441 +#: user-manual.txt:4437 #, no-wrap msgid "Back in the Export pop-up, press the button 'Export'\n" msgstr "" #. type: Plain text -#: user-manual.txt:4442 +#: user-manual.txt:4438 #, no-wrap msgid "The dives are now exported to the file Divelog.SDE.\n" msgstr "" #. type: Plain text -#: user-manual.txt:4444 +#: user-manual.txt:4440 #, no-wrap msgid "*Divemanager 4 (DM4) and Divemanager 5 (DM5):*\n" msgstr "" #. type: Plain text -#: user-manual.txt:4449 +#: user-manual.txt:4445 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 " @@ -9399,103 +9831,102 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4451 +#: user-manual.txt:4447 msgid "Locating the Suunto DM4 (or DM5) database:" msgstr "" #. type: Plain text -#: user-manual.txt:4453 user-manual.txt:4462 +#: user-manual.txt:4449 user-manual.txt:4458 msgid "Start Suunto DM4/DM5" msgstr "" #. type: Plain text -#: user-manual.txt:4454 +#: user-manual.txt:4450 msgid "Select 'Help -> About'" msgstr "" #. type: Plain text -#: user-manual.txt:4455 +#: user-manual.txt:4451 msgid "Click 'Copy' after text 'Copy log folder path to clipboard'" msgstr "" #. type: Plain text -#: user-manual.txt:4456 +#: user-manual.txt:4452 msgid "Open Windows Explorer" msgstr "Ouvrir l'explorateur Windows" #. type: Plain text -#: user-manual.txt:4457 +#: user-manual.txt:4453 msgid "Paste the address to the path box at the top of the File Explorer" msgstr "" #. type: Plain text -#: user-manual.txt:4458 +#: user-manual.txt:4454 msgid "The database is called DM4.db or DM5.db" msgstr "" #. type: Plain text -#: user-manual.txt:4460 +#: user-manual.txt:4456 msgid "Making a backup copy of the Suunto DM4/DM5 database:" msgstr "" #. type: Plain text -#: user-manual.txt:4463 +#: user-manual.txt:4459 msgid "Select 'File - Create backup'" msgstr "" #. type: Plain text -#: user-manual.txt:4465 +#: user-manual.txt:4461 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:4466 +#: user-manual.txt:4462 msgid "Click 'Save'" msgstr "" #. type: Plain text -#: user-manual.txt:4467 +#: user-manual.txt:4463 msgid "The dives are now exported to the file DM4.bak (or DM5.bak)" msgstr "" #. type: Title === -#: user-manual.txt:4469 +#: user-manual.txt:4465 #, no-wrap msgid "Exporting from Atomic Logbook" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4472 +#: user-manual.txt:4468 #, no-wrap msgid "images/icons/atomiclogo.jpg" msgstr "images/icons/atomiclogo.jpg" #. type: Plain text -#: user-manual.txt:4479 +#: user-manual.txt:4475 msgid "" -"Atomic Logbook is a Windows software by Atomic Aquatics. It allows " -"downloading of dive information from Cobalt and Cobalt 2 dive computers. " -"The divelog is kept in a SQLite database at C:\\ProgramData\\AtomicsAquatics" -"\\Cobalt-Logbook\\Cobalt.db. This file can be directly imported to " -"Subsurface." +"Atomic Logbook is Windows software by Atomic Aquatics. It allows downloading " +"of dive information from Cobalt and Cobalt 2 dive computers. The divelog is " +"kept in a SQLite database at C:\\ProgramData\\AtomicsAquatics\\Cobalt-Logbook" +"\\Cobalt.db. This file can be directly imported to Subsurface." msgstr "" #. type: Title === -#: user-manual.txt:4481 +#: user-manual.txt:4477 #, no-wrap msgid "Exporting from Mares Dive Organiser V2.1" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4484 +#: user-manual.txt:4480 #, no-wrap msgid "images/icons/mareslogo.jpg" msgstr "images/icons/mareslogo.jpg" #. type: Plain text -#: user-manual.txt:4492 +#: user-manual.txt:4488 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 " @@ -9506,7 +9937,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4497 +#: user-manual.txt:4493 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 " @@ -9514,36 +9945,36 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4500 +#: user-manual.txt:4496 msgid "" "Rename the file to DiveOrganizerxxxxx.zip. Inside the zipped directory is a " "file _DiveOrganizer.sdf_." msgstr "" #. type: Plain text -#: user-manual.txt:4501 +#: user-manual.txt:4497 msgid "Extract the _.sdf_ file from the zipped folder to your Desktop." msgstr "" #. type: Plain text -#: user-manual.txt:4502 +#: user-manual.txt:4498 msgid "The password for accessing the .zip file is _mares_." msgstr "" #. type: Title === -#: user-manual.txt:4504 +#: user-manual.txt:4500 #, no-wrap msgid "Exporting from *DivingLog 5.0 and 6.0*" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4506 +#: user-manual.txt:4502 #, no-wrap msgid "images/icons/divingloglogo.jpg" msgstr "images/icons/divingloglogo.jpg" #. type: Plain text -#: user-manual.txt:4513 +#: user-manual.txt:4509 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 " @@ -9553,37 +9984,37 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4515 +#: user-manual.txt:4511 msgid "To transfer all files from DivingLog to Subsurface:" msgstr "" #. type: Plain text -#: user-manual.txt:4517 +#: user-manual.txt:4513 msgid "In DivingLog open the 'File -> Export -> SQLite' menu" msgstr "" #. type: Plain text -#: user-manual.txt:4518 +#: user-manual.txt:4514 msgid "Select 'Settings' button" msgstr "" #. type: Plain text -#: user-manual.txt:4519 +#: user-manual.txt:4515 msgid "Set the 'RTF2Plaintext' to 'true'" msgstr "" #. type: Plain text -#: user-manual.txt:4520 +#: user-manual.txt:4516 msgid "Close the Settings dialog" msgstr "" #. type: Plain text -#: user-manual.txt:4521 +#: user-manual.txt:4517 msgid "Click 'Export' button and select the filename" msgstr "" #. type: Plain text -#: user-manual.txt:4525 +#: user-manual.txt:4521 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 " @@ -9591,13 +10022,13 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:4526 +#: user-manual.txt:4522 #, 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:4536 +#: user-manual.txt:4532 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 " @@ -9617,35 +10048,42 @@ msgstr "" "tableur utilisé." #. type: Plain text -#: user-manual.txt:4542 +#: user-manual.txt:4538 +#| 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 in a single row. _Subsurface_ supports many data items (Dive " +#| "number, Date, Time, Duration, Location, GPS, Max Depth, Mean Depth, " +#| "Buddy, Notes, Weight and Tags). Organize dive data following a few " +#| "simple rules:" 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 " "in a single row. _Subsurface_ supports many data items (Dive number, Date, " -"Time, Duration, Location, GPS, Max Depth, Mean Depth, Buddy, Notes, Weight " +"Time, Duration, Location, GPS, Max. Depth, Mean Depth, Buddy, Notes, Weight " "and Tags). Organize dive data following a few simple rules:" msgstr "" "Organiser les données de plongées dans le tableur pour que la première ligne " "contienne le nom (ou le titre) de chaque colonne et que les informations de " "chaque plongée soient contenues sur une seule ligne. _Subsurface_ supporte " -"de nombreux éléments (Dive #, Date, Time, Duration, Location, GPS, Max " +"de nombreux éléments (Dive #, Date, Time, Duration, Location, GPS, Max. " "Depth, Mean Depth, Buddy, Notes, Weight et Tags). Organiser les données de " "plongées selon quelques règles simples :" #. type: Plain text -#: user-manual.txt:4544 +#: user-manual.txt:4540 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:4545 +#: user-manual.txt:4541 msgid "Duration: the format should be minutes:seconds." msgstr "Durée : le format est minutes:secondes." #. type: Plain text -#: user-manual.txt:4546 +#: user-manual.txt:4542 msgid "" "Unit system: only one unit system should be used (no mix of imperial and " "metric units)" @@ -9654,25 +10092,25 @@ msgstr "" "entre les unités impériales et métriques)" #. type: Plain text -#: user-manual.txt:4547 +#: user-manual.txt:4543 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:4548 +#: user-manual.txt:4544 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:4548 +#: user-manual.txt:4544 #, no-wrap msgid "_LibreOffice Calc_ and _OpenOffice Calc_" msgstr "_LibreOffice Calc_ et _OpenOffice Calc_" #. type: Plain text -#: user-manual.txt:4552 +#: user-manual.txt:4548 msgid "" "These are open source spreadsheet applications forming parts of larger open " "source office suite applications. The user interaction with _LibreOffice_ " @@ -9683,13 +10121,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:4553 +#: user-manual.txt:4549 #, no-wrap msgid "images/LOffice_spreadsheetdata.jpg" msgstr "images/LOffice_spreadsheetdata.jpg" #. type: Plain text -#: user-manual.txt:4556 +#: user-manual.txt:4552 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 " @@ -9697,13 +10135,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:4557 +#: user-manual.txt:4553 #, no-wrap msgid "images/LOffice_save_as_options.jpg" msgstr "images/LOffice_save_as_options.jpg" #. type: Plain text -#: user-manual.txt:4560 +#: user-manual.txt:4556 msgid "" "After selecting _Save_, select the appropriate field delimiter (choose _Tab_ " "to prevent conflicts with the comma when using this as a decimal point), " @@ -9711,13 +10149,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:4561 +#: user-manual.txt:4557 #, no-wrap msgid "images/LOffice_field_options.jpg" msgstr "images/LOffice_field_options.jpg" #. type: Plain text -#: user-manual.txt:4564 +#: user-manual.txt:4560 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 " @@ -9725,13 +10163,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4565 +#: user-manual.txt:4561 #, no-wrap msgid "Microsoft _Excel_" msgstr "Microsoft _Excel_" #. type: Plain text -#: user-manual.txt:4571 +#: user-manual.txt:4567 msgid "" "The field delimiter (called \"_list separator_\" in Microsoft manuals) is " "not accessible from within _Excel_ and needs to be set through the " @@ -9742,68 +10180,67 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4573 +#: user-manual.txt:4569 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:4574 +#: user-manual.txt:4570 msgid "Open the _Regional and Language Options_ dialog box." msgstr "" #. type: Plain text -#: user-manual.txt:4577 +#: user-manual.txt:4572 msgid "" -"Do one of the following: ** In Windows 7, click the _Formats_ tab, and then " -"click _Customize this format_. ** In Windows XP, click the _Regional " -"Options_ tab, and then click _Customize_." +"Do the following: ** In Windows 7, click the _Formats_ tab, and then click " +"_Customize this format_." msgstr "" #. type: Plain text -#: user-manual.txt:4578 +#: user-manual.txt:4573 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:4579 +#: user-manual.txt:4574 msgid "Click _OK_ twice." msgstr "" #. type: Plain text -#: user-manual.txt:4581 +#: user-manual.txt:4576 msgid "Below is an image of the _Control Panel_:" msgstr "" #. type: Target for macro image -#: user-manual.txt:4582 +#: user-manual.txt:4577 #, no-wrap msgid "images/Win_SaveCSV2.jpg" msgstr "images/Win_SaveCSV2.jpg" #. type: Plain text -#: user-manual.txt:4585 +#: user-manual.txt:4580 msgid "To export the dive log in CSV format:" msgstr "" #. type: Plain text -#: user-manual.txt:4587 +#: user-manual.txt:4582 msgid "" "With the dive log opened in _Excel_, select the round Windows button at the " "top left, then _Save As_." msgstr "" #. type: Target for macro image -#: user-manual.txt:4588 +#: user-manual.txt:4583 #, no-wrap msgid "images/Win_SaveCSV1.jpg" msgstr "images/Win_SaveCSV1.jpg" #. type: Plain text -#: user-manual.txt:4594 +#: user-manual.txt:4589 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 " @@ -9813,13 +10250,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:4595 +#: user-manual.txt:4590 #, no-wrap msgid "images/Win_SaveCSV3.jpg" msgstr "images/Win_SaveCSV3.jpg" #. type: Plain text -#: user-manual.txt:4601 +#: user-manual.txt:4596 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 " @@ -9828,13 +10265,13 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:4602 +#: user-manual.txt:4597 #, 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:4607 +#: user-manual.txt:4602 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 " @@ -9843,12 +10280,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4609 +#: user-manual.txt:4604 msgid "Templates are accessed using the print dialogue (see image *B* below)." msgstr "" #. type: Plain text -#: user-manual.txt:4617 +#: user-manual.txt:4612 msgid "" "The buttons under the _Template_ dropdown box lets you _Edit_, _Delete_, " "_Import_ and _Export_ templates (see image *A* above). New or modified " @@ -9860,18 +10297,18 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4619 +#: user-manual.txt:4614 msgid "The Edit Panel has three tabs:" msgstr "" #. type: Target for macro image -#: user-manual.txt:4620 +#: user-manual.txt:4615 #, no-wrap msgid "images/Template1_f22.jpg" msgstr "images/Template1_f22.jpg" #. type: Plain text -#: user-manual.txt:4624 +#: user-manual.txt:4619 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. " @@ -9879,7 +10316,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4628 +#: user-manual.txt:4623 msgid "" "The _Colors_ tab (image *B* above) allows editing the colors used for " "printing the dive log. The colors are highly customizable: the _Edit_ " @@ -9888,7 +10325,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4637 +#: user-manual.txt:4632 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. " @@ -9904,13 +10341,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:4638 +#: user-manual.txt:4633 #, no-wrap msgid "images/Template2_f22.jpg" msgstr "images/Template2_f22.jpg" #. type: Plain text -#: user-manual.txt:4643 +#: user-manual.txt:4638 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 " @@ -9919,33 +10356,33 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4645 +#: user-manual.txt:4640 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:4646 +#: user-manual.txt:4641 #, no-wrap msgid "Main dive loop" msgstr "" #. type: Plain text -#: user-manual.txt:4648 +#: user-manual.txt:4643 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:4648 user-manual.txt:4713 user-manual.txt:4730 +#: user-manual.txt:4643 user-manual.txt:4708 user-manual.txt:4725 #, no-wrap msgid "template.html" msgstr "" #. type: delimited block . -#: user-manual.txt:4653 +#: user-manual.txt:4648 #, no-wrap msgid "" "\t{% for dive in dives %}\n" @@ -9954,13 +10391,13 @@ msgid "" msgstr "" #. type: Block title -#: user-manual.txt:4655 user-manual.txt:4718 user-manual.txt:4737 +#: user-manual.txt:4650 user-manual.txt:4713 user-manual.txt:4732 #, no-wrap msgid "output.html" msgstr "" #. type: delimited block . -#: user-manual.txt:4660 +#: user-manual.txt:4655 #, no-wrap msgid "" "\t<h1> 1 </h1>\n" @@ -9969,25 +10406,25 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4663 +#: user-manual.txt:4658 msgid "" -"Additional information about _Grantlee_ can be found at http://www.grantlee." -"org/apidox/for_themers.html[here]" +"Additional information about _Grantlee_ can be found http://www.grantlee.org/" +"apidox/for_themers.html[here]" msgstr "" #. type: Title === -#: user-manual.txt:4664 +#: user-manual.txt:4659 #, no-wrap msgid "Grantlee exported variables" msgstr "" #. type: Plain text -#: user-manual.txt:4666 +#: user-manual.txt:4661 msgid "Only a subset of the dive data is exported:" msgstr "" #. type: delimited block | -#: user-manual.txt:4695 +#: user-manual.txt:4690 #, no-wrap msgid "" "|*Name*|*Description*\n" @@ -9998,7 +10435,7 @@ msgid "" "|location| (*string*) location of the dive\n" "|duration| (*string*) duration of the dive\n" "|depth| (*string*) depth of the dive\n" -"|divemaster| (*string*) dive master for the dive\n" +"|divemaster| (*string*) divemaster for the dive\n" "|buddy| (*string*) buddy for the dive\n" "|airTemp| (*string*) air temperature of the dive\n" "|waterTemp| (*string*) water temperature of the dive\n" @@ -10021,7 +10458,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4699 +#: user-manual.txt:4694 msgid "" "_Subsurface_ also exports *template_options* data. This data must be used as " "_CSS_ values to provide a dynamically editable template. The exported data " @@ -10029,14 +10466,16 @@ msgid "" msgstr "" #. type: delimited block | -#: user-manual.txt:4711 +#: user-manual.txt:4706 #, no-wrap msgid "" "|*Name*|*Description*\n" "|font| (*string*) font family\n" -"|borderwidth| (*int*) border-width value dynamically calculated as 0.1% of the page width with minimum value of 1px\n" +"|borderwidth| (*int*) border-width value dynamically calculated as 0.1% of" +" the page width with minimum value of 1px\n" "|font_size| (*double*) size of fonts in vw, ranges between 1.0 and 2.0\n" -"|line_spacing| (*double*) distance between text lines, ranges between 1.0 and 3.0\n" +"|line_spacing| (*double*) distance between text lines, ranges between 1.0 and" +" 3.0\n" "|color1| (*string*) background color\n" "|color2| (*string*) primary table cell color\n" "|color3| (*string*) secondary table cell color\n" @@ -10046,34 +10485,35 @@ msgid "" msgstr "" #. type: delimited block . -#: user-manual.txt:4716 +#: user-manual.txt:4711 #, no-wrap msgid "\tborder-width: {{ template_options.borderwidth }}px;\n" msgstr "" #. type: delimited block . -#: user-manual.txt:4721 +#: user-manual.txt:4716 #, no-wrap msgid "\tborder-width: 3px;\n" msgstr "" #. type: Plain text -#: user-manual.txt:4724 +#: user-manual.txt:4719 msgid "" "Another variable that _Subsurface_ exports is *print_options*. This variable " "contains a single member:" msgstr "" #. type: delimited block | -#: user-manual.txt:4727 +#: user-manual.txt:4722 #, no-wrap msgid "" "|*Name*|*Description*\n" -"|grayscale | Use _CSS_ filters to convert the page into grayscale (should be added to body style to enable printing grayscale prints)\n" +"|grayscale | Use _CSS_ filters to convert the page into grayscale (should be" +" added to body style to enable printing grayscale prints)\n" msgstr "" #. type: delimited block . -#: user-manual.txt:4735 +#: user-manual.txt:4730 #, no-wrap msgid "" "\tbody {\n" @@ -10082,7 +10522,7 @@ msgid "" msgstr "" #. type: delimited block . -#: user-manual.txt:4742 +#: user-manual.txt:4737 #, no-wrap msgid "" "\tbody {\n" @@ -10091,45 +10531,47 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4744 +#: user-manual.txt:4739 #, no-wrap msgid "Defined CSS selectors" msgstr "" #. type: Plain text -#: user-manual.txt:4747 +#: user-manual.txt:4742 msgid "" "As the dive profile is placed after rendering, _Subsurface_ uses special " -"_CSS_ selectors to searche in the HTML output. The _CSS_ selectors in the " +"_CSS_ selectors to search in the HTML output. The _CSS_ selectors in the " "following table should be added." msgstr "" #. type: delimited block | -#: user-manual.txt:4754 +#: user-manual.txt:4749 #, no-wrap msgid "" "|*Selector*|*Type*|*Description*\n" "|dive_{{ dive.id }} | id | is used to fetch the relevant dive profile\n" -"|diveProfile | class | each dive that will contain a dive profile should have this class selector in addition to the dive_{{ dive.id }} id selector\n" -"|dontbreak | class | prevents the dive with this class from being divided into two pages. This can be used\n" +"|diveProfile | class | each dive that will contain a dive profile should have" +" this class selector in addition to the dive_{{ dive.id }} id selector\n" +"|dontbreak | class | prevents the dive with this class from being divided" +" into two pages. This can be used\n" "in flow layout templates only (when data-numberofdives = 0)\n" msgstr "" #. type: Plain text -#: user-manual.txt:4757 +#: user-manual.txt:4752 msgid "" "Rendering dive profiles is not supported for flow layout templates (when " "data-numberofdives = 0)." msgstr "" #. type: Title === -#: user-manual.txt:4758 +#: user-manual.txt:4753 #, no-wrap msgid "Special attributes" msgstr "" #. type: Plain text -#: user-manual.txt:4762 +#: user-manual.txt:4757 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 " @@ -10137,55 +10579,55 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4764 +#: user-manual.txt:4759 msgid "" "The *data-numberofdives* data attribute is added to the body tag to set the " "rendering mode." msgstr "" #. type: Plain text -#: user-manual.txt:4766 +#: user-manual.txt:4761 msgid "render 6 dives per page:" msgstr "" #. type: delimited block . -#: user-manual.txt:4769 +#: user-manual.txt:4764 #, no-wrap msgid "\t<body data-numberofdives = 6>\n" msgstr "" #. type: Plain text -#: user-manual.txt:4772 +#: user-manual.txt:4767 msgid "render as much dives as possible:" msgstr "" #. type: delimited block . -#: user-manual.txt:4775 +#: user-manual.txt:4770 #, no-wrap msgid "\t<body data-numberofdives = 0>\n" msgstr "" #. type: Plain text -#: user-manual.txt:4778 +#: user-manual.txt:4773 msgid "" "All CSS units should be in relative lengths only, to support printing on any " "page size." msgstr "" #. type: Title == -#: user-manual.txt:4779 +#: user-manual.txt:4774 #, no-wrap msgid "APPENDIX F: FAQs." msgstr "" #. type: Title === -#: user-manual.txt:4781 +#: user-manual.txt:4776 #, no-wrap msgid "Subsurface appears to miscalculate gas consumption and SAC" msgstr "" #. type: Plain text -#: user-manual.txt:4785 +#: user-manual.txt:4780 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_ " @@ -10193,7 +10635,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4791 +#: user-manual.txt:4786 msgid "" "'Answer': Not really. What happens is that _Subsurface_ actually calculates " "gas consumption differently - and better - than you expect. In particular, " @@ -10203,7 +10645,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4797 +#: user-manual.txt:4792 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 " @@ -10213,12 +10655,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4799 +#: user-manual.txt:4794 msgid "+consumption = (amount_of_air_at_beginning - amount_of_air_at_end)+" msgstr "" #. type: Plain text -#: user-manual.txt:4805 +#: user-manual.txt:4800 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 " @@ -10229,12 +10671,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4807 +#: user-manual.txt:4802 msgid "+12.2*((220-100)/1.013)+" msgstr "" #. type: Plain text -#: user-manual.txt:4812 +#: user-manual.txt:4807 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 " @@ -10244,7 +10686,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4818 +#: user-manual.txt:4813 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 " @@ -10255,13 +10697,15 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4819 +#: user-manual.txt:4814 #, no-wrap -msgid "Some dive profiles have time discrepancies with the recorded samples from my dive computer..." +msgid "" +"Some dive profiles have time discrepancies with the recorded samples from my" +" dive computer..." msgstr "" #. type: Plain text -#: user-manual.txt:4823 +#: user-manual.txt:4818 msgid "" "_Subsurface_ ends up ignoring surface time for many things (average depth, " "divetime, SAC, etc). 'Question': Why do dive durations in my dive computer " @@ -10269,7 +10713,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4831 +#: user-manual.txt:4826 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 " @@ -10283,13 +10727,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4832 +#: user-manual.txt:4827 #, no-wrap msgid "Some dive profiles are missing from the download" msgstr "" #. type: Plain text -#: user-manual.txt:4846 +#: user-manual.txt:4841 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 " @@ -10304,7 +10748,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4850 +#: user-manual.txt:4845 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 " @@ -10312,6 +10756,12 @@ msgid "" "salvaged after being overwritten by new dives." msgstr "" +#~ msgid "images/rec_diveplan.jpg" +#~ msgstr "images/rec_diveplan.jpg" + +#~ msgid "images/DivePlanner2_f20.jpg" +#~ msgstr "images/DivePlanner2_f20.jpg" + #~ msgid "" #~ "If required, then close the _Facebook_ connection by either closing " #~ "_Subsurface_ or by selecting _File -> Preferences -> Facebook_ from the " diff --git a/Documentation/mobile-manual_fr.html.git b/Documentation/mobile-manual_fr.html.git index c11ca00d8..222f1a42d 100644 --- a/Documentation/mobile-manual_fr.html.git +++ b/Documentation/mobile-manual_fr.html.git @@ -827,7 +827,7 @@ the dive log.</p></div> <div id="footer"> <div id="footer-text"> Last updated - 2017-02-03 15:33:16 CET + 2017-07-04 13:38:54 CEST </div> </div> </body> diff --git a/Documentation/user-manual_fr.html.git b/Documentation/user-manual_fr.html.git index 52600793b..91e5847c7 100644 --- a/Documentation/user-manual_fr.html.git +++ b/Documentation/user-manual_fr.html.git @@ -442,9 +442,10 @@ asciidoc.install(3); </div> </div> <div class="paragraph"><p><span class="big">MANUEL UTILISATEUR</span></p></div> -<div class="paragraph"><p><strong>Auteurs du manuel</strong> : Willem Ferguson, Jacco van Koll, Dirk Hohndel, Reinout Hoornweg, -Linus Torvalds, Miika Turkia, Amit Chaudhuri, Jan Schubert, Salvador Cuñat, Pedro Neves</p></div> -<div class="paragraph"><p><span class="blue"><em>Version 4.6, janvier 2017</em></span></p></div> +<div class="paragraph"><p><strong>Manual authors</strong>: Willem Ferguson, Jacco van Koll, Dirk Hohndel, Reinout Hoornweg, +Linus Torvalds, Miika Turkia, Amit Chaudhuri, Jan Schubert, Salvador Cuñat, Pedro Neves, +Stefan Fuchs</p></div> +<div class="paragraph"><p><span class="blue"><em>Version 4.6, March 2017</em></span></p></div> <div class="paragraph"><p>Bienvenue en tant qu’utilisateur de <em>Subsurface</em>, un programme avancé d’enregistrement de plongées (carnet de plongées) avec une bonne infrastructure pour décrire, organiser, interpréter et imprimer des plongées @@ -512,20 +513,18 @@ Souhaitez-vous pouvoir accéder ou modifier votre carnet de plongée en </p> </li> </ul></div> -<div class="paragraph"><p><em>Subsurface</em> est disponible pour Windows (Win XP ou plus récent), les Macs -basés sur processeurs Intel (OS/X) et de nombreuses distributions -Linux. <em>Subsurface</em> peut être compilé pour bien plus de plateformes -matérielles et d’environnements logiciels où Qt et libdivecomputer sont -disponibles.</p></div> -<div class="paragraph"><p>Ce manuel explique comment utiliser le programme <em>Subsurface</em>. Pour -installer le logiciel, consultez la page <em>Téléchargement</em> sur le -<a href="http://subsurface-divelog.org/">site web de <em>Subsurface</em></a>. En cas de -problème, vous pouvez envoyer un e-mail sur -<a href="mailto:subsurface@subsurface-divelog.org">notre liste de diffusion</a> et -rapportez les bogues sur <a href="http://trac.hohndel.org">notre bugtracker</a>. Pour -des instructions de compilation du logiciel et (si besoin) de ses -dépendances, merci de consulter le fichier INSTALL inclus dans les sources -logicielles.</p></div> +<div class="paragraph"><p><em>Subsurface</em> binaries are available for Windows PCs (Win 7 or later from +version 4.6 of <em>Subsurface</em> onwards), Intel based Macs (OS/X) and many Linux +distributions. <em>Subsurface</em> can be built for many more hardware platforms +and software environments where Qt and libdivecomputer are available.</p></div> +<div class="paragraph"><p>This manual explains how to use the <em>Subsurface</em> program. To install the +software, consult the <em>Downloads</em> page on the +<a href="https://subsurface-divelog.org/"><em>Subsurface</em> web site</a>. Please discuss +issues with this program by sending an email to +<a href="mailto:subsurface@subsurface-divelog.org">our mailing list</a> and report bugs +at <a href="https://github.com/Subsurface-divelog/subsurface/issues">our bugtracker</a>. +For instructions on how to build the software and (if needed) its +dependencies please consult the INSTALL file included with the source code.</p></div> <div class="paragraph"><p><strong>Public</strong> : Plongeurs loisirs, apnéistes, plongeurs Tek et plongeurs professionnels</p></div> <div id="toc"> @@ -586,10 +585,10 @@ envoyer un nouveau sondage en démarrant <em>Subsurface</em> avec l’option <div class="sect1"> <h2 id="S_StartUsing">3. Commencer à utiliser le programme</h2> <div class="sectionbody"> -<div class="paragraph"><p>La fenêtre <em>Subsurface</em> est généralement divisée en 4 panneaux avec un <strong>Menu -principal</strong> (Fichier Importer Journal Vue 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="paragraph"><p>The <em>Subsurface</em> window is usually divided into four panels with a <strong>Main +Menu</strong> (File Edit Import Log View Share Help) at the top of the window (for +Windows and Linux) or the top of the screen (for Mac and Ubuntu Unity). The +four panels are:</p></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 @@ -634,12 +633,10 @@ permet plusieurs choix d’affichage :</p></div> <div class="paragraph"><p><strong>Info</strong> : affiche uniquement les notes de plongées de la dernière plongée sélectionnée et les statistiques pour toutes les plongées mises en surbrillance.</p></div> <div class="paragraph"><p><strong>Globe</strong> : affiche uniquement la carte mondiale, centrée sur la dernière plongée sélectionnée.</p></div> -<div class="paragraph"><p>Comme d’autres fonctions qui peuvent être accédée via le menu principal, ces -options peuvent aussi être utilisées par des raccourcis clavier. Les -raccourcis pour un système particulier sont affichés avec un souligné des -les entrées de menu. À cause des différents systèmes d’exploitation et des -divers langues, <em>Subsurface</em> peut utiliser différentes touches de raccourcis -et ne sont donc pas détaillées ici.</p></div> +<div class="paragraph"><p>Like other functions that can be accessed via the Main Menu, these options +can also be triggered using keyboard shortcuts. The shortcuts are shown with +an underline in the main menu entries, with the Alt-key pressed, or are +denoted after the menu item.</p></div> <div class="paragraph"><p>Lorsque le programme est lancé pour la première fois, il n’affiche aucune information, parce qu’il n’a aucune information de plongée disponible. Dans les sections suivantes, le procédure pour créer a nouveau carnet de plongée @@ -717,7 +714,7 @@ Tableur ou de fichiers CSV contenant les profils de plongées. <div class="paragraph"><p>This is usually the approach for dives without a dive computer. The basic record of information within <em>Subsurface</em> is a dive. The most important information in a simple dive logbook usually includes dive type, date, time, -duration, depth, the names of your dive buddy and the dive master or dive +duration, depth, the names of your dive buddy and the divemaster or dive guide, and some remarks about the dive. <em>Subsurface</em> can store much more information for each dive. To add a dive to a dive log, select <em>Log → Add Dive</em> from the Main Menu. The program then shows three panels on which to @@ -770,7 +767,8 @@ several line segments demarcated by waypoints (white dots on the profile, as shown above). The default dive depth is 15 m. If the dive depth was 20 m then you need to drag the appropriate waypoints downward to 20 m. To add a waypoint, double-click on any line segment. To move an additional waypoint, -drag it. To remove a waypoint, right-click on it and choose "Remove this +drag it. Moving can also be done by selecting the waypoint and using the +arrow keys. To remove a waypoint, right-click on it and choose "Remove this point" from the context menu. Drag the waypoints to represent an accurate time duration for the dive. Below is a dive profile for a dive to 20 m for 30 min, followed by a 5 minute safety stop at 5 m.</p></div> @@ -785,7 +783,7 @@ mixture specified in the <strong>Equipment</strong> tab, which was air in the ca profile above. The gas mixtures of segments of the dive profile can be changed by right-clicking on the particular waypoint and selecting the appropriate gas from the context menu. Changing the gas for a waypoint -affects the gas shown in the segment <em>to the left</em> of that waypoint. Note +affects the gas shown in the segment <em>to the right</em> of that waypoint. Note that only the gases defined in the <strong>Equipment</strong> tab appear in the context menu (see image below).</p></div> <div class="imageblock" style="text-align:center;"> @@ -808,7 +806,7 @@ information about each dive, e.g. a detailed record of depth, duration, rates of ascent/descent and of gas partial pressures. <em>Subsurface</em> can capture this information, using dive details from a wide range of dive computers. The latest list of supported dive computers can be found at: -<a href="http://subsurface-divelog.org/documentation/supported-dive-computers/"> +<a href="https://subsurface-divelog.org/documentation/supported-dive-computers/"> Supported dive computers</a>.</p></div> <div class="admonitionblock"> <table><tr> @@ -866,7 +864,7 @@ In <em>Subsurface</em>, from the Main Menu, select <em>Import → Import Fro <div class="paragraph"><p>Dive computers tend to keep a certain number of dives in memory, even though these dives have already been imported to <em>Subsurface</em>. For that reason, if the dive computer allows this, <em>Subsurface</em> only imports dives that have not -been uploaded before. This makes the download process faster on most dive +been downloaded before. This makes the download process faster on most dive computers and also saves battery power of the dive computer (at least for those not charging while connected via USB).</p></div> <div class="ulist"><ul> @@ -1242,11 +1240,11 @@ edited. If you click on the <strong>Notes</strong> tab, the following fields are </div> </div> <div class="paragraph"><p>The right hand image, above, shows a <strong>Notes tab</strong> filled with dive -information. The <strong>Time</strong> field reflects the date and time of the dive. By -clicking the date, a calendar is displayed for selecting the correct -date. Press ESC to close the calendar. The time values (hour and minutes) -can also be edited directly by clicking on each of them in the text box and -by over-typing the information displayed.</p></div> +information. The <strong>Date</strong> and <strong>Time</strong> fields reflects the date and time of the +dive. By clicking the date, a calendar is displayed for selecting the +correct date. Press ESC to close the calendar. The time values (hour and +minutes) can also be edited directly by clicking on each of them in the text +box and by over-typing the information displayed.</p></div> <div class="paragraph"><p><strong>Air/water temperatures</strong>: Air and water temperatures during the dive are shown in text boxes to the right of the Start time. Many dive computers supply water temperature information and this box may have information. @@ -1276,25 +1274,24 @@ several dives are made at the same location, the site information for the first dive is re-used. Existing dive locations can be edited by selecting (on the <strong>Dive List</strong> panel) a dive done at that site and by opening the location information. Click the globe button on the right of the location -name (see image on the right, above). When entering a dive location name, -auto location of dive site names makes it easy to select an existing dive -site name. When typing the name of a dive site, a dropdown list appears -showing all sites with similar names. If the dive site has been used before, -click on the already-existing name. The dive site names in the dropdown -list contain either a globe symbol (indicating existing dive sites in the -<em>Subsurface</em> database) or a <strong>+</strong> symbol (indicating dive site names that -appear consistent with the current dive site name but which haven’t been -added to the dive site database). If the present dive site has not been -used before, a message appears as follows (image <strong>A</strong> below):</p></div> +name (see image image <strong>A</strong> below). When typing the name of a dive site, a +dropdown list appears showing all sites with similar names. If the dive site +has been used before, click on the already-existing name. The dive site +names in the dropdown list contain either a globe symbol (indicating +existing dive sites in the <em>Subsurface</em> database) or a <strong>+</strong> symbol +(indicating dive site names that appear consistent with the current dive +site name but which haven’t been added to the dive site database). If the +present dive site has not been used before, a message appears as follows +(image <strong>A</strong> below):</p></div> <div class="imageblock" style="text-align:center;"> <div class="content"> <img src="images/Locations1_f22.jpg" alt="FIGURE:Location description panel" /> </div> </div> -<div class="paragraph"><p>Doubleclick on the new dive site name. A panel appears to enter the -coordinates and other information about the site (image <strong>B</strong>, above). The -most important items are the coordinates of the site. There are three ways -to specify coordinates:</p></div> +<div class="paragraph"><p>Click the globe button and a panel appears to enter the coordinates and +other information about the site (image <strong>B</strong>, above). The most important +items are the coordinates of the site. There are three ways to specify +coordinates:</p></div> <div class="olist loweralpha"><ol class="loweralpha"> <li> <p> @@ -1358,7 +1355,7 @@ Freedive (dive without SCUBA equipment), CCR (Closed-circuit rebreather) and pSCR (Passive semi-closed rebreather).</p></div> <div class="paragraph"><p><strong>Divemaster</strong>: The name of the divemaster or dive guide should be entered in this field -which offers auto selection based on the list of dive masters in +which offers auto selection based on the list of divemasters in the current logbook.</p></div> <div class="paragraph"><p><strong>Buddy</strong>: In this field, enter the name(s) of the buddy or buddies (separated with commas) who were on the @@ -1478,8 +1475,8 @@ two types of weights: integrated as well as a weight belt:</p></div> </div> <div class="sect3"> <h4 id="_editing_several_selected_dives_simultaneously">5.2.6. Editing several selected dives simultaneously</h4> -<div class="paragraph"><p><em>METHOD 1</em>: After uploading dives from a dive computer, the dive profiles of -each is shown in the <strong>Dive profile</strong> tab, as well as a few items of +<div class="paragraph"><p><em>METHOD 1</em>: After downloading dives from a dive computer, the dive profiles +of each is shown in the <strong>Dive profile</strong> tab, as well as a few items of information in the <strong>Notes</strong> tab (e.g. water temperature) and in the <strong>Equipment</strong> tab (e.g. gas pressures and gas composition). Other fields remain empty. It may be useful to simultaneously edit some of the fields in @@ -1581,14 +1578,15 @@ service like <em>divelogs.de</em> and then import from there with <em>Subsurface</em>. Divelogs.de supports a few additional logbook formats that <em>Subsurface</em> currently cannot handle.</p></div> <div class="paragraph"><p>If the format of other software is supported natively on Subsurface, select -either <em>Import → Import log files</em> or <em>File → Open log file</em>. <em>Subsurface</em> -supports the data formats of many dive computers, including Suunto, -Shearwater and some CCR equipment. When importing dives, <em>Subsurface</em> tries -to detect multiple records for the same dive and merges the information as -best as it can. If there are no time zone issues (or other reasons that -would cause the beginning time of the dives to be significantly different) -<em>Subsurface</em> will not create duplicate entries. Below is more specific -information to import data to <em>Subsurface</em>.</p></div> +either <em>Import → Import log files</em> or <em>File → Open log file</em>. Notice that +the import adds the imported data to the current <strong>Dive list</strong>, and the open +style starts a new dive list. <em>Subsurface</em> supports the data formats of many +dive computers, including Suunto, Shearwater and some CCR equipment. When +importing dives, <em>Subsurface</em> tries to detect multiple records for the same +dive and merges the information as best as it can. If there are no time zone +issues (or other reasons that would cause the beginning time of the dives to +be significantly different) <em>Subsurface</em> will not create duplicate +entries. Below is more specific information to import data to <em>Subsurface</em>.</p></div> <div class="sect3"> <h4 id="_using_the_universal_import_dialogue">5.3.1. Using the universal import dialogue</h4> <div class="paragraph" id="Unified_import"><p>Importing dives from other software is done through a universal interface @@ -1671,6 +1669,16 @@ Underwater technologies AV1 dive logs </li> <li> <p> +Divesoft dive logs +</p> +</li> +<li> +<p> +Poseidon MK VI eCCR dive logs +</p> +</li> +<li> +<p> CSV (text-based and spreadsheet-based) dive logs, including APD CCR logs </p> </li> @@ -1982,10 +1990,9 @@ import information from other sources like spreadsheet-based dive logs and some dive computers.</td> </tr></table> </div> -<div class="paragraph"><p><em>CSV</em> files can be created or edited with a normal text editor. The most -important attribute of a <em>CSV</em> file is the <em>field separator</em>, the character -used to separate fields within a single line. The field separator is -frequently a comma, a colon, a SPACE character or a TAB character. When +<div class="paragraph"><p>The most important attribute of a <em>CSV</em> file is the <em>field separator</em>, the +character used to separate fields within a single line. The field separator +is frequently a comma, a colon, a SPACE character or a TAB character. When exporting data from spreadsheet software, the field separator needs to be specified in order to create the <em>CSV</em> file. <em>CSV</em> files are normally organized into a single line that provides the headers (or <em>field names</em>) of @@ -2022,7 +2029,7 @@ example of a <em>CSV</em> dive log from an APD closed-circuit rebreather (CCR) d computer:</p></div> <div class="literalblock"> <div class="content"> -<pre><code>Dive Time (s) Depth (m) pO₂ - Setpoint (Bar) pO₂ - C1 Cell 1 (Bar) Ambient temp. (Celsius) +<pre><code>Dive Time (s) Depth (m) pO~2~ - Setpoint (Bar) pO~2~ - C1 Cell 1 (Bar) Ambient temp. (Celsius) 0 0.0 0.70 0.81 13.1 0 1.2 0.70 0.71 13.1 0 0.0 0.70 0.71 13.1 @@ -2172,8 +2179,7 @@ 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. Check the indicator at the top of the -mobile screen for internet activity, indicating the transfer of information.</p></div> +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> @@ -2216,7 +2222,7 @@ Register on the <a href="http://api.hohndel.org/login/"><em>Subsurface companion Download the app from <a href="https://play.google.com/store/apps/details?id=org.subsurface">Google Play Store</a> or from - <a href="http://f-droid.org/repository/browse/?fdfilter=subsurface&fdid=org.subsurface">F-Droid</a>. + <a href="https://f-droid.org/repository/browse/?fdfilter=subsurface&fdid=org.subsurface">F-Droid</a>. </p> </li> </ul></div> @@ -2254,9 +2260,9 @@ Download the app from <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 → -Defaults</em> from the main menu in <em>Subsurface</em> itself. This helps -synchronization between <em>Subsurface</em> and the Companion App.</td> +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> @@ -2295,12 +2301,12 @@ Use Map: This option allows you to fix a position by searching a world <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, then select the tab - in the upper right, afterAndroid device. + 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>Dive lists of dive locations</strong></p></div> +<div class="paragraph"><p><strong>List of dive locations</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 @@ -2325,8 +2331,7 @@ screen:</p></div> <div class="ulist"><ul> <li> <p> -Edit (pencil): Change the text name or other characteristics of the dive - location. +Edit (pencil): Change the name of the dive location. </p> </li> </ul></div> @@ -2552,8 +2557,8 @@ 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> <div class="sect3"> <h4 id="_loading_photos_and_synchronizing_between_dive_computer_and_camera">5.5.1. Loading photos and synchronizing between dive computer and camera</h4> -<div class="paragraph"><p>Left-lick 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>. Right-click the +<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> @@ -2567,7 +2572,7 @@ 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>Having selected the local folder ot Internet image to be imported, the time +<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 @@ -2890,7 +2895,7 @@ involves three steps, exactly as with multi-cylinder dives above:</p></div> </div> </div> <div class="sect3"> -<h4 id="S_sSCR_dives">5.6.3. Semi-closed circuit rebreather (SCR) dives</h4> +<h4 id="S_sSCR_dives">5.6.3. Passive semi-closed circuit rebreather (pSCR) dives</h4> <div class="admonitionblock"> <table><tr> <td class="icon"> @@ -2900,13 +2905,12 @@ involves three steps, exactly as with multi-cylinder dives above:</p></div> equipment that recirculates the breathing gas a diver uses, while removing carbon dioxide from the exhaled gas. While a small amount (typically a tenth) of the exhaled breathing gas is released into the water, a small -amount of fresh gas is released from the back gas cylinder (typically -containing nitrox). A diver using a single cylinder of breathing gas can -therefore dive for much longer periods than using a recreational -open-circuit configuration. With pSCR equipment, a very small amount of -breathing gas is released every time the diver inhales. With active SCR -(aSCR) equipment, in contrast, a small amount of breathing gas is released -continuously from the back cylinder.</td> +amount of fresh gas is released from the driving gas cylinder. A diver +using a single cylinder of breathing gas can therefore dive for much longer +periods than using a recreational open-circuit configuration. With pSCR +equipment, a very small amount of breathing gas is released every time the +diver inhales. With active SCR (aSCR) equipment, in contrast, a small amount +of breathing gas is released continuously from the driving cylinder.</td> </tr></table> </div> <div class="paragraph"><p>To log pSCR dives, no special procedures are required. Use the normal steps @@ -2929,8 +2933,8 @@ pSCR diving often involves gas changes, requiring an additional cylinder. <div class="paragraph"><p>If a pSCR <em>Dive Mode</em> has been selected, the dive ceiling for that is adjusted for the oxygen drop across the mouthpiece, which often requires longer decompression periods. Below is a dive profile of a pSCR dive using -EAN36 on the back cylinder and oxygen for decompression. Note that this dive -lasted over two hours.</p></div> +EAN36 as bottom gas and oxygen for decompression. Note that this dive lasted +over two hours.</p></div> <div class="imageblock" style="text-align:center;"> <div class="content"> <img src="images/pSCR_profile.jpg" alt="FIGURE: pSCR profile" /> @@ -3017,8 +3021,8 @@ If no sensor data are available, the pO<sub>2</sub> value is assumed to be equal oxygen sensors can be shown. The display of additional CCR information is turned on by checking the appropriate boxes in the <em>Preferences</em> panel (accessible by selecting <a href="#S_CCR_options"><em>File → Preferences → -Graph</em></a>). This part of the <em>Preferences</em> panel is shown in the image below, -representing two checkboxes that modify the display of pO<sub>2</sub> when the +Profile</em></a>). This part of the <em>Preferences</em> panel is shown in the image +below, representing two checkboxes that modify the display of pO<sub>2</sub> when the appropriate toolbar button on the Dive Profile has been checked.</p></div> <div class="imageblock" style="text-align:center;"> <div class="content"> @@ -3033,7 +3037,7 @@ pressure graph and allows a comparison of the mean measured oxygen partial pressure and the setpoint values, as shown below.</p></div> <div class="imageblock" style="text-align:center;"> <div class="content"> -<img src="images/CCR_setpoint_f20.jpg" alt="FIGURE: CCR setpoint and po2 graph" /> +<img src="images/CCR_setpoint_f20.jpg" alt="FIGURE: CCR setpoint and pO~2~ graph" /> </div> </div> <div class="paragraph"><p>The second checkbox allows the display of the data from each individual @@ -3101,7 +3105,7 @@ dive profile:</p></div> </div> <div class="paragraph"><p>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 <em>File → -Preferences → Graph</em>. Below is a dive profile indicating the dive +Preferences → Profile</em>. Below is a dive profile indicating the dive computer-generated deco ceiling:</p></div> <div class="imageblock" style="text-align:center;"> <div class="content"> @@ -3243,12 +3247,10 @@ placed adjacent to significant changes.</p></div> <h4 id="S_InfoBox">6.4.1. The <strong>Information Box</strong></h4> <div class="paragraph"><p>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 -<strong>Dive Profile</strong> panel. If the mouse points outside of the <strong>Dive Profile</strong> -panel, then only the top line of the Information Box is visible (see -left-hand part of figure (<strong>A</strong>) below). The Information Box can be moved -around in the <strong>Dive Profile</strong> panel by click-dragging it with the mouse so -that it is not obstructing important detail. The position of the Information -Box is saved and used again during subsequent dive analyses.</p></div> +<strong>Dive Profile</strong> panel. The Information Box can be moved around in the <strong>Dive +Profile</strong> panel by click-dragging it with the mouse so that it is not +obstructing important detail. The position of the Information Box is saved +and used again during subsequent dive analyses.</p></div> <div class="imageblock" style="text-align:center;"> <div class="content"> <img src="images/InfoBox2.jpg" alt="Figure: Information Box" /> @@ -3265,10 +3267,11 @@ characteristics of the particular dive. These include: Time period into the dive (indicated by a @), depth, cylinder pressure (P), temperature, ascent/descent rate, surface air consumption (SAC), oxygen partial pressure, maximum operating depth, equivalent air depth (EAD), equivalent narcotic -depth (END), equivalent air density depth (EADD), decompression requirements -at that instant in time (Deco), time to surface (TTS), the calculated -ceiling, as well as of the statistics in the Information Box, shown as four -buttons on the left of the profile panel. These are:</p></div> +depth (END), equivalent air density depth (EADD, also as gas density in +g/l), decompression requirements at that instant in time (Deco), time to +surface (TTS), the calculated ceiling, as well as of the statistics in the +Information Box, shown as four buttons on the left of the profile +panel. These are:</p></div> <div class="admonitionblock"> <table><tr> <td class="icon"> @@ -3278,9 +3281,9 @@ buttons on the left of the profile panel. These are:</p></div> used. MOD is dependent on the oxygen concentration in the breathing gas. For air (21% oxygen) it is around 57 m if a maximum pO<sub>2</sub> of 1.4 is specified in the <strong>Preferences</strong> section (select <em>File → Preferences → -Graph</em> and edit the text box <em>pO<sub>2</sub> in calculating MOD</em>. When diving below -the MOD there is a markedly increased risk of exposure to the dangers of -oxygen toxicity.</td> +Profile</em> and edit the text box <em>pO<sub>2</sub> in calculating MOD</em>. When diving +below the MOD there is a markedly increased risk of exposure to the dangers +of oxygen toxicity.</td> </tr></table> </div> <div class="admonitionblock"> @@ -3294,12 +3297,10 @@ given the present depth, that does not require decompression (that is, before an ascent ceiling appears). Once a diver has exceeded the NDL and decompression is required (that is, there is an ascent ceiling above the diver) then TTS gives the number of minutes required before the diver can -surface. TTS includes ascent time as well as decompression time. TTS is -calculated assuming an ascent surface air consumption (SAC) for the gas -currently used. Even if the profile contains several gas switches, TTS at a -specific moment during the dive is calculated using the current gas. TTS -longer than 2 hours is not accurately calculated and Subsurface only -indicates <em>TTS > 2h</em>.</td> +surface. TTS includes ascent time as well as decompression time. Even if the +profile contains several gas switches, TTS at a specific moment during the +dive is calculated using the current gas. TTS longer than 2 hours is not +accurately calculated and Subsurface only indicates <em>TTS > 2h</em>.</td> </tr></table> </div> <div class="admonitionblock"> @@ -3381,7 +3382,7 @@ The dark green area at the bottom of the graph represents the pressures of The top black horizontal line indicates the inert gas pressure limit determined by the gradient factor that applies to the depth of the diver at the particular point on the <strong>Dive Profile</strong>. The gradient factor shown is an - interpolation between the GFLow and GFHigh values specified in the <em>Graph</em> + interpolation between the GFLow and GFHigh values specified in the <em>Profile</em> tab of the <strong>Preferences Panel</strong> of <em>Subsurface</em>. </p> </li> @@ -3518,6 +3519,9 @@ relative to some absolute values but relative to the mean normalized air consumption during the dive. So areas in red or orange indicate times of increased normalized air consumption while dark green reflects times when the diver was using less gas than average.</p></div> +<div class="paragraph"><p>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, +the color is a representation of the breathing gas density.</p></div> <div class="admonitionblock"> <table><tr> <td class="icon"> @@ -3929,25 +3933,20 @@ title. This expands the selected trip, revealing individual dives during the trip.</p></div> </div> <div class="sect3"> -<h4 id="_collapsing_or_expanding_dive_information_for_different_trips">7.3.3. Collapsing or expanding dive information for different trips</h4> -<div class="paragraph"><p>After selecting a particular trip in the dive list, the context menu allows -several options to expand or collapse dives within trips. This includes -expanding all trips and collapsing all trips.</p></div> -</div> -<div class="sect3"> -<h4 id="_merging_dives_from_more_than_one_trip_into_a_single_trip">7.3.4. Merging dives from more than one trip into a single trip</h4> +<h4 id="_merging_dives_from_more_than_one_trip_into_a_single_trip">7.3.3. Merging dives from more than one trip into a single trip</h4> <div class="paragraph"><p>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 above. (Merge trip with trip below; Merge trip with trip above)</p></div> </div> <div class="sect3"> -<h4 id="_splitting_a_single_trip_into_more_than_one_trip">7.3.5. Splitting a single trip into more than one trip</h4> -<div class="paragraph"><p>If a trip includes ten dives, you can split this trip into two trips (trip -1: top 4 dives; trip 2: bottom 6 dives) by selecting and right-clicking the -top four dives. The resulting context menu lets the user create a new trip -by choosing the option <strong>Create new trip above</strong>. The top four dives are then -grouped into a separate trip. The figures below show the selection and -context menu on the left (A) and the completed action on the right (B):</p></div> +<h4 id="_splitting_a_single_trip_into_more_than_one_trip">7.3.4. Splitting a single trip into more than one trip</h4> +<div class="paragraph"><p>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 +right-clicking the top four dives. The resulting context menu lets the user +create a new trip by choosing the option <strong>Create new trip above</strong>. The top +four dives are then grouped into a separate trip. The figures below show the +selection and context menu on the left (A) and the completed action on the +right (B):</p></div> <div class="imageblock" style="text-align:center;"> <div class="content"> <img src="images/SplitDive3a.jpg" alt="FIGURE: Split a trip into 2 trips" /> @@ -4038,7 +4037,7 @@ brings up the possibility to <em>Undo</em> or <em>Redo</em> an action.</p></div> <div class="sect2"> <h3 id="S_Filter">7.5. Filtering the dive list</h3> <div class="paragraph"><p>The dives in the <strong>Dive List</strong> panel can be filtered, selecting only some of -the dives based on their attributes, e.g. dive tags, dive site, dive master, +the dives based on their attributes, e.g. dive tags, dive site, divemaster, buddy or protective clothing. For instance, filtering lets you list the deep dives at a particular dive site, or otherwise the cave dives with a particular buddy.</p></div> @@ -4112,21 +4111,20 @@ entry</em>." Close this message panel.</p></div> <img src="images/facebook1.jpg" alt="Figure: Facebook login" /> </div> </div> -<div class="paragraph"><p>Une fois qu’une connexion à <em>Facebook</em> est établie, transférer un profil de -plongée vers <em>Facebook</em> est facile. Dans le panneau <strong>Profil de plongée</strong> de -<em>Subsurface</em>, sélectionnez la plongée à transférer. Ensuite, à partir du -<strong>menu principal</strong>, sélectionnez <em>Partager sur → Facebook</em>. Une fenêtre -s’affiche, pour déterminer quelles informations seront transférées avec le -profil de plongée (image <strong>A</strong> ci-dessous). Pour transférer un profil de -plongée vers <em>Facebook</em>, le nom d’un album <em>Facebook</em> doit être fourni. Les -cases à cocher sur la partie gauche permettent de sélectionner des -informations supplémentaires à transférer avec le profil de plongée. Ces -informations sont affichées dans le champs de texte sur la partie droite du -panneau. (image <strong>A</strong> ci dessous). Personnalisez le message qui sera envoyé -avec le profil de plongée en modifiant les informations. Une fois les -informations supplémentaires ajoutées et vérifiées, sélectionner le bouton -<em>OK</em> qui effectue le transfert vers <em>Facebook</em>. Après le transfert, une -fenêtre de confirmation apparait ,indiquant le succès du transfert.</p></div> +<div class="paragraph"><p>Having established a login to <em>Facebook</em>, transferring a dive profile to a +<em>Facebook</em> timeline is easy. In the <em>Subsurface</em> <strong>Dive List</strong> panel, +highlight the dive to be transferred. Then, from the <strong>Main Menu</strong>, select +<em>Share on → Facebook</em>. A dialogue box is shown, determining the amount of +additional information to be transferred with the dive profile (image <strong>A</strong>, +below). To transfer a dive profile to <em>Facebook</em>, the name of a <em>Facebook</em> +album is needed. The checkboxes on the left hand side determine how much +additional information is added to the dive profile, shown in the text box +on the right hand side of the panel (image <strong>A</strong>, below). Customise the +message that will be posted with the dive profile by editing any of the +information. After specifying additional information and verifying the text, +select the <em>OK</em> button that triggers the transfer to <em>Facebook</em>. After the +transfer is done, an acknowledgement dialogue appears, indicating it was +successful.</p></div> <div class="paragraph"><p>À la fois l’album créé et la publication sur votre ligne temporelle seront marquées comme privés. Pour que vos amis puissent la voir, connectez-vous à <em>Facebook</em> depuis un navigateur ou l’application Facebook et modifiez les @@ -4397,7 +4395,7 @@ pressures, deco ceilings and O<sub>2</sub>/He/N<sub>2</sub> partial pressures.</ <div class="paragraph"><p>If you prefer not to use the integrated cloud storage of dive logs (and don’t need the web access), it’s simple to store dive logs in the cloud using several of the existing facilities on the Internet. For instance -<a href="http://www.dropbox.com/"><em>Dropbox</em></a> offers a free application that allows +<a href="https://www.dropbox.com/"><em>Dropbox</em></a> offers a free application that allows files on the Dropbox servers to be seen as a local folder on a desktop computer.</p></div> <div class="imageblock" style="text-align:center;"> @@ -4413,19 +4411,6 @@ local <em>Dropbox</em> folder, so there’s no need for a direct internet connection. If the local copy is modified, e.g. by adding a dive, the remote copy in the <em>Dropbox</em> server in the Cloud will be automatically updated whenever Internet access is available.</p></div> -<div class="paragraph"><p>In this way a dive log in your <em>Dropbox</em> folder can be accessed seamlessly -from the Internet and can be accessed anywhere with Internet -access. Currently there are no costs involved for this service. Dropbox -(Windows, Mac and Linux) can be installed by accessing the -<a href="http://www.dropbox.com/install"><em>Install Page on the Dropbox website</em></a> -Alternatively you can use <em>Dropbox</em> as a way back up your dive log. To Store -a dive log on <em>Dropbox</em>, select <em>File → Save as</em> from the <em>Subsurface</em> main -menu, navigate to the <em>Dropbox</em> folder and select the <em>Save</em> button. To -access the dive log in <em>Dropbox</em>, select <em>File → Open Logbook</em> from the -<em>Subsurface</em> main menu and navigate to the dive log file in the <em>Dropbox</em> -folder and select the <em>Open</em> button.</p></div> -<div class="paragraph"><p>Several paid services exist on the Internet (e.g. Google, Amazon) where the -same process could be used for the Cloud-based storage of dive logs.</p></div> </div> </div> </div> @@ -4626,15 +4611,14 @@ information on how to write or modify a template.</p></div> <div class="sect1"> <h2 id="S_Configure">12. Configurer un ordinateur de plongée</h2> <div class="sectionbody"> -<div class="paragraph"><p><em>Subsurface</em> vous permet de configurer un ordinateur de -plongée. Actuellement, les familles d’ordinateurs supportés sont -Heinrichs-Weikamp (OSTC 2, OSTC 3) et Suunto Vyper (Stinger, Mosquito, D3, -Vyper, Vytec, Cobra, Gekko et Zoop). De nombreux paramètres de ces -ordinateurs de plongée peuvent être lues et modifiées. Pour 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="#_appendix_a_operating_system_specific_information_for_importing_dive_information_from_a_dive_computer">ANNEXE A</a> pour plus d’informations sur la manière de procéder.</p></div> +<div class="paragraph"><p><em>Subsurface</em> lets you configure a dive computer. Currently, the +Heinrichs-Weikamp (OSTC 2/2N/2C, OSTC 3, Sport) and Suunto Vyper (Stinger, +Mosquito, D3, Vyper, Vytec, Cobra, Gekko and Zoop) family of dive computers +are supported. A large number of settings of these dive computers can be +read and changed to different values. To begin, be sure the appropriate +hardware driver is installed for the dive computer (also required for +downloading dives) and the device name of the dive computer is known. See +<a href="#_appendix_a_operating_system_specific_information_for_importing_dive_information_from_a_dive_computer">APPENDIX A</a> for information on how to do this.</p></div> <div class="paragraph"><p>Une fois que l’ordinateur de plongée est connecté à <em>Subsurface</em>, sélectionner <em>Fichier → Configurer l’ordinateur de plongée</em>, à partir du menu principal. Sélectionner le nom du périphérique (ou le point de montage) @@ -4688,7 +4672,7 @@ suivantes peuvent être effectuées :</p></div> <div class="paragraph"><p>There are several user-definable settings within <em>Subsurface</em>, found by selecting <em>File → Preferences</em>, mostly affecting the way in which <em>Subsurface</em> shows dive information to the user. The settings are in six -panels: <em>Defaults</em>, <em>Units</em>, <em>Graph</em>, <em>Language</em>, <em>Network</em>, and +panels: <em>General</em>, <em>Units</em>, <em>Profile</em>, <em>Language</em>, <em>Network</em>, and <em>Georeference</em>, all of which operate on the same principles: specified settings can be applied to the display of the dive log by selecting <em>Apply</em>. At this stage, any new settings only apply to the present session @@ -4696,11 +4680,11 @@ and are not saved. In order to apply new settings permanently, select the <em>Save</em> button. If you do not wish to apply the new preferences, select <em>Cancel</em>.</p></div> <div class="sect2"> -<h3 id="_defaults">13.1. Defaults</h3> -<div class="paragraph"><p>There are several headings in the <strong>Defaults</strong> panel:</p></div> +<h3 id="_general">13.1. General</h3> +<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 defaults page" /> +<img src="images/Pref1_f23.jpg" alt="FIGURE: Preferences general page" /> </div> </div> <div class="ulist"><ul> @@ -4788,7 +4772,7 @@ represented either as traditional coordinates (degrees, minutes, seconds) or as decimal degrees Choose the appropriate option.</p></div> </div> <div class="sect2"> -<h3 id="_graph">13.3. Graph</h3> +<h3 id="_profile">13.3. Profile</h3> <div class="paragraph"><p>This panel has three sections:</p></div> <div class="imageblock" id="S_CCR_options" style="text-align:center;"> <div class="content"> @@ -4821,7 +4805,7 @@ CCR Options: These options determine oxygen management for CCR dives: </li> <li> <p> -<em>CCR: Show setpoints when viewing pO2:</em> With this checkbox activated, the pO<sub>2</sub> +<em>CCR: Show setpoints when viewing pO<sub>2</sub>:</em> With this checkbox activated, the pO<sub>2</sub> graph on the dive profile has an overlay in red which indicates the CCR setpoint values. See the section on <a href="#S_CCR_dives">Closed Circuit Rebreather dives</a>. </p> @@ -4867,7 +4851,7 @@ CCR Options: These options determine oxygen management for CCR dives: </li> <li> <p> -Bühlmann: Set the <em>gradient factors</em> (GFlow and GFHigh) for calculcating the deco ceiling following +Bühlmann: Set the <em>gradient factors</em> (GFLow and GFHigh) for calculcating the deco ceiling following the ZH-L16 algorithm. GF_Low is the gradient factor at depth and GF_High is used at the surface. At intermediate depths gradient factors between GF_Low and GF_High are used. Gradient factors add conservatism to nitrogen and helium exposure during a dive, in a @@ -4876,7 +4860,7 @@ Bühlmann: Set the <em>gradient factors</em> (GFlow and GFHigh) for calculcating respect to inert gas loading and the deeper the ceilings are. Gradient factors of 20/60 are considered conservative and values of 70/90 are considered harsh. - In addition decide whether to check the <em>GFLow at max depth</em> box. If checked, GF_Low is used for the + In addition decide whether to check the <em>GFLow at max. depth</em> box. If checked, GF_Low is used for the deepest dive depth and linearly increased up to the GF_High value at the surface. If unchecked, GF_Low is used between the deepest dive depth and the first deco stop, after which the gradient factor linearly increases up to the GF_High value at the surface. For more information see: @@ -4953,18 +4937,16 @@ country combination from the list of locations. The <em>Filter</em> text box to list similar languages. For instance there are several system variants of English or French. <strong>This particular preference requires a restart of <em>Subsurface</em> to take effect</strong>.</p></div> -<div class="paragraph"><p>In this section also specify appropriate date an time formats for showing +<div class="paragraph"><p>In this section also specify appropriate date and time formats for showing dive details.</p></div> </div> <div class="sect2"> <h3 id="_network">13.5. Network</h3> <div class="paragraph"><p>This panel facilitates communication between <em>Subsurface</em> and data sources on the Internet. This is important, for instance, when <em>Subsurface</em> needs -to communicate with web services such as Cloud storage or the -<a href="#S_Companion"><em>Subsurface Companion app</em></a>. These Internet requirements are -determined by your type of connection to the Internet and by the Internet -Service Provider (ISP) used. Your ISP should provide the appropriate -information.</p></div> +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> <div class="imageblock" style="text-align:center;"> <div class="content"> <img src="images/Pref5_f23.jpg" alt="FIGURE: Preferences Network page" /> @@ -4974,7 +4956,7 @@ information.</p></div> <div class="ulist"><ul> <li> <p> -<em>Proxy type</em>: +<em>Proxy</em>: If a proxy server is used for Internet access, the type of proxy needs to be selected from the dropdown list, after which the IP address of the host and the appropriate port number should be provided. If the proxy server uses authentication, the appropriate userID and @@ -5038,7 +5020,7 @@ below).</p></div> <div class="paragraph"><p>Dive planning is an advanced feature of <em>Subsurface</em>, accessed by selecting <em>Log → Plan Dive</em> from the main menu. It allows calculation of inert gas load during a dive by using the Bühlmann ZH-L16 algorithm with the addition -of gradient factors as implemented by Erik Baker.</p></div> +of gradient factors as implemented by Erik Baker, or using the VPM-B model.</p></div> <div class="sidebarblock"> <div class="content"> <div class="admonitionblock"> @@ -5093,8 +5075,8 @@ A user who is not absolutely sure about any of the above requirements should <h3 id="_the_em_subsurface_em_dive_planner_screen">14.1. The <em>Subsurface</em> dive planner screen</h3> <div class="paragraph"><p>Like the <em>Subsurface</em> dive log, the planner screen is divided into several sections (see image below). The <strong>setup</strong> parameters for a dive are entered -into the sections on the left hand side of the screen. They are: Available -Gases, Rates, Planning, Gas Options and Notes.</p></div> +into the sections on the left hand and bottom side of the screen. They are: +Available Gases, Rates, Planning, Gas Options and Notes.</p></div> <div class="paragraph"><p>At the top right hand is a green <strong>design panel</strong> on which the profile of the dive can be manipulated directly by dragging and clicking as explained below. This feature makes the <em>Subsurface</em> dive planner unique in ease of @@ -5156,8 +5138,8 @@ In the table labelled <em>Available Gases</em>, add the information of the cylinder. This is done in a similar way as for <a href="#cylinder_definitions">providing cylinder data for dive logs</a>. Choose the cylinder type by double clicking the cylinder type and using the dropdown - list, then specify the work pressure of this cylinder. By leaving the oxygen - concentration (O2%) field empty, the cylinder is assumed to contain + list, then specify the start pressure of this cylinder. By leaving the + oxygen concentration (O<sub>2</sub>%) field empty, the cylinder is assumed to contain air. Otherwise enter the oxygen and/or helium concentration in the boxes provided in this dialogue. Add additional cylinders by using the "+" icon to the top right-hand of the dialogue. @@ -5171,14 +5153,14 @@ The <em>Available Gases</em> table includes three gas depth fields, labelled: <li> <p> Deco switch at: the switch depth for deco gases. Unless overridden by the user, this will be - automatically calculated based on the Deco pO₂ preference (default 1.6 bar) + automatically calculated based on the Deco pO<sub>2</sub> preference (default 1.6 bar) </p> </li> <li> <p> Bot. MOD: the gas Maximum Operating Depth (MOD) if it is used as a bottom mix. Automatically - calculated based on the Bottom pO₂ preference (default 1.4 bar). Editing this field will modify the - O₂% according to the depth set. Set to <em>'*</em>' to calculate the best O₂% for the dive maximum depth. + calculated based on the Bottom pO<sub>2</sub> preference (default 1.4 bar). Editing this field will modify the + O<sub>2</sub>% according to the depth set. Set to <em>'*</em>' to calculate the best O<sub>2</sub>% for the dive maximum depth. </p> </li> <li> @@ -5210,7 +5192,7 @@ The most efficient way to create a dive profile is to enter the appropriate values into the table marked <em>Dive planner points</em>. The first line of the table represents the duration and the final depth of the descent from the surface. Subsequent segments describe the bottom phase of the dive. The <em>CC - set point</em> column is only relevant for closed circuit divers. The ascent is + setpoint</em> column is only relevant for closed circuit divers. The ascent is usually not specified because this is what the planner is supposed to calculate. Add additional segments to the profile by selecting the "+" icon at the top right hand of the table. Segments entered into the <em>Dive planner @@ -5249,7 +5231,7 @@ Immediately under the heading <em>Planning</em> are two checkboxes <em>Recreatio <li> <p> Then define the cylinder size, the gas mixture (air or % oxygen) and the - starting cylinder pressure in the top left-hand section of the planner under + working cylinder pressure in the top left-hand section of the planner under <em>Available gases</em>. </p> </li> @@ -5315,7 +5297,7 @@ text box at the bottom right of the panel, requiring sufficient air for buddy-sharing during ascent.</p></div> <div class="imageblock" style="text-align:center;"> <div class="content"> -<img src="images/rec_diveplan.jpg" alt="FIGURE: A recreational dive plan: setup" /> +<img src="images/Planner_OC_rec.jpg" alt="FIGURE: A recreational dive plan: setup" /> </div> </div> </div> @@ -5326,7 +5308,7 @@ using multiple breathing gases. These dives are planned in three stages:</p></d <div class="paragraph"><p><strong>a) Nitrogen management</strong>: This is done by specifying the rates for descent and ascent, as well as the deco model (GFLow, GFHigh or Conservatism level) under the headings <em>Rates</em> and <em>Planning</em> to the bottom left of the planning screen. Two deco models are supported the Bühlmann model and the VPM-B -model. Select one of the two models. When selecting the Bühlmann model, the gradient factors (GFhigh and GFlow +model. Select one of the two models. When selecting the Bühlmann model, the gradient factors (GFHigh and GFLow need to be specified. Initially, the GFHigh and GFLow values in the <em>Preferences</em> panel of <em>Subsurface</em> is used. If these are changed within the planner (see <em>Gas Options</em> within the planner), the new values are @@ -5354,10 +5336,10 @@ practice.</p></div> <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> -<a href="http://www.amazon.com/Deco-Divers-Decompression-Theory-Physiology/dp/1905492073/ref=sr_1_1?s=books&ie=UTF8&qid=1403932320&sr=1-1&keywords=deco+for+divers"><em>Deco +<a href="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"><em>Deco for Divers</em>, by Mark Powell (2008). Aquapress</a> Southend-on-Sea, UK. ISBN 10: -1-905492-07-3. Un excellent livre non technique qui traite à la fois des -modèles de décompression Bühlmann et VPM-B. +1-905492-07-3. An excellent non-technical review that discusses both the +Bühlmann deco model and the VPM-B model. </p> </li> </ul></div> @@ -5373,8 +5355,9 @@ maximal descent rate specified in the <em>Rates</em> section of the dive setup.< pressure for oxygen needs to be specified for the bottom part of the dive (<em>bottom po2</em>) as well as for the decompression part of the dive (<em>deco po2</em>). Commonly used values are 1.4 bar for the bottom part of the dive and 1.6 bar for any decompression -stages. Normally, a partial pressure of 1.6 bar is not exceeded. PO2 settings and the depth at which switching to a gas takes place can also be edited in the -<em>Available Gases</em> dialog. Normally the planner decides on switching to a new gas when, during +stages. Normally, a partial pressure of 1.6 bar is not exceeded. The depth at which switching to a gas +takes place can be edited in the +<em>Available Gases</em> dialog. Normally, the planner decides on switching to a new gas when, during ascent, the partial pressure of the new gas has decreased to 1.6 bar.</p></div> <div class="paragraph"><p><strong>c) Gas management</strong>: With open-circuit dives this is a primary consideration. Divers need to keep within the limits of the amount of @@ -5391,7 +5374,21 @@ The planner calculates the total volume of gas used during the dive and issues a if you exceeds the total amount of gas available. Good practice demands that divers not dive to the limit of the gas supply but that an appropriate reserve is kept for unforeseen circumstances. -For technical diving, this reserve can be up to 66% of the total available gas.</p></div> +For technical diving, this reserve can be up to 66% of the total available gas. +In addition to calculating the total gas consumption for every cylinder the planner provides one way +of calculating the recommended volume of bottom gas which is needed for safe asscent to the +first deco gas change depth or the surface. This procedure is called the "minimum gas" or "rock bottom" +consideration and it is used by various (but not all) +technical diving organisations. The calculation assumes that in worst case an out of gas (OoG) +situation could occur at the end of the planned bottom time at maximum depth. This OoG event forces +the buddy team the share the gas of one diver and to stay at maximum depth for an additional +time of n minutes (preferences option "problem solving time"). +At the same moment the combined SAC of both divers is increased by a estimated factor (preferences option +"SAC factor") compared to the SAC factor of a single diver under normal conditions. +The result of the minimum gas calculation for the bottom gas is printed to the planner output as an +additional information. No automatic checks are performed based on this result. +Please take care that the feature only gives valid results for simple, rectengular shaped single +level dive profiles. For multi level dives one would need to check every leg of the profile independently.</p></div> <div class="paragraph"><p>Now you can start the detailed time-depth planning of the dive. <em>Subsurface</em> offers an unique graphical interface for doing planning. The mechanics are similar to hand-entering a dive profile in the dive log part of @@ -5410,21 +5407,19 @@ table on the left of the dive planner panel. Ensure the <em>Used Gas</em> value each row of that table corresponds to one of the gas mixtures specified in the <em>Available Gases</em> table. Add new waypoints until the main features of the dive have been completed, e.g. the bottom time segment and deep stops -(if these are implemented). Leave the remaining waypoints on the ascent to -<em>Subsurface</em>. In most cases <em>Subsurface</em> computes additional way points in -order to fulfill decompression requirements for that dive. A waypoint can be -moved by selecting it and by using the arrow keys. The waypoints listed in -the <em>Dive Planner Points</em> dialogue can be edited by hand in order to get a -precise presentation of the dive plan. In fact, it is sometimes more easy to -create the whole dive profile by editing the <em>Dive Planner Points</em> dialog.</p></div> +(if these are implemented). In most cases <em>Subsurface</em> computes additional +way points in order to fulfill decompression requirements for that dive. A +waypoint can also be moved by selecting it and by using the arrow keys. The +waypoints listed in the <em>Dive Planner Points</em> dialogue can be edited by hand +in order to get a precise presentation of the dive plan. In fact, it is +sometimes more easy to create the whole dive profile by editing the <em>Dive +Planner Points</em> dialog.</p></div> <div class="paragraph"><p>Show any changes in gas cylinder used by indicating gas changes as explained in the section <a href="#S_CreateProfile">hand-creating a dive profile</a>. These changes should reflect the cylinders and gas compositions defined in the table with <em>Available Gases</em>. If two or more gases are used, automatic gas -switches will be suggested during the ascent to the surface. These changes -can be deleted by right-clicking the gas change and manually creating a gas -change by right-clicking on the appropriate waypoint.</p></div> -<div class="paragraph"><p>A non-zero value in the "CC set point" column of the table of dive planner +switches will be planned during the ascent to the surface.</p></div> +<div class="paragraph"><p>A non-zero value in the "CC setpoint" column of the table of dive planner points indicates a valid setpoint for oxygen partial pressure and that the segment is dived using a closed circuit rebreather (CCR). If the last manually entered segment is a CCR segment, the decompression phase is @@ -5432,11 +5427,11 @@ computed assuming the diver uses a CCR with the specified set-point. If the last segment (however short) is on open circuit (OC, indicated by a zero set-point) the decompression is computed in OC mode and the planner only considers gas changes in OC mode.</p></div> -<div class="paragraph"><p>Below is an example of a dive plan to 45m using EAN26, followed by an ascent -using EAN50 and using the settings as described above.</p></div> +<div class="paragraph"><p>Below is an example of a dive plan to 45m using Tx21/35, followed by an +ascent using EAN50 and oxygen and using the settings as described above.</p></div> <div class="imageblock" style="text-align:center;"> <div class="content"> -<img src="images/DivePlanner2_f20.jpg" alt="FIGURE: Planning a dive: setup" /> +<img src="images/Planner_OC_deco_VPM.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 @@ -5462,14 +5457,16 @@ from the segment durations at a particular level.</p></div> <h3 id="_planning_pscr_dives">14.3. Planning pSCR dives</h3> <div class="paragraph"><p>To plan a dive using a passive semi-closed rebreather (pSCR), select <em>pSCR</em> rather than <em>Open circuit</em> in the dropdown list. -The parameters of the pSCR dive can be set by selecting <em>File → Preferences → Graph</em> +The parameters of the pSCR dive can be set by selecting <em>File → Preferences → Profile</em> from the main menu, where the gas consumption calculation takes into account the pSCR dump ratio (default 1:10) as well as the metabolic rate. The calculation also takes the oxygen drop accross the mouthpiece of the rebreather into account. If the pO<sub>2</sub> drops below what is considered safe, a warning appears in the <em>Dive plan -details</em>. A typical pSCR configuration is with a single cylinder and one or more bail-out -cylinders. Therefore the setup of the <em>Available gases</em> and the <em>Dive planner points</em> tables -are very similar to that of a CCR dive plan, described below. However, no oxygen setpoints +details</em>. A typical pSCR cylinder setup is very similar to an open circuit dive; +one or more drive cilinders, possibly with different bottom and decompression +gasses, including gas switches during the dive like in open circuit diving. +Therefore, the setup of the <em>Available gases</em> and the <em>Dive planner points</em> tables +are very similar to that of a open circuit dive plan, described above. However, no oxygen setpoints are specified for pSCR dives. Below is a dive plan for a pSCR dive. The dive is comparable to that of the CCR dive below, but note the longer ascent duration due to the lower oxygen in the loop due to the oxygen drop across the mouthpiece of the pSCR equipment.</p></div> @@ -5486,7 +5483,7 @@ the dropdown list, circled in blue in the image below.</p></div> <div class="paragraph"><p><strong>Available gases</strong>: In the <em>Available gases</em> table, enter the cylinder information for the diluent cylinder and for any bail-out cylinders. Do NOT enter the information for the oxygen cylinder since it is implied when the <em>CCR</em> dropdown selection is made.</p></div> -<div class="paragraph"><p><strong>Entering setpoints</strong>: Specify a default setpoint in the Preferences tab, by selecting <em>File → Preferences → Graph</em> from +<div class="paragraph"><p><strong>Entering setpoints</strong>: Specify a default setpoint in the Preferences tab, by selecting <em>File → Preferences → Profile</em> from the main menu. All user-entered segments in the <em>Dive planner points</em> table use the default setpoint value. Then, different setpoints can be specified for dive segments in the <em>Dive planner points</em> table. A zero setpoint @@ -5541,17 +5538,11 @@ configuration in the highlighted dive.</p></div> <div class="paragraph"><p>Selecting the <em>Print</em> button in the planner allows printing of the <em>Dive Plan Details</em> for wet notes. You can also cut and paste the <em>Dive Plan Details</em> to include in a text file or word processing document.</p></div> -<div class="paragraph"><p>Dive plans have many characteristics in common with dive logs (dive profile, -dive notes, etc). After a dive plan has been saved, the dive details and -gas calculations are saved in the <strong>Notes</strong> tab. While a dive plan is being -designed, it can be printed using the <em>Print</em> button in the dive -planner. This prints the dive details and gas calculations in the <em>Dive Plan -Details</em> panel of the dive planner. 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 same way as during the planning -process. The only way to print the dive plan is to use the <em>File → Print</em> -function on the main menu in the same way as for dive logs or by copy and -paste to a word processor.</p></div> +<div class="paragraph"><p>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 +same way as during the planning process. The only way to print the dive plan +is to use the <em>File → Print</em> function on the main menu in the same way as +for dive logs or by copy and paste to a word processor.</p></div> </div> <div class="sect2"> <h3 id="S_MergeDivePlan">14.8. Saving a dive with its dive plan</h3> @@ -5641,7 +5632,7 @@ cellspacing="0" cellpadding="4"> </tr> <tr> <td align="left" valign="top"><p class="table">--version</p></td> -<td align="left" valign="top"><p class="table">Prints the current version of <em>Subsurface</em>.</p></td> +<td align="left" valign="top"><p class="table">Prints the current version of <em>Subsurface</em></p></td> </tr> <tr> <td align="left" valign="top"><p class="table">--survey</p></td> @@ -5659,6 +5650,10 @@ cellspacing="0" cellpadding="4"> <td align="left" valign="top"><p class="table">--win32console</p></td> <td align="left" valign="top"><p class="table">Create a dedicated console if needed (Windows only). Add this option before everything else</p></td> </tr> +<tr> +<td align="left" valign="top"><p class="table">--win32log</p></td> +<td align="left" valign="top"><p class="table">Write the program output to subsurface.log (Windows only). Add option before everything else</p></td> +</tr> </tbody> </table> </div> @@ -5944,9 +5939,8 @@ The Edit option allows one to undo or redo an action, e.g. deleting dives. </li> <li> <p> -<em>Vérifier les mises à jour</em> - Vérifier si une nouvelle version de - Subsurface est disponible sur le <a href="http://subsurface-divelog.org/">site web de - <em>Subsurface</em> </a>. +<em>Check for updates</em> - Find out whether a newer version of Subsurface is + available on the <a href="https://subsurface-divelog.org/"><em>Subsurface</em> web site</a>. </p> </li> <li> @@ -5998,13 +5992,12 @@ Sous Windows, le bon pilote devrait être téléchargé automatiquement la </p> </li> </ul></div> -<div class="paragraph"><p>Sous Mac, les utilisateurs peuvent parfois avoir besoin d’installer -manuellement le bon pilote. Par exemple, pour le Mares Puck ou n’importe -quel autre ordinateur de plongée utilisant une interface USB-série basé sur -le composant Silicon Labs CP2101 ou similaire, le bon pilote est disponible -sous <em>Mac_OSX_VCP_Driver.zip</em> sur le -<a href="http://www.silabs.com/support/pages/document-library.aspx?p=Interface&f=USB%20Bridges&pn=CP2101">dépôt -de documents et logiciels Silicon Labs</a>.</p></div> +<div class="paragraph"><p>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 +computer using a USB-to-serial interface based on the Silicon Labs CP2101 or +similar chip can be found as <em>Mac_OSX_VCP_Driver.zip</em> at the +<a href="https://www.silabs.com/support/pages/document-library.aspx?p=Interface&f=USB%20Bridges&pn=CP2101">Silicon +Labs document and software repository</a>.</p></div> </div> <div class="sect2"> <h3 id="S_HowFindDeviceName">17.2. Comment trouver le nom du périphérique branché sur USB et paramétrer les permissions en écriture</h3> @@ -6206,7 +6199,7 @@ password, enter 0000. Write down or copy the MAC address of your dive computer - this needed later and should be in the form 00:11:22:33:44:55.</p></div> <div class="paragraph"><p>If the graphical method doesn’t work, pair the device from the command line. Open a terminal and use <code>hciconfig</code> to check the Bluetooth controller -status</p></div> +status.</p></div> <div class="literalblock"> <div class="content"> <pre><code>$ hciconfig @@ -6232,8 +6225,8 @@ hci0: Type: BR/EDR Bus: USB TX bytes:449 acl:0 sco:0 commands:46 errors:0</code></pre> </div></div> <div class="paragraph"><p>Check that the status now includes <code><em>UP</em>, <em>RUNNING</em> AND <em>AUTH</em></code>.</p></div> -<div class="paragraph"><p>If there are multiple controllers running, it’s easiest to off the unused -controller(s). For example, for <code>hci1</code>:</p></div> +<div class="paragraph"><p>If there are multiple controllers running, it’s easiest to turn off the +unused controller(s). For example, for <code>hci1</code>:</p></div> <div class="literalblock"> <div class="content"> <pre><code>sudo hciconfig hci1 down</code></pre> @@ -6276,7 +6269,7 @@ Scanning ... 00:11:22:33:44:55 Petrel bluez-simple-agent hci0 00:11:22:33:44:55</code></pre> </div></div> -<div class="paragraph"><p>Once ther dive computer is pired, set up the RFCOMM connection</p></div> +<div class="paragraph"><p>Once the dive computer is paired, set up the RFCOMM connection.</p></div> </div> <div class="sect4"> <h5 id="_establishing_the_rfcomm_connection">Establishing the RFCOMM connection</h5> @@ -6459,7 +6452,7 @@ for OSX 10.6 or higher.</p></div> file for every dive. Mark all the dives you’d like to import or open. Note: The DR5 does not seem to store gradient factors nor deco information, so for <em>Subsurface</em> it is not possible to display them. Adjust the gradient -factors in the <em>Graph Settings</em> in <em>Subsurface</em> to generate a deco overlay +factors in the <em>Profile Settings</em> in <em>Subsurface</em> to generate a deco overlay in the <em>Subsurface</em> <strong>Dive Profile</strong> panel but please note that the deco calculated by <em>Subsurface</em> will most likely differ from the one displayed on the DR5.</td> @@ -6478,7 +6471,7 @@ option in BLACK’s logbook menu. When mounted as a USB drive UDDF files ar available in LOGBOOK directory. Note: The xDEEP BLACK saves NDL time but does not seem to store gradient factors nor deco information, so for <em>Subsurface</em> it is not possible to display them. Adjust the gradient factors -in the <em>Graph Settings</em> in <em>Subsurface</em> to generate a deco overlay in the +in the <em>Profile Settings</em> in <em>Subsurface</em> to generate a deco overlay in the <em>Subsurface</em> <strong>Dive Profile</strong> panel but please note that the deco calculated by <em>Subsurface</em> will most likely differ from the one displayed on the xDEEP BLACK.</td> @@ -6581,7 +6574,7 @@ Open a text editor, e.g. Notepad (Windows) or TextWrangler (Mac). <li> <p> Copy the contents of the clipboard into the text editor and save the text - file with a filename extension of <em>.apd</em> + file with a filename extension of <em>.apd</em>. </p> </li> <li> @@ -6663,11 +6656,11 @@ Linux and/or Windows.</p></div> <td class="icon"> <img src="images/icons/suuntologo.jpg" alt="Note" /> </td> -<td class="content">DiveManager is a MS Windows application for Suunto dive computers. -Divemanager 3 (DM3) is an older version of the Suunto software. More recent -Suunto dive computers use Divemanager version 4 or 5 (DM4 or DM5). The -different versions of Divemanager use different methods and different file -naming conventions to export dive log data.</td> +<td class="content">DiveManager is a Windows application for Suunto dive computers. Divemanager +3 (DM3) is an older version of the Suunto software. More recent Suunto dive +computers use Divemanager version 4 or 5 (DM4 or DM5). The different +versions of Divemanager use different methods and different file naming +conventions to export dive log data.</td> </tr></table> </div> <div class="paragraph"><p><strong>Divemanager 3 (DM3):</strong></p></div> @@ -6833,9 +6826,9 @@ The dives are now exported to the file DM4.bak (or DM5.bak) <td class="icon"> <img src="images/icons/atomiclogo.jpg" alt="Note" /> </td> -<td class="content">Atomic Logbook is a Windows software by Atomic Aquatics. It allows -downloading of dive information from Cobalt and Cobalt 2 dive computers. -The divelog is kept in a SQLite database at +<td class="content">Atomic Logbook is Windows software by Atomic Aquatics. It allows downloading +of dive information from Cobalt and Cobalt 2 dive computers. The divelog is +kept in a SQLite database at C:\ProgramData\AtomicsAquatics\Cobalt-Logbook\Cobalt.db. This file can be directly imported to Subsurface.</td> </tr></table> @@ -6941,12 +6934,11 @@ pour convertir un carnet de plongée enregistrée sous forme de tableur vers un fichier CSV qui pourra ensuite être importé dans <em>Subsurface</em>. Créer un fichier CSV est simple malgré que la procédure soit différente selon le tableur utilisé.</p></div> -<div class="paragraph"><p>Organiser les données de plongées dans le tableur pour que la première ligne -contienne le nom (ou le titre) de chaque colonne et que les informations de -chaque plongée soient contenues sur une seule ligne. <em>Subsurface</em> supporte -de nombreux éléments (Dive #, Date, Time, Duration, Location, GPS, Max -Depth, Mean Depth, Buddy, Notes, Weight et Tags). Organiser les données de -plongées selon quelques règles simples :</p></div> +<div class="paragraph"><p>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 +in a single row. <em>Subsurface</em> supports many data items (Dive number, Date, +Time, Duration, Location, GPS, Max. Depth, Mean Depth, Buddy, Notes, Weight +and Tags). Organize dive data following a few simple rules:</p></div> <div class="olist arabic"><ol class="arabic"> <li> <p> @@ -7030,9 +7022,8 @@ Open the <em>Regional and Language Options</em> dialog box. </li> <li> <p> -Do one of the following: <strong> In Windows 7, click the <em>Formats</em> tab, and then - click <em>Customize this format</em>. </strong> In Windows XP, click the <em>Regional - Options</em> tab, and then click <em>Customize</em>. +Do the following: ** In Windows 7, click the <em>Formats</em> tab, and then click + <em>Customize this format</em>. </p> </li> <li> @@ -7151,7 +7142,7 @@ end. It is possible to iterate over the list as follows: <h1> 2 </h1> <h1> 3 </h1></code></pre> </div></div> -<div class="paragraph"><p>Additional information about <em>Grantlee</em> can be found at +<div class="paragraph"><p>Additional information about <em>Grantlee</em> can be found <a href="http://www.grantlee.org/apidox/for_themers.html">here</a></p></div> </div> <div class="sect2"> @@ -7199,7 +7190,7 @@ cellspacing="0" cellpadding="4"> </tr> <tr> <td align="left" valign="top"><p class="table">divemaster</p></td> -<td align="left" valign="top"><p class="table">(<strong>string</strong>) dive master for the dive</p></td> +<td align="left" valign="top"><p class="table">(<strong>string</strong>) divemaster for the dive</p></td> </tr> <tr> <td align="left" valign="top"><p class="table">buddy</p></td> @@ -7387,7 +7378,7 @@ cellspacing="0" cellpadding="4"> <div class="sect2"> <h3 id="_defined_css_selectors">21.3. Defined CSS selectors</h3> <div class="paragraph"><p>As the dive profile is placed after rendering, <em>Subsurface</em> uses special -<em>CSS</em> selectors to searche in the HTML output. The <em>CSS</em> selectors in the +<em>CSS</em> selectors to search in the HTML output. The <em>CSS</em> selectors in the following table should be added.</p></div> <div class="tableblock"> <table rules="all" @@ -7550,7 +7541,7 @@ salvaged after being overwritten by new dives.</p></div> <div id="footer"> <div id="footer-text"> Last updated - 2017-02-03 15:33:17 CET + 2017-07-04 13:38:54 CEST </div> </div> </body> diff --git a/Documentation/user-manual_fr.txt b/Documentation/user-manual_fr.txt index 0579483d4..5942873a2 100644 --- a/Documentation/user-manual_fr.txt +++ b/Documentation/user-manual_fr.txt @@ -7,10 +7,11 @@ image::images/Subsurface4Banner.jpg["Banner", align="center"] [big]#MANUEL UTILISATEUR# -*Auteurs du manuel* : Willem Ferguson, Jacco van Koll, Dirk Hohndel, Reinout Hoornweg, -Linus Torvalds, Miika Turkia, Amit Chaudhuri, Jan Schubert, Salvador Cuñat, Pedro Neves +*Manual authors*: Willem Ferguson, Jacco van Koll, Dirk Hohndel, Reinout Hoornweg, +Linus Torvalds, Miika Turkia, Amit Chaudhuri, Jan Schubert, Salvador Cuñat, Pedro Neves, +Stefan Fuchs -[blue]#_Version 4.6, janvier 2017_# +[blue]#_Version 4.6, March 2017_# Bienvenue en tant qu'utilisateur de _Subsurface_, un programme avancé d'enregistrement de plongées (carnet de plongées) avec une bonne @@ -47,21 +48,19 @@ rapport à d'autres solutions logicielles similaires : - Souhaitez-vous pouvoir accéder ou modifier votre carnet de plongée en utilisant un smartphone ? -_Subsurface_ est disponible pour Windows (Win XP ou plus récent), les Macs -basés sur processeurs Intel (OS/X) et de nombreuses distributions -Linux. _Subsurface_ peut être compilé pour bien plus de plateformes -matérielles et d'environnements logiciels où Qt et libdivecomputer sont -disponibles. - -Ce manuel explique comment utiliser le programme _Subsurface_. Pour -installer le logiciel, consultez la page _Téléchargement_ sur le -http://subsurface-divelog.org/[site web de _Subsurface_]. En cas de -problème, vous pouvez envoyer un e-mail sur -mailto:subsurface@subsurface-divelog.org[notre liste de diffusion] et -rapportez les bogues sur http://trac.hohndel.org[notre bugtracker]. Pour -des instructions de compilation du logiciel et (si besoin) de ses -dépendances, merci de consulter le fichier INSTALL inclus dans les sources -logicielles. +_Subsurface_ binaries are available for Windows PCs (Win 7 or later from +version 4.6 of _Subsurface_ onwards), Intel based Macs (OS/X) and many Linux +distributions. _Subsurface_ can be built for many more hardware platforms +and software environments where Qt and libdivecomputer are available. + +This manual explains how to use the _Subsurface_ program. To install the +software, consult the _Downloads_ page on the +https://subsurface-divelog.org/[_Subsurface_ web site]. Please discuss +issues with this program by sending an email to +mailto:subsurface@subsurface-divelog.org[our mailing list] and report bugs +at https://github.com/Subsurface-divelog/subsurface/issues[our bugtracker]. +For instructions on how to build the software and (if needed) its +dependencies please consult the INSTALL file included with the source code. *Public* : Plongeurs loisirs, apnéistes, plongeurs Tek et plongeurs professionnels @@ -119,10 +118,10 @@ _--survey_ sur la ligne de commande. Commencer à utiliser le programme --------------------------------- -La fenêtre _Subsurface_ est généralement divisée en 4 panneaux avec un *Menu -principal* (Fichier Importer Journal Vue 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 : +The _Subsurface_ window is usually divided into four panels with a *Main +Menu* (File Edit Import Log View Share Help) at the top of the window (for +Windows and Linux) or the top of the screen (for Mac and Ubuntu Unity). The +four panels are: 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 @@ -179,12 +178,10 @@ toutes les plongées mises en surbrillance. *Globe* : affiche uniquement la carte mondiale, centrée sur la dernière plongée sélectionnée. -Comme d'autres fonctions qui peuvent être accédée via le menu principal, ces -options peuvent aussi être utilisées par des raccourcis clavier. Les -raccourcis pour un système particulier sont affichés avec un souligné des -les entrées de menu. À cause des différents systèmes d'exploitation et des -divers langues, _Subsurface_ peut utiliser différentes touches de raccourcis -et ne sont donc pas détaillées ici. +Like other functions that can be accessed via the Main Menu, these options +can also be triggered using keyboard shortcuts. The shortcuts are shown with +an underline in the main menu entries, with the Alt-key pressed, or are +denoted after the menu item. Lorsque le programme est lancé pour la première fois, il n'affiche aucune information, parce qu'il n'a aucune information de plongée disponible. Dans @@ -292,7 +289,8 @@ several line segments demarcated by waypoints (white dots on the profile, as shown above). The default dive depth is 15 m. If the dive depth was 20 m then you need to drag the appropriate waypoints downward to 20 m. To add a waypoint, double-click on any line segment. To move an additional waypoint, -drag it. To remove a waypoint, right-click on it and choose "Remove this +drag it. Moving can also be done by selecting the waypoint and using the +arrow keys. To remove a waypoint, right-click on it and choose "Remove this point" from the context menu. Drag the waypoints to represent an accurate time duration for the dive. Below is a dive profile for a dive to 20 m for 30 min, followed by a 5 minute safety stop at 5 m. @@ -305,7 +303,7 @@ mixture specified in the *Equipment* tab, which was air in the case of the profile above. The gas mixtures of segments of the dive profile can be changed by right-clicking on the particular waypoint and selecting the appropriate gas from the context menu. Changing the gas for a waypoint -affects the gas shown in the segment _to the left_ of that waypoint. Note +affects the gas shown in the segment _to the right_ of that waypoint. Note that only the gases defined in the *Equipment* tab appear in the context menu (see image below). @@ -325,7 +323,7 @@ information about each dive, e.g. a detailed record of depth, duration, rates of ascent/descent and of gas partial pressures. _Subsurface_ can capture this information, using dive details from a wide range of dive computers. The latest list of supported dive computers can be found at: -link:http://subsurface-divelog.org/documentation/supported-dive-computers/[ +link:https://subsurface-divelog.org/documentation/supported-dive-computers/[ Supported dive computers]. [icon="images/icons/warning2.png"] @@ -369,7 +367,7 @@ image::images/DC_import_f20.jpg["FIGURE: Download dialogue 1", align="center"] Dive computers tend to keep a certain number of dives in memory, even though these dives have already been imported to _Subsurface_. For that reason, if the dive computer allows this, _Subsurface_ only imports dives that have not -been uploaded before. This makes the download process faster on most dive +been downloaded before. This makes the download process faster on most dive computers and also saves battery power of the dive computer (at least for those not charging while connected via USB). @@ -670,11 +668,11 @@ edited. If you click on the *Notes* tab, the following fields are visible image::images/AddDive3_f22.jpg["FIGURE: The Notes tab", align="center"] The right hand image, above, shows a *Notes tab* filled with dive -information. The *Time* field reflects the date and time of the dive. By -clicking the date, a calendar is displayed for selecting the correct -date. Press ESC to close the calendar. The time values (hour and minutes) -can also be edited directly by clicking on each of them in the text box and -by over-typing the information displayed. +information. The *Date* and *Time* fields reflects the date and time of the +dive. By clicking the date, a calendar is displayed for selecting the +correct date. Press ESC to close the calendar. The time values (hour and +minutes) can also be edited directly by clicking on each of them in the text +box and by over-typing the information displayed. *Air/water temperatures*: Air and water temperatures during the dive are shown in text boxes to the right of the Start time. Many dive computers supply water @@ -703,23 +701,22 @@ several dives are made at the same location, the site information for the first dive is re-used. Existing dive locations can be edited by selecting (on the *Dive List* panel) a dive done at that site and by opening the location information. Click the globe button on the right of the location -name (see image on the right, above). When entering a dive location name, -auto location of dive site names makes it easy to select an existing dive -site name. When typing the name of a dive site, a dropdown list appears -showing all sites with similar names. If the dive site has been used before, -click on the already-existing name. The dive site names in the dropdown -list contain either a globe symbol (indicating existing dive sites in the -_Subsurface_ database) or a *+* symbol (indicating dive site names that -appear consistent with the current dive site name but which haven’t been -added to the dive site database). If the present dive site has not been -used before, a message appears as follows (image *A* below): +name (see image image *A* below). When typing the name of a dive site, a +dropdown list appears showing all sites with similar names. If the dive site +has been used before, click on the already-existing name. The dive site +names in the dropdown list contain either a globe symbol (indicating +existing dive sites in the _Subsurface_ database) or a *+* symbol +(indicating dive site names that appear consistent with the current dive +site name but which haven’t been added to the dive site database). If the +present dive site has not been used before, a message appears as follows +(image *A* below): image::images/Locations1_f22.jpg["FIGURE:Location description panel", align="center"] -Doubleclick on the new dive site name. A panel appears to enter the -coordinates and other information about the site (image *B*, above). The -most important items are the coordinates of the site. There are three ways -to specify coordinates: +Click the globe button and a panel appears to enter the coordinates and +other information about the site (image *B*, above). The most important +items are the coordinates of the site. There are three ways to specify +coordinates: a. Use the world map in the bottom right hand part of the _Subsurface_ window. The map displays an orange bar indicating "No location data - Move @@ -889,8 +886,8 @@ image::images/WeightsDataEntry3_f20.jpg["FIGURE: A completed weights information ==== Editing several selected dives simultaneously -_METHOD 1_: After uploading dives from a dive computer, the dive profiles of -each is shown in the *Dive profile* tab, as well as a few items of +_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 information in the *Notes* tab (e.g. water temperature) and in the *Equipment* tab (e.g. gas pressures and gas composition). Other fields remain empty. It may be useful to simultaneously edit some of the fields in @@ -982,14 +979,15 @@ _Subsurface_. Divelogs.de supports a few additional logbook formats that _Subsurface_ currently cannot handle. If the format of other software is supported natively on Subsurface, select -either _Import -> Import log files_ or _File -> Open log file_. _Subsurface_ -supports the data formats of many dive computers, including Suunto, -Shearwater and some CCR equipment. When importing dives, _Subsurface_ tries -to detect multiple records for the same dive and merges the information as -best as it can. If there are no time zone issues (or other reasons that -would cause the beginning time of the dives to be significantly different) -_Subsurface_ will not create duplicate entries. Below is more specific -information to import data to _Subsurface_. +either _Import -> Import log files_ or _File -> Open log file_. Notice that +the import adds the imported data to the current *Dive list*, and the open +style starts a new dive list. _Subsurface_ supports the data formats of many +dive computers, including Suunto, Shearwater and some CCR equipment. When +importing dives, _Subsurface_ tries to detect multiple records for the same +dive and merges the information as best as it can. If there are no time zone +issues (or other reasons that would cause the beginning time of the dives to +be significantly different) _Subsurface_ will not create duplicate +entries. Below is more specific information to import data to _Subsurface_. ==== Using the universal import dialogue [[Unified_import]] @@ -1018,6 +1016,8 @@ as in dialogue *B*, above. Currently these are: - Suunto Dive Manager (DM3, DM4, DM5) - DL7 files used by Diver's Alert network (DAN) - Underwater technologies AV1 dive logs + - Divesoft dive logs + - Poseidon MK VI eCCR dive logs - CSV (text-based and spreadsheet-based) dive logs, including APD CCR logs Selecting the appropriate format and then the specific log file in the large @@ -1273,10 +1273,9 @@ and diving software. Within _Subsurface_, _CSV_ files can also be used to import information from other sources like spreadsheet-based dive logs and some dive computers. -_CSV_ files can be created or edited with a normal text editor. The most -important attribute of a _CSV_ file is the _field separator_, the character -used to separate fields within a single line. The field separator is -frequently a comma, a colon, a SPACE character or a TAB character. When +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 +is frequently a comma, a colon, a SPACE character or a TAB character. When exporting data from spreadsheet software, the field separator needs to be specified in order to create the _CSV_ file. _CSV_ files are normally organized into a single line that provides the headers (or _field names_) of @@ -1310,7 +1309,7 @@ be maintained. Here is a highly simplified and shortened TAB-delimited example of a _CSV_ dive log from an APD closed-circuit rebreather (CCR) dive computer: - Dive Time (s) Depth (m) pO₂ - Setpoint (Bar) pO₂ - C1 Cell 1 (Bar) Ambient temp. (Celsius) + Dive Time (s) Depth (m) pO~2~ - Setpoint (Bar) pO~2~ - C1 Cell 1 (Bar) Ambient temp. (Celsius) 0 0.0 0.70 0.81 13.1 0 1.2 0.70 0.71 13.1 0 0.0 0.70 0.71 13.1 @@ -1444,8 +1443,7 @@ 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. Check the indicator at the top of the -mobile screen for internet activity, indicating the transfer of information. +data_. The locations are uploaded. ===== Apply the stored GPS locations to dives on the _Subsurface_ dive list. @@ -1485,7 +1483,7 @@ To do this: - Download the app from https://play.google.com/store/apps/details?id=org.subsurface[Google Play Store] or from - http://f-droid.org/repository/browse/?fdfilter=subsurface&fdid=org.subsurface[F-Droid]. + https://f-droid.org/repository/browse/?fdfilter=subsurface&fdid=org.subsurface[F-Droid]. ===== Using the Subsurface companion app on an Android smartphone @@ -1507,9 +1505,9 @@ On first use the app has three options: [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 -> -Defaults_ from the main menu in _Subsurface_ itself. This helps -synchronization between _Subsurface_ and the Companion App. +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* @@ -1537,10 +1535,11 @@ image::images/Companion_5.jpg["FIGURE: Companion App, add location using map", a * Import local GPX file: The Android device searches for .gpx files and located archives will be shown. The selected .gpx file is opened and its - locations shown. Now select the appropriate locations, then select the tab - in the upper right, afterAndroid device. + locations shown. Now select the appropriate locations, and select the check + symbol in the upper right to add them. + -*Dive lists of dive locations* +*List of dive locations* 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 @@ -1564,8 +1563,7 @@ 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 text name or other characteristics of the dive - location. +- 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 @@ -1755,8 +1753,8 @@ taken. They can also be viewed from the dive profile. ==== Loading photos and synchronizing between dive computer and camera -Left-lick on a dive or on a group of dives on the dive list, bringing up the -xref:S_DiveListContextMenu[Dive list context Menu]. Right-click the +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. @@ -1769,7 +1767,7 @@ 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_. -Having selected the local folder ot Internet image to be imported, the time +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 @@ -2016,7 +2014,7 @@ involves three steps, exactly as with multi-cylinder dives above: image::images/sidemount1.jpg["FIGURE: Sidemount profile", align="center"] [[S_sSCR_dives]] -==== Semi-closed circuit rebreather (SCR) dives +==== Passive semi-closed circuit rebreather (pSCR) dives [icon="images/halcyon_RB80.jpg"] [NOTE] @@ -2024,13 +2022,12 @@ Passive semi-closed rebreathers (pSCR) are a technical advance in diving equipment that recirculates the breathing gas a diver uses, while removing carbon dioxide from the exhaled gas. While a small amount (typically a tenth) of the exhaled breathing gas is released into the water, a small -amount of fresh gas is released from the back gas cylinder (typically -containing nitrox). A diver using a single cylinder of breathing gas can -therefore dive for much longer periods than using a recreational -open-circuit configuration. With pSCR equipment, a very small amount of -breathing gas is released every time the diver inhales. With active SCR -(aSCR) equipment, in contrast, a small amount of breathing gas is released -continuously from the back cylinder. +amount of fresh gas is released from the driving gas cylinder. A diver +using a single cylinder of breathing gas can therefore dive for much longer +periods than using a recreational open-circuit configuration. With pSCR +equipment, a very small amount of breathing gas is released every time the +diver inhales. With active SCR (aSCR) equipment, in contrast, a small amount +of breathing gas is released continuously from the driving cylinder. To log pSCR dives, no special procedures are required. Use the normal steps outlined above: @@ -2045,8 +2042,8 @@ outlined above: If a pSCR _Dive Mode_ has been selected, the dive ceiling for that is adjusted for the oxygen drop across the mouthpiece, which often requires longer decompression periods. Below is a dive profile of a pSCR dive using -EAN36 on the back cylinder and oxygen for decompression. Note that this dive -lasted over two hours. +EAN36 as bottom gas and oxygen for decompression. Note that this dive lasted +over two hours. image::images/pSCR_profile.jpg["FIGURE: pSCR profile", align="center"] @@ -2121,8 +2118,8 @@ The oxygen setpoint values as well as the readings from the individual oxygen sensors can be shown. The display of additional CCR information is turned on by checking the appropriate boxes in the _Preferences_ panel (accessible by selecting xref:S_CCR_options[_File -> Preferences -> -Graph_]). This part of the _Preferences_ panel is shown in the image below, -representing two checkboxes that modify the display of pO~2~ when the +Profile_]). This part of the _Preferences_ panel is shown in the image +below, representing two checkboxes that modify the display of pO~2~ when the appropriate toolbar button on the Dive Profile has been checked. image::images/CCR_preferences_f20.jpg["FIGURE: CCR preferences panel", align="center"] @@ -2134,7 +2131,7 @@ information. This is a red line superimposed on the green oxygen partial pressure graph and allows a comparison of the mean measured oxygen partial pressure and the setpoint values, as shown below. -image::images/CCR_setpoint_f20.jpg["FIGURE: CCR setpoint and po2 graph", align="center"] +image::images/CCR_setpoint_f20.jpg["FIGURE: CCR setpoint and pO~2~ graph", align="center"] The second checkbox allows the display of the data from each individual oxygen sensor of the CCR equipment. The data for each sensor is colour-coded @@ -2186,7 +2183,7 @@ image::images/icons/cceiling.jpg["DC ceiling icon"] 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 -> -Preferences -> Graph_. Below is a dive profile indicating the dive +Preferences -> Profile_. Below is a dive profile indicating the dive computer-generated deco ceiling: image::images/CCR_dive_ceilingF22.jpg["FIGURE: CCR computer-generated deco ceiling", align="center"] @@ -2278,12 +2275,10 @@ placed adjacent to significant changes. ==== The *Information Box* The Information box displays a large range of information about the dive profile. Normally the Information Box is located to the top left of the -*Dive Profile* panel. If the mouse points outside of the *Dive Profile* -panel, then only the top line of the Information Box is visible (see -left-hand part of figure (*A*) below). The Information Box can be moved -around in the *Dive Profile* panel by click-dragging it with the mouse so -that it is not obstructing important detail. The position of the Information -Box is saved and used again during subsequent dive analyses. +*Dive Profile* panel. The Information Box can be moved around in the *Dive +Profile* panel by click-dragging it with the mouse so that it is not +obstructing important detail. The position of the Information Box is saved +and used again during subsequent dive analyses. image::images/InfoBox2.jpg["Figure: Information Box", align="center"] @@ -2298,10 +2293,11 @@ characteristics of the particular dive. These include: Time period into the dive (indicated by a @), depth, cylinder pressure (P), temperature, ascent/descent rate, surface air consumption (SAC), oxygen partial pressure, maximum operating depth, equivalent air depth (EAD), equivalent narcotic -depth (END), equivalent air density depth (EADD), decompression requirements -at that instant in time (Deco), time to surface (TTS), the calculated -ceiling, as well as of the statistics in the Information Box, shown as four -buttons on the left of the profile panel. These are: +depth (END), equivalent air density depth (EADD, also as gas density in +g/l), decompression requirements at that instant in time (Deco), time to +surface (TTS), the calculated ceiling, as well as of the statistics in the +Information Box, shown as four buttons on the left of the profile +panel. These are: [icon="images/icons/MOD.jpg"] [NOTE] @@ -2309,9 +2305,9 @@ Show the *Maximum Operating Depth (MOD)* of the dive, given the gas mixture used. MOD is dependent on the oxygen concentration in the breathing gas. For air (21% oxygen) it is around 57 m if a maximum pO~2~ of 1.4 is specified in the *Preferences* section (select _File -> Preferences -> -Graph_ and edit the text box _pO~2~ in calculating MOD_. When diving below -the MOD there is a markedly increased risk of exposure to the dangers of -oxygen toxicity. +Profile_ and edit the text box _pO~2~ in calculating MOD_. When diving +below the MOD there is a markedly increased risk of exposure to the dangers +of oxygen toxicity. [icon="images/icons/NDL.jpg"] [NOTE] @@ -2321,12 +2317,10 @@ given the present depth, that does not require decompression (that is, before an ascent ceiling appears). Once a diver has exceeded the NDL and decompression is required (that is, there is an ascent ceiling above the diver) then TTS gives the number of minutes required before the diver can -surface. TTS includes ascent time as well as decompression time. TTS is -calculated assuming an ascent surface air consumption (SAC) for the gas -currently used. Even if the profile contains several gas switches, TTS at a -specific moment during the dive is calculated using the current gas. TTS -longer than 2 hours is not accurately calculated and Subsurface only -indicates _TTS > 2h_. +surface. TTS includes ascent time as well as decompression time. Even if the +profile contains several gas switches, TTS at a specific moment during the +dive is calculated using the current gas. TTS longer than 2 hours is not +accurately calculated and Subsurface only indicates _TTS > 2h_. [icon="images/icons/SAC.jpg"] [NOTE] @@ -2388,7 +2382,7 @@ image::images/GasPressureBarGraph.jpg["FIGURE:Gas Pressure bar Graph", align="ce - The top black horizontal line indicates the inert gas pressure limit determined by the gradient factor that applies to the depth of the diver at the particular point on the *Dive Profile*. The gradient factor shown is an - interpolation between the GFLow and GFHigh values specified in the _Graph_ + interpolation between the GFLow and GFHigh values specified in the _Profile_ tab of the *Preferences Panel* of _Subsurface_. - The bottom margin of the red area in the graph indicates the Bühlman-derived @@ -2491,6 +2485,10 @@ consumption during the dive. So areas in red or orange indicate times of increased normalized air consumption while dark green reflects times when the diver was using less gas than average. +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, +the color is a representation of the breathing gas density. + [icon="images/icons/Heartbutton.png"] [NOTE] Clicking on the heart rate button allows display of heart rate information @@ -2834,12 +2832,6 @@ trips by clicking the expansion button [+/-] on the left of each trip title. This expands the selected trip, revealing individual dives during the trip. -==== Collapsing or expanding dive information for different trips - -After selecting a particular trip in the dive list, the context menu allows -several options to expand or collapse dives within trips. This includes -expanding all trips and collapsing all trips. - ==== Merging dives from more than one trip into a single trip After selecting a trip title, the context menu allows the merging of trips @@ -2847,12 +2839,13 @@ by either merging the selected trip with the trip below or with the trip above. (Merge trip with trip below; Merge trip with trip above) ==== Splitting a single trip into more than one trip -If a trip includes ten dives, you can split this trip into two trips (trip -1: top 4 dives; trip 2: bottom 6 dives) by selecting and right-clicking the -top four dives. The resulting context menu lets the user create a new trip -by choosing the option *Create new trip above*. The top four dives are then -grouped into a separate trip. The figures below show the selection and -context menu on the left (A) and the completed action on the right (B): +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 +right-clicking the top four dives. The resulting context menu lets the user +create a new trip by choosing the option *Create new trip above*. The top +four dives are then grouped into a separate trip. The figures below show the +selection and context menu on the left (A) and the completed action on the +right (B): image::images/SplitDive3a.jpg["FIGURE: Split a trip into 2 trips", align="center"] @@ -2999,21 +2992,20 @@ entry_." Close this message panel. image::images/facebook1.jpg["Figure: Facebook login", align="center"] -Une fois qu'une connexion à _Facebook_ est établie, transférer un profil de -plongée vers _Facebook_ est facile. Dans le panneau *Profil de plongée* de -_Subsurface_, sélectionnez la plongée à transférer. Ensuite, à partir du -*menu principal*, sélectionnez _Partager sur -> Facebook_. Une fenêtre -s'affiche, pour déterminer quelles informations seront transférées avec le -profil de plongée (image *A* ci-dessous). Pour transférer un profil de -plongée vers _Facebook_, le nom d'un album _Facebook_ doit être fourni. Les -cases à cocher sur la partie gauche permettent de sélectionner des -informations supplémentaires à transférer avec le profil de plongée. Ces -informations sont affichées dans le champs de texte sur la partie droite du -panneau. (image *A* ci dessous). Personnalisez le message qui sera envoyé -avec le profil de plongée en modifiant les informations. Une fois les -informations supplémentaires ajoutées et vérifiées, sélectionner le bouton -_OK_ qui effectue le transfert vers _Facebook_. Après le transfert, une -fenêtre de confirmation apparait ,indiquant le succès du transfert. +Having established a login to _Facebook_, transferring a dive profile to a +_Facebook_ timeline is easy. In the _Subsurface_ *Dive List* panel, +highlight the dive to be transferred. Then, from the *Main Menu*, select +_Share on -> Facebook_. A dialogue box is shown, determining the amount of +additional information to be transferred with the dive profile (image *A*, +below). To transfer a dive profile to _Facebook_, the name of a _Facebook_ +album is needed. The checkboxes on the left hand side determine how much +additional information is added to the dive profile, shown in the text box +on the right hand side of the panel (image *A*, below). Customise the +message that will be posted with the dive profile by editing any of the +information. After specifying additional information and verifying the text, +select the _OK_ button that triggers the transfer to _Facebook_. After the +transfer is done, an acknowledgement dialogue appears, indicating it was +successful. À la fois l'album créé et la publication sur votre ligne temporelle seront marquées comme privés. Pour que vos amis puissent la voir, connectez-vous à @@ -3184,7 +3176,7 @@ pressures, deco ceilings and O~2~/He/N~2~ partial pressures. If you prefer not to use the integrated cloud storage of dive logs (and don't need the web access), it’s simple to store dive logs in the cloud using several of the existing facilities on the Internet. For instance -http://www.dropbox.com/[_Dropbox_] offers a free application that allows +https://www.dropbox.com/[_Dropbox_] offers a free application that allows files on the Dropbox servers to be seen as a local folder on a desktop computer. @@ -3199,20 +3191,6 @@ connection. If the local copy is modified, e.g. by adding a dive, the remote copy in the _Dropbox_ server in the Cloud will be automatically updated whenever Internet access is available. -In this way a dive log in your _Dropbox_ folder can be accessed seamlessly -from the Internet and can be accessed anywhere with Internet -access. Currently there are no costs involved for this service. Dropbox -(Windows, Mac and Linux) can be installed by accessing the -http://www.dropbox.com/install[_Install Page on the Dropbox website_] -Alternatively you can use _Dropbox_ as a way back up your dive log. To Store -a dive log on _Dropbox_, select _File -> Save as_ from the _Subsurface_ main -menu, navigate to the _Dropbox_ folder and select the _Save_ button. To -access the dive log in _Dropbox_, select _File -> Open Logbook_ from the -_Subsurface_ main menu and navigate to the dive log file in the _Dropbox_ -folder and select the _Open_ button. - -Several paid services exist on the Internet (e.g. Google, Amazon) where the -same process could be used for the Cloud-based storage of dive logs. [[S_user_space]] == Several _Subsurface_ users on one desktop computer @@ -3338,16 +3316,15 @@ information on how to write or modify a template. [[S_Configure]] == Configurer un ordinateur de plongée -_Subsurface_ vous permet de configurer un ordinateur de -plongée. Actuellement, les familles d'ordinateurs supportés sont -Heinrichs-Weikamp (OSTC 2, OSTC 3) et Suunto Vyper (Stinger, Mosquito, D3, -Vyper, Vytec, Cobra, Gekko et Zoop). De nombreux paramètres de ces -ordinateurs de plongée peuvent être lues et modifiées. Pour 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 -<<_appendix_a_operating_system_specific_information_for_importing_dive_information_from_a_dive_computer, -ANNEXE A>> pour plus d'informations sur la manière de procéder. +_Subsurface_ lets you configure a dive computer. Currently, the +Heinrichs-Weikamp (OSTC 2/2N/2C, OSTC 3, Sport) and Suunto Vyper (Stinger, +Mosquito, D3, Vyper, Vytec, Cobra, Gekko and Zoop) family of dive computers +are supported. A large number of settings of these dive computers can be +read and changed to different values. To begin, be sure the appropriate +hardware driver is installed for the dive computer (also required for +downloading dives) and the device name of the dive computer is known. See +<<_appendix_a_operating_system_specific_information_for_importing_dive_information_from_a_dive_computer,APPENDIX +A>> for information on how to do this. Une fois que l'ordinateur de plongée est connecté à _Subsurface_, sélectionner _Fichier -> Configurer l'ordinateur de plongée_, à partir du @@ -3379,7 +3356,7 @@ suivantes peuvent être effectuées : There are several user-definable settings within _Subsurface_, found by selecting _File -> Preferences_, mostly affecting the way in which _Subsurface_ shows dive information to the user. The settings are in six -panels: _Defaults_, _Units_, _Graph_, _Language_, _Network_, and +panels: _General_, _Units_, _Profile_, _Language_, _Network_, and _Georeference_, all of which operate on the same principles: specified settings can be applied to the display of the dive log by selecting _Apply_. At this stage, any new settings only apply to the present session @@ -3387,11 +3364,11 @@ and are not saved. In order to apply new settings permanently, select the _Save_ button. If you do not wish to apply the new preferences, select _Cancel_. -=== Defaults +=== General -There are several headings in the *Defaults* panel: +There are several headings in the *General* panel: -image::images/Pref1_f23.jpg["FIGURE: Preferences defaults page", align="center"] +image::images/Pref1_f23.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. @@ -3439,7 +3416,7 @@ seconds or minutes. Choose the appropriate option. GPS coordinates can be represented either as traditional coordinates (degrees, minutes, seconds) or as decimal degrees Choose the appropriate option. -=== Graph +=== Profile This panel has three sections: [[S_CCR_options]] @@ -3464,7 +3441,7 @@ image::images/Pref4_f23.jpg["FIGURE: Preferences Graph page", align="center"] during a particular dive. Setpoint changes during the dive can be added via the profile context menu. -*** _CCR: Show setpoints when viewing pO2:_ With this checkbox activated, the pO~2~ +*** _CCR: Show setpoints when viewing pO~2~:_ With this checkbox activated, the pO~2~ graph on the dive profile has an overlay in red which indicates the CCR setpoint values. See the section on xref:S_CCR_dives[Closed Circuit Rebreather dives]. @@ -3540,23 +3517,22 @@ list similar languages. For instance there are several system variants of English or French. *This particular preference requires a restart of _Subsurface_ to take effect*. -In this section also specify appropriate date an time formats for showing +In this section also specify appropriate date and time formats for showing dive details. === Network 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 or the -<<S_Companion,_Subsurface Companion app_>>. These Internet requirements are -determined by your type of connection to the Internet and by the Internet -Service Provider (ISP) used. Your ISP should provide the appropriate -information. +to communicate with web services such as Cloud storage, the +<<S_Companion,_Subsurface Companion app_>> or when you want to communicate +through a proxy. + image::images/Pref5_f23.jpg["FIGURE: Preferences Network page", align="center"] This dialogue has three sections: -** _Proxy type_: +** _Proxy_: If a proxy server is used for Internet access, the type of proxy needs to be selected from the dropdown list, after which the IP address of the host and the appropriate port number should be provided. If the proxy server uses authentication, the appropriate userID and @@ -3595,7 +3571,7 @@ image::images/Pref7_f23.jpg["FIGURE: Georeference panel", align="center"] Dive planning is an advanced feature of _Subsurface_, accessed by selecting _Log -> Plan Dive_ from the main menu. It allows calculation of inert gas load during a dive by using the Bühlmann ZH-L16 algorithm with the addition -of gradient factors as implemented by Erik Baker. +of gradient factors as implemented by Erik Baker, or using the VPM-B model. **** [icon="images/icons/warning2.png"] @@ -3622,8 +3598,8 @@ used under the following conditions: Like the _Subsurface_ dive log, the planner screen is divided into several sections (see image below). The *setup* parameters for a dive are entered -into the sections on the left hand side of the screen. They are: Available -Gases, Rates, Planning, Gas Options and Notes. +into the sections on the left hand and bottom side of the screen. They are: +Available Gases, Rates, Planning, Gas Options and Notes. 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 @@ -3658,18 +3634,18 @@ image::images/PlannerWindow1_f20.jpg["FIGURE: Dive planner startup window", alig cylinder. This is done in a similar way as for <<cylinder_definitions,providing cylinder data for dive logs>>. Choose the cylinder type by double clicking the cylinder type and using the dropdown - list, then specify the work pressure of this cylinder. By leaving the oxygen - concentration (O2%) field empty, the cylinder is assumed to contain + list, then specify the start pressure of this cylinder. By leaving the + oxygen concentration (O~2~%) field empty, the cylinder is assumed to contain air. Otherwise enter the oxygen and/or helium concentration in the boxes provided in this dialogue. Add additional cylinders by using the "+" icon to the top right-hand of the dialogue. - The _Available Gases_ table includes three gas depth fields, labelled: ** Deco switch at: the switch depth for deco gases. Unless overridden by the user, this will be - automatically calculated based on the Deco pO₂ preference (default 1.6 bar) + automatically calculated based on the Deco pO~2~ preference (default 1.6 bar) ** Bot. MOD: the gas Maximum Operating Depth (MOD) if it is used as a bottom mix. Automatically - calculated based on the Bottom pO₂ preference (default 1.4 bar). Editing this field will modify the - O₂% according to the depth set. Set to ''*'' to calculate the best O₂% for the dive maximum depth. + calculated based on the Bottom pO~2~ preference (default 1.4 bar). Editing this field will modify the + O~2~% according to the depth set. Set to ''*'' to calculate the best O~2~% for the dive maximum depth. ** MND: the gas Maximum Narcotic Depth (MND). Automatically calculated based on the Best Mix END preference (default 30m / 98 ft). Editing this field will modify the He% according to the depth set. Set to ''*'' to calculate the best He% for the dive maximum depth. @@ -3715,7 +3691,7 @@ calculation of the nitrogen load incurred during previous dives. and _Safety Stop_. Check these two boxes. - Then define the cylinder size, the gas mixture (air or % oxygen) and the - starting cylinder pressure in the top left-hand section of the planner under + working cylinder pressure in the top left-hand section of the planner under _Available gases_. - The planner calculates whether the specified cylinder contains enough @@ -3767,7 +3743,7 @@ dive is limited by the amount of air in the cylinder. That is shown in the text box at the bottom right of the panel, requiring sufficient air for buddy-sharing during ascent. -image::images/rec_diveplan.jpg["FIGURE: A recreational dive plan: setup", align="center"] +image::images/Planner_OC_rec.jpg["FIGURE: A recreational dive plan: setup", align="center"] ==== Non-recreational open circuit dives, including decompression @@ -3801,10 +3777,10 @@ For more information external to this manual see: M-values by Erik Baker, _Immersed_ Vol. 3, No. 3.] * link:http://www.rebreatherworld.com/general-and-new-to-rebreather-articles/5037-gradient-factors-for-dummies.html[Gradient factors for dummies, by Kevin Watts] -link:http://www.amazon.com/Deco-Divers-Decompression-Theory-Physiology/dp/1905492073/ref=sr_1_1?s=books&ie=UTF8&qid=1403932320&sr=1-1&keywords=deco+for+divers[_Deco +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: -1-905492-07-3. Un excellent livre non technique qui traite à la fois des -modèles de décompression Bühlmann et VPM-B. +1-905492-07-3. An excellent non-technical review that discusses both the +Bühlmann deco model and the VPM-B model. 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 @@ -3819,8 +3795,9 @@ maximal descent rate specified in the _Rates_ section of the dive setup. pressure for oxygen needs to be specified for the bottom part of the dive (_bottom po2_) as well as for the decompression part of the dive (_deco po2_). Commonly used values are 1.4 bar for the bottom part of the dive and 1.6 bar for any decompression -stages. Normally, a partial pressure of 1.6 bar is not exceeded. pO₂ settings and the depth at which switching to a gas takes place can also be edited in the -_Available Gases_ dialog. Normally the planner decides on switching to a new gas when, during +stages. Normally, a partial pressure of 1.6 bar is not exceeded. The depth at which switching to a gas +takes place can be edited in the +_Available Gases_ dialog. Normally, the planner decides on switching to a new gas when, during ascent, the partial pressure of the new gas has decreased to 1.6 bar. *c) Gas management*: With open-circuit dives this is a primary @@ -3839,6 +3816,21 @@ if you exceeds the total amount of gas available. Good practice demands that div the limit of the gas supply but that an appropriate reserve is kept for unforeseen circumstances. For technical diving, this reserve can be up to 66% of the total available gas. +In addition to calculating the total gas consumption for every cylinder the planner provides one way +of calculating the recommended volume of bottom gas which is needed for safe asscent to the +first deco gas change depth or the surface. This procedure is called the "minimum gas" or "rock bottom" +consideration and it is used by various (but not all) +technical diving organisations. The calculation assumes that in worst case an out of gas (OoG) +situation could occur at the end of the planned bottom time at maximum depth. This OoG event forces +the buddy team the share the gas of one diver and to stay at maximum depth for an additional +time of n minutes (preferences option "problem solving time"). +At the same moment the combined SAC of both divers is increased by a estimated factor (preferences option +"SAC factor") compared to the SAC factor of a single diver under normal conditions. +The result of the minimum gas calculation for the bottom gas is printed to the planner output as an +additional information. No automatic checks are performed based on this result. +Please take care that the feature only gives valid results for simple, rectengular shaped single +level dive profiles. For multi level dives one would need to check every leg of the profile independently. + Now you can start the detailed time-depth planning of the dive. _Subsurface_ offers an unique graphical interface for doing planning. The mechanics are @@ -3859,21 +3851,19 @@ table on the left of the dive planner panel. Ensure the _Used Gas_ value in each row of that table corresponds to one of the gas mixtures specified in the _Available Gases_ table. Add new waypoints until the main features of the dive have been completed, e.g. the bottom time segment and deep stops -(if these are implemented). Leave the remaining waypoints on the ascent to -_Subsurface_. In most cases _Subsurface_ computes additional way points in -order to fulfill decompression requirements for that dive. A waypoint can be -moved by selecting it and by using the arrow keys. The waypoints listed in -the _Dive Planner Points_ dialogue can be edited by hand in order to get a -precise presentation of the dive plan. In fact, it is sometimes more easy to -create the whole dive profile by editing the _Dive Planner Points_ dialog. +(if these are implemented). In most cases _Subsurface_ computes additional +way points in order to fulfill decompression requirements for that dive. A +waypoint can also be moved by selecting it and by using the arrow keys. The +waypoints listed in the _Dive Planner Points_ dialogue can be edited by hand +in order to get a precise presentation of the dive plan. In fact, it is +sometimes more easy to create the whole dive profile by editing the _Dive +Planner Points_ dialog. Show any changes in gas cylinder used by indicating gas changes as explained in the section <<S_CreateProfile,hand-creating a dive profile>>. These changes should reflect the cylinders and gas compositions defined in the table with _Available Gases_. If two or more gases are used, automatic gas -switches will be suggested during the ascent to the surface. These changes -can be deleted by right-clicking the gas change and manually creating a gas -change by right-clicking on the appropriate waypoint. +switches will be planned during the ascent to the surface. A non-zero value in the "CC setpoint" column of the table of dive planner points indicates a valid setpoint for oxygen partial pressure and that the @@ -3884,10 +3874,10 @@ last segment (however short) is on open circuit (OC, indicated by a zero set-point) the decompression is computed in OC mode and the planner only considers gas changes in OC mode. -Below is an example of a dive plan to 45m using EAN26, followed by an ascent -using EAN50 and using the settings as described above. +Below is an example of a dive plan to 45m using Tx21/35, followed by an +ascent using EAN50 and oxygen and using the settings as described above. -image::images/DivePlanner2_f20.jpg["FIGURE: Planning a dive: setup", align="center"] +image::images/Planner_OC_deco_VPM.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 @@ -3914,14 +3904,16 @@ from the segment durations at a particular level. To plan a dive using a passive semi-closed rebreather (pSCR), select _pSCR_ rather than _Open circuit_ in the dropdown list. -The parameters of the pSCR dive can be set by selecting _File -> Preferences -> Graph_ +The parameters of the pSCR dive can be set by selecting _File -> Preferences -> Profile_ from the main menu, where the gas consumption calculation takes into account the pSCR dump ratio (default 1:10) as well as the metabolic rate. The calculation also takes the oxygen drop accross the mouthpiece of the rebreather into account. If the pO~2~ drops below what is considered safe, a warning appears in the _Dive plan -details_. A typical pSCR configuration is with a single cylinder and one or more bail-out -cylinders. Therefore the setup of the _Available gases_ and the _Dive planner points_ tables -are very similar to that of a CCR dive plan, described below. However, no oxygen setpoints +details_. A typical pSCR cylinder setup is very similar to an open circuit dive; +one or more drive cilinders, possibly with different bottom and decompression +gasses, including gas switches during the dive like in open circuit diving. +Therefore, the setup of the _Available gases_ and the _Dive planner points_ tables +are very similar to that of a open circuit dive plan, described above. However, no oxygen setpoints are specified for pSCR dives. Below is a dive plan for a pSCR dive. The dive is comparable to that of the CCR dive 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. @@ -3938,7 +3930,7 @@ the dropdown list, circled in blue in the image below. diluent cylinder and for any bail-out cylinders. Do NOT enter the information for the oxygen cylinder since it is implied when the _CCR_ dropdown selection is made. -*Entering setpoints*: Specify a default setpoint in the Preferences tab, by selecting _File -> Preferences -> Graph_ from +*Entering setpoints*: Specify a default setpoint in the Preferences tab, by selecting _File -> Preferences -> Profile_ from the main menu. All user-entered segments in the _Dive planner points_ table use the default setpoint value. Then, different setpoints can be specified for dive segments in the _Dive planner points_ table. A zero setpoint @@ -3997,17 +3989,11 @@ 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 Details_ to include in a text file or word processing document. -Dive plans have many characteristics in common with dive logs (dive profile, -dive notes, etc). After a dive plan has been saved, the dive details and -gas calculations are saved in the *Notes* tab. While a dive plan is being -designed, it can be printed using the _Print_ button in the dive -planner. This prints the dive details and gas calculations in the _Dive Plan -Details_ panel of the dive planner. 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 same way as during the planning -process. The only way to print the dive plan is to use the _File -> Print_ -function on the main menu in the same way as for dive logs or by copy and -paste to a word processor. +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 +same way as during the planning process. The only way to print the dive plan +is to use the _File -> Print_ function on the main menu in the same way as +for dive logs or by copy and paste to a word processor. [[S_MergeDivePlan]] === Saving a dive with its dive plan @@ -4048,11 +4034,12 @@ The options include: |--verbose|Print debug information while running _Subsurface_ | -v|Print debug information while running _Subsurface_ | -v -v| Print even more debug information while running _Subsurface_ -|--version|Prints the current version of _Subsurface_. +|--version|Prints the current version of _Subsurface_ |--survey|Opens the xref:S_UserSurvey[user survey] immediately after starting _Subsurface_ |--user=<username>|Choose the xref:S_user_space[configuration space] of user <username> |--cloud-timeout=<duration>|Set the timeout for cloud connection (0 < duration < 60). This enables longer timeouts for slow Internet connections |--win32console|Create a dedicated console if needed (Windows only). Add this option before everything else +|--win32log|Write the program output to subsurface.log (Windows only). Add option before everything else |==================== == Description des éléments du menu principal de Subsurface @@ -4154,9 +4141,8 @@ des sections de ce manuel traitant des opérations relatives. === Aide - _À propos de Subsurface_ - Affiche un panneau avec le numéro de version de _Subsurface_ ainsi que les informations de licence. -- _Vérifier les mises à jour_ - Vérifier si une nouvelle version de - Subsurface est disponible sur le http://subsurface-divelog.org/[site web de - _Subsurface_ ]. +- _Check for updates_ - Find out whether a newer version of Subsurface is + available on the https://subsurface-divelog.org/[_Subsurface_ web site]. - <<S_UserSurvey,_Sondge utilisateur_>> - Aider à rendre _Subsurface_ encore meilleur en répondant à notre sondage utilisateur ou en répondant à un autre sondage, si vos habitudes de plongées ont changées. @@ -4183,13 +4169,12 @@ l'ordinateur de plongée (Bluetooth, USB, infra-rouge). première fois que l'utilisateur branche son ordinateur de plongée sur le port USB de son ordinateur de bureau. -Sous Mac, les utilisateurs peuvent parfois avoir besoin d'installer -manuellement le bon pilote. Par exemple, pour le Mares Puck ou n'importe -quel autre ordinateur de plongée utilisant une interface USB-série basé sur -le composant Silicon Labs CP2101 ou similaire, le bon pilote est disponible -sous _Mac_OSX_VCP_Driver.zip_ sur le -http://www.silabs.com/support/pages/document-library.aspx?p=Interface&f=USB%20Bridges&pn=CP2101[dépôt -de documents et logiciels Silicon Labs]. +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 +computer using a USB-to-serial interface based on the Silicon Labs CP2101 or +similar chip can be found as _Mac_OSX_VCP_Driver.zip_ at the +https://www.silabs.com/support/pages/document-library.aspx?p=Interface&f=USB%20Bridges&pn=CP2101[Silicon +Labs document and software repository]. [[S_HowFindDeviceName]] === Comment trouver le nom du périphérique branché sur USB et paramétrer les permissions en écriture @@ -4362,7 +4347,7 @@ computer - this needed later and should be in the form 00:11:22:33:44:55. 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 +status. $ hciconfig hci0: Type: BR/EDR Bus: USB @@ -4387,8 +4372,8 @@ power on the controller and enable authentication: Check that the status now includes +'UP', 'RUNNING' AND 'AUTH'+. -If there are multiple controllers running, it's easiest to off the unused -controller(s). For example, for +hci1+: +If there are multiple controllers running, it's easiest to turn off the +unused controller(s). For example, for +hci1+: sudo hciconfig hci1 down @@ -4429,7 +4414,7 @@ there is probably not a +bluetoothctl+, but a script called 00:11:22:33:44:55 Petrel bluez-simple-agent hci0 00:11:22:33:44:55 -Once ther dive computer is pired, set up the RFCOMM connection +Once the dive computer is paired, set up the RFCOMM connection. ===== Establishing the RFCOMM connection @@ -4570,7 +4555,7 @@ 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. Note: The DR5 does not seem to store gradient factors nor deco information, so for _Subsurface_ it is not possible to display them. Adjust the gradient -factors in the _Graph Settings_ in _Subsurface_ to generate a deco overlay +factors in the _Profile Settings_ in _Subsurface_ to generate a deco overlay in the _Subsurface_ *Dive Profile* panel but please note that the deco calculated by _Subsurface_ will most likely differ from the one displayed on the DR5. @@ -4586,7 +4571,7 @@ option in BLACK's logbook menu. When mounted as a USB drive UDDF files are available in LOGBOOK directory. Note: The xDEEP BLACK saves NDL time but does not seem to store gradient factors nor deco information, so for _Subsurface_ it is not possible to display them. Adjust the gradient factors -in the _Graph Settings_ in _Subsurface_ to generate a deco overlay in the +in the _Profile Settings_ in _Subsurface_ to generate a deco overlay in the _Subsurface_ *Dive Profile* panel but please note that the deco calculated by _Subsurface_ will most likely differ from the one displayed on the xDEEP BLACK. @@ -4642,7 +4627,7 @@ _Subsurface_ as follows: Clipboard_". - Open a text editor, e.g. Notepad (Windows) or TextWrangler (Mac). - Copy the contents of the clipboard into the text editor and save the text - file with a filename extension of _.apd_ + file with a filename extension of _.apd_. - Within _Subsurface_, select _Import -> Import log files_ to open the xref:Unified_import[universal import dialogue]. - In the dropdown list towards the bottom right of the dialogue (labeled @@ -4689,11 +4674,11 @@ Linux and/or Windows. === Exporting from *Suunto Divemanager (DM3, DM4 or DM5)* [icon="images/icons/suuntologo.jpg"] [NOTE] -DiveManager is a MS Windows application for Suunto dive computers. -Divemanager 3 (DM3) is an older version of the Suunto software. More recent -Suunto dive computers use Divemanager version 4 or 5 (DM4 or DM5). The -different versions of Divemanager use different methods and different file -naming conventions to export dive log data. +DiveManager is a Windows application for Suunto dive computers. Divemanager +3 (DM3) is an older version of the Suunto software. More recent Suunto dive +computers use Divemanager version 4 or 5 (DM4 or DM5). The different +versions of Divemanager use different methods and different file naming +conventions to export dive log data. *Divemanager 3 (DM3):* @@ -4748,9 +4733,9 @@ Making a backup copy of the Suunto DM4/DM5 database: [icon="images/icons/atomiclogo.jpg"] [NOTE] -Atomic Logbook is a Windows software by Atomic Aquatics. It allows -downloading of dive information from Cobalt and Cobalt 2 dive computers. -The divelog is kept in a SQLite database at +Atomic Logbook is Windows software by Atomic Aquatics. It allows downloading +of dive information from Cobalt and Cobalt 2 dive computers. The divelog is +kept in a SQLite database at C:\ProgramData\AtomicsAquatics\Cobalt-Logbook\Cobalt.db. This file can be directly imported to Subsurface. @@ -4810,12 +4795,11 @@ un fichier CSV qui pourra ensuite être importé dans _Subsurface_. Créer un fichier CSV est simple malgré que la procédure soit différente selon le tableur utilisé. -Organiser les données de plongées dans le tableur pour que la première ligne -contienne le nom (ou le titre) de chaque colonne et que les informations de -chaque plongée soient contenues sur une seule ligne. _Subsurface_ supporte -de nombreux éléments (Dive #, Date, Time, Duration, Location, GPS, Max -Depth, Mean Depth, Buddy, Notes, Weight et Tags). Organiser les données de -plongées selon quelques règles simples : +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 +in a single row. _Subsurface_ supports many data items (Dive number, Date, +Time, Duration, Location, GPS, Max. Depth, Mean Depth, Buddy, Notes, Weight +and Tags). Organize dive data following a few simple rules: 1. Date : utiliser un des formats suivants : aaaa-mm-jj, jj.mm.aaaa, mm/jj/aaaa 2. Durée : le format est minutes:secondes. @@ -4864,9 +4848,8 @@ outlined below. - In Microsoft Windows, click the *Start* button, then select _Control Panel_ from the list on the right-hand side. - Open the _Regional and Language Options_ dialog box. -- Do one of the following: ** In Windows 7, click the _Formats_ tab, and then - click _Customize this format_. ** In Windows XP, click the _Regional - Options_ tab, and then click _Customize_. +- Do the following: ** In Windows 7, click the _Formats_ tab, and then click + _Customize this format_. - Type a new separator in the _List separator_ box. To use a TAB-delimited file, type the word TAB in the box. - Click _OK_ twice. @@ -4966,7 +4949,7 @@ end. It is possible to iterate over the list as follows: <h1> 3 </h1> .... -Additional information about _Grantlee_ can be found at +Additional information about _Grantlee_ can be found http://www.grantlee.org/apidox/for_themers.html[here] === Grantlee exported variables @@ -5053,7 +5036,7 @@ contains a single member: === Defined CSS selectors As the dive profile is placed after rendering, _Subsurface_ uses special -_CSS_ selectors to searche in the HTML output. The _CSS_ selectors in the +_CSS_ selectors to search in the HTML output. The _CSS_ selectors in the following table should be added. |==================== |