mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'v4.4-branch' back into master

Browse source 
The manuals all will need a careful read.
The changes to use lsb-release and the PCLinuxOS specific files got lost
because I didn't want to try to rewite this in the middle of a merge.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>

Conflicts:
	Documentation/50-pot/subsurface-manual.pot
	Documentation/fr/po/subsurface-manual.fr.po
	Documentation/user-manual.txt
	Documentation/user-manual_es.txt
	Documentation/user-manual_fr.html.git
	Documentation/user-manual_fr.txt
	Documentation/user-manual_ru.html.git
	Documentation/user-manual_ru.txt
	file.c
	qthelper.cpp
	subsurface.pro
	subsurfacesysinfo.cpp
	xslt/DiveLog.xslt
This commit is contained in:
Dirk Hohndel 2015-02-18 21:33:00 -08:00
commit f1f02941c7
21 changed files with 2118 additions and 1425 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

120
Documentation/50-pot/subsurface-manual.pot
View file

@ -6366,8 +6366,8 @@ msgid "<<S_ViewPanels,_Profile_>> - View only the *Dive Profile* panel."
msgstr ""
#. type: Plain text
#: ./user-manual.txt:3187
msgid "<<S_ViewPanels,_Info_>> - View only the *Notes* panel."
#: ./user-manual.txt:3115
msgid "<<S_ViewPanels,_Info_>> - View only the *Dive Notes* panel."
msgstr ""
#. type: Plain text
@ -7392,7 +7392,7 @@ msgid "images/icons/atomiclogo.jpg"
msgstr ""
#. type: Plain text
#: ./user-manual.txt:3639
#: ./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. "
@ -7402,19 +7402,19 @@ msgid ""
msgstr ""
#. type: Title ===
#: ./user-manual.txt:3641
#: ./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:3644
#: ./user-manual.txt:3571
#, no-wrap
msgid "images/icons/mareslogo.jpg"
msgstr ""
#. type: Plain text
#: ./user-manual.txt:3652
#: ./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 "
@ -7425,7 +7425,7 @@ msgid ""
msgstr ""
#. type: Plain text
#: ./user-manual.txt:3657
#: ./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 "
@ -7433,36 +7433,36 @@ msgid ""
msgstr ""
#. type: Plain text
#: ./user-manual.txt:3660
#: ./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:3661
#: ./user-manual.txt:3588
msgid "Extract the _.sdf_ file from the zipped folder to your Desktop."
msgstr ""
#. type: Plain text
#: ./user-manual.txt:3662
#: ./user-manual.txt:3589
msgid "The password for accessing the .zip file is _mares_."
msgstr ""
#. type: Title ===
#: ./user-manual.txt:3664
#: ./user-manual.txt:3591
#, no-wrap
msgid "Exporting from *DivingLog 5.0*"
msgstr ""
#. type: Named 'icon' AttributeList argument for style 'icon'
#: ./user-manual.txt:3666
#: ./user-manual.txt:3593
#, no-wrap
msgid "images/icons/divingloglogo.jpg"
msgstr ""
#. type: Plain text
#: ./user-manual.txt:3675
#: ./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 "
@ -7473,28 +7473,28 @@ msgid ""
msgstr ""
#. type: Plain text
#: ./user-manual.txt:3677
#: ./user-manual.txt:3604
msgid "In DivingLog open the 'File -> Export -> XML' menu"
msgstr ""
#. type: Plain text
#: ./user-manual.txt:3678
#: ./user-manual.txt:3605
msgid "Select the dives to export"
msgstr ""
#. type: Plain text
#: ./user-manual.txt:3679
#: ./user-manual.txt:3606
msgid "Click on the export button and select the filename"
msgstr ""
#. type: Title ==
#: ./user-manual.txt:3681
#: ./user-manual.txt:3608
#, no-wrap
msgid "APPENDIX D: Exporting a spreadsheet to CSV format"
msgstr ""
#. type: Plain text
#: ./user-manual.txt:3690
#: ./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 "
@ -7507,7 +7507,7 @@ msgid ""
msgstr ""
#. type: Plain text
#: ./user-manual.txt:3696
#: ./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 "
@ -7518,40 +7518,40 @@ msgid ""
msgstr ""
#. type: Plain text
#: ./user-manual.txt:3698
#: ./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:3699
#: ./user-manual.txt:3626
msgid "Duration: the format should be minutes:seconds."
msgstr ""
#. type: Plain text
#: ./user-manual.txt:3700
#: ./user-manual.txt:3627
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:3701
#: ./user-manual.txt:3628
msgid "Tags and buddies: values should be separated using a comma."
msgstr ""
#. type: Plain text
#: ./user-manual.txt:3702
#: ./user-manual.txt:3629
msgid "GPS position: users must use decimal degrees, e.g. 30.22496 30.821798"
msgstr ""
#. type: Title ===
#: ./user-manual.txt:3703
#: ./user-manual.txt:3630
#, no-wrap
msgid "_LibreOffice Calc_ and _OpenOffice Calc_"
msgstr ""
#. type: Plain text
#: ./user-manual.txt:3707
#: ./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_ "
@ -7562,13 +7562,13 @@ msgid ""
msgstr ""
#. type: Target for macro image
#: ./user-manual.txt:3708
#: ./user-manual.txt:3635
#, no-wrap
msgid "images/LOffice_spreadsheetdata.jpg"
msgstr ""
#. type: Plain text
#: ./user-manual.txt:3711
#: ./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 "
@ -7576,13 +7576,13 @@ msgid ""
msgstr ""
#. type: Target for macro image
#: ./user-manual.txt:3712
#: ./user-manual.txt:3639
#, no-wrap
msgid "images/LOffice_save_as_options.jpg"
msgstr ""
#. type: Plain text
#: ./user-manual.txt:3715
#: ./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), "
@ -7590,13 +7590,13 @@ msgid ""
msgstr ""
#. type: Target for macro image
#: ./user-manual.txt:3716
#: ./user-manual.txt:3643
#, no-wrap
msgid "images/LOffice_field_options.jpg"
msgstr ""
#. type: Plain text
#: ./user-manual.txt:3719
#: ./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 "
@ -7604,13 +7604,13 @@ msgid ""
msgstr ""
#. type: Title ===
#: ./user-manual.txt:3720
#: ./user-manual.txt:3647
#, no-wrap
msgid "Microsoft _Excel_"
msgstr ""
#. type: Plain text
#: ./user-manual.txt:3726
#: ./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 "
@ -7621,19 +7621,19 @@ msgid ""
msgstr ""
#. type: Plain text
#: ./user-manual.txt:3728
#: ./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:3729
#: ./user-manual.txt:3656
msgid "Open the _Regional and Language Options_ dialog box."
msgstr ""
#. type: Plain text
#: ./user-manual.txt:3732
#: ./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 "
@ -7641,48 +7641,48 @@ msgid ""
msgstr ""
#. type: Plain text
#: ./user-manual.txt:3733
#: ./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:3734
#: ./user-manual.txt:3661
msgid "Click _OK_ twice."
msgstr ""
#. type: Plain text
#: ./user-manual.txt:3736
#: ./user-manual.txt:3663
msgid "Below is an image of the _Control Panel_:"
msgstr ""
#. type: Target for macro image
#: ./user-manual.txt:3737
#: ./user-manual.txt:3664
#, no-wrap
msgid "images/Win_SaveCSV2.jpg"
msgstr ""
#. type: Plain text
#: ./user-manual.txt:3740
#: ./user-manual.txt:3667
msgid "To export the dive log in CSV format:"
msgstr ""
#. type: Plain text
#: ./user-manual.txt:3742
#: ./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:3743
#: ./user-manual.txt:3670
#, no-wrap
msgid "images/Win_SaveCSV1.jpg"
msgstr ""
#. type: Plain text
#: ./user-manual.txt:3746
#: ./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 "
@ -7692,13 +7692,13 @@ msgid ""
msgstr ""
#. type: Target for macro image
#: ./user-manual.txt:3747
#: ./user-manual.txt:3674
#, no-wrap
msgid "images/Win_SaveCSV3.jpg"
msgstr ""
#. type: Plain text
#: ./user-manual.txt:3750
#: ./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 "
@ -7707,19 +7707,19 @@ msgid ""
msgstr ""
#. type: Title ==
#: ./user-manual.txt:3751
#: ./user-manual.txt:3678
#, no-wrap
msgid "APPENDIX E: FAQs."
msgstr ""
#. type: Title ===
#: ./user-manual.txt:3753
#: ./user-manual.txt:3680
#, no-wrap
msgid "Subsurface appears to miscalculate gas consumption and SAC"
msgstr ""
#. type: Plain text
#: ./user-manual.txt:3757
#: ./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_ "
@ -7727,7 +7727,7 @@ msgid ""
msgstr ""
#. type: Plain text
#: ./user-manual.txt:3763
#: ./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, "
@ -7737,7 +7737,7 @@ msgid ""
msgstr ""
#. type: Plain text
#: ./user-manual.txt:3769
#: ./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 "
@ -7747,12 +7747,12 @@ msgid ""
msgstr ""
#. type: Plain text
#: ./user-manual.txt:3771
#: ./user-manual.txt:3698
msgid "+consumption = (amount_of_air_at_beginning - amount_of_air_at_end)+"
msgstr ""
#. type: Plain text
#: ./user-manual.txt:3777
#: ./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 "
@ -7763,12 +7763,12 @@ msgid ""
msgstr ""
#. type: Plain text
#: ./user-manual.txt:3779
#: ./user-manual.txt:3706
msgid "+12.2*((220-100)/1.013)+"
msgstr ""
#. type: Plain text
#: ./user-manual.txt:3784
#: ./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 "
@ -7778,7 +7778,7 @@ msgid ""
msgstr ""
#. type: Plain text
#: ./user-manual.txt:3790
#: ./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 "
@ -7789,7 +7789,7 @@ msgid ""
msgstr ""
#. type: Title ===
#: ./user-manual.txt:3791
#: ./user-manual.txt:3718
#, 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:3795
#: ./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 "
@ -7805,7 +7805,7 @@ msgid ""
msgstr ""
#. type: Plain text
#: ./user-manual.txt:3803
#: ./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 "

261
Documentation/fr/po/subsurface-manual.fr.po
View file

