diff options
author | Dirk Hohndel <dirk@hohndel.org> | 2015-10-23 22:50:28 +0900 |
---|---|---|
committer | Dirk Hohndel <dirk@hohndel.org> | 2015-10-23 22:50:28 +0900 |
commit | 6703e1091bba453eb7e62dbfe2e2b3bf790776db (patch) | |
tree | 9f22ecd5bfb4d966c5c0d9f14d27fbafae7272eb /translations/subsurface_source.ts | |
parent | 604971ca0c83e8d3993aed04261443692122109e (diff) | |
download | subsurface-6703e1091bba453eb7e62dbfe2e2b3bf790776db.tar.gz |
Latest strings for translations
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'translations/subsurface_source.ts')
-rw-r--r-- | translations/subsurface_source.ts | 685 |
1 files changed, 351 insertions, 334 deletions
diff --git a/translations/subsurface_source.ts b/translations/subsurface_source.ts index 127ede480..a328b6757 100644 --- a/translations/subsurface_source.ts +++ b/translations/subsurface_source.ts @@ -260,12 +260,12 @@ <context> <name>BuddyFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="613"/> + <location filename="../qt-ui/simplewidgets.cpp" line="612"/> <source>Person: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="614"/> + <location filename="../qt-ui/simplewidgets.cpp" line="613"/> <source>Searches for buddies and divemasters</source> <translation type="unfinished"></translation> </message> @@ -1716,17 +1716,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="124"/> + <location filename="../qt-models/cylindermodel.cpp" line="132"/> <source>Clicking here will remove this cylinder.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="342"/> + <location filename="../qt-models/cylindermodel.cpp" line="350"/> <source>Cylinder cannot be removed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="343"/> + <location filename="../qt-models/cylindermodel.cpp" line="351"/> <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source> <translation type="unfinished"></translation> </message> @@ -1898,104 +1898,6 @@ </message> </context> <context> - <name>DiveItem</name> - <message> - <location filename="../qt-models/divetripmodel.cpp" line="192"/> - <source>#</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../qt-models/divetripmodel.cpp" line="195"/> - <source>Date</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../qt-models/divetripmodel.cpp" line="198"/> - <source>Rating</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../qt-models/divetripmodel.cpp" line="201"/> - <source>Depth(%1)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../qt-models/divetripmodel.cpp" line="201"/> - <source>m</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../qt-models/divetripmodel.cpp" line="201"/> - <source>ft</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../qt-models/divetripmodel.cpp" line="204"/> - <source>Duration</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../qt-models/divetripmodel.cpp" line="207"/> - <source>Temp(%1%2)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../qt-models/divetripmodel.cpp" line="210"/> - <source>Weight(%1)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../qt-models/divetripmodel.cpp" line="210"/> - <source>kg</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../qt-models/divetripmodel.cpp" line="210"/> - <source>lbs</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../qt-models/divetripmodel.cpp" line="213"/> - <source>Suit</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../qt-models/divetripmodel.cpp" line="216"/> - <source>Cyl</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../qt-models/divetripmodel.cpp" line="219"/> - <source>Gas</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../qt-models/divetripmodel.cpp" line="224"/> - <source>SAC(%1)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../qt-models/divetripmodel.cpp" line="224"/> - <source>/min</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../qt-models/divetripmodel.cpp" line="227"/> - <source>OTU</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../qt-models/divetripmodel.cpp" line="230"/> - <source>Max CNS</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../qt-models/divetripmodel.cpp" line="233"/> - <source>Location</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> <name>DiveListView</name> <message> <location filename="../qt-ui/divelistview.cpp" line="845"/> @@ -2096,12 +1998,12 @@ <context> <name>DiveLocationModel</name> <message> - <location filename="../qt-ui/locationinformation.cpp" line="323"/> + <location filename="../qt-ui/locationinformation.cpp" line="327"/> <source>Create a new dive site, copying relevant information from the current dive.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/locationinformation.cpp" line="324"/> + <location filename="../qt-ui/locationinformation.cpp" line="328"/> <source>Create a new dive site with this name</source> <translation type="unfinished"></translation> </message> @@ -2787,32 +2689,32 @@ <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="129"/> + <location filename="../qt-models/diveplannermodel.cpp" line="134"/> <source>unknown</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="306"/> + <location filename="../qt-models/diveplannermodel.cpp" line="311"/> <source>Final depth</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="308"/> + <location filename="../qt-models/diveplannermodel.cpp" line="313"/> <source>Run time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="310"/> + <location filename="../qt-models/diveplannermodel.cpp" line="315"/> <source>Duration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="312"/> + <location filename="../qt-models/diveplannermodel.cpp" line="317"/> <source>Used gas</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="314"/> + <location filename="../qt-models/diveplannermodel.cpp" line="319"/> <source>CC setpoint</source> <translation type="unfinished"></translation> </message> @@ -3017,127 +2919,127 @@ p, li { white-space: pre-wrap; } <context> <name>DiveTripModel</name> <message> - <location filename="../qt-models/divetripmodel.cpp" line="393"/> - <location filename="../qt-models/divetripmodel.cpp" line="439"/> + <location filename="../qt-models/divetripmodel.cpp" line="395"/> + <location filename="../qt-models/divetripmodel.cpp" line="441"/> <source>#</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="396"/> - <location filename="../qt-models/divetripmodel.cpp" line="442"/> + <location filename="../qt-models/divetripmodel.cpp" line="398"/> + <location filename="../qt-models/divetripmodel.cpp" line="444"/> <source>Date</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="399"/> - <location filename="../qt-models/divetripmodel.cpp" line="445"/> + <location filename="../qt-models/divetripmodel.cpp" line="401"/> + <location filename="../qt-models/divetripmodel.cpp" line="447"/> <source>Rating</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="402"/> + <location filename="../qt-models/divetripmodel.cpp" line="404"/> <source>Depth</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="408"/> + <location filename="../qt-models/divetripmodel.cpp" line="410"/> <source>Temp</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="411"/> + <location filename="../qt-models/divetripmodel.cpp" line="413"/> <source>Weight</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="423"/> + <location filename="../qt-models/divetripmodel.cpp" line="425"/> <source>SAC</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="448"/> + <location filename="../qt-models/divetripmodel.cpp" line="450"/> <source>m</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="448"/> + <location filename="../qt-models/divetripmodel.cpp" line="450"/> <source>ft</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="457"/> + <location filename="../qt-models/divetripmodel.cpp" line="459"/> <source>Weight(%1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="414"/> - <location filename="../qt-models/divetripmodel.cpp" line="460"/> + <location filename="../qt-models/divetripmodel.cpp" line="416"/> + <location filename="../qt-models/divetripmodel.cpp" line="462"/> <source>Suit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="417"/> - <location filename="../qt-models/divetripmodel.cpp" line="463"/> + <location filename="../qt-models/divetripmodel.cpp" line="419"/> + <location filename="../qt-models/divetripmodel.cpp" line="465"/> <source>Cyl</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="420"/> - <location filename="../qt-models/divetripmodel.cpp" line="466"/> + <location filename="../qt-models/divetripmodel.cpp" line="422"/> + <location filename="../qt-models/divetripmodel.cpp" line="468"/> <source>Gas</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="471"/> + <location filename="../qt-models/divetripmodel.cpp" line="473"/> <source>SAC(%1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="471"/> + <location filename="../qt-models/divetripmodel.cpp" line="473"/> <source>/min</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="429"/> - <location filename="../qt-models/divetripmodel.cpp" line="477"/> + <location filename="../qt-models/divetripmodel.cpp" line="431"/> + <location filename="../qt-models/divetripmodel.cpp" line="479"/> <source>Max CNS</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="432"/> - <location filename="../qt-models/divetripmodel.cpp" line="480"/> + <location filename="../qt-models/divetripmodel.cpp" line="434"/> + <location filename="../qt-models/divetripmodel.cpp" line="482"/> <source>Location</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="457"/> + <location filename="../qt-models/divetripmodel.cpp" line="459"/> <source>kg</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="448"/> + <location filename="../qt-models/divetripmodel.cpp" line="450"/> <source>Depth(%1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="405"/> - <location filename="../qt-models/divetripmodel.cpp" line="451"/> + <location filename="../qt-models/divetripmodel.cpp" line="407"/> + <location filename="../qt-models/divetripmodel.cpp" line="453"/> <source>Duration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="454"/> + <location filename="../qt-models/divetripmodel.cpp" line="456"/> <source>Temp(%1%2)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="457"/> + <location filename="../qt-models/divetripmodel.cpp" line="459"/> <source>lbs</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="426"/> - <location filename="../qt-models/divetripmodel.cpp" line="474"/> + <location filename="../qt-models/divetripmodel.cpp" line="428"/> + <location filename="../qt-models/divetripmodel.cpp" line="476"/> <source>OTU</source> <translation type="unfinished"></translation> </message> @@ -3527,7 +3429,7 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="640"/> + <location filename="../qt-ui/simplewidgets.cpp" line="639"/> <source>Location: </source> <translation type="unfinished"></translation> </message> @@ -3653,7 +3555,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/locationinformation.cpp" line="31"/> - <location filename="../qt-ui/locationinformation.cpp" line="216"/> + <location filename="../qt-ui/locationinformation.cpp" line="217"/> <source>Dive site management</source> <translation type="unfinished"></translation> </message> @@ -3674,7 +3576,7 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/locationinformation.cpp" line="223"/> + <location filename="../qt-ui/locationinformation.cpp" line="224"/> <source>You are editing a dive site</source> <translation type="unfinished"></translation> </message> @@ -3984,6 +3886,26 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"></translation> </message> <message> + <location filename="../qt-ui/maintab.cpp" line="98"/> + <source>OC</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/maintab.cpp" line="98"/> + <source>CCR</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/maintab.cpp" line="98"/> + <source>pSCR</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/maintab.cpp" line="98"/> + <source>Freedive</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../qt-ui/maintab.cpp" line="307"/> <source>Air temp. [%1]</source> <translation type="unfinished"></translation> @@ -4021,91 +3943,91 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/maintab.cpp" line="606"/> - <location filename="../qt-ui/maintab.cpp" line="638"/> <location filename="../qt-ui/maintab.cpp" line="642"/> <location filename="../qt-ui/maintab.cpp" line="646"/> + <location filename="../qt-ui/maintab.cpp" line="650"/> <source>/min</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="635"/> + <location filename="../qt-ui/maintab.cpp" line="639"/> <source>Deepest dive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="636"/> + <location filename="../qt-ui/maintab.cpp" line="640"/> <source>Shallowest dive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="649"/> + <location filename="../qt-ui/maintab.cpp" line="653"/> <source>Highest total SAC of a dive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="650"/> + <location filename="../qt-ui/maintab.cpp" line="654"/> <source>Lowest total SAC of a dive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="651"/> + <location filename="../qt-ui/maintab.cpp" line="655"/> <source>Average total SAC of all selected dives</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="662"/> + <location filename="../qt-ui/maintab.cpp" line="666"/> <source>Highest temperature</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="663"/> + <location filename="../qt-ui/maintab.cpp" line="667"/> <source>Lowest temperature</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="664"/> + <location filename="../qt-ui/maintab.cpp" line="668"/> <source>Average temperature of all selected dives</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="674"/> + <location filename="../qt-ui/maintab.cpp" line="678"/> <source>Longest dive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="675"/> + <location filename="../qt-ui/maintab.cpp" line="679"/> <source>Shortest dive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="676"/> + <location filename="../qt-ui/maintab.cpp" line="680"/> <source>Average length of all selected dives</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="700"/> + <location filename="../qt-ui/maintab.cpp" line="704"/> <source>These gases could be mixed from Air and using: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="704"/> + <location filename="../qt-ui/maintab.cpp" line="708"/> <source> and </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="834"/> + <location filename="../qt-ui/maintab.cpp" line="838"/> <source>New dive site</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="1128"/> + <location filename="../qt-ui/maintab.cpp" line="1132"/> <source>Discard the changes?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="1129"/> + <location filename="../qt-ui/maintab.cpp" line="1133"/> <source>You are about to discard your changes.</source> <translation type="unfinished"></translation> </message> @@ -4258,7 +4180,7 @@ mixed from Air and using: <message> <location filename="../qt-ui/mainwindow.ui" line="171"/> <location filename="../build/ui_mainwindow.h" line="460"/> - <location filename="../qt-ui/mainwindow.cpp" line="362"/> + <location filename="../qt-ui/mainwindow.cpp" line="407"/> <source>Open</source> <translation type="unfinished"></translation> </message> @@ -4511,7 +4433,7 @@ mixed from Air and using: <message> <location filename="../qt-ui/mainwindow.ui" line="698"/> <location filename="../build/ui_mainwindow.h" line="560"/> - <location filename="../qt-ui/mainwindow.cpp" line="226"/> + <location filename="../qt-ui/mainwindow.cpp" line="225"/> <source>&Undo</source> <translation type="unfinished"></translation> </message> @@ -4524,7 +4446,7 @@ mixed from Air and using: <message> <location filename="../qt-ui/mainwindow.ui" line="706"/> <location filename="../build/ui_mainwindow.h" line="562"/> - <location filename="../qt-ui/mainwindow.cpp" line="227"/> + <location filename="../qt-ui/mainwindow.cpp" line="226"/> <source>&Redo</source> <translation type="unfinished"></translation> </message> @@ -4759,143 +4681,143 @@ mixed from Air and using: <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="359"/> + <location filename="../qt-ui/mainwindow.cpp" line="404"/> <source>Open file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="363"/> - <location filename="../qt-ui/mainwindow.cpp" line="468"/> - <location filename="../qt-ui/mainwindow.cpp" line="1853"/> + <location filename="../qt-ui/mainwindow.cpp" line="408"/> + <location filename="../qt-ui/mainwindow.cpp" line="513"/> + <location filename="../qt-ui/mainwindow.cpp" line="1903"/> <source>Cancel</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="464"/> + <location filename="../qt-ui/mainwindow.cpp" line="509"/> <source>Traverse image directories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="467"/> + <location filename="../qt-ui/mainwindow.cpp" line="512"/> <source>Scan</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="475"/> + <location filename="../qt-ui/mainwindow.cpp" line="520"/> <source>Scanning images...(this can take a while)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="528"/> + <location filename="../qt-ui/mainwindow.cpp" line="573"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="646"/> + <location filename="../qt-ui/mainwindow.cpp" line="691"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="697"/> + <location filename="../qt-ui/mainwindow.cpp" line="743"/> <source>Print runtime table</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="802"/> + <location filename="../qt-ui/mainwindow.cpp" line="849"/> <source>Trying to edit a dive that's not a manually added dive.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1060"/> + <location filename="../qt-ui/mainwindow.cpp" line="1110"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1063"/> + <location filename="../qt-ui/mainwindow.cpp" line="1113"/> <source>Do you want to save the changes that you made in the data file?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1068"/> + <location filename="../qt-ui/mainwindow.cpp" line="1118"/> <source>Save changes?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1435"/> + <location filename="../qt-ui/mainwindow.cpp" line="1485"/> <source>Save file as</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1530"/> + <location filename="../qt-ui/mainwindow.cpp" line="1580"/> <source>[cloud storage for] %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1630"/> + <location filename="../qt-ui/mainwindow.cpp" line="1680"/> <source>Opening datafile from older version</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1631"/> + <location filename="../qt-ui/mainwindow.cpp" line="1681"/> <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly. Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1642"/> + <location filename="../qt-ui/mainwindow.cpp" line="1692"/> <source>Open dive log file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1643"/> + <location filename="../qt-ui/mainwindow.cpp" line="1693"/> <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;All files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1853"/> + <location filename="../qt-ui/mainwindow.cpp" line="1903"/> <source>Contacting cloud service...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1069"/> + <location filename="../qt-ui/mainwindow.cpp" line="1119"/> <source>Changes will be lost if you don't save them.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="503"/> - <location filename="../qt-ui/mainwindow.cpp" line="646"/> - <location filename="../qt-ui/mainwindow.cpp" line="725"/> - <location filename="../qt-ui/mainwindow.cpp" line="796"/> - <location filename="../qt-ui/mainwindow.cpp" line="802"/> - <location filename="../qt-ui/mainwindow.cpp" line="1688"/> + <location filename="../qt-ui/mainwindow.cpp" line="548"/> + <location filename="../qt-ui/mainwindow.cpp" line="691"/> + <location filename="../qt-ui/mainwindow.cpp" line="771"/> + <location filename="../qt-ui/mainwindow.cpp" line="843"/> + <location filename="../qt-ui/mainwindow.cpp" line="849"/> + <location filename="../qt-ui/mainwindow.cpp" line="1738"/> <source>Warning</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="353"/> <location filename="../qt-ui/mainwindow.cpp" line="398"/> - <location filename="../qt-ui/mainwindow.cpp" line="1408"/> + <location filename="../qt-ui/mainwindow.cpp" line="443"/> + <location filename="../qt-ui/mainwindow.cpp" line="1458"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="725"/> + <location filename="../qt-ui/mainwindow.cpp" line="771"/> <source>Trying to replan a dive that's not a planned dive.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="849"/> + <location filename="../qt-ui/mainwindow.cpp" line="896"/> <source>Yearly statistics</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1436"/> + <location filename="../qt-ui/mainwindow.cpp" line="1486"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="796"/> - <location filename="../qt-ui/mainwindow.cpp" line="1688"/> + <location filename="../qt-ui/mainwindow.cpp" line="843"/> + <location filename="../qt-ui/mainwindow.cpp" line="1738"/> <source>Please, first finish the current edition before trying to do another.</source> <translation type="unfinished"></translation> </message> @@ -4913,7 +4835,7 @@ Subsurface has already tried to pre-populate the data but it might be worth whil <context> <name>MultiFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="725"/> + <location filename="../qt-ui/simplewidgets.cpp" line="724"/> <source>Filter shows %1 (of %2) dives</source> <translation type="unfinished"></translation> </message> @@ -6029,12 +5951,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a <context> <name>QObject</name> <message> - <location filename="../qthelper.cpp" line="1255"/> + <location filename="../qthelper.cpp" line="1310"/> <source>AIR</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qthelper.cpp" line="1255"/> + <location filename="../qthelper.cpp" line="1310"/> <source>OXYGEN</source> <translation type="unfinished"></translation> </message> @@ -6074,42 +5996,53 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a <translation type="unfinished"></translation> </message> <message> - <location filename="../qthelper.cpp" line="1269"/> + <location filename="../qthelper.cpp" line="1072"/> + <location filename="../qthelper.cpp" line="1074"/> + <source>(%1 dives)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qthelper.cpp" line="1077"/> + <source>(1 dive)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qthelper.cpp" line="1324"/> <source>kg</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qthelper.cpp" line="1270"/> + <location filename="../qthelper.cpp" line="1325"/> <source>lbs</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qthelper.cpp" line="1293"/> + <location filename="../qthelper.cpp" line="1348"/> <source>ft</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qthelper.cpp" line="1294"/> + <location filename="../qthelper.cpp" line="1349"/> <source>m</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qthelper.cpp" line="1316"/> + <location filename="../qthelper.cpp" line="1371"/> <source>psi</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qthelper.cpp" line="1317"/> + <location filename="../qthelper.cpp" line="1372"/> <source>bar</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qthelper.cpp" line="1339"/> + <location filename="../qthelper.cpp" line="1394"/> <source>l</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qthelper.cpp" line="1340"/> + <location filename="../qthelper.cpp" line="1395"/> <source>cuft</source> <translation type="unfinished"></translation> </message> @@ -6577,7 +6510,7 @@ Not all images have timestamps in the range between <context> <name>SuitFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="666"/> + <location filename="../qt-ui/simplewidgets.cpp" line="665"/> <source>Suits: </source> <translation type="unfinished"></translation> </message> @@ -6604,7 +6537,7 @@ Not all images have timestamps in the range between <context> <name>TagFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="587"/> + <location filename="../qt-ui/simplewidgets.cpp" line="586"/> <source>Tags: </source> <translation type="unfinished"></translation> </message> @@ -6798,16 +6731,10 @@ Not all images have timestamps in the range between <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/templateedit.cpp" line="135"/> + <location filename="../qt-ui/templateedit.cpp" line="133"/> <source>Do you want to save your changes?</source> <translation type="unfinished"></translation> </message> - <message> - <location filename="../qt-ui/templateedit.cpp" line="140"/> - <source>You are about to modify a template bundled with Subsurface. -</source> - <translation type="unfinished"></translation> - </message> </context> <context> <name>TestParse</name> @@ -6891,10 +6818,105 @@ Not all images have timestamps in the range between <context> <name>TripItem</name> <message> - <location filename="../qt-models/divetripmodel.cpp" line="65"/> + <location filename="../qt-models/divetripmodel.cpp" line="67"/> <source>(%1 shown)</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="194"/> + <source>#</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="197"/> + <source>Date</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="200"/> + <source>Rating</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="203"/> + <source>Depth(%1)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="203"/> + <source>m</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="203"/> + <source>ft</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="206"/> + <source>Duration</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="209"/> + <source>Temp(%1%2)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="212"/> + <source>Weight(%1)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="212"/> + <source>kg</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="212"/> + <source>lbs</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="215"/> + <source>Suit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="218"/> + <source>Cyl</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="221"/> + <source>Gas</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="226"/> + <source>SAC(%1)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="226"/> + <source>/min</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="229"/> + <source>OTU</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="232"/> + <source>Max CNS</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="235"/> + <source>Location</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>URLDialog</name> @@ -6992,8 +7014,8 @@ Not all images have timestamps in the range between <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/usermanual.cpp" line="71"/> - <location filename="../qt-ui/usermanual.cpp" line="77"/> + <location filename="../qt-ui/usermanual.cpp" line="74"/> + <location filename="../qt-ui/usermanual.cpp" line="80"/> <source>Cannot find the Subsurface manual</source> <translation type="unfinished"></translation> </message> @@ -7394,7 +7416,7 @@ Maximum</source> <context> <name>getextFromC</name> <message> - <location filename="../libdivecomputer.c" line="641"/> + <location filename="../libdivecomputer.c" line="674"/> <source>Error parsing the header</source> <translation type="unfinished"></translation> </message> @@ -7473,7 +7495,7 @@ Maximum</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../dive.c" line="1579"/> + <location filename="../dive.c" line="1580"/> <source>(%s) or (%s)</source> <translation type="unfinished"></translation> </message> @@ -7577,7 +7599,7 @@ Maximum</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="165"/> + <location filename="../libdivecomputer.c" line="198"/> <source>none</source> <translation type="unfinished"></translation> </message> @@ -7585,7 +7607,7 @@ Maximum</source> <location filename="../cochran.c" line="306"/> <location filename="../cochran.c" line="312"/> <location filename="../cochran.c" line="382"/> - <location filename="../libdivecomputer.c" line="165"/> + <location filename="../libdivecomputer.c" line="198"/> <source>deco stop</source> <translation type="unfinished"></translation> </message> @@ -7598,7 +7620,7 @@ Maximum</source> <message> <location filename="../cochran.c" line="367"/> <location filename="../cochran.c" line="406"/> - <location filename="../libdivecomputer.c" line="165"/> + <location filename="../libdivecomputer.c" line="198"/> <source>rbt</source> <translation type="unfinished"></translation> </message> @@ -7606,45 +7628,45 @@ Maximum</source> <location filename="../cochran.c" line="333"/> <location filename="../cochran.c" line="387"/> <location filename="../file.c" line="721"/> - <location filename="../libdivecomputer.c" line="165"/> + <location filename="../libdivecomputer.c" line="198"/> <source>ascent</source> <translation type="unfinished"></translation> </message> <message> <location filename="../cochran.c" line="376"/> <location filename="../cochran.c" line="423"/> - <location filename="../libdivecomputer.c" line="165"/> + <location filename="../libdivecomputer.c" line="198"/> <source>ceiling</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="165"/> + <location filename="../libdivecomputer.c" line="198"/> <source>workload</source> <translation type="unfinished"></translation> </message> <message> <location filename="../cochran.c" line="392"/> - <location filename="../libdivecomputer.c" line="166"/> + <location filename="../libdivecomputer.c" line="199"/> <source>transmitter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="166"/> + <location filename="../libdivecomputer.c" line="199"/> <source>violation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="166"/> + <location filename="../libdivecomputer.c" line="199"/> <source>bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="166"/> + <location filename="../libdivecomputer.c" line="199"/> <source>surface</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="166"/> + <location filename="../libdivecomputer.c" line="199"/> <source>safety stop</source> <translation type="unfinished"></translation> </message> @@ -7653,193 +7675,193 @@ Maximum</source> <location filename="../cochran.c" line="411"/> <location filename="../cochran.c" line="418"/> <location filename="../file.c" line="812"/> - <location filename="../libdivecomputer.c" line="167"/> - <location filename="../libdivecomputer.c" line="170"/> + <location filename="../libdivecomputer.c" line="200"/> + <location filename="../libdivecomputer.c" line="203"/> <source>gaschange</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="167"/> + <location filename="../libdivecomputer.c" line="200"/> <source>safety stop (voluntary)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="167"/> + <location filename="../libdivecomputer.c" line="200"/> <source>safety stop (mandatory)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="168"/> + <location filename="../libdivecomputer.c" line="201"/> <source>deepstop</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="168"/> + <location filename="../libdivecomputer.c" line="201"/> <source>ceiling (safety stop)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="168"/> + <location filename="../libdivecomputer.c" line="201"/> <source>divetime</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="168"/> + <location filename="../libdivecomputer.c" line="201"/> <source>below floor</source> <comment>event showing dive is below deco floor and adding deco time</comment> <translation type="unfinished"></translation> </message> <message> <location filename="../cochran.c" line="350"/> - <location filename="../libdivecomputer.c" line="169"/> + <location filename="../libdivecomputer.c" line="202"/> <source>maxdepth</source> <translation type="unfinished"></translation> </message> <message> <location filename="../cochran.c" line="345"/> - <location filename="../libdivecomputer.c" line="169"/> + <location filename="../libdivecomputer.c" line="202"/> <source>OLF</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="169"/> + <location filename="../libdivecomputer.c" line="202"/> <source>airtime</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="169"/> + <location filename="../libdivecomputer.c" line="202"/> <source>rgbm</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="169"/> + <location filename="../libdivecomputer.c" line="202"/> <source>heading</source> <translation type="unfinished"></translation> </message> <message> <location filename="../cochran.c" line="355"/> <location filename="../cochran.c" line="401"/> - <location filename="../libdivecomputer.c" line="169"/> + <location filename="../libdivecomputer.c" line="202"/> <source>pO₂</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="170"/> + <location filename="../libdivecomputer.c" line="203"/> <source>tissue level warning</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="170"/> + <location filename="../libdivecomputer.c" line="203"/> <source>non stop time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="187"/> + <location filename="../libdivecomputer.c" line="220"/> <source>invalid event number</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="625"/> + <location filename="../libdivecomputer.c" line="658"/> <source>Unable to create parser for %s %s</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="631"/> + <location filename="../libdivecomputer.c" line="664"/> <source>Error registering the data</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="462"/> + <location filename="../libdivecomputer.c" line="495"/> <source>Error parsing the datetime</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="480"/> + <location filename="../libdivecomputer.c" line="513"/> <source>Dive %d: %s</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="486"/> + <location filename="../libdivecomputer.c" line="519"/> <source>Error parsing the divetime</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="496"/> + <location filename="../libdivecomputer.c" line="529"/> <source>Error parsing the maxdepth</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="515"/> + <location filename="../libdivecomputer.c" line="548"/> <source>Error parsing temperature</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="535"/> + <location filename="../libdivecomputer.c" line="568"/> <source>Error parsing the gas mix count</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="547"/> + <location filename="../libdivecomputer.c" line="580"/> <source>Error obtaining water salinity</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="556"/> + <location filename="../libdivecomputer.c" line="589"/> <source>Error obtaining surface pressure</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="581"/> + <location filename="../libdivecomputer.c" line="614"/> <source>Error obtaining divemode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="601"/> + <location filename="../libdivecomputer.c" line="634"/> <source>Error parsing the gas mix</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="651"/> + <location filename="../libdivecomputer.c" line="684"/> <source>Error parsing the samples</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="788"/> + <location filename="../libdivecomputer.c" line="821"/> <source>Event: waiting for user action</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="796"/> + <location filename="../libdivecomputer.c" line="829"/> <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="860"/> + <location filename="../libdivecomputer.c" line="893"/> <source>Error registering the event handler.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="865"/> + <location filename="../libdivecomputer.c" line="898"/> <source>Error registering the cancellation handler.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="886"/> + <location filename="../libdivecomputer.c" line="919"/> <source>Dive data import error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="925"/> + <location filename="../libdivecomputer.c" line="958"/> <source>Unable to create libdivecomputer context</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="932"/> + <location filename="../libdivecomputer.c" line="965"/> <source>Unable to open %s %s (%s)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="956"/> + <location filename="../libdivecomputer.c" line="989"/> <source>Insufficient privileges to open the device %s %s (%s)</source> <translation type="unfinished"></translation> </message> @@ -8049,225 +8071,225 @@ Maximum</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1126"/> + <location filename="../profile.c" line="1133"/> <source>@: %d:%02d D: %.1f%s </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1129"/> + <location filename="../profile.c" line="1136"/> <source>P: %d%s </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1133"/> + <location filename="../profile.c" line="1140"/> <source>T: %.1f%s </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1139"/> + <location filename="../profile.c" line="1146"/> <source>V: %.1f%s </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1142"/> + <location filename="../profile.c" line="1149"/> <source>SAC: %.*f%s/min </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1144"/> + <location filename="../profile.c" line="1151"/> <source>CNS: %u%% </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1146"/> + <location filename="../profile.c" line="1153"/> <source>pO%s: %.2fbar </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1148"/> + <location filename="../profile.c" line="1155"/> <source>pN%s: %.2fbar </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1150"/> + <location filename="../profile.c" line="1157"/> <source>pHe: %.2fbar </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1153"/> + <location filename="../profile.c" line="1160"/> <source>MOD: %d%s </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1160"/> + <location filename="../profile.c" line="1167"/> <source>EAD: %d%s EADD: %d%s </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1164"/> + <location filename="../profile.c" line="1171"/> <source>END: %d%s EADD: %d%s </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1176"/> + <location filename="../profile.c" line="1184"/> <source>Safetystop: %umin @ %.0f%s </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1179"/> + <location filename="../profile.c" line="1187"/> <source>Safetystop: unkn time @ %.0f%s </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1184"/> + <location filename="../profile.c" line="1192"/> <source>Deco: %umin @ %.0f%s </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1187"/> + <location filename="../profile.c" line="1195"/> <source>Deco: unkn time @ %.0f%s </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1191"/> + <location filename="../profile.c" line="1199"/> <source>In deco </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1193"/> + <location filename="../profile.c" line="1201"/> <source>NDL: %umin </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1196"/> + <location filename="../profile.c" line="1204"/> <source>TTS: %umin </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1199"/> + <location filename="../profile.c" line="1207"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1207"/> + <location filename="../profile.c" line="1215"/> <source>In deco (calc) </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1210"/> + <location filename="../profile.c" line="1218"/> <source>NDL: %umin (calc) </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1212"/> + <location filename="../profile.c" line="1220"/> <source>NDL: >2h (calc) </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1216"/> + <location filename="../profile.c" line="1224"/> <source>TTS: %umin (calc) </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1218"/> + <location filename="../profile.c" line="1226"/> <source>TTS: >2h (calc) </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1221"/> + <location filename="../profile.c" line="1229"/> <source>RBT: %umin </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1224"/> + <location filename="../profile.c" line="1232"/> <source>Calculated ceiling %.0f%s </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1230"/> + <location filename="../profile.c" line="1238"/> <source>Tissue %.0fmin: %.1f%s </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1236"/> + <location filename="../profile.c" line="1244"/> <source>heartbeat: %d </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1238"/> + <location filename="../profile.c" line="1246"/> <source>bearing: %d </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1241"/> + <location filename="../profile.c" line="1249"/> <source>mean depth to here %.1f%s </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1336"/> + <location filename="../profile.c" line="1344"/> <source>%sT: %d:%02d min</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1340"/> - <location filename="../profile.c" line="1344"/> <location filename="../profile.c" line="1348"/> + <location filename="../profile.c" line="1352"/> + <location filename="../profile.c" line="1356"/> <source>%s %sD:%.1f%s</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1352"/> + <location filename="../profile.c" line="1360"/> <source>%s %sD:%.1f%s </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1356"/> + <location filename="../profile.c" line="1364"/> <source>%s%sV:%.2f%s</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1360"/> - <location filename="../profile.c" line="1364"/> + <location filename="../profile.c" line="1368"/> + <location filename="../profile.c" line="1372"/> <source>%s %sV:%.2f%s</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1371"/> + <location filename="../profile.c" line="1379"/> <source>%s %sP:%d %s</source> <translation type="unfinished"></translation> </message> @@ -8302,16 +8324,6 @@ EADD: %d%s <translation type="unfinished"></translation> </message> <message> - <location filename="../qthelper.cpp" line="1019"/> - <source>%1 %2 (%3 dives)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../qthelper.cpp" line="1024"/> - <source>%1 %2 (1 dive)</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../dive.c" line="23"/> <source>boat</source> <translation type="unfinished"></translation> @@ -8585,42 +8597,47 @@ EADD: %d%s <translation type="unfinished"></translation> </message> <message> - <location filename="../statistics.c" line="220"/> + <location filename="../statistics.c" line="221"/> <source>%dd %dh %dmin</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../statistics.c" line="222"/> + <location filename="../statistics.c" line="224"/> + <source>%dmin %dsecs</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../statistics.c" line="226"/> <source>%dh %dmin</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../statistics.c" line="234"/> + <location filename="../statistics.c" line="238"/> <source>for dives #</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../statistics.c" line="240"/> + <location filename="../statistics.c" line="244"/> <source>for selected dives</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../statistics.c" line="275"/> + <location filename="../statistics.c" line="279"/> <source>for dive #%d</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../statistics.c" line="277"/> + <location filename="../statistics.c" line="281"/> <source>for selected dive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../statistics.c" line="279"/> + <location filename="../statistics.c" line="283"/> <source>for all dives</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../statistics.c" line="281"/> + <location filename="../statistics.c" line="285"/> <source>(no dives)</source> <translation type="unfinished"></translation> </message> @@ -8720,7 +8737,7 @@ EADD: %d%s <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="154"/> + <location filename="../libdivecomputer.c" line="187"/> <location filename="../parse-xml.c" line="3177"/> <location filename="../uemis-downloader.c" line="133"/> <source>unknown</source> |