diff options
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/50-pot/subsurface-manual.pot | 363 | ||||
| -rw-r--r-- | Documentation/FAQ.wordpress | 11 | ||||
| -rw-r--r-- | Documentation/fr/po/subsurface-manual.fr.po | 539 | ||||
| -rw-r--r-- | Documentation/images/icons/atomiclogo.jpg | bin | 0 -> 6155 bytes | |||
| -rw-r--r-- | Documentation/user-manual.txt | 85 | ||||
| -rw-r--r-- | Documentation/user-manual_es.txt | 177 | ||||
| -rw-r--r-- | Documentation/user-manual_fr.html.git | 344 | ||||
| -rw-r--r-- | Documentation/user-manual_fr.txt | 318 | ||||
| -rw-r--r-- | Documentation/user-manual_ru.html.git | 363 | ||||
| -rw-r--r-- | Documentation/user-manual_ru.txt | 1 |
10 files changed, 1094 insertions, 1107 deletions
diff --git a/Documentation/50-pot/subsurface-manual.pot b/Documentation/50-pot/subsurface-manual.pot index 5f4a46ca6..bb4cab640 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-02-06 09:16+0100\n" +"POT-Creation-Date: 2015-02-15 14:23+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -205,9 +205,9 @@ msgstr "" #. type: Plain text #: ./user-manual.txt:108 msgid "" -"The *Dive Info* to the top left, giving more detailed information on the " -"dive selected in the *Dive List*, including some statistics for the selected " -"dive or for all highlighted dive(s)." +"The *Info* to the top left, giving more detailed information on the dive " +"selected in the *Dive List*, including some statistics for the selected dive " +"or for all highlighted dive(s)." msgstr "" #. type: Plain text @@ -233,7 +233,7 @@ msgid "" "information and profile of the _selected dive_ are shown in the respective " "panels. On the other hand, if one highlights more than one dive the last " "highlighted dive is the _selected dive_, but summary data of all " -"_highlighted dives_ are shown in the *Stats* tab of the *Dive Info* panel " +"_highlighted dives_ are shown in the *Stats* tab of the *Info* panel " "(maximum, minimum and average depths, durations, water temperatures and SAC; " "total time and number of dives selected)." msgstr "" @@ -274,7 +274,7 @@ msgstr "" #: ./user-manual.txt:141 #, no-wrap msgid "" -"*Info*: Show only the Dive Notes about the last selected dive and statistics " +"*Info*: Show only the Notes about the last selected dive and statistics " "for\n" "all highlighted dives.\n" msgstr "" @@ -430,11 +430,11 @@ msgid "" "guide, and some remarks about the dive. _Subsurface_ can store much more " "information than this for each dive. In order to add a dive to a dive log, " "select _Log -> Add Dive_ from the Main Menu. The program then shows three " -"panels to enter information for a dive: two tabs in the *Dive Info* panel " -"(*Dive Notes* and *Equipment*), as well as the *Dive Profile* panel that " -"displays a graphical profile of each dive. These panels are respectively " -"marked [red]#A#, [red]#B# and [red]#C# in the figure below. Each of these " -"tabs will now be explained for data entry." +"panels to enter information for a dive: two tabs in the *Info* panel " +"(*Notes* and *Equipment*), as well as the *Dive Profile* panel that displays " +"a graphical profile of each dive. These panels are respectively marked " +"[red]#A#, [red]#B# and [red]#C# in the figure below. Each of these tabs will " +"now be explained for data entry." msgstr "" #. type: Target for macro image @@ -446,10 +446,10 @@ msgstr "" #. type: Plain text #: ./user-manual.txt:215 msgid "" -"When one edits a field in Dive notes or Equipment panels, _Subsurface_ " -"enters *Editing Mode*, indicated by the message in the blue box at the top " -"of the _Dive Notes_ panel (see the image below). This message is displayed " -"in all the panels under Dive notes and Equipment when in *Editing Mode*." +"When one edits a field in Notes or Equipment panels, _Subsurface_ enters " +"*Editing Mode*, indicated by the message in the blue box at the top of the " +"_Notes_ panel (see the image below). This message is displayed in all the " +"panels under Notes and Equipment when in *Editing Mode*." msgstr "" #. type: Target for macro image @@ -473,7 +473,7 @@ msgstr "" #. type: Title ==== #: ./user-manual.txt:224 ./user-manual.txt:700 #, no-wrap -msgid "Dive Notes" +msgid "Notes" msgstr "" #. type: Plain text @@ -481,8 +481,8 @@ msgstr "" msgid "" "This panel contains the date, time and place information for a particular " "dive, environmental conditions, co-divers and buddies, as well as some " -"descriptive information. If one clicks on the *Dive Notes* tab, the " -"following fields are visible:" +"descriptive information. If one clicks on the *Notes* tab, the following " +"fields are visible:" msgstr "" #. type: Target for macro image @@ -683,7 +683,7 @@ msgid "" "The *Save* and *Cancel* buttons are used to save all the information for " "tabs in the info panel and in the dive profile panel, so there's no need to " "use them until ALL other information has been added. Here is an example of a " -"completed Dive Notes panel:" +"completed Notes panel:" msgstr "" #. type: Target for macro image @@ -938,13 +938,13 @@ msgstr "" #. type: Plain text #: ./user-manual.txt:473 msgid "" -"The information entered in the *Dive Notes* tab, the *Equipment* tab as well " -"as the *Dive Profile* can now be saved in the user's logbook by using the " -"two buttons on the top right hand of the Dive Notes tab. If the _Save_ " -"button is clicked, the dive data are saved in the current logbook. If the " -"_Cancel_ button is clicked, the newly entered dive data are discarded. When " -"exiting _Subsurface_, the user will be prompted once more to save the " -"logbook with the new dive(s)." +"The information entered in the *Notes* tab, the *Equipment* tab as well as " +"the *Dive Profile* 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 _Save_ button is " +"clicked, the dive data are saved in the current logbook. If the _Cancel_ " +"button is clicked, the newly entered dive data are discarded. When exiting " +"_Subsurface_, the user will be prompted once more to save the logbook with " +"the new dive(s)." msgstr "" #. type: Title === @@ -1057,7 +1057,7 @@ msgid "" "on most dive computers and also saves battery power of the dive computer (at " "least for those not charging while connected via USB). If, for some reason, " "the user wishes to import ALL dives from the dive computer, even though some " -"may already be in the logbook, then check the check box labelled _Force " +"may already be in the logbook, then check the check box labeled _Force " "download of all dives_." msgstr "" @@ -1324,8 +1324,8 @@ msgstr "" msgid "" "With the uploaded dives in the *Dive List*, the information from the dive " "computer is not complete and more details must be added in order to have a " -"fuller record of the dives. To do this, the *Dive Notes* and the *Equipment* " -"tabs on the top left hand of the _Subsurface_ window should be used." +"fuller record of the dives. To do this, the *Notes* and the *Equipment* tabs " +"on the top left hand of the _Subsurface_ window should be used." msgstr "" #. type: Plain text @@ -1337,8 +1337,8 @@ msgid "" "record. In a few cases, (e.g. APD rebreathers) one also has to provide the " "date and time of the dive. If the contents of this tab is changed or edited " "in any way, the message in a blue box at the top of the panel indicates that " -"the dive is being edited. If one clicks on the *Dive Notes* tab, the " -"following fields are visible:" +"the dive is being edited. If one clicks on the *Notes* tab, the following " +"fields are visible:" msgstr "" #. type: Target for macro image @@ -1611,17 +1611,17 @@ msgstr "" msgid "" "_METHOD 1_: After uploading dives from a dive computer, the dive profiles of " "the uploaded dives are shown in the *Dive profile* tab, as well as a few " -"items of information in the *Dive Notes* tab (e.g. water temperature) and in " -"the *Equipment* tab (e.g. gas pressures and gas composition). However the " -"other fields remain empty. It may be useful to simultaneously edit some of " -"the fields in the *Dive Notes* and *Equipment* tabs. For instance, it is " -"possible that a diver performed several dives during a single day, using " -"identical equipment while diving at the same dive site or with the same dive " -"master and/or buddy or tags. Instead of completing the information for each " -"of these dives separately, one can select all the dives for that day in the " -"*Dive List* and insert the same information in the *Dive Notes* and " -"*Equipment* fields that need identical information. This is achieved by " -"editing the dive notes or the equipment for any one of the selected dives." +"items of information in the *Notes* tab (e.g. water temperature) and in the " +"*Equipment* tab (e.g. gas pressures and gas composition). However the other " +"fields remain empty. It may be useful to simultaneously edit some of the " +"fields in the *Notes* and *Equipment* tabs. For instance, it is possible " +"that a diver performed several dives during a single day, using identical " +"equipment while diving at the same dive site or with the same dive master " +"and/or buddy or tags. Instead of completing the information for each of " +"these dives separately, one can select all the dives for that day in the " +"*Dive List* and insert the same information in the *Notes* and *Equipment* " +"fields that need identical information. This is achieved by editing the dive " +"notes or the equipment for any one of the selected dives." msgstr "" #. type: Plain text @@ -1643,15 +1643,15 @@ msgstr "" #: ./user-manual.txt:933 msgid "" "_METHOD 2_:There is a different way of achieving the same goal. Select a " -"dive with all the appropriate information typed into the *Dive Notes* and " +"dive with all the appropriate information typed into the *Notes* and " "*Equipment* tabs. Then, from the main menu, select _Log -> Copy dive " "components_. A box is presented with a selection of check boxes for most of " -"the fields in the *Dive Notes* and *Equipment* tabs. Select the fields to " -"be copied from the currently selected dive, then select _OK_. Now, in the " -"*Dive List*, select the dives into which this information is to be " -"pasted. Then, from the main menu, select _Log -> Paste dive components_. " -"All the selected dives now contain the data initially selected in the " -"original source dive log." +"the fields in the *Notes* and *Equipment* tabs. Select the fields to be " +"copied from the currently selected dive, then select _OK_. Now, in the *Dive " +"List*, select the dives into which this information is to be pasted. Then, " +"from the main menu, select _Log -> Paste dive components_. All the selected " +"dives now contain the data initially selected in the original source dive " +"log." msgstr "" #. type: Title ==== @@ -1713,13 +1713,13 @@ msgstr "" #. type: Plain text #: ./user-manual.txt:967 msgid "" -"The information entered in the *Dive Notes* tab and the *Equipment* tab can " -"be saved by using the two buttons on the top right hand of the *Dive Notes* " -"tab. If the _Save_ button is clicked, the dive data are saved. If the " -"_Cancel_ 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 _Subsurface_ there is a final prompt to " -"confirm that the new data should be saved." +"The information entered in the *Notes* tab and the *Equipment* tab can be " +"saved by using the two buttons on the top right hand of the *Notes* tab. If " +"the _Save_ button is clicked, the dive data are saved. If the _Cancel_ " +"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 _Subsurface_ there is a final prompt to confirm that the new data " +"should be saved." msgstr "" #. type: Title === @@ -2048,12 +2048,12 @@ msgid "" "row of cells immediately above these contains the names understood by " "_Subsurface_. The white area below the dropdown lists contains all the field " "names that _Subsurface_ recognises. These names are in blue balloons and can " -"be moved using a drag-and-frop action. For instance, _Subsurface_ expects " +"be moved using a drag-and-drop action. For instance, _Subsurface_ expects " "the column heading for Dive number (\" # \") to be \"Dive # \". If the " "column heading that _Subsurface_ expects is not in the blue cells, then drag " "the appropriate column heading from the upper area and drop it in the " "appropriate blue cell at the top of the table. To indicate the correct " -"column for \"Dive #\", drag the ballooned item labelled \"Dive # \" and drop " +"column for \"Dive #\", drag the ballooned item labeled \"Dive # \" and drop " "it in the blue cell immediately above the white cell containing \" # " "\". This is depicted in the image below." msgstr "" @@ -2084,8 +2084,8 @@ msgstr "" #: ./user-manual.txt:1179 msgid "" "_CSV_ is an abbreviation for a data file format: _Comma-Separated " -"Variables_. It is a file format allowing someone to view or edit the " -"information using a text editor such as Notebook (Windows), gedit (Linux) or " +"Values_. It is a file format allowing someone to view or edit the " +"information using a text editor such as Notepad (Windows), gedit (Linux) or " "TextWrangler (OS/X). The two main advantages of the _CSV_ format is that the " "data are easily editable as text without any proprietary software and " "ensuring all information is human-readable, not being obscured by any custom " @@ -2920,7 +2920,7 @@ msgstr "" #. type: Plain text #: ./user-manual.txt:1592 -msgid "the _Photos_ tab of the *Dive Notes* panel." +msgid "the _Photos_ tab of the *Notes* panel." msgstr "" #. type: Plain text @@ -2977,9 +2977,9 @@ msgstr "" #: ./user-manual.txt:1623 msgid "" "Photographs associated with a dive are shown as thumbnails in the _Photos_ " -"tab of the _Dive Notes_ panel. Photos taken in rapid succession during a " -"dive (therefore sometimes with large overlap on the dive profile) can easily " -"be accessed in the _Photos_ tab. This tab serves as a tool for individually " +"tab of the _Notes_ panel. Photos taken in rapid succession during a dive " +"(therefore sometimes with large overlap on the dive profile) can easily be " +"accessed in the _Photos_ tab. This tab serves as a tool for individually " "accessing the photos of a dive, while the stubs on the dive profile give an " "indication of when during a dive a photo was taken. By single-clicking on a " "thumbnail in the _Photos_ panel, a photo is selected. By double-clicking a " @@ -3043,8 +3043,8 @@ msgstr "" msgid "" "*Describe the cylinders used during the dive* This is performed in the " "*Equipment tab* of\n" -"the *Dive Info* panel, as xref:cylinder_definitions[described above]. Enter " -"the cylinders one by one,\n" +"the *Info* panel, as xref:cylinder_definitions[described above]. Enter the " +"cylinders one by one,\n" "specifying the characteristics of the cylinder and the gas composition " "within each cylinder.\n" msgstr "" @@ -3074,7 +3074,7 @@ msgid "" "right-clicking, follow the context menu to \"Add gas change\" and select the " "appropriate cylinder from\n" "those defined during the first step, above (see image below). If the\n" -"*tank bar* button in the ttolbar has been activated, the cylinder switches " +"*tank bar* button in the toolbar has been activated, the cylinder switches " "are also indicated in the\n" "tank bar.\n" msgstr "" @@ -3140,7 +3140,7 @@ msgid "" "*Within _Subsurface_ describe the cylinders used during the dive*. The diver " "needs to provide the\n" "specifications of the different cylinders, using the *Equipment* tab of the " -"*Dive Info Panel* (see\n" +"*Info Panel* (see\n" "image below where two 12 litre cylinder were used).\n" msgstr "" @@ -3166,7 +3166,7 @@ msgid "" "image below). After all\n" "the cylinder change events have been recorded on the dive profile, the " "correct cylinder pressures\n" -"for both cylinders are shown on the dive profile, as inthe image below.\n" +"for both cylinders are shown on the dive profile, as in the image below.\n" msgstr "" #. type: Target for macro image @@ -3178,7 +3178,7 @@ msgstr "" #. type: Plain text #: ./user-manual.txt:1703 msgid "" -"This section gives an example of the versatility of _Subsurface_ as a give " +"This section gives an example of the versatility of _Subsurface_ as a dive " "logging tool." msgstr "" @@ -3219,7 +3219,7 @@ msgstr "" #. type: Plain text #: ./user-manual.txt:1722 -msgid "Select pSCR in the _Dive Mode_ dropdown list on the *Dive Info* panel." +msgid "Select pSCR in the _Dive Mode_ dropdown list on the *Info* panel." msgstr "" #. type: Plain text @@ -3235,7 +3235,7 @@ msgstr "" #: ./user-manual.txt:1731 msgid "" "If a pSCR _Dive Mode_ has been selected, the dive ceiling for pSCR dives is " -"adjusted for the oxygen drop accross the mouthpiece which often requires " +"adjusted for the oxygen drop across the mouthpiece which often requires " "longer decompression periods. Below is a dive profile of a pSCR dive using " "EAN36 on the back cylinder and oxygen for decompression. Note that this dive " "lasted over two hours." @@ -3453,7 +3453,7 @@ msgid "" "two cylinders are shown as green lines overlapping the depth profile. In " "addition, start and end pressures for both oxygen and diluent cylinders are " "shown in the _Equipment Tab_. Below is a dive profile for a CCR dive, " -"including an overaly of setpoint and oxygen sensor data, as well as the " +"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." msgstr "" @@ -3489,17 +3489,17 @@ msgstr "" #. type: Title === #: ./user-manual.txt:1848 #, no-wrap -msgid "The *Dive Info* tab (for individual dives)" +msgid "The *Info* tab (for individual dives)" msgstr "" #. type: Plain text #: ./user-manual.txt:1855 msgid "" -"The Dive Info tab gives some summary information about a particular dive " -"that has been selected in the *Dive List*. Useful information here includes " -"the surface interval before the dive, the maximum and mean depths of the " -"dive, the gas volume consumed, the surface air consumption (SAC) and the " -"number of oxygen toxicity units (OTU) incurred." +"The Info tab gives some summary information about a particular dive that has " +"been selected in the *Dive List*. Useful information here includes the " +"surface interval before the dive, the maximum and mean depths of the dive, " +"the gas volume consumed, the surface air consumption (SAC) and the number of " +"oxygen toxicity units (OTU) incurred." msgstr "" #. type: Plain text @@ -4084,11 +4084,11 @@ msgid "" "breathing gas. The EAD is the depth of a hypothetical air dive that has the " "same partial pressure of nitrogen as the current depth of the nitrox dive at " "hand. A nitrox dive leads to the same decompression obligation as an air " -"dive to the depth equalling the EAD. The END is the depth of a hypothetical " +"dive to the depth equaling the EAD. The END is the depth of a hypothetical " "air dive that has the same sum of partial pressures of the narcotic gases " "nitrogen and oxygen as the current trimix dive. A trimix diver can expect " -"the same narcotic effect as a diver breathing air diving at a depth " -"equalling the END." +"the same narcotic effect as a diver breathing air diving at a depth equaling " +"the END." msgstr "" #. type: Plain text @@ -4362,14 +4362,14 @@ msgstr "" 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 " -"title from the *Dive List*. This shows a *Trip Notes* tab in the *Dive " -"Notes* panel. Here users can add or edit information about the date/time, " -"the trip location and any other general comments about the trip as a whole " -"(e.g. the dive company that was dived with, the general weather and surface " -"conditions during the trip, etc.). After entering this information, users " -"should select *Save* from the buttons at the top right of the *Trip Notes* " -"tab. The trip title in the *Dive List* panel should now reflect some of the " -"edited information." +"title from the *Dive List*. This shows a *Trip Notes* tab in the *Notes* " +"panel. Here users can add or edit information about the date/time, the trip " +"location and any other general comments about the trip as a whole (e.g. the " +"dive company that was dived with, the general weather and surface conditions " +"during the trip, etc.). After entering this information, users should " +"select *Save* from the buttons at the top right of the *Trip Notes* tab. The " +"trip title in the *Dive List* panel should now reflect some of the edited " +"information." msgstr "" #. type: Title ==== @@ -4526,9 +4526,9 @@ msgid "" "panel. Users can merge these dives onto a single dive by selecting the " "appropriate dives, right-clicking them to bring up the context menu and then " "selecting *Merge selected dives*. It may be necessary to edit the dive " -"information in the *Dive Notes* panel to reflect events or conditions that " -"apply to the merged dive. The figure below shows the depth profile of two " -"such dives that were merged:" +"information in the *Notes* panel to reflect events or conditions that apply " +"to the merged dive. The figure below shows the depth profile of two such " +"dives that were merged:" msgstr "" #. type: Target for macro image @@ -4651,10 +4651,10 @@ msgstr "" #: ./user-manual.txt:2465 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 *Dive " -"Notes* panel of _Subsurface_ (See image *A* below). Ensure that the dive " -"that you want to transfer to the timeline is depicted in the _Subsurface_ " -"*Dive Profile* panel. Select the _Facebook_ icon, and a dialogue is shown, " +"one's _Facebook_ timeline is easy. A _Facebook_ icon appears in the *Notes* " +"panel of _Subsurface_ (See image *A* below). Ensure that the dive that you " +"want to transfer to the timeline is depicted in the _Subsurface_ *Dive " +"Profile* panel. Select the _Facebook_ icon, and a dialogue is shown, " "determining the amount of additional information transferred with the dive " "profile (see image *B*, below). In order to transfer a dive profile to " "_Facebook_, the name of a _Facebook_ album needs to be provided. The " @@ -4744,7 +4744,7 @@ msgstr "" #. type: Plain text #: ./user-manual.txt:2501 msgid "" -"_DiveShare_ is also a dive log repostory on the Internet focusing on the " +"_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, " "so registration with _http://scubadiveshare.com_ is required." msgstr "" @@ -5219,7 +5219,7 @@ msgstr "" msgid "" " ** *Default cylinder*: Here users can specify the default cylinder listed " "in\n" -" the *Equipment* tab of the *Dive Notes* panel.\n" +" the *Equipment* tab of the *Notes* panel.\n" msgstr "" #. type: Plain text @@ -5658,7 +5658,7 @@ msgid "" "sections (see image below). The *setup* parameters for a dive are entered " "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 Dive Notes." +"and Notes." msgstr "" #. type: Plain text @@ -5720,16 +5720,15 @@ msgstr "" #. type: Plain text #: ./user-manual.txt:2924 msgid "" -"In the table labelled _Available Gases_, add the information of the " -"cylinders to be used as well as the gas composition within that " -"cylinder. This is done in a similar way as for <<S_CylinderData,providing " -"cylinder data for dive logs>>. Choose the cylinder type by double clicking " -"the cylinder type and using the dropdown list, then specify the work " -"pressure of this cylinder. By leaving the oxygen concentration (O2%) filed " -"empty, the cylinder is assumed to contain air. Otherwise enter the oxygen " -"and/or helium concentration in the boxes provided in this dialogue. Add " -"additional cylinders by using the \"+\" icon to the top righthand of the " -"dialogue." +"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 " +"in a similar way as for <<S_CylinderData,providing cylinder data for dive " +"logs>>. Choose the cylinder type by double clicking the cylinder type and " +"using the dropdown list, then specify the work pressure of this cylinder. By " +"leaving the oxygen concentration (O2%) filed empty, the cylinder is assumed " +"to contain air. Otherwise enter the oxygen and/or helium concentration in " +"the boxes provided in this dialogue. Add additional cylinders by using the " +"\"+\" icon to the top righthand of the dialogue." msgstr "" #. type: Plain text @@ -5883,7 +5882,7 @@ msgid "" "features of the dive have been completed, e.g. the bottom time segment and " "deep stops (if these are implemented). Leave the remaining waypoints on the " "ascent to _Subsurface_. In most cases _Subsurface_ computes additional way " -"points in order to fulfil decompression requirements for that dive. A " +"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 _Dive Planner Points_ dialogue can be " "edited by hand in order to obtain a precise presentation of the dive " @@ -5949,7 +5948,7 @@ msgstr "" 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 " -"by checking any of the options under the _Dive Notes_ section of the dive " +"by checking any of the options under the _Notes_ section of the dive " "planner, immediately to the left of the _Dive Plan Details_. If a _Verbatim " "diveplan_ is requested, a detailed sentence-level explanation of the dive " "plan is given. If any of the management specifications have been exceeded " @@ -6050,7 +6049,7 @@ msgid "" "ratio (default 10:1) as well as the metabolism rate. The calculation also " "takes the oxygen drop\n" "accross the mouthpiece of the rebreather into account. If the\n" -"pO~2~ drops below what is considered a save value, a warning apears in the " +"pO~2~ drops below what is considered a save value, a warning appears in the " "_Dive plan\n" "details_. A typical pSCR configuration is with a single cylinder and one or " "more bail-out\n" @@ -6062,7 +6061,7 @@ msgid "" "is comparable\n" "to that of the CCR dive above, but note the longer ascent duration due to " "the lower oxygen\n" -"in the loop due to the oxygen drop accross the mouthpiece of the pSCR " +"in the loop due to the oxygen drop across the mouthpiece of the pSCR " "equipment.\n" msgstr "" @@ -6153,8 +6152,8 @@ msgstr "" msgid "" "Dive plans have many characteristics in common with dive logs (dive profile, " "dive notes, etc). After a dive plan has been saved, the dive details and " -"gas calculations are saved in the *Dive Notes* tab. While a dive plan is " -"being designed, it can be printed using the _Print_ button in the dive " +"gas calculations are saved in the *Notes* tab. While a dive plan is being " +"designed, it can be printed using the _Print_ button in the dive " "planner. This prints the dive details and gas calculations in the _Dive Plan " "Details_ panel of the dive planner. However, after the plan has been saved, " "it is represented in a way very similar to a dive log and the gas " @@ -6367,7 +6366,7 @@ msgid "<<S_ViewPanels,_Profile_>> - View only the *Dive Profile* panel." msgstr "" #. type: Plain text -#: ./user-manual.txt:3187 +#: ./user-manual.txt:3115 msgid "<<S_ViewPanels,_Info_>> - View only the *Dive Notes* panel." msgstr "" @@ -7132,8 +7131,8 @@ msgstr "" #. type: Plain text #: ./user-manual.txt:3549 msgid "" -"In the dropdown list on the middle right labeled '_Pre-configured " -"imports_\", select _APD Log Viewer_." +"In the dropdown list on the top left labeled '_Pre-configured imports_\", " +"select _APD Log Viewer_." msgstr "" #. type: Plain text @@ -7386,30 +7385,36 @@ msgstr "" msgid "Exporting from Atomic Logbook" msgstr "" +#. type: Named 'icon' AttributeList argument for style 'icon' +#: ./user-manual.txt:3632 +#, no-wrap +msgid "images/icons/atomiclogo.jpg" +msgstr "" + #. type: Plain text -#: ./user-manual.txt:3638 +#: ./user-manual.txt:3566 msgid "" "Atomic Logbook is a Windows software by Atomic Aquatics. It allows " "downloading of dive information from Cobalt and Cobalt 2 dive computers. " -"The divelog is kept in a SQlite database at " +"The divelog is kept in a SQLite database at " "C:\\ProgramData\\AtomicsAquatics\\Cobalt-Logbook\\Cobalt.db. This file can " "be directly imported to Subsurface." msgstr "" #. type: Title === -#: ./user-manual.txt:3640 +#: ./user-manual.txt:3568 #, no-wrap msgid "Exporting from Mares Dive Organiser V2.1" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: ./user-manual.txt:3643 +#: ./user-manual.txt:3571 #, no-wrap msgid "images/icons/mareslogo.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:3651 +#: ./user-manual.txt:3579 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 " @@ -7420,7 +7425,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3656 +#: ./user-manual.txt:3584 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 " @@ -7428,36 +7433,36 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3659 +#: ./user-manual.txt:3587 msgid "" "Rename the file to DiveOrganiserxxxxx.zip. Inside the zipped directory is a " "file _DiveOrganiser.sdf_." msgstr "" #. type: Plain text -#: ./user-manual.txt:3660 +#: ./user-manual.txt:3588 msgid "Extract the _.sdf_ file from the zipped folder to your Desktop." msgstr "" #. type: Plain text -#: ./user-manual.txt:3661 +#: ./user-manual.txt:3589 msgid "The password for accessing the .zip file is _mares_." msgstr "" #. type: Title === -#: ./user-manual.txt:3663 +#: ./user-manual.txt:3591 #, no-wrap msgid "Exporting from *DivingLog 5.0*" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: ./user-manual.txt:3665 +#: ./user-manual.txt:3593 #, no-wrap msgid "images/icons/divingloglogo.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:3674 +#: ./user-manual.txt:3602 msgid "" "Unfortunately DivingLog XML files give us no indication on the preferences " "set on one's system. So in order for _Subsurface_ to be able to successfully " @@ -7468,28 +7473,28 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3676 +#: ./user-manual.txt:3604 msgid "In DivingLog open the 'File -> Export -> XML' menu" msgstr "" #. type: Plain text -#: ./user-manual.txt:3677 +#: ./user-manual.txt:3605 msgid "Select the dives to export" msgstr "" #. type: Plain text -#: ./user-manual.txt:3678 +#: ./user-manual.txt:3606 msgid "Click on the export button and select the filename" msgstr "" #. type: Title == -#: ./user-manual.txt:3680 +#: ./user-manual.txt:3608 #, no-wrap msgid "APPENDIX D: Exporting a spreadsheet to CSV format" msgstr "" #. type: Plain text -#: ./user-manual.txt:3689 +#: ./user-manual.txt:3617 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 " @@ -7502,7 +7507,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3695 +#: ./user-manual.txt:3623 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 " @@ -7513,40 +7518,40 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3697 +#: ./user-manual.txt:3625 msgid "Date: use one of the following formats: yyyy-mm-dd, dd.mm.yyyy, mm/dd/yyyy" msgstr "" #. type: Plain text -#: ./user-manual.txt:3698 +#: ./user-manual.txt:3626 msgid "Duration: the format should be minutes:seconds." msgstr "" #. type: Plain text -#: ./user-manual.txt:3699 +#: ./user-manual.txt:3627 msgid "" -"Unit system: only one unit system shold be used (i.e., no mixture between " +"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:3700 +#: ./user-manual.txt:3628 msgid "Tags and buddies: values should be separated using a comma." msgstr "" #. type: Plain text -#: ./user-manual.txt:3701 +#: ./user-manual.txt:3629 msgid "GPS position: users must use decimal degrees, e.g. 30.22496 30.821798" msgstr "" #. type: Title === -#: ./user-manual.txt:3702 +#: ./user-manual.txt:3630 #, no-wrap msgid "_LibreOffice Calc_ and _OpenOffice Calc_" msgstr "" #. type: Plain text -#: ./user-manual.txt:3706 +#: ./user-manual.txt:3634 msgid "" "These are open source spreadsheet applications forming parts of larger open " "source office suite applications. The user interaction with _LibreOffice_ " @@ -7557,13 +7562,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: ./user-manual.txt:3707 +#: ./user-manual.txt:3635 #, no-wrap msgid "images/LOffice_spreadsheetdata.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:3710 +#: ./user-manual.txt:3638 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 " @@ -7571,13 +7576,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: ./user-manual.txt:3711 +#: ./user-manual.txt:3639 #, no-wrap msgid "images/LOffice_save_as_options.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:3714 +#: ./user-manual.txt:3642 msgid "" "After selecting _Save_, select the appropriate field delimiter (choose _Tab_ " "to prevent conflicts with the comma when using this as a decimal point), " @@ -7585,13 +7590,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: ./user-manual.txt:3715 +#: ./user-manual.txt:3643 #, no-wrap msgid "images/LOffice_field_options.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:3718 +#: ./user-manual.txt:3646 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 " @@ -7599,13 +7604,13 @@ msgid "" msgstr "" #. type: Title === -#: ./user-manual.txt:3719 +#: ./user-manual.txt:3647 #, no-wrap msgid "Microsoft _Excel_" msgstr "" #. type: Plain text -#: ./user-manual.txt:3725 +#: ./user-manual.txt:3653 msgid "" "The field delimiter (called \"_list separator_\" in Microsoft manuals) is " "not accessible from within _Excel_ and needs to be set through the " @@ -7616,19 +7621,19 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3727 +#: ./user-manual.txt:3655 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:3728 +#: ./user-manual.txt:3656 msgid "Open the _Regional and Language Options_ dialog box." msgstr "" #. type: Plain text -#: ./user-manual.txt:3731 +#: ./user-manual.txt:3659 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 " @@ -7636,48 +7641,48 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3732 +#: ./user-manual.txt:3660 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:3733 +#: ./user-manual.txt:3661 msgid "Click _OK_ twice." msgstr "" #. type: Plain text -#: ./user-manual.txt:3735 +#: ./user-manual.txt:3663 msgid "Below is an image of the _Control Panel_:" msgstr "" #. type: Target for macro image -#: ./user-manual.txt:3736 +#: ./user-manual.txt:3664 #, no-wrap msgid "images/Win_SaveCSV2.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:3739 +#: ./user-manual.txt:3667 msgid "To export the dive log in CSV format:" msgstr "" #. type: Plain text -#: ./user-manual.txt:3741 +#: ./user-manual.txt:3669 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:3742 +#: ./user-manual.txt:3670 #, no-wrap msgid "images/Win_SaveCSV1.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:3745 +#: ./user-manual.txt:3673 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 " @@ -7687,13 +7692,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: ./user-manual.txt:3746 +#: ./user-manual.txt:3674 #, no-wrap msgid "images/Win_SaveCSV3.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:3749 +#: ./user-manual.txt:3677 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 " @@ -7702,19 +7707,19 @@ msgid "" msgstr "" #. type: Title == -#: ./user-manual.txt:3750 +#: ./user-manual.txt:3678 #, no-wrap msgid "APPENDIX E: FAQs." msgstr "" #. type: Title === -#: ./user-manual.txt:3752 +#: ./user-manual.txt:3680 #, no-wrap msgid "Subsurface appears to miscalculate gas consumption and SAC" msgstr "" #. type: Plain text -#: ./user-manual.txt:3756 +#: ./user-manual.txt:3684 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_ " @@ -7722,7 +7727,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3762 +#: ./user-manual.txt:3690 msgid "" "'Answer': Not really. What happens is that _Subsurface_ actually calculates " "gas consumption differently - and better - than you expect. In particular, " @@ -7732,7 +7737,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3768 +#: ./user-manual.txt:3696 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 " @@ -7742,12 +7747,12 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3770 +#: ./user-manual.txt:3698 msgid "+consumption = (amount_of_air_at_beginning - amount_of_air_at_end)+" msgstr "" #. type: Plain text -#: ./user-manual.txt:3776 +#: ./user-manual.txt:3704 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 " @@ -7758,12 +7763,12 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3778 +#: ./user-manual.txt:3706 msgid "+12.2*((220-100)/1.013)+" msgstr "" #. type: Plain text -#: ./user-manual.txt:3783 +#: ./user-manual.txt:3711 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 " @@ -7773,7 +7778,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3789 +#: ./user-manual.txt:3717 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 " @@ -7784,7 +7789,7 @@ msgid "" msgstr "" #. type: Title === -#: ./user-manual.txt:3790 +#: ./user-manual.txt:3718 #, no-wrap msgid "" "Some dive profiles have time discrepancies with the recorded samples from my " @@ -7792,7 +7797,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3794 +#: ./user-manual.txt:3722 msgid "" "_Subsurface_ ends up ignoring surface time for many things (average depth, " "divetime, SAC, etc). 'Question': Why do dive durations in my dive computer " @@ -7800,7 +7805,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3802 +#: ./user-manual.txt:3730 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 " diff --git a/Documentation/FAQ.wordpress b/Documentation/FAQ.wordpress index 1d7082eae..0cd64ae15 100644 --- a/Documentation/FAQ.wordpress +++ b/Documentation/FAQ.wordpress @@ -100,4 +100,15 @@ Many common programs are already supported and we are always happy to try to add We support a large number of dive computers already and are always happy to add support for more. Please contact us via the user forums so we can try to help. Some vendors have actively helped us in our work and adding support for new models from those vendors is usually easy. Other vendors are more neutral, some are actively hostile. Without help from the vendor it can be rather challenging to reverse engineer the transfer protocol and the dive encoding, but with sufficient help from you it is often possible to do so. +A good starting point is often to send us a libdivecomputer log and dump (you can pick those in the dive computer download dialog) when connecting to the dive computer using a similar existing model (if possible). + +[/expand] +[expand title="Is there a virus in the Subsurface installer?"] + +If you get a warning message or if Subsurface is blocked by your anti virus software, that is almost certainly a false positive. Subsurface is not built on a Windows machine, it is cross built from source on Linux on a well maintained and clean server. + +Most/all Windows AV software packages support an "add exception" feature, which skips an executable from being scanned. Try adding Subsurface to the list of non-harmful software. If the Subsurface installer download is detected as malware, please temporary disable your AV software until Subsurface is installed + +In either case, please inform your AV software vendor of a "false positive" as we assure your that Subsurface is not malware + [/expand] diff --git a/Documentation/fr/po/subsurface-manual.fr.po b/Documentation/fr/po/subsurface-manual.fr.po index 18f4a6d06..a906bb427 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-02-06 09:16+0100\n" -"PO-Revision-Date: 2015-02-06 14:30+0100\n" +"POT-Creation-Date: 2015-02-15 14:23+0100\n" +"PO-Revision-Date: 2015-02-15 14:25+0100\n" "Last-Translator: Guillaume GARDET <guillaume.gardet@opensuse.org>\n" "Language-Team: French <opensuse-fr@opensuse.org>\n" "Language: fr\n" @@ -275,14 +275,14 @@ msgstr "" #. type: Plain text #: user-manual.txt:108 msgid "" -"The *Dive Info* to the top left, giving more detailed information on the " -"dive selected in the *Dive List*, including some statistics for the selected " -"dive or for all highlighted dive(s)." +"The *Info* to the top left, giving more detailed information on the dive " +"selected in the *Dive List*, including some statistics for the selected dive " +"or for all highlighted dive(s)." msgstr "" -"Les *informations de plongée* en haut à gauche, fournissent des informations " -"détaillées sur la plongée sélectionnée dans la *liste des plongées*, dont " -"des statistiques pour la plongée sélectionnée ou pour toutes les plongées " -"mises en surbrillance." +"Les *informations* en haut à gauche, fournissent des informations détaillées " +"sur la plongée sélectionnée dans la *liste des plongées*, dont des " +"statistiques pour la plongée sélectionnée ou pour toutes les plongées mises " +"en surbrillance." #. type: Plain text #: user-manual.txt:111 @@ -313,7 +313,7 @@ msgid "" "information and profile of the _selected dive_ are shown in the respective " "panels. On the other hand, if one highlights more than one dive the last " "highlighted dive is the _selected dive_, but summary data of all " -"_highlighted dives_ are shown in the *Stats* tab of the *Dive Info* panel " +"_highlighted dives_ are shown in the *Stats* tab of the *Info* panel " "(maximum, minimum and average depths, durations, water temperatures and SAC; " "total time and number of dives selected)." msgstr "" @@ -323,9 +323,9 @@ msgstr "" "plus d'une plongée est mise en surbrillance seule la dernière mise en " "surbrillance est la _plongée sélectionnée_, mais les données de _toutes les " "plongées mises en surbrillances_ sont affichées dans l'onglet *Stats* du " -"panneau *informations de plongée* (profondeur maximale, minimale et moyenne, " -"les durées, les températures de l'eau et le SAC (air consommé); temps total " -"et nombre de plongées sélectionnées)." +"panneau *informations* (profondeur maximale, minimale et moyenne, les " +"durées, les températures de l'eau et le SAC (air consommé); temps total et " +"nombre de plongées sélectionnées)." #. type: Target for macro image #: user-manual.txt:127 @@ -366,7 +366,7 @@ msgstr "*Profil* : affiche uniquement le profile de plongée de la plongée sél #: user-manual.txt:141 #, no-wrap msgid "" -"*Info*: Show only the Dive Notes about the last selected dive and statistics for\n" +"*Info*: Show only the Notes about the last selected dive and statistics for\n" "all highlighted dives.\n" msgstr "" "*Info* : affiche uniquement les notes de plongées de la dernière plongée sélectionnée et les statistiques pour\n" @@ -541,11 +541,11 @@ msgid "" "guide, and some remarks about the dive. _Subsurface_ can store much more " "information than this for each dive. In order to add a dive to a dive log, " "select _Log -> Add Dive_ from the Main Menu. The program then shows three " -"panels to enter information for a dive: two tabs in the *Dive Info* panel " -"(*Dive Notes* and *Equipment*), as well as the *Dive Profile* panel that " -"displays a graphical profile of each dive. These panels are respectively " -"marked [red]#A#, [red]#B# and [red]#C# in the figure below. Each of these " -"tabs will now be explained for data entry." +"panels to enter information for a dive: two tabs in the *Info* panel " +"(*Notes* and *Equipment*), as well as the *Dive Profile* panel that displays " +"a graphical profile of each dive. These panels are respectively marked " +"[red]#A#, [red]#B# and [red]#C# in the figure below. Each of these tabs will " +"now be explained for data entry." msgstr "" #. type: Target for macro image @@ -557,10 +557,10 @@ msgstr "images/AddDive1_f20.jpg" #. type: Plain text #: user-manual.txt:215 msgid "" -"When one edits a field in Dive notes or Equipment panels, _Subsurface_ " -"enters *Editing Mode*, indicated by the message in the blue box at the top " -"of the _Dive Notes_ panel (see the image below). This message is displayed " -"in all the panels under Dive notes and Equipment when in *Editing Mode*." +"When one edits a field in Notes or Equipment panels, _Subsurface_ enters " +"*Editing Mode*, indicated by the message in the blue box at the top of the " +"_Notes_ panel (see the image below). This message is displayed in all the " +"panels under Notes and Equipment when in *Editing Mode*." msgstr "" #. type: Target for macro image @@ -584,16 +584,16 @@ msgstr "" #. type: Title ==== #: user-manual.txt:224 user-manual.txt:700 #, no-wrap -msgid "Dive Notes" -msgstr "Notes de plongée" +msgid "Notes" +msgstr "Notes" #. type: Plain text #: user-manual.txt:230 msgid "" "This panel contains the date, time and place information for a particular " "dive, environmental conditions, co-divers and buddies, as well as some " -"descriptive information. If one clicks on the *Dive Notes* tab, the " -"following fields are visible:" +"descriptive information. If one clicks on the *Notes* tab, the following " +"fields are visible:" msgstr "" #. type: Target for macro image @@ -781,7 +781,7 @@ msgid "" "The *Save* and *Cancel* buttons are used to save all the information for " "tabs in the info panel and in the dive profile panel, so there's no need to " "use them until ALL other information has been added. Here is an example of a " -"completed Dive Notes panel:" +"completed Notes panel:" msgstr "" #. type: Target for macro image @@ -1031,13 +1031,13 @@ msgstr "" #. type: Plain text #: user-manual.txt:473 msgid "" -"The information entered in the *Dive Notes* tab, the *Equipment* tab as well " -"as the *Dive Profile* can now be saved in the user's logbook by using the " -"two buttons on the top right hand of the Dive Notes tab. If the _Save_ " -"button is clicked, the dive data are saved in the current logbook. If the " -"_Cancel_ button is clicked, the newly entered dive data are discarded. When " -"exiting _Subsurface_, the user will be prompted once more to save the " -"logbook with the new dive(s)." +"The information entered in the *Notes* tab, the *Equipment* tab as well as " +"the *Dive Profile* 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 _Save_ button is " +"clicked, the dive data are saved in the current logbook. If the _Cancel_ " +"button is clicked, the newly entered dive data are discarded. When exiting " +"_Subsurface_, the user will be prompted once more to save the logbook with " +"the new dive(s)." msgstr "" #. type: Title === @@ -1150,7 +1150,7 @@ msgid "" "on most dive computers and also saves battery power of the dive computer (at " "least for those not charging while connected via USB). If, for some reason, " "the user wishes to import ALL dives from the dive computer, even though some " -"may already be in the logbook, then check the check box labelled _Force " +"may already be in the logbook, then check the check box labeled _Force " "download of all dives_." msgstr "" @@ -1416,8 +1416,8 @@ msgstr "" msgid "" "With the uploaded dives in the *Dive List*, the information from the dive " "computer is not complete and more details must be added in order to have a " -"fuller record of the dives. To do this, the *Dive Notes* and the *Equipment* " -"tabs on the top left hand of the _Subsurface_ window should be used." +"fuller record of the dives. To do this, the *Notes* and the *Equipment* tabs " +"on the top left hand of the _Subsurface_ window should be used." msgstr "" #. type: Plain text @@ -1429,8 +1429,8 @@ msgid "" "In a few cases, (e.g. APD rebreathers) one also has to provide the date and " "time of the dive. If the contents of this tab is changed or edited in any " "way, the message in a blue box at the top of the panel indicates that the " -"dive is being edited. If one clicks on the *Dive Notes* tab, the following " -"fields are visible:" +"dive is being edited. If one clicks on the *Notes* tab, the following fields " +"are visible:" msgstr "" #. type: Target for macro image @@ -1686,17 +1686,17 @@ msgstr "" msgid "" "_METHOD 1_: After uploading dives from a dive computer, the dive profiles of " "the uploaded dives are shown in the *Dive profile* tab, as well as a few " -"items of information in the *Dive Notes* tab (e.g. water temperature) and in " -"the *Equipment* tab (e.g. gas pressures and gas composition). However the " -"other fields remain empty. It may be useful to simultaneously edit some of " -"the fields in the *Dive Notes* and *Equipment* tabs. For instance, it is " -"possible that a diver performed several dives during a single day, using " -"identical equipment while diving at the same dive site or with the same dive " -"master and/or buddy or tags. Instead of completing the information for each " -"of these dives separately, one can select all the dives for that day in the " -"*Dive List* and insert the same information in the *Dive Notes* and " -"*Equipment* fields that need identical information. This is achieved by " -"editing the dive notes or the equipment for any one of the selected dives." +"items of information in the *Notes* tab (e.g. water temperature) and in the " +"*Equipment* tab (e.g. gas pressures and gas composition). However the other " +"fields remain empty. It may be useful to simultaneously edit some of the " +"fields in the *Notes* and *Equipment* tabs. For instance, it is possible " +"that a diver performed several dives during a single day, using identical " +"equipment while diving at the same dive site or with the same dive master " +"and/or buddy or tags. Instead of completing the information for each of " +"these dives separately, one can select all the dives for that day in the " +"*Dive List* and insert the same information in the *Notes* and *Equipment* " +"fields that need identical information. This is achieved by editing the dive " +"notes or the equipment for any one of the selected dives." msgstr "" #. type: Plain text @@ -1718,15 +1718,15 @@ msgstr "" #: user-manual.txt:933 msgid "" "_METHOD 2_:There is a different way of achieving the same goal. Select a " -"dive with all the appropriate information typed into the *Dive Notes* and " +"dive with all the appropriate information typed into the *Notes* and " "*Equipment* tabs. Then, from the main menu, select _Log -> Copy dive " "components_. A box is presented with a selection of check boxes for most of " -"the fields in the *Dive Notes* and *Equipment* tabs. Select the fields to " -"be copied from the currently selected dive, then select _OK_. Now, in the " -"*Dive List*, select the dives into which this information is to be pasted. " -"Then, from the main menu, select _Log -> Paste dive components_. All the " -"selected dives now contain the data initially selected in the original " -"source dive log." +"the fields in the *Notes* and *Equipment* tabs. Select the fields to be " +"copied from the currently selected dive, then select _OK_. Now, in the *Dive " +"List*, select the dives into which this information is to be pasted. Then, " +"from the main menu, select _Log -> Paste dive components_. All the selected " +"dives now contain the data initially selected in the original source dive " +"log." msgstr "" #. type: Title ==== @@ -1787,13 +1787,13 @@ msgstr "" #. type: Plain text #: user-manual.txt:967 msgid "" -"The information entered in the *Dive Notes* tab and the *Equipment* tab can " -"be saved by using the two buttons on the top right hand of the *Dive Notes* " -"tab. If the _Save_ button is clicked, the dive data are saved. If the " -"_Cancel_ 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 _Subsurface_ there is a final prompt to confirm that the " -"new data should be saved." +"The information entered in the *Notes* tab and the *Equipment* tab can be " +"saved by using the two buttons on the top right hand of the *Notes* tab. If " +"the _Save_ button is clicked, the dive data are saved. If the _Cancel_ " +"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 _Subsurface_ there is a final prompt to confirm that the new data " +"should be saved." msgstr "" #. type: Title === @@ -2121,12 +2121,12 @@ msgid "" "row of cells immediately above these contains the names understood by " "_Subsurface_. The white area below the dropdown lists contains all the field " "names that _Subsurface_ recognises. These names are in blue balloons and can " -"be moved using a drag-and-frop action. For instance, _Subsurface_ expects " +"be moved using a drag-and-drop action. For instance, _Subsurface_ expects " "the column heading for Dive number (\" # \") to be \"Dive # \". If the " "column heading that _Subsurface_ expects is not in the blue cells, then drag " "the appropriate column heading from the upper area and drop it in the " "appropriate blue cell at the top of the table. To indicate the correct " -"column for \"Dive #\", drag the ballooned item labelled \"Dive # \" and drop " +"column for \"Dive #\", drag the ballooned item labeled \"Dive # \" and drop " "it in the blue cell immediately above the white cell containing \" # \". " "This is depicted in the image below." msgstr "" @@ -2156,18 +2156,18 @@ msgstr "" #. type: delimited block * #: user-manual.txt:1179 msgid "" -"_CSV_ is an abbreviation for a data file format: _Comma-Separated " -"Variables_. It is a file format allowing someone to view or edit the " -"information using a text editor such as Notebook (Windows), gedit (Linux) or " -"TextWrangler (OS/X). The two main advantages of the _CSV_ format is that the " -"data are easily editable as text without any proprietary software and " -"ensuring all information is human-readable, not being obscured by any custom " -"or proprietary attributes that proprietary software insert into files. " -"Because of its simplicity the _CSV_ format is used as an interchange format " -"between many software packages, e.g. between spreadsheet, statistical, " -"graphics, database and diving software. Within _Subsurface_, _CSV_ files can " -"also be used to import information from other sources such as spreadsheet-" -"based dive logs and even from some dive computers." +"_CSV_ is an abbreviation for a data file format: _Comma-Separated Values_. " +"It is a file format allowing someone to view or edit the information using a " +"text editor such as Notepad (Windows), gedit (Linux) or TextWrangler (OS/X). " +"The two main advantages of the _CSV_ format is that the data are easily " +"editable as text without any proprietary software and ensuring all " +"information is human-readable, not being obscured by any custom or " +"proprietary attributes that proprietary software insert into files. Because " +"of its simplicity the _CSV_ format is used as an interchange format between " +"many software packages, e.g. between spreadsheet, statistical, graphics, " +"database and diving software. Within _Subsurface_, _CSV_ files can also be " +"used to import information from other sources such as spreadsheet-based dive " +"logs and even from some dive computers." msgstr "" #. type: delimited block * @@ -2964,7 +2964,7 @@ msgid "After the images have been loaded, they appear in two places:" msgstr "" #. type: Plain text -#: user-manual.txt:1592 +#: user-manual.txt:1588 msgid "the _Photos_ tab of the *Dive Notes* panel." msgstr "" @@ -3022,9 +3022,9 @@ msgstr "" #: user-manual.txt:1623 msgid "" "Photographs associated with a dive are shown as thumbnails in the _Photos_ " -"tab of the _Dive Notes_ panel. Photos taken in rapid succession during a " -"dive (therefore sometimes with large overlap on the dive profile) can easily " -"be accessed in the _Photos_ tab. This tab serves as a tool for individually " +"tab of the _Notes_ panel. Photos taken in rapid succession during a dive " +"(therefore sometimes with large overlap on the dive profile) can easily be " +"accessed in the _Photos_ tab. This tab serves as a tool for individually " "accessing the photos of a dive, while the stubs on the dive profile give an " "indication of when during a dive a photo was taken. By single-clicking on a " "thumbnail in the _Photos_ panel, a photo is selected. By double-clicking a " @@ -3086,71 +3086,7 @@ msgstr "" #: user-manual.txt:1651 #, no-wrap msgid "" -"*Describe the cylinders used during the dive* This is performed in the *Equipment tab* of\n" -"the *Dive Info* panel, as xref:cylinder_definitions[described above]. Enter the cylinders one by one,\n" -"specifying the characteristics of the cylinder and the gas composition within each cylinder.\n" -msgstr "" - -#. type: Plain text -#: user-manual.txt:1656 -#, no-wrap -msgid "" -"*Record the times at which switches from one cylinder to another was done:* This is information\n" -"provided by some dive computers (provided the diver indicated these changes to the dive computer\n" -"by pressing specific buttons). If the dive computer does not provide the information, the diver has to\n" -"record these changes using a different method, e.g. writing it on a slate.\n" -msgstr "" - -#. type: Plain text -#: user-manual.txt:1664 -#, no-wrap -msgid "" -"*Record the cylinder changes on the dive profile*: If the latter option\n" -"was followed, the diver needs to indicate the gas change event by right-clicking at the appropriate point\n" -"in time on the *Dive Profile* panel and indicating the cylinder to which the change was made. After\n" -"right-clicking, follow the context menu to \"Add gas change\" and select the appropriate cylinder from\n" -"those defined during the first step, above (see image below). If the\n" -"*tank bar* button in the ttolbar has been activated, the cylinder switches are also indicated in the\n" -"tank bar.\n" -msgstr "" - -#. type: Plain text -#: user-manual.txt:1668 -msgid "" -"Having performed these tasks, _Subsurface_ indicates the appropriate use of " -"cylinders in the dive profile. Below is a multi-cylinder dive, starting off " -"with EAN28, then changing cylinders to EAN50 after 26 minutes to perform " -"decompression." -msgstr "" - -#. type: Target for macro image -#: user-manual.txt:1669 -#, no-wrap -msgid "images/multicylinder_dive.jpg" -msgstr "images/multicylinder_dive.jpg" - -#. type: Title ==== -#: user-manual.txt:1671 -#, no-wrap -msgid "Sidemount dives" -msgstr "" - -#. type: Plain text -#: user-manual.txt:1677 -msgid "" -"Sidemount diving is just another form of multicylinder diving, often with " -"both or all cylinders having the same gas mixture. Although it is a popular " -"configuration for cave divers, sidemount diving can be performed by " -"recreational divers who have completed the appropriate training. Sidemount " -"dive logging involves, exactly as with multicylinder dives, above, three " -"steps:" -msgstr "" - -#. type: Plain text -#: user-manual.txt:1686 -#, no-wrap -msgid "" -"*During the dive, record cylinder switch events*. Since sidemount diving normally involves two\n" +"*During the dive, recording cylinder switch events*. Since sidemount diving normally involves two\n" "cylinders with air or with the same gas mixture, _Subsurface_ distinguishes among these different\n" "cylinders. In contrast, most dive computers that allow gas switching only distinguish among different\n" "_gases_ used, not among different _cylinders_ used. This means that when sidemount dives are downloaded\n" @@ -3165,7 +3101,7 @@ msgstr "" #, no-wrap msgid "" "*Within _Subsurface_ describe the cylinders used during the dive*. The diver needs to provide the\n" -"specifications of the different cylinders, using the *Equipment* tab of the *Dive Info Panel* (see\n" +"specifications of the different cylinders, using the *Equipment* tab of the *Info Panel* (see\n" "image below where two 12 litre cylinder were used).\n" msgstr "" @@ -3182,7 +3118,7 @@ msgid "" "profile with a cylinder symbol. If the *Tank Bar* is activated using the toolbar to the left of the\n" "profile, then the cylinder change is also indicated on the Tank Bar (see image below). After all\n" "the cylinder change events have been recorded on the dive profile, the correct cylinder pressures\n" -"for both cylinders are shown on the dive profile, as inthe image below.\n" +"for both cylinders are shown on the dive profile, as in the image below.\n" msgstr "" #. type: Target for macro image @@ -3194,77 +3130,12 @@ msgstr "images/sidemount1.jpg" #. type: Plain text #: user-manual.txt:1703 msgid "" -"This section gives an example of the versatility of _Subsurface_ as a give " +"This section gives an example of the versatility of _Subsurface_ as a dive " "logging tool." msgstr "" #. type: Title ==== -#: user-manual.txt:1706 -#, no-wrap -msgid "Semi-closed circuit rebreather (SCR) dives" -msgstr "" - -#. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:1708 -#, no-wrap -msgid "images/halcyon_RB80.jpg" -msgstr "images/halcyon_RB80.jpg" - -#. type: Plain text -#: user-manual.txt:1718 -msgid "" -"Passive semi-closed rebreathers (pSCR) comprise a technical advance in " -"diving equipment that recirculates the breathing gas that a diver breathes, " -"while removing carbon dioxide from the exhaled gas. While a small amount " -"(typically a tenth) of the exhaled breathing gas is released into the water, " -"a small amount of fresh gas is released from the back gas cylinder " -"(typically containing nitrox). A diver, using a single cylinder of " -"breathing gas can therefore dive for much longer periods than using a " -"recreational open-circuit configuration. With pSCR equipment, a very small " -"amount of breathing gas is released every time the breather inhales. With " -"active SCR (aSCR) equipment, in contrast, a small amount of breathing gas is " -"released continuously from the back cylinder." -msgstr "" - -#. type: Plain text -#: user-manual.txt:1720 -msgid "" -"To log pSCR dives, no special procedures are required, just the normal steps " -"outlined above:" -msgstr "" - -#. type: Plain text -#: user-manual.txt:1722 -msgid "Select pSCR in the _Dive Mode_ dropdown list on the *Dive Info* panel." -msgstr "" - -#. type: Plain text -#: user-manual.txt:1726 -msgid "" -"pSCR diving often involves gas changes, requiring an additional cylinder. " -"Define all the appropriate cylinders as described above and indicate the " -"cylinder/gas changes as described above in the section on xref:" -"S_MulticylinderDives[multicylinder dives]." -msgstr "" - -#. type: Plain text -#: user-manual.txt:1731 -msgid "" -"If a pSCR _Dive Mode_ has been selected, the dive ceiling for pSCR dives is " -"adjusted for the oxygen drop accross the mouthpiece which often requires " -"longer decompression periods. Below is a dive profile of a pSCR dive using " -"EAN36 on the back cylinder and oxygen for decompression. Note that this dive " -"lasted over two hours." -msgstr "" - -#. type: Target for macro image -#: user-manual.txt:1732 -#, no-wrap -msgid "images/pSCR_profile.jpg" -msgstr "images/pSCR_profile.jpg" - -#. type: Title ==== -#: user-manual.txt:1737 +#: user-manual.txt:1667 #, no-wrap msgid "Closed circuit rebreather (CCR) dives" msgstr "" @@ -3468,7 +3339,7 @@ msgid "" "two cylinders are shown as green lines overlapping the depth profile. In " "addition, start and end pressures for both oxygen and diluent cylinders are " "shown in the _Equipment Tab_. Below is a dive profile for a CCR dive, " -"including an overaly of setpoint and oxygen sensor data, as well as the " +"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." msgstr "" @@ -3504,17 +3375,17 @@ msgstr "" #. type: Title === #: user-manual.txt:1848 #, no-wrap -msgid "The *Dive Info* tab (for individual dives)" +msgid "The *Info* tab (for individual dives)" msgstr "" #. type: Plain text #: user-manual.txt:1855 msgid "" -"The Dive Info tab gives some summary information about a particular dive " -"that has been selected in the *Dive List*. Useful information here includes " -"the surface interval before the dive, the maximum and mean depths of the " -"dive, the gas volume consumed, the surface air consumption (SAC) and the " -"number of oxygen toxicity units (OTU) incurred." +"The Info tab gives some summary information about a particular dive that has " +"been selected in the *Dive List*. Useful information here includes the " +"surface interval before the dive, the maximum and mean depths of the dive, " +"the gas volume consumed, the surface air consumption (SAC) and the number of " +"oxygen toxicity units (OTU) incurred." msgstr "" #. type: Plain text @@ -4097,10 +3968,10 @@ msgid "" "The EAD is the depth of a hypothetical air dive that has the same partial " "pressure of nitrogen as the current depth of the nitrox dive at hand. A " "nitrox dive leads to the same decompression obligation as an air dive to the " -"depth equalling the EAD. The END is the depth of a hypothetical air dive " -"that has the same sum of partial pressures of the narcotic gases nitrogen " -"and oxygen as the current trimix dive. A trimix diver can expect the same " -"narcotic effect as a diver breathing air diving at a depth equalling the END." +"depth equaling the EAD. The END is the depth of a hypothetical air dive that " +"has the same sum of partial pressures of the narcotic gases nitrogen and " +"oxygen as the current trimix dive. A trimix diver can expect the same " +"narcotic effect as a diver breathing air diving at a depth equaling the END." msgstr "" #. type: Plain text @@ -4373,14 +4244,14 @@ msgstr "" 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 " -"title from the *Dive List*. This shows a *Trip Notes* tab in the *Dive " -"Notes* panel. Here users can add or edit information about the date/time, " -"the trip location and any other general comments about the trip as a whole " -"(e.g. the dive company that was dived with, the general weather and surface " -"conditions during the trip, etc.). After entering this information, users " -"should select *Save* from the buttons at the top right of the *Trip Notes* " -"tab. The trip title in the *Dive List* panel should now reflect some of the " -"edited information." +"title from the *Dive List*. This shows a *Trip Notes* tab in the *Notes* " +"panel. Here users can add or edit information about the date/time, the trip " +"location and any other general comments about the trip as a whole (e.g. the " +"dive company that was dived with, the general weather and surface conditions " +"during the trip, etc.). After entering this information, users should " +"select *Save* from the buttons at the top right of the *Trip Notes* tab. The " +"trip title in the *Dive List* panel should now reflect some of the edited " +"information." msgstr "" #. type: Title ==== @@ -4537,9 +4408,9 @@ msgid "" "Users can merge these dives onto a single dive by selecting the appropriate " "dives, right-clicking them to bring up the context menu and then selecting " "*Merge selected dives*. It may be necessary to edit the dive information in " -"the *Dive Notes* panel to reflect events or conditions that apply to the " -"merged dive. The figure below shows the depth profile of two such dives that " -"were merged:" +"the *Notes* panel to reflect events or conditions that apply to the merged " +"dive. The figure below shows the depth profile of two such dives that were " +"merged:" msgstr "" #. type: Target for macro image @@ -4673,10 +4544,10 @@ msgstr "images/facebook1_f20.jpg" #: user-manual.txt:2465 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 *Dive " -"Notes* panel of _Subsurface_ (See image *A* below). Ensure that the dive " -"that you want to transfer to the timeline is depicted in the _Subsurface_ " -"*Dive Profile* panel. Select the _Facebook_ icon, and a dialogue is shown, " +"one's _Facebook_ timeline is easy. A _Facebook_ icon appears in the *Notes* " +"panel of _Subsurface_ (See image *A* below). Ensure that the dive that you " +"want to transfer to the timeline is depicted in the _Subsurface_ *Dive " +"Profile* panel. Select the _Facebook_ icon, and a dialogue is shown, " "determining the amount of additional information transferred with the dive " "profile (see image *B*, below). In order to transfer a dive profile to " "_Facebook_, the name of a _Facebook_ album needs to be provided. The " @@ -4767,7 +4638,7 @@ msgstr "" #. type: Plain text #: user-manual.txt:2501 msgid "" -"_DiveShare_ is also a dive log repostory on the Internet focusing on the " +"_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, " "so registration with _http://scubadiveshare.com_ is required." msgstr "" @@ -5251,7 +5122,7 @@ msgstr "" #, no-wrap msgid "" " ** *Default cylinder*: Here users can specify the default cylinder listed in\n" -" the *Equipment* tab of the *Dive Notes* panel.\n" +" the *Equipment* tab of the *Notes* panel.\n" msgstr "" #. type: Plain text @@ -5637,7 +5508,7 @@ msgid "" "sections (see image below). The *setup* parameters for a dive are entered " "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 Dive Notes." +"and Notes." msgstr "" #. type: Plain text @@ -5699,15 +5570,15 @@ msgstr "" #. type: Plain text #: user-manual.txt:2924 msgid "" -"In the table labelled _Available Gases_, add the information of the " -"cylinders to be used as well as the gas composition within that cylinder. " -"This is done in a similar way as for <<S_CylinderData,providing cylinder " -"data for dive logs>>. Choose the cylinder type by double clicking the " -"cylinder type and using the dropdown list, then specify the work pressure of " -"this cylinder. By leaving the oxygen concentration (O2%) filed empty, the " -"cylinder is assumed to contain air. Otherwise enter the oxygen and/or helium " -"concentration in the boxes provided in this dialogue. Add additional " -"cylinders by using the \"+\" icon to the top righthand of the dialogue." +"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 " +"in a similar way as for <<S_CylinderData,providing cylinder data for dive " +"logs>>. Choose the cylinder type by double clicking the cylinder type and " +"using the dropdown list, then specify the work pressure of this cylinder. By " +"leaving the oxygen concentration (O2%) filed empty, the cylinder is assumed " +"to contain air. Otherwise enter the oxygen and/or helium concentration in " +"the boxes provided in this dialogue. Add additional cylinders by using the " +"\"+\" icon to the top righthand of the dialogue." msgstr "" #. type: Plain text @@ -5846,7 +5717,7 @@ msgid "" "features of the dive have been completed, e.g. the bottom time segment and " "deep stops (if these are implemented). Leave the remaining waypoints on the " "ascent to _Subsurface_. In most cases _Subsurface_ computes additional way " -"points in order to fulfil decompression requirements for that dive. A " +"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 _Dive Planner Points_ dialogue can be " "edited by hand in order to obtain a precise presentation of the dive plan. " @@ -5911,7 +5782,7 @@ msgstr "" 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 " -"by checking any of the options under the _Dive Notes_ section of the dive " +"by checking any of the options under the _Notes_ section of the dive " "planner, immediately to the left of the _Dive Plan Details_. If a _Verbatim " "diveplan_ is requested, a detailed sentence-level explanation of the dive " "plan is given. If any of the management specifications have been exceeded " @@ -5999,13 +5870,13 @@ msgid "" "from the main menu, where the gas consumption calculation takes into account the pSCR dump\n" "ratio (default 10:1) as well as the metabolism rate. The calculation also takes the oxygen drop\n" "accross the mouthpiece of the rebreather into account. If the\n" -"pO~2~ drops below what is considered a save value, a warning apears in the _Dive plan\n" +"pO~2~ drops below what is considered a save value, a warning appears in the _Dive plan\n" "details_. A typical pSCR configuration is with a single cylinder and one or more bail-out\n" "cylinders. Therefore the setup of the _Available gases_ and the _Dive planner points_ tables\n" "are very similar to that of a CCR dive plan, described above. However, no oxygen setpoints\n" "are specified for pSCR dives. Below is a dive plan for a pSCR dive. The dive is comparable\n" "to that of the CCR dive above, but note the longer ascent duration due to the lower oxygen\n" -"in the loop due to the oxygen drop accross the mouthpiece of the pSCR equipment.\n" +"in the loop due to the oxygen drop across the mouthpiece of the pSCR equipment.\n" msgstr "" #. type: Target for macro image @@ -6095,15 +5966,15 @@ msgstr "" msgid "" "Dive plans have many characteristics in common with dive logs (dive profile, " "dive notes, etc). After a dive plan has been saved, the dive details and " -"gas calculations are saved in the *Dive Notes* tab. While a dive plan is " -"being designed, it can be printed using the _Print_ button in the dive " -"planner. This prints the dive details and gas calculations in the _Dive Plan " -"Details_ panel of the dive planner. However, after the plan has been saved, " -"it is represented in a way very similar to a dive log and the gas " -"calculations cannot be accessed in the same way as during the planning " -"process. The only way to print the dive plan is to use the _File -> Print_ " -"facility on the main menu in the same way as for dive logs or by copy and " -"paste to a word processor." +"gas calculations are saved in the *Notes* tab. While a dive plan is being " +"designed, it can be printed using the _Print_ button in the dive planner. " +"This prints the dive details and gas calculations in the _Dive Plan Details_ " +"panel of the dive planner. However, after the plan has been saved, it is " +"represented in a way very similar to a dive log and the gas calculations " +"cannot be accessed in the same way as during the planning process. The only " +"way to print the dive plan is to use the _File -> Print_ facility on the " +"main menu in the same way as for dive logs or by copy and paste to a word " +"processor." msgstr "" #. type: Title == @@ -6363,7 +6234,7 @@ msgstr "" "plongée*." #. type: Plain text -#: user-manual.txt:3187 +#: user-manual.txt:3115 msgid "<<S_ViewPanels,_Info_>> - View only the *Dive Notes* panel." msgstr "" "<<S_ViewPanels,_Info_>> - Affiche uniquement le panneau des *notes de " @@ -7199,8 +7070,8 @@ msgstr "" #. type: Plain text #: user-manual.txt:3549 msgid "" -"In the dropdown list on the middle right labeled '_Pre-configured imports_" -"\", select _APD Log Viewer_." +"In the dropdown list on the top left labeled '_Pre-configured imports_\", " +"select _APD Log Viewer_." msgstr "" #. type: Plain text @@ -7455,30 +7326,36 @@ msgstr "" msgid "Exporting from Atomic Logbook" msgstr "" +#. type: Named 'icon' AttributeList argument for style 'icon' +#: user-manual.txt:3632 +#, no-wrap +msgid "images/icons/atomiclogo.jpg" +msgstr "images/icons/atomiclogo.jpg" + #. type: Plain text -#: user-manual.txt:3638 +#: user-manual.txt:3566 msgid "" "Atomic Logbook is a Windows software by Atomic Aquatics. It allows " "downloading of dive information from Cobalt and Cobalt 2 dive computers. " -"The divelog is kept in a SQlite database at C:\\ProgramData\\AtomicsAquatics" +"The divelog is kept in a SQLite database at C:\\ProgramData\\AtomicsAquatics" "\\Cobalt-Logbook\\Cobalt.db. This file can be directly imported to " "Subsurface." msgstr "" #. type: Title === -#: user-manual.txt:3640 +#: user-manual.txt:3568 #, no-wrap msgid "Exporting from Mares Dive Organiser V2.1" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:3643 +#: user-manual.txt:3571 #, no-wrap msgid "images/icons/mareslogo.jpg" msgstr "images/icons/mareslogo.jpg" #. type: Plain text -#: user-manual.txt:3651 +#: user-manual.txt:3579 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 " @@ -7489,7 +7366,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3656 +#: user-manual.txt:3584 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 " @@ -7497,36 +7374,36 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3659 +#: user-manual.txt:3587 msgid "" "Rename the file to DiveOrganiserxxxxx.zip. Inside the zipped directory is a " "file _DiveOrganiser.sdf_." msgstr "" #. type: Plain text -#: user-manual.txt:3660 +#: user-manual.txt:3588 msgid "Extract the _.sdf_ file from the zipped folder to your Desktop." msgstr "" #. type: Plain text -#: user-manual.txt:3661 +#: user-manual.txt:3589 msgid "The password for accessing the .zip file is _mares_." msgstr "" #. type: Title === -#: user-manual.txt:3663 +#: user-manual.txt:3591 #, no-wrap msgid "Exporting from *DivingLog 5.0*" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:3665 +#: user-manual.txt:3593 #, no-wrap msgid "images/icons/divingloglogo.jpg" msgstr "images/icons/divingloglogo.jpg" #. type: Plain text -#: user-manual.txt:3674 +#: user-manual.txt:3602 msgid "" "Unfortunately DivingLog XML files give us no indication on the preferences " "set on one's system. So in order for _Subsurface_ to be able to successfully " @@ -7537,28 +7414,28 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3676 +#: user-manual.txt:3604 msgid "In DivingLog open the 'File -> Export -> XML' menu" msgstr "" #. type: Plain text -#: user-manual.txt:3677 +#: user-manual.txt:3605 msgid "Select the dives to export" msgstr "" #. type: Plain text -#: user-manual.txt:3678 +#: user-manual.txt:3606 msgid "Click on the export button and select the filename" msgstr "" #. type: Title == -#: user-manual.txt:3680 +#: user-manual.txt:3608 #, no-wrap msgid "APPENDIX D: Exporting a spreadsheet to CSV format" msgstr "" #. type: Plain text -#: user-manual.txt:3689 +#: user-manual.txt:3617 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 " @@ -7571,7 +7448,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3695 +#: user-manual.txt:3623 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 " @@ -7582,41 +7459,41 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3697 +#: user-manual.txt:3625 msgid "" "Date: use one of the following formats: yyyy-mm-dd, dd.mm.yyyy, mm/dd/yyyy" msgstr "" #. type: Plain text -#: user-manual.txt:3698 +#: user-manual.txt:3626 msgid "Duration: the format should be minutes:seconds." msgstr "" #. type: Plain text -#: user-manual.txt:3699 +#: user-manual.txt:3627 msgid "" -"Unit system: only one unit system shold be used (i.e., no mixture between " +"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:3700 +#: user-manual.txt:3628 msgid "Tags and buddies: values should be separated using a comma." msgstr "" #. type: Plain text -#: user-manual.txt:3701 +#: user-manual.txt:3629 msgid "GPS position: users must use decimal degrees, e.g. 30.22496 30.821798" msgstr "" #. type: Title === -#: user-manual.txt:3702 +#: user-manual.txt:3630 #, no-wrap msgid "_LibreOffice Calc_ and _OpenOffice Calc_" msgstr "" #. type: Plain text -#: user-manual.txt:3706 +#: user-manual.txt:3634 msgid "" "These are open source spreadsheet applications forming parts of larger open " "source office suite applications. The user interaction with _LibreOffice_ " @@ -7627,13 +7504,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:3707 +#: user-manual.txt:3635 #, no-wrap msgid "images/LOffice_spreadsheetdata.jpg" msgstr "images/LOffice_spreadsheetdata.jpg" #. type: Plain text -#: user-manual.txt:3710 +#: user-manual.txt:3638 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 " @@ -7641,13 +7518,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:3711 +#: user-manual.txt:3639 #, no-wrap msgid "images/LOffice_save_as_options.jpg" msgstr "images/LOffice_save_as_options.jpg" #. type: Plain text -#: user-manual.txt:3714 +#: user-manual.txt:3642 msgid "" "After selecting _Save_, select the appropriate field delimiter (choose _Tab_ " "to prevent conflicts with the comma when using this as a decimal point), " @@ -7655,13 +7532,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:3715 +#: user-manual.txt:3643 #, no-wrap msgid "images/LOffice_field_options.jpg" msgstr "images/LOffice_field_options.jpg" #. type: Plain text -#: user-manual.txt:3718 +#: user-manual.txt:3646 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:" @@ -7669,13 +7546,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3719 +#: user-manual.txt:3647 #, no-wrap msgid "Microsoft _Excel_" msgstr "" #. type: Plain text -#: user-manual.txt:3725 +#: user-manual.txt:3653 msgid "" "The field delimiter (called \"_list separator_\" in Microsoft manuals) is " "not accessible from within _Excel_ and needs to be set through the " @@ -7686,19 +7563,19 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3727 +#: user-manual.txt:3655 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:3728 +#: user-manual.txt:3656 msgid "Open the _Regional and Language Options_ dialog box." msgstr "" #. type: Plain text -#: user-manual.txt:3731 +#: user-manual.txt:3659 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 " @@ -7706,48 +7583,48 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3732 +#: user-manual.txt:3660 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:3733 +#: user-manual.txt:3661 msgid "Click _OK_ twice." msgstr "" #. type: Plain text -#: user-manual.txt:3735 +#: user-manual.txt:3663 msgid "Below is an image of the _Control Panel_:" msgstr "" #. type: Target for macro image -#: user-manual.txt:3736 +#: user-manual.txt:3664 #, no-wrap msgid "images/Win_SaveCSV2.jpg" msgstr "images/Win_SaveCSV2.jpg" #. type: Plain text -#: user-manual.txt:3739 +#: user-manual.txt:3667 msgid "To export the dive log in CSV format:" msgstr "" #. type: Plain text -#: user-manual.txt:3741 +#: user-manual.txt:3669 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:3742 +#: user-manual.txt:3670 #, no-wrap msgid "images/Win_SaveCSV1.jpg" msgstr "images/Win_SaveCSV1.jpg" #. type: Plain text -#: user-manual.txt:3745 +#: user-manual.txt:3673 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 " @@ -7757,13 +7634,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:3746 +#: user-manual.txt:3674 #, no-wrap msgid "images/Win_SaveCSV3.jpg" msgstr "images/Win_SaveCSV3.jpg" #. type: Plain text -#: user-manual.txt:3749 +#: user-manual.txt:3677 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 " @@ -7772,19 +7649,19 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:3750 +#: user-manual.txt:3678 #, no-wrap msgid "APPENDIX E: FAQs." msgstr "" #. type: Title === -#: user-manual.txt:3752 +#: user-manual.txt:3680 #, no-wrap msgid "Subsurface appears to miscalculate gas consumption and SAC" msgstr "" #. type: Plain text -#: user-manual.txt:3756 +#: user-manual.txt:3684 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_ " @@ -7792,7 +7669,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3762 +#: user-manual.txt:3690 msgid "" "'Answer': Not really. What happens is that _Subsurface_ actually calculates " "gas consumption differently - and better - than you expect. In particular, " @@ -7802,7 +7679,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3768 +#: user-manual.txt:3696 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 " @@ -7812,12 +7689,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3770 +#: user-manual.txt:3698 msgid "+consumption = (amount_of_air_at_beginning - amount_of_air_at_end)+" msgstr "" #. type: Plain text -#: user-manual.txt:3776 +#: user-manual.txt:3704 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 " @@ -7828,12 +7705,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3778 +#: user-manual.txt:3706 msgid "+12.2*((220-100)/1.013)+" msgstr "" #. type: Plain text -#: user-manual.txt:3783 +#: user-manual.txt:3711 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 " @@ -7843,7 +7720,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3789 +#: user-manual.txt:3717 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 " @@ -7854,13 +7731,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3790 +#: user-manual.txt:3718 #, no-wrap msgid "Some dive profiles have time discrepancies with the recorded samples from my dive computer..." msgstr "" #. type: Plain text -#: user-manual.txt:3794 +#: user-manual.txt:3722 msgid "" "_Subsurface_ ends up ignoring surface time for many things (average depth, " "divetime, SAC, etc). 'Question': Why do dive durations in my dive computer " @@ -7868,7 +7745,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3802 +#: user-manual.txt:3730 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 " diff --git a/Documentation/images/icons/atomiclogo.jpg b/Documentation/images/icons/atomiclogo.jpg Binary files differnew file mode 100644 index 000000000..2d24b290c --- /dev/null +++ b/Documentation/images/icons/atomiclogo.jpg diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt index 78e56cab2..5bbb6ee13 100644 --- a/Documentation/user-manual.txt +++ b/Documentation/user-manual.txt @@ -102,7 +102,7 @@ between dives. The *Dive List* is an important tool for manipulating a dive log. map and centred on the site of the last dive selected in the *Dive List*. -3. The *Dive Info* to the top left, giving more detailed information on the +3. The *Info* to the top left, giving more detailed information on the dive selected in the *Dive List*, including some statistics for the selected dive or for all highlighted dive(s). @@ -119,7 +119,7 @@ and profile of the _selected dive_ are shown in the respective panels. On the other hand, if one highlights more than one dive the last highlighted dive is the _selected dive_, but summary data of all _highlighted dives_ are shown in the *Stats* tab -of the *Dive Info* panel (maximum, minimum and average depths, durations, water +of the *Info* panel (maximum, minimum and average depths, durations, water temperatures and SAC; total time and number of dives selected). [[S_ViewPanels]] @@ -136,7 +136,7 @@ display: *Profile*: Show only the Dive Profile of the selected dive. -*Info*: Show only the Dive Notes about the last selected dive and statistics for +*Info*: Show only the Notes about the last selected dive and statistics for all highlighted dives. *Globe*: Show only the world map, centred on the last selected dive. @@ -201,7 +201,7 @@ depth, the names of your dive buddy and of the dive master or dive guide, and some remarks about the dive. _Subsurface_ can store much more information than this for each dive. In order to add a dive to a dive log, select _Log -> Add Dive_ from the Main Menu. The program then shows three panels to enter -information for a dive: two tabs in the *Dive Info* panel (*Dive Notes* and +information for a dive: two tabs in the *Info* panel (*Notes* and *Equipment*), as well as the *Dive Profile* panel that displays a graphical profile of each dive. These panels are respectively marked [red]#A#, [red]#B# and [red]#C# @@ -209,9 +209,9 @@ in the figure below. Each of these tabs will now be explained for data entry. image::images/AddDive1_f20.jpg["FIGURE: Add dive",align="center"] -When one edits a field in Dive notes or Equipment panels, _Subsurface_ enters *Editing Mode*, -indicated by the message in the blue box at the top of the _Dive Notes_ panel (see the image below). This message is -displayed in all the panels under Dive notes and Equipment when in *Editing Mode*. +When one edits a field in Notes or Equipment panels, _Subsurface_ enters *Editing Mode*, +indicated by the message in the blue box at the top of the _Notes_ panel (see the image below). This message is +displayed in all the panels under Notes and Equipment when in *Editing Mode*. image::images/BlueEditBar_f20.jpg["Blue edit bar",align="center"] @@ -221,14 +221,14 @@ before saving the information. By selecting the _Save_ button, a local copy of t for this specific dive is saved in memory. When one closes Subsurface, the program will ask again, this time whether the complete dive log should be saved on disk or not. -==== Dive Notes +==== Notes This panel contains the date, time and place information for a particular dive, environmental conditions, co-divers and buddies, as well as some descriptive -information. If one clicks on the *Dive Notes* tab, the following +information. If one clicks on the *Notes* tab, the following fields are visible: -image::images/AddDive2_f20.jpg["FIGURE: The Dive Notes tab",align="center"] +image::images/AddDive2_f20.jpg["FIGURE: The Notes tab",align="center"] The *Time* field reflects the date and the time of the dive. By clicking the date, a calendar is displayed from which @@ -323,9 +323,9 @@ shown for the user to choose from. The *Save* and *Cancel* buttons are used to save all the information for tabs in the info panel and in the dive profile panel, so there's no need to use them until ALL other information has been added. Here is an example of a completed -Dive Notes panel: +Notes panel: -image::images/CompletedDiveInfo_f20.jpg["FIGURE: A completed Dive Notes tab",align="center"] +image::images/CompletedDiveInfo_f20.jpg["FIGURE: A completed Notes tab",align="center"] ==== Equipment @@ -461,10 +461,10 @@ image::images/DiveProfile4_f20.jpg["FIGURE: Completed dive profile",align="cente ==== Saving the hand-entered dive information -The information entered in the *Dive Notes* tab, the *Equipment* tab as well as +The information entered in the *Notes* tab, the *Equipment* tab as well as the *Dive Profile* can now be saved in the user's logbook by using the two buttons -on the top right hand of the Dive Notes tab. If the _Save_ button is clicked, +on the top right hand of the Notes tab. If the _Save_ button is clicked, the dive data are saved in the current logbook. If the _Cancel_ button is clicked, the newly entered @@ -694,10 +694,10 @@ allowing easy identification of devices. With the uploaded dives in the *Dive List*, the information from the dive computer is not complete and more details must be added in order to have a fuller record of the dives. To do this, -the *Dive Notes* and the *Equipment* tabs on the top left hand of the +the *Notes* and the *Equipment* tabs on the top left hand of the _Subsurface_ window should be used. -==== Dive Notes +==== Notes The date and time of the dive, gas mixture and (often) water temperature are usually shown as obtained from the dive computer, but the user needs to add @@ -705,10 +705,10 @@ additional information by hand in order to have a more complete dive record. In (e.g. APD rebreathers) one also has to provide the date and time of the dive. If the contents of this tab is changed or edited in any way, the message in a blue box at the top of the panel indicates that the dive is being edited. If one -clicks on the *Dive Notes* tab, the following fields are +clicks on the *Notes* tab, the following fields are visible: -image::images/AddDive3_f20.jpg["FIGURE: The Dive Notes tab",align="center"] +image::images/AddDive3_f20.jpg["FIGURE: The Notes tab",align="center"] The *Time* field reflects the date and time of the dive. By clicking the date, a calendar is displayed from which @@ -807,9 +807,9 @@ typed The *Save* and *Cancel* buttons are used to save all the information for tabs in the info panel and in the dive profile panel, so there's no need to use them until ALL other information has been added. Here is an example of a completed -Dive Notes panel: +Notes panel: -image::images/CompletedDiveInfo_f20.jpg["FIGURE: A completed Dive Notes tab",align="center"] +image::images/CompletedDiveInfo_f20.jpg["FIGURE: A completed Notes tab",align="center"] ==== Equipment @@ -901,14 +901,14 @@ image::images/WeightsDataEntry3_f20.jpg["FIGURE: A completed weights information _METHOD 1_: After uploading dives from a dive computer, the dive profiles of the uploaded dives are shown in the *Dive profile* tab, as well as a few items of information -in the *Dive Notes* tab (e.g. water temperature) and in the *Equipment* tab (e.g. gas pressures +in the *Notes* tab (e.g. water temperature) and in the *Equipment* tab (e.g. gas pressures and gas composition). However the other fields remain empty. It may be useful to simultaneously edit some of the -fields in the *Dive Notes* and *Equipment* tabs. For instance, it is possible +fields in the *Notes* and *Equipment* tabs. For instance, it is possible that a diver performed several dives during a single day, using identical equipment while diving at the same dive site or with the same dive master and/or buddy or tags. Instead of completing the information for each of these dives separately, one can select all the dives for that day in the *Dive List* and -insert the same information in the *Dive Notes* and *Equipment* fields that need +insert the same information in the *Notes* and *Equipment* fields that need identical information. This is achieved by editing the dive notes or the equipment for any one of the selected dives. @@ -924,8 +924,8 @@ up the completion of the dive log after several similar dives. [[S_CopyComponents]] _METHOD 2_:There is a different way of achieving the same goal. Select a dive with all the appropriate information -typed into the *Dive Notes* and *Equipment* tabs. Then, from the main menu, select _Log -> Copy dive components_. -A box is presented with a selection of check boxes for most of the fields in the *Dive Notes* and *Equipment* tabs. +typed into the *Notes* and *Equipment* tabs. Then, from the main menu, select _Log -> Copy dive components_. +A box is presented with a selection of check boxes for most of the fields in the *Notes* and *Equipment* tabs. Select the fields to be copied from the currently selected dive, then select _OK_. Now, in the *Dive List*, select the dives into which this information is to be pasted. Then, from the main menu, select _Log -> Paste dive components_. @@ -954,10 +954,10 @@ image::images/Bookmarks.jpg["FIGURE: Bookmark dialog",align="center"] ==== Saving the updated dive information -The information entered in the *Dive Notes* tab and the *Equipment* tab can be +The information entered in the *Notes* tab and the *Equipment* tab can be saved by using the -two buttons on the top right hand of the *Dive Notes* tab. If the _Save_ button +two buttons on the top right hand of the *Notes* tab. If the _Save_ button is clicked, the dive data are saved. If the _Cancel_ button is clicked, then the newly entered dive data are @@ -1588,7 +1588,7 @@ image::images/icons/ShowPhotos_f20.png["FIGURE:Show photos toolbar button",align After the images have been loaded, they appear in two places: - - the _Photos_ tab of the *Dive Notes* panel. + - the _Photos_ tab of the *Notes* panel. - as tiny icons (stubs) on the dive profile at the appropriate positions reflecting the time each photograph was taken. See below: @@ -1611,7 +1611,7 @@ image::images/LoadImage6_f20.jpg["FIGURE: Full-screen photo on dive profile",ali ==== The _Photos_ tab -Photographs associated with a dive are shown as thumbnails in the _Photos_ tab of the _Dive Notes_ +Photographs associated with a dive are shown as thumbnails in the _Photos_ tab of the _Notes_ panel. Photos taken in rapid succession during a dive (therefore sometimes with large overlap on the dive profile) can easily be accessed in the _Photos_ tab. This tab serves as a tool for individually accessing the photos of a dive, while the stubs on the dive profile @@ -1646,7 +1646,7 @@ multicylinder dives are often used by technical divers who dive deep or long. As as _Subsurface_ is concerned, there are only two types of information that need to be provided: - *Describe the cylinders used during the dive* This is performed in the *Equipment tab* of - the *Dive Info* panel, as xref:cylinder_definitions[described above]. Enter the cylinders one by one, + the *Info* panel, as xref:cylinder_definitions[described above]. Enter the cylinders one by one, specifying the characteristics of the cylinder and the gas composition within each cylinder. - *Record the times at which switches from one cylinder to another was done:* This is information @@ -1684,7 +1684,7 @@ dive logging involves, exactly as with multicylinder dives, above, three steps: has this facility) marking each cylinder switch with a bookmark that can be retrieved later. Returning from a dive with the information about cylinder changes is the only tricky part of logging sidemount dives. - *Within _Subsurface_ describe the cylinders used during the dive*. The diver needs to provide the - specifications of the different cylinders, using the *Equipment* tab of the *Dive Info Panel* (see + specifications of the different cylinders, using the *Equipment* tab of the *Info Panel* (see image below where two 12 litre cylinder were used). - *Indicate cylinder change events on the _Subsurface_ dive profile*. Once the dive log has been imported from a dive computer into _Subsurface_, the cylinder switch events need to be indicated on the dive profile. @@ -1718,7 +1718,7 @@ breathing gas is released continuously from the back cylinder. To log pSCR dives, no special procedures are required, just the normal steps outlined above: -- Select pSCR in the _Dive Mode_ dropdown list on the *Dive Info* panel. +- Select pSCR in the _Dive Mode_ dropdown list on the *Info* panel. - pSCR diving often involves gas changes, requiring an additional cylinder. Define all the appropriate cylinders as described above @@ -1845,9 +1845,9 @@ Poseidon MkVI and APD equipment can be found in xref:S_PoseidonMkVI[Appendix B]. == Obtaining more information about dives entered into the logbook -=== The *Dive Info* tab (for individual dives) +=== The *Info* tab (for individual dives) -The Dive Info tab gives some summary information about a particular dive that +The Info tab gives some summary information about a particular dive that has been selected in the *Dive List*. Useful information here includes the surface interval before the dive, the maximum and mean depths of the dive, the gas volume consumed, the surface air consumption (SAC) and the number of oxygen @@ -2301,7 +2301,7 @@ now shows only the titles for the trips. 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 title from -the *Dive List*. This shows a *Trip Notes* tab in the *Dive Notes* panel. Here +the *Dive List*. This shows a *Trip Notes* tab in the *Notes* panel. Here users can add or edit information about the date/time, the trip location and any other general comments about the trip as a whole (e.g. the dive company that was dived with, the general weather and surface conditions during the trip, etc.). @@ -2388,7 +2388,7 @@ for a few minutes, resulting in two or more dives being recorded by the dive computer and appearing as different dives in the *Dive List* panel. Users can merge these dives onto a single dive by selecting the appropriate dives, right-clicking them to bring up the context menu and then selecting *Merge selected -dives*. It may be necessary to edit the dive information in the *Dive Notes* +dives*. It may be necessary to edit the dive information in the *Notes* panel to reflect events or conditions that apply to the merged dive. The figure below shows the depth profile of two such dives that were merged: @@ -2452,7 +2452,7 @@ _Facebook_ connection. image::images/facebook1_f20.jpg["Figure: Facebook login",align="center"] Having established a login to _Facebook_, transfer of a dive profile to one's _Facebook_ timeline is easy. -A _Facebook_ icon appears in the *Dive Notes* panel of _Subsurface_ (See image *A* below). Ensure that the dive +A _Facebook_ icon appears in the *Notes* panel of _Subsurface_ (See image *A* below). Ensure that the dive that you want to transfer to the timeline is depicted in the _Subsurface_ *Dive Profile* panel. Select the _Facebook_ icon, and a dialogue is shown, determining the amount of additional information transferred with the dive profile (see image *B*, below). In order to transfer a dive profile to _Facebook_, the name of a @@ -2716,7 +2716,7 @@ image::images/Pref1_f20.jpg["FIGURE: Preferences defaults page",align="center"] the dive list. ** *Default cylinder*: Here users can specify the default cylinder listed in - the *Equipment* tab of the *Dive Notes* panel. + the *Equipment* tab of the *Notes* panel. ** *Animations*: Some actions in showing the dive profile are performed using animations. For instance, the axis values for depth and time change from dive to @@ -2888,7 +2888,7 @@ user interface. It is explicitly used under the following conditions: Like the _Subsurface_ dive log, the planner screen is divided into several sections (see image below). The *setup* parameters for a dive are entered into the several sections on the left hand side of the screen. -The setup is divided into several sections: Available Gases, Rates, Planning, Gas Options and Dive Notes. +The setup is divided into several sections: Available Gases, Rates, Planning, Gas Options and Notes. 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 below. This feature makes the @@ -3028,7 +3028,7 @@ in the *Dive List* panel of _Subsurface_. 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 by checking any of the -options under the _Dive Notes_ section of the dive planner, immediately to the left +options under the _Notes_ section of the dive planner, immediately to the left of the _Dive Plan Details_. If a _Verbatim diveplan_ is requested, a detailed sentence-level explanation of the dive plan is given. If any of the management specifications have been exceeded during the planning, a warning @@ -3124,7 +3124,7 @@ inclusion in a text file or word processing document. Dive plans have many characteristics in common with dive logs (dive profile, dive notes, etc). After a dive plan has been saved, the dive details and gas calculations are saved in -the *Dive Notes* tab. While a dive plan is being designed, it can be printed using +the *Notes* tab. While a dive plan is being designed, it can be printed using the _Print_ button in the dive planner. This prints the dive details and gas calculations in the _Dive Plan Details_ panel of the dive planner. However, after the plan has been saved, it is represented in a way very similar to a dive log and the gas calculations cannot be @@ -3183,7 +3183,7 @@ dealing with the appropriate operations. simmultaneously. - <<S_ViewPanels,_Dive List_>> - View only the *Dive List* panel. - <<S_ViewPanels,_Profile_>> - View only the *Dive Profile* panel. -- <<S_ViewPanels,_Info_>> - View only the *Dive Notes* panel. +- <<S_ViewPanels,_Info_>> - View only the *Notes* panel. - <<S_ViewPanels,_Globe_>> - View only the *World Map* panel. - _Yearly Statistics_ - Display summary statistics about dives during this and past years. @@ -3629,6 +3629,7 @@ Making a backup copy of the Suunto DM4/DM5 database: === Exporting from Atomic Logbook [[Atomic_Export]] +[icon="images/icons/atomiclogo.jpg"] [NOTE] Atomic Logbook is a Windows software by Atomic Aquatics. It allows downloading of dive information from Cobalt and Cobalt 2 dive computers. diff --git a/Documentation/user-manual_es.txt b/Documentation/user-manual_es.txt index 41a5a1152..98d0cfbaf 100644 --- a/Documentation/user-manual_es.txt +++ b/Documentation/user-manual_es.txt @@ -107,7 +107,7 @@ inmersiones. mapamundi y aparece centrado en el punto de la última inmersión seleccionada de la *Lista de Inmersiones*. -3. La *Información de la inmersión* arriba a la izquierda, presentando +3. La *Información* arriba a la izquierda, presentando información más detallada de la inmersión seleccionada en la *Lista de inmersiones*, incluyendo algunas estadísticas de la inmersión seleccionada o de todas las inmersiones resaltadas. @@ -124,8 +124,8 @@ Si se selecciona una inmersión en la *Lista de inmersiones*, se muestra su ubicación, información detallada y su perfil en sus paneles respectivos. Por otra parte, si uno selecciona más de un buceo, el último resaltado actuará como _inmersión seleccionada_, pero los datos resumidos de las _inmersiones -resaltadas_ se mostrarán en la pestaña *Estadísticas* del panel *Información de -la inmersión* (máximas, mínimas y medias de profundidades, duraciones, +resaltadas_ se mostrarán en la pestaña *Estadísticas* del panel *Información* +(máximas, mínimas y medias de profundidades, duraciones, temperaturas del agua, consumos de gases; el tiempo total y el número de inmersiones seleccionadas). @@ -209,18 +209,18 @@ buceo o el dive master o el guía, y algunas anotaciones acerca de la inmersión _Subsurface_ puede conservar mucha más información por cada inmersión. Para añadir una inmersión a un registro de buceo, selecciona _Registro → Añadir Inmersión_ en el menú principal. El programa muestra entonces tres paneles para -introducir información: Dos pestañas en el panel *Información de la Inmersión* -(*Notas de la inmersión* y *Equipo*), así como el panel perfil que muestra un +introducir información: Dos pestañas en el panel *Información* +(*Notas* y *Equipo*), así como el panel perfil que muestra un perfil gráfico de cada buceo. Estos paneles estan marcados respectivamente como [red]#A#, [red]#B# y [red]#C# en la figura de abajo. Ahora veremos cada una de las pestañas usadas para introducir la información. image::images/AddDive1_f20.jpg["FIGURA: Añadir inmersión",align="center"] -Al editar un campo de los paneles _Notas de la Inmersión_ o _Equipo_, _Subsurface_ +Al editar un campo de los paneles _Notas_ o _Equipo_, _Subsurface_ entra en el modo de edición. Esto se indica con el mensaje en un recuadro azul -en la parte de arriba del panel _Notas de la Inmersión_. Este mensaje se -muestra en todos los paneles dependientes de _Notas de la Inmersión_ mientras +en la parte de arriba del panel _Notas_. Este mensaje se +muestra en todos los paneles dependientes de _Notas_ mientras se esté en modo de edición. image::images/BlueEditBar_f20.jpg["Blue edit bar",align="center"] @@ -233,14 +233,14 @@ en memoria una copia local de la información. Al salir de _Subsurface_, el programa preguntará de nuevo, esta vez si se guarda el diario completo en el disco o no. -==== Notas de la inmersión +==== Notas Este panel contiene la información de fecha, hora y lugar de un buceo concreto, condiciones ambientales, compañeros así como alguna información descriptiva. Si -pulsas en la pestaña *Notas de la inmersión*, los siguientes campos aparecen +pulsas en la pestaña *Notas*, los siguientes campos aparecen visibles: -image::images/AddDive2_f20.jpg["FIGURA: La pestaña Notas de la inmersión",align="center"] +image::images/AddDive2_f20.jpg["FIGURA: La pestaña Notas",align="center"] El campo *Hora* refleja la fecha y la hora de la inmersión. Clicando la fecha se muestra un calendario desde el que seleccionar la fecha correcta. Pulsa ESC para @@ -333,9 +333,9 @@ introducirse aquí. Los botones *Guardar* y *Cancelar* se utilizan para guardar toda la información de los campos del panel de información y del panel de perfil, por lo que no hay necesidad de usarlos hasta que se ha añadido TODA la información. Aquí hay un -ejemplo de panel de Notas de la Inmersión completo: +ejemplo de panel de Notas completo: -image::images/CompletedDiveInfo_f20.jpg["FIGURA: Una pestaña de Notas de la Inmersión completada",align="center"] +image::images/CompletedDiveInfo_f20.jpg["FIGURA: Una pestaña de Notas completada",align="center"] ==== Equipo @@ -468,10 +468,10 @@ image::images/DiveProfile4_f20.jpg["FIGURE: Perfil de inmersión completado",ali ==== Guardar la información introducida a mano -La información introducida en las pestañas *Notas de la inmersión*, Equipo y +La información introducida en las pestañas *Notas*, Equipo y *Perfil de la inmersión* puede guardarse en el registro de inmersiones del -usuario utilizando los dos botones arriba a la derecha de la pestaña "Notas de -la Inmersión". Si se pulsa _Guardar_, los datos del buceo se guardan en el +usuario utilizando los dos botones arriba a la derecha de la pestaña "Notas". +Si se pulsa _Guardar_, los datos del buceo se guardan en el registro actual. Si se pulsa _Cancelar_ los datos recién introducidos serán descartados. Al salir de _Subsurface_ al usuario se le pedirá que guarde el registro con la nueva(s) inmersión(es). @@ -682,10 +682,10 @@ lugar del modelo, permitiendo una identificación de dispositivos más fácil. Con los buceos descargados en la *Lista de inmersiones*, la información del ordenador no está completa y es necesario añadir más detalles para tener un registro más detallado de las inmersiones. Para ello se usan las pestañas -*Notas de la Inmersión* y *Equipo* arriba a la izquierda de la ventana de +*Notas* y *Equipo* arriba a la izquierda de la ventana de _Subsurface_. -==== Notas de la inmersión +==== Notas La fecha y hora del buceo, la mezcla de gases y, a menudo, la temperatura del agua se muestran al haberse obtenido del ordenador de buceo, pero el usuario @@ -693,10 +693,10 @@ necesita añadir a mano alguna información para tener un registro más completo la inmersión. En algunos casos (p.e. rebreathers APD) también se ha de facilitar la fecha y la hora. Si se cambia o edita de alguna manera el contenido de esta pestaña, el mensaje de la barra azul arriba del panel indicará que se está -editando el buceo. Si se pulsa en la pestaña *Notas de la inmersión*, se +editando el buceo. Si se pulsa en la pestaña *Notas*, se visualizan los siguientes campos: -image::images/AddDive3_f20.jpg["FIGURA: La pestaña Notas de la inmersión",align="center"] +image::images/AddDive3_f20.jpg["FIGURA: La pestaña Notas",align="center"] El campo *Hora* refleja la fecha y la hora de la inmersión. Clicando la fecha se muestra un calendario desde el que seleccionar la fecha correcta. Pulsa ESC para @@ -783,9 +783,9 @@ y *profunda* para que elija entre ellas. Los botones *Guardar* y *Cancelar* se utilizan para guardar toda la información de los campos del panel de información y del panel de perfil, por lo que no hay necesidad de usarlos hasta que se ha añadido TODA la información. Aquí hay un -ejemplo de panel de Notas de la Inmersión completo: +ejemplo de panel de Notas completo: -image::images/CompletedDiveInfo_f20.jpg["FIGURA:Una pestaña completa de Notas de la Inmersión",align="center"] +image::images/CompletedDiveInfo_f20.jpg["FIGURA:Una pestaña completa de Notas",align="center"] ==== Equipo @@ -870,7 +870,7 @@ image::images/WeightsDataEntry3_f20.jpg["FIGURA: Tabla con información de lastr _METODO 1_: Tras descargar inmersiones de un ordenador de buceo, los perfiles de los buceos descargados se mostrarán en el panel "Perfil de la inmersión", -así como algunas otras informaciones en las pestañas "Notas de la Inmersión" y +así como algunas otras informaciones en las pestañas "Notas" y "Equipo". Sin embargo, otros campos permanecerán vacíos. Puede resultar útil editar simultáneamente algunos de los campos de las "Notas @@ -879,7 +879,7 @@ efectuara varias inmersiones en un solo día utilizando el mismo equipo, o en el mismo punto de buceo o con el mismo guía o compañero. En lugar de completar la información de las inmersiones una por una, se pueden seleccionar todos los buceos deseados en la "Lista de Inmersiones" e insertar la información común en -las "Notas de Inmersión" y "Equipo". +las "Notas" y "Equipo". La edición simultánea solo funciona con campos que no contienen aún ninguna información. Esto significa que si, para una inmersión en concreto, uno de los @@ -896,10 +896,10 @@ varios buceos similares. [[S_CopyComponents]] _METODO 2_: Hay una forma diferente de hacer lo mismo. Seleccionamos un buceo -que contenga toda la información apropiada en las pestañas *Notas de la -Inmersión* y *Equipo*. Entonces, desde el menú principal, seleccionamos +que contenga toda la información apropiada en las pestañas *Notas* y *Equipo*. +Entonces, desde el menú principal, seleccionamos _Registro -> Copiar componentes_. Aparecerá una ventana con casillas -seleccionables para la mayoría de campos de las pestañas *Notas de la inmersión* +seleccionables para la mayoría de campos de las pestañas *Notas* y *Equipo*. Selecciona los campos a copiar desde la inmersión seleccionada, luego pulsa _Aceptar_. Ahora selecciona en la *Lista de Inmersiones* los buceos a los que pegar esta información. Desde el menú principal, selecciona _Registro @@ -930,9 +930,8 @@ image::images/Bookmarks.jpg["FIGURA: Diálogo de marcadores",align="center"] ==== Guardar la información de buceo actualizada -La información introducida en las pestañas Notas de la inmersión y Equipo puede -guardarse utilizando los dos botones de arriba a la derecha de la pestaña *Notas -de la Inmersión*. Si se pulsa _Guardar_ los datos del buceo se guardan. Si se +La información introducida en las pestañas Notas y Equipo puede +guardarse utilizando los dos botones de arriba a la derecha de la pestaña *Notas*. Si se pulsa _Guardar_ los datos del buceo se guardan. Si se pulsa _Cancelar_ los datos de buceo recién introducidos se borran, aunque el perfil y los datos descargados del ordenador quedarán retenidos. Cuando el usuario salga de _Subsurface_ hay una pregunta final para confirmar si los @@ -1577,7 +1576,7 @@ perfil de la inmersión. Si está en un rango de 30 minutos, sí se muestra. Después que las imágenes han sido cargadas aparecen en dos lugares: - - La pestaña _Fotos_ del panel _Notas de la inmersión_. + - La pestaña _Fotos_ del panel _Notas_. - Como pequeños iconos (chinchetas) sobre el perfil de inmersión, en posiciones que relejan la hora en que se tomó cada fotografía. Ver a continuación: @@ -1645,7 +1644,7 @@ profundo y durante mucho tiempo. En lo que corresponde a _Subsurface_, solo hay dos clases de información que necesitan proporcionarse: - *Describir las botellas usadas durante el buceo*. Esto se hace en la pestaña - *Equipo* del panel *Información de la inmersión* tal como xref:cylinder_definitions[se describe anteriormente]. + *Equipo* del panel *Información* tal como xref:cylinder_definitions[se describe anteriormente]. se introducen las botellas una a una, especificando las características de la botella y la composición del gas de cada una de ellas. @@ -1679,7 +1678,7 @@ configuración popular entre los espeleo buceadores, el buceo en lateral se puede efectuar por buceadores recreativos que hayan completado el entrenamiento adecuado. Registrar inmersiones en sidemount se hace en tres pasos: -- *Durante el buceo, se registran los eventos de cambio de botella". Ya que bucear +- *Durante el buceo, registrar los eventos de cambio de botella". Ya que bucear en lateral supone, normalmente, usar 2 botellas con aire o con la misma mezcla, _Subsurface_ distingue entre estas botellas. En comparación, la mayoría de ordenadores de buceo que contemplan cambios de gas solo distinguen entre @@ -1713,42 +1712,6 @@ image::images/sidemount1.jpg["FIGURE: Sidemount profile",align="center"] Esta sección es un ejemplo de la versatilidad de _Subsurface_ como herramienta de registro de inmersiones. -[[S_sSCR_dives]] -==== Inmersiones con rebreather de circuito semi cerrado (SCR) - -[icon="images/halcyon_RB80.jpg"] -[NOTE] -Los rebreathers semi cerrados pasivos (pSCR) suponen un avance técnico en el -equipo de buceo que recircula el gas que el buzo respira, y elimina el dióxido -de carbono del gas exhalado. Al tiempo que una pequeña cantidad del gas exhalado -(habitualmente una décima parte) se libera en el agua, una pequeña cantidad de -gas de la botella se introduce en el circuito (habitualmente nitrox). Un buzo -usando una sola botella de gas puede, pues, bucear durante periodos de tiempo -mucho mayores que utilizando una configuración recreativa de circuito abierto. -Con los pSCR una cantidad muy pequeña de gas se libera cada vez que el buzo -inhala. Con los equipos SCR activos (aSCR), en cambio, una pequeña cantidad del -gas respirado se libera continuamente. - -Para registrar inmersiones con pSCR, no se requieren procedimientos especiales, -solo los pasos normales descritos con anterioridad: - -- Seleccionar el modo pSCR en el desplegable _Modo de inmersión_ en el panel - *Información de la inmersión*. - -- El buceo con pSCR, a menudo, requiere cambios de gas, necesitando una botella - adicional. Hay, pues, que describir todas las botellas como se indicó con - anterioridad e indicar los cambios de botella/gas como se explicó en la - sección xref:S_MulticylinderDives[Inmersiones multi botella]. - -Si se ha seleccionado pSCR en el _Modo de inmersión_, el techo de buceo para -inmersiones pSCR se ajusta para la caída de oxígeno a través de la boquilla -que, a menudo, requiere mayores períodos de descompresión. A continuación un -perfil de inmersión de un buceo con pSCR usando EAN36 como gas de fondo y -oxígeno para la descompresión. Fíjate que la inmersión duró unas dos horas. - -image::images/pSCR_profile.jpg["FIGURA: Perfil pSCR",align="center"] - - [[S_CCR_dives]] ==== Inmersiones con rebreather de circuito cerrado (CCR) @@ -1927,8 +1890,8 @@ recomendadas. Esta información se proporciona utilizando diferentes colores: El perfil también incluye lecturas de profundidad para los picos y valles del gráfico. De esta forma, se debe poder visualizar la profundidad del punto más -hondo y otros picos. La profundidad media se muestra como una línea gris que -indica la profundidad media en cada momento de la inmersión. +hondo y otros picos. La profundidad media se muestra como una línea roja +horizontal. [icon="images/icons/scale.jpg"] [NOTE] @@ -2469,59 +2432,7 @@ en las que aparezcan las etiquetas "cueva" _O_ "barco", solas o conjuntamente. [[S_ExportLog]] == Exportar el registro de inmersiones o parte del mismo -Hay dos posibilidades de exportar información de buceo desde _Subsurface_: - -- Exportar información de buceo a _Facebook_ - -- xref:S_Export_other[Exportar información de buceo a otros destinos o formatos] - -[[S_facebook]] -=== Exportar información de buceo a _Facebook_ - -La exportación de inmersiones a _Facebook_ se maneja de forma diferente a otros -tipos de exportación. Esto es debido a que exportar a _Facebook_ requiere una -conexión a esta red social y necesita un usuario de _Facebook_ y su password. -Si, desde el menú principal, seleccionamos _Archivo -> Preferencias -> -Facebook_, se nos presentará una pantalla de acceso (ver imagen *A* de la -izquierda a continuación). Introducimos nuestro usuario y password de -_Facebook_. Una vez que nos hemos conectado a _Facebook_, se nos presenta el -panel de la imagen *B* a continuación. Este panel tiene un botón que habrá que -seleccionar para cerrar la conexión a _Facebook_. - -image::images/facebook1_f20.jpg["Figure: Acceso a Facebook",align="center"] - -Tras haber establecido una conexión con _Facebook_, transferir un perfil de -inmersión a nuestro perfil de _Facebook_ es sencillo. Un icono de _Facebook_ -aparece en el panel *Notas de la inmersión* de _Subsurface_ (ver imagen *A* a -continuación). Asegúrate de que la inmersión que quieres transferir al historial -es la que se muestra en el panel *Perfil de la inmersión*. Selecciona el icono -de _Facebook_ y se mostrará un icono que determinará la cantidad de información -transferida junto al perfil (ver imagen *B*, a continuación). Se necesita -proporcionar el nombre de un álbum de _Facebook_ para poder enviar el perfil de -inmersión. Las casillas seleccionables de la izquierda nos permiten seleccionar -la información que vamos a enviar. Esta información se muestra en la ventana de -texto de la derecha (ver imagen *B* a continuación). El mensaje que se va a -enviar se puede editar directamente en esta ventana de texto. Tras haber elegido -la información y verificado lo que se va a subir, se selecciona el botón _OK_ -lo que inicia la transferencia a _Facebook_. Unos momentos después aparecerá -un mensaje indicando una transferencia correcta. - -El álbum creado y el post al historial se marcarán como privados. Para que -los amigos puedan ver el post habrá que cambiar los permisos desde un acceso -normal a _Facebook_ desde un navegador o desde la app de _Facebook_. Aunque -esto suponga un paso de más, los desarrolladores entienden que esta es la mejor -solución para evitar subidas no deseadas en el historial público. - -image::images/facebook2_f20.jpg["Figure: Facebook login",align="center"] - -Si se considera necesario, cierra la conexión a _Facebook_, bien cerrando -_Subsurface_ o bien seleccionando _Archivo -> Preferencias -> Facebook_ desde -el menú principal, clicando el botón correspondiente en el panel _Facebook_. - -[[S_Export_other]] -=== Exportar información de buceo a otros destinos o formatos -Para exportar a otros destinos, -se llega a la función de exportación seleccionando _Archivo -> Exportar_ lo que +Se llega a la función de exportación seleccionando _Archivo -> Exportar_ lo que despliega el diálogo de exportación. Este diálogo siempre ofrece dos opciones: guardar TODAS las inmersiones, o guardar solo las inmersiones seleccionadas en el panel *Lista de Inmersiones* de _Subsurface_. Marca la casilla seleccionable @@ -2834,9 +2745,8 @@ Este panel permite dos tipos de selecciones: aunque siguen estando guardadas. ** _Mostrar la profundidad media_: Activar esta casilla hace que _Subsurface_ - trace una línea gris a través del perfil, indicando la profundidad media del - buceo en cada momento de la inmersión. Normalmente es una línea con forma de - "u" que indicará la profundidad media mayor justo antes de iniciar el ascenso. + trace una línea roja a través del perfil, indicando la profundidad media del + buceo. * *Varios*: @@ -2916,19 +2826,6 @@ el servidor proxy utiliza autenticación también han de indicarse el usuario y password para que _Subsurface_ pueda pasar automáticamente a través del proxy para acceder a internet. -=== Acceso a Facebook -Este panel nos permite acceder a una cuenta de _Facebook_ para poder enviar -información desde _Subsurface_. - -image::images/Pref6_f20.jpg["FIGURE: Facebook login panel",align="center"] - -Si se proporciona un usuario y una clave validos, se crea una conexión a -_Facebook_. La conexión se cierra cuando al cerrar _Subsurface_. La casilla -seleccionable "No cerrar sesión con Subsurface" de la pantalla de acceso no -tiene ningún efecto, en estos momentos. -Ver la sección xref:S_facebook[Exportar perfiles de inmersión a Facebook] -para más información. - [[S_DivePlanner]] == El Planificador de _Subsurface_ La planificación de inmersiones es una característica avanzada de _Subsurface_ diff --git a/Documentation/user-manual_fr.html.git b/Documentation/user-manual_fr.html.git index 315642988..f1411e0cf 100644 --- a/Documentation/user-manual_fr.html.git +++ b/Documentation/user-manual_fr.html.git @@ -524,10 +524,10 @@ important pour manipuler un journal (carnet) de plongée.</p></div> <div class="paragraph"><p>La <strong>carte de plongée</strong> en bas à droite, affiche les sites de plongées de
l’utilisateur, sur une carte mondiale et centrée sur le site de la dernière
plongée sélectionnée dans la <strong>liste des plongées</strong>.</p></div>
-<div class="paragraph"><p>Les <strong>informations de plongée</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>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>
<div class="paragraph"><p>Les séparateurs entre ces panneaux peuvent être déplacés pour modifier la
@@ -540,9 +540,9 @@ sélectionnée</em> sont affichées dans les panneaux respectifs. D’autre plus d’une plongée est mise en surbrillance seule la dernière mise en
surbrillance est la <em>plongée sélectionnée</em>, mais les données de <em>toutes les
plongées mises en surbrillances</em> sont affichées dans l’onglet <strong>Stats</strong> du
-panneau <strong>informations de plongée</strong> (profondeur maximale, minimale et moyenne,
-les durées, les températures de l’eau et le SAC (air consommé); temps total
-et nombre de plongées sélectionnées).</p></div>
+panneau <strong>informations</strong> (profondeur maximale, minimale et moyenne, les
+durées, les températures de l’eau et le SAC (air consommé); temps total et
+nombre de plongées sélectionnées).</p></div>
<div class="imageblock" id="S_ViewPanels" style="text-align:center;">
<div class="content">
<img src="images/main_window_f20.jpg" alt="The Main Window" />
@@ -639,20 +639,20 @@ 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>Dive Info</strong> panel
-(<strong>Dive Notes</strong> and <strong>Equipment</strong>), as well as the <strong>Dive Profile</strong> panel that
-displays a graphical profile of each dive. These panels are respectively
-marked <span class="red">A</span>, <span class="red">B</span> and <span class="red">C</span> in the figure below. Each of these
-tabs will now be explained for data entry.</p></div>
+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
+a graphical profile of each dive. These panels are respectively marked
+<span class="red">A</span>, <span class="red">B</span> and <span class="red">C</span> in the figure below. Each of these tabs will
+now be explained for data entry.</p></div>
<div class="imageblock" style="text-align:center;">
<div class="content">
<img src="images/AddDive1_f20.jpg" alt="FIGURE: Add dive" />
</div>
</div>
-<div class="paragraph"><p>When one edits a field in Dive notes or Equipment panels, <em>Subsurface</em>
-enters <strong>Editing Mode</strong>, indicated by the message in the blue box at the top
-of the <em>Dive Notes</em> panel (see the image below). This message is displayed
-in all the panels under Dive notes and Equipment when in <strong>Editing Mode</strong>.</p></div>
+<div class="paragraph"><p>When one edits a field in Notes or Equipment panels, <em>Subsurface</em> enters
+<strong>Editing Mode</strong>, indicated by the message in the blue box at the top of the
+<em>Notes</em> panel (see the image below). This message is displayed in all the
+panels under Notes and Equipment when in <strong>Editing Mode</strong>.</p></div>
<div class="imageblock" style="text-align:center;">
<div class="content">
<img src="images/BlueEditBar_f20.jpg" alt="Blue edit bar" />
@@ -666,14 +666,14 @@ specific dive is saved in memory. When one closes Subsurface, the program will ask again, this time whether the complete dive log should be saved on
disk or not.</p></div>
<div class="sect3">
-<h4 id="_notes_de_plongée">5.1.1. Notes de plongée</h4>
+<h4 id="_notes">5.1.1. Notes</h4>
<div class="paragraph"><p>This panel contains the date, time and place information for a particular
dive, environmental conditions, co-divers and buddies, as well as some
-descriptive information. If one clicks on the <strong>Dive Notes</strong> tab, the
-following fields are visible:</p></div>
+descriptive information. If one clicks on the <strong>Notes</strong> tab, the following
+fields are visible:</p></div>
<div class="imageblock" style="text-align:center;">
<div class="content">
-<img src="images/AddDive2_f20.jpg" alt="FIGURE: The Dive Notes tab" />
+<img src="images/AddDive2_f20.jpg" alt="FIGURE: The Notes tab" />
</div>
</div>
<div class="paragraph"><p>The <strong>Time</strong> field reflects the date and the time of the dive. By clicking the
@@ -765,10 +765,10 @@ shown for the user to choose from.</p></div> <div class="paragraph"><p>The <strong>Save</strong> and <strong>Cancel</strong> buttons are used to save all the information for
tabs in the info panel and in the dive profile panel, so there’s no need to
use them until ALL other information has been added. Here is an example of a
-completed Dive Notes panel:</p></div>
+completed Notes panel:</p></div>
<div class="imageblock" style="text-align:center;">
<div class="content">
-<img src="images/CompletedDiveInfo_f20.jpg" alt="FIGURE: A completed Dive Notes tab" />
+<img src="images/CompletedDiveInfo_f20.jpg" alt="FIGURE: A completed Notes tab" />
</div>
</div>
</div>
@@ -914,13 +914,13 @@ EAN50.</p></div> </div>
<div class="sect3">
<h4 id="_saving_the_hand_entered_dive_information">5.1.4. Saving the hand-entered dive information</h4>
-<div class="paragraph"><p>The information entered in the <strong>Dive Notes</strong> tab, the <strong>Equipment</strong> tab as well
-as 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 Dive 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>
+<div class="paragraph"><p>The information entered in the <strong>Notes</strong> tab, the <strong>Equipment</strong> tab as well as
+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>
</div>
</div>
<div class="sect2">
@@ -995,7 +995,7 @@ that have not been uploaded before. This makes the download process faster on most dive computers and also saves battery power of the dive computer (at
least for those not charging while connected via USB). If, for some reason,
the user wishes to import ALL dives from the dive computer, even though some
-may already be in the logbook, then check the check box labelled <em>Force
+may already be in the logbook, then check the check box labeled <em>Force
download of all dives</em>.</p></div>
<div class="ulist"><ul>
<li>
@@ -1194,22 +1194,22 @@ device instead of the model name, allowing easy identification of devices.</p></ <h4 id="S_EditDiveInfo">5.2.3. Updating the dive information imported from the dive computer.</h4>
<div class="paragraph"><p>With the uploaded dives in the <strong>Dive List</strong>, the information from the dive
computer is not complete and more details must be added in order to have a
-fuller record of the dives. To do this, the <strong>Dive Notes</strong> and the <strong>Equipment</strong>
-tabs on the top left hand of the <em>Subsurface</em> window should be used.</p></div>
+fuller record of the dives. To do this, the <strong>Notes</strong> and the <strong>Equipment</strong> tabs
+on the top left hand of the <em>Subsurface</em> window should be used.</p></div>
</div>
<div class="sect3">
-<h4 id="_notes_de_plongée_2">5.2.4. Notes de plongée</h4>
+<h4 id="_notes_2">5.2.4. Notes</h4>
<div class="paragraph"><p>The date and time of the dive, gas mixture and (often) water temperature are
usually shown as obtained from the dive computer, but the user needs to add
additional information by hand in order to have a more complete dive
record. In a few cases, (e.g. APD rebreathers) one also has to provide the
date and time of the dive. If the contents of this tab is changed or edited
in any way, the message in a blue box at the top of the panel indicates that
-the dive is being edited. If one clicks on the <strong>Dive Notes</strong> tab, the
-following fields are visible:</p></div>
+the dive is being edited. If one clicks on the <strong>Notes</strong> tab, the following
+fields are visible:</p></div>
<div class="imageblock" style="text-align:center;">
<div class="content">
-<img src="images/AddDive3_f20.jpg" alt="FIGURE: The Dive Notes tab" />
+<img src="images/AddDive3_f20.jpg" alt="FIGURE: The Notes tab" />
</div>
</div>
<div class="paragraph"><p>The <strong>Time</strong> field reflects the date and time of the dive. By clicking the
@@ -1305,10 +1305,10 @@ typed <div class="paragraph"><p>The <strong>Save</strong> and <strong>Cancel</strong> buttons are used to save all the information for
tabs in the info panel and in the dive profile panel, so there’s no need to
use them until ALL other information has been added. Here is an example of a
-completed Dive Notes panel:</p></div>
+completed Notes panel:</p></div>
<div class="imageblock" style="text-align:center;">
<div class="content">
-<img src="images/CompletedDiveInfo_f20.jpg" alt="FIGURE: A completed Dive Notes tab" />
+<img src="images/CompletedDiveInfo_f20.jpg" alt="FIGURE: A completed Notes tab" />
</div>
</div>
</div>
@@ -1406,17 +1406,17 @@ weights: integrated as well as a weight belt:</p></div> <h4 id="_editing_several_selected_dives_simultaneously">5.2.6. Editing several selected dives simultaneously</h4>
<div class="paragraph"><p><em>METHOD 1</em>: After uploading dives from a dive computer, the dive profiles of
the uploaded dives are shown in the <strong>Dive profile</strong> tab, as well as a few
-items of information in the <strong>Dive Notes</strong> tab (e.g. water temperature) and in
-the <strong>Equipment</strong> tab (e.g. gas pressures and gas composition). However the
-other fields remain empty. It may be useful to simultaneously edit some of
-the fields in the <strong>Dive Notes</strong> and <strong>Equipment</strong> tabs. For instance, it is
-possible that a diver performed several dives during a single day, using
-identical equipment while diving at the same dive site or with the same dive
-master and/or buddy or tags. Instead of completing the information for each
-of these dives separately, one can select all the dives for that day in the
-<strong>Dive List</strong> and insert the same information in the <strong>Dive Notes</strong> and
-<strong>Equipment</strong> fields that need identical information. This is achieved by
-editing the dive notes or the equipment for any one of the selected dives.</p></div>
+items of information in the <strong>Notes</strong> tab (e.g. water temperature) and in the
+<strong>Equipment</strong> tab (e.g. gas pressures and gas composition). However the other
+fields remain empty. It may be useful to simultaneously edit some of the
+fields in the <strong>Notes</strong> and <strong>Equipment</strong> tabs. For instance, it is possible
+that a diver performed several dives during a single day, using identical
+equipment while diving at the same dive site or with the same dive master
+and/or buddy or tags. Instead of completing the information for each of
+these dives separately, one can select all the dives for that day in the
+<strong>Dive List</strong> and insert the same information in the <strong>Notes</strong> and <strong>Equipment</strong>
+fields that need identical information. This is achieved by editing the dive
+notes or the equipment for any one of the selected dives.</p></div>
<div class="paragraph"><p>The simultaneous editing only works with fields that do not already contain
information. This means that, if some fields have been edited for a
particular dive among the selected dives, these are not changed while
@@ -1428,15 +1428,15 @@ the edited dive is changed, even though several dives have been selected in the <strong>Dive List</strong>. This greatly speeds up the completion of the dive log after
several similar dives.</p></div>
<div class="paragraph" id="S_CopyComponents"><p><em>METHOD 2</em>:There is a different way of achieving the same goal. Select a
-dive with all the appropriate information typed into the <strong>Dive Notes</strong> and
+dive with all the appropriate information typed into the <strong>Notes</strong> and
<strong>Equipment</strong> tabs. Then, from the main menu, select <em>Log → Copy dive
components</em>. A box is presented with a selection of check boxes for most of
-the fields in the <strong>Dive Notes</strong> and <strong>Equipment</strong> tabs. Select the fields to
-be copied from the currently selected dive, then select <em>OK</em>. Now, in the
-<strong>Dive List</strong>, select the dives into which this information is to be
-pasted. Then, from the main menu, select <em>Log → Paste dive components</em>.
-All the selected dives now contain the data initially selected in the
-original source dive log.</p></div>
+the fields in the <strong>Notes</strong> and <strong>Equipment</strong> tabs. Select the fields to be
+copied from the currently selected dive, then select <em>OK</em>. Now, in the <strong>Dive
+List</strong>, select the dives into which this information is to be pasted. Then,
+from the main menu, select <em>Log → Paste dive components</em>. All the selected
+dives now contain the data initially selected in the original source dive
+log.</p></div>
</div>
<div class="sect3">
<h4 id="_adding_bookmarks_to_a_dive">5.2.7. Adding Bookmarks to a dive</h4>
@@ -1479,13 +1479,13 @@ If one hovers using the mouse over the red bookmark, the appropriate text is </div>
<div class="sect3">
<h4 id="_saving_the_updated_dive_information">5.2.8. Saving the updated dive information</h4>
-<div class="paragraph"><p>The information entered in the <strong>Dive Notes</strong> tab and the <strong>Equipment</strong> tab can
-be saved by using the two buttons on the top right hand of the <strong>Dive 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>
+<div class="paragraph"><p>The information entered in the <strong>Notes</strong> tab and the <strong>Equipment</strong> tab can be
+saved by using the two buttons on the top right hand of the <strong>Notes</strong> tab. If
+the <em>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>
</div>
</div>
<div class="sect2">
@@ -1720,12 +1720,12 @@ table contains the column headings found in the <em>CSV</em> data file. The blue row of cells immediately above these contains the names understood by
<em>Subsurface</em>. The white area below the dropdown lists contains all the field
names that <em>Subsurface</em> recognises. These names are in blue balloons and can
-be moved using a drag-and-frop action. For instance, <em>Subsurface</em> expects
+be moved using a drag-and-drop action. For instance, <em>Subsurface</em> expects
the column heading for Dive number (" # ") to be "Dive # ". If the column
heading that <em>Subsurface</em> expects is not in the blue cells, then drag the
appropriate column heading from the upper area and drop it in the
appropriate blue cell at the top of the table. To indicate the correct
-column for "Dive #", drag the ballooned item labelled "Dive # " and drop it
+column for "Dive #", drag the ballooned item labeled "Dive # " and drop it
in the blue cell immediately above the white cell containing " # ". This is
depicted in the image below.</p></div>
<div class="imageblock" style="text-align:center;">
@@ -1747,8 +1747,8 @@ in the <strong>Dive List</strong> panel.</p></div> <img src="images/icons/important.png" alt="Important" />
</td>
<td class="content"><em>CSV</em> is an abbreviation for a data file format: <em>Comma-Separated
-Variables</em>. It is a file format allowing someone to view or edit the
-information using a text editor such as Notebook (Windows), gedit (Linux) or
+Values</em>. It is a file format allowing someone to view or edit the
+information using a text editor such as Notepad (Windows), gedit (Linux) or
TextWrangler (OS/X). The two main advantages of the <em>CSV</em> format is that the
data are easily editable as text without any proprietary software and
ensuring all information is human-readable, not being obscured by any custom
@@ -2310,7 +2310,7 @@ button in the tool bar to the left of the dive profile:</p></div> <div class="ulist"><ul>
<li>
<p>
-the <em>Photos</em> tab of the <strong>Dive Notes</strong> panel.
+the <em>Photos</em> tab of the <strong>Notes</strong> panel.
</p>
</li>
<li>
@@ -2348,9 +2348,9 @@ the <em>Photos</em> tab (see text below).</p></div> <div class="sect3">
<h4 id="_the_em_photos_em_tab">5.5.3. The <em>Photos</em> tab</h4>
<div class="paragraph"><p>Photographs associated with a dive are shown as thumbnails in the <em>Photos</em>
-tab of the <em>Dive Notes</em> panel. Photos taken in rapid succession during a
-dive (therefore sometimes with large overlap on the dive profile) can easily
-be accessed in the <em>Photos</em> tab. This tab serves as a tool for individually
+tab of the <em>Notes</em> panel. Photos taken in rapid succession during a dive
+(therefore sometimes with large overlap on the dive profile) can easily be
+accessed in the <em>Photos</em> tab. This tab serves as a tool for individually
accessing the photos of a dive, while the stubs on the dive profile give an
indication of when during a dive a photo was taken. By single-clicking on a
thumbnail in the <em>Photos</em> panel, a photo is selected. By double-clicking a
@@ -2390,53 +2390,7 @@ there are only two types of information that need to be provided:</p></div> <div class="ulist"><ul>
<li>
<p>
-<strong>Describe the cylinders used during the dive</strong> This is performed in the <strong>Equipment tab</strong> of
- the <strong>Dive Info</strong> panel, as <a href="#cylinder_definitions">described above</a>. Enter the cylinders one by one,
- specifying the characteristics of the cylinder and the gas composition within each cylinder.
-</p>
-</li>
-<li>
-<p>
-<strong>Record the times at which switches from one cylinder to another was done:</strong> This is information
- provided by some dive computers (provided the diver indicated these changes to the dive computer
- by pressing specific buttons). If the dive computer does not provide the information, the diver has to
- record these changes using a different method, e.g. writing it on a slate.
-</p>
-</li>
-<li>
-<p>
-<strong>Record the cylinder changes on the dive profile</strong>: If the latter option
- was followed, the diver needs to indicate the gas change event by right-clicking at the appropriate point
- in time on the <strong>Dive Profile</strong> panel and indicating the cylinder to which the change was made. After
- right-clicking, follow the context menu to "Add gas change" and select the appropriate cylinder from
- those defined during the first step, above (see image below). If the
- <strong>tank bar</strong> button in the ttolbar has been activated, the cylinder switches are also indicated in the
- tank bar.
-</p>
-</li>
-</ul></div>
-<div class="paragraph"><p>Having performed these tasks, <em>Subsurface</em> indicates the appropriate use of
-cylinders in the dive profile. Below is a multi-cylinder dive, starting off
-with EAN28, then changing cylinders to EAN50 after 26 minutes to perform
-decompression.</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/multicylinder_dive.jpg" alt="FIGURE: Multicylinder profile" />
-</div>
-</div>
-</div>
-<div class="sect3">
-<h4 id="_sidemount_dives">5.6.2. Sidemount dives</h4>
-<div class="paragraph"><p>Sidemount diving is just another form of multicylinder diving, often with
-both or all cylinders having the same gas mixture. Although it is a popular
-configuration for cave divers, sidemount diving can be performed by
-recreational divers who have completed the appropriate training. Sidemount
-dive logging involves, exactly as with multicylinder dives, above, three
-steps:</p></div>
-<div class="ulist"><ul>
-<li>
-<p>
-<strong>During the dive, record cylinder switch events</strong>. Since sidemount diving normally involves two
+<strong>During the dive, recording cylinder switch events</strong>. Since sidemount diving normally involves two
cylinders with air or with the same gas mixture, <em>Subsurface</em> distinguishes among these different
cylinders. In contrast, most dive computers that allow gas switching only distinguish among different
<em>gases</em> used, not among different <em>cylinders</em> used. This means that when sidemount dives are downloaded
@@ -2449,7 +2403,7 @@ steps:</p></div> <li>
<p>
<strong>Within <em>Subsurface</em> describe the cylinders used during the dive</strong>. The diver needs to provide the
- specifications of the different cylinders, using the <strong>Equipment</strong> tab of the <strong>Dive Info Panel</strong> (see
+ 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>
@@ -2464,7 +2418,7 @@ steps:</p></div> 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 inthe image below.
+ for both cylinders are shown on the dive profile, as in the image below.
</p>
</li>
</ul></div>
@@ -2473,59 +2427,11 @@ steps:</p></div> <img src="images/sidemount1.jpg" alt="FIGURE: Sidemount profile" />
</div>
</div>
-<div class="paragraph"><p>This section gives an example of the versatility of <em>Subsurface</em> as a give
+<div class="paragraph"><p>This section gives an example of the versatility of <em>Subsurface</em> as a dive
logging tool.</p></div>
</div>
<div class="sect3">
-<h4 id="S_sSCR_dives">5.6.3. Semi-closed circuit rebreather (SCR) dives</h4>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="images/halcyon_RB80.jpg" alt="Note" />
-</td>
-<td class="content">Passive semi-closed rebreathers (pSCR) comprise a technical advance in
-diving equipment that recirculates the breathing gas that a diver breathes,
-while removing carbon dioxide from the exhaled gas. While a small amount
-(typically a tenth) of the exhaled breathing gas is released into the water,
-a small amount of fresh gas is released from the back gas cylinder
-(typically containing nitrox). A diver, using a single cylinder of
-breathing gas can therefore dive for much longer periods than using a
-recreational open-circuit configuration. With pSCR equipment, a very small
-amount of breathing gas is released every time the breather inhales. With
-active SCR (aSCR) equipment, in contrast, a small amount of breathing gas is
-released continuously from the back cylinder.</td>
-</tr></table>
-</div>
-<div class="paragraph"><p>To log pSCR dives, no special procedures are required, just the normal steps
-outlined above:</p></div>
-<div class="ulist"><ul>
-<li>
-<p>
-Select pSCR in the <em>Dive Mode</em> dropdown list on the <strong>Dive Info</strong> panel.
-</p>
-</li>
-<li>
-<p>
-pSCR diving often involves gas changes, requiring an additional cylinder.
- Define all the appropriate cylinders as described above and indicate the
- cylinder/gas changes as described above in the section on
- <a href="#S_MulticylinderDives">multicylinder dives</a>.
-</p>
-</li>
-</ul></div>
-<div class="paragraph"><p>If a pSCR <em>Dive Mode</em> has been selected, the dive ceiling for pSCR dives is
-adjusted for the oxygen drop accross the mouthpiece which often requires
-longer decompression periods. Below is a dive profile of a pSCR dive using
-EAN36 on the back cylinder and oxygen for decompression. Note that this dive
-lasted over two hours.</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/pSCR_profile.jpg" alt="FIGURE: pSCR profile" />
-</div>
-</div>
-</div>
-<div class="sect3">
-<h4 id="S_CCR_dives">5.6.4. Closed circuit rebreather (CCR) dives</h4>
+<h4 id="S_CCR_dives">5.6.2. Closed circuit rebreather (CCR) dives</h4>
<div class="admonitionblock">
<table><tr>
<td class="icon">
@@ -2658,7 +2564,7 @@ the pressures of the oxygen and diluent cylinders. The pressures of these two cylinders are shown as green lines overlapping the depth profile. In
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 overaly of setpoint and oxygen sensor data, as well as the
+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;">
@@ -2681,12 +2587,12 @@ B</a>.</p></div> <h2 id="_obtaining_more_information_about_dives_entered_into_the_logbook">6. Obtaining more information about dives entered into the logbook</h2>
<div class="sectionbody">
<div class="sect2">
-<h3 id="_the_strong_dive_info_strong_tab_for_individual_dives">6.1. The <strong>Dive Info</strong> tab (for individual dives)</h3>
-<div class="paragraph"><p>The Dive Info tab gives some summary information about a particular dive
-that has been selected in the <strong>Dive List</strong>. Useful information here includes
-the surface interval before the dive, the maximum and mean depths of the
-dive, the gas volume consumed, the surface air consumption (SAC) and the
-number of oxygen toxicity units (OTU) incurred.</p></div>
+<h3 id="_the_strong_info_strong_tab_for_individual_dives">6.1. The <strong>Info</strong> tab (for individual dives)</h3>
+<div class="paragraph"><p>The Info tab gives some summary information about a particular dive that has
+been selected in the <strong>Dive List</strong>. Useful information here includes the
+surface interval before the dive, the maximum and mean depths of the dive,
+the gas volume consumed, the surface air consumption (SAC) and the number of
+oxygen toxicity units (OTU) incurred.</p></div>
<div class="admonitionblock">
<table><tr>
<td class="icon">
@@ -3131,11 +3037,11 @@ other than air. Their values are dependent on the composition of the breathing gas. The EAD is the depth of a hypothetical air dive that has the
same partial pressure of nitrogen as the current depth of the nitrox dive at
hand. A nitrox dive leads to the same decompression obligation as an air
-dive to the depth equalling the EAD. The END is the depth of a hypothetical
+dive to the depth equaling the EAD. The END is the depth of a hypothetical
air dive that has the same sum of partial pressures of the narcotic gases
nitrogen and oxygen as the current trimix dive. A trimix diver can expect
-the same narcotic effect as a diver breathing air diving at a depth
-equalling the END.</td>
+the same narcotic effect as a diver breathing air diving at a depth equaling
+the END.</td>
</tr></table>
</div>
<div class="paragraph"><p>Figure (<strong>B</strong>) above shows an information box with a nearly complete set of
@@ -3324,14 +3230,14 @@ List</strong> panel now shows only the titles for the trips.</p></div> <h4 id="_editing_the_title_and_associated_information_for_a_particular_trip">7.3.1. Editing the title and associated information for a particular trip</h4>
<div class="paragraph"><p>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
-title from the <strong>Dive List</strong>. This shows a <strong>Trip Notes</strong> tab in the <strong>Dive
-Notes</strong> panel. Here users can add or edit information about the date/time,
-the trip location and any other general comments about the trip as a whole
-(e.g. the dive company that was dived with, the general weather and surface
-conditions during the trip, etc.). After entering this information, users
-should select <strong>Save</strong> from the buttons at the top right of the <strong>Trip Notes</strong>
-tab. The trip title in the <strong>Dive List</strong> panel should now reflect some of the
-edited information.</p></div>
+title from the <strong>Dive List</strong>. This shows a <strong>Trip Notes</strong> tab in the <strong>Notes</strong>
+panel. Here users can add or edit information about the date/time, the trip
+location and any other general comments about the trip as a whole (e.g. the
+dive company that was dived with, the general weather and surface conditions
+during the trip, etc.). After entering this information, users should
+select <strong>Save</strong> from the buttons at the top right of the <strong>Trip Notes</strong> tab. The
+trip title in the <strong>Dive List</strong> panel should now reflect some of the edited
+information.</p></div>
</div>
<div class="sect3">
<h4 id="_viewing_the_dives_during_a_particular_trip">7.3.2. Viewing the dives during a particular trip</h4>
@@ -3412,9 +3318,9 @@ the dive computer and appearing as different dives in the <strong>Dive List</str panel. Users can merge these dives onto a single dive by selecting the
appropriate dives, right-clicking them to bring up the context menu and then
selecting <strong>Merge selected dives</strong>. It may be necessary to edit the dive
-information in the <strong>Dive Notes</strong> panel to reflect events or conditions that
-apply to the merged dive. The figure below shows the depth profile of two
-such dives that were merged:</p></div>
+information in the <strong>Notes</strong> panel to reflect events or conditions that apply
+to the merged dive. The figure below shows the depth profile of two such
+dives that were merged:</p></div>
<div class="imageblock" style="text-align:center;">
<div class="content">
<img src="images/MergedDive.png" alt="Example: Merged dive" />
@@ -3496,10 +3402,10 @@ connexion <em>Facebook</em>.</p></div> </div>
</div>
<div class="paragraph"><p>Having established a login to <em>Facebook</em>, transfer of a dive profile to
-one’s <em>Facebook</em> timeline is easy. A <em>Facebook</em> icon appears in the <strong>Dive
-Notes</strong> panel of <em>Subsurface</em> (See image <strong>A</strong> below). Ensure that the dive
-that you want to transfer to the timeline is depicted in the <em>Subsurface</em>
-<strong>Dive Profile</strong> panel. Select the <em>Facebook</em> icon, and a dialogue is shown,
+one’s <em>Facebook</em> timeline is easy. A <em>Facebook</em> icon appears in the <strong>Notes</strong>
+panel of <em>Subsurface</em> (See image <strong>A</strong> below). Ensure that the dive that you
+want to transfer to the timeline is depicted in the <em>Subsurface</em> <strong>Dive
+Profile</strong> panel. Select the <em>Facebook</em> icon, and a dialogue is shown,
determining the amount of additional information transferred with the dive
profile (see image <strong>B</strong>, below). In order to transfer a dive profile to
<em>Facebook</em>, the name of a <em>Facebook</em> album needs to be provided. The
@@ -3561,7 +3467,7 @@ Universal Dive Data Format (<em>UDDF</em>). Refer to <em>http://uddf.org</em> fo </li>
<li>
<p>
-<em>DiveShare</em> is also a dive log repostory on the Internet focusing on the
+<em>DiveShare</em> 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,
so registration with <em>http://scubadiveshare.com</em> is required.
</p>
@@ -3898,7 +3804,7 @@ leave the settings panel by selecting <strong>OK</strong>.</p></div> <li>
<p>
<strong>Default cylinder</strong>: Here users can specify the default cylinder listed in
- the <strong>Equipment</strong> tab of the <strong>Dive Notes</strong> panel.
+ the <strong>Equipment</strong> tab of the <strong>Notes</strong> panel.
</p>
</li>
<li>
@@ -4178,7 +4084,7 @@ A user who is not absolutely sure about any of the above requirements should sections (see image below). The <strong>setup</strong> parameters for a dive are entered
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 Dive Notes.</p></div>
+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
@@ -4230,15 +4136,14 @@ In the top left-hand area of the planning screen, ensure that the constant </li>
<li>
<p>
-In the table labelled <em>Available Gases</em>, add the information of the
- cylinders to be used as well as the gas composition within that
- cylinder. This is done in a similar way as for <a href="#S_CylinderData">providing cylinder data for dive logs</a>. Choose the cylinder type by double clicking
- the cylinder type and using the dropdown list, then specify the work
- pressure of this cylinder. By leaving the oxygen concentration (O2%) filed
- empty, the cylinder is assumed to contain air. Otherwise enter the oxygen
- and/or helium concentration in the boxes provided in this dialogue. Add
- additional cylinders by using the "+" icon to the top righthand of the
- dialogue.
+In the table labeled <em>Available Gases</em>, add the information of the cylinders
+ to be used as well as the gas composition within that cylinder. This is done
+ in a similar way as for <a href="#S_CylinderData">providing cylinder data for dive logs</a>. Choose the cylinder type by double clicking the cylinder type and
+ using the dropdown list, then specify the work pressure of this cylinder. By
+ leaving the oxygen concentration (O2%) filed empty, the cylinder is assumed
+ to contain air. Otherwise enter the oxygen and/or helium concentration in
+ the boxes provided in this dialogue. Add additional cylinders by using the
+ "+" icon to the top righthand of the dialogue.
</p>
</li>
<li>
@@ -4326,7 +4231,7 @@ specified in the <em>Available Gases</em> table. Add new waypoints until the ma 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 fulfil decompression requirements for that dive. A
+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
@@ -4360,7 +4265,7 @@ 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
-by checking any of the options under the <em>Dive Notes</em> section of the dive
+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
plan is given. If any of the management specifications have been exceeded
@@ -4403,13 +4308,13 @@ The parameters of the pSCR diver can be set by selecting <em>File → Pre from the main menu, where the gas consumption calculation takes into account the pSCR dump
ratio (default 10:1) as well as the metabolism rate. The calculation also takes the oxygen drop
accross the mouthpiece of the rebreather into account. If the
-pO<sub>2</sub> drops below what is considered a save value, a warning apears in the <em>Dive plan
+pO<sub>2</sub> drops below what is considered a save value, a warning appears in the <em>Dive plan
details</em>. A typical pSCR configuration is with a single cylinder and one or more bail-out
cylinders. Therefore the setup of the <em>Available gases</em> and the <em>Dive planner points</em> tables
are very similar to that of a CCR dive plan, described above. However, no oxygen setpoints
are specified for pSCR dives. Below is a dive plan for a pSCR dive. The dive is comparable
to that of the CCR dive above, but note the longer ascent duration due to the lower oxygen
-in the loop due to the oxygen drop accross the mouthpiece of the pSCR equipment.</p></div>
+in the loop due to the oxygen drop across the mouthpiece of the pSCR equipment.</p></div>
<div class="imageblock" style="text-align:center;">
<div class="content">
<img src="images/Planner_pSCR1_f20.jpg" alt="FIGURE: Planning a pSCR dive: setup" />
@@ -4454,8 +4359,8 @@ Plan Details</em> for wet notes. Alternatively one can cut and paste the <em>Div Plan Details</em> for inclusion in a text file or word processing document.</p></div>
<div class="paragraph"><p>Dive plans have many characteristics in common with dive logs (dive profile,
dive notes, etc). After a dive plan has been saved, the dive details and
-gas calculations are saved in the <strong>Dive Notes</strong> tab. While a dive plan is
-being designed, it can be printed using the <em>Print</em> button in the dive
+gas calculations are saved in the <strong>Notes</strong> tab. While a dive plan is being
+designed, it can be printed using the <em>Print</em> button in the dive
planner. This prints the dive details and gas calculations in the <em>Dive Plan
Details</em> panel of the dive planner. However, after the plan has been saved,
it is represented in a way very similar to a dive log and the gas
@@ -4649,8 +4554,7 @@ des sections de ce manuel traitant des opérations relatives.</p></div> </li>
<li>
<p>
-<a href="#S_ViewPanels"><em>Info</em></a> - Affiche uniquement le panneau des <strong>notes de
- plongée</strong>.
+<a href="#S_ViewPanels"><em>Info</em></a> - Affiche uniquement le panneau des <strong>notes</strong>.
</p>
</li>
<li>
@@ -5179,7 +5083,7 @@ On the list of file names select the .CSV file that has been created </li>
<li>
<p>
-In the dropdown list on the middle right labeled '<em>Pre-configured imports</em>",
+In the dropdown list on the top left labeled '<em>Pre-configured imports</em>",
select <em>APD Log Viewer</em>.
</p>
</li>
@@ -5393,11 +5297,11 @@ 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/note.png" alt="Note" />
+<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
+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>
@@ -5509,7 +5413,7 @@ Duration: the format should be minutes:seconds. </li>
<li>
<p>
-Unit system: only one unit system shold be used (i.e., no mixture between
+Unit system: only one unit system should be used (i.e., no mixture between
imperial and metric units)
</p>
</li>
@@ -5686,7 +5590,7 @@ dive”.</p></div> <div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2015-02-17 08:49:01 PST
+Last updated 2015-02-04 07:41:58 PST
</div>
</div>
</body>
diff --git a/Documentation/user-manual_fr.txt b/Documentation/user-manual_fr.txt index 8c90f2c27..9674adc72 100644 --- a/Documentation/user-manual_fr.txt +++ b/Documentation/user-manual_fr.txt @@ -108,10 +108,10 @@ La *carte de plongée* en bas à droite, affiche les sites de plongées de l'utilisateur, sur une carte mondiale et centrée sur le site de la dernière plongée sélectionnée dans la *liste des plongées*. -Les *informations de plongée* en haut à gauche, fournissent des informations -détaillées sur la plongée sélectionnée dans la *liste des plongées*, dont -des statistiques pour la plongée sélectionnée ou pour toutes les plongées -mises en surbrillance. +Les *informations* en haut à gauche, fournissent des informations détaillées +sur la plongée sélectionnée dans la *liste des plongées*, dont des +statistiques pour la plongée sélectionnée ou pour toutes les plongées mises +en surbrillance. Le *profil de plongée* en haut à droite, affiche un profil de plongée graphique de la plongée sélectionnée dans la *liste des plongées*. @@ -127,9 +127,9 @@ sélectionnée_ sont affichées dans les panneaux respectifs. D'autre part, si plus d'une plongée est mise en surbrillance seule la dernière mise en surbrillance est la _plongée sélectionnée_, mais les données de _toutes les plongées mises en surbrillances_ sont affichées dans l'onglet *Stats* du -panneau *informations de plongée* (profondeur maximale, minimale et moyenne, -les durées, les températures de l'eau et le SAC (air consommé); temps total -et nombre de plongées sélectionnées). +panneau *informations* (profondeur maximale, minimale et moyenne, les +durées, les températures de l'eau et le SAC (air consommé); temps total et +nombre de plongées sélectionnées). [[S_ViewPanels]] @@ -217,18 +217,18 @@ duration, depth, the names of your dive buddy and of the dive master or dive guide, and some remarks about the dive. _Subsurface_ can store much more information than this for each dive. In order to add a dive to a dive log, select _Log -> Add Dive_ from the Main Menu. The program then shows three -panels to enter information for a dive: two tabs in the *Dive Info* panel -(*Dive Notes* and *Equipment*), as well as the *Dive Profile* panel that -displays a graphical profile of each dive. These panels are respectively -marked [red]#A#, [red]#B# and [red]#C# in the figure below. Each of these -tabs will now be explained for data entry. +panels to enter information for a dive: two tabs in the *Info* panel +(*Notes* and *Equipment*), as well as the *Dive Profile* panel that displays +a graphical profile of each dive. These panels are respectively marked +[red]#A#, [red]#B# and [red]#C# in the figure below. Each of these tabs will +now be explained for data entry. image::images/AddDive1_f20.jpg["FIGURE: Add dive", align="center"] -When one edits a field in Dive notes or Equipment panels, _Subsurface_ -enters *Editing Mode*, indicated by the message in the blue box at the top -of the _Dive Notes_ panel (see the image below). This message is displayed -in all the panels under Dive notes and Equipment when in *Editing Mode*. +When one edits a field in Notes or Equipment panels, _Subsurface_ enters +*Editing Mode*, indicated by the message in the blue box at the top of the +_Notes_ panel (see the image below). This message is displayed in all the +panels under Notes and Equipment when in *Editing Mode*. image::images/BlueEditBar_f20.jpg["Blue edit bar", align="center"] @@ -240,14 +240,14 @@ specific dive is saved in memory. When one closes Subsurface, the program will ask again, this time whether the complete dive log should be saved on disk or not. -==== Notes de plongée +==== Notes This panel contains the date, time and place information for a particular dive, environmental conditions, co-divers and buddies, as well as some -descriptive information. If one clicks on the *Dive Notes* tab, the -following fields are visible: +descriptive information. If one clicks on the *Notes* tab, the following +fields are visible: -image::images/AddDive2_f20.jpg["FIGURE: The Dive Notes tab", align="center"] +image::images/AddDive2_f20.jpg["FIGURE: The Notes tab", align="center"] The *Time* field reflects the date and the time of the dive. By clicking the date, a calendar is displayed from which one can choose the correct @@ -340,9 +340,9 @@ shown for the user to choose from. The *Save* and *Cancel* buttons are used to save all the information for tabs in the info panel and in the dive profile panel, so there's no need to use them until ALL other information has been added. Here is an example of a -completed Dive Notes panel: +completed Notes panel: -image::images/CompletedDiveInfo_f20.jpg["FIGURE: A completed Dive Notes tab", align="center"] +image::images/CompletedDiveInfo_f20.jpg["FIGURE: A completed Notes tab", align="center"] ==== Equipment @@ -471,13 +471,13 @@ image::images/DiveProfile4_f20.jpg["FIGURE: Completed dive profile", align="cent ==== Saving the hand-entered dive information -The information entered in the *Dive Notes* tab, the *Equipment* tab as well -as the *Dive Profile* can now be saved in the user's logbook by using the -two buttons on the top right hand of the Dive Notes tab. If the _Save_ -button is clicked, the dive data are saved in the current logbook. If the -_Cancel_ button is clicked, the newly entered dive data are discarded. When -exiting _Subsurface_, the user will be prompted once more to save the -logbook with the new dive(s). +The information entered in the *Notes* tab, the *Equipment* tab as well as +the *Dive Profile* 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 _Save_ button is +clicked, the dive data are saved in the current logbook. If the _Cancel_ +button is clicked, the newly entered dive data are discarded. When exiting +_Subsurface_, the user will be prompted once more to save the logbook with +the new dive(s). [[S_ImportDiveComputer]] === Importing new dive information from a Dive Computer @@ -538,7 +538,7 @@ that have not been uploaded before. This makes the download process faster on most dive computers and also saves battery power of the dive computer (at least for those not charging while connected via USB). If, for some reason, the user wishes to import ALL dives from the dive computer, even though some -may already be in the logbook, then check the check box labelled _Force +may already be in the logbook, then check the check box labeled _Force download of all dives_. - The dialogue has two drop-down lists, *Vendor* and *Dive Computer*. On the @@ -690,10 +690,10 @@ device instead of the model name, allowing easy identification of devices. With the uploaded dives in the *Dive List*, the information from the dive computer is not complete and more details must be added in order to have a -fuller record of the dives. To do this, the *Dive Notes* and the *Equipment* -tabs on the top left hand of the _Subsurface_ window should be used. +fuller record of the dives. To do this, the *Notes* and the *Equipment* tabs +on the top left hand of the _Subsurface_ window should be used. -==== Notes de plongée +==== Notes The date and time of the dive, gas mixture and (often) water temperature are usually shown as obtained from the dive computer, but the user needs to add @@ -701,10 +701,10 @@ additional information by hand in order to have a more complete dive record. In a few cases, (e.g. APD rebreathers) one also has to provide the date and time of the dive. If the contents of this tab is changed or edited in any way, the message in a blue box at the top of the panel indicates that -the dive is being edited. If one clicks on the *Dive Notes* tab, the -following fields are visible: +the dive is being edited. If one clicks on the *Notes* tab, the following +fields are visible: -image::images/AddDive3_f20.jpg["FIGURE: The Dive Notes tab", align="center"] +image::images/AddDive3_f20.jpg["FIGURE: The Notes tab", align="center"] The *Time* field reflects the date and time of the dive. By clicking the date, a calendar is displayed from which one can choose the correct @@ -800,9 +800,9 @@ typed The *Save* and *Cancel* buttons are used to save all the information for tabs in the info panel and in the dive profile panel, so there's no need to use them until ALL other information has been added. Here is an example of a -completed Dive Notes panel: +completed Notes panel: -image::images/CompletedDiveInfo_f20.jpg["FIGURE: A completed Dive Notes tab", align="center"] +image::images/CompletedDiveInfo_f20.jpg["FIGURE: A completed Notes tab", align="center"] ==== Equipment @@ -888,17 +888,17 @@ image::images/WeightsDataEntry3_f20.jpg["FIGURE: A completed weights information _METHOD 1_: After uploading dives from a dive computer, the dive profiles of the uploaded dives are shown in the *Dive profile* tab, as well as a few -items of information in the *Dive Notes* tab (e.g. water temperature) and in -the *Equipment* tab (e.g. gas pressures and gas composition). However the -other fields remain empty. It may be useful to simultaneously edit some of -the fields in the *Dive Notes* and *Equipment* tabs. For instance, it is -possible that a diver performed several dives during a single day, using -identical equipment while diving at the same dive site or with the same dive -master and/or buddy or tags. Instead of completing the information for each -of these dives separately, one can select all the dives for that day in the -*Dive List* and insert the same information in the *Dive Notes* and -*Equipment* fields that need identical information. This is achieved by -editing the dive notes or the equipment for any one of the selected dives. +items of information in the *Notes* tab (e.g. water temperature) and in the +*Equipment* tab (e.g. gas pressures and gas composition). However the other +fields remain empty. It may be useful to simultaneously edit some of the +fields in the *Notes* and *Equipment* tabs. For instance, it is possible +that a diver performed several dives during a single day, using identical +equipment while diving at the same dive site or with the same dive master +and/or buddy or tags. Instead of completing the information for each of +these dives separately, one can select all the dives for that day in the +*Dive List* and insert the same information in the *Notes* and *Equipment* +fields that need identical information. This is achieved by editing the dive +notes or the equipment for any one of the selected dives. The simultaneous editing only works with fields that do not already contain information. This means that, if some fields have been edited for a @@ -913,15 +913,15 @@ several similar dives. [[S_CopyComponents]] _METHOD 2_:There is a different way of achieving the same goal. Select a -dive with all the appropriate information typed into the *Dive Notes* and +dive with all the appropriate information typed into the *Notes* and *Equipment* tabs. Then, from the main menu, select _Log -> Copy dive components_. A box is presented with a selection of check boxes for most of -the fields in the *Dive Notes* and *Equipment* tabs. Select the fields to -be copied from the currently selected dive, then select _OK_. Now, in the -*Dive List*, select the dives into which this information is to be -pasted. Then, from the main menu, select _Log -> Paste dive components_. -All the selected dives now contain the data initially selected in the -original source dive log. +the fields in the *Notes* and *Equipment* tabs. Select the fields to be +copied from the currently selected dive, then select _OK_. Now, in the *Dive +List*, select the dives into which this information is to be pasted. Then, +from the main menu, select _Log -> Paste dive components_. All the selected +dives now contain the data initially selected in the original source dive +log. ==== Adding Bookmarks to a dive @@ -948,13 +948,13 @@ image::images/Bookmarks.jpg["FIGURE: Bookmark dialog", align="center"] ==== Saving the updated dive information -The information entered in the *Dive Notes* tab and the *Equipment* tab can -be saved by using the two buttons on the top right hand of the *Dive Notes* -tab. If the _Save_ button is clicked, the dive data are saved. If the -_Cancel_ 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 _Subsurface_ there is a final prompt to -confirm that the new data should be saved. +The information entered in the *Notes* tab and the *Equipment* tab can be +saved by using the two buttons on the top right hand of the *Notes* tab. If +the _Save_ button is clicked, the dive data are saved. If the _Cancel_ +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 _Subsurface_ there is a final prompt to confirm that the new data +should be saved. === Importing dive information from other digital data sources or other data formats @@ -1135,12 +1135,12 @@ table contains the column headings found in the _CSV_ data file. The blue row of cells immediately above these contains the names understood by _Subsurface_. The white area below the dropdown lists contains all the field names that _Subsurface_ recognises. These names are in blue balloons and can -be moved using a drag-and-frop action. For instance, _Subsurface_ expects +be moved using a drag-and-drop action. For instance, _Subsurface_ expects the column heading for Dive number (" # ") to be "Dive # ". If the column heading that _Subsurface_ expects is not in the blue cells, then drag the appropriate column heading from the upper area and drop it in the appropriate blue cell at the top of the table. To indicate the correct -column for "Dive #", drag the ballooned item labelled "Dive # " and drop it +column for "Dive #", drag the ballooned item labeled "Dive # " and drop it in the blue cell immediately above the white cell containing " # ". This is depicted in the image below. @@ -1159,8 +1159,8 @@ in the *Dive List* panel. [IMPORTANT] _CSV_ is an abbreviation for a data file format: _Comma-Separated -Variables_. It is a file format allowing someone to view or edit the -information using a text editor such as Notebook (Windows), gedit (Linux) or +Values_. It is a file format allowing someone to view or edit the +information using a text editor such as Notepad (Windows), gedit (Linux) or TextWrangler (OS/X). The two main advantages of the _CSV_ format is that the data are easily editable as text without any proprietary software and ensuring all information is human-readable, not being obscured by any custom @@ -1601,7 +1601,7 @@ image::images/icons/ShowPhotos_f20.png["FIGURE:Show photos toolbar button", alig After the images have been loaded, they appear in two places: - - the _Photos_ tab of the *Dive Notes* panel. + - the _Photos_ tab of the *Notes* panel. - as tiny icons (stubs) on the dive profile at the appropriate positions reflecting the time each photograph was taken. See below: @@ -1625,9 +1625,9 @@ image::images/LoadImage6_f20.jpg["FIGURE: Full-screen photo on dive profile", al ==== The _Photos_ tab Photographs associated with a dive are shown as thumbnails in the _Photos_ -tab of the _Dive Notes_ panel. Photos taken in rapid succession during a -dive (therefore sometimes with large overlap on the dive profile) can easily -be accessed in the _Photos_ tab. This tab serves as a tool for individually +tab of the _Notes_ panel. Photos taken in rapid succession during a dive +(therefore sometimes with large overlap on the dive profile) can easily be +accessed in the _Photos_ tab. This tab serves as a tool for individually accessing the photos of a dive, while the stubs on the dive profile give an indication of when during a dive a photo was taken. By single-clicking on a thumbnail in the _Photos_ panel, a photo is selected. By double-clicking a @@ -1666,40 +1666,7 @@ needs of the dive. For this reason multicylinder dives are often used by technical divers who dive deep or long. As far as _Subsurface_ is concerned, there are only two types of information that need to be provided: -- *Describe the cylinders used during the dive* This is performed in the *Equipment tab* of - the *Dive Info* panel, as xref:cylinder_definitions[described above]. Enter the cylinders one by one, - specifying the characteristics of the cylinder and the gas composition within each cylinder. - -- *Record the times at which switches from one cylinder to another was done:* This is information - provided by some dive computers (provided the diver indicated these changes to the dive computer - by pressing specific buttons). If the dive computer does not provide the information, the diver has to - record these changes using a different method, e.g. writing it on a slate. - -- *Record the cylinder changes on the dive profile*: If the latter option - was followed, the diver needs to indicate the gas change event by right-clicking at the appropriate point - in time on the *Dive Profile* panel and indicating the cylinder to which the change was made. After - right-clicking, follow the context menu to "Add gas change" and select the appropriate cylinder from - those defined during the first step, above (see image below). If the - *tank bar* button in the ttolbar has been activated, the cylinder switches are also indicated in the - tank bar. - -Having performed these tasks, _Subsurface_ indicates the appropriate use of -cylinders in the dive profile. Below is a multi-cylinder dive, starting off -with EAN28, then changing cylinders to EAN50 after 26 minutes to perform -decompression. - -image::images/multicylinder_dive.jpg["FIGURE: Multicylinder profile", align="center"] - -==== Sidemount dives - -Sidemount diving is just another form of multicylinder diving, often with -both or all cylinders having the same gas mixture. Although it is a popular -configuration for cave divers, sidemount diving can be performed by -recreational divers who have completed the appropriate training. Sidemount -dive logging involves, exactly as with multicylinder dives, above, three -steps: - -- *During the dive, record cylinder switch events*. Since sidemount diving normally involves two +- *During the dive, recording cylinder switch events*. Since sidemount diving normally involves two cylinders with air or with the same gas mixture, _Subsurface_ distinguishes among these different cylinders. In contrast, most dive computers that allow gas switching only distinguish among different _gases_ used, not among different _cylinders_ used. This means that when sidemount dives are downloaded @@ -1708,7 +1675,7 @@ steps: has this facility) marking each cylinder switch with a bookmark that can be retrieved later. Returning from a dive with the information about cylinder changes is the only tricky part of logging sidemount dives. - *Within _Subsurface_ describe the cylinders used during the dive*. The diver needs to provide the - specifications of the different cylinders, using the *Equipment* tab of the *Dive Info Panel* (see + specifications of the different cylinders, using the *Equipment* tab of the *Info Panel* (see image below where two 12 litre cylinder were used). - *Indicate cylinder change events on the _Subsurface_ dive profile*. Once the dive log has been imported from a dive computer into _Subsurface_, the cylinder switch events need to be indicated on the dive profile. @@ -1719,51 +1686,13 @@ steps: profile with a cylinder symbol. If the *Tank Bar* 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 inthe image below. + for both cylinders are shown on the dive profile, as in the image below. image::images/sidemount1.jpg["FIGURE: Sidemount profile", align="center"] -This section gives an example of the versatility of _Subsurface_ as a give +This section gives an example of the versatility of _Subsurface_ as a dive logging tool. - -[[S_sSCR_dives]] -==== Semi-closed circuit rebreather (SCR) dives - -[icon="images/halcyon_RB80.jpg"] -[NOTE] -Passive semi-closed rebreathers (pSCR) comprise a technical advance in -diving equipment that recirculates the breathing gas that a diver breathes, -while removing carbon dioxide from the exhaled gas. While a small amount -(typically a tenth) of the exhaled breathing gas is released into the water, -a small amount of fresh gas is released from the back gas cylinder -(typically containing nitrox). A diver, using a single cylinder of -breathing gas can therefore dive for much longer periods than using a -recreational open-circuit configuration. With pSCR equipment, a very small -amount of breathing gas is released every time the breather inhales. With -active SCR (aSCR) equipment, in contrast, a small amount of breathing gas is -released continuously from the back cylinder. - -To log pSCR dives, no special procedures are required, just the normal steps -outlined above: - -- Select pSCR in the _Dive Mode_ dropdown list on the *Dive Info* panel. - -- pSCR diving often involves gas changes, requiring an additional cylinder. - Define all the appropriate cylinders as described above and indicate the - cylinder/gas changes as described above in the section on - xref:S_MulticylinderDives[multicylinder dives]. - -If a pSCR _Dive Mode_ has been selected, the dive ceiling for pSCR dives is -adjusted for the oxygen drop accross the mouthpiece which often requires -longer decompression periods. Below is a dive profile of a pSCR dive using -EAN36 on the back cylinder and oxygen for decompression. Note that this dive -lasted over two hours. - -image::images/pSCR_profile.jpg["FIGURE: pSCR profile", align="center"] - - - [[S_CCR_dives]] ==== Closed circuit rebreather (CCR) dives @@ -1870,7 +1799,7 @@ the pressures of the oxygen and diluent cylinders. The pressures of these two cylinders are shown as green lines overlapping the depth profile. In addition, start and end pressures for both oxygen and diluent cylinders are shown in the _Equipment Tab_. Below is a dive profile for a CCR dive, -including an overaly of setpoint and oxygen sensor data, as well as the +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. @@ -1886,13 +1815,13 @@ B]. == Obtaining more information about dives entered into the logbook -=== The *Dive Info* tab (for individual dives) +=== The *Info* tab (for individual dives) -The Dive Info tab gives some summary information about a particular dive -that has been selected in the *Dive List*. Useful information here includes -the surface interval before the dive, the maximum and mean depths of the -dive, the gas volume consumed, the surface air consumption (SAC) and the -number of oxygen toxicity units (OTU) incurred. +The Info tab gives some summary information about a particular dive that has +been selected in the *Dive List*. Useful information here includes the +surface interval before the dive, the maximum and mean depths of the dive, +the gas volume consumed, the surface air consumption (SAC) and the number of +oxygen toxicity units (OTU) incurred. [icon="images/icons/info.jpg"] [NOTE] @@ -2220,11 +2149,11 @@ other than air. Their values are dependent on the composition of the breathing gas. The EAD is the depth of a hypothetical air dive that has the same partial pressure of nitrogen as the current depth of the nitrox dive at hand. A nitrox dive leads to the same decompression obligation as an air -dive to the depth equalling the EAD. The END is the depth of a hypothetical +dive to the depth equaling the EAD. The END is the depth of a hypothetical air dive that has the same sum of partial pressures of the narcotic gases nitrogen and oxygen as the current trimix dive. A trimix diver can expect -the same narcotic effect as a diver breathing air diving at a depth -equalling the END. +the same narcotic effect as a diver breathing air diving at a depth equaling +the END. Figure (*B*) above shows an information box with a nearly complete set of data. @@ -2372,14 +2301,14 @@ List* panel now shows only the titles for the trips. 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 -title from the *Dive List*. This shows a *Trip Notes* tab in the *Dive -Notes* panel. Here users can add or edit information about the date/time, -the trip location and any other general comments about the trip as a whole -(e.g. the dive company that was dived with, the general weather and surface -conditions during the trip, etc.). After entering this information, users -should select *Save* from the buttons at the top right of the *Trip Notes* -tab. The trip title in the *Dive List* panel should now reflect some of the -edited information. +title from the *Dive List*. This shows a *Trip Notes* tab in the *Notes* +panel. Here users can add or edit information about the date/time, the trip +location and any other general comments about the trip as a whole (e.g. the +dive company that was dived with, the general weather and surface conditions +during the trip, etc.). After entering this information, users should +select *Save* from the buttons at the top right of the *Trip Notes* tab. The +trip title in the *Dive List* panel should now reflect some of the edited +information. ==== Viewing the dives during a particular trip @@ -2456,9 +2385,9 @@ the dive computer and appearing as different dives in the *Dive List* panel. Users can merge these dives onto a single dive by selecting the appropriate dives, right-clicking them to bring up the context menu and then selecting *Merge selected dives*. It may be necessary to edit the dive -information in the *Dive Notes* panel to reflect events or conditions that -apply to the merged dive. The figure below shows the depth profile of two -such dives that were merged: +information in the *Notes* panel to reflect events or conditions that apply +to the merged dive. The figure below shows the depth profile of two such +dives that were merged: image::images/MergedDive.png["Example: Merged dive", align="center"] @@ -2527,10 +2456,10 @@ connexion _Facebook_. image::images/facebook1_f20.jpg["Figure: Facebook login", align="center"] Having established a login to _Facebook_, transfer of a dive profile to -one's _Facebook_ timeline is easy. A _Facebook_ icon appears in the *Dive -Notes* panel of _Subsurface_ (See image *A* below). Ensure that the dive -that you want to transfer to the timeline is depicted in the _Subsurface_ -*Dive Profile* panel. Select the _Facebook_ icon, and a dialogue is shown, +one's _Facebook_ timeline is easy. A _Facebook_ icon appears in the *Notes* +panel of _Subsurface_ (See image *A* below). Ensure that the dive that you +want to transfer to the timeline is depicted in the _Subsurface_ *Dive +Profile* panel. Select the _Facebook_ icon, and a dialogue is shown, determining the amount of additional information transferred with the dive profile (see image *B*, below). In order to transfer a dive profile to _Facebook_, the name of a _Facebook_ album needs to be provided. The @@ -2578,7 +2507,7 @@ A dive log or part of it can be saved in three formats: _Divelogs.de_. Log into _http://en.divelogs.de_ and subscribe to this service in order to upload dive log data from _Subsurface_. -* _DiveShare_ is also a dive log repostory on the Internet focusing on the +* _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, so registration with _http://scubadiveshare.com_ is required. @@ -2806,7 +2735,7 @@ image::images/Pref1_f20.jpg["FIGURE: Preferences defaults page", align="center"] the dive list. ** *Default cylinder*: Here users can specify the default cylinder listed in - the *Equipment* tab of the *Dive Notes* panel. + the *Equipment* tab of the *Notes* panel. ** *Animations*: Some actions in showing the dive profile are performed using animations. For instance, the axis values for depth and time change from dive to @@ -2983,7 +2912,7 @@ Like the _Subsurface_ dive log, the planner screen is divided into several sections (see image below). The *setup* parameters for a dive are entered into the several sections on the left hand side of the screen. The setup is divided into several sections: Available Gases, Rates, Planning, Gas Options -and Dive Notes. +and Notes. 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 @@ -3012,16 +2941,15 @@ image::images/PlannerWindow1_f20.jpg["FIGURE: Dive planner startup window", alig atmospheric pressure can also be entered as an altitude in metres, assuming an atmospheric pressure of 1.013 bar. -- In the table labelled _Available Gases_, add the information of the - cylinders to be used as well as the gas composition within that - cylinder. This is done in a similar way as for <<S_CylinderData,providing - cylinder data for dive logs>>. Choose the cylinder type by double clicking - the cylinder type and using the dropdown list, then specify the work - pressure of this cylinder. By leaving the oxygen concentration (O2%) filed - empty, the cylinder is assumed to contain air. Otherwise enter the oxygen - and/or helium concentration in the boxes provided in this dialogue. Add - additional cylinders by using the "+" icon to the top righthand of the - dialogue. +- 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 + in a similar way as for <<S_CylinderData,providing cylinder data for dive + logs>>. Choose the cylinder type by double clicking the cylinder type and + using the dropdown list, then specify the work pressure of this cylinder. By + leaving the oxygen concentration (O2%) filed empty, the cylinder is assumed + to contain air. Otherwise enter the oxygen and/or helium concentration in + the boxes provided in this dialogue. Add additional cylinders by using the + "+" icon to the top righthand of the dialogue. - The dialogue indicating _Dive Planner Points_ is usually not used at this stage of the dive planning. @@ -3102,7 +3030,7 @@ specified in the _Available Gases_ table. Add new waypoints until the main features of the dive have been completed, e.g. the bottom time segment and deep stops (if these are implemented). Leave the remaining waypoints on the ascent to _Subsurface_. In most cases _Subsurface_ computes additional way -points in order to fulfil decompression requirements for that dive. A +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 _Dive Planner Points_ dialogue can be edited by hand in order to obtain a precise presentation of the dive @@ -3140,7 +3068,7 @@ appear in the *Dive List* panel of _Subsurface_. 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 -by checking any of the options under the _Dive Notes_ section of the dive +by checking any of the options under the _Notes_ section of the dive planner, immediately to the left of the _Dive Plan Details_. If a _Verbatim diveplan_ is requested, a detailed sentence-level explanation of the dive plan is given. If any of the management specifications have been exceeded @@ -3185,13 +3113,13 @@ The parameters of the pSCR diver can be set by selecting _File -> Preferences from the main menu, where the gas consumption calculation takes into account the pSCR dump ratio (default 10:1) as well as the metabolism rate. The calculation also takes the oxygen drop accross the mouthpiece of the rebreather into account. If the -pO~2~ drops below what is considered a save value, a warning apears in the _Dive plan +pO~2~ drops below what is considered a save value, a warning appears in the _Dive plan details_. A typical pSCR configuration is with a single cylinder and one or more bail-out cylinders. Therefore the setup of the _Available gases_ and the _Dive planner points_ tables are very similar to that of a CCR dive plan, described above. However, no oxygen setpoints are specified for pSCR dives. Below is a dive plan for a pSCR dive. The dive is comparable to that of the CCR dive above, but note the longer ascent duration due to the lower oxygen -in the loop due to the oxygen drop accross the mouthpiece of the pSCR equipment. +in the loop due to the oxygen drop across the mouthpiece of the pSCR equipment. image::images/Planner_pSCR1_f20.jpg["FIGURE: Planning a pSCR dive: setup", align="center"] @@ -3239,8 +3167,8 @@ Plan Details_ for inclusion in a text file or word processing document. Dive plans have many characteristics in common with dive logs (dive profile, dive notes, etc). After a dive plan has been saved, the dive details and -gas calculations are saved in the *Dive Notes* tab. While a dive plan is -being designed, it can be printed using the _Print_ button in the dive +gas calculations are saved in the *Notes* tab. While a dive plan is being +designed, it can be printed using the _Print_ button in the dive planner. This prints the dive details and gas calculations in the _Dive Plan Details_ panel of the dive planner. However, after the plan has been saved, it is represented in a way very similar to a dive log and the gas @@ -3315,8 +3243,7 @@ des sections de ce manuel traitant des opérations relatives. *liste des plongées*. - <<S_ViewPanels,_Profil_>> - Affiche uniquement le panneau du *profil de la plongée*. -- <<S_ViewPanels,_Info_>> - Affiche uniquement le panneau des *notes de - plongée*. +- <<S_ViewPanels,_Info_>> - Affiche uniquement le panneau des *notes*. - <<S_ViewPanels,_Globe_>> - Affiche uniquement le panneau de la *carte mondiale*. - _Statistiques annuelles_ - Affiche par année le résumé des statistiques des @@ -3677,7 +3604,7 @@ _Subsurface_ as follows: 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 middle right labeled '_Pre-configured imports_", +- 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_. @@ -3762,10 +3689,11 @@ Making a backup copy of the Suunto DM4/DM5 database: === Exporting from Atomic Logbook [[Atomic_Export]] +[icon="images/icons/atomiclogo.jpg"] [NOTE] Atomic Logbook is a Windows software by Atomic Aquatics. It allows downloading of dive information from Cobalt and Cobalt 2 dive computers. -The divelog is kept in a SQlite database at +The divelog is kept in a SQLite database at C:\ProgramData\AtomicsAquatics\Cobalt-Logbook\Cobalt.db. This file can be directly imported to Subsurface. @@ -3827,7 +3755,7 @@ following a few simple rules: 1. Date: use one of the following formats: yyyy-mm-dd, dd.mm.yyyy, mm/dd/yyyy 2. Duration: the format should be minutes:seconds. -3. Unit system: only one unit system shold be used (i.e., no mixture between +3. Unit system: only one unit system should be used (i.e., no mixture between imperial and metric units) 4. Tags and buddies: values should be separated using a comma. 5. GPS position: users must use decimal degrees, e.g. 30.22496 30.821798 diff --git a/Documentation/user-manual_ru.html.git b/Documentation/user-manual_ru.html.git index 96d0dbede..dce91ace8 100644 --- a/Documentation/user-manual_ru.html.git +++ b/Documentation/user-manual_ru.html.git @@ -473,7 +473,11 @@ libdivecomputer.</p></div> <h2 id="S_UserSurvey">1. Работа с этим руководством</h2>
<div class="sectionbody">
<div class="paragraph"><p>Если руководство открыто из <em>Subsurface</em>, то вы не увидите никаких элементов
+<<<<<<< HEAD +управления. Однака важная функция <em>поиска</em> доступна по нажатию комбинации клавиш
+======= управления. Однако важная функция <em>поиска</em> доступна по нажатию комбинации клавиш
+>>>>>>> v4.4-branch control-F или command-F. Используйте текстовое поле в нижней части экрана для поиска
нужной информации в руководстве.</p></div>
</div>
@@ -572,8 +576,13 @@ control-F или command-F. Используйте текстовое поле <div class="sect1">
<h2 id="S_GetInformation">5. Сохранение погружений в журнале</h2>
<div class="sectionbody">
+<<<<<<< HEAD +<div class="paragraph"><p>Теперь, когда создан новый журоанл, очень просто добавить погружения к нему.
+<em>Subsurface</em> предлашает несколько способов добавления погружений, которые подробно
+======= <div class="paragraph"><p>Теперь, когда создан новый журнал, очень просто добавить погружения к нему.
<em>Subsurface</em> предлагает несколько способов добавления погружений, которые подробно
+>>>>>>> v4.4-branch описаны далее:</p></div>
<div class="paragraph"><p>1) Если вы ведете бумажный журнал, храните информацию в электронной таблице или
используете другой ручной способ, данные о погружениях могут быть добавлены с
@@ -588,6 +597,11 @@ control-F или command-F. Используйте текстовое поле </li>
<li>
<p>
+<<<<<<< HEAD +Импорт данных из журнала, который велся в электронной таблице или в виже CSV-файла.
+ Обратитесь к главам <a href="#S_Appendix_D">ПРИЛОЖЕНИЕ Г: Экспорт таблиц в CSV формат</a> и
+ <a href="#S_ImportingCSVDives">Импорт погружений в CSV формате</a>.
+======= Импорт данных из журнала, который велся в электронной таблице или в виде CSV-файла.
Обратитесь к главам <a href="#S_Appendix_D">ПРИЛОЖЕНИЕ Г: Экспорт таблиц в CSV формат</a> и
<a href="#S_ImportingCSVDives">Импорт погружений в CSV формате</a>.
@@ -601,16 +615,35 @@ control-F или command-F. Используйте текстовое поле <li>
<p>
Непосредственно дайв-компьютера. Смотрите главу <a href="#S_ImportDiveComputer">Импорт данных нового погружения из дайв-компьютера</a> или
+>>>>>>> v4.4-branch +</p>
+</li>
+</ul></div>
+<div class="paragraph"><p>2) Если ваши погружения записаны в дайв-компьютере, вы можете получить значительное
+ количество информации, включая профиль погружения. Погружения могут быть импортированы
+ из:</p></div>
+<div class="ulist"><ul>
+<li>
+<p>
+<<<<<<< HEAD +Непосредственно дайв-компьютера. Смотрите главу <a href="#S_ImportDiveComputer">Импорт данных нового погружения из дайв-компьютера</a> или
+======= +Стороннего программного обеспечения, распространяемого производителями дайв-компьютеров.
+ Обратитесь к <a href="#S_ImportingAlienDiveLogs">Импорт погружений из других источников и форматов данных</a>.
+>>>>>>> v4.4-branch </p>
</li>
<li>
<p>
+<<<<<<< HEAD Стороннего программного обеспечения, распространяемого производителями дайв-компьютеров.
Обратитесь к <a href="#S_ImportingAlienDiveLogs">Импорт погружений из других источников и форматов данных</a>.
</p>
</li>
<li>
<p>
+======= +>>>>>>> v4.4-branch Импорт из электронных таблиц и CSV-файлов, содержащих профили погружений. Смотрите
<a href="#S_ImportingCSVDives">Импорт погружений в CSV-формате из дайв-компьютеров и другого ПО для ведения журналов</a>.
</p>
@@ -675,6 +708,24 @@ control-F или command-F. Используйте текстовое поле <div class="paragraph"><p>а. Выбрать на карте, которая находится в правой нижней части окна
<em>Subsurface</em>. На карте отображается зеленая полоса с надписью «Выберите место
на карте двойным щелчком мыши». При двойном нажатии в соответствующем месте
+<<<<<<< HEAD +карты, зеленая полоса исчезнет и координаты точки будут заполнены в поле.
+</p>
+</li>
+<li>
+<p>
+Координаты могут быть получены с помощью вспомогательного приложения
+<em>Subsurface</em>, если у вас есть устройство Android или iPhone с GPS-датчиком
+и координаты дайв-сайта были сохранены в этом устройстве.
+<a href="#S_Companion">Нажмите, чтобы узнать больше</a>
+</p>
+</li>
+<li>
+<p>
+Если вам известны координаты, их можно ввести вручную в одном из четырех
+форматов, сначала широта, потом долгота:
+</p>
+======= карты, зеленая полоса исчезнет и координаты точки будут заполнены в поле.</p></div>
<div class="paragraph"><p>б. Координаты могут быть получены с помощью вспомогательного приложения
<em>Subsurface</em>, если у вас есть устройство Android или iPhone с GPS-датчиком
@@ -682,6 +733,7 @@ control-F или command-F. Используйте текстовое поле <a href="#S_Companion">Нажмите, чтобы узнать больше</a></p></div>
<div class="paragraph"><p>в. Если вам известны координаты, их можно ввести вручную в одном из четырех
форматов, сначала широта, потом долгота:</p></div>
+>>>>>>> v4.4-branch <div class="literalblock">
<div class="content">
<pre><code>ISO 6709 Приложение D, например 30°13'28.9"Ю 30°49'1.5"В
@@ -995,8 +1047,13 @@ Freedive (погружение без дыхательного аппарата) </li>
<li>
<p>
+<<<<<<< HEAD +Нажмите кнопку <em>Загрузить</em>. После успешной загрузки диалоговое окно будет выглядет
+ как показано на рисунке <strong>B</strong>.
+======= Нажмите кнопку <em>Загрузить</em>. После успешной загрузки диалоговое окно будет
выглядеть как показано на рисунке <strong>B</strong>.
+>>>>>>> v4.4-branch </p>
</li>
<li>
@@ -1012,7 +1069,11 @@ Freedive (погружение без дыхательного аппарата) </p>
</li>
</ul></div>
+<<<<<<< HEAD +<div class="paragraph"><p>После загрузки погружений они отобразятся в ввиде таблицы в правой части окна
+======= <div class="paragraph"><p>После загрузки погружений они отобразятся в в виде таблицы в правой части окна
+>>>>>>> v4.4-branch (как показано на рисунке <strong>В</strong> выше). Проставьте галочки напротив тех погружений,
которые должны быть перенесены в <strong>Список погружений</strong> и нажмите кнопку <strong>OK</strong>.
Окно загрузки будет закрыто, а выбранные погружения появятся в списке.</p></div>
@@ -1196,7 +1257,11 @@ Freedive (погружение без дыхательного аппарата) <div class="paragraph"><p><strong>Примечания</strong>: В это поле можно ввести любую дополнительную информацию.</p></div>
<div class="paragraph"><p>Кнопка <strong>Применить изменения</strong> используются для сохранения информации на всех
вкладках информационной панели и профиля погружения, поэтому нет необходимости
+<<<<<<< HEAD +нажимать её до тех пор, пока вы не заполнили ВСЮ информацию. Ниже приведен
+======= нажимать ее до тех пор, пока вы не заполнили ВСЮ информацию. Ниже приведен
+>>>>>>> v4.4-branch пример полностью заполненной информационной панели:</p></div>
<div class="imageblock" style="text-align:center;">
<div class="content">
@@ -1382,7 +1447,11 @@ Organiser, мы рекомендуем сначала экспортироват Suunto Dive Manager и Shearwater. При импорте <em>Subsurface</em> пытается определить
множественные записи относящиеся к одному погружению и объединить их. Если не
обнаружено проблем (разница во временной зоне или значительная разница во времени),
+<<<<<<< HEAD +<em>Subsurface</em> не создаcт дубликатов погружений.</p></div>
+======= <em>Subsurface</em> не создаст дубликатов погружений.</p></div>
+>>>>>>> v4.4-branch </div>
<div class="sect3">
<h4 id="_использование_универсального_импорта">5.2.10. Использование универсального импорта</h4>
@@ -1486,10 +1555,17 @@ divelogs.de). В появившемся окне (рисунок <strong>А</str <h4 id="S_ImportingCSVData">5.2.13. Импорт погружений в формате CSV</h4>
<div class="paragraph"><p>Файл со значениями, разделенными запятой (.csv) может использоваться как для импорта
профиля погружения (в случае ребризеров замкнутого цикла APD Inspiration и Evolution), так
+<<<<<<< HEAD +и для загружки общей информации о дайвах (если вы вели учет в электронной таблице). CSV
+является универсальным и простым форматом для обмена данными между компьютерам и программами.
+Более подробно об этом формате рассказывается в главе <a href="#S_CSV_Intro">Формат CSV для дайверов</a>.
+<em>Subsurface</em> позволяет также выгружать журнал погужений для дальнейшей загрузки в другие программы.
+======= и для загрузки общей информации о дайвах (если вы вели учет в электронной таблице). CSV
является универсальным и простым форматом для обмена данными между компьютерам и программами.
Более подробно об этом формате рассказывается в главе <a href="#S_CSV_Intro">Формат CSV для дайверов</a>.
<em>Subsurface</em> позволяет также выгружать журнал погружений для дальнейшей загрузки в другие программы.
+>>>>>>> v4.4-branch Обратитесь к главе <a href="#S_Appendix_D">ПРИЛОЖЕНИЕ Г: Экспорт электронных таблиц в формат CSV</a>
за информацией по загрузке данных из электронных таблиц в <em>Subsurface</em>.</p></div>
</div>
@@ -1502,7 +1578,11 @@ divelogs.de). В появившемся окне (рисунок <strong>А</str <div class="olist arabic"><ol class="arabic">
<li>
<p>
+<<<<<<< HEAD +<em>Общая информация о погружении</em>: в этом случае файл содержит обучную для журнала информацию,
+======= <em>Общая информация о погружении</em>: в этом случае файл содержит обычную для журнала информацию,
+>>>>>>> v4.4-branch например, дату и время, глубину, длительность, имена партнеров и дайв-мастера, возможно
данные об баллонах и давлении до и после погружения, примечания. Все данные для одного
погружения хранятся в одной строке, а порядке определенном в заголовке.
@@ -1519,7 +1599,11 @@ divelogs.de). В появившемся окне (рисунок <strong>А</str </p>
</li>
</ol></div>
+<<<<<<< HEAD +<div class="paragraph"><p>Перед импортом CSV-файла в <em>Subsurface</em> вам <strong>необходимо выяснить некоторые свойсвтва этого
+======= <div class="paragraph"><p>Перед импортом CSV-файла в <em>Subsurface</em> вам <strong>необходимо выяснить некоторые свойства этого
+>>>>>>> v4.4-branch файла</strong>:</p></div>
<div class="paragraph"><p>а. Какой символ служит разделителем колонок в одной строке данных? Этот символ должен быть
запятой (,) или табуляцией? Вы можете определить это, открыв файл в текстовом редакторе.
@@ -1540,14 +1624,22 @@ divelogs.de). В появившемся окне (рисунок <strong>А</str <img src="images/csv_import1_f20.jpg" alt="Рисунок: Диалог 1 импорт CSV" />
</div>
</div>
+<<<<<<< HEAD +<div class="paragraph"><p>Обратите внимение на выпадающий список в левом верхнем углу. Он содержит настройки для
+======= <div class="paragraph"><p>Обратите внимание на выпадающий список в левом верхнем углу. Он содержит настройки для
+>>>>>>> v4.4-branch часто встречающихся дайв-компьютеров и программ. Если ваш CSV-файл есть в этом списке,
используйте его. В противном случае следует выбрать <em>Импорт вручную</em>. В окне конфигурации
также есть выпадающие список для указания символа-разделителя, формата даты и длительности
погружения, а также используемой системы мер. Для успешного импорта очень важно задать
правильные значения в этих списках.</p></div>
<div class="paragraph"><p>На последнем шаге вы должны сопоставить поля данных в файле их названиям. Первая белая
+<<<<<<< HEAD +строка таблицы данных содержит заголоки, найденные в CSV-файле. Голубая строка таблицы,
+======= строка таблицы данных содержит заголовки, найденные в CSV-файле. Голубая строка таблицы,
+>>>>>>> v4.4-branch находящаяся непосредственно на ней, содержит названия <em>Subsurface</em>. В белой области,
находящейся сразу под выпадающими списками, представлены поля-метки, которые могут быть
импортированы в <em>Subsurface</em>. Эти метки, заключенные в овалы голубого цвета, необходимо
@@ -1571,8 +1663,13 @@ divelogs.de). В появившемся окне (рисунок <strong>А</str <td class="icon">
<img src="images/icons/important.png" alt="Важно" />
</td>
+<<<<<<< HEAD +<td class="content">Аббревиатура <em>CSV</em> происходит от английского <em>Comma-Separated Variables</em>, что означает
+<em>зачения, разделенные запятой</em>. Файлы этого формата можно отредактировать с помощь текстового
+======= <td class="content">Аббревиатура <em>CSV</em> происходит от английского <em>Comma-Separated Values</em>, что означает
<em>значения, разделенные запятой</em>. Файлы этого формата можно отредактировать с помощь текстового
+>>>>>>> v4.4-branch редактора, например Notepad (Windows), gedit (Linux) или TextWrangler(OS/X). Преимущества
этого формата заключаются в том, что а) для его редактирования не нужно никакого специализированного
программного обеспечения, и б) в нем нет ничего лишнего и он может легко быть
@@ -1641,7 +1738,11 @@ Pulau Weh 2012-12-20 09:46 55:56 38.6 Karaeng Bontonompo</code Файл должен быть сохранен в кодировке UTF-8, если вы используете символы отличные от латинских.
Размер файла также может быть причиной определенных проблем. Импорт 100 погружений за раз
(<em>Общая информация о погружениях_) вряд ли будет проблемой, но файлы большего размера могут.
+<<<<<<< HEAD +При возникновении проблем с _Импортом CSV</em> попробуйте для начала уменьшить развер файла.</td>
+======= При возникновении проблем с _Импортом CSV</em> попробуйте для начала уменьшить размер файла.</td>
+>>>>>>> v4.4-branch </tr></table>
</div>
</div>
@@ -1945,21 +2046,36 @@ Pulau Weh 2012-12-20 09:46 55:56 38.6 Karaeng Bontonompo</code ниже), после чего можно приступать к сбору информации о местоположении погружений.</p></div>
<div class="imageblock" style="text-align:center;">
<div class="content">
+<<<<<<< HEAD +<img src="images/iphone.jpg" alt="FIGURE: Using iPhone companion application" width="640" />
+</div>
+</div>
+<div class="paragraph"><p>Погружения могут быть добавлены автоматически или вручную. В ручном редиме, служба получения
+======= <img src="images/iphone.jpg" alt="Рисунок: Использоване вспомогательного приложения на iPhone" width="640" />
</div>
</div>
<div class="paragraph"><p>Погружения могут быть добавлены автоматически или вручную. В ручном режиме, служба получения
+>>>>>>> v4.4-branch координат запускается автоматически, а в нижней части экрана появляется красная полоса. После
завершения погружения вам нужно нажать на красной области, чтобы остановить службу
позиционирования. При запущенной службе позиционирования вы можете добавлять погружения
только в ручном режиме.</p></div>
+<<<<<<< HEAD +<div class="paragraph"><p>Позже вы можете отредактирование название месте погружения, выбрав и нажав на него в списке.
+======= <div class="paragraph"><p>Позже вы можете отредактировать название места погружения, выбрав и нажав на него в списке.
+>>>>>>> v4.4-branch Другие поля для редактирования недоступны. Список дайвов автоматически выгружается на сервер,
возможно вручную синхронизировать погружения отсутствует.</p></div>
</div>
<div class="sect3">
<h4 id="_загрузка_координат_погружений_в_журнал_em_subsurface_em">5.3.6. Загрузка координат погружений в журнал <em>Subsurface</em></h4>
+<<<<<<< HEAD +<div class="paragraph"><p>Перед получением GPS-кородинат с сервера, погружения должны быть загружены в
+======= <div class="paragraph"><p>Перед получением GPS-координат с сервера, погружения должны быть загружены в
+>>>>>>> v4.4-branch журнал из дайв-компьютера или введены вручную. Для загрузки координат выберите
в главном меню <em>Импорт → Импорт координат</em> или нажмите комбинацию клавиш
Ctrl-G. Вам будет представлено окно, как показано на рисунке <strong>А</strong> ниже. При
@@ -2125,6 +2241,15 @@ Ctrl-G. Вам будет представлено окно, как показа будьте внимательны, кожа щелкаете мышкой на картинке. При нажатии мышкой на
миниатюрное фото (в профиле или на вкладке _Фотографии), полноразмерная
фотография откроется во внешней программе для просмотра изображений:</p></div>
+<<<<<<< HEAD +<div class="paragraph"><p>image::ima
+ges/LoadImage6_f20.jpg["Рисунок: Просмотр полноразмерных фотографий",align="center"]</p></div>
+</div>
+<div class="sect3">
+<h4 id="_вкладка_em_фотографии_em">5.4.3. Вкладка <em>Фотографии</em></h4>
+<div class="paragraph"><p>Фотографии, добавленные к погружению, отображаются миниатюными картинками на
+вкладке <em>Фотографии</em> в <em>Информационной ппнели</em>. Снимки, сделанные в серии и
+======= <div class="imageblock" style="text-align:center;">
<div class="content">
<img src="images/LoadImage6_f20.jpg" alt="Рисунок: Просмотр полноразмерных фотографий" />
@@ -2135,6 +2260,7 @@ Ctrl-G. Вам будет представлено окно, как показа <h4 id="_вкладка_em_фотографии_em">5.4.3. Вкладка <em>Фотографии</em></h4>
<div class="paragraph"><p>Фотографии, добавленные к погружению, отображаются миниатюрными картинками на
вкладке <em>Фотографии</em> в <em>Информационной панели</em>. Снимки, сделанные в серии и
+>>>>>>> v4.4-branch имеющие короткий временной интервал, могут перекрывать друг друга на профиле,
но легко различимы на этой вкладке. Одиночный щелчок мышью на фотографии
выделяет ее, двойной щелчок мышью открывает окно просмотра фото во внешней
@@ -2143,9 +2269,15 @@ Ctrl-G. Вам будет представлено окно, как показа </div>
<div class="sect3">
<h4 id="_фотографии_на_внешнем_жестком_диске">5.4.4. Фотографии на внешнем жестком диске</h4>
+<<<<<<< HEAD +<div class="paragraph"><p>Многие фотографы хранят свои снимки на внешнем накопителе. Если внещний диск
+подключен, то <em>Subsurface</em> в большинстве случаев увидит его, и таким образом
+будет обеспечен доступ к внешнему хранилищу фотографий. При этом вы добавлете
+======= <div class="paragraph"><p>Многие фотографы хранят свои снимки на внешнем накопителе. Если внешний диск
подключен, то <em>Subsurface</em> в большинстве случаев увидит его, и таким образом
будет обеспечен доступ к внешнему хранилищу фотографий. При этом вы добавляете
+>>>>>>> v4.4-branch фото с внешнего диска так, как описан выше. Однако после того, как внешний
накопитель отключен, у <em>Subsurface</em> не будет доступа к фотографиям. Если на
панели кнопок-переключателей (слева от профиля) нажата кнопка <em>Миниатюры
@@ -2157,6 +2289,11 @@ Ctrl-G. Вам будет представлено окно, как показа <div class="sect2">
<h3 id="_ведение_журнала_для_специальных_типов_погружений">5.5. Ведение журнала для специальных типов погружений</h3>
<div class="sect3">
+<<<<<<< HEAD +<h4 id="_погружения_в_конфигурации_side_mount">5.5.1. Погружения в конфигурации side-mount</h4>
+<div class="paragraph"><p><em>Subsurface</em> легко справляется с многобаллонными погружениями. Ведение журнала сайд-маунт
+погружение заключается в трех шагах:</p></div>
+======= <h4 id="S_MulticylinderDives">5.5.1. Погружения с несколькими баллонами</h4>
<div class="paragraph"><p><em>Subsurface</em> позволяет без проблем вести учет многобаллонных погружений. Такие погружения обычно
выполняются если (а) не хватает воздуха для совершения погружения на одном баллоне; (б) нужно более
@@ -2204,6 +2341,7 @@ Ctrl-G. Вам будет представлено окно, как показа Хотя эта конфигурация наиболее популяра среди пещерных дайвером, она может использоваться и для
рекреационных погружений после соответствующей подготовки. Как и в случае многобаллонных погружений,
для учета таких погружений необходимо выполнить три шага:</p></div>
+>>>>>>> v4.4-branch <div class="ulist"><ul>
<li>
<p>
@@ -2246,6 +2384,9 @@ Ctrl-G. Вам будет представлено окно, как показа <div class="paragraph"><p>Эта глава демонстрирует гибкость <em>Subsurface</em> при ведении журналов погружений.</p></div>
</div>
<div class="sect3">
+<<<<<<< HEAD +<h4 id="S_CCR_dives">5.5.2. Погружения с ребризером закрытого цикла (CCR)</h4>
+======= <h4 id="S_sSCR_dives">5.5.3. Погружения с ребризером полузамкнутого цикла (SCR)</h4>
<div class="admonitionblock">
<table><tr>
@@ -2287,13 +2428,18 @@ Ctrl-G. Вам будет представлено окно, как показа </div>
<div class="sect3">
<h4 id="S_CCR_dives">5.5.4. Погружения с ребризером закрытого цикла (CCR)</h4>
+>>>>>>> v4.4-branch <div class="admonitionblock">
<table><tr>
<td class="icon">
<img src="images/APD.jpg" alt="Замечание" />
</td>
<td class="content">Ребризеры замкнутого цикла используют передовые технологии для рециркуляции отработанного газа,
+<<<<<<< HEAD +выполняя две фукнции для поддержания концентрации кислорода, делая смест пригодной для дыхания:
+======= выполняя две функции для поддержания концентрации кислорода, делая смест пригодной для дыхания:
+>>>>>>> v4.4-branch а) удаление углекислого газа из выдыхаемого воздуха
б) поддержание концентрации кислорода в безопасных пределах.
На текущий момент <em>Subsurface</em> обеспечивает наилучшую поддержку CCR дайв-компьютера Poseidon
@@ -2317,17 +2463,30 @@ CCR не позволяют загружать журналы нескольки </div>
</div>
<div class="sect3">
+<<<<<<< HEAD +<h4 id="_информация_отображаемая_для_ccr_погружений">5.5.3. Информация, отображаемая для CCR-погружений</h4>
+<div class="paragraph"><p><em>Парциальные давления газов</em>: График парциального давления кислорода показывает информацию с
+кислородных датчиков ребризера. В отличие от рекреационного режима, где значения pO<sub>2</sub> высчитываются
+исходя из состава смеси и глубины, для CCR-погружений эти значения берутся от датчиков. В этом случае
+график должнен быть достаточно ровным, соответствую значению установки (set-point). Среднее значение
+pO<sub>2</sub> не является средним значением, рапортуемым датчиком, а расчитано <em>Subsurface</em> следующим
+======= <h4 id="_информация_отображаемая_для_ccr_погружений">5.5.5. Информация, отображаемая для CCR-погружений</h4>
<div class="paragraph"><p><em>Парциальные давления газов</em>: График парциального давления кислорода показывает информацию с
кислородных датчиков ребризера. В отличие от рекреационного режима, где значения pO<sub>2</sub> высчитываются
исходя из состава смеси и глубины, для CCR-погружений эти значения берутся от датчиков. В этом случае
график должен быть достаточно ровным, соответствуя значению установки кислорода (set-point). Среднее значение
pO<sub>2</sub> не является средним значением от датчика, а рассчитано <em>Subsurface</em> следующим
+>>>>>>> v4.4-branch образом:</p></div>
<div class="ulist"><ul>
<li>
<p>
+<<<<<<< HEAD +для двух датчиков O<sub>2</sub> расчитывается среднее значение.
+======= для двух датчиков O<sub>2</sub> рассчитывается среднее значение.
+>>>>>>> v4.4-branch </p>
</li>
<li>
@@ -2343,7 +2502,11 @@ pO<sub>2</sub> не является средним значением от да </p>
</li>
</ul></div>
+<<<<<<< HEAD +<div class="paragraph"><p>Среднее значание pO<sub>2</sub> сенсоров отображается зеленой линией.</p></div>
+======= <div class="paragraph"><p>Среднее значение pO<sub>2</sub> сенсоров отображается зеленой линией.</p></div>
+>>>>>>> v4.4-branch <div class="paragraph"><p>Значения установок кислорода, а также показания индивидуальных датчиков, могут быть показаны на
профиле. Отображение расширенной информации для CCR-погружения регулируется в <em>Настройках_ (доступны
в <a href="#S_CCR_options">_Файл → Настройки → Профиль</em></a>. Вот настройки, влияющие на отображение pO<sub>2</sub>
@@ -2380,7 +2543,11 @@ pO<sub>2</sub> не является средним значением от да </p>
</li>
</ul></div>
+<<<<<<< HEAD +<div class="paragraph"><p>Среднее значение pO<sub>2</sub> показвается зеленым цветом. Такое отображение позволяет непосредственно
+======= <div class="paragraph"><p>Среднее значение pO<sub>2</sub> показывается зеленым цветом. Такое отображение позволяет непосредственно
+>>>>>>> v4.4-branch сравнить данные от каждого сенсора и выявить странно низкие или абсолютно неверные показания.</p></div>
<div class="imageblock" style="text-align:center;">
<div class="content">
@@ -2391,6 +2558,15 @@ pO<sub>2</sub> не является средним значением от да галочки напротив обоих параметров. Парциальные давления азота (и гелия, если применимо) отображаются
так же, как для погружения на открытом цикле.</p></div>
<div class="paragraph"><p><em>События</em>: в случае погружений с ребризером могут быть записаны дополнительные события, например,
+<<<<<<< HEAD +перевод загубника в режим открытого цикла. Такие события отображаются на профиле в виде жетых
+треуголников. При наведении на него указателя мыши, в <a href="#S_InfoBox">плавающем информационном окне</a>
+показывается описание события.</p></div>
+<div class="paragraph"><p><em>Давление в баллонах_: некоторые CCR дайв-компьютеры (например, Poseidon MkVI) сохраняют информацию
+о давлении в баллонах с кислородом и дилуентом. График давлений в этих баллонах отображается
+зелеными линиями поверх профиля глубины. В дополнение к этому, информация о начальном и конечном
+давлениях в баллонах с дилуентом и кислородом показывается на вкладке _Снаряжение</em>.
+======= перевод загубника в режим открытого цикла. Такие события отображаются на профиле в виде желтых
треугольников. При наведении на него указателя мыши, в <a href="#S_InfoBox">плавающем информационном окне</a>
показывается описание события.</p></div>
@@ -2398,6 +2574,7 @@ pO<sub>2</sub> не является средним значением от да о давлении в баллонах с кислородом и дилуентом. График давлений в этих баллонах отображается
зелеными линиями поверх профиля глубины. В дополнение к этому, информация о начальном и конечном
давлениях в баллонах с дилуентом и кислородом показывается на вкладке <em>Снаряжение</em>.
+>>>>>>> v4.4-branch Ниже представлен профиль CCR-погружения, на котором показаны графики значений установки, сенсоров и
давлений в баллонах. В этом случае мы видим согласованность показаний двух сенсоров.</p></div>
<div class="imageblock" style="text-align:center;">
@@ -2408,7 +2585,11 @@ pO<sub>2</sub> не является средним значением от да <div class="paragraph"><p><em>Дополнительная информация</em>: Информация, специфичная для конкретного оборудования, отображается в
<em>Subsurface</em> на вкладке <a href="#S_ExtraDataTab">Дополнительная информация</a>. Она может включать настройки
оборудования и прочие данные.</p></div>
+<<<<<<< HEAD +<div class="paragraph"><p>За более детальной информацией по загружке погружений из ребризеров Poseidon MkVI и APD обратитесь
+======= <div class="paragraph"><p>За более детальной информацией по загрузке погружений из ребризеров Poseidon MkVI и APD обратитесь
+>>>>>>> v4.4-branch к <a href="#S_PoseidonMkVI">ПРИЛОЖЕНИЮ Б</a>.</p></div>
</div>
</div>
@@ -2438,10 +2619,17 @@ pO<sub>2</sub> не является средним значением от да </div>
<div class="sect2">
<h3 id="S_ExtraDataTab">6.2. Вкладка <strong>Дополнительно</strong> (обычно для индивидуального погружения)</h3>
+<<<<<<< HEAD +<div class="paragraph"><p>При использовании дайв-компьютера он обычно сообщает дополнительную информацию, которуб невозможно
+отобразить единообразным образом, принимая во внимание, что эта информация различается для разных
+моделей. Обычно эта информация включает в себя настройки компьютера, уровень заряда батареи,
+бесполетное время или установки градиент-фактора. Когда доступны, эти данные отображаются на вкладке
+======= <div class="paragraph"><p>При использовании дайв-компьютера он обычно сообщает дополнительную информацию, которую невозможно
отобразить единообразным образом, принимая во внимание, что эта информация различается для разных
моделей. Обычно эта информация включает в себя настройки компьютера, уровень заряда батареи,
неполетное время или установки градиент-фактора. Когда доступны, эти данные отображаются на вкладке
+>>>>>>> v4.4-branch <strong>Дополнительно</strong>. На рисунке ниже приведены дополнительные данные для погружение на ребризере Poseidon.</p></div>
<div class="imageblock" style="text-align:center;">
<div class="content">
@@ -2681,8 +2869,13 @@ cellspacing="0" cellpadding="4"> <img src="images/icons/ShowCylindersButton.jpg" alt="Замечание" />
</td>
<td class="content">Если выбран этот переключатель, то баллоны, используемые в погружении, отображаются в виде цветной
+<<<<<<< HEAD +полосы в нижней части профиля погружения. Кодировка цветов следующая: кислород отрисовывается
+зеленой полосой, азот желтой, а гелий - красной. Рисунк ниже представлят профиль погружения с первой
+======= полосы в нижней части профиля погружения. Кодировка цветов следующая: кислород нарисован
зеленой полосой, азот желтой, а гелий - красной. Рисунок ниже представляет профиль погружения с первой
+>>>>>>> v4.4-branch смесью Trimix (красно-зеленая полоса), с дальнейшим переходом на Nitrox (желто-зеленая полоса) на 23
минуте. Баллоны с воздухом представлены светло-голубой полосой.</td>
</tr></table>
@@ -2700,12 +2893,21 @@ cellspacing="0" cellpadding="4"> <td class="content">Показывает давление инертных газов в тканях относительно внешнего давления (горизонтальная серая
линия). Давление в тканях рассчитывается по алгоритму Бюльмана ZH-L16 и отображается линиями, цвет
которых варьируется от зеленого (самые быстрые ткани) до синего (самые медленные ткани).
+<<<<<<< HEAD +Черная линия, отрисованная выше графика внешнего давления, показывает максимальное допустимое
+перенасыщение согласно значений градиент-фактора, указанных в <strong>Настройках*. Для дайверов, планирующих
+декомпрессионные погружения, эффективное скорость рассыщения достигается при давлении в тканях
+большем чем окружаещее давление (серая линия), но меньшем чем предельное (черная линия). Это
+представление отображает давление в тканях на протяжении всего погружения. Напротив,
+<a href="#S_gas_pressure_graph">Гистограмма давления газов</a> в плавающем *Информационном окне</strong> отображает
+======= Черная линия, нарисованная выше графика внешнего давления, показывает максимальное допустимое
перенасыщение согласно значений градиент-фактора, указанных в настройках. Для дайверов, планирующих
декомпрессионные погружения, эффективное скорость расыщения достигается при давлении в тканях
большем чем окружающее давление (серая линия), но меньшем чем предельное (черная линия). Это
представление отображает давление в тканях на протяжении всего погружения. Напротив,
<a href="#S_gas_pressure_graph">Гистограмма давления газов</a> в плавающем <strong>Информационном окне</strong> отображает
+>>>>>>> v4.4-branch давление в момент времени, соответствующий положению указателя мыши на оси времени.</td>
</tr></table>
</div>
@@ -2838,7 +3040,11 @@ CCR-погружений в дополнение к тем, что были им <div class="paragraph"><p>На рисунке <strong>В</strong> выше показано информационное окно практически со всей доступной информацией.</p></div>
<div class="sect3">
<h4 id="S_gas_pressure_graph">6.6.1. Гистограмма давления газов</h4>
+<<<<<<< HEAD +<div class="paragraph"><p>В левой части <strong>Информационного окна</strong> расположена вертикальная гистрограмма, отображающая давление
+======= <div class="paragraph"><p>В левой части <strong>Информационного окна</strong> расположена вертикальная гистограмма, отображающая давление
+>>>>>>> v4.4-branch азота (и других инертных газов, например гелия, там, где это применимо), вдыхаемых дайвером <em>в
определенный момент времени</em>, соответствующий положению указателя мыши на оси времени. Рисунок ниже
поясняет, что именно показывает гистограмма:</p></div>
@@ -2880,7 +3086,11 @@ CCR-погружений в дополнение к тем, что были им <li>
<p>
Нижняя граница красной области на гистограмме отображает вычисленное по алгоритму Бюльмана
+<<<<<<< HEAD + M-значение, - давление инертного газа, при котором весьма вероятно формирование пузырикьков,
+======= M-значение, - давление инертного газа, при котором весьма вероятно формирование пузырьков,
+>>>>>>> v4.4-branch что в свою очередь может привести к декомпрессионной болезни.
</p>
</li>
@@ -3080,9 +3290,15 @@ CCR-погружений в дополнение к тем, что были им <div class="paragraph"><p>Вы можете отфильтровать погружения в списке, указав те или иные атрибуты дайва (метки, напарник,
место погружения, костюм). Например, можно выбрать все глубокие погружения в определенном месте,
либо пещерные дайвы с вашим другом.</p></div>
+<<<<<<< HEAD +<div class="paragraph"><p>Чтобы вызвать фильтр, выберите в главном меню <em>Журнал → Фильтр погружений</em>. Вам будет преставлена
+<em>Панель фильтров</em>, расположенная в верхней части окна <em>Subsurface</em>. В правой части этой панели
+находятся три кнопки, которые позволяют очистить фильтры, спрятать панель или вовсе закрыть её (при
+======= <div class="paragraph"><p>Чтобы вызвать фильтр, выберите в главном меню <em>Журнал → Фильтр погружений</em>. Вам будет преlставлена
<em>Панель фильтров</em>, расположенная в верхней части окна <em>Subsurface</em>. В правой части этой панели
находятся три кнопки, которые позволяют очистить фильтры, спрятать панель или вовсе закрыть ее (при
+>>>>>>> v4.4-branch это фильтры очищаются).</p></div>
<div class="imageblock" style="text-align:center;">
<div class="content">
@@ -3119,10 +3335,17 @@ CCR-погружений в дополнение к тем, что были им <h3 id="S_facebook">8.1. Экспорт информации о погружении в <em>Facebook</em></h3>
<div class="paragraph"><p>Экспорт в <em>Facebook</em> отличается от всех других видов экспорта, поскольку он требует подключения
учетной записи, что в свою очередь требует от вас логин и пароль <em>Facebook</em>. Для авторизации
+<<<<<<< HEAD +необхоимо в главном меню выбрать <em>Файл → Настройки</em> и там выбрать вкладку <em>Facebook</em>, на которой
+вам будет представлена форма авторизации (см. рисунок <strong>А</strong> слева внизу). Авторизуйтесь своими логином
+и паролем, после чего экран должен выглядеть как показано на рисунке <strong>В</strong>. При необходимости вы
+можете отключить <em>Subsurface</em> от <em>Facebook</em>, нажав на соответствующу кнопку.</p></div>
+======= необходимо в главном меню выбрать <em>Файл → Настройки</em> и там выбрать вкладку <em>Facebook</em>, на которой
вам будет представлена форма авторизации (см. рисунок <strong>А</strong> слева внизу). Авторизуйтесь своими логином
и паролем, после чего экран должен выглядеть как показано на рисунке <strong>В</strong>. При необходимости вы
можете отключить <em>Subsurface</em> от <em>Facebook</em>, нажав на соответствующую кнопку.</p></div>
+>>>>>>> v4.4-branch <div class="imageblock" style="text-align:center;">
<div class="content">
<img src="images/facebook1_f20.jpg" alt="Рисунок: Авторизация Facebook" />
@@ -3131,7 +3354,11 @@ CCR-погружений в дополнение к тем, что были им <div class="paragraph"><p>После того как соединение с <em>Facebook</em> установлено, публикация профиля погружения в вашей Хронике не
составит проблем. Выберите погружение в списке и убедитесь в том, что именно этот дайв должен быть
опубликован. Нажмите кнопку с логотипом <em>Facebook</em>, расположенную в <strong>Информационной панели</strong> справа
+<<<<<<< HEAD +от поля <em>Прмечания</em> (см. рисунок <strong>А</strong> ниже). По нажатию на эту кнопку вам будет представлено окно, в
+======= от поля <em>Примечания</em> (см. рисунок <strong>А</strong> ниже). По нажатию на эту кнопку вам будет представлено окно, в
+>>>>>>> v4.4-branch котором вы можете выбрать какую дополнительную информацию опубликовать вместе с профилем погружения
(рисунок <strong>В</strong>). Обязательным является только поле <em>Альбом</em>. Кроме указания стандартных параметров
погружения, вы можете вручную отредактировать сопроводительный текст. Для отправки профиля
@@ -3228,7 +3455,11 @@ HTML (см. рисунок <strong>В</strong> выше). Вы можете вы <li>
<p>
<em>Глубины фото</em>. Создает текстовый файл, в котором содержатся имена файлов всех фотографий,
+<<<<<<< HEAD +прикрепленных к погружениям вместе с указанием глубины, на котороый эти фотографии были сделаны.
+======= прикрепленных к погружениям вместе с указанием глубины, на которой эти фотографии были сделаны.
+>>>>>>> v4.4-branch </p>
</li>
<li>
@@ -3396,7 +3627,11 @@ Print</em>. Вам будет представлено диалоговое ок D3, Vyper, Vytec, Cobra, Gekko И Zoop). Множество параметров компьютера может быть считано и изменено.
Первым шагом вы должны убедиться что установлены все необходимые драйверы оборудования и что вам известно
имя устройства. Внимательно ознакомьтесь с информацией в <a href="#APPENDIX_A">ПРИЛОЖЕНИИ А</a>.</p></div>
+<<<<<<< HEAD +<div class="paragraph"><p>После того, как дайв-компьютер подключен, выберите <em>Файл → Настройка дайв-компьютера</em> в главом меню.
+======= <div class="paragraph"><p>После того, как дайв-компьютер подключен, выберите <em>Файл → Настройка дайв-компьютера</em> в главном меню.
+>>>>>>> v4.4-branch Укажите имя устройства в текстовом поле в верхней части окна, и выберите соответствующую модель
дайв-компьютера в списке слева (см. рисунок ниже).</p></div>
<div class="imageblock" style="text-align:center;">
@@ -3754,6 +3989,7 @@ ZH-L16 с добавлением градиент-факторов за авто </div>
<div class="sect2">
<h3 id="_пример_планирования_погружения_на_открытом_цикле">13.2. Пример планирования погружения на открытом цикле</h3>
+<<<<<<< HEAD <div class="ulist"><ul>
<li>
<p>
@@ -3768,10 +4004,29 @@ ZH-L16 с добавлением градиент-факторов за авто <li>
<p>
Ребризер замкнутого цикла (CCR)
+======= +<div class="ulist"><ul>
+<li>
+<p>
+В левой нижней части экрана планировщика расположен выпадающий список (на рисунке ниже обведен синей линией), предоставляющий варианта типа погружения:
+</p>
+<div class="ulist"><ul>
+<li>
+<p>
+Открытый цикл (по умолчанию)
+>>>>>>> v4.4-branch </p>
</li>
<li>
<p>
+<<<<<<< HEAD +======= +Ребризер замкнутого цикла (CCR)
+</p>
+</li>
+<li>
+<p>
+>>>>>>> v4.4-branch Пассивный ребризер полузамкнутого цикла (pSCR)
</p>
</li>
@@ -3829,7 +4084,11 @@ GFHigh берутся из настроек <em>Subsurface</em>, однако, </p>
</li>
</ul></div>
+<<<<<<< HEAD +<div class="paragraph"><p>Скорость всплытия важна в фазе рассыщения в конце дайва и указывается для
+======= <div class="paragraph"><p>Скорость всплытия важна в фазе расыщения в конце дайва и указывается для
+>>>>>>> v4.4-branch нескольких диапазонов глубины, принимая во внимание среднюю глубину как точку
отсчета. Средняя глубина отображается на профиле красной горизонтальной линией.
Скорость всплытия на больших глубинах находится обычно в пределах 8-12 м/мин,
@@ -3887,8 +4146,13 @@ SAC отдельно для донной фазы (<em>SAC на дне</em>) и <div class="paragraph"><p>Ненулевое значение в колонке "Установка СС" в таблице путевых точек означает корректное значение
установки и что погружение на этом сегменте выполняется на CCR-ребризере. Если последний вручную
введенный сегмент выполняется на CCR, декомпрессионные процедуры рассчитываются согласно значения
+<<<<<<< HEAD +указанной уставновки. Если же последний сегмент выполняется на открытом цикле (значение устновки
+равно нулю), декомпрессионные обязательства рассчитаваются в режиме ОЦ. Замена газов предусмотрена
+======= указанной установки. Если же последний сегмент выполняется на открытом цикле (значение устновки кислорода
равно нулю), декомпрессионные обязательства рассчитываются в режиме ОЦ. Замена газов предусмотрена
+>>>>>>> v4.4-branch только для открытого цикла.</p></div>
<div class="paragraph"><p>Ниже на рисунке приведен пример плана погружения на 45м с использованием EAN26
и всплытием на EAN50, используя настройки, описанные выше:</p></div>
@@ -3899,7 +4163,13 @@ SAC отдельно для донной фазы (<em>SAC на дне</em>) и </div>
<div class="paragraph"><p>После окончания планирование, вы можете сохранить план, нажав на кнопку
<em>Сохранить</em>. План появится в списке погружений.</p></div>
+<<<<<<< HEAD +</div>
+<div class="sect2">
+<h3 id="_детальный_план_погружения">13.3. Детальный план погружения</h3>
+======= <div class="paragraph"><p><strong>Детальный план погружения</strong></p></div>
+>>>>>>> v4.4-branch <div class="paragraph"><p>В правой нижней части экрана планировщика находится текстовая область с
подробным словесным описанием плана погружения. Вы можете изменить его
детализацию с помощью нескольких параметров в секции <em>Заметки погружения</em>.
@@ -3912,6 +4182,22 @@ SAC отдельно для донной фазы (<em>SAC на дне</em>) и деко</em>, то время переходом показывается отдельно от времени сегментов.</p></div>
</div>
<div class="sect2">
+<<<<<<< HEAD +<h3 id="_планирование_погружений_на_ребризере_замкнутого_цикла">13.4. Планирование погружений на ребризере замкнутого цикла</h3>
+<div class="paragraph"><p>Для планирования таких погружений выберите CCR в списке, как показано на рисунке выше (список
+обведен синей линией).</p></div>
+<div class="paragraph"><p><strong>Доступные смеси</strong>: добавьте в таблицу доступных смесей информацию о баллонах дилуэнта и аварийных
+газах. НЕ вводите информацию о кислородном баллоне, поскольку он подразумеватся при использовании
+режима CCR.</p></div>
+<div class="paragraph"><p><strong>Ввод установок</strong>: укажите значение установки по умолчанию в *Настройках* приложения (в главном меню
+выберите <em>Файл → Настройки</em> и вкладку <em>Профиль</em>). По умолчанию для всех дабавляемых сегментов
+точка установки берется из настроек, он вы можете поменять их по своему желанию. Значение равное
+нулю означает, что дайвер перешел на открытый цикл. Декомпрессия всегда рассчитывается используя
+последнюю установку вручную добавленного сегмента. Чтобы запланировать переход на ОЦ во время подъема,
+добавьте одноминутный сегмент со значением установки равным нулю. Декомрпессионный алгоритм
+автоматически не меняет смеси для CCR-погружений (с положительной установкой).</p></div>
+<div class="paragraph"><p>Профиль погружения на ребризере замкнутого типа модет выглядеть так:</p></div>
+======= <h3 id="_планирование_погружений_на_ребризере_замкнутого_цикла">13.3. Планирование погружений на ребризере замкнутого цикла</h3>
<div class="paragraph"><p>Для планирования таких погружений выберите CCR в списке, как показано на рисунке выше (список
обведен синей линией).</p></div>
@@ -3926,11 +4212,53 @@ SAC отдельно для донной фазы (<em>SAC на дне</em>) и добавьте одноминутный сегмент со значением установки равным нулю. Декомпрессионный алгоритм
автоматически не меняет смеси для CCR-погружений (с положительной установкой).</p></div>
<div class="paragraph"><p>Профиль погружения на ребризере замкнутого типа может выглядеть так:</p></div>
+>>>>>>> v4.4-branch <div class="imageblock" style="text-align:center;">
<div class="content">
<img src="images/Planner_CCR1_f20.jpg" alt="Рисунок: Планирование CCR-погружения, настройка" />
</div>
</div>
+<<<<<<< HEAD +<div class="paragraph"><p>Обратите внимание, что в <em>Детальном плане погружения</em> расход газа для CCR-сегментов не рассчитывает
+и всегда равен нулю.</p></div>
+</div>
+<div class="sect2">
+<h3 id="_планирование_погружений_на_ребризере_полузамкнутого_типа">13.5. Планирование погружений на ребризере полузамкнутого типа</h3>
+<div class="paragraph"><p>Для планирования таких погружений выберите pSCR в списке, как показано на рисунке выше (список
+обведен синей линией).
+Параметры pSCR-погружений также задаются в *Настройках* (в главном меню выберите <em>Файл → Настройки</em>
+и вкладку <em>Профиль</em>). К этим настройкам относятся уровень метаболизма и отношение сброса (1:10 по
+умолчанию).
+=== Печать плана погружения</p></div>
+<div class="paragraph"><p>Вы можете распечатать план нажатием на кнопку <em>Печать</em>. Либо можете
+скопировать текст плана и вставить его в любой текстовый редактор. Алгоритм также принимает во
+внимание сброс газа из загубника. Если уровень pO<sub>2</sub> падает ниже безопасного значения, в
+<em>Детальном плане погружения</em> отображается предупреждение. Типичная конфигурация для погружения
+на ребризере полузамкнотого цикла включаеи один баллон и несколько аварийных баллонов. Поэтому
+содержимое таблиц <em>Доступные смеси</em> и <em>Путевые точки</em> очень похожи на те, что описаны для погружений
+на закрытом цикле выше. Однако, для pSCR погружений не указываются установки. Ниже приведен пример
+плана для позамкнутого цикла. Он очень похож на профиль CCR за тем исключением, что сегменты на
+всплытии длиннее, что связано с пониженным содержанием кислорода в системе из-за сброса из загубника.</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/Planner_pSCR1_f20.jpg" alt="FIGURE: Planning a pSCR dive: setup" />
+</div>
+</div>
+</div>
+<div class="sect2">
+<h3 id="S_Replan">13.6. Изменение существующего плана</h3>
+<div class="paragraph"><p>Обычно, после сохранения плана, он доступен в <strong>Списке погружений</strong>. <em>Subsurface</em> не предоставляет
+возможности изменить план из списка. Для того, чтобы изменить план, выберите его в списке. Затем в
+главном меню выберите <em>Журнал → Перепланировать</em>. Это действие откроет планировщик с существующим
+планом, позволяя изменить его.</p></div>
+<div class="paragraph"><p>В случае перепланирования у вас появляется возможность <strong>Сохранить новый</strong> план, для того, чтобы
+не перезаписывать старый. Если новая копия сохраняется с тем же временем, что и старый план, то они
+считаются двумя версиями одного плана и не влияют друг на друга при вычислении декомпрессионных
+обязательств.</p></div>
+</div>
+<div class="sect2">
+<h3 id="_планирование_повторных_погружений">13.7. Планирование повторных погружений</h3>
+======= <div class="paragraph"><p>Обратите внимание, что в <em>Детальном плане погружения</em> расход газа для CCR-сегментов не рассчитывается
и всегда равен нулю.</p></div>
</div>
@@ -3966,6 +4294,7 @@ SAC отдельно для донной фазы (<em>SAC на дне</em>) и </div>
<div class="sect2">
<h3 id="_планирование_повторных_погружений">13.6. Планирование повторных погружений</h3>
+>>>>>>> v4.4-branch <div class="paragraph"><p><em>Subsurface</em> позволяет планировать повторные погружения при условии, что вы
корректно укажете дату и время начала. При этом учитывается остаточное
насыщение после предыдущего погружения.</p></div>
@@ -3980,7 +4309,11 @@ SAC отдельно для донной фазы (<em>SAC на дне</em>) и для нового плана будет использоваться конфигурация из шаблона.</p></div>
</div>
<div class="sect2">
+<<<<<<< HEAD +<h3 id="_печать_плана_погружения">13.8. Печать плана погружения</h3>
+======= <h3 id="_печать_плана_погружения">13.7. Печать плана погружения</h3>
+>>>>>>> v4.4-branch <div class="paragraph"><p>Вы можете распечатать план погружения с тем чтобы взять его с собой под воду, нажав кнопку <em>Печать</em>.
Альтернативный способ - скопировать текст из <em>Детального плана погружения</em> и вставить его в в ваш
любимый текстовый редактор.</p></div>
@@ -4519,6 +4852,9 @@ UDDF-файл для каждого погружения. Выделите вс </div>
</div>
<div class="sect2">
+<<<<<<< HEAD +<h3 id="_импорт_погружений_из_shearwater_predator_используя_bluetooth">16.4. Импорт погружений из Shearwater Predator используя Bluetooth</h3>
+======= <h3 id="S_ImportingXDeep">16.4. Импорт погружений из xDEEP BLACK</h3>
<div class="admonitionblock">
<table><tr>
@@ -4537,6 +4873,7 @@ UDDF-файл для каждого погружения. Выделите вс </div>
<div class="sect2">
<h3 id="_импорт_погружений_из_shearwater_predator_используя_bluetooth">16.5. Импорт погружений из Shearwater Predator используя Bluetooth</h3>
+>>>>>>> v4.4-branch <div class="admonitionblock">
<table><tr>
<td class="icon">
@@ -4852,6 +5189,9 @@ UDDF-файл для каждого погружения. Выделите вс </ol></div>
</div>
<div class="sect2">
+<<<<<<< HEAD +<h3 id="_экспорт_погружений_из_mares_dive_organiser_v2_1">17.2. Экспорт погружений из Mares Dive Organiser V2.1</h3>
+======= <h3 id="_экспорт_погружений_из_atomic_logbook">17.2. Экспорт погружений из Atomic Logbook</h3>
<div class="admonitionblock" id="Atomic_Export">
<table><tr>
@@ -4867,6 +5207,7 @@ Windows. Оно позволяет загружать журналы погру </div>
<div class="sect2">
<h3 id="_экспорт_погружений_из_mares_dive_organiser_v2_1">17.3. Экспорт погружений из Mares Dive Organiser V2.1</h3>
+>>>>>>> v4.4-branch <div class="admonitionblock" id="Mares_Export">
<table><tr>
<td class="icon">
@@ -4907,7 +5248,11 @@ Windows. Оно позволяет загружать журналы погру </ol></div>
</div>
<div class="sect2">
+<<<<<<< HEAD +<h3 id="S_ImportingDivinglog">17.3. Экспорт погружений из <strong>DivingLog 5.0</strong></h3>
+======= <h3 id="S_ImportingDivinglog">17.4. Экспорт погружений из <strong>DivingLog 5.0</strong></h3>
+>>>>>>> v4.4-branch <div class="admonitionblock">
<table><tr>
<td class="icon">
@@ -4941,6 +5286,15 @@ Language</em> и нажмите кнопку <em>Metric</em>). Затем вып </div>
</div>
<div class="sect1">
+<<<<<<< HEAD +<h2 id="_приложение_г_частые_вопросы_и_ответы">18. ПРИЛОЖЕНИЕ Г: Частые вопросы и ответы</h2>
+<div class="sectionbody">
+<div class="sect2">
+<h3 id="_похоже_что_em_subsurface_em_неправильно_считает_расход_газов_и_sac">18.1. Похоже, что <em>Subsurface</em> неправильно считает расход газов и SAC</h3>
+<div class="paragraph" id="SAC_CALCULATION"><p><em>Вопрос</em>: Я погружался с баллоном 12.2л, начальное давление 220бар, конечное -
+100 бар. Мои расчеты SAC не совпадают со значением в <em>Subsurface</em>. Возможно
+ли, что <em>Subsurface</em> считает неверно?</p></div>
+======= <h2 id="S_Appendix_D">18. ПРИЛОЖЕНИЕ Г: Экспорт электронных таблиц в CSV-формат</h2>
<div class="sectionbody">
<div class="paragraph"><p>Многие дайверы ведут журнал погружений в каком-либо электронном формате, зачастую в виде таблицы
@@ -5078,6 +5432,7 @@ GPS-координаты. Следует использоваться десят <h3 id="_похоже_что_em_subsurface_em_неправильно_считает_расход_газов_и_sac">19.1. Похоже, что <em>Subsurface</em> неправильно считает расход газов и SAC</h3>
<div class="paragraph" id="SAC_CALCULATION"><p><em>Вопрос</em>: Я погружался с баллоном 12.2л, начальное давление 220бар, конечное - 100 бар. Мои расчеты
SAC не совпадают со значением в <em>Subsurface</em>. Возможно ли, что <em>Subsurface</em> считает неверно?</p></div>
+>>>>>>> v4.4-branch <div class="paragraph"><p><em>Ответ</em>: Нет. <em>Subsurface</em> рассчитывает расход газа иначе, и даже лучше, чем вы
ожидаете. В частности, мы принимаем во внимание несжимаемость газа.
Традиционно, расход и SAC считаются по формуле:
@@ -5104,7 +5459,11 @@ SAC не совпадают со значением в <em>Subsurface</em>. Во воздух ведет себя почти как идеальный газ.</p></div>
</div>
<div class="sect2">
+<<<<<<< HEAD +<h3 id="_на_некоторых_профилях_наблюдаются_различия_во_времени_с_данных_дайв_компьютера_8230">18.2. На некоторых профилях наблюдаются различия во времени с данных дайв-компьютера…</h3>
+======= <h3 id="_на_некоторых_профилях_наблюдаются_различия_во_времени_с_данных_дайв_компьютера_8230">19.2. На некоторых профилях наблюдаются различия во времени с данных дайв-компьютера…</h3>
+>>>>>>> v4.4-branch <div class="paragraph"><p><em>Subsurface</em> игнорирует поверхностное время при различных расчетах (средняя
глубина, время дайва, SAC и т.д)</p></div>
<div class="paragraph"><p><em>Вопрос</em>: почему время погружения на дайв-компьютере и в <em>Subsurface</em> различаются?</p></div>
@@ -5124,7 +5483,11 @@ SAC не совпадают со значением в <em>Subsurface</em>. Во <div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
+<<<<<<< HEAD +Последнее обновление 2015-02-04 13:41:50 PST
+======= Последнее обновление 2015-02-17 08:49:01 PST
+>>>>>>> v4.4-branch </div>
</div>
</body>
diff --git a/Documentation/user-manual_ru.txt b/Documentation/user-manual_ru.txt index c6f5f1788..ed0877fca 100644 --- a/Documentation/user-manual_ru.txt +++ b/Documentation/user-manual_ru.txt @@ -3628,6 +3628,7 @@ Divemanager 3 (DM3) - старая версия журнала погружен === Экспорт погружений из Atomic Logbook [[Atomic_Export]] +[icon="images/icons/atomiclogo.jpg"] [NOTE] Компания Atomic Aquatics предлагает собственное программное обеспечение Atomic Logbook для платформы Windows. Оно позволяет загружать журналы погружений с компьютеров Cobalt и Cobalt 2. Журнал хранится |
