diff options
| author |  Guillaume GARDET <guillaume.gardet@free.fr> | 2015-01-29 16:19:38 +0100 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2015-01-29 07:27:27 -0800 |
| commit | f291eb6a7920134604efbd7515d5d470a1d7eb91 (patch) | |
| tree | bfc28120f876d01204f8057513aae062d6907111 /Documentation/fr/po | |
| parent | 9a91c801a63f81dc5d7460eb84bac8329c35cace (diff) | |
| download | subsurface-f291eb6a7920134604efbd7515d5d470a1d7eb91.tar.gz | |
Documentation: update french translation
Update french translation of user-manual and POT file.
Signed-off-by: Guillaume GARDET <guillaume.gardet@free.fr>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'Documentation/fr/po')
| -rw-r--r-- | Documentation/fr/po/subsurface-manual.fr.po | 2591 |
1 files changed, 1278 insertions, 1313 deletions
diff --git a/Documentation/fr/po/subsurface-manual.fr.po b/Documentation/fr/po/subsurface-manual.fr.po index 31286cbb8..16de7b04f 100644 --- a/Documentation/fr/po/subsurface-manual.fr.po +++ b/Documentation/fr/po/subsurface-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: 2015-01-26 15:24+0100\n" -"PO-Revision-Date: 2015-01-26 15:13+0100\n" +"POT-Creation-Date: 2015-01-29 16:16+0100\n" +"PO-Revision-Date: 2015-01-29 16:16+0100\n" "Last-Translator: Guillaume GARDET <guillaume.gardet@opensuse.org>\n" "Language-Team: French <opensuse-fr@opensuse.org>\n" "Language: fr\n" @@ -42,8 +42,8 @@ msgstr "" #. type: Plain text #: user-manual.txt:22 -msgid "[blue]#_Version 4.3, December 2014_#" -msgstr "[blue]#_Version 4.3, Décembre 2014_#" +msgid "[blue]#_Version 4.4, February 2015_#" +msgstr "[blue]#_Version 4.4, Février 2015_#" #. type: Plain text #: user-manual.txt:28 @@ -170,13 +170,33 @@ msgid "toc::[]" msgstr "toc::[]" #. type: Title - -#: user-manual.txt:68 +#: user-manual.txt:67 +#, no-wrap +msgid "Using this manual" +msgstr "Utilisation de ce manuel" + +#. type: Plain text +#: user-manual.txt:72 +msgid "" +"When opened from within _Subsurface_, this manual does not have external " +"controls. However, a _SEARCH_ function is important. This is activated by " +"pressing control-F or command-F on the keyboard. A text box appears at the " +"bottom of the window. Use this to search for any term in the manual." +msgstr "" +"Lorsqu'il est ouvert depuis _Subsurface_, ce manuel n'a pas de contrôles " +"externes. Cependant, une fonction de _RECHERCHE_ est importante. Elle est " +"activée par la combinaison de touches du clavier Ctrl-F ou commande-F. Un " +"champ de recherche apparait en bas de la fenêtre. Il suffit de l'utiliser " +"pour rechercher n'importe quel terme dans le manuel." + +#. type: Title - +#: user-manual.txt:74 #, no-wrap msgid "The user survey" msgstr "Le sondage utilisateur" #. type: Plain text -#: user-manual.txt:80 +#: user-manual.txt:86 msgid "" "In order to develop _Subsurface_ in a way that serves its users in the best " "possible way, it is important to have some user information. Upon launching " @@ -208,13 +228,13 @@ msgstr "" "ligne de commande." #. type: Title - -#: user-manual.txt:83 +#: user-manual.txt:89 #, no-wrap msgid "Start Using the Program" msgstr "Commencer à utiliser le programme" #. type: Plain text -#: user-manual.txt:88 +#: user-manual.txt:94 msgid "" "The _Subsurface_ window is usually divided into four panels with a *Main " "Menu* (File Import Log View Filter Help) at the top of the window (for " @@ -227,7 +247,7 @@ msgstr "" "quatre panneaux sont :" #. type: Plain text -#: user-manual.txt:94 +#: user-manual.txt:100 msgid "" "The *Dive List* to the bottom left containing a list of all the dives in the " "user's dive log. A dive can be selected and highlighted on the dive list by " @@ -243,7 +263,7 @@ msgstr "" "important pour manipuler un journal (carnet) de plongée." #. type: Plain text -#: user-manual.txt:98 +#: user-manual.txt:104 msgid "" "The *Dive Map* to the bottom right, showing the user's dive sites on a world " "map and centred on the site of the last dive selected in the *Dive List*." @@ -253,7 +273,7 @@ msgstr "" "plongée sélectionnée dans la *liste des plongées*." #. type: Plain text -#: user-manual.txt:102 +#: user-manual.txt:108 msgid "" "The *Dive Info* to the top left, giving more detailed information on the " "dive selected in the *Dive List*, including some statistics for the selected " @@ -265,7 +285,7 @@ msgstr "" "mises en surbrillance." #. type: Plain text -#: user-manual.txt:105 +#: user-manual.txt:111 msgid "" "The *Dive Profile* to the top right, showing a graphical dive profile of the " "selected dive in the *Dive List*." @@ -274,7 +294,7 @@ msgstr "" "graphique de la plongée sélectionnée dans la *liste des plongées*." #. type: Plain text -#: user-manual.txt:110 +#: user-manual.txt:116 msgid "" "The dividers between panels can be dragged in order to change the size of " "any of the panels. _Subsurface_ remembers the position of the dividers, so " @@ -287,7 +307,7 @@ msgstr "" "positions." #. type: Plain text -#: user-manual.txt:118 +#: user-manual.txt:124 msgid "" "If a dive is selected in the *Dive List*, the dive location, detailed " "information and profile of the _selected dive_ are shown in the respective " @@ -308,13 +328,13 @@ msgstr "" "et nombre de plongées sélectionnées)." #. type: Target for macro image -#: user-manual.txt:121 +#: user-manual.txt:127 #, no-wrap msgid "images/main_window_f20.jpg" msgstr "images/main_window_f20.jpg" #. type: Plain text -#: user-manual.txt:126 +#: user-manual.txt:132 msgid "" "The user can determine which of the four panels are displayed by selecting " "the *View* option on the main menu. This feature gives the user several " @@ -325,25 +345,25 @@ msgstr "" "permet plusieurs choix d'affichage :" #. type: Plain text -#: user-manual.txt:128 +#: user-manual.txt:134 #, no-wrap msgid "*All*: show all four of the panels as in the screenshot above.\n" msgstr "*Tout* : affiche les quatre panneaux tels que sur la capture d'écran ci-dessus.\n" #. type: Plain text -#: user-manual.txt:130 +#: user-manual.txt:136 #, 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:132 +#: user-manual.txt:138 #, no-wrap msgid "*Profile*: Show only the Dive Profile of the selected dive.\n" msgstr "*Profil* : affiche uniquement le profile de plongée de la plongée sélectionnée.\n" #. type: Plain text -#: user-manual.txt:135 +#: user-manual.txt:141 #, no-wrap msgid "" "*Info*: Show only the Dive Notes about the last selected dive and statistics for\n" @@ -353,13 +373,13 @@ msgstr "" "toutes les plongées mises en surbrillance.\n" #. type: Plain text -#: user-manual.txt:137 +#: user-manual.txt:143 #, no-wrap msgid "*Globe*: Show only the world map, centred on the last selected dive.\n" msgstr "*Globe* : affiche uniquement la carte mondiale, centrée sur la dernière plongée sélectionnée.\n" #. type: Plain text -#: user-manual.txt:143 +#: user-manual.txt:149 msgid "" "Like many other functions that can be accessed via the Main Menu, these " "options can be triggered using keyboard shortcuts. The shortcuts for a " @@ -376,7 +396,7 @@ msgstr "" "raccourcis et ne sont donc pas détaillées ici." #. type: Plain text -#: user-manual.txt:147 +#: user-manual.txt:153 msgid "" "When the program is started for the first time, it shows no information at " "all. This is because the program doesn't have any dive information " @@ -389,13 +409,13 @@ msgstr "" "carnet de plongée sera détaillée." #. type: Title - -#: user-manual.txt:150 +#: user-manual.txt:156 #, no-wrap msgid "Creating a new logbook" msgstr "Créer un nouveau carnet de plongée" #. type: Plain text -#: user-manual.txt:155 +#: user-manual.txt:161 msgid "" "Select _File -> New Logbook_ from the main menu. All existing dive data are " "cleared so that new information can be added. If there are unsaved data in " @@ -409,13 +429,13 @@ msgstr "" "faut les enregistrer ou non avant de créer le nouveau carnet." #. type: Title == -#: user-manual.txt:157 +#: user-manual.txt:163 #, no-wrap msgid "Storing dive information in the logbook" msgstr "" #. type: Plain text -#: user-manual.txt:162 +#: user-manual.txt:168 msgid "" "Now that a new logbook was created, it is simple to add dive data to it. " "_Subsurface_ allows several ways of adding dive data to a logbook, detailed " @@ -423,96 +443,96 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:164 +#: user-manual.txt:170 msgid "If the user has a handwritten divelog, a spreadsheet or another form of" msgstr "" #. type: Plain text -#: user-manual.txt:166 +#: user-manual.txt:172 msgid "" "manually maintained divelog, dive data can be added to the logbook using one " "of these approaches:" msgstr "" #. type: Plain text -#: user-manual.txt:168 +#: user-manual.txt:174 msgid "Enter dive information by hand. This is useful if the diver did not" msgstr "" #. type: Plain text -#: user-manual.txt:170 +#: user-manual.txt:176 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:172 +#: user-manual.txt:178 msgid "" "Import dive log information that has been maintained either as a spreadsheet" msgstr "" #. type: Plain text -#: user-manual.txt:174 +#: user-manual.txt:180 msgid "" "or as a CSV file. Refer to: xref:S_Appendix_D[APPENDIX D: Exporting a " -"spreadsheet to CSV format] and the text about xref:" -"S_ImportingManualCSV[Importing dives from manually created CSV files] and" +"spreadsheet to CSV format] and to xref:S_ImportingCSVDives[Importing dives " +"in CSV format]." msgstr "" #. type: Plain text -#: user-manual.txt:176 +#: user-manual.txt:182 msgid "" "If one has dives recorded using a dive computer, the depth profile of the" msgstr "" #. type: Plain text -#: user-manual.txt:178 +#: user-manual.txt:184 msgid "" "dive and a large amount of additional information can be accessed. These " "dives can be imported from:" msgstr "" #. type: Plain text -#: user-manual.txt:180 +#: user-manual.txt:186 msgid "" "The divecomputer itself. See: xref:S_ImportDiveComputer[Importing new dive " "information from a Dive Computer] or" msgstr "" #. type: Plain text -#: user-manual.txt:182 +#: user-manual.txt:188 msgid "" "Proprietary software distributed by manufacturers of dive computers. Refer" msgstr "" #. type: Plain text -#: user-manual.txt:183 +#: user-manual.txt:189 msgid "" "to: xref:S_ImportingAlienDiveLogs[Importing dive information from other " "digital data sources or other data formats]." msgstr "" #. type: Plain text -#: user-manual.txt:185 +#: user-manual.txt:191 msgid "Import from spreadsheet or CSV files containing dive profiles." msgstr "" #. type: Plain text -#: user-manual.txt:186 +#: user-manual.txt:192 msgid "" "See: xref:S_ImportingCSVDives[Importing dives in CSV format from dive " "computers or other dive log software]" msgstr "" #. type: Title === -#: user-manual.txt:189 +#: user-manual.txt:195 #, no-wrap msgid "Entering dive information by hand" msgstr "" #. type: Plain text -#: user-manual.txt:203 +#: user-manual.txt:209 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 " @@ -529,13 +549,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:204 +#: user-manual.txt:210 #, no-wrap msgid "images/AddDive1_f20.jpg" -msgstr "" +msgstr "images/AddDive1_f20.jpg" #. type: Plain text -#: user-manual.txt:209 +#: user-manual.txt:215 msgid "" "When one edits a field in Dive notes or Equipment panels, _Subsurface_ " "enters *Editing Mode*, indicated by the message in the blue box at the top " @@ -544,13 +564,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:210 user-manual.txt:787 +#: user-manual.txt:216 user-manual.txt:817 #, no-wrap msgid "images/BlueEditBar_f20.jpg" -msgstr "" +msgstr "images/BlueEditBar_f20.jpg" #. type: Plain text -#: user-manual.txt:217 +#: user-manual.txt:223 msgid "" "The _Save_ button should only be selected after all the parts of a dive have " "been entered. When entering dives by hand, the _Info_, _Equipment_ and " @@ -562,13 +582,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:218 user-manual.txt:673 +#: user-manual.txt:224 user-manual.txt:697 #, no-wrap msgid "Dive Notes" msgstr "Notes de plongée" #. type: Plain text -#: user-manual.txt:224 +#: user-manual.txt:230 msgid "" "This panel contains the date, time and place information for a particular " "dive, environmental conditions, co-divers and buddies, as well as some " @@ -577,13 +597,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:225 +#: user-manual.txt:231 #, no-wrap msgid "images/AddDive2_f20.jpg" -msgstr "" +msgstr "images/AddDive2_f20.jpg" #. type: Plain text -#: user-manual.txt:234 +#: user-manual.txt:240 msgid "" "The *Time* field reflects the date and the time of the dive. By clicking the " "date, a calendar is displayed from which one can choose the correct date. " @@ -594,7 +614,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:241 +#: user-manual.txt:247 #, no-wrap msgid "" "*Air and water temperatures*: the air and water temperatures during the\n" @@ -606,7 +626,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:246 +#: user-manual.txt:252 #, no-wrap msgid "" "*Location*: Here the name of the dive site can be entered, e.g. \"Tihany, Lake\n" @@ -616,7 +636,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:249 user-manual.txt:710 +#: user-manual.txt:255 user-manual.txt:735 #, no-wrap msgid "" "*Coordinates*: The geographic coordinates of the dive site should be entered\n" @@ -624,7 +644,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:256 +#: user-manual.txt:262 msgid "" "One can find the coordinates on the world map in the bottom right hand part " "of the Subsurface window. The map displays a green bar indicating \"No " @@ -634,7 +654,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:261 +#: user-manual.txt:267 msgid "" "The coordinates can be obtained from the _Subsurface_ Companion app if the " "user has an Android device with GPS and if the coordinates of the dive site " @@ -643,14 +663,14 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:264 user-manual.txt:725 +#: user-manual.txt:270 user-manual.txt:750 msgid "" "The coordinates can be entered by hand if they are known, using one of four " "formats with latitude followed by longitude:" msgstr "" #. type: Plain text -#: user-manual.txt:269 user-manual.txt:730 +#: user-manual.txt:275 user-manual.txt:755 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. " @@ -658,7 +678,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:273 +#: user-manual.txt:279 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 " @@ -666,7 +686,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:279 user-manual.txt:740 +#: user-manual.txt:285 user-manual.txt:765 msgid "" "Please note that GPS coordinates of a dive site are linked to the Location " "name - so adding coordinates to dives that do not have a location " @@ -676,7 +696,17 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:284 +#: user-manual.txt:290 +#, no-wrap +msgid "" +"*Dive mode*: This is a dropdown box allowing one to choose the type of dive\n" +"performed. The options are OC (Open Circuit, the default setting, meant 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:295 #, no-wrap msgid "" "*Divemaster*: The name of the dive master or dive guide for this dive can be\n" @@ -686,7 +716,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:288 +#: user-manual.txt:299 #, no-wrap msgid "" "*Buddy*: In this field one can enter the name(s) of the buddy / buddies\n" @@ -695,7 +725,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:293 +#: user-manual.txt:304 #, no-wrap msgid "" "*Suit*: The type of diving suit used for the dive can be entered here.\n" @@ -705,7 +735,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:296 user-manual.txt:758 +#: user-manual.txt:307 user-manual.txt:788 #, no-wrap msgid "" "*Rating*: One can provide a subjective overall rating of the dive on a\n" @@ -713,7 +743,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:300 user-manual.txt:762 +#: user-manual.txt:311 user-manual.txt:792 #, no-wrap msgid "" "*Visibility*: Similarly, one can provide a rating of visibility during the\n" @@ -722,7 +752,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:306 +#: user-manual.txt:317 #, no-wrap msgid "" "*Tags*: Tags that describe the type of dive performed may\n" @@ -733,13 +763,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:308 +#: user-manual.txt:319 #, no-wrap msgid "*Notes*: Any additional information can be typed here.\n" msgstr "" #. type: Plain text -#: user-manual.txt:313 user-manual.txt:778 +#: user-manual.txt:324 user-manual.txt:808 msgid "" "The *Save* and *Cancel* buttons are used to save all the information for " "tabs in the info panel and in the dive profile panel, so there's no need to " @@ -748,19 +778,19 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:314 user-manual.txt:779 +#: user-manual.txt:325 user-manual.txt:809 #, no-wrap msgid "images/CompletedDiveInfo_f20.jpg" -msgstr "" +msgstr "images/CompletedDiveInfo_f20.jpg" #. type: Title ==== -#: user-manual.txt:316 user-manual.txt:781 +#: user-manual.txt:327 user-manual.txt:811 #, no-wrap msgid "Equipment" msgstr "" #. type: Plain text -#: user-manual.txt:323 +#: user-manual.txt:334 msgid "" "The Equipment tab allows the user to enter information about the type of " "cylinder and gas used, as well as the weights used for a dive. This is a " @@ -770,7 +800,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:327 user-manual.txt:796 +#: user-manual.txt:338 user-manual.txt:826 #, no-wrap msgid "" "*Cylinders*: The cylinder information is entered through a dialogue that looks\n" @@ -778,13 +808,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:328 +#: user-manual.txt:339 #, no-wrap msgid "images/Gas_dialogue1_f20.jpg" -msgstr "" +msgstr "images/Gas_dialogue1_f20.jpg" #. type: Plain text -#: user-manual.txt:336 +#: user-manual.txt:347 msgid "" "The + button at the top right allows the user to add more cylinders for this " "dive. The dark dustbin icon on the left allows one to delete information " @@ -795,7 +825,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:341 +#: user-manual.txt:352 msgid "" "Start by selecting a cylinder type on the left-hand side of the table. To " "select a cylinder, click in the *Type* box. This brings up a button that " @@ -803,13 +833,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:342 +#: user-manual.txt:353 #, no-wrap msgid "images/Gas_dialogue2_f20.jpg" -msgstr "" +msgstr "images/Gas_dialogue2_f20.jpg" #. type: Plain text -#: user-manual.txt:350 +#: user-manual.txt:361 msgid "" "The drop-down list can be used to select the cylinder type used for the dive " "or the user may start typing in the box which shows the available options " @@ -820,7 +850,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:355 +#: user-manual.txt:366 msgid "" "Next, indicate the starting pressure and the ending pressure of the gas used " "during the dive. The unit of pressure (metric/imperial) corresponds to the " @@ -828,7 +858,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:366 +#: user-manual.txt:377 msgid "" "Finally, type in the gas mixture used in the *O2%* field. If air was used, a " "value of 21% can be entered on this field, or it might be left blank. If " @@ -842,13 +872,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:367 user-manual.txt:834 +#: user-manual.txt:378 user-manual.txt:864 #, no-wrap msgid "images/CylinderDataEntry3_f20.jpg" -msgstr "" +msgstr "images/CylinderDataEntry3_f20.jpg" #. type: Plain text -#: user-manual.txt:373 +#: user-manual.txt:384 #, no-wrap msgid "" "*Weights*: Information about the weight system used during a dive can be entered\n" @@ -858,26 +888,26 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:374 user-manual.txt:842 +#: user-manual.txt:385 user-manual.txt:872 #, no-wrap msgid "images/WeightsDataEntry1_f20.jpg" -msgstr "" +msgstr "images/WeightsDataEntry1_f20.jpg" #. type: Plain text -#: user-manual.txt:378 +#: user-manual.txt:389 msgid "" "If one then clicks on the *Type* field, a drop-down list becomes accessible " "through a down-arrow:" msgstr "" #. type: Target for macro image -#: user-manual.txt:379 user-manual.txt:847 +#: user-manual.txt:390 user-manual.txt:877 #, no-wrap msgid "images/WeightsDataEntry2_f20.jpg" -msgstr "" +msgstr "images/WeightsDataEntry2_f20.jpg" #. type: Plain text -#: user-manual.txt:393 +#: user-manual.txt:404 msgid "" "The drop-down list can then be used to select the type of weight system or " "the user may start typing in the box which shows the available options for " @@ -892,26 +922,26 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:394 user-manual.txt:863 +#: user-manual.txt:405 user-manual.txt:893 #, no-wrap msgid "images/WeightsDataEntry3_f20.jpg" -msgstr "" +msgstr "images/WeightsDataEntry3_f20.jpg" #. type: Plain text -#: user-manual.txt:398 +#: user-manual.txt:409 msgid "" "There's NO need to click the _Save_ button before the dive profile has been " "completed." msgstr "" #. type: Title ==== -#: user-manual.txt:400 +#: user-manual.txt:411 #, no-wrap msgid "Creating a Dive Profile" msgstr "" #. type: Plain text -#: user-manual.txt:407 +#: user-manual.txt:418 msgid "" "The *Dive Profile* (a graphical representation of the depth of the dive as a " "function of time) is indicated in the panel on the top right hand of the " @@ -921,13 +951,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:408 +#: user-manual.txt:419 #, no-wrap msgid "images/DiveProfile1_f20.jpg" -msgstr "" +msgstr "images/DiveProfile1_f20.jpg" #. type: Plain text -#: user-manual.txt:426 +#: user-manual.txt:437 msgid "" "_Modifying the dive profile_: When the cursor is moved around the dive " "profile, its position is indicated by two coloured lines (red and green) as " @@ -946,13 +976,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:427 +#: user-manual.txt:438 #, no-wrap msgid "images/DiveProfile2_f20.jpg" -msgstr "" +msgstr "images/DiveProfile2_f20.jpg" #. type: Plain text -#: user-manual.txt:439 +#: user-manual.txt:450 msgid "" "_Specifying the gas composition:_ The gas composition used is clearly " "indicated along the line segments of the dive profile. This defaults to the " @@ -966,13 +996,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:440 +#: user-manual.txt:451 #, no-wrap msgid "images/DiveProfile3_f20.jpg" -msgstr "" +msgstr "images/DiveProfile3_f20.jpg" #. type: Plain text -#: user-manual.txt:445 +#: user-manual.txt:456 msgid "" "Below is the profile of a dive to 25 m for 30 min and with a switch from air " "to EAN50 at the end of the duration at 20m. In this case the first cylinder " @@ -980,19 +1010,19 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:446 +#: user-manual.txt:457 #, no-wrap msgid "images/DiveProfile4_f20.jpg" -msgstr "" +msgstr "images/DiveProfile4_f20.jpg" #. type: Title ==== -#: user-manual.txt:448 +#: user-manual.txt:459 #, no-wrap msgid "Saving the hand-entered dive information" msgstr "" #. type: Plain text -#: user-manual.txt:459 +#: user-manual.txt:470 msgid "" "The information entered in the *Dive Notes* tab, the *Equipment* tab as well " "as the *Dive Profile* can now be saved in the user's logbook by using the " @@ -1004,19 +1034,19 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:461 +#: user-manual.txt:472 #, no-wrap msgid "Importing new dive information from a Dive Computer" msgstr "" #. type: Title ==== -#: user-manual.txt:463 +#: user-manual.txt:474 #, no-wrap msgid "Connecting and importing data from a dive computer." msgstr "" #. type: Plain text -#: user-manual.txt:474 +#: user-manual.txt:485 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, " @@ -1028,13 +1058,13 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:475 user-manual.txt:2725 +#: user-manual.txt:486 user-manual.txt:2681 #, no-wrap msgid "images/icons/warning2.png" -msgstr "" +msgstr "images/icons/warning2.png" #. type: Plain text -#: user-manual.txt:486 +#: user-manual.txt:497 msgid "" "Several dive computers consume more power when they are in their PC-" "Communication mode. **This could drain the dive computer's battery**. We " @@ -1046,7 +1076,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:502 +#: user-manual.txt:513 msgid "" "To import dive information from a dive computer to a computer with " "_Subsurface_, it is necessary that the two pieces of equipment communicate " @@ -1063,61 +1093,62 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:505 +#: user-manual.txt:516 msgid "" "After this, the dive computer can be hooked up to the user's PC, which can " "be achieved by following these steps:" msgstr "" #. type: Plain text -#: user-manual.txt:507 +#: user-manual.txt:518 msgid "" "The interface cable should be connected to a free USB port (or the Infra-red" msgstr "" #. type: Plain text -#: user-manual.txt:508 +#: user-manual.txt:519 msgid "or Bluetooth connection set up as described later in this manual)" msgstr "" #. type: Plain text -#: user-manual.txt:510 +#: user-manual.txt:521 msgid "The dive computer should be placed into PC Communication mode." msgstr "" #. type: Plain text -#: user-manual.txt:511 +#: user-manual.txt:522 msgid "(Users should refer to the manual of their specific dive computer)" msgstr "" #. type: Plain text -#: user-manual.txt:515 +#: user-manual.txt:526 msgid "" "In _Subsurface_, from the Main Menu, the user must select _Import -> Import " "From Dive Computer_. Dialogue *A* in the figure below appears:" msgstr "" #. type: Target for macro image -#: user-manual.txt:517 +#: user-manual.txt:528 #, no-wrap -msgid "images/ImportFromDC1_f20.jpg" -msgstr "" +msgid "images/DC_import_f20.jpg" +msgstr "images/DC_import_f20.jpg" #. type: Plain text -#: user-manual.txt:527 +#: user-manual.txt:539 msgid "" "Dive computers tend to keep a certain number of dives in their memory, even " "though these dives have already been imported to _Subsurface_. For that " -"reason _Subsurface_ only imports dives that have not been uploaded 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). If, for some reason, the user wishes to import ALL " -"dives from the dive computer, even though some may already be in the " -"logbook, then check the check box labelled _Force download of all dives_." +"reason, if the divecomputer allows this, _Subsurface_ only imports dives " +"that have not been uploaded 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). If, for some reason, " +"the user wishes to import ALL dives from the dive computer, even though some " +"may already be in the logbook, then check the check box labelled _Force " +"download of all dives_." msgstr "" #. type: Plain text -#: user-manual.txt:534 +#: user-manual.txt:546 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, " @@ -1127,7 +1158,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:545 +#: user-manual.txt:557 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 " @@ -1142,7 +1173,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:555 +#: user-manual.txt:567 msgid "" "If all the dives on the dive computer need to be downloaded, check the " "checkbox _Force download of all dives_. Normally, _Subsurface_ only " @@ -1157,16 +1188,23 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:561 +#: user-manual.txt:573 msgid "" "If the checkbox _Always prefer downloaded dives_ has been checked and, " "during download, dives with identical date-times exist on the dive computer " -"and on the _Subsurface_ *Dive List* panel, the record in the _Subsurface_ " -"divelog will be overwritten by the record from the dive computer" +"and on the _Subsurface_ *Dive List* panel, the dive in the _Subsurface_ " +"divelog will be overwritten by the dive record from the dive computer" msgstr "" #. type: Plain text -#: user-manual.txt:565 +#: user-manual.txt:576 +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:580 msgid "" "Do *not* check the checkboxes labelled _Save libdivecomputer logfile_ and " "_Save libdivecomputer dumpfile_. These are only used as diagnostic tools " @@ -1174,30 +1212,48 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:568 +#: user-manual.txt:583 msgid "" -"The _OK_ button must then be clicked. Dialogue *B* in the figure above " -"appears." +"Then select the _Download_ button. After successful download, Dialogue *B* " +"in the figure above appears." msgstr "" #. type: Plain text -#: user-manual.txt:583 +#: user-manual.txt:598 msgid "" "With communication established, one can see how the data are retrieved from " "the dive computer. Depending on the make of the dive computer and/or number " -"of recorded dives, this could take some time. The user should be patient. " -"The _Download_ dialogue shows a progress bar at the bottom of the dialogue " -"(for some dive computers the progress information could be inaccurate as we " -"cannot determine how much downloadable data there is until all data have " -"been downloaded). When the download of the dive information is complete, all " -"the imported dives appear in the *Dive List*, sorted by date and time. " +"of recorded dives, this could take some time. Be patient. The _Download_ " +"dialogue shows a progress bar at the bottom of the dialogue (for some dive " +"computers the progress information could be inaccurate as we cannot " +"determine how much downloadable data there is until all data have been " +"downloaded). When the download of the dive information is complete, all the " +"imported dives appear in the *Dive List*, sorted by date and time. " "Disconnect and switch off the dive computer to conserve its battery power. " "If a particular dive is selected, the *Dive Profile* panel shows an " "informative graph of dive depth against time for that particular dive." msgstr "" #. type: Plain text -#: user-manual.txt:588 +#: user-manual.txt:605 +msgid "" +"After the dives have been downloaded, they appear in a tabular format on the " +"righthand side of the dialogue (see image *B*, above). Each dive comprises a " +"row in the table, with the date, duration and depth shown. Next to each dive " +"is a checkbox: check all the dives that need to be transfered to the *Dive " +"List*. In the case of the image above, the last six dives are checked and " +"will be transfered to the *Dive List*." +msgstr "" + +#. type: Plain text +#: user-manual.txt:608 +msgid "" +"After this has been completed, select the OK button. The checked dives are " +"transfered to the *Dive List*." +msgstr "" + +#. type: Plain text +#: user-manual.txt:612 msgid "" "If there is a problem in communicating with the dive computer, an error " "message will be shown, similar to this text: \"Unable to open /dev/ttyUSB0 " @@ -1205,37 +1261,37 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:592 +#: user-manual.txt:616 #, no-wrap msgid "*PROBLEMS WITH DATA DOWNLOAD FROM A DIVE COMPUTER?*\n" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:592 user-manual.txt:1094 user-manual.txt:1161 -#: user-manual.txt:1330 user-manual.txt:1406 +#: user-manual.txt:616 user-manual.txt:1161 user-manual.txt:1227 +#: user-manual.txt:1279 user-manual.txt:1355 #, no-wrap msgid "images/icons/important.png" -msgstr "" +msgstr "images/icons/important.png" #. type: delimited block * -#: user-manual.txt:595 +#: user-manual.txt:619 msgid "Check the following:" msgstr "" #. type: delimited block * -#: user-manual.txt:598 +#: user-manual.txt:622 msgid "Is the dive computer still in PC-communication or Upload mode?" msgstr "" #. type: delimited block * -#: user-manual.txt:601 +#: user-manual.txt:625 msgid "" "Is the battery of the dive computer fully charged? If not then the battery " "must be charged or replaced." msgstr "" #. type: delimited block * -#: user-manual.txt:605 +#: user-manual.txt:629 msgid "" "Is the connecting cable faulty? Does the cable work perfectly using other " "software? Has it worked before, or is this the first time the cable is being " @@ -1243,7 +1299,7 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:610 +#: user-manual.txt:634 msgid "" "Consult xref:" "_appendix_a_operating_system_specific_information_for_importing_dive_information_from_a_dive_computer[Appendix " @@ -1251,7 +1307,7 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:614 +#: user-manual.txt:638 msgid "" "On Unix-like operating systems, does the user have write permission to the " "USB port? If not, consult xref:" @@ -1260,7 +1316,7 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:622 +#: user-manual.txt:646 msgid "" "If the _Subsurface_ computer does not recognise the USB adaptor by showing " "an appropriate device name next to the Mount Point, then there is a " @@ -1273,7 +1329,7 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:625 +#: user-manual.txt:649 #, no-wrap msgid "" "\tSave libdivecomputer logfile\n" @@ -1281,7 +1337,7 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:631 +#: user-manual.txt:655 #, no-wrap msgid "" "*Important*: These check boxes are only used when problems are encountered\n" @@ -1292,7 +1348,7 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:635 +#: user-manual.txt:659 #, no-wrap msgid "" "*Important:* _After downloading with the above checkboxes\n" @@ -1301,7 +1357,7 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:638 +#: user-manual.txt:662 #, no-wrap msgid "" "\tsubsurface.log\n" @@ -1309,7 +1365,7 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:644 +#: user-manual.txt:668 msgid "" "These files should be send to the _Subsurface_ mail list: " "_subsurface@subsurface-divelog.org_ with a request for the files to be " @@ -1318,13 +1374,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:647 +#: user-manual.txt:671 #, no-wrap msgid "Changing the name of a dive computer" msgstr "" #. type: Plain text -#: user-manual.txt:663 +#: user-manual.txt:687 msgid "" "It may be necessary to distinguish between different dive computers used to " "upload dive logs to _Subsurface_. For instance if one's partner's dive " @@ -1343,40 +1399,41 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:665 +#: user-manual.txt:689 #, no-wrap msgid "Updating the dive information imported from the dive computer." msgstr "" #. type: Plain text -#: user-manual.txt:672 +#: user-manual.txt:696 msgid "" -"The information from the dive computer is not complete and more details must " -"be added in order to have a fuller record of the dives. To do this, the " -"*Dive Notes* and the *Equipment* tabs on the top left hand of the " -"_Subsurface_ window should be used." +"With the uploaded dives in the *Dive List*, the information from the dive " +"computer is not complete and more details must be added in order to have a " +"fuller record of the dives. To do this, the *Dive Notes* and the *Equipment* " +"tabs on the top left hand of the _Subsurface_ window should be used." msgstr "" #. type: Plain text -#: user-manual.txt:682 +#: user-manual.txt:707 msgid "" -"The date and time of the dive, gas mixture and (often) water temperature is " -"shown as obtained from the dive computer, but the user needs to add " -"additional information by hand in order to have a more complete dive " -"record. If the contents of this tab is changed or edited in any way, the " -"message in a blue box at the top of the panel indicates that the dive is " -"being edited. If one clicks on the *Dive Notes* tab, the following fields " -"are visible:" +"The date and time of the dive, gas mixture and (often) water temperature are " +"usually shown as obtained from the dive computer, but the user needs to add " +"additional information by hand in order to have a more complete dive record. " +"In a few cases, (e.g. APD rebreathers) one also has to provide the date and " +"time of the dive. If the contents of this tab is changed or edited in any " +"way, the message in a blue box at the top of the panel indicates that the " +"dive is being edited. If one clicks on the *Dive Notes* tab, the following " +"fields are visible:" msgstr "" #. type: Target for macro image -#: user-manual.txt:683 +#: user-manual.txt:708 #, no-wrap msgid "images/AddDive3_f20.jpg" -msgstr "" +msgstr "images/AddDive3_f20.jpg" #. type: Plain text -#: user-manual.txt:691 +#: user-manual.txt:716 msgid "" "The *Time* field reflects the date and time of the dive. By clicking the " "date, a calendar is displayed from which one can choose the correct date. " @@ -1386,7 +1443,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:702 +#: user-manual.txt:727 #, no-wrap msgid "" "*Air/water temperatures*: Air and water temperatures during the dive are shown\n" @@ -1402,7 +1459,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:707 +#: user-manual.txt:732 #, no-wrap msgid "" "*Location*: In this field one should type in text that describes the site\n" @@ -1412,7 +1469,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:717 +#: user-manual.txt:742 msgid "" "The user can find the coordinates on the world map in the bottom right hand " "part of the Subsurface window. The map displays a green bar indicating " @@ -1422,7 +1479,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:722 +#: user-manual.txt:747 msgid "" "The user can obtain the coordinates from the _Subsurface_ Companion app if " "an Android device with GPS was used and if the coordinates of the dive site " @@ -1431,7 +1488,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:734 +#: user-manual.txt:759 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 " @@ -1439,7 +1496,17 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:745 +#: user-manual.txt:770 +#, no-wrap +msgid "" +"*Dive mode*: This is a dropdown box allowing one to choose the type of dive\n" +"performed. The options are OC (Open Circuit, the default seting, meant 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:775 #, no-wrap msgid "" "*Divemaster*: The name of the dive master or dive guide for this dive should be\n" @@ -1449,7 +1516,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:750 +#: user-manual.txt:780 #, no-wrap msgid "" "*Buddy*: In this field, one enters the name(s) of the buddy / buddies\n" @@ -1459,7 +1526,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:755 +#: user-manual.txt:785 #, no-wrap msgid "" "*Suit*: Here the type of diving suit used for the dive can be entered.\n" @@ -1469,7 +1536,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:771 +#: user-manual.txt:801 #, no-wrap msgid "" "*Tags*: Tags that describe the type of dive performed can be entered\n" @@ -1483,13 +1550,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:773 +#: user-manual.txt:803 #, no-wrap msgid "*Notes*: Any additional information for the dive can be entered here.\n" msgstr "" #. type: Plain text -#: user-manual.txt:786 +#: user-manual.txt:816 msgid "" "The Equipment tab allows one to enter information about the type of cylinder " "and gas used as well as the weights used for the dive. The message in a blue " @@ -1497,7 +1564,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:793 +#: user-manual.txt:823 msgid "" "indicates that the dive is being edited. This is a highly interactive part " "of _Subsurface_ and the information on cylinders and gases (entered here) " @@ -1505,13 +1572,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:797 +#: user-manual.txt:827 #, no-wrap msgid "images/DC_gas-dialogue1_f20.jpg" -msgstr "" +msgstr "images/DC_gas-dialogue1_f20.jpg" #. type: Plain text -#: user-manual.txt:805 +#: user-manual.txt:835 msgid "" "In most cases _Subsurface_ obtains the gas used from the dive computer and " "automatically inserts the gas composition(% oxygen) in the table. The + " @@ -1523,7 +1590,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:810 +#: user-manual.txt:840 msgid "" "The user should start by selecting a cylinder type on the left-hand side of " "the table. To select a cylinder, the *cylinder type* box should be clicked. " @@ -1532,13 +1599,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:811 +#: user-manual.txt:841 #, no-wrap msgid "images/DC_gas-dialogue2_f20.jpg" -msgstr "" +msgstr "images/DC_gas-dialogue2_f20.jpg" #. type: Plain text -#: user-manual.txt:818 +#: user-manual.txt:848 msgid "" "The drop-down list can then be used to select the cylinder type that was " "used for this dive or the user may start typing in the box which shows the " @@ -1548,7 +1615,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:822 +#: user-manual.txt:852 msgid "" "Next one must indicate the starting pressure and the ending pressure of the " "specified gas during the dive. The unit of pressure (metric/imperial) " @@ -1556,7 +1623,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:833 +#: user-manual.txt:863 msgid "" "Finally, provide the gas mixture used. If air was used, the value of 21% can " "be entered or this field can be left blank. If nitrox or trimix were used, " @@ -1569,7 +1636,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:841 +#: user-manual.txt:871 #, no-wrap msgid "" "*Weights*: Information about the weight system used can be entered\n" @@ -1580,14 +1647,14 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:846 +#: user-manual.txt:876 msgid "" "By clicking on the *Type* field, a drop-down list becomes accessible through " "a down-arrow:" msgstr "" #. type: Plain text -#: user-manual.txt:862 +#: user-manual.txt:892 msgid "" "The drop-down list can then be used to select the type of weight system used " "during the dive or the user may start typing in the box which shows the " @@ -1602,13 +1669,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:865 +#: user-manual.txt:895 #, no-wrap msgid "Editing several selected dives simultaneously" msgstr "" #. type: Plain text -#: user-manual.txt:880 +#: user-manual.txt:910 msgid "" "_METHOD 1_: After uploading dives from a dive computer, the dive profiles of " "the uploaded dives are shown in the *Dive profile* tab, as well as a few " @@ -1626,7 +1693,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:890 +#: user-manual.txt:920 msgid "" "The simultaneous editing only works with fields that do not already contain " "information. This means that, if some fields have been edited for a " @@ -1641,7 +1708,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:899 +#: user-manual.txt:929 msgid "" "_METHOD 2_:There is a different way of achieving the same goal. Select a " "dive with all the appropriate information typed into the *Dive Notes* and " @@ -1656,13 +1723,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:900 +#: user-manual.txt:930 #, no-wrap msgid "Adding Bookmarks to a dive" msgstr "" #. type: Plain text -#: user-manual.txt:905 +#: user-manual.txt:935 msgid "" "Many divers wish to annotate their dives with text that indicate particular " "events during the dive, e.g. \"Saw dolphins\", or \"Released surface buoy\". " @@ -1670,7 +1737,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:909 +#: user-manual.txt:939 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 " @@ -1678,40 +1745,40 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:911 +#: user-manual.txt:941 msgid "" "Right-click on the red flag. This brings up the context menu (see *B* " "below). Select _Edit name_." msgstr "" #. type: Plain text -#: user-manual.txt:914 +#: user-manual.txt:944 msgid "" "A text box is shown. Type the explanatory text for the bookmark (see *C* " "below). Select _OK_. This saves the text associated with the bookmark." msgstr "" #. type: Plain text -#: user-manual.txt:917 +#: user-manual.txt:947 msgid "" "If one hovers using the mouse over the red bookmark, the appropriate text is " "shown at the bottom of the information box (see *D* below)." msgstr "" #. type: Target for macro image -#: user-manual.txt:918 +#: user-manual.txt:948 #, no-wrap msgid "images/Bookmarks.jpg" -msgstr "" +msgstr "images/Bookmarks.jpg" #. type: Title ==== -#: user-manual.txt:921 +#: user-manual.txt:951 #, no-wrap msgid "Saving the updated dive information" msgstr "" #. type: Plain text -#: user-manual.txt:933 +#: user-manual.txt:963 msgid "" "The information entered in the *Dive Notes* tab and the *Equipment* tab can " "be saved by using the two buttons on the top right hand of the *Dive Notes* " @@ -1723,13 +1790,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:934 +#: user-manual.txt:964 #, no-wrap msgid "Importing dive information from other digital data sources or other data formats" msgstr "" #. type: Plain text -#: user-manual.txt:960 +#: user-manual.txt:990 msgid "" "If a user has been diving for some time, it is possible that several dives " "were logged using other dive log software. This information does not need " @@ -1751,11 +1818,11 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:969 +#: user-manual.txt:999 msgid "" "If the format of other software is supported natively on Subsurface, it " -"should be sufficient to select either _Import->Import log files_ or _File-" -">Open log file_. _Subsurface_ supports the data formats of many dive " +"should be sufficient to select either _Import -> Import log files_ or _File -" +"> Open log file_. _Subsurface_ supports the data formats of many dive " "computers, including Suunto and Shearwater. When importing dives, " "_Subsurface_ tries to detect multiple records for the same dive and merges " "the information as best as it can. If there are no time zone issues (or " @@ -1764,13 +1831,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:970 +#: user-manual.txt:1000 #, no-wrap msgid "Using the universal import dialogue" msgstr "" #. type: Plain text -#: user-manual.txt:976 +#: user-manual.txt:1006 msgid "" "Importing dives from other software is performed through a universal " "interface that is activated by selecting _Import_ from the Main Menu, then " @@ -1778,13 +1845,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:977 +#: user-manual.txt:1007 #, no-wrap msgid "images/Import1_f20.jpg" -msgstr "" +msgstr "images/Import1_f20.jpg" #. type: Plain text -#: user-manual.txt:982 +#: user-manual.txt:1012 msgid "" "Towards the bottom right is a dropdown selector with a default label of " "_Dive Log Files_ which gives access to the different types of direct imports " @@ -1792,45 +1859,45 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:984 +#: user-manual.txt:1014 msgid "" "XML-formatted dive logs (DivingLog 5.0, MacDive and several other dive log " "systems)" msgstr "" #. type: Plain text -#: user-manual.txt:985 +#: user-manual.txt:1015 msgid "UDDF-formatted dive logs (e.g. Kenozoooid)" msgstr "" #. type: Plain text -#: user-manual.txt:986 +#: user-manual.txt:1016 msgid "UDCF-formatted dive logs" msgstr "" #. type: Plain text -#: user-manual.txt:987 +#: user-manual.txt:1017 msgid "Poseidon MkVI CCR logs" msgstr "" #. type: Plain text -#: user-manual.txt:988 +#: user-manual.txt:1018 msgid "JDiveLog" msgstr "" #. type: Plain text -#: user-manual.txt:989 +#: user-manual.txt:1019 msgid "Suunto Dive Manager (DM3 and DM4)" msgstr "" #. type: Plain text -#: user-manual.txt:990 +#: user-manual.txt:1020 msgid "" "CSV (text-based and spreadsheet-based) dive logs, including APD CCR logs" msgstr "" #. type: Plain text -#: user-manual.txt:994 +#: user-manual.txt:1024 msgid "" "Selecting the appropriate file in the file list of the dialogue opens the " "imported dive log in the _Subsurface_ *Dive List*. Some other formats, not " @@ -1839,118 +1906,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:995 -#, no-wrap -msgid "Importing dive logs from closed circuit rebreather (CCR) systems" -msgstr "" - -#. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:997 user-manual.txt:1698 -#, no-wrap -msgid "images/APD.jpg" -msgstr "" - -#. type: Plain text -#: user-manual.txt:1002 user-manual.txt:1703 -msgid "" -"Closed system rebreathers use advanced technology to recirculate gas that " -"has been breathed while doing two things to maintain a breathable oxygen " -"concentration:" -msgstr "" - -#. type: Plain text -#: user-manual.txt:1003 user-manual.txt:1704 -msgid "remove carbon dioxide from the gas that has been exhaled" -msgstr "" - -#. type: Plain text -#: user-manual.txt:1012 -msgid "" -"regulate the oxygen concentration to remain within safe diving limits. " -"Currently, within _Subsurface_, the Poseidon MkVI Discovery is the best " -"supported CCR dive computer. The CCR interface of _Subsurface_ is currently " -"experimental and under active development. In contrast to a conventional " -"open circuit dive computer, a CCR system computer does not allow the " -"download of a log containing multiple dives. Rather, each dive is stored " -"independently. This means that _Subsurface_ cannot download a dive log " -"directly from a CCR dive computer, but that it imports CCR dive logs in the " -"same way that it imports dive log data from other databases." -msgstr "" - -#. type: Title ===== -#: user-manual.txt:1013 user-manual.txt:1714 -#, no-wrap -msgid "Import a CCR dive" -msgstr "" - -#. type: Plain text #: user-manual.txt:1025 -msgid "" -"See the section dealing with xref:S_ImportingAlienDiveLogs[Importing dive " -"information from other digital sources]. From the main menu of _Subsurface_, " -"select _Import->Import log files_ to bring up the xref:" -"Unified_import[universal import dialogue]. As explained in the previous " -"section, the bottom right hand of the import dialogue contains a dropdown " -"list of appropriate devices that currently includes an option for MkVI " -"files. Having selected the appropriate CCR format and the directory where " -"the original dive logs have been stored from the CCR dive computer, one can " -"select a particular dive log file (in the case of the MkVI it is a file with " -"a .txt extension). After selecting the appropriate dive log, activate the " -"_Open_ button at the bottom right hand of the universal import dialogue." -msgstr "" - -#. type: Title ===== -#: user-manual.txt:1026 -#, no-wrap -msgid "Displayed information for a dive" -msgstr "" - -#. type: Plain text -#: user-manual.txt:1037 -msgid "" -"_Partial pressures of gases_: The graph of oxygen partial pressure shows the " -"information from the oxygen sensors of the CCR equipment. In the case of the " -"Poseidon MKVI, the mean value of the two oxygen sensors are shown. In the " -"case of the APD equipment, the mean of the three oxygen sensors are shown. " -"If one sensor shows a very different oxygen PO2 reading compared to the " -"others, the divergent sensor is ignored. For CCR dives the graph for oxygen " -"partial pressure should be fairly flat, reflecting the setpoint settings " -"during the dive. Partial pressures for nitrogen (and helium, if applicable) " -"are shown in the usual way as for other dives." -msgstr "" - -#. type: Plain text -#: user-manual.txt:1042 -msgid "" -"_Cylinder pressures_: CCR dive computers like the Poseidon MkVI record the " -"pressures of the oxygen and diluent cylinders. The pressure of the oxygen " -"cylinder is shown on the dive profile. In addition, start and end pressures " -"for both oxygen and diluent cylinders are shown in the _Equipment Tab_." -msgstr "" - -#. type: Plain text -#: user-manual.txt:1046 -msgid "" -"_Equipment-specific information_: Equipment-specific information gathered by " -"_Subsurface_ is shown in the _Extra data_ tab. This may include setup " -"information or metadata about the dive." -msgstr "" - -#. type: Plain text -#: user-manual.txt:1048 -msgid "" -"More equipment-specific information for downloading CCR dive logs can be " -"found in xref:S_PoseidonMkVI[Appendix B]." -msgstr "" - -#. type: Title ==== -#: user-manual.txt:1049 #, no-wrap msgid "Importing from Mares Dive Organiser V2.1" msgstr "" #. type: Plain text -#: user-manual.txt:1056 +#: user-manual.txt:1032 msgid "" "Since Mares utilise proprietary Windows software not compatible with multi-" "platform applications, these dive logs cannot be directly imported into " @@ -1960,7 +1922,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1061 +#: user-manual.txt:1037 msgid "" "The dive log data from Mares Dive Organiser need to be exported to the " "user's desktop, using a _.sdf_ file name extension. Refer to xref:" @@ -1968,7 +1930,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1067 +#: user-manual.txt:1043 msgid "" "Data should then be imported into _www.divelogs.de_. One needs to create a " "user account in _www.divelogs.de_, log into that web site, then select " @@ -1978,23 +1940,23 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1069 +#: user-manual.txt:1045 msgid "" "Finally, import the dives from _divelogs.de_ to _Subsurface_, using the " "instructions below." msgstr "" #. type: Title ==== -#: user-manual.txt:1072 +#: user-manual.txt:1048 #, no-wrap msgid "Importing dives from *divelogs.de*" msgstr "" #. type: Plain text -#: user-manual.txt:1085 +#: user-manual.txt:1061 msgid "" "The import of dive information from _divelogs.de_ is simple, using a single " -"dialogue box. The _Import->Import form Divelogs.de_ option should be " +"dialogue box. The _Import -> Import from Divelogs.de_ option should be " "selected from the Main Menu. This brings up a dialogue box (see figure on " "left [*A*] below). Enter a user-ID and password for _divelogs.de_ into the " "appropriate fields and then select the _Download_ button. Download from " @@ -2005,170 +1967,216 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1086 +#: user-manual.txt:1062 #, no-wrap msgid "images/Divelogs1.jpg" -msgstr "" +msgstr "images/Divelogs1.jpg" #. type: Title ==== -#: user-manual.txt:1089 +#: user-manual.txt:1065 #, no-wrap msgid "Importing data in CSV format" msgstr "" #. type: Plain text -#: user-manual.txt:1093 +#: user-manual.txt:1076 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 " "circuit rebreathers) or as dive metadata (in case the user keeps dive data " -"in a spreadsheet). For an introduction to CSV-formatted files see xref:" -"S_CSV_Intro[A Diver's Introduction To CSV Files]." +"in a spreadsheet). The _CSV_ format is a universal simplified format that " +"allows for easy information exchange between different computers or software " +"packages. For an introduction to CSV-formatted files see xref:S_CSV_Intro[A " +"Diver's Introduction To CSV Files]. _Subsurface_ dive logs can also be " +"exported in _CSV_ format to other software that reads this format. See xref:" +"S_Appendix_D[APPENDIX D: Exporting a spreadsheet to CSV format] for " +"information that may be helpful for importing spreadsheet-based data into " +"_Subsurface_." +msgstr "" + +#. type: Title ===== +#: user-manual.txt:1078 +#, no-wrap +msgid "Importing dives in CSV format from dive computers or other dive log software" msgstr "" #. type: Plain text -#: user-manual.txt:1103 +#: user-manual.txt:1083 msgid "" -"The CSV import has a couple of caveats. You should avoid some special " -"characters like ampersand (&), less than (<), greater than (>) and double " -"quotes (\"), the latter if quoting text cells. The file should use UTF-8 " -"character set, if having non-ASCII characters. Also the size of the CSV file " -"might cause problems. Importing 100 dives at a time (without dive profile) " -"has worked previously, but larger files might exceed limits of the parser " -"used. When having problems with CSV imports, try first with a smaller sample " -"to make sure everything works." +"One can view a _CSV_ file by using an ordinary text editor. It is normally " +"organised into a single line that provides the headers (or _field names_ or " +"_column headings_) of the data columns, followed by the data, one record per " +"line." msgstr "" -#. type: Title ===== -#: user-manual.txt:1105 -#, no-wrap -msgid "Importing dives in CSV format from dive computers or other dive log software" +#. type: Plain text +#: user-manual.txt:1085 +msgid "" +"There are two types of _CSV_ dive logs that can be imported into " +"_Subsurface_:" msgstr "" #. type: Plain text -#: user-manual.txt:1112 +#: user-manual.txt:1091 msgid "" -"CSV files are normally organised into a single line that provides the " -"headers (or _field names_) of the data columns, followed by the data, one " -"record per line. CSV files can be opened with a normal text editor. For " -"information of how to export a spreadsheet in CSV format see xref:" -"S_Appendix_D[APPENDIX D: Exporting a spreadsheet to CSV format]." +"_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, " +"dive duration, names of buddy and dive master and perhaps some information " +"about cylinder pressures before and after the dive, as well as a comment or " +"two about the dive. All the data for a single dive go on a single line of " +"text, following the order of the column headings." msgstr "" #. type: Plain text -#: user-manual.txt:1114 -msgid "Before being able to import the data to _Subsurface_ one needs to know:" +#: user-manual.txt:1100 +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 " +"intervals, indicating depth, water temperature at that depth, and cylinder " +"pressure at that moment in time. Each line contains the information for a " +"single instant in time during the dive, 30 seconds after that of the " +"previous instant. Many lines are required to complete the depth profile " +"information for a single dive. This is a common export format used by closed-" +"circuit rebreather (CCR) dive equipment and many software packages that " +"handle dive computer data and/or dive logs." +msgstr "" + +#. type: Plain text +#: user-manual.txt:1103 +msgid "" +"Before being able to import the _CSV_ data to _Subsurface_ *one needs to " +"know a few things about the data being imported*:" msgstr "" #. type: Plain text -#: user-manual.txt:1123 +#: user-manual.txt:1111 msgid "" "Which character separates the different columns within a single line of " "data? This field separator should be either a comma (,) or a TAB character. " "This can be determined by opening the file with a text editor. If it is " "comma-delimited, then the comma characters between the values are clearly " "visible. If no commas are evident and the numbers are aligned in columns, " -"the file is probably TAB-delimited (i.e. it uses a TAB as a field separator, " -"as in the above example)." +"the file is probably TAB-delimited (i.e. it uses a TAB as a field separator)." msgstr "" #. type: Plain text -#: user-manual.txt:1127 +#: user-manual.txt:1115 msgid "" -"Which data columns need to be imported into _Subsurface_? The Dive Time and " -"Depth columns are always required. Open the file using a text editor and " -"note the titles of the columns to be imported and their column positions." +"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 " +"editor and note the titles of the columns to be imported and their column " +"positions." msgstr "" #. type: Plain text -#: user-manual.txt:1129 +#: user-manual.txt:1117 msgid "" "Is the numeric information (e.g. dive depth) in metric or in imperial unis?" msgstr "" #. type: Plain text -#: user-manual.txt:1136 +#: user-manual.txt:1124 msgid "" "Armed with this information, importing the data into _Subsurface_ is " -"straightforward. Select _Import->Import Log Files_ from the main menu. In " -"the resulting file selection menu, select _CSV files_, after which a common " -"configuration dialog appears for all the files with a CSV extension:" +"straightforward. Select _Import -> Import Log Files_ from the main menu. In " +"the resulting file selection menu, select _CSV files_ (towards the bottom " +"right). This shows all .CSV files in the selected directory. Select the file " +"that needs to be imported. A configuration panel appears as depicted below:" msgstr "" #. type: Target for macro image -#: user-manual.txt:1137 +#: user-manual.txt:1125 #, no-wrap -msgid "images/Import_CSV1.jpg" -msgstr "" +msgid "images/csv_import1_f20.jpg" +msgstr "images/csv_import1_f20.jpg" #. type: Plain text -#: user-manual.txt:1143 +#: user-manual.txt:1136 msgid "" -"There are pre-configured definitions for some dive computers, e.g. the APD " -"rebreathers. If the user's dive computer is on this list, it should be " -"selected using the dropdown box labeled _Pre-configured imports_." +"Notice that, at the top left, there is a dropdown list containing pre-" +"configured settings for some of the more common dive computers and software " +"packages encountered by divers. If the _CSV_ file being imported originated " +"from any of these pre-configured items, then select it. Otherwise use the " +"_Manual Import_ option. The configuration panel also has dropdown lists for " +"the specification of the appropriate field separator (Tab, comma or " +"semicolon), the date format used in the _CSV_ file, the time units (seconds, " +"minutes or minutes:seconds), as well as the unit system (metric or " +"imperial). Selecting the appropriate options among these is critical for the " +"successful import of the data." msgstr "" #. type: Plain text #: user-manual.txt:1150 msgid "" -"If the dive computer is not on the pre-configured list, the user must select " -"the _Field Separator_ (TAB or comma) for the particular CSV file, using the " -"appropriate dropdown list. For each data column used for import, the user " -"must check the appropriate check box and indicate in which column these data " -"are found." +"The last remaining task is to ensure that all the data columns have the " +"appropriate column headings. The top line of the white part of the data " +"table contains the column headings found in the _CSV_ data file. The blue " +"row of cells immediately above these contains the names understood by " +"_Subsurface_. The white area below the dropdown lists contains all the field " +"names that _Subsurface_ recognises. These names are in blue balloons and can " +"be moved using a drag-and-frop action. For instance, _Subsurface_ expects " +"the column heading for Dive number (\" # \") to be \"Dive # \". If the " +"column heading that _Subsurface_ expects is not in the blue cells, then drag " +"the appropriate column heading from the upper area and drop it in the " +"appropriate blue cell at the top of the table. To indicate the correct " +"column for \"Dive #\", drag the ballooned item labelled \"Dive # \" and drop " +"it in the blue cell immediately above the white cell containing \" # \". " +"This is depicted in the image below." msgstr "" +#. type: Target for macro image +#: user-manual.txt:1151 +#, no-wrap +msgid "images/csv_import2_f20.jpg" +msgstr "images/csv_import2_f20.jpg" + #. type: Plain text -#: user-manual.txt:1153 +#: user-manual.txt:1157 msgid "" -"Finally _OK_ should be clicked and the dive(s) are imported and listed in " -"the *Dive List* tab of _Subsurface_." -msgstr "" - -#. type: Title ==== -#: user-manual.txt:1156 -#, no-wrap -msgid "Importing dives from a manually kept CSV file or a spreadsheet" +"Continue in this way to ensure that all the column headings in the blue row " +"of cells correspond to the headings listed in the top part of the dialogue. " +"Having completed this task, select the _OK_ button to the bottom right og " +"the dialogue. The data from the _CSV_ file are imported and shown in the " +"*Dive List* panel." msgstr "" #. type: delimited block * #: user-manual.txt:1161 #, no-wrap -msgid "*A Diver's Introduction To CSV Files*\n" +msgid "*A Diver's Introduction to _CSV_ Files*\n" msgstr "" #. type: delimited block * #: user-manual.txt:1175 msgid "" -"CSV is an abbreviation for a data file format: _Comma-Separated Variables_. " -"It is a file format allowing someone to view or edit the information using a " -"text editor such as Notebook (Windows), gedit (Linux) or TextWrangler (OS/" -"X). The two main advantages of the CSV format is that the data are easily " -"editable as text without any proprietary software and ensuring all " -"information is human-readable, not being obscured by the any custom or " -"proprietary attributes that proprietary software insert into files. Because " -"of its simplicity the CSV format is used as an interchange format between " -"many software packages, e.g. between spreadsheet, statistical, graphics, " -"database and diving software. Within _Subsurface_, CSV files can also be " -"used to import information from other sources such as spreadsheet-based dive " -"logs and even from some dive computers." +"_CSV_ is an abbreviation for a data file format: _Comma-Separated " +"Variables_. It is a file format allowing someone to view or edit the " +"information using a text editor such as Notebook (Windows), gedit (Linux) or " +"TextWrangler (OS/X). The two main advantages of the _CSV_ format is that the " +"data are easily editable as text without any proprietary software and " +"ensuring all information is human-readable, not being obscured by any custom " +"or proprietary attributes that proprietary software insert into files. " +"Because of its simplicity the _CSV_ format is used as an interchange format " +"between many software packages, e.g. between spreadsheet, statistical, " +"graphics, database and diving software. Within _Subsurface_, _CSV_ files can " +"also be used to import information from other sources such as spreadsheet-" +"based dive logs and even from some dive computers." msgstr "" #. type: delimited block * #: user-manual.txt:1184 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 " +"_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 " "exporting data from spreadsheet software, the field separator needs to be " -"specified in order to create the CSV file. CSV files are normally organised " -"into a single line that provides the headers (or _field names_) of the data " -"columns, followed by the data, one record per line. Note that each field " -"name may comprise more than one word separated by spaces; for instance _Dive " -"site_, below. Here is an example of dive information for four dives using a " -"comma as a field separator:" +"specified in order to create the _CSV_ file. _CSV_ files are normally " +"organised into a single line that provides the headers (or _field names_) of " +"the data columns, followed by the data, one record per line. Note that each " +"field name may comprise more than one word separated by spaces; for instance " +"_Dive site_, below. Here is an example of dive information for four dives " +"using a comma as a field separator:" msgstr "" #. type: delimited block * @@ -2210,7 +2218,7 @@ msgid "" "character: the tabs are before and after _Dive date_). If the field names in " "the first line are long, the alignment with data in the other lines cannot " "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 " +"example of a _CSV_ dive log from an APD closed-circuit rebreather (CCR) dive " "computer:" msgstr "" @@ -2231,144 +2239,37 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:1219 -msgid "" -"CSV files can therefore be used in many contexts for importing data into a " -"_Subsurface_ dive log." -msgstr "" - -#. type: delimited block * -#: user-manual.txt:1222 -msgid "" -"An important aspect of the CSV format required by _Subsurface_ is the " -"_Column Mapping_. In the example from different dive sites above, each line " -"of data is organised as follows:" -msgstr "" - -#. type: delimited block * -#: user-manual.txt:1229 -#, no-wrap -msgid "" -"\tColumn 1:\tDive site (location)\n" -"\tColumn 2:\tDive date\n" -"\tColumn 3:\tDive time\n" -"\tColumn 4:\tDive duration\n" -"\tColumn 5:\tMaximum dive depth (m)\n" -"\tColumn 6:\tName of dive buddy\n" -msgstr "" - -#. type: delimited block * -#: user-manual.txt:1232 +#: user-manual.txt:1223 msgid "" -"_Subsurface_ requires the column number of each of these data items. For " -"these data the column specification may look like this:" -msgstr "" - -#. type: Target for macro image -#: user-manual.txt:1233 -#, no-wrap -msgid "images/CSV_column_definition.jpg" -msgstr "" - -#. type: delimited block * -#: user-manual.txt:1237 -msgid "" -"Knowledge of a few basic things about he content of the CSV file allows a " -"smooth import of the dives into _Subsurface_." -msgstr "" - -#. type: Plain text -#: user-manual.txt:1247 -msgid "" -"If one keeps dive logs in a spreadsheet, there is an option to import those " -"dives, exported as a CSV file. See xref:S_Appendix_D[APPENDIX D: Exporting a " -"spreadsheet to CSV format] for information of how to export a spreadsheet in " -"CSV format. When importing manually kept log files into _Subsurface_, the " -"information needed is quite different from that accessible using a dive " -"computer, as we are importing only summary data, not depth profile samples." +"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_ " +"file, making it much easier to work with _CSV_ files. _CSV_ files can " +"therefore be used in many contexts for importing data into a _Subsurface_ " +"dive log. Knowledge of a few basic things about the content of the _CSV_ " +"file allows a smooth import of the dives into _Subsurface_." msgstr "" #. type: Plain text -#: user-manual.txt:1250 -msgid "" -"When importing dives in CSV format (see above), one needs to know the " -"internal format of the CSV data to import." -msgstr "" - -#. type: Plain text -#: user-manual.txt:1257 -msgid "" -"Which character separates the different columns within a single line of " -"data? A recommended field separator for the export is TAB, as commas might " -"be part of the decimal data values themselves. Therefore the use of an " -"appropriate field separator is very important. When exporting data from a " -"spreadsheet it is likely to request the user to supply an appropriate field " -"separator character." -msgstr "" - -#. type: Plain text -#: user-manual.txt:1263 -msgid "" -"Which columns need to be imported into _Subsurface_? Currently there are not " -"any mandatory input fields, but some, e.g. dive duration are crucial for the " -"log file to make any sense. Possible options can be seen in the image below " -"and one should include as many as possible of the fields available in the " -"original log file." -msgstr "" - -#. type: Plain text -#: user-manual.txt:1269 -msgid "" -"Units used for depth, weight and temperature. We consider depth to be either " -"feet or meters, weight kilograms or pounds and temperature either Celsius or " -"Fahrenheit. However, the users can select _Metric_ or _Imperial_ in the " -"*Preferences* tab of _Subsurface_. No mixture of unit systems is allowed for " -"the different fields." -msgstr "" - -#. type: Plain text -#: user-manual.txt:1273 -msgid "" -"Importing manually kept CSV log files is quite straight forward, but there " -"might be many fields and counting the field numbers is error prone. " -"Therefore validation of the data to be imported is critical." -msgstr "" - -#. type: Plain text -#: user-manual.txt:1278 -msgid "" -"To import the dives, select _Import->Import Log Files_ from the menu bar. If " -"the CSV option in the dropdown list is selected and the file list includes " -"file names ending with .CSV, one can select the _Manual dives_ tab that will " -"bring up the following configuration dialog:" -msgstr "" - -#. type: Target for macro image -#: user-manual.txt:1279 -#, no-wrap -msgid "images/Import_CSV2.jpg" -msgstr "" - -#. type: Plain text -#: user-manual.txt:1288 +#: user-manual.txt:1237 msgid "" -"Check the check boxes corresponding to the data in the original import " -"file. For each of the checked data items, a corresponding column number " -"needs to be entered. For instance in the image above, the name of the dive " -"site (i.e. location) is located as the 11th item (or column) on each line " -"of the CSV import file. The input fields can be configured as appropriate, " -"and when everything is done the _OK_ button should be selected to perform " -"the import. New dives should appear in the *Dive List* area of _Subsurface_." +"The _CSV_ import has a couple of caveats. One should avoid some special " +"characters like ampersand (&), less than (<), greater than (>) and double " +"quotes (\") as part of the numbers or text within a cell. The file should " +"use UTF-8 character set, if using non-ASCII characters. Also the size of the " +"_CSV_ file might cause problems. Importing 100 dives at a time (_CSV dive " +"details_) works, but larger files might exceed limits of the parser used. " +"When encountering problems with _CSV_ imports, first try with a smaller file " +"to make sure everything works." msgstr "" #. type: Title === -#: user-manual.txt:1291 +#: user-manual.txt:1240 #, no-wrap msgid "Importing GPS coordinates with the _Subsurface Companion App_ for mobile phones" msgstr "" #. type: Plain text -#: user-manual.txt:1299 +#: user-manual.txt:1248 msgid "" "Using the *Subsurface Companion App* on an Android device with a GPS, the " "coordinates for the diving location can be automatically passed to the " @@ -2378,18 +2279,18 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1301 +#: user-manual.txt:1250 msgid "To do this:" msgstr "" #. type: Title ==== -#: user-manual.txt:1302 +#: user-manual.txt:1251 #, no-wrap msgid "Create a Companion App account" msgstr "" #. type: Plain text -#: user-manual.txt:1307 +#: user-manual.txt:1256 msgid "" "Register on the http://api.hohndel.org/login/[_Subsurface companion web " "page_]. A confirmation email with instructions and a personal *DIVERID* " @@ -2398,7 +2299,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1312 +#: user-manual.txt:1261 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/?" @@ -2406,18 +2307,18 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:1313 +#: user-manual.txt:1262 #, no-wrap msgid "Using the Subsurface companion app on a smartphone" msgstr "" #. type: Plain text -#: user-manual.txt:1316 +#: user-manual.txt:1265 msgid "On first use the app has three options:" msgstr "" #. type: Plain text -#: user-manual.txt:1322 +#: user-manual.txt:1271 msgid "" "_Create a new account._ Equivalent to registering in _Subsurface_ companion " "page using an Internet browser. One can request a *DIVERID* using this " @@ -2427,14 +2328,14 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1325 +#: user-manual.txt:1274 msgid "" "_Retrieve an account._ If users forgot their *DIVERID* they will receive an " "email to recover the number." msgstr "" #. type: Plain text -#: user-manual.txt:1329 +#: user-manual.txt:1278 msgid "" "_Use an existing account._ Users are prompted for their *DIVERID*. The app " "saves this *DIVERID* and does not ask for it again unless one uses the " @@ -2442,22 +2343,22 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1337 +#: user-manual.txt:1286 msgid "" "In the _Subsurface_ main program, the *DIVERID* should also be entered on " -"the Default Preferences panel, obtained by selecting _File->Preferences-" -">Defaults_ from the main menu in _Subsurface_ itself. This facilitates " +"the Default Preferences panel, obtained by selecting _File -> Preferences -> " +"Defaults_ from the main menu in _Subsurface_ itself. This facilitates " "synchronisation between _Subsurface_ and the Companion App." msgstr "" #. type: Title ===== -#: user-manual.txt:1338 +#: user-manual.txt:1287 #, no-wrap msgid "Creating new dive locations" msgstr "" #. type: Plain text -#: user-manual.txt:1343 +#: user-manual.txt:1292 msgid "" "Now one is ready to get a dive position and send it to the server. The " "Android display will look like the left hand image (*A*) below, but without " @@ -2465,21 +2366,21 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1346 +#: user-manual.txt:1295 msgid "" "Touch the \"+\" icon on the top right to add a new dive site, a menu will be " "showed with 3 options:" msgstr "" #. type: Plain text -#: user-manual.txt:1349 +#: user-manual.txt:1298 msgid "" "Current: A prompt for a place name (or a request to activate the GPS if it " "is turned off) will be displayed, after which the current location is saved." msgstr "" #. type: Plain text -#: user-manual.txt:1358 +#: user-manual.txt:1307 msgid "" "Use Map: This option allows the user to fix a position by searching a world " "map. A world map is shown (see *B* below) on which one should indicate the " @@ -2492,13 +2393,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1359 +#: user-manual.txt:1308 #, no-wrap msgid "images/Companion_5.jpg" -msgstr "" +msgstr "images/Companion_5.jpg" #. type: Plain text -#: user-manual.txt:1367 +#: user-manual.txt:1316 msgid "" "Import local GPX file: The android device searches for .gpx files and " "located archives will be shown. The selected .gpx file is opened and the " @@ -2508,13 +2409,13 @@ msgid "" msgstr "" #. type: Title ===== -#: user-manual.txt:1368 +#: user-manual.txt:1317 #, no-wrap msgid "Dive lists of dive locations" msgstr "" #. type: Plain text -#: user-manual.txt:1376 +#: user-manual.txt:1325 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 " @@ -2525,7 +2426,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1384 +#: user-manual.txt:1333 msgid "" "Dive locations in this list can be viewed in two ways: a list of locations " "or a map indicating the dive locations. The display mode (List or Map) is " @@ -2537,13 +2438,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1385 +#: user-manual.txt:1334 #, no-wrap msgid "images/Companion_4.jpg" -msgstr "" +msgstr "images/Companion_4.jpg" #. type: Plain text -#: user-manual.txt:1391 +#: user-manual.txt:1340 msgid "" "When one clicks on a dive (*not* selecting the check box), the name given to " "it, date/time and GPS coordinates will be shown, with two options at the top " @@ -2551,32 +2452,32 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1393 +#: user-manual.txt:1342 msgid "" "Edit (pencil): Change the text name or other characteristics of the dive " "location." msgstr "" #. type: Plain text -#: user-manual.txt:1395 +#: user-manual.txt:1344 msgid "Maps: Display a map showing the dive location." msgstr "" #. type: Plain text -#: user-manual.txt:1398 +#: user-manual.txt:1347 msgid "" "After editing and saving a dive location (see *C* above), one needs to " "upload it to the web service, as explained below." msgstr "" #. type: Title ===== -#: user-manual.txt:1399 +#: user-manual.txt:1348 #, no-wrap msgid "Uploading dive locations" msgstr "" #. type: Plain text -#: user-manual.txt:1405 +#: user-manual.txt:1354 msgid "" "There are several ways to send locations to the server. The easiest is by " "simply selecting the locations (See *A* below) and then touching the right " @@ -2584,51 +2485,51 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1410 +#: user-manual.txt:1359 msgid "" "Users must be careful, as 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:1411 +#: user-manual.txt:1360 #, no-wrap msgid "images/Companion_1.jpg" -msgstr "" +msgstr "images/Companion_1.jpg" #. type: Plain text -#: user-manual.txt:1416 +#: user-manual.txt:1365 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: Title ===== -#: user-manual.txt:1418 +#: user-manual.txt:1367 #, no-wrap msgid "Settings on the Companion app" msgstr "" #. type: Plain text -#: user-manual.txt:1421 +#: user-manual.txt:1370 msgid "" "Selecting the _Settings_ menu option results in the right hand image above " "(*B*)." msgstr "" #. type: Title ===== -#: user-manual.txt:1422 +#: user-manual.txt:1371 #, no-wrap msgid "Server and account" msgstr "" #. type: Plain text -#: user-manual.txt:1425 +#: user-manual.txt:1374 msgid "_Web-service URL._ This is predefined (http://api.hohndel.org/)" msgstr "" #. type: Plain text -#: user-manual.txt:1429 +#: user-manual.txt:1378 msgid "" "_User ID._ The DIVERID obtained by registering as described above. The " "easiest way to obtain it is simply to copy and paste from the confirmation " @@ -2636,33 +2537,33 @@ msgid "" msgstr "" #. type: Title ===== -#: user-manual.txt:1430 +#: user-manual.txt:1379 #, no-wrap msgid "Synchronisation" msgstr "" #. type: Plain text -#: user-manual.txt:1434 +#: user-manual.txt:1383 msgid "" "_Synchronize on startup._ If selected, dive locations in the Android device " "and those on the web service synchronise each time the app is started." msgstr "" #. type: Plain text -#: user-manual.txt:1437 +#: user-manual.txt:1386 msgid "" "_Upload new dives._ If selected, each time the user adds a dive location it " "is automatically sent to the server." msgstr "" #. type: Title ===== -#: user-manual.txt:1438 +#: user-manual.txt:1387 #, no-wrap msgid "Background service" msgstr "" #. type: Plain text -#: user-manual.txt:1441 +#: user-manual.txt:1390 msgid "" "Instead of entering a unique dive location, users can leave the service " "running in the background of their Android device, allowing the continuous " @@ -2670,35 +2571,35 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1444 +#: user-manual.txt:1393 msgid "The settings below define the behaviour of the service:" msgstr "" #. type: Plain text -#: user-manual.txt:1447 +#: user-manual.txt:1396 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:1449 +#: user-manual.txt:1398 msgid "_Min distance._ In meters. Minimum distance between two locations." msgstr "" #. type: Plain text -#: user-manual.txt:1451 +#: user-manual.txt:1400 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:1452 user-manual.txt:1528 user-manual.txt:1813 +#: user-manual.txt:1401 user-manual.txt:1477 user-manual.txt:1762 #, no-wrap msgid "images/icons/info.jpg" -msgstr "" +msgstr "images/icons/info.jpg" #. type: Plain text -#: user-manual.txt:1462 +#: user-manual.txt:1411 msgid "" "_How does the background service work?_ Assuming the user sets 5 minutes and " "50 meters in the settings above, the app will start by recording a location " @@ -2711,59 +2612,59 @@ msgid "" msgstr "" #. type: Title ===== -#: user-manual.txt:1463 +#: user-manual.txt:1412 #, no-wrap msgid "Other" msgstr "" #. type: Plain text -#: user-manual.txt:1467 +#: user-manual.txt:1416 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:1469 +#: user-manual.txt:1418 msgid "_Subsurface website._ A link to the URL of Subsurface web" msgstr "" #. type: Plain text -#: user-manual.txt:1471 +#: user-manual.txt:1420 msgid "_Version._ Displays the current version of the Companion App." msgstr "" #. type: Title ===== -#: user-manual.txt:1472 +#: user-manual.txt:1421 #, no-wrap msgid "Search" msgstr "" #. type: Plain text -#: user-manual.txt:1475 +#: user-manual.txt:1424 msgid "Search the saved dive locations by name or by date and time." msgstr "" #. type: Title ===== -#: user-manual.txt:1476 +#: user-manual.txt:1425 #, no-wrap msgid "Start service" msgstr "" #. type: Plain text -#: user-manual.txt:1479 +#: user-manual.txt:1428 msgid "" "Initiates the _background service_ following the previously defined settings." msgstr "" #. type: Title ===== -#: user-manual.txt:1480 +#: user-manual.txt:1429 #, no-wrap msgid "Disconnect" msgstr "" #. type: Plain text -#: user-manual.txt:1488 +#: user-manual.txt:1437 msgid "" "This is a badly named option that disconnects the app from the server by " "resetting the user ID in the app, showing the first screen where an account " @@ -2773,25 +2674,25 @@ msgid "" msgstr "" #. type: Title ===== -#: user-manual.txt:1489 +#: user-manual.txt:1438 #, no-wrap msgid "Send all locations" msgstr "" #. type: Plain text -#: user-manual.txt:1492 +#: user-manual.txt:1441 msgid "" "This option sends all locations stored in the Android device to the server." msgstr "" #. type: Title ==== -#: user-manual.txt:1494 +#: user-manual.txt:1443 #, no-wrap msgid "Downloading dive locations to the _Subsurface_ divelog" msgstr "" #. type: Plain text -#: user-manual.txt:1503 +#: user-manual.txt:1452 msgid "" "Download dive(s) from a dive computer or enter them manually into " "_Subsurface_ before obtaining the GPS coordinates from the server. The " @@ -2803,13 +2704,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1504 +#: user-manual.txt:1453 #, no-wrap msgid "images/DownloadGPS.jpg" -msgstr "" +msgstr "images/DownloadGPS.jpg" #. type: Plain text -#: user-manual.txt:1512 +#: user-manual.txt:1461 msgid "" "Note that the _Apply_ button is now active. By clicking on it, users can " "update the locations of the newly entered or uploaded dives in _Subsurface_ " @@ -2820,7 +2721,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1519 +#: user-manual.txt:1468 msgid "" "Since _Subsurface_ matches GPS locations from the Android device and dive " "information from the dive computer based on date-time data, automatic " @@ -2832,7 +2733,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1527 +#: user-manual.txt:1476 msgid "" "Similar date-times may not always be possible and there may be many reasons " "for this (e.g. time zones), or _Subsurface_ may be unable to decide which is " @@ -2846,12 +2747,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1531 +#: user-manual.txt:1480 msgid "TIPS:" msgstr "" #. type: Plain text -#: user-manual.txt:1538 +#: user-manual.txt:1487 msgid "" "_Background service_, being a very powerful tool, may fill the location list " "with many unnecessary locations not corresponding to the exact dive point " @@ -2864,7 +2765,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1542 +#: user-manual.txt:1491 msgid "" "It may also make sense to give informative names to the locations sent to " "the web server, or at least to use an informative name in the _Name " @@ -2873,13 +2774,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:1544 +#: user-manual.txt:1493 #, no-wrap msgid "Adding photographs to dives" msgstr "" #. type: Plain text -#: user-manual.txt:1550 +#: user-manual.txt:1499 msgid "" "Many (if not most) divers take a camera with them and take photographs " "during a dive. One would like to associate each photograph with a specific " @@ -2888,39 +2789,39 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:1551 +#: user-manual.txt:1500 #, no-wrap msgid "Loading photos and getting synchronisation between dive computer and camera" msgstr "" #. type: Plain text -#: user-manual.txt:1555 +#: user-manual.txt:1504 msgid "" "Left-lick on a dive or on a group of dives on the dive list. Then right-" "click on this dive or group of dives and choose the option _Load Images_:" msgstr "" #. type: Target for macro image -#: user-manual.txt:1556 +#: user-manual.txt:1505 #, no-wrap msgid "images/LoadImage1_f20.jpg" -msgstr "" +msgstr "images/LoadImage1_f20.jpg" #. type: Plain text -#: user-manual.txt:1560 +#: user-manual.txt:1509 msgid "" "The system file browser appears. Select the folder and photographs that need " "to be loaded into _Subsurface_ and click the _Open_ button." msgstr "" #. type: Target for macro image -#: user-manual.txt:1561 +#: user-manual.txt:1510 #, no-wrap msgid "images/LoadImage2_f20.jpg" -msgstr "" +msgstr "images/LoadImage2_f20.jpg" #. type: Plain text -#: user-manual.txt:1570 +#: user-manual.txt:1519 msgid "" "This brings one to the time synchronisation dialog, shown below. The " "critical problem is that the time synchronisation is not perfect between the " @@ -2931,12 +2832,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1572 +#: user-manual.txt:1521 msgid "_Subsurface_ achieves this synchronisation in two ways:" msgstr "" #. type: Plain text -#: user-manual.txt:1584 +#: user-manual.txt:1533 #, no-wrap msgid "" "*Manually*: If the user wrote down the exact camera time at the start of a dive, the\n" @@ -2953,13 +2854,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1585 +#: user-manual.txt:1534 #, no-wrap msgid "images/LoadImage3b_f20.jpg" -msgstr "" +msgstr "images/LoadImage3b_f20.jpg" #. type: Plain text -#: user-manual.txt:1603 +#: user-manual.txt:1552 #, no-wrap msgid "" "*By photograph*: There is a very slick way of achieving synchronisation. If one takes a\n" @@ -2980,7 +2881,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1606 +#: user-manual.txt:1555 msgid "" "If the timestamp of a photograph is long before or after the dive, it is not " "placed on the dive profile. If the timestamp of the photo is within 30 " @@ -2988,62 +2889,62 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:1607 +#: user-manual.txt:1556 #, no-wrap msgid "Viewing the photos" msgstr "" #. type: Plain text -#: user-manual.txt:1611 +#: user-manual.txt:1560 msgid "" "In order to view the photos added to a dive, activate the _show-photos_ " "button in the tool bar to the left of the dive profile:" msgstr "" #. type: Target for macro image -#: user-manual.txt:1612 +#: user-manual.txt:1561 #, no-wrap msgid "images/icons/ShowPhotos_f20.png" -msgstr "" +msgstr "images/icons/ShowPhotos_f20.png" #. type: Plain text -#: user-manual.txt:1615 +#: user-manual.txt:1564 msgid "After the images have been loaded, they appear in two places:" msgstr "" #. type: Plain text -#: user-manual.txt:1617 +#: user-manual.txt:1566 msgid "the _Photos_ tab of the *Dive Notes* panel." msgstr "" #. type: Plain text -#: user-manual.txt:1619 +#: user-manual.txt:1568 msgid "" "as tiny icons (stubs) on the dive profile at the appropriate positions " "reflecting the time each photograph was taken. See below:" msgstr "" #. type: Target for macro image -#: user-manual.txt:1620 +#: user-manual.txt:1569 #, no-wrap msgid "images/LoadImage4_f20.jpg" -msgstr "" +msgstr "images/LoadImage4_f20.jpg" #. type: Plain text -#: user-manual.txt:1624 +#: user-manual.txt:1573 msgid "" "If one hovers with the mouse over any of the photo icons, then a thumbnail " "photo is shown of the appropriate photo. See the image below:" msgstr "" #. type: Target for macro image -#: user-manual.txt:1625 +#: user-manual.txt:1574 #, no-wrap msgid "images/LoadImage5_f20.jpg" -msgstr "" +msgstr "images/LoadImage5_f20.jpg" #. type: Plain text -#: user-manual.txt:1634 +#: user-manual.txt:1583 msgid "" "Clicking on the thumbnail brings up a full size photo overlaid on the " "_Subsurface_ window. This allows good viewing of the photographs that have " @@ -3055,19 +2956,19 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1635 +#: user-manual.txt:1584 #, no-wrap msgid "images/LoadImage6_f20.jpg" -msgstr "" +msgstr "images/LoadImage6_f20.jpg" #. type: Title ==== -#: user-manual.txt:1637 +#: user-manual.txt:1586 #, no-wrap msgid "The _Photos_ tab" msgstr "" #. type: Plain text -#: user-manual.txt:1648 +#: user-manual.txt:1597 msgid "" "Photographs associated with a dive are shown as thumbnails in the _Photos_ " "tab of the _Dive Notes_ panel. Photos taken in rapid succession during a " @@ -3083,13 +2984,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:1649 +#: user-manual.txt:1598 #, no-wrap msgid "Photos on an external hard disk" msgstr "" #. type: Plain text -#: user-manual.txt:1660 +#: user-manual.txt:1609 msgid "" "Most underwater photographers store their photos on an external drive. If " "such a drive can be mapped (almost always the case) the photos can be " @@ -3107,26 +3008,26 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:1662 +#: user-manual.txt:1611 #, no-wrap msgid "Logging special types of dives" msgstr "" #. type: Title ==== -#: user-manual.txt:1664 +#: user-manual.txt:1613 #, no-wrap msgid "Sidemount dives" msgstr "" #. type: Plain text -#: user-manual.txt:1668 +#: user-manual.txt:1617 msgid "" "_Subsurface_ easily handles dives involving more than one cylinder. " "Sidemount dive logging involves three steps:" msgstr "" #. type: Plain text -#: user-manual.txt:1677 +#: user-manual.txt:1626 #, no-wrap msgid "" "*During the dive, recording cylinder switch events*. Since sidemount diving normally involves two\n" @@ -3140,7 +3041,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1680 +#: user-manual.txt:1629 #, no-wrap msgid "" "*Within _Subsurface_ describe the cylinders used during the dive*. The diver needs to provide the\n" @@ -3149,7 +3050,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1690 +#: user-manual.txt:1639 #, no-wrap msgid "" "*Indicate cylinder change events on the _Subsurface_ dive profile*. Once the dive log has been imported\n" @@ -3165,26 +3066,45 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1691 +#: user-manual.txt:1640 #, no-wrap msgid "images/sidemount1.jpg" -msgstr "" +msgstr "images/sidemount1.jpg" #. type: Plain text -#: user-manual.txt:1694 +#: user-manual.txt:1643 msgid "" "This section gives an example of the versatility of _Subsurface_ as a give " "logging tool." msgstr "" #. type: Title ==== -#: user-manual.txt:1696 +#: user-manual.txt:1645 #, no-wrap msgid "Closed circuit rebreather (CCR) dives" msgstr "" +#. type: Named 'icon' AttributeList argument for style 'icon' +#: user-manual.txt:1647 +#, no-wrap +msgid "images/APD.jpg" +msgstr "images/APD.jpg" + #. type: Plain text -#: user-manual.txt:1713 +#: user-manual.txt:1652 +msgid "" +"Closed system rebreathers use advanced technology to recirculate gas that " +"has been breathed while doing two things to maintain a breathable oxygen " +"concentration:" +msgstr "" + +#. type: Plain text +#: user-manual.txt:1653 +msgid "remove carbon dioxide from the gas that has been exhaled" +msgstr "" + +#. type: Plain text +#: user-manual.txt:1662 msgid "" "regulate the oxygen concentration to remain within safe diving limits. " "Currently, within _Subsurface_, the Poseidon MkVI Discovery is the best " @@ -3197,12 +3117,18 @@ msgid "" "same way that it imports dive log data from other digital databases." msgstr "" +#. type: Title ===== +#: user-manual.txt:1663 +#, no-wrap +msgid "Import a CCR dive" +msgstr "" + #. type: Plain text -#: user-manual.txt:1727 +#: user-manual.txt:1676 msgid "" "See the section dealing with xref:S_ImportingAlienDiveLogs[Importing dive " "information from other digital sources]. From the main menu of _Subsurface_, " -"select _Import->Import log files_ to bring up the xref:" +"select _Import -> Import log files_ to bring up the xref:" "Unified_import[universal import dialogue]. As explained in that section, the " "bottom right hand of the import dialogue contains a dropdown list of " "appropriate devices that currently includes an option for (Poseidon) MkVI " @@ -3215,13 +3141,13 @@ msgid "" msgstr "" #. type: Title ===== -#: user-manual.txt:1728 +#: user-manual.txt:1677 #, no-wrap msgid "Displayed information for a CCR dive" msgstr "" #. type: Plain text -#: user-manual.txt:1738 +#: user-manual.txt:1687 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 " @@ -3235,12 +3161,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1740 +#: user-manual.txt:1689 msgid "For TWO O~2~ sensors the mean value of the two sensors are given." msgstr "" #. type: Plain text -#: user-manual.txt:1744 +#: user-manual.txt:1693 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 " @@ -3249,12 +3175,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1746 +#: user-manual.txt:1695 msgid "The mean pO~2~ of the sensors is indicated with a green line," msgstr "" #. type: Plain text -#: user-manual.txt:1754 +#: user-manual.txt:1703 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 " @@ -3266,14 +3192,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1755 -#, fuzzy, no-wrap -#| msgid "images/Configure_dc_f20.jpg" -msgid "images/CCR_preferences.jpg" -msgstr "images/Configure_dc_f20.jpg" +#: user-manual.txt:1704 +#, no-wrap +msgid "images/CCR_preferences_f20.jpg" +msgstr "images/CCR_preferences_f20.jpg" #. type: Plain text -#: user-manual.txt:1762 +#: user-manual.txt:1711 msgid "" "Checking any of the check boxes allows the display of additional oxygen-" "related information whenever the pO~2~ toolbar button on the _Profile_ panel " @@ -3284,13 +3209,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1763 +#: user-manual.txt:1712 #, no-wrap -msgid "images/CCR_setpoint.jpg" -msgstr "" +msgid "images/CCR_setpoint_f20.jpg" +msgstr "images/CCR_setpoint_f20.jpg" #. type: Plain text -#: user-manual.txt:1767 +#: user-manual.txt:1716 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 " @@ -3298,22 +3223,22 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1769 +#: user-manual.txt:1718 msgid "Sensor 1: grey" msgstr "" #. type: Plain text -#: user-manual.txt:1770 +#: user-manual.txt:1719 msgid "Sensor 2: blue" msgstr "" #. type: Plain text -#: user-manual.txt:1771 +#: user-manual.txt:1720 msgid "Sensor 3: brown" msgstr "" #. type: Plain text -#: user-manual.txt:1775 +#: user-manual.txt:1724 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 " @@ -3321,14 +3246,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1776 -#, fuzzy, no-wrap -#| msgid "images/Configure_dc_f20.jpg" -msgid "images/CCR_sensor_data.jpg" -msgstr "images/Configure_dc_f20.jpg" +#: user-manual.txt:1725 +#, no-wrap +msgid "images/CCR_sensor_data_f20.jpg" +msgstr "images/CCR_sensor_data_f20.jpg" #. type: Plain text -#: user-manual.txt:1781 +#: user-manual.txt:1730 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, " @@ -3336,7 +3260,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1785 +#: user-manual.txt:1734 msgid "" "_Events_: Several events are logged, e.g. switching the mouthpiece to open " "circuit. These events are indicated by yellow triangles and, if one hovers " @@ -3345,7 +3269,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1793 +#: user-manual.txt:1742 msgid "" "_Cylinder pressures_: Some CCR dive computers like the Poseidon MkVI record " "the pressures of the oxygen and diluent cylinders. The pressures of these " @@ -3358,13 +3282,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1794 +#: user-manual.txt:1743 #, no-wrap -msgid "images/CCR_dive_profile.jpg" -msgstr "" +msgid "images/CCR_dive_profile_f20.jpg" +msgstr "images/CCR_dive_profile_f20.jpg" #. type: Plain text -#: user-manual.txt:1799 +#: user-manual.txt:1748 msgid "" "_Equipment-specific information_: Equipment-specific information gathered by " "_Subsurface_ is shown in the xref:S_ExtraTab[Extra data tab]. This may " @@ -3372,7 +3296,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1802 +#: user-manual.txt:1751 msgid "" "More equipment-specific information for downloading CCR dive logs for " "Poseidon MkVI and APD equipment can be found in xref:S_PoseidonMkVI[Appendix " @@ -3380,19 +3304,19 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:1803 +#: user-manual.txt:1752 #, no-wrap msgid "Obtaining more information about dives entered into the logbook" msgstr "" #. type: Title === -#: user-manual.txt:1805 +#: user-manual.txt:1754 #, no-wrap msgid "The *Dive Info* tab (for individual dives)" msgstr "" #. type: Plain text -#: user-manual.txt:1812 +#: user-manual.txt:1761 msgid "" "The Dive Info tab gives some summary information about a particular dive " "that has been selected in the *Dive List*. Useful information here includes " @@ -3402,7 +3326,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1819 +#: user-manual.txt:1768 msgid "" "Gas consumption and SAC calculations: _Subsurface_ calculates SAC and Gas " "consumption taking in account gas incompressibility, particularly at tank " @@ -3411,13 +3335,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:1820 +#: user-manual.txt:1769 #, no-wrap msgid "The *Extra Data* tab (usually for individual dives)" msgstr "" #. type: Plain text -#: user-manual.txt:1828 +#: user-manual.txt:1777 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 " @@ -3429,19 +3353,19 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1829 +#: user-manual.txt:1778 #, no-wrap msgid "images/ExtraDataTab_f20.jpg" -msgstr "" +msgstr "images/ExtraDataTab_f20.jpg" #. type: Title === -#: user-manual.txt:1831 +#: user-manual.txt:1780 #, no-wrap msgid "The *Stats* tab (for groups of dives)" msgstr "" #. type: Plain text -#: user-manual.txt:1842 +#: user-manual.txt:1791 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 " @@ -3454,19 +3378,19 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:1844 +#: user-manual.txt:1793 #, no-wrap msgid "The *Dive Profile*" msgstr "" #. type: Target for macro image -#: user-manual.txt:1846 +#: user-manual.txt:1795 #, no-wrap msgid "images/Profile2.jpg" -msgstr "" +msgstr "images/Profile2.jpg" #. type: Plain text -#: user-manual.txt:1857 +#: user-manual.txt:1806 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 " @@ -3479,7 +3403,7 @@ msgid "" msgstr "" #. type: delimited block | -#: user-manual.txt:1864 +#: user-manual.txt:1813 #, no-wrap msgid "" "|*Colour*|*Descent speed (m/min)*|*Ascent speed (m/min)*\n" @@ -3491,7 +3415,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1869 +#: user-manual.txt:1818 msgid "" "The profile also includes depth readings for the peaks and troughs in the " "graph. Thus, users should see the depth of the deepest point and other " @@ -3499,13 +3423,13 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:1870 +#: user-manual.txt:1819 #, no-wrap msgid "images/icons/scale.jpg" -msgstr "" +msgstr "images/icons/scale.jpg" #. type: Plain text -#: user-manual.txt:1875 +#: user-manual.txt:1824 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 " @@ -3514,7 +3438,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1878 +#: user-manual.txt:1827 #, no-wrap msgid "" "*Water temperature* is displayed with its own blue line with temperature values\n" @@ -3522,24 +3446,24 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1883 +#: user-manual.txt:1834 msgid "" "The dive profile can include graphs of the *partial pressures* of O2, N2, " "and He during the dive (see figure above) as well as a calculated and dive " "computer reported deco ceilings (only visible for deep, long, or repetitive " -"dives). Partial pressures of oxygen are indicated in green, those of " +"dives). Partial pressures of oxygen are indicated in green, those of " "nitrogen in black, and those of helium in dark red. These partial pressure " "graphs are shown below the profile data." msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:1884 +#: user-manual.txt:1835 #, no-wrap msgid "images/icons/O2.jpg" -msgstr "" +msgstr "images/icons/O2.jpg" #. type: Plain text -#: user-manual.txt:1888 +#: user-manual.txt:1839 msgid "" "Clicking this button allows display of the partial pressure of *oxygen* " "during the dive. This is depicted below the dive depth and water temperature " @@ -3547,26 +3471,26 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:1889 +#: user-manual.txt:1840 #, no-wrap msgid "images/icons/N2.jpg" -msgstr "" +msgstr "images/icons/N2.jpg" #. type: Plain text -#: user-manual.txt:1892 +#: user-manual.txt:1843 msgid "" "Clicking this button allows display of the partial pressure of *nitrogen* " "during the dive." msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:1893 +#: user-manual.txt:1844 #, no-wrap msgid "images/icons/He.jpg" -msgstr "" +msgstr "images/icons/He.jpg" #. type: Plain text -#: user-manual.txt:1897 +#: user-manual.txt:1848 msgid "" "Clicking this button allows display of the partial pressure of *helium* " "during the dive. This is only of importance to divers using Trimix, " @@ -3574,7 +3498,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1910 +#: user-manual.txt:1861 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 " @@ -3589,13 +3513,13 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:1911 +#: user-manual.txt:1862 #, no-wrap msgid "images/icons/Heartbutton.png" -msgstr "" +msgstr "images/icons/Heartbutton.png" #. type: Plain text -#: user-manual.txt:1915 +#: user-manual.txt:1866 msgid "" "Clicking on the heart rate button will allow the display of heart rate " "information during the dive if the dive computer was attached to a heart " @@ -3603,7 +3527,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1923 +#: user-manual.txt:1874 #, no-wrap msgid "" "It is possible to *zoom* into the profile graph. This is done either by using\n" @@ -3616,19 +3540,19 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1924 +#: user-manual.txt:1875 #, no-wrap msgid "images/MeasuringBar.png" -msgstr "" +msgstr "images/MeasuringBar.png" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:1926 +#: user-manual.txt:1877 #, no-wrap msgid "images/icons/ruler.jpg" -msgstr "" +msgstr "images/icons/ruler.jpg" #. type: Plain text -#: user-manual.txt:1934 +#: user-manual.txt:1885 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 " @@ -3638,13 +3562,13 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:1935 +#: user-manual.txt:1886 #, no-wrap msgid "images/icons/ShowPhotos.png" -msgstr "" +msgstr "images/icons/ShowPhotos.png" #. type: Plain text -#: user-manual.txt:1942 +#: user-manual.txt:1893 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 " @@ -3653,7 +3577,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1971 +#: user-manual.txt:1922 msgid "" "The profile can also include the dive computer reported *ceiling* (more " "precisely, the deepest deco stop that the dive computer calculated for each " @@ -3683,13 +3607,13 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:1972 +#: user-manual.txt:1923 #, no-wrap msgid "images/icons/cceiling.jpg" -msgstr "" +msgstr "images/icons/cceiling.jpg" #. type: Plain text -#: user-manual.txt:1977 +#: user-manual.txt:1928 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 " @@ -3697,13 +3621,13 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:1978 +#: user-manual.txt:1929 #, no-wrap msgid "images/icons/ceiling1.jpg" -msgstr "" +msgstr "images/icons/ceiling1.jpg" #. type: Plain text -#: user-manual.txt:1983 +#: user-manual.txt:1934 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 " @@ -3712,13 +3636,13 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:1984 +#: user-manual.txt:1935 #, no-wrap msgid "images/icons/ceiling2.jpg" -msgstr "" +msgstr "images/icons/ceiling2.jpg" #. type: Plain text -#: user-manual.txt:1988 +#: user-manual.txt:1939 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 " @@ -3726,32 +3650,32 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:1989 +#: user-manual.txt:1940 #, no-wrap msgid "images/icons/ceiling3.jpg" -msgstr "" +msgstr "images/icons/ceiling3.jpg" #. type: Plain text -#: user-manual.txt:1993 +#: user-manual.txt:1944 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:1994 +#: user-manual.txt:1945 #, no-wrap msgid "images/Ceilings2.jpg" -msgstr "" +msgstr "images/Ceilings2.jpg" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:1996 +#: user-manual.txt:1947 #, no-wrap msgid "images/icons/ShowCylindersButton.jpg" -msgstr "" +msgstr "images/icons/ShowCylindersButton.jpg" #. type: Plain text -#: user-manual.txt:2002 +#: user-manual.txt:1953 msgid "" "By selecting this icon, the different cylinders used during a dive can be " "represented as a coloured bar at the bottom of the *Dive Profile*. In " @@ -3763,19 +3687,19 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2003 +#: user-manual.txt:1954 #, no-wrap msgid "images/ShowCylinders_f20.jpg" -msgstr "" +msgstr "images/ShowCylinders_f20.jpg" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2006 +#: user-manual.txt:1957 #, no-wrap msgid "images/tissues.jpg" -msgstr "" +msgstr "images/tissues.jpg" #. type: Plain text -#: user-manual.txt:2018 +#: user-manual.txt:1969 msgid "" "Display inert gas tissue pressures relative to ambient inert gas pressure " "(horizontal grey line). Tissue pressures are calculated using the Bühlmann " @@ -3794,13 +3718,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2019 +#: user-manual.txt:1970 #, no-wrap msgid "images/tissuesGraph.jpg" -msgstr "" +msgstr "images/tissuesGraph.jpg" #. type: Plain text -#: user-manual.txt:2027 +#: user-manual.txt:1978 msgid "" "Gradient Factor settings strongly affect the calculated ceilings and their " "depths. For more information about Gradient factors, see the section on " @@ -3813,25 +3737,25 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2029 +#: user-manual.txt:1980 #, no-wrap msgid " ** http://www.tek-dive.com/portal/upload/M-Values.pdf[Understanding M-values by Erik Baker, _Immersed_ Vol. 3, No. 3.]\n" msgstr " ** http://www.tek-dive.com/portal/upload/M-Values.pdf[Understanding M-values by Erik Baker, _Immersed_ Vol. 3, No. 3.]\n" #. type: Plain text -#: user-manual.txt:2031 +#: user-manual.txt:1982 #, no-wrap msgid " ** link:http://www.rebreatherworld.com/general-and-new-to-rebreather-articles/5037-gradient-factors-for-dummies.html[Gradient factors for dummies, by Kevin Watts]\n" msgstr " ** link:http://www.rebreatherworld.com/general-and-new-to-rebreather-articles/5037-gradient-factors-for-dummies.html[Gradient factors for dummies, by Kevin Watts]\n" #. type: Title === -#: user-manual.txt:2033 +#: user-manual.txt:1984 #, no-wrap msgid "The Dive Profile context menu" msgstr "" #. type: Plain text -#: user-manual.txt:2051 +#: user-manual.txt:2002 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 the " @@ -3852,13 +3776,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:2052 +#: user-manual.txt:2003 #, no-wrap msgid "The *Information Box*" msgstr "" #. type: Plain text -#: user-manual.txt:2062 +#: user-manual.txt:2013 msgid "" "The Information box displays a large range of information pertaining to the " "dive profile. Normally the Information Box is located to the top left of the " @@ -3871,13 +3795,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2063 +#: user-manual.txt:2014 #, no-wrap msgid "images/InfoBox2.jpg" -msgstr "" +msgstr "images/InfoBox2.jpg" #. type: Plain text -#: user-manual.txt:2080 +#: user-manual.txt:2031 msgid "" "The moment the mouse points inside the *Dive Profile* panel, the information " "box expands and shows many data items. In this situation, the data reflect " @@ -3898,20 +3822,20 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2083 +#: user-manual.txt:2034 msgid "" "The user has control over the display of several statistics, represented as " "four buttons on the left of the profile panel. These are:" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2084 +#: user-manual.txt:2035 #, no-wrap msgid "images/icons/MOD.jpg" -msgstr "" +msgstr "images/icons/MOD.jpg" #. type: Plain text -#: user-manual.txt:2091 +#: user-manual.txt:2042 msgid "" "Clicking this button causes the Information Box to display the *Maximum " "Operating Depth (MOD)* of the dive, given the gas mixture used. MOD is " @@ -3921,13 +3845,13 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2092 +#: user-manual.txt:2043 #, no-wrap msgid "images/icons/NDL.jpg" -msgstr "" +msgstr "images/icons/NDL.jpg" #. type: Plain text -#: user-manual.txt:2101 +#: user-manual.txt:2052 msgid "" "Clicking this button causes the Information Box to display the *No-deco " "Limit (NDL)* or the *Total Time to Surface (TTS)*. NDL is the time duration " @@ -3940,13 +3864,13 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2102 +#: user-manual.txt:2053 #, no-wrap msgid "images/icons/SAC.jpg" -msgstr "" +msgstr "images/icons/SAC.jpg" #. type: Plain text -#: user-manual.txt:2111 +#: user-manual.txt:2062 msgid "" "Clicking this button causes the Information Box to display the *Surface Air " "Consumption (SAC)*. SAC is an indication of the surface-normalised " @@ -3959,13 +3883,13 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2112 +#: user-manual.txt:2063 #, no-wrap msgid "images/icons/EAD.jpg" -msgstr "" +msgstr "images/icons/EAD.jpg" #. type: Plain text -#: user-manual.txt:2127 +#: user-manual.txt:2078 msgid "" "Clicking this button displays the *Equivalent Air Depth (EAD)* for nitrox " "dives as well as the *Equivalent Narcotic Depth (END)* for trimix dives. " @@ -3981,20 +3905,20 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2129 +#: user-manual.txt:2080 msgid "" "Figure (*B*) above shows an information box with a nearly complete set of " "data." msgstr "" #. type: Title ==== -#: user-manual.txt:2131 +#: user-manual.txt:2082 #, no-wrap msgid "The Gas Pressure Bar Graph" msgstr "" #. type: Plain text -#: user-manual.txt:2138 +#: user-manual.txt:2089 msgid "" "On the left of the *Information Box* is a vertical bar graph indicating the " "pressures of the nitrogen (and other inert gases, e.g. helium, if " @@ -4005,13 +3929,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2139 +#: user-manual.txt:2090 #, no-wrap msgid "images/GasPressureBarGraph.jpg" -msgstr "" +msgstr "images/GasPressureBarGraph.jpg" #. type: Plain text -#: user-manual.txt:2145 +#: user-manual.txt:2096 msgid "" "The light green area indicates the total gas, with the top margin of the " "light green area indicating the total gas pressure inhaled by the diver and " @@ -4021,7 +3945,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2151 +#: user-manual.txt:2102 msgid "" "The horizontal black line underneath the light green margin indicates the " "equilibrium pressure of the inert gases inhaled by the diver, usually " @@ -4032,7 +3956,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2155 +#: user-manual.txt:2106 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 " @@ -4040,7 +3964,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2160 +#: user-manual.txt:2111 msgid "" "The top black horizontal line indicates the gradient factor that applies to " "the depth of the diver at the particular point on the *Dive Profile*. The " @@ -4049,7 +3973,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2164 +#: user-manual.txt:2115 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 " @@ -4057,7 +3981,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2167 +#: user-manual.txt:2118 msgid "" "These five values are indicated on the left in the graph above. The way the " "Gas Pressure Bar Graph changes during a dive is indicated on the right hand " @@ -4065,7 +3989,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2170 +#: user-manual.txt:2121 msgid "" "Graph *A* indicates the situation at the start of a dive with diver at the " "surface. The pressures in all the tissue compartments are still at the " @@ -4073,7 +3997,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2173 +#: user-manual.txt:2124 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, their gas " @@ -4081,7 +4005,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2178 +#: user-manual.txt:2129 msgid "" "Graph *C* represents the pressures after 30 minutes at 30 m. The fast " "compartments have attained equilibrium (i.e. they have reached the hight of " @@ -4091,7 +4015,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2184 +#: user-manual.txt:2135 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 " @@ -4102,7 +4026,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2189 +#: user-manual.txt:2140 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 " @@ -4112,19 +4036,19 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:2192 +#: user-manual.txt:2143 #, no-wrap msgid "Organising the logbook (Manipulating groups of dives)" msgstr "" #. type: Title === -#: user-manual.txt:2194 +#: user-manual.txt:2145 #, no-wrap msgid "The Dive List context menu" msgstr "" #. type: Plain text -#: user-manual.txt:2199 +#: user-manual.txt:2150 msgid "" "Many actions within _Subsurface_ are dependent on a context menu used mostly " "to manipulate groups of dives. The context menu is found by selecting a dive " @@ -4132,30 +4056,30 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2200 +#: user-manual.txt:2151 #, no-wrap msgid "images/ContextMenu.jpg" -msgstr "" +msgstr "images/ContextMenu.jpg" #. type: Plain text -#: user-manual.txt:2203 +#: user-manual.txt:2154 msgid "The context menu is used in many manipulations described below." msgstr "" #. type: Title ==== -#: user-manual.txt:2204 +#: user-manual.txt:2155 #, no-wrap msgid "Customising the information showed in the *Dive List* panel" msgstr "" #. type: Target for macro image -#: user-manual.txt:2206 +#: user-manual.txt:2157 #, no-wrap msgid "images/DiveListOptions.jpg" -msgstr "" +msgstr "images/DiveListOptions.jpg" #. type: Plain text -#: user-manual.txt:2214 +#: user-manual.txt:2165 msgid "" "The default information in the *Dive List* includes, for each dive, " "Dive_number, Date, Rating, Dive_depth, Dive_duration and Dive_location. This " @@ -4169,13 +4093,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2215 +#: user-manual.txt:2166 #, no-wrap msgid "Selecting dives from a particular dive site" msgstr "" #. type: Plain text -#: user-manual.txt:2221 +#: user-manual.txt:2172 msgid "" "Many divers have long dive lists and it may be difficult to locate all the " "dives at a particular site. By pressing _Ctl-F_ on the keyboard, a text box " @@ -4185,13 +4109,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:2223 +#: user-manual.txt:2174 #, no-wrap msgid "Renumbering the dives" msgstr "" #. type: Plain text -#: user-manual.txt:2235 +#: user-manual.txt:2186 msgid "" "Dives are normally numbered incrementally from non-recent dives (low " "sequence numbers) to recent dives (having the highest sequence numbers). The " @@ -4207,13 +4131,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:2237 +#: user-manual.txt:2188 #, no-wrap msgid "Grouping dives into trips and manipulating trips" msgstr "" #. type: Plain text -#: user-manual.txt:2245 +#: user-manual.txt:2196 msgid "" "For regular divers, the dive list can rapidly become very long. _Subsurface_ " "can group dives into _trips_. It performs this by grouping dives that have " @@ -4225,13 +4149,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2246 +#: user-manual.txt:2197 #, no-wrap msgid "images/Group2.jpg" -msgstr "" +msgstr "images/Group2.jpg" #. type: Plain text -#: user-manual.txt:2252 +#: user-manual.txt:2203 msgid "" "Grouping into trips allows a rapid way of accessing individual dives without " "having to scan a long lists of dives. In order to group the dives in a dive " @@ -4240,13 +4164,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2253 +#: user-manual.txt:2204 #, no-wrap msgid "Editing the title and associated information for a particular trip" msgstr "" #. type: Plain text -#: user-manual.txt:2266 +#: user-manual.txt:2217 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 " @@ -4261,13 +4185,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2267 +#: user-manual.txt:2218 #, no-wrap msgid "Viewing the dives during a particular trip" msgstr "" #. type: Plain text -#: user-manual.txt:2272 +#: user-manual.txt:2223 msgid "" "Once the dives have been grouped into trips, users can expand one or more " "trips by clicking the arrow-head on the left of each trip title. This " @@ -4276,13 +4200,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2273 +#: user-manual.txt:2224 #, no-wrap msgid "Collapsing or expanding dive information for different trips" msgstr "" #. type: Plain text -#: user-manual.txt:2279 +#: user-manual.txt:2230 msgid "" "If a user right-clicks after selecting a particular trip in the dive list, " "the resulting context menu allows several possibilities to expand or " @@ -4291,13 +4215,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2280 +#: user-manual.txt:2231 #, no-wrap msgid "Merging dives from more than one trip into a single trip" msgstr "" #. type: Plain text -#: user-manual.txt:2285 +#: user-manual.txt:2236 msgid "" "By right-clicking on a selected trip title in the *Dive List* panel, a " "context menu shows up that allows the merging of trips by either merging of " @@ -4305,13 +4229,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2286 +#: user-manual.txt:2237 #, no-wrap msgid "Splitting a single trip into more than one trip" msgstr "" #. type: Plain text -#: user-manual.txt:2296 +#: user-manual.txt:2247 msgid "" "If a trip includes five dives, the user can split this trip into two trips " "(trip 1: top 3 dives; trip 2: bottom 2 dives) by selecting and right-" @@ -4323,25 +4247,25 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2297 +#: user-manual.txt:2248 #, no-wrap msgid "images/SplitDive3a.jpg" -msgstr "" +msgstr "images/SplitDive3a.jpg" #. type: Title === -#: user-manual.txt:2299 +#: user-manual.txt:2250 #, no-wrap msgid "Manipulating single dives" msgstr "" #. type: Title ==== -#: user-manual.txt:2301 +#: user-manual.txt:2252 #, no-wrap msgid "Delete a dive from the dive log" msgstr "" #. type: Plain text -#: user-manual.txt:2308 +#: user-manual.txt:2259 msgid "" "Dives can be permanently deleted from the dive log by selecting and right-" "clicking them to bring up the context menu, and then selecting *Delete " @@ -4351,13 +4275,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2309 +#: user-manual.txt:2260 #, no-wrap msgid "Unlink a dive from a trip" msgstr "" #. type: Plain text -#: user-manual.txt:2316 +#: user-manual.txt:2267 msgid "" "Users can unlink dives from the trip to which they belong. In order to do " "this, select and right-click the relevant dives to bring up the context " @@ -4366,13 +4290,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2317 +#: user-manual.txt:2268 #, no-wrap msgid "Add a dive to the trip immediately above" msgstr "" #. type: Plain text -#: user-manual.txt:2324 +#: user-manual.txt:2275 msgid "" "Selected dives can be moved from the trip to which they belong and placed " "within the trip immediately above the currently active trip. To do this, " @@ -4381,13 +4305,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2325 +#: user-manual.txt:2276 #, no-wrap msgid "Shift the start time of dive(s)" msgstr "" #. type: Plain text -#: user-manual.txt:2336 +#: user-manual.txt:2287 msgid "" "Sometimes it is necessary to adjust the start time of a dive. This may apply " "to situations where dives are performed in different time zones or when the " @@ -4400,13 +4324,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2337 +#: user-manual.txt:2288 #, no-wrap msgid "Merge dives into a single dive" msgstr "" #. type: Plain text -#: user-manual.txt:2347 +#: user-manual.txt:2298 msgid "" "Sometimes a dive is briefly interrupted, e.g. if a diver returns to the " "surface for a few minutes, resulting in two or more dives being recorded by " @@ -4420,19 +4344,19 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2348 +#: user-manual.txt:2299 #, no-wrap msgid "images/MergedDive.png" -msgstr "" +msgstr "images/MergedDive.png" #. type: Title === -#: user-manual.txt:2351 +#: user-manual.txt:2302 #, no-wrap msgid "Filtering the dive list" msgstr "" #. type: Plain text -#: user-manual.txt:2357 +#: user-manual.txt:2308 msgid "" "The dives in the *Dive List* panel can be filtered, that is, one can select " "only some of the dives based on their attributes, e.g. dive tags, dive site, " @@ -4442,7 +4366,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2366 +#: user-manual.txt:2317 msgid "" "To open the filter, select _Log -> Filter divelist_ from the main menu. This " "opens the _Filter Panel_ at the top of the _Subsurface_ window. Three icons " @@ -4456,13 +4380,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2368 +#: user-manual.txt:2319 #, no-wrap msgid "images/Filterpanel.jpg" -msgstr "" +msgstr "images/Filterpanel.jpg" #. type: Plain text -#: user-manual.txt:2378 +#: user-manual.txt:2329 msgid "" "Four filter criteria may be used to filter the dive list: dive tags, person " "(buddy / dive master), dive site and dive suit, each of which is represented " @@ -4475,7 +4399,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2386 +#: user-manual.txt:2337 msgid "" "To activate filtering of the dive list, the check box of at least one item " "in one of the four check lists needs to be checked. The dive list is then " @@ -4488,13 +4412,13 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:2388 +#: user-manual.txt:2339 #, no-wrap msgid "Exporting the dive log or parts of the dive log" msgstr "" #. type: Plain text -#: user-manual.txt:2394 +#: user-manual.txt:2345 msgid "" "The export function can be reached by selecting _File -> Export_, which " "brings up the Export dialog. This dialog always gives two options: save ALL " @@ -4503,24 +4427,24 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2395 +#: user-manual.txt:2346 #, no-wrap -msgid "images/Export.jpg" -msgstr "" +msgid "images/Export_f20.jpg" +msgstr "images/Export_f20.jpg" #. type: Plain text -#: user-manual.txt:2398 +#: user-manual.txt:2349 msgid "A dive log or part of it can be saved in three formats:" msgstr "" #. type: Plain text -#: user-manual.txt:2400 +#: user-manual.txt:2351 msgid "" "_Subsurface XML_ format. This is the native format used by _Subsurface_." msgstr "" #. type: Plain text -#: user-manual.txt:2404 +#: user-manual.txt:2355 msgid "" "Universal Dive Data Format (_UDDF_). Refer to _http://uddf.org_ for more " "information. UDDF is a generic format that enables communication among many " @@ -4528,7 +4452,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2408 +#: user-manual.txt:2359 msgid "" "_Divelogs.de_, an Internet-based dive log repository. In order to upload to " "_Divelogs.de_, one needs a user-ID as well as a password for _Divelogs.de_. " @@ -4537,7 +4461,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2412 +#: user-manual.txt:2363 msgid "" "_DiveShare_ is also a dive log repostory on the Internet focusing on the " "recreational dives. In order to upload dives one has to provide a used ID, " @@ -4545,40 +4469,24 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2415 -msgid "" -"_CSV dive profile_, that includes a large amount of detail for each dive, " -"including the depth profile, temperature and pressure information of each " -"dive." -msgstr "" - -#. type: Plain text -#: user-manual.txt:2420 +#: user-manual.txt:2368 msgid "" "_CSV dive details_, that includes the most critical information of the dive " "profile. Included information of a dive is: dive number, date, time, buddy, " "duration, depth, temperature and pressure: in short, most of the information " -"that recreational divers enter into written log books." -msgstr "" - -#. type: Plain text -#: user-manual.txt:2423 -msgid "" -"_Worldmap_ format, an HTML file with a world map upon which each dive and " -"some information about it are indicated. This map is not editable." +"that recreational divers enter into handwritten log books." msgstr "" #. type: Plain text -#: user-manual.txt:2428 +#: user-manual.txt:2371 msgid "" -"_Image depths_, which creates a text file that contains the file names of " -"all photos or images attached to any of the selected dives in the _Dive " -"List_, together with the depth under water where of each of those photos " -"were taken." +"_CSV dive profile_, that includes a large amount of detail for each dive, " +"including the depth profile, temperature and pressure information of each " +"dive." msgstr "" #. type: Plain text -#: user-manual.txt:2440 +#: user-manual.txt:2383 msgid "" "_HTML_ format, in which the dive(s) are stored in HTML files, readable with " "an Internet browser. Most modern web browsers are supported, but JavaScript " @@ -4593,12 +4501,36 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2442 +#: user-manual.txt:2388 +msgid "" +"_Worldmap_ format, an HTML file with a world map upon which each dive and " +"some information about it are indicated. This map is not editable. However, " +"if one selects any of the dive sites on the map, a summary of the dive is " +"available in text, as shown in the image below." +msgstr "" + +#. type: Target for macro image +#: user-manual.txt:2389 +#, no-wrap +msgid "images/mapview_f20.jpg" +msgstr "images/mapview_f20.jpg" + +#. type: Plain text +#: user-manual.txt:2396 +msgid "" +"_Image depths_, which creates a text file that contains the file names of " +"all photos or images attached to any of the selected dives in the _Dive " +"List_, together with the depth under water where of each of those photos " +"were taken." +msgstr "" + +#. type: Plain text +#: user-manual.txt:2398 msgid "_General Settings_, under the HTML tab, provides the following options:" msgstr "" #. type: Plain text -#: user-manual.txt:2450 +#: user-manual.txt:2406 #, no-wrap msgid "" "** Subsurface Numbers: if this option is checked, the dive(s) are exported with the\n" @@ -4611,27 +4543,27 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2453 +#: user-manual.txt:2409 msgid "" "Under _Style Options_ some style-related options are available like font " "size and theme." msgstr "" #. type: Plain text -#: user-manual.txt:2456 +#: user-manual.txt:2412 msgid "" "Export to other formats can be achieved through third party facilities, for " "instance _www.divelogs.de_." msgstr "" #. type: Title == -#: user-manual.txt:2458 +#: user-manual.txt:2414 #, no-wrap msgid "Keeping a _Subsurface_ dive log in the Cloud" msgstr "" #. type: Plain text -#: user-manual.txt:2471 +#: user-manual.txt:2427 msgid "" "For each diver, dive log information is highly important. Not only is it a " "record of diving activities for one's own pleasure, but it is important " @@ -4648,7 +4580,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2476 +#: user-manual.txt:2432 msgid "" "For instance http://www.dropbox.com/[_Dropbox_] offers a free application " "that allows files on the Dropbox servers to be seen as a local folder on " @@ -4656,13 +4588,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2477 +#: user-manual.txt:2433 #, no-wrap msgid "images/Cloud.jpg" -msgstr "" +msgstr "images/Cloud.jpg" #. type: Plain text -#: user-manual.txt:2486 +#: user-manual.txt:2442 msgid "" "The _Dropbox_ program creates a copy of the _Dropbox_ Internet Cloud content " "on one's desktop computer. When the computer is connected to the Internet, " @@ -4675,7 +4607,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2493 +#: user-manual.txt:2449 msgid "" "In this way a dive log in one's _Dropbox_ folder can be accessed seamlessly " "from the Internet and can be accessed from any place with Internet access. " @@ -4685,43 +4617,43 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2499 +#: user-manual.txt:2455 msgid "" "Alternatively one can use _Dropbox_ as a mechanism to backup one's dive log. " -"To Store a dive log in the Cloud, select _File->Save as_ from the " +"To Store a dive log in the Cloud, 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 the Cloud, select _File->Open " +"_Save_ button. To access the dive log in the Cloud, 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:2502 +#: user-manual.txt:2458 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:2505 +#: user-manual.txt:2461 #, no-wrap msgid "Printing a dive log" msgstr "" #. type: Plain text -#: user-manual.txt:2509 +#: user-manual.txt:2465 msgid "" "_Subsurface_ provides a simple interface to print a whole dive log or only a " "few selected dives, including dive profiles and other contextual information." msgstr "" #. type: Plain text -#: user-manual.txt:2511 +#: user-manual.txt:2467 msgid "Before printing, two decisions are required:" msgstr "" #. type: Plain text -#: user-manual.txt:2514 +#: user-manual.txt:2470 msgid "" "Should the whole dive log be printed or only part of it? If only part of the " "dive log is required, then the user must select the required dives from the " @@ -4729,7 +4661,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2516 +#: user-manual.txt:2472 msgid "" "What gas partial pressure information is required on the dive profile? Users " "should select the appropriate toggle-buttons on the button bar to the left " @@ -4737,58 +4669,58 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2520 +#: user-manual.txt:2476 msgid "" "Now the print options should be selected to match the user's needs. To do " -"this, user should select _File->Print_ from the Main menu. The following " +"this, user should select _File -> Print_ from the Main menu. The following " "dialogue appears (see the image on the left [A], below)." msgstr "" #. type: Target for macro image -#: user-manual.txt:2521 +#: user-manual.txt:2477 #, no-wrap msgid "images/PrintDiveLog.jpg" -msgstr "" +msgstr "images/PrintDiveLog.jpg" #. type: Plain text -#: user-manual.txt:2524 +#: user-manual.txt:2480 msgid "Under _Print type_ users need to select one of three options:" msgstr "" #. type: Plain text -#: user-manual.txt:2526 +#: user-manual.txt:2482 msgid "" "Print the complete Dive List: to do this, _Table Print_ should be selected." msgstr "" #. type: Plain text -#: user-manual.txt:2528 +#: user-manual.txt:2484 msgid "" "Print the selected dives (dive profiles and all other information) at 6 " "dives per printed page: to do this, users should select _6 dives per page_." msgstr "" #. type: Plain text -#: user-manual.txt:2530 +#: user-manual.txt:2486 msgid "" "Print the selected dives (dive profiles and all other information) at 2 " "dives per printed page: to do this, users should select _2 dives per page_." msgstr "" #. type: Plain text -#: user-manual.txt:2532 +#: user-manual.txt:2488 msgid "" "Print the selected dives (dive profiles and all other information) at 1 dive " "per printed page: to do this, users should select _1 dive per page_." msgstr "" #. type: Plain text -#: user-manual.txt:2534 +#: user-manual.txt:2490 msgid "Under _Print options_ users need to select:" msgstr "" #. type: Plain text -#: user-manual.txt:2538 +#: user-manual.txt:2494 msgid "" "Printing only the dives that have been selected from the dive list prior to " "activating the print dialogue, achieved by checking the box _Print only " @@ -4796,13 +4728,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2539 +#: user-manual.txt:2495 msgid "" "Printing in colour, achieved by checking the box with _Print in colour_." msgstr "" #. type: Plain text -#: user-manual.txt:2546 +#: user-manual.txt:2502 msgid "" "The _Ordering_ affects the layout of the page (or part of it) for each " "dive. The dive profile could be printed at the top of each dive, with the " @@ -4813,7 +4745,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2550 +#: user-manual.txt:2506 msgid "" "Users can _Preview_ the printed page by selecting the _Preview_ button on " "the dialogue. After preview, changes to the options in the print dialogue " @@ -4821,7 +4753,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2560 +#: user-manual.txt:2516 msgid "" "Next, select the _Print_ button in the dialogue. This activates the regular " "print dialogue used by the user operating system (image [*B*] in the middle, " @@ -4833,22 +4765,22 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2561 +#: user-manual.txt:2517 #, no-wrap msgid "images/Printpreview.jpg" -msgstr "" +msgstr "images/Printpreview.jpg" #. type: Title == -#: user-manual.txt:2565 +#: user-manual.txt:2521 #, no-wrap msgid "Setting user _Preferences_ for _Subsurface_" msgstr "" #. type: Plain text -#: user-manual.txt:2573 +#: user-manual.txt:2529 msgid "" "There are several settings within _Subsurface_ that the user can specify. " -"These are found when selecting _File->Preferences_. The settings are " +"These are found when selecting _File -> Preferences_. The settings are " "performed in five groups: *Defaults*, *Units*, *Graph*, *Language* and " "*Network*. All five sections operate on the same principles: the user must " "specify the settings that are to be changed, then these changes are saved " @@ -4857,24 +4789,24 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:2574 +#: user-manual.txt:2530 #, no-wrap msgid "Defaults" msgstr "" #. type: Plain text -#: user-manual.txt:2577 +#: user-manual.txt:2533 msgid "There are several settings in the *Defaults* panel:" msgstr "" #. type: Target for macro image -#: user-manual.txt:2578 +#: user-manual.txt:2534 #, no-wrap msgid "images/Pref1.jpg" -msgstr "" +msgstr "images/Pref1.jpg" #. type: Plain text -#: user-manual.txt:2582 +#: user-manual.txt:2538 #, no-wrap msgid "" " ** *Lists and tables*: Here one can specify the font type and font size of the\n" @@ -4882,7 +4814,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2587 +#: user-manual.txt:2543 #, no-wrap msgid "" " ** *Dives*: For the _Default Dive File_ one need to specify the directory and\n" @@ -4892,7 +4824,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2592 +#: user-manual.txt:2548 #, no-wrap msgid "" " ** *Display invalid*: Dives can be marked as invalid (when a user wishes to hide\n" @@ -4902,7 +4834,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2595 +#: user-manual.txt:2551 #, no-wrap msgid "" " ** *Default cylinder*: Here users can specify the default cylinder listed in\n" @@ -4910,7 +4842,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2603 +#: user-manual.txt:2559 #, no-wrap msgid "" " ** *Animations*: Some actions in showing the dive profile are performed using\n" @@ -4923,7 +4855,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2608 +#: user-manual.txt:2564 #, no-wrap msgid "" " ** *Subsurface web service*: When one subscribes to the <<S_Companion,Subsurface web service>>, a very\n" @@ -4933,7 +4865,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2611 +#: user-manual.txt:2567 #, no-wrap msgid "" " ** *Clear all settings*: As indicated in the button below this heading, all settings are\n" @@ -4941,19 +4873,19 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:2612 +#: user-manual.txt:2568 #, no-wrap msgid "Units" msgstr "" #. type: Target for macro image -#: user-manual.txt:2613 +#: user-manual.txt:2569 #, no-wrap msgid "images/Pref2.jpg" -msgstr "" +msgstr "images/Pref2.jpg" #. type: Plain text -#: user-manual.txt:2620 +#: user-manual.txt:2576 msgid "" "Here user can choose between metric and imperial units of depth, pressure, " "volume, temperature and mass. By selecting the Metric or Imperial radio " @@ -4964,24 +4896,24 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:2621 +#: user-manual.txt:2577 #, no-wrap msgid "Graph" msgstr "" #. type: Target for macro image -#: user-manual.txt:2623 +#: user-manual.txt:2579 #, no-wrap -msgid "images/Pref3.jpg" -msgstr "" +msgid "images/Pref3_f20.jpg" +msgstr "images/Pref3_f20.jpg" #. type: Plain text -#: user-manual.txt:2627 +#: user-manual.txt:2583 msgid "This panel allows two type of selections:" msgstr "" #. type: Plain text -#: user-manual.txt:2635 +#: user-manual.txt:2591 #, no-wrap msgid "" "*Show*: Here users can specify the amount of information shown as part of\n" @@ -4994,7 +4926,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2640 +#: user-manual.txt:2596 #, no-wrap msgid "" "** _Draw dive computer reported ceiling red_: This checkbox allows exactly what it says.\n" @@ -5004,13 +4936,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2642 +#: user-manual.txt:2598 #, no-wrap msgid "** _Show unused cylinders in Equipment Tab_: This checkbox allows display of information about unused cylinders when viewing the *Equipment Tab*. Conversely, if this box is not checked, and any cylinders entered using the *Equipment Tab* are not used (e.g. there was no gas switch to such a cylinder), then these cylinders are omitted from that list.\n" msgstr "" #. type: Plain text -#: user-manual.txt:2645 +#: user-manual.txt:2601 #, no-wrap msgid "" "** _Show average depth_: Activating this checkbox causes _Subsurface_ to draw a red line across\n" @@ -5018,13 +4950,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2647 +#: user-manual.txt:2603 #, no-wrap msgid "*Misc*:\n" msgstr "" #. type: Plain text -#: user-manual.txt:2659 +#: user-manual.txt:2615 #, no-wrap msgid "" "** Gradient Factors:* Here users can set the _gradient factors_ used while diving. GF_Low is\n" @@ -5041,19 +4973,19 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2661 +#: user-manual.txt:2617 #, no-wrap msgid " *** http://www.tek-dive.com/portal/upload/M-Values.pdf[Understanding M-values by Erik Baker, _Immersed_ Vol. 3, No. 3.]\n" msgstr " *** http://www.tek-dive.com/portal/upload/M-Values.pdf[Understanding M-values by Erik Baker, _Immersed_ Vol. 3, No. 3.]\n" #. type: Plain text -#: user-manual.txt:2663 +#: user-manual.txt:2619 #, no-wrap msgid " *** link:http://www.rebreatherworld.com/general-and-new-to-rebreather-articles/5037-gradient-factors-for-dummies.html[Gradient factors for dummies, by Kevin Watts]\n" msgstr " *** link:http://www.rebreatherworld.com/general-and-new-to-rebreather-articles/5037-gradient-factors-for-dummies.html[Gradient factors for dummies, by Kevin Watts]\n" #. type: Plain text -#: user-manual.txt:2667 +#: user-manual.txt:2623 #, no-wrap msgid "" " ** _CCR: Show setpoints when viewing pO2:_ With this checkbox ativated, the pO~2~\n" @@ -5062,7 +4994,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2671 +#: user-manual.txt:2627 #, no-wrap msgid "" " ** _CCR: Show individual O~2~ sensor values when viewing pO~2~:_ Show the pO~2~\n" @@ -5071,19 +5003,19 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2673 +#: user-manual.txt:2629 #, no-wrap msgid "*Configuring dive planning using rebreather equipment:*\n" msgstr "" #. type: Plain text -#: user-manual.txt:2675 +#: user-manual.txt:2631 #, no-wrap msgid "** _Default CCR setpoint for dive planning:_ Specify the O~2~ setpoint for a\n" msgstr "" #. type: Plain text -#: user-manual.txt:2677 +#: user-manual.txt:2633 #, no-wrap msgid "" "CCR dive plan. This determines the pO~2~ that will be maintained\n" @@ -5091,25 +5023,25 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2679 +#: user-manual.txt:2635 #, no-wrap msgid "** _pSCR O~2~ metabolism rate:_ For a semiclosed rebreather (pSCR) system, this is the\n" msgstr "" #. type: Plain text -#: user-manual.txt:2680 +#: user-manual.txt:2636 #, no-wrap msgid "volume of oxygen used by a diver each minute. Set this value for pSCR dive planning.\n" msgstr "" #. type: Plain text -#: user-manual.txt:2682 +#: user-manual.txt:2638 #, no-wrap msgid "** _pSCR ratio:_ For pSCR equipment the dump ratio is the ratio of gas released to the\n" msgstr "" #. type: Plain text -#: user-manual.txt:2684 +#: user-manual.txt:2640 #, no-wrap msgid "" "environment to that of the gas recirculated to the diver. Set this value for a\n" @@ -5117,24 +5049,24 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:2686 +#: user-manual.txt:2642 #, no-wrap msgid "Language" msgstr "" #. type: Plain text -#: user-manual.txt:2688 +#: user-manual.txt:2644 msgid "Choose a language that _Subsurface_ will use." msgstr "" #. type: Target for macro image -#: user-manual.txt:2689 +#: user-manual.txt:2645 #, no-wrap msgid "images/Pref4.jpg" -msgstr "" +msgstr "images/Pref4.jpg" #. type: Plain text -#: user-manual.txt:2699 +#: user-manual.txt:2655 msgid "" "A checkbox allows one to use the _System Default_ language which in most " "cases will be the correct setting; with this _Subsurface_ simply runs in the " @@ -5147,26 +5079,26 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:2700 +#: user-manual.txt:2656 #, no-wrap msgid "Network" msgstr "" #. type: Plain text -#: user-manual.txt:2702 +#: user-manual.txt:2658 msgid "" "This panel facilitates communication between _Subsurface_ and data sources " "on the Internet." msgstr "" #. type: Target for macro image -#: user-manual.txt:2703 +#: user-manual.txt:2659 #, no-wrap msgid "images/Pref5.jpg" -msgstr "" +msgstr "images/Pref5.jpg" #. type: Plain text -#: user-manual.txt:2716 +#: user-manual.txt:2672 msgid "" "This is important, for instance, when _Subsurface_ needs to communicate with " "Internet services such as the <<S_Companion,_Subsurface Companion app_>> or " @@ -5183,13 +5115,13 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:2718 +#: user-manual.txt:2674 #, no-wrap msgid "The _Subsurface_ dive planner" msgstr "" #. type: Plain text -#: user-manual.txt:2723 +#: user-manual.txt:2679 msgid "" "Dive planning is an advanced feature of _Subsurface_, accessible by " "selecting _Log -> Plan Dive_ from the main menu. It allows calculation of " @@ -5198,7 +5130,7 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:2731 +#: user-manual.txt:2687 msgid "" "The _Subsurface_ dive planner IS CURRENTLY EXPERIMENTAL and assumes the user " "is already familiar with the _Subsurface_ user interface. It is explicitly " @@ -5206,19 +5138,19 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:2734 +#: user-manual.txt:2690 msgid "" "The user is conversant with dive planning and has the necessary training to " "perform dive planning." msgstr "" #. type: delimited block * -#: user-manual.txt:2735 +#: user-manual.txt:2691 msgid "The user plans dives within his/her certification limits." msgstr "" #. type: delimited block * -#: user-manual.txt:2738 +#: user-manual.txt:2694 msgid "" "Dive planning makes large assumptions about the characteristics of the " "_average person_ and cannot compensate for individual physiology or health " @@ -5226,32 +5158,32 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:2739 +#: user-manual.txt:2695 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:2740 +#: user-manual.txt:2696 msgid "The user is familiar with the user interface of _Subsurface_." msgstr "" #. type: delimited block * -#: user-manual.txt:2742 +#: user-manual.txt:2698 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:2744 +#: user-manual.txt:2700 #, no-wrap msgid "The _Subsurface_ dive planner screen" msgstr "" #. type: Plain text -#: user-manual.txt:2749 +#: user-manual.txt:2705 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 " @@ -5261,7 +5193,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2753 +#: user-manual.txt:2709 msgid "" "At the top right hand is a green *design panel* upon which the profile of " "the dive can be manipulated directly by dragging and clicking as explained " @@ -5270,7 +5202,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2757 +#: user-manual.txt:2713 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 " @@ -5279,26 +5211,26 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2758 +#: user-manual.txt:2714 #, no-wrap msgid "images/PlannerWindow1.jpg" -msgstr "" +msgstr "images/PlannerWindow1.jpg" #. type: Title === -#: user-manual.txt:2761 +#: user-manual.txt:2717 #, no-wrap msgid "Initiating dive planning" msgstr "" #. type: Plain text -#: user-manual.txt:2765 +#: user-manual.txt:2721 msgid "" "The dive planner comprises two parts: *constructing a dive plan* and " "*evaluating* that dive plan. To perform dive planning, perform these steps:" msgstr "" #. type: Plain text -#: user-manual.txt:2769 +#: user-manual.txt:2725 msgid "" "Clear the existing dive log by creating a new planning log. This is achieved " "by selecting _File -> New logbook_ from the main menu. This way, dive plans " @@ -5306,7 +5238,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2774 +#: user-manual.txt:2730 msgid "" "In the top left-hand area of the screen, ensure that the constant dive " "parameters are appropriate. These are: Start date and time of the dive, " @@ -5316,7 +5248,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2783 +#: user-manual.txt:2739 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. " @@ -5330,25 +5262,25 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2786 +#: user-manual.txt:2742 msgid "" "The dialogue indicating _Dive Planner Points_ is usually not used at this " "stage of the dive planning." msgstr "" #. type: Title === -#: user-manual.txt:2787 +#: user-manual.txt:2743 #, no-wrap msgid "Managing nitrogen, oxygen and gas consumption" msgstr "" #. type: Plain text -#: user-manual.txt:2790 +#: user-manual.txt:2746 msgid "The planning is performed in three stages:" msgstr "" #. type: Plain text -#: user-manual.txt:2800 +#: user-manual.txt:2756 #, no-wrap msgid "" "*a) Nitrogen management*: This is performed by specifying the rates for descent and ascent,\n" @@ -5363,7 +5295,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2805 +#: user-manual.txt:2761 #, no-wrap msgid "" " *** link:http://www.tek-dive.com/portal/upload/M-Values.pdf[Understanding M-values by Erik Baker, _Immersed_ Vol. 3, No. 3.]\n" @@ -5377,7 +5309,7 @@ msgstr "" "An excellent non-technical review.\n" #. type: Plain text -#: user-manual.txt:2813 +#: user-manual.txt:2769 #, no-wrap msgid "" " ** The ascent rate is critical for nitrogen off-gassing at the end of the dive and is specified\n" @@ -5390,7 +5322,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2823 +#: user-manual.txt:2779 #, no-wrap msgid "" "*b) Oxygen management*: In the *Gas Options* part of the dive specification, the maximum partial\n" @@ -5404,7 +5336,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2838 +#: user-manual.txt:2794 #, no-wrap msgid "" "*c) Gas management*: One needs keep within the limits of the amount of gas contained in the dive\n" @@ -5423,7 +5355,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2849 +#: user-manual.txt:2805 msgid "" "Now (at last) one can start the detailed time-depth planning of the dive. " "_Subsurface_ offers a unique graphical interface for performing this part of " @@ -5439,7 +5371,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2862 +#: user-manual.txt:2818 msgid "" "Each waypoint on the dive profile creates a _Dive Planner Point_ in the " "table on the left of the dive planner panel. Ensure that the _Used Gas_ " @@ -5457,7 +5389,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2870 +#: user-manual.txt:2826 msgid "" "Indicate any changes in gas cylinder used by indicating gas changes as " "explained in the section <<S_CreateProfile,hand-creating a dive profile>>. " @@ -5469,7 +5401,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2879 +#: user-manual.txt:2835 msgid "" "A non-zero value in the \"CC set point\" column of the table of dive planner " "points indicates a valid setpoint for oxygen partial pressure and that the " @@ -5482,20 +5414,20 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2882 +#: user-manual.txt:2838 msgid "" "Below is an example of a dive plan to 45m using EAN26, followed by an ascent " "using EAN50 and using the settings as described above." msgstr "" #. type: Target for macro image -#: user-manual.txt:2883 +#: user-manual.txt:2839 #, no-wrap msgid "images/DivePlanner2.jpg" -msgstr "" +msgstr "images/DivePlanner2.jpg" #. type: Plain text -#: user-manual.txt:2888 +#: user-manual.txt:2844 msgid "" "Once the above has been completed, one can save it by clicking the _Save_ " "button towards the bottom left of the green design panel. The saved dive " @@ -5503,13 +5435,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:2889 +#: user-manual.txt:2845 #, no-wrap msgid "The dive plan details" msgstr "" #. type: Plain text -#: user-manual.txt:2898 +#: user-manual.txt:2854 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 " @@ -5522,7 +5454,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2903 +#: user-manual.txt:2859 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 " @@ -5532,13 +5464,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:2905 +#: user-manual.txt:2861 #, no-wrap msgid "Modifying an existing dive plan" msgstr "" #. type: Plain text -#: user-manual.txt:2912 +#: user-manual.txt:2868 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 not a way to " @@ -5549,7 +5481,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2918 +#: user-manual.txt:2874 msgid "" "In addition there is the option \"Save new\". This keeps the original " "planned dive and adds a (possibly modified) copy to the dive list. If that " @@ -5559,13 +5491,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:2919 +#: user-manual.txt:2875 #, no-wrap msgid "Planning for repetitive dives" msgstr "" #. type: Plain text -#: user-manual.txt:2926 +#: user-manual.txt:2882 msgid "" "Repetitive dives can easily be planned if the dates and start times of the " "repetitive dive set is specified appropriately in the top left-hand _Start " @@ -5574,7 +5506,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2932 +#: user-manual.txt:2888 msgid "" "If one has just completed a long/deep dive and is planning another dive, " "then highlight, in the *Dive List*, the dive that has just been completed " @@ -5584,7 +5516,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2937 +#: user-manual.txt:2893 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 one " @@ -5594,13 +5526,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:2938 +#: user-manual.txt:2894 #, no-wrap msgid "Printing the dive plan" msgstr "" #. type: Plain text -#: user-manual.txt:2943 +#: user-manual.txt:2899 msgid "" "Selecting the _Print_ button in the planner allows printing of the _Dive " "Plan Details_ for wet notes. Alternatively one can cut and paste the _Dive " @@ -5608,7 +5540,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2953 +#: user-manual.txt:2909 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 " @@ -5618,19 +5550,19 @@ msgid "" "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_ " +"process. The only way to print the dive plan is to use the _File -> Print_ " "facility 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:2955 +#: user-manual.txt:2911 #, no-wrap msgid "Configuring a dive computer" msgstr "Configurer un ordinateur de plongée" #. type: Plain text -#: user-manual.txt:2963 +#: user-manual.txt:2919 msgid "" "_Subsurface_ enables one to configure a dive computer. Currently the " "Heinrichs-Weikamp (OSTC 2, OSTC 3) and Suunto Vyper (Stinger, Mosquito, D3, " @@ -5653,10 +5585,10 @@ msgstr "" "APPENDIX A>> pour plus d'informations sur la manière de procéder." #. type: Plain text -#: user-manual.txt:2968 +#: user-manual.txt:2924 msgid "" "Once the dive computer is connected to the _Subsurface_ computer, select " -"_File->Configure dive computer_ from the _Main Menu_. Provide the " +"_File -> Configure dive computer_ from the _Main Menu_. Provide the " "appropriate device name in the text box at the top of the configuration " "panel that opens and select the appropriate dive computer model from the " "panel on the lefthand (see image below)." @@ -5668,13 +5600,13 @@ msgstr "" "de plongée à partir du panneau à gauche (voir l'image ci-dessous)." #. type: Target for macro image -#: user-manual.txt:2969 +#: user-manual.txt:2925 #, no-wrap msgid "images/Configure_dc_f20.jpg" msgstr "images/Configure_dc_f20.jpg" #. type: Plain text -#: user-manual.txt:2972 +#: user-manual.txt:2928 msgid "" "Using the appropriate buttons on the configuration panel, the following " "actions can be performed:" @@ -5683,7 +5615,7 @@ msgstr "" "suivantes peuvent être réalisées :" #. type: Plain text -#: user-manual.txt:2975 +#: user-manual.txt:2931 #, no-wrap msgid "" "*Retrieve available details*. This loads the existing configuration from the dive computer\n" @@ -5693,7 +5625,7 @@ msgstr "" "dans _Subsurface_, en l'affichant dans le panneau de configuration.\n" #. type: Plain text -#: user-manual.txt:2977 +#: user-manual.txt:2933 #, no-wrap msgid "" "*Save changes to device*. This changes the configuration of the\n" @@ -5703,7 +5635,7 @@ msgstr "" "de plongée pour correspondre aux informations affichées dans le panneau de configuration.\n" #. type: Plain text -#: user-manual.txt:2979 +#: user-manual.txt:2935 #, no-wrap msgid "" "*Backup*. This saves the configuration data to a file. _Subsurface_ asks for\n" @@ -5713,7 +5645,7 @@ msgstr "" "l'emplacement et le nom du fichier pour enregistrer les informations.\n" #. type: Plain text -#: user-manual.txt:2981 +#: user-manual.txt:2937 #, no-wrap msgid "" "*Restore backup*. This loads the information from a backup file and displays it\n" @@ -5723,7 +5655,7 @@ msgstr "" "dans le panneau de configuration.\n" #. type: Plain text -#: user-manual.txt:2983 +#: user-manual.txt:2939 #, no-wrap msgid "" "*Update firmware*. If new firmware is available for the dive computer, this is\n" @@ -5733,13 +5665,13 @@ msgstr "" "il sera chargé dans l'ordinateur de plongée.\n" #. type: Title == -#: user-manual.txt:2984 +#: user-manual.txt:2940 #, 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:2989 +#: user-manual.txt:2945 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 " @@ -5750,13 +5682,13 @@ msgstr "" "des sections de ce manuel traitant des opérations relatives." #. type: Title === -#: user-manual.txt:2990 +#: user-manual.txt:2946 #, no-wrap msgid "File" msgstr "Fichier" #. type: Plain text -#: user-manual.txt:2993 +#: user-manual.txt:2949 msgid "" "<<S_NewLogbook,_New Logbook_>> - Close the currently open dive logbook and " "clear all dive information." @@ -5765,7 +5697,7 @@ msgstr "" "actuellement ouvert et supprime toutes les informations de plongées." #. type: Plain text -#: user-manual.txt:2995 +#: user-manual.txt:2951 msgid "" "_Open logbook_ - This opens the file manager in order to select a dive " "logbook to open." @@ -5774,24 +5706,24 @@ msgstr "" "carnet de plongée à ouvrir." #. type: Plain text -#: user-manual.txt:2996 +#: user-manual.txt:2952 msgid "_Save_ - Save the dive logbook that is currently open." msgstr "" "_Sauvegarder_ - Enregistrer le carnet de plongée qui est actuellement ouvert." #. type: Plain text -#: user-manual.txt:2997 +#: user-manual.txt:2953 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:2998 +#: user-manual.txt:2954 msgid "_Close_ - Close the dive logbook that is currently open." msgstr "_Fermer_ - Fermer le carnet de plongée actuellement ouvert." #. type: Plain text -#: user-manual.txt:3000 +#: user-manual.txt:2956 msgid "" "<<S_ExportLog,_Export_>> - Export the currently open dive logbook (or the " "selected dives in the logbook) to one of several formats." @@ -5801,20 +5733,20 @@ msgstr "" "formats." #. type: Plain text -#: user-manual.txt:3001 +#: user-manual.txt:2957 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:3002 +#: user-manual.txt:2958 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:3003 +#: user-manual.txt:2959 msgid "" "<<S_Configure,_Configure dive computer_>> - Edit the configuration of a dive " "computer." @@ -5823,18 +5755,18 @@ msgstr "" "configuration d'un ordinateur de plongée." #. type: Plain text -#: user-manual.txt:3004 +#: user-manual.txt:2960 msgid "_Quit_ - Quit _Subsurface_." msgstr "_Quitter_ - Quitter _Subsurface_." #. type: Title === -#: user-manual.txt:3005 +#: user-manual.txt:2961 #, no-wrap msgid "Import" msgstr "Importer" #. type: Plain text -#: user-manual.txt:3008 +#: user-manual.txt:2964 msgid "" "<<S_ImportDiveComputer,_Import from dive computer_>> - Import dive " "information from a dive computer." @@ -5843,7 +5775,7 @@ msgstr "" "Importer des informations de plongées à partir de l'ordinateur de plongée." #. type: Plain text -#: user-manual.txt:3010 +#: user-manual.txt:2966 msgid "" "<<Unified_import,_Import Log Files_>> - Import dive information from a file " "in in a _Subsurface_-compatible format." @@ -5853,7 +5785,7 @@ msgstr "" "_Subsurface_." #. type: Plain text -#: user-manual.txt:3012 +#: user-manual.txt:2968 msgid "" "<<S_Companion,_Import GPS data from Subsurface web service_>> - Load GPS " "coordinates from the _Subsurface_ mobile phone app." @@ -5863,7 +5795,7 @@ msgstr "" "(téléphones et tablettes)." #. type: Plain text -#: user-manual.txt:3014 +#: user-manual.txt:2970 msgid "" "<<S_ImportingDivelogsDe,_Import from Divelogs.de_>> - Import dive " "information from _www.Divelogs.de_." @@ -5872,13 +5804,13 @@ msgstr "" "informations de plongées à partir de _www.Divelogs.de_." #. type: Title === -#: user-manual.txt:3015 +#: user-manual.txt:2971 #, no-wrap msgid "Log" msgstr "Journal (log)" #. type: Plain text -#: user-manual.txt:3017 +#: user-manual.txt:2973 msgid "" "<<S_EnterData,_Add Dive_>> - Manually add a new dive to the *Dive List* " "panel." @@ -5887,7 +5819,7 @@ msgstr "" "plongée au panneau de la *liste des plongées*." #. type: Plain text -#: user-manual.txt:3018 +#: user-manual.txt:2974 msgid "" "<<S_DivePlanner,_Plan Dive_>> - This feature allows the planning of dives." msgstr "" @@ -5895,7 +5827,7 @@ msgstr "" "planifier des plongées." #. type: Plain text -#: user-manual.txt:3019 +#: user-manual.txt:2975 msgid "" "<<S_Replan,_Re-plan dive_>> - Edit a dive plan that has been saved into the " "*Dive List*." @@ -5904,7 +5836,7 @@ msgstr "" "a été enregistrée dans la *liste des plongées*." #. type: Plain text -#: user-manual.txt:3021 +#: user-manual.txt:2977 msgid "" "<<S_CopyComponents,_Copy dive components_>> - By selecting this option, one " "can copy information from several fields of a dive log onto the clipboard." @@ -5914,7 +5846,7 @@ msgstr "" "champs d'un journal de plongée vers le presse-papier." #. type: Plain text -#: user-manual.txt:3023 +#: user-manual.txt:2979 msgid "" "_Paste dive components_ - Paste, into the selected dives in the *Dive List*, " "the information copied using the _Copy dive components_ option." @@ -5924,7 +5856,7 @@ msgstr "" "préalable avec l'option _Copier les composants de la plongée_." #. type: Plain text -#: user-manual.txt:3025 +#: user-manual.txt:2981 msgid "" "<<S_Renumber,_Renumber_>> - Renumber the dives listed in the *Dive List* " "panel." @@ -5933,7 +5865,7 @@ msgstr "" "le panneau de la *liste des plongées*." #. type: Plain text -#: user-manual.txt:3027 +#: user-manual.txt:2983 msgid "" "<<S_Group,_Auto Group_>> - Group the dives in the *Dive List* panel into " "dive trips." @@ -5942,7 +5874,7 @@ msgstr "" "*liste des plongées* dans des voyages de plongées." #. type: Plain text -#: user-manual.txt:3028 +#: user-manual.txt:2984 msgid "" "<<S_DeviceNames,_Edit Device Names_>> - Edit the names of dive computers to " "facilitate your logs." @@ -5951,7 +5883,7 @@ msgstr "" "les noms des ordinateurs de plongée pour faciliter vos journaux (logs)." #. type: Plain text -#: user-manual.txt:3029 +#: user-manual.txt:2985 msgid "" "<<S_Filter,_Filter divelist_>> - Select only some dives, based on specific " "tags or dive criteria." @@ -5960,13 +5892,13 @@ msgstr "" "certaines plongées, à partir de tags ou de critères de plongées." #. type: Title === -#: user-manual.txt:3030 +#: user-manual.txt:2986 #, no-wrap msgid "View" msgstr "Vue" #. type: Plain text -#: user-manual.txt:3033 +#: user-manual.txt:2989 msgid "" "<<S_ViewPanels,_All_>> - View the four main _Subsurface_ panels " "simmultaneously." @@ -5975,35 +5907,35 @@ msgstr "" "_Subsurface_ simultanément." #. type: Plain text -#: user-manual.txt:3034 +#: user-manual.txt:2990 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:3035 +#: user-manual.txt:2991 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:3036 +#: user-manual.txt:2992 msgid "<<S_ViewPanels,_Info_>> - View only the *Dive Notes* panel." msgstr "" "<<S_ViewPanels,_Info_>> - Affiche uniquement le panneau des *notes de " "plongée*." #. type: Plain text -#: user-manual.txt:3037 +#: user-manual.txt:2993 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:3039 +#: user-manual.txt:2995 msgid "" "_Yearly Statistics_ - Display summary statistics about dives during this and " "past years." @@ -6012,28 +5944,28 @@ msgstr "" "plongées effectuées." #. type: Plain text -#: user-manual.txt:3040 +#: user-manual.txt:2996 msgid "_Prev DC_ - Switch to previous dive computer." msgstr "_Ordinateur précédent_ - Passer à l'ordinateur de plongée précédent." #. type: Plain text -#: user-manual.txt:3041 +#: user-manual.txt:2997 msgid "_Next DC_ - Switch to next dive computer." msgstr "_Ordinateur suivant_ - Passer à l'ordinateur de plongée suivant." #. type: Plain text -#: user-manual.txt:3042 +#: user-manual.txt:2998 msgid "_Full Screen_ - Toggles Full Screen mode." msgstr "_Plein écran_ - Passer en mode plein écran." #. type: Title === -#: user-manual.txt:3043 +#: user-manual.txt:2999 #, no-wrap msgid "Help" msgstr "Aide" #. type: Plain text -#: user-manual.txt:3046 +#: user-manual.txt:3002 msgid "" "_About Subsurface_ - Show a panel with the version number of _Subsurface_ as " "well as licensing information." @@ -6042,7 +5974,7 @@ msgstr "" "_Subsurface_ ainsi que les informations de licence." #. type: Plain text -#: user-manual.txt:3048 +#: user-manual.txt:3004 msgid "" "_Check for updates_ - Find out whether a newer version of Subsurface is " "available on the http://subsurface-divelog.org/[_Subsurface_ web site]." @@ -6052,31 +5984,38 @@ msgstr "" "_Subsurface_ ]." #. type: Plain text -#: user-manual.txt:3049 -msgid "_User Manual_ - Open a window showing this user manual." +#: user-manual.txt:3005 +msgid "" +"<<S_UserSurvey,_User survey_>> - Help to make _Subsurface_ even better by " +"taking part in our user survey." +msgstr "" + +#. type: Plain text +#: user-manual.txt:3006 +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:3051 +#: user-manual.txt:3009 #, no-wrap msgid "APPENDIX A: Operating system specific information for importing dive information from a dive computer." msgstr "" #. type: Title === -#: user-manual.txt:3053 +#: user-manual.txt:3011 #, 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:3054 +#: user-manual.txt:3012 #, no-wrap msgid "images/icons/drivers.jpg" -msgstr "" +msgstr "images/icons/drivers.jpg" #. type: Plain text -#: user-manual.txt:3059 +#: user-manual.txt:3017 msgid "" "The operating system of the desktop computer needs the appropriate drivers " "in order to communicate with the dive computer in whichever way the dive " @@ -6084,7 +6023,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3065 +#: user-manual.txt:3023 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 " @@ -6093,7 +6032,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3069 +#: user-manual.txt:3027 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 " @@ -6101,7 +6040,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3076 +#: user-manual.txt:3034 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 " @@ -6112,19 +6051,19 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3078 +#: user-manual.txt:3036 #, 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:3079 +#: user-manual.txt:3037 #, no-wrap msgid "images/icons/usb.jpg" -msgstr "" +msgstr "images/icons/usb.jpg" #. type: Plain text -#: user-manual.txt:3087 +#: user-manual.txt:3045 msgid "" "When a user connects the dive computer by using a USB connector, usually " "_Subsurface_ will either propose a drop down list that contains the correct " @@ -6135,13 +6074,13 @@ msgid "" msgstr "" #. type: Block title -#: user-manual.txt:3088 user-manual.txt:3171 +#: user-manual.txt:3046 user-manual.txt:3129 #, no-wrap msgid "On Windows:" msgstr "Sur Windows :" #. type: Plain text -#: user-manual.txt:3092 +#: user-manual.txt:3050 msgid "" "Simply try COM1, COM2, etc. The drop down list should contain all connected " "COM devices." @@ -6150,56 +6089,56 @@ msgstr "" "tous les périphériques COM connectés." #. type: Block title -#: user-manual.txt:3093 user-manual.txt:3186 +#: user-manual.txt:3051 user-manual.txt:3144 #, no-wrap msgid "On MacOS:" msgstr "Sur MacOS :" #. type: Plain text -#: user-manual.txt:3096 +#: user-manual.txt:3054 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:3097 +#: user-manual.txt:3055 #, no-wrap msgid "On Linux:" msgstr "Sur Linux :" #. type: Plain text -#: user-manual.txt:3100 +#: user-manual.txt:3058 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:3102 +#: user-manual.txt:3060 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:3103 +#: user-manual.txt:3061 msgid "Open a terminal" msgstr "Ouvrir un terminal" #. type: Plain text -#: user-manual.txt:3104 user-manual.txt:3106 +#: user-manual.txt:3062 user-manual.txt:3064 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:3105 +#: user-manual.txt:3063 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:3108 +#: user-manual.txt:3066 msgid "A message similar to this one should appear:" msgstr "Un message similaire à celui-ci devrait apparaitre :" #. type: Plain text -#: user-manual.txt:3124 +#: user-manual.txt:3082 #, no-wrap msgid "" "\tusb 2-1.1: new full speed USB device number 14 using ehci_hcd\n" @@ -6235,7 +6174,7 @@ msgstr "" "\tftdi_sio: v1.6.0:USB FTDI Serial Converters Driver\n" #. type: Plain text -#: user-manual.txt:3129 +#: user-manual.txt:3087 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 " @@ -6247,12 +6186,12 @@ msgstr "" "que Subsurface utilise le bon port USB." #. type: Plain text -#: user-manual.txt:3131 +#: user-manual.txt:3089 msgid "Ensuring that the user has write permission to the USB serial port:" msgstr "" #. type: Plain text -#: user-manual.txt:3137 +#: user-manual.txt:3095 msgid "" "On Unix-like operating systems the USB ports can only be accessed by users " "who are members of the +dialout+ group. If one is not root, one may not be a " @@ -6261,14 +6200,14 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3141 +#: user-manual.txt:3099 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:3146 +#: user-manual.txt:3104 #, no-wrap msgid "" "Type: +id johnB+ This lists all the groups that johnB belongs to and\n" @@ -6279,7 +6218,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3148 +#: user-manual.txt:3106 #, no-wrap msgid "" "Under some circumstances this change takes only effect (eg. on Ubuntu) after\n" @@ -6287,7 +6226,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3153 +#: user-manual.txt:3111 msgid "" "With the appropriate device name (e.g. +dev/ttyUSB3+) and with write " "permission to the USB port, the dive computer interface can connect and one " @@ -6295,19 +6234,19 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3155 +#: user-manual.txt:3113 #, no-wrap msgid "Setting up bluetooth enabled devices" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:3156 +#: user-manual.txt:3114 #, no-wrap msgid "images/icons/bluetooth.jpg" -msgstr "" +msgstr "images/icons/bluetooth.jpg" #. type: Plain text -#: user-manual.txt:3162 +#: user-manual.txt:3120 msgid "" "For dive computers communicating through bluetooth like the Heinrichs " "Weikamp Frog or the Shearwater Predator and Petrel there is a different " @@ -6316,13 +6255,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3164 +#: user-manual.txt:3122 #, no-wrap msgid "*For the dive computer, after enabling Bluetooth, ensure it is in Upload mode.*\n" msgstr "" #. type: Plain text -#: user-manual.txt:3168 +#: user-manual.txt:3126 msgid "" "For Bluetooth pairing of the dive computer, refer to the manufacturer's user " "guide. When using a Shearwater Predator/Petrel, select _Dive Log -> Upload " @@ -6330,38 +6269,38 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3170 +#: user-manual.txt:3128 #, no-wrap msgid "*Pair the _Subsurface_ computer with the dive computer.*\n" msgstr "" #. type: Plain text -#: user-manual.txt:3179 +#: user-manual.txt:3137 msgid "" "Bluetooth is most likely already enabled. For pairing with the dive computer " -"choose _Control Panel->Bluetooth Devices->Add Wireless Device_. This should " -"bring up a dialog showing your dive computer (in Bluetooth mode) and " -"allowing pairing. Right click on it and choose _Properties->COM Ports_ to " +"choose _Control Panel -> Bluetooth Devices -> Add Wireless Device_. This " +"should bring up a dialog showing your dive computer (in Bluetooth mode) and " +"allowing pairing. Right click on it and choose _Propertie s-> COM Ports_ to " "identify the port used for your dive computer. If there are several ports " "listed, use the one saying \"Outgoing\" instead of \"Incoming\"." msgstr "" #. type: Plain text -#: user-manual.txt:3182 +#: user-manual.txt:3140 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:3185 +#: user-manual.txt:3143 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:3192 +#: user-manual.txt:3150 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. " @@ -6370,20 +6309,20 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3195 +#: user-manual.txt:3153 msgid "" "Once the pairing is completed the correct device is shown in the 'Device or " "Mount Point' drop-down in the _Subsurface_ *Import* dialog." msgstr "" #. type: Block title -#: user-manual.txt:3196 +#: user-manual.txt:3154 #, no-wrap msgid "On Linux" msgstr "Sur Linux" #. type: Plain text -#: user-manual.txt:3204 +#: user-manual.txt:3162 msgid "" "Ensure Bluetooth is enabled on the _Subsurface_ computer. On most common " "distributions this should be true out of the box and pairing should be " @@ -6395,7 +6334,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3211 +#: user-manual.txt:3169 msgid "" "In the rare cases where the above is not true, then depending on your " "system, try +initd+ or +systemd+. This might be different and also involve " @@ -6406,12 +6345,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3213 +#: user-manual.txt:3171 msgid "One may also use a manual approach by using such commands:" msgstr "" #. type: Plain text -#: user-manual.txt:3218 +#: user-manual.txt:3176 msgid "" "+hciconfig+ shows the Bluetooth devices available on your computer (not dive " "computer), most likely one will see a hci0, if not try +hcitool -a+ to see " @@ -6419,14 +6358,14 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3222 +#: user-manual.txt:3180 msgid "" "+hcitool scanning+ gets a list of bluetooth enabled client devices, look for " "the dive computer and remember the MAC address are shown there" msgstr "" #. type: Plain text -#: user-manual.txt:3226 +#: user-manual.txt:3184 msgid "" "+bluez-simple-agent hci0 10:00:E8:C4:BE:C4+ pairs the dive computer with the " "bluetooth stack of the _Subsurface_ computer, copy/paste the MAC address " @@ -6434,14 +6373,14 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3229 +#: user-manual.txt:3187 msgid "" "Unfortunately on Linux binding to a communication device has to be done " "manually by running:" msgstr "" #. type: Plain text -#: user-manual.txt:3235 +#: user-manual.txt:3193 msgid "" "+rfcomm bind /dev/rfcomm0 10:00:E8:C4:BE:C4+ binds the dive computer to a " "communication device in the desktop computer, in case rfcomm is already " @@ -6450,32 +6389,32 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3238 +#: user-manual.txt:3196 msgid "" "For downloading dives in _Subsurface_ specify the device name connected to " "the MAC address in the last step above, e.g. _/dev/rfcomm0_." msgstr "" #. type: Title == -#: user-manual.txt:3240 +#: user-manual.txt:3198 #, no-wrap msgid "APPENDIX B: Dive Computer specific information for importing dive information." msgstr "" #. type: Title === -#: user-manual.txt:3243 +#: user-manual.txt:3201 #, no-wrap msgid "Import from a Uemis Zurich" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:3245 +#: user-manual.txt:3203 #, no-wrap msgid "images/icons/iumis.jpg" -msgstr "" +msgstr "images/icons/iumis.jpg" #. type: Plain text -#: user-manual.txt:3261 +#: user-manual.txt:3219 msgid "" "_Subsurface_ downloads the information stored on the SDA (the built-in file " "system of the Uemis) including information about dive spots and equipment. " @@ -6491,7 +6430,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3276 +#: user-manual.txt:3234 msgid "" "After selecting the above device name, download the dives from the Uemis " "Zurich. One technical issue with the Uemis Zurich download implementation " @@ -6508,19 +6447,19 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3278 +#: user-manual.txt:3236 #, no-wrap msgid "Importing dives from the Uwatec Galileo" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:3280 +#: user-manual.txt:3238 #, no-wrap msgid "images/icons/Galileo.jpg" -msgstr "" +msgstr "images/icons/Galileo.jpg" #. type: Plain text -#: user-manual.txt:3295 +#: user-manual.txt:3253 msgid "" "The Uwatec Galileo dive computers use infra red (IrDA) communication between " "the dive computer and Subsurface. The Uwatec hardware uses a USB dongle " @@ -6536,14 +6475,14 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3298 +#: user-manual.txt:3256 msgid "" "After executing this command, Subsurface will recognise the Galileo dive " "computer and download dive information." msgstr "" #. type: Plain text -#: user-manual.txt:3302 +#: user-manual.txt:3260 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/" @@ -6551,26 +6490,26 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3305 +#: user-manual.txt:3263 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:3307 +#: user-manual.txt:3265 #, no-wrap msgid "Importing dives from Heinrichs Weikamp DR5" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:3309 +#: user-manual.txt:3267 #, no-wrap msgid "images/icons/HW_DR5.jpg" -msgstr "" +msgstr "images/icons/HW_DR5.jpg" #. type: Plain text -#: user-manual.txt:3319 +#: user-manual.txt:3277 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. " @@ -6583,19 +6522,45 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3320 +#: user-manual.txt:3280 +#, no-wrap +msgid "Importing dives from xDEEP BLACK" +msgstr "" + +#. type: Named 'icon' AttributeList argument for style 'icon' +#: user-manual.txt:3282 +#, no-wrap +msgid "images/icons/HW_xdeepblack.jpg" +msgstr "images/icons/HW_xdeepblack.jpg" + +#. type: Plain text +#: user-manual.txt:3291 +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 " +"_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:3293 #, no-wrap msgid "Import from Shearwater Predator using Bluetooth" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:3322 +#: user-manual.txt:3295 #, no-wrap msgid "images/icons/predator.jpg" -msgstr "" +msgstr "images/icons/predator.jpg" #. type: Plain text -#: user-manual.txt:3330 +#: user-manual.txt:3303 msgid "" "Using a Shearwater Predator one may be able to pair Bluetooth but then " "encounter issues when downloading, showing errors like _Slip RX: unexp. SLIP " @@ -6606,36 +6571,36 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3333 +#: user-manual.txt:3306 msgid "" "use the Bluetooth dongle which came with the Shearwater Predator instead of " "the built-in one of the _Subsurface_ computer" msgstr "" #. type: Plain text -#: user-manual.txt:3334 +#: user-manual.txt:3307 msgid "switch to different Bluetooth drivers for the same hardware" msgstr "" #. type: Plain text -#: user-manual.txt:3335 +#: user-manual.txt:3308 msgid "switch off WiFi while using Bluetooth" msgstr "" #. type: Title === -#: user-manual.txt:3337 +#: user-manual.txt:3310 #, no-wrap msgid "Importing dive logs from the Poseidon MkVI Discovery" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:3339 +#: user-manual.txt:3312 #, no-wrap msgid "images/MkVI.jpeg" -msgstr "" +msgstr "images/MkVI.jpeg" #. type: Plain text -#: user-manual.txt:3347 +#: user-manual.txt:3320 msgid "" "Download of dive logs from the MkVI is performed using a custom " "communications adapter and the _Poseidon PC Configuration Software_, " @@ -6647,45 +6612,45 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3350 +#: user-manual.txt:3323 msgid "" "Setup configuration for the dive and key dive parameters (file with a .txt " "extension)" msgstr "" #. type: Plain text -#: user-manual.txt:3351 +#: user-manual.txt:3324 msgid "Dive log details (file with a .csv extension)" msgstr "" #. type: Plain text -#: user-manual.txt:3353 +#: user-manual.txt:3326 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:3355 +#: user-manual.txt:3328 msgid "" "_Subsurface_ accesses the .txt and the .csv files to obtain dive log " "information." msgstr "" #. type: Title === -#: user-manual.txt:3357 +#: user-manual.txt:3330 #, no-wrap msgid "Importing dive logs from the APD Inspiration CCR" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:3359 +#: user-manual.txt:3332 #, no-wrap msgid "images/APDComputer.jpg" -msgstr "" +msgstr "images/APDComputer.jpg" #. type: Plain text -#: user-manual.txt:3367 +#: user-manual.txt:3340 msgid "" "The dive logs of an APD Inspiration or similar CCR dive computer are " "downloaded using a communications adapter and _AP Communicator_, obtained " @@ -6697,82 +6662,82 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3369 +#: user-manual.txt:3342 msgid "Open a dive within the _AP Log Viewer_." msgstr "" #. type: Plain text -#: user-manual.txt:3370 +#: user-manual.txt:3343 msgid "Select the tab at the top of the screen, entitled \"_Data_\"." msgstr "" #. type: Plain text -#: user-manual.txt:3371 +#: user-manual.txt:3344 msgid "" "If the raw dive log data show on the screen, click on \"_Copy to Clipboard_" "\"." msgstr "" #. type: Plain text -#: user-manual.txt:3372 +#: user-manual.txt:3345 msgid "Open a text editor, e.g. Notepad (Windows), TextWrangler (Mac)." msgstr "" #. type: Plain text -#: user-manual.txt:3374 +#: user-manual.txt:3347 msgid "" "Copy the contents of the clipboard into the text editor and save the text " "file with a filename extension of .CSV" msgstr "" #. type: Plain text -#: user-manual.txt:3375 +#: user-manual.txt:3348 msgid "" -"Within _Subsurface_, select _Import->Import log files_ to open the xref:" +"Within _Subsurface_, select _Import -> Import log files_ to open the xref:" "Unified_import[universal import dialogue]." msgstr "" #. type: Plain text -#: user-manual.txt:3376 +#: user-manual.txt:3349 msgid "" "In the dropdown list towards the bottom right of the dialogue, select \"_CSV " "files_\"." msgstr "" #. type: Plain text -#: user-manual.txt:3378 +#: user-manual.txt:3351 msgid "" "On the list of file names select the .CSV file that has been created above. " "An import dialogue opens." msgstr "" #. type: Plain text -#: user-manual.txt:3380 +#: user-manual.txt:3353 msgid "" "In the dropdown list on the middle right labeled '_Pre-configured imports_" "\", select _APD Log Viewer_." msgstr "" #. type: Plain text -#: user-manual.txt:3381 +#: user-manual.txt:3354 msgid "" "Ensure the other settings for the ADP dive log are appropriate, then select " "_OK_." msgstr "" #. type: Plain text -#: user-manual.txt:3383 +#: user-manual.txt:3356 msgid "The APD dive log will appear within _Subsurface_." msgstr "" #. type: Title == -#: user-manual.txt:3385 +#: user-manual.txt:3358 #, no-wrap msgid "APPENDIX C: Exporting Dive log information from external dive log software." msgstr "" #. type: Plain text -#: user-manual.txt:3394 +#: user-manual.txt:3367 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, " @@ -6782,22 +6747,22 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3396 +#: user-manual.txt:3369 msgid "Export the foreign dive log data to format that is accessible from" msgstr "" #. type: Plain text -#: user-manual.txt:3397 +#: user-manual.txt:3370 msgid "_Subsurface_." msgstr "" #. type: Plain text -#: user-manual.txt:3398 +#: user-manual.txt:3371 msgid "Import the accessible dive log data into _Subsurface_." msgstr "" #. type: Plain text -#: user-manual.txt:3402 +#: user-manual.txt:3375 msgid "" "This appendix provides some information about approaches to export dive log " "data from foreign dive log software. The procedures below mostly apply to " @@ -6805,19 +6770,19 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3404 +#: user-manual.txt:3377 #, no-wrap msgid "Exporting dives from *Suunto Divemanager (DM3, DM4 or DM5)*" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:3405 +#: user-manual.txt:3378 #, no-wrap msgid "images/icons/suuntologo.jpg" -msgstr "" +msgstr "images/icons/suuntologo.jpg" #. type: Plain text -#: user-manual.txt:3412 +#: user-manual.txt:3385 msgid "" "DiveManager is a MS Windows application for Suunto dive computers. " "Divemanager 3 (DM3) is an older version of the Suunto software. More recent " @@ -6827,69 +6792,69 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3414 +#: user-manual.txt:3387 #, no-wrap msgid "*Divemanager 3 (DM3):*\n" msgstr "" #. type: Plain text -#: user-manual.txt:3416 +#: user-manual.txt:3389 msgid "" "Start 'Suunto Divemanager 3' and log in with the name containing the logs" msgstr "" #. type: Plain text -#: user-manual.txt:3417 +#: user-manual.txt:3390 msgid "Do not start the import wizard to import dives from the dive computer." msgstr "" #. type: Plain text -#: user-manual.txt:3419 +#: user-manual.txt:3392 msgid "" "In the navigation tree on the left side of the program-window, select the " "appropriate dives." msgstr "" #. type: Plain text -#: user-manual.txt:3420 +#: user-manual.txt:3393 msgid "" "Within the list of dives, select the dives you would like to import later:" msgstr "" #. type: Plain text -#: user-manual.txt:3421 +#: user-manual.txt:3394 msgid "To select certain dives: hold 'ctrl' and click the dive" msgstr "" #. type: Plain text -#: user-manual.txt:3422 +#: user-manual.txt:3395 msgid "To select all dives: Select the first dive, hold down shift and" msgstr "" #. type: Plain text -#: user-manual.txt:3423 +#: user-manual.txt:3396 msgid "select the last dive" msgstr "" #. type: Plain text -#: user-manual.txt:3424 +#: user-manual.txt:3397 msgid "With the dives marked, use the program menu _File -> Export_" msgstr "" #. type: Plain text -#: user-manual.txt:3425 +#: user-manual.txt:3398 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:3426 +#: user-manual.txt:3399 msgid "Click the browse button next to the field Export Path" msgstr "" #. type: Plain text -#: user-manual.txt:3428 +#: user-manual.txt:3401 #, no-wrap msgid "" "** A file-manager like window pops up\n" @@ -6897,13 +6862,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3429 +#: user-manual.txt:3402 #, no-wrap msgid "Divelog.SDE file\n" msgstr "" #. type: Plain text -#: user-manual.txt:3431 +#: user-manual.txt:3404 #, no-wrap msgid "" "** Optionally change the name of the file for saving\n" @@ -6911,25 +6876,25 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3432 +#: user-manual.txt:3405 #, no-wrap msgid "Back in the Export pop-up, press the button 'Export'\n" msgstr "" #. type: Plain text -#: user-manual.txt:3433 +#: user-manual.txt:3406 #, no-wrap msgid "The dives are now exported to the file Divelog.SDE.\n" msgstr "" #. type: Plain text -#: user-manual.txt:3435 +#: user-manual.txt:3408 #, no-wrap msgid "*Divemanager 4 (DM4) and Divemanager 5 (DM5):*\n" msgstr "" #. type: Plain text -#: user-manual.txt:3440 +#: user-manual.txt:3413 msgid "" "DM4 and DM5 use identical mechanisms for exporting dive logs. To export a " "divelog from Divemanager one needs to locate the DM4/DM5 database where the " @@ -6938,75 +6903,75 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3442 +#: user-manual.txt:3415 msgid "Locating the Suunto DM4 (or DM5) database:" msgstr "" #. type: Plain text -#: user-manual.txt:3444 user-manual.txt:3453 +#: user-manual.txt:3417 user-manual.txt:3426 msgid "Start Suunto DM4/DM5" msgstr "" #. type: Plain text -#: user-manual.txt:3445 +#: user-manual.txt:3418 msgid "Select 'Help -> About'" msgstr "" #. type: Plain text -#: user-manual.txt:3446 +#: user-manual.txt:3419 msgid "Click 'Copy' after text 'Copy log folder path to clipboard'" msgstr "" #. type: Plain text -#: user-manual.txt:3447 +#: user-manual.txt:3420 msgid "Now open Windows Explorer" msgstr "" #. type: Plain text -#: user-manual.txt:3448 +#: user-manual.txt:3421 msgid "Paste the address to the path box at the top of the File Explorer" msgstr "" #. type: Plain text -#: user-manual.txt:3449 +#: user-manual.txt:3422 msgid "The database is called DM4.db or DM5.db" msgstr "" #. type: Plain text -#: user-manual.txt:3451 +#: user-manual.txt:3424 msgid "Making a backup copy of the Suunto DM4/DM5 database:" msgstr "" #. type: Plain text -#: user-manual.txt:3454 +#: user-manual.txt:3427 msgid "Select 'File - Create backup'" msgstr "" #. type: Plain text -#: user-manual.txt:3456 +#: user-manual.txt:3429 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:3457 +#: user-manual.txt:3430 msgid "Click 'Save'" msgstr "" #. type: Plain text -#: user-manual.txt:3458 +#: user-manual.txt:3431 msgid "The dives are now exported to the file DM4.bak (or DM5.bak)" msgstr "" #. type: Title === -#: user-manual.txt:3460 +#: user-manual.txt:3433 #, no-wrap msgid "Exporting from Atomic Logbook" msgstr "" #. type: Plain text -#: user-manual.txt:3469 +#: user-manual.txt:3442 msgid "" "Atomic Logbook is a Windows software by Atomic Aquatics. It allows " "downloading of dive information from Cobalt and Cobalt 2 dive computers. " @@ -7016,19 +6981,19 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3471 +#: user-manual.txt:3444 #, no-wrap msgid "Exporting from Mares Dive Organiser V2.1" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:3474 +#: user-manual.txt:3447 #, no-wrap msgid "images/icons/mareslogo.jpg" -msgstr "" +msgstr "images/icons/mareslogo.jpg" #. type: Plain text -#: user-manual.txt:3482 +#: user-manual.txt:3455 msgid "" "Mares Dive Organiser is a Windows application. The dive log is kept as a " "Microsoft SQL Compact Edition database with a '.sdf' filename extension. The " @@ -7039,7 +7004,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3487 +#: user-manual.txt:3460 msgid "" "Within Dive Organiser, select _Database -> Backup_ from the main menu and " "back up the database to the desk top. This creates a zipped file " @@ -7047,36 +7012,36 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3490 +#: user-manual.txt:3463 msgid "" "Rename the file to DiveOrganiserxxxxx.zip. Inside the zipped directory is a " "file _DiveOrganiser.sdf_." msgstr "" #. type: Plain text -#: user-manual.txt:3491 +#: user-manual.txt:3464 msgid "Extract the _.sdf_ file from the zipped folder to your Desktop." msgstr "" #. type: Plain text -#: user-manual.txt:3492 +#: user-manual.txt:3465 msgid "The password for accessing the .zip file is _mares_." msgstr "" #. type: Title === -#: user-manual.txt:3494 +#: user-manual.txt:3467 #, no-wrap msgid "Exporting dives from *DivingLog 5.0*" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:3496 +#: user-manual.txt:3469 #, no-wrap msgid "images/icons/divingloglogo.jpg" -msgstr "" +msgstr "images/icons/divingloglogo.jpg" #. type: Plain text -#: user-manual.txt:3505 +#: user-manual.txt:3478 msgid "" "Unfortunately DivingLog XML files give us no indication on the preferences " "set on one's system. So in order for _Subsurface_ to be able to successfully " @@ -7087,28 +7052,28 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3507 +#: user-manual.txt:3480 msgid "In DivingLog open the 'File -> Export -> XML' menu" msgstr "" #. type: Plain text -#: user-manual.txt:3508 +#: user-manual.txt:3481 msgid "Select the dives to export" msgstr "" #. type: Plain text -#: user-manual.txt:3509 +#: user-manual.txt:3482 msgid "Click on the export button and select the filename" msgstr "" #. type: Title == -#: user-manual.txt:3511 +#: user-manual.txt:3484 #, no-wrap msgid "APPENDIX D: Exporting a spreadsheet to CSV format" msgstr "" #. type: Plain text -#: user-manual.txt:3521 +#: user-manual.txt:3494 msgid "" "Many divers keep a diving log in some form of a digital file, commonly a " "spreadsheet with various fields of information. These logs can be easily " @@ -7122,7 +7087,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3527 +#: user-manual.txt:3500 msgid "" "The first step is to organize the diving data in the spreadsheet, so that " "the first row contains the names (or titles) of each column and the " @@ -7133,41 +7098,41 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3529 +#: user-manual.txt:3502 msgid "" "Date: use one of the following formats: yyyy-mm-dd, dd.mm.yyyy, mm/dd/yyyy" msgstr "" #. type: Plain text -#: user-manual.txt:3530 +#: user-manual.txt:3503 msgid "Duration: the format should be minutes:seconds." msgstr "" #. type: Plain text -#: user-manual.txt:3531 +#: user-manual.txt:3504 msgid "" "Unit system: only one unit system shold be used (i.e., no mixture between " "imperial and metric units)" msgstr "" #. type: Plain text -#: user-manual.txt:3532 +#: user-manual.txt:3505 msgid "Tags and buddies: values should be separated using a comma." msgstr "" #. type: Plain text -#: user-manual.txt:3533 +#: user-manual.txt:3506 msgid "GPS position: users must use decimal degrees, e.g. 30.22496 30.821798" msgstr "" #. type: Title === -#: user-manual.txt:3534 +#: user-manual.txt:3507 #, no-wrap msgid "_LibreOffice Calc_ and _OpenOffice Calc_" msgstr "" #. type: Plain text -#: user-manual.txt:3538 +#: user-manual.txt:3511 msgid "" "These are open source spreadsheet applications forming parts of larger open " "source office suite applications. The user interaction with _LibreOffice_ " @@ -7178,13 +7143,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:3539 +#: user-manual.txt:3512 #, no-wrap msgid "images/LOffice_spreadsheetdata.jpg" -msgstr "" +msgstr "images/LOffice_spreadsheetdata.jpg" #. type: Plain text -#: user-manual.txt:3542 +#: user-manual.txt:3515 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 " @@ -7192,13 +7157,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:3543 +#: user-manual.txt:3516 #, no-wrap msgid "images/LOffice_save_as_options.jpg" -msgstr "" +msgstr "images/LOffice_save_as_options.jpg" #. type: Plain text -#: user-manual.txt:3546 +#: user-manual.txt:3519 msgid "" "After selecting _Save_, select the appropriate field delimiter (choose _Tab_ " "to prevent conflicts with the comma when using this as a decimal point), " @@ -7206,13 +7171,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:3547 +#: user-manual.txt:3520 #, no-wrap msgid "images/LOffice_field_options.jpg" -msgstr "" +msgstr "images/LOffice_field_options.jpg" #. type: Plain text -#: user-manual.txt:3550 +#: user-manual.txt:3523 msgid "" "One can double check the .CSV file by opening it with a text editor, and " "then import the dive data as explained on the section xref:" @@ -7220,13 +7185,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3551 +#: user-manual.txt:3524 #, no-wrap msgid "Microsoft _Excel_" msgstr "" #. type: Plain text -#: user-manual.txt:3557 +#: user-manual.txt:3530 msgid "" "The field delimiter (called \"_list separator_\" in Microsoft manuals) is " "not accessible from within _Excel_ and needs to be set through the " @@ -7237,19 +7202,19 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3559 +#: user-manual.txt:3532 msgid "" "In Microsoft Windows, click the *Start* button, and then select _Control " "Panel_ from the list on the right-hand side." msgstr "" #. type: Plain text -#: user-manual.txt:3560 +#: user-manual.txt:3533 msgid "Open the _Regional and Language Options_ dialog box." msgstr "" #. type: Plain text -#: user-manual.txt:3563 +#: user-manual.txt:3536 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 " @@ -7257,48 +7222,48 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3564 +#: user-manual.txt:3537 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:3565 +#: user-manual.txt:3538 msgid "Click _OK_ twice." msgstr "" #. type: Plain text -#: user-manual.txt:3567 +#: user-manual.txt:3540 msgid "Below is an image of the _Control Panel_:" msgstr "" #. type: Target for macro image -#: user-manual.txt:3568 +#: user-manual.txt:3541 #, no-wrap msgid "images/Win_SaveCSV2.jpg" -msgstr "" +msgstr "images/Win_SaveCSV2.jpg" #. type: Plain text -#: user-manual.txt:3571 +#: user-manual.txt:3544 msgid "To export the dive log in CSV format:" msgstr "" #. type: Plain text -#: user-manual.txt:3573 +#: user-manual.txt:3546 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:3574 +#: user-manual.txt:3547 #, no-wrap msgid "images/Win_SaveCSV1.jpg" -msgstr "" +msgstr "images/Win_SaveCSV1.jpg" #. type: Plain text -#: user-manual.txt:3577 +#: user-manual.txt:3550 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 " @@ -7308,13 +7273,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:3578 +#: user-manual.txt:3551 #, no-wrap msgid "images/Win_SaveCSV3.jpg" -msgstr "" +msgstr "images/Win_SaveCSV3.jpg" #. type: Plain text -#: user-manual.txt:3581 +#: user-manual.txt:3554 msgid "" "Select the _Save_ button. The CSV-formatted file is saved into the folder " "that was selected. One can double check the .CSV file by opening it with a " @@ -7323,19 +7288,19 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:3582 +#: user-manual.txt:3555 #, no-wrap msgid "APPENDIX E: FAQs." msgstr "" #. type: Title === -#: user-manual.txt:3584 +#: user-manual.txt:3557 #, no-wrap msgid "Subsurface appears to miscalculate gas consumption and SAC" msgstr "" #. type: Plain text -#: user-manual.txt:3588 +#: user-manual.txt:3561 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_ " @@ -7343,7 +7308,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3594 +#: user-manual.txt:3567 msgid "" "'Answer': Not really. What happens is that _Subsurface_ actually calculates " "gas consumption differently - and better - than you expect. In particular, " @@ -7353,7 +7318,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3600 +#: user-manual.txt:3573 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 " @@ -7363,12 +7328,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3602 +#: user-manual.txt:3575 msgid "+consumption = (amount_of_air_at_beginning - amount_of_air_at_end)+" msgstr "" #. type: Plain text -#: user-manual.txt:3608 +#: user-manual.txt:3581 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 " @@ -7379,12 +7344,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3610 +#: user-manual.txt:3583 msgid "+12.2*((220-100)/1.013)+" msgstr "" #. type: Plain text -#: user-manual.txt:3615 +#: user-manual.txt:3588 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 " @@ -7394,7 +7359,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3621 +#: user-manual.txt:3594 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 " @@ -7405,13 +7370,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3622 +#: user-manual.txt:3595 #, no-wrap msgid "Some dive profiles have time discrepancies with the recorded samples from my dive computer..." msgstr "" #. type: Plain text -#: user-manual.txt:3626 +#: user-manual.txt:3599 msgid "" "_Subsurface_ ends up ignoring surface time for many things (average depth, " "divetime, SAC, etc). 'Question': Why do dive durations in my dive computer " @@ -7419,7 +7384,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3634 +#: user-manual.txt:3607 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 " |