diff options
Diffstat (limited to 'translations/subsurface_en_GB.ts')
| -rw-r--r-- | translations/subsurface_en_GB.ts | 479 |
1 files changed, 247 insertions, 232 deletions
diff --git a/translations/subsurface_en_GB.ts b/translations/subsurface_en_GB.ts index aed0355bf..c0e2f1e5c 100644 --- a/translations/subsurface_en_GB.ts +++ b/translations/subsurface_en_GB.ts @@ -1544,7 +1544,7 @@ <context> <name>ContextDrawer</name> <message> - <location filename="../mobile-widgets/qml/kirigami/src/controls/ContextDrawer.qml" line="77"/> + <location filename="../mobile-widgets/qml/kirigami/src/controls/ContextDrawer.qml" line="76"/> <source>Actions</source> <translation>Actions</translation> </message> @@ -1607,42 +1607,42 @@ <translation>Use</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="44"/> + <location filename="../qt-models/cylindermodel.cpp" line="43"/> <source>cuft</source> <translation>cuft</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="48"/> + <location filename="../qt-models/cylindermodel.cpp" line="47"/> <source>ℓ</source> <translation>ℓ</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="229"/> + <location filename="../qt-models/cylindermodel.cpp" line="235"/> <source>Clicking here will remove this cylinder.</source> <translation>Clicking here will remove this cylinder.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="239"/> + <location filename="../qt-models/cylindermodel.cpp" line="247"/> <source>Switch depth for deco gas. Calculated using Deco pO₂ preference, unless set manually.</source> <translation>Switch depth for deco. gas. Calculated using Deco. pO₂ preference, unless set manually.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="242"/> + <location filename="../qt-models/cylindermodel.cpp" line="250"/> <source>Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to '*' for best O₂% for max depth.</source> <translation>Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to '*' for best O₂% for max depth.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="245"/> + <location filename="../qt-models/cylindermodel.cpp" line="253"/> <source>Calculated using Best Mix END preference. Setting MND adjusts He%, set to '*' for best He% for max depth.</source> <translation>Calculated using Best Mix END preference. Setting MND adjusts He%, set to '*' for best He% for max depth.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="503"/> + <location filename="../qt-models/cylindermodel.cpp" line="522"/> <source>Cylinder cannot be removed</source> <translation>Cylinder cannot be removed</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="504"/> + <location filename="../qt-models/cylindermodel.cpp" line="523"/> <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source> <translation>This gas is in use. Only cylinders that are not used in the dive can be removed.</translation> </message> @@ -1770,6 +1770,11 @@ <source>Show on map</source> <translation>Show on map</translation> </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="160"/> + <source>Multiple Buddies</source> + <translation>Multiple buddies</translation> + </message> </context> <context> <name>DiveDetailsEdit</name> @@ -2017,7 +2022,7 @@ GPS location:</translation> <translation>Please tap the '+' button to add a dive</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="248"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="255"/> <source>No dives in dive list</source> <translation>No dives in dive list</translation> </message> @@ -2753,6 +2758,11 @@ GPS location:</translation> <source>%1 dive(s)</source> <translation>%1 dive(s)</translation> </message> + <message> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="428"/> + <source>Multiple Buddies</source> + <translation>Multiple buddies</translation> + </message> </context> <context> <name>DivePlanner</name> @@ -2795,32 +2805,32 @@ GPS location:</translation> <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="137"/> + <location filename="../qt-models/diveplannermodel.cpp" line="142"/> <source>unknown</source> <translation>unknown</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="327"/> + <location filename="../qt-models/diveplannermodel.cpp" line="332"/> <source>Final depth</source> <translation>Final depth</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="329"/> + <location filename="../qt-models/diveplannermodel.cpp" line="334"/> <source>Run time</source> <translation>Run time</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="331"/> + <location filename="../qt-models/diveplannermodel.cpp" line="336"/> <source>Duration</source> <translation>Duration</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="333"/> + <location filename="../qt-models/diveplannermodel.cpp" line="338"/> <source>Used gas</source> <translation>Used gas</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="335"/> + <location filename="../qt-models/diveplannermodel.cpp" line="340"/> <source>CC setpoint</source> <translation>CC setpoint</translation> </message> @@ -3607,7 +3617,7 @@ p, li { white-space: pre-wrap; } <context> <name>GlobalDrawer</name> <message> - <location filename="../mobile-widgets/qml/kirigami/src/controls/GlobalDrawer.qml" line="362"/> + <location filename="../mobile-widgets/qml/kirigami/src/controls/GlobalDrawer.qml" line="361"/> <source>Back</source> <translation>Back</translation> </message> @@ -4829,7 +4839,7 @@ mixed from Air and using: <message> <location filename="../desktop-widgets/mainwindow.cpp" line="506"/> <location filename="../desktop-widgets/mainwindow.cpp" line="551"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1560"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1562"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation>Please save or cancel the current dive edit before opening a new file.</translation> </message> @@ -4841,7 +4851,7 @@ mixed from Air and using: <message> <location filename="../desktop-widgets/mainwindow.cpp" line="516"/> <location filename="../desktop-widgets/mainwindow.cpp" line="627"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1993"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1995"/> <source>Cancel</source> <translation>Cancel</translation> </message> @@ -4864,9 +4874,9 @@ mixed from Air and using: <location filename="../desktop-widgets/mainwindow.cpp" line="662"/> <location filename="../desktop-widgets/mainwindow.cpp" line="809"/> <location filename="../desktop-widgets/mainwindow.cpp" line="917"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="992"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="998"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1864"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="994"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1866"/> <source>Warning</source> <translation>Warning</translation> </message> @@ -4891,85 +4901,85 @@ mixed from Air and using: <translation>Trying to replan a dive that's not a planned dive.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="992"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1864"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="994"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1866"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>Please, first finish the current edition before trying to do another.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="998"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> <source>Trying to edit a dive that's not a manually added dive.</source> <translation>Trying to edit a dive that's not a manually added dive.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1045"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1047"/> <source>Yearly statistics</source> <translation>Yearly statistics</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1259"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1261"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation>Do you want to save the changes that you made in the file %1?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1262"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1264"/> <source>Do you want to save the changes that you made in the data file?</source> <translation>Do you want to save the changes that you made in the data file?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1267"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1269"/> <source>Save changes?</source> <translation>Save changes?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1268"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1270"/> <source>Changes will be lost if you don't save them.</source> <translation>Changes will be lost if you don't save them.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1587"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1589"/> <source>Save file as</source> <translation>Save file as</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1588"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1590"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Subsurface XML files (*.ssrf *.xml *.XML)</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1685"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1687"/> <source>[local cache for] %1</source> <translation>[local cache for] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1687"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1689"/> <source>[cloud storage for] %1</source> <translation>[cloud storage for] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1803"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1805"/> <source>Opening datafile from older version</source> <translation>Opening datafile from older version</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1804"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1806"/> <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>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.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1815"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1817"/> <source>Open dive log file</source> <translation>Open dive log file</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1816"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1818"/> <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;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);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;All files (*)</source> <translation>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;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);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;All files (*)</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1993"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1995"/> <source>Contacting cloud service...</source> <translation>Contacting cloud service...</translation> </message> @@ -5923,113 +5933,113 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="730"/> + <location filename="../profile-widget/profilewidget2.cpp" line="750"/> <source> (#%1 of %2)</source> <translation> (No.%1 of %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="733"/> + <location filename="../profile-widget/profilewidget2.cpp" line="753"/> <source>Unknown dive computer</source> <translation>Unknown dive computer</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="753"/> + <location filename="../profile-widget/profilewidget2.cpp" line="773"/> <source>Show NDL / TTS was disabled because of excessive processing time</source> <translation>Show NDL / TTS was disabled because of excessive processing time</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1339"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1359"/> <source>Make first divecomputer</source> <translation>Make first dive computer</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1341"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1361"/> <source>Delete this divecomputer</source> <translation>Delete this dive computer</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1355"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1375"/> <source>Add gas change</source> <translation>Add gas change</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1358"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1378"/> <source> (Tank %1)</source> <translation> (Tank %1)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1366"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1386"/> <source>Add set-point change</source> <translation>Add set-point change</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1368"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1388"/> <source>Add bookmark</source> <translation>Add bookmark</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1372"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1392"/> <source>Edit the profile</source> <translation>Edit the profile</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1376"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1396"/> <source>Remove event</source> <translation>Remove event</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1381"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1401"/> <source>Hide similar events</source> <translation>Hide similar events</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1388"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1408"/> <source>Edit name</source> <translation>Edit name</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1417"/> - <location filename="../profile-widget/profilewidget2.cpp" line="1424"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1437"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1444"/> <source>Adjust pressure of tank %1 (currently interpolated as %2)</source> <translation>Adjust pressure of tank %1 (currently interpolated as %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1439"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1459"/> <source>Unhide all events</source> <translation>Unhide all events</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1474"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1494"/> <source>Hide events</source> <translation>Hide events</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1474"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1494"/> <source>Hide all %1 events?</source> <translation>Hide all %1 events?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1509"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1529"/> <source>Remove the selected event?</source> <translation>Remove the selected event?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1510"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1530"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1633"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1653"/> <source>Edit name of bookmark</source> <translation>Edit name of bookmark</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1634"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1654"/> <source>Custom name:</source> <translation>Custom name:</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1639"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1659"/> <source>Name is too long!</source> <translation>Name is too long.</translation> </message> @@ -6042,96 +6052,96 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <translation>Starting...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="202"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="204"/> <source>working in no-cloud mode</source> <translation>working in no-cloud mode</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="216"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="218"/> <source>no cloud credentials</source> <translation>no cloud credentials</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="217"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="269"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="219"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="271"/> <source>Please enter valid cloud credentials.</source> <translation>Please enter valid cloud credentials.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="284"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="286"/> <source>Attempting to open cloud storage with new credentials</source> <translation>Attempting to open cloud storage with new credentials</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="306"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="308"/> <source>Testing cloud credentials</source> <translation>Testing cloud credentials</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="320"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="322"/> <source>No response from cloud server to validate the credentials</source> <translation>No response from cloud server to validate the credentials</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="329"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="331"/> <source>Cannot connect to cloud storage - cloud account not verified</source> <translation>Cannot connect to cloud storage - cloud account not verified</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="361"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="363"/> <source>Cloud credentials are invalid</source> <translation>Cloud credentials are invalid</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="374"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="376"/> <source>Cannot open cloud storage: Error creating https connection</source> <translation>Cannot open cloud storage: Error creating https connection</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="387"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="389"/> <source>Cannot open cloud storage: %1</source> <translation>Cannot open cloud storage: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="399"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="401"/> <source>Cannot connect to cloud storage</source> <translation>Cannot connect to cloud storage</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="441"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="443"/> <source>Cloud storage error: %1</source> <translation>Cloud storage error: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="531"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="533"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> <translation>Failed to connect to cloud server, reverting to no-cloud mode</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="550"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="554"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation>Cloud storage open successfully. No dives in dive list.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="721"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="724"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="725"/> <source>h</source> <translation>h</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="721"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="722"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="724"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="725"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="726"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="724"/> <source>sec</source> <translation>sec</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1102"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1103"/> <source>Unknown GPS location</source> <translation>Unknown GPS location</translation> </message> @@ -6988,62 +6998,62 @@ Not all images have timestamps in the range between <context> <name>TestParse</name> <message> - <location filename="../tests/testparse.cpp" line="308"/> + <location filename="../tests/testparse.cpp" line="313"/> <source>Sample time</source> <translation>Sample time</translation> </message> <message> - <location filename="../tests/testparse.cpp" line="310"/> + <location filename="../tests/testparse.cpp" line="315"/> <source>Sample depth</source> <translation>Sample depth</translation> </message> <message> - <location filename="../tests/testparse.cpp" line="312"/> + <location filename="../tests/testparse.cpp" line="317"/> <source>Sample temperature</source> <translation>Sample temperature</translation> </message> <message> - <location filename="../tests/testparse.cpp" line="314"/> + <location filename="../tests/testparse.cpp" line="319"/> <source>Sample pO₂</source> <translation>Sample pO₂</translation> </message> <message> - <location filename="../tests/testparse.cpp" line="316"/> + <location filename="../tests/testparse.cpp" line="321"/> <source>Sample sensor1 pO₂</source> <translation>Sample sensor1 pO₂</translation> </message> <message> - <location filename="../tests/testparse.cpp" line="318"/> + <location filename="../tests/testparse.cpp" line="323"/> <source>Sample sensor2 pO₂</source> <translation>Sample sensor2 pO₂</translation> </message> <message> - <location filename="../tests/testparse.cpp" line="320"/> + <location filename="../tests/testparse.cpp" line="325"/> <source>Sample sensor3 pO₂</source> <translation>Sample sensor3 pO₂</translation> </message> <message> - <location filename="../tests/testparse.cpp" line="322"/> + <location filename="../tests/testparse.cpp" line="327"/> <source>Sample CNS</source> <translation>Sample CNS</translation> </message> <message> - <location filename="../tests/testparse.cpp" line="324"/> + <location filename="../tests/testparse.cpp" line="329"/> <source>Sample NDL</source> <translation>Sample NDL</translation> </message> <message> - <location filename="../tests/testparse.cpp" line="326"/> + <location filename="../tests/testparse.cpp" line="331"/> <source>Sample TTS</source> <translation>Sample TTS</translation> </message> <message> - <location filename="../tests/testparse.cpp" line="328"/> + <location filename="../tests/testparse.cpp" line="333"/> <source>Sample stopdepth</source> <translation>Sample stopdepth</translation> </message> <message> - <location filename="../tests/testparse.cpp" line="330"/> + <location filename="../tests/testparse.cpp" line="335"/> <source>Sample pressure</source> <translation>Sample pressure</translation> </message> @@ -7662,7 +7672,7 @@ Maximum</translation> <context> <name>getextFromC</name> <message> - <location filename="../core/libdivecomputer.c" line="737"/> + <location filename="../core/libdivecomputer.c" line="776"/> <source>Error parsing the header</source> <translation>Error parsing the header</translation> </message> @@ -7673,7 +7683,7 @@ Maximum</translation> <location filename="../core/cochran.c" line="309"/> <location filename="../core/cochran.c" line="315"/> <location filename="../core/cochran.c" line="385"/> - <location filename="../core/libdivecomputer.c" line="223"/> + <location filename="../core/libdivecomputer.c" line="232"/> <source>deco stop</source> <translation>deco stop</translation> </message> @@ -7681,7 +7691,7 @@ Maximum</translation> <location filename="../core/cochran.c" line="336"/> <location filename="../core/cochran.c" line="390"/> <location filename="../core/file.c" line="777"/> - <location filename="../core/libdivecomputer.c" line="223"/> + <location filename="../core/libdivecomputer.c" line="234"/> <source>ascent</source> <translation>ascent</translation> </message> @@ -7693,20 +7703,20 @@ Maximum</translation> </message> <message> <location filename="../core/cochran.c" line="348"/> - <location filename="../core/libdivecomputer.c" line="227"/> + <location filename="../core/libdivecomputer.c" line="250"/> <source>OLF</source> <translation>OLF</translation> </message> <message> <location filename="../core/cochran.c" line="353"/> - <location filename="../core/libdivecomputer.c" line="227"/> + <location filename="../core/libdivecomputer.c" line="249"/> <source>maxdepth</source> <translation>maxdepth</translation> </message> <message> <location filename="../core/cochran.c" line="358"/> <location filename="../core/cochran.c" line="404"/> - <location filename="../core/libdivecomputer.c" line="227"/> + <location filename="../core/libdivecomputer.c" line="251"/> <source>pO₂</source> <translation>pO₂</translation> </message> @@ -7715,28 +7725,28 @@ Maximum</translation> <location filename="../core/cochran.c" line="414"/> <location filename="../core/cochran.c" line="421"/> <location filename="../core/file.c" line="868"/> - <location filename="../core/libdivecomputer.c" line="225"/> - <location filename="../core/libdivecomputer.c" line="228"/> + <location filename="../core/libdivecomputer.c" line="242"/> + <location filename="../core/libdivecomputer.c" line="256"/> <source>gaschange</source> <translation>gas change</translation> </message> <message> <location filename="../core/cochran.c" line="370"/> <location filename="../core/cochran.c" line="409"/> - <location filename="../core/libdivecomputer.c" line="223"/> + <location filename="../core/libdivecomputer.c" line="233"/> <source>rbt</source> <translation>rbt</translation> </message> <message> <location filename="../core/cochran.c" line="379"/> <location filename="../core/cochran.c" line="426"/> - <location filename="../core/libdivecomputer.c" line="223"/> + <location filename="../core/libdivecomputer.c" line="235"/> <source>ceiling</source> <translation>ceiling</translation> </message> <message> <location filename="../core/cochran.c" line="395"/> - <location filename="../core/libdivecomputer.c" line="224"/> + <location filename="../core/libdivecomputer.c" line="237"/> <source>transmitter</source> <translation>transmitter</translation> </message> @@ -7998,12 +8008,17 @@ Maximum</translation> <message> <location filename="../core/dive.c" line="33"/> <location filename="../core/equipment.c" line="88"/> - <location filename="../core/planner.c" line="1447"/> - <location filename="../core/planner.c" line="1450"/> + <location filename="../core/planner.c" line="1476"/> + <location filename="../core/planner.c" line="1479"/> <source>oxygen</source> <translation>oxygen</translation> </message> <message> + <location filename="../core/dive.c" line="33"/> + <source>not used</source> + <translation>unused</translation> + </message> + <message> <location filename="../core/dive.c" line="181"/> <source>pascal</source> <translation>pascal</translation> @@ -8084,10 +8099,10 @@ Maximum</translation> <translation>(%s) or (%s)</translation> </message> <message> - <location filename="../core/divelist.c" line="490"/> + <location filename="../core/divelist.c" line="491"/> <location filename="../core/equipment.c" line="84"/> - <location filename="../core/planner.c" line="1443"/> - <location filename="../core/planner.c" line="1446"/> + <location filename="../core/planner.c" line="1472"/> + <location filename="../core/planner.c" line="1475"/> <source>air</source> <translation>air</translation> </message> @@ -8250,205 +8265,200 @@ Maximum</translation> <translation>git clone of %s failed (%s)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="210"/> + <location filename="../core/libdivecomputer.c" line="218"/> <location filename="../core/parse-xml.c" line="3317"/> <location filename="../core/uemis-downloader.c" line="134"/> <source>unknown</source> <translation>unknown</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="223"/> + <location filename="../core/libdivecomputer.c" line="231"/> <source>none</source> <translation>none</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="223"/> + <location filename="../core/libdivecomputer.c" line="236"/> <source>workload</source> <translation>workload</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="224"/> + <location filename="../core/libdivecomputer.c" line="238"/> <source>violation</source> <translation>violation</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="224"/> + <location filename="../core/libdivecomputer.c" line="239"/> <source>bookmark</source> <translation>bookmark</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="224"/> + <location filename="../core/libdivecomputer.c" line="240"/> <source>surface</source> <translation>surface</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="224"/> + <location filename="../core/libdivecomputer.c" line="241"/> <source>safety stop</source> <translation>safety stop</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="225"/> + <location filename="../core/libdivecomputer.c" line="243"/> <source>safety stop (voluntary)</source> <translation>safety stop (recommended)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="225"/> + <location filename="../core/libdivecomputer.c" line="244"/> <source>safety stop (mandatory)</source> <translation>safety stop (mandatory)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="226"/> + <location filename="../core/libdivecomputer.c" line="245"/> <source>deepstop</source> <translation>deep stop</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="226"/> + <location filename="../core/libdivecomputer.c" line="246"/> <source>ceiling (safety stop)</source> <translation>ceiling (safety stop)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="226"/> + <location filename="../core/libdivecomputer.c" line="247"/> <source>below floor</source> <comment>event showing dive is below deco floor and adding deco time</comment> <translation>below floor</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="226"/> + <location filename="../core/libdivecomputer.c" line="248"/> <source>divetime</source> <translation>divetime</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="227"/> + <location filename="../core/libdivecomputer.c" line="252"/> <source>airtime</source> <translation>airtime</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="227"/> + <location filename="../core/libdivecomputer.c" line="253"/> <source>rgbm</source> <translation>rgbm</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="227"/> + <location filename="../core/libdivecomputer.c" line="254"/> <source>heading</source> <translation>heading</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="228"/> + <location filename="../core/libdivecomputer.c" line="255"/> <source>tissue level warning</source> <translation>tissue level warning</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="228"/> - <source>non stop time</source> - <translation>no-stop time</translation> - </message> - <message> - <location filename="../core/libdivecomputer.c" line="237"/> + <location filename="../core/libdivecomputer.c" line="265"/> <source>invalid event number</source> <translation>invalid event number</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="553"/> + <location filename="../core/libdivecomputer.c" line="592"/> <source>Error parsing the datetime</source> <translation>Error parsing the date/time</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="571"/> + <location filename="../core/libdivecomputer.c" line="610"/> <source>Dive %d: %s</source> <translation>Dive %d: %s</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="577"/> + <location filename="../core/libdivecomputer.c" line="616"/> <source>Error parsing the divetime</source> <translation>Error parsing the divetime</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="587"/> + <location filename="../core/libdivecomputer.c" line="626"/> <source>Error parsing the maxdepth</source> <translation>Error parsing the maxdepth</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="606"/> + <location filename="../core/libdivecomputer.c" line="645"/> <source>Error parsing temperature</source> <translation>Error parsing temperature</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="626"/> + <location filename="../core/libdivecomputer.c" line="665"/> <source>Error parsing the gas mix count</source> <translation>Error parsing the gas mix count</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="638"/> + <location filename="../core/libdivecomputer.c" line="677"/> <source>Error obtaining water salinity</source> <translation>Error obtaining water salinity</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="647"/> + <location filename="../core/libdivecomputer.c" line="686"/> <source>Error obtaining surface pressure</source> <translation>Error obtaining surface pressure</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="672"/> + <location filename="../core/libdivecomputer.c" line="711"/> <source>Error obtaining divemode</source> <translation>Error obtaining divemode</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="692"/> + <location filename="../core/libdivecomputer.c" line="731"/> <source>Error parsing the gas mix</source> <translation>Error parsing the gas mix</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="717"/> + <location filename="../core/libdivecomputer.c" line="756"/> <source>Unable to create parser for %s %s</source> <translation>Unable to create parser for %s %s</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="723"/> + <location filename="../core/libdivecomputer.c" line="762"/> <source>Error registering the data</source> <translation>Error registering data</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="744"/> + <location filename="../core/libdivecomputer.c" line="783"/> <source>Error parsing the samples</source> <translation>Error parsing the samples</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="882"/> + <location filename="../core/libdivecomputer.c" line="921"/> <source>Event: waiting for user action</source> <translation>Event: waiting for user action</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="890"/> + <location filename="../core/libdivecomputer.c" line="929"/> <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source> <translation>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="954"/> + <location filename="../core/libdivecomputer.c" line="993"/> <source>Error registering the event handler.</source> <translation>Error registering the event handler.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="959"/> + <location filename="../core/libdivecomputer.c" line="998"/> <source>Error registering the cancellation handler.</source> <translation>Error registering the cancellation handler.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="980"/> + <location filename="../core/libdivecomputer.c" line="1019"/> <source>Dive data import error</source> <translation>Dive data import error</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1019"/> + <location filename="../core/libdivecomputer.c" line="1058"/> <source>Unable to create libdivecomputer context</source> <translation>Unable to create libdivecomputer context</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1026"/> + <location filename="../core/libdivecomputer.c" line="1065"/> <source>Unable to open %s %s (%s)</source> <translation>Unable to open %s %s (%s)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1048"/> + <location filename="../core/libdivecomputer.c" line="1087"/> <source>Insufficient privileges to open the device %s %s (%s)</source> <translation>Insufficient privileges to open the device %s %s (%s)</translation> </message> @@ -8508,177 +8518,182 @@ Maximum</translation> </message> <message> <location filename="../core/planner.c" line="574"/> - <location filename="../core/planner.c" line="840"/> - <location filename="../core/planner.c" line="845"/> - <location filename="../core/planner.c" line="871"/> - <location filename="../core/planner.c" line="881"/> + <location filename="../core/planner.c" line="868"/> + <location filename="../core/planner.c" line="874"/> + <location filename="../core/planner.c" line="900"/> + <location filename="../core/planner.c" line="910"/> <source>Warning:</source> <translation>Warning:</translation> </message> <message> - <location filename="../core/planner.c" line="584"/> - <source>based on Bühlmann ZHL-16C with GFlow = %d and GFhigh = %d</source> - <translation>based on Bühlmann ZHL-16C with GFlow = %d and GFhigh = %d</translation> - </message> - <message> - <location filename="../core/planner.c" line="589"/> - <source>based on VPM-B at nominal conservatism</source> - <translation>based on VPM-B at nominal conservatism</translation> - </message> - <message> - <location filename="../core/planner.c" line="591"/> - <source>based on VPM-B at +%d conservatism</source> - <translation>based on VPM-B at +%d conservatism</translation> - </message> - <message> - <location filename="../core/planner.c" line="593"/> + <location filename="../core/planner.c" line="812"/> <source>, effective GF=%d/%d</source> <translation>, effective GF=%d/%d</translation> </message> <message> - <location filename="../core/planner.c" line="597"/> - <source>recreational mode based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source> - <translation>recreational mode based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</translation> - </message> - <message> - <location filename="../core/planner.c" line="602"/> + <location filename="../core/planner.c" line="586"/> <source>Subsurface dive plan (surface interval </source> <translation>Subsurface dive plan (surface interval </translation> </message> <message> - <location filename="../core/planner.c" line="607"/> + <location filename="../core/planner.c" line="590"/> <source>Subsurface dive plan</source> <translation>Subsurface dive plan</translation> </message> <message> - <location filename="../core/planner.c" line="610"/> - <source><div>Runtime: %dmin</div><br></source> - <translation><div>Runtime: %dmin</div><br></translation> + <location filename="../core/planner.c" line="593"/> + <source>Runtime: %dmin<br></div></source> + <translation>Runtime: %dmin<br></div></translation> </message> <message> - <location filename="../core/planner.c" line="615"/> + <location filename="../core/planner.c" line="598"/> <source>depth</source> <translation>depth</translation> </message> <message> - <location filename="../core/planner.c" line="618"/> + <location filename="../core/planner.c" line="601"/> <source>duration</source> <translation>duration</translation> </message> <message> - <location filename="../core/planner.c" line="621"/> + <location filename="../core/planner.c" line="604"/> <source>runtime</source> <translation>runtime</translation> </message> <message> - <location filename="../core/planner.c" line="624"/> + <location filename="../core/planner.c" line="607"/> <source>gas</source> <translation>gas</translation> </message> <message> - <location filename="../core/planner.c" line="667"/> + <location filename="../core/planner.c" line="650"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> <translation>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</translation> </message> <message> - <location filename="../core/planner.c" line="675"/> + <location filename="../core/planner.c" line="658"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source> <translation>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</translation> </message> <message> - <location filename="../core/planner.c" line="688"/> + <location filename="../core/planner.c" line="671"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> <translation>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</translation> </message> <message> - <location filename="../core/planner.c" line="695"/> + <location filename="../core/planner.c" line="678"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source> <translation>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</translation> </message> <message> - <location filename="../core/planner.c" line="740"/> + <location filename="../core/planner.c" line="723"/> <source>%3.0f%s</source> <translation>%3.0f%s</translation> </message> <message> - <location filename="../core/planner.c" line="743"/> - <location filename="../core/planner.c" line="747"/> + <location filename="../core/planner.c" line="726"/> + <location filename="../core/planner.c" line="730"/> <source>%3dmin</source> <translation>%3dmin</translation> </message> <message> - <location filename="../core/planner.c" line="756"/> - <location filename="../core/planner.c" line="768"/> + <location filename="../core/planner.c" line="739"/> + <location filename="../core/planner.c" line="751"/> <source>(SP = %.1fbar)</source> <translation>(SP = %.1fbar)</translation> </message> <message> - <location filename="../core/planner.c" line="791"/> + <location filename="../core/planner.c" line="774"/> <source>Switch gas to %s (SP = %.1fbar)</source> <translation>Switch gas to %s (SP = %.1fbar)</translation> </message> <message> - <location filename="../core/planner.c" line="793"/> + <location filename="../core/planner.c" line="776"/> <source>Switch gas to %s</source> <translation>Switch gas to %s</translation> </message> <message> - <location filename="../core/planner.c" line="812"/> + <location filename="../core/planner.c" line="796"/> <source>CNS</source> <translation>CNS</translation> </message> <message> - <location filename="../core/planner.c" line="814"/> + <location filename="../core/planner.c" line="798"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../core/planner.c" line="818"/> + <location filename="../core/planner.c" line="803"/> + <source>Deco model: Bühlmann ZHL-16C with GFlow = %d and GFhigh = %d</source> + <translation>Deco model: Bühlmann ZHL-16C with GFlow = %d and GFhigh = %d</translation> + </message> + <message> + <location filename="../core/planner.c" line="808"/> + <source>Deco model: VPM-B at nominal conservatism</source> + <translation>Deco model: VPM-B at nominal conservatism</translation> + </message> + <message> + <location filename="../core/planner.c" line="810"/> + <source>Deco model: VPM-B at +%d conservatism</source> + <translation>Deco model: VPM-B at +%d conservatism</translation> + </message> + <message> + <location filename="../core/planner.c" line="816"/> + <source>Deco model: Recreational mode based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source> + <translation>Deco model: Recreational mode based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</translation> + </message> + <message> + <location filename="../core/planner.c" line="824"/> + <source>ATM pressure: %dmbar (%d%s)<br></div></source> + <translation>Atm. pressure: %dmbar (%d%s)<br></div></translation> + </message> + <message> + <location filename="../core/planner.c" line="842"/> <source>Gas consumption (CCR legs excluded):</source> <translation>Gas consumption (CCR legs excluded):</translation> </message> <message> - <location filename="../core/planner.c" line="820"/> - <source>Gas consumption:</source> - <translation>Gas consumption:</translation> + <location filename="../core/planner.c" line="844"/> + <source>Gas consumption (based on SAC</source> + <translation>Gas consumption (based on SAC</translation> </message> <message> - <location filename="../core/planner.c" line="841"/> + <location filename="../core/planner.c" line="869"/> <source>this is more gas than available in the specified cylinder!</source> <translation>this is more gas than available in the specified cylinder!</translation> </message> <message> - <location filename="../core/planner.c" line="846"/> + <location filename="../core/planner.c" line="875"/> <source>not enough reserve for gas sharing on ascent!</source> <translation>not enough reserve for gas sharing on ascent!</translation> </message> <message> - <location filename="../core/planner.c" line="848"/> + <location filename="../core/planner.c" line="877"/> <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source> <translation>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</translation> </message> <message> - <location filename="../core/planner.c" line="850"/> + <location filename="../core/planner.c" line="879"/> <source>%.0f%s (%.0f%s during planned ascent) of %s</source> <translation>%.0f%s (%.0f%s during planned ascent) of %s</translation> </message> <message> - <location filename="../core/planner.c" line="868"/> + <location filename="../core/planner.c" line="897"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</translation> </message> <message> - <location filename="../core/planner.c" line="878"/> + <location filename="../core/planner.c" line="907"/> <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</translation> </message> <message> - <location filename="../core/planner.c" line="1205"/> + <location filename="../core/planner.c" line="1234"/> <source>Can't find gas %s</source> <translation>Can't find gas %s</translation> </message> <message> - <location filename="../core/planner.c" line="1451"/> + <location filename="../core/planner.c" line="1480"/> <source>ean</source> <translation>ean</translation> </message> @@ -9103,8 +9118,8 @@ EADD: %d%s </message> <message> <location filename="../core/save-html.c" line="509"/> - <location filename="../smtk-import/smartrak.c" line="251"/> - <location filename="../smtk-import/smartrak.c" line="321"/> + <location filename="../smtk-import/smartrak.c" line="248"/> + <location filename="../smtk-import/smartrak.c" line="318"/> <source>Notes</source> <translation>Notes</translation> </message> @@ -9675,77 +9690,77 @@ Is the Uemis Zurich plugged in correctly?</translation> <translation>Notes:</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="247"/> + <location filename="../smtk-import/smartrak.c" line="244"/> <source>Built</source> <translation>Built</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="247"/> + <location filename="../smtk-import/smartrak.c" line="244"/> <source>Sank</source> <translation>Sank</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="247"/> + <location filename="../smtk-import/smartrak.c" line="244"/> <source>SankTime</source> <translation>SankTime</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="248"/> + <location filename="../smtk-import/smartrak.c" line="245"/> <source>Reason</source> <translation>Reason</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="248"/> + <location filename="../smtk-import/smartrak.c" line="245"/> <source>Nationality</source> <translation>Nationality</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="248"/> + <location filename="../smtk-import/smartrak.c" line="245"/> <source>Shipyard</source> <translation>Shipyard</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="249"/> + <location filename="../smtk-import/smartrak.c" line="246"/> <source>ShipType</source> <translation>ShipType</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="249"/> + <location filename="../smtk-import/smartrak.c" line="246"/> <source>Length</source> <translation>Length</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="249"/> + <location filename="../smtk-import/smartrak.c" line="246"/> <source>Beam</source> <translation>Beam</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="250"/> + <location filename="../smtk-import/smartrak.c" line="247"/> <source>Draught</source> <translation>Draught</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="250"/> + <location filename="../smtk-import/smartrak.c" line="247"/> <source>Displacement</source> <translation>Displacement</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="250"/> + <location filename="../smtk-import/smartrak.c" line="247"/> <source>Cargo</source> <translation>Cargo</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="263"/> + <location filename="../smtk-import/smartrak.c" line="260"/> <source>Wreck Data</source> <translation>Wreck Data</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="320"/> + <location filename="../smtk-import/smartrak.c" line="317"/> <source>Altitude</source> <translation>Altitude</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="320"/> + <location filename="../smtk-import/smartrak.c" line="317"/> <source>Depth</source> <translation>Depth</translation> </message> |