@ -2964,8 +2964,8 @@ msgid "After the images have been loaded, they appear in two places:"
msgstr ""
#. type: Plain text
#: user-manual.txt:1592
msgid "the _Photos_ tab of the *Notes* panel."
#: user-manual.txt:1588
msgid "the _Photos_ tab of the *Dive Notes* panel."
msgstr ""
#. type: Plain text
@ -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 *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"
"*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"
@ -3199,72 +3135,7 @@ msgid ""
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 *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
#: user-manual.txt:1667
#, no-wrap
msgid "Closed circuit rebreather (CCR) dives"
msgstr ""
@ -6363,9 +6234,11 @@ msgstr ""
"plongée*."
#. type: Plain text
#: user-manual.txt:3187
msgid "<<S_ViewPanels,_Info_>> - View only the *Notes* panel."
msgstr "<<S_ViewPanels,_Info_>> - Affiche uniquement le panneau des *notes*."
#: 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*."
#. type: Plain text
#: user-manual.txt:3188
@ -7460,7 +7333,7 @@ msgid "images/icons/atomiclogo.jpg"
msgstr "images/icons/atomiclogo.jpg"
#. type: Plain text
#: user-manual.txt:3639
#: 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. "
@ -7470,19 +7343,19 @@ msgid ""
msgstr ""
#. type: Title ===
#: user-manual.txt:3641
#: 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:3644
#: user-manual.txt:3571
#, no-wrap
msgid "images/icons/mareslogo.jpg"
msgstr "images/icons/mareslogo.jpg"
#. type: Plain text
#: user-manual.txt:3652
#: 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 "
@ -7493,7 +7366,7 @@ msgid ""
msgstr ""
#. type: Plain text
#: user-manual.txt:3657
#: 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 "
@ -7501,36 +7374,36 @@ msgid ""
msgstr ""
#. type: Plain text
#: user-manual.txt:3660
#: 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:3661
#: user-manual.txt:3588
msgid "Extract the _.sdf_ file from the zipped folder to your Desktop."
msgstr ""
#. type: Plain text
#: user-manual.txt:3662
#: user-manual.txt:3589
msgid "The password for accessing the .zip file is _mares_."
msgstr ""
#. type: Title ===
#: user-manual.txt:3664
#: user-manual.txt:3591
#, no-wrap
msgid "Exporting from *DivingLog 5.0*"
msgstr ""
#. type: Named 'icon' AttributeList argument for style 'icon'
#: user-manual.txt:3666
#: user-manual.txt:3593
#, no-wrap
msgid "images/icons/divingloglogo.jpg"
msgstr "images/icons/divingloglogo.jpg"
#. type: Plain text
#: user-manual.txt:3675
#: 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 "
@ -7541,28 +7414,28 @@ msgid ""
msgstr ""
#. type: Plain text
#: user-manual.txt:3677
#: user-manual.txt:3604
msgid "In DivingLog open the 'File -> Export -> XML' menu"
msgstr ""
#. type: Plain text
#: user-manual.txt:3678
#: user-manual.txt:3605
msgid "Select the dives to export"
msgstr ""
#. type: Plain text
#: user-manual.txt:3679
#: user-manual.txt:3606
msgid "Click on the export button and select the filename"
msgstr ""
#. type: Title ==
#: user-manual.txt:3681
#: user-manual.txt:3608
#, no-wrap
msgid "APPENDIX D: Exporting a spreadsheet to CSV format"
msgstr ""
#. type: Plain text
#: user-manual.txt:3690
#: 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 "
@ -7575,7 +7448,7 @@ msgid ""
msgstr ""
#. type: Plain text
#: user-manual.txt:3696
#: 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 "
@ -7586,41 +7459,41 @@ msgid ""
msgstr ""
#. type: Plain text
#: user-manual.txt:3698
#: 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:3699
#: user-manual.txt:3626
msgid "Duration: the format should be minutes:seconds."
msgstr ""
#. type: Plain text
#: user-manual.txt:3700
#: user-manual.txt:3627
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:3701
#: user-manual.txt:3628
msgid "Tags and buddies: values should be separated using a comma."
msgstr ""
#. type: Plain text
#: user-manual.txt:3702
#: user-manual.txt:3629
msgid "GPS position: users must use decimal degrees, e.g. 30.22496 30.821798"
msgstr ""
#. type: Title ===
#: user-manual.txt:3703
#: user-manual.txt:3630
#, no-wrap
msgid "_LibreOffice Calc_ and _OpenOffice Calc_"
msgstr ""
#. type: Plain text
#: user-manual.txt:3707
#: 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_ "
@ -7631,13 +7504,13 @@ msgid ""
msgstr ""
#. type: Target for macro image
#: user-manual.txt:3708
#: user-manual.txt:3635
#, no-wrap
msgid "images/LOffice_spreadsheetdata.jpg"
msgstr "images/LOffice_spreadsheetdata.jpg"
#. type: Plain text
#: user-manual.txt:3711
#: 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 "
@ -7645,13 +7518,13 @@ msgid ""
msgstr ""
#. type: Target for macro image
#: user-manual.txt:3712
#: 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:3715
#: 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), "
@ -7659,13 +7532,13 @@ msgid ""
msgstr ""
#. type: Target for macro image
#: user-manual.txt:3716
#: user-manual.txt:3643
#, no-wrap
msgid "images/LOffice_field_options.jpg"
msgstr "images/LOffice_field_options.jpg"
#. type: Plain text
#: user-manual.txt:3719
#: 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:"
@ -7673,13 +7546,13 @@ msgid ""
msgstr ""
#. type: Title ===
#: user-manual.txt:3720
#: user-manual.txt:3647
#, no-wrap
msgid "Microsoft _Excel_"
msgstr ""
#. type: Plain text
#: user-manual.txt:3726
#: 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 "
@ -7690,19 +7563,19 @@ msgid ""
msgstr ""
#. type: Plain text
#: user-manual.txt:3728
#: 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:3729
#: user-manual.txt:3656
msgid "Open the _Regional and Language Options_ dialog box."
msgstr ""
#. type: Plain text
#: user-manual.txt:3732
#: 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 "
@ -7710,48 +7583,48 @@ msgid ""
msgstr ""
#. type: Plain text
#: user-manual.txt:3733
#: 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:3734
#: user-manual.txt:3661
msgid "Click _OK_ twice."
msgstr ""
#. type: Plain text
#: user-manual.txt:3736
#: user-manual.txt:3663
msgid "Below is an image of the _Control Panel_:"
msgstr ""
#. type: Target for macro image
#: user-manual.txt:3737
#: user-manual.txt:3664
#, no-wrap
msgid "images/Win_SaveCSV2.jpg"
msgstr "images/Win_SaveCSV2.jpg"
#. type: Plain text
#: user-manual.txt:3740
#: user-manual.txt:3667
msgid "To export the dive log in CSV format:"
msgstr ""
#. type: Plain text
#: user-manual.txt:3742
#: 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:3743
#: user-manual.txt:3670
#, no-wrap
msgid "images/Win_SaveCSV1.jpg"
msgstr "images/Win_SaveCSV1.jpg"
#. type: Plain text
#: user-manual.txt:3746
#: 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 "
@ -7761,13 +7634,13 @@ msgid ""
msgstr ""
#. type: Target for macro image
#: user-manual.txt:3747
#: user-manual.txt:3674
#, no-wrap
msgid "images/Win_SaveCSV3.jpg"
msgstr "images/Win_SaveCSV3.jpg"
#. type: Plain text
#: user-manual.txt:3750
#: 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 "
@ -7776,19 +7649,19 @@ msgid ""
msgstr ""
#. type: Title ==
#: user-manual.txt:3751
#: user-manual.txt:3678
#, no-wrap
msgid "APPENDIX E: FAQs."
msgstr ""
#. type: Title ===
#: user-manual.txt:3753
#: user-manual.txt:3680
#, no-wrap
msgid "Subsurface appears to miscalculate gas consumption and SAC"
msgstr ""
#. type: Plain text
#: user-manual.txt:3757
#: 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_ "
@ -7796,7 +7669,7 @@ msgid ""
msgstr ""
#. type: Plain text
#: user-manual.txt:3763
#: 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, "
@ -7806,7 +7679,7 @@ msgid ""
msgstr ""
#. type: Plain text
#: user-manual.txt:3769
#: 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 "
@ -7816,12 +7689,12 @@ msgid ""
msgstr ""
#. type: Plain text
#: user-manual.txt:3771
#: user-manual.txt:3698
msgid "+consumption = (amount_of_air_at_beginning - amount_of_air_at_end)+"
msgstr ""
#. type: Plain text
#: user-manual.txt:3777
#: 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 "
@ -7832,12 +7705,12 @@ msgid ""
msgstr ""
#. type: Plain text
#: user-manual.txt:3779
#: user-manual.txt:3706
msgid "+12.2*((220-100)/1.013)+"
msgstr ""
#. type: Plain text
#: user-manual.txt:3784
#: 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 "
@ -7847,7 +7720,7 @@ msgid ""
msgstr ""
#. type: Plain text
#: user-manual.txt:3790
#: 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 "
@ -7858,13 +7731,13 @@ msgid ""
msgstr ""
#. type: Title ===
#: user-manual.txt:3791
#: 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:3795
#: 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 "
@ -7872,7 +7745,7 @@ msgid ""
msgstr ""
#. type: Plain text
#: user-manual.txt:3803
#: 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 "

148
Documentation/user-manual.html.git
View file

@ -722,6 +722,8 @@ Decimal degrees, e.g. 30.22496 , 30.821798</code></pre>
<div class="paragraph"><p>Southern hemisphere latitudes are given with a <strong>S</strong>, e.g. S30°, or with a
negative value, e.g. -30.22496. Similarly western longitudes are given with a
<strong>W</strong>, e.g. W07°, or with a negative value, e.g. -7.34323.</p></div>
<div class="paragraph"><p>Some keyboards don&#8217;t have the degree sign (°). It can be replaced by a d like
that: N30d W20d.</p></div>
<div class="paragraph"><p>Please note that GPS coordinates of a dive site are linked to the Location
name - so adding coordinates to dives that do not have a location description
will cause unexpected behaviour (Subsurface will think that all of these
@ -1002,7 +1004,7 @@ the divecomputer allows this,
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
even though some 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>
@ -1341,7 +1343,7 @@ message in a blue box at the top of the panel:</p></div>
<em>Subsurface</em> and the information on
cylinders and gases (entered here) determines the behaviour of the dive profile
(top right-hand panel).</p></div>
<div class="paragraph"><p><strong>Cylinders</strong>: The cylinder information is entered through a dialogue that looks
<div class="paragraph" id="cylinder_definitions"><p><strong>Cylinders</strong>: The cylinder information is entered through a dialogue that looks
like this:</p></div>
<div class="imageblock" style="text-align:center;">
<div class="content">
@ -1736,12 +1738,12 @@ column headings. The top line of the white part of the data table contains the c
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
in blue balloons and can 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 in the blue
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;">
@ -1761,9 +1763,9 @@ The data from the <em>CSV</em> file are imported and shown in the <strong>Dive L
<td class="icon">
<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
<td class="content"><em>CSV</em> is an abbreviation for a data file format: <em>Comma-Separated Values</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 TextWrangler (OS/X). The two main advantages of
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 or
proprietary attributes that proprietary software insert into files.
@ -2372,13 +2374,59 @@ If, later, the external drive with the photos is connected again, the photos can
<div class="sect2">
<h3 id="_logging_special_types_of_dives">5.6. Logging special types of dives</h3>
<div class="sect3">
<h4 id="_sidemount_dives">5.6.1. Sidemount dives</h4>
<div class="paragraph"><p><em>Subsurface</em> easily handles dives involving more than one cylinder. Sidemount dive logging involves
three steps:</p></div>
<h4 id="S_MulticylinderDives">5.6.1. Multicylinder dives</h4>
<div class="paragraph"><p><em>Subsurface</em> easily handles dives involving more than one cylinder. Multicylinder diving usually happens
(a) if a diver does not have enough gas for the complete dive in a single cylinder; (b) if the diver
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
<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 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
@ -2406,7 +2454,7 @@ three 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>
@ -2415,10 +2463,52 @@ three 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 logging tool.</p></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>
<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 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">
@ -2542,7 +2632,7 @@ a description of that event is given as the bottom line in the <a href="#S_InfoB
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
Below is a dive profile for a CCR dive, including an overlay
of setpoint and oxygen sensor data, as well as the cylinder pressure data. In this
case there is good agreement from the readings of the two oxygen sensors.</p></div>
<div class="imageblock" style="text-align:center;">
@ -2668,7 +2758,7 @@ cellspacing="0" cellpadding="4">
</div>
<div class="paragraph"><p>The profile also includes depth readings for the peaks and troughs in the graph.
Thus, users should see the depth of the deepest point and other peaks. Mean depth
is marked with a horizontal red line.</p></div>
is plotted as a grey line, indicating mean dive depth up to a particular moment during the dive.</p></div>
<div class="admonitionblock">
<table><tr>
<td class="icon">
@ -3001,11 +3091,11 @@ 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
air 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>
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 data.</p></div>
@ -3402,7 +3492,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 recreational
<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>
@ -3815,8 +3905,10 @@ Thresholds: <em>Subsurface</em> can display the nitrogen, oxygen and the helium
</li>
<li>
<p>
<em>Show average depth</em>: Activating this checkbox causes <em>Subsurface</em> to draw a red line across
the dive profile, indicating the mean depth of the dive.
<em>Show average depth</em>: Activating this checkbox causes <em>Subsurface</em> to draw a grey line across
the dive profile, indicating the mean depth of the dive up to a particular point in time during
that dive. Normally this is a u-shaped line indicating the deepest average depth just before the
ascent.
</p>
</li>
</ul></div>
@ -4064,7 +4156,7 @@ In the top left-hand area of the planning screen, ensure that the constant dive
</li>
<li>
<p>
In the table labelled <em>Available Gases</em>, add the information of the cylinders to be used
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
@ -4154,7 +4246,7 @@ of that table corresponds to one of the gas mixtures specified in the <em>Availa
Add new waypoints until the main features of the dive have been completed, e.g. the
bottom time segment and deep stops (if these are implemented). Leave the remaining
waypoints on the ascent to <em>Subsurface</em>. In most cases <em>Subsurface</em>
computes additional way points in order to fulfil decompression requirements for that
computes additional way points in order to fulfill decompression requirements for that
dive. A waypoint can be moved by selecting that waypoint and by using the arrow keys.
The waypoints listed in the <em>Dive Planner Points</em> dialogue can be edited by hand in
order to obtain a precise presentation of the dive plan. In fact, one can create the
@ -4228,13 +4320,13 @@ The parameters of the pSCR diver can be set by selecting <em>File &#8594; 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" />
@ -5002,7 +5094,7 @@ On the list of file names select the .CSV file that has been created above. An i
</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>
@ -5220,7 +5312,7 @@ The dives are now exported to the file DM4.bak (or DM5.bak)
</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>
@ -5333,7 +5425,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 imperial and metric units)
Unit system: only one unit system should be used (i.e., no mixture between imperial and metric units)
</p>
</li>
<li>
@ -5490,7 +5582,7 @@ you don&#8217;t want that to count as some kind of long dive”.</p></div>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
Last updated 2015-02-04 07:44:40 PST
Last updated 2015-02-17 08:49:01 PST
</div>
</div>
</body>

