Translation updates

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

1 files changed, 5010 insertions, 3443 deletions

diff --git a/translations/subsurface_fi_FI.ts b/translations/subsurface_fi_FI.ts
index 5f6ae9392..d97657cb9 100644
--- a/translations/subsurface_fi_FI.ts
+++ b/translations/subsurface_fi_FI.ts
@@ -37,11 +37,16 @@
     </message>
 </context>
 <context>
-    <name>BackButton</name>
+    <name>AddWeight</name>
     <message>
-        <location filename="../mobile-widgets/qml/kirigami/src/controls/templates/private/BackButton.qml" line="50"/>
-        <source>Navigate Back</source>
-        <translation>Palaa takaisin</translation>
+        <location filename="../commands/command_edit.cpp" line="991"/>
+        <source>Add weight</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <location filename="../commands/command_edit.cpp" line="993"/>
+        <source>Add weight (%n dive(s))</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
 </context>
 <context>
@@ -53,13 +58,6 @@
         <translation>Bluetooth -laitteen valinta</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="172"/>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="32"/>
-        <location filename="../subsurface/desktop-widgets/ui_btdeviceselectiondialog.h" line="250"/>
-        <source>Discovered devices</source>
-        <translation>Havaitut laitteet</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="22"/>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="35"/>
         <location filename="../subsurface/desktop-widgets/ui_btdeviceselectiondialog.h" line="241"/>
@@ -74,6 +72,54 @@
         <translation>Lopeta</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="66"/>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="26"/>
+        <location filename="../subsurface/desktop-widgets/ui_btdeviceselectiondialog.h" line="244"/>
+        <source>Local Bluetooth device details</source>
+        <translation>Bluetooth -laitteen tiedot</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="75"/>
+        <location filename="../subsurface/desktop-widgets/ui_btdeviceselectiondialog.h" line="245"/>
+        <source>Name: </source>
+        <translation>Nimi:</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="89"/>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="28"/>
+        <location filename="../subsurface/desktop-widgets/ui_btdeviceselectiondialog.h" line="246"/>
+        <source>Address:</source>
+        <translation>Osoite:</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="118"/>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="30"/>
+        <location filename="../subsurface/desktop-widgets/ui_btdeviceselectiondialog.h" line="247"/>
+        <source>Bluetooth powered on</source>
+        <translation>Bluetooth käynnistetty</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="140"/>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="31"/>
+        <location filename="../subsurface/desktop-widgets/ui_btdeviceselectiondialog.h" line="248"/>
+        <source>Turn on/off</source>
+        <translation>Käynnistä/sammuta</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="150"/>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="27"/>
+        <location filename="../subsurface/desktop-widgets/ui_btdeviceselectiondialog.h" line="249"/>
+        <source>Select device:</source>
+        <translation>Valitse laite:</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="172"/>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="32"/>
+        <location filename="../subsurface/desktop-widgets/ui_btdeviceselectiondialog.h" line="250"/>
+        <source>Discovered devices</source>
+        <translation>Havaitut laitteet</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="193"/>
         <location filename="../subsurface/desktop-widgets/ui_btdeviceselectiondialog.h" line="251"/>
         <source>Bluetooth mode</source>
@@ -122,47 +168,6 @@
         <translation>Tyhjennä</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="66"/>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="26"/>
-        <location filename="../subsurface/desktop-widgets/ui_btdeviceselectiondialog.h" line="244"/>
-        <source>Local Bluetooth device details</source>
-        <translation>Bluetooth -laitteen tiedot</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="75"/>
-        <location filename="../subsurface/desktop-widgets/ui_btdeviceselectiondialog.h" line="245"/>
-        <source>Name: </source>
-        <translation>Nimi:</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="89"/>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="28"/>
-        <location filename="../subsurface/desktop-widgets/ui_btdeviceselectiondialog.h" line="246"/>
-        <source>Address:</source>
-        <translation>Osoite:</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="118"/>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="30"/>
-        <location filename="../subsurface/desktop-widgets/ui_btdeviceselectiondialog.h" line="247"/>
-        <source>Bluetooth powered on</source>
-        <translation>Bluetooth käynnistetty</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="140"/>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="31"/>
-        <location filename="../subsurface/desktop-widgets/ui_btdeviceselectiondialog.h" line="248"/>
-        <source>Turn on/off</source>
-        <translation>Käynnistä/sammuta</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="150"/>
-        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="27"/>
-        <location filename="../subsurface/desktop-widgets/ui_btdeviceselectiondialog.h" line="249"/>
-        <source>Select device:</source>
-        <translation>Valitse laite:</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="29"/>
         <source>Name:</source>
         <translation>Nimi:</translation>
@@ -362,45 +367,55 @@
 <context>
     <name>CloudCredentials</name>
     <message>
-        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="49"/>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="43"/>
         <source>Cloud credentials</source>
         <translation>Pilvipalvelun tunnus</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="55"/>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="49"/>
         <source>Email</source>
         <translation>Sähköposti</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="71"/>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="65"/>
         <source>Password</source>
         <translation>Salasana</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="89"/>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="83"/>
         <source>PIN</source>
         <translation>PIN</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="106"/>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="100"/>
         <source>Register</source>
         <translation>Rekisteröidy</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="117"/>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="111"/>
         <source>Cancel</source>
         <translation>Peruuta</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="133"/>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="114"/>
+        <source>Check credentials...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="127"/>
         <source>Sign-in or Register</source>
         <translation>Kirjaudu sisään tai rekisteröidy</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="144"/>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="138"/>
         <source>No cloud mode</source>
         <translation>Off-line -tila</translation>
     </message>
+    <message>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="151"/>
+        <source>Forgot password?</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>CloudStorageAuthenticate</name>
@@ -601,26 +616,35 @@
 <context>
     <name>Command</name>
     <message>
-        <location filename="../desktop-widgets/command_base.cpp" line="34"/>
+        <location filename="../commands/command_base.cpp" line="45"/>
         <source>&amp;Undo</source>
         <translation>Peruuta</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/command_base.cpp" line="39"/>
+        <location filename="../commands/command_base.cpp" line="50"/>
         <source>&amp;Redo</source>
         <translation>Tee uudelleen</translation>
     </message>
+    <message>
+        <location filename="../commands/command_base.cpp" line="65"/>
+        <source>all dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../commands/command_edit.cpp" line="94"/>
+        <source>Edit %1</source>
+        <translation>Muokkaa %1</translation>
+    </message>
     <message numerus="yes">
-        <location filename="../desktop-widgets/command_edit.cpp" line="78"/>
+        <location filename="../commands/command_edit.cpp" line="96"/>
         <source>Edit %1 (%n dive(s))</source>
-        <extracomment>remove the part in parentheses for %n = 1</extracomment>
         <translation><numerusform>Muokkaa %1 (%n sukellusta)</numerusform><numerusform>Muokkaa %1 (%n sukellus)</numerusform></translation>
     </message>
 </context>
 <context>
     <name>Command::AddDive</name>
     <message>
-        <location filename="../desktop-widgets/command_divelist.cpp" line="380"/>
+        <location filename="../commands/command_divelist.cpp" line="399"/>
         <source>add dive</source>
         <translation>lisää sukellus</translation>
     </message>
@@ -628,7 +652,7 @@
 <context>
     <name>Command::AddDiveSite</name>
     <message>
-        <location filename="../desktop-widgets/command_divesite.cpp" line="79"/>
+        <location filename="../commands/command_divesite.cpp" line="78"/>
         <source>add dive site</source>
         <translation>lisää sukelluskohde</translation>
     </message>
@@ -636,15 +660,23 @@
 <context>
     <name>Command::AddDivesToTrip</name>
     <message numerus="yes">
-        <location filename="../desktop-widgets/command_divelist.cpp" line="690"/>
+        <location filename="../commands/command_divelist.cpp" line="709"/>
         <source>add %n dives to trip</source>
         <translation><numerusform>lisää %n sukellus retkeen</numerusform><numerusform>lisää %n sukellusta retkeen</numerusform></translation>
     </message>
 </context>
 <context>
+    <name>Command::ApplyGPSFixes</name>
+    <message>
+        <location filename="../commands/command_divesite.cpp" line="396"/>
+        <source>apply GPS fixes</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>Command::AutogroupDives</name>
     <message>
-        <location filename="../desktop-widgets/command_divelist.cpp" line="710"/>
+        <location filename="../commands/command_divelist.cpp" line="729"/>
         <source>autogroup dives</source>
         <translation>ryhmittele automaattisesti</translation>
     </message>
@@ -652,7 +684,7 @@
 <context>
     <name>Command::CreateTrip</name>
     <message>
-        <location filename="../desktop-widgets/command_divelist.cpp" line="697"/>
+        <location filename="../commands/command_divelist.cpp" line="716"/>
         <source>create trip</source>
         <translation>luo retki</translation>
     </message>
@@ -660,7 +692,7 @@
 <context>
     <name>Command::DeleteDive</name>
     <message numerus="yes">
-        <location filename="../desktop-widgets/command_divelist.cpp" line="532"/>
+        <location filename="../commands/command_divelist.cpp" line="549"/>
         <source>delete %n dive(s)</source>
         <translation><numerusform>poista %n sukellus</numerusform><numerusform>poista %n sukellusta</numerusform></translation>
     </message>
@@ -668,7 +700,7 @@
 <context>
     <name>Command::DeleteDiveComputer</name>
     <message>
-        <location filename="../desktop-widgets/command_divelist.cpp" line="885"/>
+        <location filename="../commands/command_divelist.cpp" line="904"/>
         <source>delete dive computer</source>
         <translation>poista sukellustietokone</translation>
     </message>
@@ -676,7 +708,7 @@
 <context>
     <name>Command::DeleteDiveSites</name>
     <message numerus="yes">
-        <location filename="../desktop-widgets/command_divesite.cpp" line="137"/>
+        <location filename="../commands/command_divesite.cpp" line="136"/>
         <source>delete %n dive site(s)</source>
         <translation><numerusform>poista %n sukelluskohde</numerusform><numerusform>poista %n sukelluskohdetta</numerusform></translation>
     </message>
@@ -684,7 +716,7 @@
 <context>
     <name>Command::EditAirTemp</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="227"/>
+        <location filename="../commands/command_edit.cpp" line="333"/>
         <source>air temperature</source>
         <translation>ilman lämpötila</translation>
     </message>
@@ -692,15 +724,31 @@
 <context>
     <name>Command::EditAtmPress</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="272"/>
+        <location filename="../commands/command_edit.cpp" line="399"/>
         <source>Atm. pressure</source>
         <translation>Ilmakehän paine</translation>
     </message>
 </context>
 <context>
+    <name>Command::EditChill</name>
+    <message>
+        <location filename="../commands/command_edit.cpp" line="312"/>
+        <source>chill</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Command::EditCurrent</name>
+    <message>
+        <location filename="../commands/command_edit.cpp" line="270"/>
+        <source>current</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>Command::EditDepth</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="320"/>
+        <location filename="../commands/command_edit.cpp" line="447"/>
         <source>depth</source>
         <translation>syvyys</translation>
     </message>
@@ -708,7 +756,7 @@
 <context>
     <name>Command::EditDiveSite</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="342"/>
+        <location filename="../commands/command_edit.cpp" line="469"/>
         <source>dive site</source>
         <translation>sukelluskohde</translation>
     </message>
@@ -716,7 +764,7 @@
 <context>
     <name>Command::EditDiveSiteCountry</name>
     <message>
-        <location filename="../desktop-widgets/command_divesite.cpp" line="275"/>
+        <location filename="../commands/command_divesite.cpp" line="260"/>
         <source>Edit dive site country</source>
         <translation>Muokkaa sukelluskohteen maata</translation>
     </message>
@@ -724,7 +772,7 @@
 <context>
     <name>Command::EditDiveSiteDescription</name>
     <message>
-        <location filename="../desktop-widgets/command_divesite.cpp" line="229"/>
+        <location filename="../commands/command_divesite.cpp" line="214"/>
         <source>Edit dive site description</source>
         <translation>Muokkaa sukelluskohteen kuvausta</translation>
     </message>
@@ -732,7 +780,7 @@
 <context>
     <name>Command::EditDiveSiteLocation</name>
     <message>
-        <location filename="../desktop-widgets/command_divesite.cpp" line="302"/>
+        <location filename="../commands/command_divesite.cpp" line="285"/>
         <source>Edit dive site location</source>
         <translation>Muokkaa sukelluskohteen sijaintia</translation>
     </message>
@@ -740,7 +788,7 @@
 <context>
     <name>Command::EditDiveSiteName</name>
     <message>
-        <location filename="../desktop-widgets/command_divesite.cpp" line="205"/>
+        <location filename="../commands/command_divesite.cpp" line="191"/>
         <source>Edit dive site name</source>
         <translation>Muokkaa sukelluskohteen nimeä</translation>
     </message>
@@ -748,7 +796,7 @@
 <context>
     <name>Command::EditDiveSiteNotes</name>
     <message>
-        <location filename="../desktop-widgets/command_divesite.cpp" line="252"/>
+        <location filename="../commands/command_divesite.cpp" line="237"/>
         <source>Edit dive site notes</source>
         <translation>Muokkaa sukelluskohteen muistiinpanoja</translation>
     </message>
@@ -756,7 +804,7 @@
 <context>
     <name>Command::EditDiveSiteTaxonomy</name>
     <message>
-        <location filename="../desktop-widgets/command_divesite.cpp" line="332"/>
+        <location filename="../commands/command_divesite.cpp" line="314"/>
         <source>Edit dive site taxonomy</source>
         <translation>Muokkaa sukelluskohteen luokittelua</translation>
     </message>
@@ -764,7 +812,7 @@
 <context>
     <name>Command::EditDuration</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="296"/>
+        <location filename="../commands/command_edit.cpp" line="423"/>
         <source>duration</source>
         <translation>kesto</translation>
     </message>
@@ -772,7 +820,7 @@
 <context>
     <name>Command::EditNotes</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="142"/>
+        <location filename="../commands/command_edit.cpp" line="164"/>
         <source>notes</source>
         <translation>muistiinpanot</translation>
     </message>
@@ -780,7 +828,7 @@
 <context>
     <name>Command::EditRating</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="185"/>
+        <location filename="../commands/command_edit.cpp" line="207"/>
         <source>rating</source>
         <translation>arvio</translation>
     </message>
@@ -788,15 +836,23 @@
 <context>
     <name>Command::EditSuit</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="164"/>
+        <location filename="../commands/command_edit.cpp" line="186"/>
         <source>suit</source>
         <translation>puku</translation>
     </message>
 </context>
 <context>
+    <name>Command::EditSurge</name>
+    <message>
+        <location filename="../commands/command_edit.cpp" line="291"/>
+        <source>surge</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>Command::EditTripBase</name>
     <message>
-        <location filename="../desktop-widgets/command_edit_trip.cpp" line="18"/>
+        <location filename="../commands/command_edit_trip.cpp" line="18"/>
         <source>Edit %1</source>
         <translation>Muokkaa %1</translation>
     </message>
@@ -804,7 +860,7 @@
 <context>
     <name>Command::EditTripLocation</name>
     <message>
-        <location filename="../desktop-widgets/command_edit_trip.cpp" line="53"/>
+        <location filename="../commands/command_edit_trip.cpp" line="53"/>
         <source>trip location</source>
         <translation>matkakohde</translation>
     </message>
@@ -812,7 +868,7 @@
 <context>
     <name>Command::EditTripNotes</name>
     <message>
-        <location filename="../desktop-widgets/command_edit_trip.cpp" line="75"/>
+        <location filename="../commands/command_edit_trip.cpp" line="75"/>
         <source>trip notes</source>
         <translation>matkan muistiinpanot</translation>
     </message>
@@ -820,7 +876,7 @@
 <context>
     <name>Command::EditVisibility</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="206"/>
+        <location filename="../commands/command_edit.cpp" line="228"/>
         <source>visibility</source>
         <translation>näkyvyys</translation>
     </message>
@@ -828,15 +884,31 @@
 <context>
     <name>Command::EditWaterTemp</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="251"/>
+        <location filename="../commands/command_edit.cpp" line="357"/>
         <source>water temperature</source>
         <translation>veden lämpötila</translation>
     </message>
 </context>
 <context>
+    <name>Command::EditWaterTypeUser</name>
+    <message>
+        <location filename="../commands/command_edit.cpp" line="378"/>
+        <source>salinity</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Command::EditWaveSize</name>
+    <message>
+        <location filename="../commands/command_edit.cpp" line="249"/>
+        <source>wavesize</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>Command::ImportDiveSites</name>
     <message>
-        <location filename="../desktop-widgets/command_divesite.cpp" line="101"/>
+        <location filename="../commands/command_divesite.cpp" line="100"/>
         <source>import dive sites from %1</source>
         <translation>tuo sukelluskohteet %1:sta</translation>
     </message>
@@ -844,7 +916,7 @@
 <context>
     <name>Command::ImportDives</name>
     <message numerus="yes">
-        <location filename="../desktop-widgets/command_divelist.cpp" line="454"/>
+        <location filename="../commands/command_divelist.cpp" line="468"/>
         <source>import %n dive(s) from %1</source>
         <translation><numerusform>tuo %n sukelluskohde %1:sta</numerusform><numerusform>tuo %n sukellusta %1:sta</numerusform></translation>
     </message>
@@ -852,7 +924,7 @@
 <context>
     <name>Command::MergeDiveSites</name>
     <message>
-        <location filename="../desktop-widgets/command_divesite.cpp" line="360"/>
+        <location filename="../commands/command_divesite.cpp" line="342"/>
         <source>merge dive sites</source>
         <translation>yhdistä sukelluskohteita</translation>
     </message>
@@ -860,7 +932,7 @@
 <context>
     <name>Command::MergeDives</name>
     <message>
-        <location filename="../desktop-widgets/command_divelist.cpp" line="890"/>
+        <location filename="../commands/command_divelist.cpp" line="909"/>
         <source>merge dive</source>
         <translation>yhdistä sukellus</translation>
     </message>
@@ -868,7 +940,7 @@
 <context>
     <name>Command::MoveDiveComputerToFront</name>
     <message>
-        <location filename="../desktop-widgets/command_divelist.cpp" line="879"/>
+        <location filename="../commands/command_divelist.cpp" line="898"/>
         <source>move dive computer to front</source>
         <translation>tuo sukellustietokone eteen</translation>
     </message>
@@ -876,7 +948,7 @@
 <context>
     <name>Command::PurgeUnusedDiveSites</name>
     <message>
-        <location filename="../desktop-widgets/command_divesite.cpp" line="157"/>
+        <location filename="../commands/command_divesite.cpp" line="156"/>
         <source>purge unused dive sites</source>
         <translation>poista käyttämättömät sukelluskohteet</translation>
     </message>
@@ -884,7 +956,7 @@
 <context>
     <name>Command::RemoveAutogenTrips</name>
     <message>
-        <location filename="../desktop-widgets/command_divelist.cpp" line="678"/>
+        <location filename="../commands/command_divelist.cpp" line="697"/>
         <source>remove autogenerated trips</source>
         <translation>poista automaattisesti luodut retket</translation>
     </message>
@@ -892,7 +964,7 @@
 <context>
     <name>Command::RemoveDivesFromTrip</name>
     <message numerus="yes">
-        <location filename="../desktop-widgets/command_divelist.cpp" line="666"/>
+        <location filename="../commands/command_divelist.cpp" line="685"/>
         <source>remove %n dive(s) from trip</source>
         <translation><numerusform>poista %n sukellus retkestä</numerusform><numerusform>poista %n sukellusta retkestä</numerusform></translation>
     </message>
@@ -900,7 +972,7 @@
 <context>
     <name>Command::RenumberDives</name>
     <message numerus="yes">
-        <location filename="../desktop-widgets/command_divelist.cpp" line="614"/>
+        <location filename="../commands/command_divelist.cpp" line="633"/>
         <source>renumber %n dive(s)</source>
         <translation><numerusform>numeroi %n sukellus uudelleen</numerusform><numerusform>numeroi %n sukellusta uudelleen</numerusform></translation>
     </message>
@@ -908,7 +980,7 @@
 <context>
     <name>Command::ShiftTime</name>
     <message numerus="yes">
-        <location filename="../desktop-widgets/command_divelist.cpp" line="571"/>
+        <location filename="../commands/command_divelist.cpp" line="585"/>
         <source>shift time of %n dives</source>
         <translation><numerusform>muuta %n sukelluksen aikaa</numerusform><numerusform>muuta %n sukelluksen aikaa</numerusform></translation>
     </message>
@@ -916,7 +988,7 @@
 <context>
     <name>Command::SplitDiveComputer</name>
     <message>
-        <location filename="../desktop-widgets/command_divelist.cpp" line="823"/>
+        <location filename="../commands/command_divelist.cpp" line="842"/>
         <source>split dive computer</source>
         <translation>Eriytä sukellustietokone</translation>
     </message>
@@ -924,7 +996,7 @@
 <context>
     <name>Command::SplitDives</name>
     <message>
-        <location filename="../desktop-widgets/command_divelist.cpp" line="805"/>
+        <location filename="../commands/command_divelist.cpp" line="824"/>
         <source>split dive</source>
         <translation>jaa sukellus</translation>
     </message>
@@ -932,42 +1004,42 @@
 <context>
     <name>ConfigureDiveComputer</name>
     <message>
-        <location filename="../core/configuredivecomputer.cpp" line="181"/>
+        <location filename="../core/configuredivecomputer.cpp" line="183"/>
         <source>Could not save the backup file %1. Error Message: %2</source>
         <translation>Backup -tiedoston %1 tallennus  epäonnistui. Virheviesti: %2</translation>
     </message>
     <message>
-        <location filename="../core/configuredivecomputer.cpp" line="197"/>
+        <location filename="../core/configuredivecomputer.cpp" line="199"/>
         <source>Could not open backup file: %1</source>
         <translation>Backup -tiedoston avaus epäonnistui: %1</translation>
     </message>
     <message>
-        <location filename="../core/configuredivecomputer.cpp" line="545"/>
+        <location filename="../core/configuredivecomputer.cpp" line="547"/>
         <source>Dive computer details read successfully</source>
         <translation>Sukellustietokoneen tiedot luettu onnistuneesti</translation>
     </message>
     <message>
-        <location filename="../core/configuredivecomputer.cpp" line="554"/>
+        <location filename="../core/configuredivecomputer.cpp" line="556"/>
         <source>Setting successfully written to device</source>
         <translation>Asetuksen tallennus laitteeseen onnistui</translation>
     </message>
     <message>
-        <location filename="../core/configuredivecomputer.cpp" line="563"/>
+        <location filename="../core/configuredivecomputer.cpp" line="565"/>
         <source>Device firmware successfully updated</source>
         <translation>Laitteen ohjelmisto on päivitetty onnistuneesti</translation>
     </message>
     <message>
-        <location filename="../core/configuredivecomputer.cpp" line="572"/>
+        <location filename="../core/configuredivecomputer.cpp" line="574"/>
         <source>Device settings successfully reset</source>
         <translation>Laitteen asetukset on palautettu onnistuneesti</translation>
     </message>
     <message>
-        <location filename="../core/configuredivecomputer.cpp" line="588"/>
+        <location filename="../core/configuredivecomputer.cpp" line="590"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>libdivecomputer-kontekstin luominen epäonnistui</translation>
     </message>
     <message>
-        <location filename="../core/configuredivecomputer.cpp" line="607"/>
+        <location filename="../core/configuredivecomputer.cpp" line="609"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation>Yhteys sukellustietokoneeseen epäonnistui.</translation>
     </message>
@@ -1065,10 +1137,16 @@
         <translation>Peruuta</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="241"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2564"/>
-        <source>Suunto Vyper family</source>
-        <translation>Suunto Vyper -tuoteperhe</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="214"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2558"/>
+        <source>OSTC Mk2/2N/2C</source>
+        <translation>OSTC Mk2/2N/2C</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="223"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2560"/>
+        <source>OSTC 2/3/Sport/Plus/cR</source>
+        <translation>OSTC 2/3/Sport/Plus/cR</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="232"/>
@@ -1077,6 +1155,12 @@
         <translation>OSTC 4</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="241"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2564"/>
+        <source>Suunto Vyper family</source>
+        <translation>Suunto Vyper -tuoteperhe</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="262"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1194"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2492"/>
@@ -1089,126 +1173,6 @@
         <translation>Perusasetukset</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1201"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2499"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2688"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2866"/>
-        <source>Eco</source>
-        <translation>Eko</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1206"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2504"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2689"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2867"/>
-        <source>Medium</source>
-        <translation>Keskimääräinen</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1211"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2509"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2690"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2868"/>
-        <source>High</source>
-        <translation>Korkea</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="603"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="707"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="733"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="759"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="799"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="822"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1219"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1767"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1790"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1816"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1868"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1934"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1960"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2042"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2058"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2391"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2517"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2888"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2932"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2955"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2991"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3069"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2593"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2605"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2607"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2609"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2613"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2615"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2692"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2758"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2760"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2762"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2765"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2772"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2774"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2784"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2785"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2857"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2870"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2913"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2918"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2920"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2923"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2932"/>
-        <source>%</source>
-        <translation>%</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1230"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2528"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2693"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2871"/>
-        <source>English</source>
-        <translation>Englanti</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1235"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2533"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2694"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2872"/>
-        <source>German</source>
-        <translation>Saksa</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1240"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2538"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2695"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2873"/>
-        <source>French</source>
-        <translation>Ranska</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1245"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2543"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2696"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2874"/>
-        <source>Italian</source>
-        <translation>Italia</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1254"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2552"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2698"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2876"/>
-        <source>m/°C</source>
-        <translation>m/°C</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1259"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2557"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2699"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2877"/>
-        <source>ft/°F</source>
-        <translation>ft/°F</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="268"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1267"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2565"/>
@@ -1221,6 +1185,16 @@
         <translation>Sarjanumero</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="278"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1628"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2835"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2568"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2745"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2908"/>
+        <source>Length</source>
+        <translation>Pituus</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="305"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1290"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2588"/>
@@ -1233,146 +1207,6 @@
         <translation>Laiteohjelmiston versio</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1301"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2599"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2703"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2881"/>
-        <source>MMDDYY</source>
-        <translation>KKPPVV</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1306"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2604"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2704"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2882"/>
-        <source>DDMMYY</source>
-        <translation>PPKKVV</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1311"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2609"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2705"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2883"/>
-        <source>YYMMDD</source>
-        <translation>VVKKPP</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1326"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2624"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2707"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2885"/>
-        <source>Language</source>
-        <translation>Kieli</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="388"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1336"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2634"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2574"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2708"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2886"/>
-        <source>Date format</source>
-        <translation>Päiväyksen muoto</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1346"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2644"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2709"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2887"/>
-        <source>Brightness</source>
-        <translation>Kirkkaus</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1356"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2654"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3856"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2710"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2888"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="3046"/>
-        <source>Units</source>
-        <translation>Yksiköt</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1366"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2664"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2711"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2889"/>
-        <source>Salinity (0-5%)</source>
-        <translation>Suolapitoisuus (0-5%)</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1379"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2677"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2712"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2890"/>
-        <source>Reset device to default settings</source>
-        <translation>Palauta laite oletusasetuksiin</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1393"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2713"/>
-        <source>230LSB/Gauss</source>
-        <translation>230LSB/Gauss</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1398"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2714"/>
-        <source>330LSB/Gauss</source>
-        <translation>330LSB/Gauss</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1403"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2715"/>
-        <source>390LSB/Gauss</source>
-        <translation>390LSB/Gauss</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1408"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2716"/>
-        <source>440LSB/Gauss</source>
-        <translation>440LSB/Gauss</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1413"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2717"/>
-        <source>660LSB/Gauss</source>
-        <translation>660LSB/Gauss</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1418"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2718"/>
-        <source>820LSB/Gauss</source>
-        <translation>820LSB/Gauss</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1423"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2719"/>
-        <source>1090LSB/Gauss</source>
-        <translation>1090LSB/Gauss</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1428"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2720"/>
-        <source>1370LSB/Gauss</source>
-        <translation>1370LSB/Gauss</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1462"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2722"/>
-        <source>Compass gain</source>
-        <translation>Kompassin vahvistus</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1472"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2710"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3805"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2723"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2891"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="3040"/>
-        <source>Computer model</source>
-        <translation>Sukellustietokoneen malli</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="315"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1479"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2717"/>
@@ -1385,62 +1219,22 @@
         <translation>Valinnainen teksti</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1497"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2735"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2725"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2893"/>
-        <source>OC</source>
-        <translation>Vapaakierto</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1502"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2740"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2726"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2894"/>
-        <source>CC</source>
-        <translation>Suljettukierto</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="661"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1507"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2745"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2597"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2727"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2895"/>
-        <source>Gauge</source>
-        <translation>Mittari</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="671"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1512"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2750"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2599"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2728"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2896"/>
-        <source>Apnea</source>
-        <translation>Vapaasukellus</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1520"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2758"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2730"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2898"/>
-        <source>Dive mode</source>
-        <translation>Sukellustyyppi</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1531"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2731"/>
-        <source>2s</source>
-        <translation>2s</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="338"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3642"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2571"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="3023"/>
+        <source>Number of dives</source>
+        <translation>Sukellusmäärä</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1536"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3775"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2732"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="3034"/>
-        <source>10s</source>
-        <translation>10s</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="345"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1595"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2809"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2572"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2742"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2906"/>
+        <source>Show safety stop</source>
+        <translation>Näytä turvapysähdys</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="359"/>
@@ -1451,36 +1245,32 @@
         <translation>Näytetiheys</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1555"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2769"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2735"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2899"/>
-        <source>Standard</source>
-        <translation>Oletus</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="388"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1336"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2634"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2574"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2708"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2886"/>
+        <source>Date format</source>
+        <translation>Päiväyksen muoto</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1560"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2774"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2736"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2900"/>
-        <source>Red</source>
-        <translation>Punainen</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="399"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2575"/>
+        <source>MM/DD/YY</source>
+        <translation>KK/PP/VV</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1565"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2779"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2737"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2901"/>
-        <source>Green</source>
-        <translation>Vihreä</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="404"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2576"/>
+        <source>DD/MM/YY</source>
+        <translation>PP/KK/VV</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1570"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2784"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2738"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2902"/>
-        <source>Blue</source>
-        <translation>Sininen</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="409"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2577"/>
+        <source>YY/MM/DD</source>
+        <translation>VV/KK/PP</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="417"/>
@@ -1493,40 +1283,16 @@
         <translation>Synkronoi sukellustietokoneen aika</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1585"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2799"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2741"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2905"/>
-        <source>Dive mode color</source>
-        <translation>Sukellustyypin väri</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="345"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1595"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2809"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2572"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2742"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2906"/>
-        <source>Show safety stop</source>
-        <translation>Näytä turvapysähdys</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="470"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1602"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2583"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2743"/>
-        <source>End Depth</source>
-        <translation>Kohdesyvyys</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="424"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2580"/>
+        <source>Salinity</source>
+        <translation>Suolapitoisuus</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="278"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1628"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2835"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2568"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2745"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2908"/>
-        <source>Length</source>
-        <translation>Pituus</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="434"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2581"/>
+        <source>kg/ℓ</source>
+        <translation>kg/ℓ</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="463"/>
@@ -1539,6 +1305,14 @@
         <translation>Alkusyvyys</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="470"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1602"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2583"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2743"/>
+        <source>End Depth</source>
+        <translation>Kohdesyvyys</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="477"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1642"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2584"/>
@@ -1547,6 +1321,42 @@
         <translation>Nollaa syvyys</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="487"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1612"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2819"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3880"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2585"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2744"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2907"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="3050"/>
+        <source>s</source>
+        <translation>s</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="506"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="531"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="553"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="632"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1652"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1677"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1699"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1845"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2852"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2971"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2586"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2587"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2588"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2594"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2748"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2749"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2750"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2763"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2910"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2921"/>
+        <source>m</source>
+        <translation>m</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="573"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1719"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2875"/>
@@ -1557,20 +1367,6 @@
         <translation>Kehittyneet asetukset</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1725"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2752"/>
-        <source>Left button sensitivity</source>
-        <translation>Vasemman painikkeen herkkyys</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1732"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3167"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2753"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2939"/>
-        <source>Always show pO₂</source>
-        <translation>Näytä aina pO2</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="579"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1739"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2590"/>
@@ -1579,6 +1375,14 @@
         <translation>Vaihtoehtoinen GF voidaan valita sukelluksen aikana</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="586"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1806"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2591"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2761"/>
+        <source>Desaturation</source>
+        <translation>Desaturaatio</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="596"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1746"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2911"/>
@@ -1589,40 +1393,52 @@
         <translation>Tuleva pintautumisaika</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1753"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2918"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2756"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2916"/>
-        <source>Pressure sensor offset</source>
-        <translation>Painesensorin poikkeama</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="815"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1760"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2925"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2614"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2757"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2917"/>
-        <source>GFLow</source>
-        <translation>GFLow</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="792"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1783"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2948"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2612"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2759"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2919"/>
-        <source>GFHigh</source>
-        <translation>GFHigh</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="586"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1806"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2591"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2761"/>
-        <source>Desaturation</source>
-        <translation>Desaturaatio</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="603"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="707"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="733"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="759"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="799"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="822"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1219"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1767"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1790"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1816"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1868"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1934"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1960"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2042"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2058"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2391"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2517"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2888"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2932"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2955"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2991"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3069"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2593"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2605"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2607"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2609"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2613"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2615"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2692"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2758"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2760"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2762"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2765"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2772"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2774"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2784"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2785"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2857"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2870"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2913"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2918"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2920"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2923"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2932"/>
+        <source>%</source>
+        <translation>%</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="645"/>
@@ -1645,12 +1461,62 @@
         <translation>ZH-L16</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1906"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3029"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2768"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2926"/>
-        <source>ZH-L16+GF</source>
-        <translation>ZH-L16+GF</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="661"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1507"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2745"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2597"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2727"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2895"/>
+        <source>Gauge</source>
+        <translation>Mittari</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="666"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2598"/>
+        <source>ZH-L16 CC</source>
+        <translation>ZH-L16 CC</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="671"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1512"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2750"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2599"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2728"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2896"/>
+        <source>Apnea</source>
+        <translation>Vapaasukellus</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="676"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2600"/>
+        <source>L16-GF OC</source>
+        <translation>L16-GF OC</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="681"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2601"/>
+        <source>L16-GF CC</source>
+        <translation>L16-GF CC</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="686"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2602"/>
+        <source>PSCR-GF</source>
+        <translation>PSCR-GF</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="694"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1914"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3042"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3822"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3914"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2604"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2770"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2929"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="3041"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="3053"/>
+        <source>min</source>
+        <translation>min</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="723"/>
@@ -1691,22 +1557,24 @@
         <translation>Saturaatio</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1993"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2777"/>
-        <source>Flip screen</source>
-        <translation>Käänteinen näyttö</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2000"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2778"/>
-        <source>Right button sensitivity</source>
-        <translation>Oikean painikkeen herkkyys</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="792"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1783"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2948"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2612"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2759"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2919"/>
+        <source>GFHigh</source>
+        <translation>GFHigh</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2007"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2779"/>
-        <source>MOD warning</source>
-        <translation>Varoitus: MOD</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="815"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1760"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2925"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2614"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2757"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2917"/>
+        <source>GFLow</source>
+        <translation>GFLow</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="838"/>
@@ -1717,10 +1585,22 @@
         <translation>Graafinen nopeusnäyttö</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2021"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2781"/>
-        <source>Dynamic ascent rate</source>
-        <translation>Vaihtuva nousunopeus</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="845"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="861"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2074"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2090"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3106"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3122"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3138"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2617"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2618"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2786"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2787"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2936"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2937"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2938"/>
+        <source>ℓ/min</source>
+        <translation>ℓ/min</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="877"/>
@@ -1743,22 +1623,6 @@
         <translation>Deko-kaasun kulutus</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2106"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3194"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2788"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2942"/>
-        <source>Temperature sensor offset</source>
-        <translation>Lämpötila-anturin poikkeama</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2113"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3201"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2789"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2943"/>
-        <source>°C</source>
-        <translation>°C</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="892"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2133"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3221"/>
@@ -1769,60 +1633,6 @@
         <translation>Kaasuasetukset</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="214"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2558"/>
-        <source>OSTC Mk2/2N/2C</source>
-        <translation>OSTC Mk2/2N/2C</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="223"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2560"/>
-        <source>OSTC 2/3/Sport/Plus/cR</source>
-        <translation>OSTC 2/3/Sport/Plus/cR</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="506"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="531"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="553"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="632"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1652"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1677"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1699"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1845"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2852"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2971"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2586"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2587"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2588"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2594"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2748"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2749"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2750"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2763"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2910"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2921"/>
-        <source>m</source>
-        <translation>m</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="845"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="861"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2074"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2090"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3106"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3122"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3138"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2617"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2618"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2786"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2787"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2936"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2937"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2938"/>
-        <source>ℓ/min</source>
-        <translation>ℓ/min</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="935"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1020"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2176"/>
@@ -2049,6 +1859,328 @@
         <translation>cbar</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1168"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2466"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3541"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2685"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2863"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="3016"/>
+        <source>pO₂ max</source>
+        <translation>pO₂ max</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1175"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2473"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3548"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2686"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2864"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="3017"/>
+        <source>pO₂ min</source>
+        <translation>pO₂ min</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1201"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2499"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2688"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2866"/>
+        <source>Eco</source>
+        <translation>Eko</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1206"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2504"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2689"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2867"/>
+        <source>Medium</source>
+        <translation>Keskimääräinen</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1211"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2509"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2690"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2868"/>
+        <source>High</source>
+        <translation>Korkea</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1230"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2528"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2693"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2871"/>
+        <source>English</source>
+        <translation>Englanti</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1235"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2533"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2694"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2872"/>
+        <source>German</source>
+        <translation>Saksa</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1240"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2538"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2695"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2873"/>
+        <source>French</source>
+        <translation>Ranska</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1245"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2543"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2696"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2874"/>
+        <source>Italian</source>
+        <translation>Italia</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1254"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2552"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2698"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2876"/>
+        <source>m/°C</source>
+        <translation>m/°C</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1259"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2557"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2699"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2877"/>
+        <source>ft/°F</source>
+        <translation>ft/°F</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1301"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2599"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2703"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2881"/>
+        <source>MMDDYY</source>
+        <translation>KKPPVV</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1306"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2604"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2704"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2882"/>
+        <source>DDMMYY</source>
+        <translation>PPKKVV</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1311"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2609"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2705"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2883"/>
+        <source>YYMMDD</source>
+        <translation>VVKKPP</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1326"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2624"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2707"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2885"/>
+        <source>Language</source>
+        <translation>Kieli</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1346"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2644"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2709"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2887"/>
+        <source>Brightness</source>
+        <translation>Kirkkaus</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1356"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2654"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3856"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2710"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2888"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="3046"/>
+        <source>Units</source>
+        <translation>Yksiköt</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1366"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2664"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2711"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2889"/>
+        <source>Salinity (0-5%)</source>
+        <translation>Suolapitoisuus (0-5%)</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1379"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2677"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2712"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2890"/>
+        <source>Reset device to default settings</source>
+        <translation>Palauta laite oletusasetuksiin</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1393"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2713"/>
+        <source>230LSB/Gauss</source>
+        <translation>230LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1398"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2714"/>
+        <source>330LSB/Gauss</source>
+        <translation>330LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1403"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2715"/>
+        <source>390LSB/Gauss</source>
+        <translation>390LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1408"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2716"/>
+        <source>440LSB/Gauss</source>
+        <translation>440LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1413"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2717"/>
+        <source>660LSB/Gauss</source>
+        <translation>660LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1418"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2718"/>
+        <source>820LSB/Gauss</source>
+        <translation>820LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1423"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2719"/>
+        <source>1090LSB/Gauss</source>
+        <translation>1090LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1428"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2720"/>
+        <source>1370LSB/Gauss</source>
+        <translation>1370LSB/Gauss</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1462"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2722"/>
+        <source>Compass gain</source>
+        <translation>Kompassin vahvistus</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1472"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2710"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3805"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2723"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2891"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="3040"/>
+        <source>Computer model</source>
+        <translation>Sukellustietokoneen malli</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1497"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2735"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2725"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2893"/>
+        <source>OC</source>
+        <translation>Vapaakierto</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1502"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2740"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2726"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2894"/>
+        <source>CC</source>
+        <translation>Suljettukierto</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1520"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2758"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2730"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2898"/>
+        <source>Dive mode</source>
+        <translation>Sukellustyyppi</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1531"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2731"/>
+        <source>2s</source>
+        <translation>2s</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1536"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3775"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2732"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="3034"/>
+        <source>10s</source>
+        <translation>10s</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1555"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2769"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2735"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2899"/>
+        <source>Standard</source>
+        <translation>Oletus</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1560"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2774"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2736"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2900"/>
+        <source>Red</source>
+        <translation>Punainen</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1565"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2779"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2737"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2901"/>
+        <source>Green</source>
+        <translation>Vihreä</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1570"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2784"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2738"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2902"/>
+        <source>Blue</source>
+        <translation>Sininen</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1585"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2799"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2741"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2905"/>
+        <source>Dive mode color</source>
+        <translation>Sukellustyypin väri</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1725"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2752"/>
+        <source>Left button sensitivity</source>
+        <translation>Vasemman painikkeen herkkyys</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1732"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3167"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2753"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2939"/>
+        <source>Always show pO₂</source>
+        <translation>Näytä aina pO2</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1753"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2918"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2756"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2916"/>
+        <source>Pressure sensor offset</source>
+        <translation>Painesensorin poikkeama</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1884"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3007"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2766"/>
@@ -2057,6 +2189,54 @@
         <translation>mbar</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1906"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3029"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2768"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2926"/>
+        <source>ZH-L16+GF</source>
+        <translation>ZH-L16+GF</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1993"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2777"/>
+        <source>Flip screen</source>
+        <translation>Käänteinen näyttö</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2000"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2778"/>
+        <source>Right button sensitivity</source>
+        <translation>Oikean painikkeen herkkyys</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2007"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2779"/>
+        <source>MOD warning</source>
+        <translation>Varoitus: MOD</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2021"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2781"/>
+        <source>Dynamic ascent rate</source>
+        <translation>Vaihtuva nousunopeus</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2106"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3194"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2788"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2942"/>
+        <source>Temperature sensor offset</source>
+        <translation>Lämpötila-anturin poikkeama</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2113"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3201"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2789"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2943"/>
+        <source>°C</source>
+        <translation>°C</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2371"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3459"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2851"/>
@@ -2095,30 +2275,40 @@
         <translation>Sensori</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3486"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="3013"/>
-        <source>Setpoint fallback</source>
-        <translation>Varasetpoint</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2881"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2912"/>
+        <source>Travel gas consumption</source>
+        <translation>Siirtymäkaasun kulutus</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1168"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2466"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3541"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2685"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2863"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="3016"/>
-        <source>pO₂ max</source>
-        <translation>pO₂ max</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2904"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2914"/>
+        <source>Button sensitivity</source>
+        <translation>Painikkeen herkkyys</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1175"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2473"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3548"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2686"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2864"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="3017"/>
-        <source>pO₂ min</source>
-        <translation>pO₂ min</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3034"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2927"/>
+        <source>VPM</source>
+        <translation>VPM</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3174"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2940"/>
+        <source>VPM conservatism</source>
+        <translation>VPM konservatismi</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3181"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2941"/>
+        <source>+</source>
+        <translation>+</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3486"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="3013"/>
+        <source>Setpoint fallback</source>
+        <translation>Varasetpoint</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3589"/>
@@ -2139,14 +2329,6 @@
         <translation>Malli</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="338"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3642"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2571"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="3023"/>
-        <source>Number of dives</source>
-        <translation>Sukellusmäärä</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3702"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="3026"/>
         <source>Max. depth</source>
@@ -2204,20 +2386,6 @@
         <translation>Sukellusaika</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="694"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1914"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3042"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3822"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3914"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2604"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2770"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2929"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="3041"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="3053"/>
-        <source>min</source>
-        <translation>min</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3836"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="3042"/>
         <source>24h</source>
@@ -2248,18 +2416,6 @@
         <translation>Metrinen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="487"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1612"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2819"/>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3880"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2585"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2744"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2907"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="3050"/>
-        <source>s</source>
-        <translation>s</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3887"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="3051"/>
         <source>Light</source>
@@ -2278,90 +2434,6 @@
         <translation>Aikahälytys</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="399"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2575"/>
-        <source>MM/DD/YY</source>
-        <translation>KK/PP/VV</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="404"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2576"/>
-        <source>DD/MM/YY</source>
-        <translation>PP/KK/VV</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="409"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2577"/>
-        <source>YY/MM/DD</source>
-        <translation>VV/KK/PP</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="424"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2580"/>
-        <source>Salinity</source>
-        <translation>Suolapitoisuus</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="434"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2581"/>
-        <source>kg/ℓ</source>
-        <translation>kg/ℓ</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="666"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2598"/>
-        <source>ZH-L16 CC</source>
-        <translation>ZH-L16 CC</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="676"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2600"/>
-        <source>L16-GF OC</source>
-        <translation>L16-GF OC</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="681"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2601"/>
-        <source>L16-GF CC</source>
-        <translation>L16-GF CC</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="686"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2602"/>
-        <source>PSCR-GF</source>
-        <translation>PSCR-GF</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2881"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2912"/>
-        <source>Travel gas consumption</source>
-        <translation>Siirtymäkaasun kulutus</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2904"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2914"/>
-        <source>Button sensitivity</source>
-        <translation>Painikkeen herkkyys</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3034"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2927"/>
-        <source>VPM</source>
-        <translation>VPM</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3174"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2940"/>
-        <source>VPM conservatism</source>
-        <translation>VPM konservatismi</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3181"/>
-        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2941"/>
-        <source>+</source>
-        <translation>+</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="895"/>
         <source>Error</source>
         <translation>Virhe</translation>
@@ -2437,6 +2509,11 @@
         <translation>Kaikki tiedostot</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1464"/>
+        <source>Choose file for dive computer download logfile</source>
+        <translation>Valitse lokitiedosto sukellustietokoneen tietojen tallennukseen</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1465"/>
         <source>Log files</source>
         <translation>Lokitiedostot</translation>
@@ -2456,19 +2533,6 @@
         <source>Disconnected from device</source>
         <translation>Yhteys laitteeseen katkaistu</translation>
     </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1464"/>
-        <source>Choose file for dive computer download logfile</source>
-        <translation>Valitse lokitiedosto sukellustietokoneen tietojen tallennukseen</translation>
-    </message>
-</context>
-<context>
-    <name>ContextDrawer</name>
-    <message>
-        <location filename="../mobile-widgets/qml/kirigami/src/controls/ContextDrawer.qml" line="77"/>
-        <source>Actions</source>
-        <translation>Tapahtumat</translation>
-    </message>
 </context>
 <context>
     <name>CopySettings</name>
@@ -2536,150 +2600,150 @@
 <context>
     <name>CylindersModel</name>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="19"/>
         <source>Type</source>
         <translation>Tyyppi</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="19"/>
         <source>Size</source>
         <translation>Tilavuus</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="19"/>
         <source>Work press.</source>
         <translation>Paineluokka</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
-        <location filename="../qt-models/cylindermodel.cpp" line="26"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="19"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="28"/>
         <source>Start press.</source>
         <translation>Alkupaine</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="19"/>
         <source>End press.</source>
         <translation>Loppupaine</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="19"/>
         <source>O₂%</source>
         <translation>O₂%</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="19"/>
         <source>He%</source>
         <translation>He%</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="18"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="20"/>
         <source>Deco switch at</source>
         <translation>Vaihda deko syvyydessä</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="18"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="20"/>
         <source>Bot. MOD</source>
         <translation>Pohja MOD</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="18"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="20"/>
         <source>MND</source>
         <translation>MND</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="18"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="20"/>
         <source>Use</source>
         <translation>Käyttö</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="53"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="48"/>
         <source>cuft</source>
         <translation>ft³</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="57"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="52"/>
         <source>ℓ</source>
         <translation>ℓ</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="237"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="261"/>
+        <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source>
+        <translation>Tämä kaasu on käytössä. Vain säiliöt, joita ei käytetä sukelluksella, voidaan poistaa.</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="263"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation>Poista säiliö.</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="248"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="274"/>
         <source>Switch depth for deco gas. Calculated using Deco pO₂ preference, unless set manually.</source>
         <translation>Dekokaasun vaihtosyvyys. Lasketaan käyttäen dekon pO₂ -asetusta, ellei arvoa ole asetettu käsin.</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="250"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="276"/>
         <source>Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to &apos;*&apos; for best O₂% for max. depth.</source>
         <translation>Laskettu käyttäen pohjan pO₂ asetusta. MOD vaikuttaa O₂%:iin, aseta arvoksi &apos;*&apos; parhaaksi O₂% maksimi syvyyteen.</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="252"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="278"/>
         <source>Calculated using Best Mix END preference. Setting MND adjusts He%, set to &apos;*&apos; for best He% for max. depth.</source>
         <translation>Laskettu käyttäen parhaan seoksen asetusta END. Asetus MND muttaa He%, aseta &apos;*&apos; saadaksesi optimaalisen He% maksimisyvyyteen.</translation>
     </message>
-    <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="235"/>
-        <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source>
-        <translation>Tämä kaasu on käytössä. Vain säiliöt, joita ei käytetä sukelluksella, voidaan poistaa.</translation>
-    </message>
 </context>
 <context>
     <name>DiveComponentSelection</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="487"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="478"/>
         <source>Dive site: </source>
         <translation>Sukelluskohde:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="489"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="480"/>
         <source>Dive master: </source>
         <translation>Sukellusvastaava:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="491"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="482"/>
         <source>Buddy: </source>
         <translation>Sukelluspari: </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="493"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="484"/>
         <source>Rating: </source>
         <translation>Arvio: </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="495"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="486"/>
         <source>Visibility: </source>
         <translation>Näkyvyys: </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="497"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="488"/>
         <source>Notes:
 </source>
         <translation>Muistiinpanot:
 </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="499"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="490"/>
         <source>Suit: </source>
         <translation>Puku: </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="501"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="492"/>
         <source>Tags: </source>
         <translation>Avainsanat:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="511"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="502"/>
         <source>Cylinders:
 </source>
         <translation>Säiliöt:
 </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="519"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="510"/>
         <source>Weights:
 </source>
         <translation>Painot:
@@ -2695,33 +2759,9 @@
         <translation>Osan valinta</translation>
     </message>
     <message>
-        <location filename="../subsurface/desktop-widgets/ui_divecomponentselection.h" line="140"/>
-        <source>Which components would you like to copy</source>
-        <translation>Mitkä osat haluat kopioida</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divecomponentselection.ui" line="87"/>
-        <location filename="../subsurface/desktop-widgets/ui_divecomponentselection.h" line="141"/>
-        <source>Dive site</source>
-        <translation>Sukelluskohde</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divecomponentselection.ui" line="129"/>
-        <location filename="../subsurface/desktop-widgets/ui_divecomponentselection.h" line="142"/>
-        <source>Suit</source>
-        <translation>Puku</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divecomponentselection.ui" line="94"/>
-        <location filename="../subsurface/desktop-widgets/ui_divecomponentselection.h" line="143"/>
-        <source>Visibility</source>
-        <translation>Näkyvyys</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divecomponentselection.ui" line="115"/>
-        <location filename="../subsurface/desktop-widgets/ui_divecomponentselection.h" line="144"/>
-        <source>Notes</source>
-        <translation>Muistiinpanot</translation>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="52"/>
+        <source>Which components would you like to copy?</source>
+        <translation>Mitkä osat haluat kopioida?</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divecomponentselection.ui" line="73"/>
@@ -2730,38 +2770,52 @@
         <translation>Avainsanat</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divecomponentselection.ui" line="52"/>
-        <source>Which components would you like to copy?</source>
-        <translation>Mitkä osat haluat kopioida?</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divecomponentselection.ui" line="80"/>
         <location filename="../subsurface/desktop-widgets/ui_divecomponentselection.h" line="146"/>
         <source>Weights</source>
         <translation>Painot</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="87"/>
+        <location filename="../subsurface/desktop-widgets/ui_divecomponentselection.h" line="141"/>
+        <source>Dive site</source>
+        <translation>Sukelluskohde</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="94"/>
+        <location filename="../subsurface/desktop-widgets/ui_divecomponentselection.h" line="143"/>
+        <source>Visibility</source>
+        <translation>Näkyvyys</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divecomponentselection.ui" line="101"/>
         <location filename="../subsurface/desktop-widgets/ui_divecomponentselection.h" line="147"/>
         <source>Cylinders</source>
         <translation>Säiliöt</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="108"/>
+        <location filename="../subsurface/desktop-widgets/ui_divecomponentselection.h" line="149"/>
+        <source>Buddy</source>
+        <translation>Sukelluspari</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="115"/>
+        <location filename="../subsurface/desktop-widgets/ui_divecomponentselection.h" line="144"/>
+        <source>Notes</source>
+        <translation>Muistiinpanot</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divecomponentselection.ui" line="122"/>
         <location filename="../subsurface/desktop-widgets/ui_divecomponentselection.h" line="148"/>
         <source>Divemaster</source>
         <translation>Divemaster</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divecomponentselection.ui" line="146"/>
-        <source>You can paste these to another dive or as text to another application.</source>
-        <translation>Voit liittää nämä toiseen sukellukseen tai tekstinä toiseen sovellukseen.</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divecomponentselection.ui" line="108"/>
-        <location filename="../subsurface/desktop-widgets/ui_divecomponentselection.h" line="149"/>
-        <source>Buddy</source>
-        <translation>Sukelluspari</translation>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="129"/>
+        <location filename="../subsurface/desktop-widgets/ui_divecomponentselection.h" line="142"/>
+        <source>Suit</source>
+        <translation>Puku</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divecomponentselection.ui" line="136"/>
@@ -2769,6 +2823,16 @@
         <source>Rating</source>
         <translation>Yleisarvio</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="146"/>
+        <source>You can paste these to another dive or as text to another application.</source>
+        <translation>Voit liittää nämä toiseen sukellukseen tai tekstinä toiseen sovellukseen.</translation>
+    </message>
+    <message>
+        <location filename="../subsurface/desktop-widgets/ui_divecomponentselection.h" line="140"/>
+        <source>Which components would you like to copy</source>
+        <translation>Mitkä osat haluat kopioida</translation>
+    </message>
 </context>
 <context>
     <name>DiveComputerManagementDialog</name>
@@ -2817,32 +2881,57 @@ poistaa valitun sukellustietokoneen?</translation>
 <context>
     <name>DiveDetails</name>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="55"/>
+        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="53"/>
         <source>Dive details</source>
         <translation>Sukelluksen yksityiskohdat</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="150"/>
+        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="63"/>
+        <source>Remove this dive from trip</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="72"/>
+        <source>Add dive to trip above</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="81"/>
+        <source>Add dive to trip below</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="90"/>
+        <source>Undo</source>
+        <translation>Peruuta</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="96"/>
+        <source>Redo</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="193"/>
         <source>Delete dive</source>
         <translation>Poista sukellus</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="167"/>
+        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="201"/>
         <source>Cancel edit</source>
         <translation>Peru muutokset</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="177"/>
+        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="211"/>
         <source>Show on map</source>
         <translation>Näytä kartalla</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="192"/>
+        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="227"/>
         <source>Save edits</source>
         <translation>Tallenna muutokset</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="192"/>
+        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="227"/>
         <source>Edit dive</source>
         <translation>Muuta sukelluksen tietoja</translation>
     </message>
@@ -2850,135 +2939,135 @@ poistaa valitun sukellustietokoneen?</translation>
 <context>
     <name>DiveDetailsEdit</name>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="158"/>
-        <source>Dive %1</source>
-        <translation>Sukellus %1</translation>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="139"/>
+        <source>Dive number:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="162"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="151"/>
         <source>Date:</source>
         <translation>Päivä:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="174"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="162"/>
         <source>Location:</source>
         <translation>Kohde:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="197"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="186"/>
         <source>Coordinates:</source>
         <translation>Koordinaatit:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="210"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="198"/>
         <source>Use current
 GPS location:</source>
         <translation>Käytä GPS -sijaintia:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="231"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="220"/>
         <source>Depth:</source>
         <translation>Syvyys:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="244"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="232"/>
         <source>Duration:</source>
         <translation>Kesto:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="258"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="245"/>
         <source>Air Temp:</source>
         <translation>Ilman lämpötila:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="271"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="257"/>
         <source>Water Temp:</source>
         <translation>Veden lämpötila:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="284"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="269"/>
         <source>Suit:</source>
         <translation>Puku:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="305"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="291"/>
         <source>Buddy:</source>
         <translation>Sukelluspari:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="325"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="312"/>
         <source>Divemaster:</source>
         <translation>Divemaster:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="345"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="333"/>
         <source>Weight:</source>
         <translation>Massa:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="360"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="347"/>
         <source>Cylinder1:</source>
         <translation>Säiliö1:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="374"/>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="434"/>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="500"/>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="566"/>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="632"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="362"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="420"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="484"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="547"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="611"/>
         <source>Gas mix:</source>
         <translation>Kaasuseos:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="389"/>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="451"/>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="517"/>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="583"/>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="649"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="376"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="436"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="499"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="563"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="627"/>
         <source>Start Pressure:</source>
         <translation>Alkupaine:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="403"/>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="467"/>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="533"/>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="599"/>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="665"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="389"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="451"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="514"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="578"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="642"/>
         <source>End Pressure:</source>
         <translation>Loppupaine:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="418"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="403"/>
         <source>Cylinder2:</source>
         <translation>Säiliö2:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="483"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="466"/>
         <source>Cylinder3:</source>
         <translation>Säiliö3:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="549"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="529"/>
         <source>Cylinder4:</source>
         <translation>Säiliö4:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="615"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="593"/>
         <source>Cylinder5:</source>
         <translation>Säiliö5:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="680"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="656"/>
         <source>Rating:</source>
         <translation>Yleisarvio:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="693"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="670"/>
         <source>Visibility:</source>
         <translation>Näkyvyys:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="707"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="685"/>
         <source>Notes:</source>
         <translation>Muistiinpanot:</translation>
     </message>
@@ -2986,67 +3075,72 @@ GPS location:</source>
 <context>
     <name>DiveDetailsView</name>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="228"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="36"/>
+        <source>&lt;unnamed dive site&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="61"/>
+        <source>Map it</source>
+        <translation>Kartalle</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="115"/>
+        <source>Rating:</source>
+        <translation>Yleisarvio:</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="163"/>
+        <source>Visibility:</source>
+        <translation>Näkyvyys:</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="310"/>
         <source>No profile to show</source>
         <translation>Ei näytettävää graafia</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="234"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="316"/>
         <source>Suit:</source>
         <translation>Puku:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="240"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="323"/>
         <source>Air Temp:</source>
         <translation>Ilman lämpötila:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="284"/>
-        <source>Cylinder:</source>
-        <translation>Säiliö:</translation>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="246"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="330"/>
         <source>Water Temp:</source>
         <translation>Veden lämpötila:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="63"/>
-        <source>Map it</source>
-        <translation>Kartalle</translation>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="372"/>
+        <source>Cylinder:</source>
+        <translation>Säiliö:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="112"/>
-        <source>Rating:</source>
-        <translation>Yleisarvio:</translation>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="380"/>
+        <source>Weight:</source>
+        <translation>Massa:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="155"/>
-        <source>Visibility:</source>
-        <translation>Näkyvyys:</translation>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="388"/>
+        <source>SAC:</source>
+        <translation>Pintakulutus:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="337"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="431"/>
         <source>Divemaster:</source>
         <translation>Divemaster:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="291"/>
-        <source>Weight:</source>
-        <translation>Massa:</translation>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="344"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="439"/>
         <source>Buddy:</source>
         <translation>Sukelluspari:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="298"/>
-        <source>SAC:</source>
-        <translation>Pintakulutus:</translation>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="380"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="478"/>
         <source>Notes</source>
         <translation>Muistiinpanot</translation>
     </message>
@@ -3054,38 +3148,38 @@ GPS location:</source>
 <context>
     <name>DiveEventItem</name>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="186"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="187"/>
         <source> (cyl. %1)</source>
         <translation> (säiliö %1)</translation>
     </message>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="190"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="191"/>
         <source>ICD</source>
         <translation>ICD</translation>
     </message>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="191"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="192"/>
         <source>ΔHe</source>
         <translation>ΔHe</translation>
     </message>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="192"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="193"/>
         <source>ΔN₂</source>
         <translation>ΔN₂</translation>
     </message>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="213"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="214"/>
         <source>Manual switch to OC</source>
         <translation>Vaihto avoimeen kiertoon</translation>
     </message>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="215"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="216"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
         <translation>alku</translation>
     </message>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="216"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="217"/>
         <source> end</source>
         <comment>Starts with space!</comment>
         <translation>loppu</translation>
@@ -3094,27 +3188,27 @@ GPS location:</source>
 <context>
     <name>DiveImportedModel</name>
     <message>
-        <location filename="../qt-models/diveimportedmodel.cpp" line="37"/>
+        <location filename="../qt-models/diveimportedmodel.cpp" line="38"/>
         <source>Date/time</source>
         <translation>Päivä/aika</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveimportedmodel.cpp" line="39"/>
+        <location filename="../qt-models/diveimportedmodel.cpp" line="40"/>
         <source>Duration</source>
         <translation>Kesto</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveimportedmodel.cpp" line="41"/>
+        <location filename="../qt-models/diveimportedmodel.cpp" line="42"/>
         <source>Depth</source>
         <translation>Syvyys</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveimportedmodel.cpp" line="71"/>
+        <location filename="../qt-models/diveimportedmodel.cpp" line="72"/>
         <source>h</source>
         <translation>t</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveimportedmodel.cpp" line="71"/>
+        <location filename="../qt-models/diveimportedmodel.cpp" line="72"/>
         <source>min</source>
         <translation>min</translation>
     </message>
@@ -3123,186 +3217,203 @@ GPS location:</source>
     <name>DiveList</name>
     <message>
         <location filename="../mobile-widgets/qml/DiveList.qml" line="13"/>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="422"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="322"/>
         <source>Dive list</source>
         <translation>Sukelluslista</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="428"/>
-        <source>Cloud credentials</source>
-        <translation>Pilvipalvelun tunnus</translation>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="188"/>
+        <source>&lt;unnamed dive site&gt;</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="445"/>
-        <source>Please wait, filtering dive list</source>
-        <translation>Odota, suodatetaan sukelluslistaa</translation>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="252"/>
+        <source>Remove dive %1 from trip</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="560"/>
-        <source>Download dives</source>
-        <translation>Lataa sukellukset</translation>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="260"/>
+        <source>Add dive %1 to trip above</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="570"/>
-        <source>Add dive</source>
-        <translation>Lisää sukellus</translation>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="268"/>
+        <source>Add dive %1 to trip below</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="580"/>
-        <source>Filter dives</source>
-        <translation>Suodata sukellukset</translation>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="276"/>
+        <source>Delete dive</source>
+        <translation>Poista sukellus</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="424"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="282"/>
+        <source>Show on map</source>
+        <translation>Näytä kartalla</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="291"/>
+        <source>Edit trip details</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="303"/>
+        <source>Undo</source>
+        <translation>Peruuta</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="309"/>
+        <source>Redo</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="324"/>
         <source>Please tap the &apos;+&apos; button to add a dive (or download dives from a supported dive computer)</source>
         <translation>Käytä &apos;+&apos; -painiketta lisätäksesi sukelluksen (tai ladataksesi sukellukset tuetulta sukellustietokoneelta)</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="445"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="330"/>
+        <source>Cloud credentials</source>
+        <translation>Pilvipalvelun tunnus</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="338"/>
         <source>No dives in dive list</source>
         <translation>Ei sukelluksia lokissa</translation>
     </message>
-</context>
-<context>
-    <name>DiveListSortModel</name>
-    <message numerus="yes">
-        <location filename="../qt-models/divelistmodel.cpp" line="108"/>
-        <source>(%n dive(s))</source>
-        <translation><numerusform>(%n sukellus)</numerusform><numerusform>(%n sukelluksia)</numerusform></translation>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="338"/>
+        <source>Please wait, updating the dive list</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divelistmodel.cpp" line="110"/>
-        <source>(%L1 shown)</source>
-        <translation>(näytetään %L1)</translation>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="381"/>
+        <source>Fulltext</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="382"/>
+        <source>People</source>
+        <translation>Ihmiset</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="383"/>
+        <source>Tags</source>
+        <translation>Avainsanat</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="443"/>
+        <source>Download dives</source>
+        <translation>Lataa sukellukset</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="453"/>
+        <source>Add dive</source>
+        <translation>Lisää sukellus</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="463"/>
+        <source>Filter dives</source>
+        <translation>Suodata sukellukset</translation>
     </message>
 </context>
 <context>
     <name>DiveListView</name>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="911"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="900"/>
         <source>Expand all</source>
         <translation>Laajenna kaikki retket</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="913"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="902"/>
         <source>Collapse all</source>
         <translation>Supista kaikki retket</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="917"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="906"/>
         <source>Collapse others</source>
         <translation>Tiivistä muut</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="921"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="910"/>
         <source>Remove dive(s) from trip</source>
         <translation>Erota sukellukset retkestä</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="922"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="911"/>
         <source>Create new trip above</source>
         <translation>Liitä uuteen retkeen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="937"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="926"/>
         <source>Add dive(s) to trip immediately above</source>
         <translation>Lisää sukellukset yläpuoliseen retkeen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="939"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="928"/>
         <source>Add dive(s) to trip immediately below</source>
         <translation>Lisää sukellukset alapuoliseen retkeen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="943"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="932"/>
         <source>Merge trip with trip above</source>
         <translation>Liitä retki yllä olevaan retkeen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="944"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="933"/>
         <source>Merge trip with trip below</source>
         <translation>Liitä retki alla olevaan retkeen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="948"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="937"/>
         <source>Delete dive(s)</source>
         <translation>Poista sukellukset</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="950"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="939"/>
         <source>Mark dive(s) invalid</source>
         <translation>Merkitse sukellukset epäkelvoiksi</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="954"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="943"/>
         <source>Merge selected dives</source>
         <translation>Yhdistä valitut sukellukset</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="956"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="945"/>
         <source>Renumber dive(s)</source>
         <translation>Numeroi uudelleen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="957"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="946"/>
         <source>Shift dive times</source>
         <translation>Muuta sukellusaikoja</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="958"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="947"/>
         <source>Split selected dives</source>
         <translation>Jaa valitut sukellukset</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="959"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="948"/>
         <source>Load media from file(s)</source>
         <translation>Lataa mediaa tiedostoista</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="960"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="949"/>
         <source>Load media from web</source>
         <translation>Lataa mediaa webistä</translation>
     </message>
-    <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="986"/>
-        <source>Open media files</source>
-        <translation>Avaa mediatiedostoja</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="989"/>
-        <source>Media files</source>
-        <translation>Mediatiedostot</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="990"/>
-        <source>Image files</source>
-        <translation>Kuvatiedostot</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="991"/>
-        <source>Video files</source>
-        <translation>Viedeotiedostot</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="992"/>
-        <source>All files</source>
-        <translation>Kaikki tiedostot</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="1041"/>
-        <source>%1 does not appear to be an image</source>
-        <translation>%1 ei vaikuta kuvalta</translation>
-    </message>
 </context>
 <context>
     <name>DiveLocationModel</name>
     <message>
-        <location filename="../desktop-widgets/locationinformation.cpp" line="327"/>
+        <location filename="../desktop-widgets/locationinformation.cpp" line="394"/>
         <source>Create a new dive site, copying relevant information from the current dive.</source>
         <translation>Luo uusi sukelluskohde ja kopioi oleelliset tiedot valitusta sukelluskohteesta</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/locationinformation.cpp" line="328"/>
+        <location filename="../desktop-widgets/locationinformation.cpp" line="395"/>
         <source>Create a new dive site with this name</source>
         <translation>Luo uusi sukelluskohde tälle nimelle</translation>
     </message>
@@ -3322,6 +3433,50 @@ GPS location:</source>
         <translation>Yleiset vientimuodot</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="108"/>
+        <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="384"/>
+        <source>Selection</source>
+        <translation>Valinta</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="117"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="412"/>
+        <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="385"/>
+        <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="395"/>
+        <source>Selected dives</source>
+        <translation>Valitut sukellukset</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="127"/>
+        <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="386"/>
+        <source>All dives</source>
+        <translation>Kaikki sukellukset</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="140"/>
+        <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="387"/>
+        <source>Options</source>
+        <translation>Asetukset</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="156"/>
+        <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="388"/>
+        <source>Metric</source>
+        <translation>Metrinen</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="161"/>
+        <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="389"/>
+        <source>Imperial</source>
+        <translation>Brittiläinen</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="175"/>
+        <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="391"/>
+        <source>Anonymize</source>
+        <translation>Anonymisoi</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="186"/>
         <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="374"/>
         <source>Export format</source>
@@ -3334,6 +3489,11 @@ GPS location:</source>
         <translation>Subsurface &amp;XML</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="211"/>
+        <source>Subsurface dive sites XML</source>
+        <translation>Subsurfacen sukelluskohde XML</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="227"/>
         <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="376"/>
         <source>UDDF</source>
@@ -3364,6 +3524,11 @@ GPS location:</source>
         <translation>CSV sukelluksen tiedot</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="280"/>
+        <source>Dive profile</source>
+        <translation>Sukellusprofiili</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="290"/>
         <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="381"/>
         <source>Worldmap</source>
@@ -3376,71 +3541,17 @@ GPS location:</source>
         <translation>TeX</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="310"/>
+        <source>LaTeX</source>
+        <translation>LaTeX</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="320"/>
         <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="383"/>
         <source>I&amp;mage depths</source>
         <translation>Kuvien syvyydet</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="108"/>
-        <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="384"/>
-        <source>Selection</source>
-        <translation>Valinta</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="117"/>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="412"/>
-        <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="385"/>
-        <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="395"/>
-        <source>Selected dives</source>
-        <translation>Valitut sukellukset</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="127"/>
-        <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="386"/>
-        <source>All dives</source>
-        <translation>Kaikki sukellukset</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="140"/>
-        <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="387"/>
-        <source>Options</source>
-        <translation>Asetukset</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="156"/>
-        <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="388"/>
-        <source>Metric</source>
-        <translation>Metrinen</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="161"/>
-        <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="389"/>
-        <source>Imperial</source>
-        <translation>Brittiläinen</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="175"/>
-        <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="391"/>
-        <source>Anonymize</source>
-        <translation>Anonymisoi</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="211"/>
-        <source>Subsurface dive sites XML</source>
-        <translation>Subsurfacen sukelluskohde XML</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="280"/>
-        <source>Dive profile</source>
-        <translation>Sukellusprofiili</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="310"/>
-        <source>LaTeX</source>
-        <translation>LaTeX</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="330"/>
         <source>Profile Data CSV</source>
         <translation>Profiilidata CSV</translation>
@@ -3555,7 +3666,7 @@ GPS location:</source>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="559"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="113"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="116"/>
         <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="412"/>
         <source>Light</source>
         <translation>Vaalea</translation>
@@ -3567,160 +3678,154 @@ GPS location:</source>
         <translation>Hiekka</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="82"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="85"/>
         <source>Generic format that is used for data exchange between a variety of diving related programs.</source>
         <translation>Yleinen tiedostomuoto, jota käytetään sukelluslokien siirtämisessä eri sukellusohjelmistojen välillä.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="84"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="87"/>
         <source>Comma separated values describing the dive profile.</source>
         <translation>Pilkulla erotettu lista, joka kuvaa sukelluksen syvyysprofiilin.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="86"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="89"/>
         <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source>
         <translation>Pilkuilla erotettu lista sukelluksen tiedoista. Tässä on mukana suurin osa tiedoista, mutta ei sukellusprofiilia.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="88"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="91"/>
         <source>Send the dive data to divelogs.de website.</source>
         <translation>Lähetä sukellustiedot divelogs.de -verkkopalveluun.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="90"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="93"/>
         <source>Send the dive data to dive-share.appspot.com website.</source>
         <translation>Lähetä sukellusloki dive-share.appspot.com -web-sivustolle.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="92"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="95"/>
         <source>HTML export of the dive locations, visualized on a world map.</source>
         <translation>Tallenna sukelluskohteet HTML -tiedostoon, joka näyttää sijainnit maailmankartalla.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="94"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="97"/>
         <source>Subsurface native XML format.</source>
         <translation>Subsurfacen oma XML -tiedostomuoto.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="96"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="99"/>
         <source>Subsurface dive sites native XML format.</source>
         <translation>Subsurfacen sukelluskohteet omassa XML-muodossa.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="98"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="101"/>
         <source>Write depths of images to file.</source>
         <translation>Tallenna kuvien syvyydet tiedostoon.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="100"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="103"/>
         <source>Write dive as TeX macros to file.</source>
         <translation>Tallenna sukellus tiedostoon TeX -makroina.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="102"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="105"/>
         <source>Write dive as LaTeX macros to file.</source>
         <translation>Tallenna sukellus tiedostoon LaTeX -makroina.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="104"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="107"/>
         <source>Write the profile image as PNG file.</source>
         <translation>Tallenna sukellusprofiili PNG-kuvana.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="106"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="109"/>
         <source>Write profile data to a CSV file.</source>
         <translation>Tallenna sukellusprofiilin tiedot CSV-tiedostoon.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="144"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="147"/>
         <source>Export UDDF file as</source>
         <translation>Vienti UDDF -tiedostoon</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="145"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="148"/>
         <source>UDDF files</source>
         <translation>UDDF-tiedostot</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="149"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="153"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="151"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="155"/>
+        <source>Export CSV file as</source>
+        <translation>Vienti CSV -tiedostoon</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="152"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="156"/>
         <source>CSV files</source>
         <translation>CSV-tiedostot</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="160"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="201"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="162"/>
+        <source>Export world map</source>
+        <translation>Vie maailmankartta</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="163"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="205"/>
         <source>HTML files</source>
         <translation>HTML-tiedostot</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="165"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="174"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="167"/>
+        <source>Export Subsurface XML</source>
+        <translation>Vie Subsurface XML</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="168"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="177"/>
         <source>Subsurface files</source>
         <translation>Subsurfacen tiedostot</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="173"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="176"/>
         <source>Export Subsurface dive sites XML</source>
         <translation>Vie Subsurfacen sukelluskohteet XML-tiedostoon</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.cpp" line="186"/>
-        <source>TeX files</source>
-        <translation>TeX-tiedostot</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="148"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="152"/>
-        <source>Export CSV file as</source>
-        <translation>Vienti CSV -tiedostoon</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="159"/>
-        <source>Export world map</source>
-        <translation>Vie maailmankartta</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="164"/>
-        <source>Export Subsurface XML</source>
-        <translation>Vie Subsurface XML</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="182"/>
         <source>Save image depths</source>
         <translation>Tallenna kuvien syvyydet</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="186"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="190"/>
         <source>Export to TeX file</source>
         <translation>Vie TeX -tiedostoon</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.cpp" line="190"/>
+        <source>TeX files</source>
+        <translation>TeX-tiedostot</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="194"/>
         <source>Save profile image</source>
         <translation>Tallenna profiilin kuva</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="194"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="198"/>
         <source>Save profile data</source>
         <translation>Tallenna profiilin tiedot</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="200"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="204"/>
         <source>Export HTML files as</source>
         <translation>Vie HTML -tiedostoihin</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="214"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="219"/>
         <source>Please wait, exporting...</source>
         <translation>Odota, vienti kesken...</translation>
     </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="249"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="482"/>
-        <source>Can&apos;t open file %s</source>
-        <translation>Tiedoston avaus ei onnistu %s</translation>
-    </message>
 </context>
 <context>
     <name>DiveLogImportDialog</name>
@@ -4049,10 +4154,10 @@ GPS location:</source>
         <translation>Ilmanpaine</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.ui" line="166"/>
-        <location filename="../subsurface/desktop-widgets/ui_diveplanner.h" line="206"/>
-        <source>mbar</source>
-        <translation>mbar</translation>
+        <location filename="../desktop-widgets/diveplanner.ui" line="131"/>
+        <location filename="../subsurface/desktop-widgets/ui_diveplanner.h" line="204"/>
+        <source>Water type</source>
+        <translation>Vesityyppi</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/diveplanner.ui" line="144"/>
@@ -4061,10 +4166,10 @@ GPS location:</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.ui" line="131"/>
-        <location filename="../subsurface/desktop-widgets/ui_diveplanner.h" line="204"/>
-        <source>Water type</source>
-        <translation>Vesityyppi</translation>
+        <location filename="../desktop-widgets/diveplanner.ui" line="166"/>
+        <location filename="../subsurface/desktop-widgets/ui_diveplanner.h" line="206"/>
+        <source>mbar</source>
+        <translation>mbar</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/diveplanner.ui" line="180"/>
@@ -4098,97 +4203,386 @@ GPS location:</source>
     </message>
 </context>
 <context>
+    <name>DivePlannerEdit</name>
+    <message>
+        <location filename="../mobile-widgets/qml/DivePlannerEdit.qml" line="11"/>
+        <source>Dive planner edit</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DivePlannerManager</name>
+    <message>
+        <location filename="../mobile-widgets/qml/DivePlannerManager.qml" line="11"/>
+        <source>Dive planner manager</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="171"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="180"/>
         <source>unknown</source>
         <translation>tuntematon</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="272"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="280"/>
         <source>cyl.</source>
         <translation>säiliö</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="378"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="386"/>
         <source>Final depth</source>
         <translation>Lopullinen syvyys</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="380"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="388"/>
         <source>Run time</source>
         <translation>Kesto</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="382"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="390"/>
         <source>Duration</source>
         <translation>Kesto</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="384"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="392"/>
         <source>Used gas</source>
         <translation>Käytetty kaasuseos</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="386"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="394"/>
         <source>CC setpoint</source>
         <translation>CC -asetuspiste</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="388"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="396"/>
         <source>Dive mode</source>
         <translation>Sukellustyyppi</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="1026"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="1083"/>
         <source>min</source>
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="1032"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="1089"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="1035"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="1092"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="1082"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="1139"/>
         <source>Stop times</source>
         <translation>Pysähdysajat</translation>
     </message>
 </context>
 <context>
+    <name>DivePlannerSetup</name>
+    <message>
+        <location filename="../mobile-widgets/qml/DivePlannerSetup.qml" line="11"/>
+        <source>Dive planner setup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DivePlannerSetup.qml" line="13"/>
+        <source> m/min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DivePlannerSetup.qml" line="13"/>
+        <source> ft/min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DivePlannerSetup.qml" line="14"/>
+        <source> l/min</source>
+        <translation>l/min</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DivePlannerSetup.qml" line="14"/>
+        <source> cuft/min</source>
+        <translation>jalkaa/min</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DivePlannerSetup.qml" line="15"/>
+        <source> BAR</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DivePlannerSetup.qml" line="15"/>
+        <source> PSI</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DivePlannerSetup.qml" line="40"/>
+        <source>Rates</source>
+        <translation>Arviot</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DivePlannerSetup.qml" line="50"/>
+        <source>Ascent</source>
+        <translation>Nousu</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DivePlannerSetup.qml" line="54"/>
+        <source>below 75% avg. depth</source>
+        <translation>Alle 75% keskisyvyydestä</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DivePlannerSetup.qml" line="70"/>
+        <source>75% to 50% avg. depth</source>
+        <translation>75%-50% keskisyvyydestä</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DivePlannerSetup.qml" line="86"/>
+        <source>50% avg. depth to 6m</source>
+        <translation>50% keskisyvyydestä - 6m</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DivePlannerSetup.qml" line="102"/>
+        <source>6m to surface</source>
+        <translation>6m:stä pintaan</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DivePlannerSetup.qml" line="119"/>
+        <source>Descent</source>
+        <translation>Laskeutuminen</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DivePlannerSetup.qml" line="123"/>
+        <source>Surface to the bottom</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DivePlannerSetup.qml" line="140"/>
+        <source>Drop to first depth</source>
+        <translation>Putoaminen alkusyvyyteen</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DivePlannerSetup.qml" line="150"/>
+        <source>Planning</source>
+        <translation>Suunnittelu</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DivePlannerSetup.qml" line="159"/>
+        <source>Dive mode</source>
+        <translation>Sukellustyyppi</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DivePlannerSetup.qml" line="165"/>
+        <source>Open circuit</source>
+        <translation>Avoin kierto</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DivePlannerSetup.qml" line="166"/>
+        <source>CCR</source>
+        <translation>CCR</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DivePlannerSetup.qml" line="167"/>
+        <source>pSCR</source>
+        <translation>pSCR</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DivePlannerSetup.qml" line="174"/>
+        <source>Bailout: Deco on OC</source>
+        <translation>Bailout: Deco OC:lla</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DivePlannerSetup.qml" line="180"/>
+        <source>Recreational mode</source>
+        <translation>Harrastemoodi</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DivePlannerSetup.qml" line="189"/>
+        <source>Reserve gas</source>
+        <translation>Varakaasu</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DivePlannerSetup.qml" line="207"/>
+        <source>Safety stop</source>
+        <translation>Turvapysähdys</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DivePlannerSetup.qml" line="217"/>
+        <source>Bühlmann deco</source>
+        <translation>Bühlmann deko</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DivePlannerSetup.qml" line="226"/>
+        <source>GFLow</source>
+        <translation>GFLow</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DivePlannerSetup.qml" line="243"/>
+        <source>GFHigh</source>
+        <translation>GFHigh</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DivePlannerSetup.qml" line="260"/>
+        <source>VPM-B deco</source>
+        <translation>VPM-B deko</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DivePlannerSetup.qml" line="269"/>
+        <source>Conservatism level</source>
+        <translation>Konservatismi</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DivePlannerSetup.qml" line="278"/>
+        <location filename="../mobile-widgets/qml/DivePlannerSetup.qml" line="317"/>
+        <location filename="../mobile-widgets/qml/DivePlannerSetup.qml" line="333"/>
+        <source>+</source>
+        <translation>+</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DivePlannerSetup.qml" line="286"/>
+        <source>Last stop at ??</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DivePlannerSetup.qml" line="291"/>
+        <source>Plan backgas breaks</source>
+        <translation>Suunnittele ilmatauot</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DivePlannerSetup.qml" line="300"/>
+        <source>Only switch at required stops</source>
+        <translation>Vaihda seosta vain tarvittavilla pysähdyksillä</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DivePlannerSetup.qml" line="309"/>
+        <source>Min switch time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DivePlannerSetup.qml" line="325"/>
+        <source>Surface segment</source>
+        <translation>Pintaosuus</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DivePlannerSetup.qml" line="343"/>
+        <source>Gas options</source>
+        <translation>Kaasuasetukset</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DivePlannerSetup.qml" line="352"/>
+        <source>Bottom SAC</source>
+        <translation>Ilmankulutus pohjalla</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DivePlannerSetup.qml" line="370"/>
+        <source>Deco SAC</source>
+        <translation>Ilmankulutus (deko)</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DivePlannerSetup.qml" line="388"/>
+        <source>SAC factor</source>
+        <translation>SAC -kerroin</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DivePlannerSetup.qml" line="403"/>
+        <source>Problem solving time</source>
+        <translation>Ongelmanratkaisuaika</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DivePlannerSetup.qml" line="411"/>
+        <source> min</source>
+        <translation> min</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DivePlannerSetup.qml" line="418"/>
+        <source>Bottom pO2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DivePlannerSetup.qml" line="433"/>
+        <source>Deco pO2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DivePlannerSetup.qml" line="448"/>
+        <source>Best mix END</source>
+        <translation>Paras seos END</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DivePlannerSetup.qml" line="464"/>
+        <source>O2 narcotic</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DivePlannerSetup.qml" line="474"/>
+        <source>Notes</source>
+        <translation>Muistiinpanot</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DivePlannerSetup.qml" line="480"/>
+        <source>Display runtime</source>
+        <translation>Näytä sukellusaika</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DivePlannerSetup.qml" line="487"/>
+        <source>Display segment duration</source>
+        <translation>Näytä etappien kestot</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DivePlannerSetup.qml" line="494"/>
+        <source>Display transitions in deco</source>
+        <translation>Näytä siirtymät dekossa</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DivePlannerSetup.qml" line="501"/>
+        <source>Verbatim dive plan</source>
+        <translation>Tarkka sukellussuunnitelma</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DivePlannerSetup.qml" line="508"/>
+        <source>Display plan variations</source>
+        <translation>Näytä vaihtoehtoisia suunnitelmia</translation>
+    </message>
+</context>
+<context>
+    <name>DivePlannerView</name>
+    <message>
+        <location filename="../mobile-widgets/qml/DivePlannerView.qml" line="11"/>
+        <source>Dive planner view</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="115"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="117"/>
         <source>Dive planner points</source>
         <translation>Sukellussuunnitelman etappipisteet</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="120"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="123"/>
         <source>Available gases</source>
         <translation>Mahdolliset kaasut</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="121"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="124"/>
         <source>Add cylinder</source>
         <translation>Lisää säiliö</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="153"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="154"/>
         <source>Add dive data point</source>
         <translation>Lisää sukellusetappi</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="163"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="164"/>
         <source>Save new</source>
         <translation>Tallenna uusi</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="268"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="269"/>
         <source>kg/ℓ</source>
         <translation>kg/ℓ</translation>
     </message>
@@ -4196,107 +4590,107 @@ GPS location:</source>
 <context>
     <name>DivePlotDataModel</name>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="114"/>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="119"/>
         <source>Depth</source>
         <translation>Syvyys</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="116"/>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="121"/>
         <source>Time</source>
         <translation>Kello</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="118"/>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="123"/>
         <source>Pressure</source>
         <translation>Paine</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="120"/>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="125"/>
         <source>Temperature</source>
         <translation>Lämpötila</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="122"/>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="127"/>
         <source>Color</source>
         <translation>Väri</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="124"/>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="129"/>
         <source>User entered</source>
         <translation>Käyttäjän syöttämä</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="126"/>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="131"/>
         <source>Pressure S</source>
         <translation>Sensoripaine</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="128"/>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="133"/>
         <source>Pressure I</source>
         <translation>Arvioitu paine</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="130"/>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="135"/>
         <source>Ceiling</source>
         <translation>Katto</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="132"/>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="137"/>
         <source>SAC</source>
         <translation>Pintakulutus</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="134"/>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="139"/>
         <source>pN₂</source>
         <translation>pN₂</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="136"/>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="141"/>
         <source>pHe</source>
         <translation>pHe</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="138"/>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="143"/>
         <source>pO₂</source>
         <translation>pO₂</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="140"/>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="145"/>
         <source>Setpoint</source>
         <translation>Setpoint</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="142"/>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="147"/>
         <source>Sensor 1</source>
         <translation>Sensori 1</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="144"/>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="149"/>
         <source>Sensor 2</source>
         <translation>Sensori 2</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="146"/>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="151"/>
         <source>Sensor 3</source>
         <translation>Sensori 3</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="148"/>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="153"/>
         <source>Ambient pressure</source>
         <translation>Ympäröivä paine</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="150"/>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="155"/>
         <source>Heart rate</source>
         <translation>Syke</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="152"/>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="157"/>
         <source>Gradient factor</source>
         <translation>Gradient Factor</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="154"/>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="159"/>
         <source>Mean depth @ s</source>
         <translation>Keskisyvyys @ s</translation>
     </message>
@@ -4367,204 +4761,329 @@ p, li { white-space: pre-wrap; }
     </message>
 </context>
 <context>
-    <name>DiveSiteSortedModel</name>
+    <name>DiveSummary</name>
     <message>
-        <location filename="../qt-models/divelocationmodel.cpp" line="271"/>
-        <source>Delete dive site?</source>
-        <translation>Poistetaanko sukelluskohde?</translation>
+        <location filename="../mobile-widgets/qml/DiveSummary.qml" line="18"/>
+        <source>Dive summary</source>
+        <translation type="unfinished"/>
     </message>
-    <message numerus="yes">
-        <location filename="../qt-models/divelocationmodel.cpp" line="272"/>
-        <source>This dive site has %n dive(s). Do you really want to delete it?
-</source>
-        <translation><numerusform>Tässä sukelluskohteessa on %n sukellus. Haluatko varmasti poistaa sen?
-</numerusform><numerusform>Tässä sukelluskohteessa on %n sukellusta. Haluatko varmasti poistaan sen?
-</numerusform></translation>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveSummary.qml" line="51"/>
+        <source>All</source>
+        <translation>Kaikki</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveSummary.qml" line="52"/>
+        <source>1 month</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveSummary.qml" line="53"/>
+        <source>3 months</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveSummary.qml" line="54"/>
+        <source>6 months</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveSummary.qml" line="55"/>
+        <source>1 year</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveSummary.qml" line="59"/>
+        <source>last dive:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveSummary.qml" line="69"/>
+        <source>first dive:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveSummary.qml" line="85"/>
+        <source>Refresh</source>
+        <translation>Päivitä</translation>
+    </message>
+</context>
+<context>
+    <name>DiveSummaryModel</name>
+    <message>
+        <location filename="../qt-models/divesummarymodel.cpp" line="67"/>
+        <source>Number of dives</source>
+        <translation>Sukellusmäärä</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divesummarymodel.cpp" line="68"/>
+        <source>Time</source>
+        <translation>Kello</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divesummarymodel.cpp" line="69"/>
+        <source>Depth</source>
+        <translation>Syvyys</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divesummarymodel.cpp" line="70"/>
+        <source>SAC</source>
+        <translation>Pintakulutus</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divesummarymodel.cpp" line="85"/>
+        <source>Total</source>
+        <translation>Yhteensä</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divesummarymodel.cpp" line="86"/>
+        <source>EAN dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/divesummarymodel.cpp" line="87"/>
+        <source>Deep dives (&gt; 39 m)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/divesummarymodel.cpp" line="88"/>
+        <source>Dive plan(s)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/divesummarymodel.cpp" line="89"/>
+        <source>Total time</source>
+        <translation>Kokonaisaika</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divesummarymodel.cpp" line="90"/>
+        <source>Max Time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/divesummarymodel.cpp" line="91"/>
+        <source>Avg time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/divesummarymodel.cpp" line="92"/>
+        <source>Max depth</source>
+        <translation>Suurin syvyys</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divesummarymodel.cpp" line="93"/>
+        <source>Avg max depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/divesummarymodel.cpp" line="94"/>
+        <source>Min SAC</source>
+        <translation>Pienin pintakulutus</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divesummarymodel.cpp" line="95"/>
+        <source>Max SAC</source>
+        <translation>Suurin pintakulutus</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divesummarymodel.cpp" line="96"/>
+        <source>Avg SAC</source>
+        <translation>Pintakulutus</translation>
     </message>
 </context>
 <context>
     <name>DiveTripModelBase</name>
+    <message numerus="yes">
+        <location filename="../qt-models/divetripmodel.cpp" line="74"/>
+        <source>(%n dive(s))</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="66"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="76"/>
+        <source>(%L1 shown)</source>
+        <translation>(näytetään %L1)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="121"/>
         <source>(%1 shown)</source>
         <translation> (näytetään %1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="207"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="274"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="314"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="307"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="376"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="416"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="209"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="276"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="316"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="309"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="378"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="418"/>
         <source>Date</source>
         <translation>Ajankohta</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="211"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="278"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="318"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="311"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="380"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="420"/>
         <source>Rating</source>
         <translation>Yleisarvio</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="213"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="320"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="313"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="422"/>
         <source>Depth(%1)</source>
         <translation>Syvyys(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="213"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="320"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="313"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="422"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="213"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="320"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="313"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="422"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="215"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="282"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="322"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="315"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="384"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="424"/>
         <source>Duration</source>
         <translation>Kesto</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="217"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="324"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="317"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="426"/>
         <source>Temp.(°%1)</source>
         <translation>Lämpö (°%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="219"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="326"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="319"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="428"/>
         <source>Weight(%1)</source>
         <translation>Massa(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="219"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="326"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="319"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="428"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="219"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="326"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="319"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="428"/>
         <source>lbs</source>
         <translation>pauna</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="288"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="328"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="321"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="390"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="430"/>
         <source>Suit</source>
         <translation>Puku</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="223"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="290"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="330"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="323"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="392"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="432"/>
         <source>Cylinder</source>
         <translation>Säiliö</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="225"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="292"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="332"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="325"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="394"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="434"/>
         <source>Gas</source>
         <translation>Kaasu</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="229"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="336"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="329"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="438"/>
         <source>SAC(%1)</source>
         <translation>Pintakulutus(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="229"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="336"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="329"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="438"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="231"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="296"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="338"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="331"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="398"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="440"/>
         <source>OTU</source>
         <translation>Happikertymä (OTU)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="233"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="333"/>
         <source>Max. CNS</source>
         <translation>Max. CNS</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="235"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="300"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="342"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="335"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="402"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="444"/>
         <source>Tags</source>
         <translation>Avainsanat</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="237"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="344"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="337"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="446"/>
         <source>Media before/during/after dive</source>
         <translation>Kuvat/videot sukelluksen yhteydessä</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="239"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="304"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="339"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="406"/>
         <source>Country</source>
         <translation>Maa</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="241"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="306"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="346"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="341"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="408"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="448"/>
         <source>Buddy</source>
         <translation>Sukelluspari</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="243"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="308"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="348"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="343"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="410"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
         <source>Location</source>
         <translation>Kohde</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="280"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="382"/>
         <source>Depth</source>
         <translation>Syvyys</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="284"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="386"/>
         <source>Temp.</source>
         <translation>Lämpö</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="286"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="388"/>
         <source>Weight</source>
         <translation>Painot</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="294"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="396"/>
         <source>SAC</source>
         <translation>Pintakulutus</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="298"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="340"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="400"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="442"/>
         <source>Max CNS</source>
         <translation>Max CNS</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="302"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="404"/>
         <source>Media</source>
         <translation>Media</translation>
     </message>
@@ -4572,110 +5091,59 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>DivelogsDeWebServices</name>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="241"/>
-        <source>internal error</source>
-        <translation>sisäinen virhe</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="249"/>
-        <source>Conversion of dive %1 to divelogs.de format failed</source>
-        <translation>Sukelluksen %1 muuntaminen divelogs.de:n muotoon epäonnistui</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="277"/>
-        <source>error writing zip file: %s zip error %d system error %d - %s</source>
-        <translation>virhe zip -tiedoston kirjoittamisessa: %s zip virhe %d järjestelmävirhe %d - %s</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="526"/>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="717"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="250"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="415"/>
         <source>Done</source>
         <translation>Valmis</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="560"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="273"/>
         <source>Uploading dive list...</source>
         <translation>Lähetetään sukelluslokia...</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="592"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="293"/>
         <source>Downloading dive list...</source>
         <translation>Ladataan sukelluslokia...</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="633"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="334"/>
         <source>Downloading %1 dives...</source>
         <translation>Ladataan %1 sukellusta...</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="667"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="368"/>
         <source>Download finished - %1</source>
         <translation>Lataus päättynyt - %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="681"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="382"/>
         <source>Problem with download</source>
         <translation>Virhe latauksessa</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="691"/>
-        <source>Corrupted download</source>
-        <translation>Lataus on korruptoitunut</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="682"/>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="692"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="383"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="393"/>
         <source>The archive could not be opened:
 %1</source>
         <translation>Pakattua tiedostoa ei voitu avata:
 %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="160"/>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="491"/>
-        <source>No dives were selected</source>
-        <translation>Ei valittuja sukelluksia</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="170"/>
-        <source>Stylesheet to export to divelogs.de is not found</source>
-        <translation>Tyylitiedostoa divelogs.de:hen vientiin ei löytynyt</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="180"/>
-        <source>Failed to create zip file for upload: %s</source>
-        <translation>ZIP -tiedoston luonti vientiä varten epäonnistui: %s</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="718"/>
-        <source>Upload finished</source>
-        <translation>Lähetys valmistui</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="731"/>
-        <source>Upload failed</source>
-        <translation>Lähetys epäonnistui</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="734"/>
-        <source>Upload successful</source>
-        <translation>Lähetys onnistui</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="737"/>
-        <source>Login failed</source>
-        <translation>Kirjautuminen epäonnistui</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="740"/>
-        <source>Cannot parse response</source>
-        <translation>Vastauksen jäsentäminen ei onnistu!</translation>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="392"/>
+        <source>Corrupted download</source>
+        <translation>Lataus on korruptoitunut</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="751"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="426"/>
         <source>Error: %1</source>
         <translation>Virhe: %1</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="435"/>
+        <source>Transferring data...</source>
+        <translation>Tietoa siirretään...</translation>
+    </message>
 </context>
 <context>
     <name>DivesiteImportDialog</name>
@@ -4738,76 +5206,76 @@ Olemassaoleva kohde</translation>
 <context>
     <name>DownloadFromDCWidget</name>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="85"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="86"/>
         <source>Download</source>
         <translation>Lataa</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="89"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="90"/>
         <source>Choose Bluetooth download mode</source>
         <translation>Valitse latausmoodi Bluetoothille</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="177"/>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="180"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="202"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="205"/>
         <source>Connecting to dive computer</source>
         <translation>Muodostetaan yhteyttä sukellustietokoneeseen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="275"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="300"/>
         <source>Error</source>
         <translation>Virhe</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="324"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="349"/>
         <source>Find Uemis dive computer</source>
         <translation>Etsi Uemis -sukellustietokone</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="324"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="349"/>
         <source>Find Garmin dive computer</source>
         <translation>Etsi Garmin -sukellustietokone</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="351"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="375"/>
         <source>Cancel download</source>
         <translation>Peruuta lataus</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="430"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="454"/>
         <source>Choose file for dive computer download logfile</source>
         <translation>Valitse lokitiedosto sukellustietokoneen tietojen tallennukseen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="431"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="455"/>
         <source>Log files</source>
         <translation>Lokitiedostot</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="456"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="468"/>
+        <source>Warning</source>
+        <translation>Varoitus</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="469"/>
+        <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source>
+        <translation>Kun sukellustietokoneen latauksesta tallennetaan raakatiedosto, sukelluksia EI tallenneta sukelluslistaan.</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="480"/>
         <source>Choose file for dive computer binary dump file</source>
         <translation>Valitse tiedosto sukellustietokoneen muistin tallennukseen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="457"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="481"/>
         <source>Dump files</source>
         <translation>Raakatiedostot</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="485"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="509"/>
         <source>Retry download</source>
         <translation>Yritä latausta uudelleen</translation>
     </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="444"/>
-        <source>Warning</source>
-        <translation>Varoitus</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="445"/>
-        <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source>
-        <translation>Kun sukellustietokoneen latauksesta tallennetaan raakatiedosto, sukelluksia EI tallenneta sukelluslistaan.</translation>
-    </message>
 </context>
 <context>
     <name>DownloadFromDiveComputer</name>
@@ -4818,54 +5286,30 @@ Olemassaoleva kohde</translation>
         <translation>Hae sukellustietokoneelta</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="121"/>
-        <location filename="../subsurface/desktop-widgets/ui_downloadfromdivecomputer.h" line="329"/>
-        <source>Device or mount point</source>
-        <translation>Laite- tai hakemistopolku</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="100"/>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="107"/>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="114"/>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="128"/>
-        <location filename="../subsurface/desktop-widgets/ui_downloadfromdivecomputer.h" line="326"/>
-        <location filename="../subsurface/desktop-widgets/ui_downloadfromdivecomputer.h" line="327"/>
-        <location filename="../subsurface/desktop-widgets/ui_downloadfromdivecomputer.h" line="328"/>
-        <location filename="../subsurface/desktop-widgets/ui_downloadfromdivecomputer.h" line="330"/>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="52"/>
         <location filename="../subsurface/desktop-widgets/ui_downloadfromdivecomputer.h" line="318"/>
         <source>Force download of all dives</source>
         <translation>Lataa kaikki sukellukset</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="59"/>
+        <location filename="../subsurface/desktop-widgets/ui_downloadfromdivecomputer.h" line="319"/>
+        <source>Dive computer</source>
+        <translation>Sukellustietokone</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="69"/>
         <location filename="../subsurface/desktop-widgets/ui_downloadfromdivecomputer.h" line="320"/>
         <source>Always prefer downloaded dives</source>
         <translation>Suosi aina ladattuja sukelluksia</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="142"/>
-        <location filename="../subsurface/desktop-widgets/ui_downloadfromdivecomputer.h" line="332"/>
-        <source>Download into new trip</source>
-        <translation>Lataa uuteen rekteen</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="76"/>
         <location filename="../subsurface/desktop-widgets/ui_downloadfromdivecomputer.h" line="321"/>
         <source>Save libdivecomputer logfile</source>
         <translation>Tallenna sukellustietokoneen lokitiedosto</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="149"/>
-        <location filename="../subsurface/desktop-widgets/ui_downloadfromdivecomputer.h" line="333"/>
-        <source>Save libdivecomputer dumpfile</source>
-        <translation>Tallenna sukellustietokoneen raakatiedosto</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="90"/>
         <location filename="../subsurface/desktop-widgets/ui_downloadfromdivecomputer.h" line="322"/>
         <source>Choose Bluetooth download mode</source>
@@ -4878,23 +5322,47 @@ Olemassaoleva kohde</translation>
         <translation>Valitse ulkoinen Bluetooth -laite.</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="100"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="107"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="114"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="128"/>
+        <location filename="../subsurface/desktop-widgets/ui_downloadfromdivecomputer.h" line="326"/>
+        <location filename="../subsurface/desktop-widgets/ui_downloadfromdivecomputer.h" line="327"/>
+        <location filename="../subsurface/desktop-widgets/ui_downloadfromdivecomputer.h" line="328"/>
+        <location filename="../subsurface/desktop-widgets/ui_downloadfromdivecomputer.h" line="330"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="121"/>
+        <location filename="../subsurface/desktop-widgets/ui_downloadfromdivecomputer.h" line="329"/>
+        <source>Device or mount point</source>
+        <translation>Laite- tai hakemistopolku</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="135"/>
         <location filename="../subsurface/desktop-widgets/ui_downloadfromdivecomputer.h" line="331"/>
         <source>Vendor</source>
         <translation>Valmistaja</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="59"/>
-        <location filename="../subsurface/desktop-widgets/ui_downloadfromdivecomputer.h" line="319"/>
-        <source>Dive computer</source>
-        <translation>Sukellustietokone</translation>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="142"/>
+        <location filename="../subsurface/desktop-widgets/ui_downloadfromdivecomputer.h" line="332"/>
+        <source>Download into new trip</source>
+        <translation>Lataa uuteen rekteen</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="149"/>
+        <location filename="../subsurface/desktop-widgets/ui_downloadfromdivecomputer.h" line="333"/>
+        <source>Save libdivecomputer dumpfile</source>
+        <translation>Tallenna sukellustietokoneen raakatiedosto</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="211"/>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="188"/>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="262"/>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="303"/>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="392"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="316"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="355"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="458"/>
         <location filename="../subsurface/desktop-widgets/ui_downloadfromdivecomputer.h" line="334"/>
         <source>Download</source>
         <translation>Lataa</translation>
@@ -4925,7 +5393,7 @@ Olemassaoleva kohde</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="330"/>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="298"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="348"/>
         <location filename="../subsurface/desktop-widgets/ui_downloadfromdivecomputer.h" line="340"/>
         <source>Cancel</source>
         <translation>Peruuta</translation>
@@ -4941,72 +5409,72 @@ Olemassaoleva kohde</translation>
         <translation>Bluetooth ei ole päällä</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="59"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="55"/>
         <source> Vendor name: </source>
         <translation>Valmistajan nimi:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="93"/>
-        <source>USB device</source>
-        <translation>USB-laite</translation>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="101"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="92"/>
         <source> Dive Computer:</source>
         <translation>Sukellustietokone:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="141"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="132"/>
         <source> Connection:</source>
         <translation>Yhteys:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="194"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="211"/>
         <source> Previously used dive computers: </source>
         <translation>Aiemmin käytetyt sukellustietokoneet:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="266"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="320"/>
         <source>Retry</source>
         <translation>Yritä uudestaan</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="298"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="348"/>
         <source>Quit</source>
         <translation>Lopeta</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="312"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="366"/>
         <source>Rescan</source>
         <translation>Hae uudelleen</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="321"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="375"/>
         <source> Downloaded dives</source>
         <translation>Ladatut sukellukset</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="322"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="376"/>
         <source>Info:</source>
         <translation>Tietoja:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="345"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="399"/>
         <source>force downloading all dives</source>
         <translation>lataa kaikki sukellukset</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="383"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="428"/>
+        <source>Please wait while we record these dives...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="443"/>
         <source>Accept</source>
         <translation>Hyväksy</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="403"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="472"/>
         <source>Select All</source>
         <translation>Valitse kaikki</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="412"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="481"/>
         <source>Unselect All</source>
         <translation>Poista valinnat</translation>
     </message>
@@ -5014,7 +5482,7 @@ Olemassaoleva kohde</translation>
 <context>
     <name>DownloadThread</name>
     <message>
-        <location filename="../core/downloadfromdcthread.cpp" line="101"/>
+        <location filename="../core/downloadfromdcthread.cpp" line="97"/>
         <source>No new dives downloaded from dive computer</source>
         <translation>Uusia sukelluksia ei ladattu sukellustietokoneesta</translation>
     </message>
@@ -5022,15 +5490,23 @@ Olemassaoleva kohde</translation>
 <context>
     <name>EditBuddies</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="602"/>
+        <location filename="../commands/command_edit.cpp" line="746"/>
         <source>buddies</source>
         <translation>kavereita</translation>
     </message>
 </context>
 <context>
+    <name>EditDive</name>
+    <message>
+        <location filename="../commands/command_edit.cpp" line="1167"/>
+        <source>Edit dive [%1]</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>EditDiveMaster</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="625"/>
+        <location filename="../commands/command_edit.cpp" line="769"/>
         <source>dive master</source>
         <translation>sukellusvastaava</translation>
     </message>
@@ -5038,29 +5514,152 @@ Olemassaoleva kohde</translation>
 <context>
     <name>EditMode</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="440"/>
+        <location filename="../commands/command_edit.cpp" line="567"/>
         <source>dive mode</source>
         <translation>sukellustyyppi</translation>
     </message>
 </context>
 <context>
+    <name>EditNumber</name>
+    <message>
+        <location filename="../commands/command_edit.cpp" line="588"/>
+        <source>number</source>
+        <translation>numbero</translation>
+    </message>
+</context>
+<context>
     <name>EditTags</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="570"/>
+        <location filename="../commands/command_edit.cpp" line="723"/>
         <source>tags</source>
         <translation>avainsanat</translation>
     </message>
 </context>
 <context>
     <name>EditTagsBase</name>
+    <message>
+        <location filename="../commands/command_edit.cpp" line="659"/>
+        <source>Edit %1</source>
+        <translation>Muokkaa %1</translation>
+    </message>
     <message numerus="yes">
-        <location filename="../desktop-widgets/command_edit.cpp" line="511"/>
+        <location filename="../commands/command_edit.cpp" line="661"/>
         <source>Edit %1 (%n dive(s))</source>
-        <extracomment>remove the part in parentheses for %n = 1</extracomment>
         <translation><numerusform>Muokkaa %1 (%n sukellus)</numerusform><numerusform>Muokkaa %1 (%n sukellusta)</numerusform></translation>
     </message>
 </context>
 <context>
+    <name>EditWeight</name>
+    <message>
+        <location filename="../commands/command_edit.cpp" line="1106"/>
+        <source>Edit weight</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <location filename="../commands/command_edit.cpp" line="1108"/>
+        <source>Edit weight (%n dive(s))</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+</context>
+<context>
+    <name>Export</name>
+    <message>
+        <location filename="../mobile-widgets/qml/Export.qml" line="11"/>
+        <source>Export Divelog information</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/Export.qml" line="43"/>
+        <source>Export credentials</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/Export.qml" line="48"/>
+        <source>User ID</source>
+        <translation>Käyttäjätunnus</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/Export.qml" line="58"/>
+        <source>Password:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/Export.qml" line="73"/>
+        <source>Private</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/Export.qml" line="88"/>
+        <source>Export</source>
+        <translation>Vienti</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/Export.qml" line="107"/>
+        <source>Cancel</source>
+        <translation>Peruuta</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/Export.qml" line="139"/>
+        <source>Export Subsurface XML</source>
+        <translation>Vie Subsurface XML</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/Export.qml" line="144"/>
+        <source>Subsurface native XML format.</source>
+        <translation>Subsurfacen oma XML -tiedostomuoto.</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/Export.qml" line="148"/>
+        <source>Export Subsurface dive sites XML</source>
+        <translation>Vie Subsurfacen sukelluskohteet XML-tiedostoon</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/Export.qml" line="152"/>
+        <source>Subsurface dive sites native XML format.</source>
+        <translation>Subsurfacen sukelluskohteet omassa XML-muodossa.</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/Export.qml" line="156"/>
+        <source>Export UDDF</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/Export.qml" line="160"/>
+        <source>Generic format that is used for data exchange between a variety of diving related programs.</source>
+        <translation>Yleinen tiedostomuoto, jota käytetään sukelluslokien siirtämisessä eri sukellusohjelmistojen välillä.</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/Export.qml" line="164"/>
+        <source>Upload divelogs.de</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/Export.qml" line="167"/>
+        <source>Send the dive data to divelogs.de website.</source>
+        <translation>Lähetä sukellustiedot divelogs.de -verkkopalveluun.</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/Export.qml" line="171"/>
+        <source>Upload DiveShare</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/Export.qml" line="174"/>
+        <source>Send the dive data to dive-share.appspot.com website.</source>
+        <translation>Lähetä sukellusloki dive-share.appspot.com -web-sivustolle.</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/Export.qml" line="195"/>
+        <source>Anonymize</source>
+        <translation>Anonymisoi</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/Export.qml" line="198"/>
+        <source>Next</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>ExtraDataModel</name>
     <message>
         <location filename="../qt-models/divecomputerextradatamodel.cpp" line="11"/>
@@ -5109,153 +5708,199 @@ Olemassaoleva kohde</translation>
         <translation>Lomake</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="42"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="142"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="326"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="382"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="433"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="459"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="587"/>
+        <source>Substring</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../desktop-widgets/filterwidget2.ui" line="47"/>
-        <source>Reset / close</source>
-        <translation>Nollaa / sulje</translation>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="147"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="331"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="387"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="438"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="464"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="592"/>
+        <source>Starts with</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="52"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="152"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="336"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="392"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="443"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="469"/>
+        <source>Exact</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="63"/>
+        <source>Suit</source>
+        <translation>Puku</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="57"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="102"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="123"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="140"/>
-        <source>Min</source>
-        <translation>Min</translation>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="70"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="77"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="173"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="213"/>
+        <source>Max</source>
+        <translation>Max</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="64"/>
-        <source>People</source>
-        <translation>Ihmiset</translation>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="84"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="114"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="233"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="477"/>
+        <source>Min</source>
+        <translation>Min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="71"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="95"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="147"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="189"/>
-        <source>Max</source>
-        <translation>Max</translation>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="107"/>
+        <source>Air Temp</source>
+        <translation>Ilman lämpötila</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="78"/>
-        <source>Rating</source>
-        <translation>Yleisarvio</translation>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="121"/>
+        <source>Equipment</source>
+        <translation>Varusteet</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="85"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="180"/>
         <source>Tags</source>
         <translation>Avainsanat</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="109"/>
-        <source>From</source>
-        <translation>Alkaen</translation>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="187"/>
+        <source>Water Temp</source>
+        <translation>Veden lämpötila</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="116"/>
-        <source>To</source>
-        <translation>Asti</translation>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="195"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="267"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="411"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="485"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="521"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="540"/>
+        <source>All of</source>
+        <translation>Kaikki</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="133"/>
-        <source>Visibility</source>
-        <translation>Näkyvyys</translation>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="200"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="272"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="416"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="490"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="526"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="545"/>
+        <source>Any of</source>
+        <translation>Mikä tahansa</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="163"/>
-        <source>Equipment</source>
-        <translation>Varusteet</translation>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="205"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="277"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="421"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="495"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="531"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="550"/>
+        <source>None of</source>
+        <translation>Ei mikään</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="179"/>
-        <source>Water Temp</source>
-        <translation>Veden lämpötila</translation>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="220"/>
+        <source>People</source>
+        <translation>Ihmiset</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="196"/>
-        <source>Location</source>
-        <translation>Kohde</translation>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="256"/>
+        <source>Planned</source>
+        <translation>Suunniteltu</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="203"/>
-        <source>Suit</source>
-        <translation>Puku</translation>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="288"/>
+        <source>Location</source>
+        <translation>Kohde</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="210"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="295"/>
         <source>Notes</source>
         <translation>Muistiinpanot</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="217"/>
-        <source>Air Temp</source>
-        <translation>Ilman lämpötila</translation>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="302"/>
+        <source>Visibility</source>
+        <translation>Näkyvyys</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="276"/>
-        <source>Logged</source>
-        <translation>Lokitettu</translation>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="347"/>
+        <source>Reset / close</source>
+        <translation>Nollaa / sulje</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="286"/>
-        <source>Planned</source>
-        <translation>Suunniteltu</translation>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="354"/>
+        <source>Rating</source>
+        <translation>Yleisarvio</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="330"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="367"/>
         <location filename="../subsurface/desktop-widgets/ui_filterwidget.h" line="118"/>
         <source>Reset filters</source>
         <translation>Nollaa suotimet</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="345"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="364"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="383"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="402"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="421"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="440"/>
-        <source>All of</source>
-        <translation>Kaikki</translation>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="451"/>
+        <source>From</source>
+        <translation>Alkaen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="350"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="369"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="388"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="407"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="426"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="445"/>
-        <source>Any of</source>
-        <translation>Mikä tahansa</translation>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="503"/>
+        <source>Logged</source>
+        <translation>Lokitettu</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="355"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="374"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="393"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="412"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="431"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="450"/>
-        <source>None of</source>
-        <translation>Ei mikään</translation>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="558"/>
+        <source>To</source>
+        <translation>Asti</translation>
     </message>
     <message>
-        <location filename="../subsurface/desktop-widgets/ui_filterwidget.h" line="121"/>
-        <source>Show/hide filters</source>
-        <translation>Näytä/piilota suotimet</translation>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="565"/>
+        <source>Close filters</source>
+        <translation>Sulje suotimet</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="316"/>
-        <location filename="../subsurface/desktop-widgets/ui_filterwidget.h" line="124"/>
-        <source>Close and reset filters</source>
-        <translation>Sulje ja nollaa suotimet</translation>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="579"/>
+        <source>Fulltext</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="597"/>
+        <source>Full word</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.cpp" line="245"/>
+        <location filename="../desktop-widgets/filterwidget2.cpp" line="284"/>
         <source>%L1/%L2 shown</source>
         <translation>%L1/%L2 näytetään</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.cpp" line="248"/>
+        <location filename="../desktop-widgets/filterwidget2.cpp" line="286"/>
         <source>%L1 dives</source>
         <translation>%L1 sukellusta</translation>
     </message>
+    <message>
+        <location filename="../subsurface/desktop-widgets/ui_filterwidget.h" line="121"/>
+        <source>Show/hide filters</source>
+        <translation>Näytä/piilota suotimet</translation>
+    </message>
+    <message>
+        <location filename="../subsurface/desktop-widgets/ui_filterwidget.h" line="124"/>
+        <source>Close and reset filters</source>
+        <translation>Sulje ja nollaa suotimet</translation>
+    </message>
 </context>
 <context>
     <name>FindMovedImagesDialog</name>
@@ -5324,41 +5969,25 @@ Olemassaoleva kohde</translation>
 <context>
     <name>FirmwareUpdateThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="2225"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="2227"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>Ominaisuus ei ole vielä saatavilla valitulle sukellustietokoneelle.</translation>
     </message>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="2230"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="2232"/>
         <source>Firmware update failed!</source>
         <translation>Laiteohjelmiston päivitys epäonnistui!</translation>
     </message>
 </context>
 <context>
-    <name>ForwardButton</name>
-    <message>
-        <location filename="../mobile-widgets/qml/kirigami/src/controls/templates/private/ForwardButton.qml" line="46"/>
-        <source>Navigate Forward</source>
-        <translation>Navigoi eteenpäin</translation>
-    </message>
-</context>
-<context>
     <name>GasSelectionModel</name>
     <message>
-        <location filename="../qt-models/models.cpp" line="38"/>
+        <location filename="../qt-models/models.cpp" line="37"/>
         <source>cyl.</source>
         <translation>säiliö</translation>
     </message>
 </context>
 <context>
-    <name>GlobalDrawer</name>
-    <message>
-        <location filename="../mobile-widgets/qml/kirigami/src/controls/GlobalDrawer.qml" line="441"/>
-        <source>Back</source>
-        <translation>Takaisin</translation>
-    </message>
-</context>
-<context>
     <name>GpsList</name>
     <message>
         <location filename="../mobile-widgets/qml/GpsList.qml" line="14"/>
@@ -5389,12 +6018,98 @@ Olemassaoleva kohde</translation>
 <context>
     <name>GpsLocation</name>
     <message>
-        <location filename="../core/gpslocation.cpp" line="132"/>
+        <location filename="../core/gpslocation.cpp" line="134"/>
         <source>Unknown GPS location (no GPS source)</source>
         <translation>Tuntematon GPS-sijainti (ei GPS lähdettä)</translation>
     </message>
 </context>
 <context>
+    <name>ImportGPS</name>
+    <message>
+        <location filename="../desktop-widgets/importgps.ui" line="23"/>
+        <source>Get dive coordinates from GPS</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/importgps.ui" line="44"/>
+        <source>Synchronise the dive and the GPS track</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/importgps.ui" line="85"/>
+        <source>GPS track date </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/importgps.ui" line="99"/>
+        <source>Dive date </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/importgps.ui" line="107"/>
+        <source>Start and end times:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/importgps.ui" line="138"/>
+        <source>   GPS   </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/importgps.ui" line="146"/>
+        <source>   Dive   </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/importgps.ui" line="154"/>
+        <source>Start:  </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/importgps.ui" line="179"/>
+        <source>End:  </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/importgps.ui" line="283"/>
+        <source>International time zone correction</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/importgps.ui" line="308"/>
+        <source>By how many hours did the international time zone at the dive site differ from UCT (also regarded as Greenwich Mean Time)? Normally one would specify this value in whole hours (h:00):</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/importgps.ui" line="374"/>
+        <location filename="../desktop-widgets/importgps.ui" line="499"/>
+        <source>h:mm</source>
+        <translation>h:mm</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/importgps.ui" line="385"/>
+        <location filename="../desktop-widgets/importgps.ui" line="510"/>
+        <source>Earlier</source>
+        <translation>Aiemmin</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/importgps.ui" line="393"/>
+        <location filename="../desktop-widgets/importgps.ui" line="518"/>
+        <source>Later</source>
+        <translation>Myöhemmin</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/importgps.ui" line="408"/>
+        <source>Equipment time settings correction</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/importgps.ui" line="433"/>
+        <source>This setting deals with differences in time settings between the GPS and the dive computer that recorded the dive. Ensure that the GPS equipment and your dive computer show the same local time. If not, adjust the time of the GPS earlier or later to coincide with that of the dive (h:min):</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>KMessageWidget</name>
     <message>
         <location filename="../desktop-widgets/kmessagewidget.cpp" line="92"/>
@@ -5438,32 +6153,32 @@ Olemassaoleva kohde</translation>
 <context>
     <name>LocationFilterDelegate</name>
     <message>
-        <location filename="../desktop-widgets/modeldelegates.cpp" line="498"/>
+        <location filename="../desktop-widgets/modeldelegates.cpp" line="476"/>
         <source> (same GPS fix)</source>
         <translation>(sama GPS-kiinnitys)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/modeldelegates.cpp" line="503"/>
+        <location filename="../desktop-widgets/modeldelegates.cpp" line="481"/>
         <source> (~%1 away</source>
         <translation> (~%1 poissa</translation>
     </message>
     <message numerus="yes">
-        <location filename="../desktop-widgets/modeldelegates.cpp" line="504"/>
+        <location filename="../desktop-widgets/modeldelegates.cpp" line="482"/>
         <source>, %n dive(s) here)</source>
         <translation><numerusform>, %n sukellus täällä)</numerusform><numerusform>, %n sukellusta täällä)</numerusform></translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/modeldelegates.cpp" line="509"/>
+        <location filename="../desktop-widgets/modeldelegates.cpp" line="487"/>
         <source>(no existing GPS data, add GPS fix from this dive)</source>
         <translation>(Ei GPS tietoja, lisää GPS kiinnitys tästä sukelluksesta)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/modeldelegates.cpp" line="511"/>
+        <location filename="../desktop-widgets/modeldelegates.cpp" line="489"/>
         <source>(no GPS data)</source>
         <translation>(ei GPS -tietoja)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/modeldelegates.cpp" line="513"/>
+        <location filename="../desktop-widgets/modeldelegates.cpp" line="491"/>
         <source>Pick site: </source>
         <translation>Valitse kohde:</translation>
     </message>
@@ -5495,51 +6210,61 @@ Olemassaoleva kohde</translation>
         <translation>Muistiinpanot</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/locationinformation.ui" line="53"/>
+        <location filename="../desktop-widgets/locationinformation.ui" line="67"/>
         <location filename="../subsurface/desktop-widgets/ui_locationInformation.h" line="194"/>
         <source>Coordinates</source>
         <translation>Koordinaatit</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/locationinformation.ui" line="73"/>
+        <location filename="../desktop-widgets/locationinformation.ui" line="78"/>
+        <source>Load dive coordinates from GPS file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/locationinformation.ui" line="81"/>
+        <source>Use GPS file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/locationinformation.ui" line="89"/>
         <location filename="../subsurface/desktop-widgets/ui_locationInformation.h" line="196"/>
         <source>Reverse geo lookup</source>
         <translation>Sijaintitiedon päivitys</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/locationinformation.ui" line="76"/>
+        <location filename="../desktop-widgets/locationinformation.ui" line="92"/>
         <location filename="../subsurface/desktop-widgets/ui_locationInformation.h" line="198"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/locationinformation.ui" line="97"/>
+        <location filename="../desktop-widgets/locationinformation.ui" line="114"/>
         <source>Near dive sites</source>
         <translation>Läheiset sukelluskohteet</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/locationinformation.ui" line="105"/>
+        <location filename="../desktop-widgets/locationinformation.ui" line="122"/>
         <source>Show dive sites in the range of:</source>
         <translation>Näytä sukelluskohteet etäisyydellä:</translation>
     </message>
     <message>
-        <location filename="../subsurface/desktop-widgets/ui_locationInformation.h" line="199"/>
-        <source>Dive sites on same coordinates</source>
-        <translation>Sukelluskohteet samassa sijainnissa</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/locationinformation.ui" line="159"/>
+        <location filename="../desktop-widgets/locationinformation.ui" line="176"/>
         <location filename="../subsurface/desktop-widgets/ui_locationInformation.h" line="200"/>
         <source>Tags</source>
         <translation>Avainsanat</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/locationinformation.ui" line="173"/>
+        <location filename="../desktop-widgets/locationinformation.ui" line="190"/>
         <location filename="../subsurface/desktop-widgets/ui_locationInformation.h" line="202"/>
         <source>Country</source>
         <translation>Maa</translation>
     </message>
     <message>
+        <location filename="../subsurface/desktop-widgets/ui_locationInformation.h" line="199"/>
+        <source>Dive sites on same coordinates</source>
+        <translation>Sukelluskohteet samassa sijainnissa</translation>
+    </message>
+    <message>
         <location filename="../subsurface/desktop-widgets/ui_locationInformation.h" line="204"/>
         <source>Update location on map</source>
         <translation>Päivitä sijainti kartalla</translation>
@@ -5548,27 +6273,27 @@ Olemassaoleva kohde</translation>
 <context>
     <name>LocationInformationModel</name>
     <message>
-        <location filename="../qt-models/divelocationmodel.cpp" line="60"/>
+        <location filename="../qt-models/divelocationmodel.cpp" line="58"/>
         <source>Name</source>
         <translation>Nimi</translation>
     </message>
     <message>
-        <location filename="../qt-models/divelocationmodel.cpp" line="62"/>
+        <location filename="../qt-models/divelocationmodel.cpp" line="60"/>
         <source>Description</source>
         <translation>Kuvaus</translation>
     </message>
     <message>
-        <location filename="../qt-models/divelocationmodel.cpp" line="64"/>
+        <location filename="../qt-models/divelocationmodel.cpp" line="62"/>
         <source># of dives</source>
         <translation># sukellusta</translation>
     </message>
     <message>
-        <location filename="../qt-models/divelocationmodel.cpp" line="104"/>
+        <location filename="../qt-models/divelocationmodel.cpp" line="102"/>
         <source>Click here to edit the divesite.</source>
         <translation>Näpäytä muokataksesi sukelluskohdetta.</translation>
     </message>
     <message>
-        <location filename="../qt-models/divelocationmodel.cpp" line="105"/>
+        <location filename="../qt-models/divelocationmodel.cpp" line="103"/>
         <source>Clicking here will remove this divesite.</source>
         <translation>Poista sukelluskohde.</translation>
     </message>
@@ -5576,25 +6301,35 @@ Olemassaoleva kohde</translation>
 <context>
     <name>LocationInformationWidget</name>
     <message>
-        <location filename="../desktop-widgets/locationinformation.cpp" line="29"/>
+        <location filename="../desktop-widgets/locationinformation.cpp" line="31"/>
         <source>Done</source>
         <translation>Valmis</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/locationinformation.cpp" line="32"/>
+        <location filename="../desktop-widgets/locationinformation.cpp" line="34"/>
         <source>Dive site management</source>
         <translation>Sukelluskohteiden hallinta</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/locationinformation.cpp" line="59"/>
+        <location filename="../desktop-widgets/locationinformation.cpp" line="63"/>
         <source>Merge into current site</source>
         <translation>Yhdistä valittuun kohteeseen</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/locationinformation.cpp" line="252"/>
+        <source>Select GPS file to open</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/locationinformation.cpp" line="254"/>
+        <source>GPS files (*.gpx *.GPX)</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>Log</name>
     <message>
-        <location filename="../mobile-widgets/qml/Log.qml" line="15"/>
+        <location filename="../mobile-widgets/qml/Log.qml" line="14"/>
         <source>Application Log</source>
         <translation>Sovellusloki</translation>
     </message>
@@ -5602,218 +6337,205 @@ Olemassaoleva kohde</translation>
 <context>
     <name>MainTab</name>
     <message>
+        <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="14"/>
+        <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="491"/>
+        <source>Form</source>
+        <translation>Lomake</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="30"/>
-        <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="454"/>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="504"/>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="546"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="426"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="436"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="467"/>
         <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="511"/>
         <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="512"/>
         <source>Notes</source>
         <translation>Muistiinpanot</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="14"/>
-        <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="491"/>
-        <source>Form</source>
-        <translation>Lomake</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="90"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="83"/>
         <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="493"/>
         <source>Date</source>
         <translation>Ajankohta</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="100"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="99"/>
         <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="494"/>
         <source>Time</source>
         <translation>Kello</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="110"/>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="228"/>
-        <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="495"/>
-        <source>Air temp.</source>
-        <translation>Ilman lämpötila</translation>
+        <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="134"/>
+        <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="497"/>
+        <source>Depth</source>
+        <translation>Syvyys</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="120"/>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="229"/>
-        <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="496"/>
-        <source>Water temp.</source>
-        <translation>Veden lämpötila</translation>
+        <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="147"/>
+        <source>Duration (h:mm)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="195"/>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="545"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="231"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="466"/>
         <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="498"/>
         <source>Location</source>
         <translation>Kohde</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="232"/>
-        <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="501"/>
-        <source>Edit dive site</source>
-        <translation>Muokkaa sukelluskohdetta</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="225"/>
-        <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="235"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="261"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="271"/>
         <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="503"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="267"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="268"/>
+        <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="501"/>
+        <source>Edit dive site</source>
+        <translation>Muokkaa sukelluskohdetta</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="303"/>
         <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="504"/>
         <source>Divemaster</source>
         <translation>Divemaster</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="277"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="313"/>
         <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="505"/>
         <source>Buddy</source>
         <translation>Sukelluspari</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="323"/>
-        <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="506"/>
-        <source>Rating</source>
-        <translation>Yleisarvio</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="336"/>
-        <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="507"/>
-        <source>Visibility</source>
-        <translation>Näkyvyys</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="343"/>
-        <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="508"/>
-        <source>Suit</source>
-        <translation>Puku</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="402"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="349"/>
         <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="509"/>
         <source>Tags</source>
         <translation>Avainsanat</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="412"/>
-        <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="510"/>
-        <source>Dive mode</source>
-        <translation>Sukellustyyppi</translation>
+        <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="397"/>
+        <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="506"/>
+        <source>Rating</source>
+        <translation>Yleisarvio</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="62"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="61"/>
         <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="513"/>
         <source>Equipment</source>
         <translation>Varusteet</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="167"/>
-        <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="497"/>
-        <source>Depth</source>
-        <translation>Syvyys</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="83"/>
-        <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="492"/>
-        <source>Duration</source>
-        <translation>Kesto</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="70"/>
-        <source>Extra Info</source>
-        <translation>Lisätiedot</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="64"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="63"/>
         <source>Information</source>
         <translation>Tiedot</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="66"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="65"/>
         <source>Statistics</source>
         <translation>Tilastot</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="68"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="67"/>
         <source>Media</source>
         <translation>Media</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="72"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="69"/>
+        <source>Extra Info</source>
+        <translation>Lisätiedot</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="71"/>
         <source>Dive sites</source>
         <translation>Sukelluskohde</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="91"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="90"/>
         <source>Apply changes</source>
         <translation>Hyväksy muutokset</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="95"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="94"/>
         <source>Discard changes</source>
         <translation>Hylkää muutokset</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="99"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="98"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="103"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="102"/>
         <source>Undo</source>
         <translation>Peruuta</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="731"/>
-        <source>Warning: edited %1 dives</source>
-        <translation>Varoitus: muokattu %1 sukellusta</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="225"/>
-        <source>Air temp. [%1]</source>
-        <translation>Ilman lämpötila [%1]</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="226"/>
-        <source>Water temp. [%1]</source>
-        <translation>Veden lämpötila [%1]</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="264"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="239"/>
         <source>Multiple dives are being edited.</source>
         <translation>Muokataan useita sukelluksia.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="266"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="241"/>
         <source>This dive is being edited.</source>
         <translation>Tätä sukellusta muokataan.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="454"/>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="494"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="395"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="426"/>
         <source>Trip notes</source>
         <translation>Matkan muistiinpanot</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="489"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="420"/>
         <source>Trip location</source>
         <translation>Matkakohde</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="686"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="591"/>
         <source>Discard the changes?</source>
         <translation>Hylätäänkö muutokset?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="687"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="592"/>
         <source>You are about to discard your changes.</source>
         <translation>Olet hylkäämässä muutoksesi.</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="630"/>
+        <source>Warning: edited %1 dives</source>
+        <translation>Varoitus: muokattu %1 sukellusta</translation>
+    </message>
+    <message>
+        <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="492"/>
+        <source>Duration</source>
+        <translation>Kesto</translation>
+    </message>
+    <message>
+        <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="495"/>
+        <source>Air temp.</source>
+        <translation>Ilman lämpötila</translation>
+    </message>
+    <message>
+        <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="496"/>
+        <source>Water temp.</source>
+        <translation>Veden lämpötila</translation>
+    </message>
+    <message>
+        <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="507"/>
+        <source>Visibility</source>
+        <translation>Näkyvyys</translation>
+    </message>
+    <message>
+        <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="508"/>
+        <source>Suit</source>
+        <translation>Puku</translation>
+    </message>
+    <message>
+        <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="510"/>
+        <source>Dive mode</source>
+        <translation>Sukellustyyppi</translation>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>
@@ -5854,11 +6576,6 @@ Olemassaoleva kohde</translation>
         <translation>Muuta</translation>
     </message>
     <message>
-        <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="620"/>
-        <source>Share on</source>
-        <translation>Jaa</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="150"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="529"/>
         <source>&amp;New logbook</source>
@@ -5878,7 +6595,7 @@ Olemassaoleva kohde</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="164"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="494"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="495"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="535"/>
         <source>Open</source>
         <translation>Avaa</translation>
@@ -6104,20 +6821,9 @@ Olemassaoleva kohde</translation>
         <translation>Sukelluslokin vienti</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="713"/>
-        <source>Cloud stora&amp;ge online</source>
-        <translation>Pilvitallennus yhdistetty</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="725"/>
-        <location filename="../desktop-widgets/mainwindow.ui" line="728"/>
-        <source>Toggle deco information</source>
-        <translation>Vaihda deko-tiedot</translation>
-    </message>
-    <message>
-        <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="584"/>
-        <source>Configure &amp;dive computer</source>
-        <translation>Ohjelmoi sukellustietokone</translation>
+        <location filename="../desktop-widgets/mainwindow.ui" line="433"/>
+        <source>Change settings on &amp;dive computer</source>
+        <translation>Muokkaa sukellustietokoneen asetuksia</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="444"/>
@@ -6216,23 +6922,12 @@ Olemassaoleva kohde</translation>
         <translation>Näytä/piilota media</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="685"/>
-        <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="607"/>
-        <source>&amp;Find moved media files</source>
-        <translation>Etsi siirretyt mediatiedostot</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="636"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="601"/>
         <source>Toggle gas bar</source>
         <translation>Vaihda seospalkin tilaa</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="433"/>
-        <source>Change settings on &amp;dive computer</source>
-        <translation>Muokkaa sukellustietokoneen asetuksia</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="644"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="602"/>
         <source>&amp;Filter divelist</source>
@@ -6263,6 +6958,12 @@ Olemassaoleva kohde</translation>
         <translation>Tee uudelleen</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="685"/>
+        <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="607"/>
+        <source>&amp;Find moved media files</source>
+        <translation>Etsi siirretyt mediatiedostot</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="690"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="608"/>
         <source>Open c&amp;loud storage</source>
@@ -6287,55 +6988,38 @@ Olemassaoleva kohde</translation>
         <translation>Muokkaa sukelluskohteita</translation>
     </message>
     <message>
-        <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="612"/>
-        <source>Facebook</source>
-        <translation>Facebook</translation>
-    </message>
-    <message>
-        <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="613"/>
-        <source>Cloud storage online</source>
+        <location filename="../desktop-widgets/mainwindow.ui" line="713"/>
+        <source>Cloud stora&amp;ge online</source>
         <translation>Pilvitallennus yhdistetty</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="485"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="532"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1514"/>
-        <source>Please save or cancel the current dive edit before opening a new file.</source>
-        <translation>Ole hyvä ja tallenna tai peruuta sukelluksen muokkaus ennen kuin avaat uuden lokin.</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="491"/>
-        <source>Open file</source>
-        <translation>Avaa tiedosto</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="495"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1911"/>
-        <source>Cancel</source>
-        <translation>Peruuta</translation>
+        <location filename="../desktop-widgets/mainwindow.ui" line="725"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="728"/>
+        <source>Toggle deco information</source>
+        <translation>Vaihda deko-tiedot</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="691"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="680"/>
         <location filename="../desktop-widgets/mainwindow.cpp" line="606"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="655"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="805"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="913"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1785"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="640"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="793"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="903"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1790"/>
         <source>Warning</source>
         <translation>Varoitus</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="692"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="681"/>
         <source>Trying to merge dives with %1min interval in between</source>
         <translation>Yritetään yhdistää sukelluksia %1min &quot;pinta-ajalla&quot;</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="256"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="264"/>
         <source>Template backup created</source>
         <translation>Templaatista otettiin varmuuskopio</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="257"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="265"/>
         <source>The following backup printing templates were created:
 
 %1
@@ -6358,11 +7042,35 @@ ei tule muokata suoraan, koska ne päivitettään automaattisesti
 uuden Subsurface-version myötä.</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="486"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="533"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1520"/>
+        <source>Please save or cancel the current dive edit before opening a new file.</source>
+        <translation>Ole hyvä ja tallenna tai peruuta sukelluksen muokkaus ennen kuin avaat uuden lokin.</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="492"/>
+        <source>Open file</source>
+        <translation>Avaa tiedosto</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="496"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1916"/>
+        <source>Cancel</source>
+        <translation>Peruuta</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/mainwindow.cpp" line="606"/>
         <source>Please save or cancel the current dive edit before going online</source>
         <translation>Tallenna tai peruuta sukelluksen muutokset ennen yhdistämistä verkkoon</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="618"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1340"/>
+        <source>Save changes?</source>
+        <translation>Tallenna muutokset?</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/mainwindow.cpp" line="619"/>
         <source>You have unsaved changes. Do you want to commit them to the cloud storage?
 If answering no, the cloud will only be synced on next call to &quot;Open cloud storage&quot; or &quot;Save to cloud storage&quot;.</source>
@@ -6375,217 +7083,231 @@ Mikäli et, muutokset synkronoidaan pilveen vasta, kun valitset &quot;Avaa pilvi
         <translation>Yhdistäminen pilveen epäonnistui</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="702"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="691"/>
         <source>Please save or cancel the current dive edit before closing the file.</source>
         <translation>Ole hyvä ja tallenna tai peruuta sukelluksen muokkaus ennen lokitiedoston sulkemista.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="805"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="793"/>
         <source>Please save or cancel the current dive edit before trying to add a dive.</source>
         <translation>Ole hyvä ja tallenna tai peruuta sukelluksen muokkaus ennen sukelluksen lisäystä.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="857"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="847"/>
         <source>Print runtime table</source>
         <translation>Tulosta sukellussuunnitelma</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="913"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="903"/>
         <source>Trying to replan a dive that&apos;s not a planned dive.</source>
         <translation>Yritetään muokata sukellusta, joka ei ole sukellussuunnitelma.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1669"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1772"/>
-        <source>multiple files</source>
-        <translation>useita tiedostoja</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1750"/>
-        <source>Open dive site file</source>
-        <translation>Avaa sukelluskohteiden tiedosto</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1785"/>
-        <source>Please, first finish the current edition before trying to do another.</source>
-        <translation>Ole hyvä ja lopeta nykyinen muokkaus ennen kuin aloitat uuden.</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1016"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1006"/>
         <source>Yearly statistics</source>
         <translation>Vuositilastot</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1243"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1284"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1234"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1275"/>
         <source>Dive log files</source>
         <translation>Sukelluslokit</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1263"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1305"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1543"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1254"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1296"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1549"/>
         <source>Subsurface files</source>
         <translation>Subsurfacen tiedostot</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1264"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1306"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1255"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1297"/>
         <source>Cochran</source>
         <translation>Cochran</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1265"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1308"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1256"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1299"/>
         <source>DiveLogs.de</source>
         <translation>DiveLogs.de</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1266"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1309"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1257"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1300"/>
         <source>JDiveLog</source>
         <translation>JDiveLog</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1267"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1310"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1258"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1301"/>
         <source>Liquivision</source>
         <translation>Liquivision</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1268"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1311"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1259"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1302"/>
         <source>Suunto</source>
         <translation>Suunto</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1269"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1312"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1260"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1303"/>
         <source>UDCF</source>
         <translation>UDCF</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1270"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1313"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1261"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1304"/>
         <source>UDDF</source>
         <translation>UDDF</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1271"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1314"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1262"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1305"/>
         <source>XML</source>
         <translation>XML</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1272"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1315"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1263"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1306"/>
         <source>Divesoft</source>
         <translation>Divesoft</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1273"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1316"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1264"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1307"/>
         <source>Datatrak/WLog</source>
         <translation>Datatrak/WLog</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1274"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1317"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1265"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1308"/>
         <source>MkVI files</source>
         <translation>MkVI-tiedostot</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1275"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1318"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1266"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1309"/>
         <source>APD log viewer</source>
         <translation>APD log viewer</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1276"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1319"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1267"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1310"/>
         <source>OSTCtools</source>
         <translation>OSTCtools</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1277"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1320"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1268"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1311"/>
         <source>DAN DL7</source>
         <translation>DAN DL7</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1307"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1298"/>
         <source>CSV</source>
         <translation>CSV</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1321"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1333"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1312"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1324"/>
         <source>All files</source>
         <translation>Kaikki tiedostot</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1328"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1319"/>
         <source>Dive site files</source>
         <translation>Sukelluskohdetiedostot</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1343"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1334"/>
         <source>Do you want to save the changes that you made in the file %1?</source>
         <translation>Haluatko tallentaa muutoksesi tiedostoon %1?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1344"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1335"/>
         <source>Do you want to save the changes that you made in the data file?</source>
         <translation>Haluatko tallentaa muutoksesi tiedostoon?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="618"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1349"/>
-        <source>Save changes?</source>
-        <translation>Tallenna muutokset?</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1350"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1341"/>
         <source>Changes will be lost if you don&apos;t save them.</source>
         <translation>Muutokset hylätään, jos et tallenna niitä.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1542"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1548"/>
         <source>Save file as</source>
         <translation>Tallenna nimellä</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1630"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1636"/>
         <source>[local cache for] %1</source>
         <translation>[paikallinen cache] %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1631"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1637"/>
         <source>[cloud storage for] %1</source>
         <translation>[pilvitallennus] %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1698"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1675"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1777"/>
+        <source>multiple files</source>
+        <translation>useita tiedostoja</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1703"/>
         <source>Opening datafile from older version</source>
         <translation>Avataan vanhan tiedostomuodon loki</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1699"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1704"/>
         <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>Avasit vanhan tiedostomuodon lokitiedoston. Suosittelemme, että luet uuden version muutoksista käyttöohjeesta, etenkin sukelluskohteiden hallinnasta, sillä se on muuttunut huomattavasti.
 Subsurface on jo yrittänyt esi-täyttää sijaintitiedot, mutta kannattaa vielä tarkistaa uudesta sukelluskohteiden hallinnasta, että kaikki tiedot ovat oikein.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1723"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1728"/>
         <source>Open dive log file</source>
         <translation>Avaa sukellusloki</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1911"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1755"/>
+        <source>Open dive site file</source>
+        <translation>Avaa sukelluskohteiden tiedosto</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1790"/>
+        <source>Please, first finish the current edition before trying to do another.</source>
+        <translation>Ole hyvä ja lopeta nykyinen muokkaus ennen kuin aloitat uuden.</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1916"/>
         <source>Contacting cloud service...</source>
         <translation>Otetaan yhteyttä pilvipalveluun...</translation>
     </message>
+    <message>
+        <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="584"/>
+        <source>Configure &amp;dive computer</source>
+        <translation>Ohjelmoi sukellustietokone</translation>
+    </message>
+    <message>
+        <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="612"/>
+        <source>Facebook</source>
+        <translation>Facebook</translation>
+    </message>
+    <message>
+        <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="613"/>
+        <source>Cloud storage online</source>
+        <translation>Pilvitallennus yhdistetty</translation>
+    </message>
+    <message>
+        <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="620"/>
+        <source>Share on</source>
+        <translation>Jaa</translation>
+    </message>
 </context>
 <context>
     <name>MapPage</name>
@@ -6679,33 +7401,9 @@ Mikäli laitteesi käyttää Bluetoothia, tee samat toimenpiteet kuin lokia lada
     </message>
 </context>
 <context>
-    <name>Page1Form.ui</name>
-    <message>
-        <location filename="../mobile-widgets/qml/kirigami/examples/minimalqmake/Page1Form.ui.qml" line="26"/>
-        <location filename="../mobile-widgets/qml/kirigami/examples/qmakewithstaticplugin/src/Page1Form.ui.qml" line="26"/>
-        <location filename="../mobile-widgets/qml/kirigami/examples/staticcmake/src/Page1Form.ui.qml" line="26"/>
-        <source>Page 1</source>
-        <translation>Sivu 1</translation>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/kirigami/examples/minimalqmake/Page1Form.ui.qml" line="37"/>
-        <location filename="../mobile-widgets/qml/kirigami/examples/qmakewithstaticplugin/src/Page1Form.ui.qml" line="37"/>
-        <location filename="../mobile-widgets/qml/kirigami/examples/staticcmake/src/Page1Form.ui.qml" line="44"/>
-        <source>Text Field</source>
-        <translation>Tekstikenttä</translation>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/kirigami/examples/minimalqmake/Page1Form.ui.qml" line="42"/>
-        <location filename="../mobile-widgets/qml/kirigami/examples/qmakewithstaticplugin/src/Page1Form.ui.qml" line="42"/>
-        <location filename="../mobile-widgets/qml/kirigami/examples/staticcmake/src/Page1Form.ui.qml" line="49"/>
-        <source>Press Me</source>
-        <translation>Clickaa minua</translation>
-    </message>
-</context>
-<context>
     <name>PasteDives</name>
     <message numerus="yes">
-        <location filename="../desktop-widgets/command_edit.cpp" line="728"/>
+        <location filename="../commands/command_edit.cpp" line="868"/>
         <source>Paste onto %n dive(s)</source>
         <translation><numerusform>Liitä %n sukellukseen</numerusform><numerusform>Liitä %n sukellukseen</numerusform></translation>
     </message>
@@ -6713,79 +7411,207 @@ Mikäli laitteesi käyttää Bluetoothia, tee samat toimenpiteet kuin lokia lada
 <context>
     <name>PlannerSettingsWidget</name>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="560"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="543"/>
         <source>ft/min</source>
         <translation>ft/min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="561"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="544"/>
         <source>Last stop at 20ft</source>
         <translation>Viimeinen pysähdys 20 jalassa</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="562"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="545"/>
         <source>50% avg. depth to 20ft</source>
         <translation>50% keskisyvyydestä - 20 jalkaan</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="563"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="546"/>
         <source>20ft to surface</source>
         <translation>20 jalasta pintaan</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="564"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="547"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="566"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="549"/>
         <source>m/min</source>
         <translation>m/min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="567"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="550"/>
         <source>Last stop at 6m</source>
         <translation>Viimeinen pysähdys kuudessa metrissä</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="568"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="551"/>
         <source>50% avg. depth to 6m</source>
         <translation>50% keskisyvyydestä - 6m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="569"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="552"/>
         <source>6m to surface</source>
         <translation>6m:stä pintaan</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="570"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="553"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="573"/>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="574"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="556"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="557"/>
         <source>cuft/min</source>
         <translation>ft³/min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="582"/>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="583"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="565"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="566"/>
         <source>ℓ/min</source>
         <translation>ℓ/min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="592"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="575"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="597"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="580"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
 </context>
 <context>
+    <name>PreferencesCloud</name>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_cloud.ui" line="14"/>
+        <source>Form</source>
+        <translation>Lomake</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_cloud.ui" line="32"/>
+        <location filename="../desktop-widgets/preferences/preferences_cloud.cpp" line="119"/>
+        <source>Subsurface cloud storage</source>
+        <translation>Subsurfacen pilvitallennustila</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_cloud.ui" line="41"/>
+        <source>Email address</source>
+        <translation>Sähköpostiosoite</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_cloud.ui" line="48"/>
+        <source>Password</source>
+        <translation>Salasana</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_cloud.ui" line="55"/>
+        <source>Verification PIN</source>
+        <translation>Vahvistus PIN -koodi</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_cloud.ui" line="62"/>
+        <source>New password</source>
+        <translation>Uusi salasana</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_cloud.ui" line="97"/>
+        <source>Save Password locally?</source>
+        <translation>Tallenna salasana paikallisesti</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_cloud.ui" line="110"/>
+        <source>To create a new cloud account:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_cloud.ui" line="120"/>
+        <source>1) Enter an email address and a novel password that Subsurface will use to initialise the dive log in the cloud. Click Apply to send the above email address and password to the (remote) cloud server.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_cloud.ui" line="130"/>
+        <source>2) The server responds by sending a verification PIN to the above email address (This is the only occasion that Subsurface uses the email address provided above). The above dialog now has a new PIN text box, not visible previously.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_cloud.ui" line="140"/>
+        <source>3) Enter the PIN in the corresponding text box in the above dialog (this field is only visible while the server is waiting for email address confirmation). Click Apply again. The Subsurface cloud storage account will be marked as verified and the Subsurface cloud storage service is initialised for use.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_cloud.cpp" line="10"/>
+        <source>Cloud</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_cloud.cpp" line="47"/>
+        <source>Change ignored. Cloud storage email and password can only consist of letters, numbers, and &apos;.&apos;, &apos;-&apos;, &apos;_&apos;, and &apos;+&apos;.</source>
+        <translation>Muutos peruttu. Pilvipalvelun sähköpostiosoiteessa ja salasanassa voi olla vain kirjaimia, numeroita ja merkit &apos;.&apos;, &apos;-&apos;, &apos;_&apos;, &apos;+&apos;.</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_cloud.cpp" line="51"/>
+        <source>Change ignored. Cloud storage email and new password can only consist of letters, numbers, and &apos;.&apos;, &apos;-&apos;, &apos;_&apos;, and &apos;+&apos;.</source>
+        <translation>Muutos peruttu. Pilvitallennuksen sähköpostiosoite ja uusi salasana voi sisältää vain kirjaimia, numeroita ja merkit &apos;.&apos;, &apos;-&apos;, &apos;_&apos;, &apos;+&apos;.</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_cloud.cpp" line="73"/>
+        <location filename="../desktop-widgets/preferences/preferences_cloud.cpp" line="87"/>
+        <source>Cloud storage email and password can only consist of letters, numbers, and &apos;.&apos;, &apos;-&apos;, &apos;_&apos;, and &apos;+&apos;.</source>
+        <translation>Pilvipalvelun sähköpostiosoitteessa ja salasanassa voi olla vain kirjaimia, numeroita ja merkit  &apos;.&apos;, &apos;-&apos;, &apos;_&apos;, &apos;+&apos;.</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_cloud.cpp" line="113"/>
+        <source>Subsurface cloud storage (credentials verified)</source>
+        <translation>Subsurfacen pilvitallennustila (käyttäjä todennettu)</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_cloud.cpp" line="115"/>
+        <source>Subsurface cloud storage (incorrect password)</source>
+        <translation>Subsurfacen pilvitallennustila (virheellinen salasana)</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_cloud.cpp" line="117"/>
+        <source>Subsurface cloud storage (PIN required)</source>
+        <translation>Subsurfacen pilvitallennustila (tarvitaan PIN)</translation>
+    </message>
+</context>
+<context>
+    <name>PreferencesDc</name>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_dc.ui" line="14"/>
+        <source>Form</source>
+        <translation>Lomake</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_dc.ui" line="24"/>
+        <source>DIVE COMPUTER</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_dc.ui" line="39"/>
+        <source>Delete connections</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_dc.ui" line="53"/>
+        <source>When importing dives from a dive computer (DC), Subsurface remembers the connection(s), showing them as selectable buttons in the Download panel. This is useful for DCs using Bluetooth for communication. In order to clear all this information, click on the button below. After clearing the information the buttons on the Download panel disappear and it is necessary to establish new connection(s) with dive computer(s) before importing dives again.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_dc.ui" line="61"/>
+        <source>Delete all dive computer connections</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_dc.cpp" line="13"/>
+        <source>Dive download</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>PreferencesDefaults</name>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="14"/>
@@ -6794,176 +7620,180 @@ Mikäli laitteesi käyttää Bluetoothia, tee samat toimenpiteet kuin lokia lada
         <translation>Lomake</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="20"/>
-        <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_defaults.h" line="330"/>
-        <source>Lists and tables</source>
-        <translation>Listat ja taulukot</translation>
+        <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="21"/>
+        <source>Font for lists and tables</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="29"/>
+        <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="31"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_defaults.h" line="331"/>
         <source>Font</source>
         <translation>Fontti</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="39"/>
+        <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="53"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_defaults.h" line="332"/>
         <source>Font size</source>
         <translation>Fontin koko</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="68"/>
+        <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_defaults.h" line="345"/>
+        <source>Animations</source>
+        <translation>Animaatiot</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="84"/>
+        <source>In some actions, e.g. when zooming the dive profile, the changing axis values are animated. Select the speed with which this animation should occur (maximum = 500):</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="94"/>
+        <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_defaults.h" line="346"/>
+        <source>Speed</source>
+        <translation>Nopeus</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="15"/>
+        <source>Display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_defaults.h" line="330"/>
+        <source>Lists and tables</source>
+        <translation>Listat ja taulukot</translation>
+    </message>
+    <message>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_defaults.h" line="333"/>
         <source>Dives</source>
         <translation>Sukelluksia</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="52"/>
-        <source>Default file</source>
-        <translation>Oletustiedosto</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="67"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_defaults.h" line="334"/>
         <source>Default dive log file</source>
         <translation>Oletus lokitiedosto</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="76"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_defaults.h" line="335"/>
         <source>&amp;No default file</source>
         <translation>Ei oletustiedostoa</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="83"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_defaults.h" line="336"/>
         <source>&amp;Local default file</source>
         <translation>Paikallinen oletustiedosto</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="90"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_defaults.h" line="337"/>
         <source>Clo&amp;ud storage default file</source>
         <translation>Pilvipalvelun oletustiedosto</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="99"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_defaults.h" line="338"/>
         <source>Local dive log file</source>
         <translation>Paikallinen sukellusloki</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="111"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_defaults.h" line="339"/>
         <source>Use default</source>
         <translation>Käytä oletusta</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="121"/>
-        <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="242"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_defaults.h" line="340"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_defaults.h" line="349"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="130"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_defaults.h" line="341"/>
         <source>Display invalid</source>
         <translation>Näytä epäkelvot</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="147"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_defaults.h" line="343"/>
         <source>Default cylinder</source>
         <translation>Oletussäiliö</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="162"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_defaults.h" line="344"/>
         <source>Use default cylinder</source>
         <translation>Käytä oletussäiliötä</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="179"/>
-        <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_defaults.h" line="345"/>
-        <source>Animations</source>
-        <translation>Animaatiot</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="188"/>
-        <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_defaults.h" line="346"/>
-        <source>Speed</source>
-        <translation>Nopeus</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="215"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_defaults.h" line="347"/>
         <source>Video thumbnails</source>
         <translation>Videoiden kuvakkeet</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="230"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_defaults.h" line="348"/>
         <source>ffmpeg executable</source>
         <translation>ffmpeg ohjelma</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="251"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_defaults.h" line="350"/>
         <source>Extract at position</source>
         <translation>Ota valitusta sijainnista</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="271"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_defaults.h" line="351"/>
         <source>Extract video thumbnails</source>
         <translation>Kerää videokuvakkeet</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="288"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_defaults.h" line="353"/>
         <source>Clear settings</source>
         <translation>Tyhjennä asetukset</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="294"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_defaults.h" line="354"/>
         <source>Reset remembered dive computers</source>
         <translation>Nollaa muistetut sukellustietokoneet</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="301"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_defaults.h" line="355"/>
         <source>Reset all settings to their default value</source>
         <translation>Palauta kaikki asetukset oletusarvoihin</translation>
     </message>
+</context>
+<context>
+    <name>PreferencesDialog</name>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="12"/>
-        <source>General</source>
-        <translation>Yleistä</translation>
+        <location filename="../desktop-widgets/preferences/preferencesdialog.cpp" line="48"/>
+        <source>Preferences</source>
+        <translation>Asetukset</translation>
     </message>
+</context>
+<context>
+    <name>PreferencesEquipment</name>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="25"/>
-        <source>Open default log file</source>
-        <translation>Avaa oletustiedosto</translation>
+        <location filename="../desktop-widgets/preferences/preferences_equipment.ui" line="14"/>
+        <source>Form</source>
+        <translation>Lomake</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="25"/>
-        <source>Subsurface files</source>
-        <translation>Subsurfacen tiedostot</translation>
+        <location filename="../desktop-widgets/preferences/preferences_equipment.ui" line="24"/>
+        <source>CYLINDERS</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="51"/>
-        <source>Select ffmpeg executable</source>
-        <translation>Valitse ffmpeg ohjelma</translation>
+        <location filename="../desktop-widgets/preferences/preferences_equipment.ui" line="32"/>
+        <source>Default cylinder in the Cylinders table of the Equipment tab</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>PreferencesDialog</name>
     <message>
-        <location filename="../desktop-widgets/preferences/preferencesdialog.cpp" line="42"/>
-        <source>Preferences</source>
-        <translation>Asetukset</translation>
+        <location filename="../desktop-widgets/preferences/preferences_equipment.ui" line="48"/>
+        <source>Select a default cylinder</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_equipment.ui" line="68"/>
+        <source>Show unused cylinders in the Cylinders table of the Equipment tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_equipment.cpp" line="12"/>
+        <source>Equipment</source>
+        <translation>Varusteet</translation>
     </message>
 </context>
 <context>
@@ -6975,14 +7805,18 @@ Mikäli laitteesi käyttää Bluetoothia, tee samat toimenpiteet kuin lokia lada
         <translation>Lomake</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_georeference.ui" line="20"/>
-        <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_georeference.h" line="106"/>
-        <source>Dive site layout</source>
-        <translation>Sukelluskohteen asettelu</translation>
+        <location filename="../desktop-widgets/preferences/preferences_georeference.ui" line="24"/>
+        <source>Reverse dive site lookup format</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_georeference.ui" line="42"/>
-        <location filename="../desktop-widgets/preferences/preferences_georeference.ui" line="59"/>
+        <location filename="../desktop-widgets/preferences/preferences_georeference.ui" line="38"/>
+        <source>Selecting the blue globe icon to the right of Location in the Notes tab opens the Edit Dive Site panel. There, an icon to the right of the dive site coordinates allows reverse lookup of the dive site. This finds the country and closest town to the divesite and adds them as dive site tags above the dive site name in the Notes tab. The combo boxes below allow one to select the order in which these tags are shown in the Notes tab. This requires an Internet connection.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_georeference.ui" line="65"/>
+        <location filename="../desktop-widgets/preferences/preferences_georeference.ui" line="82"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_georeference.h" line="107"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_georeference.h" line="108"/>
         <source>/</source>
@@ -6993,6 +7827,11 @@ Mikäli laitteesi käyttää Bluetoothia, tee samat toimenpiteet kuin lokia lada
         <source>Georeference</source>
         <translation>Maantieteellinen sijainti</translation>
     </message>
+    <message>
+        <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_georeference.h" line="106"/>
+        <source>Dive site layout</source>
+        <translation>Sukelluskohteen asettelu</translation>
+    </message>
 </context>
 <context>
     <name>PreferencesGraph</name>
@@ -7009,66 +7848,6 @@ Mikäli laitteesi käyttää Bluetoothia, tee samat toimenpiteet kuin lokia lada
         <translation>Säiliöpaineen näytön asetukset</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="131"/>
-        <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_graph.h" line="348"/>
-        <source>CCR options:</source>
-        <translation>CCR -asetukset:</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="239"/>
-        <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_graph.h" line="361"/>
-        <source>Ceiling display setup</source>
-        <translation>Kattosyvyyden näytön asetukset</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="314"/>
-        <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_graph.h" line="368"/>
-        <source>Draw dive computer reported ceiling red</source>
-        <translation>Näytä sukellustietokoneen raportoima kattosyvyys punaisella</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="268"/>
-        <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_graph.h" line="364"/>
-        <source>Algorithm for calculated ceiling:</source>
-        <translation>Kattosyvyyden laskenta-algoritmi:</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="298"/>
-        <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_graph.h" line="367"/>
-        <source>+</source>
-        <translation>+</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="245"/>
-        <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_graph.h" line="362"/>
-        <source>GFHigh</source>
-        <translation>GFHigh</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="341"/>
-        <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_graph.h" line="371"/>
-        <source>GFLow</source>
-        <translation>GFLow</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="175"/>
-        <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_graph.h" line="353"/>
-        <source>pSCR options:</source>
-        <translation>pSCR -asetukset:</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="202"/>
-        <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_graph.h" line="356"/>
-        <source>Dilution ratio</source>
-        <translation>Laimennussuhde</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="215"/>
-        <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_graph.h" line="358"/>
-        <source>1:</source>
-        <translation>1:</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="29"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_graph.h" line="339"/>
         <source>Threshold for pO₂ (minimum, maximum)</source>
@@ -7109,6 +7888,12 @@ Mikäli laitteesi käyttää Bluetoothia, tee samat toimenpiteet kuin lokia lada
         <translation>pO₂ MOD:n laskentaan (vain maksimi)</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="131"/>
+        <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_graph.h" line="348"/>
+        <source>CCR options:</source>
+        <translation>CCR -asetukset:</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="138"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_graph.h" line="349"/>
         <source>Dive planner default setpoint</source>
@@ -7127,12 +7912,36 @@ Mikäli laitteesi käyttää Bluetoothia, tee samat toimenpiteet kuin lokia lada
         <translation>Näytä CCR setpointit näytettäessä pO₂</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="175"/>
+        <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_graph.h" line="353"/>
+        <source>pSCR options:</source>
+        <translation>pSCR -asetukset:</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="182"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_graph.h" line="354"/>
         <source>pSCR metabolic rate O₂</source>
         <translation>pSCR aineenvaihdunnan nopeus O₂</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="192"/>
+        <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_graph.h" line="355"/>
+        <source>ℓ/min</source>
+        <translation>ℓ/min</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="202"/>
+        <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_graph.h" line="356"/>
+        <source>Dilution ratio</source>
+        <translation>Laimennussuhde</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="215"/>
+        <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_graph.h" line="358"/>
+        <source>1:</source>
+        <translation>1:</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="222"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_graph.h" line="359"/>
         <source>Show equivalent OC pO₂ with pSCR pO₂</source>
@@ -7145,16 +7954,16 @@ Mikäli laitteesi käyttää Bluetoothia, tee samat toimenpiteet kuin lokia lada
         <translation>Näytä varoitukset (isobaric counterdiffusion)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="288"/>
-        <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_graph.h" line="366"/>
-        <source>Conservatism level</source>
-        <translation>Konservatismi</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="239"/>
+        <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_graph.h" line="361"/>
+        <source>Ceiling display setup</source>
+        <translation>Kattosyvyyden näytön asetukset</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="374"/>
-        <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_graph.h" line="375"/>
-        <source>Recalculate thumbnails if older than media file</source>
-        <translation>Generoi uudet pikkukuvat, jos nykyiset ovat vanhempia kuin mediatiedosto</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="245"/>
+        <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_graph.h" line="362"/>
+        <source>GFHigh</source>
+        <translation>GFHigh</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="255"/>
@@ -7163,10 +7972,10 @@ Mikäli laitteesi käyttää Bluetoothia, tee samat toimenpiteet kuin lokia lada
         <translation>B&amp;ühlmann</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="192"/>
-        <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_graph.h" line="355"/>
-        <source>ℓ/min</source>
-        <translation>ℓ/min</translation>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="268"/>
+        <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_graph.h" line="364"/>
+        <source>Algorithm for calculated ceiling:</source>
+        <translation>Kattosyvyyden laskenta-algoritmi:</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="275"/>
@@ -7177,33 +7986,59 @@ Mikäli laitteesi käyttää Bluetoothia, tee samat toimenpiteet kuin lokia lada
         <translation>%</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="288"/>
+        <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_graph.h" line="366"/>
+        <source>Conservatism level</source>
+        <translation>Konservatismi</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="298"/>
+        <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_graph.h" line="367"/>
+        <source>+</source>
+        <translation>+</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="314"/>
+        <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_graph.h" line="368"/>
+        <source>Draw dive computer reported ceiling red</source>
+        <translation>Näytä sukellustietokoneen raportoima kattosyvyys punaisella</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="321"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_graph.h" line="369"/>
         <source>&amp;VPM-B</source>
         <translation>&amp;VPM-B</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="354"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="341"/>
+        <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_graph.h" line="371"/>
+        <source>GFLow</source>
+        <translation>GFLow</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="12"/>
+        <source>Tech setup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_graph.h" line="372"/>
         <source>Misc</source>
         <translation>Sekalaiset</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="360"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_graph.h" line="373"/>
         <source>Show unused cylinders in Equipment tab</source>
         <translation>Näytä käyttämättömät säiliöt varusteluettelossa</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="367"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_graph.h" line="374"/>
         <source>Show mean depth in Profile</source>
         <translation>Näytä profiilissa keskisyvyys</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="11"/>
-        <source>Profile</source>
-        <translation>Profiilikuvaaja</translation>
+        <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_graph.h" line="375"/>
+        <source>Recalculate thumbnails if older than media file</source>
+        <translation>Generoi uudet pikkukuvat, jos nykyiset ovat vanhempia kuin mediatiedosto</translation>
     </message>
 </context>
 <context>
@@ -7239,12 +8074,6 @@ Mikäli laitteesi käyttää Bluetoothia, tee samat toimenpiteet kuin lokia lada
         <translation>Päiväyksen muoto</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_language.ui" line="113"/>
-        <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_language.h" line="189"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Preferred date format. Commonly used fields are&lt;/p&gt;&lt;p&gt;d (day of month)&lt;/p&gt;&lt;p&gt;ddd (abbr. day name)&lt;/p&gt;&lt;p&gt;M (month number)&lt;/p&gt;&lt;p&gt;MMM (abbr. month name)&lt;/p&gt;&lt;p&gt;yy/yyyy (2/4 digit year)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Ensisijainen päiväyksen muoto. Yleisimmät kentät ovat&lt;/p&gt;&lt;p&gt;d (kuukauden päivä)&lt;/p&gt;&lt;p&gt;ddd (lyh. päivän nimi)&lt;/p&gt;&lt;p&gt;M (kuukauden numero)&lt;/p&gt;&lt;p&gt;MMM (lyh. kuukauden nimi)&lt;/p&gt;&lt;p&gt;yy/yyyy (2/4 numeroinen vuosi)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/preferences/preferences_language.ui" line="80"/>
         <location filename="../desktop-widgets/preferences/preferences_language.ui" line="138"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_language.h" line="183"/>
@@ -7265,6 +8094,12 @@ Mikäli laitteesi käyttää Bluetoothia, tee samat toimenpiteet kuin lokia lada
         <translation>Lyhyt muoto</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/preferences/preferences_language.ui" line="113"/>
+        <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_language.h" line="189"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Preferred date format. Commonly used fields are&lt;/p&gt;&lt;p&gt;d (day of month)&lt;/p&gt;&lt;p&gt;ddd (abbr. day name)&lt;/p&gt;&lt;p&gt;M (month number)&lt;/p&gt;&lt;p&gt;MMM (abbr. month name)&lt;/p&gt;&lt;p&gt;yy/yyyy (2/4 digit year)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Ensisijainen päiväyksen muoto. Yleisimmät kentät ovat&lt;/p&gt;&lt;p&gt;d (kuukauden päivä)&lt;/p&gt;&lt;p&gt;ddd (lyh. päivän nimi)&lt;/p&gt;&lt;p&gt;M (kuukauden numero)&lt;/p&gt;&lt;p&gt;MMM (lyh. kuukauden nimi)&lt;/p&gt;&lt;p&gt;yy/yyyy (2/4 numeroinen vuosi)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/preferences/preferences_language.ui" line="132"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_language.h" line="191"/>
         <source>Time format</source>
@@ -7319,6 +8154,172 @@ Katso http://doc.qt.io/qt-5/qdatetime.html#toString</translation>
     </message>
 </context>
 <context>
+    <name>PreferencesLog</name>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_log.ui" line="14"/>
+        <source>Form</source>
+        <translation>Lomake</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_log.ui" line="21"/>
+        <source>DIVE LOG</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_log.ui" line="44"/>
+        <source>Default dive log file</source>
+        <translation>Oletus lokitiedosto</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_log.ui" line="53"/>
+        <source>&amp;No default file</source>
+        <translation>Ei oletustiedostoa</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_log.ui" line="60"/>
+        <source>&amp;Local default file</source>
+        <translation>Paikallinen oletustiedosto</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_log.ui" line="67"/>
+        <source>Clo&amp;ud storage default file</source>
+        <translation>Pilvipalvelun oletustiedosto</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_log.ui" line="76"/>
+        <source>Local dive log file</source>
+        <translation>Paikallinen sukellusloki</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_log.ui" line="88"/>
+        <source>Use default</source>
+        <translation>Käytä oletusta</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_log.ui" line="98"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_log.ui" line="111"/>
+        <source>In the Dive List, show dives that you have marked as invalid, e.g. pool dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_log.ui" line="119"/>
+        <source>In the Information tab, show tools for recording wave height, surge and chill during a dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_log.ui" line="127"/>
+        <source>In the Dive Profile, show mean depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_log.ui" line="135"/>
+        <source>In the Information tab, allow editing of water salinity</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_log.cpp" line="14"/>
+        <source> Dive log</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_log.cpp" line="27"/>
+        <source>Open default log file</source>
+        <translation>Avaa oletustiedosto</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_log.cpp" line="27"/>
+        <source>Subsurface files</source>
+        <translation>Subsurfacen tiedostot</translation>
+    </message>
+</context>
+<context>
+    <name>PreferencesMedia</name>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_media.ui" line="14"/>
+        <source>Form</source>
+        <translation>Lomake</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_media.ui" line="24"/>
+        <source>UPDATE THUMBNAILS</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_media.ui" line="38"/>
+        <source>Photographs or videos are sometimes edited after being uploaded and linked to Subsurface. If a photo is therefore more recent than its original thumbnail, checking the checkbox below will allow creating a new thumbnail after the media has been edited.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_media.ui" line="46"/>
+        <source>Recalculate thumbnail if older than media file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_media.ui" line="68"/>
+        <source>VIDEOS</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_media.ui" line="76"/>
+        <source>Video thumbnails</source>
+        <translation>Videoiden kuvakkeet</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_media.ui" line="98"/>
+        <source>One can view video files through thumbnail(s) in the Media tab, created using the external programm FFmpeg which needs to be installed on your machine. Check the checkbox below to allow this. Then, in the text box below, specify the path to FFmpeg. In Linux, a typical path is:  /usr/bin/ffmpeg. If FFmpeg is installed in the system area of your computer, just type ffmpeg in the text box below. For more info see Appendix F of the User Manual.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_media.ui" line="106"/>
+        <source>Extract video thumbnails</source>
+        <translation>Kerää videokuvakkeet</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_media.ui" line="114"/>
+        <source>Path to ffmpeg:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_media.ui" line="126"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_media.ui" line="142"/>
+        <source>One can specify te relative position within the video from where the thumbnail is retrieved. Use the slider below do do that.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_media.ui" line="150"/>
+        <source>Extract at position</source>
+        <translation>Ota valitusta sijainnista</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_media.cpp" line="14"/>
+        <source>Media</source>
+        <translation>Media</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_media.cpp" line="39"/>
+        <source>Warning</source>
+        <translation>Varoitus</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_media.cpp" line="39"/>
+        <source>Couldn&apos;t execute ffmpeg at given location. Thumbnailing will not work.</source>
+        <translation>Ffmpeg:n suorittaminen annetusta sijainnista epäonnistui. Pikkukuvakkeita ei siis näytetä.</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_media.cpp" line="45"/>
+        <source>Select ffmpeg executable</source>
+        <translation>Valitse ffmpeg ohjelma</translation>
+    </message>
+</context>
+<context>
     <name>PreferencesNetwork</name>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_network.ui" line="14"/>
@@ -7328,9 +8329,8 @@ Katso http://doc.qt.io/qt-5/qdatetime.html#toString</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_network.ui" line="20"/>
-        <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_network.h" line="234"/>
-        <source>Proxy</source>
-        <translation>Välityspalvelin</translation>
+        <source>If your Internet access is through a proxy server, provide details for using that proxy</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_network.ui" line="32"/>
@@ -7358,7 +8358,6 @@ Katso http://doc.qt.io/qt-5/qdatetime.html#toString</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_network.ui" line="108"/>
-        <location filename="../desktop-widgets/preferences/preferences_network.ui" line="172"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_network.h" line="239"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_network.h" line="246"/>
         <source>Password</source>
@@ -7371,91 +8370,82 @@ Katso http://doc.qt.io/qt-5/qdatetime.html#toString</translation>
         <translation>Vaatii kirjautumisen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.ui" line="156"/>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="139"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="9"/>
+        <source>Network</source>
+        <translation>Verkko</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="14"/>
+        <source>No proxy</source>
+        <translation>Ei välityspalvelinta</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="15"/>
+        <source>System proxy</source>
+        <translation>Järjestelmän proxy -asetukset</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/>
+        <source>HTTP proxy</source>
+        <translation>HTTP proxy</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/>
+        <source>SOCKS proxy</source>
+        <translation>SOCKS proxy</translation>
+    </message>
+    <message>
+        <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_network.h" line="234"/>
+        <source>Proxy</source>
+        <translation>Välityspalvelin</translation>
+    </message>
+    <message>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_network.h" line="241"/>
         <source>Subsurface cloud storage</source>
         <translation>Subsurfacen pilvitallennustila</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.ui" line="165"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_network.h" line="245"/>
         <source>Email address</source>
         <translation>Sähköpostiosoite</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.ui" line="179"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_network.h" line="247"/>
         <source>Verification PIN</source>
         <translation>Vahvistus PIN -koodi</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.ui" line="186"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_network.h" line="248"/>
         <source>New password</source>
         <translation>Uusi salasana</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.ui" line="221"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_network.h" line="255"/>
         <source>Save Password locally?</source>
         <translation>Tallenna salasana paikallisesti</translation>
     </message>
+</context>
+<context>
+    <name>PreferencesReset</name>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="11"/>
-        <source>Network</source>
-        <translation>Verkko</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/>
-        <source>No proxy</source>
-        <translation>Ei välityspalvelinta</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/>
-        <source>System proxy</source>
-        <translation>Järjestelmän proxy -asetukset</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/>
-        <source>HTTP proxy</source>
-        <translation>HTTP proxy</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="19"/>
-        <source>SOCKS proxy</source>
-        <translation>SOCKS proxy</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="67"/>
-        <source>Change ignored. Cloud storage email and password can only consist of letters, numbers, and &apos;.&apos;, &apos;-&apos;, &apos;_&apos;, and &apos;+&apos;.</source>
-        <translation>Muutos peruttu. Pilvipalvelun sähköpostiosoiteessa ja salasanassa voi olla vain kirjaimia, numeroita ja merkit &apos;.&apos;, &apos;-&apos;, &apos;_&apos;, &apos;+&apos;.</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="71"/>
-        <source>Change ignored. Cloud storage email and new password can only consist of letters, numbers, and &apos;.&apos;, &apos;-&apos;, &apos;_&apos;, and &apos;+&apos;.</source>
-        <translation>Muutos peruttu. Pilvitallennuksen sähköpostiosoite ja uusi salasana voi sisältää vain kirjaimia, numeroita ja merkit &apos;.&apos;, &apos;-&apos;, &apos;_&apos;, &apos;+&apos;.</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="93"/>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="107"/>
-        <source>Cloud storage email and password can only consist of letters, numbers, and &apos;.&apos;, &apos;-&apos;, &apos;_&apos;, and &apos;+&apos;.</source>
-        <translation>Pilvipalvelun sähköpostiosoitteessa ja salasanassa voi olla vain kirjaimia, numeroita ja merkit  &apos;.&apos;, &apos;-&apos;, &apos;_&apos;, &apos;+&apos;.</translation>
+        <location filename="../desktop-widgets/preferences/preferences_reset.ui" line="14"/>
+        <source>Form</source>
+        <translation>Lomake</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="133"/>
-        <source>Subsurface cloud storage (credentials verified)</source>
-        <translation>Subsurfacen pilvitallennustila (käyttäjä todennettu)</translation>
+        <location filename="../desktop-widgets/preferences/preferences_reset.ui" line="39"/>
+        <source>Selecting this button will reset all preferences to their default values</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="135"/>
-        <source>Subsurface cloud storage (incorrect password)</source>
-        <translation>Subsurfacen pilvitallennustila (virheellinen salasana)</translation>
+        <location filename="../desktop-widgets/preferences/preferences_reset.ui" line="50"/>
+        <source>Reset all preferences</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="137"/>
-        <source>Subsurface cloud storage (PIN required)</source>
-        <translation>Subsurfacen pilvitallennustila (tarvitaan PIN)</translation>
+        <location filename="../desktop-widgets/preferences/preferences_reset.cpp" line="6"/>
+        <source>Reset</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -7691,20 +8681,35 @@ Katso http://doc.qt.io/qt-5/qdatetime.html#toString</translation>
 <context>
     <name>PrintDialog</name>
     <message>
-        <location filename="../desktop-widgets/printdialog.cpp" line="105"/>
+        <location filename="../desktop-widgets/printdialog.cpp" line="106"/>
         <source>P&amp;rint</source>
         <translation>Tulosta</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/printdialog.cpp" line="108"/>
+        <location filename="../desktop-widgets/printdialog.cpp" line="109"/>
         <source>&amp;Preview</source>
         <translation>Esikatselu</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/printdialog.cpp" line="120"/>
+        <location filename="../desktop-widgets/printdialog.cpp" line="112"/>
+        <source>Export Html</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/printdialog.cpp" line="125"/>
         <source>Print</source>
         <translation>Tulosta</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/printdialog.cpp" line="196"/>
+        <source>Filename to export html to</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/printdialog.cpp" line="197"/>
+        <source>Html file</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PrintOptions</name>
@@ -7830,138 +8835,138 @@ Tallenna muokkauksesi eri nimelle.</translation>
 <context>
     <name>ProfileWidget2</name>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="814"/>
-        <source> (#%1 of %2)</source>
-        <translation> (#%1 / %2)</translation>
+        <location filename="../profile-widget/profilewidget2.cpp" line="811"/>
+        <source>Planned dive</source>
+        <translation>Suunniteltu sukellus</translation>
+    </message>
+    <message>
+        <location filename="../profile-widget/profilewidget2.cpp" line="813"/>
+        <source>Manually added dive</source>
+        <translation>Käsin lisätty sukellus</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="810"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="815"/>
         <source>Unknown dive computer</source>
         <translation>Tuntematon sukellustietokone</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="840"/>
-        <source>Show NDL / TTS was disabled because of excessive processing time</source>
-        <translation>Suoranousu-/pintautumisaikaa ei näytetä, koska niiden laskemiseen kuluu liikaa aikaa</translation>
+        <location filename="../profile-widget/profilewidget2.cpp" line="819"/>
+        <source> (#%1 of %2)</source>
+        <translation> (#%1 / %2)</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1454"/>
-        <source>Add gas change</source>
-        <translation>Lisää kaasun vaihto</translation>
+        <location filename="../profile-widget/profilewidget2.cpp" line="842"/>
+        <source>Show NDL / TTS was disabled because of excessive processing time</source>
+        <translation>Suoranousu-/pintautumisaikaa ei näytetä, koska niiden laskemiseen kuluu liikaa aikaa</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1438"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1434"/>
         <source>Make first dive computer</source>
         <translation>Aseta ensimmäiseksi sukellustietokoneeksi</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="806"/>
-        <source>Planned dive</source>
-        <translation>Suunniteltu sukellus</translation>
-    </message>
-    <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="808"/>
-        <source>Manually added dive</source>
-        <translation>Käsin lisätty sukellus</translation>
-    </message>
-    <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1440"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1436"/>
         <source>Delete this dive computer</source>
         <translation>Poista tämä sukellustietokone</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1441"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1437"/>
         <source>Split this dive computer into own dive</source>
         <translation>Jaa tämä sukellustietokone omaksi sukelluksekseen</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1457"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1450"/>
+        <source>Add gas change</source>
+        <translation>Lisää kaasun vaihto</translation>
+    </message>
+    <message>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1453"/>
         <source> (cyl. %1)</source>
         <translation> (säiliö %1)</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1463"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1458"/>
         <source>Add setpoint change</source>
         <translation>Aseta setpoint-muutos</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1465"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1460"/>
         <source>Add bookmark</source>
         <translation>Lisää kirjanmerkki</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1467"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1462"/>
         <source>Split dive into two</source>
         <translation>Jaa sukellus kahtia</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1477"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1469"/>
         <source>Change divemode</source>
         <translation>Muuta sukellustyyppi</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1501"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1493"/>
         <source>Edit the profile</source>
         <translation>Muokkaa profiilia</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1505"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1497"/>
         <source>Remove event</source>
         <translation>Poista tapahtuma</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1510"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1502"/>
         <source>Hide similar events</source>
         <translation>Piilota samankaltaiset tapahtumat</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1517"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1509"/>
         <source>Edit name</source>
         <translation>Muokkaa nimeä</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1548"/>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1555"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1542"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1549"/>
         <source>Adjust pressure of cyl. %1 (currently interpolated as %2)</source>
         <translation>Muokkaa säiliön %1 painetta (arvioitu %2)</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1570"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1564"/>
         <source>Unhide all events</source>
         <translation>Näytä kaikki tapahtumat</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1598"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1592"/>
         <source>Hide events</source>
         <translation>Piilota tapahtumat</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1598"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1592"/>
         <source>Hide all %1 events?</source>
         <translation>Piilota kaikki %1 tapahtumat</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1633"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1627"/>
         <source>Remove the selected event?</source>
         <translation>Poistetaanko valitut tapahtumat?</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1634"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1628"/>
         <source>%1 @ %2:%3</source>
         <translation>%1 @ %2:%3</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1786"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1760"/>
         <source>Edit name of bookmark</source>
         <translation>Muokkaa kirjanmerkin nimeä</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1787"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1761"/>
         <source>Custom name:</source>
         <translation>Valinnainen nimi:</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1792"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1766"/>
         <source>Name is too long!</source>
         <translation>Nimi on liian pitkä!</translation>
     </message>
@@ -7969,175 +8974,226 @@ Tallenna muokkauksesi eri nimelle.</translation>
 <context>
     <name>QMLManager</name>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="206"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="256"/>
         <source>Starting...</source>
         <translation>Ladataan...</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="275"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="331"/>
         <source>Open local dive data file</source>
         <translation>Avaa paikallinen sukelluslokitiedosto</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="283"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="352"/>
         <source>Opening local data file failed</source>
         <translation>Paikallisen tiedoston avaus epäonnistui</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="313"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="372"/>
         <source>%1 dives loaded from local dive data file</source>
         <translation>%1 sukellusta ladattu paikallisesta tiedostosta</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="414"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="379"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="698"/>
+        <source>Incorrect cloud credentials</source>
+        <translation>Virheelliset pilvitunnukset</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="518"/>
         <source>working in no-cloud mode</source>
         <translation>käytä off-line -tilassa</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="418"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="522"/>
         <source>Error parsing local storage, giving up</source>
         <translation>Virhe paikallisen tallenteen jäsentämisessä, keskeytetään</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="427"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="531"/>
         <source>no cloud credentials</source>
         <translation>Ei pilvipalvelun tunnuksia</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="428"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="504"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="532"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="604"/>
         <source>Please enter valid cloud credentials.</source>
         <translation>Syötä pilvipalvelun tunnuksent.</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="460"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="565"/>
         <source>Cloud storage email and password can only consist of letters, numbers, and &apos;.&apos;, &apos;-&apos;, &apos;_&apos;, and &apos;+&apos;.</source>
         <translation>Pilvipalvelun sähköpostiosoitteessa ja salasanassa voi olla vain kirjaimia, numeroita ja merkit  &apos;.&apos;, &apos;-&apos;, &apos;_&apos;, &apos;+&apos;.</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="466"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="571"/>
         <source>Invalid format for email address</source>
         <translation>Virheellinen sähköpostiosoite</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="515"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="615"/>
         <source>Attempting to open cloud storage with new credentials</source>
         <translation>Yritetään avata yhteyttä pilvipalveluun uusilla tunnuksilla</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="537"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="629"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="676"/>
         <source>Testing cloud credentials</source>
         <translation>Testataan pilvipalvelun tunnuksia</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="552"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="646"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="691"/>
         <source>No response from cloud server to validate the credentials</source>
         <translation>Käyttäjätunnusta ei voitu vahvistaa, koska pilvipalvelin ei vastaa</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="560"/>
-        <source>Incorrect cloud credentials</source>
-        <translation>Virheelliset pilvitunnukset</translation>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="652"/>
+        <source>Incorrect email / password combination</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="657"/>
+        <source>Cloud credentials require verification PIN</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="660"/>
+        <source>Incorrect PIN, please try again</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="566"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="665"/>
+        <source>PIN accepted, credentials verified</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="704"/>
         <source>Cannot connect to cloud storage - cloud account not verified</source>
         <translation>Yhteys pilvipalveluun epäonnistui - käyttäjätunnusta ei voida vahvistaa</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="593"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="728"/>
         <source>Cloud credentials are invalid</source>
         <translation>Virheelliset pilvipalvelun tunnukset</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="607"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="742"/>
         <source>Cannot open cloud storage: Error creating https connection</source>
         <translation>Yhteys pivlipalveluun epäonnistui: Virhe luotaessa HTTPS -yhteyttä</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="621"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="756"/>
         <source>Cannot open cloud storage: %1</source>
         <translation>Pilvitallennuksen yhteyden avaus epäonnistui: %1</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="634"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="769"/>
         <source>Cannot connect to cloud storage</source>
         <translation>Yhteys pilvitallennukseen epäonnistui</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="639"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="774"/>
         <source>Cloud credentials valid, loading dives...</source>
         <translation>Pilvitunnukset OK, ladataan sukelluksia...</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="649"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="783"/>
         <source>Cloud storage error: %1</source>
         <translation>Virhe pilvitallennuksessa: %1</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="695"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="829"/>
         <source>Loading dives from local storage (&apos;no cloud&apos; mode)</source>
         <translation>Ladataan sukellukset paikallisesta tallennustilasta (&apos;ei pilve&apos; tila)</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="741"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="875"/>
         <source>Failed to connect to cloud server, reverting to no cloud status</source>
         <translation>Yhteysvirhe pilvipalveluun, käytetään off-line -tilassa</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="766"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="897"/>
         <source>Cloud storage open successfully. No dives in dive list.</source>
         <translation>Yhteys muodostettu pilvipalveluun. Sukelluslista on tyhjä.</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="940"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="941"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="1082"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="1083"/>
         <source>h</source>
         <translation>t</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="940"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="941"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="942"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="1082"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="1083"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="1084"/>
         <source>min</source>
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="940"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="1082"/>
         <source>sec</source>
         <translation>sek</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="1479"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="1186"/>
+        <source>weight</source>
+        <translation>Massa</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="1471"/>
+        <source>Fatal error: cannot save data file. Please copy log file and report.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="1660"/>
         <source>Unknown GPS location</source>
         <translation>Tuntemattomat GPS -sijainnit</translation>
     </message>
+    <message>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="1878"/>
+        <source>no default cylinder</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
-    <name>QMLPrefs</name>
+    <name>QObject</name>
     <message>
-        <location filename="../mobile-widgets/qmlprefs.cpp" line="138"/>
-        <source>Starting...</source>
-        <translation>Ladataan...</translation>
+        <location filename="../qt-models/divesummarymodel.cpp" line="197"/>
+        <source>no dives in period</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>ReadSettingsThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="2127"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="2151"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="2129"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="2153"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>Ominaisuus ei ole vielä saatavilla valitulle sukellustietokoneelle.</translation>
     </message>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="2129"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="2137"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="2148"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="2131"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="2139"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="2150"/>
         <source>Failed!</source>
         <translation>Epäonnistui!</translation>
     </message>
 </context>
 <context>
+    <name>RemoveWeight</name>
+    <message>
+        <location filename="../commands/command_edit.cpp" line="1076"/>
+        <source>Remove weight</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <location filename="../commands/command_edit.cpp" line="1078"/>
+        <source>Remove weight (%n dive(s))</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+</context>
+<context>
     <name>RenumberDialog</name>
     <message>
         <location filename="../desktop-widgets/renumber.ui" line="17"/>
@@ -8153,31 +9209,44 @@ Tallenna muokkauksesi eri nimelle.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/renumber.ui" line="61"/>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="138"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="139"/>
         <location filename="../subsurface/desktop-widgets/ui_renumber.h" line="90"/>
         <source>New starting number</source>
         <translation>Uusi aloitusnumero</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="136"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="137"/>
         <source>New number</source>
         <translation>Uusi numero</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="141"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="142"/>
         <source>Renumber selected dives</source>
         <translation>Numeroi valitut sukellukset uudelleen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="143"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="144"/>
         <source>Renumber all dives</source>
         <translation>Numeroi kaikki sukellukset uudelleen</translation>
     </message>
 </context>
 <context>
+    <name>ReplanDive</name>
+    <message>
+        <location filename="../commands/command_edit.cpp" line="944"/>
+        <source>Replan dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../commands/command_edit.cpp" line="944"/>
+        <source>Edit profile</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>ResetSettingsThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="2248"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="2250"/>
         <source>Reset settings failed!</source>
         <translation>Asetusten nollaus epäonnistui!</translation>
     </message>
@@ -8215,203 +9284,324 @@ Tallenna muokkauksesi eri nimelle.</translation>
 <context>
     <name>Settings</name>
     <message>
-        <location filename="../mobile-widgets/qml/Settings.qml" line="16"/>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="14"/>
         <source>Settings</source>
         <translation>Asetukset</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/Settings.qml" line="20"/>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="17"/>
         <source>Undefined</source>
         <translation>Tuntematon</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/Settings.qml" line="21"/>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="18"/>
         <source>Incorrect username/password combination</source>
         <translation>Virheellinen käyttäjätunnus tai salasana</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/Settings.qml" line="22"/>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="19"/>
         <source>Credentials need to be verified</source>
         <translation>Tunnukset pitää varmentaa</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/Settings.qml" line="23"/>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="20"/>
         <source>Credentials verified</source>
         <translation>Tunnukset varmistettu</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/Settings.qml" line="24"/>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="21"/>
         <source>No cloud mode</source>
         <translation>Off-line -tila</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/Settings.qml" line="33"/>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="28"/>
+        <source>General settings</source>
+        <translation>Yleisasetukset</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="37"/>
         <source>Cloud status</source>
         <translation>Pilven tila</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/Settings.qml" line="42"/>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="45"/>
         <source>Email</source>
         <translation>Sähköposti</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/Settings.qml" line="47"/>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="49"/>
         <source>Not applicable</source>
         <translation>Ei sovellu</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/Settings.qml" line="53"/>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="54"/>
         <source>Change</source>
         <translation>Muuta</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/Settings.qml" line="60"/>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="57"/>
+        <source>Starting...</source>
+        <translation>Ladataan...</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="61"/>
         <source>Status</source>
         <translation>Tila</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/Settings.qml" line="84"/>
-        <source>Theme</source>
-        <translation>Teema</translation>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="81"/>
+        <source>Default Cylinder</source>
+        <translation>Oletussäiliö</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/Settings.qml" line="93"/>
-        <source>Blue</source>
-        <translation>Sininen</translation>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="89"/>
+        <source>Cylinder:</source>
+        <translation>Säiliö:</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="112"/>
+        <source>Dive computers</source>
+        <translation>Sukellustietokoneet</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/Settings.qml" line="109"/>
-        <location filename="../mobile-widgets/qml/Settings.qml" line="163"/>
-        <location filename="../mobile-widgets/qml/Settings.qml" line="218"/>
-        <source>regular text</source>
-        <translation>tavallinen teksti</translation>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="120"/>
+        <source>Forget remembered dive computers</source>
+        <translation>Unohda muistetut sukellustietokoneet</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/Settings.qml" line="125"/>
-        <location filename="../mobile-widgets/qml/Settings.qml" line="179"/>
-        <location filename="../mobile-widgets/qml/Settings.qml" line="234"/>
-        <source>Highlight</source>
-        <translation>Korostus</translation>
+        <source>Forget</source>
+        <translation>Unohda</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="140"/>
+        <source>Theme</source>
+        <translation>Teema</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/Settings.qml" line="148"/>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="152"/>
+        <source>Blue</source>
+        <translation>Sininen</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="153"/>
         <source>Pink</source>
         <translation>Pinkki</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/Settings.qml" line="202"/>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="154"/>
         <source>Dark</source>
         <translation>Tumma</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/Settings.qml" line="255"/>
-        <source>Scaling</source>
-        <translation>Skaalaus</translation>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="167"/>
+        <source>background</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/Settings.qml" line="268"/>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="180"/>
+        <source>text</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="196"/>
+        <source>primary</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="211"/>
+        <source>primary text</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="227"/>
+        <source>darker primary</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="242"/>
+        <source>darker primary text</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="258"/>
+        <source>light primary</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="273"/>
+        <source>light primary text</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="293"/>
+        <source>secondary text</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="309"/>
+        <source>drawer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="324"/>
         <source>smaller</source>
         <translation>peinempi</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/Settings.qml" line="276"/>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="331"/>
         <source>regular</source>
         <translation>tavallinen</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/Settings.qml" line="284"/>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="338"/>
         <source>larger</source>
         <translation>suurempi</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/Settings.qml" line="306"/>
-        <source>GPS location service</source>
-        <translation>GPS-sijaintipalvelu</translation>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="351"/>
+        <source>Units</source>
+        <translation>Yksiköt</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/Settings.qml" line="316"/>
-        <source>Distance threshold (meters)</source>
-        <translation>Minimietäisyys (metriä)</translation>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="357"/>
+        <source>Metric</source>
+        <translation>Metrinen</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/Settings.qml" line="332"/>
-        <source>Time threshold (minutes)</source>
-        <translation>Minimikesto (minuuttia)</translation>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="366"/>
+        <source>Imperial</source>
+        <translation>Brittiläinen</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/Settings.qml" line="361"/>
-        <source>Default Cylinder</source>
-        <translation>Oletussäiliö</translation>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="375"/>
+        <source>Personalize</source>
+        <translation>Mukauta</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/Settings.qml" line="370"/>
-        <source>Cylinder:</source>
-        <translation>Säiliö:</translation>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="397"/>
+        <source>Depth</source>
+        <translation>Syvyys</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/Settings.qml" line="395"/>
-        <source>Dive computers</source>
-        <translation>Sukellustietokoneet</translation>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="401"/>
+        <source>meters</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/Settings.qml" line="404"/>
-        <source>Forget remembered dive computers</source>
-        <translation>Unohda muistetut sukellustietokoneet</translation>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="409"/>
+        <source>feet</source>
+        <translation>jalka</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/Settings.qml" line="410"/>
-        <source>Forget</source>
-        <translation>Unohda</translation>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="417"/>
+        <source>Pressure</source>
+        <translation>Paine</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/Settings.qml" line="432"/>
-        <source>Units</source>
-        <translation>Yksiköt</translation>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="421"/>
+        <source>bar</source>
+        <translation>bar</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/Settings.qml" line="442"/>
-        <source>Use Imperial Units</source>
-        <translation>Käytä brittiläisiä yksiköitä</translation>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="429"/>
+        <source>psi</source>
+        <translation>psi</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="437"/>
+        <source>Volume</source>
+        <translation>Tilavuus</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/Settings.qml" line="458"/>
-        <source>Use Metric Units</source>
-        <translation>Käytä metrisiä yksiköitä</translation>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="441"/>
+        <source>liter</source>
+        <translation>litra</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="449"/>
+        <source>cuft</source>
+        <translation>ft³</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/Settings.qml" line="486"/>
-        <source>Filter preferences</source>
-        <translation>Suodotusasetukset</translation>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="457"/>
+        <source>Temperature</source>
+        <translation>Lämpötila</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/Settings.qml" line="495"/>
-        <source>Include notes in full text filtering</source>
-        <translation>Suodata myös muistiinpanojen sisällön perusteella</translation>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="461"/>
+        <source>celsius</source>
+        <translation>Celsius</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/Settings.qml" line="510"/>
-        <source>Match filter case sensitive</source>
-        <translation>Suodata isot ja pienet kirjaimet erikseen</translation>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="469"/>
+        <source>fahrenheit</source>
+        <translation>Fahrenheit</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/Settings.qml" line="537"/>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="477"/>
+        <source>Weight</source>
+        <translation>Painot</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="481"/>
+        <source>kg</source>
+        <translation>kg</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="489"/>
+        <source>lbs</source>
+        <translation>pauna</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="501"/>
+        <source>Advanced</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="509"/>
+        <source>GPS location service</source>
+        <translation>GPS-sijaintipalvelu</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="518"/>
+        <source>Distance threshold (meters)</source>
+        <translation>Minimietäisyys (metriä)</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="532"/>
+        <source>Time threshold (minutes)</source>
+        <translation>Minimikesto (minuuttia)</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="553"/>
         <source>Bluetooth</source>
         <translation>Bluetooth</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/Settings.qml" line="547"/>
-        <source>Show all bluetooth devices 
-even if not recognized as dive computers</source>
-        <translation>Näytä kaikki bluetooth-laitteet
-vaikka ei tunnistettaisi sukellustietokoneeksi</translation>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="562"/>
+        <source>Temporarily show all bluetooth devices 
+even if not recognized as dive computers.
+Please report DCs that need this setting</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="582"/>
+        <source>Display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="590"/>
+        <source>Show only one column in Portrait mode</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/Settings.qml" line="572"/>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="611"/>
         <source>Developer</source>
         <translation>Kehittäjä</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/Settings.qml" line="582"/>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="620"/>
         <source>Display Developer menu</source>
         <translation>Näytä kehittäjävalikko</translation>
     </message>
@@ -8488,38 +9678,38 @@ Osa mediatiedostojen aikaleimoista ei ole minkään valitun sukelluksen aikana (
         <translation>Mikä päivä ja aika näkyy kuvassa?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="284"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="275"/>
         <source>Open image file</source>
         <translation>Avaa kuvatiedosto</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="286"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="277"/>
         <source>Image files</source>
         <translation>Kuvatiedostot</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="367"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="358"/>
         <source>Selected dive date/time</source>
         <translation>Valitun sukelluksen päivä/aika</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="369"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="360"/>
         <source>First selected dive date/time</source>
         <translation>Ensimmäisen valitun sukelluksen päivä/aika</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="370"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="361"/>
         <source>Last selected dive date/time</source>
         <translation>Viimeisen valitun sukelluksen päivä/aika</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="372"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="363"/>
         <source>
 Files with inappropriate date/time</source>
         <translation>Tiedostot virheellisellä päivällä/ajalla</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="382"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="373"/>
         <source>No Exif date/time found</source>
         <translation>Päivää/aikaa ei löytynyt Exif-tiedoista</translation>
     </message>
@@ -8621,41 +9811,41 @@ Files with inappropriate date/time</source>
         <translation>Tuo viestit (virheet, varoitukset jne.)</translation>
     </message>
     <message>
-        <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="54"/>
+        <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="55"/>
         <source>Open SmartTrak files</source>
         <translation>Avaa SmartTrak -tiedostot</translation>
     </message>
     <message>
-        <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="55"/>
+        <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="56"/>
         <source>SmartTrak files</source>
         <translation>SmartTrak-tiedostot</translation>
     </message>
     <message>
-        <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="55"/>
-        <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="66"/>
+        <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="56"/>
+        <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="67"/>
         <source>All files</source>
         <translation>Kaikki tiedostot</translation>
     </message>
     <message>
         <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="66"/>
-        <source>Subsurface files</source>
-        <translation>Subsurfacen tiedostot</translation>
-    </message>
-    <message>
-        <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="65"/>
         <source>Open Subsurface files</source>
         <translation>Avaa Subsurfacen tiedostot</translation>
     </message>
+    <message>
+        <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="67"/>
+        <source>Subsurface files</source>
+        <translation>Subsurfacen tiedostot</translation>
+    </message>
 </context>
 <context>
     <name>StartPage</name>
     <message>
-        <location filename="../mobile-widgets/qml/StartPage.qml" line="37"/>
+        <location filename="../mobile-widgets/qml/StartPage.qml" line="34"/>
         <source>To use Subsurface-mobile with Subsurface cloud storage, please enter your cloud credentials.&lt;br/&gt;&lt;br/&gt;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).&lt;br/&gt;&lt;br/&gt;To use Subsurface-mobile only with local data on this device, select the no cloud button above.</source>
         <translation>Käyttääksesi Subsurface-mobiilia pilvitallennustilan kanssa, syötä käyttäjätunnuksesi ja salasanasi. &lt;br/&gt;&lt;br/&gt;Mikäli tämä on ensimmäinen kerta, kun käytät Subsurfacen pilvitallennusta, syötä sähköpostiosoitteesi (kaikki pieniä kirjaimia) ja haluamasi salasana (kirjaimia ja numeroita). &lt;br/&gt;&lt;br/&gt;Käyttääksesi Subsurface-mobiilia pelkästään paikallisella tallennuksella, valitse ei-pilveä -painike.</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/StartPage.qml" line="50"/>
+        <location filename="../mobile-widgets/qml/StartPage.qml" line="47"/>
         <source>Thank you for registering with Subsurface. We sent &lt;b&gt;%1&lt;/b&gt; a PIN code to complete the registration. If you do not receive an email from us within 15 minutes, please check the correct spelling of your email address and your spam box first.&lt;br/&gt;&lt;br/&gt;In case of any problems regarding cloud account setup, please contact us at our user forum (https://subsurface-divelog.org/user-forum/).&lt;br/&gt;&lt;br/&gt;</source>
         <translation>Kiitoksia Subsurfacen rekisteröinnistä. Lähetimme &lt;b&gt; %1 &lt;/b&gt; PIN-koodin rekisteröinnin viimeistelemiseksi. Jos et saa viestiä 15 minuutin sisällä, tarkista sähköpostiosoitteesi ja spam-kansiosi. &lt;br/&gt;&lt;br/&gt;Mikäli sinulla on ongelmia pilvitallennuksen kanssa, otathan yhteyttä käyttäjä-foorumilla (https://subsurface-divelog.org/user-forum/). &lt;br/&gt;&lt;br/&gt;</translation>
     </message>
@@ -8706,25 +9896,45 @@ Files with inappropriate date/time</source>
         <translation>Varusteet</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.cpp" line="48"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.ui" line="74"/>
+        <source>Suit</source>
+        <translation>Puku</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.cpp" line="53"/>
         <source>Cylinders</source>
         <translation>Säiliöt</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.cpp" line="49"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.cpp" line="54"/>
         <source>Add cylinder</source>
         <translation>Lisää säiliö</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.cpp" line="52"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.cpp" line="57"/>
         <source>Weights</source>
         <translation>Painot</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.cpp" line="53"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.cpp" line="58"/>
         <source>Add weight system</source>
         <translation>Lisää painojärjestelmä</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.cpp" line="61"/>
+        <source>OK</source>
+        <translation>OK</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.cpp" line="65"/>
+        <source>Undo</source>
+        <translation>Peruuta</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.cpp" line="275"/>
+        <source>Warning: edited %1 dives</source>
+        <translation>Varoitus: muokattu %1 sukellusta</translation>
+    </message>
 </context>
 <context>
     <name>TabDiveExtraInfo</name>
@@ -8744,120 +9954,259 @@ Files with inappropriate date/time</source>
         <translation>Tiedot</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="59"/>
-        <location filename="../subsurface/desktop-widgets/ui_TabDiveInformation.h" line="298"/>
-        <source>Date</source>
-        <translation>Ajankohta</translation>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="63"/>
+        <source>DIVE</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="71"/>
+        <source>Dive mode</source>
+        <translation>Sukellustyyppi</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="78"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="95"/>
         <location filename="../subsurface/desktop-widgets/ui_TabDiveInformation.h" line="300"/>
         <source>Interval</source>
         <translation>Pinta-aika</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="97"/>
-        <location filename="../subsurface/desktop-widgets/ui_TabDiveInformation.h" line="302"/>
-        <source>Gases used</source>
-        <translation>Käytetyt seokset</translation>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="123"/>
+        <source>Duration</source>
+        <translation>Kesto</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="151"/>
+        <location filename="../subsurface/desktop-widgets/ui_TabDiveInformation.h" line="312"/>
+        <source>Max. depth</source>
+        <translation>Suurin syvyys</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="180"/>
+        <location filename="../subsurface/desktop-widgets/ui_TabDiveInformation.h" line="314"/>
+        <source>Avg. depth</source>
+        <translation>Keskisyvyys</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="209"/>
+        <source>GAS</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="116"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="217"/>
+        <source>Gas name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="245"/>
         <location filename="../subsurface/desktop-widgets/ui_TabDiveInformation.h" line="304"/>
         <source>Gas consumed</source>
         <translation>Kaasun kulutus</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="135"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="273"/>
         <location filename="../subsurface/desktop-widgets/ui_TabDiveInformation.h" line="306"/>
         <source>SAC</source>
         <translation>Pintakulutus</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="154"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="301"/>
         <location filename="../subsurface/desktop-widgets/ui_TabDiveInformation.h" line="308"/>
         <source>CNS</source>
         <translation>Happikertymä (CNS)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="173"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="329"/>
         <location filename="../subsurface/desktop-widgets/ui_TabDiveInformation.h" line="310"/>
         <source>OTU</source>
         <translation>Happikertymä (OTU)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="192"/>
-        <location filename="../subsurface/desktop-widgets/ui_TabDiveInformation.h" line="312"/>
-        <source>Max. depth</source>
-        <translation>Suurin syvyys</translation>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="364"/>
+        <source>ENVIRONMENT</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="211"/>
-        <location filename="../subsurface/desktop-widgets/ui_TabDiveInformation.h" line="314"/>
-        <source>Avg. depth</source>
-        <translation>Keskisyvyys</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="231"/>
-        <source>Atm. pressure</source>
-        <translation>Ilmakehän paine</translation>
-    </message>
-    <message>
-        <location filename="../subsurface/desktop-widgets/ui_TabDiveInformation.h" line="316"/>
-        <source>Air pressure</source>
-        <translation>Ilmanpaine</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="261"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="372"/>
         <location filename="../subsurface/desktop-widgets/ui_TabDiveInformation.h" line="318"/>
         <source>Air temp.</source>
         <translation>Ilman lämpötila</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="280"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="401"/>
         <location filename="../subsurface/desktop-widgets/ui_TabDiveInformation.h" line="320"/>
         <source>Water temp.</source>
         <translation>Veden lämpötila</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="299"/>
-        <location filename="../subsurface/desktop-widgets/ui_TabDiveInformation.h" line="322"/>
-        <source>Dive time</source>
-        <translation>Sukellusaika</translation>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="436"/>
+        <source>Water type/Density</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="318"/>
-        <location filename="../subsurface/desktop-widgets/ui_TabDiveInformation.h" line="324"/>
-        <source>Water type</source>
-        <translation>Vesityyppi</translation>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="473"/>
+        <source>Atm. pressure/Altitude</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="506"/>
+        <source>Surface waves</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="537"/>
+        <source>Large</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="544"/>
+        <source>Small</source>
+        <translation>Pieni</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="555"/>
+        <source>Visibility</source>
+        <translation>Näkyvyys</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="75"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="586"/>
+        <source>Bad</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="593"/>
+        <source>Good</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="604"/>
+        <source>Current</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="635"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="684"/>
+        <source>Strong</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="642"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="691"/>
+        <source>Weak</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="653"/>
+        <source>Surge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="702"/>
+        <source>Chill</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="733"/>
+        <source>Freezing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="740"/>
+        <source>Comfy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="26"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="30"/>
+        <source>use dc</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="30"/>
+        <source>Fresh</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="30"/>
+        <source>Salty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="30"/>
+        <source>Salt</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="56"/>
+        <source>OK</source>
+        <translation>OK</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="59"/>
+        <source>Undo</source>
+        <translation>Peruuta</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="103"/>
+        <source>Warning: edited %1 dives</source>
+        <translation>Varoitus: muokattu %1 sukellusta</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="151"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="81"/>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="103"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="158"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="176"/>
         <source>h</source>
         <translation>t</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="81"/>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="103"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="158"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="176"/>
         <source>min</source>
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="81"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="158"/>
         <source>sec</source>
         <translation>sek</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="103"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="176"/>
         <source>d</source>
         <translation>p</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="255"/>
+        <source>unknown</source>
+        <translation>tuntematon</translation>
+    </message>
+    <message>
+        <location filename="../subsurface/desktop-widgets/ui_TabDiveInformation.h" line="298"/>
+        <source>Date</source>
+        <translation>Ajankohta</translation>
+    </message>
+    <message>
+        <location filename="../subsurface/desktop-widgets/ui_TabDiveInformation.h" line="302"/>
+        <source>Gases used</source>
+        <translation>Käytetyt seokset</translation>
+    </message>
+    <message>
+        <location filename="../subsurface/desktop-widgets/ui_TabDiveInformation.h" line="316"/>
+        <source>Air pressure</source>
+        <translation>Ilmanpaine</translation>
+    </message>
+    <message>
+        <location filename="../subsurface/desktop-widgets/ui_TabDiveInformation.h" line="322"/>
+        <source>Dive time</source>
+        <translation>Sukellusaika</translation>
+    </message>
+    <message>
+        <location filename="../subsurface/desktop-widgets/ui_TabDiveInformation.h" line="324"/>
+        <source>Water type</source>
+        <translation>Vesityyppi</translation>
+    </message>
 </context>
 <context>
     <name>TabDivePhotos</name>
@@ -8923,7 +10272,7 @@ Files with inappropriate date/time</source>
     <name>TabDiveSite</name>
     <message>
         <location filename="../desktop-widgets/tab-widgets/TabDiveSite.ui" line="14"/>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveSite.cpp" line="14"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveSite.cpp" line="15"/>
         <source>Dive sites</source>
         <translation>Sukelluskohteet</translation>
     </message>
@@ -8933,7 +10282,18 @@ Files with inappropriate date/time</source>
         <translation>Poista käyttämättömät sukelluskohteet</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveSite.cpp" line="52"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveSite.cpp" line="56"/>
+        <source>Delete dive site?</source>
+        <translation>Poistetaanko sukelluskohde?</translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../desktop-widgets/tab-widgets/TabDiveSite.cpp" line="57"/>
+        <source>This dive site has %n dive(s). Do you really want to delete it?
+</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveSite.cpp" line="74"/>
         <source>New dive site</source>
         <translation>Uusi sukelluskohde</translation>
     </message>
@@ -8947,15 +10307,15 @@ Files with inappropriate date/time</source>
         <translation>Tilastot</translation>
     </message>
     <message>
-        <location filename="../subsurface/desktop-widgets/ui_TabDiveStatistics.h" line="195"/>
-        <source>Depth</source>
-        <translation>Syvyys</translation>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="73"/>
+        <source>Max. depth</source>
+        <translation>Suurin syvyys</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="128"/>
-        <location filename="../subsurface/desktop-widgets/ui_TabDiveStatistics.h" line="200"/>
-        <source>Duration</source>
-        <translation>Kesto</translation>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="85"/>
+        <location filename="../subsurface/desktop-widgets/ui_TabDiveStatistics.h" line="196"/>
+        <source>SAC</source>
+        <translation>Pintakulutus</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="97"/>
@@ -8964,29 +10324,24 @@ Files with inappropriate date/time</source>
         <translation>Lämpötila</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="73"/>
-        <source>Max. depth</source>
-        <translation>Suurin syvyys</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="109"/>
         <location filename="../subsurface/desktop-widgets/ui_TabDiveStatistics.h" line="198"/>
         <source>Total time</source>
         <translation>Kokonaisaika</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="128"/>
+        <location filename="../subsurface/desktop-widgets/ui_TabDiveStatistics.h" line="200"/>
+        <source>Duration</source>
+        <translation>Kesto</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="140"/>
         <location filename="../subsurface/desktop-widgets/ui_TabDiveStatistics.h" line="201"/>
         <source>Dives</source>
         <translation>Sukelluksia</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="85"/>
-        <location filename="../subsurface/desktop-widgets/ui_TabDiveStatistics.h" line="196"/>
-        <source>SAC</source>
-        <translation>Pintakulutus</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="159"/>
         <location filename="../subsurface/desktop-widgets/ui_TabDiveStatistics.h" line="203"/>
         <source>Gas consumption</source>
@@ -9048,38 +10403,38 @@ Files with inappropriate date/time</source>
         <translation>Valittujen sukellusten keskimääräinen kesto</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="60"/>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="64"/>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="68"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="76"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="80"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="84"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="82"/>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="88"/>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="91"/>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="93"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="100"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="106"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="109"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="111"/>
         <source>h</source>
         <translation>t</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="82"/>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="88"/>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="91"/>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="93"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="100"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="106"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="109"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="111"/>
         <source>min</source>
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="82"/>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="88"/>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="91"/>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="93"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="100"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="106"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="109"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="111"/>
         <source>sec</source>
         <translation>sek</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="121"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="135"/>
         <source>These gases could be
 mixed from Air and using:
 </source>
@@ -9088,20 +10443,25 @@ sekoittaa ilmasta ja käyttäen:
 </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="123"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="137"/>
         <source>He</source>
         <translation>He</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="127"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="141"/>
         <source>and</source>
         <translation>ja</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="129"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="143"/>
         <source>O₂</source>
         <translation>O₂</translation>
     </message>
+    <message>
+        <location filename="../subsurface/desktop-widgets/ui_TabDiveStatistics.h" line="195"/>
+        <source>Depth</source>
+        <translation>Syvyys</translation>
+    </message>
 </context>
 <context>
     <name>TableView</name>
@@ -9345,33 +10705,50 @@ sekoittaa ilmasta ja käyttäen:
 <context>
     <name>TextHyperlinkEventFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="599"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="590"/>
         <source>%1click to visit %2</source>
         <translation>napauta %1 pohjassa avataksesi %2</translation>
     </message>
 </context>
 <context>
-    <name>ToolBarApplicationHeader</name>
+    <name>ToolTipItem</name>
     <message>
-        <location filename="../mobile-widgets/qml/kirigami/src/controls/ToolBarApplicationHeader.qml" line="126"/>
-        <source>More Actions</source>
-        <translation>Lisää tapahtumia</translation>
+        <location filename="../profile-widget/divetooltipitem.cpp" line="137"/>
+        <source>Information</source>
+        <translation>Tiedot</translation>
     </message>
 </context>
 <context>
-    <name>ToolBarPageHeader</name>
+    <name>TripDetails</name>
     <message>
-        <location filename="../mobile-widgets/qml/kirigami/src/controls/private/ToolBarPageHeader.qml" line="111"/>
-        <source>More Actions</source>
-        <translation>Lisää tapahtumia</translation>
+        <location filename="../mobile-widgets/qml/TripDetails.qml" line="15"/>
+        <source>Trip details</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>ToolTipItem</name>
     <message>
-        <location filename="../profile-widget/divetooltipitem.cpp" line="137"/>
-        <source>Information</source>
-        <translation>Tiedot</translation>
+        <location filename="../mobile-widgets/qml/TripDetails.qml" line="55"/>
+        <source>Save edits</source>
+        <translation>Tallenna muutokset</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/TripDetails.qml" line="62"/>
+        <source>Cancel edit</source>
+        <translation>Peru muutokset</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/TripDetails.qml" line="82"/>
+        <source>Edit trip details</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/TripDetails.qml" line="95"/>
+        <source>Trip location:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/TripDetails.qml" line="109"/>
+        <source>Trip notes</source>
+        <translation>Matkan muistiinpanot</translation>
     </message>
 </context>
 <context>
@@ -9487,18 +10864,18 @@ Mikäli et halua tarkistusta tehtävän, valitse kieltävä painike.</translatio
         <translation>Käyttäjäkysely</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/usersurvey.ui" line="168"/>
-        <location filename="../subsurface/desktop-widgets/ui_usersurvey.h" line="205"/>
-        <source>Subsurface user survey</source>
-        <translation>Subsurfacen käyttäjäkysely</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="20"/>
         <location filename="../subsurface/desktop-widgets/ui_usersurvey.h" line="193"/>
         <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;Haluaisimme tietää enemmän käyttäjistämme, heidän asetuksistaan ja tyypillisestä Subsurfacen käytöstä. Voisitko täyttää tämän lomakkeen ja lähettää sen Subsurfacen kehittäjille.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/usersurvey.ui" line="40"/>
+        <location filename="../subsurface/desktop-widgets/ui_usersurvey.h" line="194"/>
+        <source>What kind of diver are you?</source>
+        <translation>Millainen sukeltaja olet?</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="47"/>
         <location filename="../subsurface/desktop-widgets/ui_usersurvey.h" line="195"/>
         <source>Technical diver</source>
@@ -9517,6 +10894,12 @@ Mikäli et halua tarkistusta tehtävän, valitse kieltävä painike.</translatio
         <translation>Sukellussuunnittelija</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/usersurvey.ui" line="75"/>
+        <location filename="../subsurface/desktop-widgets/ui_usersurvey.h" line="198"/>
+        <source>Where are you importing data from?</source>
+        <translation>Mistä tuot tietoja?</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="82"/>
         <location filename="../subsurface/desktop-widgets/ui_usersurvey.h" line="199"/>
         <source>Supported dive computer</source>
@@ -9553,16 +10936,10 @@ Mikäli et halua tarkistusta tehtävän, valitse kieltävä painike.</translatio
         <translation>Järjestelmästäsi lähetetään myös seuraavat tiedot.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/usersurvey.ui" line="40"/>
-        <location filename="../subsurface/desktop-widgets/ui_usersurvey.h" line="194"/>
-        <source>What kind of diver are you?</source>
-        <translation>Millainen sukeltaja olet?</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/usersurvey.ui" line="75"/>
-        <location filename="../subsurface/desktop-widgets/ui_usersurvey.h" line="198"/>
-        <source>Where are you importing data from?</source>
-        <translation>Mistä tuot tietoja?</translation>
+        <location filename="../desktop-widgets/usersurvey.ui" line="168"/>
+        <location filename="../subsurface/desktop-widgets/ui_usersurvey.h" line="205"/>
+        <source>Subsurface user survey</source>
+        <translation>Subsurfacen käyttäjäkysely</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/usersurvey.cpp" line="19"/>
@@ -9652,13 +11029,13 @@ Kieli: %1</translation>
     <name>VideoFrameExtractor</name>
     <message>
         <location filename="../core/videoframeextractor.cpp" line="93"/>
-        <source>ffmpeg failed to start - video thumbnail creation suspended</source>
-        <translation>ffmpeg:n käynnistys epäonnistui - videokuvakkeiden luominen keskeytetty</translation>
+        <source>ffmpeg failed to start - video thumbnail creation suspended. To enable video thumbnailing, set working executable in preferences.</source>
+        <translation>Ffmpegin käynnistys ei onnistunut, joten videokuvakkeiden luonti kekseytetty. Saadaksesi videokuvakkeet käyttöön, konfiguroi toimiva konvertteri asetuksista.</translation>
     </message>
     <message>
-        <location filename="../core/videoframeextractor.cpp" line="99"/>
-        <source>failed waiting for ffmpeg - video thumbnail creation suspended</source>
-        <translation>ffmpeg:n odotus epäonnistui - videokuvakkeiden luominen keskeytetty</translation>
+        <location filename="../core/videoframeextractor.cpp" line="97"/>
+        <source>Failed waiting for ffmpeg - video thumbnail creation suspended. To enable video thumbnailing, set working executable in preferences.</source>
+        <translation>Ffmpeg:n odottaminen epäonnistui - videokuvakkeiden luonti keskeytetty. Saadaksesi videokuvakkeet käyttöön, konfiguroi toimiva kovertteri asetuksista.</translation>
     </message>
 </context>
 <context>
@@ -9725,12 +11102,12 @@ Kieli: %1</translation>
         <translation>Lähetä</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="329"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="80"/>
         <source>Operation timed out</source>
         <translation>Toimenpide ei valmistunut ajoissa</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="350"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="101"/>
         <source>Transferring data...</source>
         <translation>Tietoa siirretään...</translation>
     </message>
@@ -9738,12 +11115,12 @@ Kieli: %1</translation>
 <context>
     <name>WeightModel</name>
     <message>
-        <location filename="../qt-models/weightmodel.cpp" line="15"/>
+        <location filename="../qt-models/weightmodel.cpp" line="19"/>
         <source>Type</source>
         <translation>Tyyppi</translation>
     </message>
     <message>
-        <location filename="../qt-models/weightmodel.cpp" line="15"/>
+        <location filename="../qt-models/weightmodel.cpp" line="19"/>
         <source>Weight</source>
         <translation>Painot</translation>
     </message>
@@ -9756,15 +11133,15 @@ Kieli: %1</translation>
 <context>
     <name>WriteSettingsThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="2175"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="2198"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="2177"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="2200"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>Ominaisuus ei ole vielä saatavilla valitulle sukellustietokoneelle.</translation>
     </message>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="2177"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="2187"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="2195"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="2179"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="2189"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="2197"/>
         <source>Failed!</source>
         <translation>Epäonnistui!</translation>
     </message>
@@ -9772,17 +11149,17 @@ Kieli: %1</translation>
 <context>
     <name>YearStatisticsItem</name>
     <message>
-        <location filename="../qt-models/yearlystatisticsmodel.cpp" line="64"/>
+        <location filename="../qt-models/yearlystatisticsmodel.cpp" line="65"/>
         <source>h</source>
         <translation>t</translation>
     </message>
     <message>
-        <location filename="../qt-models/yearlystatisticsmodel.cpp" line="64"/>
+        <location filename="../qt-models/yearlystatisticsmodel.cpp" line="65"/>
         <source>min</source>
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../qt-models/yearlystatisticsmodel.cpp" line="64"/>
+        <location filename="../qt-models/yearlystatisticsmodel.cpp" line="65"/>
         <source>sec</source>
         <translation>sek</translation>
     </message>
@@ -9790,94 +11167,94 @@ Kieli: %1</translation>
 <context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-models/yearlystatisticsmodel.cpp" line="131"/>
+        <location filename="../qt-models/yearlystatisticsmodel.cpp" line="132"/>
         <source>Year 
  &gt; Month / Trip</source>
         <translation>Vuosi
 &gt; Kuukausi / Retki</translation>
     </message>
     <message>
-        <location filename="../qt-models/yearlystatisticsmodel.cpp" line="134"/>
+        <location filename="../qt-models/yearlystatisticsmodel.cpp" line="135"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-models/yearlystatisticsmodel.cpp" line="137"/>
+        <location filename="../qt-models/yearlystatisticsmodel.cpp" line="138"/>
         <source>Duration 
  Total</source>
         <translation>Kesto
 Kokonais</translation>
     </message>
     <message>
-        <location filename="../qt-models/yearlystatisticsmodel.cpp" line="140"/>
+        <location filename="../qt-models/yearlystatisticsmodel.cpp" line="141"/>
         <source>
 Average</source>
         <translation>
 Keskim.</translation>
     </message>
     <message>
-        <location filename="../qt-models/yearlystatisticsmodel.cpp" line="143"/>
+        <location filename="../qt-models/yearlystatisticsmodel.cpp" line="144"/>
         <source>
 Shortest</source>
         <translation>
 Lyhin</translation>
     </message>
     <message>
-        <location filename="../qt-models/yearlystatisticsmodel.cpp" line="146"/>
+        <location filename="../qt-models/yearlystatisticsmodel.cpp" line="147"/>
         <source>
 Longest</source>
         <translation>
 Pisin</translation>
     </message>
     <message>
-        <location filename="../qt-models/yearlystatisticsmodel.cpp" line="149"/>
+        <location filename="../qt-models/yearlystatisticsmodel.cpp" line="150"/>
         <source>Depth (%1)
  Average</source>
         <translation>Dyvyys (%1)
 Keski</translation>
     </message>
     <message>
-        <location filename="../qt-models/yearlystatisticsmodel.cpp" line="152"/>
+        <location filename="../qt-models/yearlystatisticsmodel.cpp" line="153"/>
         <source>
 Average maximum</source>
         <translation>
 Maksimien keskiarvo</translation>
     </message>
     <message>
-        <location filename="../qt-models/yearlystatisticsmodel.cpp" line="155"/>
-        <location filename="../qt-models/yearlystatisticsmodel.cpp" line="164"/>
-        <location filename="../qt-models/yearlystatisticsmodel.cpp" line="173"/>
+        <location filename="../qt-models/yearlystatisticsmodel.cpp" line="156"/>
+        <location filename="../qt-models/yearlystatisticsmodel.cpp" line="165"/>
+        <location filename="../qt-models/yearlystatisticsmodel.cpp" line="174"/>
         <source>
 Minimum</source>
         <translation>
 Alin</translation>
     </message>
     <message>
-        <location filename="../qt-models/yearlystatisticsmodel.cpp" line="158"/>
-        <location filename="../qt-models/yearlystatisticsmodel.cpp" line="167"/>
-        <location filename="../qt-models/yearlystatisticsmodel.cpp" line="176"/>
+        <location filename="../qt-models/yearlystatisticsmodel.cpp" line="159"/>
+        <location filename="../qt-models/yearlystatisticsmodel.cpp" line="168"/>
+        <location filename="../qt-models/yearlystatisticsmodel.cpp" line="177"/>
         <source>
 Maximum</source>
         <translation>
 Suurin</translation>
     </message>
     <message>
-        <location filename="../qt-models/yearlystatisticsmodel.cpp" line="161"/>
+        <location filename="../qt-models/yearlystatisticsmodel.cpp" line="162"/>
         <source>SAC (%1)
  Average</source>
         <translation>SAC (%1)
 Keski</translation>
     </message>
     <message>
-        <location filename="../qt-models/yearlystatisticsmodel.cpp" line="170"/>
+        <location filename="../qt-models/yearlystatisticsmodel.cpp" line="171"/>
         <source>Temp. (%1)
  Average</source>
         <translation>Lämpö (%1)
 Keski</translation>
     </message>
     <message>
-        <location filename="../qt-models/yearlystatisticsmodel.cpp" line="236"/>
-        <location filename="../qt-models/yearlystatisticsmodel.cpp" line="254"/>
+        <location filename="../qt-models/yearlystatisticsmodel.cpp" line="237"/>
+        <location filename="../qt-models/yearlystatisticsmodel.cpp" line="255"/>
         <source>%1 - %2</source>
         <translation>%1 - %2</translation>
     </message>
@@ -9885,7 +11262,7 @@ Keski</translation>
 <context>
     <name>getextFromC</name>
     <message>
-        <location filename="../core/libdivecomputer.c" line="801"/>
+        <location filename="../core/libdivecomputer.c" line="815"/>
         <source>Error parsing the header</source>
         <translation>Virhe otsaketietojen tulkinnassa</translation>
     </message>
@@ -9893,43 +11270,52 @@ Keski</translation>
 <context>
     <name>gettextFromC</name>
     <message>
+        <location filename="../backend-shared/exportfuncs.cpp" line="227"/>
+        <location filename="../backend-shared/exportfuncs.cpp" line="265"/>
+        <location filename="../core/save-html.c" line="486"/>
+        <location filename="../core/save-html.c" line="575"/>
+        <location filename="../core/worldmap-save.c" line="116"/>
+        <source>Can&apos;t open file %s</source>
+        <translation>Tiedoston avaus ei onnistu %s</translation>
+    </message>
+    <message>
         <location filename="../core/cochran.c" line="306"/>
         <location filename="../core/cochran.c" line="312"/>
         <location filename="../core/cochran.c" line="382"/>
-        <location filename="../core/libdivecomputer.c" line="244"/>
+        <location filename="../core/libdivecomputer.c" line="245"/>
         <source>deco stop</source>
         <translation>deko-pysähdys</translation>
     </message>
     <message>
         <location filename="../core/cochran.c" line="333"/>
         <location filename="../core/cochran.c" line="387"/>
-        <location filename="../core/import-csv.c" line="680"/>
-        <location filename="../core/libdivecomputer.c" line="246"/>
+        <location filename="../core/import-csv.c" line="701"/>
+        <location filename="../core/libdivecomputer.c" line="247"/>
         <source>ascent</source>
         <translation>nousu</translation>
     </message>
     <message>
         <location filename="../core/cochran.c" line="339"/>
-        <location filename="../core/import-csv.c" line="658"/>
+        <location filename="../core/import-csv.c" line="679"/>
         <source>battery</source>
         <translation>paristo</translation>
     </message>
     <message>
         <location filename="../core/cochran.c" line="345"/>
-        <location filename="../core/libdivecomputer.c" line="262"/>
+        <location filename="../core/libdivecomputer.c" line="263"/>
         <source>OLF</source>
         <translation>Happikertymä</translation>
     </message>
     <message>
         <location filename="../core/cochran.c" line="350"/>
-        <location filename="../core/libdivecomputer.c" line="261"/>
+        <location filename="../core/libdivecomputer.c" line="262"/>
         <source>maxdepth</source>
         <translation>Suurin syvyys</translation>
     </message>
     <message>
         <location filename="../core/cochran.c" line="355"/>
         <location filename="../core/cochran.c" line="401"/>
-        <location filename="../core/libdivecomputer.c" line="263"/>
+        <location filename="../core/libdivecomputer.c" line="264"/>
         <source>pO₂</source>
         <translation>pO₂</translation>
     </message>
@@ -9937,9 +11323,9 @@ Keski</translation>
         <location filename="../core/cochran.c" line="362"/>
         <location filename="../core/cochran.c" line="411"/>
         <location filename="../core/cochran.c" line="418"/>
-        <location filename="../core/import-csv.c" line="761"/>
-        <location filename="../core/libdivecomputer.c" line="254"/>
-        <location filename="../core/libdivecomputer.c" line="268"/>
+        <location filename="../core/import-csv.c" line="782"/>
+        <location filename="../core/libdivecomputer.c" line="255"/>
+        <location filename="../core/libdivecomputer.c" line="269"/>
         <location filename="../core/plannernotes.c" line="54"/>
         <source>gaschange</source>
         <translation>Kaasun vaihto</translation>
@@ -9947,829 +11333,755 @@ Keski</translation>
     <message>
         <location filename="../core/cochran.c" line="367"/>
         <location filename="../core/cochran.c" line="406"/>
-        <location filename="../core/libdivecomputer.c" line="245"/>
+        <location filename="../core/libdivecomputer.c" line="246"/>
         <source>rbt</source>
         <translation>pohja-aika</translation>
     </message>
     <message>
         <location filename="../core/cochran.c" line="376"/>
         <location filename="../core/cochran.c" line="423"/>
-        <location filename="../core/libdivecomputer.c" line="247"/>
+        <location filename="../core/libdivecomputer.c" line="248"/>
         <source>ceiling</source>
         <translation>katto</translation>
     </message>
     <message>
         <location filename="../core/cochran.c" line="392"/>
-        <location filename="../core/libdivecomputer.c" line="249"/>
+        <location filename="../core/libdivecomputer.c" line="250"/>
         <source>transmitter</source>
         <translation>lähetin</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="255"/>
+        <location filename="../core/datatrak.c" line="256"/>
         <source>clear</source>
         <translation>tyhjennä</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="258"/>
+        <location filename="../core/datatrak.c" line="259"/>
         <source>misty</source>
         <translation>sumuinen</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="261"/>
+        <location filename="../core/datatrak.c" line="262"/>
         <source>fog</source>
         <translation>sumu</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="264"/>
+        <location filename="../core/datatrak.c" line="265"/>
         <source>rain</source>
         <translation>sade</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="267"/>
+        <location filename="../core/datatrak.c" line="268"/>
         <source>storm</source>
         <translation>myrsky</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="270"/>
+        <location filename="../core/datatrak.c" line="271"/>
         <source>snow</source>
         <translation>lumi</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="290"/>
+        <location filename="../core/datatrak.c" line="291"/>
         <source>No suit</source>
         <translation>Ei pukua</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="293"/>
+        <location filename="../core/datatrak.c" line="294"/>
         <source>Shorty</source>
         <translation>lyhyt</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="296"/>
+        <location filename="../core/datatrak.c" line="297"/>
         <source>Combi</source>
         <translation>yhdistelmä</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="299"/>
+        <location filename="../core/datatrak.c" line="300"/>
         <source>Wet suit</source>
         <translation>Märkäpuku</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="302"/>
+        <location filename="../core/datatrak.c" line="303"/>
         <source>Semidry suit</source>
         <translation>Puolikuiva</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="305"/>
+        <location filename="../core/datatrak.c" line="306"/>
         <source>Dry suit</source>
         <translation>Kuivapuku</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="364"/>
+        <location filename="../core/datatrak.c" line="367"/>
         <source>no stop</source>
         <translation>ilman pysähdystä</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="366"/>
+        <location filename="../core/datatrak.c" line="369"/>
         <location filename="../core/tag.c" line="20"/>
         <source>deco</source>
         <translation>deko</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="368"/>
+        <location filename="../core/datatrak.c" line="371"/>
         <source>single ascent</source>
         <translation>yksittäinen nousu</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="370"/>
+        <location filename="../core/datatrak.c" line="373"/>
         <source>multiple ascent</source>
         <translation>useita nousuja</translation>
     </message>
     <message>
-        <location filename="../core/tag.c" line="18"/>
-        <source>fresh</source>
-        <translation>makea</translation>
-    </message>
-    <message>
-        <location filename="../core/datatrak.c" line="372"/>
+        <location filename="../core/datatrak.c" line="375"/>
         <source>fresh water</source>
         <translation>makea vesi</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="374"/>
+        <location filename="../core/datatrak.c" line="377"/>
         <source>salt water</source>
         <translation>suolavesi</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="395"/>
+        <location filename="../core/datatrak.c" line="398"/>
         <source>sight seeing</source>
         <translation>nähtävyydet</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="397"/>
+        <location filename="../core/datatrak.c" line="400"/>
         <source>club dive</source>
         <translation>seurasukellus</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="399"/>
+        <location filename="../core/datatrak.c" line="402"/>
         <location filename="../core/tag.c" line="19"/>
         <source>instructor</source>
         <translation>kouluttaja</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="401"/>
+        <location filename="../core/datatrak.c" line="404"/>
         <source>instruction</source>
         <translation>opastus</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="403"/>
+        <location filename="../core/datatrak.c" line="406"/>
         <location filename="../core/tag.c" line="18"/>
         <source>night</source>
         <translation>yö</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="405"/>
+        <location filename="../core/datatrak.c" line="408"/>
         <location filename="../core/tag.c" line="16"/>
         <source>cave</source>
         <translation>luola</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="407"/>
+        <location filename="../core/datatrak.c" line="410"/>
         <location filename="../core/tag.c" line="15"/>
         <source>ice</source>
         <translation>jää</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="409"/>
+        <location filename="../core/datatrak.c" line="412"/>
         <source>search</source>
         <translation>etsi</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="416"/>
+        <location filename="../core/datatrak.c" line="419"/>
         <location filename="../core/tag.c" line="16"/>
         <source>wreck</source>
         <translation>hylky</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="418"/>
+        <location filename="../core/datatrak.c" line="421"/>
         <location filename="../core/tag.c" line="17"/>
         <source>river</source>
         <translation>joki</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="420"/>
+        <location filename="../core/datatrak.c" line="423"/>
         <location filename="../core/tag.c" line="14"/>
         <source>drift</source>
         <translation>virta</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="422"/>
+        <location filename="../core/datatrak.c" line="425"/>
         <location filename="../core/tag.c" line="19"/>
         <source>photo</source>
         <translation>valokuva</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="424"/>
+        <location filename="../core/datatrak.c" line="427"/>
         <source>other</source>
         <translation>muu</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="434"/>
+        <location filename="../core/datatrak.c" line="437"/>
         <source>Other activities</source>
         <translation>Muut aktiviteetit</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="458"/>
+        <location filename="../core/datatrak.c" line="461"/>
         <source>Datatrak/Wlog notes</source>
         <translation>Datatrak/Wlog -muistiinpanot</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="502"/>
+        <location filename="../core/datatrak.c" line="504"/>
         <source>[Warning] Manual dive # %d
 </source>
         <translation>[Varoitus] Käsin syötetty sukellus # %d
 </translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="528"/>
+        <location filename="../core/datatrak.c" line="530"/>
         <source>[Error] Out of memory for dive %d. Abort parsing.</source>
         <translation>[Virhe] Muisti on loppu sukelluksella %d. Keskeytetään jäsentäminen.</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="576"/>
+        <location filename="../core/datatrak.c" line="578"/>
         <source>[Error] File is not a DataTrak file. Aborted</source>
         <translation>[Virhe] Tiedosto ei ole DataTrak-muodossa. Kekseytetty</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="589"/>
+        <location filename="../core/datatrak.c" line="591"/>
         <source>Error: no dive</source>
         <translation>Virhe: ei sukellusta</translation>
     </message>
     <message>
-        <location filename="../core/tag.c" line="14"/>
-        <source>boat</source>
-        <translation>vene</translation>
+        <location filename="../core/dive.c" line="30"/>
+        <source>Open circuit</source>
+        <translation>Avoin kierto</translation>
     </message>
     <message>
-        <location filename="../core/tag.c" line="14"/>
-        <source>shore</source>
-        <translation>ranta</translation>
+        <location filename="../core/dive.c" line="31"/>
+        <source>CCR</source>
+        <translation>CCR</translation>
     </message>
     <message>
-        <location filename="../core/tag.c" line="15"/>
-        <source>deep</source>
-        <translation>syvä</translation>
+        <location filename="../core/dive.c" line="32"/>
+        <source>pSCR</source>
+        <translation>pSCR</translation>
     </message>
     <message>
-        <location filename="../core/tag.c" line="15"/>
-        <source>cavern</source>
-        <translation>luola (cavern)</translation>
+        <location filename="../core/dive.c" line="33"/>
+        <source>Freedive</source>
+        <translation>Vapaasukellus</translation>
     </message>
     <message>
-        <location filename="../core/tag.c" line="16"/>
-        <source>altitude</source>
-        <translation>korkeus</translation>
+        <location filename="../core/divelist.c" line="619"/>
+        <location filename="../core/equipment.c" line="166"/>
+        <location filename="../core/planner.c" line="1174"/>
+        <location filename="../core/planner.c" line="1177"/>
+        <source>air</source>
+        <translation>ilma</translation>
     </message>
     <message>
-        <location filename="../core/tag.c" line="17"/>
-        <source>pool</source>
-        <translation>uima-allas</translation>
+        <location filename="../core/divelogexportlogic.cpp" line="57"/>
+        <location filename="../core/divelogexportlogic.cpp" line="95"/>
+        <location filename="../core/subsurface-qt/diveobjecthelper.cpp" line="266"/>
+        <location filename="../desktop-widgets/templatelayout.h" line="101"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="159"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="209"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="211"/>
+        <source>h</source>
+        <translation>t</translation>
     </message>
     <message>
-        <location filename="../core/tag.c" line="17"/>
-        <source>lake</source>
-        <translation>järvi</translation>
+        <location filename="../core/divelogexportlogic.cpp" line="57"/>
+        <location filename="../core/divelogexportlogic.cpp" line="95"/>
+        <location filename="../core/plannernotes.c" line="62"/>
+        <location filename="../core/plannernotes.c" line="523"/>
+        <location filename="../core/subsurface-qt/diveobjecthelper.cpp" line="266"/>
+        <location filename="../core/worldmap-save.c" line="49"/>
+        <location filename="../desktop-widgets/templatelayout.h" line="102"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="159"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="209"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="211"/>
+        <source>min</source>
+        <translation>min</translation>
     </message>
     <message>
-        <location filename="../core/tag.c" line="18"/>
-        <source>student</source>
-        <translation>oppilas</translation>
+        <location filename="../core/divelogexportlogic.cpp" line="57"/>
+        <location filename="../core/divelogexportlogic.cpp" line="95"/>
+        <location filename="../core/qthelper.h" line="73"/>
+        <location filename="../desktop-widgets/templatelayout.h" line="102"/>
+        <source>sec</source>
+        <translation>sek</translation>
     </message>
     <message>
-        <location filename="../core/tag.c" line="19"/>
-        <source>video</source>
-        <translation>video</translation>
+        <location filename="../core/divelogexportlogic.cpp" line="153"/>
+        <source>Cannot find a folder called &apos;theme&apos; in the standard locations</source>
+        <translation>Teema-hakemistoa ei löydy standardi-sijeinneista</translation>
+    </message>
+    <message>
+        <location filename="../core/divesite-helper.cpp" line="21"/>
+        <source>No dive site layout categories set in preferences!</source>
+        <translation>Asetuksissa ei ole sukelluskohteiden määrityksiä!</translation>
+    </message>
+    <message>
+        <location filename="../core/divesite-helper.cpp" line="29"/>
+        <location filename="../core/save-html.c" line="530"/>
+        <source>Tags</source>
+        <translation>Avainsanat</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="27"/>
+        <location filename="../core/equipment.c" line="66"/>
         <source>OC-gas</source>
         <translation>Vapaankierron seos</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="27"/>
+        <location filename="../core/equipment.c" line="66"/>
         <source>diluent</source>
         <translation>diluent</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="27"/>
-        <location filename="../core/equipment.c" line="92"/>
-        <location filename="../core/planner.c" line="1158"/>
-        <location filename="../core/planner.c" line="1161"/>
+        <location filename="../core/equipment.c" line="66"/>
+        <location filename="../core/equipment.c" line="170"/>
+        <location filename="../core/planner.c" line="1178"/>
+        <location filename="../core/planner.c" line="1181"/>
         <source>oxygen</source>
         <translation>happi</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="27"/>
+        <location filename="../core/equipment.c" line="66"/>
         <source>not used</source>
         <translation>käyttämättä</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="32"/>
-        <source>Open circuit</source>
-        <translation>Avoin kierto</translation>
-    </message>
-    <message>
-        <location filename="../core/units.c" line="14"/>
-        <source>pascal</source>
-        <translation>Pa</translation>
-    </message>
-    <message>
-        <location filename="../core/plannernotes.c" line="72"/>
-        <location filename="../core/plannernotes.c" line="73"/>
-        <location filename="../core/plannernotes.c" line="74"/>
-        <location filename="../core/qthelper.cpp" line="622"/>
-        <location filename="../core/qthelper.cpp" line="814"/>
-        <location filename="../core/qthelper.cpp" line="1252"/>
-        <location filename="../core/units.c" line="19"/>
-        <source>bar</source>
-        <translation>bar</translation>
-    </message>
-    <message>
-        <location filename="../core/qthelper.cpp" line="625"/>
-        <location filename="../core/qthelper.cpp" line="816"/>
-        <location filename="../core/qthelper.cpp" line="1251"/>
-        <location filename="../core/units.c" line="23"/>
-        <source>psi</source>
-        <translation>psi</translation>
-    </message>
-    <message>
-        <location filename="../core/units.c" line="60"/>
-        <source>ℓ</source>
-        <translation>ℓ</translation>
-    </message>
-    <message>
-        <location filename="../core/qthelper.cpp" line="1275"/>
-        <location filename="../core/units.c" line="65"/>
-        <source>cuft</source>
-        <translation>ft³</translation>
-    </message>
-    <message>
-        <location filename="../core/qthelper.cpp" line="538"/>
-        <location filename="../core/qthelper.cpp" line="553"/>
-        <location filename="../core/qthelper.cpp" line="732"/>
-        <location filename="../core/qthelper.cpp" line="1227"/>
-        <location filename="../core/units.c" line="106"/>
-        <source>m</source>
-        <translation>m</translation>
-    </message>
-    <message>
-        <location filename="../core/qthelper.cpp" line="541"/>
-        <location filename="../core/qthelper.cpp" line="555"/>
-        <location filename="../core/qthelper.cpp" line="734"/>
-        <location filename="../core/qthelper.cpp" line="1226"/>
-        <location filename="../core/units.c" line="111"/>
-        <source>ft</source>
-        <translation>ft</translation>
-    </message>
-    <message>
-        <location filename="../core/units.c" line="134"/>
-        <source>m/min</source>
-        <translation>m/min</translation>
-    </message>
-    <message>
-        <location filename="../core/units.c" line="136"/>
-        <source>m/s</source>
-        <translation>m/s</translation>
-    </message>
-    <message>
-        <location filename="../core/units.c" line="141"/>
-        <source>ft/min</source>
-        <translation>ft/min</translation>
-    </message>
-    <message>
-        <location filename="../core/units.c" line="143"/>
-        <source>ft/s</source>
-        <translation>ft/s</translation>
-    </message>
-    <message>
-        <location filename="../core/qthelper.cpp" line="564"/>
-        <location filename="../core/qthelper.cpp" line="574"/>
-        <location filename="../core/qthelper.cpp" line="789"/>
-        <location filename="../core/qthelper.cpp" line="1203"/>
-        <location filename="../core/units.c" line="162"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="132"/>
-        <source>lbs</source>
-        <translation>pauna</translation>
-    </message>
-    <message>
-        <location filename="../core/qthelper.cpp" line="562"/>
-        <location filename="../core/qthelper.cpp" line="572"/>
-        <location filename="../core/qthelper.cpp" line="787"/>
-        <location filename="../core/qthelper.cpp" line="1202"/>
-        <location filename="../core/units.c" line="166"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="130"/>
-        <source>kg</source>
-        <translation>kg</translation>
-    </message>
-    <message>
-        <location filename="../core/divelist.c" line="678"/>
-        <location filename="../core/equipment.c" line="88"/>
-        <location filename="../core/planner.c" line="1154"/>
-        <location filename="../core/planner.c" line="1157"/>
-        <source>air</source>
-        <translation>ilma</translation>
-    </message>
-    <message>
-        <location filename="../core/equipment.c" line="90"/>
+        <location filename="../core/equipment.c" line="168"/>
         <source>EAN%d</source>
         <translation>EAN%d</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="205"/>
+        <location filename="../core/equipment.c" line="276"/>
         <source>integrated</source>
         <translation>integroitu</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="206"/>
+        <location filename="../core/equipment.c" line="277"/>
         <source>belt</source>
         <translation>vyöpaino</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="207"/>
+        <location filename="../core/equipment.c" line="278"/>
         <source>ankle</source>
         <translation>nilkkapaino</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="208"/>
+        <location filename="../core/equipment.c" line="279"/>
         <source>backplate</source>
         <translation>selkälevy</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="209"/>
+        <location filename="../core/equipment.c" line="280"/>
         <source>clip-on</source>
         <translation>clip-on</translation>
     </message>
     <message>
-        <location filename="../core/file.c" line="116"/>
+        <location filename="../core/file.c" line="117"/>
         <source>No dives in the input file &apos;%s&apos;</source>
         <translation>Tiedostosta &apos;%s&apos; ei löytynyt yhtään sukellusta</translation>
     </message>
     <message>
-        <location filename="../core/file.c" line="334"/>
-        <location filename="../core/import-csv.c" line="118"/>
-        <location filename="../core/import-csv.c" line="356"/>
-        <location filename="../core/import-csv.c" line="499"/>
-        <location filename="../core/import-csv.c" line="839"/>
-        <location filename="../core/ostctools.c" line="53"/>
-        <source>Failed to read &apos;%s&apos;</source>
-        <translation>Tiedoston &apos;%s&apos; avaaminen epäonnistui</translation>
-    </message>
-    <message>
-        <location filename="../core/file.c" line="221"/>
+        <location filename="../core/file.c" line="222"/>
         <source>Cannot open CSV file %s; please use Import log file dialog</source>
         <comment>'Import log file' should be the same text as corresponding label in Import menu</comment>
         <translation>CSV -tiedoston %s avaus epäonnistui; käytä Tuonti -dialogia</translation>
     </message>
     <message>
-        <location filename="../core/file.c" line="336"/>
-        <source>Empty file &apos;%s&apos;</source>
-        <translation>Tyhjä tiedosto &apos;%s&apos;</translation>
-    </message>
-    <message>
-        <location filename="../core/import-csv.c" line="597"/>
-        <source>Poseidon import failed: unable to read &apos;%s&apos;</source>
-        <translation>Poseidon -tuonti epäonnistui: tiedoston &apos;%s&apos; luku epäonnistui</translation>
-    </message>
-    <message>
-        <location filename="../core/import-csv.c" line="633"/>
-        <source>Mouth piece position OC</source>
-        <translation>Suukappaleen asema (avoin kierto)</translation>
-    </message>
-    <message>
-        <location filename="../core/import-csv.c" line="637"/>
-        <source>Mouth piece position CC</source>
-        <translation>Suukappaleen asento (suljettu kierto)</translation>
-    </message>
-    <message>
-        <location filename="../core/import-csv.c" line="641"/>
-        <source>Mouth piece position unknown</source>
-        <translation>Suukappaleen asento tuntematon</translation>
-    </message>
-    <message>
-        <location filename="../core/import-csv.c" line="645"/>
-        <source>Mouth piece position not connected</source>
-        <translation>Suukappale ei kytketty</translation>
-    </message>
-    <message>
-        <location filename="../core/import-csv.c" line="652"/>
-        <source>Power off</source>
-        <translation>Sammuta</translation>
-    </message>
-    <message>
-        <location filename="../core/import-csv.c" line="702"/>
-        <source>O₂ calibration failed</source>
-        <translation>Happikalibrointi epäonnistui</translation>
-    </message>
-    <message>
-        <location filename="../core/import-csv.c" line="704"/>
-        <location filename="../core/import-csv.c" line="713"/>
-        <source>O₂ calibration</source>
-        <translation>Happikalibrointi</translation>
+        <location filename="../core/file.c" line="335"/>
+        <location filename="../core/import-csv.c" line="118"/>
+        <location filename="../core/import-csv.c" line="357"/>
+        <location filename="../core/import-csv.c" line="519"/>
+        <location filename="../core/import-csv.c" line="860"/>
+        <location filename="../core/ostctools.c" line="55"/>
+        <source>Failed to read &apos;%s&apos;</source>
+        <translation>Tiedoston &apos;%s&apos; avaaminen epäonnistui</translation>
     </message>
     <message>
-        <location filename="../core/import-csv.c" line="229"/>
-        <source>No dive profile found from &apos;%s&apos;</source>
-        <translation>Sukellusprofiilia ei löytynyt &apos;%s&apos;:sta</translation>
+        <location filename="../core/file.c" line="337"/>
+        <source>Empty file &apos;%s&apos;</source>
+        <translation>Tyhjä tiedosto &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="83"/>
+        <location filename="../core/git-access.c" line="85"/>
         <source>Checkout from storage (%lu/%lu)</source>
         <translation>Ladattu tallennustilasta (%lu/%lu)</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="114"/>
+        <location filename="../core/git-access.c" line="116"/>
         <source>Transfer from storage (%d/%d)</source>
         <translation>Siirrä tallennustilasta (%d/%d)</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="126"/>
+        <location filename="../core/git-access.c" line="128"/>
         <source>Transfer to storage (%d/%d)</source>
         <translation>Siirrä tallennustilaan (%d/%d)</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="162"/>
+        <location filename="../core/git-access.c" line="164"/>
         <source>Local cache directory %s corrupted - can&apos;t sync with Subsurface cloud storage</source>
         <translation>Paikallinen välimuistihakemisto %s on korruptoitunut - synkronointi Subsurfacen pilvitallennustilaan ei onnistu</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="185"/>
-        <location filename="../core/git-access.c" line="205"/>
+        <location filename="../core/git-access.c" line="187"/>
+        <location filename="../core/git-access.c" line="207"/>
         <source>Could not update local cache to newer remote data</source>
         <translation>Paikallisen kopion päivitys uudempaan etäversioon epäonnistui</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="198"/>
+        <location filename="../core/git-access.c" line="200"/>
         <source>Subsurface cloud storage corrupted</source>
         <translation>Virhe: Subsurfacen pilvitallennustila on korruptoitunut</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="334"/>
+        <location filename="../core/git-access.c" line="336"/>
         <source>Could not update Subsurface cloud storage, try again later</source>
         <translation>Virhe: Subsurfacen pilvitallennustilan päivitys epäonnistui, yritä myöhemmin uudelleen</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="394"/>
+        <location filename="../core/git-access.c" line="396"/>
         <source>Remote storage and local data diverged. Error: merge failed (%s)</source>
         <translation>Etä- ja paikallinen tallennus eroavat toisistaan. Error: merge failed (%s)</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="424"/>
+        <location filename="../core/git-access.c" line="426"/>
         <source>Remote storage and local data diverged. Cannot combine local and remote changes</source>
         <translation>Virhe: paikallinen- ja pilvitadata eroavat toisistaan. Emme voi yhdistää näitä keskenään</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="458"/>
+        <location filename="../core/git-access.c" line="460"/>
         <source>Remote storage and local data diverged</source>
         <translation>Virhe: paikallinen ja pilvidata eroavat toisistaan</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="461"/>
+        <location filename="../core/git-access.c" line="463"/>
         <source>Remote storage and local data diverged. Error: writing the data failed (%s)</source>
         <translation>Paikallinen ja pilvidata eroavat toisistaan. Virhe: tiedon tallennus epäonnistui (%s)</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="470"/>
+        <location filename="../core/git-access.c" line="472"/>
         <source>Problems with local cache of Subsurface cloud data</source>
         <translation>Virhe: ongelmia paikallisen pilvidatan kopion kanssa</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="471"/>
+        <location filename="../core/git-access.c" line="473"/>
         <source>Moved cache data to %s. Please try the operation again.</source>
         <translation>Paikallinen kopio siirretty %s. Ole hyvä ja yritä toimintoa uudelleen.</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="518"/>
+        <location filename="../core/git-access.c" line="520"/>
         <source>Update local storage to match cloud storage</source>
         <translation>Päivitä paikallinen tallennustila vastaamaan pilvipalvelua</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="526"/>
+        <location filename="../core/git-access.c" line="528"/>
         <source>Push local changes to cloud storage</source>
         <translation>Tallenna paikalliset muutokset pilvitallennustilaan</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="544"/>
+        <location filename="../core/git-access.c" line="546"/>
         <source>Try to merge local changes into cloud storage</source>
         <translation>Yritä yhdistää paikalliset muutokset pilvitallennustilaan</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="586"/>
+        <location filename="../core/git-access.c" line="588"/>
         <source>Store data into cloud storage</source>
         <translation>Tallenna tiedot pilvitallennustilaan</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="610"/>
+        <location filename="../core/git-access.c" line="612"/>
         <source>Sync with cloud storage</source>
         <translation>Synkronoi pilvitallennustila</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="637"/>
+        <location filename="../core/git-access.c" line="639"/>
         <source>Can&apos;t reach cloud server, working with local data</source>
         <translation>Lukeminen pilvitallennustilasta epäonnistui, käytetään paikallista dataa</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="650"/>
+        <location filename="../core/git-access.c" line="652"/>
         <source>Successful cloud connection, fetch remote</source>
         <translation>Onnistunut yhteys pilvitallennustilaan, haetaan tiedot</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="669"/>
+        <location filename="../core/git-access.c" line="671"/>
         <source>Done syncing with cloud storage</source>
         <translation>Synkronointi pilvitallennustilaan valmis</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="804"/>
+        <location filename="../core/git-access.c" line="806"/>
         <source>Error connecting to Subsurface cloud storage</source>
         <translation>Virhe: yhteys Subsurfacen pilvitallennustilaan</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="807"/>
+        <location filename="../core/git-access.c" line="809"/>
         <source>git clone of %s failed (%s)</source>
         <translation>lokin %s haku epäonnistui (%s)</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="833"/>
+        <location filename="../core/git-access.c" line="835"/>
         <source>Synchronising data file</source>
         <translation>Synkronoidaan tiedot</translation>
     </message>
     <message>
-        <location filename="../core/import-divinglog.c" line="315"/>
-        <location filename="../core/libdivecomputer.c" line="230"/>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="31"/>
-        <location filename="../core/uemis-downloader.c" line="197"/>
+        <location filename="../core/gpslocation.h" line="14"/>
+        <source>Waiting to aquire GPS location</source>
+        <translation>Odotetaan GPS -sijaintia</translation>
+    </message>
+    <message>
+        <location filename="../core/import-csv.c" line="229"/>
+        <source>No dive profile found from &apos;%s&apos;</source>
+        <translation>Sukellusprofiilia ei löytynyt &apos;%s&apos;:sta</translation>
+    </message>
+    <message>
+        <location filename="../core/import-csv.c" line="618"/>
+        <source>Poseidon import failed: unable to read &apos;%s&apos;</source>
+        <translation>Poseidon -tuonti epäonnistui: tiedoston &apos;%s&apos; luku epäonnistui</translation>
+    </message>
+    <message>
+        <location filename="../core/import-csv.c" line="654"/>
+        <source>Mouth piece position OC</source>
+        <translation>Suukappaleen asema (avoin kierto)</translation>
+    </message>
+    <message>
+        <location filename="../core/import-csv.c" line="658"/>
+        <source>Mouth piece position CC</source>
+        <translation>Suukappaleen asento (suljettu kierto)</translation>
+    </message>
+    <message>
+        <location filename="../core/import-csv.c" line="662"/>
+        <source>Mouth piece position unknown</source>
+        <translation>Suukappaleen asento tuntematon</translation>
+    </message>
+    <message>
+        <location filename="../core/import-csv.c" line="666"/>
+        <source>Mouth piece position not connected</source>
+        <translation>Suukappale ei kytketty</translation>
+    </message>
+    <message>
+        <location filename="../core/import-csv.c" line="673"/>
+        <source>Power off</source>
+        <translation>Sammuta</translation>
+    </message>
+    <message>
+        <location filename="../core/import-csv.c" line="723"/>
+        <source>O₂ calibration failed</source>
+        <translation>Happikalibrointi epäonnistui</translation>
+    </message>
+    <message>
+        <location filename="../core/import-csv.c" line="725"/>
+        <location filename="../core/import-csv.c" line="734"/>
+        <source>O₂ calibration</source>
+        <translation>Happikalibrointi</translation>
+    </message>
+    <message>
+        <location filename="../core/import-divinglog.c" line="306"/>
+        <location filename="../core/libdivecomputer.c" line="229"/>
+        <location filename="../core/subsurface-qt/diveobjecthelper.cpp" line="39"/>
+        <location filename="../core/uemis-downloader.c" line="199"/>
         <source>unknown</source>
         <translation>tuntematon</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="243"/>
+        <location filename="../core/libdivecomputer.c" line="244"/>
         <source>none</source>
         <translation>ei mitään</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="248"/>
+        <location filename="../core/libdivecomputer.c" line="249"/>
         <source>workload</source>
         <translation>työmäärä</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="250"/>
+        <location filename="../core/libdivecomputer.c" line="251"/>
         <source>violation</source>
         <translation>rike</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="251"/>
+        <location filename="../core/libdivecomputer.c" line="252"/>
         <source>bookmark</source>
         <translation>kirjanmerkki</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="252"/>
+        <location filename="../core/libdivecomputer.c" line="253"/>
         <source>surface</source>
         <translation>pinta</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="253"/>
+        <location filename="../core/libdivecomputer.c" line="254"/>
         <source>safety stop</source>
         <translation>turvapysähdys</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="255"/>
+        <location filename="../core/libdivecomputer.c" line="256"/>
         <source>safety stop (voluntary)</source>
         <translation>turvapysähdys (vapaaehtoinen)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="256"/>
+        <location filename="../core/libdivecomputer.c" line="257"/>
         <source>safety stop (mandatory)</source>
         <translation>turvapysähdys (pakollinen)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="257"/>
+        <location filename="../core/libdivecomputer.c" line="258"/>
         <source>deepstop</source>
         <translation>syväpysähdys</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="258"/>
+        <location filename="../core/libdivecomputer.c" line="259"/>
         <source>ceiling (safety stop)</source>
         <translation>katto (turvapysähdys)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="259"/>
+        <location filename="../core/libdivecomputer.c" line="260"/>
         <source>below floor</source>
         <comment>event showing dive is below deco floor and adding deco time</comment>
         <translation>liian syvällä</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="260"/>
+        <location filename="../core/libdivecomputer.c" line="261"/>
         <source>divetime</source>
         <translation>sukellusaika</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="264"/>
+        <location filename="../core/libdivecomputer.c" line="265"/>
         <source>airtime</source>
         <translation>Ilma-aika</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="265"/>
+        <location filename="../core/libdivecomputer.c" line="266"/>
         <source>rgbm</source>
         <translation>rgbm</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="266"/>
+        <location filename="../core/libdivecomputer.c" line="267"/>
         <source>heading</source>
         <translation>suunta</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="267"/>
+        <location filename="../core/libdivecomputer.c" line="268"/>
         <source>tissue level warning</source>
         <translation>kudoskertymän varoitus</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="277"/>
+        <location filename="../core/libdivecomputer.c" line="278"/>
         <source>invalid event number</source>
         <translation>tuntematon tapahtumanumero</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="613"/>
+        <location filename="../core/libdivecomputer.c" line="626"/>
         <source>Error parsing the datetime</source>
         <translation>Virhe ajan jäsentämisessä</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="631"/>
+        <location filename="../core/libdivecomputer.c" line="644"/>
         <source>Dive %d: %s</source>
         <translation>Sukellus %d: %s</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="637"/>
+        <location filename="../core/libdivecomputer.c" line="650"/>
         <source>Error parsing the divetime</source>
         <translation>Virhe sukelluksen keston jäsentämisessä</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="647"/>
+        <location filename="../core/libdivecomputer.c" line="660"/>
         <source>Error parsing the maxdepth</source>
         <translation>Virhe maksimisyvyyden jäsentämisessä</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="661"/>
+        <location filename="../core/libdivecomputer.c" line="674"/>
         <source>Error parsing temperature</source>
         <translation>Virhe lämpötilan jäsentämisessä</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="680"/>
+        <location filename="../core/libdivecomputer.c" line="693"/>
         <source>Error parsing the gas mix count</source>
         <translation>Virhe kaasuseosten määrän jäsentämisessä</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="691"/>
+        <location filename="../core/libdivecomputer.c" line="704"/>
         <source>Error obtaining water salinity</source>
         <translation>Virhe veden suolapitoisuuden määrityksessä</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="700"/>
+        <location filename="../core/libdivecomputer.c" line="713"/>
         <source>Error obtaining surface pressure</source>
         <translation>Virhe ilmanpaineen määrityksessä</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="723"/>
+        <location filename="../core/libdivecomputer.c" line="736"/>
         <source>Error obtaining dive mode</source>
         <translation>Virhe sukellusmoodin kanssa</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="745"/>
+        <location filename="../core/libdivecomputer.c" line="758"/>
         <source>Error parsing the gas mix</source>
         <translation>Virhe kaasuseoksen jäsentämisessä</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="771"/>
+        <location filename="../core/libdivecomputer.c" line="786"/>
         <source>Unable to create parser for %s %s</source>
         <translation>Jäsentäjän luominen %s %s epäonnistui</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="777"/>
+        <location filename="../core/libdivecomputer.c" line="792"/>
         <source>Error registering the data</source>
         <translation>Virhe tiedon rekisteröinnissä</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="808"/>
+        <location filename="../core/libdivecomputer.c" line="822"/>
         <source>Error parsing the samples</source>
         <translation>Virhe näytteiden tulkinnassa</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="815"/>
+        <location filename="../core/libdivecomputer.c" line="831"/>
         <source>Already downloaded dive at %s</source>
         <translation>Sukellus on jo ladattu %s</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="1057"/>
+        <location filename="../core/libdivecomputer.c" line="1071"/>
         <source>Event: waiting for user action</source>
         <translation>Tapahtuma: odotetaan käyttäjän toimia</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="1079"/>
+        <location filename="../core/libdivecomputer.c" line="1093"/>
         <source>model=%s firmware=%u serial=%u</source>
         <translation>malli=%s firmware=%u sarjanumero=%u</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="1145"/>
+        <location filename="../core/libdivecomputer.c" line="1159"/>
         <source>Error registering the event handler.</source>
         <translation>Virhe tapahtumakäsittelijän rekisteröinnissä.</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="1150"/>
+        <location filename="../core/libdivecomputer.c" line="1164"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Virhe perumiskäsittelijän rekisteröinnissä.</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="1171"/>
+        <location filename="../core/libdivecomputer.c" line="1185"/>
         <source>Dive data import error</source>
         <translation>Virhe sukellusten jäsentämisessä</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="1358"/>
+        <location filename="../core/libdivecomputer.c" line="1401"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>libdivecomputer-kontekstin luominen epäonnistui</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="1367"/>
+        <location filename="../core/libdivecomputer.c" line="1410"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>Avaaminen epäonnistui: %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="1378"/>
+        <location filename="../core/libdivecomputer.c" line="1422"/>
         <source>Error opening the device %s %s (%s).
 In most cases, in order to debug this issue, it is useful to send the developers the log files. You can copy them to the clipboard in the About dialog.</source>
         <translation>Virhe avattaessa laitetta %s %s (%s).
 Ongelman selvittämiseksi tarvitaan yleensä lokitiedostot. Voit kopioida ne leikepöydälleä Tietoja valikon kautta.</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="1380"/>
+        <location filename="../core/libdivecomputer.c" line="1424"/>
         <source>Error opening the device %s %s (%s).
 In most cases, in order to debug this issue, a libdivecomputer logfile will be useful.
 You can create this logfile by selecting the corresponding checkbox in the download dialog.</source>
@@ -10778,133 +12090,92 @@ Ongelman tutkimiseksi libdivecomputer lokitiedosto on hyödyllinen.
 Voit luoda tämän tiedoston valitsemalla kyseisen valinnan sukellusten lataus -dialogista.</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="1388"/>
+        <location filename="../core/libdivecomputer.c" line="1433"/>
         <source>No new dives downloaded from dive computer</source>
         <translation>Uusia sukelluksia ei ladattu sukellustietokoneesta</translation>
     </message>
     <message>
-        <location filename="../core/load-git.c" line="175"/>
-        <location filename="../core/parse-xml.c" line="1207"/>
+        <location filename="../core/load-git.c" line="170"/>
+        <location filename="../core/parse-xml.c" line="1229"/>
         <source>multiple GPS locations for this dive site; also %s
 </source>
         <translation>sukelluskohteella on useita GPS -positioita; %s
 </translation>
     </message>
     <message>
-        <location filename="../core/load-git.c" line="201"/>
-        <location filename="../core/parse.c" line="442"/>
+        <location filename="../core/load-git.c" line="195"/>
+        <location filename="../core/parse.c" line="441"/>
         <source>additional name for site: %s
 </source>
         <translation>Ylimääräinen nimi sukelluskohteelle: %s
 </translation>
     </message>
     <message>
-        <location filename="../core/load-git.c" line="1664"/>
+        <location filename="../core/load-git.c" line="1703"/>
         <source>Load dives from local cache</source>
         <translation>Lataa sukellukset paikallisesta välimuistista</translation>
     </message>
     <message>
-        <location filename="../core/load-git.c" line="1668"/>
+        <location filename="../core/load-git.c" line="1707"/>
         <source>Successfully opened dive data</source>
         <translation>Sukellusdatan avaus onnistui</translation>
     </message>
     <message>
-        <location filename="../core/ostctools.c" line="128"/>
-        <location filename="../core/ostctools.c" line="159"/>
+        <location filename="../core/ostctools.c" line="121"/>
+        <location filename="../core/ostctools.c" line="152"/>
         <source>Unknown DC in dive %d</source>
         <translation>Tuntematon sukellustietokone sukelluksella %d</translation>
     </message>
     <message>
-        <location filename="../core/ostctools.c" line="171"/>
+        <location filename="../core/ostctools.c" line="164"/>
         <source>Error - %s - parsing dive %d</source>
         <translation>Virhe - %s - jäsentäessä sukellusta %d</translation>
     </message>
     <message>
-        <location filename="../core/parse-xml.c" line="400"/>
+        <location filename="../core/parse-xml.c" line="402"/>
         <source>Strange percentage reading %s
 </source>
         <translation>Outo prosenttiosuus: %s
 </translation>
     </message>
     <message>
-        <location filename="../core/parse-xml.c" line="1664"/>
+        <location filename="../core/parse-xml.c" line="1701"/>
         <source>Failed to parse &apos;%s&apos;</source>
         <translation>Tiedoston &apos;%s&apos; lukeminen epäonnistui.</translation>
     </message>
     <message>
-        <location filename="../core/parse-xml.c" line="2257"/>
+        <location filename="../core/parse-xml.c" line="2297"/>
         <source>Can&apos;t open stylesheet %s</source>
         <translation>Tyylitiedoston %s avaus ei onnistu</translation>
     </message>
     <message>
-        <location filename="../core/plannernotes.c" line="113"/>
-        <source>Decompression calculation aborted due to excessive time</source>
-        <translation>Dekon laskeminen on keskeytetty kohtuuttoman keston vuoksi</translation>
-    </message>
-    <message>
-        <location filename="../core/plannernotes.c" line="112"/>
-        <location filename="../core/plannernotes.c" line="473"/>
-        <location filename="../core/plannernotes.c" line="479"/>
-        <location filename="../core/plannernotes.c" line="518"/>
-        <location filename="../core/plannernotes.c" line="551"/>
-        <location filename="../core/plannernotes.c" line="585"/>
-        <location filename="../core/plannernotes.c" line="596"/>
-        <source>Warning:</source>
-        <translation>Varoitus:</translation>
-    </message>
-    <message>
-        <location filename="../core/plannernotes.c" line="416"/>
-        <source>, effective GF=%d/%d</source>
-        <translation>, efektiivinen GF=%d/%d</translation>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="300"/>
+        <location filename="../core/planner.c" line="298"/>
         <location filename="../desktop-widgets/simplewidgets.cpp" line="193"/>
         <source>SP change</source>
         <translation>SP:n mutos</translation>
     </message>
     <message>
-        <location filename="../core/plannernotes.c" line="102"/>
-        <source>VPM-B</source>
-        <translation>VPM-B</translation>
-    </message>
-    <message>
-        <location filename="../core/plannernotes.c" line="104"/>
-        <source>BUHLMANN</source>
-        <translation>BUHLMANN</translation>
-    </message>
-    <message>
-        <location filename="../core/plannernotes.c" line="156"/>
-        <source>Runtime: %dmin&lt;br&gt;&lt;/div&gt;</source>
-        <translation>Kesto: %dmin&lt;br&gt;&lt;/div&gt;</translation>
+        <location filename="../core/planner.c" line="901"/>
+        <source>Can&apos;t find gas %s</source>
+        <translation>Seosta %s ei löydy</translation>
     </message>
     <message>
-        <location filename="../core/plannernotes.c" line="160"/>
-        <source>depth</source>
-        <translation>syvyys</translation>
+        <location filename="../core/planner.c" line="1182"/>
+        <source>ean</source>
+        <translation>ean</translation>
     </message>
     <message>
-        <location filename="../core/plannernotes.c" line="162"/>
-        <source>duration</source>
-        <translation>kesto</translation>
+        <location filename="../core/plannernotes.c" line="52"/>
+        <source>Isobaric counterdiffusion information</source>
+        <translation>Isobaarisen käänteisdiffuusion tiedot</translation>
     </message>
     <message>
         <location filename="../core/plannernotes.c" line="53"/>
-        <location filename="../core/plannernotes.c" line="164"/>
+        <location filename="../core/plannernotes.c" line="178"/>
         <source>runtime</source>
         <translation>sukellusaika</translation>
     </message>
     <message>
-        <location filename="../core/plannernotes.c" line="166"/>
-        <source>gas</source>
-        <translation>kaasu</translation>
-    </message>
-    <message>
-        <location filename="../core/plannernotes.c" line="52"/>
-        <source>Isobaric counterdiffusion information</source>
-        <translation>Isobaarisen käänteisdiffuusion tiedot</translation>
-    </message>
-    <message>
         <location filename="../core/plannernotes.c" line="55"/>
         <source>&amp;#916;He</source>
         <translation>&amp;#916;He</translation>
@@ -10920,224 +12191,274 @@ Voit luoda tämän tiedoston valitsemalla kyseisen valinnan sukellusten lataus -
         <translation>max &amp;#916;N&amp;#8322;</translation>
     </message>
     <message>
-        <location filename="../core/plannernotes.c" line="297"/>
-        <source>%3.0f%s</source>
-        <translation>%3.0f%s</translation>
-    </message>
-    <message>
-        <location filename="../core/plannernotes.c" line="301"/>
-        <location filename="../core/plannernotes.c" line="306"/>
-        <source>%3dmin</source>
-        <translation>%3d min</translation>
-    </message>
-    <message>
-        <location filename="../core/plannernotes.c" line="372"/>
-        <source>Switch gas to %s (SP = %.1fbar)</source>
-        <translation>Vaihda kaasu seuraavaan %s (SP = %.1fbar)</translation>
-    </message>
-    <message>
-        <location filename="../core/plannernotes.c" line="374"/>
-        <source>Switch gas to %s</source>
-        <translation>Vaihda kaasu seuraavaan: %s
-</translation>
-    </message>
-    <message>
-        <location filename="../core/plannernotes.c" line="403"/>
-        <source>CNS</source>
-        <translation>Happikertymä (CNS)</translation>
-    </message>
-    <message>
-        <location filename="../core/plannernotes.c" line="404"/>
-        <source>OTU</source>
-        <translation>Happikertymä (OTU)</translation>
+        <location filename="../core/plannernotes.c" line="72"/>
+        <location filename="../core/plannernotes.c" line="73"/>
+        <location filename="../core/plannernotes.c" line="74"/>
+        <location filename="../core/qthelper.cpp" line="630"/>
+        <location filename="../core/qthelper.cpp" line="822"/>
+        <location filename="../core/qthelper.cpp" line="1285"/>
+        <location filename="../core/units.c" line="19"/>
+        <source>bar</source>
+        <translation>bar</translation>
     </message>
     <message>
-        <location filename="../core/plannernotes.c" line="412"/>
-        <source>Deco model: VPM-B at nominal conservatism</source>
-        <translation>Dekomalli: VPM-B nimelliskonservatismilla</translation>
+        <location filename="../core/plannernotes.c" line="79"/>
+        <source>DISCLAIMER / WARNING: THIS IMPLEMENTATION OF THE %s ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source>
+        <translation>VAROITUS: TÄMÄ ON UUSI TOTEUTUS %s ALGORITMISTA JA SUKELLUSTEN SUUNNITTELUOMINAISUUDESTA. TESTAUS EI OLE OLLUT RIITTÄVÄN KATTAVAA, JOTEN SUOSITAMME, ETTÄ ETTE SUKELLA VAIN NÄIDEN TULOSTEN PERUSTEELLA.</translation>
     </message>
     <message>
-        <location filename="../core/plannernotes.c" line="505"/>
-        <source>Minimum gas</source>
-        <translation>Minimikaasu</translation>
+        <location filename="../core/plannernotes.c" line="89"/>
+        <source>VPM-B</source>
+        <translation>VPM-B</translation>
     </message>
     <message>
-        <location filename="../core/plannernotes.c" line="506"/>
-        <source>based on</source>
-        <translation>perustuu</translation>
+        <location filename="../core/plannernotes.c" line="90"/>
+        <source>BUHLMANN</source>
+        <translation>BUHLMANN</translation>
     </message>
     <message>
-        <location filename="../core/plannernotes.c" line="508"/>
-        <source>SAC</source>
-        <translation>Pintakulutus</translation>
+        <location filename="../core/plannernotes.c" line="124"/>
+        <location filename="../core/plannernotes.c" line="486"/>
+        <location filename="../core/plannernotes.c" line="492"/>
+        <location filename="../core/plannernotes.c" line="531"/>
+        <location filename="../core/plannernotes.c" line="565"/>
+        <location filename="../core/plannernotes.c" line="599"/>
+        <location filename="../core/plannernotes.c" line="610"/>
+        <source>Warning:</source>
+        <translation>Varoitus:</translation>
     </message>
     <message>
-        <location filename="../core/plannernotes.c" line="527"/>
-        <source>%.0f%s/%.0f%s of &lt;span style=&apos;color: red;&apos;&gt;&lt;b&gt;%s&lt;/b&gt;&lt;/span&gt;</source>
-        <translation>%.0f%s/%.0f%s / &lt;span style=&apos;color: red;&apos;&gt;&lt;b&gt;%s&lt;/b&gt;&lt;/span&gt;</translation>
+        <location filename="../core/plannernotes.c" line="125"/>
+        <source>Decompression calculation aborted due to excessive time</source>
+        <translation>Dekon laskeminen on keskeytetty kohtuuttoman keston vuoksi</translation>
     </message>
     <message>
-        <location filename="../core/plannernotes.c" line="532"/>
-        <source>%.0f%s of &lt;span style=&apos;color: red;&apos;&gt;&lt;b&gt;%s&lt;/b&gt;&lt;/span&gt; (%.0f%s during planned ascent)</source>
-        <translation>%.0f%s / &lt;span style=&apos;color: red;&apos;&gt;&lt;b&gt;%s&lt;/b&gt;&lt;/span&gt; (%.0f%s suunnitellun nousun aikana)</translation>
+        <location filename="../core/plannernotes.c" line="140"/>
+        <location filename="../core/plannernotes.c" line="147"/>
+        <location filename="../core/plannernotes.c" line="155"/>
+        <source>Subsurface</source>
+        <translation>Subsurface</translation>
     </message>
     <message>
-        <location filename="../core/plannernotes.c" line="535"/>
-        <source>%.0f%s of &lt;span style=&apos;color: red;&apos;&gt;&lt;b&gt;%s&lt;/b&gt;&lt;/span&gt;</source>
-        <translation>%.0f%s / &lt;span style=&apos;color: red;&apos;&gt;&lt;b&gt;%s&lt;/b&gt;&lt;/span&gt;</translation>
+        <location filename="../core/plannernotes.c" line="142"/>
+        <source>dive plan&lt;/b&gt; (overlapping dives detected)</source>
+        <translation>sukellussuunnitelma&lt;/b&gt; (päällekkäisiä sukelluksia havaittu)</translation>
     </message>
     <message>
-        <location filename="../core/plannernotes.c" line="128"/>
-        <location filename="../core/plannernotes.c" line="135"/>
-        <location filename="../core/plannernotes.c" line="143"/>
-        <source>Subsurface</source>
-        <translation>Subsurface</translation>
+        <location filename="../core/plannernotes.c" line="149"/>
+        <source>dive plan&lt;/b&gt; created on</source>
+        <translation>sukellussuunnitelma&lt;/b&gt; luotu</translation>
     </message>
     <message>
-        <location filename="../core/plannernotes.c" line="145"/>
+        <location filename="../core/plannernotes.c" line="157"/>
         <source>dive plan&lt;/b&gt; (surface interval </source>
         <translation>sukellussuunnitelma&lt;/b&gt; (pinta-aika </translation>
     </message>
     <message>
-        <location filename="../core/plannernotes.c" line="147"/>
+        <location filename="../core/plannernotes.c" line="159"/>
         <source>created on</source>
         <translation>luotu</translation>
     </message>
     <message>
-        <location filename="../core/plannernotes.c" line="137"/>
-        <source>dive plan&lt;/b&gt; created on</source>
-        <translation>sukellussuunnitelma&lt;/b&gt; luotu</translation>
+        <location filename="../core/plannernotes.c" line="166"/>
+        <location filename="../core/plannernotes.c" line="169"/>
+        <source>Runtime: %dmin%s</source>
+        <translation>Kesto: %dmin%s</translation>
     </message>
     <message>
-        <location filename="../core/plannernotes.c" line="119"/>
-        <source>DISCLAIMER / WARNING: THIS IMPLEMENTATION OF THE %s ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source>
-        <translation>VAROITUS: TÄMÄ ON UUSI TOTEUTUS %s ALGORITMISTA JA SUKELLUSTEN SUUNNITTELUOMINAISUUDESTA. TESTAUS EI OLE OLLUT RIITTÄVÄN KATTAVAA, JOTEN SUOSITAMME, ETTÄ ETTE SUKELLA VAIN NÄIDEN TULOSTEN PERUSTEELLA.</translation>
+        <location filename="../core/plannernotes.c" line="174"/>
+        <source>depth</source>
+        <translation>syvyys</translation>
     </message>
     <message>
-        <location filename="../core/plannernotes.c" line="130"/>
-        <source>dive plan&lt;/b&gt; (overlapping dives detected)</source>
-        <translation>sukellussuunnitelma&lt;/b&gt; (päällekkäisiä sukelluksia havaittu)</translation>
+        <location filename="../core/plannernotes.c" line="176"/>
+        <source>duration</source>
+        <translation>kesto</translation>
     </message>
     <message>
-        <location filename="../core/plannernotes.c" line="153"/>
-        <source>Runtime: %dmin%s</source>
-        <translation>Kesto: %dmin%s</translation>
+        <location filename="../core/plannernotes.c" line="180"/>
+        <source>gas</source>
+        <translation>kaasu</translation>
     </message>
     <message>
-        <location filename="../core/plannernotes.c" line="220"/>
+        <location filename="../core/plannernotes.c" line="234"/>
         <source>%s to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation>%s -&gt; %.*f %s %d:%02d min:ssa - kesto %d:%02u - %s (SP = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../core/plannernotes.c" line="221"/>
-        <location filename="../core/plannernotes.c" line="229"/>
+        <location filename="../core/plannernotes.c" line="235"/>
+        <location filename="../core/plannernotes.c" line="243"/>
         <source>Ascend</source>
         <translation>Nouse</translation>
     </message>
     <message>
-        <location filename="../core/plannernotes.c" line="221"/>
-        <location filename="../core/plannernotes.c" line="229"/>
+        <location filename="../core/plannernotes.c" line="235"/>
+        <location filename="../core/plannernotes.c" line="243"/>
         <source>Descend</source>
         <translation>Laske</translation>
     </message>
     <message>
-        <location filename="../core/plannernotes.c" line="228"/>
+        <location filename="../core/plannernotes.c" line="242"/>
         <source>%s to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source>
         <translation>%s -&gt; %.*f %s %d:%02d min:ssa - kesto %d:%02u - %s</translation>
     </message>
     <message>
-        <location filename="../core/plannernotes.c" line="243"/>
+        <location filename="../core/plannernotes.c" line="257"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar CCR)</source>
         <translation>Pysy syvyydessä %.*f %s %d:%02d min - aika %d:%02u seoksella %s (SP = %.1fbar CCR)</translation>
     </message>
     <message>
-        <location filename="../core/plannernotes.c" line="250"/>
+        <location filename="../core/plannernotes.c" line="264"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s %s</source>
         <translation>Pysy %.*f %s:n syvyydessä %d:%02d min - sukellusaika %d:%02u kaasulla %s %s</translation>
     </message>
     <message>
-        <location filename="../core/plannernotes.c" line="316"/>
-        <location filename="../core/plannernotes.c" line="339"/>
+        <location filename="../core/plannernotes.c" line="311"/>
+        <source>%3.0f%s</source>
+        <translation>%3.0f%s</translation>
+    </message>
+    <message>
+        <location filename="../core/plannernotes.c" line="315"/>
+        <location filename="../core/plannernotes.c" line="320"/>
+        <source>%3dmin</source>
+        <translation>%3d min</translation>
+    </message>
+    <message>
+        <location filename="../core/plannernotes.c" line="330"/>
+        <location filename="../core/plannernotes.c" line="353"/>
         <source>(SP = %.1fbar CCR)</source>
         <translation>(SP = %.1fbar CCR)</translation>
     </message>
     <message>
-        <location filename="../core/plannernotes.c" line="409"/>
+        <location filename="../core/plannernotes.c" line="387"/>
+        <source>Switch gas to %s (SP = %.1fbar)</source>
+        <translation>Vaihda kaasu seuraavaan %s (SP = %.1fbar)</translation>
+    </message>
+    <message>
+        <location filename="../core/plannernotes.c" line="389"/>
+        <source>Switch gas to %s</source>
+        <translation>Vaihda kaasu seuraavaan: %s
+</translation>
+    </message>
+    <message>
+        <location filename="../core/plannernotes.c" line="418"/>
+        <source>CNS</source>
+        <translation>Happikertymä (CNS)</translation>
+    </message>
+    <message>
+        <location filename="../core/plannernotes.c" line="419"/>
+        <source>OTU</source>
+        <translation>Happikertymä (OTU)</translation>
+    </message>
+    <message>
+        <location filename="../core/plannernotes.c" line="424"/>
         <source>Deco model: Bühlmann ZHL-16C with GFLow = %d%% and GFHigh = %d%%</source>
         <translation>Dekomalli: Bühlmann ZHL-16C: GFLow = %d%% ja GFHigh = %d%%</translation>
     </message>
     <message>
-        <location filename="../core/plannernotes.c" line="414"/>
+        <location filename="../core/plannernotes.c" line="427"/>
+        <source>Deco model: VPM-B at nominal conservatism</source>
+        <translation>Dekomalli: VPM-B nimelliskonservatismilla</translation>
+    </message>
+    <message>
+        <location filename="../core/plannernotes.c" line="429"/>
         <source>Deco model: VPM-B at +%d conservatism</source>
         <translation>Dekomalli: VPM-B +%d konservatismilla</translation>
     </message>
     <message>
-        <location filename="../core/plannernotes.c" line="418"/>
+        <location filename="../core/plannernotes.c" line="431"/>
+        <source>, effective GF=%d/%d</source>
+        <translation>, efektiivinen GF=%d/%d</translation>
+    </message>
+    <message>
+        <location filename="../core/plannernotes.c" line="433"/>
         <source>Deco model: Recreational mode based on Bühlmann ZHL-16B with GFLow = %d%% and GFHigh = %d%%</source>
         <translation>Dekomalli: Harrastesukellus perustuen Bühlmann ZHL-16B käyttäen GFLow = %d%% ja GFHigh = %d%%</translation>
     </message>
     <message>
-        <location filename="../core/plannernotes.c" line="426"/>
-        <source>ATM pressure: %dmbar (%d%s)&lt;br&gt;&lt;/div&gt;</source>
-        <translation>Ilmanpaine: %dmbar (%d%s)&lt;br&gt;&lt;/div&gt;</translation>
+        <location filename="../core/plannernotes.c" line="441"/>
+        <source>ATM pressure: %dmbar (%d%s)&lt;br/&gt;
+&lt;/div&gt;
+</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/plannernotes.c" line="441"/>
+        <location filename="../core/plannernotes.c" line="456"/>
         <source>Gas consumption (CCR legs excluded):</source>
         <translation>Kaasun kulutus (CCR -etappeja ei mukana):</translation>
     </message>
     <message>
-        <location filename="../core/plannernotes.c" line="443"/>
+        <location filename="../core/plannernotes.c" line="458"/>
         <source>Gas consumption (based on SAC</source>
         <translation>Ilmankulutus (perustuen SAC:iin</translation>
     </message>
     <message>
-        <location filename="../core/plannernotes.c" line="474"/>
+        <location filename="../core/plannernotes.c" line="487"/>
         <source>this is more gas than available in the specified cylinder!</source>
         <translation>tämä on enemmän kaasua kuin sinulla on määritellyissä säiliöissä!</translation>
     </message>
     <message>
-        <location filename="../core/plannernotes.c" line="480"/>
+        <location filename="../core/plannernotes.c" line="493"/>
         <source>not enough reserve for gas sharing on ascent!</source>
         <translation>sinulla ei ole tarpeeksi kaasua jakaaksesi sitä pintaan nousun ajan!</translation>
     </message>
     <message>
+        <location filename="../core/plannernotes.c" line="518"/>
+        <source>Minimum gas</source>
+        <translation>Minimikaasu</translation>
+    </message>
+    <message>
         <location filename="../core/plannernotes.c" line="519"/>
+        <source>based on</source>
+        <translation>perustuu</translation>
+    </message>
+    <message>
+        <location filename="../core/plannernotes.c" line="521"/>
+        <source>SAC</source>
+        <translation>Pintakulutus</translation>
+    </message>
+    <message>
+        <location filename="../core/plannernotes.c" line="532"/>
         <source>required minimum gas for ascent already exceeding start pressure of cylinder!</source>
         <translation>tarvitaan enemmän kaasua, kuin sylinterissä on lähdössä </translation>
     </message>
     <message>
-        <location filename="../core/plannernotes.c" line="524"/>
+        <location filename="../core/plannernotes.c" line="537"/>
         <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>%.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 suunnitellussa nousussa)</translation>
     </message>
     <message>
-        <location filename="../core/plannernotes.c" line="552"/>
+        <location filename="../core/plannernotes.c" line="540"/>
+        <source>%.0f%s/%.0f%s of &lt;span style=&apos;color: red;&apos;&gt;&lt;b&gt;%s&lt;/b&gt;&lt;/span&gt;</source>
+        <translation>%.0f%s/%.0f%s / &lt;span style=&apos;color: red;&apos;&gt;&lt;b&gt;%s&lt;/b&gt;&lt;/span&gt;</translation>
+    </message>
+    <message>
+        <location filename="../core/plannernotes.c" line="545"/>
+        <source>%.0f%s of &lt;span style=&apos;color: red;&apos;&gt;&lt;b&gt;%s&lt;/b&gt;&lt;/span&gt; (%.0f%s during planned ascent)</source>
+        <translation>%.0f%s / &lt;span style=&apos;color: red;&apos;&gt;&lt;b&gt;%s&lt;/b&gt;&lt;/span&gt; (%.0f%s suunnitellun nousun aikana)</translation>
+    </message>
+    <message>
+        <location filename="../core/plannernotes.c" line="548"/>
+        <source>%.0f%s of &lt;span style=&apos;color: red;&apos;&gt;&lt;b&gt;%s&lt;/b&gt;&lt;/span&gt;</source>
+        <translation>%.0f%s / &lt;span style=&apos;color: red;&apos;&gt;&lt;b&gt;%s&lt;/b&gt;&lt;/span&gt;</translation>
+    </message>
+    <message>
+        <location filename="../core/plannernotes.c" line="566"/>
         <source>Isobaric counterdiffusion conditions exceeded</source>
         <translation>Isobaarisen käänteisdiffuusion ehdot ylitetty</translation>
     </message>
     <message>
-        <location filename="../core/plannernotes.c" line="583"/>
+        <location filename="../core/plannernotes.c" line="597"/>
         <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
         <translation>korkea pO₂ -arvo %.2f %d:%02u:ssa seoksella %s syvyydessä %.*f %s</translation>
     </message>
     <message>
-        <location filename="../core/plannernotes.c" line="594"/>
+        <location filename="../core/plannernotes.c" line="608"/>
         <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
         <translation>matala pO₂ -arvo %.2f %d:%02u:ssa seoksella %s syvyydessä %.*f %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="881"/>
-        <source>Can&apos;t find gas %s</source>
-        <translation>Seosta %s ei löydy</translation>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="1162"/>
-        <source>ean</source>
-        <translation>ean</translation>
-    </message>
-    <message>
-        <location filename="../core/profile.c" line="1396"/>
+        <location filename="../core/profile.c" line="1446"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
@@ -11146,91 +12467,77 @@ S: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1407"/>
+        <location filename="../core/profile.c" line="1453"/>
+        <source>P: %d%s (%s)
+</source>
+        <translation>P: %d%s (%s)
+</translation>
+    </message>
+    <message>
+        <location filename="../core/profile.c" line="1457"/>
         <source>T: %.1f%s
 </source>
         <translation>L: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1413"/>
+        <location filename="../core/profile.c" line="1463"/>
         <source>V: %.1f%s
 </source>
         <translation>N: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1416"/>
+        <location filename="../core/profile.c" line="1466"/>
         <source>SAC: %.*f%s/min
 </source>
         <translation>SAC: %.*f%s/min
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1418"/>
+        <location filename="../core/profile.c" line="1468"/>
         <source>CNS: %u%%
 </source>
         <translation>CNS: %u%%
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1427"/>
-        <source>pHe: %.2fbar
-</source>
-        <translation>pHe: %.2fbar
-</translation>
-    </message>
-    <message>
-        <location filename="../core/profile.c" line="1430"/>
-        <source>MOD: %d%s
-</source>
-        <translation>MOD: %d%s
-</translation>
-    </message>
-    <message>
         <location filename="../core/profile.c" line="1470"/>
-        <source>Deco: %umin @ %.0f%s
-</source>
-        <translation>Deko: %umin @ %.0f%s
-</translation>
-    </message>
-    <message>
-        <location filename="../core/profile.c" line="1462"/>
-        <source>Safety stop: %umin @ %.0f%s
+        <source>pO₂: %.2fbar
 </source>
-        <translation>Turvapysähdys: %umin @ %.0f%s
+        <translation>pO₂: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1403"/>
-        <source>P: %d%s (%s)
+        <location filename="../core/profile.c" line="1472"/>
+        <source>SCR ΔpO₂: %.2fbar
 </source>
-        <translation>P: %d%s (%s)
+        <translation>SCR ΔpO₂: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1420"/>
-        <source>pO₂: %.2fbar
+        <location filename="../core/profile.c" line="1475"/>
+        <source>pN₂: %.2fbar
 </source>
-        <translation>pO₂: %.2fbar
+        <translation>pN₂: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1422"/>
-        <source>SCR ΔpO₂: %.2fbar
+        <location filename="../core/profile.c" line="1477"/>
+        <source>pHe: %.2fbar
 </source>
-        <translation>SCR ΔpO₂: %.2fbar
+        <translation>pHe: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1425"/>
-        <source>pN₂: %.2fbar
+        <location filename="../core/profile.c" line="1480"/>
+        <source>MOD: %d%s
 </source>
-        <translation>pN₂: %.2fbar
+        <translation>MOD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1439"/>
+        <location filename="../core/profile.c" line="1489"/>
         <source>EAD: %d%s
 EADD: %d%s / %.1fg/ℓ
 </source>
@@ -11239,7 +12546,7 @@ EADD: %d%s / %.1fg/ℓ
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1445"/>
+        <location filename="../core/profile.c" line="1495"/>
         <source>END: %d%s
 EADD: %d%s / %.1fg/ℓ
 </source>
@@ -11248,565 +12555,675 @@ EADD: %d%s / %.1fg/ℓ
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1450"/>
+        <location filename="../core/profile.c" line="1500"/>
         <source>Density: %.1fg/ℓ
 </source>
         <translation>Tiheys: %.1fg/ℓ
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1465"/>
+        <location filename="../core/profile.c" line="1512"/>
+        <source>Safety stop: %umin @ %.0f%s
+</source>
+        <translation>Turvapysähdys: %umin @ %.0f%s
+</translation>
+    </message>
+    <message>
+        <location filename="../core/profile.c" line="1515"/>
         <source>Safety stop: unknown time @ %.0f%s
 </source>
         <translation>Turvapysähdys: tuntematon kesto @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1473"/>
+        <location filename="../core/profile.c" line="1520"/>
+        <source>Deco: %umin @ %.0f%s
+</source>
+        <translation>Deko: %umin @ %.0f%s
+</translation>
+    </message>
+    <message>
+        <location filename="../core/profile.c" line="1523"/>
         <source>Deco: unknown time @ %.0f%s
 </source>
         <translation>Deko: tuntematon kesto @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1477"/>
+        <location filename="../core/profile.c" line="1527"/>
         <source>In deco
 </source>
         <translation>Dekossa</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1479"/>
+        <location filename="../core/profile.c" line="1529"/>
         <source>NDL: %umin
 </source>
         <translation>NDL: %umin
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1482"/>
+        <location filename="../core/profile.c" line="1532"/>
         <source>TTS: %umin
 </source>
         <translation>TTS: %umin
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1485"/>
+        <location filename="../core/profile.c" line="1535"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation>Deko: %umin @ %.0f%s (lask.)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1493"/>
+        <location filename="../core/profile.c" line="1543"/>
         <source>In deco (calc)
 </source>
         <translation>Dekossa (lask.)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1496"/>
+        <location filename="../core/profile.c" line="1546"/>
         <source>NDL: %umin (calc)
 </source>
         <translation>NDL: %umin (calc)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1498"/>
+        <location filename="../core/profile.c" line="1548"/>
         <source>NDL: &gt;2h (calc)
 </source>
         <translation>NDL: &gt;2h (lask.)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1502"/>
+        <location filename="../core/profile.c" line="1552"/>
         <source>TTS: %umin (calc)
 </source>
         <translation>TTS: %umin (calc)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1504"/>
+        <location filename="../core/profile.c" line="1554"/>
         <source>TTS: &gt;2h (calc)
 </source>
         <translation>TTS: &gt;2h (lask.)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1507"/>
+        <location filename="../core/profile.c" line="1557"/>
         <source>RBT: %umin
 </source>
         <translation>RBT: %umin
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1510"/>
+        <location filename="../core/profile.c" line="1560"/>
+        <source>GF %d%%
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/profile.c" line="1562"/>
         <source>Surface GF %.0f%%
 </source>
         <translation>Surface GF %.0f%%
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1513"/>
+        <location filename="../core/profile.c" line="1565"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation>Laskettu katto %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1519"/>
+        <location filename="../core/profile.c" line="1571"/>
         <source>Tissue %.0fmin: %.1f%s
 </source>
         <translation>Kudos %.0fmin: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1526"/>
+        <location filename="../core/profile.c" line="1578"/>
         <source>ICD in leading tissue
 </source>
         <translation>ICD johtavassa kudoksessa
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1528"/>
+        <location filename="../core/profile.c" line="1580"/>
         <source>heart rate: %d
 </source>
         <translation>sydämen syke: %d
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1530"/>
+        <location filename="../core/profile.c" line="1582"/>
         <source>bearing: %d
 </source>
         <translation>suunta: %d
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1533"/>
+        <location filename="../core/profile.c" line="1585"/>
         <source>mean depth to here %.1f%s
 </source>
         <translation>Keskisyvyys tähän asti %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1630"/>
+        <location filename="../core/profile.c" line="1681"/>
         <source>ΔT:%d:%02dmin</source>
         <translation>ΔT:%d:%02dmin</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1634"/>
+        <location filename="../core/profile.c" line="1685"/>
         <source>%s ΔD:%.1f%s</source>
         <translation>%s ΔD:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1638"/>
+        <location filename="../core/profile.c" line="1689"/>
         <source>%s ↓D:%.1f%s</source>
         <translation>%s ↓D:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1642"/>
+        <location filename="../core/profile.c" line="1693"/>
         <source>%s ↑D:%.1f%s</source>
         <translation>%s ↑D:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1646"/>
+        <location filename="../core/profile.c" line="1697"/>
         <source>%s øD:%.1f%s
 </source>
         <translation>%s øD:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1650"/>
+        <location filename="../core/profile.c" line="1701"/>
         <source>%s ↓V:%.2f%s</source>
         <translation>%s ↓V:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1654"/>
+        <location filename="../core/profile.c" line="1705"/>
         <source>%s ↑V:%.2f%s</source>
         <translation>%s ↑V:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1658"/>
+        <location filename="../core/profile.c" line="1709"/>
         <source>%s øV:%.2f%s</source>
         <translation>%s øV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1665"/>
+        <location filename="../core/profile.c" line="1716"/>
         <source>%s ΔP:%d%s</source>
         <translation>%s ΔP:%d%s</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1690"/>
+        <location filename="../core/profile.c" line="1741"/>
         <source>%s SAC:%.*f%s/min</source>
         <translation>%s SAC:%.*f%s/min</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="68"/>
+        <location filename="../core/qthelper.cpp" line="70"/>
         <source>%1km</source>
         <translation>%1km</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="70"/>
+        <location filename="../core/qthelper.cpp" line="72"/>
         <source>%1m</source>
         <translation>%1m</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="74"/>
+        <location filename="../core/qthelper.cpp" line="76"/>
         <source>%1mi</source>
         <translation>%1 mailia</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="76"/>
+        <location filename="../core/qthelper.cpp" line="78"/>
         <source>%1yd</source>
         <translation>%1 vuotta</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="94"/>
-        <location filename="../core/qthelper.cpp" line="234"/>
+        <location filename="../core/qthelper.cpp" line="96"/>
+        <location filename="../core/qthelper.cpp" line="235"/>
         <source>N</source>
         <translation>N</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="94"/>
-        <location filename="../core/qthelper.cpp" line="235"/>
+        <location filename="../core/qthelper.cpp" line="96"/>
+        <location filename="../core/qthelper.cpp" line="236"/>
         <source>S</source>
         <translation>S</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="95"/>
-        <location filename="../core/qthelper.cpp" line="236"/>
+        <location filename="../core/qthelper.cpp" line="97"/>
+        <location filename="../core/qthelper.cpp" line="237"/>
         <source>E</source>
         <translation>E</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="95"/>
-        <location filename="../core/qthelper.cpp" line="237"/>
+        <location filename="../core/qthelper.cpp" line="97"/>
+        <location filename="../core/qthelper.cpp" line="238"/>
         <source>W</source>
         <translation>W</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="583"/>
-        <location filename="../core/qthelper.cpp" line="760"/>
+        <location filename="../core/qthelper.cpp" line="546"/>
+        <location filename="../core/qthelper.cpp" line="561"/>
+        <location filename="../core/qthelper.cpp" line="740"/>
+        <location filename="../core/qthelper.cpp" line="1260"/>
+        <location filename="../core/units.c" line="106"/>
+        <source>m</source>
+        <translation>m</translation>
+    </message>
+    <message>
+        <location filename="../core/qthelper.cpp" line="549"/>
+        <location filename="../core/qthelper.cpp" line="563"/>
+        <location filename="../core/qthelper.cpp" line="742"/>
+        <location filename="../core/qthelper.cpp" line="1259"/>
+        <location filename="../core/units.c" line="111"/>
+        <source>ft</source>
+        <translation>ft</translation>
+    </message>
+    <message>
+        <location filename="../core/qthelper.cpp" line="570"/>
+        <location filename="../core/qthelper.cpp" line="580"/>
+        <location filename="../core/qthelper.cpp" line="795"/>
+        <location filename="../core/qthelper.cpp" line="1235"/>
+        <location filename="../core/units.c" line="166"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="185"/>
+        <source>kg</source>
+        <translation>kg</translation>
+    </message>
+    <message>
+        <location filename="../core/qthelper.cpp" line="572"/>
+        <location filename="../core/qthelper.cpp" line="582"/>
+        <location filename="../core/qthelper.cpp" line="797"/>
+        <location filename="../core/qthelper.cpp" line="1236"/>
+        <location filename="../core/units.c" line="162"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="187"/>
+        <source>lbs</source>
+        <translation>pauna</translation>
+    </message>
+    <message>
+        <location filename="../core/qthelper.cpp" line="591"/>
+        <location filename="../core/qthelper.cpp" line="768"/>
         <source>C</source>
         <translation>C</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="586"/>
-        <location filename="../core/qthelper.cpp" line="762"/>
+        <location filename="../core/qthelper.cpp" line="594"/>
+        <location filename="../core/qthelper.cpp" line="770"/>
         <source>F</source>
         <translation>F</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="837"/>
-        <location filename="../core/qthelper.cpp" line="1179"/>
+        <location filename="../core/qthelper.cpp" line="633"/>
+        <location filename="../core/qthelper.cpp" line="824"/>
+        <location filename="../core/qthelper.cpp" line="1284"/>
+        <location filename="../core/units.c" line="23"/>
+        <source>psi</source>
+        <translation>psi</translation>
+    </message>
+    <message>
+        <location filename="../core/qthelper.cpp" line="845"/>
+        <location filename="../core/qthelper.cpp" line="1204"/>
         <source>AIR</source>
         <translation>Ilma</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="839"/>
+        <location filename="../core/qthelper.cpp" line="847"/>
         <source>EAN</source>
         <translation>EAN</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="914"/>
+        <location filename="../core/qthelper.cpp" line="922"/>
         <source>more than %1 days</source>
         <translation>yli %1 päivää</translation>
     </message>
-    <message numerus="yes">
+    <message>
         <location filename="../core/qthelper.cpp" line="960"/>
+        <location filename="../core/qthelper.cpp" line="965"/>
+        <source>no dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <location filename="../core/qthelper.cpp" line="985"/>
         <source>(%n dive(s))</source>
         <translation><numerusform>(%n sukelluksia)</numerusform><numerusform>(%n sukellusta)</numerusform></translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="1179"/>
+        <location filename="../core/qthelper.cpp" line="1204"/>
         <source>OXYGEN</source>
         <translation>HAPPI</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="1274"/>
+        <location filename="../core/qthelper.cpp" line="1307"/>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="480"/>
-        <location filename="../core/save-html.c" line="564"/>
-        <location filename="../core/worldmap-save.c" line="114"/>
-        <source>Can&apos;t open file %s</source>
-        <translation>Tiedoston avaus ei onnistu %s</translation>
+        <location filename="../core/qthelper.cpp" line="1308"/>
+        <location filename="../core/units.c" line="65"/>
+        <source>cuft</source>
+        <translation>ft³</translation>
+    </message>
+    <message>
+        <location filename="../core/save-git.c" line="922"/>
+        <source>Start saving data</source>
+        <translation>Tallenna tiedot</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="499"/>
+        <location filename="../core/save-git.c" line="931"/>
+        <source>Start saving dives</source>
+        <translation>Tallenna sukellukset</translation>
+    </message>
+    <message>
+        <location filename="../core/save-git.c" line="964"/>
+        <source>Done creating local cache</source>
+        <translation>Paikallisen välitallennustilan luonti valmis</translation>
+    </message>
+    <message>
+        <location filename="../core/save-git.c" line="1221"/>
+        <source>Preparing to save data</source>
+        <translation>Valmistellaan datan tallennus</translation>
+    </message>
+    <message>
+        <location filename="../core/save-html.c" line="505"/>
         <source>Number</source>
         <translation>Numero</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="500"/>
+        <location filename="../core/save-html.c" line="506"/>
         <source>Date</source>
         <translation>Ajankohta</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="501"/>
+        <location filename="../core/save-html.c" line="507"/>
         <source>Time</source>
         <translation>Kello</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="502"/>
+        <location filename="../core/save-html.c" line="508"/>
         <source>Location</source>
         <translation>Kohde</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="503"/>
+        <location filename="../core/save-html.c" line="509"/>
         <source>Air temp.</source>
         <translation>Ilman lämpötila</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="504"/>
+        <location filename="../core/save-html.c" line="510"/>
         <source>Water temp.</source>
         <translation>Veden lämpötila</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="505"/>
+        <location filename="../core/save-html.c" line="511"/>
         <source>Dives</source>
         <translation>Sukelluksia</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="506"/>
+        <location filename="../core/save-html.c" line="512"/>
         <source>Expand all</source>
         <translation>Laajenna kaikki retket</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="507"/>
+        <location filename="../core/save-html.c" line="513"/>
         <source>Collapse all</source>
         <translation>Supista kaikki retket</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="508"/>
+        <location filename="../core/save-html.c" line="514"/>
         <source>Trips</source>
         <translation>Retkiä</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="509"/>
+        <location filename="../core/save-html.c" line="515"/>
         <source>Statistics</source>
         <translation>Tilastot</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="510"/>
+        <location filename="../core/save-html.c" line="516"/>
         <source>Advanced search</source>
         <translation>Laajennettu haku</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="513"/>
+        <location filename="../core/save-html.c" line="520"/>
         <source>Rating</source>
         <translation>Yleisarvio</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="514"/>
+        <location filename="../core/save-html.c" line="521"/>
+        <source>WaveSize</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/save-html.c" line="522"/>
         <source>Visibility</source>
         <translation>Näkyvyys</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="515"/>
+        <location filename="../core/save-html.c" line="523"/>
+        <source>Current</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/save-html.c" line="524"/>
+        <source>Surge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/save-html.c" line="525"/>
+        <source>Chill</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/save-html.c" line="526"/>
         <source>Duration</source>
         <translation>Kesto</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="516"/>
+        <location filename="../core/save-html.c" line="527"/>
         <source>Divemaster</source>
         <translation>Sukellusvanhin</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="517"/>
+        <location filename="../core/save-html.c" line="528"/>
         <source>Buddy</source>
         <translation>Sukelluspari</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="518"/>
+        <location filename="../core/save-html.c" line="529"/>
         <source>Suit</source>
         <translation>Puku</translation>
     </message>
     <message>
-        <location filename="../core/divesite-helper.cpp" line="21"/>
-        <source>No dive site layout categories set in preferences!</source>
-        <translation>Asetuksissa ei ole sukelluskohteiden määrityksiä!</translation>
-    </message>
-    <message>
-        <location filename="../core/divesite-helper.cpp" line="29"/>
-        <location filename="../core/save-html.c" line="519"/>
-        <source>Tags</source>
-        <translation>Avainsanat</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="520"/>
+        <location filename="../core/save-html.c" line="531"/>
         <location filename="../smtk-import/smartrak.c" line="257"/>
         <location filename="../smtk-import/smartrak.c" line="330"/>
         <source>Notes</source>
         <translation>Muistiinpanot</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="521"/>
+        <location filename="../core/save-html.c" line="532"/>
         <source>Show more details</source>
         <translation>Näytä lisää yksityiskohtia</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="524"/>
+        <location filename="../core/save-html.c" line="535"/>
         <source>Yearly statistics</source>
         <translation>Vuositilastot</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="525"/>
+        <location filename="../core/save-html.c" line="536"/>
         <source>Year</source>
         <translation>Vuosi</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="526"/>
+        <location filename="../core/save-html.c" line="537"/>
         <source>Total time</source>
         <translation>Kokonaisaika</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="527"/>
+        <location filename="../core/save-html.c" line="538"/>
         <source>Average time</source>
         <translation>Keskimääräinen kesto</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="528"/>
+        <location filename="../core/save-html.c" line="539"/>
         <source>Shortest time</source>
         <translation>Lyhin kesto</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="529"/>
+        <location filename="../core/save-html.c" line="540"/>
         <source>Longest time</source>
         <translation>Pisin kesto</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="530"/>
+        <location filename="../core/save-html.c" line="541"/>
         <source>Average depth</source>
         <translation>Keskisyvyys</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="531"/>
+        <location filename="../core/save-html.c" line="542"/>
         <source>Min. depth</source>
         <translation>Pienin syvyys</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="532"/>
+        <location filename="../core/save-html.c" line="543"/>
         <source>Max. depth</source>
         <translation>Suurin syvyys</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="533"/>
+        <location filename="../core/save-html.c" line="544"/>
         <source>Average SAC</source>
         <translation>Pintakulutus</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="534"/>
+        <location filename="../core/save-html.c" line="545"/>
         <source>Min. SAC</source>
         <translation>Pienin pintakulutus</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="535"/>
+        <location filename="../core/save-html.c" line="546"/>
         <source>Max. SAC</source>
         <translation>Suurin pintakulutus</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="536"/>
+        <location filename="../core/save-html.c" line="547"/>
         <source>Average temp.</source>
         <translation>Keskilämpötila</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="537"/>
+        <location filename="../core/save-html.c" line="548"/>
         <source>Min. temp.</source>
         <translation>Alin lämpötila</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="538"/>
+        <location filename="../core/save-html.c" line="549"/>
         <source>Max. temp.</source>
         <translation>Ylin lämpötila</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="539"/>
+        <location filename="../core/save-html.c" line="550"/>
         <source>Back to list</source>
         <translation>Takaisin listalle</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="542"/>
+        <location filename="../core/save-html.c" line="553"/>
         <source>Dive #</source>
         <translation>Sukellus</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="543"/>
+        <location filename="../core/save-html.c" line="554"/>
         <source>Dive profile</source>
         <translation>Sukellusprofiili</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="544"/>
+        <location filename="../core/save-html.c" line="555"/>
         <source>Dive information</source>
         <translation>Sukellustiedot</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="545"/>
+        <location filename="../core/save-html.c" line="556"/>
         <source>Dive equipment</source>
         <translation>Sukellusvarusteet</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="546"/>
-        <location filename="../core/save-html.c" line="553"/>
+        <location filename="../core/save-html.c" line="557"/>
+        <location filename="../core/save-html.c" line="564"/>
         <source>Type</source>
         <translation>Tyyppi</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="547"/>
+        <location filename="../core/save-html.c" line="558"/>
         <source>Size</source>
         <translation>Tilavuus</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="548"/>
+        <location filename="../core/save-html.c" line="559"/>
         <source>Work pressure</source>
         <translation>Paineluokka</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="549"/>
+        <location filename="../core/save-html.c" line="560"/>
         <source>Start pressure</source>
         <translation>Alkupaine</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="550"/>
+        <location filename="../core/save-html.c" line="561"/>
         <source>End pressure</source>
         <translation>Loppupaine</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="551"/>
+        <location filename="../core/save-html.c" line="562"/>
         <source>Gas</source>
         <translation>Kaasu</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="552"/>
+        <location filename="../core/save-html.c" line="563"/>
         <source>Weight</source>
         <translation>Painot</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="554"/>
+        <location filename="../core/save-html.c" line="565"/>
         <source>Events</source>
         <translation>Tapahtumat</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="555"/>
+        <location filename="../core/save-html.c" line="566"/>
         <source>Name</source>
         <translation>Nimi</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="556"/>
+        <location filename="../core/save-html.c" line="567"/>
         <source>Value</source>
         <translation>Arvo</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="557"/>
+        <location filename="../core/save-html.c" line="568"/>
         <source>Coordinates</source>
         <translation>Koordinaatit</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="558"/>
+        <location filename="../core/save-html.c" line="569"/>
         <source>Dive status</source>
         <translation>Sukelluksen tila</translation>
     </message>
     <message>
+        <location filename="../core/save-xml.c" line="758"/>
+        <source>Failed to save dives to %s (%s)</source>
+        <translation>Sukellusten %s (%s) tallennus epäonnistui</translation>
+    </message>
+    <message>
+        <location filename="../core/save-xml.c" line="874"/>
+        <source>Failed to save divesites to %s (%s)</source>
+        <translation>Sukelluskohteiden %s (%s) tallennus epäonnistui</translation>
+    </message>
+    <message>
         <location filename="../core/statistics.c" line="146"/>
         <source>All (by type stats)</source>
         <translation>Kaikki (tyypin mukaan)</translation>
@@ -11822,87 +13239,157 @@ EADD: %d%s / %.1fg/ℓ
         <translation>Kaikki (minimilämpötilan mukaan)</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="33"/>
-        <source>CCR</source>
-        <translation>CCR</translation>
-    </message>
-    <message>
-        <location filename="../core/dive.c" line="34"/>
-        <source>pSCR</source>
-        <translation>pSCR</translation>
-    </message>
-    <message>
-        <location filename="../core/dive.c" line="35"/>
-        <source>Freedive</source>
-        <translation>Vapaasukellus</translation>
-    </message>
-    <message>
         <location filename="../core/statistics.c" line="226"/>
         <source>All (by trip stats)</source>
         <translation>Kaikki (matkan tilastojen mukaan)</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="116"/>
+        <location filename="../core/subsurfacestartup.c" line="121"/>
         <source>Jan</source>
         <translation>tammi</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="116"/>
+        <location filename="../core/subsurfacestartup.c" line="121"/>
         <source>Feb</source>
         <translation>helmi</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="116"/>
+        <location filename="../core/subsurfacestartup.c" line="121"/>
         <source>Mar</source>
         <translation>maalis</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="116"/>
+        <location filename="../core/subsurfacestartup.c" line="121"/>
         <source>Apr</source>
         <translation>huhti</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="116"/>
+        <location filename="../core/subsurfacestartup.c" line="121"/>
         <source>May</source>
         <translation>touko</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="116"/>
+        <location filename="../core/subsurfacestartup.c" line="121"/>
         <source>Jun</source>
         <translation>kesä</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="117"/>
+        <location filename="../core/subsurfacestartup.c" line="122"/>
         <source>Jul</source>
         <translation>heinä</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="117"/>
+        <location filename="../core/subsurfacestartup.c" line="122"/>
         <source>Aug</source>
         <translation>elo</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="117"/>
+        <location filename="../core/subsurfacestartup.c" line="122"/>
         <source>Sep</source>
         <translation>syys</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="117"/>
+        <location filename="../core/subsurfacestartup.c" line="122"/>
         <source>Oct</source>
         <translation>loka</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="117"/>
+        <location filename="../core/subsurfacestartup.c" line="122"/>
         <source>Nov</source>
         <translation>marras</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="117"/>
+        <location filename="../core/subsurfacestartup.c" line="122"/>
         <source>Dec</source>
         <translation>joulu</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="32"/>
+        <location filename="../core/tag.c" line="14"/>
+        <source>boat</source>
+        <translation>vene</translation>
+    </message>
+    <message>
+        <location filename="../core/tag.c" line="14"/>
+        <source>shore</source>
+        <translation>ranta</translation>
+    </message>
+    <message>
+        <location filename="../core/tag.c" line="15"/>
+        <source>deep</source>
+        <translation>syvä</translation>
+    </message>
+    <message>
+        <location filename="../core/tag.c" line="15"/>
+        <source>cavern</source>
+        <translation>luola (cavern)</translation>
+    </message>
+    <message>
+        <location filename="../core/tag.c" line="16"/>
+        <source>altitude</source>
+        <translation>korkeus</translation>
+    </message>
+    <message>
+        <location filename="../core/tag.c" line="17"/>
+        <source>pool</source>
+        <translation>uima-allas</translation>
+    </message>
+    <message>
+        <location filename="../core/tag.c" line="17"/>
+        <source>lake</source>
+        <translation>järvi</translation>
+    </message>
+    <message>
+        <location filename="../core/tag.c" line="18"/>
+        <source>fresh</source>
+        <translation>makea</translation>
+    </message>
+    <message>
+        <location filename="../core/tag.c" line="18"/>
+        <source>student</source>
+        <translation>oppilas</translation>
+    </message>
+    <message>
+        <location filename="../core/tag.c" line="19"/>
+        <source>video</source>
+        <translation>video</translation>
+    </message>
+    <message>
+        <location filename="../core/taxonomy.c" line="9"/>
+        <source>None</source>
+        <translation>Ei mitään</translation>
+    </message>
+    <message>
+        <location filename="../core/taxonomy.c" line="10"/>
+        <source>Ocean</source>
+        <translation>Meri</translation>
+    </message>
+    <message>
+        <location filename="../core/taxonomy.c" line="11"/>
+        <source>Country</source>
+        <translation>Maa</translation>
+    </message>
+    <message>
+        <location filename="../core/taxonomy.c" line="12"/>
+        <source>State</source>
+        <translation>Tila</translation>
+    </message>
+    <message>
+        <location filename="../core/taxonomy.c" line="13"/>
+        <source>County</source>
+        <translation>Maakunta</translation>
+    </message>
+    <message>
+        <location filename="../core/taxonomy.c" line="14"/>
+        <source>Town</source>
+        <translation>Kunta</translation>
+    </message>
+    <message>
+        <location filename="../core/taxonomy.c" line="15"/>
+        <source>City</source>
+        <translation>Kaupunki</translation>
+    </message>
+    <message>
+        <location filename="../core/uemis-downloader.c" line="34"/>
         <source>Uemis Zurich: the file system is almost full.
 Disconnect/reconnect the dive computer
 and click &apos;Retry&apos;</source>
@@ -11911,7 +13398,7 @@ Liitä sukellustietokone uudestaan
 ja yritä uudestaan.</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="33"/>
+        <location filename="../core/uemis-downloader.c" line="35"/>
         <source>Uemis Zurich: the file system is full.
 Disconnect/reconnect the dive computer
 and click Retry</source>
@@ -11919,104 +13406,104 @@ and click Retry</source>
 Irrota ja liitä sukellustietokone uudestaan, jonka jälkeen klikkaa &quot;Yritä uudestaan&quot;</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="34"/>
+        <location filename="../core/uemis-downloader.c" line="36"/>
         <source>Short write to req.txt file.
 Is the Uemis Zurich plugged in correctly?</source>
         <translation>Tiedoston req.txt kirjoittaminen epäonnistui.
 Onko Uemis Zurich kytketty oikein?</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="35"/>
+        <location filename="../core/uemis-downloader.c" line="37"/>
         <source>No dives to download.</source>
         <translation>Ei ladattavia sukelluksia.</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="499"/>
+        <location filename="../core/uemis-downloader.c" line="501"/>
         <source>%s %s</source>
         <translation>%s %s</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="535"/>
+        <location filename="../core/uemis-downloader.c" line="537"/>
         <source>data</source>
         <translation>tieto</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="563"/>
+        <location filename="../core/uemis-downloader.c" line="565"/>
         <source>dive log #</source>
         <translation>Sukellusloki #</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="565"/>
+        <location filename="../core/uemis-downloader.c" line="567"/>
         <source>dive spot #</source>
         <translation>sukelluskohde #</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="567"/>
+        <location filename="../core/uemis-downloader.c" line="569"/>
         <source>details for #</source>
         <translation>yksityiskohdat #</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="795"/>
+        <location filename="../core/uemis-downloader.c" line="798"/>
         <source>wetsuit</source>
         <translation>märkäpuku</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="795"/>
+        <location filename="../core/uemis-downloader.c" line="798"/>
         <source>semidry</source>
         <translation>puolikuiva</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="795"/>
+        <location filename="../core/uemis-downloader.c" line="798"/>
         <source>drysuit</source>
         <translation>kuivapuku</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="796"/>
+        <location filename="../core/uemis-downloader.c" line="799"/>
         <source>shorty</source>
         <translation>lyhyt</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="796"/>
+        <location filename="../core/uemis-downloader.c" line="799"/>
         <source>vest</source>
         <translation>liivi</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="796"/>
+        <location filename="../core/uemis-downloader.c" line="799"/>
         <source>long john</source>
         <translation>haalari</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="796"/>
+        <location filename="../core/uemis-downloader.c" line="799"/>
         <source>jacket</source>
         <translation>takki</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="796"/>
+        <location filename="../core/uemis-downloader.c" line="799"/>
         <source>full suit</source>
         <translation>kokopuku</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="796"/>
+        <location filename="../core/uemis-downloader.c" line="799"/>
         <source>2 pcs full suit</source>
         <translation>Kaksiosainen kokopuku</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="797"/>
+        <location filename="../core/uemis-downloader.c" line="800"/>
         <source>membrane</source>
         <translation>laminaatti</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="1336"/>
+        <location filename="../core/uemis-downloader.c" line="1339"/>
         <source>Initialise communication</source>
         <translation>Muodosta yhteys</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="1339"/>
+        <location filename="../core/uemis-downloader.c" line="1342"/>
         <source>Uemis init failed</source>
         <translation>Uemiksen lukeminen epäonnistui</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="1351"/>
+        <location filename="../core/uemis-downloader.c" line="1354"/>
         <source>Start download</source>
         <translation>Aloita lataus</translation>
     </message>
@@ -12111,80 +13598,136 @@ Onko Uemis Zurich kytketty oikein?</translation>
         <translation>Hälytys: heikko paristo</translation>
     </message>
     <message>
-        <location filename="../core/worldmap-save.c" line="42"/>
-        <source>Date:</source>
-        <translation>Päivä:</translation>
+        <location filename="../core/units.c" line="14"/>
+        <source>pascal</source>
+        <translation>Pa</translation>
     </message>
     <message>
-        <location filename="../core/worldmap-save.c" line="44"/>
-        <source>Time:</source>
-        <translation>Kello:</translation>
+        <location filename="../core/units.c" line="60"/>
+        <source>ℓ</source>
+        <translation>ℓ</translation>
     </message>
     <message>
-        <location filename="../core/worldmap-save.c" line="46"/>
-        <source>Duration:</source>
-        <translation>Kesto:</translation>
+        <location filename="../core/units.c" line="134"/>
+        <source>m/min</source>
+        <translation>m/min</translation>
     </message>
     <message>
-        <location filename="../core/divelogexportlogic.cpp" line="56"/>
-        <location filename="../core/divelogexportlogic.cpp" line="94"/>
-        <location filename="../core/plannernotes.c" line="62"/>
-        <location filename="../core/plannernotes.c" line="510"/>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="140"/>
-        <location filename="../core/worldmap-save.c" line="47"/>
-        <location filename="../desktop-widgets/templatelayout.h" line="101"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="104"/>
-        <source>min</source>
-        <translation>min</translation>
+        <location filename="../core/units.c" line="136"/>
+        <source>m/s</source>
+        <translation>m/s</translation>
     </message>
     <message>
-        <location filename="../core/divelogexportlogic.cpp" line="56"/>
-        <location filename="../core/divelogexportlogic.cpp" line="94"/>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="140"/>
-        <location filename="../desktop-widgets/templatelayout.h" line="100"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="104"/>
-        <source>h</source>
-        <translation>t</translation>
+        <location filename="../core/units.c" line="141"/>
+        <source>ft/min</source>
+        <translation>ft/min</translation>
     </message>
     <message>
-        <location filename="../core/divelogexportlogic.cpp" line="56"/>
-        <location filename="../core/divelogexportlogic.cpp" line="94"/>
-        <location filename="../core/qthelper.h" line="76"/>
-        <location filename="../desktop-widgets/templatelayout.h" line="101"/>
-        <source>sec</source>
-        <translation>sek</translation>
+        <location filename="../core/units.c" line="143"/>
+        <source>ft/s</source>
+        <translation>ft/s</translation>
     </message>
     <message>
-        <location filename="../core/divelogexportlogic.cpp" line="152"/>
-        <source>Cannot find a folder called &apos;theme&apos; in the standard locations</source>
-        <translation>Teema-hakemistoa ei löydy standardi-sijeinneista</translation>
+        <location filename="../core/worldmap-save.c" line="44"/>
+        <source>Date:</source>
+        <translation>Päivä:</translation>
+    </message>
+    <message>
+        <location filename="../core/worldmap-save.c" line="46"/>
+        <source>Time:</source>
+        <translation>Kello:</translation>
+    </message>
+    <message>
+        <location filename="../core/worldmap-save.c" line="48"/>
+        <source>Duration:</source>
+        <translation>Kesto:</translation>
     </message>
     <message>
-        <location filename="../core/worldmap-save.c" line="50"/>
+        <location filename="../core/worldmap-save.c" line="52"/>
         <source>Max. depth:</source>
         <translation>Suurin syvyys:</translation>
     </message>
     <message>
-        <location filename="../core/worldmap-save.c" line="53"/>
+        <location filename="../core/worldmap-save.c" line="55"/>
         <source>Air temp.:</source>
         <translation>Ilman lämpötila:</translation>
     </message>
     <message>
-        <location filename="../core/worldmap-save.c" line="56"/>
+        <location filename="../core/worldmap-save.c" line="58"/>
         <source>Water temp.:</source>
         <translation>Veden lämpötila:</translation>
     </message>
     <message>
-        <location filename="../core/worldmap-save.c" line="58"/>
+        <location filename="../core/worldmap-save.c" line="60"/>
         <source>Location:</source>
         <translation>Kohde:</translation>
     </message>
     <message>
-        <location filename="../core/worldmap-save.c" line="62"/>
+        <location filename="../core/worldmap-save.c" line="64"/>
         <source>Notes:</source>
         <translation>Muistiinpanot:</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="64"/>
+        <source>Remove this point</source>
+        <translation>Poista tämä etappi</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="558"/>
+        <source>Don&apos;t save an empty log to the cloud</source>
+        <translation>Älä tallenna tyhjää lokitiedostoa pilveen</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="47"/>
+        <source>Average</source>
+        <translation>Keskim.</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="50"/>
+        <source>Minimum</source>
+        <translation>Alin</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="53"/>
+        <source>Maximum</source>
+        <translation>Korkein</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="155"/>
+        <source>Invalid response from server</source>
+        <translation>Virheellinen vastaus palvelimelta</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="163"/>
+        <source>Expected XML tag &apos;DiveDateReader&apos;, got instead &apos;%1</source>
+        <translation>Odotettu XML tägi on &apos;DiveDateReader&apos;, mutta saatiin &apos;%1&apos;</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="209"/>
+        <source>Expected XML tag &apos;DiveDates&apos; not found</source>
+        <translation>Odotettua XML -tägiä &apos;DiveDates&apos; ei löydy</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="216"/>
+        <source>Malformed XML response. Line %1: %2</source>
+        <translation>Virheellinen XML vastasu. Rivi %1: %2</translation>
+    </message>
+    <message>
+        <location filename="../profile-widget/diveprofileitem.cpp" line="191"/>
+        <source>planned waypoint above ceiling</source>
+        <translation>Suunniteltu etappipysähdys katon yläpuolella</translation>
+    </message>
+    <message>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1655"/>
+        <source>modechange</source>
+        <translation>vaihda moodia</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="176"/>
+        <source>/min</source>
+        <translation>/min</translation>
+    </message>
+    <message>
         <location filename="../smtk-import/smartrak.c" line="253"/>
         <source>Built</source>
         <translation>Käännetty</translation>
@@ -12259,250 +13802,172 @@ Onko Uemis Zurich kytketty oikein?</translation>
         <source>Depth</source>
         <translation>Syvyys</translation>
     </message>
+</context>
+<context>
+    <name>main</name>
     <message>
-        <location filename="../profile-widget/diveprofileitem.cpp" line="190"/>
-        <source>planned waypoint above ceiling</source>
-        <translation>Suunniteltu etappipysähdys katon yläpuolella</translation>
-    </message>
-    <message>
-        <location filename="../core/taxonomy.c" line="9"/>
-        <source>None</source>
-        <translation>Ei mitään</translation>
-    </message>
-    <message>
-        <location filename="../core/taxonomy.c" line="10"/>
-        <source>Ocean</source>
-        <translation>Meri</translation>
-    </message>
-    <message>
-        <location filename="../core/taxonomy.c" line="11"/>
-        <source>Country</source>
-        <translation>Maa</translation>
-    </message>
-    <message>
-        <location filename="../core/taxonomy.c" line="12"/>
-        <source>State</source>
-        <translation>Tila</translation>
-    </message>
-    <message>
-        <location filename="../core/taxonomy.c" line="13"/>
-        <source>County</source>
-        <translation>Maakunta</translation>
-    </message>
-    <message>
-        <location filename="../core/taxonomy.c" line="14"/>
-        <source>Town</source>
-        <translation>Kunta</translation>
-    </message>
-    <message>
-        <location filename="../core/taxonomy.c" line="15"/>
-        <source>City</source>
-        <translation>Kaupunki</translation>
-    </message>
-    <message>
-        <location filename="../core/save-git.c" line="914"/>
-        <source>Start saving data</source>
-        <translation>Tallenna tiedot</translation>
-    </message>
-    <message>
-        <location filename="../core/save-git.c" line="923"/>
-        <source>Start saving dives</source>
-        <translation>Tallenna sukellukset</translation>
-    </message>
-    <message>
-        <location filename="../core/save-git.c" line="956"/>
-        <source>Done creating local cache</source>
-        <translation>Paikallisen välitallennustilan luonti valmis</translation>
-    </message>
-    <message>
-        <location filename="../core/save-git.c" line="1207"/>
-        <source>Preparing to save data</source>
-        <translation>Valmistellaan datan tallennus</translation>
-    </message>
-    <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1661"/>
-        <source>modechange</source>
-        <translation>vaihda moodia</translation>
-    </message>
-    <message>
-        <location filename="../core/gpslocation.h" line="14"/>
-        <source>Waiting to aquire GPS location</source>
-        <translation>Odotetaan GPS -sijaintia</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="66"/>
-        <source>Remove this point</source>
-        <translation>Poista tämä etappi</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="558"/>
-        <source>Don&apos;t save an empty log to the cloud</source>
-        <translation>Älä tallenna tyhjää lokitiedostoa pilveen</translation>
+        <location filename="../mobile-widgets/qml/main.qml" line="16"/>
+        <source>Subsurface-mobile</source>
+        <translation>Subsurface-mobiili</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="46"/>
-        <source>Average</source>
-        <translation>Keskim.</translation>
+        <location filename="../mobile-widgets/qml/main.qml" line="232"/>
+        <source>Dive list</source>
+        <translation>Sukelluslista</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="49"/>
-        <source>Minimum</source>
-        <translation>Alin</translation>
+        <location filename="../mobile-widgets/qml/main.qml" line="243"/>
+        <source>Dive management</source>
+        <translation>Sukellusten hallinta</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="52"/>
-        <source>Maximum</source>
-        <translation>Korkein</translation>
+        <location filename="../mobile-widgets/qml/main.qml" line="248"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="357"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="426"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="484"/>
+        <source>Back</source>
+        <translation>Takaisin</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="404"/>
-        <source>Invalid response from server</source>
-        <translation>Virheellinen vastaus palvelimelta</translation>
+        <location filename="../mobile-widgets/qml/main.qml" line="255"/>
+        <source>Add dive manually</source>
+        <translation>Lisää sukellus käsin</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="412"/>
-        <source>Expected XML tag &apos;DiveDateReader&apos;, got instead &apos;%1</source>
-        <translation>Odotettu XML tägi on &apos;DiveDateReader&apos;, mutta saatiin &apos;%1&apos;</translation>
+        <location filename="../mobile-widgets/qml/main.qml" line="267"/>
+        <source>Download from DC</source>
+        <translation>Lataa sukellustietokoneelta</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="458"/>
-        <source>Expected XML tag &apos;DiveDates&apos; not found</source>
-        <translation>Odotettua XML -tägiä &apos;DiveDates&apos; ei löydy</translation>
+        <location filename="../mobile-widgets/qml/main.qml" line="279"/>
+        <source>Apply GPS fixes</source>
+        <translation>Käytä GPS-sijainteja</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="465"/>
-        <source>Malformed XML response. Line %1: %2</source>
-        <translation>Virheellinen XML vastasu. Rivi %1: %2</translation>
+        <location filename="../mobile-widgets/qml/main.qml" line="299"/>
+        <source>Manual sync with cloud</source>
+        <translation>Synkronoi kerran pilvipalveluun</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="121"/>
-        <source>/min</source>
-        <translation>/min</translation>
+        <location filename="../mobile-widgets/qml/main.qml" line="312"/>
+        <source>Disable auto cloud sync</source>
+        <translation>Poista automaattinen pilvisynkronointi käytöstä</translation>
     </message>
     <message>
-        <location filename="../core/save-xml.c" line="743"/>
-        <source>Failed to save dives to %s (%s)</source>
-        <translation>Sukellusten %s (%s) tallennus epäonnistui</translation>
+        <location filename="../mobile-widgets/qml/main.qml" line="312"/>
+        <source>Enable auto cloud sync</source>
+        <translation>Ota automaattinen pilvisynkronointi käyttöön</translation>
     </message>
     <message>
-        <location filename="../core/save-xml.c" line="864"/>
-        <source>Failed to save divesites to %s (%s)</source>
-        <translation>Sukelluskohteiden %s (%s) tallennus epäonnistui</translation>
+        <location filename="../mobile-widgets/qml/main.qml" line="318"/>
+        <source>Turning off automatic sync to cloud causes all data to only be stored locally. This can be very useful in situations with limited or no network access. Please choose &apos;Manual sync with cloud&apos; if you have network connectivity and want to sync your data to cloud storage.</source>
+        <translation>Tiedot tallennetaan vain paikallisesti, kun poistat automaattisen pilvipalvelusynkronoinnin käytöstä. Tämä voi olla hyödyllistä, kun käytössä on huono verkkoyhteys. Valitse &apos;Synkronoi kerran pilvipalveluun&apos;, kun olet toimivassa verkossa ja haluat synkronoida tietosi pilvipalveluun.</translation>
     </message>
-</context>
-<context>
-    <name>main</name>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="15"/>
-        <source>Subsurface-mobile</source>
-        <translation>Subsurface-mobiili</translation>
+        <location filename="../mobile-widgets/qml/main.qml" line="328"/>
+        <source>Dive summary</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="206"/>
-        <source>Dive list</source>
-        <translation>Sukelluslista</translation>
+        <location filename="../mobile-widgets/qml/main.qml" line="339"/>
+        <source>Export</source>
+        <translation>Vienti</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="233"/>
-        <source>Dive management</source>
-        <translation>Sukellusten hallinta</translation>
+        <location filename="../mobile-widgets/qml/main.qml" line="351"/>
+        <source>Location</source>
+        <translation>Kohde</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="295"/>
-        <source>Disable auto cloud sync</source>
-        <translation>Poista automaattinen pilvisynkronointi käytöstä</translation>
+        <location filename="../mobile-widgets/qml/main.qml" line="373"/>
+        <source>Show GPS fixes</source>
+        <translation>Näytä GPS -sijainnit</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="295"/>
-        <source>Enable auto cloud sync</source>
-        <translation>Ota automaattinen pilvisynkronointi käyttöön</translation>
+        <location filename="../mobile-widgets/qml/main.qml" line="386"/>
+        <source>Clear GPS cache</source>
+        <translation>Tyhjennä GPS:n väliaikaistiedot</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="343"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="397"/>
         <source>Disable location service</source>
         <translation>Disabloi sijaintipalvelu</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="365"/>
-        <source>Settings</source>
-        <translation>Asetukset</translation>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="238"/>
-        <source>Add dive manually</source>
-        <translation>Lisää sukellus käsin</translation>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="252"/>
-        <source>Download from DC</source>
-        <translation>Lataa sukellustietokoneelta</translation>
+        <location filename="../mobile-widgets/qml/main.qml" line="397"/>
+        <source>Run location service</source>
+        <translation>Käytä sijaintipalvelua</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="273"/>
-        <source>Manual sync with cloud</source>
-        <translation>Synkronoi kerran pilvipalveluun</translation>
+        <location filename="../mobile-widgets/qml/main.qml" line="408"/>
+        <source>Settings</source>
+        <translation>Asetukset</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="301"/>
-        <source>Turning off automatic sync to cloud causes all data to only be stored locally. This can be very useful in situations with limited or no network access. Please choose &apos;Manual sync with cloud&apos; if you have network connectivity and want to sync your data to cloud storage.</source>
-        <translation>Tiedot tallennetaan vain paikallisesti, kun poistat automaattisen pilvipalvelusynkronoinnin käytöstä. Tämä voi olla hyödyllistä, kun käytössä on huono verkkoyhteys. Valitse &apos;Synkronoi kerran pilvipalveluun&apos;, kun olet toimivassa verkossa ja haluat synkronoida tietosi pilvipalveluun.</translation>
+        <location filename="../mobile-widgets/qml/main.qml" line="421"/>
+        <source>Help</source>
+        <translation>Ohje</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="312"/>
-        <source>GPS</source>
-        <translation>GPS</translation>
+        <location filename="../mobile-widgets/qml/main.qml" line="433"/>
+        <source>About</source>
+        <translation>Tietoja</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="400"/>
-        <source>Help</source>
-        <translation>Ohje</translation>
+        <location filename="../mobile-widgets/qml/main.qml" line="444"/>
+        <source>Show user manual</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="264"/>
-        <source>Apply GPS fixes</source>
-        <translation>Käytä GPS-sijainteja</translation>
+        <location filename="../mobile-widgets/qml/main.qml" line="453"/>
+        <source>Ask for support</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="319"/>
-        <source>Show GPS fixes</source>
-        <translation>Näytä GPS -sijainnit</translation>
+        <location filename="../mobile-widgets/qml/main.qml" line="457"/>
+        <source>failed to open email client, please manually create support email to support@subsurface-divelog.org - the logs have been copied to the clipboard and can be pasted into that email.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="332"/>
-        <source>Clear GPS cache</source>
-        <translation>Tyhjennä GPS:n väliaikaistiedot</translation>
+        <location filename="../mobile-widgets/qml/main.qml" line="467"/>
+        <source>Reset forgotten Subsurface Cloud password</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="378"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="478"/>
         <source>Developer</source>
         <translation>Kehittäjä</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="381"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="488"/>
         <source>App log</source>
         <translation>Sovellusloki</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="389"/>
-        <source>Theme information</source>
-        <translation>Teeman tiedot</translation>
+        <location filename="../mobile-widgets/qml/main.qml" line="495"/>
+        <source>Test busy indicator (toggle)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="354"/>
-        <source>About</source>
-        <translation>Tietoja</translation>
+        <location filename="../mobile-widgets/qml/main.qml" line="505"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="507"/>
+        <source>Test notification text</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="343"/>
-        <source>Run location service</source>
-        <translation>Käytä sijaintipalvelua</translation>
+        <location filename="../mobile-widgets/qml/main.qml" line="511"/>
+        <source>Theme information</source>
+        <translation>Teeman tiedot</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/kirigami/examples/minimalqmake/main.qml" line="28"/>
-        <location filename="../mobile-widgets/qml/kirigami/examples/qmakewithstaticplugin/src/main.qml" line="28"/>
-        <location filename="../mobile-widgets/qml/kirigami/examples/staticcmake/src/main.qml" line="28"/>
-        <source>Hello World</source>
-        <translation>Hello World</translation>
+        <location filename="../mobile-widgets/qml/main.qml" line="519"/>
+        <source>Enable verbose logging</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/main.qml" line="521"/>
+        <source>Not persistent</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -12617,33 +14082,9 @@ p, li { white-space: pre-wrap; }
         <translation>Suunnittelu</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="372"/>
-        <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="585"/>
-        <source>Min. switch duration O₂% below 100%</source>
-        <translation>Vaihdon vähimmäiskesto O₂% alle 100%</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="439"/>
-        <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="595"/>
-        <source>VPM-B deco</source>
-        <translation>VPM-B deko</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="502"/>
-        <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="596"/>
-        <source>Bühlmann deco</source>
-        <translation>Bühlmann deko</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="512"/>
-        <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="597"/>
-        <source>Reserve gas</source>
-        <translation>Varakaasu</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="261"/>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="613"/>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="642"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="690"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="719"/>
         <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="575"/>
         <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="606"/>
         <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="608"/>
@@ -12651,14 +14092,6 @@ p, li { white-space: pre-wrap; }
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="320"/>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="386"/>
-        <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="583"/>
-        <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="594"/>
-        <source>%</source>
-        <translation>%</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="293"/>
         <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="578"/>
         <source>Postpone gas change if a stop is not required</source>
@@ -12671,10 +14104,24 @@ p, li { white-space: pre-wrap; }
         <translation>Vaihda seosta vain tarvittavilla pysähdyksillä</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="352"/>
-        <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="586"/>
-        <source>Plan backgas breaks</source>
-        <translation>Suunnittele ilmatauot</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="303"/>
+        <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="589"/>
+        <source>Last stop at 6m</source>
+        <translation>Viimeinen pysähdys kuudessa metrissä</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="310"/>
+        <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="600"/>
+        <source>+</source>
+        <translation>+</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="320"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="386"/>
+        <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="583"/>
+        <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="594"/>
+        <source>%</source>
+        <translation>%</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="333"/>
@@ -12686,10 +14133,34 @@ p, li { white-space: pre-wrap; }
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="303"/>
-        <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="589"/>
-        <source>Last stop at 6m</source>
-        <translation>Viimeinen pysähdys kuudessa metrissä</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="352"/>
+        <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="586"/>
+        <source>Plan backgas breaks</source>
+        <translation>Suunnittele ilmatauot</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="372"/>
+        <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="585"/>
+        <source>Min. switch duration O₂% below 100%</source>
+        <translation>Vaihdon vähimmäiskesto O₂% alle 100%</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="379"/>
+        <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="584"/>
+        <source>Drop to first depth</source>
+        <translation>Putoaminen alkusyvyyteen</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="399"/>
+        <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="582"/>
+        <source>GFLow</source>
+        <translation>GFLow</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="409"/>
+        <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="581"/>
+        <source>GFHigh</source>
+        <translation>GFHigh</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="419"/>
@@ -12704,28 +14175,22 @@ p, li { white-space: pre-wrap; }
         <translation>Harrastemoodi</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="379"/>
-        <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="584"/>
-        <source>Drop to first depth</source>
-        <translation>Putoaminen alkusyvyyteen</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="449"/>
-        <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="598"/>
-        <source>Safety stop</source>
-        <translation>Turvapysähdys</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="429"/>
         <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="599"/>
         <source>Conservatism level</source>
         <translation>Konservatismi</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="310"/>
-        <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="600"/>
-        <source>+</source>
-        <translation>+</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="439"/>
+        <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="595"/>
+        <source>VPM-B deco</source>
+        <translation>VPM-B deko</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="449"/>
+        <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="598"/>
+        <source>Safety stop</source>
+        <translation>Turvapysähdys</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="495"/>
@@ -12734,6 +14199,18 @@ p, li { white-space: pre-wrap; }
         <translation>Sukellustyyppi</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="502"/>
+        <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="596"/>
+        <source>Bühlmann deco</source>
+        <translation>Bühlmann deko</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="512"/>
+        <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="597"/>
+        <source>Reserve gas</source>
+        <translation>Varakaasu</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="522"/>
         <source>Bailout: Deco on OC</source>
         <translation>Bailout: Deco OC:lla</translation>
@@ -12751,29 +14228,113 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="567"/>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="629"/>
+        <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="616"/>
+        <source>Notes</source>
+        <translation>Muistiinpanot</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="588"/>
+        <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="617"/>
+        <source>Verbatim dive plan</source>
+        <translation>Tarkka sukellussuunnitelma</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="595"/>
+        <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="619"/>
+        <source>In diveplan, list transitions or treat them as implicit</source>
+        <translation>Listataanko siirtymät erikseen sukellussuunnitelmassa?</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="598"/>
+        <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="621"/>
+        <source>Display transitions in deco</source>
+        <translation>Näytä siirtymät dekossa</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="605"/>
+        <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="623"/>
+        <source>In dive plan, show runtime (absolute time) of stops</source>
+        <translation>Sukelluksen suunnittelu: näytä kokonaiskesto (absoluuttinen aika)</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="608"/>
+        <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="625"/>
+        <source>Display runtime</source>
+        <translation>Näytä sukellusaika</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="618"/>
+        <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="627"/>
+        <source>In dive plan, show duration (relative time) of stops</source>
+        <translation>Sukelluksen suunnittelu: näytä pysähdysten kesto (suhteellinen aika)</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="621"/>
+        <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="629"/>
+        <source>Display segment duration</source>
+        <translation>Näytä etappien kestot</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="631"/>
+        <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="631"/>
+        <source>Compute variations of plan (performance cost)</source>
+        <translation>Laske vaihtoehtoisia suunnitelmia (suorituskykyvaade)</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="634"/>
+        <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="633"/>
+        <source>Display plan variations</source>
+        <translation>Näytä vaihtoehtoisia suunnitelmia</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="644"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="706"/>
         <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="604"/>
         <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="607"/>
         <source>ℓ/min</source>
         <translation>ℓ/min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="661"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="657"/>
+        <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="605"/>
+        <source>Deco SAC</source>
+        <translation>Ilmankulutus (deko)</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="735"/>
+        <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="610"/>
+        <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>Käytetään parhaan kaasuseoksen laskentaan. Valitse paras seossyvyys käytettävissä olevien seosten taulusta syöttämällä syvyys, jonka jälkeen &quot;B&quot; (paras Trimix seos) tai &quot;BN&quot; (paras Nitrox seos)</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="738"/>
         <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="612"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="762"/>
-        <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="631"/>
-        <source>Compute variations of plan (performance cost)</source>
-        <translation>Laske vaihtoehtoisia suunnitelmia (suorituskykyvaade)</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="754"/>
+        <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="613"/>
+        <source>Bottom SAC</source>
+        <translation>Ilmankulutus pohjalla</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="765"/>
-        <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="633"/>
-        <source>Display plan variations</source>
-        <translation>Näytä vaihtoehtoisia suunnitelmia</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="761"/>
+        <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="614"/>
+        <source>Bottom pO₂</source>
+        <translation>pO₂ pohjalla</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="768"/>
+        <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="615"/>
+        <source>Best mix END</source>
+        <translation>Paras seos END</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="775"/>
+        <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="634"/>
+        <source>Deco pO₂</source>
+        <translation>pO₂ dekossa</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="782"/>
@@ -12800,100 +14361,106 @@ p, li { white-space: pre-wrap; }
         <translation>Käytetään vähimmäiskaasun määrittämiseen. Ylimääräinen aika maksimisyvyydessä ongelmatilanteessa.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="658"/>
-        <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="610"/>
-        <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>Käytetään parhaan kaasuseoksen laskentaan. Valitse paras seossyvyys käytettävissä olevien seosten taulusta syöttämällä syvyys, jonka jälkeen &quot;B&quot; (paras Trimix seos) tai &quot;BN&quot; (paras Nitrox seos)</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="837"/>
+        <source>Treat oxygen as narcotic when computing best mix</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="399"/>
-        <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="582"/>
-        <source>GFLow</source>
-        <translation>GFLow</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="840"/>
+        <source>O₂ narcotic</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>uploadDiveLogsDE</name>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="409"/>
-        <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="581"/>
-        <source>GFHigh</source>
-        <translation>GFHigh</translation>
+        <location filename="../core/uploadDiveLogsDE.cpp" line="54"/>
+        <source>Cannot prepare dives, none selected?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="677"/>
-        <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="613"/>
-        <source>Bottom SAC</source>
-        <translation>Ilmankulutus pohjalla</translation>
+        <location filename="../core/uploadDiveLogsDE.cpp" line="71"/>
+        <source>building zip file to upload</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="684"/>
-        <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="614"/>
-        <source>Bottom pO₂</source>
-        <translation>pO₂ pohjalla</translation>
+        <location filename="../core/uploadDiveLogsDE.cpp" line="76"/>
+        <source>Stylesheet to export to divelogs.de is not found</source>
+        <translation>Tyylitiedostoa divelogs.de:hen vientiin ei löytynyt</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="691"/>
-        <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="615"/>
-        <source>Best mix END</source>
-        <translation>Paras seos END</translation>
+        <location filename="../core/uploadDiveLogsDE.cpp" line="86"/>
+        <source>Failed to create zip file for upload: %s</source>
+        <translation>ZIP -tiedoston luonti vientiä varten epäonnistui: %s</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="698"/>
-        <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="616"/>
-        <source>Notes</source>
-        <translation>Muistiinpanot</translation>
+        <location filename="../core/uploadDiveLogsDE.cpp" line="148"/>
+        <source>internal error</source>
+        <translation>sisäinen virhe</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="736"/>
-        <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="623"/>
-        <source>In dive plan, show runtime (absolute time) of stops</source>
-        <translation>Sukelluksen suunnittelu: näytä kokonaiskesto (absoluuttinen aika)</translation>
+        <location filename="../core/uploadDiveLogsDE.cpp" line="159"/>
+        <source>Conversion of dive %1 to divelogs.de format failed</source>
+        <translation>Sukelluksen %1 muuntaminen divelogs.de:n muotoon epäonnistui</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="739"/>
-        <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="625"/>
-        <source>Display runtime</source>
-        <translation>Näytä sukellusaika</translation>
+        <location filename="../core/uploadDiveLogsDE.cpp" line="187"/>
+        <source>error writing zip file: %s zip error %d system error %d - %s</source>
+        <translation>virhe zip -tiedoston kirjoittamisessa: %s zip virhe %d järjestelmävirhe %d - %s</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="749"/>
-        <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="627"/>
-        <source>In dive plan, show duration (relative time) of stops</source>
-        <translation>Sukelluksen suunnittelu: näytä pysähdysten kesto (suhteellinen aika)</translation>
+        <location filename="../core/uploadDiveLogsDE.cpp" line="213"/>
+        <source>Uploading dives</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="752"/>
-        <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="629"/>
-        <source>Display segment duration</source>
-        <translation>Näytä etappien kestot</translation>
+        <location filename="../core/uploadDiveLogsDE.cpp" line="294"/>
+        <source>Upload failed</source>
+        <translation>Lähetys epäonnistui</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="726"/>
-        <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="619"/>
-        <source>In diveplan, list transitions or treat them as implicit</source>
-        <translation>Listataanko siirtymät erikseen sukellussuunnitelmassa?</translation>
+        <location filename="../core/uploadDiveLogsDE.cpp" line="298"/>
+        <source>Upload successful</source>
+        <translation>Lähetys onnistui</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="729"/>
-        <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="621"/>
-        <source>Display transitions in deco</source>
-        <translation>Näytä siirtymät dekossa</translation>
+        <location filename="../core/uploadDiveLogsDE.cpp" line="303"/>
+        <source>Login failed</source>
+        <translation>Kirjautuminen epäonnistui</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="719"/>
-        <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="617"/>
-        <source>Verbatim dive plan</source>
-        <translation>Tarkka sukellussuunnitelma</translation>
+        <location filename="../core/uploadDiveLogsDE.cpp" line="309"/>
+        <location filename="../core/uploadDiveLogsDE.cpp" line="310"/>
+        <source>Cannot parse response</source>
+        <translation>Vastauksen jäsentäminen ei onnistu!</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="775"/>
-        <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="634"/>
-        <source>Deco pO₂</source>
-        <translation>pO₂ dekossa</translation>
+        <location filename="../core/uploadDiveLogsDE.cpp" line="323"/>
+        <source>divelogs.de not responding</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="580"/>
-        <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="605"/>
-        <source>Deco SAC</source>
-        <translation>Ilmankulutus (deko)</translation>
+        <location filename="../core/uploadDiveLogsDE.cpp" line="336"/>
+        <source>network error %1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>uploadDiveShare</name>
+    <message>
+        <location filename="../core/uploadDiveShare.cpp" line="85"/>
+        <source>Upload successful</source>
+        <translation>Lähetys onnistui</translation>
+    </message>
+    <message>
+        <location filename="../core/uploadDiveShare.cpp" line="97"/>
+        <source>dive-share.com not responding</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/uploadDiveShare.cpp" line="110"/>
+        <source>network error %1</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 </TS>
\ No newline at end of file