diff options
author | Guillaume GARDET <guillaume.gardet@free.fr> | 2015-02-20 09:44:06 +0100 |
---|---|---|
committer | Dirk Hohndel <dirk@hohndel.org> | 2015-02-20 02:55:26 -0800 |
commit | fc0d2a3fdbb187ee75cebacc98fd8f92213bbe87 (patch) | |
tree | 72206e84e470dfaf6cb985c0aa485ba1fa390b61 /Documentation | |
parent | 762315e7eef47c1a5357e9c8691676707e3c630e (diff) | |
download | subsurface-fc0d2a3fdbb187ee75cebacc98fd8f92213bbe87.tar.gz |
Documentation: Merge/update french user-manual translation
Update french translation of user-manual.
Signed-off-by: Guillaume GARDET <guillaume.gardet@free.fr>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/50-pot/subsurface-manual.pot | 122 | ||||
-rw-r--r-- | Documentation/fr/po/subsurface-manual.fr.po | 265 | ||||
-rw-r--r-- | Documentation/user-manual_fr.html.git | 136 | ||||
-rw-r--r-- | Documentation/user-manual_fr.txt | 73 |
4 files changed, 444 insertions, 152 deletions
diff --git a/Documentation/50-pot/subsurface-manual.pot b/Documentation/50-pot/subsurface-manual.pot index bb4cab640..1af02c4ec 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-15 14:23+0100\n" +"POT-Creation-Date: 2015-02-20 09:39+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" @@ -6366,8 +6366,8 @@ msgid "<<S_ViewPanels,_Profile_>> - View only the *Dive Profile* panel." msgstr "" #. type: Plain text -#: ./user-manual.txt:3115 -msgid "<<S_ViewPanels,_Info_>> - View only the *Dive Notes* panel." +#: ./user-manual.txt:3187 +msgid "<<S_ViewPanels,_Info_>> - View only the *Notes* panel." msgstr "" #. type: Plain text @@ -7392,7 +7392,7 @@ msgid "images/icons/atomiclogo.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:3566 +#: ./user-manual.txt:3639 msgid "" "Atomic Logbook is a Windows software by Atomic Aquatics. It allows " "downloading of dive information from Cobalt and Cobalt 2 dive computers. " @@ -7402,19 +7402,19 @@ msgid "" msgstr "" #. type: Title === -#: ./user-manual.txt:3568 +#: ./user-manual.txt:3641 #, no-wrap msgid "Exporting from Mares Dive Organiser V2.1" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: ./user-manual.txt:3571 +#: ./user-manual.txt:3644 #, no-wrap msgid "images/icons/mareslogo.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:3579 +#: ./user-manual.txt:3652 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 " @@ -7425,7 +7425,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3584 +#: ./user-manual.txt:3657 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 " @@ -7433,36 +7433,36 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3587 +#: ./user-manual.txt:3660 msgid "" "Rename the file to DiveOrganiserxxxxx.zip. Inside the zipped directory is a " "file _DiveOrganiser.sdf_." msgstr "" #. type: Plain text -#: ./user-manual.txt:3588 +#: ./user-manual.txt:3661 msgid "Extract the _.sdf_ file from the zipped folder to your Desktop." msgstr "" #. type: Plain text -#: ./user-manual.txt:3589 +#: ./user-manual.txt:3662 msgid "The password for accessing the .zip file is _mares_." msgstr "" #. type: Title === -#: ./user-manual.txt:3591 +#: ./user-manual.txt:3664 #, no-wrap msgid "Exporting from *DivingLog 5.0*" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: ./user-manual.txt:3593 +#: ./user-manual.txt:3666 #, no-wrap msgid "images/icons/divingloglogo.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:3602 +#: ./user-manual.txt:3675 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 " @@ -7473,28 +7473,28 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3604 +#: ./user-manual.txt:3677 msgid "In DivingLog open the 'File -> Export -> XML' menu" msgstr "" #. type: Plain text -#: ./user-manual.txt:3605 +#: ./user-manual.txt:3678 msgid "Select the dives to export" msgstr "" #. type: Plain text -#: ./user-manual.txt:3606 +#: ./user-manual.txt:3679 msgid "Click on the export button and select the filename" msgstr "" #. type: Title == -#: ./user-manual.txt:3608 +#: ./user-manual.txt:3681 #, no-wrap msgid "APPENDIX D: Exporting a spreadsheet to CSV format" msgstr "" #. type: Plain text -#: ./user-manual.txt:3617 +#: ./user-manual.txt:3690 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 " @@ -7507,7 +7507,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3623 +#: ./user-manual.txt:3696 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 " @@ -7518,40 +7518,40 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3625 +#: ./user-manual.txt:3698 msgid "Date: use one of the following formats: yyyy-mm-dd, dd.mm.yyyy, mm/dd/yyyy" msgstr "" #. type: Plain text -#: ./user-manual.txt:3626 +#: ./user-manual.txt:3699 msgid "Duration: the format should be minutes:seconds." msgstr "" #. type: Plain text -#: ./user-manual.txt:3627 +#: ./user-manual.txt:3700 msgid "" "Unit system: only one unit system should be used (i.e., no mixture between " "imperial and metric units)" msgstr "" #. type: Plain text -#: ./user-manual.txt:3628 +#: ./user-manual.txt:3701 msgid "Tags and buddies: values should be separated using a comma." msgstr "" #. type: Plain text -#: ./user-manual.txt:3629 +#: ./user-manual.txt:3702 msgid "GPS position: users must use decimal degrees, e.g. 30.22496 30.821798" msgstr "" #. type: Title === -#: ./user-manual.txt:3630 +#: ./user-manual.txt:3703 #, no-wrap msgid "_LibreOffice Calc_ and _OpenOffice Calc_" msgstr "" #. type: Plain text -#: ./user-manual.txt:3634 +#: ./user-manual.txt:3707 msgid "" "These are open source spreadsheet applications forming parts of larger open " "source office suite applications. The user interaction with _LibreOffice_ " @@ -7562,13 +7562,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: ./user-manual.txt:3635 +#: ./user-manual.txt:3708 #, no-wrap msgid "images/LOffice_spreadsheetdata.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:3638 +#: ./user-manual.txt:3711 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 " @@ -7576,13 +7576,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: ./user-manual.txt:3639 +#: ./user-manual.txt:3712 #, no-wrap msgid "images/LOffice_save_as_options.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:3642 +#: ./user-manual.txt:3715 msgid "" "After selecting _Save_, select the appropriate field delimiter (choose _Tab_ " "to prevent conflicts with the comma when using this as a decimal point), " @@ -7590,13 +7590,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: ./user-manual.txt:3643 +#: ./user-manual.txt:3716 #, no-wrap msgid "images/LOffice_field_options.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:3646 +#: ./user-manual.txt:3719 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 " @@ -7604,13 +7604,13 @@ msgid "" msgstr "" #. type: Title === -#: ./user-manual.txt:3647 +#: ./user-manual.txt:3720 #, no-wrap msgid "Microsoft _Excel_" msgstr "" #. type: Plain text -#: ./user-manual.txt:3653 +#: ./user-manual.txt:3726 msgid "" "The field delimiter (called \"_list separator_\" in Microsoft manuals) is " "not accessible from within _Excel_ and needs to be set through the " @@ -7621,19 +7621,19 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3655 +#: ./user-manual.txt:3728 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:3656 +#: ./user-manual.txt:3729 msgid "Open the _Regional and Language Options_ dialog box." msgstr "" #. type: Plain text -#: ./user-manual.txt:3659 +#: ./user-manual.txt:3732 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 " @@ -7641,48 +7641,48 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3660 +#: ./user-manual.txt:3733 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:3661 +#: ./user-manual.txt:3734 msgid "Click _OK_ twice." msgstr "" #. type: Plain text -#: ./user-manual.txt:3663 +#: ./user-manual.txt:3736 msgid "Below is an image of the _Control Panel_:" msgstr "" #. type: Target for macro image -#: ./user-manual.txt:3664 +#: ./user-manual.txt:3737 #, no-wrap msgid "images/Win_SaveCSV2.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:3667 +#: ./user-manual.txt:3740 msgid "To export the dive log in CSV format:" msgstr "" #. type: Plain text -#: ./user-manual.txt:3669 +#: ./user-manual.txt:3742 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:3670 +#: ./user-manual.txt:3743 #, no-wrap msgid "images/Win_SaveCSV1.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:3673 +#: ./user-manual.txt:3746 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 " @@ -7692,13 +7692,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: ./user-manual.txt:3674 +#: ./user-manual.txt:3747 #, no-wrap msgid "images/Win_SaveCSV3.jpg" msgstr "" #. type: Plain text -#: ./user-manual.txt:3677 +#: ./user-manual.txt:3750 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 " @@ -7707,19 +7707,19 @@ msgid "" msgstr "" #. type: Title == -#: ./user-manual.txt:3678 +#: ./user-manual.txt:3751 #, no-wrap msgid "APPENDIX E: FAQs." msgstr "" #. type: Title === -#: ./user-manual.txt:3680 +#: ./user-manual.txt:3753 #, no-wrap msgid "Subsurface appears to miscalculate gas consumption and SAC" msgstr "" #. type: Plain text -#: ./user-manual.txt:3684 +#: ./user-manual.txt:3757 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_ " @@ -7727,7 +7727,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3690 +#: ./user-manual.txt:3763 msgid "" "'Answer': Not really. What happens is that _Subsurface_ actually calculates " "gas consumption differently - and better - than you expect. In particular, " @@ -7737,7 +7737,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3696 +#: ./user-manual.txt:3769 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 " @@ -7747,12 +7747,12 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3698 +#: ./user-manual.txt:3771 msgid "+consumption = (amount_of_air_at_beginning - amount_of_air_at_end)+" msgstr "" #. type: Plain text -#: ./user-manual.txt:3704 +#: ./user-manual.txt:3777 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 " @@ -7763,12 +7763,12 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3706 +#: ./user-manual.txt:3779 msgid "+12.2*((220-100)/1.013)+" msgstr "" #. type: Plain text -#: ./user-manual.txt:3711 +#: ./user-manual.txt:3784 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 " @@ -7778,7 +7778,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3717 +#: ./user-manual.txt:3790 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 " @@ -7789,7 +7789,7 @@ msgid "" msgstr "" #. type: Title === -#: ./user-manual.txt:3718 +#: ./user-manual.txt:3791 #, no-wrap msgid "" "Some dive profiles have time discrepancies with the recorded samples from my " @@ -7797,7 +7797,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3722 +#: ./user-manual.txt:3795 msgid "" "_Subsurface_ ends up ignoring surface time for many things (average depth, " "divetime, SAC, etc). 'Question': Why do dive durations in my dive computer " @@ -7805,7 +7805,7 @@ msgid "" msgstr "" #. type: Plain text -#: ./user-manual.txt:3730 +#: ./user-manual.txt:3803 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/fr/po/subsurface-manual.fr.po b/Documentation/fr/po/subsurface-manual.fr.po index a906bb427..46cc0bace 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-15 14:23+0100\n" -"PO-Revision-Date: 2015-02-15 14:25+0100\n" +"POT-Creation-Date: 2015-02-20 09:39+0100\n" +"PO-Revision-Date: 2015-02-20 09:40+0100\n" "Last-Translator: Guillaume GARDET <guillaume.gardet@opensuse.org>\n" "Language-Team: French <opensuse-fr@opensuse.org>\n" "Language: fr\n" @@ -2964,8 +2964,8 @@ msgid "After the images have been loaded, they appear in two places:" msgstr "" #. type: Plain text -#: user-manual.txt:1588 -msgid "the _Photos_ tab of the *Dive Notes* panel." +#: user-manual.txt:1592 +msgid "the _Photos_ tab of the *Notes* panel." msgstr "" #. type: Plain text @@ -3086,7 +3086,71 @@ msgstr "" #: user-manual.txt:1651 #, no-wrap msgid "" -"*During the dive, recording cylinder switch events*. Since sidemount diving normally involves two\n" +"*Describe the cylinders used during the dive* This is performed in the *Equipment tab* of\n" +"the *Info* panel, as xref:cylinder_definitions[described above]. Enter the cylinders one by one,\n" +"specifying 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 toolbar 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" "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" @@ -3135,7 +3199,72 @@ msgid "" msgstr "" #. type: Title ==== -#: user-manual.txt:1667 +#: 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 *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 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." +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 #, no-wrap msgid "Closed circuit rebreather (CCR) dives" msgstr "" @@ -6234,11 +6363,9 @@ msgstr "" "plongée*." #. type: Plain text -#: 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 " -"plongée*." +#: user-manual.txt:3187 +msgid "<<S_ViewPanels,_Info_>> - View only the *Notes* panel." +msgstr "<<S_ViewPanels,_Info_>> - Affiche uniquement le panneau des *notes*." #. type: Plain text #: user-manual.txt:3188 @@ -7333,7 +7460,7 @@ msgid "images/icons/atomiclogo.jpg" msgstr "images/icons/atomiclogo.jpg" #. type: Plain text -#: user-manual.txt:3566 +#: user-manual.txt:3639 msgid "" "Atomic Logbook is a Windows software by Atomic Aquatics. It allows " "downloading of dive information from Cobalt and Cobalt 2 dive computers. " @@ -7343,19 +7470,19 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3568 +#: user-manual.txt:3641 #, no-wrap msgid "Exporting from Mares Dive Organiser V2.1" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:3571 +#: user-manual.txt:3644 #, no-wrap msgid "images/icons/mareslogo.jpg" msgstr "images/icons/mareslogo.jpg" #. type: Plain text -#: user-manual.txt:3579 +#: user-manual.txt:3652 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 " @@ -7366,7 +7493,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3584 +#: user-manual.txt:3657 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 " @@ -7374,36 +7501,36 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3587 +#: user-manual.txt:3660 msgid "" "Rename the file to DiveOrganiserxxxxx.zip. Inside the zipped directory is a " "file _DiveOrganiser.sdf_." msgstr "" #. type: Plain text -#: user-manual.txt:3588 +#: user-manual.txt:3661 msgid "Extract the _.sdf_ file from the zipped folder to your Desktop." msgstr "" #. type: Plain text -#: user-manual.txt:3589 +#: user-manual.txt:3662 msgid "The password for accessing the .zip file is _mares_." msgstr "" #. type: Title === -#: user-manual.txt:3591 +#: user-manual.txt:3664 #, no-wrap msgid "Exporting from *DivingLog 5.0*" msgstr "" #. type: Named 'icon' AttributeList argument for style 'icon' -#: user-manual.txt:3593 +#: user-manual.txt:3666 #, no-wrap msgid "images/icons/divingloglogo.jpg" msgstr "images/icons/divingloglogo.jpg" #. type: Plain text -#: user-manual.txt:3602 +#: user-manual.txt:3675 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 " @@ -7414,28 +7541,28 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3604 +#: user-manual.txt:3677 msgid "In DivingLog open the 'File -> Export -> XML' menu" msgstr "" #. type: Plain text -#: user-manual.txt:3605 +#: user-manual.txt:3678 msgid "Select the dives to export" msgstr "" #. type: Plain text -#: user-manual.txt:3606 +#: user-manual.txt:3679 msgid "Click on the export button and select the filename" msgstr "" #. type: Title == -#: user-manual.txt:3608 +#: user-manual.txt:3681 #, no-wrap msgid "APPENDIX D: Exporting a spreadsheet to CSV format" msgstr "" #. type: Plain text -#: user-manual.txt:3617 +#: user-manual.txt:3690 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 " @@ -7448,7 +7575,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3623 +#: user-manual.txt:3696 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 " @@ -7459,41 +7586,41 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3625 +#: user-manual.txt:3698 msgid "" "Date: use one of the following formats: yyyy-mm-dd, dd.mm.yyyy, mm/dd/yyyy" msgstr "" #. type: Plain text -#: user-manual.txt:3626 +#: user-manual.txt:3699 msgid "Duration: the format should be minutes:seconds." msgstr "" #. type: Plain text -#: user-manual.txt:3627 +#: user-manual.txt:3700 msgid "" "Unit system: only one unit system should be used (i.e., no mixture between " "imperial and metric units)" msgstr "" #. type: Plain text -#: user-manual.txt:3628 +#: user-manual.txt:3701 msgid "Tags and buddies: values should be separated using a comma." msgstr "" #. type: Plain text -#: user-manual.txt:3629 +#: user-manual.txt:3702 msgid "GPS position: users must use decimal degrees, e.g. 30.22496 30.821798" msgstr "" #. type: Title === -#: user-manual.txt:3630 +#: user-manual.txt:3703 #, no-wrap msgid "_LibreOffice Calc_ and _OpenOffice Calc_" msgstr "" #. type: Plain text -#: user-manual.txt:3634 +#: user-manual.txt:3707 msgid "" "These are open source spreadsheet applications forming parts of larger open " "source office suite applications. The user interaction with _LibreOffice_ " @@ -7504,13 +7631,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:3635 +#: user-manual.txt:3708 #, no-wrap msgid "images/LOffice_spreadsheetdata.jpg" msgstr "images/LOffice_spreadsheetdata.jpg" #. type: Plain text -#: user-manual.txt:3638 +#: user-manual.txt:3711 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 " @@ -7518,13 +7645,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:3639 +#: user-manual.txt:3712 #, no-wrap msgid "images/LOffice_save_as_options.jpg" msgstr "images/LOffice_save_as_options.jpg" #. type: Plain text -#: user-manual.txt:3642 +#: user-manual.txt:3715 msgid "" "After selecting _Save_, select the appropriate field delimiter (choose _Tab_ " "to prevent conflicts with the comma when using this as a decimal point), " @@ -7532,13 +7659,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:3643 +#: user-manual.txt:3716 #, no-wrap msgid "images/LOffice_field_options.jpg" msgstr "images/LOffice_field_options.jpg" #. type: Plain text -#: user-manual.txt:3646 +#: user-manual.txt:3719 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:" @@ -7546,13 +7673,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3647 +#: user-manual.txt:3720 #, no-wrap msgid "Microsoft _Excel_" msgstr "" #. type: Plain text -#: user-manual.txt:3653 +#: user-manual.txt:3726 msgid "" "The field delimiter (called \"_list separator_\" in Microsoft manuals) is " "not accessible from within _Excel_ and needs to be set through the " @@ -7563,19 +7690,19 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3655 +#: user-manual.txt:3728 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:3656 +#: user-manual.txt:3729 msgid "Open the _Regional and Language Options_ dialog box." msgstr "" #. type: Plain text -#: user-manual.txt:3659 +#: user-manual.txt:3732 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 " @@ -7583,48 +7710,48 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3660 +#: user-manual.txt:3733 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:3661 +#: user-manual.txt:3734 msgid "Click _OK_ twice." msgstr "" #. type: Plain text -#: user-manual.txt:3663 +#: user-manual.txt:3736 msgid "Below is an image of the _Control Panel_:" msgstr "" #. type: Target for macro image -#: user-manual.txt:3664 +#: user-manual.txt:3737 #, no-wrap msgid "images/Win_SaveCSV2.jpg" msgstr "images/Win_SaveCSV2.jpg" #. type: Plain text -#: user-manual.txt:3667 +#: user-manual.txt:3740 msgid "To export the dive log in CSV format:" msgstr "" #. type: Plain text -#: user-manual.txt:3669 +#: user-manual.txt:3742 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:3670 +#: user-manual.txt:3743 #, no-wrap msgid "images/Win_SaveCSV1.jpg" msgstr "images/Win_SaveCSV1.jpg" #. type: Plain text -#: user-manual.txt:3673 +#: user-manual.txt:3746 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 " @@ -7634,13 +7761,13 @@ msgid "" msgstr "" #. type: Target for macro image -#: user-manual.txt:3674 +#: user-manual.txt:3747 #, no-wrap msgid "images/Win_SaveCSV3.jpg" msgstr "images/Win_SaveCSV3.jpg" #. type: Plain text -#: user-manual.txt:3677 +#: user-manual.txt:3750 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 " @@ -7649,19 +7776,19 @@ msgid "" msgstr "" #. type: Title == -#: user-manual.txt:3678 +#: user-manual.txt:3751 #, no-wrap msgid "APPENDIX E: FAQs." msgstr "" #. type: Title === -#: user-manual.txt:3680 +#: user-manual.txt:3753 #, no-wrap msgid "Subsurface appears to miscalculate gas consumption and SAC" msgstr "" #. type: Plain text -#: user-manual.txt:3684 +#: user-manual.txt:3757 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_ " @@ -7669,7 +7796,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3690 +#: user-manual.txt:3763 msgid "" "'Answer': Not really. What happens is that _Subsurface_ actually calculates " "gas consumption differently - and better - than you expect. In particular, " @@ -7679,7 +7806,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3696 +#: user-manual.txt:3769 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 " @@ -7689,12 +7816,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3698 +#: user-manual.txt:3771 msgid "+consumption = (amount_of_air_at_beginning - amount_of_air_at_end)+" msgstr "" #. type: Plain text -#: user-manual.txt:3704 +#: user-manual.txt:3777 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 " @@ -7705,12 +7832,12 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3706 +#: user-manual.txt:3779 msgid "+12.2*((220-100)/1.013)+" msgstr "" #. type: Plain text -#: user-manual.txt:3711 +#: user-manual.txt:3784 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 " @@ -7720,7 +7847,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3717 +#: user-manual.txt:3790 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 " @@ -7731,13 +7858,13 @@ msgid "" msgstr "" #. type: Title === -#: user-manual.txt:3718 +#: user-manual.txt:3791 #, no-wrap msgid "Some dive profiles have time discrepancies with the recorded samples from my dive computer..." msgstr "" #. type: Plain text -#: user-manual.txt:3722 +#: user-manual.txt:3795 msgid "" "_Subsurface_ ends up ignoring surface time for many things (average depth, " "divetime, SAC, etc). 'Question': Why do dive durations in my dive computer " @@ -7745,7 +7872,7 @@ msgid "" msgstr "" #. type: Plain text -#: user-manual.txt:3730 +#: user-manual.txt:3803 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/user-manual_fr.html.git b/Documentation/user-manual_fr.html.git index f1411e0cf..f69584f6b 100644 --- a/Documentation/user-manual_fr.html.git +++ b/Documentation/user-manual_fr.html.git @@ -2387,13 +2387,59 @@ needs more than one gas mixture because of the depth or the decompression needs of the dive. For this reason multicylinder dives are often used by
technical divers who dive deep or long. As far as <em>Subsurface</em> is concerned,
there are only two types of information that need to be provided:</p></div>
-<div class="ulist"><ul>
-<li>
-<p>
-<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
+<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>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 toolbar 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 + 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 from these dive computers, the events of switching between cylinders with the same gas are not downloaded. This may mean
that one may have to keep a written log of cylinder switch times using a slate, or (if the dive computer
has this facility) marking each cylinder switch with a bookmark that can be retrieved later. Returning
@@ -2428,13 +2474,61 @@ there are only two types of information that need to be provided:</p></div> </div>
</div>
<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_CCR_dives">5.6.2. Closed circuit rebreather (CCR) dives</h4>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
+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>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 across the mouthpiece which often requires +longer decompression periods. Below is a dive profile of a pSCR dive using +EAN36 on the back cylinder and oxygen for decompression. Note that this dive +lasted over two hours.</p></div> +<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> +<div class="admonitionblock"> +<table><tr> +<td class="icon"> <img src="images/APD.jpg" alt="Note" />
</td>
<td class="content">Closed system rebreathers use advanced technology to recirculate gas that
@@ -5587,11 +5681,11 @@ dive”.</p></div> </div>
</div>
</div>
-<div id="footnotes"><hr /></div>
-<div id="footer">
-<div id="footer-text">
-Last updated 2015-02-04 07:41:58 PST
-</div>
-</div>
-</body>
+<div id="footnotes"><hr /></div> +<div id="footer"> +<div id="footer-text"> +Last updated 2015-02-20 09:40:45 CET +</div> +</div> +</body> </html>
diff --git a/Documentation/user-manual_fr.txt b/Documentation/user-manual_fr.txt index 9674adc72..6fbcdabc3 100644 --- a/Documentation/user-manual_fr.txt +++ b/Documentation/user-manual_fr.txt @@ -1666,7 +1666,40 @@ 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: -- *During the dive, recording cylinder switch events*. Since sidemount diving normally involves two +- *Describe the cylinders used during the dive* This is performed in the *Equipment tab* of + 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 + 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 toolbar 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 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 @@ -1693,6 +1726,44 @@ image::images/sidemount1.jpg["FIGURE: Sidemount profile", align="center"] 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 *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 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. + +image::images/pSCR_profile.jpg["FIGURE: pSCR profile", align="center"] + + + [[S_CCR_dives]] ==== Closed circuit rebreather (CCR) dives |