219
Documentation/user-manual_es.html.git
View file

@ -411,7 +411,7 @@ asciidoc.install(3);
<div class="paragraph"><p><strong>Autores</strong>: Willem Ferguson, Jacco van Koll, Dirk Hohndel, Reinout Hoornweg,
Linus Torvalds, Miika Turkia, Amit Chaudhuri, Jan Schubert, Salvador Cuñat,
Pedro Neves</p></div>
<div class="paragraph"><p><span class="BLUE"><em>Versión 4.4, February 2015</em></span></p></div>
<div class="paragraph"><p><span class="BLUE"><em>Versión 4.4, Febrero 2015</em></span></p></div>
<div class="paragraph"><p>Bienvenido como usuario de <em>Subsurface</em>, un avanzado programa de registro de
inmersiones con extensa infraestructura para describir, organizar e
interpretarbuceos en apnea o con botella. <em>Subsurface</em> ofrece muchas ventajas
@ -725,6 +725,8 @@ Grados decimales, p.e. 30.22496 , 30.821798</code></pre>
<div class="paragraph"><p>Las latitudes del hemisferio sur se dan con una S, p.e. S30º o con un valor
negativo, p.e. -30.22496. De igual manera, las longitudes del oeste se dan con
una W, p.e. W07º, o con un valor negativo, p.e. -7.34323.</p></div>
<div class="paragraph"><p>Algunos teclados no disponen del signo de grados (°). Puede remplazarse con una
"d", así: N30d W20d.</p></div>
<div class="paragraph"><p>Las coordenadas GPS de un punto de buceo están unidas al nombre de dicho punto
así, al añadir coordenadas a inmersiones en las que no se ha facilitado una
descripción de la ubicación se producirá un comportamiento inesperado
@ -1313,11 +1315,11 @@ mensaje en azul arriba del panel</p></div>
altamente interactiva y la información de botellas y gases que se introduzca
determinará el comportamiento del perfil de la inmersión (panel de arriba a la
derecha).</p></div>
<div class="paragraph"><p><strong>Botellas</strong>: La información de las botellas se introduce con un dialogo como
<div class="paragraph" id="cylinder_definitions"><p><strong>Botellas</strong>: La información de las botellas se introduce con un dialogo como
este:</p></div>
<div class="imageblock" style="text-align:center;">
<div class="content">
<img src="images/DC_gas_dialogue1_f20_jpg" alt="FIGURA: Diálogo de Botellas inicial" />
<img src="images/DC_gas-dialogue1_f20.jpg" alt="FIGURA: Diálogo de Botellas inicial" />
</div>
</div>
<div class="paragraph"><p>En la mayoría de los casos <em>Subsurface</em> obtiene el gas usado del ordenador de
@ -1332,7 +1334,7 @@ la casilla <strong>Tipo de botella</strong>. Esto hará aparecer un botón que p
mostrar una lista desplegable de botellas.</p></div>
<div class="imageblock" style="text-align:center;">
<div class="content">
<img src="images/DC_gas_dialogue2_f20_jpg" alt="FIGURA: Botón del desplegable de la lista de botellas" />
<img src="images/DC_gas-dialogue2_f20.jpg" alt="FIGURA: Botón del desplegable de la lista de botellas" />
</div>
</div>
<div class="paragraph"><p>La lista desplegable puede usarse para seleccionar el tipo de botella que
@ -1512,7 +1514,7 @@ haciendo clic en <em>Importar archivos de registro</em>. Con ello se mostrará e
dialogo <strong>A</strong> a continuación.</p></div>
<div class="imageblock" style="text-align:center;">
<div class="content">
<img src="images/Import1_f20_jpg" alt="FIGURA: Importar: paso 1" />
<img src="images/Import1_f20.jpg" alt="FIGURA: Importar: paso 1" />
</div>
</div>
<div class="paragraph"><p>Abajo a la derecha hay un desplegable con una etiqueta por defecto Archivos de
@ -2362,13 +2364,67 @@ se vuelve a conectar, las fotos se visualizarán normalmente.</p></div>
<div class="sect2">
<h3 id="_registrar_tipos_de_inmersion_especiales">6.3. Registrar tipos de inmersión especiales</h3>
<div class="sect3">
<h4 id="_inmersiones_en_montaje_lateral_sidemount">6.3.1. Inmersiones en montaje lateral (sidemount)</h4>
<div class="paragraph"><p>_Subsurface maneja fácilmente buceos en los que se use más de una botella.
Registrar inmersiones en lateral se hace en tres pasos:</p></div>
<h4 id="S_MulticylinderDives">6.3.1. Inmersiones multi botella</h4>
<div class="paragraph"><p><em>Subsurface</em> maneja fácilmente inmersiones que requieren más de una botella. El
buceo multi botella se produce habitualmente cuando (a) un buceador no tiene
bastante gas para completar una inmersión con una sola botella o (b) cuando el
buceador necesita más de una mezcla de gas a causa de la profundidad o de las
necesidades descompresivas de la inmersión. Por este motivo, las inmersiones
multi tanque son empleadas a menudo por los buceadores técnicos ya que bucean
profundo y durante mucho tiempo. En lo que corresponde a <em>Subsurface</em>, solo hay
dos clases de información que necesitan proporcionarse:</p></div>
<div class="ulist"><ul>
<li>
<p>
*Durante el buceo, registrar los eventos de cambio de botella". Ya que bucear
<strong>Describir las botellas usadas durante el buceo</strong>. Esto se hace en la pestaña
<strong>Equipo</strong> del panel <strong>Información de la inmersión</strong> tal como <a href="#cylinder_definitions">se describe anteriormente</a>.
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.
</p>
</li>
<li>
<p>
<strong>Registrar los momentos en que se cambia de una botella a otra</strong>. Esta es una
información que facilitan algunos ordenadores (siempre y cuando el buceador
se la diga al ordenador durante el buceo). Si el ordenador no la proporciona,
el buceador necesita registrarla usando un método diferente, p.e. en una
pizarra.
</p>
</li>
<li>
<p>
<strong>Indica los cambios de botella en el perfil</strong>. Si se utilizó la última opción,
el buceador ha de indicar el evento de cambio de gas haciendo clic derecho en
el momento adecuado del panel <strong>Perfil de inmersión</strong> y señalar la botella a la
que se cambió. Tras hacer clic derecho, seguir el menú contextual a "Añadir
cambio de gas" y seleccionar la botella apropiada entre las definidas en el
primer paso (ver imagen a continuación). Si el botón <strong>Barra de botellas</strong> de
la barra de herramientas se ha activado, los cambios también se indicarán en
la barra.
</p>
</li>
</ul></div>
<div class="paragraph"><p>Habiendo llevado a cabo estas tareas, <em>Subsurface</em> indica en el perfil de buceo
el uso de diferentes botellas. A continuación, una inmersión multi botella que
empieza con EAN28, se cambia a EAN50 despues de 26 minutos para efectuar la
deco.</p></div>
<div class="imageblock" style="text-align:center;">
<div class="content">
<img src="images/multicylinder_dive.jpg" alt="FIGURa: Perfil multi tanque" />
</div>
</div>
</div>
<div class="sect3">
<h4 id="_inmersiones_en_montaje_lateral_sidemount">6.3.2. Inmersiones en montaje lateral (sidemount)</h4>
<div class="paragraph"><p>El buceo en montaje lateral es solo otra forma de buceo multi tanque, a menudo
con ambas o todas las botellas conteniendo la misma mezcla. Aunque es una
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:</p></div>
<div class="ulist"><ul>
<li>
<p>
*Durante el buceo, se registran los eventos de cambio de botella". Ya que bucear
en lateral supone, normalmente, usar 2 botellas con aire o con la misma mezcla,
<em>Subsurface</em> distingue entre estas botellas. En comparación, la mayoría de
ordenadores de buceo que contemplan cambios de gas solo distinguen entre
@ -2416,7 +2472,55 @@ Registrar inmersiones en lateral se hace en tres pasos:</p></div>
de registro de inmersiones.</p></div>
</div>
<div class="sect3">
<h4 id="S_CCR_dives">6.3.2. Inmersiones con rebreather de circuito cerrado (CCR)</h4>
<h4 id="S_sSCR_dives">6.3.3. Inmersiones con rebreather de circuito semi cerrado (SCR)</h4>
<div class="admonitionblock">
<table><tr>
<td class="icon">
<img src="images/halcyon_RB80.jpg" alt="Note" />
</td>
<td class="content">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.</td>
</tr></table>
</div>
<div class="paragraph"><p>Para registrar inmersiones con pSCR, no se requieren procedimientos especiales,
solo los pasos normales descritos con anterioridad:</p></div>
<div class="ulist"><ul>
<li>
<p>
Seleccionar el modo pSCR en el desplegable <em>Modo de inmersión</em> en el panel
<strong>Información de la inmersión</strong>.
</p>
</li>
<li>
<p>
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 <a href="#S_MulticylinderDives">Inmersiones multi botella</a>.
</p>
</li>
</ul></div>
<div class="paragraph"><p>Si se ha seleccionado pSCR en el <em>Modo de inmersión</em>, 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.</p></div>
<div class="imageblock" style="text-align:center;">
<div class="content">
<img src="images/pSCR_profile.jpg" alt="FIGURA: Perfil pSCR" />
</div>
</div>
</div>
<div class="sect3">
<h4 id="S_CCR_dives">6.3.4. Inmersiones con rebreather de circuito cerrado (CCR)</h4>
<div class="admonitionblock">
<table><tr>
<td class="icon">
@ -2439,7 +2543,7 @@ se importan datos de otras fuentes digitales.</td>
</div>
</div>
<div class="sect3">
<h4 id="_importar_una_inmersion_con_ccr">6.3.3. Importar una inmersión con CCR</h4>
<h4 id="_importar_una_inmersion_con_ccr">6.3.5. Importar una inmersión con CCR</h4>
<div class="paragraph"><p>Véase la sección que trata de <a href="#S_ImportingAlienDiveLogs">Importar información de buceo de otras fuentes digitales</a>.
Desde el menú principal de <em>Subsurface</em>, seleccionar <em>Import &#8594; Importar archivos
de registro</em> para desplegar el <a href="#Unified_import">Diálogo de importación universal</a>.
@ -2452,7 +2556,7 @@ archivo concreto (en el caso del MKVI es un archivo con extensión .txt). Tras
seleccionar el archivo, activar el botón <em>Abrir</em> de abajo a la derecha.</p></div>
</div>
<div class="sect3">
<h4 id="_informacion_mostrada_para_un_buceo_con_ccr">6.3.4. Información mostrada para un buceo con CCR</h4>
<h4 id="_informacion_mostrada_para_un_buceo_con_ccr">6.3.6. Información mostrada para un buceo con CCR</h4>
<div class="paragraph"><p><em>Presiones parciales de los gases</em>: El gráfico de presión parcial de oxígeno
muestra la información de los sensores de oxígeno del equipo CCR. A diferencia
del equipo de circuito abierto (donde los valores de pO<sub>2</sub> se calculan en base
@ -2661,8 +2765,8 @@ cellspacing="0" cellpadding="4">
</div>
<div class="paragraph"><p>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 roja
horizontal.</p></div>
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.</p></div>
<div class="admonitionblock">
<table><tr>
<td class="icon">
@ -3329,7 +3433,68 @@ en las que aparezcan las etiquetas "cueva" <em>O</em> "barco", solas o conjuntam
<div class="sect1">
<h2 id="S_ExportLog">9. Exportar el registro de inmersiones o parte del mismo</h2>
<div class="sectionbody">
<div class="paragraph"><p>Se llega a la función de exportación seleccionando <em>Archivo &#8594; Exportar</em> lo que
<div class="paragraph"><p>Hay dos posibilidades de exportar información de buceo desde <em>Subsurface</em>:</p></div>
<div class="ulist"><ul>
<li>
<p>
Exportar información de buceo a <em>Facebook</em>
</p>
</li>
<li>
<p>
<a href="#S_Export_other">Exportar información de buceo a otros destinos o formatos</a>
</p>
</li>
</ul></div>
<div class="sect2">
<h3 id="S_facebook">9.1. Exportar información de buceo a <em>Facebook</em></h3>
<div class="paragraph"><p>La exportación de inmersiones a <em>Facebook</em> se maneja de forma diferente a otros
tipos de exportación. Esto es debido a que exportar a <em>Facebook</em> requiere una
conexión a esta red social y necesita un usuario de <em>Facebook</em> y su password.
Si, desde el menú principal, seleccionamos <em>Archivo &#8594; Preferencias &#8594;
Facebook</em>, se nos presentará una pantalla de acceso (ver imagen <strong>A</strong> de la
izquierda a continuación). Introducimos nuestro usuario y password de
<em>Facebook</em>. Una vez que nos hemos conectado a <em>Facebook</em>, se nos presenta el
panel de la imagen <strong>B</strong> a continuación. Este panel tiene un botón que habrá que
seleccionar para cerrar la conexión a <em>Facebook</em>.</p></div>
<div class="imageblock" style="text-align:center;">
<div class="content">
<img src="images/facebook1_f20.jpg" alt="Figure: Acceso a Facebook" />
</div>
</div>
<div class="paragraph"><p>Tras haber establecido una conexión con <em>Facebook</em>, transferir un perfil de
inmersión a nuestro perfil de <em>Facebook</em> es sencillo. Un icono de <em>Facebook</em>
aparece en el panel <strong>Notas de la inmersión</strong> de <em>Subsurface</em> (ver imagen <strong>A</strong> a
continuación). Asegúrate de que la inmersión que quieres transferir al historial
es la que se muestra en el panel <strong>Perfil de la inmersión</strong>. Selecciona el icono
de <em>Facebook</em> y se mostrará un icono que determinará la cantidad de información
transferida junto al perfil (ver imagen <strong>B</strong>, a continuación). Se necesita
proporcionar el nombre de un álbum de <em>Facebook</em> 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 <strong>B</strong> 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 <em>OK</em>
lo que inicia la transferencia a <em>Facebook</em>. Unos momentos después aparecerá
un mensaje indicando una transferencia correcta.</p></div>
<div class="paragraph"><p>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 <em>Facebook</em> desde un navegador o desde la app de <em>Facebook</em>. 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.</p></div>
<div class="imageblock" style="text-align:center;">
<div class="content">
<img src="images/facebook2_f20.jpg" alt="Figure: Facebook login" />
</div>
</div>
<div class="paragraph"><p>Si se considera necesario, cierra la conexión a <em>Facebook</em>, bien cerrando
<em>Subsurface</em> o bien seleccionando <em>Archivo &#8594; Preferencias &#8594; Facebook</em> desde
el menú principal, clicando el botón correspondiente en el panel <em>Facebook</em>.</p></div>
</div>
<div class="sect2">
<h3 id="S_Export_other">9.2. Exportar información de buceo a otros destinos o formatos</h3>
<div class="paragraph"><p>Para exportar a otros destinos,
se llega a la función de exportación seleccionando <em>Archivo &#8594; Exportar</em> 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 <strong>Lista de Inmersiones</strong> de <em>Subsurface</em>. Marca la casilla seleccionable
@ -3456,6 +3621,7 @@ Solo exportar lista: Solo se exportará una lista de inmersiones. No se
</ul></div>
</div>
</div>
</div>
<div class="sect1">
<h2 id="S_Cloud_access">10. Guardar un diario de <em>Subsurface</em> en la Nube</h2>
<div class="sectionbody">
@ -3801,8 +3967,9 @@ Umbrales: <em>Subsurface</em> puede mostrar las presiones parciales de nitrógen
<li>
<p>
<em>Mostrar la profundidad media</em>: Activar esta casilla hace que <em>Subsurface</em>
trace una línea roja a través del perfil, indicando la profundidad media del
buceo.
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.
</p>
</li>
</ul></div>
@ -3927,6 +4094,22 @@ el servidor proxy utiliza autenticación también han de indicarse el usuario y
password para que <em>Subsurface</em> pueda pasar automáticamente a través del proxy
para acceder a internet.</p></div>
</div>
<div class="sect2">
<h3 id="_acceso_a_facebook">13.6. Acceso a Facebook</h3>
<div class="paragraph"><p>Este panel nos permite acceder a una cuenta de <em>Facebook</em> para poder enviar
información desde <em>Subsurface</em>.</p></div>
<div class="imageblock" style="text-align:center;">
<div class="content">
<img src="images/Pref6_f20.jpg" alt="FIGURE: Facebook login panel" />
</div>
</div>
<div class="paragraph"><p>Si se proporciona un usuario y una clave validos, se crea una conexión a
<em>Facebook</em>. La conexión se cierra cuando al cerrar <em>Subsurface</em>. 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 <a href="#S_facebook">Exportar perfiles de inmersión a Facebook</a>
para más información.</p></div>
</div>
</div>
</div>
<div class="sect1">
@ -5529,7 +5712,7 @@ querrás que te cuente como algún tipo de inmersión larga.</p></div>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
Last updated 2015-02-04 07:44:40 PST
Last updated 2015-02-17 08:49:01 PST
</div>
</div>
</body>

132
Documentation/user-manual_es.txt
View file

@ -1678,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
@ -1712,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*.
- 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)
@ -1860,9 +1824,9 @@ Puede incluir información de ajustes o metadatos sobre la inmersión.
== Obtener más información sobre inmersiones guardadas en el diario
=== La pestaña Información (para inmersiones individuales)
=== La pestaña Información de la inmersión (para inmersiones individuales)
La pestaña Información proporciona alguna información resumida
La pestaña Información de la inmersión proporciona alguna información resumida
sobre un buceo en particular que ha sido seleccionado en la *Lista de
inmersiones*. La información útil incluye el intervalo en superficie antes de la
inmersión, las profundidades máxima y media, el volumen de gas consumido, el
@ -1926,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]
@ -2418,8 +2382,8 @@ grabadas por el ordenador y apareciendo como buceos distintos en el panel *Lista
de inmersiones*. Se pueden unir estos buceos en uno solo seleccionando las
correspondientes inmersiones y haciendo clic-derecho para mostrar el menú.
Entonces se selecciona *Mezclar inmersiones seleccionadas*. Puede que sea
necesario editar la información de la inmersión en el panel *Notas* para
reflejar situaciones o condiciones que afecten al buceo
necesario editar la información de la inmersión en el panel *Notas de la
inmersión* para reflejar situaciones o condiciones que afecten al buceo
resultante de la fusión. La figura a continuación muestra el perfil de dos
inmersiones que fueron unidas:
@ -2468,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 _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
@ -2763,7 +2675,7 @@ image::images/Pref1_f20.jpg["FIGURA: Pantalla de Predeterminados en Preferencias
inmersiones se muestran en la lista.
** *Botella por defecto*: Se puede especificar una botella por defecto de las
que aparecen listadas en la pestaña *Equipo* del panel *Notas*.
que aparecen listadas en la pestaña *Equipo* del panel *Notas de la inmersión*.
Es muy cómodo si se bucea habitualmente con el mismo tipo de botella, asigna a
cada nueva inmersión una botella del tipo aquí definido.
@ -2833,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*:
@ -2915,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_
@ -2963,7 +2861,7 @@ Al igual que el diario de _Subsurface_, la pantalla del planificador se divide
en varias secciones (ver imagen a continuación). Los parámetros de ajuste de una
inmersión se introducen en las diversas secciones a la izquierda de la pantalla.
El ajuste se divide en varias secciones: Gases disponibles, Ritmos, Planificar,
Opciones de gases y Notas.
Opciones de gases y Notas de inmersión.
Arriba a la derecha hay un *panel de diseño* verde sobre el cual puede
manipularse directamente el perfil de inmersión arrastrando y haciendo clic como
@ -3111,7 +3009,7 @@ guardado aparecerá en el panel *Lista de Inmersiones*.
En la parte inferior derecha del planificador, bajo el encabezamiento _Detalles
del plan de buceo_, se proporcionan los detalles exactos del plan de inmersión.
Estos detalles pueden modificarse seleccionando cualquiera de las opciones bajo
el encabezamiento _Notas_ del planificador, justo a la izquierda
el encabezamiento _Notas de la inmersión_ del planificador, justo a la izquierda
del anterior. Si se solicita un _Plan de buceo detallado_, se obtendrá un plan
detallado al nivel de oraciones. Si cualquiera de los límites especificados se
sobrepasa, se obtendrá un mensaje de aviso bajo la información del plan.
@ -3214,7 +3112,7 @@ textos.
Los planes de inmersión tienen muchas características en común con los registros
de buceo (perfil, notas, etc). Despues de haber guardado un plan, los detalles y
los calculos de gas quedan almacenados en la pestaña *Notas*.
los calculos de gas quedan almacenados en la pestaña *Notas de la inmersión*.
Mientras se está diseñando un plan, se puede imprimir utilizando el botón
_Imprimir_ del planificador. Esto imprimirá los detalles y cálculos de gases del
panel _Detalles del plan de inmersión_ del planificador. Sin embargo, tras haber
@ -3285,7 +3183,7 @@ de este manual que describen las operaciones con más detalle.
- <<S_ViewPanels,_Lista_de_inmersiones_>> - Se visualiza solo el panel Lista de
inmersiones.
- <<S_ViewPanels,_Perfil_>> - Se visualiza solo el panel Perfil de inmersión.
- <<S_ViewPanels,_Info_>> - Se visualiza solo el panel Notas.
- <<S_ViewPanels,_Info_>> - Se visualiza solo el panel Notas de la inmersión.
- <<S_ViewPanels,_Globo_>> - Se presenta solo el panel Mapamundi.
- _Estadísticas anuales_ - Muestra estadísticas anuales resumidas sobre las
inmersiones efectuadas en este año y los pasados.

1274
Documentation/user-manual_fr.html.git
View file

File diff suppressed because it is too large Load diff

73
Documentation/user-manual_fr.txt
View file

@ -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 *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
- *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
@ -1726,44 +1693,6 @@ 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

826
Documentation/user-manual_ru.html.git
View file

File diff suppressed because it is too large Load diff

84
INSTALL
View file

@ -10,8 +10,7 @@ Below are instructions for building Subsurface under some popular
Linux distributions, for building Subsurface using Homebrew on a Mac,
and for cross-building Subsurface for Windows. The lack of a working
package management system for Windows makes it really painful to build
Subsurface natively under Windows, we have some hints how to do so
here as well.
Subsurface natively under Windows, so we don't support that at all.
All of the prebuilt binaries that we provide (right now Windows, Mac,
Ubuntu/Debian/LinuxMint, and openSUSE/Fedora) are built using our own
@ -96,75 +95,30 @@ sudo apt-get install git g++ make autoconf libtool cmake pkg-config \
libqt5webkit5-dev libqt5qml5 libqt5quick5 libqt5declarative5 \
qtscript5-dev
On Debian style distributions you can install the required development
packages by running (once Qt version of subsurface is available in your
distribution)
$ sudo apt-get build-dep subsurface
but on many of them this will give you the build dependencies for the
official package (which is often way out of date). So be careful that this
doesn't get you a Qt4 based environment
On PCLinuxOS you appear to need the following packages
su -c "apt-get install -y autoconf automake cmake libtool gcc-c++ git \
lib64usb1.0-devel lib64zip-devel lib64qt5webkitwidgets-devel qttools5 \
qttranslations5 lib64qt5xml-devel lib64qt5test-devel lib64qtscript-devel \
lib64qt5svg-devel lib64qt5concurrent-devel"
First you need to compile our version of libdivecomputer:
In order to build Subsurface, use the supplied build script. This should
work on most systems that have all the prerequisite packages installed...
$ mkdir ~/src # unless you have this already
$ cd ~/src
$ git clone -b Subsurface-4.4 git://subsurface-divelog.org/libdc libdivecomputer
# or -b Subsurface-testing to get the testing version - careful,
# careful - this gets rebased and may be broken
# -> when not building a release version of Subsurface but the
# latest master, it may be necessary to build against the
# Subsurface-testing branch
You should have Subsurface sources checked out in a sane place, something
like this:
$ cd libdivecomputer
$ autoreconf --install
$ ./configure --disable-shared
$ make
$ sudo make install
mkdir -p ~/src
cd ~/src
git clone -b v4.4.1 git://subsurface-divelog.org/subsurface
./subsurface/scripts/build.sh # <- this step will take quite a while as it
# compiles a handful of libraries before
# building Subsurface
Then you compile our custom branch of libmarblewidget
Now you can run Subsurface like this:
$ cd ~/src
$ git clone -b Subsurface-4.4 git://subsurface-divelog.org/marble marble-source
# or -b Subsurface-testing to get the testing version - careful,
# careful - this gets rebased and may be broken
$ mkdir marble-build
$ cd marble-build
$ cmake -DQTONLY=ON -DQT5BUILD=ON \
-DBUILD_MARBLE_APPS=OFF -DBUILD_MARBLE_EXAMPLES=OFF \
-DBUILD_MARBLE_TESTS=OFF -DBUILD_MARBLE_TOOLS=OFF \
-DBUILD_TESTING=OFF -DWITH_DESIGNER_PLUGIN=OFF \
-DBUILD_WITH_DBUS=OFF ../marble-source
$ make # <- this step will take quite a while... if you have more cores
# try make -j8 or something like that
$ sudo make install
Finally you can compile Subsurface:
$ cd ~/src
$ git clone git://subsurface-divelog.org/subsurface.git
$ cd subsurface
$ git checkout v4.4 # this get's you the last release
# skip this step to build the latest development
# version
$ qmake SPECIAL_MARBLE_PREFIX=1
# on Fedora/OpenSUSE you need qmake-qt5
$ make
$ sudo make install # [optionally, add: prefix=/usr/local]
At least on Fedora and OpenSUSE you need to make sure that /usr/local/lib
is searched for shared libraries (this is where the steps above installed
libdivecomputer and libmarblewidget in order not to conflict with system
pacakges). So you need to do the following:
$ sudo echo "/usr/local/lib" > /etc/ld.so.conf.d/local.conf
$ sudo ldconfig
Now you should be able to start the Subsurface binary you just created
with
$ ./subsurface
cd ~/src/subsurface
./subsurface
Building Subsurface under MacOSX (using Homebrew)

8
README
View file

@ -1,7 +1,7 @@
This is the README file for Subsurface 4.4 Beta 3
This is the README file for Subsurface 4.4.1
Please check the ReleaseNotes.txt for details about new features and
changes since Subsurface 4.3
changes since Subsurface 4.4 (and earlier versions).
Subsurface can be found at http://subsurface-divelog.org
@ -24,11 +24,11 @@ If you want the latest release (instead of the bleeding edge
development version) you can either get this via git or the release tar
ball. After cloning run the following command:
git checkout v4.3 (or whatever the last release is)
git checkout v4.4.1 (or whatever the last release is)
or download a tar ball from:
http://subsurface-divelog.org/downloads/Subsurface-4.3.tgz
http://subsurface-divelog.org/downloads/Subsurface-4.4.1.tgz
Detailed build instructions can be found in the INSTALL file.

27
ReleaseNotes/ReleaseNotes.txt
View file

@ -1,16 +1,37 @@
// _Subsurface_ 4.4 Release Notes
// _Subsurface_ 4.4.1 Release Notes
_Subsurface_ 4.4 - February 2015
_Subsurface_ 4.4.1 - February 2015
--------------------------------
The _Subsurface_ development team proudly announces
the release of version 4.4 of _Subsurface_, an open
the release of version 4.4.1 of _Subsurface_, an open
source divelog and dive planning program for Windows, Mac and Linux.
License: GPLv2
_Subsurface_ can be found at: http://_Subsurface_-divelog.org
This is just a small update to _Subsurface_ 4.4, mainly intended to update
the user manual translations to be consistent with 4.4, to fix a small
number of bugs and to update to the latest libdivecomputer.
Some of the changes since _Subsurface_ 4.4
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Spanish, Russian and French translations of the user manual have been
updated.
Better and more flexible parsing of GPS coordinates.
Small fixes to the HTML export.
Fixed a problem where dives imported from some Shearwater dive computers
would be considered CCR dives. For dives imported in the past, manually
setting them to OC works around the issue.
Several fixes to imports from other divelog, including importing from
MacDive.
Some of the changes since _Subsurface_ 4.3
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

5
file.c
View file

@ -14,6 +14,9 @@
/* For SAMPLE_* */
#include <libdivecomputer/parser.h>
/* to check XSLT version number */
#include <libxslt/xsltconfig.h>
/* Crazy windows sh*t */
#ifndef O_BINARY
#define O_BINARY 0
@ -869,7 +872,9 @@ int parse_csv_file(const char *filename, int timef, int depthf, int tempf, int p
/* Increase the limits for recursion and variables on XSLT
* parsing */
xsltMaxDepth = 30000;
#if LIBXSLT_VERSION > 10126
xsltMaxVars = 150000;
#endif
if (timef >= MAXCOLS || depthf >= MAXCOLS || tempf >= MAXCOLS || po2f >= MAXCOLS || cnsf >= MAXCOLS || ndlf >= MAXCOLS || cnsf >= MAXCOLS || stopdepthf >= MAXCOLS || pressuref >= MAXCOLS)
return report_error(translate("gettextFromC", "Maximum number of supported columns on CSV import is %d"), MAXCOLS);

32
packaging/ubuntu/0001-Make-build-with-Qt4.patch
View file

@ -1,19 +1,21 @@
From f4637480501bb82884b719624d8d179b5d3016c2 Mon Sep 17 00:00:00 2001
From a5da35bf6fea4424d387ec5d1f94f520834ef77b Mon Sep 17 00:00:00 2001
From: Dirk Hohndel <dirk@hohndel.org>
Date: Wed, 28 Jan 2015 14:42:12 -0800
Date: Tue, 17 Feb 2015 13:23:33 -0800
Subject: [PATCH] Make build with Qt4
This is just a best effort patch - Qt4 is no longer officially supported
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
---
qt-ui/divelogexportdialog.cpp | 7 ++++++-
qt-ui/divelogexportdialog.h | 4 ++++
qt-ui/divelogimportdialog.cpp | 30 ++++++++++++++++++++++++++++++
qt-ui/divelogimportdialog.cpp | 34 ++++++++++++++++++++++++++++++++++
qt-ui/downloadfromdivecomputer.cpp | 12 ++++++++++++
qt-ui/plannerSettings.ui | 4 ++--
5 files changed, 54 insertions(+), 3 deletions(-)
5 files changed, 58 insertions(+), 3 deletions(-)
diff --git a/qt-ui/divelogexportdialog.cpp b/qt-ui/divelogexportdialog.cpp
index aff0265de616..24ac2942ac36 100644
index 43c41550f145..8c6d2899f0f0 100644
--- a/qt-ui/divelogexportdialog.cpp
+++ b/qt-ui/divelogexportdialog.cpp
@@ -1,8 +1,9 @@
@ -27,7 +29,7 @@ index aff0265de616..24ac2942ac36 100644
#include "divelogexportdialog.h"
#include "diveshareexportdialog.h"
#include "ui_divelogexportdialog.h"
@@ -311,7 +312,11 @@ void DiveLogExportDialog::on_buttonBox_accepted()
@@ -313,7 +314,11 @@ void DiveLogExportDialog::on_buttonBox_accepted()
settings.endGroup();
// the non XSLT exports are called directly above, the XSLT based ons are called here
if (!stylesheet.isEmpty())
@ -64,10 +66,10 @@ index 14f8f453980f..524416414a8e 100644
void showExplanation();
void exportHtmlInit(const QString &filename);
diff --git a/qt-ui/divelogimportdialog.cpp b/qt-ui/divelogimportdialog.cpp
index c79b9df953eb..25fd75d15d0e 100644
index bb4701ce36d3..4b9c8f8c0740 100644
--- a/qt-ui/divelogimportdialog.cpp
+++ b/qt-ui/divelogimportdialog.cpp
@@ -375,14 +375,22 @@ void DiveLogImportDialog::loadFileContents(int value, whatChanged triggeredBy)
@@ -376,14 +376,22 @@ void DiveLogImportDialog::loadFileContents(int value, whatChanged triggeredBy)
seabear = true;
firstLine = "Sample time;Sample depth;Sample NDL;Sample TTS;Sample stopdepth;Sample temperature;Sample pressure";
blockSignals(true);
@ -90,19 +92,25 @@ index c79b9df953eb..25fd75d15d0e 100644
blockSignals(false);
}
@@ -390,7 +398,11 @@ void DiveLogImportDialog::loadFileContents(int value, whatChanged triggeredBy)
if (triggeredBy == KNOWNTYPES && value == 1) {
@@ -392,9 +400,17 @@ void DiveLogImportDialog::loadFileContents(int value, whatChanged triggeredBy)
apd=true;
firstLine = "Sample time\tSample depth\t\t\t\t\tSample pO₂\t\t\t\t\t\t\t\t\tSample temperature\t\tSample CNS\tSample stopdepth";
blockSignals(true);
+#if QT_VERSION >= 0x050000
ui->CSVSeparator->setCurrentText(tr("Tab"));
+#else
+ ui->CSVSeparator->setCurrentIndex(0);
+#endif
if (triggeredBy == INITIAL && fileNames.first().contains(".apd", Qt::CaseInsensitive))
+#if QT_VERSION >= 0x050000
ui->knownImports->setCurrentText("APD Log Viewer");
+#else
+ ui->knownImports->setCurrentIndex(1);
+#endif
blockSignals(false);
}
@@ -409,7 +421,16 @@ void DiveLogImportDialog::loadFileContents(int value, whatChanged triggeredBy)
@@ -413,7 +429,16 @@ void DiveLogImportDialog::loadFileContents(int value, whatChanged triggeredBy)
separator = ";";
if (ui->CSVSeparator->currentText() != separator) {
blockSignals(true);
@ -119,7 +127,7 @@ index c79b9df953eb..25fd75d15d0e 100644
blockSignals(false);
currColumns = firstLine.split(separator);
}
@@ -460,7 +481,16 @@ void DiveLogImportDialog::loadFileContents(int value, whatChanged triggeredBy)
@@ -464,7 +489,16 @@ void DiveLogImportDialog::loadFileContents(int value, whatChanged triggeredBy)
if (ui->CSVSeparator->currentText() != separator || separator == "Tab") {
ui->CSVSeparator->blockSignals(true);

1
packaging/ubuntu/debian/12.04.rules
View file

@ -29,6 +29,7 @@ override_dh_auto_configure:
-DBUILD_TESTING=OFF -DWITH_DESIGNER_PLUGIN=OFF \
-DBUILD_WITH_DBUS=OFF ../marble-source ; \
make -j8 ; \
ln -s src/lib/marble lib ; \
mkdir include ; cd include ; for i in `find ../../marble-source -name \*.h` ; do ln -s $$i . ; done ; \
ln -s . marble )
patch -p1 < packaging/ubuntu/0001-Make-build-with-Qt4.patch

1
packaging/ubuntu/debian/rules
View file

@ -29,6 +29,7 @@ override_dh_auto_configure:
-DBUILD_TESTING=OFF -DWITH_DESIGNER_PLUGIN=OFF \
-DBUILD_WITH_DBUS=OFF ../marble-source ; \
make -j8 ; \
ln -s src/lib/marble lib ; \
mkdir include ; cd include ; for i in `find ../../marble-source -name \*.h` ; do ln -s $$i . ; done ; \
ln -s . marble )
qmake LIBDCDEVEL=./libdivecomputer LIBGIT2DEVEL=./libgit2 LIBGIT2STATIC=1 LIBMARBLEDEVEL=./marble-build SPECIAL_MARBLE_PREFIX=1 subsurface.pro

