aboutsummaryrefslogtreecommitdiffstats
path: root/translations/subsurface_et_EE.ts
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2017-04-23 12:36:13 -0700
committerGravatar Dirk Hohndel <dirk@hohndel.org>2017-04-23 12:36:13 -0700
commit51ee9d4405d5033b6e2d9551dec0805fc55e3718 (patch)
tree7468aa908a199b9ffd74fec7c5e4202b6269c688 /translations/subsurface_et_EE.ts
parent9c86a0f616054af577b84d55351606a3a1a2049f (diff)
downloadsubsurface-51ee9d4405d5033b6e2d9551dec0805fc55e3718.tar.gz
Latest translations
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'translations/subsurface_et_EE.ts')
-rw-r--r--translations/subsurface_et_EE.ts2326
1 files changed, 1225 insertions, 1101 deletions
diff --git a/translations/subsurface_et_EE.ts b/translations/subsurface_et_EE.ts
index 2dc50f59c..b66e2ffc2 100644
--- a/translations/subsurface_et_EE.ts
+++ b/translations/subsurface_et_EE.ts
@@ -2,25 +2,25 @@
<context>
<name>About</name>
<message>
- <location filename="../mobile-widgets/qml/About.qml" line="10"/>
- <location filename="../mobile-widgets/qml/About.qml" line="19"/>
+ <location filename="../mobile-widgets/qml/About.qml" line="9"/>
+ <location filename="../mobile-widgets/qml/About.qml" line="18"/>
<source>About Subsurface-mobile</source>
<translation>Subsurface-mobile kohta</translation>
</message>
<message>
- <location filename="../mobile-widgets/qml/About.qml" line="36"/>
+ <location filename="../mobile-widgets/qml/About.qml" line="35"/>
<source>A mobile version of the free Subsurface divelog software.
</source>
<translation>Mobiilne versioon vabavaralisest Subsurface sukeldumislogi rakendusest.
</translation>
</message>
<message>
- <location filename="../mobile-widgets/qml/About.qml" line="37"/>
+ <location filename="../mobile-widgets/qml/About.qml" line="36"/>
<source>View your dive logs while on the go.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qml/About.qml" line="48"/>
+ <location filename="../mobile-widgets/qml/About.qml" line="47"/>
<source>Version: %1
© Subsurface developer team
@@ -290,12 +290,12 @@
<context>
<name>BuddyFilter</name>
<message>
- <location filename="../desktop-widgets/simplewidgets.cpp" line="626"/>
+ <location filename="../desktop-widgets/simplewidgets.cpp" line="504"/>
<source>Person: </source>
<translation>Isik:</translation>
</message>
<message>
- <location filename="../desktop-widgets/simplewidgets.cpp" line="627"/>
+ <location filename="../desktop-widgets/simplewidgets.cpp" line="505"/>
<source>Searches for buddies and divemasters</source>
<translation>Otsi semusid ja divemastereid</translation>
</message>
@@ -512,42 +512,42 @@
<context>
<name>ConfigureDiveComputer</name>
<message>
- <location filename="../core/configuredivecomputer.cpp" line="220"/>
+ <location filename="../core/configuredivecomputer.cpp" line="219"/>
<source>Could not save the backup file %1. Error Message: %2</source>
<translation>Ei suuda salvestada varukoopia faili %1. Veateade: %2</translation>
</message>
<message>
- <location filename="../core/configuredivecomputer.cpp" line="236"/>
+ <location filename="../core/configuredivecomputer.cpp" line="235"/>
<source>Could not open backup file: %1</source>
<translation>Ei suuda avada varukoopia faili: %1</translation>
</message>
<message>
- <location filename="../core/configuredivecomputer.cpp" line="584"/>
+ <location filename="../core/configuredivecomputer.cpp" line="583"/>
<source>Dive computer details read successfully</source>
<translation>Sukeldumiskompuutri andmed edukalt loetud</translation>
</message>
<message>
- <location filename="../core/configuredivecomputer.cpp" line="593"/>
+ <location filename="../core/configuredivecomputer.cpp" line="592"/>
<source>Setting successfully written to device</source>
<translation>Seaded edukalt seadmesse kirjutatud</translation>
</message>
<message>
- <location filename="../core/configuredivecomputer.cpp" line="602"/>
+ <location filename="../core/configuredivecomputer.cpp" line="601"/>
<source>Device firmware successfully updated</source>
<translation>Seadme firmware edukalt uuendatud</translation>
</message>
<message>
- <location filename="../core/configuredivecomputer.cpp" line="611"/>
+ <location filename="../core/configuredivecomputer.cpp" line="610"/>
<source>Device settings successfully reset</source>
<translation>Seadme seaded edukalt algväärtustatud</translation>
</message>
<message>
- <location filename="../core/configuredivecomputer.cpp" line="627"/>
+ <location filename="../core/configuredivecomputer.cpp" line="626"/>
<source>Unable to create libdivecomputer context</source>
<translation>Ei saa luua libdivecomputer konteksti</translation>
</message>
<message>
- <location filename="../core/configuredivecomputer.cpp" line="656"/>
+ <location filename="../core/configuredivecomputer.cpp" line="655"/>
<source>Could not a establish connection to the dive computer.</source>
<translation>Ei suuda luua sidet sukeldumiskompuutriga.</translation>
</message>
@@ -853,6 +853,7 @@
</message>
<message>
<location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="571"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2346"/>
<source>Apnea</source>
<translation>Apnea</translation>
</message>
@@ -970,8 +971,8 @@
</message>
<message>
<location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="791"/>
- <source>Always show ppO2</source>
- <translation>Kuva alati ppO2</translation>
+ <source>Always show pO₂</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="798"/>
@@ -1313,7 +1314,7 @@
</message>
<message>
<location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1696"/>
- <source>Max depth</source>
+ <source>Max. depth</source>
<translation>Max sügavus</translation>
</message>
<message>
@@ -1441,11 +1442,6 @@
<translation>ZH-L16 CC</translation>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2346"/>
- <source>Apnoea</source>
- <translation>Apnoe</translation>
- </message>
- <message>
<location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2351"/>
<source>L16-GF OC</source>
<translation>L16-GF OC</translation>
@@ -1532,8 +1528,8 @@
</message>
<message>
<location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1227"/>
- <source>Choose file for divecomputer download logfile</source>
- <translation>Vali sukeldumiskompuutri allalaadimise logifail</translation>
+ <source>Choose file for dive computer download logfile</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1228"/>
@@ -1544,7 +1540,8 @@
<context>
<name>ContextDrawer</name>
<message>
- <location filename="../mobile-widgets/qml/kirigami/src/controls/ContextDrawer.qml" line="76"/>
+ <location filename="../mobile-widgets/qml/kirigami/src/controls/ContextDrawer.qml" line="77"/>
+ <location filename="../mobile-widgets/qml/kirigami-old/src/controls/ContextDrawer.qml" line="77"/>
<source>Actions</source>
<translation>Tegevused</translation>
</message>
@@ -1568,6 +1565,7 @@
</message>
<message>
<location filename="../qt-models/cylindermodel.cpp" line="16"/>
+ <location filename="../qt-models/cylindermodel.cpp" line="24"/>
<source>Start press.</source>
<translation>Algusrõhk</translation>
</message>
@@ -1607,42 +1605,37 @@
<translation>Kasuta</translation>
</message>
<message>
- <location filename="../qt-models/cylindermodel.cpp" line="43"/>
+ <location filename="../qt-models/cylindermodel.cpp" line="52"/>
<source>cuft</source>
<translation>kuupjalg</translation>
</message>
<message>
- <location filename="../qt-models/cylindermodel.cpp" line="47"/>
+ <location filename="../qt-models/cylindermodel.cpp" line="56"/>
<source>ℓ</source>
<translation>ℓ</translation>
</message>
<message>
- <location filename="../qt-models/cylindermodel.cpp" line="235"/>
+ <location filename="../qt-models/cylindermodel.cpp" line="274"/>
<source>Clicking here will remove this cylinder.</source>
<translation>Siin klikkamine eemaldab selle ballooni</translation>
</message>
<message>
- <location filename="../qt-models/cylindermodel.cpp" line="247"/>
+ <location filename="../qt-models/cylindermodel.cpp" line="286"/>
<source>Switch depth for deco gas. Calculated using Deco pO₂ preference, unless set manually.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-models/cylindermodel.cpp" line="250"/>
- <source>Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to &apos;*&apos; for best O₂% for max depth.</source>
+ <location filename="../qt-models/cylindermodel.cpp" line="289"/>
+ <source>Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to &apos;*&apos; for best O₂% for max. depth.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-models/cylindermodel.cpp" line="253"/>
- <source>Calculated using Best Mix END preference. Setting MND adjusts He%, set to &apos;*&apos; for best He% for max depth.</source>
+ <location filename="../qt-models/cylindermodel.cpp" line="292"/>
+ <source>Calculated using Best Mix END preference. Setting MND adjusts He%, set to &apos;*&apos; for best He% for max. depth.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../qt-models/cylindermodel.cpp" line="522"/>
- <source>Cylinder cannot be removed</source>
- <translation>Ballooni ei saa eemaldada</translation>
- </message>
- <message>
- <location filename="../qt-models/cylindermodel.cpp" line="523"/>
+ <location filename="../qt-models/cylindermodel.cpp" line="272"/>
<source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source>
<translation>See gaas on kasutusel. Eemaldada saab ainult neid balloone, mis pole sellel sukeldumisel kasutusel.</translation>
</message>
@@ -1756,22 +1749,22 @@
<context>
<name>DiveDetails</name>
<message>
- <location filename="../mobile-widgets/qml/DiveDetails.qml" line="38"/>
+ <location filename="../mobile-widgets/qml/DiveDetails.qml" line="41"/>
<source>Dive details</source>
<translation>Sukeldumise info</translation>
</message>
<message>
- <location filename="../mobile-widgets/qml/DiveDetails.qml" line="72"/>
+ <location filename="../mobile-widgets/qml/DiveDetails.qml" line="75"/>
<source>Delete dive</source>
<translation>Kustuta sukeldumine</translation>
</message>
<message>
- <location filename="../mobile-widgets/qml/DiveDetails.qml" line="89"/>
+ <location filename="../mobile-widgets/qml/DiveDetails.qml" line="90"/>
<source>Show on map</source>
<translation>Näita kaardil</translation>
</message>
<message>
- <location filename="../mobile-widgets/qml/DiveDetails.qml" line="160"/>
+ <location filename="../mobile-widgets/qml/DiveDetails.qml" line="154"/>
<source>Multiple Buddies</source>
<translation>Mitu semu</translation>
</message>
@@ -1779,94 +1772,94 @@
<context>
<name>DiveDetailsEdit</name>
<message>
- <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="80"/>
+ <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="83"/>
<source>Dive %1</source>
<translation>Sukeldumise #</translation>
</message>
<message>
- <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="84"/>
+ <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="87"/>
<source>Date:</source>
<translation>Kuupäev:</translation>
</message>
<message>
- <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="92"/>
+ <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="95"/>
<source>Location:</source>
<translation>Asukoht:</translation>
</message>
<message>
- <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="101"/>
+ <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="104"/>
<source>Coordinates:</source>
<translation>Koordinaadid:</translation>
</message>
<message>
- <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="110"/>
+ <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="113"/>
<source>Use current
GPS location:</source>
<translation>Kasuta praegust
asukohta:</translation>
</message>
<message>
- <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="124"/>
+ <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="127"/>
<source>Depth:</source>
<translation>Sügavus:</translation>
</message>
<message>
- <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="133"/>
+ <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="136"/>
<source>Duration:</source>
<translation>Kestus:</translation>
</message>
<message>
- <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="143"/>
+ <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="146"/>
<source>Air Temp:</source>
<translation>Õhu temp:</translation>
</message>
<message>
- <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="152"/>
+ <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="155"/>
<source>Water Temp:</source>
<translation>Vee temp:</translation>
</message>
<message>
- <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="161"/>
+ <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="164"/>
<source>Suit:</source>
<translation>Ülikond:</translation>
</message>
<message>
- <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="176"/>
+ <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="175"/>
<source>Buddy:</source>
<translation>Semu:</translation>
</message>
<message>
- <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="191"/>
- <source>Dive Master:</source>
- <translation>Dive master:</translation>
+ <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="186"/>
+ <source>Divemaster:</source>
+ <translation>Divemaster:</translation>
</message>
<message>
- <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="206"/>
+ <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="197"/>
<source>Weight:</source>
<translation>Raskus</translation>
</message>
<message>
- <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="216"/>
+ <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="207"/>
<source>Cylinder:</source>
<translation>Balloon:</translation>
</message>
<message>
- <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="231"/>
+ <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="218"/>
<source>Gas mix:</source>
<translation>Gaasisegu:</translation>
</message>
<message>
- <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="241"/>
+ <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="228"/>
<source>Start Pressure:</source>
<translation>Algrõhk:</translation>
</message>
<message>
- <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="250"/>
+ <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="237"/>
<source>End Pressure:</source>
<translation>Lõpurõhk</translation>
</message>
<message>
- <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="260"/>
+ <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="247"/>
<source>Notes:</source>
<translation>Märkmed:</translation>
</message>
@@ -1874,72 +1867,72 @@ asukohta:</translation>
<context>
<name>DiveDetailsView</name>
<message>
- <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="63"/>
+ <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="60"/>
<source>Date: </source>
<translation>Kuupäev:</translation>
</message>
<message>
- <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="80"/>
+ <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="77"/>
<source>Depth: </source>
<translation>Sügavus:</translation>
</message>
<message>
- <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="89"/>
+ <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="86"/>
<source>Duration: </source>
<translation>Kestus:</translation>
</message>
<message>
- <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="121"/>
+ <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="118"/>
<source>No profile to show</source>
<translation>Pole profiili mida näidata</translation>
</message>
<message>
- <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="139"/>
+ <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="136"/>
<source>Dive Details</source>
<translation>Sukeldumise info</translation>
</message>
<message>
- <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="144"/>
+ <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="143"/>
<source>Suit:</source>
<translation>Ülikond:</translation>
</message>
<message>
- <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="158"/>
+ <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="149"/>
<source>Air Temp:</source>
<translation>Õhu temp:</translation>
</message>
<message>
- <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="172"/>
+ <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="193"/>
<source>Cylinder:</source>
<translation>Balloon:</translation>
</message>
<message>
- <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="185"/>
+ <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="155"/>
<source>Water Temp:</source>
<translation>Vee temp:</translation>
</message>
<message>
- <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="198"/>
- <source>Dive Master:</source>
- <translation>Dive master:</translation>
+ <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="246"/>
+ <source>Divemaster:</source>
+ <translation>Divemaster:</translation>
</message>
<message>
- <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="211"/>
+ <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="200"/>
<source>Weight:</source>
<translation>Raskus</translation>
</message>
<message>
- <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="224"/>
+ <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="253"/>
<source>Buddy:</source>
<translation>Semu:</translation>
</message>
<message>
- <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="237"/>
+ <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="207"/>
<source>SAC:</source>
<translation>SAC:</translation>
</message>
<message>
- <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="252"/>
+ <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="289"/>
<source>Notes</source>
<translation>Märkmed</translation>
</message>
@@ -1972,27 +1965,27 @@ asukohta:</translation>
<context>
<name>DiveImportedModel</name>
<message>
- <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="662"/>
+ <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="677"/>
<source>Date/time</source>
<translation>Kuupäev /aeg</translation>
</message>
<message>
- <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="664"/>
+ <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="679"/>
<source>Duration</source>
<translation>Kestus</translation>
</message>
<message>
- <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="666"/>
+ <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="681"/>
<source>Depth</source>
<translation>Sügavus</translation>
</message>
<message>
- <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="688"/>
+ <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="703"/>
<source>h:</source>
<translation>h:</translation>
</message>
<message>
- <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="688"/>
+ <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="703"/>
<source>min</source>
<translation>min</translation>
</message>
@@ -2007,12 +2000,12 @@ asukohta:</translation>
<translation>Sukeldumiste nimekiri</translation>
</message>
<message>
- <location filename="../mobile-widgets/qml/DiveList.qml" line="95"/>
+ <location filename="../mobile-widgets/qml/DiveList.qml" line="97"/>
<source>Depth: </source>
<translation>Sügavus:</translation>
</message>
<message>
- <location filename="../mobile-widgets/qml/DiveList.qml" line="106"/>
+ <location filename="../mobile-widgets/qml/DiveList.qml" line="108"/>
<source>Duration: </source>
<translation>Kestus:</translation>
</message>
@@ -2027,7 +2020,7 @@ asukohta:</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qml/DiveList.qml" line="255"/>
+ <location filename="../mobile-widgets/qml/DiveList.qml" line="252"/>
<source>No dives in dive list</source>
<translation type="unfinished"/>
</message>
@@ -2759,12 +2752,12 @@ asukohta:</translation>
<context>
<name>DiveObjectHelper</name>
<message>
- <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="323"/>
+ <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="335"/>
<source>%1 dive(s)</source>
<translation>%1 sukeldumine</translation>
</message>
<message>
- <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="428"/>
+ <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="440"/>
<source>Multiple Buddies</source>
<translation>Mitu semu</translation>
</message>
@@ -2810,32 +2803,32 @@ asukohta:</translation>
<context>
<name>DivePlannerPointsModel</name>
<message>
- <location filename="../qt-models/diveplannermodel.cpp" line="142"/>
+ <location filename="../qt-models/diveplannermodel.cpp" line="152"/>
<source>unknown</source>
<translation>tundmatu</translation>
</message>
<message>
- <location filename="../qt-models/diveplannermodel.cpp" line="332"/>
+ <location filename="../qt-models/diveplannermodel.cpp" line="343"/>
<source>Final depth</source>
<translation>Lõppsügavus</translation>
</message>
<message>
- <location filename="../qt-models/diveplannermodel.cpp" line="334"/>
+ <location filename="../qt-models/diveplannermodel.cpp" line="345"/>
<source>Run time</source>
<translation>Töö aeg</translation>
</message>
<message>
- <location filename="../qt-models/diveplannermodel.cpp" line="336"/>
+ <location filename="../qt-models/diveplannermodel.cpp" line="347"/>
<source>Duration</source>
<translation>Kestus</translation>
</message>
<message>
- <location filename="../qt-models/diveplannermodel.cpp" line="338"/>
+ <location filename="../qt-models/diveplannermodel.cpp" line="349"/>
<source>Used gas</source>
<translation>Kasutatud gaas</translation>
</message>
<message>
- <location filename="../qt-models/diveplannermodel.cpp" line="340"/>
+ <location filename="../qt-models/diveplannermodel.cpp" line="351"/>
<source>CC setpoint</source>
<translation type="unfinished"/>
</message>
@@ -2853,12 +2846,17 @@ asukohta:</translation>
<translation>Saadaval gaasid</translation>
</message>
<message>
- <location filename="../desktop-widgets/diveplanner.cpp" line="142"/>
+ <location filename="../desktop-widgets/diveplanner.cpp" line="116"/>
+ <source>Add cylinder</source>
+ <translation>Lisa balloon</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/diveplanner.cpp" line="143"/>
<source>Add dive data point</source>
<translation>Lisa sukeldumise andmepunkt</translation>
</message>
<message>
- <location filename="../desktop-widgets/diveplanner.cpp" line="151"/>
+ <location filename="../desktop-widgets/diveplanner.cpp" line="152"/>
<source>Save new</source>
<translation>Salvesta uus</translation>
</message>
@@ -3069,11 +3067,6 @@ p, li { white-space: pre-wrap; }
<translation>Kestus</translation>
</message>
<message>
- <location filename="../qt-models/divetripmodel.cpp" line="448"/>
- <source>Temp</source>
- <translation>Temp</translation>
- </message>
- <message>
<location filename="../qt-models/divetripmodel.cpp" line="451"/>
<source>Weight</source>
<translation>Raskus</translation>
@@ -3085,10 +3078,15 @@ p, li { white-space: pre-wrap; }
<translation>Ülikond</translation>
</message>
<message>
+ <location filename="../qt-models/divetripmodel.cpp" line="448"/>
+ <source>Temp.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../qt-models/divetripmodel.cpp" line="457"/>
<location filename="../qt-models/divetripmodel.cpp" line="506"/>
- <source>Cyl</source>
- <translation>Ball</translation>
+ <source>Cylinder</source>
+ <translation>Balloon</translation>
</message>
<message>
<location filename="../qt-models/divetripmodel.cpp" line="460"/>
@@ -3141,8 +3139,8 @@ p, li { white-space: pre-wrap; }
</message>
<message>
<location filename="../qt-models/divetripmodel.cpp" line="497"/>
- <source>Temp(%1%2)</source>
- <translation>Temp(%1%2)</translation>
+ <source>Temp.(%1%2)</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../qt-models/divetripmodel.cpp" line="500"/>
@@ -3301,50 +3299,55 @@ p, li { white-space: pre-wrap; }
<translation>Vali Bluetoothi allalaadimise viis</translation>
</message>
<message>
- <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="191"/>
+ <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="206"/>
<source>Error</source>
<translation>Viga</translation>
</message>
<message>
- <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="286"/>
+ <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="301"/>
<source>Find Uemis dive computer</source>
<translation>Leia Uemis sukeldumiskompuuter</translation>
</message>
<message>
- <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="398"/>
- <source>Choose file for divecomputer download logfile</source>
- <translation>Vali sukeldumiskompuutri allalaadimise logifail</translation>
+ <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="326"/>
+ <source>Cancel download</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="413"/>
+ <source>Choose file for dive computer download logfile</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="399"/>
+ <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="441"/>
+ <source>Choose file for dive computer binary dump file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="467"/>
+ <source>Retry download</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="414"/>
<source>Log files (*.log)</source>
<translation>Logifailid (*.log)</translation>
</message>
<message>
- <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="414"/>
+ <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="429"/>
<source>Warning</source>
<translation>Hoiatus</translation>
</message>
<message>
- <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="415"/>
+ <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="430"/>
<source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source>
<translation>libdivecomputer tõmmisefaili salvestamine EI LAE sukeldumised sukeldumiste listi.</translation>
</message>
<message>
- <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="426"/>
- <source>Choose file for divecomputer binary dump file</source>
- <translation>Vali sukeldumiskompuutri binaarformaadis tõmmisefail</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="427"/>
+ <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="442"/>
<source>Dump files (*.bin)</source>
<translation>Tõmmisefailid (*.bin)</translation>
</message>
- <message>
- <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="452"/>
- <source>Retry</source>
- <translation>Korda</translation>
- </message>
</context>
<context>
<name>DownloadFromDiveComputer</name>
@@ -3614,12 +3617,12 @@ p, li { white-space: pre-wrap; }
<context>
<name>FirmwareUpdateThread</name>
<message>
- <location filename="../core/configuredivecomputerthreads.cpp" line="1691"/>
+ <location filename="../core/configuredivecomputerthreads.cpp" line="1692"/>
<source>This feature is not yet available for the selected dive computer.</source>
<translation>Omadus ei ole valitud sukeldumiskompuutril veel olemas</translation>
</message>
<message>
- <location filename="../core/configuredivecomputerthreads.cpp" line="1696"/>
+ <location filename="../core/configuredivecomputerthreads.cpp" line="1697"/>
<source>Firmware update failed!</source>
<translation>Firmware uuendamine ebaõnnestus!</translation>
</message>
@@ -3627,7 +3630,8 @@ p, li { white-space: pre-wrap; }
<context>
<name>GlobalDrawer</name>
<message>
- <location filename="../mobile-widgets/qml/kirigami/src/controls/GlobalDrawer.qml" line="361"/>
+ <location filename="../mobile-widgets/qml/kirigami/src/controls/GlobalDrawer.qml" line="362"/>
+ <location filename="../mobile-widgets/qml/kirigami-old/src/controls/GlobalDrawer.qml" line="362"/>
<source>Back</source>
<translation>Tagasi</translation>
</message>
@@ -3643,32 +3647,32 @@ p, li { white-space: pre-wrap; }
<context>
<name>GpsList</name>
<message>
- <location filename="../mobile-widgets/qml/GpsList.qml" line="16"/>
+ <location filename="../mobile-widgets/qml/GpsList.qml" line="14"/>
<source>GPS Fixes</source>
<translation>GPS määrang</translation>
</message>
<message>
- <location filename="../mobile-widgets/qml/GpsList.qml" line="32"/>
+ <location filename="../mobile-widgets/qml/GpsList.qml" line="27"/>
<source>Date: </source>
<translation>Kuupäev:</translation>
</message>
<message>
- <location filename="../mobile-widgets/qml/GpsList.qml" line="42"/>
+ <location filename="../mobile-widgets/qml/GpsList.qml" line="37"/>
<source>Name: </source>
<translation>Nimi:</translation>
</message>
<message>
- <location filename="../mobile-widgets/qml/GpsList.qml" line="52"/>
+ <location filename="../mobile-widgets/qml/GpsList.qml" line="47"/>
<source>Latitude: </source>
<translation>Laiuskraad:</translation>
</message>
<message>
- <location filename="../mobile-widgets/qml/GpsList.qml" line="61"/>
+ <location filename="../mobile-widgets/qml/GpsList.qml" line="56"/>
<source>Longitude: </source>
<translation>Pikkuskraad:</translation>
</message>
<message>
- <location filename="../mobile-widgets/qml/GpsList.qml" line="105"/>
+ <location filename="../mobile-widgets/qml/GpsList.qml" line="99"/>
<source>List of stored GPS fixes</source>
<translation>Salvestatud GPS määrangute nimekiri</translation>
</message>
@@ -3684,12 +3688,12 @@ p, li { white-space: pre-wrap; }
<context>
<name>KMessageWidget</name>
<message>
- <location filename="../desktop-widgets/kmessagewidget.cpp" line="90"/>
+ <location filename="../desktop-widgets/kmessagewidget.cpp" line="91"/>
<source>&amp;Close</source>
<translation>&amp;Sulge</translation>
</message>
<message>
- <location filename="../desktop-widgets/kmessagewidget.cpp" line="91"/>
+ <location filename="../desktop-widgets/kmessagewidget.cpp" line="92"/>
<source>Close message</source>
<translation>Sule teade</translation>
</message>
@@ -3697,7 +3701,7 @@ p, li { white-space: pre-wrap; }
<context>
<name>LocationFilter</name>
<message>
- <location filename="../desktop-widgets/simplewidgets.cpp" line="653"/>
+ <location filename="../desktop-widgets/simplewidgets.cpp" line="531"/>
<source>Location: </source>
<translation>Asukoht:</translation>
</message>
@@ -3843,8 +3847,8 @@ Oled kindel et soovid jätkata?</translation>
<context>
<name>Log</name>
<message>
- <location filename="../mobile-widgets/qml/Log.qml" line="15"/>
- <location filename="../mobile-widgets/qml/Log.qml" line="23"/>
+ <location filename="../mobile-widgets/qml/Log.qml" line="13"/>
+ <location filename="../mobile-widgets/qml/Log.qml" line="21"/>
<source>Application Log</source>
<translation type="unfinished"/>
</message>
@@ -3852,437 +3856,227 @@ Oled kindel et soovid jätkata?</translation>
<context>
<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/tab-widgets/maintab.ui" line="27"/>
+ <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="447"/>
+ <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="511"/>
+ <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="543"/>
<source>Notes</source>
<translation>Märkmed</translation>
</message>
<message>
- <location filename="../desktop-widgets/maintab.ui" line="21"/>
- <source>General notes about the current selection</source>
- <translation type="unfinished"/>
+ <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="14"/>
+ <source>Form</source>
+ <translation>Vorm</translation>
</message>
<message>
- <location filename="../desktop-widgets/maintab.ui" line="92"/>
- <location filename="../desktop-widgets/maintab.ui" line="646"/>
+ <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="87"/>
<source>Date</source>
<translation>Kuupäev</translation>
</message>
<message>
- <location filename="../desktop-widgets/maintab.ui" line="102"/>
+ <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="97"/>
<source>Time</source>
<translation>Aeg</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/tab-widgets/maintab.ui" line="107"/>
+ <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="292"/>
<source>Air temp.</source>
<translation>Õhu temp.</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/tab-widgets/maintab.ui" line="117"/>
+ <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="293"/>
<source>Water temp.</source>
<translation>Vee temp.</translation>
</message>
<message>
- <location filename="../desktop-widgets/maintab.ui" line="184"/>
- <location filename="../desktop-widgets/maintab.cpp" line="570"/>
+ <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="192"/>
+ <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="542"/>
<source>Location</source>
<translation>Asukoht</translation>
</message>
<message>
- <location filename="../desktop-widgets/maintab.ui" line="214"/>
+ <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="222"/>
<source>Edit dive site</source>
<translation>Toimeta sukeldumiskoht</translation>
</message>
<message>
- <location filename="../desktop-widgets/maintab.ui" line="217"/>
+ <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="225"/>
<source>...</source>
<translation>...</translation>
</message>
<message>
- <location filename="../desktop-widgets/maintab.ui" line="252"/>
+ <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="260"/>
<source>Divemaster</source>
<translation>Divemaster</translation>
</message>
<message>
- <location filename="../desktop-widgets/maintab.ui" line="262"/>
+ <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="270"/>
<source>Buddy</source>
<translation>Semu</translation>
</message>
<message>
- <location filename="../desktop-widgets/maintab.ui" line="308"/>
+ <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="316"/>
<source>Rating</source>
<translation>Hinne</translation>
</message>
<message>
- <location filename="../desktop-widgets/maintab.ui" line="321"/>
+ <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="329"/>
<source>Visibility</source>
<translation>Nähtavus</translation>
</message>
<message>
- <location filename="../desktop-widgets/maintab.ui" line="328"/>
+ <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="336"/>
<source>Suit</source>
<translation>Ülikond</translation>
</message>
<message>
- <location filename="../desktop-widgets/maintab.ui" line="387"/>
+ <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="395"/>
<source>Tags</source>
<translation>Märgendid</translation>
</message>
<message>
- <location filename="../desktop-widgets/maintab.ui" line="397"/>
+ <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="405"/>
<source>Dive mode</source>
<translation>Sukeldumise liik</translation>
</message>
<message>
- <location filename="../desktop-widgets/maintab.ui" line="491"/>
+ <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="499"/>
<source>Equipment</source>
<translation>Varustus</translation>
</message>
<message>
- <location filename="../desktop-widgets/maintab.ui" line="494"/>
- <source>Used equipment in the current selection</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../desktop-widgets/maintab.ui" line="586"/>
- <source>Info</source>
- <translation>Info</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/maintab.ui" line="589"/>
- <source>Dive information</source>
- <translation>Sukeldumise info</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/maintab.ui" line="665"/>
- <source>Interval</source>
- <translation>Pinnaintervall</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/maintab.ui" line="684"/>
- <source>Gases used</source>
- <translation>Kasutatud gaasid</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/maintab.ui" line="703"/>
- <source>Gas consumed</source>
- <translation>Kulutatud gaasid</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/maintab.ui" line="722"/>
- <location filename="../desktop-widgets/maintab.ui" line="1094"/>
- <source>SAC</source>
- <translation>SAC</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/maintab.ui" line="741"/>
- <source>CNS</source>
- <translation>CNS</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/maintab.ui" line="760"/>
- <source>OTU</source>
- <translation>OTU</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/maintab.ui" line="779"/>
- <source>Max. depth</source>
- <translation>Max sügavus</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/maintab.ui" line="798"/>
- <source>Avg. depth</source>
- <translation>Keskmine sügavus</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/maintab.ui" line="817"/>
- <source>Air pressure</source>
- <translation>Õhurõhk</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/maintab.ui" line="874"/>
- <source>Dive time</source>
- <translation>Sukeldumise aeg</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/maintab.ui" line="893"/>
- <source>Salinity</source>
- <translation>Soolsus</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/maintab.ui" line="930"/>
- <source>Stats</source>
- <translation>Statistika</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/maintab.ui" line="933"/>
- <source>Simple statistics about the selection</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../desktop-widgets/maintab.ui" line="986"/>
+ <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="164"/>
<source>Depth</source>
<translation>Sügavus</translation>
</message>
<message>
- <location filename="../desktop-widgets/maintab.ui" line="998"/>
+ <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="80"/>
<source>Duration</source>
<translation>Kestus</translation>
</message>
<message>
- <location filename="../desktop-widgets/maintab.ui" line="1027"/>
- <source>Temperature</source>
- <translation>Temperatuur</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/maintab.ui" line="1039"/>
- <source>Total time</source>
- <translation>Koguaeg</translation>
+ <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="55"/>
+ <source>Extra Info</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/maintab.ui" line="1058"/>
- <source>Dives</source>
- <translation>Sukeldumisi kokku</translation>
+ <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="49"/>
+ <source>Information</source>
+ <translation>Info</translation>
</message>
<message>
- <location filename="../desktop-widgets/maintab.ui" line="1106"/>
- <source>Gas consumption</source>
- <translation>Gaasi tarbimine</translation>
+ <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="51"/>
+ <source>Statistics</source>
+ <translation>Statistika</translation>
</message>
<message>
- <location filename="../desktop-widgets/maintab.ui" line="1148"/>
+ <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="53"/>
<source>Photos</source>
<translation>Fotod</translation>
</message>
<message>
- <location filename="../desktop-widgets/maintab.ui" line="1151"/>
- <source>All photos from the current selection</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../desktop-widgets/maintab.ui" line="1177"/>
- <source>Extra data</source>
- <translation>Lisaandmed</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/maintab.ui" line="1180"/>
- <source>Adittional data from the dive computer</source>
- <translation>Lisaandmed sukeldumiskompuutrist</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/maintab.cpp" line="63"/>
+ <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="72"/>
<source>Apply changes</source>
<translation>Rakenda muudatused</translation>
</message>
<message>
- <location filename="../desktop-widgets/maintab.cpp" line="67"/>
+ <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="76"/>
<source>Discard changes</source>
<translation>Tühista muudatused</translation>
</message>
<message>
- <location filename="../desktop-widgets/maintab.cpp" line="88"/>
+ <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="92"/>
<source>Cylinders</source>
<translation>Balloonid</translation>
</message>
<message>
- <location filename="../desktop-widgets/maintab.cpp" line="89"/>
+ <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="93"/>
<source>Add cylinder</source>
<translation>Lisa balloon</translation>
</message>
<message>
- <location filename="../desktop-widgets/maintab.cpp" line="92"/>
+ <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="96"/>
<source>Weights</source>
<translation>Raskused</translation>
</message>
<message>
- <location filename="../desktop-widgets/maintab.cpp" line="93"/>
+ <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="97"/>
<source>Add weight system</source>
<translation>Lisa raskuste süsteem</translation>
</message>
<message>
- <location filename="../desktop-widgets/maintab.cpp" line="97"/>
+ <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="101"/>
<source>OC</source>
<translation>OC</translation>
</message>
<message>
- <location filename="../desktop-widgets/maintab.cpp" line="97"/>
+ <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="101"/>
<source>CCR</source>
<translation>CCR</translation>
</message>
<message>
- <location filename="../desktop-widgets/maintab.cpp" line="97"/>
+ <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="101"/>
<source>pSCR</source>
<translation>pSCR</translation>
</message>
<message>
- <location filename="../desktop-widgets/maintab.cpp" line="97"/>
+ <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="101"/>
<source>Freedive</source>
<translation>Vabasukeldumine</translation>
</message>
<message>
- <location filename="../desktop-widgets/maintab.cpp" line="303"/>
+ <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="289"/>
<source>Air temp. [%1]</source>
<translation>Õhu temp. [%1]</translation>
</message>
<message>
- <location filename="../desktop-widgets/maintab.cpp" line="304"/>
+ <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="290"/>
<source>Water temp. [%1]</source>
<translation>Vee temp. [%1]</translation>
</message>
<message>
- <location filename="../desktop-widgets/maintab.cpp" line="343"/>
+ <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="329"/>
<source>This trip is being edited.</source>
<translation>Seda väljasõitu toimetatakse</translation>
</message>
<message>
- <location filename="../desktop-widgets/maintab.cpp" line="350"/>
+ <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="336"/>
<source>Multiple dives are being edited.</source>
<translation>Mitut sukeldumist toimetatakse</translation>
</message>
<message>
- <location filename="../desktop-widgets/maintab.cpp" line="352"/>
+ <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="338"/>
<source>This dive is being edited.</source>
<translation>Seda sukeldumist toimetatakse.</translation>
</message>
<message>
- <location filename="../desktop-widgets/maintab.cpp" line="501"/>
- <location filename="../desktop-widgets/maintab.cpp" line="534"/>
+ <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="469"/>
+ <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="502"/>
<source>Trip notes</source>
<translation>Väljasõidu märkmed</translation>
</message>
<message>
- <location filename="../desktop-widgets/maintab.cpp" line="529"/>
+ <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="497"/>
<source>Trip location</source>
<translation>Väljasõidu koht</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"/>
- <source>/min</source>
- <translation>/min</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/maintab.cpp" line="641"/>
- <source>Deepest dive</source>
- <translation>Sügavaim sukeldumine</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/maintab.cpp" line="642"/>
- <source>Shallowest dive</source>
- <translation>Madalaim sukeldumine</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/maintab.cpp" line="655"/>
- <source>Highest total SAC of a dive</source>
- <translation>Suurim summaarne SAC sukeldumisel</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/maintab.cpp" line="656"/>
- <source>Lowest total SAC of a dive</source>
- <translation>Madalaim summaarne SAC sukeldumisel</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/maintab.cpp" line="657"/>
- <source>Average total SAC of all selected dives</source>
- <translation>Keskmine summaarne SAC kõigil valitud sukeldumistel</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/maintab.cpp" line="668"/>
- <source>Highest temperature</source>
- <translation>Kõrgeim temp</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/maintab.cpp" line="669"/>
- <source>Lowest temperature</source>
- <translation>Madalaim temp</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/maintab.cpp" line="670"/>
- <source>Average temperature of all selected dives</source>
- <translation>Kõigi valitud sukeldumiste keskmine temp</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/maintab.cpp" line="683"/>
- <source>Longest dive</source>
- <translation>Pikim sukeldumine</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/maintab.cpp" line="684"/>
- <source>Shortest dive</source>
- <translation>Lühim sukeldumine</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/maintab.cpp" line="685"/>
- <source>Average length of all selected dives</source>
- <translation>Kõigi valitud sukeldumiste keskmine pikkus</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/maintab.cpp" line="709"/>
- <source>These gases could be
-mixed from Air and using:
-</source>
- <translation>Need gaasid saab segada
-õhust ja kasutades:</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/maintab.cpp" line="713"/>
- <source> and </source>
- <translation>ja</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/maintab.cpp" line="843"/>
+ <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="706"/>
<source>New dive site</source>
<translation>Uus sukeldumiskoht</translation>
</message>
<message>
- <location filename="../desktop-widgets/maintab.cpp" line="1139"/>
+ <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1004"/>
<source>Discard the changes?</source>
<translation>Loobu muudatustest?</translation>
</message>
<message>
- <location filename="../desktop-widgets/maintab.cpp" line="1140"/>
+ <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1005"/>
<source>You are about to discard your changes.</source>
<translation>Oled muudatustest loobumas.</translation>
</message>
- <message>
- <location filename="../desktop-widgets/maintab.cpp" line="1594"/>
- <source>Deleting Images</source>
- <translation>Kustutan pildid</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/maintab.cpp" line="1594"/>
- <source>Are you sure you want to delete all images?</source>
- <translation>Oled kindel et soovid kustutada kõik pildid?</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/maintab.cpp" line="1653"/>
- <source>Load image(s) from file(s)</source>
- <translation>Lae pilt (pildid) faili(de)st</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/maintab.cpp" line="1654"/>
- <source>Load image(s) from web</source>
- <translation>Lae pilt (pildid) veebist</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/maintab.cpp" line="1656"/>
- <source>Delete selected images</source>
- <translation>Kustuta valitud pildid</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/maintab.cpp" line="1657"/>
- <source>Delete all images</source>
- <translation>Kustuta kõik pildid</translation>
- </message>
</context>
<context>
<name>MainWindow</name>
@@ -4338,7 +4132,7 @@ mixed from Air and using:
</message>
<message>
<location filename="../desktop-widgets/mainwindow.ui" line="171"/>
- <location filename="../desktop-widgets/mainwindow.cpp" line="515"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="518"/>
<source>Open</source>
<translation>Ava</translation>
</message>
@@ -4681,158 +4475,158 @@ mixed from Air and using:
</message>
<message>
<location filename="../desktop-widgets/mainwindow.cpp" line="332"/>
- <location filename="../desktop-widgets/mainwindow.cpp" line="363"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="365"/>
<source>Connect to</source>
<translation>Ühenda</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.cpp" line="358"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="359"/>
<source>Disconnect from</source>
<translation>Ühenda lahti</translation>
</message>
<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="509"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="554"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="1583"/>
<source>Please save or cancel the current dive edit before opening a new file.</source>
<translation>Enne uue faili avamist salvesta või katkesta käesoleva sukeldumise toimetamine.</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.cpp" line="512"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="515"/>
<source>Open file</source>
<translation>Ava fail</translation>
</message>
<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="519"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="632"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="2016"/>
<source>Cancel</source>
<translation>Loobu</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.cpp" line="623"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="628"/>
<source>Traverse image directories</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.cpp" line="626"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="631"/>
<source>Scan</source>
<translation>Skaneeri</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.cpp" line="634"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="639"/>
<source>Scanning images...(this can take a while)</source>
<translation type="unfinished"/>
</message>
<message>
- <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="665"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="812"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="921"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="1006"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="1012"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="1887"/>
<source>Warning</source>
<translation>Hoiatus</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.cpp" line="687"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="690"/>
<source>Please save or cancel the current dive edit before closing the file.</source>
<translation>Enne faili sulgemist salvesta või katkesta käesoleva sukeldumise toimetamine.</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.cpp" line="809"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="812"/>
<source>Please save or cancel the current dive edit before trying to add a dive.</source>
<translation>Enne sukeldumise lisamist salvesta või katkesta käesoleva sukeldumise toimetamine.</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.cpp" line="861"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="864"/>
<source>Print runtime table</source>
<translation>Väljasta jooksva aja tabel</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.cpp" line="917"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="921"/>
<source>Trying to replan a dive that&apos;s not a planned dive.</source>
<translation type="unfinished"/>
</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="1006"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="1887"/>
<source>Please, first finish the current edition before trying to do another.</source>
<translation>Lõpeta praegune toimetamine enne järgmise alustamist.</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="1012"/>
<source>Trying to edit a dive that&apos;s not a manually added dive.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.cpp" line="1047"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="1059"/>
<source>Yearly statistics</source>
<translation>Aastane statistika</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.cpp" line="1270"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="1282"/>
<source>Do you want to save the changes that you made in the file %1?</source>
<translation>Kas soovid salvestada muudatused mis tegid faili %1?</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.cpp" line="1273"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="1285"/>
<source>Do you want to save the changes that you made in the data file?</source>
<translation>Kas soovid salvestada muudatused mis tegid andmefaili?</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.cpp" line="1278"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="1290"/>
<source>Save changes?</source>
<translation>Salvesta muudatused?</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.cpp" line="1279"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="1291"/>
<source>Changes will be lost if you don&apos;t save them.</source>
<translation>Muudatusi lähevad kaotsi kui neid ei salvestata.</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.cpp" line="1598"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="1610"/>
<source>Save file as</source>
<translation>Salvesta nimega</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.cpp" line="1599"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="1611"/>
<source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
<translation>Subsurface XML files (*.ssrf *.xml *.XML)</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.cpp" line="1696"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="1708"/>
<source>[local cache for] %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.cpp" line="1698"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="1710"/>
<source>[cloud storage for] %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.cpp" line="1814"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="1826"/>
<source>Opening datafile from older version</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.cpp" line="1815"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="1827"/>
<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"/>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.cpp" line="1826"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="1838"/>
<source>Open dive log file</source>
<translation>Ava sukeldumislogi fail</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.cpp" line="1827"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="1839"/>
<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"/>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.cpp" line="2004"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="2016"/>
<source>Contacting cloud service...</source>
<translation type="unfinished"/>
</message>
@@ -4840,7 +4634,7 @@ Subsurface has already tried to pre-populate the data but it might be worth whil
<context>
<name>MultiFilter</name>
<message>
- <location filename="../desktop-widgets/simplewidgets.cpp" line="738"/>
+ <location filename="../desktop-widgets/simplewidgets.cpp" line="616"/>
<source>Filter shows %1 (of %2) dives</source>
<translation type="unfinished"/>
</message>
@@ -4888,89 +4682,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="339"/>
<source>Open circuit</source>
<translation>Avatud süsteem</translation>
</message>
<message>
- <location filename="../desktop-widgets/diveplanner.cpp" line="315"/>
+ <location filename="../desktop-widgets/diveplanner.cpp" line="339"/>
<source>CCR</source>
<translation>CCR</translation>
</message>
<message>
- <location filename="../desktop-widgets/diveplanner.cpp" line="315"/>
+ <location filename="../desktop-widgets/diveplanner.cpp" line="339"/>
<source>pSCR</source>
<translation>pSCR</translation>
</message>
<message>
- <location filename="../desktop-widgets/diveplanner.cpp" line="401"/>
+ <location filename="../desktop-widgets/diveplanner.cpp" line="427"/>
<source>ft/min</source>
<translation>jalg/min</translation>
</message>
<message>
- <location filename="../desktop-widgets/diveplanner.cpp" line="402"/>
+ <location filename="../desktop-widgets/diveplanner.cpp" line="428"/>
<source>Last stop at 20ft</source>
<translation>Viimane peatus 20 jala peal</translation>
</message>
<message>
- <location filename="../desktop-widgets/diveplanner.cpp" line="403"/>
+ <location filename="../desktop-widgets/diveplanner.cpp" line="429"/>
<source>50% avg. depth to 20ft</source>
<translation>50% keskmine sügavus 20 jalani</translation>
</message>
<message>
- <location filename="../desktop-widgets/diveplanner.cpp" line="404"/>
+ <location filename="../desktop-widgets/diveplanner.cpp" line="430"/>
<source>20ft to surface</source>
<translation>20 jalga pinnani</translation>
</message>
<message>
- <location filename="../desktop-widgets/diveplanner.cpp" line="405"/>
+ <location filename="../desktop-widgets/diveplanner.cpp" line="431"/>
<source>ft</source>
<translation>jalg</translation>
</message>
<message>
- <location filename="../desktop-widgets/diveplanner.cpp" line="407"/>
+ <location filename="../desktop-widgets/diveplanner.cpp" line="433"/>
<source>m/min</source>
<translation>m/min</translation>
</message>
<message>
- <location filename="../desktop-widgets/diveplanner.cpp" line="408"/>
+ <location filename="../desktop-widgets/diveplanner.cpp" line="434"/>
<source>Last stop at 6m</source>
<translation>Viimane peatus 6m peal</translation>
</message>
<message>
- <location filename="../desktop-widgets/diveplanner.cpp" line="409"/>
+ <location filename="../desktop-widgets/diveplanner.cpp" line="435"/>
<source>50% avg. depth to 6m</source>
<translation>50% keskmine sügavus 6m-i</translation>
</message>
<message>
- <location filename="../desktop-widgets/diveplanner.cpp" line="410"/>
+ <location filename="../desktop-widgets/diveplanner.cpp" line="436"/>
<source>6m to surface</source>
<translation>6m pinnani</translation>
</message>
<message>
- <location filename="../desktop-widgets/diveplanner.cpp" line="411"/>
+ <location filename="../desktop-widgets/diveplanner.cpp" line="437"/>
<source>m</source>
<translation>m</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="440"/>
+ <location filename="../desktop-widgets/diveplanner.cpp" line="441"/>
<source>cuft/min</source>
<translation>kuupjalg/min</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="449"/>
+ <location filename="../desktop-widgets/diveplanner.cpp" line="450"/>
<source>ℓ/min</source>
<translation>ℓ/min</translation>
</message>
<message>
- <location filename="../desktop-widgets/diveplanner.cpp" line="433"/>
+ <location filename="../desktop-widgets/diveplanner.cpp" line="459"/>
<source>bar</source>
<translation>bar</translation>
</message>
<message>
- <location filename="../desktop-widgets/diveplanner.cpp" line="438"/>
+ <location filename="../desktop-widgets/diveplanner.cpp" line="464"/>
<source>psi</source>
<translation>psi</translation>
</message>
@@ -5103,9 +4897,8 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa
</message>
<message>
<location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="9"/>
- <source>Defaults</source>
- <translation>Vaike-
-väärtused</translation>
+ <source>General</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="22"/>
@@ -5175,134 +4968,155 @@ väärtused</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="29"/>
- <source>Threshold for pO₂ (bar)</source>
- <translation>pO₂ lävi (bar)</translation>
+ <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="129"/>
+ <source>CCR options:</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="49"/>
- <source>Threshold for pN₂ (bar)</source>
- <translation>pN₂ lävi (bar)</translation>
+ <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="89"/>
+ <source>Show setpoints when viewing pO₂</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="69"/>
- <source>Threshold for pHe (bar)</source>
- <translation>pHe lävi (bar)</translation>
+ <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="82"/>
+ <source>Show individual O₂ sensor values when viewing pO₂</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="89"/>
- <source>pO₂ in calculating MOD (bar)</source>
+ <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="178"/>
+ <source>Ceiling display setup</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="106"/>
- <source>CCR options:</source>
- <translation type="unfinished"/>
+ <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="217"/>
+ <source>Draw dive computer reported ceiling red</source>
+ <translation>Joonista sukeldumiskompuutri väljastatud lagi punasega</translation>
</message>
<message>
- <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="113"/>
- <source>Dive planner default setpoint (bar)</source>
+ <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="197"/>
+ <source>Algorithm for calculated ceiling:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="133"/>
- <source>Show setpoints when viewing pO₂</source>
+ <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="294"/>
+ <source>+</source>
+ <translation>+</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="234"/>
+ <source>GFHigh</source>
+ <translation>GFHigh</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="334"/>
+ <source>GFLow</source>
+ <translation>GFLow</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="287"/>
+ <source>GFLow at max. depth</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="140"/>
- <source>Show individual O₂ sensor values when viewing pO₂</source>
+ <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="307"/>
+ <source>pSCR options:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="150"/>
- <source>Ceiling display setup</source>
+ <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="277"/>
+ <source>Dilution ratio</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="159"/>
- <source>Draw dive computer reported ceiling red</source>
- <translation>Joonista sukeldumiskompuutri väljastatud lagi punasega</translation>
+ <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="227"/>
+ <source>1:</source>
+ <translation>1:</translation>
</message>
<message>
- <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="169"/>
- <source>Algorithm for calculated ceiling:</source>
+ <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="29"/>
+ <source>Threshold for pO₂ (minimum, maximum)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="176"/>
- <source>VPM-B</source>
- <translation>VPM-B</translation>
+ <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="49"/>
+ <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="72"/>
+ <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="103"/>
+ <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="139"/>
+ <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="152"/>
+ <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="165"/>
+ <source>bar</source>
+ <translation>bar</translation>
</message>
<message>
- <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="183"/>
- <source>VPM-B Conservatism</source>
+ <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="122"/>
+ <source>Threshold for pN₂ (maximum only)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="193"/>
- <source>+</source>
- <translation>+</translation>
+ <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="39"/>
+ <source>Threshold for pHe (maximum only)</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="206"/>
- <source>Bühlmann</source>
- <translation>Bühlmann</translation>
+ <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="62"/>
+ <source>pO₂ in calculating MOD (maximum only )</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="216"/>
- <source>GFHigh</source>
- <translation>GFHigh</translation>
+ <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="96"/>
+ <source>Dive planner default setpoint</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="236"/>
- <source>GFLow</source>
- <translation>GFLow</translation>
+ <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="184"/>
+ <source>Conservatism level</source>
+ <translation>Konservatiivsuse tase</translation>
</message>
<message>
- <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="256"/>
- <source>GFLow at max depth</source>
- <translation>GFlow max sügavusel</translation>
+ <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="204"/>
+ <source>B&amp;ühlmann</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="263"/>
- <source>pSCR options:</source>
- <translation type="unfinished"/>
+ <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="244"/>
+ <source>ℓ/min</source>
+ <translation>ℓ/min</translation>
</message>
<message>
- <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="270"/>
- <source>Metabolic rate (ℓ O₂/min)</source>
- <translation type="unfinished"/>
+ <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="254"/>
+ <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="321"/>
+ <source>%</source>
+ <translation>%</translation>
</message>
<message>
- <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="287"/>
- <source>Dilution ratio</source>
+ <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="267"/>
+ <source>Metabolic rate O₂</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="300"/>
- <source>1:</source>
- <translation>1:</translation>
+ <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="314"/>
+ <source>&amp;VPM-B</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="310"/>
+ <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="347"/>
<source>Misc</source>
<translation>Muu</translation>
</message>
<message>
- <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="316"/>
+ <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="353"/>
<source>Show unused cylinders in Equipment tab</source>
<translation>Näita kasutamata balloonid varustuse saki all</translation>
</message>
<message>
- <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="323"/>
+ <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="360"/>
<source>Show mean depth in Profile</source>
<translation>Näita keskmist sügavust profiilis</translation>
</message>
<message>
<location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="9"/>
- <source>Graph</source>
- <translation>Graaf</translation>
+ <source>Profile</source>
+ <translation>Profiil</translation>
</message>
</context>
<context>
@@ -5599,7 +5413,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source>
</message>
<message>
<location filename="../desktop-widgets/preferences/preferences_units.ui" line="140"/>
- <source>cu ft</source>
+ <source>cuft</source>
<translation>kuupjalg</translation>
</message>
<message>
@@ -5681,17 +5495,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&amp;rint</source>
<translation>P&amp;rindi</translation>
</message>
<message>
- <location filename="../desktop-widgets/printdialog.cpp" line="105"/>
+ <location filename="../desktop-widgets/printdialog.cpp" line="106"/>
<source>&amp;Preview</source>
<translation>&amp;Eelvaade</translation>
</message>
<message>
- <location filename="../desktop-widgets/printdialog.cpp" line="117"/>
+ <location filename="../desktop-widgets/printdialog.cpp" line="118"/>
<source>Print</source>
<translation>Väljastus</translation>
</message>
@@ -5783,113 +5597,113 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source>
<context>
<name>ProfileWidget2</name>
<message>
- <location filename="../profile-widget/profilewidget2.cpp" line="750"/>
+ <location filename="../profile-widget/profilewidget2.cpp" line="774"/>
<source> (#%1 of %2)</source>
<translation>(#%1 %2st)</translation>
</message>
<message>
- <location filename="../profile-widget/profilewidget2.cpp" line="753"/>
+ <location filename="../profile-widget/profilewidget2.cpp" line="777"/>
<source>Unknown dive computer</source>
<translation>Tundmatu sukeldumiskompuuter</translation>
</message>
<message>
- <location filename="../profile-widget/profilewidget2.cpp" line="773"/>
+ <location filename="../profile-widget/profilewidget2.cpp" line="797"/>
<source>Show NDL / TTS was disabled because of excessive processing time</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../profile-widget/profilewidget2.cpp" line="1359"/>
- <source>Make first divecomputer</source>
- <translation>Loo esimene sukeldumiskompuuter</translation>
- </message>
- <message>
- <location filename="../profile-widget/profilewidget2.cpp" line="1361"/>
- <source>Delete this divecomputer</source>
- <translation>Kustuta see sukeldumiskompuuter</translation>
- </message>
- <message>
- <location filename="../profile-widget/profilewidget2.cpp" line="1375"/>
+ <location filename="../profile-widget/profilewidget2.cpp" line="1399"/>
<source>Add gas change</source>
<translation>Lisa gaasivahetus</translation>
</message>
<message>
- <location filename="../profile-widget/profilewidget2.cpp" line="1378"/>
+ <location filename="../profile-widget/profilewidget2.cpp" line="1402"/>
<source> (Tank %1)</source>
<translation> (Balloon %1)</translation>
</message>
<message>
- <location filename="../profile-widget/profilewidget2.cpp" line="1386"/>
- <source>Add set-point change</source>
+ <location filename="../profile-widget/profilewidget2.cpp" line="1383"/>
+ <source>Make first dive computer</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../profile-widget/profilewidget2.cpp" line="1385"/>
+ <source>Delete this dive computer</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../profile-widget/profilewidget2.cpp" line="1410"/>
+ <source>Add setpoint change</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../profile-widget/profilewidget2.cpp" line="1388"/>
+ <location filename="../profile-widget/profilewidget2.cpp" line="1412"/>
<source>Add bookmark</source>
<translation>Lisa järjehoidja</translation>
</message>
<message>
- <location filename="../profile-widget/profilewidget2.cpp" line="1392"/>
+ <location filename="../profile-widget/profilewidget2.cpp" line="1416"/>
<source>Edit the profile</source>
<translation>Toimeta profiili</translation>
</message>
<message>
- <location filename="../profile-widget/profilewidget2.cpp" line="1396"/>
+ <location filename="../profile-widget/profilewidget2.cpp" line="1420"/>
<source>Remove event</source>
<translation>Eemalda sündmus</translation>
</message>
<message>
- <location filename="../profile-widget/profilewidget2.cpp" line="1401"/>
+ <location filename="../profile-widget/profilewidget2.cpp" line="1425"/>
<source>Hide similar events</source>
<translation>Peida sarnased sündmused</translation>
</message>
<message>
- <location filename="../profile-widget/profilewidget2.cpp" line="1408"/>
+ <location filename="../profile-widget/profilewidget2.cpp" line="1432"/>
<source>Edit name</source>
<translation>Toimeta nimi</translation>
</message>
<message>
- <location filename="../profile-widget/profilewidget2.cpp" line="1437"/>
- <location filename="../profile-widget/profilewidget2.cpp" line="1444"/>
+ <location filename="../profile-widget/profilewidget2.cpp" line="1461"/>
+ <location filename="../profile-widget/profilewidget2.cpp" line="1468"/>
<source>Adjust pressure of tank %1 (currently interpolated as %2)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../profile-widget/profilewidget2.cpp" line="1459"/>
+ <location filename="../profile-widget/profilewidget2.cpp" line="1483"/>
<source>Unhide all events</source>
<translation>Peida kõik sündmused</translation>
</message>
<message>
- <location filename="../profile-widget/profilewidget2.cpp" line="1494"/>
+ <location filename="../profile-widget/profilewidget2.cpp" line="1518"/>
<source>Hide events</source>
<translation>Peida sündmused</translation>
</message>
<message>
- <location filename="../profile-widget/profilewidget2.cpp" line="1494"/>
+ <location filename="../profile-widget/profilewidget2.cpp" line="1518"/>
<source>Hide all %1 events?</source>
<translation>Peida kõik %1 sündmust?</translation>
</message>
<message>
- <location filename="../profile-widget/profilewidget2.cpp" line="1529"/>
+ <location filename="../profile-widget/profilewidget2.cpp" line="1553"/>
<source>Remove the selected event?</source>
<translation>Eemalda valitud sündmus?</translation>
</message>
<message>
- <location filename="../profile-widget/profilewidget2.cpp" line="1530"/>
+ <location filename="../profile-widget/profilewidget2.cpp" line="1554"/>
<source>%1 @ %2:%3</source>
<translation>%1 @ %2:%3</translation>
</message>
<message>
- <location filename="../profile-widget/profilewidget2.cpp" line="1653"/>
+ <location filename="../profile-widget/profilewidget2.cpp" line="1677"/>
<source>Edit name of bookmark</source>
<translation>Toimeta järjehoidja nimi</translation>
</message>
<message>
- <location filename="../profile-widget/profilewidget2.cpp" line="1654"/>
+ <location filename="../profile-widget/profilewidget2.cpp" line="1678"/>
<source>Custom name:</source>
<translation>Kohandatud nimi</translation>
</message>
<message>
- <location filename="../profile-widget/profilewidget2.cpp" line="1659"/>
+ <location filename="../profile-widget/profilewidget2.cpp" line="1683"/>
<source>Name is too long!</source>
<translation>Nimi on liiga pikk!</translation>
</message>
@@ -5902,96 +5716,96 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source>
<translation>Alustan...</translation>
</message>
<message>
- <location filename="../mobile-widgets/qmlmanager.cpp" line="204"/>
+ <location filename="../mobile-widgets/qmlmanager.cpp" line="209"/>
<source>working in no-cloud mode</source>
<translation>Töötamine mitte-pilve režiimis</translation>
</message>
<message>
- <location filename="../mobile-widgets/qmlmanager.cpp" line="218"/>
+ <location filename="../mobile-widgets/qmlmanager.cpp" line="223"/>
<source>no cloud credentials</source>
<translation>pole pilve volitusi</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="224"/>
+ <location filename="../mobile-widgets/qmlmanager.cpp" line="276"/>
<source>Please enter valid cloud credentials.</source>
<translation>Palun sisesta kehtivad pilve volitused.</translation>
</message>
<message>
- <location filename="../mobile-widgets/qmlmanager.cpp" line="286"/>
+ <location filename="../mobile-widgets/qmlmanager.cpp" line="291"/>
<source>Attempting to open cloud storage with new credentials</source>
<translation>Üritan avada pilvesalvestit uute volitustega</translation>
</message>
<message>
- <location filename="../mobile-widgets/qmlmanager.cpp" line="308"/>
+ <location filename="../mobile-widgets/qmlmanager.cpp" line="313"/>
<source>Testing cloud credentials</source>
<translation>Pilve volituste testimine</translation>
</message>
<message>
- <location filename="../mobile-widgets/qmlmanager.cpp" line="322"/>
+ <location filename="../mobile-widgets/qmlmanager.cpp" line="327"/>
<source>No response from cloud server to validate the credentials</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qmlmanager.cpp" line="331"/>
+ <location filename="../mobile-widgets/qmlmanager.cpp" line="336"/>
<source>Cannot connect to cloud storage - cloud account not verified</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qmlmanager.cpp" line="363"/>
+ <location filename="../mobile-widgets/qmlmanager.cpp" line="368"/>
<source>Cloud credentials are invalid</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qmlmanager.cpp" line="376"/>
+ <location filename="../mobile-widgets/qmlmanager.cpp" line="381"/>
<source>Cannot open cloud storage: Error creating https connection</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qmlmanager.cpp" line="389"/>
+ <location filename="../mobile-widgets/qmlmanager.cpp" line="394"/>
<source>Cannot open cloud storage: %1</source>
<translation>Ei saa avada pilve salvestit: %1</translation>
</message>
<message>
- <location filename="../mobile-widgets/qmlmanager.cpp" line="401"/>
+ <location filename="../mobile-widgets/qmlmanager.cpp" line="406"/>
<source>Cannot connect to cloud storage</source>
<translation>Ei saa ühendust pilve salvestiga</translation>
</message>
<message>
- <location filename="../mobile-widgets/qmlmanager.cpp" line="443"/>
+ <location filename="../mobile-widgets/qmlmanager.cpp" line="448"/>
<source>Cloud storage error: %1</source>
<translation>Pilve salvesti viga: %1</translation>
</message>
<message>
- <location filename="../mobile-widgets/qmlmanager.cpp" line="533"/>
+ <location filename="../mobile-widgets/qmlmanager.cpp" line="538"/>
<source>Failed to connect to cloud server, reverting to no cloud status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qmlmanager.cpp" line="554"/>
+ <location filename="../mobile-widgets/qmlmanager.cpp" line="564"/>
<source>Cloud storage open successfully. No dives in dive list.</source>
<translation>Pilve salvesti avamine õnnestus. Sukeldumiste nimekiri on tühi.</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="735"/>
+ <location filename="../mobile-widgets/qmlmanager.cpp" line="736"/>
<source>h</source>
<translation>h</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="735"/>
+ <location filename="../mobile-widgets/qmlmanager.cpp" line="736"/>
+ <location filename="../mobile-widgets/qmlmanager.cpp" line="737"/>
<source>min</source>
<translation>min</translation>
</message>
<message>
- <location filename="../mobile-widgets/qmlmanager.cpp" line="724"/>
+ <location filename="../mobile-widgets/qmlmanager.cpp" line="735"/>
<source>sec</source>
<translation>sek</translation>
</message>
<message>
- <location filename="../mobile-widgets/qmlmanager.cpp" line="1103"/>
+ <location filename="../mobile-widgets/qmlmanager.cpp" line="1115"/>
<source>Unknown GPS location</source>
<translation>Tundmatu GPS koht</translation>
</message>
@@ -6004,79 +5818,79 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source>
<translation type="unfinished"/>
</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="1306"/>
<source>m</source>
<translation>m</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="1305"/>
<source>ft</source>
<translation>jalg</translation>
</message>
<message>
- <location filename="../core/qthelper.cpp" line="794"/>
+ <location filename="../core/qthelper.cpp" line="818"/>
<source>C</source>
<translation>C</translation>
</message>
<message>
- <location filename="../core/qthelper.cpp" line="796"/>
+ <location filename="../core/qthelper.cpp" line="820"/>
<source>F</source>
<translation>F</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="1281"/>
<source>kg</source>
<translation>kg</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="1282"/>
<source>lbs</source>
<translation>nael</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="1331"/>
<source>bar</source>
<translation>bar</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="1330"/>
<source>psi</source>
<translation>psi</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="1266"/>
<source>AIR</source>
<translation>ÕHK</translation>
</message>
<message>
- <location filename="../core/qthelper.cpp" line="873"/>
+ <location filename="../core/qthelper.cpp" line="897"/>
<source>EAN</source>
<translation>EAN</translation>
</message>
<message numerus="yes">
- <location filename="../core/qthelper.cpp" line="962"/>
+ <location filename="../core/qthelper.cpp" line="996"/>
<source>(%n dive(s))</source>
<translation><numerusform>(%n sukeldumist)</numerusform><numerusform>(%n sukeldumist)</numerusform></translation>
</message>
<message>
- <location filename="../core/qthelper.cpp" line="1232"/>
+ <location filename="../core/qthelper.cpp" line="1266"/>
<source>OXYGEN</source>
<translation>HAPNIK</translation>
</message>
<message>
- <location filename="../core/qthelper.cpp" line="1319"/>
+ <location filename="../core/qthelper.cpp" line="1353"/>
<source>l</source>
<translation>l</translation>
</message>
<message>
- <location filename="../core/qthelper.cpp" line="1320"/>
+ <location filename="../core/qthelper.cpp" line="1354"/>
<source>cuft</source>
<translation>kuupjalg</translation>
</message>
@@ -6086,12 +5900,12 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source>
<translation>tundmatu</translation>
</message>
<message>
- <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="114"/>
+ <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="126"/>
<source>h:</source>
<translation>h:</translation>
</message>
<message>
- <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="114"/>
+ <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="126"/>
<source>min</source>
<translation>min</translation>
</message>
@@ -6144,8 +5958,8 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source>
<context>
<name>ReadSettingsThread</name>
<message>
- <location filename="../core/configuredivecomputerthreads.cpp" line="1592"/>
- <location filename="../core/configuredivecomputerthreads.cpp" line="1617"/>
+ <location filename="../core/configuredivecomputerthreads.cpp" line="1593"/>
+ <location filename="../core/configuredivecomputerthreads.cpp" line="1618"/>
<source>This feature is not yet available for the selected dive computer.</source>
<translation>Omadus ei ole valitud sukeldumiskompuutril veel olemas</translation>
</message>
@@ -6187,7 +6001,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source>
<context>
<name>ResetSettingsThread</name>
<message>
- <location filename="../core/configuredivecomputerthreads.cpp" line="1716"/>
+ <location filename="../core/configuredivecomputerthreads.cpp" line="1717"/>
<source>Reset settings failed!</source>
<translation>Seadete algväärtustamine ebaõnnestus!</translation>
</message>
@@ -6204,12 +6018,12 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source>
<name>SetpointDialog</name>
<message>
<location filename="../desktop-widgets/setpoint.ui" line="17"/>
- <source>Renumber</source>
- <translation>Nummerda ümber</translation>
+ <source>Add setpoint change</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../desktop-widgets/setpoint.ui" line="43"/>
- <source>New set-point (0 for OC)</source>
+ <source>New setpoint (0 for OC)</source>
<translation type="unfinished"/>
</message>
<message>
@@ -6399,54 +6213,54 @@ Not all images have timestamps in the range between
<context>
<name>SocialNetworkDialog</name>
<message>
- <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="300"/>
+ <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="304"/>
<source>Dive date: %1
</source>
<translation>Sukeldumise kuupäev: %1
</translation>
</message>
<message>
- <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="303"/>
+ <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="307"/>
<source>Duration: %1
</source>
<translation>Kestus: %1
</translation>
</message>
<message>
- <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="304"/>
+ <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="308"/>
<source>h:</source>
<comment>abbreviation for hours plus separator</comment>
<translation>h:</translation>
</message>
<message>
- <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="305"/>
+ <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="309"/>
<source>min</source>
<comment>abbreviation for minutes</comment>
<translation>min</translation>
</message>
<message>
- <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="308"/>
+ <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="312"/>
<source>Dive location: %1
</source>
<translation>Sukeldumise asukoht: %1
</translation>
</message>
<message>
- <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="311"/>
+ <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="315"/>
<source>Buddy: %1
</source>
<translation>Semu: %1
</translation>
</message>
<message>
- <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="314"/>
+ <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="318"/>
<source>Divemaster: %1
</source>
<translation>Divemaster: %1
</translation>
</message>
<message>
- <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="317"/>
+ <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="321"/>
<source>
%1</source>
<translation>
@@ -6519,20 +6333,20 @@ Not all images have timestamps in the range between
<context>
<name>StartPage</name>
<message>
- <location filename="../mobile-widgets/qml/StartPage.qml" line="19"/>
+ <location filename="../mobile-widgets/qml/StartPage.qml" line="18"/>
<source>To use Subsurface-mobile with Subsurface cloud storage, please enter your cloud credentials.
</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qml/StartPage.qml" line="20"/>
+ <location filename="../mobile-widgets/qml/StartPage.qml" line="19"/>
<source>If this is the first time you use Subsurface cloud storage, enter a valid email (all lower case) and a password of your choice (letters and numbers). The server will send a PIN to the email address provided that you will have to enter here.
</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qml/StartPage.qml" line="23"/>
+ <location filename="../mobile-widgets/qml/StartPage.qml" line="22"/>
<source>To use Subsurface-mobile only with local data on this device, tap on the no cloud icon below.</source>
<translation type="unfinished"/>
</message>
@@ -6545,22 +6359,22 @@ Not all images have timestamps in the range between
<translation>Programmist</translation>
</message>
<message>
- <location filename="../desktop-widgets/about.ui" line="80"/>
+ <location filename="../desktop-widgets/about.ui" line="83"/>
<source>&amp;License</source>
<translation>&amp;Litsents</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"/>
</message>
<message>
- <location filename="../desktop-widgets/about.ui" line="94"/>
+ <location filename="../desktop-widgets/about.ui" line="97"/>
<source>&amp;Website</source>
<translation>&amp;Veebileht</translation>
</message>
<message>
- <location filename="../desktop-widgets/about.ui" line="101"/>
+ <location filename="../desktop-widgets/about.ui" line="104"/>
<source>&amp;Close</source>
<translation>&amp;Sulge</translation>
</message>
@@ -6621,7 +6435,7 @@ Not all images have timestamps in the range between
<context>
<name>SuitFilter</name>
<message>
- <location filename="../desktop-widgets/simplewidgets.cpp" line="679"/>
+ <location filename="../desktop-widgets/simplewidgets.cpp" line="557"/>
<source>Suits: </source>
<translation>Ülikond:</translation>
</message>
@@ -6635,6 +6449,253 @@ Not all images have timestamps in the range between
</message>
</context>
<context>
+ <name>TabDiveExtraInfo</name>
+ <message>
+ <location filename="../desktop-widgets/tab-widgets/TabDiveExtraInfo.ui" line="14"/>
+ <source>Extra Info</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>TabDiveInformation</name>
+ <message>
+ <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="14"/>
+ <source>Information</source>
+ <translation>Info</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="56"/>
+ <source>Date</source>
+ <translation>Kuupäev</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="75"/>
+ <source>Interval</source>
+ <translation>Pinnaintervall</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="94"/>
+ <source>Gases used</source>
+ <translation>Kasutatud gaasid</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="113"/>
+ <source>Gas consumed</source>
+ <translation>Kulutatud gaasid</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="132"/>
+ <source>SAC</source>
+ <translation>SAC</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="151"/>
+ <source>CNS</source>
+ <translation>CNS</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="170"/>
+ <source>OTU</source>
+ <translation>OTU</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="189"/>
+ <source>Max. depth</source>
+ <translation>Max sügavus</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="208"/>
+ <source>Avg. depth</source>
+ <translation>Keskmine sügavus</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="227"/>
+ <source>Air pressure</source>
+ <translation>Õhurõhk</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="246"/>
+ <source>Air temp.</source>
+ <translation>Õhu temp.</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="265"/>
+ <source>Water temp.</source>
+ <translation>Vee temp.</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="284"/>
+ <source>Dive time</source>
+ <translation>Sukeldumise aeg</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="303"/>
+ <source>Salinity</source>
+ <translation>Soolsus</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="70"/>
+ <source>/min</source>
+ <translation>/min</translation>
+ </message>
+</context>
+<context>
+ <name>TabDivePhotos</name>
+ <message>
+ <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.ui" line="14"/>
+ <source>Photos</source>
+ <translation>Fotod</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="45"/>
+ <source>Load image(s) from file(s)</source>
+ <translation>Lae pilt (pildid) faili(de)st</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="46"/>
+ <source>Load image(s) from web</source>
+ <translation>Lae pilt (pildid) veebist</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="48"/>
+ <source>Delete selected images</source>
+ <translation>Kustuta valitud pildid</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="49"/>
+ <source>Delete all images</source>
+ <translation>Kustuta kõik pildid</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="88"/>
+ <source>Deleting Images</source>
+ <translation>Kustutan pildid</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="88"/>
+ <source>Are you sure you want to delete all images?</source>
+ <translation>Oled kindel et soovid kustutada kõik pildid?</translation>
+ </message>
+</context>
+<context>
+ <name>TabDiveStatistics</name>
+ <message>
+ <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="14"/>
+ <source>Statistics</source>
+ <translation>Statistika</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="55"/>
+ <source>Depth</source>
+ <translation>Sügavus</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="67"/>
+ <source>Duration</source>
+ <translation>Kestus</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="96"/>
+ <source>Temperature</source>
+ <translation>Temperatuur</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="108"/>
+ <source>Total time</source>
+ <translation>Koguaeg</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="127"/>
+ <source>Dives</source>
+ <translation>Sukeldumisi kokku</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="163"/>
+ <source>SAC</source>
+ <translation>SAC</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="175"/>
+ <source>Gas consumption</source>
+ <translation>Gaasi tarbimine</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="11"/>
+ <source>Highest total SAC of a dive</source>
+ <translation>Suurim summaarne SAC sukeldumisel</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="12"/>
+ <source>Lowest total SAC of a dive</source>
+ <translation>Madalaim summaarne SAC sukeldumisel</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="13"/>
+ <source>Average total SAC of all selected dives</source>
+ <translation>Keskmine summaarne SAC kõigil valitud sukeldumistel</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="14"/>
+ <source>Highest temperature</source>
+ <translation>Kõrgeim temp</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="15"/>
+ <source>Lowest temperature</source>
+ <translation>Madalaim temp</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="16"/>
+ <source>Average temperature of all selected dives</source>
+ <translation>Kõigi valitud sukeldumiste keskmine temp</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="17"/>
+ <source>Deepest dive</source>
+ <translation>Sügavaim sukeldumine</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="18"/>
+ <source>Shallowest dive</source>
+ <translation>Madalaim sukeldumine</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="19"/>
+ <source>Longest dive</source>
+ <translation>Pikim sukeldumine</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="20"/>
+ <source>Shortest dive</source>
+ <translation>Lühim sukeldumine</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="21"/>
+ <source>Average length of all selected dives</source>
+ <translation>Kõigi valitud sukeldumiste keskmine pikkus</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="55"/>
+ <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="59"/>
+ <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="63"/>
+ <source>/min</source>
+ <translation>/min</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="115"/>
+ <source>These gases could be
+mixed from Air and using:
+</source>
+ <translation>Need gaasid saab segada
+õhust ja kasutades:</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="119"/>
+ <source> and </source>
+ <translation>ja</translation>
+ </message>
+</context>
+<context>
<name>TableView</name>
<message>
<location filename="../desktop-widgets/tableview.ui" line="14"/>
@@ -6646,7 +6707,7 @@ Not all images have timestamps in the range between
<context>
<name>TagFilter</name>
<message>
- <location filename="../desktop-widgets/simplewidgets.cpp" line="600"/>
+ <location filename="../desktop-widgets/simplewidgets.cpp" line="478"/>
<source>Tags: </source>
<translation>Märgendid:</translation>
</message>
@@ -6760,87 +6821,92 @@ Not all images have timestamps in the range between
<translation>Reavahe</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"/>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/templateedit.ui" line="271"/>
<source>Template</source>
<translation>Mall</translation>
</message>
<message>
- <location filename="../desktop-widgets/templateedit.ui" line="264"/>
+ <location filename="../desktop-widgets/templateedit.ui" line="294"/>
<source>Colors</source>
<translation>Värvid</translation>
</message>
<message>
- <location filename="../desktop-widgets/templateedit.ui" line="280"/>
+ <location filename="../desktop-widgets/templateedit.ui" line="310"/>
<source>Background</source>
<translation>Taust</translation>
</message>
<message>
- <location filename="../desktop-widgets/templateedit.ui" line="293"/>
+ <location filename="../desktop-widgets/templateedit.ui" line="323"/>
<source>color1</source>
<translation>värv1</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>Toimeta</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"/>
</message>
<message>
- <location filename="../desktop-widgets/templateedit.ui" line="333"/>
+ <location filename="../desktop-widgets/templateedit.ui" line="363"/>
<source>color2</source>
<translation type="unfinished"/>
</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"/>
</message>
<message>
- <location filename="../desktop-widgets/templateedit.ui" line="373"/>
+ <location filename="../desktop-widgets/templateedit.ui" line="403"/>
<source>color3</source>
<translation type="unfinished"/>
</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"/>
</message>
<message>
- <location filename="../desktop-widgets/templateedit.ui" line="413"/>
+ <location filename="../desktop-widgets/templateedit.ui" line="443"/>
<source>color4</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/templateedit.ui" line="440"/>
+ <location filename="../desktop-widgets/templateedit.ui" line="470"/>
<source>Text 2</source>
<translation>Tekst 2</translation>
</message>
<message>
- <location filename="../desktop-widgets/templateedit.ui" line="453"/>
+ <location filename="../desktop-widgets/templateedit.ui" line="483"/>
<source>color5</source>
<translation>Värv5</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"/>
</message>
<message>
- <location filename="../desktop-widgets/templateedit.ui" line="493"/>
+ <location filename="../desktop-widgets/templateedit.ui" line="523"/>
<source>color6</source>
<translation>Värv6</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"/>
</message>
@@ -6848,62 +6914,62 @@ Not all images have timestamps in the range between
<context>
<name>TestParse</name>
<message>
- <location filename="../tests/testparse.cpp" line="313"/>
+ <location filename="../tests/testparse.cpp" line="314"/>
<source>Sample time</source>
<translation>Näidis aeg</translation>
</message>
<message>
- <location filename="../tests/testparse.cpp" line="315"/>
+ <location filename="../tests/testparse.cpp" line="316"/>
<source>Sample depth</source>
<translation>Näidis sügavus</translation>
</message>
<message>
- <location filename="../tests/testparse.cpp" line="317"/>
+ <location filename="../tests/testparse.cpp" line="318"/>
<source>Sample temperature</source>
<translation>Näidis temp</translation>
</message>
<message>
- <location filename="../tests/testparse.cpp" line="319"/>
+ <location filename="../tests/testparse.cpp" line="320"/>
<source>Sample pO₂</source>
<translation>Näidis pO₂</translation>
</message>
<message>
- <location filename="../tests/testparse.cpp" line="321"/>
+ <location filename="../tests/testparse.cpp" line="322"/>
<source>Sample sensor1 pO₂</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../tests/testparse.cpp" line="323"/>
+ <location filename="../tests/testparse.cpp" line="324"/>
<source>Sample sensor2 pO₂</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../tests/testparse.cpp" line="325"/>
+ <location filename="../tests/testparse.cpp" line="326"/>
<source>Sample sensor3 pO₂</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../tests/testparse.cpp" line="327"/>
+ <location filename="../tests/testparse.cpp" line="328"/>
<source>Sample CNS</source>
<translation>Näidis CNS</translation>
</message>
<message>
- <location filename="../tests/testparse.cpp" line="329"/>
+ <location filename="../tests/testparse.cpp" line="330"/>
<source>Sample NDL</source>
<translation>Näidis NDL</translation>
</message>
<message>
- <location filename="../tests/testparse.cpp" line="331"/>
+ <location filename="../tests/testparse.cpp" line="332"/>
<source>Sample TTS</source>
<translation>Näidis TTS</translation>
</message>
<message>
- <location filename="../tests/testparse.cpp" line="333"/>
+ <location filename="../tests/testparse.cpp" line="334"/>
<source>Sample stopdepth</source>
<translation>Näidis peatuse sügavus</translation>
</message>
<message>
- <location filename="../tests/testparse.cpp" line="335"/>
+ <location filename="../tests/testparse.cpp" line="336"/>
<source>Sample pressure</source>
<translation>Näidis TTS</translation>
</message>
@@ -6911,7 +6977,7 @@ Not all images have timestamps in the range between
<context>
<name>TextHyperlinkEventFilter</name>
<message>
- <location filename="../desktop-widgets/simplewidgets.cpp" line="822"/>
+ <location filename="../desktop-widgets/simplewidgets.cpp" line="700"/>
<source>%1click to visit %2</source>
<translation type="unfinished"/>
</message>
@@ -6968,8 +7034,18 @@ Not all images have timestamps in the range between
</message>
<message>
<location filename="../qt-models/divetripmodel.cpp" line="226"/>
- <source>Temp(%1%2)</source>
- <translation>Temp(%1%2)</translation>
+ <source>Temp.(%1%2)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-models/divetripmodel.cpp" line="235"/>
+ <source>Cylinder</source>
+ <translation>Balloon</translation>
+ </message>
+ <message>
+ <location filename="../qt-models/divetripmodel.cpp" line="249"/>
+ <source>Max. CNS</source>
+ <translation>Max CNS</translation>
</message>
<message>
<location filename="../qt-models/divetripmodel.cpp" line="229"/>
@@ -6992,11 +7068,6 @@ Not all images have timestamps in the range between
<translation>Ülikond</translation>
</message>
<message>
- <location filename="../qt-models/divetripmodel.cpp" line="235"/>
- <source>Cyl</source>
- <translation>Ball</translation>
- </message>
- <message>
<location filename="../qt-models/divetripmodel.cpp" line="238"/>
<source>Gas</source>
<translation>Gaas</translation>
@@ -7017,11 +7088,6 @@ Not all images have timestamps in the range between
<translation>OTU</translation>
</message>
<message>
- <location filename="../qt-models/divetripmodel.cpp" line="249"/>
- <source>Max CNS</source>
- <translation>Max CNS</translation>
- </message>
- <message>
<location filename="../qt-models/divetripmodel.cpp" line="252"/>
<source>Photos before/during/after dive</source>
<translation>Fotod sukeldumise eel/ajal/järel</translation>
@@ -7141,67 +7207,67 @@ If you don&apos;t want Subsurface to continue checking, please click Decline.</s
<translation>Kasutajaküsitlus</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>Subsurface kasutajauuring</translation>
</message>
<message>
- <location filename="../desktop-widgets/usersurvey.ui" line="44"/>
+ <location filename="../desktop-widgets/usersurvey.ui" line="20"/>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;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.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Me sooviksime rohkem teada meie kasutajatest, nende eelistustest ja kasutamise kommetest. Palun leidke minut selle küsitluse täitmiseks ja Subsurface tiimile saatmiseks.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message>
<message>
- <location filename="../desktop-widgets/usersurvey.ui" line="63"/>
+ <location filename="../desktop-widgets/usersurvey.ui" line="47"/>
<source>Technical diver</source>
<translation>Tehniline sukelduja</translation>
</message>
<message>
- <location filename="../desktop-widgets/usersurvey.ui" line="76"/>
+ <location filename="../desktop-widgets/usersurvey.ui" line="54"/>
<source>Recreational diver</source>
<translation>Hobisukelduja</translation>
</message>
<message>
- <location filename="../desktop-widgets/usersurvey.ui" line="89"/>
+ <location filename="../desktop-widgets/usersurvey.ui" line="61"/>
<source>Dive planner</source>
<translation>Sukeldumise planeerija</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>Toetatud sukeldumiskompuuter</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>Muu tarkvara/allikad</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"/>
</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>Android/iPhone toetav äpp</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>Ettepanekud? (inglise keeles)</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"/>
</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>Milline sukelduja olete?</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"/>
</message>
@@ -7385,15 +7451,15 @@ Keel: %1</translation>
<context>
<name>WriteSettingsThread</name>
<message>
- <location filename="../core/configuredivecomputerthreads.cpp" line="1641"/>
- <location filename="../core/configuredivecomputerthreads.cpp" line="1662"/>
+ <location filename="../core/configuredivecomputerthreads.cpp" line="1642"/>
+ <location filename="../core/configuredivecomputerthreads.cpp" line="1663"/>
<source>This feature is not yet available for the selected dive computer.</source>
<translation>Omadus ei ole valitud sukeldumiskompuutril veel olemas.</translation>
</message>
<message>
- <location filename="../core/configuredivecomputerthreads.cpp" line="1643"/>
- <location filename="../core/configuredivecomputerthreads.cpp" line="1650"/>
- <location filename="../core/configuredivecomputerthreads.cpp" line="1659"/>
+ <location filename="../core/configuredivecomputerthreads.cpp" line="1644"/>
+ <location filename="../core/configuredivecomputerthreads.cpp" line="1651"/>
+ <location filename="../core/configuredivecomputerthreads.cpp" line="1660"/>
<source>Failed!</source>
<translation>Ebaõnnestus!</translation>
</message>
@@ -7521,7 +7587,7 @@ Max</translation>
<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"/>
</message>
@@ -7529,277 +7595,281 @@ Max</translation>
<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>dekopeatus</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>tõus</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>patarei</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>Hapnikulimiidi osa (OLF)</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>max sügavus</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>pO₂</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>gaasivahetus</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>rbt</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>lagi</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>saatja</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"/>
- </message>
- <message>
- <location filename="../core/datatrak.c" line="286"/>
+ <location filename="../core/datatrak.c" line="288"/>
<source>clear</source>
<translation>selge</translation>
</message>
<message>
- <location filename="../core/datatrak.c" line="289"/>
+ <location filename="../core/datatrak.c" line="291"/>
<source>misty</source>
<translation>vine</translation>
</message>
<message>
- <location filename="../core/datatrak.c" line="292"/>
+ <location filename="../core/datatrak.c" line="294"/>
<source>fog</source>
<translation>udu</translation>
</message>
<message>
- <location filename="../core/datatrak.c" line="295"/>
+ <location filename="../core/datatrak.c" line="297"/>
<source>rain</source>
<translation>vihm</translation>
</message>
<message>
- <location filename="../core/datatrak.c" line="298"/>
+ <location filename="../core/datatrak.c" line="300"/>
<source>storm</source>
<translation>torm</translation>
</message>
<message>
- <location filename="../core/datatrak.c" line="301"/>
+ <location filename="../core/datatrak.c" line="303"/>
<source>snow</source>
<translation>lumi</translation>
</message>
<message>
- <location filename="../core/datatrak.c" line="321"/>
+ <location filename="../core/datatrak.c" line="323"/>
<source>No suit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../core/datatrak.c" line="324"/>
+ <location filename="../core/datatrak.c" line="326"/>
<source>Shorty</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../core/datatrak.c" line="327"/>
+ <location filename="../core/datatrak.c" line="329"/>
<source>Combi</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../core/datatrak.c" line="330"/>
+ <location filename="../core/datatrak.c" line="332"/>
<source>Wet suit</source>
<translation>Märg ülikond</translation>
</message>
<message>
- <location filename="../core/datatrak.c" line="333"/>
+ <location filename="../core/datatrak.c" line="335"/>
<source>Semidry suit</source>
<translation>Poolkuiv ülikond</translation>
</message>
<message>
- <location filename="../core/datatrak.c" line="336"/>
+ <location filename="../core/datatrak.c" line="338"/>
<source>Dry suit</source>
<translation>Kuiv ülikond</translation>
</message>
<message>
- <location filename="../core/datatrak.c" line="396"/>
+ <location filename="../core/datatrak.c" line="398"/>
<source>no stop</source>
<translation type="unfinished"/>
</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>deko</translation>
</message>
<message>
- <location filename="../core/datatrak.c" line="400"/>
+ <location filename="../core/datatrak.c" line="402"/>
<source>single ascent</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../core/datatrak.c" line="402"/>
+ <location filename="../core/datatrak.c" line="404"/>
<source>multiple ascent</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../core/datatrak.c" line="404"/>
<location filename="../core/dive.c" line="27"/>
<source>fresh</source>
<translation>magevesi</translation>
</message>
<message>
+ <location filename="../core/datatrak.c" line="155"/>
+ <source>Error: the file does not appear to be a DATATRAK dive log</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../core/datatrak.c" line="406"/>
+ <source>fresh water</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../core/datatrak.c" line="408"/>
<source>salt water</source>
<translation>soolane vesi</translation>
</message>
<message>
- <location filename="../core/datatrak.c" line="431"/>
+ <location filename="../core/datatrak.c" line="433"/>
<source>sight seeing</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../core/datatrak.c" line="433"/>
+ <location filename="../core/datatrak.c" line="435"/>
<source>club dive</source>
<translation>Klubisukeldumine</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>instruktor</translation>
</message>
<message>
- <location filename="../core/datatrak.c" line="437"/>
+ <location filename="../core/datatrak.c" line="439"/>
<source>instruction</source>
<translation type="unfinished"/>
</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>öö</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>koobas</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>jää</translation>
</message>
<message>
- <location filename="../core/datatrak.c" line="445"/>
+ <location filename="../core/datatrak.c" line="447"/>
<source>search</source>
<translation type="unfinished"/>
</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>vrakk</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>jõgi</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>hoovus</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>foto</translation>
</message>
<message>
- <location filename="../core/datatrak.c" line="463"/>
+ <location filename="../core/datatrak.c" line="465"/>
<source>other</source>
<translation>muu</translation>
</message>
<message>
- <location filename="../core/datatrak.c" line="474"/>
+ <location filename="../core/datatrak.c" line="476"/>
<source>Other activities</source>
<translation>Muu tegevus</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"/>
</message>
<message>
- <location filename="../core/datatrak.c" line="537"/>
+ <location filename="../core/datatrak.c" line="539"/>
<source>Manually entered dive</source>
<translation>Käsitsi sisestatud sukeldumine</translation>
</message>
<message>
- <location filename="../core/datatrak.c" line="588"/>
+ <location filename="../core/datatrak.c" line="590"/>
<source>Unknown</source>
<translation>Tundmatu</translation>
</message>
<message>
- <location filename="../core/datatrak.c" line="674"/>
+ <location filename="../core/datatrak.c" line="676"/>
<source>Error: couldn&apos;t open the file %s</source>
<translation>Viga: ei suuda avada faili %s</translation>
</message>
<message>
- <location filename="../core/datatrak.c" line="687"/>
+ <location filename="../core/datatrak.c" line="689"/>
<source>Error: no dive</source>
<translation>Viga: pole sukeldumisi</translation>
</message>
@@ -7860,9 +7930,9 @@ Max</translation>
</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="1545"/>
+ <location filename="../core/planner.c" line="1548"/>
<source>oxygen</source>
<translation>hapnik</translation>
</message>
@@ -7899,93 +7969,93 @@ Max</translation>
<translation>kuupjalg</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>m</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>jalg</translation>
</message>
<message>
- <location filename="../core/dive.c" line="297"/>
+ <location filename="../core/dive.c" line="301"/>
<source>m/min</source>
<translation>m/min</translation>
</message>
<message>
- <location filename="../core/dive.c" line="299"/>
+ <location filename="../core/dive.c" line="303"/>
<source>m/s</source>
<translation>m/s</translation>
</message>
<message>
- <location filename="../core/dive.c" line="304"/>
+ <location filename="../core/dive.c" line="308"/>
<source>ft/min</source>
<translation>jalg/min</translation>
</message>
<message>
- <location filename="../core/dive.c" line="306"/>
+ <location filename="../core/dive.c" line="310"/>
<source>ft/s</source>
<translation>jalga/s</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>nael</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>kg</translation>
</message>
<message>
- <location filename="../core/dive.c" line="1751"/>
+ <location filename="../core/dive.c" line="1755"/>
<source>(%s) or (%s)</source>
<translation>(%s) või (%s)</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="1541"/>
+ <location filename="../core/planner.c" line="1544"/>
<source>air</source>
<translation>õhk</translation>
</message>
<message>
- <location filename="../core/equipment.c" line="86"/>
+ <location filename="../core/equipment.c" line="88"/>
<source>EAN%d</source>
<translation>EAN%d</translation>
</message>
<message>
- <location filename="../core/equipment.c" line="198"/>
+ <location filename="../core/equipment.c" line="202"/>
<source>integrated</source>
<translation>integreeritud</translation>
</message>
<message>
- <location filename="../core/equipment.c" line="199"/>
+ <location filename="../core/equipment.c" line="203"/>
<source>belt</source>
<translation>vöö</translation>
</message>
<message>
- <location filename="../core/equipment.c" line="200"/>
+ <location filename="../core/equipment.c" line="204"/>
<source>ankle</source>
<translation>pahkluu</translation>
</message>
<message>
- <location filename="../core/equipment.c" line="201"/>
- <source>backplate weight</source>
- <translation>seljaplaadi kaal</translation>
+ <location filename="../core/equipment.c" line="205"/>
+ <source>backplate</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../core/equipment.c" line="202"/>
+ <location filename="../core/equipment.c" line="206"/>
<source>clip-on</source>
<translation>külgeriputatav</translation>
</message>
@@ -8057,275 +8127,275 @@ Max</translation>
<translation>O₂ kalibreerimine</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&apos;t sync with Subsurface cloud storage</source>
<translation type="unfinished"/>
</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"/>
</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"/>
</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"/>
</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"/>
</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"/>
</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"/>
</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"/>
</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"/>
</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"/>
</message>
<message>
- <location filename="../core/git-access.c" line="743"/>
+ <location filename="../core/git-access.c" line="750"/>
<source>Error connecting to Subsurface cloud storage</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../core/git-access.c" line="746"/>
+ <location filename="../core/git-access.c" line="753"/>
<source>git clone of %s failed (%s)</source>
<translation type="unfinished"/>
</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="3321"/>
<location filename="../core/uemis-downloader.c" line="134"/>
<source>unknown</source>
<translation>tundmatu</translation>
</message>
<message>
- <location filename="../core/libdivecomputer.c" line="231"/>
+ <location filename="../core/libdivecomputer.c" line="234"/>
<source>none</source>
<translation>mitte ükski</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>töökoormus</translation>
</message>
<message>
- <location filename="../core/libdivecomputer.c" line="238"/>
+ <location filename="../core/libdivecomputer.c" line="241"/>
<source>violation</source>
<translation>rikkumine</translation>
</message>
<message>
- <location filename="../core/libdivecomputer.c" line="239"/>
+ <location filename="../core/libdivecomputer.c" line="242"/>
<source>bookmark</source>
<translation>järjehoidja</translation>
</message>
<message>
- <location filename="../core/libdivecomputer.c" line="240"/>
+ <location filename="../core/libdivecomputer.c" line="243"/>
<source>surface</source>
<translation>pind</translation>
</message>
<message>
- <location filename="../core/libdivecomputer.c" line="241"/>
+ <location filename="../core/libdivecomputer.c" line="244"/>
<source>safety stop</source>
<translation>ohutuspeatus</translation>
</message>
<message>
- <location filename="../core/libdivecomputer.c" line="243"/>
+ <location filename="../core/libdivecomputer.c" line="246"/>
<source>safety stop (voluntary)</source>
<translation>ohutuspeatus (vabatahtlik)</translation>
</message>
<message>
- <location filename="../core/libdivecomputer.c" line="244"/>
+ <location filename="../core/libdivecomputer.c" line="247"/>
<source>safety stop (mandatory)</source>
<translation>ohutuspeatus (kohustuslik)</translation>
</message>
<message>
- <location filename="../core/libdivecomputer.c" line="245"/>
+ <location filename="../core/libdivecomputer.c" line="248"/>
<source>deepstop</source>
<translation>sügavpeatus</translation>
</message>
<message>
- <location filename="../core/libdivecomputer.c" line="246"/>
+ <location filename="../core/libdivecomputer.c" line="249"/>
<source>ceiling (safety stop)</source>
<translation>lagi (ohutuspeatus)</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>allpool taset</translation>
</message>
<message>
- <location filename="../core/libdivecomputer.c" line="248"/>
+ <location filename="../core/libdivecomputer.c" line="251"/>
<source>divetime</source>
<translation>põhjaaeg</translation>
</message>
<message>
- <location filename="../core/libdivecomputer.c" line="252"/>
+ <location filename="../core/libdivecomputer.c" line="255"/>
<source>airtime</source>
<translation>aeg õhuga</translation>
</message>
<message>
- <location filename="../core/libdivecomputer.c" line="253"/>
+ <location filename="../core/libdivecomputer.c" line="256"/>
<source>rgbm</source>
<translation>rgbm</translation>
</message>
<message>
- <location filename="../core/libdivecomputer.c" line="254"/>
+ <location filename="../core/libdivecomputer.c" line="257"/>
<source>heading</source>
<translation>suund</translation>
</message>
<message>
- <location filename="../core/libdivecomputer.c" line="255"/>
+ <location filename="../core/libdivecomputer.c" line="258"/>
<source>tissue level warning</source>
<translation>koe taseme hoiatus</translation>
</message>
<message>
- <location filename="../core/libdivecomputer.c" line="265"/>
+ <location filename="../core/libdivecomputer.c" line="268"/>
<source>invalid event number</source>
<translation>vale sündmuse nr</translation>
</message>
<message>
- <location filename="../core/libdivecomputer.c" line="592"/>
+ <location filename="../core/libdivecomputer.c" line="595"/>
<source>Error parsing the datetime</source>
<translation>Viga kuupäeva ja aja tuvastamisel</translation>
</message>
<message>
- <location filename="../core/libdivecomputer.c" line="610"/>
+ <location filename="../core/libdivecomputer.c" line="613"/>
<source>Dive %d: %s</source>
<translation>Sukeldumine %d: %s</translation>
</message>
<message>
- <location filename="../core/libdivecomputer.c" line="616"/>
+ <location filename="../core/libdivecomputer.c" line="619"/>
<source>Error parsing the divetime</source>
<translation>Viga põhjaaja tuvastamisel</translation>
</message>
<message>
- <location filename="../core/libdivecomputer.c" line="626"/>
+ <location filename="../core/libdivecomputer.c" line="629"/>
<source>Error parsing the maxdepth</source>
<translation>Viga max sügavuse tuvastamisel</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"/>
</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>Viga gaasisegude arvu tuvastamisel</translation>
</message>
<message>
- <location filename="../core/libdivecomputer.c" line="677"/>
+ <location filename="../core/libdivecomputer.c" line="680"/>
<source>Error obtaining water salinity</source>
<translation>Viga vee soolsuse saamisel</translation>
</message>
<message>
- <location filename="../core/libdivecomputer.c" line="686"/>
+ <location filename="../core/libdivecomputer.c" line="689"/>
<source>Error obtaining surface pressure</source>
<translation>Viga pinnarõhu saamisel</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"/>
</message>
<message>
- <location filename="../core/libdivecomputer.c" line="731"/>
+ <location filename="../core/libdivecomputer.c" line="734"/>
<source>Error parsing the gas mix</source>
<translation>Viga gaasisegu tuvastamisel</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>Ei saa luua parserit %s %s jaoks</translation>
</message>
<message>
- <location filename="../core/libdivecomputer.c" line="762"/>
+ <location filename="../core/libdivecomputer.c" line="765"/>
<source>Error registering the data</source>
<translation>Viga andmete registreerimisel</translation>
</message>
<message>
- <location filename="../core/libdivecomputer.c" line="783"/>
+ <location filename="../core/libdivecomputer.c" line="786"/>
<source>Error parsing the samples</source>
<translation>Viga proovide tuvastamisel</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>Sündmus: ootan kasutaja sekkumist</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>mudel=%u (0x%08x), püsivara=%u (0x%08x), seerianr=%u (0x%08x)</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>Viga sündmuste draiveri registreerimisel.</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>Viga tühistamise draiveri registreerimisel</translation>
</message>
<message>
- <location filename="../core/libdivecomputer.c" line="1019"/>
+ <location filename="../core/libdivecomputer.c" line="1022"/>
<source>Dive data import error</source>
<translation>Viga sukeldumise andmete impordil</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>Ei saa luua libdivecomputer konteksti</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>Ei saa avada %s %s (%s)</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"/>
</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"/>
</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"/>
@@ -8342,216 +8412,248 @@ Max</translation>
<translation type="unfinished"/>
</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>Imelik protsendilugem %s
</translation>
</message>
<message>
- <location filename="../core/parse-xml.c" line="2047"/>
+ <location filename="../core/parse-xml.c" line="2052"/>
<source>Failed to parse &apos;%s&apos;</source>
<translation>&apos;%s&apos; tuvastamine ebaõnnestus</translation>
</message>
<message>
- <location filename="../core/parse-xml.c" line="3771"/>
+ <location filename="../core/parse-xml.c" line="3779"/>
<source>Can&apos;t open stylesheet %s</source>
<translation>Ei suuda avada stiililehte %s</translation>
</message>
<message>
- <location filename="../core/planner.c" line="561"/>
+ <location filename="../core/planner.c" line="567"/>
<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>ÕIGUSTEST LOOBUMINE / HOIATUS: SEE ON %s ALGORITMI UUS TEOSTUS JA SUKELDUMISE PLANEERIJA UUS TEOSTUS MIDA ON VÄHE TESTITUD. SOOVITAME TUNGIVALT PLANEERIDA SUKELDUMISI TUGINEDES MITTE AINULT SIIN ANTUD TULEMUSTELE.</translation>
</message>
<message>
- <location filename="../core/planner.c" line="575"/>
+ <location filename="../core/planner.c" line="581"/>
<source>Decompression calculation aborted due to excessive time</source>
<translation>Dekompressiooni arvutamine katkestatud liigse ajakulu tõttu</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="583"/>
+ <location filename="../core/planner.c" line="898"/>
+ <location filename="../core/planner.c" line="904"/>
+ <location filename="../core/planner.c" line="932"/>
+ <location filename="../core/planner.c" line="967"/>
+ <location filename="../core/planner.c" line="979"/>
<source>Warning:</source>
<translation>Hoiatus:</translation>
</message>
<message>
- <location filename="../core/planner.c" line="815"/>
+ <location filename="../core/planner.c" line="839"/>
<source>, effective GF=%d/%d</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../core/planner.c" line="589"/>
- <source>Subsurface dive plan (surface interval </source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../core/planner.c" line="320"/>
+ <location filename="../core/planner.c" line="324"/>
<location filename="../desktop-widgets/simplewidgets.cpp" line="202"/>
<source>SP change</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../core/planner.c" line="593"/>
- <source>Subsurface dive plan</source>
- <translation>Subsurface sukeldumise plaan</translation>
+ <location filename="../core/planner.c" line="562"/>
+ <source>VPM-B</source>
+ <translation>VPM-B</translation>
+ </message>
+ <message>
+ <location filename="../core/planner.c" line="564"/>
+ <source>BUHLMANN</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../core/planner.c" line="596"/>
+ <location filename="../core/planner.c" line="609"/>
<source>Runtime: %dmin&lt;br&gt;&lt;/div&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../core/planner.c" line="601"/>
+ <location filename="../core/planner.c" line="614"/>
<source>depth</source>
<translation>sügavus</translation>
</message>
<message>
- <location filename="../core/planner.c" line="604"/>
+ <location filename="../core/planner.c" line="617"/>
<source>duration</source>
<translation>kestus</translation>
</message>
<message>
- <location filename="../core/planner.c" line="607"/>
+ <location filename="../core/planner.c" line="620"/>
<source>runtime</source>
<translation>jooksev aeg</translation>
</message>
<message>
- <location filename="../core/planner.c" line="610"/>
+ <location filename="../core/planner.c" line="623"/>
<source>gas</source>
<translation>gaas</translation>
</message>
<message>
- <location filename="../core/planner.c" line="653"/>
+ <location filename="../core/planner.c" line="677"/>
<source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../core/planner.c" line="661"/>
+ <location filename="../core/planner.c" line="685"/>
<source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source>
<translation>Üleminek %.*f %s-le %d:%02d min jooksul - jooksev aeg %d:%02u %s peal</translation>
</message>
<message>
- <location filename="../core/planner.c" line="674"/>
+ <location filename="../core/planner.c" line="698"/>
<source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../core/planner.c" line="681"/>
+ <location filename="../core/planner.c" line="705"/>
<source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source>
<translation>Püsi %.*f %s peal %d:%02d min - jooksev aeg %d:%02u %s peal</translation>
</message>
<message>
- <location filename="../core/planner.c" line="726"/>
+ <location filename="../core/planner.c" line="750"/>
<source>%3.0f%s</source>
<translation>%3.0f%s</translation>
</message>
<message>
- <location filename="../core/planner.c" line="729"/>
- <location filename="../core/planner.c" line="733"/>
+ <location filename="../core/planner.c" line="753"/>
+ <location filename="../core/planner.c" line="757"/>
<source>%3dmin</source>
<translation>%3dmin</translation>
</message>
<message>
- <location filename="../core/planner.c" line="742"/>
- <location filename="../core/planner.c" line="754"/>
+ <location filename="../core/planner.c" line="766"/>
+ <location filename="../core/planner.c" line="778"/>
<source>(SP = %.1fbar)</source>
<translation>(SP = %.1fbar)</translation>
</message>
<message>
- <location filename="../core/planner.c" line="777"/>
+ <location filename="../core/planner.c" line="801"/>
<source>Switch gas to %s (SP = %.1fbar)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../core/planner.c" line="779"/>
+ <location filename="../core/planner.c" line="803"/>
<source>Switch gas to %s</source>
<translation>Vaheta gaasiks %s</translation>
</message>
<message>
- <location filename="../core/planner.c" line="799"/>
+ <location filename="../core/planner.c" line="823"/>
<source>CNS</source>
<translation>CNS</translation>
</message>
<message>
- <location filename="../core/planner.c" line="801"/>
+ <location filename="../core/planner.c" line="825"/>
<source>OTU</source>
<translation>OTU</translation>
</message>
<message>
- <location filename="../core/planner.c" line="806"/>
- <source>Deco model: Bühlmann ZHL-16C with GFlow = %d and GFhigh = %d</source>
- <translation>Deko mudel: Bühlmann ZHL-16C koos GFlow = %d ja GFhigh = %d</translation>
+ <location filename="../core/planner.c" line="835"/>
+ <source>Deco model: VPM-B at nominal conservatism</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../core/planner.c" line="811"/>
- <source>Deco model: VPM-B at nominal conservatism</source>
+ <location filename="../core/planner.c" line="595"/>
+ <location filename="../core/planner.c" line="603"/>
+ <source>Subsurface</source>
+ <translation>Subsurface</translation>
+ </message>
+ <message>
+ <location filename="../core/planner.c" line="597"/>
+ <source>dive plan&lt;/b&gt; (surface interval </source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../core/planner.c" line="813"/>
+ <location filename="../core/planner.c" line="599"/>
+ <source>created on</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../core/planner.c" line="605"/>
+ <source>dive plan&lt;/b&gt; created on</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../core/planner.c" line="830"/>
+ <source>Deco model: Bühlmann ZHL-16C with GFLow = %d%% and GFHigh = %d%%</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../core/planner.c" line="837"/>
<source>Deco model: VPM-B at +%d conservatism</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../core/planner.c" line="819"/>
- <source>Deco model: Recreational mode based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source>
+ <location filename="../core/planner.c" line="843"/>
+ <source>Deco model: Recreational mode based on Bühlmann ZHL-16B with GFLow = %d%% and GFHigh = %d%%</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../core/planner.c" line="827"/>
+ <location filename="../core/planner.c" line="851"/>
<source>ATM pressure: %dmbar (%d%s)&lt;br&gt;&lt;/div&gt;</source>
<translation>ATM rõhk: %dmbar (%d%s)&lt;br&gt;&lt;/div&gt;</translation>
</message>
<message>
- <location filename="../core/planner.c" line="845"/>
+ <location filename="../core/planner.c" line="869"/>
<source>Gas consumption (CCR legs excluded):</source>
<translation>Gaasikulu (CCR lõigud välja arvatud):</translation>
</message>
<message>
- <location filename="../core/planner.c" line="847"/>
+ <location filename="../core/planner.c" line="871"/>
<source>Gas consumption (based on SAC</source>
<translation>Gaasi tarbimine (SAC põhine</translation>
</message>
<message>
- <location filename="../core/planner.c" line="872"/>
+ <location filename="../core/planner.c" line="899"/>
<source>this is more gas than available in the specified cylinder!</source>
<translation>gaasi hulk on suurem kui määratud balloonis võimalik!</translation>
</message>
<message>
- <location filename="../core/planner.c" line="878"/>
+ <location filename="../core/planner.c" line="905"/>
<source>not enough reserve for gas sharing on ascent!</source>
<translation>pole piisavalt reservi gaasi jagamiseks tõusul!</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>
- <translation>%.0f%s/%.0f%s %s-st (%.0f%s/%.0f%s planeeritud tõusul)</translation>
+ <location filename="../core/planner.c" line="926"/>
+ <source>&lt;br&gt;&amp;nbsp;&amp;mdash; &lt;span style=&apos;color: green;&apos;&gt;Minimum gas&lt;/span&gt; (based on %.1fxSAC/+%dmin@%.0f%s): %.0f%s/%.0f%s</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../core/planner.c" line="882"/>
- <source>%.0f%s (%.0f%s during planned ascent) of %s</source>
- <translation>%.0f%s (%.0f%s planeeritud tõusu jooksul) %s-st</translation>
+ <location filename="../core/planner.c" line="933"/>
+ <source>required minimum gas for ascent already exceeding start pressure of cylinder!</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../core/planner.c" line="900"/>
+ <location filename="../core/planner.c" line="936"/>
+ <source>%.0f%s/%.0f%s of &lt;span style=&apos;color: red;&apos;&gt;&lt;b&gt;%s&lt;/b&gt;&lt;/span&gt; (%.0f%s/%.0f%s in planned ascent)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../core/planner.c" line="939"/>
+ <source>%.0f%s (%.0f%s during planned ascent) of &lt;span style=&apos;color: red;&apos;&gt;&lt;b&gt;%s&lt;/b&gt;&lt;/span&gt;</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../core/planner.c" line="964"/>
<source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
<translation>kõrge pO₂ väärtus %.2f %d:%02u peal gaasiga %s sügavusel %.*f %s</translation>
</message>
<message>
- <location filename="../core/planner.c" line="910"/>
+ <location filename="../core/planner.c" line="976"/>
<source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../core/planner.c" line="1237"/>
+ <location filename="../core/planner.c" line="1303"/>
<source>Can&apos;t find gas %s</source>
<translation>Ei leia gaasi %s</translation>
</message>
<message>
- <location filename="../core/planner.c" line="1483"/>
+ <location filename="../core/planner.c" line="1549"/>
<source>ean</source>
<translation>ean</translation>
</message>
@@ -8646,32 +8748,29 @@ EADD: %d%s
</translation>
</message>
<message>
- <location filename="../core/profile.c" line="1350"/>
- <source>Safetystop: %umin @ %.0f%s
+ <location filename="../core/profile.c" line="1358"/>
+ <source>Deco: %umin @ %.0f%s
</source>
- <translation>Ohutuspeatus: %umin @ %.0f%s
+ <translation>Deko: %umin @ %.0f%s
</translation>
</message>
<message>
- <location filename="../core/profile.c" line="1353"/>
- <source>Safetystop: unkn time @ %.0f%s
+ <location filename="../core/profile.c" line="1350"/>
+ <source>Safety stop: %umin @ %.0f%s
</source>
- <translation>Ohutuspeatus: teadmata aeg @ %.0f%s
-</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../core/profile.c" line="1358"/>
- <source>Deco: %umin @ %.0f%s
+ <location filename="../core/profile.c" line="1353"/>
+ <source>Safety stop: unknown time @ %.0f%s
</source>
- <translation>Deko: %umin @ %.0f%s
-</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../core/profile.c" line="1361"/>
- <source>Deco: unkn time @ %.0f%s
+ <source>Deco: unknown time @ %.0f%s
</source>
- <translation>Deko: teadmata aeg @ %.0f%s
-</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../core/profile.c" line="1365"/>
@@ -8755,10 +8854,9 @@ EADD: %d%s
</message>
<message>
<location filename="../core/profile.c" line="1410"/>
- <source>heartbeat: %d
+ <source>heart rate: %d
</source>
- <translation>Pulss: %d
-</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../core/profile.c" line="1412"/>
@@ -8809,8 +8907,8 @@ EADD: %d%s
</message>
<message>
<location filename="../core/profile.c" line="1576"/>
- <source>%s SAC:%.*f %s</source>
- <translation>%s SAC:%.*f %s</translation>
+ <source>%s SAC: %.*f%s</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../core/qthelper.cpp" line="67"/>
@@ -8867,281 +8965,286 @@ EADD: %d%s
<translation>F</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&apos;t open file %s</source>
<translation>Ei saa avada faili %s</translation>
</message>
<message>
- <location filename="../core/save-html.c" line="488"/>
+ <location filename="../core/save-html.c" line="490"/>
<source>Number</source>
<translation>Number</translation>
</message>
<message>
- <location filename="../core/save-html.c" line="489"/>
+ <location filename="../core/save-html.c" line="491"/>
<source>Date</source>
<translation>Kuupäev</translation>
</message>
<message>
- <location filename="../core/save-html.c" line="490"/>
+ <location filename="../core/save-html.c" line="492"/>
<source>Time</source>
<translation>Aeg</translation>
</message>
<message>
- <location filename="../core/save-html.c" line="491"/>
+ <location filename="../core/save-html.c" line="493"/>
<source>Location</source>
<translation>Asukoht</translation>
</message>
<message>
- <location filename="../core/save-html.c" line="492"/>
+ <location filename="../core/save-html.c" line="494"/>
<source>Air temp.</source>
<translation>Õhu temp.</translation>
</message>
<message>
- <location filename="../core/save-html.c" line="493"/>
+ <location filename="../core/save-html.c" line="495"/>
<source>Water temp.</source>
<translation>Vee temp.</translation>
</message>
<message>
- <location filename="../core/save-html.c" line="494"/>
+ <location filename="../core/save-html.c" line="496"/>
<source>Dives</source>
<translation>Sukeldumisi kokku</translation>
</message>
<message>
- <location filename="../core/save-html.c" line="495"/>
+ <location filename="../core/save-html.c" line="497"/>
<source>Expand all</source>
<translation>Laienda kõik</translation>
</message>
<message>
- <location filename="../core/save-html.c" line="496"/>
+ <location filename="../core/save-html.c" line="498"/>
<source>Collapse all</source>
<translation>Ahenda kõik kokku</translation>
</message>
<message>
- <location filename="../core/save-html.c" line="497"/>
+ <location filename="../core/save-html.c" line="499"/>
<source>Trips</source>
<translation>Väljasõidud</translation>
</message>
<message>
- <location filename="../core/save-html.c" line="498"/>
+ <location filename="../core/save-html.c" line="500"/>
<source>Statistics</source>
<translation>Statistika</translation>
</message>
<message>
- <location filename="../core/save-html.c" line="499"/>
+ <location filename="../core/save-html.c" line="501"/>
<source>Advanced search</source>
<translation>Detailsem otsing</translation>
</message>
<message>
- <location filename="../core/save-html.c" line="502"/>
+ <location filename="../core/save-html.c" line="504"/>
<source>Rating</source>
<translation>Hinne</translation>
</message>
<message>
- <location filename="../core/save-html.c" line="503"/>
+ <location filename="../core/save-html.c" line="505"/>
<source>Visibility</source>
<translation>Nähtavus</translation>
</message>
<message>
- <location filename="../core/save-html.c" line="504"/>
+ <location filename="../core/save-html.c" line="506"/>
<source>Duration</source>
<translation>Kestus</translation>
</message>
<message>
- <location filename="../core/save-html.c" line="505"/>
+ <location filename="../core/save-html.c" line="507"/>
<source>Divemaster</source>
<translation>Divemaster</translation>
</message>
<message>
- <location filename="../core/save-html.c" line="506"/>
+ <location filename="../core/save-html.c" line="508"/>
<source>Buddy</source>
<translation>Semu</translation>
</message>
<message>
- <location filename="../core/save-html.c" line="507"/>
+ <location filename="../core/save-html.c" line="509"/>
<source>Suit</source>
<translation>Ülikond</translation>
</message>
<message>
- <location filename="../core/save-html.c" line="508"/>
+ <location filename="../core/save-html.c" line="510"/>
<source>Tags</source>
<translation>Märgendid</translation>
</message>
<message>
- <location filename="../core/save-html.c" line="509"/>
- <location filename="../smtk-import/smartrak.c" line="248"/>
- <location filename="../smtk-import/smartrak.c" line="318"/>
+ <location filename="../core/save-html.c" line="511"/>
+ <location filename="../smtk-import/smartrak.c" line="258"/>
+ <location filename="../smtk-import/smartrak.c" line="331"/>
<source>Notes</source>
<translation>Märkmed</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>Näita rohkem detaile</translation>
</message>
<message>
- <location filename="../core/save-html.c" line="513"/>
+ <location filename="../core/save-html.c" line="515"/>
<source>Yearly statistics</source>
<translation>Aastane statistika</translation>
</message>
<message>
- <location filename="../core/save-html.c" line="514"/>
+ <location filename="../core/save-html.c" line="516"/>
<source>Year</source>
<translation>Aasta</translation>
</message>
<message>
- <location filename="../core/save-html.c" line="515"/>
+ <location filename="../core/save-html.c" line="517"/>
<source>Total time</source>
<translation>Koguaeg</translation>
</message>
<message>
- <location filename="../core/save-html.c" line="516"/>
+ <location filename="../core/save-html.c" line="518"/>
<source>Average time</source>
<translation>Keskmine aeg</translation>
</message>
<message>
- <location filename="../core/save-html.c" line="517"/>
+ <location filename="../core/save-html.c" line="519"/>
<source>Shortest time</source>
<translation>Lühim aeg</translation>
</message>
<message>
- <location filename="../core/save-html.c" line="518"/>
+ <location filename="../core/save-html.c" line="520"/>
<source>Longest time</source>
<translation>Pikim aeg</translation>
</message>
<message>
- <location filename="../core/save-html.c" line="519"/>
+ <location filename="../core/save-html.c" line="521"/>
<source>Average depth</source>
<translation>Keskmine sügavus</translation>
</message>
<message>
- <location filename="../core/save-html.c" line="520"/>
+ <location filename="../core/save-html.c" line="522"/>
<source>Min. depth</source>
<translation>Min sügavus</translation>
</message>
<message>
- <location filename="../core/save-html.c" line="521"/>
+ <location filename="../core/save-html.c" line="523"/>
<source>Max. depth</source>
<translation>Max sügavus</translation>
</message>
<message>
- <location filename="../core/save-html.c" line="522"/>
+ <location filename="../core/save-html.c" line="524"/>
<source>Average SAC</source>
<translation>Keskmine SAC</translation>
</message>
<message>
- <location filename="../core/save-html.c" line="523"/>
+ <location filename="../core/save-html.c" line="525"/>
<source>Min. SAC</source>
<translation>Min. SAC</translation>
</message>
<message>
- <location filename="../core/save-html.c" line="524"/>
+ <location filename="../core/save-html.c" line="526"/>
<source>Max. SAC</source>
<translation>Max. SAC</translation>
</message>
<message>
- <location filename="../core/save-html.c" line="525"/>
+ <location filename="../core/save-html.c" line="527"/>
<source>Average temp.</source>
<translation>Keskmine temp</translation>
</message>
<message>
- <location filename="../core/save-html.c" line="526"/>
+ <location filename="../core/save-html.c" line="528"/>
<source>Min. temp.</source>
<translation>Min. temp.</translation>
</message>
<message>
- <location filename="../core/save-html.c" line="527"/>
+ <location filename="../core/save-html.c" line="529"/>
<source>Max. temp.</source>
<translation>Max. temp.</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>Tagasi nimekirja</translation>
</message>
<message>
- <location filename="../core/save-html.c" line="531"/>
- <source>Dive No.</source>
- <translation>Sukeldumise nr</translation>
+ <location filename="../core/save-html.c" line="533"/>
+ <source>Dive #</source>
+ <translation>Sukeldumise #</translation>
</message>
<message>
- <location filename="../core/save-html.c" line="532"/>
+ <location filename="../core/save-html.c" line="534"/>
<source>Dive profile</source>
<translation>Sukeldumise profiil</translation>
</message>
<message>
- <location filename="../core/save-html.c" line="533"/>
+ <location filename="../core/save-html.c" line="535"/>
<source>Dive information</source>
<translation>Sukeldumise info</translation>
</message>
<message>
- <location filename="../core/save-html.c" line="534"/>
+ <location filename="../core/save-html.c" line="536"/>
<source>Dive equipment</source>
<translation>Sukeldumisvarustus</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>Tüüp</translation>
</message>
<message>
- <location filename="../core/save-html.c" line="536"/>
+ <location filename="../core/save-html.c" line="538"/>
<source>Size</source>
<translation>Suurus</translation>
</message>
<message>
- <location filename="../core/save-html.c" line="537"/>
+ <location filename="../core/save-html.c" line="539"/>
<source>Work pressure</source>
<translation>Töörõhk</translation>
</message>
<message>
- <location filename="../core/save-html.c" line="538"/>
+ <location filename="../core/save-html.c" line="540"/>
<source>Start pressure</source>
<translation>Algusrõhk</translation>
</message>
<message>
- <location filename="../core/save-html.c" line="539"/>
+ <location filename="../core/save-html.c" line="541"/>
<source>End pressure</source>
<translation>Lõpurõhk</translation>
</message>
<message>
- <location filename="../core/save-html.c" line="540"/>
+ <location filename="../core/save-html.c" line="542"/>
<source>Gas</source>
<translation>Gaas</translation>
</message>
<message>
- <location filename="../core/save-html.c" line="541"/>
+ <location filename="../core/save-html.c" line="543"/>
<source>Weight</source>
<translation>Raskus</translation>
</message>
<message>
- <location filename="../core/save-html.c" line="543"/>
+ <location filename="../core/save-html.c" line="545"/>
<source>Events</source>
<translation>Sündmused</translation>
</message>
<message>
- <location filename="../core/save-html.c" line="544"/>
+ <location filename="../core/save-html.c" line="546"/>
<source>Name</source>
<translation>Nimi</translation>
</message>
<message>
- <location filename="../core/save-html.c" line="545"/>
+ <location filename="../core/save-html.c" line="547"/>
<source>Value</source>
<translation>Väärtus</translation>
</message>
<message>
- <location filename="../core/save-html.c" line="546"/>
+ <location filename="../core/save-html.c" line="548"/>
<source>Coordinates</source>
<translation>Koordinaadid</translation>
</message>
<message>
- <location filename="../core/save-html.c" line="547"/>
+ <location filename="../core/save-html.c" line="549"/>
<source>Dive status</source>
<translation>Sukeldumise staatus</translation>
</message>
<message>
+ <location filename="../core/statistics.c" line="195"/>
+ <source>All (by trip stats)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../core/statistics.c" line="242"/>
<source>more than %d days</source>
<translation>enam kui %d päeva</translation>
@@ -9192,97 +9295,97 @@ EADD: %d%s
<translation>(pole sukeldumisi)</translation>
</message>
<message>
- <location filename="../core/subsurfacestartup.c" line="125"/>
+ <location filename="../core/subsurfacestartup.c" line="128"/>
<source>Sun</source>
<translation>Pühap</translation>
</message>
<message>
- <location filename="../core/subsurfacestartup.c" line="125"/>
+ <location filename="../core/subsurfacestartup.c" line="128"/>
<source>Mon</source>
<translation>Esmasp</translation>
</message>
<message>
- <location filename="../core/subsurfacestartup.c" line="125"/>
+ <location filename="../core/subsurfacestartup.c" line="128"/>
<source>Tue</source>
<translation>Teisip</translation>
</message>
<message>
- <location filename="../core/subsurfacestartup.c" line="125"/>
+ <location filename="../core/subsurfacestartup.c" line="128"/>
<source>Wed</source>
<translation>Kolmap</translation>
</message>
<message>
- <location filename="../core/subsurfacestartup.c" line="125"/>
+ <location filename="../core/subsurfacestartup.c" line="128"/>
<source>Thu</source>
<translation>Neljap</translation>
</message>
<message>
- <location filename="../core/subsurfacestartup.c" line="125"/>
+ <location filename="../core/subsurfacestartup.c" line="128"/>
<source>Fri</source>
<translation>Reede</translation>
</message>
<message>
- <location filename="../core/subsurfacestartup.c" line="125"/>
+ <location filename="../core/subsurfacestartup.c" line="128"/>
<source>Sat</source>
<translation>Laup</translation>
</message>
<message>
- <location filename="../core/subsurfacestartup.c" line="134"/>
+ <location filename="../core/subsurfacestartup.c" line="137"/>
<source>Jan</source>
<translation>Jaan</translation>
</message>
<message>
- <location filename="../core/subsurfacestartup.c" line="134"/>
+ <location filename="../core/subsurfacestartup.c" line="137"/>
<source>Feb</source>
<translation>Veebr</translation>
</message>
<message>
- <location filename="../core/subsurfacestartup.c" line="134"/>
+ <location filename="../core/subsurfacestartup.c" line="137"/>
<source>Mar</source>
<translation>Märts</translation>
</message>
<message>
- <location filename="../core/subsurfacestartup.c" line="134"/>
+ <location filename="../core/subsurfacestartup.c" line="137"/>
<source>Apr</source>
<translation>Apr</translation>
</message>
<message>
- <location filename="../core/subsurfacestartup.c" line="134"/>
+ <location filename="../core/subsurfacestartup.c" line="137"/>
<source>May</source>
<translation>Mai</translation>
</message>
<message>
- <location filename="../core/subsurfacestartup.c" line="134"/>
+ <location filename="../core/subsurfacestartup.c" line="137"/>
<source>Jun</source>
<translation>Juuni</translation>
</message>
<message>
- <location filename="../core/subsurfacestartup.c" line="135"/>
+ <location filename="../core/subsurfacestartup.c" line="138"/>
<source>Jul</source>
<translation>Juuli</translation>
</message>
<message>
- <location filename="../core/subsurfacestartup.c" line="135"/>
+ <location filename="../core/subsurfacestartup.c" line="138"/>
<source>Aug</source>
<translation>Aug</translation>
</message>
<message>
- <location filename="../core/subsurfacestartup.c" line="135"/>
+ <location filename="../core/subsurfacestartup.c" line="138"/>
<source>Sep</source>
<translation>Sept</translation>
</message>
<message>
- <location filename="../core/subsurfacestartup.c" line="135"/>
+ <location filename="../core/subsurfacestartup.c" line="138"/>
<source>Oct</source>
<translation>Okt</translation>
</message>
<message>
- <location filename="../core/subsurfacestartup.c" line="135"/>
+ <location filename="../core/subsurfacestartup.c" line="138"/>
<source>Nov</source>
<translation>Nov</translation>
</message>
<message>
- <location filename="../core/subsurfacestartup.c" line="135"/>
+ <location filename="../core/subsurfacestartup.c" line="138"/>
<source>Dec</source>
<translation>Dets</translation>
</message>
@@ -9323,13 +9426,13 @@ Is the Uemis Zurich plugged in correctly?</source>
</message>
<message>
<location filename="../core/uemis-downloader.c" line="495"/>
- <source>divelog #</source>
- <translation>sukeldumise logi #</translation>
+ <source>dive log #</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../core/uemis-downloader.c" line="497"/>
- <source>divespot #</source>
- <translation>sukeldumise koht #</translation>
+ <source>dive spot #</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../core/uemis-downloader.c" line="499"/>
@@ -9492,122 +9595,122 @@ Is the Uemis Zurich plugged in correctly?</source>
<translation>Patarei tühjenemise alarm</translation>
</message>
<message>
- <location filename="../core/worldmap-save.c" line="39"/>
+ <location filename="../core/worldmap-save.c" line="41"/>
<source>Date:</source>
<translation>Kuupäev:</translation>
</message>
<message>
- <location filename="../core/worldmap-save.c" line="41"/>
+ <location filename="../core/worldmap-save.c" line="43"/>
<source>Time:</source>
<translation>Aeg:</translation>
</message>
<message>
- <location filename="../core/worldmap-save.c" line="43"/>
+ <location filename="../core/worldmap-save.c" line="45"/>
<source>Duration:</source>
<translation>Kestus:</translation>
</message>
<message>
- <location filename="../core/worldmap-save.c" line="44"/>
+ <location filename="../core/worldmap-save.c" line="46"/>
<source>min</source>
<translation>min</translation>
</message>
<message>
- <location filename="../core/worldmap-save.c" line="47"/>
+ <location filename="../core/worldmap-save.c" line="49"/>
<source>Max. depth:</source>
<translation>Max sügavus</translation>
</message>
<message>
- <location filename="../core/worldmap-save.c" line="50"/>
+ <location filename="../core/worldmap-save.c" line="52"/>
<source>Air temp.:</source>
<translation>Õhu temp:</translation>
</message>
<message>
- <location filename="../core/worldmap-save.c" line="53"/>
+ <location filename="../core/worldmap-save.c" line="55"/>
<source>Water temp.:</source>
<translation>Vee temp:</translation>
</message>
<message>
- <location filename="../core/worldmap-save.c" line="55"/>
+ <location filename="../core/worldmap-save.c" line="57"/>
<source>Location:</source>
<translation>Asukoht:</translation>
</message>
<message>
- <location filename="../core/worldmap-save.c" line="59"/>
+ <location filename="../core/worldmap-save.c" line="61"/>
<source>Notes:</source>
<translation>Märkmed:</translation>
</message>
<message>
- <location filename="../smtk-import/smartrak.c" line="244"/>
+ <location filename="../smtk-import/smartrak.c" line="254"/>
<source>Built</source>
<translation>Ehitusaasta</translation>
</message>
<message>
- <location filename="../smtk-import/smartrak.c" line="244"/>
+ <location filename="../smtk-import/smartrak.c" line="254"/>
<source>Sank</source>
<translation>Uppus</translation>
</message>
<message>
- <location filename="../smtk-import/smartrak.c" line="244"/>
- <source>SankTime</source>
- <translation>Uppumise aeg</translation>
+ <location filename="../smtk-import/smartrak.c" line="254"/>
+ <source>Sank Time</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../smtk-import/smartrak.c" line="245"/>
+ <location filename="../smtk-import/smartrak.c" line="255"/>
<source>Reason</source>
<translation>Põhjus</translation>
</message>
<message>
- <location filename="../smtk-import/smartrak.c" line="245"/>
+ <location filename="../smtk-import/smartrak.c" line="255"/>
<source>Nationality</source>
<translation>Lipuriik</translation>
</message>
<message>
- <location filename="../smtk-import/smartrak.c" line="245"/>
+ <location filename="../smtk-import/smartrak.c" line="255"/>
<source>Shipyard</source>
<translation>Laevatehas</translation>
</message>
<message>
- <location filename="../smtk-import/smartrak.c" line="246"/>
+ <location filename="../smtk-import/smartrak.c" line="256"/>
<source>ShipType</source>
<translation>Laeva tüüp</translation>
</message>
<message>
- <location filename="../smtk-import/smartrak.c" line="246"/>
+ <location filename="../smtk-import/smartrak.c" line="256"/>
<source>Length</source>
<translation>Pikkus</translation>
</message>
<message>
- <location filename="../smtk-import/smartrak.c" line="246"/>
+ <location filename="../smtk-import/smartrak.c" line="256"/>
<source>Beam</source>
<translation>Pikkus</translation>
</message>
<message>
- <location filename="../smtk-import/smartrak.c" line="247"/>
+ <location filename="../smtk-import/smartrak.c" line="257"/>
<source>Draught</source>
<translation>Süvis</translation>
</message>
<message>
- <location filename="../smtk-import/smartrak.c" line="247"/>
+ <location filename="../smtk-import/smartrak.c" line="257"/>
<source>Displacement</source>
<translation>Veeväljasurve</translation>
</message>
<message>
- <location filename="../smtk-import/smartrak.c" line="247"/>
+ <location filename="../smtk-import/smartrak.c" line="257"/>
<source>Cargo</source>
<translation>Last</translation>
</message>
<message>
- <location filename="../smtk-import/smartrak.c" line="260"/>
+ <location filename="../smtk-import/smartrak.c" line="269"/>
<source>Wreck Data</source>
<translation>Vraki andmed</translation>
</message>
<message>
- <location filename="../smtk-import/smartrak.c" line="317"/>
+ <location filename="../smtk-import/smartrak.c" line="330"/>
<source>Altitude</source>
<translation>Kõrgus</translation>
</message>
<message>
- <location filename="../smtk-import/smartrak.c" line="317"/>
+ <location filename="../smtk-import/smartrak.c" line="330"/>
<source>Depth</source>
<translation>Sügavus</translation>
</message>
@@ -9620,82 +9723,82 @@ Is the Uemis Zurich plugged in correctly?</source>
<context>
<name>main</name>
<message>
- <location filename="../mobile-widgets/qml/main.qml" line="13"/>
+ <location filename="../mobile-widgets/qml/main.qml" line="12"/>
<source>Subsurface-mobile</source>
<translation>Subsurface-mobile</translation>
</message>
<message>
- <location filename="../mobile-widgets/qml/main.qml" line="105"/>
+ <location filename="../mobile-widgets/qml/main.qml" line="110"/>
<source>Subsurface</source>
<translation>Subsurface</translation>
</message>
<message>
- <location filename="../mobile-widgets/qml/main.qml" line="112"/>
+ <location filename="../mobile-widgets/qml/main.qml" line="117"/>
<source>Dive list</source>
<translation>Sukeldumiste nimekiri</translation>
</message>
<message>
- <location filename="../mobile-widgets/qml/main.qml" line="127"/>
+ <location filename="../mobile-widgets/qml/main.qml" line="132"/>
<source>Cloud credentials</source>
<translation>Pilve volitused</translation>
</message>
<message>
- <location filename="../mobile-widgets/qml/main.qml" line="141"/>
+ <location filename="../mobile-widgets/qml/main.qml" line="146"/>
<source>Manage dives</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qml/main.qml" line="143"/>
+ <location filename="../mobile-widgets/qml/main.qml" line="148"/>
<source>Add dive manually</source>
<translation>Lisa sukeldumine käsitsi</translation>
</message>
<message>
- <location filename="../mobile-widgets/qml/main.qml" line="151"/>
+ <location filename="../mobile-widgets/qml/main.qml" line="156"/>
<source>Manual sync with cloud</source>
<translation>Käsitsi sünkro pilvega</translation>
</message>
<message>
- <location filename="../mobile-widgets/qml/main.qml" line="169"/>
+ <location filename="../mobile-widgets/qml/main.qml" line="174"/>
<source>Offline mode</source>
<translation>Vallasrežiim</translation>
</message>
<message>
- <location filename="../mobile-widgets/qml/main.qml" line="169"/>
+ <location filename="../mobile-widgets/qml/main.qml" line="174"/>
<source>Enable auto cloud sync</source>
<translation>Luba pilve automaatne sünkro</translation>
</message>
<message>
- <location filename="../mobile-widgets/qml/main.qml" line="189"/>
+ <location filename="../mobile-widgets/qml/main.qml" line="191"/>
<source>GPS</source>
<translation>GPS</translation>
</message>
<message>
- <location filename="../mobile-widgets/qml/main.qml" line="192"/>
+ <location filename="../mobile-widgets/qml/main.qml" line="195"/>
<source>GPS-tag dives</source>
<translation>GPS-märgista sukeldumised</translation>
</message>
<message>
- <location filename="../mobile-widgets/qml/main.qml" line="199"/>
+ <location filename="../mobile-widgets/qml/main.qml" line="202"/>
<source>Upload GPS data</source>
<translation>Lae GPS andmed üles</translation>
</message>
<message>
- <location filename="../mobile-widgets/qml/main.qml" line="206"/>
+ <location filename="../mobile-widgets/qml/main.qml" line="209"/>
<source>Download GPS data</source>
<translation>Lae GPS andmed alla</translation>
</message>
<message>
- <location filename="../mobile-widgets/qml/main.qml" line="213"/>
+ <location filename="../mobile-widgets/qml/main.qml" line="216"/>
<source>Show GPS fixes</source>
<translation>Näita GPS määrang</translation>
</message>
<message>
- <location filename="../mobile-widgets/qml/main.qml" line="222"/>
+ <location filename="../mobile-widgets/qml/main.qml" line="225"/>
<source>Clear GPS cache</source>
<translation>Kustuta GPS vahemälu</translation>
</message>
<message>
- <location filename="../mobile-widgets/qml/main.qml" line="228"/>
+ <location filename="../mobile-widgets/qml/main.qml" line="231"/>
<source>Preferences</source>
<translation>Eelistused</translation>
</message>
@@ -9725,20 +9828,15 @@ Is the Uemis Zurich plugged in correctly?</source>
<translation>Kohta</translation>
</message>
<message>
- <location filename="../mobile-widgets/qml/main.qml" line="306"/>
+ <location filename="../mobile-widgets/qml/main.qml" line="292"/>
<source>Run location service</source>
<translation>Käivita positsioneerimise teenus</translation>
</message>
<message>
- <location filename="../mobile-widgets/qml/main.qml" line="306"/>
+ <location filename="../mobile-widgets/qml/main.qml" line="292"/>
<source>No GPS source available</source>
<translation>GPS allikas pole kättesaadav</translation>
</message>
- <message>
- <location filename="../mobile-widgets/qml/main.qml" line="318"/>
- <source>Actions</source>
- <translation>Tegevused</translation>
- </message>
</context>
<context>
<name>plannerDetails</name>
@@ -9849,8 +9947,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="585"/>
+ <location filename="../desktop-widgets/plannerSettings.ui" line="614"/>
<source>bar</source>
<translation>bar</translation>
</message>
@@ -9871,22 +9969,13 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/plannerSettings.ui" line="343"/>
- <source>GF low</source>
- <translation>GF madal</translation>
- </message>
- <message>
<location filename="../desktop-widgets/plannerSettings.ui" line="353"/>
<source>Plan backgas breaks</source>
<translation>planeeri põhigaasi pausid</translation>
</message>
<message>
- <location filename="../desktop-widgets/plannerSettings.ui" line="360"/>
- <source>GF high</source>
- <translation>GF kõrge</translation>
- </message>
- <message>
<location filename="../desktop-widgets/plannerSettings.ui" line="370"/>
+ <location filename="../desktop-widgets/plannerSettings.ui" line="780"/>
<source>min</source>
<translation>min</translation>
</message>
@@ -9926,88 +10015,123 @@ p, li { white-space: pre-wrap; }
<translation>Konservatiivsuse tase</translation>
</message>
<message>
- <location filename="../desktop-widgets/plannerSettings.ui" line="515"/>
+ <location filename="../desktop-widgets/plannerSettings.ui" line="505"/>
+ <source>+</source>
+ <translation>+</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/plannerSettings.ui" line="518"/>
<source>Gas options</source>
<translation>Gaasi valikud</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="539"/>
+ <location filename="../desktop-widgets/plannerSettings.ui" line="601"/>
<source>ℓ/min</source>
<translation>ℓ/min</translation>
</message>
<message>
- <location filename="../desktop-widgets/plannerSettings.ui" line="594"/>
+ <location filename="../desktop-widgets/plannerSettings.ui" line="633"/>
<source>m</source>
<translation>m</translation>
</message>
<message>
- <location filename="../desktop-widgets/plannerSettings.ui" line="606"/>
+ <location filename="../desktop-widgets/plannerSettings.ui" line="741"/>
+ <source>SAC factor</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/plannerSettings.ui" line="748"/>
+ <source>Used to calculate minimum gas. Consider two divers with possibly increased SAC after OoG event.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/plannerSettings.ui" line="770"/>
+ <source>Problem solving time</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/plannerSettings.ui" line="777"/>
+ <source>Used to calculate minimum gas. Additional time at max. depth after OoG event.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/plannerSettings.ui" line="630"/>
<source>Used to calculate best mix. Select best mix depth in &apos;Available gases&apos; table by entering gas depth, followed by &quot;B&quot; (best trimix mix) or &quot;BN&quot; (best nitrox mix)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/plannerSettings.ui" line="613"/>
+ <location filename="../desktop-widgets/plannerSettings.ui" line="343"/>
+ <source>GFLow</source>
+ <translation>GFLow</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/plannerSettings.ui" line="360"/>
+ <source>GFHigh</source>
+ <translation>GFHigh</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/plannerSettings.ui" line="649"/>
<source>Bottom SAC</source>
<translation>SAC põhjas</translation>
</message>
<message>
- <location filename="../desktop-widgets/plannerSettings.ui" line="620"/>
+ <location filename="../desktop-widgets/plannerSettings.ui" line="656"/>
<source>Bottom pO₂</source>
<translation>Põhja pO₂</translation>
</message>
<message>
- <location filename="../desktop-widgets/plannerSettings.ui" line="627"/>
+ <location filename="../desktop-widgets/plannerSettings.ui" line="663"/>
<source>Best mix END</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/plannerSettings.ui" line="634"/>
+ <location filename="../desktop-widgets/plannerSettings.ui" line="670"/>
<source>Notes</source>
<translation>Märkmed</translation>
</message>
<message>
- <location filename="../desktop-widgets/plannerSettings.ui" line="655"/>
+ <location filename="../desktop-widgets/plannerSettings.ui" line="691"/>
<source>In dive plan, show runtime (absolute time) of stops</source>
<translation>Näita sukeldumise plaanis peatuste jooksvat (tõelist) aega</translation>
</message>
<message>
- <location filename="../desktop-widgets/plannerSettings.ui" line="658"/>
+ <location filename="../desktop-widgets/plannerSettings.ui" line="694"/>
<source>Display runtime</source>
<translation>Kuva jooksev aeg</translation>
</message>
<message>
- <location filename="../desktop-widgets/plannerSettings.ui" line="668"/>
+ <location filename="../desktop-widgets/plannerSettings.ui" line="704"/>
<source>In dive plan, show duration (relative time) of stops</source>
<translation>Näita sukeldumiste plaanis peatuste pikkust (suhtelist aega)</translation>
</message>
<message>
- <location filename="../desktop-widgets/plannerSettings.ui" line="671"/>
+ <location filename="../desktop-widgets/plannerSettings.ui" line="707"/>
<source>Display segment duration</source>
<translation>Kuva segmendi kestust</translation>
</message>
<message>
- <location filename="../desktop-widgets/plannerSettings.ui" line="678"/>
+ <location filename="../desktop-widgets/plannerSettings.ui" line="714"/>
<source>In diveplan, list transitions or treat them as implicit</source>
<translation>Näita sukeldumiste plaanis üleminekuid või käsitle neid peidetuna</translation>
</message>
<message>
- <location filename="../desktop-widgets/plannerSettings.ui" line="681"/>
+ <location filename="../desktop-widgets/plannerSettings.ui" line="717"/>
<source>Display transitions in deco</source>
<translation>Kuva üleminekud dekos</translation>
</message>
<message>
- <location filename="../desktop-widgets/plannerSettings.ui" line="688"/>
+ <location filename="../desktop-widgets/plannerSettings.ui" line="724"/>
<source>Verbatim dive plan</source>
<translation>Tekstiline sukeldumise plaan</translation>
</message>
<message>
- <location filename="../desktop-widgets/plannerSettings.ui" line="711"/>
+ <location filename="../desktop-widgets/plannerSettings.ui" line="734"/>
<source>Deco pO₂</source>
<translation>Deco pO₂</translation>
</message>
<message>
- <location filename="../desktop-widgets/plannerSettings.ui" line="718"/>
+ <location filename="../desktop-widgets/plannerSettings.ui" line="552"/>
<source>Deco SAC</source>
<translation>Deko SAC</translation>
</message>
generated by cgit v1.2.3-70-g09d2 (git 2.47.0) at 2024-12-24 13:39:38 +0000