diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2017-03-12 09:22:27 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2017-03-12 09:22:27 -0700 |
| commit | 4db42808f6951953766a5ff6f2cb042a873dcb30 (patch) | |
| tree | c92dd619c9482bb0c526ea72f711d89168d1d6fd | |
| parent | b2c13f4178222961a75ee2f2326293bca9c2d972 (diff) | |
| download | subsurface-4db42808f6951953766a5ff6f2cb042a873dcb30.tar.gz | |
Update translation source strings
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rw-r--r-- | translations/subsurface_source.ts | 1176 |
1 files changed, 610 insertions, 566 deletions
diff --git a/translations/subsurface_source.ts b/translations/subsurface_source.ts index b96744b7b..fd6946f91 100644 --- a/translations/subsurface_source.ts +++ b/translations/subsurface_source.ts @@ -1311,7 +1311,7 @@ </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1696"/> - <source>Max depth</source> + <source>Max. depth</source> <translation type="unfinished"></translation> </message> <message> @@ -1614,32 +1614,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="244"/> + <location filename="../qt-models/cylindermodel.cpp" line="270"/> <source>Clicking here will remove this cylinder.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="256"/> + <location filename="../qt-models/cylindermodel.cpp" line="282"/> <source>Switch depth for deco gas. Calculated using Deco pO₂ preference, unless set manually.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="259"/> - <source>Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to '*' for best O₂% for max depth.</source> + <location filename="../qt-models/cylindermodel.cpp" line="285"/> + <source>Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to '*' for best O₂% for max. depth.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="262"/> - <source>Calculated using Best Mix END preference. Setting MND adjusts He%, set to '*' for best He% for max depth.</source> + <location filename="../qt-models/cylindermodel.cpp" line="288"/> + <source>Calculated using Best Mix END preference. Setting MND adjusts He%, set to '*' for best He% for max. depth.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="531"/> - <source>Cylinder cannot be removed</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../qt-models/cylindermodel.cpp" line="532"/> + <location filename="../qt-models/cylindermodel.cpp" line="268"/> <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source> <translation type="unfinished"></translation> </message> @@ -2805,32 +2800,32 @@ GPS location:</source> <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="142"/> + <location filename="../qt-models/diveplannermodel.cpp" line="147"/> <source>unknown</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="332"/> + <location filename="../qt-models/diveplannermodel.cpp" line="337"/> <source>Final depth</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="334"/> + <location filename="../qt-models/diveplannermodel.cpp" line="339"/> <source>Run time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="336"/> + <location filename="../qt-models/diveplannermodel.cpp" line="341"/> <source>Duration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="338"/> + <location filename="../qt-models/diveplannermodel.cpp" line="343"/> <source>Used gas</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="340"/> + <location filename="../qt-models/diveplannermodel.cpp" line="345"/> <source>CC setpoint</source> <translation type="unfinished"></translation> </message> @@ -2848,12 +2843,17 @@ GPS location:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="142"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="116"/> + <source>Add cylinder</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../desktop-widgets/diveplanner.cpp" line="143"/> <source>Add dive data point</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="151"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="152"/> <source>Save new</source> <translation type="unfinished"></translation> </message> @@ -3055,11 +3055,6 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="448"/> - <source>Temp</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../qt-models/divetripmodel.cpp" line="451"/> <source>Weight</source> <translation type="unfinished"></translation> @@ -3071,9 +3066,14 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"></translation> </message> <message> + <location filename="../qt-models/divetripmodel.cpp" line="448"/> + <source>Temp.</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../qt-models/divetripmodel.cpp" line="457"/> <location filename="../qt-models/divetripmodel.cpp" line="506"/> - <source>Cyl</source> + <source>Cylinder</source> <translation type="unfinished"></translation> </message> <message> @@ -3127,7 +3127,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-models/divetripmodel.cpp" line="497"/> - <source>Temp(%1%2)</source> + <source>Temp.(%1%2)</source> <translation type="unfinished"></translation> </message> <message> @@ -3837,9 +3837,9 @@ p, li { white-space: pre-wrap; } <name>MainTab</name> <message> <location filename="../desktop-widgets/maintab.ui" line="18"/> - <location filename="../desktop-widgets/maintab.ui" line="439"/> - <location filename="../desktop-widgets/maintab.cpp" line="539"/> - <location filename="../desktop-widgets/maintab.cpp" line="571"/> + <location filename="../desktop-widgets/maintab.ui" line="459"/> + <location filename="../desktop-widgets/maintab.cpp" line="557"/> + <location filename="../desktop-widgets/maintab.cpp" line="589"/> <source>Notes</source> <translation type="unfinished"></translation> </message> @@ -3849,214 +3849,216 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="92"/> - <location filename="../desktop-widgets/maintab.ui" line="646"/> + <location filename="../desktop-widgets/maintab.ui" line="99"/> + <location filename="../desktop-widgets/maintab.ui" line="666"/> <source>Date</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="102"/> + <location filename="../desktop-widgets/maintab.ui" line="109"/> <source>Time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="112"/> - <location filename="../desktop-widgets/maintab.ui" line="836"/> - <location filename="../desktop-widgets/maintab.cpp" line="306"/> + <location filename="../desktop-widgets/maintab.ui" line="119"/> + <location filename="../desktop-widgets/maintab.ui" line="856"/> + <location filename="../desktop-widgets/maintab.cpp" line="310"/> <source>Air temp.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="122"/> - <location filename="../desktop-widgets/maintab.ui" line="855"/> - <location filename="../desktop-widgets/maintab.cpp" line="307"/> + <location filename="../desktop-widgets/maintab.ui" line="129"/> + <location filename="../desktop-widgets/maintab.ui" line="875"/> + <location filename="../desktop-widgets/maintab.cpp" line="311"/> <source>Water temp.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="184"/> - <location filename="../desktop-widgets/maintab.cpp" line="570"/> + <location filename="../desktop-widgets/maintab.ui" line="204"/> + <location filename="../desktop-widgets/maintab.cpp" line="588"/> <source>Location</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="214"/> + <location filename="../desktop-widgets/maintab.ui" line="234"/> <source>Edit dive site</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="217"/> + <location filename="../desktop-widgets/maintab.ui" line="237"/> <source>...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="252"/> + <location filename="../desktop-widgets/maintab.ui" line="272"/> <source>Divemaster</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="262"/> + <location filename="../desktop-widgets/maintab.ui" line="282"/> <source>Buddy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="308"/> + <location filename="../desktop-widgets/maintab.ui" line="328"/> <source>Rating</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="321"/> + <location filename="../desktop-widgets/maintab.ui" line="341"/> <source>Visibility</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="328"/> + <location filename="../desktop-widgets/maintab.ui" line="348"/> <source>Suit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="387"/> + <location filename="../desktop-widgets/maintab.ui" line="407"/> <source>Tags</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="397"/> + <location filename="../desktop-widgets/maintab.ui" line="417"/> <source>Dive mode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="491"/> + <location filename="../desktop-widgets/maintab.ui" line="511"/> <source>Equipment</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="494"/> + <location filename="../desktop-widgets/maintab.ui" line="514"/> <source>Used equipment in the current selection</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="586"/> + <location filename="../desktop-widgets/maintab.ui" line="606"/> <source>Info</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="589"/> + <location filename="../desktop-widgets/maintab.ui" line="609"/> <source>Dive information</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="665"/> + <location filename="../desktop-widgets/maintab.ui" line="685"/> <source>Interval</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="684"/> + <location filename="../desktop-widgets/maintab.ui" line="704"/> <source>Gases used</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="703"/> + <location filename="../desktop-widgets/maintab.ui" line="723"/> <source>Gas consumed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="722"/> - <location filename="../desktop-widgets/maintab.ui" line="1094"/> + <location filename="../desktop-widgets/maintab.ui" line="742"/> + <location filename="../desktop-widgets/maintab.ui" line="1114"/> <source>SAC</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="741"/> + <location filename="../desktop-widgets/maintab.ui" line="761"/> <source>CNS</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="760"/> + <location filename="../desktop-widgets/maintab.ui" line="780"/> <source>OTU</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="779"/> + <location filename="../desktop-widgets/maintab.ui" line="799"/> <source>Max. depth</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="798"/> + <location filename="../desktop-widgets/maintab.ui" line="818"/> <source>Avg. depth</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="817"/> + <location filename="../desktop-widgets/maintab.ui" line="837"/> <source>Air pressure</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="874"/> + <location filename="../desktop-widgets/maintab.ui" line="894"/> <source>Dive time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="893"/> + <location filename="../desktop-widgets/maintab.ui" line="913"/> <source>Salinity</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="930"/> + <location filename="../desktop-widgets/maintab.ui" line="950"/> <source>Stats</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="933"/> + <location filename="../desktop-widgets/maintab.ui" line="953"/> <source>Simple statistics about the selection</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="986"/> + <location filename="../desktop-widgets/maintab.ui" line="176"/> + <location filename="../desktop-widgets/maintab.ui" line="1006"/> <source>Depth</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="998"/> + <location filename="../desktop-widgets/maintab.ui" line="92"/> + <location filename="../desktop-widgets/maintab.ui" line="1018"/> <source>Duration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="1027"/> + <location filename="../desktop-widgets/maintab.ui" line="1047"/> <source>Temperature</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="1039"/> + <location filename="../desktop-widgets/maintab.ui" line="1059"/> <source>Total time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="1058"/> + <location filename="../desktop-widgets/maintab.ui" line="1078"/> <source>Dives</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="1106"/> + <location filename="../desktop-widgets/maintab.ui" line="1126"/> <source>Gas consumption</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="1148"/> + <location filename="../desktop-widgets/maintab.ui" line="1168"/> <source>Photos</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="1151"/> + <location filename="../desktop-widgets/maintab.ui" line="1171"/> <source>All photos from the current selection</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="1177"/> + <location filename="../desktop-widgets/maintab.ui" line="1197"/> <source>Extra data</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="1180"/> + <location filename="../desktop-widgets/maintab.ui" line="1200"/> <source>Adittional data from the dive computer</source> <translation type="unfinished"></translation> </message> @@ -4111,158 +4113,158 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="303"/> + <location filename="../desktop-widgets/maintab.cpp" line="307"/> <source>Air temp. [%1]</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="304"/> + <location filename="../desktop-widgets/maintab.cpp" line="308"/> <source>Water temp. [%1]</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="343"/> + <location filename="../desktop-widgets/maintab.cpp" line="347"/> <source>This trip is being edited.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="350"/> + <location filename="../desktop-widgets/maintab.cpp" line="354"/> <source>Multiple dives are being edited.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="352"/> + <location filename="../desktop-widgets/maintab.cpp" line="356"/> <source>This dive is being edited.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="501"/> - <location filename="../desktop-widgets/maintab.cpp" line="534"/> + <location filename="../desktop-widgets/maintab.cpp" line="515"/> + <location filename="../desktop-widgets/maintab.cpp" line="548"/> <source>Trip notes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="529"/> + <location filename="../desktop-widgets/maintab.cpp" line="543"/> <source>Trip location</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="608"/> - <location filename="../desktop-widgets/maintab.cpp" line="644"/> - <location filename="../desktop-widgets/maintab.cpp" line="648"/> - <location filename="../desktop-widgets/maintab.cpp" line="652"/> + <location filename="../desktop-widgets/maintab.cpp" line="633"/> + <location filename="../desktop-widgets/maintab.cpp" line="669"/> + <location filename="../desktop-widgets/maintab.cpp" line="673"/> + <location filename="../desktop-widgets/maintab.cpp" line="677"/> <source>/min</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="641"/> + <location filename="../desktop-widgets/maintab.cpp" line="666"/> <source>Deepest dive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="642"/> + <location filename="../desktop-widgets/maintab.cpp" line="667"/> <source>Shallowest dive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="655"/> + <location filename="../desktop-widgets/maintab.cpp" line="680"/> <source>Highest total SAC of a dive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="656"/> + <location filename="../desktop-widgets/maintab.cpp" line="681"/> <source>Lowest total SAC of a dive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="657"/> + <location filename="../desktop-widgets/maintab.cpp" line="682"/> <source>Average total SAC of all selected dives</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="668"/> + <location filename="../desktop-widgets/maintab.cpp" line="693"/> <source>Highest temperature</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="669"/> + <location filename="../desktop-widgets/maintab.cpp" line="694"/> <source>Lowest temperature</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="670"/> + <location filename="../desktop-widgets/maintab.cpp" line="695"/> <source>Average temperature of all selected dives</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="683"/> + <location filename="../desktop-widgets/maintab.cpp" line="708"/> <source>Longest dive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="684"/> + <location filename="../desktop-widgets/maintab.cpp" line="709"/> <source>Shortest dive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="685"/> + <location filename="../desktop-widgets/maintab.cpp" line="710"/> <source>Average length of all selected dives</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="709"/> + <location filename="../desktop-widgets/maintab.cpp" line="734"/> <source>These gases could be mixed from Air and using: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="713"/> + <location filename="../desktop-widgets/maintab.cpp" line="738"/> <source> and </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="843"/> + <location filename="../desktop-widgets/maintab.cpp" line="868"/> <source>New dive site</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="1139"/> + <location filename="../desktop-widgets/maintab.cpp" line="1166"/> <source>Discard the changes?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="1140"/> + <location filename="../desktop-widgets/maintab.cpp" line="1167"/> <source>You are about to discard your changes.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="1594"/> + <location filename="../desktop-widgets/maintab.cpp" line="1658"/> <source>Deleting Images</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="1594"/> + <location filename="../desktop-widgets/maintab.cpp" line="1658"/> <source>Are you sure you want to delete all images?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="1653"/> + <location filename="../desktop-widgets/maintab.cpp" line="1717"/> <source>Load image(s) from file(s)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="1654"/> + <location filename="../desktop-widgets/maintab.cpp" line="1718"/> <source>Load image(s) from web</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="1656"/> + <location filename="../desktop-widgets/maintab.cpp" line="1720"/> <source>Delete selected images</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="1657"/> + <location filename="../desktop-widgets/maintab.cpp" line="1721"/> <source>Delete all images</source> <translation type="unfinished"></translation> </message> @@ -4676,7 +4678,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="1571"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1576"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation type="unfinished"></translation> </message> @@ -4688,7 +4690,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="2004"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2009"/> <source>Cancel</source> <translation type="unfinished"></translation> </message> @@ -4711,9 +4713,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="994"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1875"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="999"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1005"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1880"/> <source>Warning</source> <translation type="unfinished"></translation> </message> @@ -4738,84 +4740,84 @@ mixed from Air and using: <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="994"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1875"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="999"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1880"/> <source>Please, first finish the current edition before trying to do another.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1005"/> <source>Trying to edit a dive that's not a manually added dive.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1047"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1052"/> <source>Yearly statistics</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1270"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1275"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1273"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1278"/> <source>Do you want to save the changes that you made in the data file?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1278"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1283"/> <source>Save changes?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1279"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1284"/> <source>Changes will be lost if you don't save them.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1598"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1603"/> <source>Save file as</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1599"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1604"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1696"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1701"/> <source>[local cache for] %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1698"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1703"/> <source>[cloud storage for] %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1814"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1819"/> <source>Opening datafile from older version</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1815"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1820"/> <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="../desktop-widgets/mainwindow.cpp" line="1826"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1831"/> <source>Open dive log file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1827"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1832"/> <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 type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="2004"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2009"/> <source>Contacting cloud service...</source> <translation type="unfinished"></translation> </message> @@ -4871,89 +4873,89 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <context> <name>PlannerSettingsWidget</name> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="315"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="334"/> <source>Open circuit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="315"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="334"/> <source>CCR</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="315"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="334"/> <source>pSCR</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="401"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="422"/> <source>ft/min</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="402"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="423"/> <source>Last stop at 20ft</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="403"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="424"/> <source>50% avg. depth to 20ft</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="404"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="425"/> <source>20ft to surface</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="405"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="426"/> <source>ft</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="407"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="428"/> <source>m/min</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="408"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="429"/> <source>Last stop at 6m</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="409"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="430"/> <source>50% avg. depth to 6m</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="410"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="431"/> <source>6m to surface</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="411"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="432"/> <source>m</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="414"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="415"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="435"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="436"/> <source>cuft/min</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="423"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="424"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="444"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="445"/> <source>ℓ/min</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="433"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="454"/> <source>bar</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="438"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="459"/> <source>psi</source> <translation type="unfinished"></translation> </message> @@ -5243,7 +5245,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa </message> <message> <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="256"/> - <source>GFLow at max depth</source> + <source>GFLow at max. depth</source> <translation type="unfinished"></translation> </message> <message> @@ -5663,17 +5665,17 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <context> <name>PrintDialog</name> <message> - <location filename="../desktop-widgets/printdialog.cpp" line="102"/> + <location filename="../desktop-widgets/printdialog.cpp" line="103"/> <source>P&rint</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/printdialog.cpp" line="105"/> + <location filename="../desktop-widgets/printdialog.cpp" line="106"/> <source>&Preview</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/printdialog.cpp" line="117"/> + <location filename="../desktop-widgets/printdialog.cpp" line="118"/> <source>Print</source> <translation type="unfinished"></translation> </message> @@ -5884,96 +5886,96 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="204"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="206"/> <source>working in no-cloud mode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="218"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="220"/> <source>no cloud credentials</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="219"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="271"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="221"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="273"/> <source>Please enter valid cloud credentials.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="286"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="288"/> <source>Attempting to open cloud storage with new credentials</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="308"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="310"/> <source>Testing cloud credentials</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="322"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="324"/> <source>No response from cloud server to validate the credentials</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="331"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="333"/> <source>Cannot connect to cloud storage - cloud account not verified</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="363"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="365"/> <source>Cloud credentials are invalid</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="376"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="378"/> <source>Cannot open cloud storage: Error creating https connection</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="389"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="391"/> <source>Cannot open cloud storage: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="401"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="403"/> <source>Cannot connect to cloud storage</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="443"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="445"/> <source>Cloud storage error: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="533"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="535"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="554"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="558"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="724"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="725"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="728"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="729"/> <source>h</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="724"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="725"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="726"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="728"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="729"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="730"/> <source>min</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="724"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="728"/> <source>sec</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1103"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1107"/> <source>Unknown GPS location</source> <translation type="unfinished"></translation> </message> @@ -5986,64 +5988,64 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/qthelper.cpp" line="766"/> - <location filename="../core/qthelper.cpp" line="1272"/> + <location filename="../core/qthelper.cpp" line="790"/> + <location filename="../core/qthelper.cpp" line="1296"/> <source>m</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/qthelper.cpp" line="768"/> - <location filename="../core/qthelper.cpp" line="1271"/> + <location filename="../core/qthelper.cpp" line="792"/> + <location filename="../core/qthelper.cpp" line="1295"/> <source>ft</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/qthelper.cpp" line="794"/> + <location filename="../core/qthelper.cpp" line="818"/> <source>C</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/qthelper.cpp" line="796"/> + <location filename="../core/qthelper.cpp" line="820"/> <source>F</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/qthelper.cpp" line="821"/> - <location filename="../core/qthelper.cpp" line="1247"/> + <location filename="../core/qthelper.cpp" line="845"/> + <location filename="../core/qthelper.cpp" line="1271"/> <source>kg</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/qthelper.cpp" line="823"/> - <location filename="../core/qthelper.cpp" line="1248"/> + <location filename="../core/qthelper.cpp" line="847"/> + <location filename="../core/qthelper.cpp" line="1272"/> <source>lbs</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/qthelper.cpp" line="848"/> - <location filename="../core/qthelper.cpp" line="1297"/> + <location filename="../core/qthelper.cpp" line="872"/> + <location filename="../core/qthelper.cpp" line="1321"/> <source>bar</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/qthelper.cpp" line="850"/> - <location filename="../core/qthelper.cpp" line="1296"/> + <location filename="../core/qthelper.cpp" line="874"/> + <location filename="../core/qthelper.cpp" line="1320"/> <source>psi</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/qthelper.cpp" line="871"/> - <location filename="../core/qthelper.cpp" line="1232"/> + <location filename="../core/qthelper.cpp" line="895"/> + <location filename="../core/qthelper.cpp" line="1256"/> <source>AIR</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/qthelper.cpp" line="873"/> + <location filename="../core/qthelper.cpp" line="897"/> <source>EAN</source> <translation type="unfinished"></translation> </message> <message numerus="yes"> - <location filename="../core/qthelper.cpp" line="962"/> + <location filename="../core/qthelper.cpp" line="986"/> <source>(%n dive(s))</source> <translation type="unfinished"> <numerusform></numerusform> @@ -6051,17 +6053,17 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> </translation> </message> <message> - <location filename="../core/qthelper.cpp" line="1232"/> + <location filename="../core/qthelper.cpp" line="1256"/> <source>OXYGEN</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/qthelper.cpp" line="1319"/> + <location filename="../core/qthelper.cpp" line="1343"/> <source>l</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/qthelper.cpp" line="1320"/> + <location filename="../core/qthelper.cpp" line="1344"/> <source>cuft</source> <translation type="unfinished"></translation> </message> @@ -6524,22 +6526,22 @@ Not all images have timestamps in the range between <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/about.ui" line="80"/> + <location filename="../desktop-widgets/about.ui" line="83"/> <source>&License</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/about.ui" line="87"/> + <location filename="../desktop-widgets/about.ui" line="90"/> <source>Credits</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/about.ui" line="94"/> + <location filename="../desktop-widgets/about.ui" line="97"/> <source>&Website</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/about.ui" line="101"/> + <location filename="../desktop-widgets/about.ui" line="104"/> <source>&Close</source> <translation type="unfinished"></translation> </message> @@ -6739,87 +6741,92 @@ Not all images have timestamps in the range between <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/templateedit.ui" line="241"/> + <location filename="../desktop-widgets/templateedit.ui" line="227"/> + <source>Border width</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../desktop-widgets/templateedit.ui" line="271"/> <source>Template</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/templateedit.ui" line="264"/> + <location filename="../desktop-widgets/templateedit.ui" line="294"/> <source>Colors</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/templateedit.ui" line="280"/> + <location filename="../desktop-widgets/templateedit.ui" line="310"/> <source>Background</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/templateedit.ui" line="293"/> + <location filename="../desktop-widgets/templateedit.ui" line="323"/> <source>color1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/templateedit.ui" line="303"/> - <location filename="../desktop-widgets/templateedit.ui" line="343"/> - <location filename="../desktop-widgets/templateedit.ui" line="383"/> - <location filename="../desktop-widgets/templateedit.ui" line="423"/> - <location filename="../desktop-widgets/templateedit.ui" line="463"/> - <location filename="../desktop-widgets/templateedit.ui" line="503"/> + <location filename="../desktop-widgets/templateedit.ui" line="333"/> + <location filename="../desktop-widgets/templateedit.ui" line="373"/> + <location filename="../desktop-widgets/templateedit.ui" line="413"/> + <location filename="../desktop-widgets/templateedit.ui" line="453"/> + <location filename="../desktop-widgets/templateedit.ui" line="493"/> + <location filename="../desktop-widgets/templateedit.ui" line="533"/> <source>Edit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/templateedit.ui" line="320"/> + <location filename="../desktop-widgets/templateedit.ui" line="350"/> <source>Table cells 1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/templateedit.ui" line="333"/> + <location filename="../desktop-widgets/templateedit.ui" line="363"/> <source>color2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/templateedit.ui" line="360"/> + <location filename="../desktop-widgets/templateedit.ui" line="390"/> <source>Table cells 2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/templateedit.ui" line="373"/> + <location filename="../desktop-widgets/templateedit.ui" line="403"/> <source>color3</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/templateedit.ui" line="400"/> + <location filename="../desktop-widgets/templateedit.ui" line="430"/> <source>Text 1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/templateedit.ui" line="413"/> + <location filename="../desktop-widgets/templateedit.ui" line="443"/> <source>color4</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/templateedit.ui" line="440"/> + <location filename="../desktop-widgets/templateedit.ui" line="470"/> <source>Text 2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/templateedit.ui" line="453"/> + <location filename="../desktop-widgets/templateedit.ui" line="483"/> <source>color5</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/templateedit.ui" line="480"/> + <location filename="../desktop-widgets/templateedit.ui" line="510"/> <source>Borders</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/templateedit.ui" line="493"/> + <location filename="../desktop-widgets/templateedit.ui" line="523"/> <source>color6</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/templateedit.cpp" line="133"/> + <location filename="../desktop-widgets/templateedit.cpp" line="140"/> <source>Do you want to save your changes?</source> <translation type="unfinished"></translation> </message> @@ -6947,7 +6954,17 @@ Not all images have timestamps in the range between </message> <message> <location filename="../qt-models/divetripmodel.cpp" line="226"/> - <source>Temp(%1%2)</source> + <source>Temp.(%1%2)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="235"/> + <source>Cylinder</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="249"/> + <source>Max. CNS</source> <translation type="unfinished"></translation> </message> <message> @@ -6971,11 +6988,6 @@ Not all images have timestamps in the range between <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="235"/> - <source>Cyl</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../qt-models/divetripmodel.cpp" line="238"/> <source>Gas</source> <translation type="unfinished"></translation> @@ -6996,11 +7008,6 @@ Not all images have timestamps in the range between <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="249"/> - <source>Max CNS</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../qt-models/divetripmodel.cpp" line="252"/> <source>Photos before/during/after dive</source> <translation type="unfinished"></translation> @@ -7120,67 +7127,67 @@ If you don't want Subsurface to continue checking, please click Decline.</s <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/usersurvey.ui" line="31"/> + <location filename="../desktop-widgets/usersurvey.ui" line="168"/> <source>Subsurface user survey</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/usersurvey.ui" line="44"/> + <location filename="../desktop-widgets/usersurvey.ui" line="20"/> <source><html><head/><body><p>We would love to learn more about our users, their preferences and their usage habits. Please spare a minute to fill out this form and submit it to the Subsurface team.</p></body></html></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/usersurvey.ui" line="63"/> + <location filename="../desktop-widgets/usersurvey.ui" line="47"/> <source>Technical diver</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/usersurvey.ui" line="76"/> + <location filename="../desktop-widgets/usersurvey.ui" line="54"/> <source>Recreational diver</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/usersurvey.ui" line="89"/> + <location filename="../desktop-widgets/usersurvey.ui" line="61"/> <source>Dive planner</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/usersurvey.ui" line="102"/> + <location filename="../desktop-widgets/usersurvey.ui" line="82"/> <source>Supported dive computer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/usersurvey.ui" line="115"/> + <location filename="../desktop-widgets/usersurvey.ui" line="89"/> <source>Other software/sources</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/usersurvey.ui" line="128"/> + <location filename="../desktop-widgets/usersurvey.ui" line="96"/> <source>Manually entering dives</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/usersurvey.ui" line="141"/> + <location filename="../desktop-widgets/usersurvey.ui" line="103"/> <source>Android/iPhone companion app</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/usersurvey.ui" line="154"/> + <location filename="../desktop-widgets/usersurvey.ui" line="117"/> <source>Any suggestions? (in English)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/usersurvey.ui" line="177"/> + <location filename="../desktop-widgets/usersurvey.ui" line="127"/> <source>The following information about your system will also be submitted.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/usersurvey.ui" line="231"/> + <location filename="../desktop-widgets/usersurvey.ui" line="40"/> <source>What kind of diver are you?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/usersurvey.ui" line="270"/> + <location filename="../desktop-widgets/usersurvey.ui" line="75"/> <source>Where are you importing data from?</source> <translation type="unfinished"></translation> </message> @@ -7486,7 +7493,7 @@ Maximum</source> <context> <name>getextFromC</name> <message> - <location filename="../core/libdivecomputer.c" line="776"/> + <location filename="../core/libdivecomputer.c" line="779"/> <source>Error parsing the header</source> <translation type="unfinished"></translation> </message> @@ -7494,163 +7501,158 @@ Maximum</source> <context> <name>gettextFromC</name> <message> - <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="232"/> + <location filename="../core/cochran.c" line="311"/> + <location filename="../core/cochran.c" line="317"/> + <location filename="../core/cochran.c" line="387"/> + <location filename="../core/libdivecomputer.c" line="235"/> <source>deco stop</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/cochran.c" line="336"/> - <location filename="../core/cochran.c" line="390"/> - <location filename="../core/datatrak.c" line="112"/> + <location filename="../core/cochran.c" line="338"/> + <location filename="../core/cochran.c" line="392"/> + <location filename="../core/datatrak.c" line="114"/> <location filename="../core/file.c" line="777"/> - <location filename="../core/libdivecomputer.c" line="234"/> + <location filename="../core/libdivecomputer.c" line="237"/> <source>ascent</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/cochran.c" line="342"/> + <location filename="../core/cochran.c" line="344"/> <location filename="../core/file.c" line="755"/> <source>battery</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/cochran.c" line="348"/> - <location filename="../core/libdivecomputer.c" line="250"/> + <location filename="../core/cochran.c" line="350"/> + <location filename="../core/libdivecomputer.c" line="253"/> <source>OLF</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/cochran.c" line="353"/> - <location filename="../core/libdivecomputer.c" line="249"/> + <location filename="../core/cochran.c" line="355"/> + <location filename="../core/libdivecomputer.c" line="252"/> <source>maxdepth</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/cochran.c" line="358"/> - <location filename="../core/cochran.c" line="404"/> - <location filename="../core/libdivecomputer.c" line="251"/> + <location filename="../core/cochran.c" line="360"/> + <location filename="../core/cochran.c" line="406"/> + <location filename="../core/libdivecomputer.c" line="254"/> <source>pO₂</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/cochran.c" line="365"/> - <location filename="../core/cochran.c" line="414"/> - <location filename="../core/cochran.c" line="421"/> + <location filename="../core/cochran.c" line="367"/> + <location filename="../core/cochran.c" line="416"/> + <location filename="../core/cochran.c" line="423"/> <location filename="../core/file.c" line="868"/> - <location filename="../core/libdivecomputer.c" line="242"/> - <location filename="../core/libdivecomputer.c" line="256"/> + <location filename="../core/libdivecomputer.c" line="245"/> + <location filename="../core/libdivecomputer.c" line="259"/> <source>gaschange</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/cochran.c" line="370"/> - <location filename="../core/cochran.c" line="409"/> - <location filename="../core/datatrak.c" line="110"/> - <location filename="../core/libdivecomputer.c" line="233"/> + <location filename="../core/cochran.c" line="372"/> + <location filename="../core/cochran.c" line="411"/> + <location filename="../core/datatrak.c" line="112"/> + <location filename="../core/libdivecomputer.c" line="236"/> <source>rbt</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/cochran.c" line="379"/> - <location filename="../core/cochran.c" line="426"/> - <location filename="../core/datatrak.c" line="114"/> - <location filename="../core/libdivecomputer.c" line="235"/> + <location filename="../core/cochran.c" line="381"/> + <location filename="../core/cochran.c" line="428"/> + <location filename="../core/datatrak.c" line="116"/> + <location filename="../core/libdivecomputer.c" line="238"/> <source>ceiling</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/cochran.c" line="395"/> - <location filename="../core/datatrak.c" line="118"/> - <location filename="../core/libdivecomputer.c" line="237"/> + <location filename="../core/cochran.c" line="397"/> + <location filename="../core/datatrak.c" line="120"/> + <location filename="../core/libdivecomputer.c" line="240"/> <source>transmitter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/datatrak.c" line="153"/> - <source>Error: the file does not appear to be a DATATRAK divelog</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../core/datatrak.c" line="286"/> + <location filename="../core/datatrak.c" line="288"/> <source>clear</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/datatrak.c" line="289"/> + <location filename="../core/datatrak.c" line="291"/> <source>misty</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/datatrak.c" line="292"/> + <location filename="../core/datatrak.c" line="294"/> <source>fog</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/datatrak.c" line="295"/> + <location filename="../core/datatrak.c" line="297"/> <source>rain</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/datatrak.c" line="298"/> + <location filename="../core/datatrak.c" line="300"/> <source>storm</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/datatrak.c" line="301"/> + <location filename="../core/datatrak.c" line="303"/> <source>snow</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/datatrak.c" line="321"/> + <location filename="../core/datatrak.c" line="323"/> <source>No suit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/datatrak.c" line="324"/> + <location filename="../core/datatrak.c" line="326"/> <source>Shorty</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/datatrak.c" line="327"/> + <location filename="../core/datatrak.c" line="329"/> <source>Combi</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/datatrak.c" line="330"/> + <location filename="../core/datatrak.c" line="332"/> <source>Wet suit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/datatrak.c" line="333"/> + <location filename="../core/datatrak.c" line="335"/> <source>Semidry suit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/datatrak.c" line="336"/> + <location filename="../core/datatrak.c" line="338"/> <source>Dry suit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/datatrak.c" line="396"/> + <location filename="../core/datatrak.c" line="398"/> <source>no stop</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/datatrak.c" line="398"/> + <location filename="../core/datatrak.c" line="400"/> <location filename="../core/dive.c" line="29"/> <source>deco</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/datatrak.c" line="400"/> + <location filename="../core/datatrak.c" line="402"/> <source>single ascent</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/datatrak.c" line="402"/> + <location filename="../core/datatrak.c" line="404"/> <source>multiple ascent</source> <translation type="unfinished"></translation> </message> @@ -7660,115 +7662,120 @@ Maximum</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/datatrak.c" line="404"/> - <source>fresh water</source> + <location filename="../core/datatrak.c" line="155"/> + <source>Error: the file does not appear to be a DATATRAK dive log</source> <translation type="unfinished"></translation> </message> <message> <location filename="../core/datatrak.c" line="406"/> + <source>fresh water</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../core/datatrak.c" line="408"/> <source>salt water</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/datatrak.c" line="431"/> + <location filename="../core/datatrak.c" line="433"/> <source>sight seeing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/datatrak.c" line="433"/> + <location filename="../core/datatrak.c" line="435"/> <source>club dive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/datatrak.c" line="435"/> + <location filename="../core/datatrak.c" line="437"/> <location filename="../core/dive.c" line="28"/> <source>instructor</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/datatrak.c" line="437"/> + <location filename="../core/datatrak.c" line="439"/> <source>instruction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/datatrak.c" line="439"/> + <location filename="../core/datatrak.c" line="441"/> <location filename="../core/dive.c" line="27"/> <source>night</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/datatrak.c" line="441"/> + <location filename="../core/datatrak.c" line="443"/> <location filename="../core/dive.c" line="25"/> <source>cave</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/datatrak.c" line="443"/> + <location filename="../core/datatrak.c" line="445"/> <location filename="../core/dive.c" line="24"/> <source>ice</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/datatrak.c" line="445"/> + <location filename="../core/datatrak.c" line="447"/> <source>search</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/datatrak.c" line="455"/> + <location filename="../core/datatrak.c" line="457"/> <location filename="../core/dive.c" line="25"/> <source>wreck</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/datatrak.c" line="457"/> + <location filename="../core/datatrak.c" line="459"/> <location filename="../core/dive.c" line="26"/> <source>river</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/datatrak.c" line="459"/> + <location filename="../core/datatrak.c" line="461"/> <location filename="../core/dive.c" line="23"/> <source>drift</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/datatrak.c" line="461"/> + <location filename="../core/datatrak.c" line="463"/> <location filename="../core/dive.c" line="28"/> <source>photo</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/datatrak.c" line="463"/> + <location filename="../core/datatrak.c" line="465"/> <source>other</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/datatrak.c" line="474"/> + <location filename="../core/datatrak.c" line="476"/> <source>Other activities</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/datatrak.c" line="498"/> + <location filename="../core/datatrak.c" line="500"/> <source>Datatrak/Wlog notes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/datatrak.c" line="537"/> + <location filename="../core/datatrak.c" line="539"/> <source>Manually entered dive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/datatrak.c" line="588"/> + <location filename="../core/datatrak.c" line="590"/> <source>Unknown</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/datatrak.c" line="674"/> + <location filename="../core/datatrak.c" line="676"/> <source>Error: couldn't open the file %s</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/datatrak.c" line="687"/> + <location filename="../core/datatrak.c" line="689"/> <source>Error: no dive</source> <translation type="unfinished"></translation> </message> @@ -7829,9 +7836,9 @@ Maximum</source> </message> <message> <location filename="../core/dive.c" line="33"/> - <location filename="../core/equipment.c" line="88"/> - <location filename="../core/planner.c" line="1479"/> - <location filename="../core/planner.c" line="1482"/> + <location filename="../core/equipment.c" line="90"/> + <location filename="../core/planner.c" line="1534"/> + <location filename="../core/planner.c" line="1537"/> <source>oxygen</source> <translation type="unfinished"></translation> </message> @@ -7868,93 +7875,93 @@ Maximum</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/dive.c" line="269"/> + <location filename="../core/dive.c" line="273"/> <location filename="../core/qthelper.cpp" line="595"/> <location filename="../core/qthelper.cpp" line="610"/> <source>m</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/dive.c" line="274"/> + <location filename="../core/dive.c" line="278"/> <location filename="../core/qthelper.cpp" line="598"/> <location filename="../core/qthelper.cpp" line="612"/> <source>ft</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/dive.c" line="297"/> + <location filename="../core/dive.c" line="301"/> <source>m/min</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/dive.c" line="299"/> + <location filename="../core/dive.c" line="303"/> <source>m/s</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/dive.c" line="304"/> + <location filename="../core/dive.c" line="308"/> <source>ft/min</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/dive.c" line="306"/> + <location filename="../core/dive.c" line="310"/> <source>ft/s</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/dive.c" line="325"/> + <location filename="../core/dive.c" line="329"/> <location filename="../core/qthelper.cpp" line="621"/> <location filename="../core/qthelper.cpp" line="631"/> <source>lbs</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/dive.c" line="329"/> + <location filename="../core/dive.c" line="333"/> <location filename="../core/qthelper.cpp" line="619"/> <location filename="../core/qthelper.cpp" line="629"/> <source>kg</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/dive.c" line="1751"/> + <location filename="../core/dive.c" line="1755"/> <source>(%s) or (%s)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../core/divelist.c" line="491"/> - <location filename="../core/equipment.c" line="84"/> - <location filename="../core/planner.c" line="1475"/> - <location filename="../core/planner.c" line="1478"/> + <location filename="../core/equipment.c" line="86"/> + <location filename="../core/planner.c" line="1530"/> + <location filename="../core/planner.c" line="1533"/> <source>air</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/equipment.c" line="86"/> + <location filename="../core/equipment.c" line="88"/> <source>EAN%d</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/equipment.c" line="198"/> + <location filename="../core/equipment.c" line="200"/> <source>integrated</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/equipment.c" line="199"/> + <location filename="../core/equipment.c" line="201"/> <source>belt</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/equipment.c" line="200"/> + <location filename="../core/equipment.c" line="202"/> <source>ankle</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/equipment.c" line="201"/> - <source>backplate weight</source> + <location filename="../core/equipment.c" line="203"/> + <source>backplate</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/equipment.c" line="202"/> + <location filename="../core/equipment.c" line="204"/> <source>clip-on</source> <translation type="unfinished"></translation> </message> @@ -8026,275 +8033,275 @@ Maximum</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/git-access.c" line="134"/> + <location filename="../core/git-access.c" line="136"/> <source>Local cache directory %s corrupted - can't sync with Subsurface cloud storage</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/git-access.c" line="157"/> - <location filename="../core/git-access.c" line="177"/> + <location filename="../core/git-access.c" line="159"/> + <location filename="../core/git-access.c" line="179"/> <source>Could not update local cache to newer remote data</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/git-access.c" line="170"/> + <location filename="../core/git-access.c" line="172"/> <source>Subsurface cloud storage corrupted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/git-access.c" line="284"/> + <location filename="../core/git-access.c" line="286"/> <source>Could not update Subsurface cloud storage, try again later</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/git-access.c" line="344"/> + <location filename="../core/git-access.c" line="346"/> <source>Remote storage and local data diverged. Error: merge failed (%s)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/git-access.c" line="374"/> + <location filename="../core/git-access.c" line="376"/> <source>Remote storage and local data diverged. Cannot combine local and remote changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/git-access.c" line="408"/> + <location filename="../core/git-access.c" line="410"/> <source>Remote storage and local data diverged</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/git-access.c" line="411"/> + <location filename="../core/git-access.c" line="413"/> <source>Remote storage and local data diverged. Error: writing the data failed (%s)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/git-access.c" line="420"/> + <location filename="../core/git-access.c" line="422"/> <source>Problems with local cache of Subsurface cloud data</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/git-access.c" line="421"/> + <location filename="../core/git-access.c" line="423"/> <source>Moved cache data to %s. Please try the operation again.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/git-access.c" line="743"/> + <location filename="../core/git-access.c" line="745"/> <source>Error connecting to Subsurface cloud storage</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/git-access.c" line="746"/> + <location filename="../core/git-access.c" line="748"/> <source>git clone of %s failed (%s)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="218"/> - <location filename="../core/parse-xml.c" line="3313"/> + <location filename="../core/libdivecomputer.c" line="221"/> + <location filename="../core/parse-xml.c" line="3315"/> <location filename="../core/uemis-downloader.c" line="134"/> <source>unknown</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="231"/> + <location filename="../core/libdivecomputer.c" line="234"/> <source>none</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/datatrak.c" line="116"/> - <location filename="../core/libdivecomputer.c" line="236"/> + <location filename="../core/datatrak.c" line="118"/> + <location filename="../core/libdivecomputer.c" line="239"/> <source>workload</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="238"/> + <location filename="../core/libdivecomputer.c" line="241"/> <source>violation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="239"/> + <location filename="../core/libdivecomputer.c" line="242"/> <source>bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="240"/> + <location filename="../core/libdivecomputer.c" line="243"/> <source>surface</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="241"/> + <location filename="../core/libdivecomputer.c" line="244"/> <source>safety stop</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="243"/> + <location filename="../core/libdivecomputer.c" line="246"/> <source>safety stop (voluntary)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="244"/> + <location filename="../core/libdivecomputer.c" line="247"/> <source>safety stop (mandatory)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="245"/> + <location filename="../core/libdivecomputer.c" line="248"/> <source>deepstop</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="246"/> + <location filename="../core/libdivecomputer.c" line="249"/> <source>ceiling (safety stop)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="247"/> + <location filename="../core/libdivecomputer.c" line="250"/> <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="../core/libdivecomputer.c" line="248"/> + <location filename="../core/libdivecomputer.c" line="251"/> <source>divetime</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="252"/> + <location filename="../core/libdivecomputer.c" line="255"/> <source>airtime</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="253"/> + <location filename="../core/libdivecomputer.c" line="256"/> <source>rgbm</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="254"/> + <location filename="../core/libdivecomputer.c" line="257"/> <source>heading</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="255"/> + <location filename="../core/libdivecomputer.c" line="258"/> <source>tissue level warning</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="265"/> + <location filename="../core/libdivecomputer.c" line="268"/> <source>invalid event number</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="592"/> + <location filename="../core/libdivecomputer.c" line="595"/> <source>Error parsing the datetime</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="610"/> + <location filename="../core/libdivecomputer.c" line="613"/> <source>Dive %d: %s</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="616"/> + <location filename="../core/libdivecomputer.c" line="619"/> <source>Error parsing the divetime</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="626"/> + <location filename="../core/libdivecomputer.c" line="629"/> <source>Error parsing the maxdepth</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="645"/> + <location filename="../core/libdivecomputer.c" line="648"/> <source>Error parsing temperature</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="665"/> + <location filename="../core/libdivecomputer.c" line="668"/> <source>Error parsing the gas mix count</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="677"/> + <location filename="../core/libdivecomputer.c" line="680"/> <source>Error obtaining water salinity</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="686"/> + <location filename="../core/libdivecomputer.c" line="689"/> <source>Error obtaining surface pressure</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="711"/> - <source>Error obtaining divemode</source> + <location filename="../core/libdivecomputer.c" line="714"/> + <source>Error obtaining dive mode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="731"/> + <location filename="../core/libdivecomputer.c" line="734"/> <source>Error parsing the gas mix</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="756"/> + <location filename="../core/libdivecomputer.c" line="759"/> <source>Unable to create parser for %s %s</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="762"/> + <location filename="../core/libdivecomputer.c" line="765"/> <source>Error registering the data</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="783"/> + <location filename="../core/libdivecomputer.c" line="786"/> <source>Error parsing the samples</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="921"/> + <location filename="../core/libdivecomputer.c" line="924"/> <source>Event: waiting for user action</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="929"/> + <location filename="../core/libdivecomputer.c" line="932"/> <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="993"/> + <location filename="../core/libdivecomputer.c" line="996"/> <source>Error registering the event handler.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="998"/> + <location filename="../core/libdivecomputer.c" line="1001"/> <source>Error registering the cancellation handler.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1019"/> + <location filename="../core/libdivecomputer.c" line="1022"/> <source>Dive data import error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1058"/> + <location filename="../core/libdivecomputer.c" line="1061"/> <source>Unable to create libdivecomputer context</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1065"/> + <location filename="../core/libdivecomputer.c" line="1068"/> <source>Unable to open %s %s (%s)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1087"/> + <location filename="../core/libdivecomputer.c" line="1090"/> <source>Insufficient privileges to open the device %s %s (%s)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/load-git.c" line="194"/> - <location filename="../core/parse-xml.c" line="1242"/> + <location filename="../core/load-git.c" line="196"/> + <location filename="../core/parse-xml.c" line="1244"/> <source>multiple GPS locations for this dive site; also %s </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/load-git.c" line="222"/> - <location filename="../core/parse-xml.c" line="1304"/> + <location filename="../core/load-git.c" line="224"/> + <location filename="../core/parse-xml.c" line="1306"/> <source>additional name for site: %s </source> <translation type="unfinished"></translation> @@ -8311,47 +8318,48 @@ Maximum</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/parse-xml.c" line="517"/> + <location filename="../core/parse-xml.c" line="519"/> <source>Strange percentage reading %s </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/parse-xml.c" line="2047"/> + <location filename="../core/parse-xml.c" line="2049"/> <source>Failed to parse '%s'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/parse-xml.c" line="3771"/> + <location filename="../core/parse-xml.c" line="3773"/> <source>Can't open stylesheet %s</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/planner.c" line="561"/> + <location filename="../core/planner.c" line="562"/> <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE %s ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/planner.c" line="575"/> + <location filename="../core/planner.c" line="576"/> <source>Decompression calculation aborted due to excessive time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/planner.c" line="577"/> - <location filename="../core/planner.c" line="871"/> - <location filename="../core/planner.c" line="877"/> - <location filename="../core/planner.c" line="903"/> - <location filename="../core/planner.c" line="913"/> + <location filename="../core/planner.c" line="578"/> + <location filename="../core/planner.c" line="886"/> + <location filename="../core/planner.c" line="892"/> + <location filename="../core/planner.c" line="921"/> + <location filename="../core/planner.c" line="956"/> + <location filename="../core/planner.c" line="968"/> <source>Warning:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/planner.c" line="815"/> + <location filename="../core/planner.c" line="827"/> <source>, effective GF=%d/%d</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/planner.c" line="589"/> + <location filename="../core/planner.c" line="590"/> <source>Subsurface dive plan (surface interval </source> <translation type="unfinished"></translation> </message> @@ -8362,164 +8370,174 @@ Maximum</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/planner.c" line="593"/> + <location filename="../core/planner.c" line="594"/> <source>Subsurface dive plan</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/planner.c" line="596"/> + <location filename="../core/planner.c" line="597"/> <source>Runtime: %dmin<br></div></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/planner.c" line="601"/> + <location filename="../core/planner.c" line="602"/> <source>depth</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/planner.c" line="604"/> + <location filename="../core/planner.c" line="605"/> <source>duration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/planner.c" line="607"/> + <location filename="../core/planner.c" line="608"/> <source>runtime</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/planner.c" line="610"/> + <location filename="../core/planner.c" line="611"/> <source>gas</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/planner.c" line="653"/> + <location filename="../core/planner.c" line="665"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/planner.c" line="661"/> + <location filename="../core/planner.c" line="673"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/planner.c" line="674"/> + <location filename="../core/planner.c" line="686"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/planner.c" line="681"/> + <location filename="../core/planner.c" line="693"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/planner.c" line="726"/> + <location filename="../core/planner.c" line="738"/> <source>%3.0f%s</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/planner.c" line="729"/> - <location filename="../core/planner.c" line="733"/> + <location filename="../core/planner.c" line="741"/> + <location filename="../core/planner.c" line="745"/> <source>%3dmin</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/planner.c" line="742"/> <location filename="../core/planner.c" line="754"/> + <location filename="../core/planner.c" line="766"/> <source>(SP = %.1fbar)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/planner.c" line="777"/> + <location filename="../core/planner.c" line="789"/> <source>Switch gas to %s (SP = %.1fbar)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/planner.c" line="779"/> + <location filename="../core/planner.c" line="791"/> <source>Switch gas to %s</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/planner.c" line="799"/> + <location filename="../core/planner.c" line="811"/> <source>CNS</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/planner.c" line="801"/> + <location filename="../core/planner.c" line="813"/> <source>OTU</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/planner.c" line="806"/> + <location filename="../core/planner.c" line="818"/> <source>Deco model: Bühlmann ZHL-16C with GFlow = %d and GFhigh = %d</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/planner.c" line="811"/> + <location filename="../core/planner.c" line="823"/> <source>Deco model: VPM-B at nominal conservatism</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/planner.c" line="813"/> + <location filename="../core/planner.c" line="825"/> <source>Deco model: VPM-B at +%d conservatism</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/planner.c" line="819"/> + <location filename="../core/planner.c" line="831"/> <source>Deco model: Recreational mode based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/planner.c" line="827"/> + <location filename="../core/planner.c" line="839"/> <source>ATM pressure: %dmbar (%d%s)<br></div></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/planner.c" line="845"/> + <location filename="../core/planner.c" line="857"/> <source>Gas consumption (CCR legs excluded):</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/planner.c" line="847"/> + <location filename="../core/planner.c" line="859"/> <source>Gas consumption (based on SAC</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/planner.c" line="872"/> + <location filename="../core/planner.c" line="887"/> <source>this is more gas than available in the specified cylinder!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/planner.c" line="878"/> + <location filename="../core/planner.c" line="893"/> <source>not enough reserve for gas sharing on ascent!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/planner.c" line="880"/> - <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source> + <location filename="../core/planner.c" line="915"/> + <source><br>&nbsp;&mdash; <span style='color: green;'>Minimum gas</span> (based on %.1fxSAC/+%dmin@%.0f%s): %.0f%s/%.0f%s</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../core/planner.c" line="922"/> + <source>required minimum gas for ascent already exceeding start pressure of cylinder!</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../core/planner.c" line="925"/> + <source>%.0f%s/%.0f%s of <span style='color: red;'><b>%s</b></span> (%.0f%s/%.0f%s in planned ascent)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/planner.c" line="882"/> - <source>%.0f%s (%.0f%s during planned ascent) of %s</source> + <location filename="../core/planner.c" line="928"/> + <source>%.0f%s (%.0f%s during planned ascent) of <span style='color: red;'><b>%s</b></span></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/planner.c" line="900"/> + <location filename="../core/planner.c" line="953"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/planner.c" line="910"/> + <location filename="../core/planner.c" line="965"/> <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/planner.c" line="1237"/> + <location filename="../core/planner.c" line="1292"/> <source>Can't find gas %s</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/planner.c" line="1483"/> + <location filename="../core/planner.c" line="1538"/> <source>ean</source> <translation type="unfinished"></translation> </message> @@ -8605,20 +8623,20 @@ EADD: %d%s <translation type="unfinished"></translation> </message> <message> - <location filename="../core/profile.c" line="1353"/> - <source>Safetystop: unkn time @ %.0f%s + <location filename="../core/profile.c" line="1358"/> + <source>Deco: %umin @ %.0f%s </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/profile.c" line="1358"/> - <source>Deco: %umin @ %.0f%s + <location filename="../core/profile.c" line="1353"/> + <source>Safetystop: unknown time @ %.0f%s </source> <translation type="unfinished"></translation> </message> <message> <location filename="../core/profile.c" line="1361"/> - <source>Deco: unkn time @ %.0f%s + <source>Deco: unknown time @ %.0f%s </source> <translation type="unfinished"></translation> </message> @@ -8748,7 +8766,7 @@ EADD: %d%s </message> <message> <location filename="../core/profile.c" line="1576"/> - <source>%s SAC:%.*f %s</source> + <source>%s SAC: %.*f%s</source> <translation type="unfinished"></translation> </message> <message> @@ -8806,281 +8824,286 @@ EADD: %d%s <translation type="unfinished"></translation> </message> <message> - <location filename="../core/save-html.c" line="469"/> - <location filename="../core/save-html.c" line="553"/> - <location filename="../core/worldmap-save.c" line="111"/> + <location filename="../core/save-html.c" line="471"/> + <location filename="../core/save-html.c" line="555"/> + <location filename="../core/worldmap-save.c" line="113"/> <source>Can't open file %s</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/save-html.c" line="488"/> + <location filename="../core/save-html.c" line="490"/> <source>Number</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/save-html.c" line="489"/> + <location filename="../core/save-html.c" line="491"/> <source>Date</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/save-html.c" line="490"/> + <location filename="../core/save-html.c" line="492"/> <source>Time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/save-html.c" line="491"/> + <location filename="../core/save-html.c" line="493"/> <source>Location</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/save-html.c" line="492"/> + <location filename="../core/save-html.c" line="494"/> <source>Air temp.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/save-html.c" line="493"/> + <location filename="../core/save-html.c" line="495"/> <source>Water temp.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/save-html.c" line="494"/> + <location filename="../core/save-html.c" line="496"/> <source>Dives</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/save-html.c" line="495"/> + <location filename="../core/save-html.c" line="497"/> <source>Expand all</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/save-html.c" line="496"/> + <location filename="../core/save-html.c" line="498"/> <source>Collapse all</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/save-html.c" line="497"/> + <location filename="../core/save-html.c" line="499"/> <source>Trips</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/save-html.c" line="498"/> + <location filename="../core/save-html.c" line="500"/> <source>Statistics</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/save-html.c" line="499"/> + <location filename="../core/save-html.c" line="501"/> <source>Advanced search</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/save-html.c" line="502"/> + <location filename="../core/save-html.c" line="504"/> <source>Rating</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/save-html.c" line="503"/> + <location filename="../core/save-html.c" line="505"/> <source>Visibility</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/save-html.c" line="504"/> + <location filename="../core/save-html.c" line="506"/> <source>Duration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/save-html.c" line="505"/> + <location filename="../core/save-html.c" line="507"/> <source>Divemaster</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/save-html.c" line="506"/> + <location filename="../core/save-html.c" line="508"/> <source>Buddy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/save-html.c" line="507"/> + <location filename="../core/save-html.c" line="509"/> <source>Suit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/save-html.c" line="508"/> + <location filename="../core/save-html.c" line="510"/> <source>Tags</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/save-html.c" line="509"/> + <location filename="../core/save-html.c" line="511"/> <location filename="../smtk-import/smartrak.c" line="248"/> <location filename="../smtk-import/smartrak.c" line="318"/> <source>Notes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/save-html.c" line="510"/> + <location filename="../core/save-html.c" line="512"/> <source>Show more details</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/save-html.c" line="513"/> + <location filename="../core/save-html.c" line="515"/> <source>Yearly statistics</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/save-html.c" line="514"/> + <location filename="../core/save-html.c" line="516"/> <source>Year</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/save-html.c" line="515"/> + <location filename="../core/save-html.c" line="517"/> <source>Total time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/save-html.c" line="516"/> + <location filename="../core/save-html.c" line="518"/> <source>Average time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/save-html.c" line="517"/> + <location filename="../core/save-html.c" line="519"/> <source>Shortest time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/save-html.c" line="518"/> + <location filename="../core/save-html.c" line="520"/> <source>Longest time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/save-html.c" line="519"/> + <location filename="../core/save-html.c" line="521"/> <source>Average depth</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/save-html.c" line="520"/> + <location filename="../core/save-html.c" line="522"/> <source>Min. depth</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/save-html.c" line="521"/> + <location filename="../core/save-html.c" line="523"/> <source>Max. depth</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/save-html.c" line="522"/> + <location filename="../core/save-html.c" line="524"/> <source>Average SAC</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/save-html.c" line="523"/> + <location filename="../core/save-html.c" line="525"/> <source>Min. SAC</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/save-html.c" line="524"/> + <location filename="../core/save-html.c" line="526"/> <source>Max. SAC</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/save-html.c" line="525"/> + <location filename="../core/save-html.c" line="527"/> <source>Average temp.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/save-html.c" line="526"/> + <location filename="../core/save-html.c" line="528"/> <source>Min. temp.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/save-html.c" line="527"/> + <location filename="../core/save-html.c" line="529"/> <source>Max. temp.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/save-html.c" line="528"/> + <location filename="../core/save-html.c" line="530"/> <source>Back to list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/save-html.c" line="531"/> - <source>Dive No.</source> + <location filename="../core/save-html.c" line="533"/> + <source>Dive #</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/save-html.c" line="532"/> + <location filename="../core/save-html.c" line="534"/> <source>Dive profile</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/save-html.c" line="533"/> + <location filename="../core/save-html.c" line="535"/> <source>Dive information</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/save-html.c" line="534"/> + <location filename="../core/save-html.c" line="536"/> <source>Dive equipment</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/save-html.c" line="535"/> - <location filename="../core/save-html.c" line="542"/> + <location filename="../core/save-html.c" line="537"/> + <location filename="../core/save-html.c" line="544"/> <source>Type</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/save-html.c" line="536"/> + <location filename="../core/save-html.c" line="538"/> <source>Size</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/save-html.c" line="537"/> + <location filename="../core/save-html.c" line="539"/> <source>Work pressure</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/save-html.c" line="538"/> + <location filename="../core/save-html.c" line="540"/> <source>Start pressure</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/save-html.c" line="539"/> + <location filename="../core/save-html.c" line="541"/> <source>End pressure</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/save-html.c" line="540"/> + <location filename="../core/save-html.c" line="542"/> <source>Gas</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/save-html.c" line="541"/> + <location filename="../core/save-html.c" line="543"/> <source>Weight</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/save-html.c" line="543"/> + <location filename="../core/save-html.c" line="545"/> <source>Events</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/save-html.c" line="544"/> + <location filename="../core/save-html.c" line="546"/> <source>Name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/save-html.c" line="545"/> + <location filename="../core/save-html.c" line="547"/> <source>Value</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/save-html.c" line="546"/> + <location filename="../core/save-html.c" line="548"/> <source>Coordinates</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/save-html.c" line="547"/> + <location filename="../core/save-html.c" line="549"/> <source>Dive status</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../core/statistics.c" line="195"/> + <source>All (by trip stats)</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../core/statistics.c" line="242"/> <source>more than %d days</source> <translation type="unfinished"></translation> @@ -9131,97 +9154,97 @@ EADD: %d%s <translation type="unfinished"></translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="125"/> + <location filename="../core/subsurfacestartup.c" line="127"/> <source>Sun</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="125"/> + <location filename="../core/subsurfacestartup.c" line="127"/> <source>Mon</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="125"/> + <location filename="../core/subsurfacestartup.c" line="127"/> <source>Tue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="125"/> + <location filename="../core/subsurfacestartup.c" line="127"/> <source>Wed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="125"/> + <location filename="../core/subsurfacestartup.c" line="127"/> <source>Thu</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="125"/> + <location filename="../core/subsurfacestartup.c" line="127"/> <source>Fri</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="125"/> + <location filename="../core/subsurfacestartup.c" line="127"/> <source>Sat</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="136"/> <source>Jan</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="136"/> <source>Feb</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="136"/> <source>Mar</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="136"/> <source>Apr</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="136"/> <source>May</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="136"/> <source>Jun</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="137"/> <source>Jul</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="137"/> <source>Aug</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="137"/> <source>Sep</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="137"/> <source>Oct</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="137"/> <source>Nov</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="137"/> <source>Dec</source> <translation type="unfinished"></translation> </message> @@ -9262,12 +9285,12 @@ Is the Uemis Zurich plugged in correctly?</source> </message> <message> <location filename="../core/uemis-downloader.c" line="495"/> - <source>divelog #</source> + <source>dive log #</source> <translation type="unfinished"></translation> </message> <message> <location filename="../core/uemis-downloader.c" line="497"/> - <source>divespot #</source> + <source>dive spot #</source> <translation type="unfinished"></translation> </message> <message> @@ -9431,47 +9454,47 @@ Is the Uemis Zurich plugged in correctly?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/worldmap-save.c" line="39"/> + <location filename="../core/worldmap-save.c" line="41"/> <source>Date:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/worldmap-save.c" line="41"/> + <location filename="../core/worldmap-save.c" line="43"/> <source>Time:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/worldmap-save.c" line="43"/> + <location filename="../core/worldmap-save.c" line="45"/> <source>Duration:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/worldmap-save.c" line="44"/> + <location filename="../core/worldmap-save.c" line="46"/> <source>min</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/worldmap-save.c" line="47"/> + <location filename="../core/worldmap-save.c" line="49"/> <source>Max. depth:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/worldmap-save.c" line="50"/> + <location filename="../core/worldmap-save.c" line="52"/> <source>Air temp.:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/worldmap-save.c" line="53"/> + <location filename="../core/worldmap-save.c" line="55"/> <source>Water temp.:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/worldmap-save.c" line="55"/> + <location filename="../core/worldmap-save.c" line="57"/> <source>Location:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../core/worldmap-save.c" line="59"/> + <location filename="../core/worldmap-save.c" line="61"/> <source>Notes:</source> <translation type="unfinished"></translation> </message> @@ -9784,8 +9807,8 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/plannerSettings.ui" line="288"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="549"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="578"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="582"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="611"/> <source>bar</source> <translation type="unfinished"></translation> </message> @@ -9822,6 +9845,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/plannerSettings.ui" line="370"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="777"/> <source>min</source> <translation type="unfinished"></translation> </message> @@ -9866,83 +9890,103 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="565"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="698"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="536"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="598"/> <source>ℓ/min</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="594"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="630"/> <source>m</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="606"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="738"/> + <source>SAC factor</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../desktop-widgets/plannerSettings.ui" line="745"/> + <source>Used to calculate minimum gas. Consider two divers with possibly increased SAC after OoG event.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../desktop-widgets/plannerSettings.ui" line="767"/> + <source>Problem solving time</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../desktop-widgets/plannerSettings.ui" line="774"/> + <source>Used to calculate minimum gas. Additional time at max. depth after OoG event.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../desktop-widgets/plannerSettings.ui" line="627"/> <source>Used to calculate best mix. Select best mix depth in 'Available gases' table by entering gas depth, followed by "B" (best trimix mix) or "BN" (best nitrox mix)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="613"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="646"/> <source>Bottom SAC</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="620"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="653"/> <source>Bottom pO₂</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="627"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="660"/> <source>Best mix END</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="634"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="667"/> <source>Notes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="655"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="688"/> <source>In dive plan, show runtime (absolute time) of stops</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="658"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="691"/> <source>Display runtime</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="668"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="701"/> <source>In dive plan, show duration (relative time) of stops</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="671"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="704"/> <source>Display segment duration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="678"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="711"/> <source>In diveplan, list transitions or treat them as implicit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="681"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="714"/> <source>Display transitions in deco</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="688"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="721"/> <source>Verbatim dive plan</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="711"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="731"/> <source>Deco pO₂</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="718"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="549"/> <source>Deco SAC</source> <translation type="unfinished"></translation> </message> |