102
scripts/build.sh Executable file
View file

@ -0,0 +1,102 @@
#!/bin/bash
#
# this should be run from the src directory, the layout is supposed to
# look like this:
#.../src/subsurface
# /libgit2
# /marble-source
# /libdivecomputer
#
# the script will build these three libraries from source, even if
# they are installed as part of the host OS since we have seen
# numerous cases where building with random versions (especially older,
# but sometimes also newer versions than recommended here) will lead
# to all kinds of unnecessary pain
SRC=$(pwd)
if [[ ! -d "subsurface" ]] ; then
echo "please start this script from the directory containing the Subsurface source directory"
exit 1
fi
# qmake or qmake-qt5 ?
qmake -v | grep "version 5" > /dev/null 2>&1
if [[ $? -eq 0 ]] ; then
QMAKE=qmake
else
qmake-qt5 -v | grep "version 5" > /dev/null 2>&1
if [[ $? -eq 0 ]] ; then
QMAKE=qmake-qt5
else
echo "can't find a working qmake for Qt5"
exit 1
fi
fi
mkdir -p install
# build libgit2
if [ ! -d libgit2 ] ; then
if [[ $1 = local ]] ; then
git clone $SRC/../libgit2 libgit2
else
git clone git://github.com/libgit2/libgit2
fi
fi
cd libgit2
git checkout v0.21.5
mkdir -p build
cd build
cmake -DCMAKE_INSTALL_PREFIX=$SRC/install -DCMAKE_BUILD_TYPE=Release -DBUILD_CLAR=OFF ..
cmake --build . --target install
cd $SRC
# build libdivecomputer
if [ ! -d libdivecomputer ] ; then
if [[ $1 = local ]] ; then
git clone $SRC/../libdivecomputer libdivecomputer
else
git clone -b Subsurface-4.4 git://subsurface-divelog.org/libdc libdivecomputer
fi
fi
cd libdivecomputer
git checkout Subsurface-4.4
if [ ! -f configure ] ; then
autoreconf --install
./configure --prefix=$SRC/install
fi
make -j4
make install
cd $SRC
# build libssrfmarblewidget
if [ ! -d marble-source ] ; then
if [[ $1 = local ]] ; then
git clone $SRC/../marble-source marble-source
else
git clone -b Subsurface-4.4 git://subsurface-divelog.org/marble marble-source
fi
fi
cd marble-source
git checkout Subsurface-4.4
mkdir -p build
cd build
cmake -DCMAKE_BUILD_TYPE=Release -DQTONLY=TRUE -DQT5BUILD=ON \
-DCMAKE_INSTALL_PREFIX=$SRC/install \
-DBUILD_MARBLE_TESTS=NO \
-DWITH_DESIGNER_PLUGIN=NO \
-DBUILD_MARBLE_APPS=NO \
$SRC/marble-source
cd src/lib/marble
make -j4
make install
cd $SRC/subsurface
$QMAKE CONFIG+=setRpath LIBDCDEVEL=1 LIBMARBLEDEVEL=$SRC/install SPECIAL_MARBLE_PREFIX=1 LIBGIT2DEVEL=$SRC/libgit2 subsurface.pro
make -j4

