diff options
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/50-pot/subsurface-manual.pot | 1927 | ||||
| -rw-r--r-- | Documentation/fr/po/subsurface-manual.fr.po | 1943 | ||||
| -rw-r--r-- | Documentation/user-manual_fr.html.git | 1310 | ||||
| -rw-r--r-- | Documentation/user-manual_fr.txt | 416 |
4 files changed, 3059 insertions, 2537 deletions
diff --git a/Documentation/50-pot/subsurface-manual.pot b/Documentation/50-pot/subsurface-manual.pot index e9ea21304..f129facb2 100644 --- a/Documentation/50-pot/subsurface-manual.pot +++ b/Documentation/50-pot/subsurface-manual.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: subsurface-manual VERSION\n" "Report-Msgid-Bugs-To: subsurface@subsurface-divelog.org\n" -"POT-Creation-Date: 2015-09-01 13:56+0200\n" +"POT-Creation-Date: 2015-09-08 10:29+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -586,13 +586,12 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:288 ./user-manual.txt:768 +#: ./user-manual.txt:288 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 " -"description will cause unexpected behaviour (Subsurface will think that all " -"of these dives have the same location and try to keep their GPS coordinates " -"the same)." +"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 description will " +"cause unexpected behaviour (Subsurface will think that all of these dives " +"have the same location and try to keep their GPS coordinates the same)." msgstr "" #. type: Plain text @@ -973,7 +972,7 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: ./user-manual.txt:489 ./user-manual.txt:2991 +#: ./user-manual.txt:489 ./user-manual.txt:3012 #, no-wrap msgid "images/icons/warning2.png" msgstr "" @@ -1419,6 +1418,16 @@ msgid "" msgstr "" #. type: Plain text +#: ./user-manual.txt:768 +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 " +"description will cause unexpected behaviour (Subsurface will think that all " +"of these dives have the same location and try to keep their GPS coordinates " +"the same)." +msgstr "" + +#. type: Plain text #: ./user-manual.txt:773 #, no-wrap msgid "" @@ -2569,7 +2578,7 @@ 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:1426 ./user-manual.txt:1523 ./user-manual.txt:1924 +#: ./user-manual.txt:1426 ./user-manual.txt:1523 ./user-manual.txt:1939 #, no-wrap msgid "images/icons/info.jpg" msgstr "" @@ -3420,15 +3429,16 @@ msgstr "" #. type: Plain text #: ./user-manual.txt:1822 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 " +"regulate the oxygen concentration to remain within safe diving limits. The " +"CCR interface of _Subsurface_ is currently experimental and under active " +"development. Subsurface currently supports Poseidon MkVI and APD " +"Discovery/Evolution dive computers. In contrast to a conventional " "recreational dive computer, a CCR system computer does not allow the " "download of a log containing multiple dives. Rather, each dive is stored " "independently. This means that _Subsurface_ cannot download a dive log " "directly from a CCR dive computer, but that it imports CCR dive logs in the " -"same way that it imports dive log data from other digital databases." +"same way that it imports dive log data from other digital databases: one " +"dive at a time." msgstr "" #. type: Title ===== @@ -3438,31 +3448,31 @@ msgid "Import a CCR dive" msgstr "" #. type: Plain text -#: ./user-manual.txt:1836 +#: ./user-manual.txt:1837 msgid "" "See the section dealing with xref:S_ImportingAlienDiveLogs[Importing dive " "information from other digital sources]. From the main menu of _Subsurface_, " "select _Import -> Import log files_ to bring up the " "xref:Unified_import[universal import dialogue]. As explained in that " "section, the bottom right hand of the import dialogue contains a dropdown " -"list of appropriate devices that currently includes an option for (Poseidon) " -"MkVI files (import for other CCR equipment is under active " -"development). Having selected the appropriate CCR format and the directory " -"where the original dive logs have been stored from the CCR dive computer, " -"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." +"list (labled _Filter:_) of appropriate devices that currently " +"includes(Poseidon) MkVI or APD log viewer files (import for other CCR " +"equipment is under active development). Having selected the appropriate CCR " +"format and the directory where the original dive logs have been stored from " +"the CCR dive computer, 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. See the section below for" msgstr "" #. type: Title ===== -#: ./user-manual.txt:1837 +#: ./user-manual.txt:1838 #, no-wrap msgid "Displayed information for a CCR dive" msgstr "" #. type: Plain text -#: ./user-manual.txt:1847 +#: ./user-manual.txt:1848 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 " @@ -3476,12 +3486,12 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:1849 +#: ./user-manual.txt:1850 msgid "For TWO O~2~ sensors the mean value of the two sensors are given." msgstr "" #. type: Plain text -#: ./user-manual.txt:1853 +#: ./user-manual.txt:1854 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 " @@ -3490,54 +3500,54 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:1855 +#: ./user-manual.txt:1856 msgid "" "If no sensor data is available, the pO~2~ value is assumed to be equal to " "the setpoint." msgstr "" #. type: Plain text -#: ./user-manual.txt:1857 +#: ./user-manual.txt:1858 msgid "The mean pO~2~ of the sensors is indicated with a green line," msgstr "" #. type: Plain text -#: ./user-manual.txt:1865 +#: ./user-manual.txt:1866 msgid "" "The oxygen setpoint values as well as the readings from the individual " "oxygen sensors can be shown. The display of additional CCR information is " "turned on by checking the appropriate checkboxes in the _Preferences_ panel " "(accessible by selecting xref:S_CCR_options[_File -> Preferences -> " -"Graph_]). This part of the _Preferences_ panel look like this, representing " -"two checkboxes that modify the display of pO~2~ when the appropriate toolbar " -"button on the Dive Profile has been activated." +"Graph_]). This part of the _Preferences_ panel is shown in the image below, " +"representing two checkboxes that modify the display of pO~2~ when the " +"appropriate toolbar button on the Dive Profile has been activated." msgstr "" #. type: Target for macro image -#: ./user-manual.txt:1866 +#: ./user-manual.txt:1867 #, no-wrap msgid "images/CCR_preferences_f20.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:1873 +#: ./user-manual.txt:1874 msgid "" -"Checking any of the check boxes allows the display of additional " +"Checking any of these check boxes allows the display of additional " "oxygen-related information whenever the pO~2~ toolbar button on the " "_Profile_ panel is activated. The first checkbox allows the display of " "setpoint information. This is a red line superimposed on the green oxygen " "partial pressure graph and allows a comparison of the mean measured oxygen " -"partial pressure and the setpoint values, as in the image below." +"partial pressure and the setpoint values, as shown below." msgstr "" #. type: Target for macro image -#: ./user-manual.txt:1874 +#: ./user-manual.txt:1875 #, no-wrap msgid "images/CCR_setpoint_f20.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:1878 +#: ./user-manual.txt:1879 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 " @@ -3545,22 +3555,22 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:1880 +#: ./user-manual.txt:1881 msgid "Sensor 1: grey" msgstr "" #. type: Plain text -#: ./user-manual.txt:1881 +#: ./user-manual.txt:1882 msgid "Sensor 2: blue" msgstr "" #. type: Plain text -#: ./user-manual.txt:1882 +#: ./user-manual.txt:1883 msgid "Sensor 3: brown" msgstr "" #. type: Plain text -#: ./user-manual.txt:1886 +#: ./user-manual.txt:1887 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 " @@ -3568,13 +3578,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: ./user-manual.txt:1887 +#: ./user-manual.txt:1888 #, no-wrap msgid "images/CCR_sensor_data_f20.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:1892 +#: ./user-manual.txt:1893 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, " @@ -3582,7 +3592,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:1896 +#: ./user-manual.txt:1897 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 " @@ -3591,7 +3601,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:1904 +#: ./user-manual.txt:1905 msgid "" "_Cylinder pressures_: Some CCR dive computers like the Poseidon MkVI record " "the pressures of the oxygen and diluent cylinders. The pressures of these " @@ -3604,13 +3614,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: ./user-manual.txt:1905 +#: ./user-manual.txt:1906 #, no-wrap -msgid "images/CCR_dive_profile_f20.jpg" +msgid "images/CCR_dive_profile_f22.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:1910 +#: ./user-manual.txt:1911 msgid "" "_Equipment-specific information_: Equipment-specific information gathered by " "_Subsurface_ is shown in the xref:S_ExtraDataTab[Extra data tab]. This may " @@ -3618,27 +3628,61 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:1913 +#: ./user-manual.txt:1917 +msgid "" +"The deco ceiling calculated by Subsurface is not very accurate because the " +"precise pressure of nitrogen in the loop can usually not be determined from " +"the dive log imported from the CCR equipment. Many CCR dive computers, " +"however, report an internally-calculated deco ceiling that is reported in " +"the dive log, reflecting a more accurate assessment. The display of this " +"ceiling is activated by clicking the appropriate button to the left of the " +"dive profile:" +msgstr "" + +#. type: Named 'icon' AttributeList argument for style 'icon' +#: ./user-manual.txt:1918 ./user-manual.txt:2101 +#, no-wrap +msgid "images/icons/cceiling.jpg" +msgstr "" + +#. type: Plain text +#: ./user-manual.txt:1923 +msgid "" +"The default colour of the computer-generated deco ceiling is white. However, " +"this can be set to red by checking the appropriate check box after selecting " +"_File -> Preferences -> Graph_. Below is a dive profile indicating the dive " +"computer-generated deco ceiling:" +msgstr "" + +#. type: Target for macro image +#: ./user-manual.txt:1924 +#, no-wrap +msgid "images/CCR_dive_ceilingF22.jpg" +msgstr "" + +#. type: Plain text +#: ./user-manual.txt:1928 msgid "" "More equipment-specific information for downloading CCR dive logs for " -"Poseidon MkVI and APD equipment can be found in xref:S_PoseidonMkVI[Appendix " +"Poseidon MkVI and APD equipment can be found in " +"xref:_appendix_b_dive_computer_specific_information_for_importing_dive_information[Appendix " "B]." msgstr "" #. type: Title == -#: ./user-manual.txt:1914 +#: ./user-manual.txt:1929 #, no-wrap msgid "Obtaining more information about dives entered into the logbook" msgstr "" #. type: Title === -#: ./user-manual.txt:1916 +#: ./user-manual.txt:1931 #, no-wrap msgid "The *Info* tab (for individual dives)" msgstr "" #. type: Plain text -#: ./user-manual.txt:1923 +#: ./user-manual.txt:1938 msgid "" "The Info tab gives some summary information about a particular dive that has " "been selected in the *Dive List*. Useful information here includes the " @@ -3648,7 +3692,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:1930 +#: ./user-manual.txt:1945 msgid "" "Gas consumption and SAC calculations: _Subsurface_ calculates SAC and Gas " "consumption taking in account gas incompressibility, particularly at tank " @@ -3657,13 +3701,13 @@ msgid "" msgstr "" #. type: Title === -#: ./user-manual.txt:1932 +#: ./user-manual.txt:1947 #, no-wrap msgid "The *Extra Data* tab (usually for individual dives)" msgstr "" #. type: Plain text -#: ./user-manual.txt:1940 +#: ./user-manual.txt:1955 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 " @@ -3675,19 +3719,19 @@ msgid "" msgstr "" #. type: Target for macro image -#: ./user-manual.txt:1941 +#: ./user-manual.txt:1956 #, no-wrap msgid "images/ExtraDataTab_f20.jpg" msgstr "" #. type: Title === -#: ./user-manual.txt:1943 +#: ./user-manual.txt:1958 #, no-wrap msgid "The *Stats* tab (for groups of dives)" msgstr "" #. type: Plain text -#: ./user-manual.txt:1954 +#: ./user-manual.txt:1969 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 " @@ -3700,19 +3744,19 @@ msgid "" msgstr "" #. type: Title === -#: ./user-manual.txt:1956 +#: ./user-manual.txt:1971 #, no-wrap msgid "The *Dive Profile*" msgstr "" #. type: Target for macro image -#: ./user-manual.txt:1958 +#: ./user-manual.txt:1973 #, no-wrap msgid "images/Profile2.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:1969 +#: ./user-manual.txt:1984 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 " @@ -3725,7 +3769,7 @@ msgid "" msgstr "" #. type: delimited block | -#: ./user-manual.txt:1976 +#: ./user-manual.txt:1991 #, no-wrap msgid "" "|*Colour*|*Descent speed (m/min)*|*Ascent speed (m/min)*\n" @@ -3737,7 +3781,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:1981 +#: ./user-manual.txt:1996 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 " @@ -3746,13 +3790,13 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: ./user-manual.txt:1982 +#: ./user-manual.txt:1997 #, no-wrap msgid "images/icons/scale.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:1987 +#: ./user-manual.txt:2002 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 " @@ -3761,7 +3805,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:1990 +#: ./user-manual.txt:2005 #, no-wrap msgid "" "*Water temperature* is displayed with its own blue line with temperature " @@ -3770,7 +3814,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:1997 +#: ./user-manual.txt:2012 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 " @@ -3781,13 +3825,13 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: ./user-manual.txt:1998 +#: ./user-manual.txt:2013 #, no-wrap msgid "images/icons/O2.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:2002 +#: ./user-manual.txt:2017 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 " @@ -3795,26 +3839,26 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: ./user-manual.txt:2003 +#: ./user-manual.txt:2018 #, no-wrap msgid "images/icons/N2.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:2006 +#: ./user-manual.txt:2021 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:2007 +#: ./user-manual.txt:2022 #, no-wrap msgid "images/icons/He.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:2011 +#: ./user-manual.txt:2026 msgid "" "Clicking this button allows display of the partial pressure of *helium* " "during the dive. This is only of importance to divers using Trimix, " @@ -3822,7 +3866,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:2024 +#: ./user-manual.txt:2039 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 " @@ -3837,13 +3881,13 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: ./user-manual.txt:2025 +#: ./user-manual.txt:2040 #, no-wrap msgid "images/icons/Heartbutton.png" msgstr "" #. type: Plain text -#: ./user-manual.txt:2029 +#: ./user-manual.txt:2044 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 " @@ -3851,7 +3895,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:2037 +#: ./user-manual.txt:2052 #, no-wrap msgid "" "It is possible to *zoom* into the profile graph. This is done either by " @@ -3866,19 +3910,19 @@ msgid "" msgstr "" #. type: Target for macro image -#: ./user-manual.txt:2038 +#: ./user-manual.txt:2053 #, no-wrap msgid "images/MeasuringBar.png" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: ./user-manual.txt:2040 +#: ./user-manual.txt:2055 #, no-wrap msgid "images/icons/ruler.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:2048 +#: ./user-manual.txt:2063 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 " @@ -3888,13 +3932,13 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: ./user-manual.txt:2049 +#: ./user-manual.txt:2064 #, no-wrap msgid "images/icons/ShowPhotos.png" msgstr "" #. type: Plain text -#: ./user-manual.txt:2056 +#: ./user-manual.txt:2071 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 " @@ -3903,7 +3947,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:2085 +#: ./user-manual.txt:2100 msgid "" "The profile can also include the dive computer reported *ceiling* (more " "precisely, the deepest deco stop that the dive computer calculated for each " @@ -3932,14 +3976,8 @@ msgid "" "bottom times." msgstr "" -#. type: Named 'icon' AttributeList argument for style 'icon' -#: ./user-manual.txt:2086 -#, no-wrap -msgid "images/icons/cceiling.jpg" -msgstr "" - #. type: Plain text -#: ./user-manual.txt:2091 +#: ./user-manual.txt:2106 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 " @@ -3947,13 +3985,13 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: ./user-manual.txt:2092 +#: ./user-manual.txt:2107 #, no-wrap msgid "images/icons/ceiling1.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:2097 +#: ./user-manual.txt:2112 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 " @@ -3962,13 +4000,13 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: ./user-manual.txt:2098 +#: ./user-manual.txt:2113 #, no-wrap msgid "images/icons/ceiling2.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:2102 +#: ./user-manual.txt:2117 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 " @@ -3976,32 +4014,32 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: ./user-manual.txt:2103 +#: ./user-manual.txt:2118 #, no-wrap msgid "images/icons/ceiling3.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:2107 +#: ./user-manual.txt:2122 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:2108 +#: ./user-manual.txt:2123 #, no-wrap msgid "images/Ceilings2.jpg" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: ./user-manual.txt:2110 +#: ./user-manual.txt:2125 #, no-wrap msgid "images/icons/ShowCylindersButton.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:2116 +#: ./user-manual.txt:2131 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 " @@ -4013,19 +4051,19 @@ msgid "" msgstr "" #. type: Target for macro image -#: ./user-manual.txt:2117 +#: ./user-manual.txt:2132 #, no-wrap msgid "images/ShowCylinders_f20.jpg" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: ./user-manual.txt:2120 +#: ./user-manual.txt:2135 #, no-wrap msgid "images/tissues.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:2132 +#: ./user-manual.txt:2147 msgid "" "Display inert gas tissue pressures relative to ambient inert gas pressure " "(horizontal grey line). Tissue pressures are calculated using the Bühlmann " @@ -4044,13 +4082,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: ./user-manual.txt:2133 +#: ./user-manual.txt:2148 #, no-wrap msgid "images/tissuesGraph.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:2141 +#: ./user-manual.txt:2156 msgid "" "Gradient Factor settings strongly affect the calculated ceilings and their " "depths. For more information about Gradient factors, see the section on " @@ -4063,7 +4101,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:2143 +#: ./user-manual.txt:2158 #, no-wrap msgid "" " ** http://www.tek-dive.com/portal/upload/M-Values.pdf[Understanding " @@ -4071,7 +4109,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:2145 +#: ./user-manual.txt:2160 #, no-wrap msgid "" " ** " @@ -4080,13 +4118,13 @@ msgid "" msgstr "" #. type: Title === -#: ./user-manual.txt:2147 +#: ./user-manual.txt:2162 #, no-wrap msgid "The Dive Profile context menu" msgstr "" #. type: Plain text -#: ./user-manual.txt:2165 +#: ./user-manual.txt:2180 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 " @@ -4107,13 +4145,13 @@ msgid "" msgstr "" #. type: Title === -#: ./user-manual.txt:2167 +#: ./user-manual.txt:2182 #, no-wrap msgid "The *Information Box*" msgstr "" #. type: Plain text -#: ./user-manual.txt:2177 +#: ./user-manual.txt:2192 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 " @@ -4126,13 +4164,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: ./user-manual.txt:2178 +#: ./user-manual.txt:2193 #, no-wrap msgid "images/InfoBox2.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:2195 +#: ./user-manual.txt:2210 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 " @@ -4153,20 +4191,20 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:2198 +#: ./user-manual.txt:2213 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:2199 +#: ./user-manual.txt:2214 #, no-wrap msgid "images/icons/MOD.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:2206 +#: ./user-manual.txt:2221 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 " @@ -4176,13 +4214,13 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: ./user-manual.txt:2207 +#: ./user-manual.txt:2222 #, no-wrap msgid "images/icons/NDL.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:2216 +#: ./user-manual.txt:2231 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 " @@ -4195,13 +4233,13 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: ./user-manual.txt:2217 +#: ./user-manual.txt:2232 #, no-wrap msgid "images/icons/SAC.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:2226 +#: ./user-manual.txt:2241 msgid "" "Clicking this button causes the Information Box to display the *Surface Air " "Consumption (SAC)*. SAC is an indication of the surface-normalised " @@ -4214,13 +4252,13 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: ./user-manual.txt:2227 +#: ./user-manual.txt:2242 #, no-wrap msgid "images/icons/EAD.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:2242 +#: ./user-manual.txt:2257 msgid "" "Clicking this button displays the *Equivalent Air Depth (EAD)* for nitrox " "dives as well as the *Equivalent Narcotic Depth (END)* for trimix " @@ -4237,20 +4275,20 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:2244 +#: ./user-manual.txt:2259 msgid "" "Figure (*B*) above shows an information box with a nearly complete set of " "data." msgstr "" #. type: Title ==== -#: ./user-manual.txt:2246 +#: ./user-manual.txt:2261 #, no-wrap msgid "The Gas Pressure Bar Graph" msgstr "" #. type: Plain text -#: ./user-manual.txt:2253 +#: ./user-manual.txt:2268 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 " @@ -4261,13 +4299,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: ./user-manual.txt:2254 +#: ./user-manual.txt:2269 #, no-wrap msgid "images/GasPressureBarGraph.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:2260 +#: ./user-manual.txt:2275 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 " @@ -4277,7 +4315,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:2266 +#: ./user-manual.txt:2281 msgid "" "The horizontal black line underneath the light green margin indicates the " "equilibrium pressure of the inert gases inhaled by the diver, usually " @@ -4288,7 +4326,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:2270 +#: ./user-manual.txt:2285 msgid "" "The dark green area at the bottom of the graph represents the pressures of " "inert gas in each of the 16 tissue compartments, following the Bühlmann " @@ -4296,7 +4334,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:2275 +#: ./user-manual.txt:2290 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 " @@ -4306,7 +4344,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:2279 +#: ./user-manual.txt:2294 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 " @@ -4314,7 +4352,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:2282 +#: ./user-manual.txt:2297 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 " @@ -4322,7 +4360,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:2285 +#: ./user-manual.txt:2300 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 " @@ -4330,7 +4368,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:2288 +#: ./user-manual.txt:2303 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 " @@ -4338,7 +4376,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:2293 +#: ./user-manual.txt:2308 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 " @@ -4348,7 +4386,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:2299 +#: ./user-manual.txt:2314 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 " @@ -4359,7 +4397,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:2304 +#: ./user-manual.txt:2319 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 " @@ -4369,19 +4407,19 @@ msgid "" msgstr "" #. type: Title == -#: ./user-manual.txt:2307 +#: ./user-manual.txt:2322 #, no-wrap msgid "Organising the logbook (Manipulating groups of dives)" msgstr "" #. type: Title === -#: ./user-manual.txt:2309 +#: ./user-manual.txt:2324 #, no-wrap msgid "The Dive List context menu" msgstr "" #. type: Plain text -#: ./user-manual.txt:2313 +#: ./user-manual.txt:2328 msgid "" "Several actions on either a single dive or a group of dives can be performed " "using the Dive List Context Menu, found by selecting either a single dive or " @@ -4389,30 +4427,30 @@ msgid "" msgstr "" #. type: Target for macro image -#: ./user-manual.txt:2314 +#: ./user-manual.txt:2329 #, no-wrap msgid "images/ContextMenu.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:2317 +#: ./user-manual.txt:2332 msgid "The context menu is used in many manipulations described below." msgstr "" #. type: Title ==== -#: ./user-manual.txt:2318 +#: ./user-manual.txt:2333 #, no-wrap msgid "Customising the information showed in the *Dive List* panel" msgstr "" #. type: Target for macro image -#: ./user-manual.txt:2320 +#: ./user-manual.txt:2335 #, no-wrap msgid "images/DiveListOptions.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:2328 +#: ./user-manual.txt:2343 msgid "" "The default information in the *Dive List* includes, for each dive, " "Dive_number, Date, Rating, Dive_depth, Dive_duration and Dive_location. This " @@ -4426,13 +4464,13 @@ msgid "" msgstr "" #. type: Title ==== -#: ./user-manual.txt:2329 +#: ./user-manual.txt:2344 #, no-wrap msgid "Selecting dives from a particular dive site" msgstr "" #. type: Plain text -#: ./user-manual.txt:2335 +#: ./user-manual.txt:2350 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 " @@ -4442,13 +4480,13 @@ msgid "" msgstr "" #. type: Title === -#: ./user-manual.txt:2337 +#: ./user-manual.txt:2352 #, no-wrap msgid "Renumbering the dives" msgstr "" #. type: Plain text -#: ./user-manual.txt:2349 +#: ./user-manual.txt:2364 msgid "" "Dives are normally numbered incrementally from non-recent dives (low " "sequence numbers) to recent dives (having the highest sequence numbers). The " @@ -4464,7 +4502,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:2354 +#: ./user-manual.txt:2369 msgid "" "One can also renumber a few selected dives in the dive list. Select the " "dives that need renumbering. Right-click on the selected list and use the " @@ -4474,13 +4512,13 @@ msgid "" msgstr "" #. type: Title === -#: ./user-manual.txt:2356 +#: ./user-manual.txt:2371 #, no-wrap msgid "Grouping dives into trips and manipulating trips" msgstr "" #. type: Plain text -#: ./user-manual.txt:2364 +#: ./user-manual.txt:2379 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 " @@ -4491,13 +4529,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: ./user-manual.txt:2365 +#: ./user-manual.txt:2380 #, no-wrap msgid "images/Group2.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:2371 +#: ./user-manual.txt:2386 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 " @@ -4506,13 +4544,13 @@ msgid "" msgstr "" #. type: Title ==== -#: ./user-manual.txt:2372 +#: ./user-manual.txt:2387 #, no-wrap msgid "Editing the title and associated information for a particular trip" msgstr "" #. type: Plain text -#: ./user-manual.txt:2385 +#: ./user-manual.txt:2400 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 " @@ -4527,13 +4565,13 @@ msgid "" msgstr "" #. type: Title ==== -#: ./user-manual.txt:2386 +#: ./user-manual.txt:2401 #, no-wrap msgid "Viewing the dives during a particular trip" msgstr "" #. type: Plain text -#: ./user-manual.txt:2391 +#: ./user-manual.txt:2406 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 " @@ -4542,13 +4580,13 @@ msgid "" msgstr "" #. type: Title ==== -#: ./user-manual.txt:2392 +#: ./user-manual.txt:2407 #, no-wrap msgid "Collapsing or expanding dive information for different trips" msgstr "" #. type: Plain text -#: ./user-manual.txt:2398 +#: ./user-manual.txt:2413 msgid "" "After selecting a particular trip in the dive list, the context menu allows " "several possibilities to expand or collapse dives within trips. This " @@ -4557,13 +4595,13 @@ msgid "" msgstr "" #. type: Title ==== -#: ./user-manual.txt:2399 +#: ./user-manual.txt:2414 #, no-wrap msgid "Merging dives from more than one trip into a single trip" msgstr "" #. type: Plain text -#: ./user-manual.txt:2404 +#: ./user-manual.txt:2419 msgid "" "After selecting a trip title, the context menu allows the merging of trips " "by either merging the selected trip with the trip below or with the trip " @@ -4571,13 +4609,13 @@ msgid "" msgstr "" #. type: Title ==== -#: ./user-manual.txt:2405 +#: ./user-manual.txt:2420 #, no-wrap msgid "Splitting a single trip into more than one trip" msgstr "" #. type: Plain text -#: ./user-manual.txt:2415 +#: ./user-manual.txt:2430 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 " @@ -4589,25 +4627,25 @@ msgid "" msgstr "" #. type: Target for macro image -#: ./user-manual.txt:2416 +#: ./user-manual.txt:2431 #, no-wrap msgid "images/SplitDive3a.jpg" msgstr "" #. type: Title === -#: ./user-manual.txt:2418 +#: ./user-manual.txt:2433 #, no-wrap msgid "Manipulating single dives" msgstr "" #. type: Title ==== -#: ./user-manual.txt:2420 +#: ./user-manual.txt:2435 #, no-wrap msgid "Delete a dive from the dive log" msgstr "" #. type: Plain text -#: ./user-manual.txt:2427 +#: ./user-manual.txt:2442 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 " @@ -4617,13 +4655,13 @@ msgid "" msgstr "" #. type: Title ==== -#: ./user-manual.txt:2428 +#: ./user-manual.txt:2443 #, no-wrap msgid "Unlink a dive from a trip" msgstr "" #. type: Plain text -#: ./user-manual.txt:2435 +#: ./user-manual.txt:2450 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 " @@ -4633,13 +4671,13 @@ msgid "" msgstr "" #. type: Title ==== -#: ./user-manual.txt:2436 +#: ./user-manual.txt:2451 #, no-wrap msgid "Add a dive to the trip immediately above" msgstr "" #. type: Plain text -#: ./user-manual.txt:2441 +#: ./user-manual.txt:2456 msgid "" "Selected dives can be moved from the trip to which they belong and placed " "within a separate trip. To do this, select and right-click the dive(s) to " @@ -4647,13 +4685,13 @@ msgid "" msgstr "" #. type: Title ==== -#: ./user-manual.txt:2442 +#: ./user-manual.txt:2457 #, no-wrap msgid "Shift the start time of dive(s)" msgstr "" #. type: Plain text -#: ./user-manual.txt:2453 +#: ./user-manual.txt:2468 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 " @@ -4666,13 +4704,13 @@ msgid "" msgstr "" #. type: Title ==== -#: ./user-manual.txt:2454 +#: ./user-manual.txt:2469 #, no-wrap msgid "Merge dives into a single dive" msgstr "" #. type: Plain text -#: ./user-manual.txt:2464 +#: ./user-manual.txt:2479 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 " @@ -4686,19 +4724,19 @@ msgid "" msgstr "" #. type: Target for macro image -#: ./user-manual.txt:2465 +#: ./user-manual.txt:2480 #, no-wrap msgid "images/MergedDive.png" msgstr "" #. type: Title ==== -#: ./user-manual.txt:2467 +#: ./user-manual.txt:2482 #, no-wrap msgid "Undo dive manipulations" msgstr "" #. type: Plain text -#: ./user-manual.txt:2473 +#: ./user-manual.txt:2488 msgid "" "Important actions on dives or trips, described above, can be undone or " "redone. This includes: _delete dives_, _merge dives_, _renumber dives_ and " @@ -4708,13 +4746,13 @@ msgid "" msgstr "" #. type: Title === -#: ./user-manual.txt:2476 +#: ./user-manual.txt:2491 #, no-wrap msgid "Filtering the dive list" msgstr "" #. type: Plain text -#: ./user-manual.txt:2482 +#: ./user-manual.txt:2497 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, " @@ -4724,7 +4762,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:2491 +#: ./user-manual.txt:2506 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 " @@ -4738,13 +4776,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: ./user-manual.txt:2492 +#: ./user-manual.txt:2507 #, no-wrap msgid "images/Filterpanel.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:2501 +#: ./user-manual.txt:2516 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 " @@ -4757,7 +4795,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:2509 +#: ./user-manual.txt:2524 msgid "" "To activate filtering of the dive list, check at least tone check box in one " "of the four check lists. The dive list is then shortened to include only the " @@ -4769,36 +4807,36 @@ msgid "" msgstr "" #. type: Title == -#: ./user-manual.txt:2511 +#: ./user-manual.txt:2526 #, no-wrap msgid "Exporting the dive log or parts of the dive log" msgstr "" #. type: Plain text -#: ./user-manual.txt:2514 +#: ./user-manual.txt:2529 msgid "There are two routes for the export of dive information from Subsurface:" msgstr "" #. type: Plain text -#: ./user-manual.txt:2516 +#: ./user-manual.txt:2531 msgid "Export dive information to _Facebook_" msgstr "" #. type: Plain text -#: ./user-manual.txt:2518 +#: ./user-manual.txt:2533 msgid "" "xref:S_Export_other[Export dive information to other destinations or " "formats]" msgstr "" #. type: Title === -#: ./user-manual.txt:2520 +#: ./user-manual.txt:2535 #, no-wrap msgid "Exporting dive information to _Facebook_" msgstr "" #. type: Plain text -#: ./user-manual.txt:2529 +#: ./user-manual.txt:2544 msgid "" "Export of dives to _Facebook_ is handled differently from other types of " "export. This is because export to _Facebook_ needs a connection to " @@ -4811,13 +4849,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: ./user-manual.txt:2530 +#: ./user-manual.txt:2545 #, no-wrap msgid "images/facebook1_f20.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:2543 +#: ./user-manual.txt:2558 msgid "" "Having established a login to _Facebook_, transfer of a dive profile to " "one's _Facebook_ timeline is easy. A _Facebook_ icon appears in the *Notes* " @@ -4838,7 +4876,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:2550 +#: ./user-manual.txt:2565 msgid "" "Both the Album created and the post to your time line will be marked as " "private. In order for friends to be able to see the post you have to change " @@ -4848,13 +4886,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: ./user-manual.txt:2551 +#: ./user-manual.txt:2566 #, no-wrap msgid "images/facebook2_f20.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:2554 +#: ./user-manual.txt:2569 msgid "" "If required, then close the _Facebook_ connection by either closing " "_Subsurface_ or by selecting _File -> Preferences -> Facebook_ from the Main " @@ -4862,13 +4900,13 @@ msgid "" msgstr "" #. type: Title === -#: ./user-manual.txt:2556 +#: ./user-manual.txt:2571 #, no-wrap msgid "Export dive information to other destinations or formats" msgstr "" #. type: Plain text -#: ./user-manual.txt:2561 +#: ./user-manual.txt:2576 msgid "" "For non-_Facebook exports_, the export function can be reached by selecting " "_File -> Export_, which brings up the Export dialog. This dialog always " @@ -4878,23 +4916,23 @@ msgid "" msgstr "" #. type: Target for macro image -#: ./user-manual.txt:2562 +#: ./user-manual.txt:2577 #, no-wrap msgid "images/Export_f20.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:2565 +#: ./user-manual.txt:2580 msgid "A dive log or part of it can be saved in three formats:" msgstr "" #. type: Plain text -#: ./user-manual.txt:2567 +#: ./user-manual.txt:2582 msgid "_Subsurface XML_ format. This is the native format used by _Subsurface_." msgstr "" #. type: Plain text -#: ./user-manual.txt:2571 +#: ./user-manual.txt:2586 msgid "" "Universal Dive Data Format (_UDDF_). Refer to _http://uddf.org_ for more " "information. UDDF is a generic format that enables communication among many " @@ -4902,7 +4940,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:2575 +#: ./user-manual.txt:2590 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 " @@ -4911,7 +4949,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:2579 +#: ./user-manual.txt:2594 msgid "" "_DiveShare_ is also a dive log repository on the Internet focusing on the " "recreational dives. In order to upload dives one has to provide a used ID, " @@ -4919,7 +4957,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:2584 +#: ./user-manual.txt:2599 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, " @@ -4928,7 +4966,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:2587 +#: ./user-manual.txt:2602 msgid "" "_CSV dive profile_, that includes a large amount of detail for each dive, " "including the depth profile, temperature and pressure information of each " @@ -4936,7 +4974,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:2599 +#: ./user-manual.txt:2614 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 " @@ -4951,7 +4989,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:2604 +#: ./user-manual.txt:2619 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, " @@ -4960,13 +4998,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: ./user-manual.txt:2605 +#: ./user-manual.txt:2620 #, no-wrap msgid "images/mapview_f20.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:2612 +#: ./user-manual.txt:2627 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 " @@ -4975,12 +5013,12 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:2614 +#: ./user-manual.txt:2629 msgid "_General Settings_, under the HTML tab, provides the following options:" msgstr "" #. type: Plain text -#: ./user-manual.txt:2622 +#: ./user-manual.txt:2637 #, no-wrap msgid "" "** Subsurface Numbers: if this option is checked, the dive(s) are exported " @@ -4997,27 +5035,27 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:2625 +#: ./user-manual.txt:2640 msgid "" "Under _Style Options_ some style-related options are available like font " "size and theme." msgstr "" #. type: Plain text -#: ./user-manual.txt:2628 +#: ./user-manual.txt:2643 msgid "" "Export to other formats can be achieved through third party facilities, for " "instance _www.divelogs.de_." msgstr "" #. type: Title == -#: ./user-manual.txt:2630 +#: ./user-manual.txt:2645 #, no-wrap msgid "Keeping a _Subsurface_ dive log in the Cloud" msgstr "" #. type: Plain text -#: ./user-manual.txt:2641 +#: ./user-manual.txt:2656 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 " @@ -5032,7 +5070,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:2645 +#: ./user-manual.txt:2660 msgid "" "_Subsurface_ includes access to a transparently integrated cloud storage " "backend that is available to all Subsurface users. In order to use the " @@ -5040,12 +5078,12 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:2647 +#: ./user-manual.txt:2662 msgid "Create a cloud storage account:" msgstr "" #. type: Plain text -#: ./user-manual.txt:2661 +#: ./user-manual.txt:2676 #, no-wrap msgid "" "** Open the _Preferences_\n" @@ -5064,12 +5102,12 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:2663 +#: ./user-manual.txt:2678 msgid "Use _Subsurface cloud storage_" msgstr "" #. type: Plain text -#: ./user-manual.txt:2669 +#: ./user-manual.txt:2684 #, no-wrap msgid "" "** From the _File_ menu users can load and save data to the _Subsurface\n" @@ -5080,7 +5118,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:2674 +#: ./user-manual.txt:2689 msgid "" "_Subsurface_ keeps a local copy of the data and _Subsurface_ stays fully " "functional if used while offline. _Subsurface_ will simply synchronize the " @@ -5089,7 +5127,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:2678 +#: ./user-manual.txt:2693 msgid "" "Although _Subsurface_ offers integrated Cloud storage of dive logs, it is " "also simple to achieve this using several of the existing facilities on the " @@ -5097,7 +5135,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:2683 +#: ./user-manual.txt:2698 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 " @@ -5105,13 +5143,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: ./user-manual.txt:2684 +#: ./user-manual.txt:2699 #, no-wrap msgid "images/Cloud.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:2693 +#: ./user-manual.txt:2708 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, " @@ -5124,7 +5162,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:2700 +#: ./user-manual.txt:2715 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 " @@ -5134,7 +5172,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:2706 +#: ./user-manual.txt:2721 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 " @@ -5145,210 +5183,235 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:2709 +#: ./user-manual.txt:2724 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:2712 +#: ./user-manual.txt:2727 #, no-wrap msgid "Printing a dive log" msgstr "" #. type: Plain text -#: ./user-manual.txt:2717 +#: ./user-manual.txt:2731 #, no-wrap msgid "" -"_Subsurface_ provides a simple interface to print a whole dive log or only a " -"few selected dives.\n" +"_Subsurface_ provides a simple and flexible interface to print a whole dive " +"log or only a few selected dives.\n" " Pre-installed templates or a custom written template can be used to choose " -"where the data will\n" -" be fitted into the page.\n" +"where the data are fitted into the page.\n" msgstr "" #. type: Plain text -#: ./user-manual.txt:2719 +#: ./user-manual.txt:2733 msgid "Before printing, two decisions are required:" msgstr "" #. type: Plain text -#: ./user-manual.txt:2722 +#: ./user-manual.txt:2736 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 " -"*Dive List* panel." +"dive log is required, then select the required dives from the *Dive List* " +"panel." msgstr "" #. type: Plain text -#: ./user-manual.txt:2724 +#: ./user-manual.txt:2738 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 " -"of the Dive Profile panel." +"If the dive profiles needs printing, what gas partial pressure information " +"should be shown? Select the appropriate toggle-buttons on the button bar to " +"the left of the *Dive Profile* panel." msgstr "" #. type: Plain text -#: ./user-manual.txt:2728 +#: ./user-manual.txt:2741 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 " -"dialogue appears (see the image on the left [A], below)." +"If _File -> Print_ is selected from the Main menu, the the dialogue below " +"(image *A*) appears. Three specifications are needed to achieve the desired " +"information and page layout:" msgstr "" #. type: Target for macro image -#: ./user-manual.txt:2729 +#: ./user-manual.txt:2742 ./user-manual.txt:4136 #, no-wrap -msgid "images/PrintDiveLog.jpg" +msgid "images/Print1_f22.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:2732 -msgid "Under _Print type_ users need to select one of two options:" +#: ./user-manual.txt:2745 +msgid "Under _Print type_ select one of two options:" msgstr "" #. type: Plain text -#: ./user-manual.txt:2734 +#: ./user-manual.txt:2747 msgid "" -"_Dive list_ print: print dives from the list with profiles and other " -"information." +"_Dive list print_: Print dives from the *Dive List* panel with profiles and " +"other information." msgstr "" #. type: Plain text -#: ./user-manual.txt:2735 -msgid "_Statistics_ print: print yearly statistics of the dives." +#: ./user-manual.txt:2748 +msgid "_Statistics print_: Print yearly statistics of the dives." msgstr "" #. type: Plain text -#: ./user-manual.txt:2737 -msgid "Under _Print options_ users need to select:" +#: ./user-manual.txt:2750 +msgid "Under _Print options_ select:" msgstr "" #. type: Plain text -#: ./user-manual.txt:2741 +#: ./user-manual.txt:2755 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 " -"selected dives_." +"Printing only the dives selected from the dive list prior to activating the " +"print dialogue by checking the box _Print only selected dives_. If this " +"check box is *not* checked all dives in the *Dive List* panel are printed." msgstr "" #. type: Plain text -#: ./user-manual.txt:2742 -msgid "Printing in colour, achieved by checking the box with _Print in colour_." +#: ./user-manual.txt:2757 +msgid "" +"Printing in colour, achieved by checking the box with _Print in colour_. If " +"this check box is not checked, printing is in monochrome (grey scale)." msgstr "" #. type: Plain text -#: ./user-manual.txt:2744 -msgid "Under _Template_ users can select:" +#: ./user-manual.txt:2760 +msgid "" +"Under _Template_ select a template to be used as the page layout. There are " +"several templates (see image *B*, above)." msgstr "" #. type: Plain text -#: ./user-manual.txt:2746 -msgid "A template to be used as the page layout." +#: ./user-manual.txt:2762 +msgid "_Table_: This prints a summary table of all dives selected (see below)." +msgstr "" + +#. type: Target for macro image +#: ./user-manual.txt:2763 +#, no-wrap +msgid "images/Print_summarylist_f22.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:2748 -msgid "_Delete_ a template from the template list" +#: ./user-manual.txt:2766 +msgid "" +"_Flow layout_: Print the text associated with each diev without printing the " +"dive profiles" msgstr "" #. type: Plain text -#: ./user-manual.txt:2749 -msgid "_Import_ a new template to the template list" +#: ./user-manual.txt:2767 +msgid "of each dive (see below):" +msgstr "" + +#. type: Target for macro image +#: ./user-manual.txt:2768 +#, no-wrap +msgid "images/Print_flow_layout_f22.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:2750 -msgid "_Export_ a template from the template list" +#: ./user-manual.txt:2771 +msgid "" +"_One Dive_: Print one dive per page, also showing the dive profile (see " +"below)" +msgstr "" + +#. type: Target for macro image +#: ./user-manual.txt:2772 +#, no-wrap +msgid "images/print2_f22.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:2751 -msgid "_Edit_ a template (choose colors, fonts, font-type)" +#: ./user-manual.txt:2776 +msgid "_Two Dives_: Print two dives per page, also showing the dive profiles." msgstr "" #. type: Plain text -#: ./user-manual.txt:2753 -msgid "When editing a template the following options are available:" +#: ./user-manual.txt:2777 +msgid "_Six Dives_: Print six dives per page, also showing the dive profiles." msgstr "" #. type: Plain text -#: ./user-manual.txt:2755 +#: ./user-manual.txt:2778 msgid "" -"_Style_: edit font type, size, choose color palette; this will not affect " -"the template HTML code" +"_Custom_: This option allows customisation of the print contents and " +"layout. This is" msgstr "" #. type: Plain text -#: ./user-manual.txt:2756 -msgid "" -"_Template_: edit the template HTML code; by saving, the \"Custom\" template " -"in the template list will be replaced" +#: ./user-manual.txt:2779 +msgid "discussed at the end of this section." msgstr "" #. type: Plain text -#: ./user-manual.txt:2757 +#: ./user-manual.txt:2783 msgid "" -"_Colors_: edit the current color palette; the new color palette will " -"overwrite the \"Custom\" color palette" +"Users can _Preview_ the printed page by selecting the _Preview_ button on " +"the dialogue (see image *A* at the start of this section). After preview, " +"changes to the options in the print dialogue can be made, resulting in a " +"layout that fits personal taste." msgstr "" #. type: Plain text -#: ./user-manual.txt:2761 +#: ./user-manual.txt:2787 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 " -"can be made, resulting in a layout that fits personal taste." +"Next, select the _Print_ button (see image *A* at the start of this " +"section). This activates the regular print dialogue used by the user " +"operating system, allowing one to choose a printer and to set its properties " +"(see image below):" +msgstr "" + +#. type: Target for macro image +#: ./user-manual.txt:2788 +#, no-wrap +msgid "images/Print_print_f22.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:2771 +#: ./user-manual.txt:2793 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, " -"above), allowing them to choose a printer and to set its properties (image " -"[*C*] on the right, above). It is important to set the print resolution of " -"the printer to an appropriate value by changing the printer " -"properties. Finally, one can print the dives. Below is a (rather small) " -"example of the output for one particular page." +"Set the print resolution of the printer to an appropriate value by changing " +"the printer _Properties_. Finally, select the _Print_ button to print the " +"dives. Below is a (rather small) example of the output for one particular " +"page." msgstr "" #. type: Target for macro image -#: ./user-manual.txt:2772 +#: ./user-manual.txt:2794 #, no-wrap msgid "images/Printpreview.jpg" msgstr "" #. type: Title === -#: ./user-manual.txt:2774 +#: ./user-manual.txt:2796 #, no-wrap msgid "Write a custom printing template (advanced)" msgstr "" #. type: Plain text -#: ./user-manual.txt:2777 +#: ./user-manual.txt:2800 msgid "" "Writing a custom template is an effective way to produce highly customized " -"printouts. Subsurface uses HTML templates with Grantlee as the printing " -"backend." -msgstr "" - -#. type: Plain text -#: ./user-manual.txt:2779 -msgid "" -"See <<_appendix_f_write_a_custom_printing_template ,APPENDIX F>> for " -"information on how to write your own template." +"printouts. Subsurface uses HTML templates to render printing. One can create " +"a template, export a new template, import an existing template and delete an " +"existing template by using the appropriate buttons under the _Template_ " +"dropdown list in the print dialogue. See <<S_APPENDIX_E,APPENDIX E>> for " +"information on how to write or modify a template." msgstr "" #. type: Title == -#: ./user-manual.txt:2781 +#: ./user-manual.txt:2802 #, no-wrap msgid "Configuring a dive computer" msgstr "" #. type: Plain text -#: ./user-manual.txt:2789 +#: ./user-manual.txt:2810 msgid "" "_Subsurface_ enables one to configure a dive computer. Currently the " "Heinrichs-Weikamp (OSTC 2, OSTC 3) and Suunto Vyper (Stinger, Mosquito, D3, " @@ -5362,7 +5425,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:2794 +#: ./user-manual.txt:2815 msgid "" "Once the dive computer is connected to the _Subsurface_ computer, select " "_File -> Configure dive computer_ from the _Main Menu_. Provide the " @@ -5372,20 +5435,20 @@ msgid "" msgstr "" #. type: Target for macro image -#: ./user-manual.txt:2795 +#: ./user-manual.txt:2816 #, no-wrap msgid "images/Configure_dc_f20.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:2798 +#: ./user-manual.txt:2819 msgid "" "Using the appropriate buttons on the configuration panel, the following " "actions can be performed:" msgstr "" #. type: Plain text -#: ./user-manual.txt:2801 +#: ./user-manual.txt:2822 #, no-wrap msgid "" "*Retrieve available details*. This loads the existing configuration from the " @@ -5394,7 +5457,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:2803 +#: ./user-manual.txt:2824 #, no-wrap msgid "" "*Save changes to device*. This changes the configuration of the\n" @@ -5403,7 +5466,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:2805 +#: ./user-manual.txt:2826 #, no-wrap msgid "" "*Backup*. This saves the configuration data to a file. _Subsurface_ asks " @@ -5412,7 +5475,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:2807 +#: ./user-manual.txt:2828 #, no-wrap msgid "" "*Restore backup*. This loads the information from a backup file and displays " @@ -5421,7 +5484,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:2809 +#: ./user-manual.txt:2830 #, no-wrap msgid "" "*Update firmware*. If new firmware is available for the dive computer, this " @@ -5430,13 +5493,13 @@ msgid "" msgstr "" #. type: Title == -#: ./user-manual.txt:2812 +#: ./user-manual.txt:2833 #, no-wrap msgid "Setting user _Preferences_ for _Subsurface_" msgstr "" #. type: Plain text -#: ./user-manual.txt:2820 +#: ./user-manual.txt:2841 msgid "" "There are several settings within _Subsurface_ that the user can " "specify. These are found when selecting _File -> Preferences_. The settings " @@ -5448,24 +5511,24 @@ msgid "" msgstr "" #. type: Title === -#: ./user-manual.txt:2821 +#: ./user-manual.txt:2842 #, no-wrap msgid "Defaults" msgstr "" #. type: Plain text -#: ./user-manual.txt:2824 +#: ./user-manual.txt:2845 msgid "There are several settings in the *Defaults* panel:" msgstr "" #. type: Target for macro image -#: ./user-manual.txt:2825 +#: ./user-manual.txt:2846 #, no-wrap msgid "images/Pref1_f20.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:2829 +#: ./user-manual.txt:2850 #, no-wrap msgid "" " ** *Lists and tables*: Here one can specify the font type and font size of " @@ -5475,7 +5538,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:2834 +#: ./user-manual.txt:2855 #, no-wrap msgid "" " ** *Dives*: For the _Default Dive File_ one need to specify the directory " @@ -5488,7 +5551,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:2839 +#: ./user-manual.txt:2860 #, no-wrap msgid "" " ** *Display invalid*: Dives can be marked as invalid (when a user wishes " @@ -5501,7 +5564,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:2842 +#: ./user-manual.txt:2863 #, no-wrap msgid "" " ** *Default cylinder*: Here users can specify the default cylinder listed " @@ -5510,7 +5573,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:2850 +#: ./user-manual.txt:2871 #, no-wrap msgid "" " ** *Animations*: Some actions in showing the dive profile are performed " @@ -5528,7 +5591,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:2855 +#: ./user-manual.txt:2876 #, no-wrap msgid "" " ** *Subsurface web service*: When one subscribes to the " @@ -5541,7 +5604,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:2858 +#: ./user-manual.txt:2879 #, no-wrap msgid "" " ** *Clear all settings*: As indicated in the button below this heading, " @@ -5550,19 +5613,19 @@ msgid "" msgstr "" #. type: Title === -#: ./user-manual.txt:2859 +#: ./user-manual.txt:2880 #, no-wrap msgid "Units" msgstr "" #. type: Target for macro image -#: ./user-manual.txt:2860 +#: ./user-manual.txt:2881 #, no-wrap msgid "images/Pref2_f20.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:2867 +#: ./user-manual.txt:2888 msgid "" "Here user can choose between metric and imperial units of depth, pressure, " "volume, temperature and mass. By selecting the Metric or Imperial radio " @@ -5573,24 +5636,24 @@ msgid "" msgstr "" #. type: Title === -#: ./user-manual.txt:2868 +#: ./user-manual.txt:2889 #, no-wrap msgid "Graph" msgstr "" #. type: Target for macro image -#: ./user-manual.txt:2870 +#: ./user-manual.txt:2891 #, no-wrap msgid "images/Pref3_f20.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:2874 +#: ./user-manual.txt:2895 msgid "This panel allows two type of selections:" msgstr "" #. type: Plain text -#: ./user-manual.txt:2882 +#: ./user-manual.txt:2903 #, no-wrap msgid "" "*Show*: Here users can specify the amount of information shown as part of\n" @@ -5607,7 +5670,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:2887 +#: ./user-manual.txt:2908 #, no-wrap msgid "" "** _Draw dive computer reported ceiling red_: This checkbox allows exactly " @@ -5621,7 +5684,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:2889 +#: ./user-manual.txt:2910 #, no-wrap msgid "" "** _Show unused cylinders in Equipment Tab_: This checkbox allows display of " @@ -5632,7 +5695,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:2895 +#: ./user-manual.txt:2916 #, no-wrap msgid "" "** _Show average depth_: Activating this checkbox causes _Subsurface_ to " @@ -5645,13 +5708,13 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:2897 +#: ./user-manual.txt:2918 #, no-wrap msgid "*Misc*:\n" msgstr "" #. type: Plain text -#: ./user-manual.txt:2909 +#: ./user-manual.txt:2930 #, no-wrap msgid "" "** Gradient Factors:* Here users can set the _gradient factors_ used while " @@ -5678,7 +5741,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:2911 +#: ./user-manual.txt:2932 #, no-wrap msgid "" " *** http://www.tek-dive.com/portal/upload/M-Values.pdf[Understanding " @@ -5686,7 +5749,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:2913 +#: ./user-manual.txt:2934 #, no-wrap msgid "" " *** " @@ -5695,7 +5758,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:2917 +#: ./user-manual.txt:2938 #, no-wrap msgid "" " ** _CCR: Show setpoints when viewing pO2:_ With this checkbox ativated, the " @@ -5707,7 +5770,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:2921 +#: ./user-manual.txt:2942 #, no-wrap msgid "" " ** _CCR: Show individual O~2~ sensor values when viewing pO~2~:_ Show the " @@ -5718,13 +5781,13 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:2923 +#: ./user-manual.txt:2944 #, no-wrap msgid "*Configuring dive planning using rebreather equipment:*\n" msgstr "" #. type: Plain text -#: ./user-manual.txt:2925 +#: ./user-manual.txt:2946 #, no-wrap msgid "" "** _Default CCR setpoint for dive planning:_ Specify the O~2~ setpoint for " @@ -5732,7 +5795,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:2929 +#: ./user-manual.txt:2950 #, no-wrap msgid "" "CCR dive plan. This determines the pO~2~ that will be maintained\n" @@ -5742,7 +5805,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:2931 +#: ./user-manual.txt:2952 #, no-wrap msgid "" "** _pSCR O~2~ metabolism rate:_ For a semiclosed rebreather (pSCR) system, " @@ -5750,7 +5813,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:2933 +#: ./user-manual.txt:2954 #, no-wrap msgid "" "volume of oxygen used by a diver each minute. Set this value for pSCR dive " @@ -5759,7 +5822,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:2935 +#: ./user-manual.txt:2956 #, no-wrap msgid "" "** _pSCR ratio:_ For pSCR equipment the dump ratio is the ratio of gas " @@ -5767,7 +5830,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:2937 +#: ./user-manual.txt:2958 #, no-wrap msgid "" "environment to that of the gas recirculated to the diver. Set this value for " @@ -5776,24 +5839,24 @@ msgid "" msgstr "" #. type: Title === -#: ./user-manual.txt:2939 +#: ./user-manual.txt:2960 #, no-wrap msgid "Language" msgstr "" #. type: Plain text -#: ./user-manual.txt:2941 +#: ./user-manual.txt:2962 msgid "Choose a language that _Subsurface_ will use." msgstr "" #. type: Target for macro image -#: ./user-manual.txt:2942 +#: ./user-manual.txt:2963 #, no-wrap msgid "images/Pref4_f20.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:2952 +#: ./user-manual.txt:2973 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 " @@ -5806,26 +5869,26 @@ msgid "" msgstr "" #. type: Title === -#: ./user-manual.txt:2953 +#: ./user-manual.txt:2974 #, no-wrap msgid "Network" msgstr "" #. type: Plain text -#: ./user-manual.txt:2955 +#: ./user-manual.txt:2976 msgid "" "This panel facilitates communication between _Subsurface_ and data sources " "on the Internet." msgstr "" #. type: Target for macro image -#: ./user-manual.txt:2956 +#: ./user-manual.txt:2977 #, no-wrap msgid "images/Pref5_f20.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:2969 +#: ./user-manual.txt:2990 msgid "" "This is important, for instance, when _Subsurface_ needs to communicate with " "Internet services such as the <<S_Companion,_Subsurface Companion app_>> or " @@ -5842,26 +5905,26 @@ msgid "" msgstr "" #. type: Title === -#: ./user-manual.txt:2970 +#: ./user-manual.txt:2991 #, no-wrap msgid "Facebook Accesss" msgstr "" #. type: Plain text -#: ./user-manual.txt:2973 +#: ./user-manual.txt:2994 msgid "" "This panel allows one to log into a Facebook account in order to transfer " "information from Subsurface to Facefook." msgstr "" #. type: Target for macro image -#: ./user-manual.txt:2974 +#: ./user-manual.txt:2995 #, no-wrap msgid "images/Pref6_f20.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:2982 +#: ./user-manual.txt:3003 msgid "" "If one provides a valid Facebook userID and password, a connection to " "Facebook is created. The connection to Facebook is closed when one closes " @@ -5871,13 +5934,13 @@ msgid "" msgstr "" #. type: Title == -#: ./user-manual.txt:2984 +#: ./user-manual.txt:3005 #, no-wrap msgid "The _Subsurface_ dive planner" msgstr "" #. type: Plain text -#: ./user-manual.txt:2989 +#: ./user-manual.txt:3010 msgid "" "Dive planning is an advanced feature of _Subsurface_, accessible by " "selecting _Log -> Plan Dive_ from the main menu. It allows calculation of " @@ -5886,7 +5949,7 @@ msgid "" msgstr "" #. type: delimited block * -#: ./user-manual.txt:2997 +#: ./user-manual.txt:3018 msgid "" "The _Subsurface_ dive planner IS CURRENTLY EXPERIMENTAL and assumes the user " "is already familiar with the _Subsurface_ user interface. It is explicitly " @@ -5894,19 +5957,19 @@ msgid "" msgstr "" #. type: delimited block * -#: ./user-manual.txt:3000 +#: ./user-manual.txt:3021 msgid "" "The user is conversant with dive planning and has the necessary training to " "perform dive planning." msgstr "" #. type: delimited block * -#: ./user-manual.txt:3001 +#: ./user-manual.txt:3022 msgid "The user plans dives within his/her certification limits." msgstr "" #. type: delimited block * -#: ./user-manual.txt:3004 +#: ./user-manual.txt:3025 msgid "" "Dive planning makes large assumptions about the characteristics of the " "_average person_ and cannot compensate for individual physiology or health " @@ -5914,32 +5977,32 @@ msgid "" msgstr "" #. type: delimited block * -#: ./user-manual.txt:3005 +#: ./user-manual.txt:3026 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:3006 +#: ./user-manual.txt:3027 msgid "The user is familiar with the user interface of _Subsurface_." msgstr "" #. type: delimited block * -#: ./user-manual.txt:3008 +#: ./user-manual.txt:3029 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:3010 +#: ./user-manual.txt:3031 #, no-wrap msgid "The _Subsurface_ dive planner screen" msgstr "" #. type: Plain text -#: ./user-manual.txt:3015 +#: ./user-manual.txt:3036 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 " @@ -5949,7 +6012,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3019 +#: ./user-manual.txt:3040 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 " @@ -5958,7 +6021,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3023 +#: ./user-manual.txt:3044 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 " @@ -5967,26 +6030,26 @@ msgid "" msgstr "" #. type: Target for macro image -#: ./user-manual.txt:3024 +#: ./user-manual.txt:3045 #, no-wrap msgid "images/PlannerWindow1_f20.jpg" msgstr "" #. type: Title === -#: ./user-manual.txt:3027 +#: ./user-manual.txt:3048 #, no-wrap msgid "Open circuit dives" msgstr "" #. type: Plain text -#: ./user-manual.txt:3030 +#: ./user-manual.txt:3051 msgid "" "Towards the centre bottom of the planner (circled in blue in the image " "above) is a dropbox with three options. Select the appropriate one of these:" msgstr "" #. type: Plain text -#: ./user-manual.txt:3033 +#: ./user-manual.txt:3054 #, no-wrap msgid "" "** Open Circuit (the default)\n" @@ -5995,12 +6058,12 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3035 +#: ./user-manual.txt:3056 msgid "Choose the Open Circuit option." msgstr "" #. type: Plain text -#: ./user-manual.txt:3039 +#: ./user-manual.txt:3060 msgid "" "In the top left-hand area of the planning screen, ensure that the constant " "dive parameters are appropriate. These are: Start date and time of the " @@ -6010,7 +6073,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3048 +#: ./user-manual.txt:3069 msgid "" "In the table labeled _Available Gases_, add the information of the cylinders " "to be used as well as the gas composition within that cylinder. This is done " @@ -6024,12 +6087,12 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3050 +#: ./user-manual.txt:3071 msgid "The profile of the planned dive can be created in two ways:" msgstr "" #. type: Plain text -#: ./user-manual.txt:3055 +#: ./user-manual.txt:3076 msgid "" "Drag the waypoints (the small white circles) on the existing dive profile in " "a way to represent the dive. Additional waypoints can be created by " @@ -6039,7 +6102,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3063 +#: ./user-manual.txt:3084 msgid "" "The most efficient way to create a dive profile is to enter the appropriate " "values into the table marked _Dive planner points_. The first line of the " @@ -6053,13 +6116,13 @@ msgid "" msgstr "" #. type: Title ==== -#: ./user-manual.txt:3064 +#: ./user-manual.txt:3085 #, no-wrap msgid "Recreational dives" msgstr "" #. type: Plain text -#: ./user-manual.txt:3079 +#: ./user-manual.txt:3100 msgid "" "The _Subsurface_ dive planner allows a sophisticated way of planning " "recreational dives, i.e. dives that remain within no-decompression limits. " @@ -6080,26 +6143,26 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3082 +#: ./user-manual.txt:3103 msgid "To plan a dive, the appropriate settings need to be defined." msgstr "" #. type: Plain text -#: ./user-manual.txt:3085 +#: ./user-manual.txt:3106 msgid "" "Ensure that the date and time is set to that of the intended dive. This " "allows calculation of the nitrogen load incurred during previous dives." msgstr "" #. type: Plain text -#: ./user-manual.txt:3088 +#: ./user-manual.txt:3109 msgid "" "Immediately under the heading _Planning_ are two checkboxes _Recreational_ " "and _Safety Stop_. Check these two boxes." msgstr "" #. type: Plain text -#: ./user-manual.txt:3092 +#: ./user-manual.txt:3113 msgid "" "Then define the cylinder size, the gas mixture (air or % oxygen) and the " "starting cylinder pressure in the top left-hand section of the planner under " @@ -6107,7 +6170,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3097 +#: ./user-manual.txt:3118 msgid "" "The planner calculates whether the specified cylinder contains enough " "air/gas to complete the planned dive. In order for this to be realistic, " @@ -6117,7 +6180,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3100 +#: ./user-manual.txt:3121 msgid "" "Define the amount of gas that the cylinder must have at the end of the " "bottom section of the dive just before ascent. A value of 50 bar is often " @@ -6125,7 +6188,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3107 +#: ./user-manual.txt:3128 msgid "" "Define the depth of the dive by dragging the waypoints (white dots) on the " "dive profile or (even better) defining the appropriate depths using the " @@ -6136,14 +6199,14 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3110 +#: ./user-manual.txt:3131 msgid "" "The ascent speed can be changed. The default ascent speeds are those " "considered safe for recreational divers." msgstr "" #. type: Plain text -#: ./user-manual.txt:3118 +#: ./user-manual.txt:3139 msgid "" "The dive profile in the planner indicates the maximum dive time within " "no-deco limits using the Bühlmann ZH-L16 algorithm and the gas and depth " @@ -6159,7 +6222,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3122 +#: ./user-manual.txt:3143 msgid "" "Below is an image of a dive plan for a recreational dive at 30 " "metres. Although the no-deco limit (NDL) is 23 minutes, the duration of the " @@ -6168,26 +6231,26 @@ msgid "" msgstr "" #. type: Target for macro image -#: ./user-manual.txt:3123 +#: ./user-manual.txt:3144 #, no-wrap msgid "images/rec_diveplan.jpg" msgstr "" #. type: Title ==== -#: ./user-manual.txt:3125 +#: ./user-manual.txt:3146 #, no-wrap msgid "Non-recreational open circuit dives, including decompression" msgstr "" #. type: Plain text -#: ./user-manual.txt:3129 +#: ./user-manual.txt:3150 msgid "" "Non-recreational dive planning involves exceeding the no-deco limits and/or " "using multiple breathing gases. Such dives are planned in three stages:" msgstr "" #. type: Plain text -#: ./user-manual.txt:3139 +#: ./user-manual.txt:3160 #, no-wrap msgid "" "*a) Nitrogen management*: This is performed by specifying the rates for " @@ -6209,21 +6272,21 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3141 +#: ./user-manual.txt:3162 msgid "" "link:http://www.tek-dive.com/portal/upload/M-Values.pdf[Understanding " "M-values by Erik Baker, _Immersed_ Vol. 3, No. 3.]" msgstr "" #. type: Plain text -#: ./user-manual.txt:3142 +#: ./user-manual.txt:3163 msgid "" "link:http://www.rebreatherworld.com/general-and-new-to-rebreather-articles/5037-gradient-factors-for-dummies.html[Gradient " "factors for dummies, by Kevin Watts]" msgstr "" #. type: Plain text -#: ./user-manual.txt:3144 +#: ./user-manual.txt:3165 msgid "" "link:http://www.amazon.com/Deco-Divers-Decompression-Theory-Physiology/dp/1905492073/ref=sr_1_1?s=books&ie=UTF8&qid=1403932320&sr=1-1&keywords=deco+for+divers[_Deco " "for Divers_, by Mark Powell (2008). Aquapress] Southend-on-Sea, UK. ISBN 10: " @@ -6231,7 +6294,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3152 +#: ./user-manual.txt:3173 msgid "" "The ascent rate is critical for nitrogen off-gassing at the end of the dive " "and is specified for several depth ranges, utilising the average (or mean) " @@ -6245,7 +6308,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3161 +#: ./user-manual.txt:3182 #, no-wrap msgid "" "*b) Oxygen management*: In the *Gas Options* part of the dive specification, " @@ -6265,7 +6328,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3175 +#: ./user-manual.txt:3196 #, no-wrap msgid "" "*c) Gas management*: With open-circuit dives this is a primary " @@ -6296,7 +6359,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3187 +#: ./user-manual.txt:3208 msgid "" "Now (at last) one can start the detailed time-depth planning of the " "dive. _Subsurface_ offers a unique graphical interface for performing this " @@ -6315,7 +6378,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3199 +#: ./user-manual.txt:3220 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_ " @@ -6333,7 +6396,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3207 +#: ./user-manual.txt:3228 msgid "" "Indicate any changes in gas cylinder used by indicating gas changes as " "explained in the section <<S_CreateProfile,hand-creating a dive " @@ -6346,7 +6409,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3216 +#: ./user-manual.txt:3237 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 " @@ -6359,20 +6422,20 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3219 +#: ./user-manual.txt:3240 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:3220 +#: ./user-manual.txt:3241 #, no-wrap msgid "images/DivePlanner2_f20.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:3225 +#: ./user-manual.txt:3246 msgid "" "Once the above has been completed, one can save it by clicking the _Save_ " "button towards the top middle of the planner. The saved dive plan will " @@ -6380,13 +6443,13 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3227 +#: ./user-manual.txt:3248 #, no-wrap msgid "*The dive plan details*\n" msgstr "" #. type: Plain text -#: ./user-manual.txt:3235 +#: ./user-manual.txt:3256 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 " @@ -6399,7 +6462,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3240 +#: ./user-manual.txt:3261 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 " @@ -6409,13 +6472,13 @@ msgid "" msgstr "" #. type: Title === -#: ./user-manual.txt:3241 +#: ./user-manual.txt:3262 #, no-wrap msgid "Planning pSCR dives" msgstr "" #. type: Plain text -#: ./user-manual.txt:3256 +#: ./user-manual.txt:3277 #, no-wrap msgid "" "To plan a dive using a passive semi-closed rebreather (pSCR), select _pSCR_ " @@ -6445,26 +6508,26 @@ msgid "" msgstr "" #. type: Target for macro image -#: ./user-manual.txt:3257 +#: ./user-manual.txt:3278 #, no-wrap msgid "images/Planner_pSCR1_f20.jpg" msgstr "" #. type: Title === -#: ./user-manual.txt:3260 +#: ./user-manual.txt:3281 #, no-wrap msgid "Planning CCR dives" msgstr "" #. type: Plain text -#: ./user-manual.txt:3264 +#: ./user-manual.txt:3285 msgid "" "To plan a dive using a closed circuit rebreather, select the _CCR_ option in " "the dropdown list, circled in blue in the image below." msgstr "" #. type: Plain text -#: ./user-manual.txt:3268 +#: ./user-manual.txt:3289 #, no-wrap msgid "" "*Available gases*: In the _Available gases_ table, enter the cylinder " @@ -6475,7 +6538,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3276 +#: ./user-manual.txt:3297 #, no-wrap msgid "" "*Entering setpoints*: Specify a default setpoint in the Preferences tab, by " @@ -6496,31 +6559,31 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3278 +#: ./user-manual.txt:3299 msgid "The dive profile for a CCR dive may look something like the image below." msgstr "" #. type: Target for macro image -#: ./user-manual.txt:3279 +#: ./user-manual.txt:3300 #, no-wrap msgid "images/Planner_CCR1_f20.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:3283 +#: ./user-manual.txt:3304 msgid "" "Note that, in the _Dive plan details_, the gas consumption for a CCR segment " "is not calculated, so gas consumptions of 0 litres are the norm." msgstr "" #. type: Title === -#: ./user-manual.txt:3285 +#: ./user-manual.txt:3306 #, no-wrap msgid "Modifying an existing dive plan" msgstr "" #. type: Plain text -#: ./user-manual.txt:3292 +#: ./user-manual.txt:3313 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 " @@ -6531,7 +6594,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3298 +#: ./user-manual.txt:3319 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 " @@ -6541,13 +6604,13 @@ msgid "" msgstr "" #. type: Title === -#: ./user-manual.txt:3299 +#: ./user-manual.txt:3320 #, no-wrap msgid "Planning for repetitive dives" msgstr "" #. type: Plain text -#: ./user-manual.txt:3306 +#: ./user-manual.txt:3327 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 " @@ -6556,7 +6619,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3312 +#: ./user-manual.txt:3333 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 " @@ -6566,7 +6629,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3317 +#: ./user-manual.txt:3338 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 " @@ -6576,13 +6639,13 @@ msgid "" msgstr "" #. type: Title === -#: ./user-manual.txt:3318 +#: ./user-manual.txt:3339 #, no-wrap msgid "Printing the dive plan" msgstr "" #. type: Plain text -#: ./user-manual.txt:3323 +#: ./user-manual.txt:3344 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 " @@ -6590,7 +6653,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3333 +#: ./user-manual.txt:3354 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 " @@ -6606,13 +6669,13 @@ msgid "" msgstr "" #. type: Title == -#: ./user-manual.txt:3334 +#: ./user-manual.txt:3355 #, no-wrap msgid "Description of the Subsurface Main Menu items" msgstr "" #. type: Plain text -#: ./user-manual.txt:3339 +#: ./user-manual.txt:3360 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 " @@ -6620,299 +6683,299 @@ msgid "" msgstr "" #. type: Title === -#: ./user-manual.txt:3340 +#: ./user-manual.txt:3361 #, no-wrap msgid "File" msgstr "" #. type: Plain text -#: ./user-manual.txt:3343 +#: ./user-manual.txt:3364 msgid "" "<<S_NewLogbook,_New Logbook_>> - Close the currently open dive logbook and " "clear all dive information." msgstr "" #. type: Plain text -#: ./user-manual.txt:3345 +#: ./user-manual.txt:3366 msgid "" "_Open logbook_ - This opens the file manager in order to select a dive " "logbook to open." msgstr "" #. type: Plain text -#: ./user-manual.txt:3346 +#: ./user-manual.txt:3367 msgid "_Save_ - Save the dive logbook that is currently open." msgstr "" #. type: Plain text -#: ./user-manual.txt:3347 +#: ./user-manual.txt:3368 msgid "_Save as_ - Save the current logbook under a different file name." msgstr "" #. type: Plain text -#: ./user-manual.txt:3348 +#: ./user-manual.txt:3369 msgid "_Close_ - Close the dive logbook that is currently open." msgstr "" #. type: Plain text -#: ./user-manual.txt:3350 +#: ./user-manual.txt:3371 msgid "" "<<S_ExportLog,_Export_>> - Export the currently open dive logbook (or the " "selected dives in the logbook) to one of several formats." msgstr "" #. type: Plain text -#: ./user-manual.txt:3351 +#: ./user-manual.txt:3372 msgid "<<S_PrintDivelog,_Print_>> - Print the currently open logbook." msgstr "" #. type: Plain text -#: ./user-manual.txt:3352 +#: ./user-manual.txt:3373 msgid "" "<<S_FindMovedImages, _Find moved images_>> - If photos taken during dives " "have been moved to" msgstr "" #. type: Plain text -#: ./user-manual.txt:3353 +#: ./user-manual.txt:3374 msgid "" "a different disk or directory, locate them and link them to the appropriate " "dives." msgstr "" #. type: Plain text -#: ./user-manual.txt:3354 +#: ./user-manual.txt:3375 msgid "<<S_Preferences,_Preferences_>> - Set the _Subsurface_ preferences." msgstr "" #. type: Plain text -#: ./user-manual.txt:3355 +#: ./user-manual.txt:3376 msgid "" "<<S_Configure,_Configure dive computer_>> - Edit the configuration of a dive " "computer." msgstr "" #. type: Plain text -#: ./user-manual.txt:3356 +#: ./user-manual.txt:3377 msgid "_Quit_ - Quit _Subsurface_." msgstr "" #. type: Title === -#: ./user-manual.txt:3357 +#: ./user-manual.txt:3378 #, no-wrap msgid "Import" msgstr "" #. type: Plain text -#: ./user-manual.txt:3360 +#: ./user-manual.txt:3381 msgid "" "<<S_ImportDiveComputer,_Import from dive computer_>> - Import dive " "information from a dive computer." msgstr "" #. type: Plain text -#: ./user-manual.txt:3362 +#: ./user-manual.txt:3383 msgid "" "<<Unified_import,_Import Log Files_>> - Import dive information from a file " "in in a _Subsurface_-compatible format." msgstr "" #. type: Plain text -#: ./user-manual.txt:3364 +#: ./user-manual.txt:3385 msgid "" "<<S_Companion,_Import GPS data from Subsurface web service_>> - Load GPS " "coordinates from the _Subsurface_ mobile phone app." msgstr "" #. type: Plain text -#: ./user-manual.txt:3366 +#: ./user-manual.txt:3387 msgid "" "<<S_ImportingDivelogsDe,_Import from Divelogs.de_>> - Import dive " "information from _www.Divelogs.de_." msgstr "" #. type: Title === -#: ./user-manual.txt:3367 +#: ./user-manual.txt:3388 #, no-wrap msgid "Log" msgstr "" #. type: Plain text -#: ./user-manual.txt:3369 +#: ./user-manual.txt:3390 msgid "" "<<S_EnterData,_Add Dive_>> - Manually add a new dive to the *Dive List* " "panel." msgstr "" #. type: Plain text -#: ./user-manual.txt:3370 +#: ./user-manual.txt:3391 msgid "" "_Edit dive_ - Edit a dive of which the profile was entered by hande and not " "from a dive computer." msgstr "" #. type: Plain text -#: ./user-manual.txt:3371 +#: ./user-manual.txt:3392 msgid "<<S_DivePlanner,_Plan Dive_>> - This feature allows the planning of dives." msgstr "" #. type: Plain text -#: ./user-manual.txt:3372 +#: ./user-manual.txt:3393 msgid "" "<<S_Replan,_Edit dive in planner_>> - Edit a dive plan that has been saved " "into the *Dive List*." msgstr "" #. type: Plain text -#: ./user-manual.txt:3374 +#: ./user-manual.txt:3395 msgid "" "<<S_CopyComponents,_Copy dive components_>> - By selecting this option, one " "can copy information from several fields of a dive log onto the clipboard." msgstr "" #. type: Plain text -#: ./user-manual.txt:3376 +#: ./user-manual.txt:3397 msgid "" "_Paste dive components_ - Paste, into the selected dives in the *Dive List*, " "the information copied using the _Copy dive components_ option." msgstr "" #. type: Plain text -#: ./user-manual.txt:3378 +#: ./user-manual.txt:3399 msgid "" "<<S_Renumber,_Renumber_>> - Renumber the dives listed in the *Dive List* " "panel." msgstr "" #. type: Plain text -#: ./user-manual.txt:3380 +#: ./user-manual.txt:3401 msgid "" "<<S_Group,_Auto Group_>> - Group the dives in the *Dive List* panel into " "dive trips." msgstr "" #. type: Plain text -#: ./user-manual.txt:3381 +#: ./user-manual.txt:3402 msgid "" "<<S_DeviceNames,_Edit Device Names_>> - Edit the names of dive computers to " "facilitate your logs." msgstr "" #. type: Plain text -#: ./user-manual.txt:3382 +#: ./user-manual.txt:3403 msgid "" "<<S_Filter,_Filter divelist_>> - Select only some dives, based on specific " "tags or dive criteria." msgstr "" #. type: Title === -#: ./user-manual.txt:3383 +#: ./user-manual.txt:3404 #, no-wrap msgid "View" msgstr "" #. type: Plain text -#: ./user-manual.txt:3386 +#: ./user-manual.txt:3407 msgid "" "<<S_ViewPanels,_All_>> - View the four main _Subsurface_ panels " "simmultaneously." msgstr "" #. type: Plain text -#: ./user-manual.txt:3387 +#: ./user-manual.txt:3408 msgid "<<S_ViewPanels,_Dive List_>> - View only the *Dive List* panel." msgstr "" #. type: Plain text -#: ./user-manual.txt:3388 +#: ./user-manual.txt:3409 msgid "<<S_ViewPanels,_Profile_>> - View only the *Dive Profile* panel." msgstr "" #. type: Plain text -#: ./user-manual.txt:3389 +#: ./user-manual.txt:3410 msgid "<<S_ViewPanels,_Info_>> - View only the *Notes* panel." msgstr "" #. type: Plain text -#: ./user-manual.txt:3390 +#: ./user-manual.txt:3411 msgid "<<S_ViewPanels,_Globe_>> - View only the *World Map* panel." msgstr "" #. type: Plain text -#: ./user-manual.txt:3392 +#: ./user-manual.txt:3413 msgid "" "_Yearly Statistics_ - Display summary statistics about dives during this and " "past years." msgstr "" #. type: Plain text -#: ./user-manual.txt:3393 +#: ./user-manual.txt:3414 msgid "_Prev DC_ - Switch to previous dive computer." msgstr "" #. type: Plain text -#: ./user-manual.txt:3394 +#: ./user-manual.txt:3415 msgid "_Next DC_ - Switch to next dive computer." msgstr "" #. type: Plain text -#: ./user-manual.txt:3395 +#: ./user-manual.txt:3416 msgid "_Full Screen_ - Toggles Full Screen mode." msgstr "" #. type: Title === -#: ./user-manual.txt:3396 +#: ./user-manual.txt:3417 #, no-wrap msgid "Help" msgstr "" #. type: Plain text -#: ./user-manual.txt:3399 +#: ./user-manual.txt:3420 msgid "" "_About Subsurface_ - Show a panel with the version number of _Subsurface_ as " "well as licensing information." msgstr "" #. type: Plain text -#: ./user-manual.txt:3401 +#: ./user-manual.txt:3422 msgid "" "_Check for updates_ - Find out whether a newer version of Subsurface is " "available on the http://subsurface-divelog.org/[_Subsurface_ web site]." msgstr "" #. type: Plain text -#: ./user-manual.txt:3402 +#: ./user-manual.txt:3423 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:3403 +#: ./user-manual.txt:3424 msgid "_User manual_ - Open a window showing this user manual." msgstr "" #. type: Title == -#: ./user-manual.txt:3405 +#: ./user-manual.txt:3426 #, no-wrap msgid "Mobile Version" msgstr "" #. type: Plain text -#: ./user-manual.txt:3408 +#: ./user-manual.txt:3429 msgid "" "_Subsurface_ has a mobile version, which can be used to view the dives " "stored in the user's cloud account." msgstr "" #. type: Title === -#: ./user-manual.txt:3409 +#: ./user-manual.txt:3430 #, no-wrap msgid "How to use the mobile version" msgstr "" #. type: Plain text -#: ./user-manual.txt:3413 +#: ./user-manual.txt:3434 msgid "" "When you first open the mobile app, you will have to log into your cloud " "account. To do this, click on the menu icon on the upper right, then click " @@ -6920,7 +6983,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3417 +#: ./user-manual.txt:3438 msgid "" "To load dives the first time, click on the menu icon, and then click on " "_Load Dives_. This will fetch the dive list from the cloud storage onto your " @@ -6929,7 +6992,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3420 +#: ./user-manual.txt:3441 msgid "" "To view dive details, tap on any dive in the dive list. This will open the " "dive details window, which shows the dive profile and below it, the dive " @@ -6937,7 +7000,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3423 +#: ./user-manual.txt:3444 msgid "" "To save changes made to the dive details, click on the back icon, then from " "the menu select _Save Changes_. This will save your changes to the cloud " @@ -6945,7 +7008,7 @@ msgid "" msgstr "" #. type: Title == -#: ./user-manual.txt:3425 +#: ./user-manual.txt:3446 #, no-wrap msgid "" "APPENDIX A: Operating system specific information for importing dive " @@ -6953,19 +7016,19 @@ msgid "" msgstr "" #. type: Title === -#: ./user-manual.txt:3427 +#: ./user-manual.txt:3448 #, 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:3428 +#: ./user-manual.txt:3449 #, no-wrap msgid "images/icons/drivers.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:3433 +#: ./user-manual.txt:3454 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 " @@ -6973,7 +7036,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3439 +#: ./user-manual.txt:3460 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 " @@ -6982,7 +7045,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3443 +#: ./user-manual.txt:3464 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 " @@ -6990,7 +7053,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3450 +#: ./user-manual.txt:3471 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 " @@ -7001,19 +7064,19 @@ msgid "" msgstr "" #. type: Title === -#: ./user-manual.txt:3452 +#: ./user-manual.txt:3473 #, 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:3453 +#: ./user-manual.txt:3474 #, no-wrap msgid "images/icons/usb.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:3461 +#: ./user-manual.txt:3482 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 " @@ -7024,67 +7087,67 @@ msgid "" msgstr "" #. type: Title ==== -#: ./user-manual.txt:3462 ./user-manual.txt:3545 +#: ./user-manual.txt:3483 ./user-manual.txt:3566 #, no-wrap msgid "On Windows:" msgstr "" #. type: Plain text -#: ./user-manual.txt:3466 +#: ./user-manual.txt:3487 msgid "" "Simply try COM1, COM2, etc. The drop down list should contain all connected " "COM devices." msgstr "" #. type: Title ==== -#: ./user-manual.txt:3467 ./user-manual.txt:3560 +#: ./user-manual.txt:3488 ./user-manual.txt:3581 #, no-wrap msgid "On MacOS:" msgstr "" #. type: Plain text -#: ./user-manual.txt:3470 +#: ./user-manual.txt:3491 msgid "The drop down box should find all connected dive computers." msgstr "" #. type: Block title -#: ./user-manual.txt:3471 +#: ./user-manual.txt:3492 #, no-wrap msgid "On Linux:" msgstr "" #. type: Plain text -#: ./user-manual.txt:3474 +#: ./user-manual.txt:3495 msgid "There is a definitive way to find the port:" msgstr "" #. type: Plain text -#: ./user-manual.txt:3476 +#: ./user-manual.txt:3497 msgid "Disconnect the USB cable from the dive computer" msgstr "" #. type: Plain text -#: ./user-manual.txt:3477 +#: ./user-manual.txt:3498 msgid "Open a terminal" msgstr "" #. type: Plain text -#: ./user-manual.txt:3478 ./user-manual.txt:3480 +#: ./user-manual.txt:3499 ./user-manual.txt:3501 msgid "Type the command: 'dmesg' and press enter" msgstr "" #. type: Plain text -#: ./user-manual.txt:3479 +#: ./user-manual.txt:3500 msgid "Plug in the USB cable of the dive computer" msgstr "" #. type: Plain text -#: ./user-manual.txt:3482 +#: ./user-manual.txt:3503 msgid "A message similar to this one should appear:" msgstr "" #. type: Plain text -#: ./user-manual.txt:3498 +#: ./user-manual.txt:3519 #, no-wrap msgid "" "\tusb 2-1.1: new full speed USB device number 14 using ehci_hcd\n" @@ -7105,7 +7168,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3503 +#: ./user-manual.txt:3524 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 " @@ -7113,12 +7176,12 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3505 +#: ./user-manual.txt:3526 msgid "Ensuring that the user has write permission to the USB serial port:" msgstr "" #. type: Plain text -#: ./user-manual.txt:3511 +#: ./user-manual.txt:3532 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 " @@ -7127,14 +7190,14 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3515 +#: ./user-manual.txt:3536 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:3520 +#: ./user-manual.txt:3541 #, no-wrap msgid "" "Type: +id johnB+ This lists all the groups that johnB belongs to and\n" @@ -7146,7 +7209,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3522 +#: ./user-manual.txt:3543 #, no-wrap msgid "" "Under some circumstances this change takes only effect (eg. on Ubuntu) " @@ -7155,7 +7218,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3527 +#: ./user-manual.txt:3548 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 " @@ -7163,19 +7226,19 @@ msgid "" msgstr "" #. type: Title === -#: ./user-manual.txt:3529 +#: ./user-manual.txt:3550 #, no-wrap msgid "Setting up bluetooth enabled devices" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: ./user-manual.txt:3530 +#: ./user-manual.txt:3551 #, no-wrap msgid "images/icons/bluetooth.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:3536 +#: ./user-manual.txt:3557 msgid "" "For dive computers communicating through bluetooth like the Heinrichs " "Weikamp Frog or the Shearwater Predator and Petrel there is a different " @@ -7184,7 +7247,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3538 +#: ./user-manual.txt:3559 #, no-wrap msgid "" "*For the dive computer, after enabling Bluetooth, ensure it is in Upload " @@ -7192,7 +7255,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3542 +#: ./user-manual.txt:3563 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 " @@ -7200,13 +7263,13 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3544 +#: ./user-manual.txt:3565 #, no-wrap msgid "*Pair the _Subsurface_ computer with the dive computer.*\n" msgstr "" #. type: Plain text -#: ./user-manual.txt:3553 +#: ./user-manual.txt:3574 msgid "" "Bluetooth is most likely already enabled. For pairing with the dive computer " "choose _Control Panel -> Bluetooth Devices -> Add Wireless Device_. This " @@ -7218,21 +7281,21 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3556 +#: ./user-manual.txt:3577 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:3559 +#: ./user-manual.txt:3580 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:3566 +#: ./user-manual.txt:3587 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 " @@ -7241,20 +7304,20 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3569 +#: ./user-manual.txt:3590 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: Title ==== -#: ./user-manual.txt:3570 +#: ./user-manual.txt:3591 #, no-wrap msgid "On Linux" msgstr "" #. type: Plain text -#: ./user-manual.txt:3578 +#: ./user-manual.txt:3599 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 " @@ -7267,7 +7330,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3582 +#: ./user-manual.txt:3603 msgid "" "Setting up a connection to download dives from your Bluetooth-enabled " "device, such as the _Shearwater Petrel_, is not yet an automated process and " @@ -7276,22 +7339,22 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3584 +#: ./user-manual.txt:3605 msgid "Enable the Bluetooth controller and pair your dive computer</li>" msgstr "" #. type: Plain text -#: ./user-manual.txt:3585 +#: ./user-manual.txt:3606 msgid "Establish an RFCOMM connection" msgstr "" #. type: Plain text -#: ./user-manual.txt:3586 +#: ./user-manual.txt:3607 msgid "Download the dives with Subsurface" msgstr "" #. type: Plain text -#: ./user-manual.txt:3592 +#: ./user-manual.txt:3613 msgid "" "Ensure the dive computer is in upload mode. On the _Shearwater Petrel_ and " "_Petrel 2_, cycle through the menu, select 'Dive Log', then 'Upload Log'. " @@ -7302,7 +7365,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3597 +#: ./user-manual.txt:3618 msgid "" "To establish the connection, establish root access through +sudo+ or +su+. " "The correct permission is required to download the dives in the computer. On " @@ -7312,23 +7375,23 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3599 +#: ./user-manual.txt:3620 msgid "+sudo usermod -a -G dialout username+" msgstr "" #. type: Plain text -#: ./user-manual.txt:3601 +#: ./user-manual.txt:3622 msgid "Then log out and log in for the change to take effect." msgstr "" #. type: Title ===== -#: ./user-manual.txt:3602 +#: ./user-manual.txt:3623 #, no-wrap msgid "Enabling the Bluetooth controller and pairing your dive computer" msgstr "" #. type: Plain text -#: ./user-manual.txt:3608 +#: ./user-manual.txt:3629 msgid "" "Attempt to set up the Bluetooth controller and pair your dive computer using " "the graphical environment of the operating system. After setting the dive " @@ -7339,7 +7402,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3611 +#: ./user-manual.txt:3632 msgid "" "If the graphical method didn't work, pair the device from the command " "line. Open a terminal and use +hciconfig+ to check the Bluetooth controller " @@ -7347,7 +7410,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3618 +#: ./user-manual.txt:3639 #, no-wrap msgid "" "\t$ hciconfig\n" @@ -7359,7 +7422,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3623 +#: ./user-manual.txt:3644 msgid "" "This indicates a Bluetooth controller with MAC address 01:23:45:67:89:AB, " "connected as hci0. Its status is 'DOWN', i.e. not powered. Additional " @@ -7369,7 +7432,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3631 +#: ./user-manual.txt:3652 #, no-wrap msgid "" "\tsudo hciconfig hci0 up auth+ (enter password when prompted)\n" @@ -7382,25 +7445,25 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3633 +#: ./user-manual.txt:3654 msgid "+Check that the status now includes +'UP', 'RUNNING' AND 'AUTH'+." msgstr "" #. type: Plain text -#: ./user-manual.txt:3635 +#: ./user-manual.txt:3656 msgid "" "If there are multiple controllers running, it's easiest to off the unused " "controller(s). For example, for +hci1+:" msgstr "" #. type: Plain text -#: ./user-manual.txt:3637 +#: ./user-manual.txt:3658 #, no-wrap msgid "\tsudo hciconfig hci1 down\n" msgstr "" #. type: Plain text -#: ./user-manual.txt:3640 +#: ./user-manual.txt:3661 msgid "" "Next step is to 'trust' and 'pair' the dive computer. On distros with Bluez " "5, such as Fedora 22, one can use a tool called +blutootctl+, which will " @@ -7408,7 +7471,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3661 +#: ./user-manual.txt:3682 #, no-wrap msgid "" "\tbluetoothctl\n" @@ -7437,14 +7500,14 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3664 +#: ./user-manual.txt:3685 msgid "" "If asked for a password, enter 0000. It's ok if the last line says " "'Connected: no'. The important part is the line above, +Pairing successful+." msgstr "" #. type: Plain text -#: ./user-manual.txt:3667 +#: ./user-manual.txt:3688 msgid "" "If the system has Bluez version 4 (e.g. Ubuntu 12.04 through to 15.04), " "there is probably not a +bluetoothctl+, but a script called " @@ -7452,7 +7515,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3672 +#: ./user-manual.txt:3693 #, no-wrap msgid "" "\thcitool -i hci0 scanning\n" @@ -7462,77 +7525,77 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3674 +#: ./user-manual.txt:3695 msgid "Once ther dive computer is pired, set up the RFCOMM connection" msgstr "" #. type: Title ===== -#: ./user-manual.txt:3675 +#: ./user-manual.txt:3696 #, no-wrap msgid "Establishing the RFCOMM connection" msgstr "" #. type: Plain text -#: ./user-manual.txt:3678 +#: ./user-manual.txt:3699 msgid "The command to establish an RFCOMM connection is:" msgstr "" #. type: Plain text -#: ./user-manual.txt:3680 +#: ./user-manual.txt:3701 msgid "+sudo rfcomm -i <controller> connect <dev> <bdaddr> [channel]+" msgstr "" #. type: Plain text -#: ./user-manual.txt:3682 +#: ./user-manual.txt:3703 msgid "<controller>+ is the Bluetooth controller, +hci0+." msgstr "" #. type: Plain text -#: ./user-manual.txt:3683 +#: ./user-manual.txt:3704 msgid "<dev> is the RFCOMM device file, +rfcomm0+" msgstr "" #. type: Plain text -#: ./user-manual.txt:3684 +#: ./user-manual.txt:3705 msgid "<bdaddr> is the dive computer's MAC address, +00:11:22:33:44:55+" msgstr "" #. type: Plain text -#: ./user-manual.txt:3685 +#: ./user-manual.txt:3706 msgid "[channel] is the dive computer's Bluetooth channel we need to connect to." msgstr "" #. type: Plain text -#: ./user-manual.txt:3688 +#: ./user-manual.txt:3709 msgid "" "If one omits it, channel 1 is assumed. Based on a limited number of user " "reports, the appropriate channel for the dive computer is probably:" msgstr "" #. type: Plain text -#: ./user-manual.txt:3690 +#: ./user-manual.txt:3711 msgid "_Shearwater Petrel 2_: channel 5" msgstr "" #. type: Plain text -#: ./user-manual.txt:3691 +#: ./user-manual.txt:3712 msgid "_Shearwater Petrel 1_: channel 1" msgstr "" #. type: Plain text -#: ./user-manual.txt:3692 +#: ./user-manual.txt:3713 msgid "_Heinrichs-Weikamp OSTC Sport_: channel 1" msgstr "" #. type: Plain text -#: ./user-manual.txt:3694 +#: ./user-manual.txt:3715 msgid "" "E.g. to connect a _Shearwater Petrel 2_, set the dive computer to upload " "mode and enter:" msgstr "" #. type: Plain text -#: ./user-manual.txt:3696 +#: ./user-manual.txt:3717 #, no-wrap msgid "" "\tsudo rfcomm -i hci0 connect rfcomm0 00:11:22:33:44:55 5 (enter a password, " @@ -7540,12 +7603,12 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3698 +#: ./user-manual.txt:3719 msgid "This gives the response:" msgstr "" #. type: Plain text -#: ./user-manual.txt:3701 +#: ./user-manual.txt:3722 #, no-wrap msgid "" "\tConnected /dev/rfcomm0 to 00:11:22:33:44:55 on channel 5\n" @@ -7553,14 +7616,14 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3703 +#: ./user-manual.txt:3724 msgid "" "To connect a _Shearwater Petrel 1+ or + HW OSTC Sport+, set the dive " "computer to upload mode and enter:" msgstr "" #. type: Plain text -#: ./user-manual.txt:3707 +#: ./user-manual.txt:3728 #, no-wrap msgid "" "\tsudo rfcomm -i hci0 connect rfcomm0 00:11:22:33:44:55 (enter a password, " @@ -7570,7 +7633,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3711 +#: ./user-manual.txt:3732 msgid "" "If the specific channel the dive computer needs is not known, or the channel " "in the list above doesn't work, the command +sdptool records+ should help " @@ -7579,7 +7642,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3721 +#: ./user-manual.txt:3742 #, no-wrap msgid "" "\tsdptool -i hci0 records 00:11:22:33:44:55\n" @@ -7594,7 +7657,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3724 +#: ./user-manual.txt:3745 msgid "" "For a Bluetooth dive computer not in the list above, or if the channel " "listed is not correct, please let the Subsurface developers know on the user " @@ -7602,13 +7665,13 @@ msgid "" msgstr "" #. type: Title ===== -#: ./user-manual.txt:3725 +#: ./user-manual.txt:3746 #, no-wrap msgid "Download the dives with Subsurface</em>" msgstr "" #. type: Plain text -#: ./user-manual.txt:3727 +#: ./user-manual.txt:3748 msgid "" "After establishing the RFCOMM connection and while the dive computer's " "upload mode countdown is still running, go to_Subsurface_, select " @@ -7618,25 +7681,25 @@ msgid "" msgstr "" #. type: Title == -#: ./user-manual.txt:3730 +#: ./user-manual.txt:3751 #, no-wrap msgid "APPENDIX B: Dive Computer specific information for importing dive data." msgstr "" #. type: Title === -#: ./user-manual.txt:3733 +#: ./user-manual.txt:3754 #, no-wrap msgid "Importing from Uemis Zurich" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: ./user-manual.txt:3735 +#: ./user-manual.txt:3756 #, no-wrap msgid "images/icons/iumis.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:3751 +#: ./user-manual.txt:3772 msgid "" "_Subsurface_ downloads the information stored on the SDA (the built-in file " "system of the Uemis) including information about dive spots and " @@ -7653,7 +7716,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3766 +#: ./user-manual.txt:3787 msgid "" "After selecting the above device name, download the dives from the Uemis " "Zurich. One technical issue with the Uemis Zurich download implementation " @@ -7670,19 +7733,19 @@ msgid "" msgstr "" #. type: Title === -#: ./user-manual.txt:3768 +#: ./user-manual.txt:3789 #, no-wrap msgid "Importing from Uwatec Galileo" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: ./user-manual.txt:3770 +#: ./user-manual.txt:3791 #, no-wrap msgid "images/icons/Galileo.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:3785 +#: ./user-manual.txt:3806 msgid "" "The Uwatec Galileo dive computers use infra red (IrDA) communication between " "the dive computer and Subsurface. The Uwatec hardware uses a USB dongle " @@ -7698,14 +7761,14 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3788 +#: ./user-manual.txt:3809 msgid "" "After executing this command, Subsurface will recognise the Galileo dive " "computer and download dive information." msgstr "" #. type: Plain text -#: ./user-manual.txt:3794 +#: ./user-manual.txt:3815 msgid "" "Under Windows, a similar situation exists. Drivers for the MCS7780 are " "available from some Internet web sites e.g. " @@ -7716,26 +7779,26 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3797 +#: ./user-manual.txt:3818 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:3799 +#: ./user-manual.txt:3820 #, no-wrap msgid "Importing from Heinrichs Weikamp DR5" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: ./user-manual.txt:3801 +#: ./user-manual.txt:3822 #, no-wrap msgid "images/icons/HW_DR5.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:3811 +#: ./user-manual.txt:3832 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. " @@ -7748,19 +7811,19 @@ msgid "" msgstr "" #. type: Title === -#: ./user-manual.txt:3814 +#: ./user-manual.txt:3835 #, no-wrap msgid "Importing from xDEEP BLACK" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: ./user-manual.txt:3816 +#: ./user-manual.txt:3837 #, no-wrap msgid "images/icons/HW_xdeepblack.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:3825 +#: ./user-manual.txt:3846 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 " @@ -7774,19 +7837,19 @@ msgid "" msgstr "" #. type: Title === -#: ./user-manual.txt:3827 +#: ./user-manual.txt:3848 #, no-wrap msgid "Importing from Shearwater Predator using Bluetooth" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: ./user-manual.txt:3829 +#: ./user-manual.txt:3850 #, no-wrap msgid "images/icons/predator.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:3837 +#: ./user-manual.txt:3858 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 " @@ -7797,36 +7860,36 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3840 +#: ./user-manual.txt:3861 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:3841 +#: ./user-manual.txt:3862 msgid "switch to different Bluetooth drivers for the same hardware" msgstr "" #. type: Plain text -#: ./user-manual.txt:3842 +#: ./user-manual.txt:3863 msgid "switch off WiFi while using Bluetooth" msgstr "" #. type: Title === -#: ./user-manual.txt:3844 +#: ./user-manual.txt:3865 #, no-wrap msgid "Importing from Poseidon MkVI Discovery" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: ./user-manual.txt:3846 +#: ./user-manual.txt:3867 #, no-wrap msgid "images/MkVI.jpeg" msgstr "" #. type: Plain text -#: ./user-manual.txt:3854 +#: ./user-manual.txt:3875 msgid "" "Download of dive logs from the MkVI is performed using a custom " "communications adapter and the _Poseidon PC Configuration Software_, " @@ -7838,45 +7901,45 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3857 +#: ./user-manual.txt:3878 msgid "" "Setup configuration for the dive and key dive parameters (file with a .txt " "extension)" msgstr "" #. type: Plain text -#: ./user-manual.txt:3858 +#: ./user-manual.txt:3879 msgid "Dive log details (file with a .csv extension)" msgstr "" #. type: Plain text -#: ./user-manual.txt:3860 +#: ./user-manual.txt:3881 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:3862 +#: ./user-manual.txt:3883 msgid "" "_Subsurface_ accesses the .txt and the .csv files to obtain dive log " "information." msgstr "" #. type: Title === -#: ./user-manual.txt:3864 +#: ./user-manual.txt:3885 #, no-wrap -msgid "Importing from APD Inspiration CCR" +msgid "Importing from APD Inspiration/Evolution CCR" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: ./user-manual.txt:3866 +#: ./user-manual.txt:3887 #, no-wrap msgid "images/APDComputer.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:3874 +#: ./user-manual.txt:3895 msgid "" "The dive logs of an APD Inspiration or similar CCR dive computer are " "downloaded using a communications adapter and _AP Communicator_, obtained " @@ -7888,82 +7951,103 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3876 +#: ./user-manual.txt:3897 +msgid "Download the dive using _AP Communicator_." +msgstr "" + +#. type: Plain text +#: ./user-manual.txt:3898 msgid "Open a dive within the _AP Log Viewer_." msgstr "" #. type: Plain text -#: ./user-manual.txt:3877 +#: ./user-manual.txt:3899 msgid "Select the tab at the top of the screen, entitled \"_Data_\"." msgstr "" #. type: Plain text -#: ./user-manual.txt:3878 +#: ./user-manual.txt:3900 msgid "" -"If the raw dive log data show on the screen, click on \"_Copy to " +"With the raw dive log data show on the screen, click on \"_Copy to " "Clipboard_\"." msgstr "" #. type: Plain text -#: ./user-manual.txt:3879 -msgid "Open a text editor, e.g. Notepad (Windows), TextWrangler (Mac)." +#: ./user-manual.txt:3901 +msgid "Open a text editor, e.g. Notepad (Windows) or TextWrangler (Mac)." msgstr "" #. type: Plain text -#: ./user-manual.txt:3881 +#: ./user-manual.txt:3903 msgid "" "Copy the contents of the clipboard into the text editor and save the text " -"file with a filename extension of .CSV" +"file with a filename extension of _.apd_" msgstr "" #. type: Plain text -#: ./user-manual.txt:3882 +#: ./user-manual.txt:3904 msgid "" "Within _Subsurface_, select _Import -> Import log files_ to open the " "xref:Unified_import[universal import dialogue]." msgstr "" #. type: Plain text -#: ./user-manual.txt:3883 +#: ./user-manual.txt:3905 msgid "" -"In the dropdown list towards the bottom right of the dialogue, select \"_CSV " -"files_\"." +"In the dropdown list towards the bottom right of the dialogue (labled " +"'Filter:'), select \"APD log viewer\"." msgstr "" #. type: Plain text -#: ./user-manual.txt:3885 +#: ./user-manual.txt:3908 msgid "" -"On the list of file names select the .CSV file that has been created " -"above. An import dialogue opens." +"On the list of file names select the _.apd_ file that has been created " +"above. An import dialogue opens indicating the default settings for the data " +"in the _.apd_ file. If any changes are required, do this as for " +"xref:S_ImportingCSVDives[CSV imports]." +msgstr "" + +#. type: Target for macro image +#: ./user-manual.txt:3909 +#, no-wrap +msgid "images/APD_CSVimportF22.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:3887 +#: ./user-manual.txt:3917 msgid "" -"In the dropdown list on the top left labeled '_Pre-configured imports_\", " -"select _APD Log Viewer_." +"The top left hand dropdown box in the import panel allows one to select the " +"APD dive computer for which the dive log needs to be imported. The default " +"it is DC1, _i.e._ the first of the two dive computers the APD uses. It is " +"possible to sequentially import the data for both dive computers by first " +"importing CD1 and then DC2.(*Hint*: The logs for the two dive computers are " +"viewed by selecting _View -> Next DC_ from the Main Menu after the uploading " +"has been completed)" msgstr "" #. type: Plain text -#: ./user-manual.txt:3888 -msgid "" -"Ensure the other settings for the ADP dive log are appropriate, then select " -"_OK_." +#: ./user-manual.txt:3918 +msgid "Click the _Ok_ button at the bottom of the import panel." msgstr "" #. type: Plain text -#: ./user-manual.txt:3890 -msgid "The APD dive log will appear within _Subsurface_." +#: ./user-manual.txt:3923 +msgid "" +"The APD dive log will appear within _Subsurface_. The dive " +"computer-generated ceiling generated by the Inspiration can be viewed by " +"selecting the appropriate button on the left of the *Dive Profile*. Cylinder " +"pressure data are not logged by the APD equipment but can be manually " +"entered in the _Equipment_ Tab." msgstr "" #. type: Title == -#: ./user-manual.txt:3892 +#: ./user-manual.txt:3924 #, no-wrap msgid "APPENDIX C: Exporting Dive log information from external dive log software." msgstr "" #. type: Plain text -#: ./user-manual.txt:3901 +#: ./user-manual.txt:3933 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, " @@ -7973,22 +8057,22 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3903 +#: ./user-manual.txt:3935 msgid "Export the foreign dive log data to format that is accessible from" msgstr "" #. type: Plain text -#: ./user-manual.txt:3904 +#: ./user-manual.txt:3936 msgid "_Subsurface_." msgstr "" #. type: Plain text -#: ./user-manual.txt:3905 +#: ./user-manual.txt:3937 msgid "Import the accessible dive log data into _Subsurface_." msgstr "" #. type: Plain text -#: ./user-manual.txt:3909 +#: ./user-manual.txt:3941 msgid "" "This appendix provides some information about approaches to export dive log " "data from foreign dive log software. The procedures below mostly apply to " @@ -7996,19 +8080,19 @@ msgid "" msgstr "" #. type: Title === -#: ./user-manual.txt:3911 +#: ./user-manual.txt:3943 #, no-wrap msgid "Exporting from *Suunto Divemanager (DM3, DM4 or DM5)*" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: ./user-manual.txt:3912 +#: ./user-manual.txt:3944 #, no-wrap msgid "images/icons/suuntologo.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:3919 +#: ./user-manual.txt:3951 msgid "" "DiveManager is a MS Windows application for Suunto dive computers. " "Divemanager 3 (DM3) is an older version of the Suunto software. More recent " @@ -8018,64 +8102,64 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3921 +#: ./user-manual.txt:3953 #, no-wrap msgid "*Divemanager 3 (DM3):*\n" msgstr "" #. type: Plain text -#: ./user-manual.txt:3923 +#: ./user-manual.txt:3955 msgid "Start 'Suunto Divemanager 3' and log in with the name containing the logs" msgstr "" #. type: Plain text -#: ./user-manual.txt:3924 +#: ./user-manual.txt:3956 msgid "Do not start the import wizard to import dives from the dive computer." msgstr "" #. type: Plain text -#: ./user-manual.txt:3926 +#: ./user-manual.txt:3958 msgid "" "In the navigation tree on the left side of the program-window, select the " "appropriate dives." msgstr "" #. type: Plain text -#: ./user-manual.txt:3927 +#: ./user-manual.txt:3959 msgid "Within the list of dives, select the dives you would like to import later:" msgstr "" #. type: Plain text -#: ./user-manual.txt:3928 +#: ./user-manual.txt:3960 msgid "To select certain dives: hold 'ctrl' and click the dive" msgstr "" #. type: Plain text -#: ./user-manual.txt:3930 +#: ./user-manual.txt:3962 msgid "" "To select all dives: Select the first dive, hold down shift and select the " "last dive" msgstr "" #. type: Plain text -#: ./user-manual.txt:3931 +#: ./user-manual.txt:3963 msgid "With the dives marked, use the program menu _File -> Export_" msgstr "" #. type: Plain text -#: ./user-manual.txt:3932 +#: ./user-manual.txt:3964 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:3933 +#: ./user-manual.txt:3965 msgid "Click the browse button next to the field Export Path" msgstr "" #. type: Plain text -#: ./user-manual.txt:3935 +#: ./user-manual.txt:3967 #, no-wrap msgid "" "** A file-manager like window pops up\n" @@ -8083,13 +8167,13 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3936 +#: ./user-manual.txt:3968 #, no-wrap msgid "Divelog.SDE file\n" msgstr "" #. type: Plain text -#: ./user-manual.txt:3938 +#: ./user-manual.txt:3970 #, no-wrap msgid "" "** Optionally change the name of the file for saving\n" @@ -8097,25 +8181,25 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3939 +#: ./user-manual.txt:3971 #, no-wrap msgid "Back in the Export pop-up, press the button 'Export'\n" msgstr "" #. type: Plain text -#: ./user-manual.txt:3940 +#: ./user-manual.txt:3972 #, no-wrap msgid "The dives are now exported to the file Divelog.SDE.\n" msgstr "" #. type: Plain text -#: ./user-manual.txt:3942 +#: ./user-manual.txt:3974 #, no-wrap msgid "*Divemanager 4 (DM4) and Divemanager 5 (DM5):*\n" msgstr "" #. type: Plain text -#: ./user-manual.txt:3947 +#: ./user-manual.txt:3979 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 " @@ -8124,81 +8208,81 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3949 +#: ./user-manual.txt:3981 msgid "Locating the Suunto DM4 (or DM5) database:" msgstr "" #. type: Plain text -#: ./user-manual.txt:3951 ./user-manual.txt:3960 +#: ./user-manual.txt:3983 ./user-manual.txt:3992 msgid "Start Suunto DM4/DM5" msgstr "" #. type: Plain text -#: ./user-manual.txt:3952 +#: ./user-manual.txt:3984 msgid "Select 'Help -> About'" msgstr "" #. type: Plain text -#: ./user-manual.txt:3953 +#: ./user-manual.txt:3985 msgid "Click 'Copy' after text 'Copy log folder path to clipboard'" msgstr "" #. type: Plain text -#: ./user-manual.txt:3954 +#: ./user-manual.txt:3986 msgid "Now open Windows Explorer" msgstr "" #. type: Plain text -#: ./user-manual.txt:3955 +#: ./user-manual.txt:3987 msgid "Paste the address to the path box at the top of the File Explorer" msgstr "" #. type: Plain text -#: ./user-manual.txt:3956 +#: ./user-manual.txt:3988 msgid "The database is called DM4.db or DM5.db" msgstr "" #. type: Plain text -#: ./user-manual.txt:3958 +#: ./user-manual.txt:3990 msgid "Making a backup copy of the Suunto DM4/DM5 database:" msgstr "" #. type: Plain text -#: ./user-manual.txt:3961 +#: ./user-manual.txt:3993 msgid "Select 'File - Create backup'" msgstr "" #. type: Plain text -#: ./user-manual.txt:3963 +#: ./user-manual.txt:3995 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:3964 +#: ./user-manual.txt:3996 msgid "Click 'Save'" msgstr "" #. type: Plain text -#: ./user-manual.txt:3965 +#: ./user-manual.txt:3997 msgid "The dives are now exported to the file DM4.bak (or DM5.bak)" msgstr "" #. type: Title === -#: ./user-manual.txt:3967 +#: ./user-manual.txt:3999 #, no-wrap msgid "Exporting from Atomic Logbook" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: ./user-manual.txt:3970 +#: ./user-manual.txt:4002 #, no-wrap msgid "images/icons/atomiclogo.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:3977 +#: ./user-manual.txt:4009 msgid "" "Atomic Logbook is a Windows software by Atomic Aquatics. It allows " "downloading of dive information from Cobalt and Cobalt 2 dive computers. " @@ -8208,19 +8292,19 @@ msgid "" msgstr "" #. type: Title === -#: ./user-manual.txt:3979 +#: ./user-manual.txt:4011 #, no-wrap msgid "Exporting from Mares Dive Organiser V2.1" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: ./user-manual.txt:3982 +#: ./user-manual.txt:4014 #, no-wrap msgid "images/icons/mareslogo.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:3990 +#: ./user-manual.txt:4022 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 " @@ -8231,7 +8315,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3995 +#: ./user-manual.txt:4027 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 " @@ -8239,36 +8323,36 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3998 +#: ./user-manual.txt:4030 msgid "" "Rename the file to DiveOrganiserxxxxx.zip. Inside the zipped directory is a " "file _DiveOrganiser.sdf_." msgstr "" #. type: Plain text -#: ./user-manual.txt:3999 +#: ./user-manual.txt:4031 msgid "Extract the _.sdf_ file from the zipped folder to your Desktop." msgstr "" #. type: Plain text -#: ./user-manual.txt:4000 +#: ./user-manual.txt:4032 msgid "The password for accessing the .zip file is _mares_." msgstr "" #. type: Title === -#: ./user-manual.txt:4002 +#: ./user-manual.txt:4034 #, no-wrap msgid "Exporting from *DivingLog 5.0 and 6.0*" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: ./user-manual.txt:4004 +#: ./user-manual.txt:4036 #, no-wrap msgid "images/icons/divingloglogo.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:4011 +#: ./user-manual.txt:4043 msgid "" "The best way to bring your logs from DivingLog to Subsurface is to convert " "the whole database. This is because other export formats do not include all " @@ -8278,37 +8362,37 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:4013 +#: ./user-manual.txt:4045 msgid "To transfer all files from DivingLog to Subsurface, do the following:" msgstr "" #. type: Plain text -#: ./user-manual.txt:4015 +#: ./user-manual.txt:4047 msgid "In DivingLog open the 'File -> Export -> SQLite' menu" msgstr "" #. type: Plain text -#: ./user-manual.txt:4016 +#: ./user-manual.txt:4048 msgid "Select 'Settings' button" msgstr "" #. type: Plain text -#: ./user-manual.txt:4017 +#: ./user-manual.txt:4049 msgid "Set the 'RTF2Plaintext' to 'true'" msgstr "" #. type: Plain text -#: ./user-manual.txt:4018 +#: ./user-manual.txt:4050 msgid "Close the Settings dialog" msgstr "" #. type: Plain text -#: ./user-manual.txt:4019 +#: ./user-manual.txt:4051 msgid "Click 'Export' button and select the filename" msgstr "" #. type: Plain text -#: ./user-manual.txt:4023 +#: ./user-manual.txt:4055 msgid "" "Once this is done, open the saved database file with Subsurface and the " "dives are automatically converted to our own format. Last step to do is save " @@ -8316,13 +8400,13 @@ msgid "" msgstr "" #. type: Title == -#: ./user-manual.txt:4025 +#: ./user-manual.txt:4056 #, no-wrap msgid "APPENDIX D: Exporting a spreadsheet to CSV format" msgstr "" #. type: Plain text -#: ./user-manual.txt:4034 +#: ./user-manual.txt:4066 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 " @@ -8335,7 +8419,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:4040 +#: ./user-manual.txt:4072 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 " @@ -8346,40 +8430,40 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:4042 +#: ./user-manual.txt:4074 msgid "Date: use one of the following formats: yyyy-mm-dd, dd.mm.yyyy, mm/dd/yyyy" msgstr "" #. type: Plain text -#: ./user-manual.txt:4043 +#: ./user-manual.txt:4075 msgid "Duration: the format should be minutes:seconds." msgstr "" #. type: Plain text -#: ./user-manual.txt:4044 +#: ./user-manual.txt:4076 msgid "" "Unit system: only one unit system should be used (i.e., no mixture between " "imperial and metric units)" msgstr "" #. type: Plain text -#: ./user-manual.txt:4045 +#: ./user-manual.txt:4077 msgid "Tags and buddies: values should be separated using a comma." msgstr "" #. type: Plain text -#: ./user-manual.txt:4046 +#: ./user-manual.txt:4078 msgid "GPS position: users must use decimal degrees, e.g. 30.22496 30.821798" msgstr "" #. type: Title === -#: ./user-manual.txt:4047 +#: ./user-manual.txt:4079 #, no-wrap msgid "_LibreOffice Calc_ and _OpenOffice Calc_" msgstr "" #. type: Plain text -#: ./user-manual.txt:4051 +#: ./user-manual.txt:4083 msgid "" "These are open source spreadsheet applications forming parts of larger open " "source office suite applications. The user interaction with _LibreOffice_ " @@ -8390,13 +8474,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: ./user-manual.txt:4052 +#: ./user-manual.txt:4084 #, no-wrap msgid "images/LOffice_spreadsheetdata.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:4055 +#: ./user-manual.txt:4087 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 " @@ -8404,13 +8488,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: ./user-manual.txt:4056 +#: ./user-manual.txt:4088 #, no-wrap msgid "images/LOffice_save_as_options.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:4059 +#: ./user-manual.txt:4091 msgid "" "After selecting _Save_, select the appropriate field delimiter (choose _Tab_ " "to prevent conflicts with the comma when using this as a decimal point), " @@ -8418,13 +8502,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: ./user-manual.txt:4060 +#: ./user-manual.txt:4092 #, no-wrap msgid "images/LOffice_field_options.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:4063 +#: ./user-manual.txt:4095 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 " @@ -8432,13 +8516,13 @@ msgid "" msgstr "" #. type: Title === -#: ./user-manual.txt:4064 +#: ./user-manual.txt:4096 #, no-wrap msgid "Microsoft _Excel_" msgstr "" #. type: Plain text -#: ./user-manual.txt:4070 +#: ./user-manual.txt:4102 msgid "" "The field delimiter (called \"_list separator_\" in Microsoft manuals) is " "not accessible from within _Excel_ and needs to be set through the " @@ -8449,19 +8533,19 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:4072 +#: ./user-manual.txt:4104 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:4073 +#: ./user-manual.txt:4105 msgid "Open the _Regional and Language Options_ dialog box." msgstr "" #. type: Plain text -#: ./user-manual.txt:4076 +#: ./user-manual.txt:4108 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 " @@ -8469,48 +8553,48 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:4077 +#: ./user-manual.txt:4109 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:4078 +#: ./user-manual.txt:4110 msgid "Click _OK_ twice." msgstr "" #. type: Plain text -#: ./user-manual.txt:4080 +#: ./user-manual.txt:4112 msgid "Below is an image of the _Control Panel_:" msgstr "" #. type: Target for macro image -#: ./user-manual.txt:4081 +#: ./user-manual.txt:4113 #, no-wrap msgid "images/Win_SaveCSV2.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:4084 +#: ./user-manual.txt:4116 msgid "To export the dive log in CSV format:" msgstr "" #. type: Plain text -#: ./user-manual.txt:4086 +#: ./user-manual.txt:4118 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:4087 +#: ./user-manual.txt:4119 #, no-wrap msgid "images/Win_SaveCSV1.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:4090 +#: ./user-manual.txt:4122 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 " @@ -8520,13 +8604,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: ./user-manual.txt:4091 +#: ./user-manual.txt:4123 #, no-wrap msgid "images/Win_SaveCSV3.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:4094 +#: ./user-manual.txt:4126 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 " @@ -8535,195 +8619,122 @@ msgid "" msgstr "" #. type: Title == -#: ./user-manual.txt:4095 -#, no-wrap -msgid "APPENDIX E: FAQs." -msgstr "" - -#. type: Title === -#: ./user-manual.txt:4097 +#: ./user-manual.txt:4128 #, no-wrap -msgid "Subsurface appears to miscalculate gas consumption and SAC" -msgstr "" - -#. type: Plain text -#: ./user-manual.txt:4101 -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_ " -"calculates. Is _Subsurface_ miscalculating?" -msgstr "" - -#. type: Plain text -#: ./user-manual.txt:4107 -msgid "" -"'Answer': Not really. What happens is that _Subsurface_ actually calculates " -"gas consumption differently - and better - than you expect. In particular, " -"it takes the incompressibility of the gas into account. Traditionally, Gas " -"consumption and SAC should be: +consumption = tank size x (start pressure - " -"end pressure)+" -msgstr "" - -#. type: Plain text -#: ./user-manual.txt:4113 -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 " -"actually don't compress linearly with pressure. Also, you are missing the " -"fact that one atmosphere of pressure isn't actually one bar. So the *real* " -"calculation is:" -msgstr "" - -#. type: Plain text -#: ./user-manual.txt:4115 -msgid "+consumption = (amount_of_air_at_beginning - amount_of_air_at_end)+" +msgid "APPENDIX E: Writing a custom print template" msgstr "" #. type: Plain text -#: ./user-manual.txt:4121 +#: ./user-manual.txt:4133 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 " -"fairly small issue under 220 bar - you'll see more differences when you do " -"high-pressure tanks with 300bar) and \"convert bar to atm\" (which is the " -"majority of your discrepancy). Remember: one ATM is ~1.013 bar, so without " -"the compressibility, your gas use is:" +"_Subsurface_ provides a mechanism to create or modify templates for printing " +"dive logs in order to produce customised printouts of dive logs. Templates, " +"written in HTML as well as a simple Grantlee instruction set, are rendered " +"to the print device by _Subsurface_." msgstr "" #. type: Plain text -#: ./user-manual.txt:4123 -msgid "+12.2*((220-100)/1.013)+" +#: ./user-manual.txt:4135 +msgid "Templates are accessed using the print dialogue (see image *B* below)." msgstr "" #. type: Plain text -#: ./user-manual.txt:4128 +#: ./user-manual.txt:4143 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 " -"compressibility does show up above 200 bar, and takes that 1445 down about " -"eight litres more, so you really did use only about 1437 l of air at surface " -"pressure." +"The buttons under the _Template_ dropdown box allows one to _Edit_, " +"_Delete_, _Import_ and to _Export_ templates (see image *A* above). New or " +"modified templates are stored as HTML files in the same directory as the " +"dive log being processed. In order to create or modify a template, select " +"the _Custom_ template from the template dropdown list in the print dialogue " +"(see image *B* above), then select _Edit_." msgstr "" #. type: Plain text -#: ./user-manual.txt:4134 -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 " -"mentioned, the \"contains less air than you thought it did\" really starts " -"becoming much more noticeable at high pressure. A 400 bar really does not " -"contain twice as much air as a 200 bar one. At lower pressures, air acts " -"pretty much like an ideal gas." +#: ./user-manual.txt:4145 +msgid "The Edit Panel comprises three tabs:" msgstr "" -#. type: Title === -#: ./user-manual.txt:4135 +#. type: Target for macro image +#: ./user-manual.txt:4146 #, no-wrap -msgid "" -"Some dive profiles have time discrepancies with the recorded samples from my " -"dive computer..." -msgstr "" - -#. type: Plain text -#: ./user-manual.txt:4139 -msgid "" -"_Subsurface_ ends up ignoring surface time for many things (average depth, " -"divetime, SAC, etc). 'Question': Why do dive durations in my dive computer " -"differ from that given by _Subsurface_?" +msgid "images/Template1_f22.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:4147 +#: ./user-manual.txt:4150 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 " -"for your buddies, your dive computer may say that your dive is 50 minutes " -"long - because you have fifty minutes worth of samples - but subsurface will " -"say it's 45 minutes - because you were actually diving for 45 minutes. It's " -"even more noticeable if you do things like divemastering the initial OW " -"dives, when you may stay in the water for a long time, but spend most of it " -"at the surface. And then you don't want that to count as some kind of long " -"dive”." -msgstr "" - -#. type: Title === -#: ./user-manual.txt:4148 -#, no-wrap -msgid "Some dive profiles are missing from the download" +"The _Style_ tab (image *A* above) controls the font, line spacing and colour " +"template used for printing the dive log. The style attributes are " +"editable. Choose one of the four colour palets used for colour printing." msgstr "" #. type: Plain text #: ./user-manual.txt:4154 msgid "" -"'Question': I cannot download all my dives, only the most recent ones even " -"though my dive computer's manual states that it records history of e.g. 999 " -"dives." +"The _Colors_ tab (image *B* above) allows editing the colours used for " +"printing the dive log. The colours are highly customisable: the _Edit_ " +"buttons in the _Colors_ tab allows choosing abritrary colours for different " +"components of the dive log printout." msgstr "" #. type: Plain text #: ./user-manual.txt:4163 msgid "" -"'Answer': Dive history is different than the dive profiles on the log. The " -"history only keeps track of the total number of dives and total amount of " -"time spent below surface. The logs, on the other hand, store the dive " -"profile, but they have limited amount of memory to do so. The exact amount " -"of dive profiles that can be stored on the device depend on sample interval " -"and duration of the dives. Once the memory is full the oldest dives get " -"overwritten with new dives. Thus we are only able to download the last 13, " -"30 or 199 dives." -msgstr "" - -#. type: Plain text -#: ./user-manual.txt:4168 -msgid "" -"If you have downloaded your dives to different dive logging software before " -"they were overwritten, there is a high change that Subsurface can import " -"these. However, if the logs are only on your dive computer, they cannot be " -"salvaged after being over written by new dives." +"The _Template_ tab of the Edit Panel (see image below) allows creating a " +"template using HTML as well as a few Grantlee programming " +"primitives. Grantlee provides the ability to create and format HTML code in " +"a highly simple but efficient way (see below). The HTML of the template can " +"be edited and saved. The saved template is stored in the same directory as " +"the dive being processed. By default, a _Custom_ template is a skeleton with " +"no specific print instructions. The informastion being printed needs to be " +"specified and formatted in the by replacing the section marked with: \"<!-- " +"Template must be filled -->\". Writing HTML code with Grantlee instructions " +"allows unlimited freedom in determining what is printed an in which way it " +"should be rendered." msgstr "" -#. type: Title == -#: ./user-manual.txt:4169 +#. type: Target for macro image +#: ./user-manual.txt:4164 #, no-wrap -msgid "APPENDIX F: Write a custom printing template" +msgid "images/Template2_f22.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:4173 +#: ./user-manual.txt:4167 msgid "" -"_Subsurface_ provides a customizable printing support which is based on " -"templates that are transformed by the _Grantlee_ backend to correct _HTML_ " -"syntax, The _HTML_ output is then rendered by _Subsurface_." +"One can adapt any of the existing templates and save it to the dive log " +"directory. The standard templates (e.g. One dive, Six dives, Table) can be " +"modified in this way." msgstr "" #. type: Plain text -#: ./user-manual.txt:4175 +#: ./user-manual.txt:4169 msgid "" "To write a custom template the following elements must exist so that the " "template will be correctly handled and rendered." msgstr "" #. type: Title === -#: ./user-manual.txt:4176 +#: ./user-manual.txt:4170 #, no-wrap msgid "Main dive loop" msgstr "" #. type: Plain text -#: ./user-manual.txt:4178 +#: ./user-manual.txt:4172 msgid "" "_Subsurface_ exports a dive list called (*dives*) to the _Grantlee_ " "backend. It is possible to iterate over the list as follows:" msgstr "" #. type: Block title -#: ./user-manual.txt:4179 ./user-manual.txt:4233 ./user-manual.txt:4250 +#: ./user-manual.txt:4173 ./user-manual.txt:4227 ./user-manual.txt:4244 #, no-wrap msgid "template.html" msgstr "" #. type: delimited block . -#: ./user-manual.txt:4184 +#: ./user-manual.txt:4178 #, no-wrap msgid "" "\t{% for dive in dives %}\n" @@ -8732,13 +8743,13 @@ msgid "" msgstr "" #. type: Block title -#: ./user-manual.txt:4186 ./user-manual.txt:4238 ./user-manual.txt:4257 +#: ./user-manual.txt:4180 ./user-manual.txt:4232 ./user-manual.txt:4251 #, no-wrap msgid "output.html" msgstr "" #. type: delimited block . -#: ./user-manual.txt:4191 +#: ./user-manual.txt:4185 #, no-wrap msgid "" "\t<h1> 1 </h1>\n" @@ -8747,25 +8758,25 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:4194 +#: ./user-manual.txt:4188 msgid "" "Additional information about _Grantlee_ can be found " "http://www.grantlee.org/apidox/for_themers.html[here]" msgstr "" #. type: Title === -#: ./user-manual.txt:4195 +#: ./user-manual.txt:4189 #, no-wrap msgid "Grantlee exported variables" msgstr "" #. type: Plain text -#: ./user-manual.txt:4197 +#: ./user-manual.txt:4191 msgid "Only a subset of the dive data is exported:" msgstr "" #. type: delimited block | -#: ./user-manual.txt:4215 +#: ./user-manual.txt:4209 #, no-wrap msgid "" "|*Name*|*Description*\n" @@ -8788,7 +8799,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:4219 +#: ./user-manual.txt:4213 msgid "" "_Subsurface_ also exports *template_options* data. This data must be used as " "_CSS_ values to provide a dynamically editable template. The exported data " @@ -8796,7 +8807,7 @@ msgid "" msgstr "" #. type: delimited block | -#: ./user-manual.txt:4231 +#: ./user-manual.txt:4225 #, no-wrap msgid "" "|*Name*|*Description*\n" @@ -8815,26 +8826,26 @@ msgid "" msgstr "" #. type: delimited block . -#: ./user-manual.txt:4236 +#: ./user-manual.txt:4230 #, no-wrap msgid "\tborder-width: {{ template_options.borderwidth }}px;\n" msgstr "" #. type: delimited block . -#: ./user-manual.txt:4241 +#: ./user-manual.txt:4235 #, no-wrap msgid "\tborder-width: 3px;\n" msgstr "" #. type: Plain text -#: ./user-manual.txt:4244 +#: ./user-manual.txt:4238 msgid "" "Another variable that _Subsurface_ exports is *print_options*. This variable " "contains a single member:" msgstr "" #. type: delimited block | -#: ./user-manual.txt:4247 +#: ./user-manual.txt:4241 #, no-wrap msgid "" "|*Name*|*Description*\n" @@ -8843,7 +8854,7 @@ msgid "" msgstr "" #. type: delimited block . -#: ./user-manual.txt:4255 +#: ./user-manual.txt:4249 #, no-wrap msgid "" "\tbody {\n" @@ -8852,7 +8863,7 @@ msgid "" msgstr "" #. type: delimited block . -#: ./user-manual.txt:4262 +#: ./user-manual.txt:4256 #, no-wrap msgid "" "\tbody {\n" @@ -8861,13 +8872,13 @@ msgid "" msgstr "" #. type: Title === -#: ./user-manual.txt:4264 +#: ./user-manual.txt:4258 #, no-wrap msgid "Defined CSS selectors" msgstr "" #. type: Plain text -#: ./user-manual.txt:4268 +#: ./user-manual.txt:4262 msgid "" "As the dive profile is placed after rendering, _Subsurface_ uses a special " "_CSS_ selectors to do some searches in the HTML output. The _CSS_ selectors " @@ -8875,7 +8886,7 @@ msgid "" msgstr "" #. type: delimited block | -#: ./user-manual.txt:4275 +#: ./user-manual.txt:4269 #, no-wrap msgid "" "|*Selector*|*Type*|*Description*\n" @@ -8888,20 +8899,20 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:4278 +#: ./user-manual.txt:4272 msgid "" "Rendering dive profiles is not supported for flow layout templates (when " "data-numberofdives = 0)." msgstr "" #. type: Title === -#: ./user-manual.txt:4279 +#: ./user-manual.txt:4273 #, no-wrap msgid "Special attributes" msgstr "" #. type: Plain text -#: ./user-manual.txt:4283 +#: ./user-manual.txt:4277 msgid "" "There are two ways of rendering- either rendering a specific number of dives " "in each page or make _Subsurface_ try to fit as much dives as possible into " @@ -8909,37 +8920,185 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:4285 +#: ./user-manual.txt:4279 msgid "" "The *data-numberofdives* data attribute is added to the body tag to set the " "rendering mode" msgstr "" #. type: Plain text -#: ./user-manual.txt:4287 +#: ./user-manual.txt:4281 msgid "render 6 dives per page:" msgstr "" #. type: delimited block . -#: ./user-manual.txt:4290 +#: ./user-manual.txt:4284 #, no-wrap msgid "\t<body data-numberofdives = 6>\n" msgstr "" #. type: Plain text -#: ./user-manual.txt:4293 +#: ./user-manual.txt:4287 msgid "render as much dives as possible:" msgstr "" #. type: delimited block . -#: ./user-manual.txt:4296 +#: ./user-manual.txt:4290 #, no-wrap msgid "\t<body data-numberofdives = 0>\n" msgstr "" #. type: Plain text -#: ./user-manual.txt:4298 +#: ./user-manual.txt:4293 msgid "" "All CSS units should be in relative lengths only, to support printing on any " "page size." msgstr "" + +#. type: Title == +#: ./user-manual.txt:4294 +#, no-wrap +msgid "APPENDIX F: FAQs." +msgstr "" + +#. type: Title === +#: ./user-manual.txt:4296 +#, no-wrap +msgid "Subsurface appears to miscalculate gas consumption and SAC" +msgstr "" + +#. type: Plain text +#: ./user-manual.txt:4300 +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_ " +"calculates. Is _Subsurface_ miscalculating?" +msgstr "" + +#. type: Plain text +#: ./user-manual.txt:4306 +msgid "" +"'Answer': Not really. What happens is that _Subsurface_ actually calculates " +"gas consumption differently - and better - than you expect. In particular, " +"it takes the incompressibility of the gas into account. Traditionally, Gas " +"consumption and SAC should be: +consumption = tank size x (start pressure - " +"end pressure)+" +msgstr "" + +#. type: Plain text +#: ./user-manual.txt:4312 +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 " +"actually don't compress linearly with pressure. Also, you are missing the " +"fact that one atmosphere of pressure isn't actually one bar. So the *real* " +"calculation is:" +msgstr "" + +#. type: Plain text +#: ./user-manual.txt:4314 +msgid "+consumption = (amount_of_air_at_beginning - amount_of_air_at_end)+" +msgstr "" + +#. type: Plain text +#: ./user-manual.txt:4320 +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 " +"fairly small issue under 220 bar - you'll see more differences when you do " +"high-pressure tanks with 300bar) and \"convert bar to atm\" (which is the " +"majority of your discrepancy). Remember: one ATM is ~1.013 bar, so without " +"the compressibility, your gas use is:" +msgstr "" + +#. type: Plain text +#: ./user-manual.txt:4322 +msgid "+12.2*((220-100)/1.013)+" +msgstr "" + +#. type: Plain text +#: ./user-manual.txt:4327 +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 " +"compressibility does show up above 200 bar, and takes that 1445 down about " +"eight litres more, so you really did use only about 1437 l of air at surface " +"pressure." +msgstr "" + +#. type: Plain text +#: ./user-manual.txt:4333 +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 " +"mentioned, the \"contains less air than you thought it did\" really starts " +"becoming much more noticeable at high pressure. A 400 bar really does not " +"contain twice as much air as a 200 bar one. At lower pressures, air acts " +"pretty much like an ideal gas." +msgstr "" + +#. type: Title === +#: ./user-manual.txt:4334 +#, no-wrap +msgid "" +"Some dive profiles have time discrepancies with the recorded samples from my " +"dive computer..." +msgstr "" + +#. type: Plain text +#: ./user-manual.txt:4338 +msgid "" +"_Subsurface_ ends up ignoring surface time for many things (average depth, " +"divetime, SAC, etc). 'Question': Why do dive durations in my dive computer " +"differ from that given by _Subsurface_?" +msgstr "" + +#. type: Plain text +#: ./user-manual.txt:4346 +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 " +"for your buddies, your dive computer may say that your dive is 50 minutes " +"long - because you have fifty minutes worth of samples - but subsurface will " +"say it's 45 minutes - because you were actually diving for 45 minutes. It's " +"even more noticeable if you do things like divemastering the initial OW " +"dives, when you may stay in the water for a long time, but spend most of it " +"at the surface. And then you don't want that to count as some kind of long " +"dive”." +msgstr "" + +#. type: Title === +#: ./user-manual.txt:4347 +#, no-wrap +msgid "Some dive profiles are missing from the download" +msgstr "" + +#. type: Plain text +#: ./user-manual.txt:4353 +msgid "" +"'Question': I cannot download all my dives, only the most recent ones even " +"though my dive computer's manual states that it records history of e.g. 999 " +"dives." +msgstr "" + +#. type: Plain text +#: ./user-manual.txt:4362 +msgid "" +"'Answer': Dive history is different than the dive profiles on the log. The " +"history only keeps track of the total number of dives and total amount of " +"time spent below surface. The logs, on the other hand, store the dive " +"profile, but they have limited amount of memory to do so. The exact amount " +"of dive profiles that can be stored on the device depend on sample interval " +"and duration of the dives. Once the memory is full the oldest dives get " +"overwritten with new dives. Thus we are only able to download the last 13, " +"30 or 199 dives." +msgstr "" + +#. type: Plain text +#: ./user-manual.txt:4366 +msgid "" +"If you have downloaded your dives to different dive logging software before " +"they were overwritten, there is a high change that Subsurface can import " +"these. However, if the logs are only on your dive computer, they cannot be " +"salvaged after being over written by new dives." +msgstr "" diff --git a/Documentation/fr/po/subsurface-manual.fr.po b/Documentation/fr/po/subsurface-manual.fr.po index 718eaf31e..705bf88bd 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-09-01 13:56+0200\n" -"PO-Revision-Date: 2015-09-01 14:25+0200\n" +"POT-Creation-Date: 2015-09-08 10:29+0200\n" +"PO-Revision-Date: 2015-09-08 10:31+0200\n" "Last-Translator: Guillaume GARDET <guillaume.gardet@opensuse.org>\n" "Language-Team: French <opensuse-fr@opensuse.org>\n" "Language: fr\n" @@ -724,13 +724,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:288 user-manual.txt:768 +#: user-manual.txt:288 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 " -"description will cause unexpected behaviour (Subsurface will think that all " -"of these dives have the same location and try to keep their GPS coordinates " -"the same)." +"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 description will " +"cause unexpected behaviour (Subsurface will think that all of these dives " +"have the same location and try to keep their GPS coordinates the same)." msgstr "" #. type: Plain text @@ -1096,7 +1095,7 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:489 user-manual.txt:2991 +#: user-manual.txt:489 user-manual.txt:3012 #, no-wrap msgid "images/icons/warning2.png" msgstr "images/icons/warning2.png" @@ -1534,6 +1533,16 @@ msgid "" msgstr "" #. type: Plain text +#: user-manual.txt:768 +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 " +"description will cause unexpected behaviour (Subsurface will think that all " +"of these dives have the same location and try to keep their GPS coordinates " +"the same)." +msgstr "" + +#. type: Plain text #: user-manual.txt:773 #, no-wrap msgid "" @@ -2668,7 +2677,7 @@ 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:1426 user-manual.txt:1523 user-manual.txt:1924 +#: user-manual.txt:1426 user-manual.txt:1523 user-manual.txt:1939 #, no-wrap msgid "images/icons/info.jpg" msgstr "images/icons/info.jpg" @@ -3452,15 +3461,15 @@ msgstr "" #. type: Plain text #: user-manual.txt:1822 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 " -"recreational dive computer, a CCR system computer does not allow the " -"download of a log containing multiple dives. Rather, each dive is stored " -"independently. This means that _Subsurface_ cannot download a dive log " -"directly from a CCR dive computer, but that it imports CCR dive logs in the " -"same way that it imports dive log data from other digital databases." +"regulate the oxygen concentration to remain within safe diving limits. The " +"CCR interface of _Subsurface_ is currently experimental and under active " +"development. Subsurface currently supports Poseidon MkVI and APD Discovery/" +"Evolution dive computers. In contrast to a conventional recreational dive " +"computer, a CCR system computer does not allow the download of a log " +"containing multiple dives. Rather, each dive is stored independently. This " +"means that _Subsurface_ cannot download a dive log directly from a CCR dive " +"computer, but that it imports CCR dive logs in the same way that it imports " +"dive log data from other digital databases: one dive at a time." msgstr "" #. type: Title ===== @@ -3470,30 +3479,31 @@ msgid "Import a CCR dive" msgstr "" #. type: Plain text -#: user-manual.txt:1836 +#: user-manual.txt:1837 msgid "" "See the section dealing with xref:S_ImportingAlienDiveLogs[Importing dive " "information from other digital sources]. From the main menu of _Subsurface_, " "select _Import -> Import log files_ to bring up the xref:" "Unified_import[universal import dialogue]. As explained in that section, the " -"bottom right hand of the import dialogue contains a dropdown list of " -"appropriate devices that currently includes an option for (Poseidon) MkVI " -"files (import for other CCR equipment is under active development). Having " -"selected the appropriate CCR format and the directory where the original " -"dive logs have been stored from the CCR dive computer, 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." +"bottom right hand of the import dialogue contains a dropdown list (labled " +"_Filter:_) of appropriate devices that currently includes(Poseidon) MkVI or " +"APD log viewer files (import for other CCR equipment is under active " +"development). Having selected the appropriate CCR format and the directory " +"where the original dive logs have been stored from the CCR dive computer, " +"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. See the section below for" msgstr "" #. type: Title ===== -#: user-manual.txt:1837 +#: user-manual.txt:1838 #, no-wrap msgid "Displayed information for a CCR dive" msgstr "" #. type: Plain text -#: user-manual.txt:1847 +#: user-manual.txt:1848 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 " @@ -3507,12 +3517,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1849 +#: user-manual.txt:1850 msgid "For TWO O~2~ sensors the mean value of the two sensors are given." msgstr "" #. type: Plain text -#: user-manual.txt:1853 +#: user-manual.txt:1854 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 " @@ -3521,54 +3531,54 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1855 +#: user-manual.txt:1856 msgid "" "If no sensor data is available, the pO~2~ value is assumed to be equal to " "the setpoint." msgstr "" #. type: Plain text -#: user-manual.txt:1857 +#: user-manual.txt:1858 msgid "The mean pO~2~ of the sensors is indicated with a green line," msgstr "" #. type: Plain text -#: user-manual.txt:1865 +#: user-manual.txt:1866 msgid "" "The oxygen setpoint values as well as the readings from the individual " "oxygen sensors can be shown. The display of additional CCR information is " "turned on by checking the appropriate checkboxes in the _Preferences_ panel " "(accessible by selecting xref:S_CCR_options[_File -> Preferences -> " -"Graph_]). This part of the _Preferences_ panel look like this, representing " -"two checkboxes that modify the display of pO~2~ when the appropriate toolbar " -"button on the Dive Profile has been activated." +"Graph_]). This part of the _Preferences_ panel is shown in the image below, " +"representing two checkboxes that modify the display of pO~2~ when the " +"appropriate toolbar button on the Dive Profile has been activated." msgstr "" #. type: Target for macro image -#: user-manual.txt:1866 +#: user-manual.txt:1867 #, no-wrap msgid "images/CCR_preferences_f20.jpg" msgstr "images/CCR_preferences_f20.jpg" #. type: Plain text -#: user-manual.txt:1873 +#: user-manual.txt:1874 msgid "" -"Checking any of the check boxes allows the display of additional oxygen-" +"Checking any of these check boxes allows the display of additional oxygen-" "related information whenever the pO~2~ toolbar button on the _Profile_ panel " "is activated. The first checkbox allows the display of setpoint " "information. This is a red line superimposed on the green oxygen partial " "pressure graph and allows a comparison of the mean measured oxygen partial " -"pressure and the setpoint values, as in the image below." +"pressure and the setpoint values, as shown below." msgstr "" #. type: Target for macro image -#: user-manual.txt:1874 +#: user-manual.txt:1875 #, no-wrap msgid "images/CCR_setpoint_f20.jpg" msgstr "images/CCR_setpoint_f20.jpg" #. type: Plain text -#: user-manual.txt:1878 +#: user-manual.txt:1879 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 " @@ -3576,22 +3586,22 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1880 +#: user-manual.txt:1881 msgid "Sensor 1: grey" msgstr "" #. type: Plain text -#: user-manual.txt:1881 +#: user-manual.txt:1882 msgid "Sensor 2: blue" msgstr "" #. type: Plain text -#: user-manual.txt:1882 +#: user-manual.txt:1883 msgid "Sensor 3: brown" msgstr "" #. type: Plain text -#: user-manual.txt:1886 +#: user-manual.txt:1887 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 " @@ -3599,13 +3609,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1887 +#: user-manual.txt:1888 #, no-wrap msgid "images/CCR_sensor_data_f20.jpg" msgstr "images/CCR_sensor_data_f20.jpg" #. type: Plain text -#: user-manual.txt:1892 +#: user-manual.txt:1893 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, " @@ -3613,7 +3623,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1896 +#: user-manual.txt:1897 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 " @@ -3622,7 +3632,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1904 +#: user-manual.txt:1905 msgid "" "_Cylinder pressures_: Some CCR dive computers like the Poseidon MkVI record " "the pressures of the oxygen and diluent cylinders. The pressures of these " @@ -3635,13 +3645,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1905 +#: user-manual.txt:1906 #, no-wrap -msgid "images/CCR_dive_profile_f20.jpg" -msgstr "images/CCR_dive_profile_f20.jpg" +msgid "images/CCR_dive_profile_f22.jpg" +msgstr "images/CCR_dive_profile_f22.jpg" #. type: Plain text -#: user-manual.txt:1910 +#: user-manual.txt:1911 msgid "" "_Equipment-specific information_: Equipment-specific information gathered by " "_Subsurface_ is shown in the xref:S_ExtraDataTab[Extra data tab]. This may " @@ -3649,27 +3659,61 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1913 +#: user-manual.txt:1917 +msgid "" +"The deco ceiling calculated by Subsurface is not very accurate because the " +"precise pressure of nitrogen in the loop can usually not be determined from " +"the dive log imported from the CCR equipment. Many CCR dive computers, " +"however, report an internally-calculated deco ceiling that is reported in " +"the dive log, reflecting a more accurate assessment. The display of this " +"ceiling is activated by clicking the appropriate button to the left of the " +"dive profile:" +msgstr "" + +#. type: Named 'icon' AttributeList argument for style 'icon' +#: user-manual.txt:1918 user-manual.txt:2101 +#, no-wrap +msgid "images/icons/cceiling.jpg" +msgstr "images/icons/cceiling.jpg" + +#. type: Plain text +#: user-manual.txt:1923 +msgid "" +"The default colour of the computer-generated deco ceiling is white. However, " +"this can be set to red by checking the appropriate check box after selecting " +"_File -> Preferences -> Graph_. Below is a dive profile indicating the dive " +"computer-generated deco ceiling:" +msgstr "" + +#. type: Target for macro image +#: user-manual.txt:1924 +#, no-wrap +msgid "images/CCR_dive_ceilingF22.jpg" +msgstr "images/CCR_dive_ceilingF22.jpg" + +#. type: Plain text +#: user-manual.txt:1928 msgid "" "More equipment-specific information for downloading CCR dive logs for " -"Poseidon MkVI and APD equipment can be found in xref:S_PoseidonMkVI[Appendix " +"Poseidon MkVI and APD equipment can be found in xref:" +"_appendix_b_dive_computer_specific_information_for_importing_dive_information[Appendix " "B]." msgstr "" #. type: Title == -#: user-manual.txt:1914 +#: user-manual.txt:1929 #, no-wrap msgid "Obtaining more information about dives entered into the logbook" msgstr "" #. type: Title === -#: user-manual.txt:1916 +#: user-manual.txt:1931 #, no-wrap msgid "The *Info* tab (for individual dives)" msgstr "" #. type: Plain text -#: user-manual.txt:1923 +#: user-manual.txt:1938 msgid "" "The Info tab gives some summary information about a particular dive that has " "been selected in the *Dive List*. Useful information here includes the " @@ -3679,7 +3723,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1930 +#: user-manual.txt:1945 msgid "" "Gas consumption and SAC calculations: _Subsurface_ calculates SAC and Gas " "consumption taking in account gas incompressibility, particularly at tank " @@ -3688,13 +3732,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:1932 +#: user-manual.txt:1947 #, no-wrap msgid "The *Extra Data* tab (usually for individual dives)" msgstr "" #. type: Plain text -#: user-manual.txt:1940 +#: user-manual.txt:1955 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 " @@ -3706,19 +3750,19 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:1941 +#: user-manual.txt:1956 #, no-wrap msgid "images/ExtraDataTab_f20.jpg" msgstr "images/ExtraDataTab_f20.jpg" #. type: Title === -#: user-manual.txt:1943 +#: user-manual.txt:1958 #, no-wrap msgid "The *Stats* tab (for groups of dives)" msgstr "" #. type: Plain text -#: user-manual.txt:1954 +#: user-manual.txt:1969 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 " @@ -3731,19 +3775,19 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:1956 +#: user-manual.txt:1971 #, no-wrap msgid "The *Dive Profile*" msgstr "" #. type: Target for macro image -#: user-manual.txt:1958 +#: user-manual.txt:1973 #, no-wrap msgid "images/Profile2.jpg" msgstr "images/Profile2.jpg" #. type: Plain text -#: user-manual.txt:1969 +#: user-manual.txt:1984 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 " @@ -3756,7 +3800,7 @@ msgid "" msgstr "" #. type: delimited block | -#: user-manual.txt:1976 +#: user-manual.txt:1991 #, no-wrap msgid "" "|*Colour*|*Descent speed (m/min)*|*Ascent speed (m/min)*\n" @@ -3774,7 +3818,7 @@ msgstr "" "|Vert foncé|< 1.5|< 1.5\n" #. type: Plain text -#: user-manual.txt:1981 +#: user-manual.txt:1996 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 " @@ -3783,13 +3827,13 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:1982 +#: user-manual.txt:1997 #, no-wrap msgid "images/icons/scale.jpg" msgstr "images/icons/scale.jpg" #. type: Plain text -#: user-manual.txt:1987 +#: user-manual.txt:2002 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 " @@ -3798,7 +3842,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1990 +#: user-manual.txt:2005 #, no-wrap msgid "" "*Water temperature* is displayed with its own blue line with temperature values\n" @@ -3806,7 +3850,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:1997 +#: user-manual.txt:2012 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 " @@ -3817,13 +3861,13 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:1998 +#: user-manual.txt:2013 #, no-wrap msgid "images/icons/O2.jpg" msgstr "images/icons/O2.jpg" #. type: Plain text -#: user-manual.txt:2002 +#: user-manual.txt:2017 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 " @@ -3831,26 +3875,26 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2003 +#: user-manual.txt:2018 #, no-wrap msgid "images/icons/N2.jpg" msgstr "images/icons/N2.jpg" #. type: Plain text -#: user-manual.txt:2006 +#: user-manual.txt:2021 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:2007 +#: user-manual.txt:2022 #, no-wrap msgid "images/icons/He.jpg" msgstr "images/icons/He.jpg" #. type: Plain text -#: user-manual.txt:2011 +#: user-manual.txt:2026 msgid "" "Clicking this button allows display of the partial pressure of *helium* " "during the dive. This is only of importance to divers using Trimix, " @@ -3858,7 +3902,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2024 +#: user-manual.txt:2039 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 " @@ -3873,13 +3917,13 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2025 +#: user-manual.txt:2040 #, no-wrap msgid "images/icons/Heartbutton.png" msgstr "images/icons/Heartbutton.png" #. type: Plain text -#: user-manual.txt:2029 +#: user-manual.txt:2044 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 " @@ -3887,7 +3931,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2037 +#: user-manual.txt:2052 #, no-wrap msgid "" "It is possible to *zoom* into the profile graph. This is done either by using\n" @@ -3900,19 +3944,19 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2038 +#: user-manual.txt:2053 #, no-wrap msgid "images/MeasuringBar.png" msgstr "images/MeasuringBar.png" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2040 +#: user-manual.txt:2055 #, no-wrap msgid "images/icons/ruler.jpg" msgstr "images/icons/ruler.jpg" #. type: Plain text -#: user-manual.txt:2048 +#: user-manual.txt:2063 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 " @@ -3922,13 +3966,13 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2049 +#: user-manual.txt:2064 #, no-wrap msgid "images/icons/ShowPhotos.png" msgstr "images/icons/ShowPhotos.png" #. type: Plain text -#: user-manual.txt:2056 +#: user-manual.txt:2071 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 " @@ -3937,7 +3981,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2085 +#: user-manual.txt:2100 msgid "" "The profile can also include the dive computer reported *ceiling* (more " "precisely, the deepest deco stop that the dive computer calculated for each " @@ -3966,14 +4010,8 @@ msgid "" "bottom times." msgstr "" -#. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2086 -#, no-wrap -msgid "images/icons/cceiling.jpg" -msgstr "images/icons/cceiling.jpg" - #. type: Plain text -#: user-manual.txt:2091 +#: user-manual.txt:2106 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 " @@ -3981,13 +4019,13 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2092 +#: user-manual.txt:2107 #, no-wrap msgid "images/icons/ceiling1.jpg" msgstr "images/icons/ceiling1.jpg" #. type: Plain text -#: user-manual.txt:2097 +#: user-manual.txt:2112 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 " @@ -3996,13 +4034,13 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2098 +#: user-manual.txt:2113 #, no-wrap msgid "images/icons/ceiling2.jpg" msgstr "images/icons/ceiling2.jpg" #. type: Plain text -#: user-manual.txt:2102 +#: user-manual.txt:2117 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 " @@ -4010,32 +4048,32 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2103 +#: user-manual.txt:2118 #, no-wrap msgid "images/icons/ceiling3.jpg" msgstr "images/icons/ceiling3.jpg" #. type: Plain text -#: user-manual.txt:2107 +#: user-manual.txt:2122 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:2108 +#: user-manual.txt:2123 #, no-wrap msgid "images/Ceilings2.jpg" msgstr "images/Ceilings2.jpg" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2110 +#: user-manual.txt:2125 #, no-wrap msgid "images/icons/ShowCylindersButton.jpg" msgstr "images/icons/ShowCylindersButton.jpg" #. type: Plain text -#: user-manual.txt:2116 +#: user-manual.txt:2131 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 " @@ -4047,19 +4085,19 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2117 +#: user-manual.txt:2132 #, no-wrap msgid "images/ShowCylinders_f20.jpg" msgstr "images/ShowCylinders_f20.jpg" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2120 +#: user-manual.txt:2135 #, no-wrap msgid "images/tissues.jpg" msgstr "images/tissues.jpg" #. type: Plain text -#: user-manual.txt:2132 +#: user-manual.txt:2147 msgid "" "Display inert gas tissue pressures relative to ambient inert gas pressure " "(horizontal grey line). Tissue pressures are calculated using the Bühlmann " @@ -4078,13 +4116,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2133 +#: user-manual.txt:2148 #, no-wrap msgid "images/tissuesGraph.jpg" msgstr "images/tissuesGraph.jpg" #. type: Plain text -#: user-manual.txt:2141 +#: user-manual.txt:2156 msgid "" "Gradient Factor settings strongly affect the calculated ceilings and their " "depths. For more information about Gradient factors, see the section on " @@ -4097,25 +4135,25 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2143 +#: user-manual.txt:2158 #, 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:2145 +#: user-manual.txt:2160 #, 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:2147 +#: user-manual.txt:2162 #, no-wrap msgid "The Dive Profile context menu" msgstr "" #. type: Plain text -#: user-manual.txt:2165 +#: user-manual.txt:2180 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 " @@ -4136,13 +4174,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:2167 +#: user-manual.txt:2182 #, no-wrap msgid "The *Information Box*" msgstr "" #. type: Plain text -#: user-manual.txt:2177 +#: user-manual.txt:2192 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 " @@ -4155,13 +4193,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2178 +#: user-manual.txt:2193 #, no-wrap msgid "images/InfoBox2.jpg" msgstr "images/InfoBox2.jpg" #. type: Plain text -#: user-manual.txt:2195 +#: user-manual.txt:2210 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 " @@ -4182,20 +4220,20 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2198 +#: user-manual.txt:2213 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:2199 +#: user-manual.txt:2214 #, no-wrap msgid "images/icons/MOD.jpg" msgstr "images/icons/MOD.jpg" #. type: Plain text -#: user-manual.txt:2206 +#: user-manual.txt:2221 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 " @@ -4205,13 +4243,13 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2207 +#: user-manual.txt:2222 #, no-wrap msgid "images/icons/NDL.jpg" msgstr "images/icons/NDL.jpg" #. type: Plain text -#: user-manual.txt:2216 +#: user-manual.txt:2231 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 " @@ -4224,13 +4262,13 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2217 +#: user-manual.txt:2232 #, no-wrap msgid "images/icons/SAC.jpg" msgstr "images/icons/SAC.jpg" #. type: Plain text -#: user-manual.txt:2226 +#: user-manual.txt:2241 msgid "" "Clicking this button causes the Information Box to display the *Surface Air " "Consumption (SAC)*. SAC is an indication of the surface-normalised " @@ -4243,13 +4281,13 @@ msgid "" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:2227 +#: user-manual.txt:2242 #, no-wrap msgid "images/icons/EAD.jpg" msgstr "images/icons/EAD.jpg" #. type: Plain text -#: user-manual.txt:2242 +#: user-manual.txt:2257 msgid "" "Clicking this button displays the *Equivalent Air Depth (EAD)* for nitrox " "dives as well as the *Equivalent Narcotic Depth (END)* for trimix dives. " @@ -4265,20 +4303,20 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2244 +#: user-manual.txt:2259 msgid "" "Figure (*B*) above shows an information box with a nearly complete set of " "data." msgstr "" #. type: Title ==== -#: user-manual.txt:2246 +#: user-manual.txt:2261 #, no-wrap msgid "The Gas Pressure Bar Graph" msgstr "" #. type: Plain text -#: user-manual.txt:2253 +#: user-manual.txt:2268 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 " @@ -4289,13 +4327,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2254 +#: user-manual.txt:2269 #, no-wrap msgid "images/GasPressureBarGraph.jpg" msgstr "images/GasPressureBarGraph.jpg" #. type: Plain text -#: user-manual.txt:2260 +#: user-manual.txt:2275 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 " @@ -4305,7 +4343,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2266 +#: user-manual.txt:2281 msgid "" "The horizontal black line underneath the light green margin indicates the " "equilibrium pressure of the inert gases inhaled by the diver, usually " @@ -4316,7 +4354,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2270 +#: user-manual.txt:2285 msgid "" "The dark green area at the bottom of the graph represents the pressures of " "inert gas in each of the 16 tissue compartments, following the Bühlmann " @@ -4324,7 +4362,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2275 +#: user-manual.txt:2290 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 " @@ -4333,7 +4371,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2279 +#: user-manual.txt:2294 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 " @@ -4341,7 +4379,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2282 +#: user-manual.txt:2297 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 " @@ -4349,7 +4387,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2285 +#: user-manual.txt:2300 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 " @@ -4357,7 +4395,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2288 +#: user-manual.txt:2303 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 " @@ -4365,7 +4403,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2293 +#: user-manual.txt:2308 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 " @@ -4375,7 +4413,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2299 +#: user-manual.txt:2314 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 " @@ -4386,7 +4424,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2304 +#: user-manual.txt:2319 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 " @@ -4396,19 +4434,19 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:2307 +#: user-manual.txt:2322 #, no-wrap msgid "Organising the logbook (Manipulating groups of dives)" msgstr "" #. type: Title === -#: user-manual.txt:2309 +#: user-manual.txt:2324 #, no-wrap msgid "The Dive List context menu" msgstr "" #. type: Plain text -#: user-manual.txt:2313 +#: user-manual.txt:2328 msgid "" "Several actions on either a single dive or a group of dives can be performed " "using the Dive List Context Menu, found by selecting either a single dive or " @@ -4416,30 +4454,30 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2314 +#: user-manual.txt:2329 #, no-wrap msgid "images/ContextMenu.jpg" msgstr "images/ContextMenu.jpg" #. type: Plain text -#: user-manual.txt:2317 +#: user-manual.txt:2332 msgid "The context menu is used in many manipulations described below." msgstr "" #. type: Title ==== -#: user-manual.txt:2318 +#: user-manual.txt:2333 #, no-wrap msgid "Customising the information showed in the *Dive List* panel" msgstr "" #. type: Target for macro image -#: user-manual.txt:2320 +#: user-manual.txt:2335 #, no-wrap msgid "images/DiveListOptions.jpg" msgstr "images/DiveListOptions.jpg" #. type: Plain text -#: user-manual.txt:2328 +#: user-manual.txt:2343 msgid "" "The default information in the *Dive List* includes, for each dive, " "Dive_number, Date, Rating, Dive_depth, Dive_duration and Dive_location. This " @@ -4453,13 +4491,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2329 +#: user-manual.txt:2344 #, no-wrap msgid "Selecting dives from a particular dive site" msgstr "" #. type: Plain text -#: user-manual.txt:2335 +#: user-manual.txt:2350 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 " @@ -4469,13 +4507,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:2337 +#: user-manual.txt:2352 #, no-wrap msgid "Renumbering the dives" msgstr "" #. type: Plain text -#: user-manual.txt:2349 +#: user-manual.txt:2364 msgid "" "Dives are normally numbered incrementally from non-recent dives (low " "sequence numbers) to recent dives (having the highest sequence numbers). The " @@ -4491,7 +4529,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2354 +#: user-manual.txt:2369 msgid "" "One can also renumber a few selected dives in the dive list. Select the " "dives that need renumbering. Right-click on the selected list and use the " @@ -4501,13 +4539,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:2356 +#: user-manual.txt:2371 #, no-wrap msgid "Grouping dives into trips and manipulating trips" msgstr "" #. type: Plain text -#: user-manual.txt:2364 +#: user-manual.txt:2379 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 " @@ -4518,13 +4556,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2365 +#: user-manual.txt:2380 #, no-wrap msgid "images/Group2.jpg" msgstr "images/Group2.jpg" #. type: Plain text -#: user-manual.txt:2371 +#: user-manual.txt:2386 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 " @@ -4533,13 +4571,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2372 +#: user-manual.txt:2387 #, no-wrap msgid "Editing the title and associated information for a particular trip" msgstr "" #. type: Plain text -#: user-manual.txt:2385 +#: user-manual.txt:2400 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 " @@ -4554,13 +4592,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2386 +#: user-manual.txt:2401 #, no-wrap msgid "Viewing the dives during a particular trip" msgstr "" #. type: Plain text -#: user-manual.txt:2391 +#: user-manual.txt:2406 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 " @@ -4569,13 +4607,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2392 +#: user-manual.txt:2407 #, no-wrap msgid "Collapsing or expanding dive information for different trips" msgstr "" #. type: Plain text -#: user-manual.txt:2398 +#: user-manual.txt:2413 msgid "" "After selecting a particular trip in the dive list, the context menu allows " "several possibilities to expand or collapse dives within trips. This " @@ -4584,13 +4622,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2399 +#: user-manual.txt:2414 #, no-wrap msgid "Merging dives from more than one trip into a single trip" msgstr "" #. type: Plain text -#: user-manual.txt:2404 +#: user-manual.txt:2419 msgid "" "After selecting a trip title, the context menu allows the merging of trips " "by either merging the selected trip with the trip below or with the trip " @@ -4598,13 +4636,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2405 +#: user-manual.txt:2420 #, no-wrap msgid "Splitting a single trip into more than one trip" msgstr "" #. type: Plain text -#: user-manual.txt:2415 +#: user-manual.txt:2430 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-" @@ -4616,25 +4654,25 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2416 +#: user-manual.txt:2431 #, no-wrap msgid "images/SplitDive3a.jpg" msgstr "images/SplitDive3a.jpg" #. type: Title === -#: user-manual.txt:2418 +#: user-manual.txt:2433 #, no-wrap msgid "Manipulating single dives" msgstr "" #. type: Title ==== -#: user-manual.txt:2420 +#: user-manual.txt:2435 #, no-wrap msgid "Delete a dive from the dive log" msgstr "" #. type: Plain text -#: user-manual.txt:2427 +#: user-manual.txt:2442 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 " @@ -4644,13 +4682,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2428 +#: user-manual.txt:2443 #, no-wrap msgid "Unlink a dive from a trip" msgstr "" #. type: Plain text -#: user-manual.txt:2435 +#: user-manual.txt:2450 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 " @@ -4660,13 +4698,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2436 +#: user-manual.txt:2451 #, no-wrap msgid "Add a dive to the trip immediately above" msgstr "" #. type: Plain text -#: user-manual.txt:2441 +#: user-manual.txt:2456 msgid "" "Selected dives can be moved from the trip to which they belong and placed " "within a separate trip. To do this, select and right-click the dive(s) to " @@ -4674,13 +4712,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2442 +#: user-manual.txt:2457 #, no-wrap msgid "Shift the start time of dive(s)" msgstr "" #. type: Plain text -#: user-manual.txt:2453 +#: user-manual.txt:2468 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 " @@ -4693,13 +4731,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:2454 +#: user-manual.txt:2469 #, no-wrap msgid "Merge dives into a single dive" msgstr "" #. type: Plain text -#: user-manual.txt:2464 +#: user-manual.txt:2479 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 " @@ -4713,19 +4751,19 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2465 +#: user-manual.txt:2480 #, no-wrap msgid "images/MergedDive.png" msgstr "images/MergedDive.png" #. type: Title ==== -#: user-manual.txt:2467 +#: user-manual.txt:2482 #, no-wrap msgid "Undo dive manipulations" msgstr "" #. type: Plain text -#: user-manual.txt:2473 +#: user-manual.txt:2488 msgid "" "Important actions on dives or trips, described above, can be undone or " "redone. This includes: _delete dives_, _merge dives_, _renumber dives_ and " @@ -4735,13 +4773,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:2476 +#: user-manual.txt:2491 #, no-wrap msgid "Filtering the dive list" msgstr "" #. type: Plain text -#: user-manual.txt:2482 +#: user-manual.txt:2497 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, " @@ -4751,7 +4789,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2491 +#: user-manual.txt:2506 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 " @@ -4765,13 +4803,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2492 +#: user-manual.txt:2507 #, no-wrap msgid "images/Filterpanel.jpg" msgstr "images/Filterpanel.jpg" #. type: Plain text -#: user-manual.txt:2501 +#: user-manual.txt:2516 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 " @@ -4784,7 +4822,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2509 +#: user-manual.txt:2524 msgid "" "To activate filtering of the dive list, check at least tone check box in one " "of the four check lists. The dive list is then shortened to include only the " @@ -4796,24 +4834,24 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:2511 +#: user-manual.txt:2526 #, no-wrap msgid "Exporting the dive log or parts of the dive log" msgstr "" #. type: Plain text -#: user-manual.txt:2514 +#: user-manual.txt:2529 msgid "" "There are two routes for the export of dive information from Subsurface:" msgstr "" #. type: Plain text -#: user-manual.txt:2516 +#: user-manual.txt:2531 msgid "Export dive information to _Facebook_" msgstr "Exporter les informations de plongée vers _Facebook_" #. type: Plain text -#: user-manual.txt:2518 +#: user-manual.txt:2533 msgid "" "xref:S_Export_other[Export dive information to other destinations or formats]" msgstr "" @@ -4821,13 +4859,13 @@ msgstr "" "destinations ou formats]" #. type: Title === -#: user-manual.txt:2520 +#: user-manual.txt:2535 #, no-wrap msgid "Exporting dive information to _Facebook_" msgstr "Export des informations de plongée vers _Facebook_" #. type: Plain text -#: user-manual.txt:2529 +#: user-manual.txt:2544 msgid "" "Export of dives to _Facebook_ is handled differently from other types of " "export. This is because export to _Facebook_ needs a connection to " @@ -4849,13 +4887,13 @@ msgstr "" "connexion _Facebook_." #. type: Target for macro image -#: user-manual.txt:2530 +#: user-manual.txt:2545 #, no-wrap msgid "images/facebook1_f20.jpg" msgstr "images/facebook1_f20.jpg" #. type: Plain text -#: user-manual.txt:2543 +#: user-manual.txt:2558 msgid "" "Having established a login to _Facebook_, transfer of a dive profile to " "one's _Facebook_ timeline is easy. A _Facebook_ icon appears in the *Notes* " @@ -4892,7 +4930,7 @@ msgstr "" "indiquant le succès du transfert." #. type: Plain text -#: user-manual.txt:2550 +#: user-manual.txt:2565 msgid "" "Both the Album created and the post to your time line will be marked as " "private. In order for friends to be able to see the post you have to change " @@ -4909,13 +4947,13 @@ msgstr "" "temporelle publique." #. type: Target for macro image -#: user-manual.txt:2551 +#: user-manual.txt:2566 #, no-wrap msgid "images/facebook2_f20.jpg" msgstr "images/facebook2_f20.jpg" #. type: Plain text -#: user-manual.txt:2554 +#: user-manual.txt:2569 msgid "" "If required, then close the _Facebook_ connection by either closing " "_Subsurface_ or by selecting _File -> Preferences -> Facebook_ from the Main " @@ -4927,13 +4965,13 @@ msgstr "" "préférences Facebook." #. type: Title === -#: user-manual.txt:2556 +#: user-manual.txt:2571 #, no-wrap msgid "Export dive information to other destinations or formats" msgstr "" #. type: Plain text -#: user-manual.txt:2561 +#: user-manual.txt:2576 msgid "" "For non-_Facebook exports_, the export function can be reached by selecting " "_File -> Export_, which brings up the Export dialog. This dialog always " @@ -4943,24 +4981,24 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2562 +#: user-manual.txt:2577 #, no-wrap msgid "images/Export_f20.jpg" msgstr "images/Export_f20.jpg" #. type: Plain text -#: user-manual.txt:2565 +#: user-manual.txt:2580 msgid "A dive log or part of it can be saved in three formats:" msgstr "" #. type: Plain text -#: user-manual.txt:2567 +#: user-manual.txt:2582 msgid "" "_Subsurface XML_ format. This is the native format used by _Subsurface_." msgstr "" #. type: Plain text -#: user-manual.txt:2571 +#: user-manual.txt:2586 msgid "" "Universal Dive Data Format (_UDDF_). Refer to _http://uddf.org_ for more " "information. UDDF is a generic format that enables communication among many " @@ -4968,7 +5006,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2575 +#: user-manual.txt:2590 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_. " @@ -4977,7 +5015,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2579 +#: user-manual.txt:2594 msgid "" "_DiveShare_ is also a dive log repository on the Internet focusing on the " "recreational dives. In order to upload dives one has to provide a used ID, " @@ -4985,7 +5023,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2584 +#: user-manual.txt:2599 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, " @@ -4994,7 +5032,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2587 +#: user-manual.txt:2602 msgid "" "_CSV dive profile_, that includes a large amount of detail for each dive, " "including the depth profile, temperature and pressure information of each " @@ -5002,7 +5040,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2599 +#: user-manual.txt:2614 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 " @@ -5017,7 +5055,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2604 +#: user-manual.txt:2619 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, " @@ -5026,13 +5064,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2605 +#: user-manual.txt:2620 #, no-wrap msgid "images/mapview_f20.jpg" msgstr "images/mapview_f20.jpg" #. type: Plain text -#: user-manual.txt:2612 +#: user-manual.txt:2627 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 " @@ -5041,12 +5079,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2614 +#: user-manual.txt:2629 msgid "_General Settings_, under the HTML tab, provides the following options:" msgstr "" #. type: Plain text -#: user-manual.txt:2622 +#: user-manual.txt:2637 #, no-wrap msgid "" "** Subsurface Numbers: if this option is checked, the dive(s) are exported with the\n" @@ -5059,27 +5097,27 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2625 +#: user-manual.txt:2640 msgid "" "Under _Style Options_ some style-related options are available like font " "size and theme." msgstr "" #. type: Plain text -#: user-manual.txt:2628 +#: user-manual.txt:2643 msgid "" "Export to other formats can be achieved through third party facilities, for " "instance _www.divelogs.de_." msgstr "" #. type: Title == -#: user-manual.txt:2630 +#: user-manual.txt:2645 #, no-wrap msgid "Keeping a _Subsurface_ dive log in the Cloud" msgstr "" #. type: Plain text -#: user-manual.txt:2641 +#: user-manual.txt:2656 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 " @@ -5094,7 +5132,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2645 +#: user-manual.txt:2660 msgid "" "_Subsurface_ includes access to a transparently integrated cloud storage " "backend that is available to all Subsurface users. In order to use the " @@ -5102,12 +5140,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2647 +#: user-manual.txt:2662 msgid "Create a cloud storage account:" msgstr "" #. type: Plain text -#: user-manual.txt:2661 +#: user-manual.txt:2676 #, no-wrap msgid "" "** Open the _Preferences_\n" @@ -5126,12 +5164,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2663 +#: user-manual.txt:2678 msgid "Use _Subsurface cloud storage_" msgstr "" #. type: Plain text -#: user-manual.txt:2669 +#: user-manual.txt:2684 #, no-wrap msgid "" "** From the _File_ menu users can load and save data to the _Subsurface\n" @@ -5142,7 +5180,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2674 +#: user-manual.txt:2689 msgid "" "_Subsurface_ keeps a local copy of the data and _Subsurface_ stays fully " "functional if used while offline. _Subsurface_ will simply synchronize the " @@ -5151,7 +5189,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2678 +#: user-manual.txt:2693 msgid "" "Although _Subsurface_ offers integrated Cloud storage of dive logs, it is " "also simple to achieve this using several of the existing facilities on the " @@ -5159,7 +5197,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2683 +#: user-manual.txt:2698 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 " @@ -5167,13 +5205,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:2684 +#: user-manual.txt:2699 #, no-wrap msgid "images/Cloud.jpg" msgstr "images/Cloud.jpg" #. type: Plain text -#: user-manual.txt:2693 +#: user-manual.txt:2708 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, " @@ -5186,7 +5224,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2700 +#: user-manual.txt:2715 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. " @@ -5196,7 +5234,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2706 +#: user-manual.txt:2721 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 " @@ -5207,209 +5245,233 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2709 +#: user-manual.txt:2724 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:2712 +#: user-manual.txt:2727 #, no-wrap msgid "Printing a dive log" msgstr "" #. type: Plain text -#: user-manual.txt:2717 +#: user-manual.txt:2731 #, no-wrap msgid "" -"_Subsurface_ provides a simple interface to print a whole dive log or only a few selected dives.\n" -" Pre-installed templates or a custom written template can be used to choose where the data will\n" -" be fitted into the page.\n" +"_Subsurface_ provides a simple and flexible interface to print a whole dive log or only a few selected dives.\n" +" Pre-installed templates or a custom written template can be used to choose where the data are fitted into the page.\n" msgstr "" #. type: Plain text -#: user-manual.txt:2719 +#: user-manual.txt:2733 msgid "Before printing, two decisions are required:" msgstr "" #. type: Plain text -#: user-manual.txt:2722 +#: user-manual.txt:2736 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 " -"*Dive List* panel." +"dive log is required, then select the required dives from the *Dive List* " +"panel." msgstr "" #. type: Plain text -#: user-manual.txt:2724 +#: user-manual.txt:2738 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 " -"of the Dive Profile panel." +"If the dive profiles needs printing, what gas partial pressure information " +"should be shown? Select the appropriate toggle-buttons on the button bar to " +"the left of the *Dive Profile* panel." msgstr "" #. type: Plain text -#: user-manual.txt:2728 +#: user-manual.txt:2741 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 " -"dialogue appears (see the image on the left [A], below)." +"If _File -> Print_ is selected from the Main menu, the the dialogue below " +"(image *A*) appears. Three specifications are needed to achieve the desired " +"information and page layout:" msgstr "" #. type: Target for macro image -#: user-manual.txt:2729 +#: user-manual.txt:2742 user-manual.txt:4136 #, no-wrap -msgid "images/PrintDiveLog.jpg" -msgstr "images/PrintDiveLog.jpg" +msgid "images/Print1_f22.jpg" +msgstr "images/Print1_f22.jpg" #. type: Plain text -#: user-manual.txt:2732 -msgid "Under _Print type_ users need to select one of two options:" +#: user-manual.txt:2745 +msgid "Under _Print type_ select one of two options:" msgstr "" #. type: Plain text -#: user-manual.txt:2734 +#: user-manual.txt:2747 msgid "" -"_Dive list_ print: print dives from the list with profiles and other " -"information." +"_Dive list print_: Print dives from the *Dive List* panel with profiles and " +"other information." msgstr "" #. type: Plain text -#: user-manual.txt:2735 -msgid "_Statistics_ print: print yearly statistics of the dives." +#: user-manual.txt:2748 +msgid "_Statistics print_: Print yearly statistics of the dives." msgstr "" #. type: Plain text -#: user-manual.txt:2737 -msgid "Under _Print options_ users need to select:" +#: user-manual.txt:2750 +msgid "Under _Print options_ select:" msgstr "" #. type: Plain text -#: user-manual.txt:2741 +#: user-manual.txt:2755 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 " -"selected dives_." +"Printing only the dives selected from the dive list prior to activating the " +"print dialogue by checking the box _Print only selected dives_. If this " +"check box is *not* checked all dives in the *Dive List* panel are printed." msgstr "" #. type: Plain text -#: user-manual.txt:2742 +#: user-manual.txt:2757 msgid "" -"Printing in colour, achieved by checking the box with _Print in colour_." +"Printing in colour, achieved by checking the box with _Print in colour_. If " +"this check box is not checked, printing is in monochrome (grey scale)." msgstr "" #. type: Plain text -#: user-manual.txt:2744 -msgid "Under _Template_ users can select:" +#: user-manual.txt:2760 +msgid "" +"Under _Template_ select a template to be used as the page layout. There are " +"several templates (see image *B*, above)." msgstr "" #. type: Plain text -#: user-manual.txt:2746 -msgid "A template to be used as the page layout." +#: user-manual.txt:2762 +msgid "_Table_: This prints a summary table of all dives selected (see below)." msgstr "" +#. type: Target for macro image +#: user-manual.txt:2763 +#, no-wrap +msgid "images/Print_summarylist_f22.jpg" +msgstr "images/Print_summarylist_f22.jpg" + #. type: Plain text -#: user-manual.txt:2748 -msgid "_Delete_ a template from the template list" +#: user-manual.txt:2766 +msgid "" +"_Flow layout_: Print the text associated with each diev without printing the " +"dive profiles" msgstr "" #. type: Plain text -#: user-manual.txt:2749 -msgid "_Import_ a new template to the template list" +#: user-manual.txt:2767 +msgid "of each dive (see below):" msgstr "" +#. type: Target for macro image +#: user-manual.txt:2768 +#, no-wrap +msgid "images/Print_flow_layout_f22.jpg" +msgstr "images/Print_flow_layout_f22.jpg" + #. type: Plain text -#: user-manual.txt:2750 -msgid "_Export_ a template from the template list" +#: user-manual.txt:2771 +msgid "" +"_One Dive_: Print one dive per page, also showing the dive profile (see " +"below)" msgstr "" +#. type: Target for macro image +#: user-manual.txt:2772 +#, no-wrap +msgid "images/print2_f22.jpg" +msgstr "images/print2_f22.jpg" + #. type: Plain text -#: user-manual.txt:2751 -msgid "_Edit_ a template (choose colors, fonts, font-type)" +#: user-manual.txt:2776 +msgid "_Two Dives_: Print two dives per page, also showing the dive profiles." msgstr "" #. type: Plain text -#: user-manual.txt:2753 -msgid "When editing a template the following options are available:" +#: user-manual.txt:2777 +msgid "_Six Dives_: Print six dives per page, also showing the dive profiles." msgstr "" #. type: Plain text -#: user-manual.txt:2755 +#: user-manual.txt:2778 msgid "" -"_Style_: edit font type, size, choose color palette; this will not affect " -"the template HTML code" +"_Custom_: This option allows customisation of the print contents and layout. " +"This is" msgstr "" #. type: Plain text -#: user-manual.txt:2756 -msgid "" -"_Template_: edit the template HTML code; by saving, the \"Custom\" template " -"in the template list will be replaced" +#: user-manual.txt:2779 +msgid "discussed at the end of this section." msgstr "" #. type: Plain text -#: user-manual.txt:2757 +#: user-manual.txt:2783 msgid "" -"_Colors_: edit the current color palette; the new color palette will " -"overwrite the \"Custom\" color palette" +"Users can _Preview_ the printed page by selecting the _Preview_ button on " +"the dialogue (see image *A* at the start of this section). After preview, " +"changes to the options in the print dialogue can be made, resulting in a " +"layout that fits personal taste." msgstr "" #. type: Plain text -#: user-manual.txt:2761 +#: user-manual.txt:2787 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 " -"can be made, resulting in a layout that fits personal taste." +"Next, select the _Print_ button (see image *A* at the start of this " +"section). This activates the regular print dialogue used by the user " +"operating system, allowing one to choose a printer and to set its properties " +"(see image below):" msgstr "" +#. type: Target for macro image +#: user-manual.txt:2788 +#, no-wrap +msgid "images/Print_print_f22.jpg" +msgstr "images/Print_print_f22.jpg" + #. type: Plain text -#: user-manual.txt:2771 +#: user-manual.txt:2793 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, " -"above), allowing them to choose a printer and to set its properties (image " -"[*C*] on the right, above). It is important to set the print resolution of " -"the printer to an appropriate value by changing the printer properties. " -"Finally, one can print the dives. Below is a (rather small) example of the " -"output for one particular page." +"Set the print resolution of the printer to an appropriate value by changing " +"the printer _Properties_. Finally, select the _Print_ button to print the " +"dives. Below is a (rather small) example of the output for one particular " +"page." msgstr "" #. type: Target for macro image -#: user-manual.txt:2772 +#: user-manual.txt:2794 #, no-wrap msgid "images/Printpreview.jpg" msgstr "images/Printpreview.jpg" #. type: Title === -#: user-manual.txt:2774 +#: user-manual.txt:2796 #, no-wrap msgid "Write a custom printing template (advanced)" msgstr "" #. type: Plain text -#: user-manual.txt:2777 +#: user-manual.txt:2800 msgid "" "Writing a custom template is an effective way to produce highly customized " -"printouts. Subsurface uses HTML templates with Grantlee as the printing " -"backend." -msgstr "" - -#. type: Plain text -#: user-manual.txt:2779 -msgid "" -"See <<_appendix_f_write_a_custom_printing_template ,APPENDIX F>> for " -"information on how to write your own template." +"printouts. Subsurface uses HTML templates to render printing. One can create " +"a template, export a new template, import an existing template and delete an " +"existing template by using the appropriate buttons under the _Template_ " +"dropdown list in the print dialogue. See <<S_APPENDIX_E,APPENDIX E>> for " +"information on how to write or modify a template." msgstr "" #. type: Title == -#: user-manual.txt:2781 +#: user-manual.txt:2802 #, no-wrap msgid "Configuring a dive computer" msgstr "Configurer un ordinateur de plongée" #. type: Plain text -#: user-manual.txt:2789 +#: user-manual.txt:2810 msgid "" "_Subsurface_ enables one to configure a dive computer. Currently the " "Heinrichs-Weikamp (OSTC 2, OSTC 3) and Suunto Vyper (Stinger, Mosquito, D3, " @@ -5432,7 +5494,7 @@ msgstr "" "APPENDIX A>> pour plus d'informations sur la manière de procéder." #. type: Plain text -#: user-manual.txt:2794 +#: user-manual.txt:2815 msgid "" "Once the dive computer is connected to the _Subsurface_ computer, select " "_File -> Configure dive computer_ from the _Main Menu_. Provide the " @@ -5447,13 +5509,13 @@ msgstr "" "de plongée à partir du panneau à gauche (voir l'image ci-dessous)." #. type: Target for macro image -#: user-manual.txt:2795 +#: user-manual.txt:2816 #, no-wrap msgid "images/Configure_dc_f20.jpg" msgstr "images/Configure_dc_f20.jpg" #. type: Plain text -#: user-manual.txt:2798 +#: user-manual.txt:2819 msgid "" "Using the appropriate buttons on the configuration panel, the following " "actions can be performed:" @@ -5462,7 +5524,7 @@ msgstr "" "suivantes peuvent être réalisées :" #. type: Plain text -#: user-manual.txt:2801 +#: user-manual.txt:2822 #, no-wrap msgid "" "*Retrieve available details*. This loads the existing configuration from the dive computer\n" @@ -5472,7 +5534,7 @@ msgstr "" "dans _Subsurface_, en l'affichant dans le panneau de configuration.\n" #. type: Plain text -#: user-manual.txt:2803 +#: user-manual.txt:2824 #, no-wrap msgid "" "*Save changes to device*. This changes the configuration of the\n" @@ -5482,7 +5544,7 @@ msgstr "" "de plongée pour correspondre aux informations affichées dans le panneau de configuration.\n" #. type: Plain text -#: user-manual.txt:2805 +#: user-manual.txt:2826 #, no-wrap msgid "" "*Backup*. This saves the configuration data to a file. _Subsurface_ asks for\n" @@ -5492,7 +5554,7 @@ msgstr "" "l'emplacement et le nom du fichier pour enregistrer les informations.\n" #. type: Plain text -#: user-manual.txt:2807 +#: user-manual.txt:2828 #, no-wrap msgid "" "*Restore backup*. This loads the information from a backup file and displays it\n" @@ -5502,7 +5564,7 @@ msgstr "" "dans le panneau de configuration.\n" #. type: Plain text -#: user-manual.txt:2809 +#: user-manual.txt:2830 #, no-wrap msgid "" "*Update firmware*. If new firmware is available for the dive computer, this is\n" @@ -5512,13 +5574,13 @@ msgstr "" "il sera chargé dans l'ordinateur de plongée.\n" #. type: Title == -#: user-manual.txt:2812 +#: user-manual.txt:2833 #, no-wrap msgid "Setting user _Preferences_ for _Subsurface_" msgstr "" #. type: Plain text -#: user-manual.txt:2820 +#: user-manual.txt:2841 msgid "" "There are several settings within _Subsurface_ that the user can specify. " "These are found when selecting _File -> Preferences_. The settings are " @@ -5530,24 +5592,24 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:2821 +#: user-manual.txt:2842 #, no-wrap msgid "Defaults" msgstr "" #. type: Plain text -#: user-manual.txt:2824 +#: user-manual.txt:2845 msgid "There are several settings in the *Defaults* panel:" msgstr "" #. type: Target for macro image -#: user-manual.txt:2825 +#: user-manual.txt:2846 #, no-wrap msgid "images/Pref1_f20.jpg" msgstr "images/Pref1_f20.jpg" #. type: Plain text -#: user-manual.txt:2829 +#: user-manual.txt:2850 #, no-wrap msgid "" " ** *Lists and tables*: Here one can specify the font type and font size of the\n" @@ -5555,7 +5617,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2834 +#: user-manual.txt:2855 #, no-wrap msgid "" " ** *Dives*: For the _Default Dive File_ one need to specify the directory and\n" @@ -5565,7 +5627,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2839 +#: user-manual.txt:2860 #, no-wrap msgid "" " ** *Display invalid*: Dives can be marked as invalid (when a user wishes to hide\n" @@ -5575,7 +5637,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2842 +#: user-manual.txt:2863 #, no-wrap msgid "" " ** *Default cylinder*: Here users can specify the default cylinder listed in\n" @@ -5583,7 +5645,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2850 +#: user-manual.txt:2871 #, no-wrap msgid "" " ** *Animations*: Some actions in showing the dive profile are performed using\n" @@ -5596,7 +5658,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2855 +#: user-manual.txt:2876 #, no-wrap msgid "" " ** *Subsurface web service*: When one subscribes to the <<S_Companion,Subsurface web service>>, a very\n" @@ -5606,7 +5668,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2858 +#: user-manual.txt:2879 #, no-wrap msgid "" " ** *Clear all settings*: As indicated in the button below this heading, all settings are\n" @@ -5614,19 +5676,19 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:2859 +#: user-manual.txt:2880 #, no-wrap msgid "Units" msgstr "" #. type: Target for macro image -#: user-manual.txt:2860 +#: user-manual.txt:2881 #, no-wrap msgid "images/Pref2_f20.jpg" msgstr "images/Pref2_f20.jpg" #. type: Plain text -#: user-manual.txt:2867 +#: user-manual.txt:2888 msgid "" "Here user can choose between metric and imperial units of depth, pressure, " "volume, temperature and mass. By selecting the Metric or Imperial radio " @@ -5637,24 +5699,24 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:2868 +#: user-manual.txt:2889 #, no-wrap msgid "Graph" msgstr "" #. type: Target for macro image -#: user-manual.txt:2870 +#: user-manual.txt:2891 #, no-wrap msgid "images/Pref3_f20.jpg" msgstr "images/Pref3_f20.jpg" #. type: Plain text -#: user-manual.txt:2874 +#: user-manual.txt:2895 msgid "This panel allows two type of selections:" msgstr "" #. type: Plain text -#: user-manual.txt:2882 +#: user-manual.txt:2903 #, no-wrap msgid "" "*Show*: Here users can specify the amount of information shown as part of\n" @@ -5667,7 +5729,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2887 +#: user-manual.txt:2908 #, no-wrap msgid "" "** _Draw dive computer reported ceiling red_: This checkbox allows exactly what it says.\n" @@ -5677,13 +5739,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2889 +#: user-manual.txt:2910 #, 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:2895 +#: user-manual.txt:2916 #, no-wrap msgid "" "** _Show average depth_: Activating this checkbox causes _Subsurface_ to draw a grey line across\n" @@ -5693,13 +5755,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2897 +#: user-manual.txt:2918 #, no-wrap msgid "*Misc*:\n" msgstr "" #. type: Plain text -#: user-manual.txt:2909 +#: user-manual.txt:2930 #, no-wrap msgid "" "** Gradient Factors:* Here users can set the _gradient factors_ used while diving. GF_Low is\n" @@ -5716,19 +5778,19 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2911 +#: user-manual.txt:2932 #, 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:2913 +#: user-manual.txt:2934 #, 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:2917 +#: user-manual.txt:2938 #, no-wrap msgid "" " ** _CCR: Show setpoints when viewing pO2:_ With this checkbox ativated, the pO~2~\n" @@ -5737,7 +5799,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2921 +#: user-manual.txt:2942 #, no-wrap msgid "" " ** _CCR: Show individual O~2~ sensor values when viewing pO~2~:_ Show the pO~2~\n" @@ -5746,19 +5808,19 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2923 +#: user-manual.txt:2944 #, no-wrap msgid "*Configuring dive planning using rebreather equipment:*\n" msgstr "" #. type: Plain text -#: user-manual.txt:2925 +#: user-manual.txt:2946 #, no-wrap msgid "** _Default CCR setpoint for dive planning:_ Specify the O~2~ setpoint for a\n" msgstr "" #. type: Plain text -#: user-manual.txt:2929 +#: user-manual.txt:2950 #, no-wrap msgid "" "CCR dive plan. This determines the pO~2~ that will be maintained\n" @@ -5768,13 +5830,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2931 +#: user-manual.txt:2952 #, 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:2933 +#: user-manual.txt:2954 #, no-wrap msgid "" "volume of oxygen used by a diver each minute. Set this value for pSCR dive planning\n" @@ -5782,13 +5844,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:2935 +#: user-manual.txt:2956 #, 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:2937 +#: user-manual.txt:2958 #, no-wrap msgid "" "environment to that of the gas recirculated to the diver. Set this value for a\n" @@ -5796,24 +5858,24 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:2939 +#: user-manual.txt:2960 #, no-wrap msgid "Language" msgstr "" #. type: Plain text -#: user-manual.txt:2941 +#: user-manual.txt:2962 msgid "Choose a language that _Subsurface_ will use." msgstr "" #. type: Target for macro image -#: user-manual.txt:2942 +#: user-manual.txt:2963 #, no-wrap msgid "images/Pref4_f20.jpg" msgstr "images/Pref4_f20.jpg" #. type: Plain text -#: user-manual.txt:2952 +#: user-manual.txt:2973 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 " @@ -5826,26 +5888,26 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:2953 +#: user-manual.txt:2974 #, no-wrap msgid "Network" msgstr "" #. type: Plain text -#: user-manual.txt:2955 +#: user-manual.txt:2976 msgid "" "This panel facilitates communication between _Subsurface_ and data sources " "on the Internet." msgstr "" #. type: Target for macro image -#: user-manual.txt:2956 +#: user-manual.txt:2977 #, no-wrap msgid "images/Pref5_f20.jpg" msgstr "images/Pref5_f20.jpg" #. type: Plain text -#: user-manual.txt:2969 +#: user-manual.txt:2990 msgid "" "This is important, for instance, when _Subsurface_ needs to communicate with " "Internet services such as the <<S_Companion,_Subsurface Companion app_>> or " @@ -5862,13 +5924,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:2970 +#: user-manual.txt:2991 #, no-wrap msgid "Facebook Accesss" msgstr "Accès Facebook" #. type: Plain text -#: user-manual.txt:2973 +#: user-manual.txt:2994 msgid "" "This panel allows one to log into a Facebook account in order to transfer " "information from Subsurface to Facefook." @@ -5877,13 +5939,13 @@ msgstr "" "transférer des informations de Subsurface vers Facebook." #. type: Target for macro image -#: user-manual.txt:2974 +#: user-manual.txt:2995 #, no-wrap msgid "images/Pref6_f20.jpg" msgstr "images/Pref6_f20.jpg" #. type: Plain text -#: user-manual.txt:2982 +#: user-manual.txt:3003 msgid "" "If one provides a valid Facebook userID and password, a connection to " "Facebook is created. The connection to Facebook is closed when one closes " @@ -5899,13 +5961,13 @@ msgstr "" "vers Facebook] pour plus d'informations." #. type: Title == -#: user-manual.txt:2984 +#: user-manual.txt:3005 #, no-wrap msgid "The _Subsurface_ dive planner" msgstr "" #. type: Plain text -#: user-manual.txt:2989 +#: user-manual.txt:3010 msgid "" "Dive planning is an advanced feature of _Subsurface_, accessible by " "selecting _Log -> Plan Dive_ from the main menu. It allows calculation of " @@ -5914,7 +5976,7 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:2997 +#: user-manual.txt:3018 msgid "" "The _Subsurface_ dive planner IS CURRENTLY EXPERIMENTAL and assumes the user " "is already familiar with the _Subsurface_ user interface. It is explicitly " @@ -5922,19 +5984,19 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:3000 +#: user-manual.txt:3021 msgid "" "The user is conversant with dive planning and has the necessary training to " "perform dive planning." msgstr "" #. type: delimited block * -#: user-manual.txt:3001 +#: user-manual.txt:3022 msgid "The user plans dives within his/her certification limits." msgstr "" #. type: delimited block * -#: user-manual.txt:3004 +#: user-manual.txt:3025 msgid "" "Dive planning makes large assumptions about the characteristics of the " "_average person_ and cannot compensate for individual physiology or health " @@ -5942,32 +6004,32 @@ msgid "" msgstr "" #. type: delimited block * -#: user-manual.txt:3005 +#: user-manual.txt:3026 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:3006 +#: user-manual.txt:3027 msgid "The user is familiar with the user interface of _Subsurface_." msgstr "" #. type: delimited block * -#: user-manual.txt:3008 +#: user-manual.txt:3029 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:3010 +#: user-manual.txt:3031 #, no-wrap msgid "The _Subsurface_ dive planner screen" msgstr "" #. type: Plain text -#: user-manual.txt:3015 +#: user-manual.txt:3036 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 " @@ -5977,7 +6039,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3019 +#: user-manual.txt:3040 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 " @@ -5986,7 +6048,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3023 +#: user-manual.txt:3044 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 " @@ -5995,26 +6057,26 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:3024 +#: user-manual.txt:3045 #, no-wrap msgid "images/PlannerWindow1_f20.jpg" msgstr "images/PlannerWindow1_f20.jpg" #. type: Title === -#: user-manual.txt:3027 +#: user-manual.txt:3048 #, no-wrap msgid "Open circuit dives" msgstr "" #. type: Plain text -#: user-manual.txt:3030 +#: user-manual.txt:3051 msgid "" "Towards the centre bottom of the planner (circled in blue in the image " "above) is a dropbox with three options. Select the appropriate one of these:" msgstr "" #. type: Plain text -#: user-manual.txt:3033 +#: user-manual.txt:3054 #, no-wrap msgid "" "** Open Circuit (the default)\n" @@ -6023,12 +6085,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3035 +#: user-manual.txt:3056 msgid "Choose the Open Circuit option." msgstr "" #. type: Plain text -#: user-manual.txt:3039 +#: user-manual.txt:3060 msgid "" "In the top left-hand area of the planning screen, ensure that the constant " "dive parameters are appropriate. These are: Start date and time of the " @@ -6038,7 +6100,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3048 +#: user-manual.txt:3069 msgid "" "In the table labeled _Available Gases_, add the information of the cylinders " "to be used as well as the gas composition within that cylinder. This is done " @@ -6052,12 +6114,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3050 +#: user-manual.txt:3071 msgid "The profile of the planned dive can be created in two ways:" msgstr "" #. type: Plain text -#: user-manual.txt:3055 +#: user-manual.txt:3076 msgid "" "Drag the waypoints (the small white circles) on the existing dive profile in " "a way to represent the dive. Additional waypoints can be created by double-" @@ -6067,7 +6129,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3063 +#: user-manual.txt:3084 msgid "" "The most efficient way to create a dive profile is to enter the appropriate " "values into the table marked _Dive planner points_. The first line of the " @@ -6081,13 +6143,13 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:3064 +#: user-manual.txt:3085 #, no-wrap msgid "Recreational dives" msgstr "" #. type: Plain text -#: user-manual.txt:3079 +#: user-manual.txt:3100 msgid "" "The _Subsurface_ dive planner allows a sophisticated way of planning " "recreational dives, i.e. dives that remain within no-decompression limits. " @@ -6108,26 +6170,26 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3082 +#: user-manual.txt:3103 msgid "To plan a dive, the appropriate settings need to be defined." msgstr "" #. type: Plain text -#: user-manual.txt:3085 +#: user-manual.txt:3106 msgid "" "Ensure that the date and time is set to that of the intended dive. This " "allows calculation of the nitrogen load incurred during previous dives." msgstr "" #. type: Plain text -#: user-manual.txt:3088 +#: user-manual.txt:3109 msgid "" "Immediately under the heading _Planning_ are two checkboxes _Recreational_ " "and _Safety Stop_. Check these two boxes." msgstr "" #. type: Plain text -#: user-manual.txt:3092 +#: user-manual.txt:3113 msgid "" "Then define the cylinder size, the gas mixture (air or % oxygen) and the " "starting cylinder pressure in the top left-hand section of the planner under " @@ -6135,7 +6197,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3097 +#: user-manual.txt:3118 msgid "" "The planner calculates whether the specified cylinder contains enough air/" "gas to complete the planned dive. In order for this to be realistic, under " @@ -6145,7 +6207,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3100 +#: user-manual.txt:3121 msgid "" "Define the amount of gas that the cylinder must have at the end of the " "bottom section of the dive just before ascent. A value of 50 bar is often " @@ -6153,7 +6215,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3107 +#: user-manual.txt:3128 msgid "" "Define the depth of the dive by dragging the waypoints (white dots) on the " "dive profile or (even better) defining the appropriate depths using the " @@ -6164,14 +6226,14 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3110 +#: user-manual.txt:3131 msgid "" "The ascent speed can be changed. The default ascent speeds are those " "considered safe for recreational divers." msgstr "" #. type: Plain text -#: user-manual.txt:3118 +#: user-manual.txt:3139 msgid "" "The dive profile in the planner indicates the maximum dive time within no-" "deco limits using the Bühlmann ZH-L16 algorithm and the gas and depth " @@ -6187,7 +6249,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3122 +#: user-manual.txt:3143 msgid "" "Below is an image of a dive plan for a recreational dive at 30 metres. " "Although the no-deco limit (NDL) is 23 minutes, the duration of the dive is " @@ -6196,26 +6258,26 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:3123 +#: user-manual.txt:3144 #, no-wrap msgid "images/rec_diveplan.jpg" msgstr "images/rec_diveplan.jpg" #. type: Title ==== -#: user-manual.txt:3125 +#: user-manual.txt:3146 #, no-wrap msgid "Non-recreational open circuit dives, including decompression" msgstr "" #. type: Plain text -#: user-manual.txt:3129 +#: user-manual.txt:3150 msgid "" "Non-recreational dive planning involves exceeding the no-deco limits and/or " "using multiple breathing gases. Such dives are planned in three stages:" msgstr "" #. type: Plain text -#: user-manual.txt:3139 +#: user-manual.txt:3160 #, no-wrap msgid "" "*a) Nitrogen management*: This is performed by specifying the rates for descent and ascent,\n" @@ -6230,7 +6292,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3141 +#: user-manual.txt:3162 msgid "" "link:http://www.tek-dive.com/portal/upload/M-Values.pdf[Understanding M-" "values by Erik Baker, _Immersed_ Vol. 3, No. 3.]" @@ -6239,7 +6301,7 @@ msgstr "" "values by Erik Baker, _Immersed_ Vol. 3, No. 3.]" #. type: Plain text -#: user-manual.txt:3142 +#: user-manual.txt:3163 msgid "" "link:http://www.rebreatherworld.com/general-and-new-to-rebreather-" "articles/5037-gradient-factors-for-dummies.html[Gradient factors for " @@ -6250,7 +6312,7 @@ msgstr "" "dummies, by Kevin Watts]" #. type: Plain text -#: user-manual.txt:3144 +#: user-manual.txt:3165 msgid "" "link:http://www.amazon.com/Deco-Divers-Decompression-Theory-Physiology/" "dp/1905492073/ref=sr_1_1?s=books&ie=UTF8&qid=1403932320&sr=1-1&keywords=deco" @@ -6263,7 +6325,7 @@ msgstr "" "Sea, UK. ISBN 10: 1-905492-07-3. An excellent non-technical review." #. type: Plain text -#: user-manual.txt:3152 +#: user-manual.txt:3173 msgid "" "The ascent rate is critical for nitrogen off-gassing at the end of the dive " "and is specified for several depth ranges, utilising the average (or mean) " @@ -6277,7 +6339,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3161 +#: user-manual.txt:3182 #, no-wrap msgid "" "*b) Oxygen management*: In the *Gas Options* part of the dive specification, the maximum partial\n" @@ -6291,7 +6353,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3175 +#: user-manual.txt:3196 #, no-wrap msgid "" "*c) Gas management*: With open-circuit dives this is a primary consideration. One needs to keep within the limits of the amount of gas within the dive\n" @@ -6310,7 +6372,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3187 +#: user-manual.txt:3208 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 " @@ -6328,7 +6390,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3199 +#: user-manual.txt:3220 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_ " @@ -6346,7 +6408,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3207 +#: user-manual.txt:3228 msgid "" "Indicate any changes in gas cylinder used by indicating gas changes as " "explained in the section <<S_CreateProfile,hand-creating a dive profile>>. " @@ -6358,7 +6420,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3216 +#: user-manual.txt:3237 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 " @@ -6371,20 +6433,20 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3219 +#: user-manual.txt:3240 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:3220 +#: user-manual.txt:3241 #, no-wrap msgid "images/DivePlanner2_f20.jpg" msgstr "images/DivePlanner2_f20.jpg" #. type: Plain text -#: user-manual.txt:3225 +#: user-manual.txt:3246 msgid "" "Once the above has been completed, one can save it by clicking the _Save_ " "button towards the top middle of the planner. The saved dive plan will " @@ -6392,13 +6454,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3227 +#: user-manual.txt:3248 #, no-wrap msgid "*The dive plan details*\n" msgstr "" #. type: Plain text -#: user-manual.txt:3235 +#: user-manual.txt:3256 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 " @@ -6411,7 +6473,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3240 +#: user-manual.txt:3261 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 " @@ -6421,13 +6483,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3241 +#: user-manual.txt:3262 #, no-wrap msgid "Planning pSCR dives" msgstr "" #. type: Plain text -#: user-manual.txt:3256 +#: user-manual.txt:3277 #, no-wrap msgid "" "To plan a dive using a passive semi-closed rebreather (pSCR), select _pSCR_ rather than\n" @@ -6446,26 +6508,26 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:3257 +#: user-manual.txt:3278 #, no-wrap msgid "images/Planner_pSCR1_f20.jpg" msgstr "images/Planner_pSCR1_f20.jpg" #. type: Title === -#: user-manual.txt:3260 +#: user-manual.txt:3281 #, no-wrap msgid "Planning CCR dives" msgstr "" #. type: Plain text -#: user-manual.txt:3264 +#: user-manual.txt:3285 msgid "" "To plan a dive using a closed circuit rebreather, select the _CCR_ option in " "the dropdown list, circled in blue in the image below." msgstr "" #. type: Plain text -#: user-manual.txt:3268 +#: user-manual.txt:3289 #, no-wrap msgid "" "*Available gases*: In the _Available gases_ table, enter the cylinder information for the\n" @@ -6474,7 +6536,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3276 +#: user-manual.txt:3297 #, no-wrap msgid "" "*Entering setpoints*: Specify a default setpoint in the Preferences tab, by selecting _File -> Preferences -> Graph_ from the main menu. All user-entered segments in the _Dive planner points_ table\n" @@ -6487,32 +6549,32 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3278 +#: user-manual.txt:3299 msgid "" "The dive profile for a CCR dive may look something like the image below." msgstr "" #. type: Target for macro image -#: user-manual.txt:3279 +#: user-manual.txt:3300 #, no-wrap msgid "images/Planner_CCR1_f20.jpg" msgstr "images/Planner_CCR1_f20.jpg" #. type: Plain text -#: user-manual.txt:3283 +#: user-manual.txt:3304 msgid "" "Note that, in the _Dive plan details_, the gas consumption for a CCR segment " "is not calculated, so gas consumptions of 0 litres are the norm." msgstr "" #. type: Title === -#: user-manual.txt:3285 +#: user-manual.txt:3306 #, no-wrap msgid "Modifying an existing dive plan" msgstr "" #. type: Plain text -#: user-manual.txt:3292 +#: user-manual.txt:3313 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 " @@ -6523,7 +6585,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3298 +#: user-manual.txt:3319 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 " @@ -6533,13 +6595,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3299 +#: user-manual.txt:3320 #, no-wrap msgid "Planning for repetitive dives" msgstr "" #. type: Plain text -#: user-manual.txt:3306 +#: user-manual.txt:3327 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 " @@ -6548,7 +6610,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3312 +#: user-manual.txt:3333 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 " @@ -6558,7 +6620,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3317 +#: user-manual.txt:3338 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 " @@ -6568,13 +6630,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3318 +#: user-manual.txt:3339 #, no-wrap msgid "Printing the dive plan" msgstr "" #. type: Plain text -#: user-manual.txt:3323 +#: user-manual.txt:3344 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 " @@ -6582,7 +6644,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3333 +#: user-manual.txt:3354 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 " @@ -6598,13 +6660,13 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:3334 +#: user-manual.txt:3355 #, 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:3339 +#: user-manual.txt:3360 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 " @@ -6615,13 +6677,13 @@ msgstr "" "des sections de ce manuel traitant des opérations relatives." #. type: Title === -#: user-manual.txt:3340 +#: user-manual.txt:3361 #, no-wrap msgid "File" msgstr "Fichier" #. type: Plain text -#: user-manual.txt:3343 +#: user-manual.txt:3364 msgid "" "<<S_NewLogbook,_New Logbook_>> - Close the currently open dive logbook and " "clear all dive information." @@ -6630,7 +6692,7 @@ msgstr "" "actuellement ouvert et supprime toutes les informations de plongées." #. type: Plain text -#: user-manual.txt:3345 +#: user-manual.txt:3366 msgid "" "_Open logbook_ - This opens the file manager in order to select a dive " "logbook to open." @@ -6639,24 +6701,24 @@ msgstr "" "carnet de plongée à ouvrir." #. type: Plain text -#: user-manual.txt:3346 +#: user-manual.txt:3367 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:3347 +#: user-manual.txt:3368 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:3348 +#: user-manual.txt:3369 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:3350 +#: user-manual.txt:3371 msgid "" "<<S_ExportLog,_Export_>> - Export the currently open dive logbook (or the " "selected dives in the logbook) to one of several formats." @@ -6666,34 +6728,34 @@ msgstr "" "formats." #. type: Plain text -#: user-manual.txt:3351 +#: user-manual.txt:3372 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:3352 +#: user-manual.txt:3373 msgid "" "<<S_FindMovedImages, _Find moved images_>> - If photos taken during dives " "have been moved to" msgstr "" #. type: Plain text -#: user-manual.txt:3353 +#: user-manual.txt:3374 msgid "" "a different disk or directory, locate them and link them to the appropriate " "dives." msgstr "" #. type: Plain text -#: user-manual.txt:3354 +#: user-manual.txt:3375 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:3355 +#: user-manual.txt:3376 msgid "" "<<S_Configure,_Configure dive computer_>> - Edit the configuration of a dive " "computer." @@ -6702,18 +6764,18 @@ msgstr "" "configuration d'un ordinateur de plongée." #. type: Plain text -#: user-manual.txt:3356 +#: user-manual.txt:3377 msgid "_Quit_ - Quit _Subsurface_." msgstr "_Quitter_ - Quitter _Subsurface_." #. type: Title === -#: user-manual.txt:3357 +#: user-manual.txt:3378 #, no-wrap msgid "Import" msgstr "Importer" #. type: Plain text -#: user-manual.txt:3360 +#: user-manual.txt:3381 msgid "" "<<S_ImportDiveComputer,_Import from dive computer_>> - Import dive " "information from a dive computer." @@ -6722,7 +6784,7 @@ msgstr "" "Importer des informations de plongées à partir de l'ordinateur de plongée." #. type: Plain text -#: user-manual.txt:3362 +#: user-manual.txt:3383 msgid "" "<<Unified_import,_Import Log Files_>> - Import dive information from a file " "in in a _Subsurface_-compatible format." @@ -6732,7 +6794,7 @@ msgstr "" "_Subsurface_." #. type: Plain text -#: user-manual.txt:3364 +#: user-manual.txt:3385 msgid "" "<<S_Companion,_Import GPS data from Subsurface web service_>> - Load GPS " "coordinates from the _Subsurface_ mobile phone app." @@ -6742,7 +6804,7 @@ msgstr "" "(téléphones et tablettes)." #. type: Plain text -#: user-manual.txt:3366 +#: user-manual.txt:3387 msgid "" "<<S_ImportingDivelogsDe,_Import from Divelogs.de_>> - Import dive " "information from _www.Divelogs.de_." @@ -6751,13 +6813,13 @@ msgstr "" "informations de plongées à partir de _www.Divelogs.de_." #. type: Title === -#: user-manual.txt:3367 +#: user-manual.txt:3388 #, no-wrap msgid "Log" msgstr "Journal (log)" #. type: Plain text -#: user-manual.txt:3369 +#: user-manual.txt:3390 msgid "" "<<S_EnterData,_Add Dive_>> - Manually add a new dive to the *Dive List* " "panel." @@ -6766,14 +6828,14 @@ msgstr "" "plongée au panneau de la *liste des plongées*." #. type: Plain text -#: user-manual.txt:3370 +#: user-manual.txt:3391 msgid "" "_Edit dive_ - Edit a dive of which the profile was entered by hande and not " "from a dive computer." msgstr "" #. type: Plain text -#: user-manual.txt:3371 +#: user-manual.txt:3392 msgid "" "<<S_DivePlanner,_Plan Dive_>> - This feature allows the planning of dives." msgstr "" @@ -6781,7 +6843,7 @@ msgstr "" "planifier des plongées." #. type: Plain text -#: user-manual.txt:3372 +#: user-manual.txt:3393 msgid "" "<<S_Replan,_Edit dive in planner_>> - Edit a dive plan that has been saved " "into the *Dive List*." @@ -6790,7 +6852,7 @@ msgstr "" "plongée planifiée qui a été enregistrée dans la *liste des plongées*." #. type: Plain text -#: user-manual.txt:3374 +#: user-manual.txt:3395 msgid "" "<<S_CopyComponents,_Copy dive components_>> - By selecting this option, one " "can copy information from several fields of a dive log onto the clipboard." @@ -6800,7 +6862,7 @@ msgstr "" "champs d'un journal de plongée vers le presse-papier." #. type: Plain text -#: user-manual.txt:3376 +#: user-manual.txt:3397 msgid "" "_Paste dive components_ - Paste, into the selected dives in the *Dive List*, " "the information copied using the _Copy dive components_ option." @@ -6810,7 +6872,7 @@ msgstr "" "préalable avec l'option _Copier les composants de la plongée_." #. type: Plain text -#: user-manual.txt:3378 +#: user-manual.txt:3399 msgid "" "<<S_Renumber,_Renumber_>> - Renumber the dives listed in the *Dive List* " "panel." @@ -6819,7 +6881,7 @@ msgstr "" "le panneau de la *liste des plongées*." #. type: Plain text -#: user-manual.txt:3380 +#: user-manual.txt:3401 msgid "" "<<S_Group,_Auto Group_>> - Group the dives in the *Dive List* panel into " "dive trips." @@ -6828,7 +6890,7 @@ msgstr "" "*liste des plongées* dans des voyages de plongées." #. type: Plain text -#: user-manual.txt:3381 +#: user-manual.txt:3402 msgid "" "<<S_DeviceNames,_Edit Device Names_>> - Edit the names of dive computers to " "facilitate your logs." @@ -6837,7 +6899,7 @@ msgstr "" "les noms des ordinateurs de plongée pour faciliter vos journaux (logs)." #. type: Plain text -#: user-manual.txt:3382 +#: user-manual.txt:3403 msgid "" "<<S_Filter,_Filter divelist_>> - Select only some dives, based on specific " "tags or dive criteria." @@ -6846,13 +6908,13 @@ msgstr "" "certaines plongées, à partir de tags ou de critères de plongées." #. type: Title === -#: user-manual.txt:3383 +#: user-manual.txt:3404 #, no-wrap msgid "View" msgstr "Vue" #. type: Plain text -#: user-manual.txt:3386 +#: user-manual.txt:3407 msgid "" "<<S_ViewPanels,_All_>> - View the four main _Subsurface_ panels " "simmultaneously." @@ -6861,33 +6923,33 @@ msgstr "" "_Subsurface_ simultanément." #. type: Plain text -#: user-manual.txt:3387 +#: user-manual.txt:3408 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:3388 +#: user-manual.txt:3409 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:3389 +#: user-manual.txt:3410 msgid "<<S_ViewPanels,_Info_>> - View only the *Notes* panel." msgstr "<<S_ViewPanels,_Info_>> - Affiche uniquement le panneau des *notes*." #. type: Plain text -#: user-manual.txt:3390 +#: user-manual.txt:3411 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:3392 +#: user-manual.txt:3413 msgid "" "_Yearly Statistics_ - Display summary statistics about dives during this and " "past years." @@ -6896,28 +6958,28 @@ msgstr "" "plongées effectuées." #. type: Plain text -#: user-manual.txt:3393 +#: user-manual.txt:3414 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:3394 +#: user-manual.txt:3415 msgid "_Next DC_ - Switch to next dive computer." msgstr "_Ordinateur suivant_ - Passer à l'ordinateur de plongée suivant." #. type: Plain text -#: user-manual.txt:3395 +#: user-manual.txt:3416 msgid "_Full Screen_ - Toggles Full Screen mode." msgstr "_Plein écran_ - Passer en mode plein écran." #. type: Title === -#: user-manual.txt:3396 +#: user-manual.txt:3417 #, no-wrap msgid "Help" msgstr "Aide" #. type: Plain text -#: user-manual.txt:3399 +#: user-manual.txt:3420 msgid "" "_About Subsurface_ - Show a panel with the version number of _Subsurface_ as " "well as licensing information." @@ -6926,7 +6988,7 @@ msgstr "" "_Subsurface_ ainsi que les informations de licence." #. type: Plain text -#: user-manual.txt:3401 +#: user-manual.txt:3422 msgid "" "_Check for updates_ - Find out whether a newer version of Subsurface is " "available on the http://subsurface-divelog.org/[_Subsurface_ web site]." @@ -6936,7 +6998,7 @@ msgstr "" "_Subsurface_ ]." #. type: Plain text -#: user-manual.txt:3402 +#: user-manual.txt:3423 msgid "" "<<S_UserSurvey,_User survey_>> - Help to make _Subsurface_ even better by " "taking part in our user survey." @@ -6945,32 +7007,32 @@ msgstr "" "meilleur en répondant à notre sondage utilisateur." #. type: Plain text -#: user-manual.txt:3403 +#: user-manual.txt:3424 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:3405 +#: user-manual.txt:3426 #, no-wrap msgid "Mobile Version" msgstr "" #. type: Plain text -#: user-manual.txt:3408 +#: user-manual.txt:3429 msgid "" "_Subsurface_ has a mobile version, which can be used to view the dives " "stored in the user's cloud account." msgstr "" #. type: Title === -#: user-manual.txt:3409 +#: user-manual.txt:3430 #, no-wrap msgid "How to use the mobile version" msgstr "" #. type: Plain text -#: user-manual.txt:3413 +#: user-manual.txt:3434 msgid "" "When you first open the mobile app, you will have to log into your cloud " "account. To do this, click on the menu icon on the upper right, then click " @@ -6978,7 +7040,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3417 +#: user-manual.txt:3438 msgid "" "To load dives the first time, click on the menu icon, and then click on " "_Load Dives_. This will fetch the dive list from the cloud storage onto your " @@ -6987,7 +7049,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3420 +#: user-manual.txt:3441 msgid "" "To view dive details, tap on any dive in the dive list. This will open the " "dive details window, which shows the dive profile and below it, the dive " @@ -6995,7 +7057,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3423 +#: user-manual.txt:3444 msgid "" "To save changes made to the dive details, click on the back icon, then from " "the menu select _Save Changes_. This will save your changes to the cloud " @@ -7003,25 +7065,25 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:3425 +#: user-manual.txt:3446 #, no-wrap msgid "APPENDIX A: Operating system specific information for importing dive information from a dive computer." msgstr "ANNEXE A : informations spécifiques au système d'exploitation utilisé pour importer les informations de plongées depuis un ordinateur de plongée." #. type: Title === -#: user-manual.txt:3427 +#: user-manual.txt:3448 #, no-wrap msgid "Make sure that the OS has the required drivers installed" msgstr "Assurez-vous que les pilotes (drivers) nécessaires sont installés" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:3428 +#: user-manual.txt:3449 #, no-wrap msgid "images/icons/drivers.jpg" msgstr "images/icons/drivers.jpg" #. type: Plain text -#: user-manual.txt:3433 +#: user-manual.txt:3454 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 " @@ -7032,7 +7094,7 @@ msgstr "" "l'ordinateur de plongée (Bluetooth, USB, infra-rouge)." #. type: Plain text -#: user-manual.txt:3439 +#: user-manual.txt:3460 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 " @@ -7046,7 +7108,7 @@ msgstr "" "particulièrement pour certaines technologies telles que l'infra-rouge." #. type: Plain text -#: user-manual.txt:3443 +#: user-manual.txt:3464 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 " @@ -7057,7 +7119,7 @@ msgstr "" "port USB de son ordinateur de bureau." #. type: Plain text -#: user-manual.txt:3450 +#: user-manual.txt:3471 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 " @@ -7075,19 +7137,19 @@ msgstr "" "documents et logiciels Silicon Labs]." #. type: Title === -#: user-manual.txt:3452 +#: user-manual.txt:3473 #, no-wrap msgid "How to Find the Device Name for USB devices and set its write permission" msgstr "Comment trouver le nom du périphérique branché sur USB et paramétrer les permissions en écriture" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:3453 +#: user-manual.txt:3474 #, no-wrap msgid "images/icons/usb.jpg" msgstr "images/icons/usb.jpg" #. type: Plain text -#: user-manual.txt:3461 +#: user-manual.txt:3482 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 " @@ -7104,13 +7166,13 @@ msgstr "" "nom de votre périphérique ;" #. type: Title ==== -#: user-manual.txt:3462 user-manual.txt:3545 +#: user-manual.txt:3483 user-manual.txt:3566 #, no-wrap msgid "On Windows:" msgstr "Sur Windows :" #. type: Plain text -#: user-manual.txt:3466 +#: user-manual.txt:3487 msgid "" "Simply try COM1, COM2, etc. The drop down list should contain all connected " "COM devices." @@ -7119,56 +7181,56 @@ msgstr "" "tous les périphériques COM connectés." #. type: Title ==== -#: user-manual.txt:3467 user-manual.txt:3560 +#: user-manual.txt:3488 user-manual.txt:3581 #, no-wrap msgid "On MacOS:" msgstr "Sur MacOS :" #. type: Plain text -#: user-manual.txt:3470 +#: user-manual.txt:3491 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:3471 +#: user-manual.txt:3492 #, no-wrap msgid "On Linux:" msgstr "Sur Linux :" #. type: Plain text -#: user-manual.txt:3474 +#: user-manual.txt:3495 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:3476 +#: user-manual.txt:3497 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:3477 +#: user-manual.txt:3498 msgid "Open a terminal" msgstr "Ouvrir un terminal" #. type: Plain text -#: user-manual.txt:3478 user-manual.txt:3480 +#: user-manual.txt:3499 user-manual.txt:3501 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:3479 +#: user-manual.txt:3500 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:3482 +#: user-manual.txt:3503 msgid "A message similar to this one should appear:" msgstr "Un message similaire à celui-ci devrait apparaitre :" #. type: Plain text -#: user-manual.txt:3498 +#: user-manual.txt:3519 #, no-wrap msgid "" "\tusb 2-1.1: new full speed USB device number 14 using ehci_hcd\n" @@ -7204,7 +7266,7 @@ msgstr "" "\tftdi_sio: v1.6.0:USB FTDI Serial Converters Driver\n" #. type: Plain text -#: user-manual.txt:3503 +#: user-manual.txt:3524 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 " @@ -7216,14 +7278,14 @@ msgstr "" "que Subsurface utilise le bon port USB." #. type: Plain text -#: user-manual.txt:3505 +#: user-manual.txt:3526 msgid "Ensuring that the user has write permission to the USB serial port:" msgstr "" "S'assurer que l'utilisateur possède les droits d'écriture sur le port série " "USB :" #. type: Plain text -#: user-manual.txt:3511 +#: user-manual.txt:3532 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 " @@ -7236,7 +7298,7 @@ msgstr "" "utiliser le port USB. Si votre nom d'utilisateur est 'johnB' :" #. type: Plain text -#: user-manual.txt:3515 +#: user-manual.txt:3536 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." @@ -7246,7 +7308,7 @@ msgstr "" "+dialout+." #. type: Plain text -#: user-manual.txt:3520 +#: user-manual.txt:3541 #, no-wrap msgid "" "Type: +id johnB+ This lists all the groups that johnB belongs to and\n" @@ -7262,7 +7324,7 @@ msgstr "" "parmi les différents IDs.\n" #. type: Plain text -#: user-manual.txt:3522 +#: user-manual.txt:3543 #, no-wrap msgid "" "Under some circumstances this change takes only effect (eg. on Ubuntu) after\n" @@ -7270,7 +7332,7 @@ msgid "" msgstr "Sous certaines circonstances, les modifications ne prennent effet qu'après une déconnexionpuis reconnexion sur l'ordinateur (sous Ubuntu, par exemple)." #. type: Plain text -#: user-manual.txt:3527 +#: user-manual.txt:3548 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 " @@ -7281,19 +7343,19 @@ msgstr "" "vous devriez pouvoir importer vos plongées." #. type: Title === -#: user-manual.txt:3529 +#: user-manual.txt:3550 #, no-wrap msgid "Setting up bluetooth enabled devices" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:3530 +#: user-manual.txt:3551 #, no-wrap msgid "images/icons/bluetooth.jpg" msgstr "images/icons/bluetooth.jpg" #. type: Plain text -#: user-manual.txt:3536 +#: user-manual.txt:3557 msgid "" "For dive computers communicating through bluetooth like the Heinrichs " "Weikamp Frog or the Shearwater Predator and Petrel there is a different " @@ -7302,13 +7364,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3538 +#: user-manual.txt:3559 #, no-wrap msgid "*For the dive computer, after enabling Bluetooth, ensure it is in Upload mode.*\n" msgstr "" #. type: Plain text -#: user-manual.txt:3542 +#: user-manual.txt:3563 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 " @@ -7316,13 +7378,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3544 +#: user-manual.txt:3565 #, no-wrap msgid "*Pair the _Subsurface_ computer with the dive computer.*\n" msgstr "" #. type: Plain text -#: user-manual.txt:3553 +#: user-manual.txt:3574 msgid "" "Bluetooth is most likely already enabled. For pairing with the dive computer " "choose _Control Panel -> Bluetooth Devices -> Add Wireless Device_. This " @@ -7334,21 +7396,21 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3556 +#: user-manual.txt:3577 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:3559 +#: user-manual.txt:3580 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:3566 +#: user-manual.txt:3587 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. " @@ -7357,20 +7419,20 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3569 +#: user-manual.txt:3590 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: Title ==== -#: user-manual.txt:3570 +#: user-manual.txt:3591 #, no-wrap msgid "On Linux" msgstr "Sur Linux" #. type: Plain text -#: user-manual.txt:3578 +#: user-manual.txt:3599 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 " @@ -7383,7 +7445,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3582 +#: user-manual.txt:3603 msgid "" "Setting up a connection to download dives from your Bluetooth-enabled " "device, such as the _Shearwater Petrel_, is not yet an automated process and " @@ -7392,22 +7454,22 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3584 +#: user-manual.txt:3605 msgid "Enable the Bluetooth controller and pair your dive computer</li>" msgstr "" #. type: Plain text -#: user-manual.txt:3585 +#: user-manual.txt:3606 msgid "Establish an RFCOMM connection" msgstr "" #. type: Plain text -#: user-manual.txt:3586 +#: user-manual.txt:3607 msgid "Download the dives with Subsurface" msgstr "" #. type: Plain text -#: user-manual.txt:3592 +#: user-manual.txt:3613 msgid "" "Ensure the dive computer is in upload mode. On the _Shearwater Petrel_ and " "_Petrel 2_, cycle through the menu, select 'Dive Log', then 'Upload Log'. " @@ -7418,7 +7480,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3597 +#: user-manual.txt:3618 msgid "" "To establish the connection, establish root access through +sudo+ or +su+. " "The correct permission is required to download the dives in the computer. On " @@ -7428,23 +7490,23 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3599 +#: user-manual.txt:3620 msgid "+sudo usermod -a -G dialout username+" msgstr "" #. type: Plain text -#: user-manual.txt:3601 +#: user-manual.txt:3622 msgid "Then log out and log in for the change to take effect." msgstr "" #. type: Title ===== -#: user-manual.txt:3602 +#: user-manual.txt:3623 #, no-wrap msgid "Enabling the Bluetooth controller and pairing your dive computer" msgstr "" #. type: Plain text -#: user-manual.txt:3608 +#: user-manual.txt:3629 msgid "" "Attempt to set up the Bluetooth controller and pair your dive computer using " "the graphical environment of the operating system. After setting the dive " @@ -7455,14 +7517,14 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3611 +#: user-manual.txt:3632 msgid "" "If the graphical method didn't work, pair the device from the command line. " "Open a terminal and use +hciconfig+ to check the Bluetooth controller status" msgstr "" #. type: Plain text -#: user-manual.txt:3618 +#: user-manual.txt:3639 #, no-wrap msgid "" "\t$ hciconfig\n" @@ -7474,7 +7536,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3623 +#: user-manual.txt:3644 msgid "" "This indicates a Bluetooth controller with MAC address 01:23:45:67:89:AB, " "connected as hci0. Its status is 'DOWN', i.e. not powered. Additional " @@ -7484,7 +7546,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3631 +#: user-manual.txt:3652 #, no-wrap msgid "" "\tsudo hciconfig hci0 up auth+ (enter password when prompted)\n" @@ -7497,25 +7559,25 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3633 +#: user-manual.txt:3654 msgid "+Check that the status now includes +'UP', 'RUNNING' AND 'AUTH'+." msgstr "" #. type: Plain text -#: user-manual.txt:3635 +#: user-manual.txt:3656 msgid "" "If there are multiple controllers running, it's easiest to off the unused " "controller(s). For example, for +hci1+:" msgstr "" #. type: Plain text -#: user-manual.txt:3637 +#: user-manual.txt:3658 #, no-wrap msgid "\tsudo hciconfig hci1 down\n" msgstr "" #. type: Plain text -#: user-manual.txt:3640 +#: user-manual.txt:3661 msgid "" "Next step is to 'trust' and 'pair' the dive computer. On distros with Bluez " "5, such as Fedora 22, one can use a tool called +blutootctl+, which will " @@ -7523,7 +7585,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3661 +#: user-manual.txt:3682 #, no-wrap msgid "" "\tbluetoothctl\n" @@ -7549,14 +7611,14 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3664 +#: user-manual.txt:3685 msgid "" "If asked for a password, enter 0000. It's ok if the last line says " "'Connected: no'. The important part is the line above, +Pairing successful+." msgstr "" #. type: Plain text -#: user-manual.txt:3667 +#: user-manual.txt:3688 msgid "" "If the system has Bluez version 4 (e.g. Ubuntu 12.04 through to 15.04), " "there is probably not a +bluetoothctl+, but a script called +bluez-simple-" @@ -7564,7 +7626,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3672 +#: user-manual.txt:3693 #, no-wrap msgid "" "\thcitool -i hci0 scanning\n" @@ -7574,89 +7636,89 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3674 +#: user-manual.txt:3695 msgid "Once ther dive computer is pired, set up the RFCOMM connection" msgstr "" #. type: Title ===== -#: user-manual.txt:3675 +#: user-manual.txt:3696 #, no-wrap msgid "Establishing the RFCOMM connection" msgstr "" #. type: Plain text -#: user-manual.txt:3678 +#: user-manual.txt:3699 msgid "The command to establish an RFCOMM connection is:" msgstr "" #. type: Plain text -#: user-manual.txt:3680 +#: user-manual.txt:3701 msgid "+sudo rfcomm -i <controller> connect <dev> <bdaddr> [channel]+" msgstr "" #. type: Plain text -#: user-manual.txt:3682 +#: user-manual.txt:3703 msgid "<controller>+ is the Bluetooth controller, +hci0+." msgstr "" #. type: Plain text -#: user-manual.txt:3683 +#: user-manual.txt:3704 msgid "<dev> is the RFCOMM device file, +rfcomm0+" msgstr "" #. type: Plain text -#: user-manual.txt:3684 +#: user-manual.txt:3705 msgid "<bdaddr> is the dive computer's MAC address, +00:11:22:33:44:55+" msgstr "" #. type: Plain text -#: user-manual.txt:3685 +#: user-manual.txt:3706 msgid "" "[channel] is the dive computer's Bluetooth channel we need to connect to." msgstr "" #. type: Plain text -#: user-manual.txt:3688 +#: user-manual.txt:3709 msgid "" "If one omits it, channel 1 is assumed. Based on a limited number of user " "reports, the appropriate channel for the dive computer is probably:" msgstr "" #. type: Plain text -#: user-manual.txt:3690 +#: user-manual.txt:3711 msgid "_Shearwater Petrel 2_: channel 5" msgstr "" #. type: Plain text -#: user-manual.txt:3691 +#: user-manual.txt:3712 msgid "_Shearwater Petrel 1_: channel 1" msgstr "" #. type: Plain text -#: user-manual.txt:3692 +#: user-manual.txt:3713 msgid "_Heinrichs-Weikamp OSTC Sport_: channel 1" msgstr "" #. type: Plain text -#: user-manual.txt:3694 +#: user-manual.txt:3715 msgid "" "E.g. to connect a _Shearwater Petrel 2_, set the dive computer to upload " "mode and enter:" msgstr "" #. type: Plain text -#: user-manual.txt:3696 +#: user-manual.txt:3717 #, no-wrap msgid "\tsudo rfcomm -i hci0 connect rfcomm0 00:11:22:33:44:55 5 (enter a password, probably 0000, when prompted)\n" msgstr "" #. type: Plain text -#: user-manual.txt:3698 +#: user-manual.txt:3719 msgid "This gives the response:" msgstr "" #. type: Plain text -#: user-manual.txt:3701 +#: user-manual.txt:3722 #, no-wrap msgid "" "\tConnected /dev/rfcomm0 to 00:11:22:33:44:55 on channel 5\n" @@ -7664,14 +7726,14 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3703 +#: user-manual.txt:3724 msgid "" "To connect a _Shearwater Petrel 1+ or + HW OSTC Sport+, set the dive " "computer to upload mode and enter:" msgstr "" #. type: Plain text -#: user-manual.txt:3707 +#: user-manual.txt:3728 #, no-wrap msgid "" "\tsudo rfcomm -i hci0 connect rfcomm0 00:11:22:33:44:55 (enter a password, probably 0000, when prompted)\n" @@ -7680,7 +7742,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3711 +#: user-manual.txt:3732 msgid "" "If the specific channel the dive computer needs is not known, or the channel " "in the list above doesn't work, the command +sdptool records+ should help " @@ -7689,7 +7751,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3721 +#: user-manual.txt:3742 #, no-wrap msgid "" "\tsdptool -i hci0 records 00:11:22:33:44:55\n" @@ -7704,7 +7766,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3724 +#: user-manual.txt:3745 msgid "" "For a Bluetooth dive computer not in the list above, or if the channel " "listed is not correct, please let the Subsurface developers know on the user " @@ -7712,13 +7774,13 @@ msgid "" msgstr "" #. type: Title ===== -#: user-manual.txt:3725 +#: user-manual.txt:3746 #, no-wrap msgid "Download the dives with Subsurface</em>" msgstr "" #. type: Plain text -#: user-manual.txt:3727 +#: user-manual.txt:3748 msgid "" "After establishing the RFCOMM connection and while the dive computer's " "upload mode countdown is still running, go to_Subsurface_, select _Import-" @@ -7728,25 +7790,25 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:3730 +#: user-manual.txt:3751 #, no-wrap msgid "APPENDIX B: Dive Computer specific information for importing dive data." msgstr "" #. type: Title === -#: user-manual.txt:3733 +#: user-manual.txt:3754 #, no-wrap msgid "Importing from Uemis Zurich" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:3735 +#: user-manual.txt:3756 #, no-wrap msgid "images/icons/iumis.jpg" msgstr "images/icons/iumis.jpg" #. type: Plain text -#: user-manual.txt:3751 +#: user-manual.txt:3772 msgid "" "_Subsurface_ downloads the information stored on the SDA (the built-in file " "system of the Uemis) including information about dive spots and equipment. " @@ -7762,7 +7824,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3766 +#: user-manual.txt:3787 msgid "" "After selecting the above device name, download the dives from the Uemis " "Zurich. One technical issue with the Uemis Zurich download implementation " @@ -7779,19 +7841,19 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3768 +#: user-manual.txt:3789 #, no-wrap msgid "Importing from Uwatec Galileo" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:3770 +#: user-manual.txt:3791 #, no-wrap msgid "images/icons/Galileo.jpg" msgstr "images/icons/Galileo.jpg" #. type: Plain text -#: user-manual.txt:3785 +#: user-manual.txt:3806 msgid "" "The Uwatec Galileo dive computers use infra red (IrDA) communication between " "the dive computer and Subsurface. The Uwatec hardware uses a USB dongle " @@ -7807,14 +7869,14 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3788 +#: user-manual.txt:3809 msgid "" "After executing this command, Subsurface will recognise the Galileo dive " "computer and download dive information." msgstr "" #. type: Plain text -#: user-manual.txt:3794 +#: user-manual.txt:3815 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/" @@ -7824,26 +7886,26 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3797 +#: user-manual.txt:3818 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:3799 +#: user-manual.txt:3820 #, no-wrap msgid "Importing from Heinrichs Weikamp DR5" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:3801 +#: user-manual.txt:3822 #, no-wrap msgid "images/icons/HW_DR5.jpg" msgstr "images/icons/HW_DR5.jpg" #. type: Plain text -#: user-manual.txt:3811 +#: user-manual.txt:3832 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. " @@ -7856,19 +7918,19 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3814 +#: user-manual.txt:3835 #, no-wrap msgid "Importing from xDEEP BLACK" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:3816 +#: user-manual.txt:3837 #, no-wrap msgid "images/icons/HW_xdeepblack.jpg" msgstr "images/icons/HW_xdeepblack.jpg" #. type: Plain text -#: user-manual.txt:3825 +#: user-manual.txt:3846 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 " @@ -7882,19 +7944,19 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3827 +#: user-manual.txt:3848 #, no-wrap msgid "Importing from Shearwater Predator using Bluetooth" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:3829 +#: user-manual.txt:3850 #, no-wrap msgid "images/icons/predator.jpg" msgstr "images/icons/predator.jpg" #. type: Plain text -#: user-manual.txt:3837 +#: user-manual.txt:3858 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 " @@ -7905,36 +7967,36 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3840 +#: user-manual.txt:3861 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:3841 +#: user-manual.txt:3862 msgid "switch to different Bluetooth drivers for the same hardware" msgstr "" #. type: Plain text -#: user-manual.txt:3842 +#: user-manual.txt:3863 msgid "switch off WiFi while using Bluetooth" msgstr "" #. type: Title === -#: user-manual.txt:3844 +#: user-manual.txt:3865 #, no-wrap msgid "Importing from Poseidon MkVI Discovery" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:3846 +#: user-manual.txt:3867 #, no-wrap msgid "images/MkVI.jpeg" msgstr "images/MkVI.jpeg" #. type: Plain text -#: user-manual.txt:3854 +#: user-manual.txt:3875 msgid "" "Download of dive logs from the MkVI is performed using a custom " "communications adapter and the _Poseidon PC Configuration Software_, " @@ -7946,45 +8008,45 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3857 +#: user-manual.txt:3878 msgid "" "Setup configuration for the dive and key dive parameters (file with a .txt " "extension)" msgstr "" #. type: Plain text -#: user-manual.txt:3858 +#: user-manual.txt:3879 msgid "Dive log details (file with a .csv extension)" msgstr "" #. type: Plain text -#: user-manual.txt:3860 +#: user-manual.txt:3881 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:3862 +#: user-manual.txt:3883 msgid "" "_Subsurface_ accesses the .txt and the .csv files to obtain dive log " "information." msgstr "" #. type: Title === -#: user-manual.txt:3864 +#: user-manual.txt:3885 #, no-wrap -msgid "Importing from APD Inspiration CCR" +msgid "Importing from APD Inspiration/Evolution CCR" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:3866 +#: user-manual.txt:3887 #, no-wrap msgid "images/APDComputer.jpg" msgstr "images/APDComputer.jpg" #. type: Plain text -#: user-manual.txt:3874 +#: user-manual.txt:3895 msgid "" "The dive logs of an APD Inspiration or similar CCR dive computer are " "downloaded using a communications adapter and _AP Communicator_, obtained " @@ -7996,82 +8058,103 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3876 +#: user-manual.txt:3897 +msgid "Download the dive using _AP Communicator_." +msgstr "" + +#. type: Plain text +#: user-manual.txt:3898 msgid "Open a dive within the _AP Log Viewer_." msgstr "" #. type: Plain text -#: user-manual.txt:3877 +#: user-manual.txt:3899 msgid "Select the tab at the top of the screen, entitled \"_Data_\"." msgstr "" #. type: Plain text -#: user-manual.txt:3878 +#: user-manual.txt:3900 msgid "" -"If the raw dive log data show on the screen, click on \"_Copy to Clipboard_" +"With the raw dive log data show on the screen, click on \"_Copy to Clipboard_" "\"." msgstr "" #. type: Plain text -#: user-manual.txt:3879 -msgid "Open a text editor, e.g. Notepad (Windows), TextWrangler (Mac)." +#: user-manual.txt:3901 +msgid "Open a text editor, e.g. Notepad (Windows) or TextWrangler (Mac)." msgstr "" #. type: Plain text -#: user-manual.txt:3881 +#: user-manual.txt:3903 msgid "" "Copy the contents of the clipboard into the text editor and save the text " -"file with a filename extension of .CSV" +"file with a filename extension of _.apd_" msgstr "" #. type: Plain text -#: user-manual.txt:3882 +#: user-manual.txt:3904 msgid "" "Within _Subsurface_, select _Import -> Import log files_ to open the xref:" "Unified_import[universal import dialogue]." msgstr "" #. type: Plain text -#: user-manual.txt:3883 +#: user-manual.txt:3905 msgid "" -"In the dropdown list towards the bottom right of the dialogue, select \"_CSV " -"files_\"." +"In the dropdown list towards the bottom right of the dialogue (labled " +"'Filter:'), select \"APD log viewer\"." msgstr "" #. type: Plain text -#: user-manual.txt:3885 +#: user-manual.txt:3908 msgid "" -"On the list of file names select the .CSV file that has been created above. " -"An import dialogue opens." +"On the list of file names select the _.apd_ file that has been created " +"above. An import dialogue opens indicating the default settings for the data " +"in the _.apd_ file. If any changes are required, do this as for xref:" +"S_ImportingCSVDives[CSV imports]." msgstr "" +#. type: Target for macro image +#: user-manual.txt:3909 +#, no-wrap +msgid "images/APD_CSVimportF22.jpg" +msgstr "images/APD_CSVimportF22.jpg" + #. type: Plain text -#: user-manual.txt:3887 +#: user-manual.txt:3917 msgid "" -"In the dropdown list on the top left labeled '_Pre-configured imports_\", " -"select _APD Log Viewer_." +"The top left hand dropdown box in the import panel allows one to select the " +"APD dive computer for which the dive log needs to be imported. The default " +"it is DC1, _i.e._ the first of the two dive computers the APD uses. It is " +"possible to sequentially import the data for both dive computers by first " +"importing CD1 and then DC2.(*Hint*: The logs for the two dive computers are " +"viewed by selecting _View -> Next DC_ from the Main Menu after the uploading " +"has been completed)" msgstr "" #. type: Plain text -#: user-manual.txt:3888 -msgid "" -"Ensure the other settings for the ADP dive log are appropriate, then select " -"_OK_." +#: user-manual.txt:3918 +msgid "Click the _Ok_ button at the bottom of the import panel." msgstr "" #. type: Plain text -#: user-manual.txt:3890 -msgid "The APD dive log will appear within _Subsurface_." +#: user-manual.txt:3923 +msgid "" +"The APD dive log will appear within _Subsurface_. The dive computer-" +"generated ceiling generated by the Inspiration can be viewed by selecting " +"the appropriate button on the left of the *Dive Profile*. Cylinder pressure " +"data are not logged by the APD equipment but can be manually entered in the " +"_Equipment_ Tab." msgstr "" #. type: Title == -#: user-manual.txt:3892 +#: user-manual.txt:3924 #, no-wrap msgid "APPENDIX C: Exporting Dive log information from external dive log software." msgstr "" #. type: Plain text -#: user-manual.txt:3901 +#: user-manual.txt:3933 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, " @@ -8081,22 +8164,22 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3903 +#: user-manual.txt:3935 msgid "Export the foreign dive log data to format that is accessible from" msgstr "" #. type: Plain text -#: user-manual.txt:3904 +#: user-manual.txt:3936 msgid "_Subsurface_." msgstr "" #. type: Plain text -#: user-manual.txt:3905 +#: user-manual.txt:3937 msgid "Import the accessible dive log data into _Subsurface_." msgstr "" #. type: Plain text -#: user-manual.txt:3909 +#: user-manual.txt:3941 msgid "" "This appendix provides some information about approaches to export dive log " "data from foreign dive log software. The procedures below mostly apply to " @@ -8104,19 +8187,19 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3911 +#: user-manual.txt:3943 #, no-wrap msgid "Exporting from *Suunto Divemanager (DM3, DM4 or DM5)*" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:3912 +#: user-manual.txt:3944 #, no-wrap msgid "images/icons/suuntologo.jpg" msgstr "images/icons/suuntologo.jpg" #. type: Plain text -#: user-manual.txt:3919 +#: user-manual.txt:3951 msgid "" "DiveManager is a MS Windows application for Suunto dive computers. " "Divemanager 3 (DM3) is an older version of the Suunto software. More recent " @@ -8126,66 +8209,66 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3921 +#: user-manual.txt:3953 #, no-wrap msgid "*Divemanager 3 (DM3):*\n" msgstr "" #. type: Plain text -#: user-manual.txt:3923 +#: user-manual.txt:3955 msgid "" "Start 'Suunto Divemanager 3' and log in with the name containing the logs" msgstr "" #. type: Plain text -#: user-manual.txt:3924 +#: user-manual.txt:3956 msgid "Do not start the import wizard to import dives from the dive computer." msgstr "" #. type: Plain text -#: user-manual.txt:3926 +#: user-manual.txt:3958 msgid "" "In the navigation tree on the left side of the program-window, select the " "appropriate dives." msgstr "" #. type: Plain text -#: user-manual.txt:3927 +#: user-manual.txt:3959 msgid "" "Within the list of dives, select the dives you would like to import later:" msgstr "" #. type: Plain text -#: user-manual.txt:3928 +#: user-manual.txt:3960 msgid "To select certain dives: hold 'ctrl' and click the dive" msgstr "" #. type: Plain text -#: user-manual.txt:3930 +#: user-manual.txt:3962 msgid "" "To select all dives: Select the first dive, hold down shift and select the " "last dive" msgstr "" #. type: Plain text -#: user-manual.txt:3931 +#: user-manual.txt:3963 msgid "With the dives marked, use the program menu _File -> Export_" msgstr "" #. type: Plain text -#: user-manual.txt:3932 +#: user-manual.txt:3964 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:3933 +#: user-manual.txt:3965 msgid "Click the browse button next to the field Export Path" msgstr "" #. type: Plain text -#: user-manual.txt:3935 +#: user-manual.txt:3967 #, no-wrap msgid "" "** A file-manager like window pops up\n" @@ -8193,13 +8276,13 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3936 +#: user-manual.txt:3968 #, no-wrap msgid "Divelog.SDE file\n" msgstr "" #. type: Plain text -#: user-manual.txt:3938 +#: user-manual.txt:3970 #, no-wrap msgid "" "** Optionally change the name of the file for saving\n" @@ -8207,25 +8290,25 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3939 +#: user-manual.txt:3971 #, no-wrap msgid "Back in the Export pop-up, press the button 'Export'\n" msgstr "" #. type: Plain text -#: user-manual.txt:3940 +#: user-manual.txt:3972 #, no-wrap msgid "The dives are now exported to the file Divelog.SDE.\n" msgstr "" #. type: Plain text -#: user-manual.txt:3942 +#: user-manual.txt:3974 #, no-wrap msgid "*Divemanager 4 (DM4) and Divemanager 5 (DM5):*\n" msgstr "" #. type: Plain text -#: user-manual.txt:3947 +#: user-manual.txt:3979 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 " @@ -8234,81 +8317,81 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3949 +#: user-manual.txt:3981 msgid "Locating the Suunto DM4 (or DM5) database:" msgstr "" #. type: Plain text -#: user-manual.txt:3951 user-manual.txt:3960 +#: user-manual.txt:3983 user-manual.txt:3992 msgid "Start Suunto DM4/DM5" msgstr "" #. type: Plain text -#: user-manual.txt:3952 +#: user-manual.txt:3984 msgid "Select 'Help -> About'" msgstr "" #. type: Plain text -#: user-manual.txt:3953 +#: user-manual.txt:3985 msgid "Click 'Copy' after text 'Copy log folder path to clipboard'" msgstr "" #. type: Plain text -#: user-manual.txt:3954 +#: user-manual.txt:3986 msgid "Now open Windows Explorer" msgstr "" #. type: Plain text -#: user-manual.txt:3955 +#: user-manual.txt:3987 msgid "Paste the address to the path box at the top of the File Explorer" msgstr "" #. type: Plain text -#: user-manual.txt:3956 +#: user-manual.txt:3988 msgid "The database is called DM4.db or DM5.db" msgstr "" #. type: Plain text -#: user-manual.txt:3958 +#: user-manual.txt:3990 msgid "Making a backup copy of the Suunto DM4/DM5 database:" msgstr "" #. type: Plain text -#: user-manual.txt:3961 +#: user-manual.txt:3993 msgid "Select 'File - Create backup'" msgstr "" #. type: Plain text -#: user-manual.txt:3963 +#: user-manual.txt:3995 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:3964 +#: user-manual.txt:3996 msgid "Click 'Save'" msgstr "" #. type: Plain text -#: user-manual.txt:3965 +#: user-manual.txt:3997 msgid "The dives are now exported to the file DM4.bak (or DM5.bak)" msgstr "" #. type: Title === -#: user-manual.txt:3967 +#: user-manual.txt:3999 #, no-wrap msgid "Exporting from Atomic Logbook" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:3970 +#: user-manual.txt:4002 #, no-wrap msgid "images/icons/atomiclogo.jpg" msgstr "images/icons/atomiclogo.jpg" #. type: Plain text -#: user-manual.txt:3977 +#: user-manual.txt:4009 msgid "" "Atomic Logbook is a Windows software by Atomic Aquatics. It allows " "downloading of dive information from Cobalt and Cobalt 2 dive computers. " @@ -8318,19 +8401,19 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3979 +#: user-manual.txt:4011 #, no-wrap msgid "Exporting from Mares Dive Organiser V2.1" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:3982 +#: user-manual.txt:4014 #, no-wrap msgid "images/icons/mareslogo.jpg" msgstr "images/icons/mareslogo.jpg" #. type: Plain text -#: user-manual.txt:3990 +#: user-manual.txt:4022 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 " @@ -8341,7 +8424,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3995 +#: user-manual.txt:4027 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 " @@ -8349,36 +8432,36 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3998 +#: user-manual.txt:4030 msgid "" "Rename the file to DiveOrganiserxxxxx.zip. Inside the zipped directory is a " "file _DiveOrganiser.sdf_." msgstr "" #. type: Plain text -#: user-manual.txt:3999 +#: user-manual.txt:4031 msgid "Extract the _.sdf_ file from the zipped folder to your Desktop." msgstr "" #. type: Plain text -#: user-manual.txt:4000 +#: user-manual.txt:4032 msgid "The password for accessing the .zip file is _mares_." msgstr "" #. type: Title === -#: user-manual.txt:4002 +#: user-manual.txt:4034 #, no-wrap msgid "Exporting from *DivingLog 5.0 and 6.0*" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:4004 +#: user-manual.txt:4036 #, no-wrap msgid "images/icons/divingloglogo.jpg" msgstr "images/icons/divingloglogo.jpg" #. type: Plain text -#: user-manual.txt:4011 +#: user-manual.txt:4043 msgid "" "The best way to bring your logs from DivingLog to Subsurface is to convert " "the whole database. This is because other export formats do not include all " @@ -8388,37 +8471,37 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4013 +#: user-manual.txt:4045 msgid "To transfer all files from DivingLog to Subsurface, do the following:" msgstr "" #. type: Plain text -#: user-manual.txt:4015 +#: user-manual.txt:4047 msgid "In DivingLog open the 'File -> Export -> SQLite' menu" msgstr "" #. type: Plain text -#: user-manual.txt:4016 +#: user-manual.txt:4048 msgid "Select 'Settings' button" msgstr "" #. type: Plain text -#: user-manual.txt:4017 +#: user-manual.txt:4049 msgid "Set the 'RTF2Plaintext' to 'true'" msgstr "" #. type: Plain text -#: user-manual.txt:4018 +#: user-manual.txt:4050 msgid "Close the Settings dialog" msgstr "" #. type: Plain text -#: user-manual.txt:4019 +#: user-manual.txt:4051 msgid "Click 'Export' button and select the filename" msgstr "" #. type: Plain text -#: user-manual.txt:4023 +#: user-manual.txt:4055 msgid "" "Once this is done, open the saved database file with Subsurface and the " "dives are automatically converted to our own format. Last step to do is save " @@ -8426,13 +8509,13 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:4025 +#: user-manual.txt:4056 #, no-wrap msgid "APPENDIX D: Exporting a spreadsheet to CSV format" msgstr "ANNEXE D : Exporter un tableur vers le format CSV" #. type: Plain text -#: user-manual.txt:4034 +#: user-manual.txt:4066 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 " @@ -8453,7 +8536,7 @@ msgstr "" "selon le tableur utilisé." #. type: Plain text -#: user-manual.txt:4040 +#: user-manual.txt:4072 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 " @@ -8471,19 +8554,19 @@ msgstr "" "règles simples :" #. type: Plain text -#: user-manual.txt:4042 +#: user-manual.txt:4074 msgid "" "Date: use one of the following formats: yyyy-mm-dd, dd.mm.yyyy, mm/dd/yyyy" msgstr "" "Date : utiliser un des formats suivants : aaaa-mm-jj, jj.mm.aaaa, mm/jj/aaaa" #. type: Plain text -#: user-manual.txt:4043 +#: user-manual.txt:4075 msgid "Duration: the format should be minutes:seconds." msgstr "Durée : le format est minutes:secondes." #. type: Plain text -#: user-manual.txt:4044 +#: user-manual.txt:4076 msgid "" "Unit system: only one unit system should be used (i.e., no mixture between " "imperial and metric units)" @@ -8492,26 +8575,26 @@ msgstr "" "entre les unités impériales et métriques)" #. type: Plain text -#: user-manual.txt:4045 +#: user-manual.txt:4077 msgid "Tags and buddies: values should be separated using a comma." msgstr "" "Étiquettes et équipiers : les valeurs doivent être séparées par des virgules." #. type: Plain text -#: user-manual.txt:4046 +#: user-manual.txt:4078 msgid "GPS position: users must use decimal degrees, e.g. 30.22496 30.821798" msgstr "" "Position GPS : vous devez utiliser les degrés décimaux, par exemple : " "30.22496 30.821798" #. type: Title === -#: user-manual.txt:4047 +#: user-manual.txt:4079 #, no-wrap msgid "_LibreOffice Calc_ and _OpenOffice Calc_" msgstr "_LibreOffice Calc_ et _OpenOffice Calc_" #. type: Plain text -#: user-manual.txt:4051 +#: user-manual.txt:4083 msgid "" "These are open source spreadsheet applications forming parts of larger open " "source office suite applications. The user interaction with _LibreOffice_ " @@ -8522,13 +8605,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:4052 +#: user-manual.txt:4084 #, no-wrap msgid "images/LOffice_spreadsheetdata.jpg" msgstr "images/LOffice_spreadsheetdata.jpg" #. type: Plain text -#: user-manual.txt:4055 +#: user-manual.txt:4087 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 " @@ -8536,13 +8619,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:4056 +#: user-manual.txt:4088 #, no-wrap msgid "images/LOffice_save_as_options.jpg" msgstr "images/LOffice_save_as_options.jpg" #. type: Plain text -#: user-manual.txt:4059 +#: user-manual.txt:4091 msgid "" "After selecting _Save_, select the appropriate field delimiter (choose _Tab_ " "to prevent conflicts with the comma when using this as a decimal point), " @@ -8550,13 +8633,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:4060 +#: user-manual.txt:4092 #, no-wrap msgid "images/LOffice_field_options.jpg" msgstr "images/LOffice_field_options.jpg" #. type: Plain text -#: user-manual.txt:4063 +#: user-manual.txt:4095 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:" @@ -8564,13 +8647,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4064 +#: user-manual.txt:4096 #, no-wrap msgid "Microsoft _Excel_" msgstr "Microsoft _Excel_" #. type: Plain text -#: user-manual.txt:4070 +#: user-manual.txt:4102 msgid "" "The field delimiter (called \"_list separator_\" in Microsoft manuals) is " "not accessible from within _Excel_ and needs to be set through the " @@ -8581,19 +8664,19 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4072 +#: user-manual.txt:4104 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:4073 +#: user-manual.txt:4105 msgid "Open the _Regional and Language Options_ dialog box." msgstr "" #. type: Plain text -#: user-manual.txt:4076 +#: user-manual.txt:4108 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 " @@ -8601,48 +8684,48 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4077 +#: user-manual.txt:4109 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:4078 +#: user-manual.txt:4110 msgid "Click _OK_ twice." msgstr "" #. type: Plain text -#: user-manual.txt:4080 +#: user-manual.txt:4112 msgid "Below is an image of the _Control Panel_:" msgstr "" #. type: Target for macro image -#: user-manual.txt:4081 +#: user-manual.txt:4113 #, no-wrap msgid "images/Win_SaveCSV2.jpg" msgstr "images/Win_SaveCSV2.jpg" #. type: Plain text -#: user-manual.txt:4084 +#: user-manual.txt:4116 msgid "To export the dive log in CSV format:" msgstr "" #. type: Plain text -#: user-manual.txt:4086 +#: user-manual.txt:4118 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:4087 +#: user-manual.txt:4119 #, no-wrap msgid "images/Win_SaveCSV1.jpg" msgstr "images/Win_SaveCSV1.jpg" #. type: Plain text -#: user-manual.txt:4090 +#: user-manual.txt:4122 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 " @@ -8652,13 +8735,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:4091 +#: user-manual.txt:4123 #, no-wrap msgid "images/Win_SaveCSV3.jpg" msgstr "images/Win_SaveCSV3.jpg" #. type: Plain text -#: user-manual.txt:4094 +#: user-manual.txt:4126 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 " @@ -8667,193 +8750,122 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:4095 -#, no-wrap -msgid "APPENDIX E: FAQs." -msgstr "" - -#. type: Title === -#: user-manual.txt:4097 +#: user-manual.txt:4128 #, no-wrap -msgid "Subsurface appears to miscalculate gas consumption and SAC" -msgstr "" - -#. type: Plain text -#: user-manual.txt:4101 -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_ " -"calculates. Is _Subsurface_ miscalculating?" -msgstr "" - -#. type: Plain text -#: user-manual.txt:4107 -msgid "" -"'Answer': Not really. What happens is that _Subsurface_ actually calculates " -"gas consumption differently - and better - than you expect. In particular, " -"it takes the incompressibility of the gas into account. Traditionally, Gas " -"consumption and SAC should be: +consumption = tank size x (start pressure - " -"end pressure)+" -msgstr "" +msgid "APPENDIX E: Writing a custom print template" +msgstr "ANNEXE E : Créer un modèle d'impression personnalisé" #. type: Plain text -#: user-manual.txt:4113 +#: user-manual.txt:4133 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 " -"actually don't compress linearly with pressure. Also, you are missing the " -"fact that one atmosphere of pressure isn't actually one bar. So the *real* " -"calculation is:" -msgstr "" - -#. type: Plain text -#: user-manual.txt:4115 -msgid "+consumption = (amount_of_air_at_beginning - amount_of_air_at_end)+" +"_Subsurface_ provides a mechanism to create or modify templates for printing " +"dive logs in order to produce customised printouts of dive logs. Templates, " +"written in HTML as well as a simple Grantlee instruction set, are rendered " +"to the print device by _Subsurface_." msgstr "" #. type: Plain text -#: user-manual.txt:4121 -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 " -"fairly small issue under 220 bar - you'll see more differences when you do " -"high-pressure tanks with 300bar) and \"convert bar to atm\" (which is the " -"majority of your discrepancy). Remember: one ATM is ~1.013 bar, so without " -"the compressibility, your gas use is:" -msgstr "" - -#. type: Plain text -#: user-manual.txt:4123 -msgid "+12.2*((220-100)/1.013)+" +#: user-manual.txt:4135 +msgid "Templates are accessed using the print dialogue (see image *B* below)." msgstr "" #. type: Plain text -#: user-manual.txt:4128 +#: user-manual.txt:4143 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 " -"compressibility does show up above 200 bar, and takes that 1445 down about " -"eight litres more, so you really did use only about 1437 l of air at surface " -"pressure." +"The buttons under the _Template_ dropdown box allows one to _Edit_, " +"_Delete_, _Import_ and to _Export_ templates (see image *A* above). New or " +"modified templates are stored as HTML files in the same directory as the " +"dive log being processed. In order to create or modify a template, select " +"the _Custom_ template from the template dropdown list in the print dialogue " +"(see image *B* above), then select _Edit_." msgstr "" #. type: Plain text -#: user-manual.txt:4134 -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 " -"mentioned, the \"contains less air than you thought it did\" really starts " -"becoming much more noticeable at high pressure. A 400 bar really does not " -"contain twice as much air as a 200 bar one. At lower pressures, air acts " -"pretty much like an ideal gas." +#: user-manual.txt:4145 +msgid "The Edit Panel comprises three tabs:" msgstr "" -#. type: Title === -#: user-manual.txt:4135 +#. type: Target for macro image +#: user-manual.txt:4146 #, no-wrap -msgid "Some dive profiles have time discrepancies with the recorded samples from my dive computer..." -msgstr "" +msgid "images/Template1_f22.jpg" +msgstr "images/Template1_f22.jpg" #. type: Plain text -#: user-manual.txt:4139 +#: user-manual.txt:4150 msgid "" -"_Subsurface_ ends up ignoring surface time for many things (average depth, " -"divetime, SAC, etc). 'Question': Why do dive durations in my dive computer " -"differ from that given by _Subsurface_?" -msgstr "" - -#. type: Plain text -#: user-manual.txt:4147 -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 " -"for your buddies, your dive computer may say that your dive is 50 minutes " -"long - because you have fifty minutes worth of samples - but subsurface will " -"say it's 45 minutes - because you were actually diving for 45 minutes. It's " -"even more noticeable if you do things like divemastering the initial OW " -"dives, when you may stay in the water for a long time, but spend most of it " -"at the surface. And then you don't want that to count as some kind of long " -"dive”." -msgstr "" - -#. type: Title === -#: user-manual.txt:4148 -#, no-wrap -msgid "Some dive profiles are missing from the download" +"The _Style_ tab (image *A* above) controls the font, line spacing and colour " +"template used for printing the dive log. The style attributes are editable. " +"Choose one of the four colour palets used for colour printing." msgstr "" #. type: Plain text #: user-manual.txt:4154 msgid "" -"'Question': I cannot download all my dives, only the most recent ones even " -"though my dive computer's manual states that it records history of e.g. 999 " -"dives." +"The _Colors_ tab (image *B* above) allows editing the colours used for " +"printing the dive log. The colours are highly customisable: the _Edit_ " +"buttons in the _Colors_ tab allows choosing abritrary colours for different " +"components of the dive log printout." msgstr "" #. type: Plain text #: user-manual.txt:4163 msgid "" -"'Answer': Dive history is different than the dive profiles on the log. The " -"history only keeps track of the total number of dives and total amount of " -"time spent below surface. The logs, on the other hand, store the dive " -"profile, but they have limited amount of memory to do so. The exact amount " -"of dive profiles that can be stored on the device depend on sample interval " -"and duration of the dives. Once the memory is full the oldest dives get " -"overwritten with new dives. Thus we are only able to download the last 13, " -"30 or 199 dives." -msgstr "" - -#. type: Plain text -#: user-manual.txt:4168 -msgid "" -"If you have downloaded your dives to different dive logging software before " -"they were overwritten, there is a high change that Subsurface can import " -"these. However, if the logs are only on your dive computer, they cannot be " -"salvaged after being over written by new dives." +"The _Template_ tab of the Edit Panel (see image below) allows creating a " +"template using HTML as well as a few Grantlee programming primitives. " +"Grantlee provides the ability to create and format HTML code in a highly " +"simple but efficient way (see below). The HTML of the template can be edited " +"and saved. The saved template is stored in the same directory as the dive " +"being processed. By default, a _Custom_ template is a skeleton with no " +"specific print instructions. The informastion being printed needs to be " +"specified and formatted in the by replacing the section marked with: \"<!-- " +"Template must be filled -->\". Writing HTML code with Grantlee instructions " +"allows unlimited freedom in determining what is printed an in which way it " +"should be rendered." msgstr "" -#. type: Title == -#: user-manual.txt:4169 +#. type: Target for macro image +#: user-manual.txt:4164 #, no-wrap -msgid "APPENDIX F: Write a custom printing template" -msgstr "" +msgid "images/Template2_f22.jpg" +msgstr "images/Template2_f22.jpg" #. type: Plain text -#: user-manual.txt:4173 +#: user-manual.txt:4167 msgid "" -"_Subsurface_ provides a customizable printing support which is based on " -"templates that are transformed by the _Grantlee_ backend to correct _HTML_ " -"syntax, The _HTML_ output is then rendered by _Subsurface_." +"One can adapt any of the existing templates and save it to the dive log " +"directory. The standard templates (e.g. One dive, Six dives, Table) can be " +"modified in this way." msgstr "" #. type: Plain text -#: user-manual.txt:4175 +#: user-manual.txt:4169 msgid "" "To write a custom template the following elements must exist so that the " "template will be correctly handled and rendered." msgstr "" #. type: Title === -#: user-manual.txt:4176 +#: user-manual.txt:4170 #, no-wrap msgid "Main dive loop" msgstr "" #. type: Plain text -#: user-manual.txt:4178 +#: user-manual.txt:4172 msgid "" "_Subsurface_ exports a dive list called (*dives*) to the _Grantlee_ backend. " "It is possible to iterate over the list as follows:" msgstr "" #. type: Block title -#: user-manual.txt:4179 user-manual.txt:4233 user-manual.txt:4250 +#: user-manual.txt:4173 user-manual.txt:4227 user-manual.txt:4244 #, no-wrap msgid "template.html" msgstr "" #. type: delimited block . -#: user-manual.txt:4184 +#: user-manual.txt:4178 #, no-wrap msgid "" "\t{% for dive in dives %}\n" @@ -8862,13 +8874,13 @@ msgid "" msgstr "" #. type: Block title -#: user-manual.txt:4186 user-manual.txt:4238 user-manual.txt:4257 +#: user-manual.txt:4180 user-manual.txt:4232 user-manual.txt:4251 #, no-wrap msgid "output.html" msgstr "" #. type: delimited block . -#: user-manual.txt:4191 +#: user-manual.txt:4185 #, no-wrap msgid "" "\t<h1> 1 </h1>\n" @@ -8877,25 +8889,25 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4194 +#: user-manual.txt:4188 msgid "" "Additional information about _Grantlee_ can be found http://www.grantlee.org/" "apidox/for_themers.html[here]" msgstr "" #. type: Title === -#: user-manual.txt:4195 +#: user-manual.txt:4189 #, no-wrap msgid "Grantlee exported variables" msgstr "" #. type: Plain text -#: user-manual.txt:4197 +#: user-manual.txt:4191 msgid "Only a subset of the dive data is exported:" msgstr "" #. type: delimited block | -#: user-manual.txt:4215 +#: user-manual.txt:4209 #, no-wrap msgid "" "|*Name*|*Description*\n" @@ -8918,7 +8930,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4219 +#: user-manual.txt:4213 msgid "" "_Subsurface_ also exports *template_options* data. This data must be used as " "_CSS_ values to provide a dynamically editable template. The exported data " @@ -8926,7 +8938,7 @@ msgid "" msgstr "" #. type: delimited block | -#: user-manual.txt:4231 +#: user-manual.txt:4225 #, no-wrap msgid "" "|*Name*|*Description*\n" @@ -8943,26 +8955,26 @@ msgid "" msgstr "" #. type: delimited block . -#: user-manual.txt:4236 +#: user-manual.txt:4230 #, no-wrap msgid "\tborder-width: {{ template_options.borderwidth }}px;\n" msgstr "" #. type: delimited block . -#: user-manual.txt:4241 +#: user-manual.txt:4235 #, no-wrap msgid "\tborder-width: 3px;\n" msgstr "" #. type: Plain text -#: user-manual.txt:4244 +#: user-manual.txt:4238 msgid "" "Another variable that _Subsurface_ exports is *print_options*. This variable " "contains a single member:" msgstr "" #. type: delimited block | -#: user-manual.txt:4247 +#: user-manual.txt:4241 #, no-wrap msgid "" "|*Name*|*Description*\n" @@ -8970,7 +8982,7 @@ msgid "" msgstr "" #. type: delimited block . -#: user-manual.txt:4255 +#: user-manual.txt:4249 #, no-wrap msgid "" "\tbody {\n" @@ -8979,7 +8991,7 @@ msgid "" msgstr "" #. type: delimited block . -#: user-manual.txt:4262 +#: user-manual.txt:4256 #, no-wrap msgid "" "\tbody {\n" @@ -8988,13 +9000,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:4264 +#: user-manual.txt:4258 #, no-wrap msgid "Defined CSS selectors" msgstr "" #. type: Plain text -#: user-manual.txt:4268 +#: user-manual.txt:4262 msgid "" "As the dive profile is placed after rendering, _Subsurface_ uses a special " "_CSS_ selectors to do some searches in the HTML output. The _CSS_ selectors " @@ -9002,7 +9014,7 @@ msgid "" msgstr "" #. type: delimited block | -#: user-manual.txt:4275 +#: user-manual.txt:4269 #, no-wrap msgid "" "|*Selector*|*Type*|*Description*\n" @@ -9013,20 +9025,20 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4278 +#: user-manual.txt:4272 msgid "" "Rendering dive profiles is not supported for flow layout templates (when " "data-numberofdives = 0)." msgstr "" #. type: Title === -#: user-manual.txt:4279 +#: user-manual.txt:4273 #, no-wrap msgid "Special attributes" msgstr "" #. type: Plain text -#: user-manual.txt:4283 +#: user-manual.txt:4277 msgid "" "There are two ways of rendering- either rendering a specific number of dives " "in each page or make _Subsurface_ try to fit as much dives as possible into " @@ -9034,41 +9046,190 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:4285 +#: user-manual.txt:4279 msgid "" "The *data-numberofdives* data attribute is added to the body tag to set the " "rendering mode" msgstr "" #. type: Plain text -#: user-manual.txt:4287 +#: user-manual.txt:4281 msgid "render 6 dives per page:" msgstr "" #. type: delimited block . -#: user-manual.txt:4290 +#: user-manual.txt:4284 #, no-wrap msgid "\t<body data-numberofdives = 6>\n" msgstr "" #. type: Plain text -#: user-manual.txt:4293 +#: user-manual.txt:4287 msgid "render as much dives as possible:" msgstr "" #. type: delimited block . -#: user-manual.txt:4296 +#: user-manual.txt:4290 #, no-wrap msgid "\t<body data-numberofdives = 0>\n" msgstr "" #. type: Plain text -#: user-manual.txt:4298 +#: user-manual.txt:4293 msgid "" "All CSS units should be in relative lengths only, to support printing on any " "page size." msgstr "" +#. type: Title == +#: user-manual.txt:4294 +#, no-wrap +msgid "APPENDIX F: FAQs." +msgstr "" + +#. type: Title === +#: user-manual.txt:4296 +#, no-wrap +msgid "Subsurface appears to miscalculate gas consumption and SAC" +msgstr "" + +#. type: Plain text +#: user-manual.txt:4300 +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_ " +"calculates. Is _Subsurface_ miscalculating?" +msgstr "" + +#. type: Plain text +#: user-manual.txt:4306 +msgid "" +"'Answer': Not really. What happens is that _Subsurface_ actually calculates " +"gas consumption differently - and better - than you expect. In particular, " +"it takes the incompressibility of the gas into account. Traditionally, Gas " +"consumption and SAC should be: +consumption = tank size x (start pressure - " +"end pressure)+" +msgstr "" + +#. type: Plain text +#: user-manual.txt:4312 +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 " +"actually don't compress linearly with pressure. Also, you are missing the " +"fact that one atmosphere of pressure isn't actually one bar. So the *real* " +"calculation is:" +msgstr "" + +#. type: Plain text +#: user-manual.txt:4314 +msgid "+consumption = (amount_of_air_at_beginning - amount_of_air_at_end)+" +msgstr "" + +#. type: Plain text +#: user-manual.txt:4320 +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 " +"fairly small issue under 220 bar - you'll see more differences when you do " +"high-pressure tanks with 300bar) and \"convert bar to atm\" (which is the " +"majority of your discrepancy). Remember: one ATM is ~1.013 bar, so without " +"the compressibility, your gas use is:" +msgstr "" + +#. type: Plain text +#: user-manual.txt:4322 +msgid "+12.2*((220-100)/1.013)+" +msgstr "" + +#. type: Plain text +#: user-manual.txt:4327 +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 " +"compressibility does show up above 200 bar, and takes that 1445 down about " +"eight litres more, so you really did use only about 1437 l of air at surface " +"pressure." +msgstr "" + +#. type: Plain text +#: user-manual.txt:4333 +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 " +"mentioned, the \"contains less air than you thought it did\" really starts " +"becoming much more noticeable at high pressure. A 400 bar really does not " +"contain twice as much air as a 200 bar one. At lower pressures, air acts " +"pretty much like an ideal gas." +msgstr "" + +#. type: Title === +#: user-manual.txt:4334 +#, no-wrap +msgid "Some dive profiles have time discrepancies with the recorded samples from my dive computer..." +msgstr "" + +#. type: Plain text +#: user-manual.txt:4338 +msgid "" +"_Subsurface_ ends up ignoring surface time for many things (average depth, " +"divetime, SAC, etc). 'Question': Why do dive durations in my dive computer " +"differ from that given by _Subsurface_?" +msgstr "" + +#. type: Plain text +#: user-manual.txt:4346 +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 " +"for your buddies, your dive computer may say that your dive is 50 minutes " +"long - because you have fifty minutes worth of samples - but subsurface will " +"say it's 45 minutes - because you were actually diving for 45 minutes. It's " +"even more noticeable if you do things like divemastering the initial OW " +"dives, when you may stay in the water for a long time, but spend most of it " +"at the surface. And then you don't want that to count as some kind of long " +"dive”." +msgstr "" + +#. type: Title === +#: user-manual.txt:4347 +#, no-wrap +msgid "Some dive profiles are missing from the download" +msgstr "" + +#. type: Plain text +#: user-manual.txt:4353 +msgid "" +"'Question': I cannot download all my dives, only the most recent ones even " +"though my dive computer's manual states that it records history of e.g. 999 " +"dives." +msgstr "" + +#. type: Plain text +#: user-manual.txt:4362 +msgid "" +"'Answer': Dive history is different than the dive profiles on the log. The " +"history only keeps track of the total number of dives and total amount of " +"time spent below surface. The logs, on the other hand, store the dive " +"profile, but they have limited amount of memory to do so. The exact amount " +"of dive profiles that can be stored on the device depend on sample interval " +"and duration of the dives. Once the memory is full the oldest dives get " +"overwritten with new dives. Thus we are only able to download the last 13, " +"30 or 199 dives." +msgstr "" + +#. type: Plain text +#: user-manual.txt:4366 +msgid "" +"If you have downloaded your dives to different dive logging software before " +"they were overwritten, there is a high change that Subsurface can import " +"these. However, if the logs are only on your dive computer, they cannot be " +"salvaged after being over written by new dives." +msgstr "" + +#~ msgid "images/PrintDiveLog.jpg" +#~ msgstr "images/PrintDiveLog.jpg" + #~ msgid "images/Pref1.jpg" #~ msgstr "images/Pref1.jpg" diff --git a/Documentation/user-manual_fr.html.git b/Documentation/user-manual_fr.html.git index b9f692c61..cb9b70799 100644 --- a/Documentation/user-manual_fr.html.git +++ b/Documentation/user-manual_fr.html.git @@ -404,9 +404,9 @@ asciidoc.install(3); <div id="content">
<div class="imageblock" style="text-align:center;">
<div class="content">
-<img src="images/Subsurface4Banner.jpg" alt="Banner" />
-</div>
-</div>
+<img src="images/Subsurface4Banner.jpg" alt="Banner" /> +</div> +</div> <div class="paragraph"><p><span class="big">MANUEL UTILISATEUR</span></p></div> <div class="paragraph"><p><strong>Auteurs du manuel</strong> : Willem Ferguson, Jacco van Koll, Dirk Hohndel, Reinout Hoornweg, Linus Torvalds, Miika Turkia, Amit Chaudhuri, Jan Schubert, Salvador Cuñat, Pedro Neves</p></div> @@ -414,9 +414,9 @@ Linus Torvalds, Miika Turkia, Amit Chaudhuri, Jan Schubert, Salvador Cuñat, Ped <div class="paragraph"><p>Bienvenue en tant qu’utilisateur de <em>Subsurface</em>, un programme avancé d’enregistrement de plongées (carnet de plongées) avec une bonne infrastructure pour décrire, organiser, interpréter et imprimer des plongées -en scaphandre et en apnée. <em>Subsurface</em> offre de nombreux avantages par
-rapport à d’autres solutions logicielles similaires :</p></div>
-<div class="ulist"><ul>
+en scaphandre et en apnée. <em>Subsurface</em> offre de nombreux avantages par +rapport à d’autres solutions logicielles similaires :</p></div> +<div class="ulist"><ul> <li>
<p>
Avez-vous besoin d’une façon d’enregistrer vos plongées utilisant des
@@ -496,9 +496,9 @@ utilisateurs de la meilleur manière qu’il soit, il est important d’ informations sur les utilisateurs. À l’ouverture de <em>Subsurface</em> après avoir
utilisé le logiciel pendant une semaine environ, une fenêtre de sondage
apparait. Cela est complètement optionnel et l’utilisateur contrôle quelles
-informations sont envoyées ou non à l'équipe de développement de
-<em>Subsurface</em>. Toutes les données que l’utilisateur choisit d’envoyer sont
-extrêmement utiles et ne seront utilisées que pour les futures
+informations sont envoyées ou non à l'équipe de développement de +<em>Subsurface</em>. Toutes les données que l’utilisateur choisit d’envoyer sont +extrêmement utiles et ne seront utilisées que pour les futures développements et modifications du logiciel pour coller au mieux aux besoins des utilisateurs de <em>Subsurface</em>. Si vous complétez le sondage ou cliquez sur l’option pour ne plus être sondé, cela devrait être la dernière @@ -527,9 +527,9 @@ plongée sélectionnée dans la <strong>liste des plongées</strong>.</p></div> <div class="paragraph"><p>Les <strong>informations</strong> en haut à gauche, fournissent des informations détaillées sur la plongée sélectionnée dans la <strong>liste des plongées</strong>, dont des statistiques pour la plongée sélectionnée ou pour toutes les plongées mises -en surbrillance.</p></div>
-<div class="paragraph"><p>Le <strong>profil de plongée</strong> en haut à droite, affiche un profil de plongée
-graphique de la plongée sélectionnée dans la <strong>liste des plongées</strong>.</p></div>
+en surbrillance.</p></div> +<div class="paragraph"><p>Le <strong>profil de plongée</strong> en haut à droite, affiche un profil de plongée +graphique de la plongée sélectionnée dans la <strong>liste des plongées</strong>.</p></div> <div class="paragraph"><p>Les séparateurs entre ces panneaux peuvent être déplacés pour modifier la
taille de chaque panneau. <em>Subsurface</em> mémorise la position de ces
séparateurs, pour qu’au prochain lancement <em>Subsurface</em> utilise ces
@@ -574,9 +574,9 @@ carnet de plongée sera détaillée.</p></div> <div class="sectionbody">
<div class="paragraph"><p>Sélectionner <em>Fichier → Nouveau carnet de plongée</em> à partir du menu
principal. Toutes les données de plongées sont effacées pour que de
-nouvelles puissent être ajoutées. S’il existe des données non encore
-enregistrées dans le carnet ouvert, l’utilisateur devra sélectionner s’il
-faut les enregistrer ou non avant de créer le nouveau carnet.</p></div>
+nouvelles puissent être ajoutées. S’il existe des données non encore +enregistrées dans le carnet ouvert, l’utilisateur devra sélectionner s’il +faut les enregistrer ou non avant de créer le nouveau carnet.</p></div> </div> </div> <div class="sect1"> @@ -642,9 +642,9 @@ Importer à partir d’un tableur ou de fichiers CSV contenant les profils d <div class="paragraph"><p>This is usually the approach for dives without a dive computer. The basic record of information within <em>Subsurface</em> is a dive. The most important information in a simple dive logbook usually includes dive type, date, time, -duration, depth, the names of your dive buddy and of the dive master or dive
-guide, and some remarks about the dive. <em>Subsurface</em> can store much more
-information than this for each dive. In order to add a dive to a dive log,
+duration, depth, the names of your dive buddy and of the dive master or dive +guide, and some remarks about the dive. <em>Subsurface</em> can store much more +information than this for each dive. In order to add a dive to a dive log, select <em>Log → Add Dive</em> from the Main Menu. The program then shows three
panels to enter information for a dive: two tabs in the <strong>Info</strong> panel
(<strong>Notes</strong> and <strong>Equipment</strong>), as well as the <strong>Dive Profile</strong> panel that displays
@@ -735,17 +735,16 @@ e.g. N30° 13' 29.8" , E30° 49' 1.5" Decimal degrees, e.g. 30.22496 , </ol></div>
<div class="paragraph"><p>Southern hemisphere latitudes are given with a <strong>S</strong>, e.g. S30°, or with a
negative value, e.g. -30.22496. Similarly western longitudes are given with
-a <strong>W</strong>, e.g. W07°, or with a negative value, e.g. -7.34323.</p></div>
-<div class="paragraph"><p>Some keyboards don’t have the degree sign (°). It can be replaced by a d
-like that: N30d W20d.</p></div>
-<div class="paragraph"><p>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
-description will cause unexpected behaviour (Subsurface will think that all
-of these dives have the same location and try to keep their GPS coordinates
-the same).</p></div>
-<div class="paragraph"><p><strong>Dive mode</strong>: This is a dropdown box allowing one to choose the type of dive
-performed. The options are OC (Open Circuit, the default setting, meant for most recreational dives),
-Freedive (dive without SCUBA equipment), CCR (Closed-circuit
+a <strong>W</strong>, e.g. W07°, or with a negative value, e.g. -7.34323.</p></div> +<div class="paragraph"><p>Some keyboards don’t have the degree sign (°). It can be replaced by a d +like that: N30d W20d.</p></div> +<div class="paragraph"><p>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 description will +cause unexpected behaviour (Subsurface will think that all of these dives +have the same location and try to keep their GPS coordinates the same).</p></div> +<div class="paragraph"><p><strong>Dive mode</strong>: This is a dropdown box allowing one to choose the type of dive +performed. The options are OC (Open Circuit, the default setting, meant for most recreational dives), +Freedive (dive without SCUBA equipment), CCR (Closed-circuit rebreather) and pSCR (Passive semi-closed rebreather).</p></div>
<div class="paragraph"><p><strong>Divemaster</strong>: The name of the dive master or dive guide for this dive can be
entered here.
@@ -925,9 +924,9 @@ EAN50.</p></div> the <strong>Dive Profile</strong> can now be saved in the user’s logbook by using the two
buttons on the top right hand of the Notes tab. If the <em>Save</em> button is
clicked, the dive data are saved in the current logbook. If the <em>Cancel</em>
-button is clicked, the newly entered dive data are discarded. When exiting
-<em>Subsurface</em>, the user will be prompted once more to save the logbook with
-the new dive(s).</p></div>
+button is clicked, the newly entered dive data are discarded. When exiting +<em>Subsurface</em>, the user will be prompted once more to save the logbook with +the new dive(s).</p></div> </div> </div> <div class="sect2"> @@ -935,9 +934,9 @@ the new dive(s).</p></div> <div class="sect3"> <h4 id="_connecting_and_importing_data_from_a_dive_computer">5.2.1. Connecting and importing data from a dive computer.</h4> <div class="paragraph"><p>The use of dive computers allows the collection of a large amount of -information about each dive, e.g. a detailed record of depth, duration,
-rates of ascent/descent and of gas partial pressures. <em>Subsurface</em> can
-capture this information and present it as part of the dive information,
+information about each dive, e.g. a detailed record of depth, duration, +rates of ascent/descent and of gas partial pressures. <em>Subsurface</em> can +capture this information and present it as part of the dive information, using dive information from a wide range of dive computers. The latest list
of supported dive computers can be found at:
<a href="http://subsurface-divelog.org/documentation/supported-dive-computers/">
@@ -1490,9 +1489,9 @@ If one hovers using the mouse over the red bookmark, the appropriate text is saved by using the two buttons on the top right hand of the <strong>Notes</strong> tab. If
the <em>Save</em> button is clicked, the dive data are saved. If the <em>Cancel</em>
button is clicked, then the newly entered dive data are deleted, although
-the dive profile obtained from the dive computer will be retained. When the
-user exits <em>Subsurface</em> there is a final prompt to confirm that the new data
-should be saved.</p></div>
+the dive profile obtained from the dive computer will be retained. When the +user exits <em>Subsurface</em> there is a final prompt to confirm that the new data +should be saved.</p></div> </div> </div> <div class="sect2"> @@ -1500,9 +1499,9 @@ should be saved.</p></div> <div class="paragraph" id="S_ImportingAlienDiveLogs"><p>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 retyping because these dive logs can probably be imported into -<em>Subsurface</em>. <em>Subsurface</em> will import dive logs from a range of other dive
-log software. While some software is supported natively, for others the user
-has to export the logbook(s) to an intermediate format so that they can then
+<em>Subsurface</em>. <em>Subsurface</em> will import dive logs from a range of other dive +log software. While some software is supported natively, for others the user +has to export the logbook(s) to an intermediate format so that they can then be imported by <em>Subsurface</em>. Currently, <em>Subsurface</em> supports importing CSV
log files from several sources. APD LogViewer, XP5, Sensus and Seabear
files are preconfigured, but because the import is flexible, users can
@@ -1564,9 +1563,9 @@ JDiveLog </li>
<li>
<p>
-Suunto Dive Manager (DM3 and DM4)
-</p>
-</li>
+Suunto Dive Manager (DM3 and DM4) +</p> +</li> <li> <p> CSV (text-based and spreadsheet-based) dive logs, including APD CCR logs @@ -1611,13 +1610,13 @@ The dive log data from Mares Dive Organiser need to be exported to the user’s desktop, using a <em>.sdf</em> file name extension. Refer to <a href="#Mares_Export">Appendix C</a> for more information. </p> -</li>
-<li>
-<p>
+</li> +<li> +<p> Data should then be imported into <em>www.divelogs.de</em>. One needs to create a
- user account in <em>www.divelogs.de</em>, log into that web site, then select
- <em>Import Logbook → Dive Organiser</em> from the menu on the left hand side. The
- instructions must be carefully followed to transfer the dive information (in
+ user account in <em>www.divelogs.de</em>, log into that web site, then select + <em>Import Logbook → Dive Organiser</em> from the menu on the left hand side. The + instructions must be carefully followed to transfer the dive information (in <em>.sdf</em> format) from the Dive Organiser database to <em>www.divelogs.de</em>. </p> </li> @@ -1664,9 +1663,9 @@ information that may be helpful for importing spreadsheet-based data into <div class="paragraph"><p>One can view a <em>CSV</em> file by using an ordinary text editor. It is normally organised into a single line that provides the headers (or <em>field names</em> or <em>column headings</em>) of the data columns, followed by the data, one record per -line.</p></div>
-<div class="paragraph"><p>There are two types of <em>CSV</em> dive logs that can be imported into
-<em>Subsurface</em>:</p></div>
+line.</p></div> +<div class="paragraph"><p>There are two types of <em>CSV</em> dive logs that can be imported into +<em>Subsurface</em>:</p></div> <div class="olist arabic"><ol class="arabic">
<li>
<p>
@@ -2386,9 +2385,9 @@ window. A photo can be deleted from the <em>Photos</em> panel by selecting it removes the photo both from the <em>Photos</em> tab as well as the dive profile.</p></div>
</div>
<div class="sect3">
-<h4 id="_photos_on_an_external_hard_disk">5.5.4. Photos on an external hard disk</h4>
-<div class="paragraph"><p>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
+<h4 id="_photos_on_an_external_hard_disk">5.5.4. Photos on an external hard disk</h4> +<div class="paragraph"><p>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 directly accessed by <em>Subsurface</em>. This facilitates the interaction between <em>Subsurface</em> and an external repository of photos. When associating a dive profile with photos from an external drive, the normal procedure of @@ -2541,16 +2540,16 @@ steps:</p></div> specifications of the different cylinders, using the <strong>Equipment</strong> tab of the <strong>Info Panel</strong> (see image below where two 12 litre cylinder were used). </p> -</li>
-<li>
-<p>
+</li> +<li> +<p> <strong>Indicate cylinder change events on the <em>Subsurface</em> dive profile</strong>. Once the dive log has been imported
from a dive computer into <em>Subsurface</em>, the cylinder switch events need to be indicated on the dive profile.
Cylinder changes are recorded by right-clicking at the appropriate point on the dive profile and then
selecting <em>Add gas change</em>. A list of the appropriate cylinders is shown with the
- currently used cylinder greyed out. In the image below Tank 1 is greyed out, leaving only Tank 2
- to be selected. Select the appropriate cylinder. The cylinder change is then indicated on the dive
- profile with a cylinder symbol. If the <strong>Tank Bar</strong> is activated using the toolbar to the left of the
+ currently used cylinder greyed out. In the image below Tank 1 is greyed out, leaving only Tank 2 + to be selected. Select the appropriate cylinder. The cylinder change is then indicated on the dive + profile with a cylinder symbol. If the <strong>Tank Bar</strong> is activated using the toolbar to the left of the profile, then the cylinder change is also indicated on the Tank Bar (see image below). After all the cylinder change events have been recorded on the dive profile, the correct cylinder pressures for both cylinders are shown on the dive profile, as in the image below. @@ -2624,35 +2623,36 @@ lasted over two hours.</p></div> has been breathed while doing two things to maintain a breathable oxygen concentration: a) remove carbon dioxide from the gas that has been exhaled -regulate the oxygen concentration to remain within safe diving limits. -Currently, within <em>Subsurface</em>, the Poseidon MkVI Discovery is the best -supported CCR dive computer. The CCR interface of <em>Subsurface</em> is currently -experimental and under active development. In contrast to a conventional +regulate the oxygen concentration to remain within safe diving limits. The +CCR interface of <em>Subsurface</em> is currently experimental and under active +development. Subsurface currently supports Poseidon MkVI and APD +Discovery/Evolution dive computers. In contrast to a conventional recreational dive computer, a CCR system computer does not allow the download of a log containing multiple dives. Rather, each dive is stored -independently. This means that <em>Subsurface</em> 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 digital databases.</td>
-</tr></table>
-</div>
-<div class="sect4">
+independently. This means that <em>Subsurface</em> 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 digital databases: one +dive at a time.</td> +</tr></table> +</div> +<div class="sect4"> <h5 id="_import_a_ccr_dive">Import a CCR dive</h5>
<div class="paragraph"><p>See the section dealing with <a href="#S_ImportingAlienDiveLogs">Importing dive
information from other digital sources</a>. From the main menu of <em>Subsurface</em>,
-select <em>Import → Import log files</em> to bring up the
-<a href="#Unified_import">universal import dialogue</a>. 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 files (import for other CCR equipment is under active
-development). Having selected the appropriate CCR format and the directory
-where the original dive logs have been stored from the CCR dive computer,
-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 <em>Open</em> button at the bottom right hand of the universal import
-dialogue.</p></div>
-</div>
-<div class="sect4">
-<h5 id="_displayed_information_for_a_ccr_dive">Displayed information for a CCR dive</h5>
+select <em>Import → Import log files</em> to bring up the +<a href="#Unified_import">universal import dialogue</a>. As explained in that +section, the bottom right hand of the import dialogue contains a dropdown +list (labled <em>Filter:</em>) of appropriate devices that currently +includes(Poseidon) MkVI or APD log viewer files (import for other CCR +equipment is under active development). Having selected the appropriate CCR +format and the directory where the original dive logs have been stored from +the CCR dive computer, 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 <em>Open</em> button at the bottom right hand of +the universal import dialogue. See the section below for</p></div> +</div> +<div class="sect4"> +<h5 id="_displayed_information_for_a_ccr_dive">Displayed information for a CCR dive</h5> <div class="paragraph"><p><em>Partial pressures of gases</em>: The graph of oxygen partial pressure shows the
information from the oxygen sensors of the CCR equipment. In contrast to
recreational equipment (where pO<sub>2</sub> values are calculated based on gas
@@ -2685,26 +2685,26 @@ If no sensor data is available, the pO<sub>2</sub> value is assumed to be equal </ul></div>
<div class="paragraph"><p>The mean pO<sub>2</sub> of the sensors is indicated with a green line,</p></div>
<div class="paragraph"><p>The oxygen setpoint values as well as the readings from the individual
-oxygen sensors can be shown. The display of additional CCR information is
-turned on by checking the appropriate checkboxes in the <em>Preferences</em> panel
-(accessible by selecting <a href="#S_CCR_options"><em>File → Preferences →
-Graph</em></a>). This part of the <em>Preferences</em> panel look like this, representing
-two checkboxes that modify the display of pO<sub>2</sub> when the appropriate toolbar
-button on the Dive Profile has been activated.</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/CCR_preferences_f20.jpg" alt="FIGURE: CCR preferences panel" />
-</div>
-</div>
-<div class="paragraph"><p>Checking any of the check boxes allows the display of additional
-oxygen-related information whenever the pO<sub>2</sub> toolbar button on the
-<em>Profile</em> panel is activated. The first checkbox allows the display of
-setpoint information. This is a red line superimposed on the green oxygen
-partial pressure graph and allows a comparison of the mean measured oxygen
-partial pressure and the setpoint values, as in the image below.</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/CCR_setpoint_f20.jpg" alt="FIGURE: CCR setpoint and po2 graph" />
+oxygen sensors can be shown. The display of additional CCR information is +turned on by checking the appropriate checkboxes in the <em>Preferences</em> panel +(accessible by selecting <a href="#S_CCR_options"><em>File → Preferences → +Graph</em></a>). This part of the <em>Preferences</em> panel is shown in the image below, +representing two checkboxes that modify the display of pO<sub>2</sub> when the +appropriate toolbar button on the Dive Profile has been activated.</p></div> +<div class="imageblock" style="text-align:center;"> +<div class="content"> +<img src="images/CCR_preferences_f20.jpg" alt="FIGURE: CCR preferences panel" /> +</div> +</div> +<div class="paragraph"><p>Checking any of these check boxes allows the display of additional +oxygen-related information whenever the pO<sub>2</sub> toolbar button on the +<em>Profile</em> panel is activated. The first checkbox allows the display of +setpoint information. This is a red line superimposed on the green oxygen +partial pressure graph and allows a comparison of the mean measured oxygen +partial pressure and the setpoint values, as shown below.</p></div> +<div class="imageblock" style="text-align:center;"> +<div class="content"> +<img src="images/CCR_setpoint_f20.jpg" alt="FIGURE: CCR setpoint and po2 graph" /> </div>
</div>
<div class="paragraph"><p>The second checkbox allows the display of the data from each individual
@@ -2749,20 +2749,37 @@ addition, start and end pressures for both oxygen and diluent cylinders are shown in the <em>Equipment Tab</em>. Below is a dive profile for a CCR dive,
including an overlay of setpoint and oxygen sensor data, as well as the
cylinder pressure data. In this case there is good agreement from the
-readings of the two oxygen sensors.</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/CCR_dive_profile_f20.jpg" alt="FIGURE: CCR dive profile" />
-</div>
-</div>
-<div class="paragraph"><p><em>Equipment-specific information</em>: Equipment-specific information gathered by
-<em>Subsurface</em> is shown in the <a href="#S_ExtraDataTab">Extra data tab</a>. This may
-include setup information or metadata about the dive.</p></div>
-<div class="paragraph"><p>More equipment-specific information for downloading CCR dive logs for
-Poseidon MkVI and APD equipment can be found in <a href="#S_PoseidonMkVI">Appendix
-B</a>.</p></div>
-</div>
-</div>
+readings of the two oxygen sensors.</p></div> +<div class="imageblock" style="text-align:center;"> +<div class="content"> +<img src="images/CCR_dive_profile_f22.jpg" alt="FIGURE: CCR dive profile" /> +</div> +</div> +<div class="paragraph"><p><em>Equipment-specific information</em>: Equipment-specific information gathered by +<em>Subsurface</em> is shown in the <a href="#S_ExtraDataTab">Extra data tab</a>. This may +include setup information or metadata about the dive.</p></div> +<div class="paragraph"><p>The deco ceiling calculated by Subsurface is not very accurate because the +precise pressure of nitrogen in the loop can usually not be determined from +the dive log imported from the CCR equipment. Many CCR dive computers, +however, report an internally-calculated deco ceiling that is reported in +the dive log, reflecting a more accurate assessment. The display of this +ceiling is activated by clicking the appropriate button to the left of the +dive profile:</p></div> +<div class="paragraph"><p>The default colour of the computer-generated deco ceiling is white. However, +this can be set to red by checking the appropriate check box after selecting +<em>File → Preferences → Graph</em>. Below is a dive profile indicating the dive +computer-generated deco ceiling:</p></div> +<div class="imageblock" style="text-align:center;"> +<div class="content"> +<img src="images/CCR_dive_ceilingF22.jpg" alt="FIGURE: CCR computer-generated deco ceiling" /> +</div> +</div> +<div class="paragraph"><p>More equipment-specific information for downloading CCR dive logs for +Poseidon MkVI and APD equipment can be found in +<a href="#_appendix_b_dive_computer_specific_information_for_importing_dive_information">Appendix +B</a>.</p></div> +</div> +</div> </div>
</div>
</div>
@@ -3327,9 +3344,9 @@ Graph <strong>D</strong> shows the pressures after ascent to a depth of 4.5 mete <p>
Graph <strong>E</strong> indicates the situation after remaining at 4.5 meters for 10
minutes. The fast compartments have decreased in pressure. As expected, the
- pressures in the slow compartments have not changed much. The pressures in
- the fast compartments do not approach the GFHigh value any more and the
- diver is safer than in the situation indicated in graph <strong>D</strong>.
+ pressures in the slow compartments have not changed much. The pressures in + the fast compartments do not approach the GFHigh value any more and the + diver is safer than in the situation indicated in graph <strong>D</strong>. </p> </li> </ul></div> @@ -3357,9 +3374,9 @@ a group of dives and then right-clicking.</p></div> <div class="content"> <img src="images/DiveListOptions.jpg" alt="Example: Dive list info options" /> </div> -</div>
-<div class="paragraph"><p>The default information in the <strong>Dive List</strong> includes, for each dive,
-Dive_number, Date, Rating, Dive_depth, Dive_duration and Dive_location. This
+</div> +<div class="paragraph"><p>The default information in the <strong>Dive List</strong> includes, for each dive, +Dive_number, Date, Rating, Dive_depth, Dive_duration and Dive_location. This information can be controlled and changed by right-clicking on the header
bar of the <strong>Dive List</strong>. For instance, a right-click on the <em>Date</em> header
brings up a list of items that can be shown in the dive list (see
@@ -3375,9 +3392,9 @@ dives at a particular site. By pressing <em>Ctl-F</em> on the keyboard, a text is opened at the top left hand of the <strong>Dive List</strong>. Type the name of a dive
site in this text box and the <strong>Dive List</strong> is immediately filtered to show
only the dives for that site.</p></div>
-</div>
-</div>
-<div class="sect2">
+</div> +</div> +<div class="sect2"> <h3 id="S_Renumber">7.2. Renumbering the dives</h3> <div class="paragraph"><p>Dives are normally numbered incrementally from non-recent dives (low sequence numbers) to recent dives (having the highest sequence numbers). The @@ -3457,14 +3474,14 @@ figures below shows the selection and context menu on the left (A) and the completed action on the right (B):</p></div> <div class="imageblock" style="text-align:center;"> <div class="content"> -<img src="images/SplitDive3a.jpg" alt="FIGURE: Split a trip into 2 trips" />
-</div>
-</div>
+<img src="images/SplitDive3a.jpg" alt="FIGURE: Split a trip into 2 trips" /> +</div> +</div> </div>
</div>
-<div class="sect2">
-<h3 id="_manipulating_single_dives">7.4. Manipulating single dives</h3>
-<div class="sect3">
+<div class="sect2"> +<h3 id="_manipulating_single_dives">7.4. Manipulating single dives</h3> +<div class="sect3"> <h4 id="_delete_a_dive_from_the_dive_log">7.4.1. Delete a dive from the dive log</h4> <div class="paragraph"><p>Dives can be permanently deleted from the dive log by selecting and right-clicking them to bring up the context menu, and then selecting <strong>Delete @@ -3571,9 +3588,9 @@ those dives that have either one OR both of these tags.</p></div> <p> Exporter les informations de plongée vers <em>Facebook</em> </p> -</li>
-<li>
-<p>
+</li> +<li> +<p> <a href="#S_Export_other">Exporter des informations de plongée vers d’autres
destinations ou formats</a>
</p>
@@ -3586,9 +3603,9 @@ d’export. Cela est du au fait que l’export vers <em>Facebook</em> n connexion vers <em>Facebook</em>, nécessitant un identifiant et un mot de passe. À
partir du menu principal, si vous sélectionnez <em>Fichier → Préférences →
Facebook</em>, un écran de connexion est présenté (voir l’image <strong>A</strong> sur la
-gauche, ci dessous). Entrez vos identifiant et mot de passe <em>Facebook</em>. Une
-fois connecté à <em>Facebook</em>, le panneau de l’image <strong>B</strong> ci dessous est
-présenté. Ce panneau a un bouton qui doit être sélectionné pour fermer la
+gauche, ci dessous). Entrez vos identifiant et mot de passe <em>Facebook</em>. Une +fois connecté à <em>Facebook</em>, le panneau de l’image <strong>B</strong> ci dessous est +présenté. Ce panneau a un bouton qui doit être sélectionné pour fermer la connexion <em>Facebook</em>.</p></div> <div class="imageblock" style="text-align:center;"> <div class="content"> @@ -3633,9 +3650,9 @@ préférences Facebook.</p></div> <div class="paragraph"><p>For non-<em>Facebook exports</em>, the export function can be reached by selecting <em>File → Export</em>, which brings up the Export dialog. This dialog always gives two options: save ALL dives, or save only the dives selected in <strong>Dive -List</strong> panel of <em>Subsurface</em>. Click the appropriate radio button (see images
-below).</p></div>
-<div class="imageblock" style="text-align:center;">
+List</strong> panel of <em>Subsurface</em>. Click the appropriate radio button (see images +below).</p></div> +<div class="imageblock" style="text-align:center;"> <div class="content">
<img src="images/Export_f20.jpg" alt="Figure: Export dialog" />
</div>
@@ -3761,9 +3778,9 @@ instance <em>www.divelogs.de</em>.</p></div> </div>
<div class="sect1">
<h2 id="S_Cloud_access">9. Keeping a <em>Subsurface</em> dive log in the Cloud</h2>
-<div class="sectionbody">
-<div class="paragraph"><p>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
+<div class="sectionbody"> +<div class="paragraph"><p>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 information required for admission to further training courses or (sometimes) even diving sites. The security of the dive log is therefore critical. In order to have a dive log that is resistant to failure of a home @@ -3854,21 +3871,21 @@ one’s desktop computer.</p></div> <div class="imageblock" style="text-align:center;"> <div class="content"> <img src="images/Cloud.jpg" alt="FIGURE: Dropbox folder" /> -</div>
-</div>
-<div class="paragraph"><p>The <em>Dropbox</em> program creates a copy of the <em>Dropbox</em> Internet Cloud content
-on one’s desktop computer. When the computer is connected to the Internet,
-the Internet content is automatically updated. Therefore both the <em>Open</em> and
-<em>Save</em> of dive logs are done using the local copy of the dive log in the
-local <em>Dropbox</em> folder, so there’s no need for a direct internet
-connection. If the local copy is modified, e.g. by adding a dive, the remote
-copy in the <em>Dropbox</em> server in the Cloud will be automatically updated
-whenever Internet access is available.</p></div>
-<div class="paragraph"><p>In this way a dive log in one’s <em>Dropbox</em> folder can be accessed seamlessly
-from the Internet and can be accessed from any place with Internet
-access. Currently there are no costs involved for this service. Dropbox
-(Windows, Mac and Linux) can be installed by accessing the
-<a href="http://www.dropbox.com/install"><em>Install Page on the Dropbox website</em></a>
+</div> +</div> +<div class="paragraph"><p>The <em>Dropbox</em> program creates a copy of the <em>Dropbox</em> Internet Cloud content +on one’s desktop computer. When the computer is connected to the Internet, +the Internet content is automatically updated. Therefore both the <em>Open</em> and +<em>Save</em> of dive logs are done using the local copy of the dive log in the +local <em>Dropbox</em> folder, so there’s no need for a direct internet +connection. If the local copy is modified, e.g. by adding a dive, the remote +copy in the <em>Dropbox</em> server in the Cloud will be automatically updated +whenever Internet access is available.</p></div> +<div class="paragraph"><p>In this way a dive log in one’s <em>Dropbox</em> folder can be accessed seamlessly +from the Internet and can be accessed from any place with Internet +access. Currently there are no costs involved for this service. Dropbox +(Windows, Mac and Linux) can be installed by accessing the +<a href="http://www.dropbox.com/install"><em>Install Page on the Dropbox website</em></a> Alternatively one can use <em>Dropbox</em> as a mechanism to backup one’s dive
log. To Store a dive log in the Cloud, select <em>File → Save as</em> from the
<em>Subsurface</em> main menu, navigate to the <em>Dropbox</em> folder and select the
@@ -3876,147 +3893,176 @@ log. To Store a dive log in the Cloud, select <em>File → Save as</em> from Logbook</em> from the <em>Subsurface</em> main menu and navigate to the dive log file
in the <em>Dropbox</em> folder and select the <em>Open</em> button.</p></div>
<div class="paragraph"><p>Several paid services exist on the Internet (e.g. Google, Amazon) where the
-same process could be used for the Cloud-based storage of dive logs.</p></div>
-</div>
-</div>
+same process could be used for the Cloud-based storage of dive logs.</p></div> +</div> +</div> <div class="sect1"> <h2 id="S_PrintDivelog">10. Printing a dive log</h2> <div class="sectionbody"> -<div class="paragraph"><p><em>Subsurface</em> provides a simple interface to print a whole dive log or only a few selected dives. - Pre-installed templates or a custom written template can be used to choose where the data will - be fitted into the page.</p></div> +<div class="paragraph"><p><em>Subsurface</em> provides a simple and flexible interface to print a whole dive log or only a few selected dives. + Pre-installed templates or a custom written template can be used to choose where the data are fitted into the page.</p></div> <div class="paragraph"><p>Before printing, two decisions are required:</p></div> <div class="ulist"><ul> <li> -<p>
-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
- <strong>Dive List</strong> panel.
-</p>
-</li>
-<li>
-<p>
-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
- of the Dive Profile panel.
-</p>
-</li>
-</ul></div>
-<div class="paragraph"><p>Now the print options should be selected to match the user’s needs. To do
-this, user should select <em>File → Print</em> from the Main menu. The following
-dialogue appears (see the image on the left [A], below).</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/PrintDiveLog.jpg" alt="FIGURE: Print dialogue" /> -</div> -</div> -<div class="paragraph"><p>Under <em>Print type</em> users need to select one of two options:</p></div> -<div class="ulist"><ul> -<li> <p> -<em>Dive list</em> print: print dives from the list with profiles and other - information. +Should the whole dive log be printed or only part of it? If only part of the + dive log is required, then select the required dives from the <strong>Dive List</strong> + panel. </p> </li> <li> <p> -<em>Statistics</em> print: print yearly statistics of the dives. +If the dive profiles needs printing, what gas partial pressure information + should be shown? Select the appropriate toggle-buttons on the button bar to + the left of the <strong>Dive Profile</strong> panel. </p> </li> </ul></div> -<div class="paragraph"><p>Under <em>Print options</em> users need to select:</p></div> +<div class="paragraph"><p>If <em>File → Print</em> is selected from the Main menu, the the dialogue below +(image <strong>A</strong>) appears. Three specifications are needed to achieve the desired +information and page layout:</p></div> +<div class="imageblock" style="text-align:center;"> +<div class="content"> +<img src="images/Print1_f22.jpg" alt="FIGURE: Print dialogue" /> +</div> +</div> +<div class="olist arabic"><ol class="arabic"> +<li> +<p> +Under <em>Print type</em> select one of two options: +</p> <div class="ulist"><ul> <li> <p> -Printing only the dives that have been selected from the dive list prior to - activating the print dialogue, achieved by checking the box <em>Print only - selected dives</em>. +<em>Dive list print</em>: Print dives from the <strong>Dive List</strong> panel with profiles and + other information. </p> </li> <li> <p> -Printing in colour, achieved by checking the box with <em>Print in colour</em>. +<em>Statistics print</em>: Print yearly statistics of the dives. </p> </li> </ul></div> -<div class="paragraph"><p>Under <em>Template</em> users can select:</p></div> +</li> +<li> +<p> +Under <em>Print options</em> select: +</p> <div class="ulist"><ul> <li> <p> -A template to be used as the page layout. +Printing only the dives selected from the dive list prior to activating the + print dialogue by checking the box <em>Print only selected dives</em>. If this + check box is <strong>not</strong> checked all dives in the <strong>Dive List</strong> panel are printed. </p> </li> <li> <p> -<em>Delete</em> a template from the template list +Printing in colour, achieved by checking the box with <em>Print in colour</em>. If + this check box is not checked, printing is in monochrome (grey scale). </p> </li> +</ul></div> +</li> +</ol></div> +<div class="paragraph"><p>Under <em>Template</em> select a template to be used as the page layout. There are +several templates (see image <strong>B</strong>, above).</p></div> +<div class="ulist"><ul> <li> <p> -<em>Import</em> a new template to the template list +<em>Table</em>: This prints a summary table of all dives selected (see below). </p> </li> +</ul></div> +<div class="imageblock" style="text-align:center;"> +<div class="content"> +<img src="images/Print_summarylist_f22.jpg" alt="FIGURE: Print summary table" /> +</div> +</div> +<div class="ulist"><ul> <li> <p> -<em>Export</em> a template from the template list +<em>Flow layout</em>: Print the text associated with each diev without printing the + dive profiles + of each dive (see below): </p> </li> +</ul></div> +<div class="imageblock" style="text-align:center;"> +<div class="content"> +<img src="images/Print_flow_layout_f22.jpg" alt="FIGURE: Print flow layout" /> +</div> +</div> +<div class="ulist"><ul> <li> <p> -<em>Edit</em> a template (choose colors, fonts, font-type) +<em>One Dive</em>: Print one dive per page, also showing the dive profile (see + below) </p> </li> </ul></div> -<div class="paragraph"><p>When editing a template the following options are available:</p></div> +<div class="imageblock" style="text-align:center;"> +<div class="content"> +<img src="images/print2_f22.jpg" alt="FIGURE: Print one dive / page" /> +</div> +</div> <div class="ulist"><ul> <li> <p> -<em>Style</em>: edit font type, size, choose color palette; this will not affect - the template HTML code +<em>Two Dives</em>: Print two dives per page, also showing the dive profiles. </p> </li> <li> <p> -<em>Template</em>: edit the template HTML code; by saving, the "Custom" template in - the template list will be replaced +<em>Six Dives</em>: Print six dives per page, also showing the dive profiles. </p> </li> <li> <p> -<em>Colors</em>: edit the current color palette; the new color palette will - overwrite the "Custom" color palette +<em>Custom</em>: This option allows customisation of the print contents and + layout. This is + discussed at the end of this section. </p> </li> </ul></div> <div class="paragraph"><p>Users can <em>Preview</em> the printed page by selecting the <em>Preview</em> button on -the dialogue. After preview, changes to the options in the print dialogue -can be made, resulting in a layout that fits personal taste.</p></div> -<div class="paragraph"><p>Next, select the <em>Print</em> button in the dialogue. This activates the regular -print dialogue used by the user operating system (image [<strong>B</strong>] in the middle, -above), allowing them to choose a printer and to set its properties (image -[<strong>C</strong>] on the right, above). It is important to set the print resolution of -the printer to an appropriate value by changing the printer -properties. Finally, one can print the dives. Below is a (rather small)
-example of the output for one particular page.</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
+the dialogue (see image <strong>A</strong> at the start of this section). After preview, +changes to the options in the print dialogue can be made, resulting in a +layout that fits personal taste.</p></div> +<div class="paragraph"><p>Next, select the <em>Print</em> button (see image <strong>A</strong> at the start of this +section). This activates the regular print dialogue used by the user +operating system, allowing one to choose a printer and to set its properties +(see image below):</p></div> +<div class="imageblock" style="text-align:center;"> +<div class="content"> +<img src="images/Print_print_f22.jpg" alt="FIGURE: Print one dive / page" /> +</div> +</div> +<div class="paragraph"><p>Set the print resolution of the printer to an appropriate value by changing +the printer <em>Properties</em>. Finally, select the <em>Print</em> button to print the +dives. Below is a (rather small) example of the output for one particular +page.</p></div> +<div class="imageblock" style="text-align:center;"> +<div class="content"> <img src="images/Printpreview.jpg" alt="FIGURE: Print preview page" /> </div> </div> <div class="sect2"> <h3 id="_write_a_custom_printing_template_advanced">10.1. Write a custom printing template (advanced)</h3> <div class="paragraph"><p>Writing a custom template is an effective way to produce highly customized -printouts. Subsurface uses HTML templates with Grantlee as the printing -backend.</p></div> -<div class="paragraph"><p>See <a href="#_appendix_f_write_a_custom_printing_template">APPENDIX F</a> for -information on how to write your own template.</p></div> +printouts. Subsurface uses HTML templates to render printing. One can create +a template, export a new template, import an existing template and delete an +existing template by using the appropriate buttons under the <em>Template</em> +dropdown list in the print dialogue. See <a href="#S_APPENDIX_E">APPENDIX E</a> for +information on how to write or modify a template.</p></div> </div> </div> </div> <div class="sect1"> -<h2 id="S_Configure">11. Configurer un ordinateur de plongée</h2>
-<div class="sectionbody">
-<div class="paragraph"><p><em>Subsurface</em> permet de configurer son ordinateur de plongée. Actuellement,
+<h2 id="S_Configure">11. Configurer un ordinateur de plongée</h2> +<div class="sectionbody"> +<div class="paragraph"><p><em>Subsurface</em> permet de configurer son ordinateur de plongée. Actuellement, les familles d’ordinateurs supportés sont Heinrichs-Weikamp (OSTC 2, OSTC 3)
et Suunto Vyper (Stinger, Mosquito, D3, Vyper, Vytec, Cobra, Gekko et
Zoop). De nombreux paramètres de ces ordinateurs de plongée peuvent être
@@ -4179,9 +4225,9 @@ the dive profile: <em>Draw dive computer reported ceiling red</em>: This checkbox allows exactly what it says.
Not all dive computers report ceiling values. If the dive computer does report it, it may differ
from the ceilings calculated by <em>Subsurface</em>. This is because of the different algorithms and gradient factors available for calculating ceilings, as well as the dynamic way that a
- dive computer can calculate ceilings during a dive.
-</p>
-</li>
+ dive computer can calculate ceilings during a dive. +</p> +</li> <li> <p> <em>Show unused cylinders in Equipment Tab</em>: This checkbox allows display of information about unused cylinders when viewing the <strong>Equipment Tab</strong>. Conversely, if this box is not checked, and any cylinders entered using the <strong>Equipment Tab</strong> are not used (e.g. there was no gas switch to such a cylinder), then these cylinders are omitted from that list. @@ -4207,9 +4253,9 @@ the dive profile: Gradient Factors:* Here users can set the <em>gradient factors</em> used while diving. GF_Low is the gradient factor at depth and GF_High is used just below the surface. At intermediate depths gradient factors between GF_Low and GF_High are used. - Gradient factors add conservatism to the nitrogen exposure during a dive, in a
- similar way that many dive computers have a conservatism setting. The lower
- the value of a gradient factor, the more conservative the calculations are with
+ Gradient factors add conservatism to the nitrogen exposure during a dive, in a + similar way that many dive computers have a conservatism setting. The lower + the value of a gradient factor, the more conservative the calculations are with respect to nitrogen loading and the deeper the ascent ceilings are. Gradient
factors of 20/60 are considered conservative and values of 60/90 are considered
harsh. Checking <strong>GFLow at max depth</strong> box causes GF_Low to be used at the
@@ -4306,9 +4352,9 @@ Internet services such as the <a href="#S_Companion"><em>Subsurface Companion ap data export/import from <em>Divelogs.de</em>. These Internet requirements are
determined by one’s type of connection to the Internet and by the Internet
Service Provider (ISP) used. One’s ISP should provide the appropriate
-information. If a proxy server is used for Internet access, the appropriate
-information needs to be provided here. The type of proxy needs to be
-selected from the dropdown list. after which the IP address of the host and
+information. If a proxy server is used for Internet access, the appropriate +information needs to be provided here. The type of proxy needs to be +selected from the dropdown list. after which the IP address of the host and the appropriate port number should be provided. If the proxy server uses authentication, the appropriate userID and password also needs to be provided so that <em>Subsurface</em> can automatically pass through the proxy @@ -4335,9 +4381,9 @@ plongée vers Facebook</a> pour plus d’informations.</p></div> <div class="sect1"> <h2 id="S_DivePlanner">13. The <em>Subsurface</em> dive planner</h2> <div class="sectionbody"> -<div class="paragraph"><p>Dive planning is an advanced feature of <em>Subsurface</em>, accessible by
-selecting <em>Log → Plan Dive</em> from the main menu. It allows calculation of
-nitrogen load during a dive by using the Bühlmann ZH-L16 algorithm with the
+<div class="paragraph"><p>Dive planning is an advanced feature of <em>Subsurface</em>, accessible by +selecting <em>Log → Plan Dive</em> from the main menu. It allows calculation of +nitrogen load during a dive by using the Bühlmann ZH-L16 algorithm with the addition of gradient factors as implemented by Erik Baker.</p></div>
<div class="sidebarblock">
<div class="content">
@@ -4396,9 +4442,9 @@ sections (see image below). The <strong>setup</strong> parameters for a dive are into the several sections on the left hand side of the screen. The setup is
divided into several sections: Available Gases, Rates, Planning, Gas Options
and Notes.</p></div>
-<div class="paragraph"><p>At the top right hand is a green <strong>design panel</strong> upon which the profile of
-the dive can be manipulated directly by dragging and clicking as explained
-below. This feature makes the <em>Subsurface</em> dive planner unique in ease of
+<div class="paragraph"><p>At the top right hand is a green <strong>design panel</strong> upon which the profile of +the dive can be manipulated directly by dragging and clicking as explained +below. This feature makes the <em>Subsurface</em> dive planner unique in ease of use.</p></div> <div class="paragraph"><p>At the bottom right is a text panel with a heading of <em>Dive Plan Details</em>. This is where the details of the dive plan are provided in a way @@ -4597,78 +4643,78 @@ For more information external to this manual see:</p></div> <div class="ulist"><ul> <li> <p> -<a href="http://www.tek-dive.com/portal/upload/M-Values.pdf">Understanding
- M-values by Erik Baker, <em>Immersed</em> Vol. 3, No. 3.</a>
-</p>
-</li>
-<li>
-<p>
-<a href="http://www.rebreatherworld.com/general-and-new-to-rebreather-articles/5037-gradient-factors-for-dummies.html">Gradient
- factors for dummies, by Kevin Watts</a>
-<a href="http://www.amazon.com/Deco-Divers-Decompression-Theory-Physiology/dp/1905492073/ref=sr_1_1?s=books&ie=UTF8&qid=1403932320&sr=1-1&keywords=deco+for+divers"><em>Deco
-for Divers</em>, by Mark Powell (2008). Aquapress</a> Southend-on-Sea, UK. ISBN 10:
-1-905492-07-3. An excellent non-technical review.
-</p>
-</li>
-</ul></div>
-<div class="paragraph"><p>The ascent rate is critical for nitrogen off-gassing at the end of the dive
-and is specified for several depth ranges, utilising the average (or mean)
-depth as a yardstick. The mean depth of the dive plan is indicated by a
-light grey line on the dive profile. Ascent rates at deeper levels are often
-in the range of 8-12 m/min, while ascent rates near the surface are often in
-the range of 4-9 m/min. The descent rate is also specified. If the option
-<em>Drop to first depth</em> is activated, then the descent phase of the planned
-dive will be at the maximal descent rate specified in the <em>Rates</em> section of
-the dive setup.</p></div>
-<div class="paragraph"><p><strong>b) Oxygen management</strong>: In the <strong>Gas Options</strong> part of the dive specification, the maximum partial
-pressure for oxygen needs to be specified for the
-bottom part of the dive (<em>bottom po2</em>) as well as for the decompression part of the dive (<em>deco po2</em>).
-The most commonly
-used values are 1.4 bar for the bottom part of the dive and 1.6 bar for any decompression
-stages. Normally, a partial pressure of 1.6 bar is not exceeded. PO2 settings and the depth at which switching to a gas takes place can also be edited in the
-<em>Available Gases</em> dialog. Normally the planner decides on switching to a new gas when, during
-ascent, the partial pressure of the new gas has increased to 1.6 bar.</p></div>
-<div class="paragraph"><p><strong>c) Gas management</strong>: With open-circuit dives this is a primary consideration. One needs to keep within the limits of the amount of gas within the dive
-cylinder(s), allowing for an appropriate margin for a safe return to the surface, possibly
-sharing with a buddy. Under the <em>Gas Options</em> heading, specify the best (but conservative) estimate
-of your surface-equivalent air consumption (SAC, also termed RMV) in
-litres/min (for the time being, only SI units are supported). Specify the SAC during the
-bottom part of the dive (<em>bottom SAC</em>) as well as during the decompression or safety stops of the
-dive (<em>deco SAC</em>). Values of 15-30 l/min are common. For good gas management, a thumbsuck guess
-is not sufficient and one needs to
-monitor one’s gas consumption on a regular basis, dependent on different dive conditions and/or equipment.
-The planner calculates the total volume of gas used during the dive and issues a warning
-if one exceeds the total amount of gas available. Good practice demands that one does not dive to
-the limit of the gas supply but that an appropriate reserve is kept for unforeseen circumstances.
-For technical diving, this reserve can be up to 66% of the total available gas.</p></div>
-<div class="paragraph"><p>Now (at last) one can start the detailed time-depth planning of the
-dive. <em>Subsurface</em> offers a unique graphical interface for performing this
-part of the planning. The mechanics of doing this is similar to
-hand-entering a dive profile in the dive log part of <em>Subsurface</em>. Upon
-activating the planner, a default dive of depth 15 m for 40 min is offered
-in the bue design surface to the top right hand of the screen. The white
-dots (waypoints) on the profile can be dragged with a mouse. Create more
-waypoints by double-clicking on the profile line and ensuring that the
-profile reflects the intended dive. Drag the waypoints to represent the
-depth and duration of the dive. It is NOt necessary to specify the ascent
-part of the dive since the planner calculates this, based on the settings
-that have been specified. If any of the management limits (for nitrogen,
-oxygen or gas) is exceeded, the surface above the dive profile changes from
-BLUE to RED.</p></div>
-<div class="paragraph"><p>Each waypoint on the dive profile creates a <em>Dive Planner Point</em> in the
-table on the left of the dive planner panel. Ensure that the <em>Used Gas</em>
-value in each row of that table corresponds to one of the gas mixtures
-specified in the <em>Available Gases</em> table. Add new waypoints until the main
-features of the dive have been completed, e.g. the bottom time segment and
-deep stops (if these are implemented). Leave the remaining waypoints on the
-ascent to <em>Subsurface</em>. In most cases <em>Subsurface</em> computes additional way
-points in order to fulfill decompression requirements for that dive. A
-waypoint can be moved by selecting that waypoint and by using the arrow
-keys. The waypoints listed in the <em>Dive Planner Points</em> dialogue can be
-edited by hand in order to obtain a precise presentation of the dive
-plan. In fact, one can create the whole dive profile by editing the <em>Dive
-Planner Points</em> dialog.</p></div>
-<div class="paragraph"><p>Indicate any changes in gas cylinder used by indicating gas changes as
+<a href="http://www.tek-dive.com/portal/upload/M-Values.pdf">Understanding + M-values by Erik Baker, <em>Immersed</em> Vol. 3, No. 3.</a> +</p> +</li> +<li> +<p> +<a href="http://www.rebreatherworld.com/general-and-new-to-rebreather-articles/5037-gradient-factors-for-dummies.html">Gradient + factors for dummies, by Kevin Watts</a> +<a href="http://www.amazon.com/Deco-Divers-Decompression-Theory-Physiology/dp/1905492073/ref=sr_1_1?s=books&ie=UTF8&qid=1403932320&sr=1-1&keywords=deco+for+divers"><em>Deco +for Divers</em>, by Mark Powell (2008). Aquapress</a> Southend-on-Sea, UK. ISBN 10: +1-905492-07-3. An excellent non-technical review. +</p> +</li> +</ul></div> +<div class="paragraph"><p>The ascent rate is critical for nitrogen off-gassing at the end of the dive +and is specified for several depth ranges, utilising the average (or mean) +depth as a yardstick. The mean depth of the dive plan is indicated by a +light grey line on the dive profile. Ascent rates at deeper levels are often +in the range of 8-12 m/min, while ascent rates near the surface are often in +the range of 4-9 m/min. The descent rate is also specified. If the option +<em>Drop to first depth</em> is activated, then the descent phase of the planned +dive will be at the maximal descent rate specified in the <em>Rates</em> section of +the dive setup.</p></div> +<div class="paragraph"><p><strong>b) Oxygen management</strong>: In the <strong>Gas Options</strong> part of the dive specification, the maximum partial +pressure for oxygen needs to be specified for the +bottom part of the dive (<em>bottom po2</em>) as well as for the decompression part of the dive (<em>deco po2</em>). +The most commonly +used values are 1.4 bar for the bottom part of the dive and 1.6 bar for any decompression +stages. Normally, a partial pressure of 1.6 bar is not exceeded. PO2 settings and the depth at which switching to a gas takes place can also be edited in the +<em>Available Gases</em> dialog. Normally the planner decides on switching to a new gas when, during +ascent, the partial pressure of the new gas has increased to 1.6 bar.</p></div> +<div class="paragraph"><p><strong>c) Gas management</strong>: With open-circuit dives this is a primary consideration. One needs to keep within the limits of the amount of gas within the dive +cylinder(s), allowing for an appropriate margin for a safe return to the surface, possibly +sharing with a buddy. Under the <em>Gas Options</em> heading, specify the best (but conservative) estimate +of your surface-equivalent air consumption (SAC, also termed RMV) in +litres/min (for the time being, only SI units are supported). Specify the SAC during the +bottom part of the dive (<em>bottom SAC</em>) as well as during the decompression or safety stops of the +dive (<em>deco SAC</em>). Values of 15-30 l/min are common. For good gas management, a thumbsuck guess +is not sufficient and one needs to +monitor one’s gas consumption on a regular basis, dependent on different dive conditions and/or equipment. +The planner calculates the total volume of gas used during the dive and issues a warning +if one exceeds the total amount of gas available. Good practice demands that one does not dive to +the limit of the gas supply but that an appropriate reserve is kept for unforeseen circumstances. +For technical diving, this reserve can be up to 66% of the total available gas.</p></div> +<div class="paragraph"><p>Now (at last) one can start the detailed time-depth planning of the +dive. <em>Subsurface</em> offers a unique graphical interface for performing this +part of the planning. The mechanics of doing this is similar to +hand-entering a dive profile in the dive log part of <em>Subsurface</em>. Upon +activating the planner, a default dive of depth 15 m for 40 min is offered +in the bue design surface to the top right hand of the screen. The white +dots (waypoints) on the profile can be dragged with a mouse. Create more +waypoints by double-clicking on the profile line and ensuring that the +profile reflects the intended dive. Drag the waypoints to represent the +depth and duration of the dive. It is NOt necessary to specify the ascent +part of the dive since the planner calculates this, based on the settings +that have been specified. If any of the management limits (for nitrogen, +oxygen or gas) is exceeded, the surface above the dive profile changes from +BLUE to RED.</p></div> +<div class="paragraph"><p>Each waypoint on the dive profile creates a <em>Dive Planner Point</em> in the +table on the left of the dive planner panel. Ensure that the <em>Used Gas</em> +value in each row of that table corresponds to one of the gas mixtures +specified in the <em>Available Gases</em> table. Add new waypoints until the main +features of the dive have been completed, e.g. the bottom time segment and +deep stops (if these are implemented). Leave the remaining waypoints on the +ascent to <em>Subsurface</em>. In most cases <em>Subsurface</em> computes additional way +points in order to fulfill decompression requirements for that dive. A +waypoint can be moved by selecting that waypoint and by using the arrow +keys. The waypoints listed in the <em>Dive Planner Points</em> dialogue can be +edited by hand in order to obtain a precise presentation of the dive +plan. In fact, one can create the whole dive profile by editing the <em>Dive +Planner Points</em> dialog.</p></div> +<div class="paragraph"><p>Indicate any changes in gas cylinder used by indicating gas changes as explained in the section <a href="#S_CreateProfile">hand-creating a dive profile</a>. These changes should reflect the cylinders and gas compositions
defined in the table with <em>Available Gases</em>. If two or more gases are used,
automatic gas switches will be suggested during the ascent to the
@@ -4693,9 +4739,9 @@ using EAN50 and using the settings as described above.</p></div> <div class="paragraph"><p>Once the above has been completed, one can save it by clicking the <em>Save</em>
button towards the top middle of the planner. The saved dive plan will
appear in the <strong>Dive List</strong> panel of <em>Subsurface</em>.</p></div>
-<div class="paragraph"><p><strong>The dive plan details</strong></p></div>
-<div class="paragraph"><p>On the bottom right of the dive planner, under <em>Dive Plan Details</em>, the
-exact details of the dive plan are provided. These details may be modified
+<div class="paragraph"><p><strong>The dive plan details</strong></p></div> +<div class="paragraph"><p>On the bottom right of the dive planner, under <em>Dive Plan Details</em>, the +exact details of the dive plan are provided. These details may be modified by checking any of the options under the <em>Notes</em> section of the dive planner, immediately to the left of the <em>Dive Plan Details</em>. If a <em>Verbatim diveplan</em> is requested, a detailed sentence-level explanation of the dive @@ -4766,9 +4812,9 @@ dive and adds a (possibly modified) copy to the dive list. If that copy is saved with the same start time as the original, the two dives are considered two versions of the same dive and do not influence other each during decompression calculation (see next section).</p></div> -</div>
-<div class="sect2">
-<h3 id="_planning_for_repetitive_dives">13.6. Planning for repetitive dives</h3>
+</div> +<div class="sect2"> +<h3 id="_planning_for_repetitive_dives">13.6. Planning for repetitive dives</h3> <div class="paragraph"><p>Repetitive dives can easily be planned if the dates and start times of the
repetitive dive set is specified appropriately in the top left-hand <em>Start
Time</em> field. <em>Subsurface</em> calculates the gas loading figures correctly and
@@ -4843,9 +4889,9 @@ des sections de ce manuel traitant des opérations relatives.</p></div> <li>
<p>
<a href="#S_ExportLog"><em>Exporter</em></a> - Exporter le carnet de plongée actuellement
- ouvert (ou les plongées sélectionnées dans le carnet) vers un des nombreux
- formats.
-</p>
+ ouvert (ou les plongées sélectionnées dans le carnet) vers un des nombreux + formats. +</p> </li> <li> <p> @@ -4872,9 +4918,9 @@ des sections de ce manuel traitant des opérations relatives.</p></div> configuration d’un ordinateur de plongée. </p> </li> -<li>
-<p>
-<em>Quitter</em> - Quitter <em>Subsurface</em>.
+<li> +<p> +<em>Quitter</em> - Quitter <em>Subsurface</em>. </p>
</li>
</ul></div>
@@ -4909,9 +4955,9 @@ des sections de ce manuel traitant des opérations relatives.</p></div> </p>
</li>
</ul></div>
-</div>
-<div class="sect2">
-<h3 id="_journal_log">14.3. Journal (log)</h3>
+</div> +<div class="sect2"> +<h3 id="_journal_log">14.3. Journal (log)</h3> <div class="ulist"><ul> <li> <p> @@ -4944,9 +4990,9 @@ des sections de ce manuel traitant des opérations relatives.</p></div> champs d’un journal de plongée vers le presse-papier. </p> </li> -<li>
-<p>
-<em>Coller les composants de la plongée</em> - Colle, dans les plongées
+<li> +<p> +<em>Coller les composants de la plongée</em> - Colle, dans les plongées sélectionnées dans la <strong>liste des plongées</strong>, les informations copiées au
préalable avec l’option <em>Copier les composants de la plongée</em>.
</p>
@@ -5058,9 +5104,9 @@ des sections de ce manuel traitant des opérations relatives.</p></div> <p>
<em>Manuel utilisateur</em> - Ouvre une fenêtre affichant ce manuel utilisateur.
</p>
-</li>
-</ul></div>
-</div>
+</li> +</ul></div> +</div> </div> </div> <div class="sect1"> @@ -5094,9 +5140,9 @@ storage.</p></div> <div class="admonitionblock"> <table><tr> <td class="icon"> -<img src="images/icons/drivers.jpg" alt="Note" />
-</td>
-<td class="content">Le système d’exploitation de l’ordinateur nécessite les bons pilotes pour
+<img src="images/icons/drivers.jpg" alt="Note" /> +</td> +<td class="content">Le système d’exploitation de l’ordinateur nécessite les bons pilotes pour communiquer avec l’ordinateur de plongée de la façon utilisée par
l’ordinateur de plongée (Bluetooth, USB, infra-rouge).</td>
</tr></table>
@@ -5122,9 +5168,9 @@ Sous Windows, le bon pilote devrait être téléchargé automatiquement la <div class="paragraph"><p>Sous Mac, les utilisateurs peuvent parfois avoir besoin d’installer
manuellement le bon pilote. Par exemple, pour le Mares Puck ou n’importe
quel autre ordinateur de plongée utilisant une interface USB-série basé sur
-le composant Silicon Labs CP2101 ou similaire, le bon pilote est disponible
-sous <em>Mac_OSX_VCP_Driver.zip</em> sur le
-<a href="http://www.silabs.com/support/pages/document-library.aspx?p=Interface&f=USB%20Bridges&pn=CP2101">dépôt
+le composant Silicon Labs CP2101 ou similaire, le bon pilote est disponible +sous <em>Mac_OSX_VCP_Driver.zip</em> sur le +<a href="http://www.silabs.com/support/pages/document-library.aspx?p=Interface&f=USB%20Bridges&pn=CP2101">dépôt de documents et logiciels Silicon Labs</a>.</p></div> </div> <div class="sect2"> @@ -5132,9 +5178,9 @@ de documents et logiciels Silicon Labs</a>.</p></div> <div class="admonitionblock"> <table><tr> <td class="icon"> -<img src="images/icons/usb.jpg" alt="Note" />
-</td>
-<td class="content">Lorsqu’un utilisateur connecte un ordinateur de plongée en utilisant l’USB,
+<img src="images/icons/usb.jpg" alt="Note" /> +</td> +<td class="content">Lorsqu’un utilisateur connecte un ordinateur de plongée en utilisant l’USB, généralement <em>Subsurface</em> proposera soit une liste déroulante contenant le
bon nom (ou le point de montage pour un Uemis Zurich) ou la liste sera
désactivée si aucun nom de périphérique n’est nécessaire. Dans les rares cas
@@ -5211,9 +5257,9 @@ vérifiez que l’appartenance au groupe est bien effectif. Le groupe <code>dialout</code> devrait
être listé
parmi les différents IDs.
-Sous certaines circonstances, les modifications ne prennent effet qu’après une déconnexionpuis reconnexion sur l’ordinateur (sous Ubuntu, par exemple).
-Avec le bon nom de périphérique (par exemple <code>dev/ttyUSB3</code>) et avec un accès
-en écriture au port USB, l’ordinateur de plongée devrait se connecter et
+Sous certaines circonstances, les modifications ne prennent effet qu’après une déconnexionpuis reconnexion sur l’ordinateur (sous Ubuntu, par exemple). +Avec le bon nom de périphérique (par exemple <code>dev/ttyUSB3</code>) et avec un accès +en écriture au port USB, l’ordinateur de plongée devrait se connecter et vous devriez pouvoir importer vos plongées.</p></div> </div> <div class="sect2"> @@ -5221,9 +5267,9 @@ vous devriez pouvoir importer vos plongées.</p></div> <div class="admonitionblock"> <table><tr> <td class="icon"> -<img src="images/icons/bluetooth.jpg" alt="Note" />
-</td>
-<td class="content">For dive computers communicating through bluetooth like the Heinrichs
+<img src="images/icons/bluetooth.jpg" alt="Note" /> +</td> +<td class="content">For dive computers communicating through bluetooth like the Heinrichs Weikamp Frog or the Shearwater Predator and Petrel there is a different
procedure to get the devices name to communicate with <em>Subsurface</em>. Follow
these steps:</td>
@@ -5234,9 +5280,9 @@ these steps:</td> <p>
<strong>For the dive computer, after enabling Bluetooth, ensure it is in Upload mode.</strong>
</p>
-</li>
-</ul></div>
-<div class="paragraph"><p>For Bluetooth pairing of the dive computer, refer to the manufacturer’s user
+</li> +</ul></div> +<div class="paragraph"><p>For Bluetooth pairing of the dive computer, refer to the manufacturer’s user guide. When using a Shearwater Predator/Petrel, select <em>Dive Log → Upload Log</em> and wait for the <em>Wait PC</em> message.</p></div> <div class="ulist"><ul> @@ -5500,33 +5546,33 @@ upload mode countdown is still running, go to_Subsurface_, select <div class="admonitionblock"> <table><tr> <td class="icon"> -<img src="images/icons/iumis.jpg" alt="Note" />
-</td>
-<td class="content"><em>Subsurface</em> downloads the information stored on the SDA (the built-in file
-system of the Uemis) including information about dive spots and
-equipment. Buddy information is not yet downloadable. Things are very
-similar to a normal USB-connected dive computer (the Uemis is one of those
-that recharge when connected to the USB port). The main difference is that
-one does not enter a device name, but instead the location where the
-UEMISSDA file system is mounted once connected to the dive computer. On
-Windows this is a drive letter ( often <em>E:</em> or <em>F:</em>), on a Mac this is
-<em>/Volumes/UEMISSDA</em> and on Linux systems this differs depending on the
-distribution. On Fedora it usually is
-<em>/var/run/media/<your_username>/UEMISSDA</em>. In all cases <em>Subsurface</em> should
-suggest the correct location in the drop down list.</td>
-</tr></table>
-</div>
-<div class="paragraph"><p>After selecting the above device name, download the dives from the Uemis
-Zurich. One technical issue with the Uemis Zurich download implementation
-(this is a Uemis firmware limitation, not a <em>Subsurface</em> issue) is that one
-cannot download more than about 40-50 dives without running out of memory on
-the SDA. This will usually only happen the very first time one downloads
-dives from the Uemis Zurich. Normally when downloading at the end of a day
-or even after a dive trip, the capacity is sufficient. If <em>Subsurface</em>
-displays an error that the dive computer ran out of space the solution is
-straight forward. Disconnect the SDA, turn it off and on again, and
-reconnect it. You can now retry (or start a new download session) and the
-download will continue where it stopped previously. One may have to do this
+<img src="images/icons/iumis.jpg" alt="Note" /> +</td> +<td class="content"><em>Subsurface</em> downloads the information stored on the SDA (the built-in file +system of the Uemis) including information about dive spots and +equipment. Buddy information is not yet downloadable. Things are very +similar to a normal USB-connected dive computer (the Uemis is one of those +that recharge when connected to the USB port). The main difference is that +one does not enter a device name, but instead the location where the +UEMISSDA file system is mounted once connected to the dive computer. On +Windows this is a drive letter ( often <em>E:</em> or <em>F:</em>), on a Mac this is +<em>/Volumes/UEMISSDA</em> and on Linux systems this differs depending on the +distribution. On Fedora it usually is +<em>/var/run/media/<your_username>/UEMISSDA</em>. In all cases <em>Subsurface</em> should +suggest the correct location in the drop down list.</td> +</tr></table> +</div> +<div class="paragraph"><p>After selecting the above device name, download the dives from the Uemis +Zurich. One technical issue with the Uemis Zurich download implementation +(this is a Uemis firmware limitation, not a <em>Subsurface</em> issue) is that one +cannot download more than about 40-50 dives without running out of memory on +the SDA. This will usually only happen the very first time one downloads +dives from the Uemis Zurich. Normally when downloading at the end of a day +or even after a dive trip, the capacity is sufficient. If <em>Subsurface</em> +displays an error that the dive computer ran out of space the solution is +straight forward. Disconnect the SDA, turn it off and on again, and +reconnect it. You can now retry (or start a new download session) and the +download will continue where it stopped previously. One may have to do this more than once, depending on how many dives are stored on the dive computer.</p></div> </div> <div class="sect2"> @@ -5534,16 +5580,16 @@ more than once, depending on how many dives are stored on the dive computer.</p> <div class="admonitionblock"> <table><tr> <td class="icon"> -<img src="images/icons/Galileo.jpg" alt="Note" />
-</td>
-<td class="content">The Uwatec Galileo dive computers use infra red (IrDA) communication between
-the dive computer and Subsurface. The Uwatec hardware uses a USB dongle
-based on the serial infra-red (SIR) protocol and the MSC7780 IrDA controller
-manufactured by MosChip and marketed by Scubapro and some electronics
-companies. Under Linux, the kernel already provides for communication using
-the IrDA protocol. However, the user additionally needs to load a driver for
-the IrDA interface with the dive computer. The easiest way is to load the
-<strong>irda-tools</strong> package from the
+<img src="images/icons/Galileo.jpg" alt="Note" /> +</td> +<td class="content">The Uwatec Galileo dive computers use infra red (IrDA) communication between +the dive computer and Subsurface. The Uwatec hardware uses a USB dongle +based on the serial infra-red (SIR) protocol and the MSC7780 IrDA controller +manufactured by MosChip and marketed by Scubapro and some electronics +companies. Under Linux, the kernel already provides for communication using +the IrDA protocol. However, the user additionally needs to load a driver for +the IrDA interface with the dive computer. The easiest way is to load the +<strong>irda-tools</strong> package from the <a href="http://irda.sourceforge.net/docs/startirda.html">Linux IrDA Project</a>. After the installation of the irda-tools, the <strong>root user</strong> can specify a device name from the console as follows: <code>irattach irda0</code></td> @@ -5566,16 +5612,16 @@ for OSX 10.6 or higher.</p></div> <table><tr> <td class="icon"> <img src="images/icons/HW_DR5.jpg" alt="Note" /> -</td>
-<td class="content">When mounted as a USB drive the Heinrichs Weikamp DR5 saves a single UDDF
-file for every dive. Mark all the dives you’d like to import or open.
-Note: The DR5 does not seem to store gradient factors nor deco information,
+</td> +<td class="content">When mounted as a USB drive the Heinrichs Weikamp DR5 saves a single UDDF +file for every dive. Mark all the dives you’d like to import or open. +Note: The DR5 does not seem to store gradient factors nor deco information, so for <em>Subsurface</em> it is not possible to display them. Adjust the gradient
factors in the <em>Graph Settings</em> in <em>Subsurface</em> to generate a deco overlay
in the <em>Subsurface</em> <strong>Dive Profile</strong> panel but please note that the deco
-calculated by <em>Subsurface</em> will most likely differ from the one displayed on
-the DR5.</td>
-</tr></table>
+calculated by <em>Subsurface</em> will most likely differ from the one displayed on +the DR5.</td> +</tr></table> </div> </div> <div class="sect2"> @@ -5583,18 +5629,18 @@ the DR5.</td> <div class="admonitionblock"> <table><tr> <td class="icon"> -<img src="images/icons/HW_xdeepblack.jpg" alt="Note" />
-</td>
-<td class="content">Each dive has to be individually saved as UDDF file using "Export UDDF"
+<img src="images/icons/HW_xdeepblack.jpg" alt="Note" /> +</td> +<td class="content">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
<em>Subsurface</em> it is not possible to display them. Adjust the gradient factors
in the <em>Graph Settings</em> in <em>Subsurface</em> to generate a deco overlay in the
<em>Subsurface</em> <strong>Dive Profile</strong> panel but please note that the deco calculated
-by <em>Subsurface</em> will most likely differ from the one displayed on the xDEEP
-BLACK.</td>
-</tr></table>
+by <em>Subsurface</em> will most likely differ from the one displayed on the xDEEP +BLACK.</td> +</tr></table> </div> </div> <div class="sect2"> @@ -5602,9 +5648,9 @@ BLACK.</td> <div class="admonitionblock"> <table><tr> <td class="icon"> -<img src="images/icons/predator.jpg" alt="Note" />
-</td>
-<td class="content">Using a Shearwater Predator one may be able to pair Bluetooth but then
+<img src="images/icons/predator.jpg" alt="Note" /> +</td> +<td class="content">Using a Shearwater Predator one may be able to pair Bluetooth but then encounter issues when downloading, showing errors like <em>Slip RX: unexp. SLIP
END</em> on the Predator. This might also arise when using other dive log
software and operating systems other than Linux. We have no detailed idea
@@ -5626,9 +5672,9 @@ switch to different Bluetooth drivers for the same hardware </li>
<li>
<p>
-switch off WiFi while using Bluetooth
-</p>
-</li>
+switch off WiFi while using Bluetooth +</p> +</li> </ul></div> </div> <div class="sect2"> @@ -5636,9 +5682,9 @@ switch off WiFi while using Bluetooth <div class="admonitionblock"> <table><tr> <td class="icon"> -<img src="images/MkVI.jpeg" alt="Note" />
-</td>
-<td class="content">Download of dive logs from the MkVI is performed using a custom
+<img src="images/MkVI.jpeg" alt="Note" /> +</td> +<td class="content">Download of dive logs from the MkVI is performed using a custom communications adapter and the <em>Poseidon PC Configuration Software</em>,
obtained when purchasing the MKVI equipment. The latter is a Windows
application allowing configuration of equipment and storage of dive
@@ -5664,19 +5710,19 @@ Dive log details (file with a .csv extension) Redbook format dive log (file with .cvsr extension). This is a compressed
version of the dive log using a proprietary format.
</p>
-</li>
-</ul></div>
-<div class="paragraph"><p><em>Subsurface</em> accesses the .txt and the .csv files to obtain dive log
+</li> +</ul></div> +<div class="paragraph"><p><em>Subsurface</em> accesses the .txt and the .csv files to obtain dive log information.</p></div> </div> <div class="sect2"> -<h3 id="_importing_from_apd_inspiration_ccr">17.7. Importing from APD Inspiration CCR</h3> +<h3 id="_importing_from_apd_inspiration_evolution_ccr">17.7. Importing from APD Inspiration/Evolution CCR</h3> <div class="admonitionblock"> <table><tr> <td class="icon"> -<img src="images/APDComputer.jpg" alt="Note" />
-</td>
-<td class="content">The dive logs of an APD Inspiration or similar CCR dive computer are
+<img src="images/APDComputer.jpg" alt="Note" /> +</td> +<td class="content">The dive logs of an APD Inspiration or similar CCR dive computer are downloaded using a communications adapter and <em>AP Communicator</em>, obtained
when purchasing the equipment. The dive logs can be viewed using the <em>AP Log
Viewer</em>, within Windows or Mac/OS. However, APD logs can be viewed and
@@ -5685,66 +5731,89 @@ of dive computer). The APD inspiration dive logs are imported into <em>Subsurface</em> as follows:</td>
</tr></table>
</div>
-<div class="ulist"><ul>
-<li>
-<p>
-Open a dive within the <em>AP Log Viewer</em>.
-</p>
-</li>
+<div class="ulist"><ul> +<li> +<p> +Download the dive using <em>AP Communicator</em>. +</p> +</li> +<li> +<p> +Open a dive within the <em>AP Log Viewer</em>. +</p> +</li> <li>
<p>
Select the tab at the top of the screen, entitled "<em>Data</em>".
</p>
-</li>
-<li>
-<p>
-If the raw dive log data show on the screen, click on "<em>Copy to Clipboard</em>".
-</p>
-</li>
-<li>
-<p>
-Open a text editor, e.g. Notepad (Windows), TextWrangler (Mac).
-</p>
-</li>
-<li>
-<p>
-Copy the contents of the clipboard into the text editor and save the text
- file with a filename extension of .CSV
-</p>
-</li>
-<li>
+</li> +<li> +<p> +With the raw dive log data show on the screen, click on "<em>Copy to + Clipboard</em>". +</p> +</li> +<li> +<p> +Open a text editor, e.g. Notepad (Windows) or TextWrangler (Mac). +</p> +</li> +<li> +<p> +Copy the contents of the clipboard into the text editor and save the text + file with a filename extension of <em>.apd</em> +</p> +</li> +<li> <p>
Within <em>Subsurface</em>, select <em>Import → Import log files</em> to open the
<a href="#Unified_import">universal import dialogue</a>.
</p>
-</li>
-<li>
-<p>
-In the dropdown list towards the bottom right of the dialogue, select "<em>CSV
- files</em>".
-</p>
-</li>
-<li>
-<p>
-On the list of file names select the .CSV file that has been created
- above. An import dialogue opens.
-</p>
-</li>
-<li>
-<p>
-In the dropdown list on the top left labeled '<em>Pre-configured imports</em>",
- select <em>APD Log Viewer</em>.
-</p>
-</li>
-<li>
-<p>
-Ensure the other settings for the ADP dive log are appropriate, then select
- <em>OK</em>.
-</p>
-</li>
-</ul></div>
-<div class="paragraph"><p>The APD dive log will appear within <em>Subsurface</em>.</p></div>
-</div>
+</li> +<li> +<p> +In the dropdown list towards the bottom right of the dialogue (labled + <em>Filter:</em>), select "APD log viewer". +</p> +</li> +<li> +<p> +On the list of file names select the <em>.apd</em> file that has been created + above. An import dialogue opens indicating the default settings for the data + in the <em>.apd</em> file. If any changes are required, do this as for + <a href="#S_ImportingCSVDives">CSV imports</a>. +</p> +</li> +</ul></div> +<div class="imageblock" style="text-align:center;"> +<div class="content"> +<img src="images/APD_CSVimportF22.jpg" alt="Figure: APD log viewer import" /> +</div> +</div> +<div class="ulist"><ul> +<li> +<p> +The top left hand dropdown box in the import panel allows one to select the + APD dive computer for which the dive log needs to be imported. The default + it is DC1, <em>i.e.</em> the first of the two dive computers the APD uses. It is + possible to sequentially import the data for both dive computers by first + importing CD1 and then DC2.(<strong>Hint</strong>: The logs for the two dive computers are + viewed by selecting <em>View → Next DC</em> from the Main Menu after the uploading + has been completed) +</p> +</li> +<li> +<p> +Click the <em>Ok</em> button at the bottom of the import panel. +</p> +</li> +</ul></div> +<div class="paragraph"><p>The APD dive log will appear within <em>Subsurface</em>. The dive +computer-generated ceiling generated by the Inspiration can be viewed by +selecting the appropriate button on the left of the <strong>Dive Profile</strong>. Cylinder +pressure data are not logged by the APD equipment but can be manually +entered in the <em>Equipment</em> Tab.</p></div> +</div> </div> </div> <div class="sect1"> @@ -5752,9 +5821,9 @@ Ensure the other settings for the ADP dive log are appropriate, then select <div class="sectionbody"> <div class="paragraph"><p>The import of dive log data from external dive log software is mostly performed using the dialogue found by selecting <em>Import</em> from the Main Menu, -then clicking on <em>Import Log Files</em>. This is a single-step process, more
-information about which can be found <a href="#Unified_import">here.</a> However, in
-some cases, a two-step process may be required:</p></div>
+then clicking on <em>Import Log Files</em>. This is a single-step process, more +information about which can be found <a href="#Unified_import">here.</a> However, in +some cases, a two-step process may be required:</p></div> <div class="olist arabic"><ol class="arabic">
<li>
<p>
@@ -5766,9 +5835,9 @@ Export the foreign dive log data to format that is accessible from <p>
Import the accessible dive log data into <em>Subsurface</em>.
</p>
-</li>
-</ol></div>
-<div class="paragraph"><p>This appendix provides some information about approaches to export dive log
+</li> +</ol></div> +<div class="paragraph"><p>This appendix provides some information about approaches to export dive log data from foreign dive log software. The procedures below mostly apply to Linux and/or Windows.</p></div> <div class="sect2"> @@ -5776,9 +5845,9 @@ Linux and/or Windows.</p></div> <div class="admonitionblock"> <table><tr> <td class="icon"> -<img src="images/icons/suuntologo.jpg" alt="Note" />
-</td>
-<td class="content">DiveManager is a MS Windows application for Suunto dive computers.
+<img src="images/icons/suuntologo.jpg" alt="Note" /> +</td> +<td class="content">DiveManager is a MS Windows application for Suunto dive computers. Divemanager 3 (DM3) is an older version of the Suunto software. More recent
Suunto dive computers use Divemanager version 4 or 5 (DM4 or DM5). The
different versions of Divemanager use different methods and different file
@@ -5800,9 +5869,9 @@ Do not start the import wizard to import dives from the dive computer. <li>
<p>
In the navigation tree on the left side of the program-window, select the
- appropriate dives.
-</p>
-</li>
+ appropriate dives. +</p> +</li> <li> <p> Within the list of dives, select the dives you would like to import later: @@ -5829,9 +5898,9 @@ With the dives marked, use the program menu <em>File → Export</em> <li> <p> The export pop-up will show. Within this pop-up, there is one field called - <em>Export Path</em>.
-</p>
-<div class="ulist"><ul>
+ <em>Export Path</em>. +</p> +<div class="ulist"><ul> <li>
<p>
Click the browse button next to the field Export Path
@@ -5936,9 +6005,9 @@ Click <em>Save</em> </li>
<li>
<p>
-The dives are now exported to the file DM4.bak (or DM5.bak)
-</p>
-</li>
+The dives are now exported to the file DM4.bak (or DM5.bak) +</p> +</li> </ol></div> </div> <div class="sect2"> @@ -5946,14 +6015,14 @@ The dives are now exported to the file DM4.bak (or DM5.bak) <div class="admonitionblock" id="Atomic_Export"> <table><tr> <td class="icon"> -<img src="images/icons/atomiclogo.jpg" alt="Note" />
-</td>
-<td class="content">Atomic Logbook is a Windows software by Atomic Aquatics. It allows
+<img src="images/icons/atomiclogo.jpg" alt="Note" /> +</td> +<td class="content">Atomic Logbook is a Windows software by Atomic Aquatics. It allows downloading of dive information from Cobalt and Cobalt 2 dive computers.
The divelog is kept in a SQLite database at
-C:\ProgramData\AtomicsAquatics\Cobalt-Logbook\Cobalt.db. This file can be
-directly imported to Subsurface.</td>
-</tr></table>
+C:\ProgramData\AtomicsAquatics\Cobalt-Logbook\Cobalt.db. This file can be +directly imported to Subsurface.</td> +</tr></table> </div> </div> <div class="sect2"> @@ -5961,9 +6030,9 @@ directly imported to Subsurface.</td> <div class="admonitionblock" id="Mares_Export"> <table><tr> <td class="icon"> -<img src="images/icons/mareslogo.jpg" alt="Note" />
-</td>
-<td class="content">Mares Dive Organiser is a Windows application. The dive log is kept as a
+<img src="images/icons/mareslogo.jpg" alt="Note" /> +</td> +<td class="content">Mares Dive Organiser is a Windows application. The dive log is kept as a Microsoft SQL Compact Edition database with a <em>.sdf</em> filename extension. The
database includes all Dive Organiser-registered divers on the particular
computer and all Mares dive computers used. The safest way to obtain a copy
@@ -5992,9 +6061,9 @@ Extract the <em>.sdf</em> file from the zipped folder to your Desktop. </li>
<li>
<p>
-The password for accessing the .zip file is <em>mares</em>.
-</p>
-</li>
+The password for accessing the .zip file is <em>mares</em>. +</p> +</li> </ol></div> </div> <div class="sect2"> @@ -6046,9 +6115,9 @@ the log file in Subsurface.</p></div> </div> </div> <div class="sect1"> -<h2 id="S_Appendix_D">19. ANNEXE D : Exporter un tableur vers le format CSV</h2> +<h2 id="_annexe_d_exporter_un_tableur_vers_le_format_csv">19. ANNEXE D : Exporter un tableur vers le format CSV</h2> <div class="sectionbody"> -<div class="paragraph"><p>De nombreux plongeurs conservent un carnet de plongée sous forme de fichier +<div class="paragraph" id="S_Appendix_D"><p>De nombreux plongeurs conservent un carnet de plongée sous forme de fichier numérique, souvent un tableur avec différents champs et informations. Ces données peuvent facilement être importées dans <em>Subsurface</em> après que le tableur a été converti en fichier CSV. Cette section explique la procedure @@ -6104,9 +6173,9 @@ this:</p></div> <div class="imageblock" style="text-align:center;"> <div class="content"> <img src="images/LOffice_spreadsheetdata.jpg" alt="FIGURE: Spreadsheet data" /> -</div>
-</div>
-<div class="paragraph"><p>To export the data as a .CSV file from within LibreOffice click <em>File →
+</div> +</div> +<div class="paragraph"><p>To export the data as a .CSV file from within LibreOffice click <em>File → Save As</em>. On the dialogue that comes up, select the <em>Text CSV (.csv)</em> as the
file type and select the option <em>Edit filter settings</em>.</p></div>
<div class="imageblock" style="text-align:center;">
@@ -6121,9 +6190,9 @@ then select <em>OK</em>.</p></div> <div class="content">
<img src="images/LOffice_field_options.jpg" alt="FIGURE: Field options" />
</div>
-</div>
-<div class="paragraph"><p>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
+</div> +<div class="paragraph"><p>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 <a href="#S_ImportingCSVDives">Importing CSV dives</a>.</p></div> </div> <div class="sect2"> @@ -6131,9 +6200,9 @@ then import the dive data as explained on the section <div class="paragraph"><p>The field delimiter (called "<em>list separator</em>" in Microsoft manuals) is not accessible from within <em>Excel</em> and needs to be set through the <em>Microsoft Control Panel</em>. After changing the separator character, all software on the -Windows machine use the new character as a separator. One can change the
-character back to the default character by following the same procedure,
-outlined below.</p></div>
+Windows machine use the new character as a separator. One can change the +character back to the default character by following the same procedure, +outlined below.</p></div> <div class="ulist"><ul>
<li>
<p>
@@ -6191,94 +6260,66 @@ the appropriate folder has been selected to save the CSV file into.</p></div> </div>
<div class="paragraph"><p>Select the <em>Save</em> 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
-text editor, and then import the dive data as explained on the section
-<a href="#S_ImportingCSVDives">Importing CSV dives</a>.</p></div>
-</div>
+text editor, and then import the dive data as explained on the section +<a href="#S_ImportingCSVDives">Importing CSV dives</a>.</p></div> +</div> </div> </div> <div class="sect1"> -<h2 id="_appendix_e_faqs">20. APPENDIX E: FAQs.</h2> +<h2 id="S_APPENDIX_E">20. ANNEXE E : Créer un modèle d’impression personnalisé</h2> <div class="sectionbody"> -<div class="sect2"> -<h3 id="_subsurface_appears_to_miscalculate_gas_consumption_and_sac">20.1. Subsurface appears to miscalculate gas consumption and SAC</h3> -<div class="paragraph" id="SAC_CALCULATION"><p><em>Question</em>: I dived with a 12.2 l tank, starting with 220 bar and ending -with 100 bar, and I calculate a different SAC compared what <em>Subsurface</em> -calculates. Is <em>Subsurface</em> miscalculating?</p></div> -<div class="paragraph"><p><em>Answer</em>: Not really. What happens is that <em>Subsurface</em> actually calculates
-gas consumption differently - and better - than you expect. In particular,
-it takes the incompressibility of the gas into account. Traditionally, Gas
-consumption and SAC should be: <code>consumption = tank size x (start pressure -
-end pressure)</code></p></div>
-<div class="paragraph"><p>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 actually
-don’t compress linearly with pressure. Also, you are missing the fact that
-one atmosphere of pressure isn’t actually one bar. So the <strong>real</strong>
-calculation is:</p></div>
-<div class="paragraph"><p><code>consumption = (amount_of_air_at_beginning - amount_of_air_at_end)</code></p></div>
-<div class="paragraph"><p>where the amount of air is <strong>not</strong> just "tank size times pressure in bar".
-It’s a combination of: "take compressibility into account" (which is a
-fairly small issue under 220 bar - you’ll see more differences when you do
-high-pressure tanks with 300bar) and "convert bar to atm" (which is the
-majority of your discrepancy). Remember: one ATM is ~1.013 bar, so without
-the compressibility, your gas use is:</p></div>
-<div class="paragraph"><p><code>12.2*((220-100)/1.013)</code></p></div>
-<div class="paragraph"><p>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
-compressibility does show up above 200 bar, and takes that 1445 down about
-eight litres more, so you really did use only about 1437 l of air at surface
-pressure.</p></div>
-<div class="paragraph"><p>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
-mentioned, the "contains less air than you thought it did" really starts
-becoming much more noticeable at high pressure. A 400 bar really does not
-contain twice as much air as a 200 bar one. At lower pressures, air acts
-pretty much like an ideal gas.</p></div> -</div> -<div class="sect2"> -<h3 id="_some_dive_profiles_have_time_discrepancies_with_the_recorded_samples_from_my_dive_computer_8230">20.2. Some dive profiles have time discrepancies with the recorded samples from my dive computer…</h3> -<div class="paragraph"><p><em>Subsurface</em> ends up ignoring surface time for many things (average depth, -divetime, SAC, etc). <em>Question</em>: Why do dive durations in my dive computer -differ from that given by <em>Subsurface</em>?</p></div> -<div class="paragraph"><p><em>Answer</em>: 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 for -your buddies, your dive computer may say that your dive is 50 minutes long - -because you have fifty minutes worth of samples - but subsurface will say -it’s 45 minutes - because you were actually diving for 45 minutes. It’s -even more noticeable if you do things like divemastering the initial OW -dives, when you may stay in the water for a long time, but spend most of it -at the surface. And then you don’t want that to count as some kind of long -dive”.</p></div> +<div class="paragraph"><p><em>Subsurface</em> provides a mechanism to create or modify templates for printing +dive logs in order to produce customised printouts of dive logs. Templates, +written in HTML as well as a simple Grantlee instruction set, are rendered +to the print device by <em>Subsurface</em>.</p></div> +<div class="paragraph"><p>Templates are accessed using the print dialogue (see image <strong>B</strong> below).</p></div> +<div class="imageblock" style="text-align:center;"> +<div class="content"> +<img src="images/Print1_f22.jpg" alt="FIGURE: Print dialogue" /> </div> -<div class="sect2"> -<h3 id="_some_dive_profiles_are_missing_from_the_download">20.3. Some dive profiles are missing from the download</h3> -<div class="paragraph" id="DC_HISTORY"><p><em>Question</em>: I cannot download all my dives, only the most recent ones even -though my dive computer’s manual states that it records history of e.g. 999 -dives.</p></div> -<div class="paragraph"><p><em>Answer</em>: Dive history is different than the dive profiles on the log. The -history only keeps track of the total number of dives and total amount of -time spent below surface. The logs, on the other hand, store the dive -profile, but they have limited amount of memory to do so. The exact amount -of dive profiles that can be stored on the device depend on sample interval -and duration of the dives. Once the memory is full the oldest dives get -overwritten with new dives. Thus we are only able to download the last 13, -30 or 199 dives.</p></div> -<div class="paragraph"><p>If you have downloaded your dives to different dive logging software before -they were overwritten, there is a high change that Subsurface can import -these. However, if the logs are only on your dive computer, they cannot be -salvaged after being over written by new dives.</p></div> </div> +<div class="paragraph"><p>The buttons under the <em>Template</em> dropdown box allows one to <em>Edit</em>, +<em>Delete</em>, <em>Import</em> and to <em>Export</em> templates (see image <strong>A</strong> above). New or +modified templates are stored as HTML files in the same directory as the +dive log being processed. In order to create or modify a template, select +the <em>Custom</em> template from the template dropdown list in the print dialogue +(see image <strong>B</strong> above), then select <em>Edit</em>.</p></div> +<div class="paragraph"><p>The Edit Panel comprises three tabs:</p></div> +<div class="imageblock" style="text-align:center;"> +<div class="content"> +<img src="images/Template1_f22.jpg" alt="FIGURE: template edit dialogue" /> +</div> +</div> +<div class="paragraph"><p>1) The <em>Style</em> tab (image <strong>A</strong> above) controls the font, line spacing and colour + template used for printing the dive log. The style attributes are + editable. Choose one of the four colour palets used for colour printing.</p></div> +<div class="paragraph"><p>2) The <em>Colors</em> tab (image <strong>B</strong> above) allows editing the colours used for + printing the dive log. The colours are highly customisable: the <em>Edit</em> + buttons in the <em>Colors</em> tab allows choosing abritrary colours for different + components of the dive log printout.</p></div> +<div class="paragraph"><p>3) The <em>Template</em> tab of the Edit Panel (see image below) allows creating a + template using HTML as well as a few Grantlee programming + primitives. Grantlee provides the ability to create and format HTML code in + a highly simple but efficient way (see below). The HTML of the template can + be edited and saved. The saved template is stored in the same directory as + the dive being processed. By default, a <em>Custom</em> template is a skeleton with + no specific print instructions. The informastion being printed needs to be + specified and formatted in the by replacing the section marked with: "<!-- + Template must be filled -→". Writing HTML code with Grantlee instructions + allows unlimited freedom in determining what is printed an in which way it + should be rendered.</p></div> +<div class="imageblock" style="text-align:center;"> +<div class="content"> +<img src="images/Template2_f22.jpg" alt="FIGURE:Template tab" /> </div> </div> -<div class="sect1"> -<h2 id="_appendix_f_write_a_custom_printing_template">21. APPENDIX F: Write a custom printing template</h2> -<div class="sectionbody"> -<div class="paragraph"><p><em>Subsurface</em> provides a customizable printing support which is based on -templates that are transformed by the <em>Grantlee</em> backend to correct <em>HTML</em> -syntax, The <em>HTML</em> output is then rendered by <em>Subsurface</em>.</p></div> +<div class="paragraph"><p>One can adapt any of the existing templates and save it to the dive log +directory. The standard templates (e.g. One dive, Six dives, Table) can be +modified in this way.</p></div> <div class="paragraph"><p>To write a custom template the following elements must exist so that the template will be correctly handled and rendered.</p></div> <div class="sect2"> -<h3 id="_main_dive_loop">21.1. Main dive loop</h3> +<h3 id="_main_dive_loop">20.1. Main dive loop</h3> <div class="paragraph"><p><em>Subsurface</em> exports a dive list called (<strong>dives</strong>) to the <em>Grantlee</em> backend. It is possible to iterate over the list as follows:</p></div> <div class="literalblock"> @@ -6299,7 +6340,7 @@ backend. It is possible to iterate over the list as follows:</p></div> <a href="http://www.grantlee.org/apidox/for_themers.html">here</a></p></div> </div> <div class="sect2"> -<h3 id="_grantlee_exported_variables">21.2. Grantlee exported variables</h3> +<h3 id="_grantlee_exported_variables">20.2. Grantlee exported variables</h3> <div class="paragraph"><p>Only a subset of the dive data is exported:</p></div> <div class="tableblock"> <table rules="all" @@ -6485,7 +6526,7 @@ cellspacing="0" cellpadding="4"> </div></div> </div> <div class="sect2"> -<h3 id="_defined_css_selectors">21.3. Defined CSS selectors</h3> +<h3 id="_defined_css_selectors">20.3. Defined CSS selectors</h3> <div class="paragraph"><p>As the dive profile is placed after rendering, <em>Subsurface</em> uses a special <em>CSS</em> selectors to do some searches in the HTML output. The <em>CSS</em> selectors in the following table should be added.</p></div> @@ -6533,7 +6574,7 @@ data-numberofdives = 0).</td> </div> </div> <div class="sect2"> -<h3 id="_special_attributes">21.4. Special attributes</h3> +<h3 id="_special_attributes">20.4. Special attributes</h3> <div class="paragraph"><p>There are two ways of rendering- either rendering a specific number of dives in each page or make <em>Subsurface</em> try to fit as much dives as possible into one page (<em>flow</em> rendering).</p></div> @@ -6573,11 +6614,84 @@ page size.</td> </div> </div> </div> +<div class="sect1"> +<h2 id="_appendix_f_faqs">21. APPENDIX F: FAQs.</h2> +<div class="sectionbody"> +<div class="sect2"> +<h3 id="S_APPENDIX_F">21.1. Subsurface appears to miscalculate gas consumption and SAC</h3> +<div class="paragraph" id="SAC_CALCULATION"><p><em>Question</em>: I dived with a 12.2 l tank, starting with 220 bar and ending +with 100 bar, and I calculate a different SAC compared what <em>Subsurface</em> +calculates. Is <em>Subsurface</em> miscalculating?</p></div> +<div class="paragraph"><p><em>Answer</em>: Not really. What happens is that <em>Subsurface</em> actually calculates +gas consumption differently - and better - than you expect. In particular, +it takes the incompressibility of the gas into account. Traditionally, Gas +consumption and SAC should be: <code>consumption = tank size x (start pressure -
+end pressure)</code></p></div>
+<div class="paragraph"><p>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 actually
+don’t compress linearly with pressure. Also, you are missing the fact that
+one atmosphere of pressure isn’t actually one bar. So the <strong>real</strong>
+calculation is:</p></div>
+<div class="paragraph"><p><code>consumption = (amount_of_air_at_beginning - amount_of_air_at_end)</code></p></div>
+<div class="paragraph"><p>where the amount of air is <strong>not</strong> just "tank size times pressure in bar".
+It’s a combination of: "take compressibility into account" (which is a
+fairly small issue under 220 bar - you’ll see more differences when you do
+high-pressure tanks with 300bar) and "convert bar to atm" (which is the
+majority of your discrepancy). Remember: one ATM is ~1.013 bar, so without
+the compressibility, your gas use is:</p></div>
+<div class="paragraph"><p><code>12.2*((220-100)/1.013)</code></p></div>
+<div class="paragraph"><p>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
+compressibility does show up above 200 bar, and takes that 1445 down about
+eight litres more, so you really did use only about 1437 l of air at surface
+pressure.</p></div>
+<div class="paragraph"><p>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
+mentioned, the "contains less air than you thought it did" really starts +becoming much more noticeable at high pressure. A 400 bar really does not +contain twice as much air as a 200 bar one. At lower pressures, air acts +pretty much like an ideal gas.</p></div> +</div> +<div class="sect2"> +<h3 id="_some_dive_profiles_have_time_discrepancies_with_the_recorded_samples_from_my_dive_computer_8230">21.2. Some dive profiles have time discrepancies with the recorded samples from my dive computer…</h3> +<div class="paragraph"><p><em>Subsurface</em> ends up ignoring surface time for many things (average depth, +divetime, SAC, etc). <em>Question</em>: Why do dive durations in my dive computer +differ from that given by <em>Subsurface</em>?</p></div> +<div class="paragraph"><p><em>Answer</em>: 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 for +your buddies, your dive computer may say that your dive is 50 minutes long - +because you have fifty minutes worth of samples - but subsurface will say +it’s 45 minutes - because you were actually diving for 45 minutes. It’s +even more noticeable if you do things like divemastering the initial OW +dives, when you may stay in the water for a long time, but spend most of it +at the surface. And then you don’t want that to count as some kind of long +dive”.</p></div> +</div> +<div class="sect2"> +<h3 id="_some_dive_profiles_are_missing_from_the_download">21.3. Some dive profiles are missing from the download</h3> +<div class="paragraph" id="DC_HISTORY"><p><em>Question</em>: I cannot download all my dives, only the most recent ones even +though my dive computer’s manual states that it records history of e.g. 999 +dives.</p></div> +<div class="paragraph"><p><em>Answer</em>: Dive history is different than the dive profiles on the log. The +history only keeps track of the total number of dives and total amount of +time spent below surface. The logs, on the other hand, store the dive +profile, but they have limited amount of memory to do so. The exact amount +of dive profiles that can be stored on the device depend on sample interval +and duration of the dives. Once the memory is full the oldest dives get +overwritten with new dives. Thus we are only able to download the last 13, +30 or 199 dives.</p></div> +<div class="paragraph"><p>If you have downloaded your dives to different dive logging software before +they were overwritten, there is a high change that Subsurface can import +these. However, if the logs are only on your dive computer, they cannot be +salvaged after being over written by new dives.</p></div> +</div> +</div> +</div> </div> <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2015-09-01 14:25:48 CEST +Last updated 2015-09-08 10:31:18 CEST </div> </div> </body> diff --git a/Documentation/user-manual_fr.txt b/Documentation/user-manual_fr.txt index 92ee08956..568359707 100644 --- a/Documentation/user-manual_fr.txt +++ b/Documentation/user-manual_fr.txt @@ -304,11 +304,10 @@ a *W*, e.g. W07°, or with a negative value, e.g. -7.34323. Some keyboards don't have the degree sign (°). It can be replaced by a d like that: N30d W20d. -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 -description will cause unexpected behaviour (Subsurface will think that all -of these dives have the same location and try to keep their GPS coordinates -the same). +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 description will +cause unexpected behaviour (Subsurface will think that all of these dives +have the same location and try to keep their GPS coordinates the same). *Dive mode*: This is a dropdown box allowing one to choose the type of dive performed. The options are OC (Open Circuit, the default setting, meant for most recreational dives), @@ -1856,15 +1855,16 @@ Closed system rebreathers use advanced technology to recirculate gas that has been breathed while doing two things to maintain a breathable oxygen concentration: a) remove carbon dioxide from the gas that has been exhaled -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 +regulate the oxygen concentration to remain within safe diving limits. The +CCR interface of _Subsurface_ is currently experimental and under active +development. Subsurface currently supports Poseidon MkVI and APD +Discovery/Evolution dive computers. In contrast to a conventional recreational dive computer, a CCR system computer does not allow the download of a log containing multiple dives. Rather, each dive is stored independently. This means that _Subsurface_ cannot download a dive log directly from a CCR dive computer, but that it imports CCR dive logs in the -same way that it imports dive log data from other digital databases. +same way that it imports dive log data from other digital databases: one +dive at a time. ===== Import a CCR dive @@ -1873,14 +1873,14 @@ information from other digital sources]. From the main menu of _Subsurface_, select _Import -> Import log files_ to bring up the xref:Unified_import[universal import dialogue]. As explained in that section, the bottom right hand of the import dialogue contains a dropdown -list of appropriate devices that currently includes an option for (Poseidon) -MkVI files (import for other CCR equipment is under active -development). Having selected the appropriate CCR format and the directory -where the original dive logs have been stored from the CCR dive computer, -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. +list (labled _Filter:_) of appropriate devices that currently +includes(Poseidon) MkVI or APD log viewer files (import for other CCR +equipment is under active development). Having selected the appropriate CCR +format and the directory where the original dive logs have been stored from +the CCR dive computer, 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. See the section below for ===== Displayed information for a CCR dive @@ -1910,18 +1910,18 @@ The oxygen setpoint values as well as the readings from the individual oxygen sensors can be shown. The display of additional CCR information is turned on by checking the appropriate checkboxes in the _Preferences_ panel (accessible by selecting xref:S_CCR_options[_File -> Preferences -> -Graph_]). This part of the _Preferences_ panel look like this, representing -two checkboxes that modify the display of pO~2~ when the appropriate toolbar -button on the Dive Profile has been activated. +Graph_]). This part of the _Preferences_ panel is shown in the image below, +representing two checkboxes that modify the display of pO~2~ when the +appropriate toolbar button on the Dive Profile has been activated. image::images/CCR_preferences_f20.jpg["FIGURE: CCR preferences panel", align="center"] -Checking any of the check boxes allows the display of additional +Checking any of these check boxes allows the display of additional oxygen-related information whenever the pO~2~ toolbar button on the _Profile_ panel is activated. The first checkbox allows the display of setpoint information. This is a red line superimposed on the green oxygen partial pressure graph and allows a comparison of the mean measured oxygen -partial pressure and the setpoint values, as in the image below. +partial pressure and the setpoint values, as shown below. image::images/CCR_setpoint_f20.jpg["FIGURE: CCR setpoint and po2 graph", align="center"] @@ -1957,14 +1957,32 @@ including an overlay of setpoint and oxygen sensor data, as well as the cylinder pressure data. In this case there is good agreement from the readings of the two oxygen sensors. -image::images/CCR_dive_profile_f20.jpg["FIGURE: CCR dive profile", align="center"] +image::images/CCR_dive_profile_f22.jpg["FIGURE: CCR dive profile", align="center"] _Equipment-specific information_: Equipment-specific information gathered by _Subsurface_ is shown in the xref:S_ExtraDataTab[Extra data tab]. This may include setup information or metadata about the dive. +The deco ceiling calculated by Subsurface is not very accurate because the +precise pressure of nitrogen in the loop can usually not be determined from +the dive log imported from the CCR equipment. Many CCR dive computers, +however, report an internally-calculated deco ceiling that is reported in +the dive log, reflecting a more accurate assessment. The display of this +ceiling is activated by clicking the appropriate button to the left of the +dive profile: + +[icon="images/icons/cceiling.jpg"] + +The default colour of the computer-generated deco ceiling is white. However, +this can be set to red by checking the appropriate check box after selecting +_File -> Preferences -> Graph_. Below is a dive profile indicating the dive +computer-generated deco ceiling: + +image::images/CCR_dive_ceilingF22.jpg["FIGURE: CCR computer-generated deco ceiling", align="center"] + More equipment-specific information for downloading CCR dive logs for -Poseidon MkVI and APD equipment can be found in xref:S_PoseidonMkVI[Appendix +Poseidon MkVI and APD equipment can be found in +xref:_appendix_b_dive_computer_specific_information_for_importing_dive_information[Appendix B]. == Obtaining more information about dives entered into the logbook @@ -2815,78 +2833,90 @@ same process could be used for the Cloud-based storage of dive logs. [[S_PrintDivelog]] == Printing a dive log -_Subsurface_ provides a simple interface to print a whole dive log or only a few selected dives. - Pre-installed templates or a custom written template can be used to choose where the data will - be fitted into the page. +_Subsurface_ provides a simple and flexible interface to print a whole dive log or only a few selected dives. + Pre-installed templates or a custom written template can be used to choose where the data are fitted into the page. Before printing, two decisions are required: - 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 - *Dive List* panel. -- 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 - of the Dive Profile panel. + dive log is required, then select the required dives from the *Dive List* + panel. +- If the dive profiles needs printing, what gas partial pressure information + should be shown? Select the appropriate toggle-buttons on the button bar to + the left of the *Dive Profile* panel. -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 -dialogue appears (see the image on the left [A], below). +If _File -> Print_ is selected from the Main menu, the the dialogue below +(image *A*) appears. Three specifications are needed to achieve the desired +information and page layout: -image::images/PrintDiveLog.jpg["FIGURE: Print dialogue", align="center"] +image::images/Print1_f22.jpg["FIGURE: Print dialogue", align="center"] -Under _Print type_ users need to select one of two options: +1. Under _Print type_ select one of two options: -- _Dive list_ print: print dives from the list with profiles and other - information. -- _Statistics_ print: print yearly statistics of the dives. +- _Dive list print_: Print dives from the *Dive List* panel with profiles and + other information. +- _Statistics print_: Print yearly statistics of the dives. -Under _Print options_ users need to select: +2. Under _Print options_ select: -- 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 - selected dives_. -- Printing in colour, achieved by checking the box with _Print in colour_. +- Printing only the dives selected from the dive list prior to activating the + print dialogue by checking the box _Print only selected dives_. If this + check box is *not* checked all dives in the *Dive List* panel are printed. +- Printing in colour, achieved by checking the box with _Print in colour_. If + this check box is not checked, printing is in monochrome (grey scale). -Under _Template_ users can select: +Under _Template_ select a template to be used as the page layout. There are +several templates (see image *B*, above). -- A template to be used as the page layout. +- _Table_: This prints a summary table of all dives selected (see below). -- _Delete_ a template from the template list -- _Import_ a new template to the template list -- _Export_ a template from the template list -- _Edit_ a template (choose colors, fonts, font-type) +image::images/Print_summarylist_f22.jpg["FIGURE: Print summary table", align="center"] -When editing a template the following options are available: +- _Flow layout_: Print the text associated with each diev without printing the + dive profiles + of each dive (see below): -- _Style_: edit font type, size, choose color palette; this will not affect - the template HTML code -- _Template_: edit the template HTML code; by saving, the "Custom" template in - the template list will be replaced -- _Colors_: edit the current color palette; the new color palette will - overwrite the "Custom" color palette +image::images/Print_flow_layout_f22.jpg["FIGURE: Print flow layout", align="center"] + +- _One Dive_: Print one dive per page, also showing the dive profile (see + below) + +image::images/print2_f22.jpg["FIGURE: Print one dive / page", align="center"] + + +- _Two Dives_: Print two dives per page, also showing the dive profiles. +- _Six Dives_: Print six dives per page, also showing the dive profiles. +- _Custom_: This option allows customisation of the print contents and + layout. This is + discussed at the end of this section. Users can _Preview_ the printed page by selecting the _Preview_ button on -the dialogue. After preview, changes to the options in the print dialogue -can be made, resulting in a layout that fits personal taste. +the dialogue (see image *A* at the start of this section). After preview, +changes to the options in the print dialogue can be made, resulting in a +layout that fits personal taste. + +Next, select the _Print_ button (see image *A* at the start of this +section). This activates the regular print dialogue used by the user +operating system, allowing one to choose a printer and to set its properties +(see image below): + +image::images/Print_print_f22.jpg["FIGURE: Print one dive / page", align="center"] -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, -above), allowing them to choose a printer and to set its properties (image -[*C*] on the right, above). It is important to set the print resolution of -the printer to an appropriate value by changing the printer -properties. Finally, one can print the dives. Below is a (rather small) -example of the output for one particular page. +Set the print resolution of the printer to an appropriate value by changing +the printer _Properties_. Finally, select the _Print_ button to print the +dives. Below is a (rather small) example of the output for one particular +page. image::images/Printpreview.jpg["FIGURE: Print preview page", align="center"] === Write a custom printing template (advanced) Writing a custom template is an effective way to produce highly customized -printouts. Subsurface uses HTML templates with Grantlee as the printing -backend. - -See <<_appendix_f_write_a_custom_printing_template ,APPENDIX F>> for -information on how to write your own template. +printouts. Subsurface uses HTML templates to render printing. One can create +a template, export a new template, import an existing template and delete an +existing template by using the appropriate buttons under the _Template_ +dropdown list in the print dialogue. See <<S_APPENDIX_E,APPENDIX E>> for +information on how to write or modify a template. [[S_Configure]] == Configurer un ordinateur de plongée @@ -4058,7 +4088,7 @@ _Subsurface_ accesses the .txt and the .csv files to obtain dive log information. -=== Importing from APD Inspiration CCR +=== Importing from APD Inspiration/Evolution CCR [icon="images/APDComputer.jpg"] [NOTE] @@ -4070,25 +4100,39 @@ managed from within _Subsurface_ (together with dives using many other types of dive computer). The APD inspiration dive logs are imported into _Subsurface_ as follows: +- Download the dive using _AP Communicator_. - Open a dive within the _AP Log Viewer_. - Select the tab at the top of the screen, entitled "_Data_". -- If the raw dive log data show on the screen, click on "_Copy to Clipboard_". -- Open a text editor, e.g. Notepad (Windows), TextWrangler (Mac). +- With the raw dive log data show on the screen, click on "_Copy to + Clipboard_". +- Open a text editor, e.g. Notepad (Windows) or TextWrangler (Mac). - Copy the contents of the clipboard into the text editor and save the text - file with a filename extension of .CSV + file with a filename extension of _.apd_ - Within _Subsurface_, select _Import -> Import log files_ to open the xref:Unified_import[universal import dialogue]. -- In the dropdown list towards the bottom right of the dialogue, select "_CSV - files_". -- On the list of file names select the .CSV file that has been created - above. An import dialogue opens. -- In the dropdown list on the top left labeled '_Pre-configured imports_", - select _APD Log Viewer_. -- Ensure the other settings for the ADP dive log are appropriate, then select - _OK_. - -The APD dive log will appear within _Subsurface_. - +- In the dropdown list towards the bottom right of the dialogue (labled + 'Filter:'), select "APD log viewer". +- On the list of file names select the _.apd_ file that has been created + above. An import dialogue opens indicating the default settings for the data + in the _.apd_ file. If any changes are required, do this as for + xref:S_ImportingCSVDives[CSV imports]. + +image::images/APD_CSVimportF22.jpg["Figure: APD log viewer import", align="center"] + +- The top left hand dropdown box in the import panel allows one to select the + APD dive computer for which the dive log needs to be imported. The default + it is DC1, _i.e._ the first of the two dive computers the APD uses. It is + possible to sequentially import the data for both dive computers by first + importing CD1 and then DC2.(*Hint*: The logs for the two dive computers are + viewed by selecting _View -> Next DC_ from the Main Menu after the uploading + has been completed) +- Click the _Ok_ button at the bottom of the import panel. + +The APD dive log will appear within _Subsurface_. The dive +computer-generated ceiling generated by the Inspiration can be viewed by +selecting the appropriate button on the left of the *Dive Profile*. Cylinder +pressure data are not logged by the APD equipment but can be manually +entered in the _Equipment_ Tab. == APPENDIX C: Exporting Dive log information from external dive log software. @@ -4219,8 +4263,8 @@ Once this is done, open the saved database file with Subsurface and the dives are automatically converted to our own format. Last step to do is save the log file in Subsurface. -[[S_Appendix_D]] == ANNEXE D : Exporter un tableur vers le format CSV +[[S_Appendix_D]] De nombreux plongeurs conservent un carnet de plongée sous forme de fichier numérique, souvent un tableur avec différents champs et informations. Ces @@ -4318,92 +4362,55 @@ that was selected. 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:S_ImportingCSVDives[Importing CSV dives]. -== APPENDIX E: FAQs. +[[S_APPENDIX_E]] +== ANNEXE E : Créer un modèle d'impression personnalisé -=== Subsurface appears to miscalculate gas consumption and SAC -[[SAC_CALCULATION]] -'Question': I dived with a 12.2 l tank, starting with 220 bar and ending -with 100 bar, and I calculate a different SAC compared what _Subsurface_ -calculates. Is _Subsurface_ miscalculating? - -'Answer': Not really. What happens is that _Subsurface_ actually calculates -gas consumption differently - and better - than you expect. In particular, -it takes the incompressibility of the gas into account. Traditionally, Gas -consumption and SAC should be: +consumption = tank size x (start pressure - -end pressure)+ +_Subsurface_ provides a mechanism to create or modify templates for printing +dive logs in order to produce customised printouts of dive logs. Templates, +written in HTML as well as a simple Grantlee instruction set, are rendered +to the print device by _Subsurface_. -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 actually -don't compress linearly with pressure. Also, you are missing the fact that -one atmosphere of pressure isn't actually one bar. So the *real* -calculation is: - -+consumption = (amount_of_air_at_beginning - amount_of_air_at_end)+ - -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 -fairly small issue under 220 bar - you'll see more differences when you do -high-pressure tanks with 300bar) and "convert bar to atm" (which is the -majority of your discrepancy). Remember: one ATM is ~1.013 bar, so without -the compressibility, your gas use is: +Templates are accessed using the print dialogue (see image *B* below). -+12.2*((220-100)/1.013)+ +image::images/Print1_f22.jpg["FIGURE: Print dialogue", align="center"] -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 -compressibility does show up above 200 bar, and takes that 1445 down about -eight litres more, so you really did use only about 1437 l of air at surface -pressure. +The buttons under the _Template_ dropdown box allows one to _Edit_, +_Delete_, _Import_ and to _Export_ templates (see image *A* above). New or +modified templates are stored as HTML files in the same directory as the +dive log being processed. In order to create or modify a template, select +the _Custom_ template from the template dropdown list in the print dialogue +(see image *B* above), then select _Edit_. -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 -mentioned, the "contains less air than you thought it did" really starts -becoming much more noticeable at high pressure. A 400 bar really does not -contain twice as much air as a 200 bar one. At lower pressures, air acts -pretty much like an ideal gas. +The Edit Panel comprises three tabs: -=== Some dive profiles have time discrepancies with the recorded samples from my dive computer... +image::images/Template1_f22.jpg["FIGURE: template edit dialogue", align="center"] -_Subsurface_ ends up ignoring surface time for many things (average depth, -divetime, SAC, etc). 'Question': Why do dive durations in my dive computer -differ from that given by _Subsurface_? +1) The _Style_ tab (image *A* above) controls the font, line spacing and colour + template used for printing the dive log. The style attributes are + editable. Choose one of the four colour palets used for colour printing. -'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 for -your buddies, your dive computer may say that your dive is 50 minutes long - -because you have fifty minutes worth of samples - but subsurface will say -it's 45 minutes - because you were actually diving for 45 minutes. It's -even more noticeable if you do things like divemastering the initial OW -dives, when you may stay in the water for a long time, but spend most of it -at the surface. And then you don't want that to count as some kind of long -dive”. +2) The _Colors_ tab (image *B* above) allows editing the colours used for + printing the dive log. The colours are highly customisable: the _Edit_ + buttons in the _Colors_ tab allows choosing abritrary colours for different + components of the dive log printout. -=== Some dive profiles are missing from the download +3) The _Template_ tab of the Edit Panel (see image below) allows creating a + template using HTML as well as a few Grantlee programming + primitives. Grantlee provides the ability to create and format HTML code in + a highly simple but efficient way (see below). The HTML of the template can + be edited and saved. The saved template is stored in the same directory as + the dive being processed. By default, a _Custom_ template is a skeleton with + no specific print instructions. The informastion being printed needs to be + specified and formatted in the by replacing the section marked with: "<!-- + Template must be filled -->". Writing HTML code with Grantlee instructions + allows unlimited freedom in determining what is printed an in which way it + should be rendered. -[[DC_HISTORY]] -'Question': I cannot download all my dives, only the most recent ones even -though my dive computer's manual states that it records history of e.g. 999 -dives. +image::images/Template2_f22.jpg["FIGURE:Template tab", align="center"] -'Answer': Dive history is different than the dive profiles on the log. The -history only keeps track of the total number of dives and total amount of -time spent below surface. The logs, on the other hand, store the dive -profile, but they have limited amount of memory to do so. The exact amount -of dive profiles that can be stored on the device depend on sample interval -and duration of the dives. Once the memory is full the oldest dives get -overwritten with new dives. Thus we are only able to download the last 13, -30 or 199 dives. - -If you have downloaded your dives to different dive logging software before -they were overwritten, there is a high change that Subsurface can import -these. However, if the logs are only on your dive computer, they cannot be -salvaged after being over written by new dives. - -== APPENDIX F: Write a custom printing template - -_Subsurface_ provides a customizable printing support which is based on -templates that are transformed by the _Grantlee_ backend to correct _HTML_ -syntax, The _HTML_ output is then rendered by _Subsurface_. +One can adapt any of the existing templates and save it to the dive log +directory. The standard templates (e.g. One dive, Six dives, Table) can be +modified in this way. To write a custom template the following elements must exist so that the template will be correctly handled and rendered. @@ -4540,3 +4547,84 @@ rendering mode IMPORTANT: All CSS units should be in relative lengths only, to support printing on any page size. + +== APPENDIX F: FAQs. +[[S_APPENDIX_F]] +=== Subsurface appears to miscalculate gas consumption and SAC +[[SAC_CALCULATION]] +'Question': I dived with a 12.2 l tank, starting with 220 bar and ending +with 100 bar, and I calculate a different SAC compared what _Subsurface_ +calculates. Is _Subsurface_ miscalculating? + +'Answer': Not really. What happens is that _Subsurface_ actually calculates +gas consumption differently - and better - than you expect. In particular, +it takes the incompressibility of the gas into account. Traditionally, Gas +consumption and SAC should be: +consumption = tank size x (start pressure - +end pressure)+ + +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 actually +don't compress linearly with pressure. Also, you are missing the fact that +one atmosphere of pressure isn't actually one bar. So the *real* +calculation is: + ++consumption = (amount_of_air_at_beginning - amount_of_air_at_end)+ + +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 +fairly small issue under 220 bar - you'll see more differences when you do +high-pressure tanks with 300bar) and "convert bar to atm" (which is the +majority of your discrepancy). Remember: one ATM is ~1.013 bar, so without +the compressibility, your gas use is: + ++12.2*((220-100)/1.013)+ + +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 +compressibility does show up above 200 bar, and takes that 1445 down about +eight litres more, so you really did use only about 1437 l of air at surface +pressure. + +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 +mentioned, the "contains less air than you thought it did" really starts +becoming much more noticeable at high pressure. A 400 bar really does not +contain twice as much air as a 200 bar one. At lower pressures, air acts +pretty much like an ideal gas. + +=== Some dive profiles have time discrepancies with the recorded samples from my dive computer... + +_Subsurface_ ends up ignoring surface time for many things (average depth, +divetime, SAC, etc). 'Question': Why do dive durations in my dive computer +differ from that given by _Subsurface_? + +'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 for +your buddies, your dive computer may say that your dive is 50 minutes long - +because you have fifty minutes worth of samples - but subsurface will say +it's 45 minutes - because you were actually diving for 45 minutes. It's +even more noticeable if you do things like divemastering the initial OW +dives, when you may stay in the water for a long time, but spend most of it +at the surface. And then you don't want that to count as some kind of long +dive”. + +=== Some dive profiles are missing from the download + +[[DC_HISTORY]] +'Question': I cannot download all my dives, only the most recent ones even +though my dive computer's manual states that it records history of e.g. 999 +dives. + +'Answer': Dive history is different than the dive profiles on the log. The +history only keeps track of the total number of dives and total amount of +time spent below surface. The logs, on the other hand, store the dive +profile, but they have limited amount of memory to do so. The exact amount +of dive profiles that can be stored on the device depend on sample interval +and duration of the dives. Once the memory is full the oldest dives get +overwritten with new dives. Thus we are only able to download the last 13, +30 or 199 dives. + +If you have downloaded your dives to different dive logging software before +they were overwritten, there is a high change that Subsurface can import +these. However, if the logs are only on your dive computer, they cannot be +salvaged after being over written by new dives. |