6
subsurface-configure.pri
View file

@ -138,6 +138,7 @@ isEmpty(LIBGIT2DEVEL) {
} else {
INCLUDEPATH += $$LIBGIT2DEVEL/include
isEmpty(LIBGIT2STATIC) {
setRpath: QMAKE_RPATHDIR += $$LIBGIT2DEVEL/build
LIBS += -L$$LIBGIT2DEVEL/build -lgit2 -lz -lcrypto
} else {
LIBS += $$LIBGIT2DEVEL/build/libgit2.a -Wl,-Bstatic -lz -lssl -lcrypto -Wl,-Bdynamic -ldl
@ -156,12 +157,13 @@ contains(QMAKE_PLATFORM, android): DEFINES += NO_MARBLE NO_USERMANUAL NO_PRINTIN
!isEmpty(LIBMARBLEDEVEL) {
# find it next to our sources
INCLUDEPATH += $$LIBMARBLEDEVEL/include
LIBS += -L$$LIBMARBLEDEVEL/src/lib/marble
setRpath: QMAKE_RPATHDIR += $$LIBMARBLEDEVEL/lib
LIBS += -L$$LIBMARBLEDEVEL/lib
}
!contains(DEFINES, NO_MARBLE) {
win32: CONFIG(debug, debug|release): LIBS += -lmarblewidgetd
else: !isEmpty(SPECIAL_MARBLE_PREFIX) {
LIBS += -L$$LIBMARBLEDEVEL/src/lib/marble -lssrfmarblewidget
LIBS += -lssrfmarblewidget
} else {
LIBS += -lmarblewidget
}

2
subsurface.pro
View file

@ -19,7 +19,7 @@ else: TARGET = subsurface
QMAKE_CLEAN += $$TARGET
VERSION = 4.4
VERSION = 4.4.1
VERSION_FILE = $$OUT_PWD/ssrf-version.h
# create a blank VERSION_FILE if missing
system(cat $$VERSION_FILE > /dev/null 2>&1 || touch $$VERSION_FILE)

182
translations/subsurface_cs.ts
View file

@ -46,7 +46,7 @@
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
<source>Location</source>
<translation>Poloha</translation>
<translation>Místo</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
@ -388,7 +388,7 @@
<location filename="../qt-ui/configuredivecomputerdialog.ui" line="796"/>
<location filename="../qt-ui/configuredivecomputerdialog.ui" line="1963"/>
<source>Last deco</source>
<translation>Poslední deco zastávka</translation>
<translation>Poslední zastavení</translation>
</message>
<message>
<location filename="../qt-ui/configuredivecomputerdialog.ui" line="717"/>
@ -488,7 +488,7 @@
<message>
<location filename="../qt-ui/configuredivecomputerdialog.ui" line="449"/>
<source>Compass gain</source>
<translation>Zisk kompasu</translation>
<translation>Citlivost kompasu</translation>
</message>
<message>
<location filename="../qt-ui/configuredivecomputerdialog.ui" line="64"/>
@ -560,7 +560,7 @@
<location filename="../qt-ui/configuredivecomputerdialog.ui" line="611"/>
<location filename="../qt-ui/configuredivecomputerdialog.ui" line="1819"/>
<source>Alt GF can be selected underwater</source>
<translation type="unfinished"/>
<translation>Alt GF lze vybrat pod vodou</translation>
</message>
<message>
<location filename="../qt-ui/configuredivecomputerdialog.ui" line="180"/>
@ -588,19 +588,19 @@
<location filename="../qt-ui/configuredivecomputerdialog.ui" line="632"/>
<location filename="../qt-ui/configuredivecomputerdialog.ui" line="2071"/>
<source>GFLow</source>
<translation>GF nízký</translation>
<translation>GFLow</translation>
</message>
<message>
<location filename="../qt-ui/configuredivecomputerdialog.ui" line="655"/>
<location filename="../qt-ui/configuredivecomputerdialog.ui" line="2064"/>
<source>GFHigh</source>
<translation>GF vysoký</translation>
<translation>GFHigh</translation>
</message>
<message>
<location filename="../qt-ui/configuredivecomputerdialog.ui" line="730"/>
<location filename="../qt-ui/configuredivecomputerdialog.ui" line="1885"/>
<source>Decotype</source>
<translation>Typ deco</translation>
<translation>Typ dekomprese</translation>
</message>
<message>
<location filename="../qt-ui/configuredivecomputerdialog.ui" line="756"/>
@ -628,13 +628,13 @@
<location filename="../qt-ui/configuredivecomputerdialog.ui" line="851"/>
<location filename="../qt-ui/configuredivecomputerdialog.ui" line="1989"/>
<source>Alt GFLow</source>
<translation>Alternativní GF nízký</translation>
<translation>Alternativní GFLow</translation>
</message>
<message>
<location filename="../qt-ui/configuredivecomputerdialog.ui" line="858"/>
<location filename="../qt-ui/configuredivecomputerdialog.ui" line="2015"/>
<source>Alt GFHigh</source>
<translation>Alternativní GF vysoký</translation>
<translation>Alternativní GFHigh</translation>
</message>
<message>
<location filename="../qt-ui/configuredivecomputerdialog.ui" line="865"/>
@ -774,7 +774,7 @@
<message>
<location filename="../qt-ui/configuredivecomputerdialog.ui" line="1148"/>
<source>Fixed setpoint</source>
<translation>Stálé nastavení bodu</translation>
<translation>Stálá nastavovací hodnota</translation>
</message>
<message>
<location filename="../qt-ui/configuredivecomputerdialog.ui" line="1153"/>
@ -784,7 +784,7 @@
<message>
<location filename="../qt-ui/configuredivecomputerdialog.ui" line="1161"/>
<source>Setpoint fallback</source>
<translation>Záložní nastavení bodu</translation>
<translation>Záložní nastavovací hodnota</translation>
</message>
<message>
<location filename="../qt-ui/configuredivecomputerdialog.ui" line="1184"/>
@ -814,7 +814,7 @@
<message>
<location filename="../qt-ui/configuredivecomputerdialog.ui" line="1697"/>
<source>kg/ℓ</source>
<translation>kg/ℓ</translation>
<translation> kg/ℓ</translation>
</message>
<message>
<location filename="../qt-ui/configuredivecomputerdialog.ui" line="1940"/>
@ -1085,7 +1085,7 @@
<message>
<location filename="../qt-ui/models.cpp" line="78"/>
<source>Work press.</source>
<translation>Provozní tlak.</translation>
<translation>Provozní tlak</translation>
</message>
<message>
<location filename="../qt-ui/models.cpp" line="78"/>
@ -1095,7 +1095,7 @@
<message>
<location filename="../qt-ui/models.cpp" line="78"/>
<source>End press.</source>
<translation>Konečný tlak.</translation>
<translation>Konečný tlak</translation>
</message>
<message>
<location filename="../qt-ui/models.cpp" line="78"/>
@ -1143,7 +1143,7 @@
<message>
<location filename="../qt-ui/divecomponentselection.ui" line="46"/>
<source>Location</source>
<translation>Poloha</translation>
<translation>Místo</translation>
</message>
<message>
<location filename="../qt-ui/divecomponentselection.ui" line="53"/>
@ -1225,7 +1225,7 @@
<message>
<location filename="../qt-ui/models.cpp" line="1616"/>
<source>Device ID</source>
<translation>Poznávací znamení zařízení</translation>
<translation>Označení zařízení</translation>
</message>
<message>
<location filename="../qt-ui/models.cpp" line="1616"/>
@ -1311,7 +1311,7 @@
<message>
<location filename="../qt-ui/models.cpp" line="1257"/>
<source>m</source>
<translation>m</translation>
<translation> m</translation>
</message>
<message>
<location filename="../qt-ui/models.cpp" line="1257"/>
@ -1341,7 +1341,7 @@
<message>
<location filename="../qt-ui/models.cpp" line="1266"/>
<source>lbs</source>
<translation>Libra US</translation>
<translation>libra US</translation>
</message>
<message>
<location filename="../qt-ui/models.cpp" line="1269"/>
@ -1381,7 +1381,7 @@
<message>
<location filename="../qt-ui/models.cpp" line="1289"/>
<source>Location</source>
<translation>Poloha</translation>
<translation>Místo</translation>
</message>
</context>
<context>
@ -1639,7 +1639,7 @@
<message>
<location filename="../qt-ui/divelogexportdialog.ui" line="428"/>
<source>Theme</source>
<translation>Motiv</translation>
<translation>Vzhled</translation>
</message>
<message>
<location filename="../qt-ui/divelogexportdialog.ui" line="439"/>
@ -1690,7 +1690,7 @@
<message>
<location filename="../qt-ui/divelogexportdialog.cpp" line="78"/>
<source>HTML export of the dive locations, visualized on a world map.</source>
<translation>Vyvedení potápěčské lokality do HTML zobrazené na mapě světa.</translation>
<translation>Vyvedení potápěčského místa do HTML zobrazené na mapě světa.</translation>
</message>
<message>
<location filename="../qt-ui/divelogexportdialog.cpp" line="80"/>
@ -1790,7 +1790,7 @@
<message>
<location filename="../qt-ui/divelogimportdialog.ui" line="125"/>
<source>Drag the tags above to each corresponding column below</source>
<translation type="unfinished"/>
<translation>Značky nahoře přetáhněte na odpovídající sloupce dole</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="576"/>
@ -1845,7 +1845,7 @@
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="580"/>
<source>Location</source>
<translation>Poloha</translation>
<translation>Místo</translation>
</message>
<message>
<location filename="../qt-ui/divelogimportdialog.cpp" line="582"/>
@ -2013,7 +2013,7 @@
<message>
<location filename="../qt-ui/diveplanner.ui" line="179"/>
<source>mbar</source>
<translation>mbar</translation>
<translation> mbar</translation>
</message>
<message>
<location filename="../qt-ui/diveplanner.ui" line="198"/>
@ -2142,7 +2142,7 @@
<message>
<location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="137"/>
<source>Setpoint</source>
<translation type="unfinished"/>
<translation>Nastavovací hodnota</translation>
</message>
<message>
<location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="139"/>
@ -2215,7 +2215,7 @@
<message>
<location filename="../qt-ui/diveshareexportdialog.ui" line="34"/>
<source>User ID</source>
<translation>Poznávací znamení uživatele</translation>
<translation>Označení uživatele</translation>
</message>
<message>
<location filename="../qt-ui/diveshareexportdialog.ui" line="48"/>
@ -2225,7 +2225,7 @@
<message>
<location filename="../qt-ui/diveshareexportdialog.ui" line="58"/>
<source>Get user ID</source>
<translation>Získat poznávací znamení uživatele</translation>
<translation>Získat označení uživatele</translation>
</message>
<message>
<location filename="../qt-ui/diveshareexportdialog.ui" line="67"/>
@ -2254,7 +2254,7 @@
<location filename="../qt-ui/models.cpp" line="1443"/>
<location filename="../qt-ui/models.cpp" line="1489"/>
<source>#</source>
<translation>Čís.</translation>
<translation>Číslo</translation>
</message>
<message>
<location filename="../qt-ui/models.cpp" line="1446"/>
@ -2341,7 +2341,7 @@
<location filename="../qt-ui/models.cpp" line="1482"/>
<location filename="../qt-ui/models.cpp" line="1530"/>
<source>Location</source>
<translation>Poloha</translation>
<translation>Místo</translation>
</message>
<message>
<location filename="../qt-ui/models.cpp" line="1507"/>
@ -2367,7 +2367,7 @@
<message>
<location filename="../qt-ui/models.cpp" line="1507"/>
<source>lbs</source>
<translation>Libra US</translation>
<translation>libra US</translation>
</message>
<message>
<location filename="../qt-ui/models.cpp" line="1476"/>
@ -2530,7 +2530,7 @@
<message>
<location filename="../qt-ui/downloadfromdivecomputer.ui" line="101"/>
<source>Vendor</source>
<translation>Výrobce</translation>
<translation>Dodavatel</translation>
</message>
<message>
<location filename="../qt-ui/downloadfromdivecomputer.ui" line="14"/>
@ -2694,7 +2694,7 @@
<message>
<location filename="../configuredivecomputerthreads.cpp" line="1626"/>
<source>Firmware update failed!</source>
<translation>Obnova firmware selhala!</translation>
<translation>Aktualizace firmware selhala!</translation>
</message>
<message>
<location filename="../configuredivecomputerthreads.cpp" line="1629"/>
@ -2715,7 +2715,7 @@
<message>
<location filename="../qt-ui/simplewidgets.cpp" line="549"/>
<source>Location: </source>
<translation>Poloha: </translation>
<translation>Místo: </translation>
</message>
</context>
<context>
@ -2723,7 +2723,7 @@
<message>
<location filename="../qt-ui/filtermodels.cpp" line="283"/>
<source>No location set</source>
<translation>Nestanovena žádná poloha</translation>
<translation>Nestanoveno žádné místo</translation>
</message>
</context>
<context>
@ -2732,7 +2732,7 @@
<location filename="../qt-ui/maintab.ui" line="160"/>
<location filename="../qt-ui/maintab.cpp" line="498"/>
<source>Location</source>
<translation>Poloha</translation>
<translation>Místo</translation>
</message>
<message>
<location filename="../qt-ui/maintab.ui" line="65"/>
@ -3105,7 +3105,7 @@ ze vzduchu a následujících plynů:</translation>
<message>
<location filename="../qt-ui/mainwindow.ui" line="641"/>
<source>Toggle DC reported ceiling</source>
<translation>Zapnout/Vypnout potápěcí počítač pro horní mez (hranici vynoření)</translation>
<translation>Zapnout/Vypnout potápěcí počítač pro horní mez (hranici vynoření)</translation>
</message>
<message>
<location filename="../qt-ui/mainwindow.ui" line="653"/>
@ -3183,7 +3183,7 @@ p, li { white-space: pre-wrap; }
<message>
<location filename="../qt-ui/mainwindow.ui" line="226"/>
<source>&amp;Log</source>
<translation>Záz&amp;nam</translation>
<translation>&amp;Záznam</translation>
</message>
<message>
<location filename="../qt-ui/mainwindow.ui" line="242"/>
@ -3198,7 +3198,7 @@ p, li { white-space: pre-wrap; }
<message>
<location filename="../qt-ui/mainwindow.ui" line="267"/>
<source>&amp;Import</source>
<translation>&amp;Zavést</translation>
<translation>Za&amp;vedení</translation>
</message>
<message>
<location filename="../qt-ui/mainwindow.ui" line="282"/>
@ -3705,12 +3705,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<message>
<location filename="../qt-ui/configuredivecomputerdialog.cpp" line="247"/>
<source>Firmware upgrade notice</source>
<translation type="unfinished"/>
<translation>Upozornění na aktualizaci firmware</translation>
</message>
<message>
<location filename="../qt-ui/configuredivecomputerdialog.cpp" line="265"/>
<source>Save the downloaded firmware as</source>
<translation type="unfinished"/>
<translation>Uložit stažený firmware jako</translation>
</message>
<message>
<location filename="../qt-ui/configuredivecomputerdialog.cpp" line="266"/>
@ -3738,7 +3738,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<message>
<location filename="../qt-ui/diveplanner.cpp" line="480"/>
<source>ft/min</source>
<translation>st/min</translation>
<translation>stop/min</translation>
</message>
<message>
<location filename="../qt-ui/diveplanner.cpp" line="481"/>
@ -3758,7 +3758,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<message>
<location filename="../qt-ui/diveplanner.cpp" line="485"/>
<source>m/min</source>
<translation>m/min</translation>
<translation> m/min</translation>
</message>
<message>
<location filename="../qt-ui/diveplanner.cpp" line="486"/>
@ -3785,7 +3785,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<location filename="../qt-ui/diveplanner.cpp" line="500"/>
<location filename="../qt-ui/diveplanner.cpp" line="501"/>
<source>ℓ/min</source>
<translation>ℓ/min</translation>
<translation> ℓ/min</translation>
</message>
</context>
<context>
@ -3919,7 +3919,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<message>
<location filename="../qt-ui/preferences.ui" line="483"/>
<source>cu ft</source>
<translation>cu st</translation>
<translation>cu stopa</translation>
</message>
<message>
<location filename="../qt-ui/preferences.ui" line="500"/>
@ -3939,7 +3939,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<message>
<location filename="../qt-ui/preferences.ui" line="795"/>
<source>CCR: show setpoints when viewing pO₂</source>
<translation type="unfinished"/>
<translation>CCR: Ukazovat nastavovací hodnoty, když se zobrazuje pO₂</translation>
</message>
<message>
<location filename="../qt-ui/preferences.ui" line="802"/>
@ -3949,12 +3949,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<message>
<location filename="../qt-ui/preferences.ui" line="809"/>
<source>Default CCR set-point for dive planning</source>
<translation type="unfinished"/>
<translation>Výchozí nastavovací hodnota CCR pro plánování potápění</translation>
</message>
<message>
<location filename="../qt-ui/preferences.ui" line="832"/>
<source>pSCR O₂ metabolism rate</source>
<translation type="unfinished"/>
<translation>pSCR rychlost látkové výměny O₂</translation>
</message>
<message>
<location filename="../qt-ui/preferences.ui" line="839"/>
@ -3964,7 +3964,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<message>
<location filename="../qt-ui/preferences.ui" line="846"/>
<source>ℓ/min</source>
<translation>ℓ/min</translation>
<translation> ℓ/min</translation>
</message>
<message>
<location filename="../qt-ui/preferences.ui" line="859"/>
@ -4059,12 +4059,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<message>
<location filename="../qt-ui/preferences.ui" line="306"/>
<source>Default user ID</source>
<translation>Výchozí poznávací znamení uživatele</translation>
<translation>Výchozí označení uživatele</translation>
</message>
<message>
<location filename="../qt-ui/preferences.ui" line="316"/>
<source>Save user ID locally?</source>
<translation>Uložit poznávací znamení uživatele místně?</translation>
<translation>Uložit označení uživatele místně?</translation>
</message>
<message>
<location filename="../qt-ui/preferences.ui" line="466"/>
@ -4084,7 +4084,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<message>
<location filename="../qt-ui/preferences.ui" line="537"/>
<source>lbs</source>
<translation>Libra US</translation>
<translation>libra US</translation>
</message>
<message>
<location filename="../qt-ui/preferences.ui" line="552"/>
@ -4109,7 +4109,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<message>
<location filename="../qt-ui/preferences.ui" line="788"/>
<source>GFLow at max depth</source>
<translation>Použít GF nízký při největší hloubce</translation>
<translation>Použít GFLow při největší hloubce</translation>
</message>
<message>
<location filename="../qt-ui/preferences.ui" line="748"/>
@ -4164,12 +4164,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<message>
<location filename="../qt-ui/preferences.ui" line="754"/>
<source>GFLow</source>
<translation>GF nízký</translation>
<translation>GFLow</translation>
</message>
<message>
<location filename="../qt-ui/preferences.ui" line="771"/>
<source>GFHigh</source>
<translation>GF vysoký</translation>
<translation>GFHigh</translation>
</message>
<message>
<location filename="../qt-ui/preferences.cpp" line="38"/>
@ -4285,7 +4285,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<message>
<location filename="../qt-ui/printlayout.cpp" line="26"/>
<source>Location</source>
<translation>Poloha</translation>
<translation>Místo</translation>
</message>
<message>
<location filename="../qt-ui/printlayout.cpp" line="63"/>
@ -4583,7 +4583,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<message>
<location filename="../qt-ui/models.cpp" line="526"/>
<source>lbs</source>
<translation>Libra US</translation>
<translation>libra US</translation>
</message>
<message>
<location filename="../qt-ui/models.cpp" line="550"/>
@ -4593,7 +4593,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<message>
<location filename="../qt-ui/models.cpp" line="551"/>
<source>m</source>
<translation>m</translation>
<translation> m</translation>
</message>
<message>
<location filename="../qt-ui/models.cpp" line="574"/>
@ -4613,7 +4613,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<message>
<location filename="../qt-ui/models.cpp" line="600"/>
<source>cuft</source>
<translation>cu st</translation>
<translation>cu stopa</translation>
</message>
<message>
<location filename="../qt-ui/subsurfacewebservices.cpp" line="513"/>
@ -4886,7 +4886,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<message>
<location filename="../qt-ui/socialnetworksdialog.ui" line="77"/>
<source>The profile picture will be posted in this album (required)</source>
<translation type="unfinished"/>
<translation>Obrázek profilu bude zobrazen v tomto albu (vyžadováno)</translation>
</message>
<message>
<location filename="../qt-ui/socialnetworksdialog.ui" line="84"/>
@ -4906,7 +4906,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<message>
<location filename="../qt-ui/socialnetworksdialog.ui" line="105"/>
<source>Location</source>
<translation>Poloha</translation>
<translation>Místo</translation>
</message>
<message>
<location filename="../qt-ui/socialnetworksdialog.ui" line="112"/>
@ -4992,12 +4992,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<message>
<location filename="../qt-ui/subsurfacewebservices.cpp" line="439"/>
<source>Invalid user identifier!</source>
<translation>Neplatné poznávací znamení uživatele!</translation>
<translation>Neplatné označení uživatele!</translation>
</message>
<message>
<location filename="../qt-ui/subsurfacewebservices.cpp" line="312"/>
<source>Enter User ID and click Download</source>
<translation>Zadejte poznávací znamení uživatele a klepněte na Stáhnout</translation>
<translation>Zadejte označení uživatele a klepněte na Stáhnout</translation>
</message>
<message>
<location filename="../qt-ui/subsurfacewebservices.cpp" line="442"/>
@ -5361,12 +5361,12 @@ Jazyk: %1</translation>
<message>
<location filename="../qt-ui/webservices.ui" line="68"/>
<source>User ID</source>
<translation>Poznávací znamení uživatele</translation>
<translation>Označení uživatele</translation>
</message>
<message>
<location filename="../qt-ui/webservices.ui" line="85"/>
<source>Save user ID locally?</source>
<translation>Uložit poznávací znamení uživatele místně?</translation>
<translation>Uložit označení uživatele místně?</translation>
</message>
<message>
<location filename="../qt-ui/webservices.ui" line="92"/>
@ -5439,7 +5439,7 @@ Jazyk: %1</translation>
<message>
<location filename="../qt-ui/models.cpp" line="1850"/>
<source>#</source>
<translation>Čís.</translation>
<translation>Číslo</translation>
</message>
<message>
<location filename="../qt-ui/models.cpp" line="1853"/>
@ -5531,7 +5531,7 @@ Průměr</translation>
<message>
<location filename="../dive.c" line="242"/>
<source>cuft</source>
<translation>cu st</translation>
<translation>cu stopa</translation>
</message>
<message>
<location filename="../dive.c" line="279"/>
@ -5539,7 +5539,7 @@ Průměr</translation>
<location filename="../qt-gui.cpp" line="237"/>
<location filename="../worldmap-save.c" line="44"/>
<source>m</source>
<translation>m</translation>
<translation> m</translation>
</message>
<message>
<location filename="../dive.c" line="284"/>
@ -5551,7 +5551,7 @@ Průměr</translation>
<message>
<location filename="../dive.c" line="307"/>
<source>m/min</source>
<translation>m/min</translation>
<translation> m/min</translation>
</message>
<message>
<location filename="../dive.c" line="309"/>
@ -5561,7 +5561,7 @@ Průměr</translation>
<message>
<location filename="../dive.c" line="314"/>
<source>ft/min</source>
<translation>st/min</translation>
<translation>stop/min</translation>
</message>
<message>
<location filename="../dive.c" line="316"/>
@ -5573,7 +5573,7 @@ Průměr</translation>
<location filename="../qt-gui.cpp" line="248"/>
<location filename="../qt-gui.cpp" line="258"/>
<source>lbs</source>
<translation>Libra US</translation>
<translation>libra US</translation>
</message>
<message>
<location filename="../dive.c" line="339"/>
@ -5922,7 +5922,7 @@ Průměr</translation>
<message>
<location filename="../libdivecomputer.c" line="721"/>
<source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source>
<translation type="unfinished"/>
<translation>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</translation>
</message>
<message>
<location filename="../libdivecomputer.c" line="785"/>
@ -6076,7 +6076,7 @@ Průměr</translation>
<message>
<location filename="../planner.c" line="548"/>
<source>based on GFlow = %d and GFhigh = %d</source>
<translation type="unfinished"/>
<translation>založeno na GFlow = %d a GFhigh = %d</translation>
</message>
<message>
<location filename="../planner.c" line="551"/>
@ -6132,7 +6132,7 @@ Průměr</translation>
<location filename="../planner.c" line="645"/>
<location filename="../planner.c" line="649"/>
<source>%3dmin</source>
<translation type="unfinished"/>
<translation>%3dmin</translation>
</message>
<message>
<location filename="../planner.c" line="658"/>
@ -6167,7 +6167,7 @@ Průměr</translation>
<message>
<location filename="../planner.c" line="712"/>
<source>Gas consumption:</source>
<translation type="unfinished"/>
<translation>Spotreba plynu:</translation>
</message>
<message>
<location filename="../planner.c" line="542"/>
@ -6326,21 +6326,21 @@ EADD: %d%s
<location filename="../profile.c" line="1171"/>
<source>Deco: %umin @ %.0f%s
</source>
<translation>Deco: %umin @ %.0f%s
<translation>Dekomprese: %umin @ %.0f%s
</translation>
</message>
<message>
<location filename="../profile.c" line="1174"/>
<source>Deco: unkn time @ %.0f%s
</source>
<translation>Deco: neznáma @ %.0f%s
<translation>Dekomprese: Neznámý čas @ %.0f%s
</translation>
</message>
<message>
<location filename="../profile.c" line="1178"/>
<source>In deco
</source>
<translation>In deco
<translation>Dekomprese
</translation>
</message>
<message>
@ -6361,14 +6361,14 @@ EADD: %d%s
<location filename="../profile.c" line="1186"/>
<source>Deco: %umin @ %.0f%s (calc)
</source>
<translation>Deco: %umin @ %.0f%s (calc)
<translation>Dekomprese: %umin @ %.0f%s (spočítáno)
</translation>
</message>
<message>
<location filename="../profile.c" line="1194"/>
<source>In deco (calc)
</source>
<translation>V deco (calc)
<translation>Dekomprese (spočítáno)
</translation>
</message>
<message>
@ -6567,7 +6567,7 @@ EADD: %d%s
<message>
<location filename="../dive.c" line="26"/>
<source>deco</source>
<translation>deco</translation>
<translation>dekomprese</translation>
</message>
<message>
<location filename="../dive.c" line="30"/>
@ -6588,7 +6588,7 @@ EADD: %d%s
<message>
<location filename="../dive.c" line="237"/>
<source>ℓ</source>
<translation>ℓ</translation>
<translation> ℓ</translation>
</message>
<message>
<location filename="../statistics.c" line="214"/>
@ -6960,7 +6960,7 @@ Is the Uemis Zurich plugged in correctly?</source>
<message>
<location filename="../save-html.c" line="455"/>
<source>Location</source>
<translation>Poloha</translation>
<translation>Místo</translation>
</message>
<message>
<location filename="../save-html.c" line="456"/>
@ -7155,7 +7155,7 @@ Is the Uemis Zurich plugged in correctly?</source>
<message>
<location filename="../save-html.c" line="495"/>
<source>Dive No.</source>
<translation>Potápění čís.</translation>
<translation>Číslo potápění</translation>
</message>
<message>
<location filename="../save-html.c" line="496"/>
@ -7246,7 +7246,7 @@ Is the Uemis Zurich plugged in correctly?</source>
<message>
<location filename="../worldmap-save.c" line="50"/>
<source>Location:</source>
<translation>Poloha:</translation>
<translation>Místo:</translation>
</message>
<message>
<location filename="../worldmap-save.c" line="54"/>
@ -7288,7 +7288,7 @@ Is the Uemis Zurich plugged in correctly?</source>
<message>
<location filename="../qt-ui/plannerSettings.ui" line="56"/>
<source>Rates</source>
<translation type="unfinished"/>
<translation>Rychlosti</translation>
</message>
<message>
<location filename="../qt-ui/plannerSettings.ui" line="77"/>
@ -7307,7 +7307,7 @@ Is the Uemis Zurich plugged in correctly?</source>
<location filename="../qt-ui/plannerSettings.ui" line="156"/>
<location filename="../qt-ui/plannerSettings.ui" line="202"/>
<source>m/min</source>
<translation>m/min</translation>
<translation> m/min</translation>
</message>
<message>
<location filename="../qt-ui/plannerSettings.ui" line="169"/>
@ -7327,7 +7327,7 @@ Is the Uemis Zurich plugged in correctly?</source>
<message>
<location filename="../qt-ui/plannerSettings.ui" line="281"/>
<source>GF low</source>
<translation>GF nízký</translation>
<translation>GFLow</translation>
</message>
<message>
<location filename="../qt-ui/plannerSettings.ui" line="268"/>
@ -7338,7 +7338,7 @@ Is the Uemis Zurich plugged in correctly?</source>
<message>
<location filename="../qt-ui/plannerSettings.ui" line="288"/>
<source>GF high</source>
<translation>GF vysoký</translation>
<translation>GFHigh</translation>
</message>
<message>
<location filename="../qt-ui/plannerSettings.ui" line="335"/>
@ -7353,7 +7353,7 @@ Is the Uemis Zurich plugged in correctly?</source>
<message>
<location filename="../qt-ui/plannerSettings.ui" line="295"/>
<source>Plan backgas breaks</source>
<translation>Plánovat přestávky na backgas</translation>
<translation>Plánovat vzduchové přestávky</translation>
</message>
<message>
<location filename="../qt-ui/plannerSettings.ui" line="355"/>
@ -7384,7 +7384,7 @@ Is the Uemis Zurich plugged in correctly?</source>
<location filename="../qt-ui/plannerSettings.ui" line="449"/>
<location filename="../qt-ui/plannerSettings.ui" line="462"/>
<source>ℓ/min</source>
<translation>ℓ/min</translation>
<translation> ℓ/min</translation>
</message>
<message>
<location filename="../qt-ui/plannerSettings.ui" line="478"/>
@ -7404,7 +7404,7 @@ Is the Uemis Zurich plugged in correctly?</source>
<message>
<location filename="../qt-ui/plannerSettings.ui" line="531"/>
<source>Display transitions in deco</source>
<translation>Zobrazit přechody mezi deco zastávkami</translation>
<translation>Zobrazit přechody mezi zastaveními dekomprese</translation>
</message>
<message>
<location filename="../qt-ui/plannerSettings.ui" line="538"/>

2
translations/subsurface_ru_RU.ts
View file

@ -7181,7 +7181,7 @@ Is the Uemis Zurich plugged in correctly?</source>
<message>
<location filename="../save-html.c" line="495"/>
<source>Dive No.</source>
<translation>№ погружения</translation>
<translation>Погружение № </translation>
</message>
<message>
<location filename="../save-html.c" line="496"/>

38
xslt/DiveLog.xslt
View file

@ -2,17 +2,31 @@
<xsl:strip-space elements="*"/>
<xsl:output method="xml" indent="yes"/>
<xsl:key name="DC" match="dive" use="concat(@ComputerID, ':', @Computer)"/>
<xsl:template match="/">
<divelog program='subsurface-import' version='2'>
<settings>
<divecomputerid deviceid="ffffffff">
<!-- Using the serial number as device ID for now. Once we have
a change to get some testing done, we can jump on using
extension that provides sha1 function.
+ xmlns:crypto="http://exslt.org/crypto"
+ extension-element-prefixes="crypto"
+ <divecomputerid deviceid="{substring(crypto:sha1(concat(@ComputerID, ':', @Computer)), 1, 8)}">
-->
<xsl:for-each select="logbook/dive[generate-id() = generate-id(key('DC',concat(@ComputerID, ':', @Computer))[1])]">
<divecomputerid deviceid="{@ComputerID}">
<xsl:attribute name="model">
<xsl:value-of select="logbook/@program"/>
<xsl:value-of select="@Computer"/>
</xsl:attribute>
<xsl:attribute name="serial">
<xsl:value-of select="logbook/@serialNumber"/>
<xsl:value-of select="@ComputerID"/>
</xsl:attribute>
</divecomputerid>
</xsl:for-each>
</settings>
<dives>
<xsl:apply-templates select="/logbook"/>
@ -62,6 +76,9 @@
<notes>
<xsl:value-of select="notes"/>
<xsl:value-of select="concat($lf, 'Weather: ', @Weather, $lf, 'Visibility: ', @Visibility)"/>
<xsl:if test="@Boat != '' and @Boat != ' '">
<xsl:value-of select="concat($lf, 'Boat: ', @Boat)"/>
</xsl:if>
</notes>
<cylinder>
@ -111,7 +128,7 @@
</xsl:if>
</cylinder>
<xsl:if test="@Weight != ''">
<xsl:if test="@Weight != '' and @Weight != '0.0'">
<weightsystem>
<xsl:attribute name="weight">
<xsl:call-template name="weightConvert">
@ -133,11 +150,22 @@
<xsl:value-of select="@DiveMaster"/>
</divemaster>
<divecomputer deviceid="ffffffff">
<divecomputer deviceid="{@ComputerID}">
<xsl:attribute name="model">
<xsl:value-of select="@Computer"/>
</xsl:attribute>
<extradata key="Sample Interval" value="{@SampleInterval}"/>
<xsl:if test="@AltitudeMode != ''">
<extradata key="Altitude Mode" value="{@AltitudeMode}"/>
</xsl:if>
<xsl:if test="@PersonalMode != ''">
<extradata key="Personal Mode" value="{@PersonalMode}"/>
</xsl:if>
<depth>
<xsl:attribute name="max">
<xsl:call-template name="depthConvert">