Translation updates

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

1 files changed, 4827 insertions, 3305 deletions

diff --git a/translations/subsurface_nl_NL.ts b/translations/subsurface_nl_NL.ts
index 461b5fab8..d8ec034ee 100644
--- a/translations/subsurface_nl_NL.ts
+++ b/translations/subsurface_nl_NL.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>Navigeer terug</translation>
+        <location filename="../commands/command_edit.cpp" line="991"/>
+        <source>Add weight</source>
+        <translation>Gewicht toeoegen</translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../commands/command_edit.cpp" line="993"/>
+        <source>Add weight (%n dive(s))</source>
+        <translation><numerusform>Gewicht toevoegen (%n duik)</numerusform><numerusform>Gewicht toevoegen (%n duiken)</numerusform></translation>
     </message>
 </context>
 <context>
@@ -53,13 +58,6 @@
         <translation>Extern Bluetooth toestel selecteren </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>Gevonden toestellen</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>Afsluiten</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>Details voor lokaal Bluetooth toestel</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>Naam:</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>Adres:</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 staat aan</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>Aan/uitzetten</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>Kiest toestel:</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>Gevonden toestellen</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>Wissen</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>Details voor lokaal Bluetooth toestel</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>Naam:</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>Adres:</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 staat aan</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>Aan/uitzetten</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>Kiest toestel:</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="29"/>
         <source>Name:</source>
         <translation>Naam:</translation>
@@ -362,50 +367,60 @@
 <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>Cloud rechten</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>E-mail</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>Wachtwoord</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>Registreer</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>Annuleren</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>Cloud rechten controleren...</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="127"/>
         <source>Sign-in or Register</source>
         <translation>Log-in of Registreer</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>Geen cloud</translation>
     </message>
+    <message>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="151"/>
+        <source>Forgot password?</source>
+        <translation>Wachtwoord vergeten?</translation>
+    </message>
 </context>
 <context>
     <name>CloudStorageAuthenticate</name>
     <message>
-        <location filename="../core/cloudstorage.cpp" line="66"/>
+        <location filename="../core/cloudstorage.cpp" line="65"/>
         <source>Cloud account verification required, enter PIN in preferences</source>
         <translation>Cloud account vereist verificatie, voer PIN in bij de voorkeuren</translation>
     </message>
@@ -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>Ongedaan maken</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>Opnieuw</translation>
     </message>
+    <message>
+        <location filename="../commands/command_base.cpp" line="65"/>
+        <source>all dives</source>
+        <translation>Alle duiken</translation>
+    </message>
+    <message>
+        <location filename="../commands/command_edit.cpp" line="94"/>
+        <source>Edit %1</source>
+        <translation>Bewerk %1</translation>
+    </message>
     <message numerus="yes">
-        <location filename="../desktop-widgets/command_edit.cpp" line="92"/>
+        <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>Bewerk %1 (%n duik)</numerusform><numerusform>Bewerk %1 (%n duiken)</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>duik toevoegen</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>duikstek toevoegen</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>%n duik aan trip toevoegen</numerusform><numerusform>%n duiken aan trip toevoegen</numerusform></translation>
     </message>
 </context>
 <context>
+    <name>Command::ApplyGPSFixes</name>
+    <message>
+        <location filename="../commands/command_divesite.cpp" line="396"/>
+        <source>apply GPS fixes</source>
+        <translation>GPS fixes toepassen</translation>
+    </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>groepeer duiken</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>Maak trip</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>verwijder %n duik</numerusform><numerusform>verwijder %n duiken</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>verwijder duikcomputer</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>verwijder %n duikstek</numerusform><numerusform>verwijder %n duikstekken</numerusform></translation>
     </message>
@@ -684,7 +716,7 @@
 <context>
     <name>Command::EditAirTemp</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="241"/>
+        <location filename="../commands/command_edit.cpp" line="333"/>
         <source>air temperature</source>
         <translation>luchttemperatuur</translation>
     </message>
@@ -692,15 +724,31 @@
 <context>
     <name>Command::EditAtmPress</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="286"/>
+        <location filename="../commands/command_edit.cpp" line="399"/>
         <source>Atm. pressure</source>
         <translation>Atm. druk</translation>
     </message>
 </context>
 <context>
+    <name>Command::EditChill</name>
+    <message>
+        <location filename="../commands/command_edit.cpp" line="312"/>
+        <source>chill</source>
+        <translation>koude</translation>
+    </message>
+</context>
+<context>
+    <name>Command::EditCurrent</name>
+    <message>
+        <location filename="../commands/command_edit.cpp" line="270"/>
+        <source>current</source>
+        <translation>stroming</translation>
+    </message>
+</context>
+<context>
     <name>Command::EditDepth</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="334"/>
+        <location filename="../commands/command_edit.cpp" line="447"/>
         <source>depth</source>
         <translation>diepte</translation>
     </message>
@@ -708,7 +756,7 @@
 <context>
     <name>Command::EditDiveSite</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="356"/>
+        <location filename="../commands/command_edit.cpp" line="469"/>
         <source>dive site</source>
         <translation>duikstek</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>Duikstek land bewerken</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>Duikstek beschrijving bewerken</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>Duikstek locatie bewerken</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>Duikstek naam bewerken</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>Duikstek notities bewerken</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>Duikstek taxonomie bewerken</translation>
     </message>
@@ -764,7 +812,7 @@
 <context>
     <name>Command::EditDuration</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="310"/>
+        <location filename="../commands/command_edit.cpp" line="423"/>
         <source>duration</source>
         <translation>duur</translation>
     </message>
@@ -772,7 +820,7 @@
 <context>
     <name>Command::EditNotes</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="156"/>
+        <location filename="../commands/command_edit.cpp" line="164"/>
         <source>notes</source>
         <translation>notities</translation>
     </message>
@@ -780,7 +828,7 @@
 <context>
     <name>Command::EditRating</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="199"/>
+        <location filename="../commands/command_edit.cpp" line="207"/>
         <source>rating</source>
         <translation>waardering</translation>
     </message>
@@ -788,15 +836,23 @@
 <context>
     <name>Command::EditSuit</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="178"/>
+        <location filename="../commands/command_edit.cpp" line="186"/>
         <source>suit</source>
         <translation>duikpak</translation>
     </message>
 </context>
 <context>
+    <name>Command::EditSurge</name>
+    <message>
+        <location filename="../commands/command_edit.cpp" line="291"/>
+        <source>surge</source>
+        <translation>golven</translation>
+    </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>Bewerk %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>trip locatie</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>trip notities</translation>
     </message>
@@ -820,7 +876,7 @@
 <context>
     <name>Command::EditVisibility</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="220"/>
+        <location filename="../commands/command_edit.cpp" line="228"/>
         <source>visibility</source>
         <translation>Zicht</translation>
     </message>
@@ -828,15 +884,31 @@
 <context>
     <name>Command::EditWaterTemp</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="265"/>
+        <location filename="../commands/command_edit.cpp" line="357"/>
         <source>water temperature</source>
         <translation>watertemperatuur</translation>
     </message>
 </context>
 <context>
+    <name>Command::EditWaterTypeUser</name>
+    <message>
+        <location filename="../commands/command_edit.cpp" line="378"/>
+        <source>salinity</source>
+        <translation>zoutgehalte</translation>
+    </message>
+</context>
+<context>
+    <name>Command::EditWaveSize</name>
+    <message>
+        <location filename="../commands/command_edit.cpp" line="249"/>
+        <source>wavesize</source>
+        <translation>golfhoogte</translation>
+    </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>importeer duikstekken van %1</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>importeer %n duik van %1</numerusform><numerusform>importeer %n duiken van %1</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>duikstekken samenvoegen</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>Duik samenvoegen</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>Duikcomputer naar voren brengen</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>ongebruikte duikstekken verwijderen</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>verwijder automatisch aangemaakte trips</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>%n duik uit trip verwijderen</numerusform><numerusform>%n duiken uit trip verwijderen</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>%n duik hernummeren</numerusform><numerusform>%n duiken hernummeren</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>Tijdstip van %n duik verschuiven</numerusform><numerusform>Tijdstip van %n duiken verschuiven</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>duikcomputer splitsen</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>duik splitsen </translation>
     </message>
@@ -1065,10 +1137,16 @@
         <translation>Annuleren</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 familie</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 familie</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>Basisinstellingen</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>Eco</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>Gemiddeld</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>Hoog</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>Engels</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>Duits</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>Frans</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>Italiaans</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>Serienummer</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>Lengte</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>Firmware versie</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>MMDDJJ</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>DDMMJJ</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>JJMMDD</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>Taal</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>Datumformaat</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>Helderheid</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>Eenheden</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>Zoutgehalte (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>Toestel instellen met standaardinstellingen </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>Kompas gevoeligheid</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>Computer model</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>Eigen tekst</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>Open Circuit</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>Gesloten Circuit</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>Meter</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>Apnee</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>Duikmodus</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>Aantal duiken</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>Toon veiligheidsstop</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="359"/>
@@ -1451,36 +1245,32 @@
         <translation>Meetfrequentie</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>Standaard</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>Datumformaat</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>Rood</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>MM/DD/YY</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>Groen</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>DD/MM/YY</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>Blauw</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>YY/MM/DD</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="417"/>
@@ -1493,40 +1283,16 @@
         <translation>Klok duikcomputer met PC synchroniseren</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>Kleur duikmodus</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>Toon veiligheidsstop</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>Einddiepte</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="424"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2580"/>
+        <source>Salinity</source>
+        <translation>Zoutgehalte</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>Lengte</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>Startdiepte</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>Einddiepte</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>Reset Diepte</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>Geavanceerde instellingen</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>Gevoeligheid linker knop</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>Altijd pO₂ tonen</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>Alt GF kan onderwater aangepast worden</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>Desaturatie</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>Toekomstige TTS</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>Druksensor compensatie</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>Desaturatie</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>Meter</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>Apnee</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>Saturatie</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>Scherm omdraaien</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>Gevoeligheid rechter knop</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>MOD Waarschuwing</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>Grafische snelheidsindicator</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>Dynamische stijgsnelheid</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>Decompressie gas consumptie</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>Temperatuursensor compensatie</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>Gas instellingen</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>Eco</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>Gemiddeld</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>Hoog</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>Engels</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>Duits</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>Frans</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>Italiaans</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>MMDDJJ</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>DDMMJJ</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>JJMMDD</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>Taal</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>Helderheid</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>Eenheden</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>Zoutgehalte (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>Toestel instellen met standaardinstellingen </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>Kompas gevoeligheid</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>Computer model</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>Open Circuit</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>Gesloten Circuit</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>Duikmodus</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>Standaard</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>Rood</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>Groen</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>Blauw</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>Kleur duikmodus</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>Gevoeligheid linker knop</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>Altijd pO₂ tonen</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>Druksensor compensatie</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>Scherm omdraaien</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>Gevoeligheid rechter knop</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>MOD Waarschuwing</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>Dynamische stijgsnelheid</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>Temperatuursensor compensatie</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>Sensor</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>Standaard setpoint</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>Travel gas consumptie</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>Gevoeligheid knop</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 conservatisme</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>Standaard setpoint</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3589"/>
@@ -2139,14 +2329,6 @@
         <translation>Model</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>Aantal duiken</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>Totale duiktijd</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>Metrisch</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>Tijdsalarm</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>MM/DD/YY</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>DD/MM/YY</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>YY/MM/DD</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>Zoutgehalte</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>Travel gas consumptie</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>Gevoeligheid knop</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 conservatisme</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>Fout</translation>
@@ -2437,6 +2509,11 @@
         <translation>Alle bestanden</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1464"/>
+        <source>Choose file for dive computer download logfile</source>
+        <translation>Kies een bestand om duikcomputer log te downloaden</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1465"/>
         <source>Log files</source>
         <translation>Log bestanden</translation>
@@ -2456,19 +2533,6 @@
         <source>Disconnected from device</source>
         <translation>Verbinding met toestel verbroken</translation>
     </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1464"/>
-        <source>Choose file for dive computer download logfile</source>
-        <translation>Kies een bestand om duikcomputer log te downloaden</translation>
-    </message>
-</context>
-<context>
-    <name>ContextDrawer</name>
-    <message>
-        <location filename="../mobile-widgets/qml/kirigami/src/controls/ContextDrawer.qml" line="77"/>
-        <source>Actions</source>
-        <translation>Acties</translation>
-    </message>
 </context>
 <context>
     <name>CopySettings</name>
@@ -2536,148 +2600,148 @@
 <context>
     <name>CylindersModel</name>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="18"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="19"/>
         <source>Type</source>
         <translation>Type</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="18"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="19"/>
         <source>Size</source>
         <translation>Grootte</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="18"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="19"/>
         <source>Work press.</source>
         <translation>Werkdruk</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="18"/>
-        <location filename="../qt-models/cylindermodel.cpp" line="27"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="19"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="28"/>
         <source>Start press.</source>
         <translation>Startdruk</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="18"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="19"/>
         <source>End press.</source>
         <translation>Einddruk</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="18"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="19"/>
         <source>O₂%</source>
         <translation>O₂%</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="18"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="19"/>
         <source>He%</source>
         <translation>He%</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="19"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="20"/>
         <source>Deco switch at</source>
         <translation>Wissel op</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="19"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="20"/>
         <source>Bot. MOD</source>
         <translation>Bodemgas MOD</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="19"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="20"/>
         <source>MND</source>
         <translation>MND</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="19"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="20"/>
         <source>Use</source>
         <translation>Gebruik</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="54"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="48"/>
         <source>cuft</source>
         <translation>cuft</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="58"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="52"/>
         <source>ℓ</source>
         <translation>ℓ</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="238"/>
+        <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>Dit gas wordt gebruikt. Enkel flessen die niet gebruikt worden tijdens deze duik kunnen verwijderd worden.</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="263"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation>Klik hier om de fles te verwijderen.</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="249"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="274"/>
         <source>Switch depth for deco gas. Calculated using Deco pO₂ preference, unless set manually.</source>
         <translation>Wissel diepte voor deco gas. Berekend mbv. Deco pO₂ voorkeur, tenzij manueel ingesteld.</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="251"/>
+        <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>Berekend mbv. Bodem pO₂ voorkeur. Instelling MOD bepaalt O₂%, zet op &apos;*&apos; voor beste O₂% voor maximum diepte.</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="253"/>
+        <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>Berekend mbv. Best Mix END voorkeur. Instelling MND bepaalt He%, zet op &apos;*&apos; voor beste He% voor maximum diepte.</translation>
     </message>
-    <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="236"/>
-        <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source>
-        <translation>Dit gas wordt gebruikt. Enkel flessen die niet gebruikt worden tijdens deze duik kunnen verwijderd worden.</translation>
-    </message>
 </context>
 <context>
     <name>DiveComponentSelection</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="488"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="478"/>
         <source>Dive site: </source>
         <translation>Duikstek:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="490"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="480"/>
         <source>Dive master: </source>
         <translation>Duikleider:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="492"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="482"/>
         <source>Buddy: </source>
         <translation>Buddy:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="494"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="484"/>
         <source>Rating: </source>
         <translation>Waardering:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="496"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="486"/>
         <source>Visibility: </source>
         <translation>Zicht:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="498"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="488"/>
         <source>Notes:
 </source>
         <translation>Notities:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="500"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="490"/>
         <source>Suit: </source>
         <translation>Pak:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="502"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="492"/>
         <source>Tags: </source>
         <translation>Trefwoorden:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="512"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="502"/>
         <source>Cylinders:
 </source>
         <translation>Flessen:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="520"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="510"/>
         <source>Weights:
 </source>
         <translation>Gewichten</translation>
@@ -2692,33 +2756,9 @@
         <translation>Componenten selecteren</translation>
     </message>
     <message>
-        <location filename="../subsurface/desktop-widgets/ui_divecomponentselection.h" line="140"/>
-        <source>Which components would you like to copy</source>
-        <translation>Welke componenten wilt u kopiëren</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>Duikstek</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>Pak</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>Zicht</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>Notities</translation>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="52"/>
+        <source>Which components would you like to copy?</source>
+        <translation>Welke componenten wilt u kopiëren?</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divecomponentselection.ui" line="73"/>
@@ -2727,38 +2767,52 @@
         <translation>Trefwoorden</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divecomponentselection.ui" line="52"/>
-        <source>Which components would you like to copy?</source>
-        <translation>Welke componenten wilt u kopiëren?</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>Gewichten</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>Duikstek</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>Zicht</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>Flessen</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>Buddy</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>Notities</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>Duikleider</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>Deze kunnen in een ander duik of als tekst in een andere applicatie worden geplakt.</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>Buddy</translation>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="129"/>
+        <location filename="../subsurface/desktop-widgets/ui_divecomponentselection.h" line="142"/>
+        <source>Suit</source>
+        <translation>Pak</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divecomponentselection.ui" line="136"/>
@@ -2766,6 +2820,16 @@
         <source>Rating</source>
         <translation>Waardering</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>Deze kunnen in een ander duik of als tekst in een andere applicatie worden geplakt.</translation>
+    </message>
+    <message>
+        <location filename="../subsurface/desktop-widgets/ui_divecomponentselection.h" line="140"/>
+        <source>Which components would you like to copy</source>
+        <translation>Welke componenten wilt u kopiëren</translation>
+    </message>
 </context>
 <context>
     <name>DiveComputerManagementDialog</name>
@@ -2814,32 +2878,57 @@ duikcomputer wilt verwijderen?</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>Duikdetails</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>Ongedaan maken</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="96"/>
+        <source>Redo</source>
+        <translation>Opnieuw</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="193"/>
         <source>Delete dive</source>
         <translation>Duik verwijderen</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>Bewerking annuleren</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>Toon op kaart</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>Wijzigingen opslaan</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>Duik bewerken</translation>
     </message>
@@ -2847,136 +2936,136 @@ duikcomputer wilt verwijderen?</translation>
 <context>
     <name>DiveDetailsEdit</name>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="158"/>
-        <source>Dive %1</source>
-        <translation>Duik %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>Datum:</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>Locatie:</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>Coördinaten:</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>Gebruik huidige
 GPS locatie:</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>Diepte:</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>Duur:</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>Lucht Temp:</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>Water Temp:</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>Duikpak:</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>Buddy:</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>Duikleider:</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>Gewicht:</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>Fles1:</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>Gas mix:</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>Startdruk:</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>Einddruk:</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>Fles2:</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>Fles3:</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>Fles4:</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>Fles5:</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>Waardering:</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>Zicht:</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>Notities:</translation>
     </message>
@@ -2984,67 +3073,72 @@ GPS locatie:</translation>
 <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>&lt;unnamed dive site&gt;</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="61"/>
+        <source>Map it</source>
+        <translation>Toon kaart</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="115"/>
+        <source>Rating:</source>
+        <translation>Waardering:</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="163"/>
+        <source>Visibility:</source>
+        <translation>Zicht: </translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="310"/>
         <source>No profile to show</source>
         <translation>Geen profiel te tonen</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>Duikpak:</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>Lucht Temp:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="284"/>
-        <source>Cylinder:</source>
-        <translation>Fles:</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>Water Temp:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="63"/>
-        <source>Map it</source>
-        <translation>Toon kaart</translation>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="372"/>
+        <source>Cylinder:</source>
+        <translation>Fles:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="112"/>
-        <source>Rating:</source>
-        <translation>Waardering:</translation>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="380"/>
+        <source>Weight:</source>
+        <translation>Gewicht:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="155"/>
-        <source>Visibility:</source>
-        <translation>Zicht: </translation>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="388"/>
+        <source>SAC:</source>
+        <translation>Gasverbruik:</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>Duikleider:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="291"/>
-        <source>Weight:</source>
-        <translation>Gewicht:</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>Buddy:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="298"/>
-        <source>SAC:</source>
-        <translation>Gasverbruik:</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>Notities</translation>
     </message>
@@ -3121,186 +3215,203 @@ GPS locatie:</translation>
     <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>Duiklijst</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="428"/>
-        <source>Cloud credentials</source>
-        <translation>Cloud rechten</translation>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="188"/>
+        <source>&lt;unnamed dive site&gt;</source>
+        <translation>&lt;unnamed dive site&gt;</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="445"/>
-        <source>Please wait, filtering dive list</source>
-        <translation>Even geduld, duiklijst wordt gefilterd</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>Duiken downloaden</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>Duik toevoegen</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>Filter duiken</translation>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="276"/>
+        <source>Delete dive</source>
+        <translation>Duik verwijderen</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>Toon op kaart</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>Ongedaan maken</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="309"/>
+        <source>Redo</source>
+        <translation>Opnieuw</translation>
+    </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>Selecteer de &apos;+&apos; knop om een duik toe te voegen (of laad van een ondersteunde duikcomputer)</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>Cloud rechten</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="338"/>
         <source>No dives in dive list</source>
         <translation>Geen duiken in de duiklijst</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 duik)</numerusform><numerusform>(%n duiken)</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>(%L1 getoond)</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>Personen</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="383"/>
+        <source>Tags</source>
+        <translation>Trefwoorden</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="443"/>
+        <source>Download dives</source>
+        <translation>Duiken downloaden</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="453"/>
+        <source>Add dive</source>
+        <translation>Duik toevoegen</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="463"/>
+        <source>Filter dives</source>
+        <translation>Filter duiken</translation>
     </message>
 </context>
 <context>
     <name>DiveListView</name>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="912"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="900"/>
         <source>Expand all</source>
         <translation>Alles uitklappen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="914"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="902"/>
         <source>Collapse all</source>
         <translation>Alles inklappen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="918"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="906"/>
         <source>Collapse others</source>
         <translation>Andere samenklappen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="922"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="910"/>
         <source>Remove dive(s) from trip</source>
         <translation>Duik(en) uit trip verwijderen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="923"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="911"/>
         <source>Create new trip above</source>
         <translation>Nieuwe trip hierboven invoegen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="938"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="926"/>
         <source>Add dive(s) to trip immediately above</source>
         <translation>Duik(en) toevoegen aan de trip hierboven</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="940"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="928"/>
         <source>Add dive(s) to trip immediately below</source>
         <translation>Duik(en) toevoegen aan de trip hieronder</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="944"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="932"/>
         <source>Merge trip with trip above</source>
         <translation>Trip met bovenstaande samenvoegen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="945"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="933"/>
         <source>Merge trip with trip below</source>
         <translation>Trip met onderstaande samenvoegen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="949"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="937"/>
         <source>Delete dive(s)</source>
         <translation>Duik(en) verwijderen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="951"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="939"/>
         <source>Mark dive(s) invalid</source>
         <translation>Duik(en) als ongeldig markeren</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="955"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="943"/>
         <source>Merge selected dives</source>
         <translation>Geselecteerde duiken samenvoegen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="957"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="945"/>
         <source>Renumber dive(s)</source>
         <translation>Duik(en) hernummeren</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="958"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="946"/>
         <source>Shift dive times</source>
         <translation>Tijdstip verschuiven</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="959"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="947"/>
         <source>Split selected dives</source>
         <translation>Geselecteerde duiken splitsen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="960"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="948"/>
         <source>Load media from file(s)</source>
         <translation>Laad media van bestand(en)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="961"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="949"/>
         <source>Load media from web</source>
         <translation>Laad media van het web</translation>
     </message>
-    <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="987"/>
-        <source>Open media files</source>
-        <translation>Open media bestanden</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="990"/>
-        <source>Media files</source>
-        <translation>Media bestanden</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="991"/>
-        <source>Image files</source>
-        <translation>Afbeeldingen</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="992"/>
-        <source>Video files</source>
-        <translation>Video bestanden</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="993"/>
-        <source>All files</source>
-        <translation>Alle bestanden</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="1042"/>
-        <source>%1 does not appear to be an image</source>
-        <translation>%1 lijkt geen afbeelding te zijn</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>Maak een nieuwe duikstek, door relevante informatie van de huidige duikstek te kopiëren. </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>Nieuwe duikstek aanmaken onder deze naam</translation>
     </message>
@@ -3320,6 +3431,50 @@ GPS locatie:</translation>
         <translation>Algemene export</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>Selectie</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>Geselecteerde duiken</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>Alle duiken</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>Opties</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>Metrisch</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>Imperiaal</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>Maak anoniem</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>
@@ -3332,6 +3487,11 @@ GPS locatie:</translation>
         <translation>Subsurface &amp;XML</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="211"/>
+        <source>Subsurface dive sites XML</source>
+        <translation>Subsurface duikstekken 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>
@@ -3362,6 +3522,11 @@ GPS locatie:</translation>
         <translation>CSV duikdetails</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="280"/>
+        <source>Dive profile</source>
+        <translation>Duikprofiel</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="290"/>
         <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="381"/>
         <source>Worldmap</source>
@@ -3374,71 +3539,17 @@ GPS locatie:</translation>
         <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>Diepte foto&apos;s</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>Selectie</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>Geselecteerde duiken</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>Alle duiken</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>Opties</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>Metrisch</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>Imperiaal</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>Maak anoniem</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="211"/>
-        <source>Subsurface dive sites XML</source>
-        <translation>Subsurface duikstekken XML</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="280"/>
-        <source>Dive profile</source>
-        <translation>Duikprofiel</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>Profielgegevens CSV</translation>
@@ -3553,7 +3664,7 @@ GPS locatie:</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="559"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="115"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="116"/>
         <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="412"/>
         <source>Light</source>
         <translation>Licht</translation>
@@ -3565,160 +3676,154 @@ GPS locatie:</translation>
         <translation>Zandkleurig</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="84"/>
+        <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>Algemene bestandsindeling die gebruikt wordt om gegevens uit te wisselen tussen verschillende duik programma&apos;s.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="86"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="87"/>
         <source>Comma separated values describing the dive profile.</source>
         <translation>Waarden gescheiden door komma&apos;s die het duikprofiel beschrijven.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="88"/>
+        <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>Waarden gescheiden komma&apos;s met duikinformatie. Deze omvatten een groot deel van de informatie, uitgezonderd het duikprofiel.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="90"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="91"/>
         <source>Send the dive data to divelogs.de website.</source>
         <translation>Verstuur de duikgegevens naar de divelogs.de website.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="92"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="93"/>
         <source>Send the dive data to dive-share.appspot.com website.</source>
         <translation>Verstuur de duikgegevens naar dive-share.appspot.com.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="94"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="95"/>
         <source>HTML export of the dive locations, visualized on a world map.</source>
         <translation>HTML export van duiklocaties op een wereldkaart.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="96"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="97"/>
         <source>Subsurface native XML format.</source>
         <translation>Subsurface XML bestandsindeling.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="98"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="99"/>
         <source>Subsurface dive sites native XML format.</source>
         <translation>Subsurface duikstekken XML bestandsindeling.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="100"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="101"/>
         <source>Write depths of images to file.</source>
         <translation>Voeg dieptes waarop foto&apos;s genomen zijn toe aan het bestand.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="102"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="103"/>
         <source>Write dive as TeX macros to file.</source>
         <translation>Duik als TeX macro&apos;s naar bestand schrijven.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="104"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="105"/>
         <source>Write dive as LaTeX macros to file.</source>
         <translation>Duik als LaTeX macro&apos;s naar bestand schrijven.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="106"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="107"/>
         <source>Write the profile image as PNG file.</source>
         <translation>Profielafbeelding als PNG bestand schrijven</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="108"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="109"/>
         <source>Write profile data to a CSV file.</source>
         <translation>Profielgegevens naar een CSV bestand schrijven</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="146"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="147"/>
         <source>Export UDDF file as</source>
         <translation>Exporteer UDDF bestand als</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="147"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="148"/>
         <source>UDDF files</source>
         <translation>UDDF bestanden</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.cpp" line="151"/>
         <location filename="../desktop-widgets/divelogexportdialog.cpp" line="155"/>
+        <source>Export CSV file as</source>
+        <translation>Exporteer CSV bestand als</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 bestanden</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.cpp" line="162"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="203"/>
+        <source>Export world map</source>
+        <translation>Wereldkaart exporteren</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 bestanden</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.cpp" line="167"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="176"/>
+        <source>Export Subsurface XML</source>
+        <translation>Exporteer 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>Subsurface bestanden</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="175"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="176"/>
         <source>Export Subsurface dive sites XML</source>
         <translation>Exporteer Subsurface duikstekken XML</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="188"/>
-        <source>TeX files</source>
-        <translation>TeX bestanden</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="150"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/>
-        <source>Export CSV file as</source>
-        <translation>Exporteer CSV bestand als</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="161"/>
-        <source>Export world map</source>
-        <translation>Wereldkaart exporteren</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="166"/>
-        <source>Export Subsurface XML</source>
-        <translation>Exporteer Subsurface XML</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="184"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="186"/>
         <source>Save image depths</source>
         <translation>Bewaar dieptes waarop de foto&apos;s genomen zijn</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="188"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="190"/>
         <source>Export to TeX file</source>
         <translation>Exporteer naar TeX bestand</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="192"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="190"/>
+        <source>TeX files</source>
+        <translation>TeX bestanden</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="194"/>
         <source>Save profile image</source>
         <translation>Profielafbeelding opslaan</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="196"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="198"/>
         <source>Save profile data</source>
         <translation>Profielgegevens opslaan</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="202"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="204"/>
         <source>Export HTML files as</source>
         <translation>Exporteer HTML bestanden als</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="216"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="219"/>
         <source>Please wait, exporting...</source>
         <translation>Even geduld, bezig met exporteren...</translation>
     </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="251"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="480"/>
-        <source>Can&apos;t open file %s</source>
-        <translation>Kan het bestand %s niet openen</translation>
-    </message>
 </context>
 <context>
     <name>DiveLogImportDialog</name>
@@ -4047,10 +4152,10 @@ GPS locatie:</translation>
         <translation>Druk (atm)</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>Soort water</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/diveplanner.ui" line="144"/>
@@ -4059,10 +4164,10 @@ GPS locatie:</translation>
         <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>Soort water</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"/>
@@ -4096,97 +4201,386 @@ GPS locatie:</translation>
     </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="173"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="180"/>
         <source>unknown</source>
         <translation>onbekend</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="274"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="280"/>
         <source>cyl.</source>
         <translation>cyl.</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="380"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="386"/>
         <source>Final depth</source>
         <translation>Eind diepte</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="382"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="388"/>
         <source>Run time</source>
         <translation>Run time</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="384"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="390"/>
         <source>Duration</source>
         <translation>Duur</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="386"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="392"/>
         <source>Used gas</source>
         <translation>Gebruikt Gas</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="388"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="394"/>
         <source>CC setpoint</source>
         <translation>CC setpoint</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="390"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="396"/>
         <source>Dive mode</source>
         <translation>Duikmodus</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="1028"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="1083"/>
         <source>min</source>
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="1034"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="1089"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="1037"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="1092"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="1084"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="1139"/>
         <source>Stop times</source>
         <translation>Stop tijden</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> m/min</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DivePlannerSetup.qml" line="13"/>
+        <source> ft/min</source>
+        <translation> ft/min</translation>
+    </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>cuft/min</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DivePlannerSetup.qml" line="15"/>
+        <source> BAR</source>
+        <translation> BAR</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DivePlannerSetup.qml" line="15"/>
+        <source> PSI</source>
+        <translation> PSI</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DivePlannerSetup.qml" line="40"/>
+        <source>Rates</source>
+        <translation>Opstijg- en afdaalsnelheden</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DivePlannerSetup.qml" line="50"/>
+        <source>Ascent</source>
+        <translation>Opstijging</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DivePlannerSetup.qml" line="54"/>
+        <source>below 75% avg. depth</source>
+        <translation>Beneden 75% gem. diepte</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DivePlannerSetup.qml" line="70"/>
+        <source>75% to 50% avg. depth</source>
+        <translation>75%-50% gem. diepte</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DivePlannerSetup.qml" line="86"/>
+        <source>50% avg. depth to 6m</source>
+        <translation>50% gem. diepte tot 6m</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DivePlannerSetup.qml" line="102"/>
+        <source>6m to surface</source>
+        <translation>6m tot oppervlakte</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DivePlannerSetup.qml" line="119"/>
+        <source>Descent</source>
+        <translation>Afdaling</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DivePlannerSetup.qml" line="123"/>
+        <source>Surface to the bottom</source>
+        <translation>Oppervlakte tot bodem</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DivePlannerSetup.qml" line="140"/>
+        <source>Drop to first depth</source>
+        <translation>Afdalen tot eerste dieptetrap</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DivePlannerSetup.qml" line="150"/>
+        <source>Planning</source>
+        <translation>Planning</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DivePlannerSetup.qml" line="159"/>
+        <source>Dive mode</source>
+        <translation>Duikmodus</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DivePlannerSetup.qml" line="165"/>
+        <source>Open circuit</source>
+        <translation>Open circuit</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 op OC</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DivePlannerSetup.qml" line="180"/>
+        <source>Recreational mode</source>
+        <translation>Recreatieve mode</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DivePlannerSetup.qml" line="189"/>
+        <source>Reserve gas</source>
+        <translation>Reserve gas</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DivePlannerSetup.qml" line="207"/>
+        <source>Safety stop</source>
+        <translation>Veiligheidsstop</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DivePlannerSetup.qml" line="217"/>
+        <source>Bühlmann deco</source>
+        <translation>Bühlmann decompressie</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 decompressie</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DivePlannerSetup.qml" line="269"/>
+        <source>Conservatism level</source>
+        <translation>Conservatisme niveau</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>Laatste stop op ??</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DivePlannerSetup.qml" line="291"/>
+        <source>Plan backgas breaks</source>
+        <translation>Plan backgas pauzes</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DivePlannerSetup.qml" line="300"/>
+        <source>Only switch at required stops</source>
+        <translation>Alleen gaswissels op verplichte stops</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>Oppervlakte segment</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DivePlannerSetup.qml" line="343"/>
+        <source>Gas options</source>
+        <translation>Gas opties</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DivePlannerSetup.qml" line="352"/>
+        <source>Bottom SAC</source>
+        <translation>Gasverbruik (bodem)</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DivePlannerSetup.qml" line="370"/>
+        <source>Deco SAC</source>
+        <translation>Gasverbruik (deco)</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DivePlannerSetup.qml" line="388"/>
+        <source>SAC factor</source>
+        <translation>SAC factor</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DivePlannerSetup.qml" line="403"/>
+        <source>Problem solving time</source>
+        <translation>Tijd om problemen op te lossen</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>Bodem pO2</translation>
+    </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>Best mix END</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DivePlannerSetup.qml" line="464"/>
+        <source>O2 narcotic</source>
+        <translation>O2 narcotisch</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DivePlannerSetup.qml" line="474"/>
+        <source>Notes</source>
+        <translation>Notities</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DivePlannerSetup.qml" line="480"/>
+        <source>Display runtime</source>
+        <translation>Runtime tonen</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DivePlannerSetup.qml" line="487"/>
+        <source>Display segment duration</source>
+        <translation>Duur van het segment tonen</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DivePlannerSetup.qml" line="494"/>
+        <source>Display transitions in deco</source>
+        <translation>Toon overgangen in deco</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DivePlannerSetup.qml" line="501"/>
+        <source>Verbatim dive plan</source>
+        <translation>Gedetailleerd duikplan</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DivePlannerSetup.qml" line="508"/>
+        <source>Display plan variations</source>
+        <translation>Toon plan variaties</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>Duikplanner punten</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="120"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="123"/>
         <source>Available gases</source>
         <translation>Beschikbare gasmengsels</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="121"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="124"/>
         <source>Add cylinder</source>
         <translation>Fles toevoegen</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>Duik punt toevoegen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="163"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="164"/>
         <source>Save new</source>
         <translation>Opslaan als nieuw bestand</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>
@@ -4194,107 +4588,107 @@ GPS locatie:</translation>
 <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>Diepte</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="116"/>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="121"/>
         <source>Time</source>
         <translation>Tijd</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="118"/>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="123"/>
         <source>Pressure</source>
         <translation>Druk</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="120"/>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="125"/>
         <source>Temperature</source>
         <translation>Temperatuur</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="122"/>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="127"/>
         <source>Color</source>
         <translation>Kleur</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="124"/>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="129"/>
         <source>User entered</source>
         <translation>Ingevoerd door gebruiker</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="126"/>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="131"/>
         <source>Pressure S</source>
         <translation>Druk S</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="128"/>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="133"/>
         <source>Pressure I</source>
         <translation>Druk I</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="130"/>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="135"/>
         <source>Ceiling</source>
         <translation>Plafond</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="132"/>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="137"/>
         <source>SAC</source>
         <translation>Gasverbruik</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>Sensor 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>Sensor 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>Sensor 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>Omgevingsdruk</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="150"/>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="155"/>
         <source>Heart rate</source>
         <translation>Hartslag</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="152"/>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="157"/>
         <source>Gradient factor</source>
         <translation>Gradiënt 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>Gemiddelde diepte @ s</translation>
     </message>
@@ -4365,204 +4759,329 @@ p, li { white-space: pre-wrap; }
     </message>
 </context>
 <context>
-    <name>DiveSiteSortedModel</name>
+    <name>DiveSummary</name>
     <message>
-        <location filename="../qt-models/divelocationmodel.cpp" line="278"/>
-        <source>Delete dive site?</source>
-        <translation>Duikstek verwijderen?</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="279"/>
-        <source>This dive site has %n dive(s). Do you really want to delete it?
-</source>
-        <translation><numerusform>Deze duikstek heeft %n duik. Wilt u deze werkelijk verwijderen?
-</numerusform><numerusform>Deze duikstek heeft %n duiken. Wilt u deze werkelijk verwijderen?
-</numerusform></translation>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveSummary.qml" line="51"/>
+        <source>All</source>
+        <translation>Alle</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveSummary.qml" line="52"/>
+        <source>1 month</source>
+        <translation>1 maand</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveSummary.qml" line="53"/>
+        <source>3 months</source>
+        <translation>3 maanden</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveSummary.qml" line="54"/>
+        <source>6 months</source>
+        <translation>6 maanden</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveSummary.qml" line="55"/>
+        <source>1 year</source>
+        <translation>1 jaar</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveSummary.qml" line="59"/>
+        <source>last dive:</source>
+        <translation>laatste duik:</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveSummary.qml" line="69"/>
+        <source>first dive:</source>
+        <translation>eerste duik:</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveSummary.qml" line="85"/>
+        <source>Refresh</source>
+        <translation>Ververs</translation>
+    </message>
+</context>
+<context>
+    <name>DiveSummaryModel</name>
+    <message>
+        <location filename="../qt-models/divesummarymodel.cpp" line="67"/>
+        <source>Number of dives</source>
+        <translation>Aantal duiken</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divesummarymodel.cpp" line="68"/>
+        <source>Time</source>
+        <translation>Tijd</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divesummarymodel.cpp" line="69"/>
+        <source>Depth</source>
+        <translation>Diepte</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divesummarymodel.cpp" line="70"/>
+        <source>SAC</source>
+        <translation>Gasverbruik</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divesummarymodel.cpp" line="85"/>
+        <source>Total</source>
+        <translation>Totale</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>Totale tijd</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>Max diepte</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>Min. gasverbruik</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divesummarymodel.cpp" line="95"/>
+        <source>Max SAC</source>
+        <translation>Max. gasverbruik</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divesummarymodel.cpp" line="96"/>
+        <source>Avg SAC</source>
+        <translation>Gem. gasverbruik</translation>
     </message>
 </context>
 <context>
     <name>DiveTripModelBase</name>
+    <message numerus="yes">
+        <location filename="../qt-models/divetripmodel.cpp" line="74"/>
+        <source>(%n dive(s))</source>
+        <translation><numerusform>(%n duik)</numerusform><numerusform>(%n duiken)</numerusform></translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="76"/>
+        <source>(%L1 shown)</source>
+        <translation>(%L1 getoond)</translation>
+    </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="67"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="121"/>
         <source>(%1 shown)</source>
         <translation>(%1 getoond)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="208"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="275"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="315"/>
+        <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>Nr.</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="210"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="277"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="317"/>
+        <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>Datum</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="279"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="319"/>
+        <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>Waardering</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="214"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="321"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="313"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="422"/>
         <source>Depth(%1)</source>
         <translation>Diepte (%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="214"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="321"/>
+        <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="214"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="321"/>
+        <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="216"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="283"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="323"/>
+        <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>Duur</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="218"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="325"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="317"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="426"/>
         <source>Temp.(°%1)</source>
         <translation>Temp.(°%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="220"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="327"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="319"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="428"/>
         <source>Weight(%1)</source>
         <translation>Gewicht (%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="220"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="327"/>
+        <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="220"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="327"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="319"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="428"/>
         <source>lbs</source>
         <translation>US pond</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="222"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="289"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="329"/>
+        <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>Pak</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="224"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="291"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="331"/>
+        <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>Fles</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="226"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="293"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="333"/>
+        <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>Gas</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="337"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="329"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="438"/>
         <source>SAC(%1)</source>
         <translation>Gasverbruik (%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="337"/>
+        <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="232"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="297"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="339"/>
+        <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>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="234"/>
+        <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="236"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="301"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="343"/>
+        <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>Trefwoorden</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="238"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="345"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="337"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="446"/>
         <source>Media before/during/after dive</source>
         <translation>Media voor/gedurende/na duik</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="240"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="305"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="339"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="406"/>
         <source>Country</source>
         <translation>Land</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="242"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="307"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="347"/>
+        <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>Buddy</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="244"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="309"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="349"/>
+        <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>Locatie</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="281"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="382"/>
         <source>Depth</source>
         <translation>Diepte</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="285"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="386"/>
         <source>Temp.</source>
         <translation>Temp.</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="287"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="388"/>
         <source>Weight</source>
         <translation>Gewicht</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="295"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="396"/>
         <source>SAC</source>
         <translation>Gasverbruik</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="299"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="341"/>
+        <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="303"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="404"/>
         <source>Media</source>
         <translation>Media</translation>
     </message>
@@ -4570,110 +5089,59 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>DivelogsDeWebServices</name>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="243"/>
-        <source>internal error</source>
-        <translation>interne fout</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="251"/>
-        <source>Conversion of dive %1 to divelogs.de format failed</source>
-        <translation>Conversie van duik %1 naar divelogs.de formaat is mislukt</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="279"/>
-        <source>error writing zip file: %s zip error %d system error %d - %s</source>
-        <translation>Fout bij schrijven zip bestand: %s zip fout %d systeem fout %d - %s</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="528"/>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="719"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="250"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="415"/>
         <source>Done</source>
         <translation>Klaar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="562"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="273"/>
         <source>Uploading dive list...</source>
         <translation>Duiklijst uploaden...</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="594"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="293"/>
         <source>Downloading dive list...</source>
         <translation>Duiklijst wordt geladen...</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="635"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="334"/>
         <source>Downloading %1 dives...</source>
         <translation>%1 duiken worden geladen...</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="669"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="368"/>
         <source>Download finished - %1</source>
         <translation>Download klaar - %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="683"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="382"/>
         <source>Problem with download</source>
         <translation>Download probleem</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="693"/>
-        <source>Corrupted download</source>
-        <translation>Beschadigde download</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="684"/>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="694"/>
+        <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>Het archief kon niet geopend worden:
 %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="162"/>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="493"/>
-        <source>No dives were selected</source>
-        <translation>Geen duiken geselecteerd</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="172"/>
-        <source>Stylesheet to export to divelogs.de is not found</source>
-        <translation>Stylesheet niet gevonden om naar divelogs.de te exporteren</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="182"/>
-        <source>Failed to create zip file for upload: %s</source>
-        <translation>Fout bij aanmaken zip bestand voor upload: %s</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="720"/>
-        <source>Upload finished</source>
-        <translation>Upload klaar</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="733"/>
-        <source>Upload failed</source>
-        <translation>Upload mislukt</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="736"/>
-        <source>Upload successful</source>
-        <translation>Upload gelukt</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="739"/>
-        <source>Login failed</source>
-        <translation>Login mislukt</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="742"/>
-        <source>Cannot parse response</source>
-        <translation>Kan antwoord niet correct ontleden</translation>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="392"/>
+        <source>Corrupted download</source>
+        <translation>Beschadigde download</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="753"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="426"/>
         <source>Error: %1</source>
         <translation>Fout: %1</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="435"/>
+        <source>Transferring data...</source>
+        <translation>Gegevens worden overgebracht...</translation>
+    </message>
 </context>
 <context>
     <name>DivesiteImportDialog</name>
@@ -4767,45 +5235,45 @@ Bestaande duikstek</translation>
         <translation>Garmin duikcomputer zoeken</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="376"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="375"/>
         <source>Cancel download</source>
         <translation>Download annuleren</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="455"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="454"/>
         <source>Choose file for dive computer download logfile</source>
         <translation>Kies een bestand om duikcomputer log te downloaden</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="456"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="455"/>
         <source>Log files</source>
         <translation>Log bestanden</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="481"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="468"/>
+        <source>Warning</source>
+        <translation>Waarschuwing</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>Duiken worden NIET in de duiklijst geladen als u de libdivecomputer dump opslaat.</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="480"/>
         <source>Choose file for dive computer binary dump file</source>
         <translation>Kies een bestand voor de duikcomputer binaire dump</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="482"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="481"/>
         <source>Dump files</source>
         <translation>Dump bestanden</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="510"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="509"/>
         <source>Retry download</source>
         <translation>Opnieuw downloaden</translation>
     </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="469"/>
-        <source>Warning</source>
-        <translation>Waarschuwing</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="470"/>
-        <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source>
-        <translation>Duiken worden NIET in de duiklijst geladen als u de libdivecomputer dump opslaat.</translation>
-    </message>
 </context>
 <context>
     <name>DownloadFromDiveComputer</name>
@@ -4816,54 +5284,30 @@ Bestaande duikstek</translation>
         <translation>Downloaden van duikcomputer</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>Device of mountpoint</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>Forceer download van alle duiken</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>Duikcomputer</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>Altijd gedownloade duiken gebruiken</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>Ophalen als een nieuwe trip</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>libdivecomputer logbestand opslaan</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>libdivecomputer dump opslaan</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>
@@ -4876,23 +5320,47 @@ Bestaande duikstek</translation>
         <translation>Selecteer een extern Bluetooth toestel.</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>Device of mountpoint</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>Merk</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>Duikcomputer</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>Ophalen als een nieuwe trip</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>libdivecomputer dump opslaan</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="211"/>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="266"/>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="307"/>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="396"/>
+        <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>Downloaden</translation>
@@ -4923,7 +5391,7 @@ Bestaande duikstek</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="330"/>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="302"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="348"/>
         <location filename="../subsurface/desktop-widgets/ui_downloadfromdivecomputer.h" line="340"/>
         <source>Cancel</source>
         <translation>Annuleren</translation>
@@ -4939,72 +5407,72 @@ Bestaande duikstek</translation>
         <translation>Bluetooth staat uit</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="63"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="55"/>
         <source> Vendor name: </source>
         <translation>Leveranciersnaam:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="97"/>
-        <source>USB device</source>
-        <translation>USB device</translation>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="105"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="92"/>
         <source> Dive Computer:</source>
         <translation>Duikcomputer:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="145"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="132"/>
         <source> Connection:</source>
         <translation>Verbinding:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="198"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="211"/>
         <source> Previously used dive computers: </source>
         <translation>Voorheen gebruikte duikcomputers:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="270"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="320"/>
         <source>Retry</source>
         <translation>Opnieuw</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="302"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="348"/>
         <source>Quit</source>
         <translation>Afsluiten</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="316"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="366"/>
         <source>Rescan</source>
         <translation>Scan opnieuw</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="325"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="375"/>
         <source> Downloaded dives</source>
         <translation>Geladen duiken</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="326"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="376"/>
         <source>Info:</source>
         <translation>Informatie:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="349"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="399"/>
         <source>force downloading all dives</source>
         <translation>forceer downloaden van alle duiken</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="387"/>
+        <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>Aanvaarden</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="407"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="472"/>
         <source>Select All</source>
         <translation>Alles selecteren</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="416"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="481"/>
         <source>Unselect All</source>
         <translation>Selectie ongedaan maken</translation>
     </message>
@@ -5012,7 +5480,7 @@ Bestaande duikstek</translation>
 <context>
     <name>DownloadThread</name>
     <message>
-        <location filename="../core/downloadfromdcthread.cpp" line="102"/>
+        <location filename="../core/downloadfromdcthread.cpp" line="97"/>
         <source>No new dives downloaded from dive computer</source>
         <translation>Geen nieuwe duiken uit duikcomputer geladen</translation>
     </message>
@@ -5020,15 +5488,23 @@ Bestaande duikstek</translation>
 <context>
     <name>EditBuddies</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="638"/>
+        <location filename="../commands/command_edit.cpp" line="746"/>
         <source>buddies</source>
         <translation>buddy’s</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="661"/>
+        <location filename="../commands/command_edit.cpp" line="769"/>
         <source>dive master</source>
         <translation>duikleider</translation>
     </message>
@@ -5036,7 +5512,7 @@ Bestaande duikstek</translation>
 <context>
     <name>EditMode</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="454"/>
+        <location filename="../commands/command_edit.cpp" line="567"/>
         <source>dive mode</source>
         <translation>duikmodus</translation>
     </message>
@@ -5044,7 +5520,7 @@ Bestaande duikstek</translation>
 <context>
     <name>EditNumber</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="475"/>
+        <location filename="../commands/command_edit.cpp" line="588"/>
         <source>number</source>
         <translation>nummer</translation>
     </message>
@@ -5052,21 +5528,136 @@ Bestaande duikstek</translation>
 <context>
     <name>EditTags</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="606"/>
+        <location filename="../commands/command_edit.cpp" line="723"/>
         <source>tags</source>
         <translation>trefwoorden</translation>
     </message>
 </context>
 <context>
     <name>EditTagsBase</name>
+    <message>
+        <location filename="../commands/command_edit.cpp" line="659"/>
+        <source>Edit %1</source>
+        <translation>Bewerk %1</translation>
+    </message>
     <message numerus="yes">
-        <location filename="../desktop-widgets/command_edit.cpp" line="547"/>
+        <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>Bewerk %1 (%n duik)</numerusform><numerusform>Bewerk %1 (%n duiken)</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>Rechten exporteren</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/Export.qml" line="48"/>
+        <source>User ID</source>
+        <translation>Gebruikers ID</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/Export.qml" line="58"/>
+        <source>Password:</source>
+        <translation>Wachtwoord:</translation>
+    </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>Exporteren</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/Export.qml" line="107"/>
+        <source>Cancel</source>
+        <translation>Annuleren</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/Export.qml" line="139"/>
+        <source>Export Subsurface XML</source>
+        <translation>Exporteer Subsurface XML</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/Export.qml" line="144"/>
+        <source>Subsurface native XML format.</source>
+        <translation>Subsurface XML bestandsindeling.</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/Export.qml" line="148"/>
+        <source>Export Subsurface dive sites XML</source>
+        <translation>Exporteer Subsurface duikstekken XML</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/Export.qml" line="152"/>
+        <source>Subsurface dive sites native XML format.</source>
+        <translation>Subsurface duikstekken XML bestandsindeling.</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/Export.qml" line="156"/>
+        <source>Export UDDF</source>
+        <translation>Exporteren als UDDF</translation>
+    </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>Algemene bestandsindeling die gebruikt wordt om gegevens uit te wisselen tussen verschillende duik programma&apos;s.</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>Verstuur de duikgegevens naar de divelogs.de website.</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>Verstuur de duikgegevens naar dive-share.appspot.com.</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/Export.qml" line="195"/>
+        <source>Anonymize</source>
+        <translation>Maak anoniem</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/Export.qml" line="198"/>
+        <source>Next</source>
+        <translation>Volgende</translation>
+    </message>
+</context>
+<context>
     <name>ExtraDataModel</name>
     <message>
         <location filename="../qt-models/divecomputerextradatamodel.cpp" line="11"/>
@@ -5115,136 +5706,188 @@ Bestaande duikstek</translation>
         <translation>Formulier</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="41"/>
-        <source>Reset / close</source>
-        <translation>Reset / sluiten</translation>
+        <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="51"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="96"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="117"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="134"/>
-        <source>Min</source>
-        <translation>Min</translation>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="47"/>
+        <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="58"/>
-        <source>People</source>
-        <translation>Personen</translation>
+        <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>Pak</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="65"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="89"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="141"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="183"/>
+        <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="72"/>
-        <source>Rating</source>
-        <translation>Waardering</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="107"/>
+        <source>Air Temp</source>
+        <translation>Luchttemp.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="79"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="121"/>
+        <source>Equipment</source>
+        <translation>Uitrusting</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="180"/>
         <source>Tags</source>
         <translation>Trefwoorden</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="103"/>
-        <source>From</source>
-        <translation>Vanaf</translation>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="187"/>
+        <source>Water Temp</source>
+        <translation>Watertemp.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="110"/>
-        <source>To</source>
-        <translation>Tot</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>Alle van</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="127"/>
-        <source>Visibility</source>
-        <translation>Zicht</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>Een van</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="157"/>
-        <source>Equipment</source>
-        <translation>Uitrusting</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>Geen van</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="173"/>
-        <source>Water Temp</source>
-        <translation>Watertemp.</translation>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="220"/>
+        <source>People</source>
+        <translation>Personen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="190"/>
-        <source>Location</source>
-        <translation>Locatie</translation>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="256"/>
+        <source>Planned</source>
+        <translation>Gepland</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="197"/>
-        <source>Suit</source>
-        <translation>Pak</translation>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="288"/>
+        <source>Location</source>
+        <translation>Locatie</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="204"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="295"/>
         <source>Notes</source>
         <translation>Notities</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="211"/>
-        <source>Air Temp</source>
-        <translation>Luchttemp.</translation>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="302"/>
+        <source>Visibility</source>
+        <translation>Zicht</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="347"/>
+        <source>Reset / close</source>
+        <translation>Reset / sluiten</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="270"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="354"/>
+        <source>Rating</source>
+        <translation>Waardering</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="367"/>
+        <location filename="../subsurface/desktop-widgets/ui_filterwidget.h" line="118"/>
+        <source>Reset filters</source>
+        <translation>Filters terugzetten</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="451"/>
+        <source>From</source>
+        <translation>Vanaf</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="503"/>
         <source>Logged</source>
         <translation>Gelogd</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="280"/>
-        <source>Planned</source>
-        <translation>Gepland</translation>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="558"/>
+        <source>To</source>
+        <translation>Tot</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="310"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="565"/>
         <source>Close filters</source>
         <translation>Filters sluiten</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="324"/>
-        <location filename="../subsurface/desktop-widgets/ui_filterwidget.h" line="118"/>
-        <source>Reset filters</source>
-        <translation>Filters terugzetten</translation>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="579"/>
+        <source>Fulltext</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="339"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="358"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="377"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="396"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="415"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="434"/>
-        <source>All of</source>
-        <translation>Alle van</translation>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="597"/>
+        <source>Full word</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="344"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="363"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="382"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="401"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="420"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="439"/>
-        <source>Any of</source>
-        <translation>Een van</translation>
+        <location filename="../desktop-widgets/filterwidget2.cpp" line="284"/>
+        <source>%L1/%L2 shown</source>
+        <translation>%L1/%L2 getoond</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="349"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="368"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="387"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="406"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="425"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="444"/>
-        <source>None of</source>
-        <translation>Geen van</translation>
+        <location filename="../desktop-widgets/filterwidget2.cpp" line="286"/>
+        <source>%L1 dives</source>
+        <translation>%L1 duiken</translation>
     </message>
     <message>
         <location filename="../subsurface/desktop-widgets/ui_filterwidget.h" line="121"/>
@@ -5256,16 +5899,6 @@ Bestaande duikstek</translation>
         <source>Close and reset filters</source>
         <translation>Filters sluiten en terugzetten</translation>
     </message>
-    <message>
-        <location filename="../desktop-widgets/filterwidget2.cpp" line="245"/>
-        <source>%L1/%L2 shown</source>
-        <translation>%L1/%L2 getoond</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/filterwidget2.cpp" line="248"/>
-        <source>%L1 dives</source>
-        <translation>%L1 duiken</translation>
-    </message>
 </context>
 <context>
     <name>FindMovedImagesDialog</name>
@@ -5345,30 +5978,14 @@ Bestaande duikstek</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>Navigeer voorwaarts</translation>
-    </message>
-</context>
-<context>
     <name>GasSelectionModel</name>
     <message>
-        <location filename="../qt-models/models.cpp" line="39"/>
+        <location filename="../qt-models/models.cpp" line="37"/>
         <source>cyl.</source>
         <translation>cyl.</translation>
     </message>
 </context>
 <context>
-    <name>GlobalDrawer</name>
-    <message>
-        <location filename="../mobile-widgets/qml/kirigami/src/controls/GlobalDrawer.qml" line="441"/>
-        <source>Back</source>
-        <translation>Terug</translation>
-    </message>
-</context>
-<context>
     <name>GpsList</name>
     <message>
         <location filename="../mobile-widgets/qml/GpsList.qml" line="14"/>
@@ -5405,6 +6022,92 @@ Bestaande duikstek</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>   GPS   </translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/importgps.ui" line="146"/>
+        <source>   Dive   </source>
+        <translation>Duik</translation>
+    </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>Internationale tijdzone correctie</translation>
+    </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>u:mm</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/importgps.ui" line="385"/>
+        <location filename="../desktop-widgets/importgps.ui" line="510"/>
+        <source>Earlier</source>
+        <translation>Vroeger</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/importgps.ui" line="393"/>
+        <location filename="../desktop-widgets/importgps.ui" line="518"/>
+        <source>Later</source>
+        <translation>Later</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"/>
@@ -5448,32 +6151,32 @@ Bestaande duikstek</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>(gelijke GPS fix)</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 verwijderd</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 duik hier)</numerusform><numerusform>, %n duiken hier)</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>(geen bestaande GPS gegevens, voeg een GPS fix van deze duik toe)</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>(geen GPS data)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/modeldelegates.cpp" line="513"/>
+        <location filename="../desktop-widgets/modeldelegates.cpp" line="491"/>
         <source>Pick site: </source>
         <translation>Kies duikstek:</translation>
     </message>
@@ -5505,51 +6208,61 @@ Bestaande duikstek</translation>
         <translation>Notities</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>Coördinaten</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>Omgekeerde geo locatie opzoeken</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>Dichtstbijzijnde duikstekken</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>Toon duikstekken in het bereik van:</translation>
     </message>
     <message>
-        <location filename="../subsurface/desktop-widgets/ui_locationInformation.h" line="199"/>
-        <source>Dive sites on same coordinates</source>
-        <translation>Duikstekken op dezelfde positie</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>Trefwoorden</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>Land</translation>
     </message>
     <message>
+        <location filename="../subsurface/desktop-widgets/ui_locationInformation.h" line="199"/>
+        <source>Dive sites on same coordinates</source>
+        <translation>Duikstekken op dezelfde positie</translation>
+    </message>
+    <message>
         <location filename="../subsurface/desktop-widgets/ui_locationInformation.h" line="204"/>
         <source>Update location on map</source>
         <translation>Bewerk locatie op kaart</translation>
@@ -5558,27 +6271,27 @@ Bestaande duikstek</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>Naam</translation>
     </message>
     <message>
-        <location filename="../qt-models/divelocationmodel.cpp" line="62"/>
+        <location filename="../qt-models/divelocationmodel.cpp" line="60"/>
         <source>Description</source>
         <translation>Beschrijving</translation>
     </message>
     <message>
-        <location filename="../qt-models/divelocationmodel.cpp" line="64"/>
+        <location filename="../qt-models/divelocationmodel.cpp" line="62"/>
         <source># of dives</source>
         <translation># duiken</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>Klik hier om de duikstek te bewerken.</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>Klik hier om deze duikstek te verwijderen.</translation>
     </message>
@@ -5586,25 +6299,35 @@ Bestaande duikstek</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>Klaar</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>Beheer duikstekken</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>Duikstekken samenvoegen in huidige stek</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>GPS bestanden (*.gpx *.GPX)</translation>
+    </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>Applicatie log</translation>
     </message>
@@ -5612,107 +6335,87 @@ Bestaande duikstek</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>Formulier</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="30"/>
-        <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="450"/>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="507"/>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="547"/>
+        <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>Notities</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>Formulier</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>Datum</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>Tijd</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="110"/>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="224"/>
-        <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="495"/>
-        <source>Air temp.</source>
-        <translation>Lucht temp.</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>Diepte</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="120"/>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="225"/>
-        <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="496"/>
-        <source>Water temp.</source>
-        <translation>Water temp.</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="546"/>
+        <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>Locatie</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>Duikstek bewerken</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>Duikstek bewerken</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>Duikleider</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>Buddy</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>Waardering</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>Zicht</translation>
-    </message>
-    <message>
-        <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="508"/>
-        <source>Suit</source>
-        <translation>Pak</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="398"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="349"/>
         <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="509"/>
         <source>Tags</source>
         <translation>Trefwoorden</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="408"/>
-        <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="510"/>
-        <source>Dive mode</source>
-        <translation>Duikmodus</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>Waardering</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="61"/>
@@ -5721,23 +6424,6 @@ Bestaande duikstek</translation>
         <translation>Uitrusting</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>Diepte</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>Duur</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="69"/>
-        <source>Extra Info</source>
-        <translation>Extra Informatie</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="63"/>
         <source>Information</source>
         <translation>Informatie</translation>
@@ -5753,6 +6439,11 @@ Bestaande duikstek</translation>
         <translation>Media</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="69"/>
+        <source>Extra Info</source>
+        <translation>Extra Informatie</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="71"/>
         <source>Dive sites</source>
         <translation>Duikstekken</translation>
@@ -5778,51 +6469,71 @@ Bestaande duikstek</translation>
         <translation>Ongedaan maken</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="735"/>
-        <source>Warning: edited %1 dives</source>
-        <translation>Waarschuwing: %1 duiken bewerkt</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="221"/>
-        <source>Air temp. [%1]</source>
-        <translation>Lucht temp. [%1]</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="222"/>
-        <source>Water temp. [%1]</source>
-        <translation>Water temp. [%1]</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="260"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="239"/>
         <source>Multiple dives are being edited.</source>
         <translation>Meerdere duiken worden bewerkt.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="262"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="241"/>
         <source>This dive is being edited.</source>
         <translation>Deze duik wordt bewerkt.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="458"/>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="497"/>
+        <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>Trip notities</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="491"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="420"/>
         <source>Trip location</source>
         <translation>Trip locatie</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="690"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="591"/>
         <source>Discard the changes?</source>
         <translation>Wijzigingen niet opslaan?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="691"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="592"/>
         <source>You are about to discard your changes.</source>
         <translation>U staat op het punt wijzigingen te verwijderen</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="630"/>
+        <source>Warning: edited %1 dives</source>
+        <translation>Waarschuwing: %1 duiken bewerkt</translation>
+    </message>
+    <message>
+        <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="492"/>
+        <source>Duration</source>
+        <translation>Duur</translation>
+    </message>
+    <message>
+        <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="495"/>
+        <source>Air temp.</source>
+        <translation>Lucht temp.</translation>
+    </message>
+    <message>
+        <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="496"/>
+        <source>Water temp.</source>
+        <translation>Water temp.</translation>
+    </message>
+    <message>
+        <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="507"/>
+        <source>Visibility</source>
+        <translation>Zicht</translation>
+    </message>
+    <message>
+        <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="508"/>
+        <source>Suit</source>
+        <translation>Pak</translation>
+    </message>
+    <message>
+        <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="510"/>
+        <source>Dive mode</source>
+        <translation>Duikmodus</translation>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>
@@ -5863,11 +6574,6 @@ Bestaande duikstek</translation>
         <translation>Bewerken</translation>
     </message>
     <message>
-        <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="620"/>
-        <source>Share on</source>
-        <translation>Deel via</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>
@@ -6113,20 +6819,9 @@ Bestaande duikstek</translation>
         <translation>Exporteer logboek</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="713"/>
-        <source>Cloud stora&amp;ge online</source>
-        <translation>Cloud opsla&amp;g online</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>Deco informatie in-/uitschakelen</translation>
-    </message>
-    <message>
-        <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="584"/>
-        <source>Configure &amp;dive computer</source>
-        <translation>Duikcomputer configureren</translation>
+        <location filename="../desktop-widgets/mainwindow.ui" line="433"/>
+        <source>Change settings on &amp;dive computer</source>
+        <translation>Instellingen wijzigen op &amp;duikcomputer</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="444"/>
@@ -6225,23 +6920,12 @@ Bestaande duikstek</translation>
         <translation>Media in-/uitschakelen</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>&amp;Vind verplaatste media bestanden</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>Toon Gas Bar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="433"/>
-        <source>Change settings on &amp;dive computer</source>
-        <translation>Instellingen wijzigen op &amp;duikcomputer</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>
@@ -6272,6 +6956,12 @@ Bestaande duikstek</translation>
         <translation>Opnieuw</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>&amp;Vind verplaatste media bestanden</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>
@@ -6296,55 +6986,38 @@ Bestaande duikstek</translation>
         <translation>B&amp;ewerk duikstek</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>Cloud opslag online</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="1530"/>
-        <source>Please save or cancel the current dive edit before opening a new file.</source>
-        <translation>Bewaar of maak de huidige wijziging ongedaan voor u een nieuw bestand opent.</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="492"/>
-        <source>Open file</source>
-        <translation>Bestand openen</translation>
+        <location filename="../desktop-widgets/mainwindow.ui" line="713"/>
+        <source>Cloud stora&amp;ge online</source>
+        <translation>Cloud opsla&amp;g online</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="496"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1927"/>
-        <source>Cancel</source>
-        <translation>Annuleren</translation>
+        <location filename="../desktop-widgets/mainwindow.ui" line="725"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="728"/>
+        <source>Toggle deco information</source>
+        <translation>Deco informatie in-/uitschakelen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="692"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="607"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="656"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="806"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="914"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1801"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="680"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="606"/>
+        <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>Waarschuwing</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="693"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="681"/>
         <source>Trying to merge dives with %1min interval in between</source>
         <translation>Je probeert duiken samen te voegen met een %1min oppervlakteinterval</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="257"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="264"/>
         <source>Template backup created</source>
         <translation>Template backup aangemaakt</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="258"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="265"/>
         <source>The following backup printing templates were created:
 
 %1
@@ -6367,234 +7040,272 @@ alleen leesbaar zijn, en deze dienen niet gewerkt te worden, want de
 applicatie kan deze overschrijven bij opnieuw opstarten.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="607"/>
+        <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>Bewaar of maak de huidige wijziging ongedaan voor u een nieuw bestand opent.</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="492"/>
+        <source>Open file</source>
+        <translation>Bestand openen</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="496"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1916"/>
+        <source>Cancel</source>
+        <translation>Annuleren</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>Bewaar of maak de huidige wijziging ongedaan voor u online gaat</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="620"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="618"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1340"/>
+        <source>Save changes?</source>
+        <translation>Aanpassingen opslaan?</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>
         <translation>Er zijn niet bewaarde wijzigingen. Wilt u deze opslaan in de cloud opslag?
 Bij antwoord nee, zal de cloud pas gesynchroniseerd worden bij de eerstvolgende &quot;Open cloud opslag&quot; of &quot;Opslaan in cloud opslag&quot;.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="630"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="629"/>
         <source>Failure taking cloud storage online</source>
         <translation>Cloud opslag online gaan is mislukt.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="703"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="691"/>
         <source>Please save or cancel the current dive edit before closing the file.</source>
         <translation>Bewaar of maak de huidige wijziging ongedaan voor U het bestand sluit.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="806"/>
+        <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>Bewaar of maak de huidige wijziging ongedaan voor U een duik toevoegt.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="858"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="847"/>
         <source>Print runtime table</source>
         <translation>Runtime tabel afdrukken</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="914"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="903"/>
         <source>Trying to replan a dive that&apos;s not a planned dive.</source>
         <translation>U probeert een duik te herplannen die geen geplande duik is.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1685"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1788"/>
-        <source>multiple files</source>
-        <translation>meerdere bestanden</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1766"/>
-        <source>Open dive site file</source>
-        <translation>Duikstek bestand openen</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1801"/>
-        <source>Please, first finish the current edition before trying to do another.</source>
-        <translation>Rond de huidige wijziging af vooraleer een volgende te beginnen.</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1017"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1006"/>
         <source>Yearly statistics</source>
         <translation>Jaarlijkse statistieken</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1244"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1285"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1234"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1275"/>
         <source>Dive log files</source>
         <translation>Duiklog bestanden</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="1559"/>
+        <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>Subsurface bestanden</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1265"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1307"/>
+        <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="1266"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1309"/>
+        <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="1267"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1310"/>
+        <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="1268"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1311"/>
+        <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="1269"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1312"/>
+        <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="1270"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1313"/>
+        <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="1271"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1314"/>
+        <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="1272"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1315"/>
+        <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="1273"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1316"/>
+        <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="1274"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1317"/>
+        <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="1275"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1318"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1265"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1308"/>
         <source>MkVI files</source>
         <translation>MkVI bestanden</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="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="1277"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1320"/>
+        <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="1278"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1321"/>
+        <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="1308"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1298"/>
         <source>CSV</source>
         <translation>CSV</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1322"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1334"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1312"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1324"/>
         <source>All files</source>
         <translation>Alle bestanden</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1329"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1319"/>
         <source>Dive site files</source>
         <translation>Duikstek bestanden</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1344"/>
+        <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>Wilt u de wijzigingen in bestand %1 opslaan?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1345"/>
+        <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>Wilt u de wijzigingen opslaan in het bestand?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="619"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1350"/>
-        <source>Save changes?</source>
-        <translation>Aanpassingen opslaan?</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1351"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1341"/>
         <source>Changes will be lost if you don&apos;t save them.</source>
         <translation>Wijzigingen gaan verloren als u deze niet bewaart.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1558"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1548"/>
         <source>Save file as</source>
         <translation>Bestand opslaan als</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1646"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1636"/>
         <source>[local cache for] %1</source>
         <translation>[lokale cache voor] %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1647"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1637"/>
         <source>[cloud storage for] %1</source>
         <translation>[cloud opslag voor] %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1714"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1675"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1777"/>
+        <source>multiple files</source>
+        <translation>meerdere bestanden</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1703"/>
         <source>Opening datafile from older version</source>
         <translation>Opent een databestand van een oudere versie</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1715"/>
+        <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>U heeft een databestand van een oudere versie van Subsurface geopend. Wij raden u aan de handleiding te lezen met betrekking tot de nieuwe versie, in het bijzonder de sterk veranderde duikstek-afhandeling.
 Subsurface heeft reeds gesprobeerd de data te converteren, maar het is nuttig zelf vast te stellen dat de conversie correct is verlopen.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1739"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1728"/>
         <source>Open dive log file</source>
         <translation>Open duiklogboek</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1927"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1755"/>
+        <source>Open dive site file</source>
+        <translation>Duikstek bestand openen</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>Rond de huidige wijziging af vooraleer een volgende te beginnen.</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1916"/>
         <source>Contacting cloud service...</source>
         <translation>Contact opnemen met cloud service...</translation>
     </message>
+    <message>
+        <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="584"/>
+        <source>Configure &amp;dive computer</source>
+        <translation>Duikcomputer configureren</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>Cloud opslag online</translation>
+    </message>
+    <message>
+        <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="620"/>
+        <source>Share on</source>
+        <translation>Deel via</translation>
+    </message>
 </context>
 <context>
     <name>MapPage</name>
@@ -6688,33 +7399,9 @@ Als je toestel Bluetooth gebruikt, doe de gelijke voorbereidingen als voor een l
     </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>Pagina 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>Tekstveld</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>Klik hier</translation>
-    </message>
-</context>
-<context>
     <name>PasteDives</name>
     <message numerus="yes">
-        <location filename="../desktop-widgets/command_edit.cpp" line="760"/>
+        <location filename="../commands/command_edit.cpp" line="868"/>
         <source>Paste onto %n dive(s)</source>
         <translation><numerusform>In %n duik plakken</numerusform><numerusform>In %n duiken plakken</numerusform></translation>
     </message>
@@ -6722,79 +7409,207 @@ Als je toestel Bluetooth gebruikt, doe de gelijke voorbereidingen als voor een l
 <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>Laatste stop op 20ft</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% gem. diepte tot 20ft</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>20ft tot oppervlakte</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>Laatste stop op 6m</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% gem. diepte tot 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 tot oppervlakte</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>cuft/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>Formulier</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>Subsurface cloud opslag</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_cloud.ui" line="41"/>
+        <source>Email address</source>
+        <translation>E-mailadres</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_cloud.ui" line="48"/>
+        <source>Password</source>
+        <translation>Wachtwoord</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_cloud.ui" line="55"/>
+        <source>Verification PIN</source>
+        <translation>Verificatie PIN</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_cloud.ui" line="62"/>
+        <source>New password</source>
+        <translation>Nieuw wachtwoord</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_cloud.ui" line="97"/>
+        <source>Save Password locally?</source>
+        <translation>Wachtwoord lokaal bewaren?</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>Cloud</translation>
+    </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>Wijziging niet toegepast. Het cloud wachtwoord kan alleen letters, nummers en de volgende symbolen bevatten: &apos;.&apos;, &apos;-&apos;, &apos;_&apos;, and &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>Wijziging niet toegepast. Het cloud wachtwoord kan alleen letters, nummers en de volgende symbolen bevatten: &apos;.&apos;, &apos;-&apos;, &apos;_&apos;, and &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>Het cloud wachtwoord kan alleen letters, nummers en de volgende symbolen bevatten: &apos;.&apos;, &apos;-&apos;, &apos;_&apos;, and &apos;+&apos;.</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_cloud.cpp" line="113"/>
+        <source>Subsurface cloud storage (credentials verified)</source>
+        <translation>Subsurface cloud opslag (rechten gecontroleerd)</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_cloud.cpp" line="115"/>
+        <source>Subsurface cloud storage (incorrect password)</source>
+        <translation>Subsurface cloud opslag (onjuist wachtwoord)</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_cloud.cpp" line="117"/>
+        <source>Subsurface cloud storage (PIN required)</source>
+        <translation>Subsurface cloud opslag (PIN vereist)</translation>
+    </message>
+</context>
+<context>
+    <name>PreferencesDc</name>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_dc.ui" line="14"/>
+        <source>Form</source>
+        <translation>Formulier</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_dc.ui" line="24"/>
+        <source>DIVE COMPUTER</source>
+        <translation>DUIKCOMPUTER</translation>
+    </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"/>
@@ -6803,186 +7618,180 @@ Als je toestel Bluetooth gebruikt, doe de gelijke voorbereidingen als voor een l
         <translation>Formulier</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>Lijsten en tabellen</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>Lettertype</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>Lettertype grootte</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>Animaties</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>Snelheid</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>Lijsten en tabellen</translation>
+    </message>
+    <message>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_defaults.h" line="333"/>
         <source>Dives</source>
         <translation>Duiken</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="52"/>
-        <source>Default file</source>
-        <translation>Standaard bestand</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>Standaard duikbestand</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>&amp;Geen standaard bestand</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>&amp;Lokaal standaard bestand</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>Clo&amp;ud opslag standaard bestand</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>Lokaal duiklogboek</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>Gebruik standaardinstelling</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>Toon ongeldige duiken</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>Standaard fles</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>Gebruik standaard fles</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>Animaties</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>Snelheid</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>Video thumbnails</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 executable</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>Extraheer op positie</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>Extraheer video thumbnails</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>Instellingen wissen</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>Wis voorheen gebruikte duikcomputers</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>Zet alle instellingen terug naar hun standaardwaarde</translation>
     </message>
+</context>
+<context>
+    <name>PreferencesDialog</name>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="14"/>
-        <source>General</source>
-        <translation>Algemeen</translation>
+        <location filename="../desktop-widgets/preferences/preferencesdialog.cpp" line="48"/>
+        <source>Preferences</source>
+        <translation>Voorkeuren</translation>
     </message>
+</context>
+<context>
+    <name>PreferencesEquipment</name>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="27"/>
-        <source>Open default log file</source>
-        <translation>Standaard logboek openen</translation>
+        <location filename="../desktop-widgets/preferences/preferences_equipment.ui" line="14"/>
+        <source>Form</source>
+        <translation>Formulier</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="27"/>
-        <source>Subsurface files</source>
-        <translation>Subsurface bestanden</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="64"/>
-        <source>Warning</source>
-        <translation>Waarschuwing</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>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="64"/>
-        <source>Couldn&apos;t execute ffmpeg at given location. Thumbnailing will not work.</source>
-        <translation>Kan ffmpeg niet uitvoeren vanaf de opgegeven locatie: Thumbnails worden niet gemaakt </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_defaults.cpp" line="70"/>
-        <source>Select ffmpeg executable</source>
-        <translation>Selecteer ffmpeg executable</translation>
+        <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>
-</context>
-<context>
-    <name>PreferencesDialog</name>
     <message>
-        <location filename="../desktop-widgets/preferences/preferencesdialog.cpp" line="42"/>
-        <source>Preferences</source>
-        <translation>Voorkeuren</translation>
+        <location filename="../desktop-widgets/preferences/preferences_equipment.cpp" line="12"/>
+        <source>Equipment</source>
+        <translation>Uitrusting</translation>
     </message>
 </context>
 <context>
@@ -6994,14 +7803,18 @@ Als je toestel Bluetooth gebruikt, doe de gelijke voorbereidingen als voor een l
         <translation>Formulier</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>Duikplek layout</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>
@@ -7012,6 +7825,11 @@ Als je toestel Bluetooth gebruikt, doe de gelijke voorbereidingen als voor een l
         <source>Georeference</source>
         <translation>Georeferentie</translation>
     </message>
+    <message>
+        <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_georeference.h" line="106"/>
+        <source>Dive site layout</source>
+        <translation>Duikplek layout</translation>
+    </message>
 </context>
 <context>
     <name>PreferencesGraph</name>
@@ -7028,66 +7846,6 @@ Als je toestel Bluetooth gebruikt, doe de gelijke voorbereidingen als voor een l
         <translation>Gasdruk display instelling</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 opties:</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>Plafond display instelling</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>Toon door duikcomputer aangegeven plafond in rood</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>Algoritme voor berekend plafond:</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 opties:</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>Verdunnningsratio</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>
@@ -7128,6 +7886,12 @@ Als je toestel Bluetooth gebruikt, doe de gelijke voorbereidingen als voor een l
         <translation>pO₂ in berekening MOD (alleen maximum)</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 opties:</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>
@@ -7146,12 +7910,36 @@ Als je toestel Bluetooth gebruikt, doe de gelijke voorbereidingen als voor een l
         <translation>Toon CCR setpoints wanneer pO₂ getoond wordt</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 opties:</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 metabolisme verbruik 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>Verdunnningsratio</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>
@@ -7164,16 +7952,16 @@ Als je toestel Bluetooth gebruikt, doe de gelijke voorbereidingen als voor een l
         <translation>Toon waarschuwingen voor isobare counter diffusie</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>Conservatisme niveau</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>Plafond display instelling</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>Thumbnails opnieuw berekenen indien ouder dan media bestand</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"/>
@@ -7182,10 +7970,10 @@ Als je toestel Bluetooth gebruikt, doe de gelijke voorbereidingen als voor een l
         <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>Algoritme voor berekend plafond:</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="275"/>
@@ -7196,33 +7984,59 @@ Als je toestel Bluetooth gebruikt, doe de gelijke voorbereidingen als voor een l
         <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>Conservatisme niveau</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>Toon door duikcomputer aangegeven plafond in rood</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>Diversen</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>Toon niet gebruikte flessen in het Uitrusting tabblad</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>Toon gemiddelde diepte in profiel</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="12"/>
-        <source>Profile</source>
-        <translation>Profiel</translation>
+        <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_graph.h" line="375"/>
+        <source>Recalculate thumbnails if older than media file</source>
+        <translation>Thumbnails opnieuw berekenen indien ouder dan media bestand</translation>
     </message>
 </context>
 <context>
@@ -7258,12 +8072,6 @@ Als je toestel Bluetooth gebruikt, doe de gelijke voorbereidingen als voor een l
         <translation>Datumformaat</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;Datum formaat voorkeur. Veel gebruikte velden zijn&lt;/p&gt;&lt;p&gt;d (dag van de maand)&lt;/p&gt;&lt;p&gt;ddd (afkorting dag naam)&lt;/p&gt;&lt;p&gt;M (maand nummer)&lt;/p&gt;&lt;p&gt;MMM (afkorting maand naam)&lt;/p&gt;&lt;p&gt;yy/yyyy (2/4 cijferig jaar)&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"/>
@@ -7284,6 +8092,12 @@ Als je toestel Bluetooth gebruikt, doe de gelijke voorbereidingen als voor een l
         <translation>Kort formaat</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;Datum formaat voorkeur. Veel gebruikte velden zijn&lt;/p&gt;&lt;p&gt;d (dag van de maand)&lt;/p&gt;&lt;p&gt;ddd (afkorting dag naam)&lt;/p&gt;&lt;p&gt;M (maand nummer)&lt;/p&gt;&lt;p&gt;MMM (afkorting maand naam)&lt;/p&gt;&lt;p&gt;yy/yyyy (2/4 cijferig jaar)&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>
@@ -7339,6 +8153,172 @@ Zie 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>Formulier</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>Standaard duikbestand</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_log.ui" line="53"/>
+        <source>&amp;No default file</source>
+        <translation>&amp;Geen standaard bestand</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_log.ui" line="60"/>
+        <source>&amp;Local default file</source>
+        <translation>&amp;Lokaal standaard bestand</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_log.ui" line="67"/>
+        <source>Clo&amp;ud storage default file</source>
+        <translation>Clo&amp;ud opslag standaard bestand</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_log.ui" line="76"/>
+        <source>Local dive log file</source>
+        <translation>Lokaal duiklogboek</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_log.ui" line="88"/>
+        <source>Use default</source>
+        <translation>Gebruik standaardinstelling</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>Standaard logboek openen</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_log.cpp" line="27"/>
+        <source>Subsurface files</source>
+        <translation>Subsurface bestanden</translation>
+    </message>
+</context>
+<context>
+    <name>PreferencesMedia</name>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_media.ui" line="14"/>
+        <source>Form</source>
+        <translation>Formulier</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>Video thumbnails</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>Extraheer video thumbnails</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>Extraheer op positie</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>Waarschuwing</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>Kan ffmpeg niet uitvoeren vanaf de opgegeven locatie: Thumbnails worden niet gemaakt </translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_media.cpp" line="45"/>
+        <source>Select ffmpeg executable</source>
+        <translation>Selecteer ffmpeg executable</translation>
+    </message>
+</context>
+<context>
     <name>PreferencesNetwork</name>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_network.ui" line="14"/>
@@ -7348,9 +8328,8 @@ Zie 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>Proxy</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"/>
@@ -7378,7 +8357,6 @@ Zie 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>
@@ -7391,91 +8369,82 @@ Zie http://doc.qt.io/qt-5/qdatetime.html#toString</translation>
         <translation>Authenticatie vereist</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>Netwerk</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="14"/>
+        <source>No proxy</source>
+        <translation>Geen proxy</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="15"/>
+        <source>System proxy</source>
+        <translation>Systeem proxy</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>Proxy</translation>
+    </message>
+    <message>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_network.h" line="241"/>
         <source>Subsurface cloud storage</source>
         <translation>Subsurface cloud opslag</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>E-mailadres</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>Verificatie PIN</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>Nieuw wachtwoord</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>Wachtwoord lokaal bewaren?</translation>
     </message>
+</context>
+<context>
+    <name>PreferencesReset</name>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="11"/>
-        <source>Network</source>
-        <translation>Netwerk</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/>
-        <source>No proxy</source>
-        <translation>Geen proxy</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/>
-        <source>System proxy</source>
-        <translation>Systeem proxy</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>Wijziging niet toegepast. Het cloud wachtwoord kan alleen letters, nummers en de volgende symbolen bevatten: &apos;.&apos;, &apos;-&apos;, &apos;_&apos;, and &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>Wijziging niet toegepast. Het cloud wachtwoord kan alleen letters, nummers en de volgende symbolen bevatten: &apos;.&apos;, &apos;-&apos;, &apos;_&apos;, and &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>Het cloud wachtwoord kan alleen letters, nummers en de volgende symbolen bevatten: &apos;.&apos;, &apos;-&apos;, &apos;_&apos;, and &apos;+&apos;.</translation>
+        <location filename="../desktop-widgets/preferences/preferences_reset.ui" line="14"/>
+        <source>Form</source>
+        <translation>Formulier</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="133"/>
-        <source>Subsurface cloud storage (credentials verified)</source>
-        <translation>Subsurface cloud opslag (rechten gecontroleerd)</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>Subsurface cloud opslag (onjuist wachtwoord)</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>Subsurface cloud opslag (PIN vereist)</translation>
+        <location filename="../desktop-widgets/preferences/preferences_reset.cpp" line="6"/>
+        <source>Reset</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -7711,20 +8680,35 @@ Zie 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>Afd&amp;rukken</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/printdialog.cpp" line="108"/>
+        <location filename="../desktop-widgets/printdialog.cpp" line="109"/>
         <source>&amp;Preview</source>
         <translation>Voorbeeldweergave</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>Afdrukken</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>Html bestand</translation>
+    </message>
 </context>
 <context>
     <name>PrintOptions</name>
@@ -7850,138 +8834,138 @@ Exporteer naar een ander bestand.</translation>
 <context>
     <name>ProfileWidget2</name>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="814"/>
-        <source> (#%1 of %2)</source>
-        <translation> (#%1 van %2)</translation>
+        <location filename="../profile-widget/profilewidget2.cpp" line="811"/>
+        <source>Planned dive</source>
+        <translation>Geplande duik</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="810"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="813"/>
+        <source>Manually added dive</source>
+        <translation>Handmatig toegevoegde duik</translation>
+    </message>
+    <message>
+        <location filename="../profile-widget/profilewidget2.cpp" line="815"/>
         <source>Unknown dive computer</source>
         <translation>Onbekende duikcomputer</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="837"/>
-        <source>Show NDL / TTS was disabled because of excessive processing time</source>
-        <translation>NDL / TTS wordt niet getoond omdat de berekening te lang duurt</translation>
+        <location filename="../profile-widget/profilewidget2.cpp" line="819"/>
+        <source> (#%1 of %2)</source>
+        <translation> (#%1 van %2)</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1451"/>
-        <source>Add gas change</source>
-        <translation>Gaswissel toevoegen</translation>
+        <location filename="../profile-widget/profilewidget2.cpp" line="842"/>
+        <source>Show NDL / TTS was disabled because of excessive processing time</source>
+        <translation>NDL / TTS wordt niet getoond omdat de berekening te lang duurt</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1435"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1434"/>
         <source>Make first dive computer</source>
         <translation>Maak eerste duikcomputer</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="806"/>
-        <source>Planned dive</source>
-        <translation>Geplande duik</translation>
-    </message>
-    <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="808"/>
-        <source>Manually added dive</source>
-        <translation>Handmatig toegevoegde duik</translation>
-    </message>
-    <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1437"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1436"/>
         <source>Delete this dive computer</source>
         <translation>Verwijder deze duikcomputer</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1438"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1437"/>
         <source>Split this dive computer into own dive</source>
         <translation>Deze duikcomputer naar eigen duik splitsen</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1454"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1450"/>
+        <source>Add gas change</source>
+        <translation>Gaswissel toevoegen</translation>
+    </message>
+    <message>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1453"/>
         <source> (cyl. %1)</source>
         <translation> (fles %1)</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1460"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1458"/>
         <source>Add setpoint change</source>
         <translation>Voeg setpoint wissel toe</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1462"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1460"/>
         <source>Add bookmark</source>
         <translation>Bladwijzer toevoegen</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1464"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1462"/>
         <source>Split dive into two</source>
         <translation>Duik in tweeën splitsen</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1474"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1469"/>
         <source>Change divemode</source>
         <translation>Duikmodus wijzigen</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1498"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1493"/>
         <source>Edit the profile</source>
         <translation>Profiel bewerken</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1502"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1497"/>
         <source>Remove event</source>
         <translation>Gebeurtenis verwijderen</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1507"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1502"/>
         <source>Hide similar events</source>
         <translation>Gelijkaardige gebeurtenissen verbergen</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1514"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1509"/>
         <source>Edit name</source>
         <translation>Naam bewerken</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1545"/>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1552"/>
+        <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>Druk aanpassen van cilinder %1 (nu geïnterpoleerd als %2)</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1567"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1564"/>
         <source>Unhide all events</source>
         <translation>Toon alle gebeurtenissen</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1595"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1592"/>
         <source>Hide events</source>
         <translation>Gebeurtenissen verbergen</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1595"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1592"/>
         <source>Hide all %1 events?</source>
         <translation>Alle %1 gebeurtenissen verbergen?</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1630"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1627"/>
         <source>Remove the selected event?</source>
         <translation>Geselecteerde gebeurtenis verwijderen?</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1631"/>
+        <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="1783"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1760"/>
         <source>Edit name of bookmark</source>
         <translation>Naam bladwijzer bewerken</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1784"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1761"/>
         <source>Custom name:</source>
         <translation>Naam:</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1789"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1766"/>
         <source>Name is too long!</source>
         <translation>Deze naam is te lang!</translation>
     </message>
@@ -7989,162 +8973,195 @@ Exporteer naar een ander bestand.</translation>
 <context>
     <name>QMLManager</name>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="207"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="256"/>
         <source>Starting...</source>
         <translation>Starten...</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="276"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="331"/>
         <source>Open local dive data file</source>
         <translation>Open lokale duikgegevens</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="284"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="352"/>
         <source>Opening local data file failed</source>
         <translation>Open lokale duikgegevens mislukt</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="314"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="372"/>
         <source>%1 dives loaded from local dive data file</source>
         <translation>%1 duiken geladen uit de lokale duikgegevens</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="421"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="379"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="698"/>
+        <source>Incorrect cloud credentials</source>
+        <translation>Onjuiste cloud rechten</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="518"/>
         <source>working in no-cloud mode</source>
         <translation>werkt met lokale data</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="425"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="522"/>
         <source>Error parsing local storage, giving up</source>
         <translation>Fout bij het verwerken van de lokale opslag, opgegeven</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="434"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="531"/>
         <source>no cloud credentials</source>
         <translation>Geen cloud rechten</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="435"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="511"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="532"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="604"/>
         <source>Please enter valid cloud credentials.</source>
         <translation>Voer geldige cloud rechten in</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="467"/>
+        <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>Het cloud wachtwoord kan alleen letters, nummers en de volgende symbolen bevatten: &apos;.&apos;, &apos;-&apos;, &apos;_&apos;, and &apos;+&apos;.</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="473"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="571"/>
         <source>Invalid format for email address</source>
         <translation>Ongeldig formaat voor e-mailadres</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="522"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="615"/>
         <source>Attempting to open cloud storage with new credentials</source>
         <translation>Probeert cloud opslag te openen met nieuwe rechten</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="544"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="629"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="676"/>
         <source>Testing cloud credentials</source>
         <translation>Cloud rechten worden gecontroleerd</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="559"/>
+        <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>Geen antwoord van de cloud server bij het valideren van de inlogrechten</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="567"/>
-        <source>Incorrect cloud credentials</source>
-        <translation>Onjuiste cloud rechten</translation>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="652"/>
+        <source>Incorrect email / password combination</source>
+        <translation>Onjuiste combinatie e-mail / wachtwoord</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="573"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="657"/>
+        <source>Cloud credentials require verification PIN</source>
+        <translation>Cloud rechten vereisen controle PIN</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="660"/>
+        <source>Incorrect PIN, please try again</source>
+        <translation>Onjuiste PIN, probeer opnieuw</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="665"/>
+        <source>PIN accepted, credentials verified</source>
+        <translation>PIN correct, rechten geverifieerd</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="704"/>
         <source>Cannot connect to cloud storage - cloud account not verified</source>
         <translation>Kan niet verbinden met de Subsurface cloud opslag - cloud account niet geverifieerd</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="600"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="728"/>
         <source>Cloud credentials are invalid</source>
         <translation>Cloud rechten zijn ongeldig</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="614"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="742"/>
         <source>Cannot open cloud storage: Error creating https connection</source>
         <translation>Kan cloud opslag niet openen: Fout bij aanmaken https verbinding</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="628"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="756"/>
         <source>Cannot open cloud storage: %1</source>
         <translation>Kan cloud opslag niet openen: %1</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="641"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="769"/>
         <source>Cannot connect to cloud storage</source>
         <translation>Kan niet verbinden met de Subsurface cloud opslag</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="646"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="774"/>
         <source>Cloud credentials valid, loading dives...</source>
         <translation>Cloud rechten zijn geldig. duiken ophalen...</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="656"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="783"/>
         <source>Cloud storage error: %1</source>
         <translation>Cloud opslag fout: %1</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="702"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="829"/>
         <source>Loading dives from local storage (&apos;no cloud&apos; mode)</source>
         <translation>Duiken laden uit de lokale opslag (&apos;no cloud&apos; mode)</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="748"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="875"/>
         <source>Failed to connect to cloud server, reverting to no cloud status</source>
         <translation>
 Kan niet verbinden met de Subsurface cloud opslag, terug naar lokale mode</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="773"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="897"/>
         <source>Cloud storage open successfully. No dives in dive list.</source>
         <translation>Cloud opslag succesvol geopend. Geen duiken in de duiklijst.</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="951"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="952"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="1082"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="1083"/>
         <source>h</source>
         <translation>h</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="951"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="952"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="953"/>
+        <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="951"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="1082"/>
         <source>sec</source>
         <translation>sec</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="1048"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="1186"/>
         <source>weight</source>
         <translation>Gewicht</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="1493"/>
+        <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>Onbekende GPS locatie</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>Starten...</translation>
+        <location filename="../qt-models/divesummarymodel.cpp" line="197"/>
+        <source>no dives in period</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -8164,6 +9181,19 @@ Kan niet verbinden met de Subsurface cloud opslag, terug naar lokale mode</trans
     </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"/>
@@ -8201,6 +9231,19 @@ Kan niet verbinden met de Subsurface cloud opslag, terug naar lokale mode</trans
     </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="2250"/>
@@ -8241,203 +9284,324 @@ Kan niet verbinden met de Subsurface cloud opslag, terug naar lokale mode</trans
 <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>Instellingen</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>Ongedefinieerd</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>Onjuiste email/wachtwoord combinatie</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>Rechten moeten nog worden gecontroleerd</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>Rechten gecontroleerd</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>Geen cloud</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>Algemene instellingen</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="37"/>
         <source>Cloud status</source>
         <translation>Cloud status</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>E-mail</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>Niet van toepassing</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>Wijzigen</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>Starten...</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="61"/>
         <source>Status</source>
         <translation>Status</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/Settings.qml" line="84"/>
-        <source>Theme</source>
-        <translation>Thema</translation>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="81"/>
+        <source>Default Cylinder</source>
+        <translation>Standaard fles</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/Settings.qml" line="93"/>
-        <source>Blue</source>
-        <translation>Blauw</translation>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="89"/>
+        <source>Cylinder:</source>
+        <translation>Fles:</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="112"/>
+        <source>Dive computers</source>
+        <translation>Duikcomputers</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>normale tekst</translation>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="120"/>
+        <source>Forget remembered dive computers</source>
+        <translation>Wis voorheen gebruikte duikcomputers</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>Accent</translation>
+        <source>Forget</source>
+        <translation>Wis</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="140"/>
+        <source>Theme</source>
+        <translation>Thema</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>Blauw</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="153"/>
         <source>Pink</source>
         <translation>Roze</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>Donker</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/Settings.qml" line="255"/>
-        <source>Scaling</source>
-        <translation>UI schaal</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="180"/>
+        <source>text</source>
+        <translation>tekst</translation>
+    </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="268"/>
+        <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>kleiner</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>normaal</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>groter</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/Settings.qml" line="306"/>
-        <source>GPS location service</source>
-        <translation>GPS locatie service</translation>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="351"/>
+        <source>Units</source>
+        <translation>Eenheden</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/Settings.qml" line="316"/>
-        <source>Distance threshold (meters)</source>
-        <translation>Afstandsdrempel (meters)</translation>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="357"/>
+        <source>Metric</source>
+        <translation>Metrisch</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/Settings.qml" line="332"/>
-        <source>Time threshold (minutes)</source>
-        <translation>Tijdsdrempel (minuten)</translation>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="366"/>
+        <source>Imperial</source>
+        <translation>Imperiaal</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/Settings.qml" line="361"/>
-        <source>Default Cylinder</source>
-        <translation>Standaard fles</translation>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="375"/>
+        <source>Personalize</source>
+        <translation>Personaliseren</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/Settings.qml" line="370"/>
-        <source>Cylinder:</source>
-        <translation>Fles:</translation>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="397"/>
+        <source>Depth</source>
+        <translation>Diepte</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/Settings.qml" line="395"/>
-        <source>Dive computers</source>
-        <translation>Duikcomputers</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>Wis voorheen gebruikte duikcomputers</translation>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="409"/>
+        <source>feet</source>
+        <translation>voet</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/Settings.qml" line="410"/>
-        <source>Forget</source>
-        <translation>Wis</translation>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="417"/>
+        <source>Pressure</source>
+        <translation>Druk</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/Settings.qml" line="432"/>
-        <source>Units</source>
-        <translation>Eenheden</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="429"/>
+        <source>psi</source>
+        <translation>psi</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/Settings.qml" line="442"/>
-        <source>Use Imperial Units</source>
-        <translation>Gebruik imperiale eenheden</translation>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="437"/>
+        <source>Volume</source>
+        <translation>Volume</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/Settings.qml" line="458"/>
-        <source>Use Metric Units</source>
-        <translation>Gebruik metrische eenheden</translation>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="441"/>
+        <source>liter</source>
+        <translation>liter</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/Settings.qml" line="486"/>
-        <source>Filter preferences</source>
-        <translation>Filter instellingen</translation>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="449"/>
+        <source>cuft</source>
+        <translation>cuft</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="457"/>
+        <source>Temperature</source>
+        <translation>Temperatuur</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/Settings.qml" line="495"/>
-        <source>Include notes in full text filtering</source>
-        <translation>Filter ook in de notities</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="469"/>
+        <source>fahrenheit</source>
+        <translation>fahrenheit</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="477"/>
+        <source>Weight</source>
+        <translation>Gewicht</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/Settings.qml" line="510"/>
-        <source>Match filter case sensitive</source>
-        <translation>Filter op hoofd- en kleine letters</translation>
+        <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>US pond</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 locatie service</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="518"/>
+        <source>Distance threshold (meters)</source>
+        <translation>Afstandsdrempel (meters)</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="532"/>
+        <source>Time threshold (minutes)</source>
+        <translation>Tijdsdrempel (minuten)</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/Settings.qml" line="537"/>
+        <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>Toon alle Bluetooth toestellen 
-zelfs als deze niet als duikcomputer worden herkend</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="572"/>
+        <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="611"/>
         <source>Developer</source>
         <translation>Ontwikkelaar</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>Toon ontwikkelaars menu</translation>
     </message>
@@ -8514,39 +9678,39 @@ Niet alle media bestanden hebben tijdstippen tussen 30 minuten voor de start en
         <translation>Welke datum en tijd worden weergegeven in de afbeelding?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="285"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="275"/>
         <source>Open image file</source>
         <translation>Afbeelding openen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="287"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="277"/>
         <source>Image files</source>
         <translation>Afbeeldingen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="368"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="358"/>
         <source>Selected dive date/time</source>
         <translation>Geselecteerde duik datum/tijd</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="370"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="360"/>
         <source>First selected dive date/time</source>
         <translation>Eerste geselecteerde duik datum/tijd</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="371"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="361"/>
         <source>Last selected dive date/time</source>
         <translation>Laatste geselecteerde duik datum/tijd</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="373"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="363"/>
         <source>
 Files with inappropriate date/time</source>
         <translation>
 Bestanden met onjuiste datum/tijd</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="383"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="373"/>
         <source>No Exif date/time found</source>
         <translation>Geen Exif daum/tijd gevonden</translation>
     </message>
@@ -8664,25 +9828,25 @@ Bestanden met onjuiste datum/tijd</translation>
         <translation>Alle bestanden</translation>
     </message>
     <message>
-        <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="67"/>
-        <source>Subsurface files</source>
-        <translation>Subsurface bestanden</translation>
-    </message>
-    <message>
         <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="66"/>
         <source>Open Subsurface files</source>
         <translation>Open Subsurface bestanden</translation>
     </message>
+    <message>
+        <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="67"/>
+        <source>Subsurface files</source>
+        <translation>Subsurface bestanden</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>Voer je cloud rechten in om Subsurface-mobile met Subsurface cloud opslag te gebruiken.&lt;br/&gt;&lt;br/&gt;Als dit de eerste keer is dat je de Subsurface cloud opslag gebruikt, voer een geldig e-mailadres in (in kleine letters) en een wachtwoord naar keuze (letters en cijfers).&lt;br/&gt;&lt;br/&gt;Klik de &quot;no cloud&quot; knop hierboven om Subsurface-mobile alleen met de lokale data op dit toestel te gebruiken.</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>Bedankt voor het registreren bij Subsurface. Wij hebben de PIN code aan &lt;b&gt;%1&lt;/b&gt; gestuurd om de registratie te voltooien. Als je niet binnen 15 minuten de PIN code hebt ontvangen, controleer dan de juiste spelling van het e-mailadres en de spam box als eerste. &lt;br/&gt;&lt;br/&gt;In geval van verdere problemen bij het opzetten van een could account, neem dan contact met ons op op het forum (https://subsurface-divelog.org/user-forum/).&lt;br/&gt;&lt;br/&gt;</translation>
     </message>
@@ -8738,37 +9902,37 @@ Bestanden met onjuiste datum/tijd</translation>
         <translation>Pak</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.cpp" line="52"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.cpp" line="53"/>
         <source>Cylinders</source>
         <translation>Flessen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.cpp" line="53"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.cpp" line="54"/>
         <source>Add cylinder</source>
         <translation>Fles toevoegen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.cpp" line="56"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.cpp" line="57"/>
         <source>Weights</source>
         <translation>Gewichten</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.cpp" line="57"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.cpp" line="58"/>
         <source>Add weight system</source>
         <translation>Gewichtssysteem toevoegen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.cpp" line="60"/>
+        <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="64"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.cpp" line="65"/>
         <source>Undo</source>
         <translation>Ongedaan maken</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.cpp" line="306"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.cpp" line="275"/>
         <source>Warning: edited %1 dives</source>
         <translation>Waarschuwing: %1 duiken bewerkt</translation>
     </message>
@@ -8791,120 +9955,259 @@ Bestanden met onjuiste datum/tijd</translation>
         <translation>Informatie</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>Datum</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>Duikmodus</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>Interval</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>Gebruikte gassen</translation>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="123"/>
+        <source>Duration</source>
+        <translation>Duur</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>Max. diepte</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="116"/>
+        <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>Gem. diepte</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="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>Gasverbruik</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>Gasverbruik</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>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>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>Max. diepte</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>Gem. diepte</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="231"/>
-        <source>Atm. pressure</source>
-        <translation>Atm. druk</translation>
-    </message>
-    <message>
-        <location filename="../subsurface/desktop-widgets/ui_TabDiveInformation.h" line="316"/>
-        <source>Air pressure</source>
-        <translation>Luchtdruk</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>Lucht temp.</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>Water temp.</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>Duiktijd</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>Soort water</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>Klein</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="555"/>
+        <source>Visibility</source>
+        <translation>Zicht</translation>
+    </message>
+    <message>
+        <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>Stroming</translation>
+    </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>Sterk</translation>
+    </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>Zwak</translation>
+    </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.cpp" line="76"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="702"/>
+        <source>Chill</source>
+        <translation>Koude</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="733"/>
+        <source>Freezing</source>
+        <translation>IJskoud</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="740"/>
+        <source>Comfy</source>
+        <translation>Comfortabel</translation>
+    </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>Zoet</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="30"/>
+        <source>Salty</source>
+        <translation>Brak</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="30"/>
+        <source>Salt</source>
+        <translation>Zout</translation>
+    </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>Ongedaan maken</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="103"/>
+        <source>Warning: edited %1 dives</source>
+        <translation>Waarschuwing: %1 duiken bewerkt</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="82"/>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="104"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="158"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="176"/>
         <source>h</source>
         <translation>h</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="82"/>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="104"/>
+        <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="82"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="158"/>
         <source>sec</source>
         <translation>sec</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="104"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="176"/>
         <source>d</source>
         <translation>d</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="255"/>
+        <source>unknown</source>
+        <translation>onbekend</translation>
+    </message>
+    <message>
+        <location filename="../subsurface/desktop-widgets/ui_TabDiveInformation.h" line="298"/>
+        <source>Date</source>
+        <translation>Datum</translation>
+    </message>
+    <message>
+        <location filename="../subsurface/desktop-widgets/ui_TabDiveInformation.h" line="302"/>
+        <source>Gases used</source>
+        <translation>Gebruikte gassen</translation>
+    </message>
+    <message>
+        <location filename="../subsurface/desktop-widgets/ui_TabDiveInformation.h" line="316"/>
+        <source>Air pressure</source>
+        <translation>Luchtdruk</translation>
+    </message>
+    <message>
+        <location filename="../subsurface/desktop-widgets/ui_TabDiveInformation.h" line="322"/>
+        <source>Dive time</source>
+        <translation>Duiktijd</translation>
+    </message>
+    <message>
+        <location filename="../subsurface/desktop-widgets/ui_TabDiveInformation.h" line="324"/>
+        <source>Water type</source>
+        <translation>Soort water</translation>
+    </message>
 </context>
 <context>
     <name>TabDivePhotos</name>
@@ -8970,7 +10273,7 @@ Bestanden met onjuiste datum/tijd</translation>
     <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>Duikstekken</translation>
     </message>
@@ -8980,7 +10283,18 @@ Bestanden met onjuiste datum/tijd</translation>
         <translation>Ongebruikte duikstekken verwijderen</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>Duikstek verwijderen?</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>Nieuwe duikstek</translation>
     </message>
@@ -8994,15 +10308,15 @@ Bestanden met onjuiste datum/tijd</translation>
         <translation>Statistieken</translation>
     </message>
     <message>
-        <location filename="../subsurface/desktop-widgets/ui_TabDiveStatistics.h" line="195"/>
-        <source>Depth</source>
-        <translation>Diepte</translation>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="73"/>
+        <source>Max. depth</source>
+        <translation>Max. diepte</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>Duur</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>Gasverbruik</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="97"/>
@@ -9011,29 +10325,24 @@ Bestanden met onjuiste datum/tijd</translation>
         <translation>Temperatuur</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="73"/>
-        <source>Max. depth</source>
-        <translation>Max. diepte</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>Totale tijd</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>Duur</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>Duiken</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>Gasverbruik</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>
@@ -9095,38 +10404,38 @@ Bestanden met onjuiste datum/tijd</translation>
         <translation>Gemiddelde duiktijd van de geselecteerde duiken</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>h</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>sec</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>
@@ -9135,20 +10444,25 @@ worden uit lucht 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>en</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>Diepte</translation>
+    </message>
 </context>
 <context>
     <name>TableView</name>
@@ -9392,33 +10706,50 @@ worden uit lucht en:
 <context>
     <name>TextHyperlinkEventFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="600"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="590"/>
         <source>%1click to visit %2</source>
         <translation>%1klik om te bezoeken %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>Meer Acties</translation>
+        <location filename="../profile-widget/divetooltipitem.cpp" line="137"/>
+        <source>Information</source>
+        <translation>Informatie</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>Meer Acties</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>Informatie</translation>
+        <location filename="../mobile-widgets/qml/TripDetails.qml" line="55"/>
+        <source>Save edits</source>
+        <translation>Wijzigingen opslaan</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/TripDetails.qml" line="62"/>
+        <source>Cancel edit</source>
+        <translation>Bewerking annuleren</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>Trip locatie:</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/TripDetails.qml" line="109"/>
+        <source>Trip notes</source>
+        <translation>Trip notities</translation>
     </message>
 </context>
 <context>
@@ -9534,18 +10865,18 @@ Als je dit niet wilt, selecteer Weiger.</translation>
         <translation>Gebruikersenquête</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>Subsurface gebruikersenquête</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;We zouden graag meer te weten komen over onze gebruikers, hun voorkeuren en hun gewoontes. Neem alstublieft even de tijd om dit formulier in te vullen en het naar het Subsurface-team te verzenden.&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>Wat voor duiker bent u?</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>
@@ -9564,6 +10895,12 @@ Als je dit niet wilt, selecteer Weiger.</translation>
         <translation>Duikplanner</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>Van waar importeert u gegevens?</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>
@@ -9600,16 +10937,10 @@ Als je dit niet wilt, selecteer Weiger.</translation>
         <translation>De volgende informatie over uw systeem zal ook verstuurd worden.</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>Wat voor duiker bent u?</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>Van waar importeert u gegevens?</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>Subsurface gebruikersenquête</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/usersurvey.cpp" line="19"/>
@@ -9772,12 +11103,12 @@ Taal: %1</translation>
         <translation>Uploaden</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="331"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="80"/>
         <source>Operation timed out</source>
         <translation>Bewerking duurde te lang</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="352"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="101"/>
         <source>Transferring data...</source>
         <translation>Gegevens worden overgebracht...</translation>
     </message>
@@ -9785,17 +11116,17 @@ Taal: %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>Type</translation>
     </message>
     <message>
-        <location filename="../qt-models/weightmodel.cpp" line="15"/>
+        <location filename="../qt-models/weightmodel.cpp" line="19"/>
         <source>Weight</source>
         <translation>Gewicht</translation>
     </message>
     <message>
-        <location filename="../qt-models/weightmodel.cpp" line="71"/>
+        <location filename="../qt-models/weightmodel.cpp" line="72"/>
         <source>Clicking here will remove this weight system.</source>
         <translation>Klik hier om dit gewichtssysteem te verwijderen.</translation>
     </message>
@@ -9819,17 +11150,17 @@ Taal: %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>h</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>sec</translation>
     </message>
@@ -9837,94 +11168,94 @@ Taal: %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>Jaar
  &gt; Maand / Trip</translation>
     </message>
     <message>
-        <location filename="../qt-models/yearlystatisticsmodel.cpp" line="134"/>
+        <location filename="../qt-models/yearlystatisticsmodel.cpp" line="135"/>
         <source>#</source>
         <translation>Nr.</translation>
     </message>
     <message>
-        <location filename="../qt-models/yearlystatisticsmodel.cpp" line="137"/>
+        <location filename="../qt-models/yearlystatisticsmodel.cpp" line="138"/>
         <source>Duration 
  Total</source>
         <translation>Duur
  Totaal</translation>
     </message>
     <message>
-        <location filename="../qt-models/yearlystatisticsmodel.cpp" line="140"/>
+        <location filename="../qt-models/yearlystatisticsmodel.cpp" line="141"/>
         <source>
 Average</source>
         <translation>
 Gemiddeld</translation>
     </message>
     <message>
-        <location filename="../qt-models/yearlystatisticsmodel.cpp" line="143"/>
+        <location filename="../qt-models/yearlystatisticsmodel.cpp" line="144"/>
         <source>
 Shortest</source>
         <translation>
 Kortste</translation>
     </message>
     <message>
-        <location filename="../qt-models/yearlystatisticsmodel.cpp" line="146"/>
+        <location filename="../qt-models/yearlystatisticsmodel.cpp" line="147"/>
         <source>
 Longest</source>
         <translation>
 Langste</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>Diepte (%1)
  Gemiddeld</translation>
     </message>
     <message>
-        <location filename="../qt-models/yearlystatisticsmodel.cpp" line="152"/>
+        <location filename="../qt-models/yearlystatisticsmodel.cpp" line="153"/>
         <source>
 Average maximum</source>
         <translation>
 Gemiddelde maximum</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>
 Minimum</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>
 Maximum</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>Gasverbruik (%1)
  Gemiddeld</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>Temp. (%1)
  Gemiddeld</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>
@@ -9932,7 +11263,7 @@ Maximum</translation>
 <context>
     <name>getextFromC</name>
     <message>
-        <location filename="../core/libdivecomputer.c" line="802"/>
+        <location filename="../core/libdivecomputer.c" line="815"/>
         <source>Error parsing the header</source>
         <translation>Fout bij het verwerken van de header</translation>
     </message>
@@ -9940,6 +11271,15 @@ Maximum</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>Kan het bestand %s niet openen</translation>
+    </message>
+    <message>
         <location filename="../core/cochran.c" line="306"/>
         <location filename="../core/cochran.c" line="312"/>
         <location filename="../core/cochran.c" line="382"/>
@@ -9950,14 +11290,14 @@ Maximum</translation>
     <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/import-csv.c" line="701"/>
         <location filename="../core/libdivecomputer.c" line="247"/>
         <source>ascent</source>
         <translation>opstijging</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>batterij</translation>
     </message>
@@ -9984,7 +11324,7 @@ Maximum</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/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"/>
@@ -10072,347 +11412,268 @@ Maximum</translation>
         <translation>Droogpak</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="365"/>
+        <location filename="../core/datatrak.c" line="367"/>
         <source>no stop</source>
         <translation>geen stop</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="367"/>
+        <location filename="../core/datatrak.c" line="369"/>
         <location filename="../core/tag.c" line="20"/>
         <source>deco</source>
         <translation>decompressie</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="369"/>
+        <location filename="../core/datatrak.c" line="371"/>
         <source>single ascent</source>
         <translation>enkele opstijging</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="371"/>
+        <location filename="../core/datatrak.c" line="373"/>
         <source>multiple ascent</source>
         <translation>meerdere opstijgingen</translation>
     </message>
     <message>
-        <location filename="../core/tag.c" line="18"/>
-        <source>fresh</source>
-        <translation>zoet</translation>
-    </message>
-    <message>
-        <location filename="../core/datatrak.c" line="373"/>
+        <location filename="../core/datatrak.c" line="375"/>
         <source>fresh water</source>
         <translation>zoet water</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="375"/>
+        <location filename="../core/datatrak.c" line="377"/>
         <source>salt water</source>
         <translation>zout water</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="396"/>
+        <location filename="../core/datatrak.c" line="398"/>
         <source>sight seeing</source>
         <translation>rondkijken</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="398"/>
+        <location filename="../core/datatrak.c" line="400"/>
         <source>club dive</source>
         <translation>club duik</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="400"/>
+        <location filename="../core/datatrak.c" line="402"/>
         <location filename="../core/tag.c" line="19"/>
         <source>instructor</source>
         <translation>instructeur</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="402"/>
+        <location filename="../core/datatrak.c" line="404"/>
         <source>instruction</source>
         <translation>instructie</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="404"/>
+        <location filename="../core/datatrak.c" line="406"/>
         <location filename="../core/tag.c" line="18"/>
         <source>night</source>
         <translation>nacht</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="406"/>
+        <location filename="../core/datatrak.c" line="408"/>
         <location filename="../core/tag.c" line="16"/>
         <source>cave</source>
         <translation>grot</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="408"/>
+        <location filename="../core/datatrak.c" line="410"/>
         <location filename="../core/tag.c" line="15"/>
         <source>ice</source>
         <translation>ijs</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="410"/>
+        <location filename="../core/datatrak.c" line="412"/>
         <source>search</source>
         <translation>zoeken</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="417"/>
+        <location filename="../core/datatrak.c" line="419"/>
         <location filename="../core/tag.c" line="16"/>
         <source>wreck</source>
         <translation>wrak</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="419"/>
+        <location filename="../core/datatrak.c" line="421"/>
         <location filename="../core/tag.c" line="17"/>
         <source>river</source>
         <translation>rivier</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="421"/>
+        <location filename="../core/datatrak.c" line="423"/>
         <location filename="../core/tag.c" line="14"/>
         <source>drift</source>
         <translation>drift</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="423"/>
+        <location filename="../core/datatrak.c" line="425"/>
         <location filename="../core/tag.c" line="19"/>
         <source>photo</source>
         <translation>foto</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="425"/>
+        <location filename="../core/datatrak.c" line="427"/>
         <source>other</source>
         <translation>andere</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="435"/>
+        <location filename="../core/datatrak.c" line="437"/>
         <source>Other activities</source>
         <translation>Andere activiteiten</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="459"/>
+        <location filename="../core/datatrak.c" line="461"/>
         <source>Datatrak/Wlog notes</source>
         <translation>Datatrak/Wlog notities</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="503"/>
+        <location filename="../core/datatrak.c" line="504"/>
         <source>[Warning] Manual dive # %d
 </source>
         <translation>[Waarschuwing] Handmatige duik # %d
 </translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="529"/>
+        <location filename="../core/datatrak.c" line="530"/>
         <source>[Error] Out of memory for dive %d. Abort parsing.</source>
         <translation>[Fout] Geen geheugen over bij duik %d. Stop verwerking.</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="577"/>
+        <location filename="../core/datatrak.c" line="578"/>
         <source>[Error] File is not a DataTrak file. Aborted</source>
         <translation>[Fout] Bestand is geen DataTrak bestand. Gestopt.</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="590"/>
+        <location filename="../core/datatrak.c" line="591"/>
         <source>Error: no dive</source>
         <translation>Fout: geen duik</translation>
     </message>
     <message>
-        <location filename="../core/tag.c" line="14"/>
-        <source>boat</source>
-        <translation>boot</translation>
+        <location filename="../core/dive.c" line="30"/>
+        <source>Open circuit</source>
+        <translation>Open circuit</translation>
     </message>
     <message>
-        <location filename="../core/tag.c" line="14"/>
-        <source>shore</source>
-        <translation>kust</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>diep</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>spelonk</translation>
+        <location filename="../core/dive.c" line="33"/>
+        <source>Freedive</source>
+        <translation>Apneu</translation>
     </message>
     <message>
-        <location filename="../core/tag.c" line="16"/>
-        <source>altitude</source>
-        <translation>hoogte</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>lucht</translation>
     </message>
     <message>
-        <location filename="../core/tag.c" line="17"/>
-        <source>pool</source>
-        <translation>zwembad</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>h</translation>
     </message>
     <message>
-        <location filename="../core/tag.c" line="17"/>
-        <source>lake</source>
-        <translation>meer</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>student</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>sec</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>Kan map &apos;theme&apos; niet vinden in de standaard locaties</translation>
+    </message>
+    <message>
+        <location filename="../core/divesite-helper.cpp" line="21"/>
+        <source>No dive site layout categories set in preferences!</source>
+        <translation>Geen duikplek layout categorieën in voorkeuren!</translation>
+    </message>
+    <message>
+        <location filename="../core/divesite-helper.cpp" line="29"/>
+        <location filename="../core/save-html.c" line="530"/>
+        <source>Tags</source>
+        <translation>Trefwoorden</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="45"/>
+        <location filename="../core/equipment.c" line="66"/>
         <source>OC-gas</source>
         <translation>OC-gas</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="45"/>
+        <location filename="../core/equipment.c" line="66"/>
         <source>diluent</source>
         <translation>diluent</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="45"/>
-        <location filename="../core/equipment.c" line="144"/>
-        <location filename="../core/planner.c" line="1179"/>
-        <location filename="../core/planner.c" line="1182"/>
+        <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>zuurstof</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="45"/>
+        <location filename="../core/equipment.c" line="66"/>
         <source>not used</source>
         <translation>niet gebruikt</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="28"/>
-        <source>Open circuit</source>
-        <translation>Open circuit</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="624"/>
-        <location filename="../core/qthelper.cpp" line="816"/>
-        <location filename="../core/qthelper.cpp" line="1254"/>
-        <location filename="../core/units.c" line="19"/>
-        <source>bar</source>
-        <translation>bar</translation>
-    </message>
-    <message>
-        <location filename="../core/qthelper.cpp" line="627"/>
-        <location filename="../core/qthelper.cpp" line="818"/>
-        <location filename="../core/qthelper.cpp" line="1253"/>
-        <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="1277"/>
-        <location filename="../core/units.c" line="65"/>
-        <source>cuft</source>
-        <translation>cuft</translation>
-    </message>
-    <message>
-        <location filename="../core/qthelper.cpp" line="540"/>
-        <location filename="../core/qthelper.cpp" line="555"/>
-        <location filename="../core/qthelper.cpp" line="734"/>
-        <location filename="../core/qthelper.cpp" line="1229"/>
-        <location filename="../core/units.c" line="106"/>
-        <source>m</source>
-        <translation>m</translation>
-    </message>
-    <message>
-        <location filename="../core/qthelper.cpp" line="543"/>
-        <location filename="../core/qthelper.cpp" line="557"/>
-        <location filename="../core/qthelper.cpp" line="736"/>
-        <location filename="../core/qthelper.cpp" line="1228"/>
-        <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="566"/>
-        <location filename="../core/qthelper.cpp" line="576"/>
-        <location filename="../core/qthelper.cpp" line="791"/>
-        <location filename="../core/qthelper.cpp" line="1205"/>
-        <location filename="../core/units.c" line="162"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="133"/>
-        <source>lbs</source>
-        <translation>US pond</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="1204"/>
-        <location filename="../core/units.c" line="166"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="131"/>
-        <source>kg</source>
-        <translation>kg</translation>
-    </message>
-    <message>
-        <location filename="../core/divelist.c" line="648"/>
-        <location filename="../core/equipment.c" line="140"/>
-        <location filename="../core/planner.c" line="1175"/>
-        <location filename="../core/planner.c" line="1178"/>
-        <source>air</source>
-        <translation>lucht</translation>
-    </message>
-    <message>
-        <location filename="../core/equipment.c" line="142"/>
+        <location filename="../core/equipment.c" line="168"/>
         <source>EAN%d</source>
         <translation>EAN%d</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="252"/>
+        <location filename="../core/equipment.c" line="276"/>
         <source>integrated</source>
         <translation>Geïntegreerd</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="253"/>
+        <location filename="../core/equipment.c" line="277"/>
         <source>belt</source>
         <translation>riem</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="254"/>
+        <location filename="../core/equipment.c" line="278"/>
         <source>ankle</source>
         <translation>enkel</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="255"/>
+        <location filename="../core/equipment.c" line="279"/>
         <source>backplate</source>
         <translation>backplate</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="256"/>
+        <location filename="../core/equipment.c" line="280"/>
         <source>clip-on</source>
         <translation>clip-on</translation>
     </message>
@@ -10422,73 +11683,27 @@ Maximum</translation>
         <translation>Geen duiken in het invoer bestand &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../core/file.c" line="335"/>
-        <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="54"/>
-        <source>Failed to read &apos;%s&apos;</source>
-        <translation>Fout bij lezen van &apos;%s&apos;</translation>
-    </message>
-    <message>
         <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 bestand %s kan niet geopend worden; gebruik het Importeer logbestanden menu</translation>
     </message>
     <message>
+        <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>Fout bij lezen van &apos;%s&apos;</translation>
+    </message>
+    <message>
         <location filename="../core/file.c" line="337"/>
         <source>Empty file &apos;%s&apos;</source>
         <translation>Leeg bestand &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 import mislukt: kan &apos;%s&apos; niet lezen</translation>
-    </message>
-    <message>
-        <location filename="../core/import-csv.c" line="633"/>
-        <source>Mouth piece position OC</source>
-        <translation>Positie mondstuk OC</translation>
-    </message>
-    <message>
-        <location filename="../core/import-csv.c" line="637"/>
-        <source>Mouth piece position CC</source>
-        <translation>Positie mondstuk CC</translation>
-    </message>
-    <message>
-        <location filename="../core/import-csv.c" line="641"/>
-        <source>Mouth piece position unknown</source>
-        <translation>Positie mondstuk onbekend</translation>
-    </message>
-    <message>
-        <location filename="../core/import-csv.c" line="645"/>
-        <source>Mouth piece position not connected</source>
-        <translation>Positie mondstuk niet aangesloten</translation>
-    </message>
-    <message>
-        <location filename="../core/import-csv.c" line="652"/>
-        <source>Power off</source>
-        <translation>Uitschakelen</translation>
-    </message>
-    <message>
-        <location filename="../core/import-csv.c" line="702"/>
-        <source>O₂ calibration failed</source>
-        <translation>O₂ calibratie mislukt</translation>
-    </message>
-    <message>
-        <location filename="../core/import-csv.c" line="704"/>
-        <location filename="../core/import-csv.c" line="713"/>
-        <source>O₂ calibration</source>
-        <translation>O₂ calibratie</translation>
-    </message>
-    <message>
-        <location filename="../core/import-csv.c" line="229"/>
-        <source>No dive profile found from &apos;%s&apos;</source>
-        <translation>Geen duikprofiel voor &apos;%s&apos; gevonden</translation>
-    </message>
-    <message>
         <location filename="../core/git-access.c" line="85"/>
         <source>Checkout from storage (%lu/%lu)</source>
         <translation>Checkout uit opslag (%lu/%lu)</translation>
@@ -10610,9 +11825,60 @@ Maximum</translation>
         <translation>Gegevensbestand synchroniseren</translation>
     </message>
     <message>
-        <location filename="../core/import-divinglog.c" line="314"/>
-        <location filename="../core/libdivecomputer.c" line="231"/>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="31"/>
+        <location filename="../core/gpslocation.h" line="14"/>
+        <source>Waiting to aquire GPS location</source>
+        <translation>Wacht op GPS fix</translation>
+    </message>
+    <message>
+        <location filename="../core/import-csv.c" line="229"/>
+        <source>No dive profile found from &apos;%s&apos;</source>
+        <translation>Geen duikprofiel voor &apos;%s&apos; gevonden</translation>
+    </message>
+    <message>
+        <location filename="../core/import-csv.c" line="618"/>
+        <source>Poseidon import failed: unable to read &apos;%s&apos;</source>
+        <translation>Poseidon import mislukt: kan &apos;%s&apos; niet lezen</translation>
+    </message>
+    <message>
+        <location filename="../core/import-csv.c" line="654"/>
+        <source>Mouth piece position OC</source>
+        <translation>Positie mondstuk OC</translation>
+    </message>
+    <message>
+        <location filename="../core/import-csv.c" line="658"/>
+        <source>Mouth piece position CC</source>
+        <translation>Positie mondstuk CC</translation>
+    </message>
+    <message>
+        <location filename="../core/import-csv.c" line="662"/>
+        <source>Mouth piece position unknown</source>
+        <translation>Positie mondstuk onbekend</translation>
+    </message>
+    <message>
+        <location filename="../core/import-csv.c" line="666"/>
+        <source>Mouth piece position not connected</source>
+        <translation>Positie mondstuk niet aangesloten</translation>
+    </message>
+    <message>
+        <location filename="../core/import-csv.c" line="673"/>
+        <source>Power off</source>
+        <translation>Uitschakelen</translation>
+    </message>
+    <message>
+        <location filename="../core/import-csv.c" line="723"/>
+        <source>O₂ calibration failed</source>
+        <translation>O₂ calibratie mislukt</translation>
+    </message>
+    <message>
+        <location filename="../core/import-csv.c" line="725"/>
+        <location filename="../core/import-csv.c" line="734"/>
+        <source>O₂ calibration</source>
+        <translation>O₂ calibratie</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>onbekend</translation>
@@ -10704,119 +11970,119 @@ Maximum</translation>
         <translation>ongeldig event-nummer</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="614"/>
+        <location filename="../core/libdivecomputer.c" line="626"/>
         <source>Error parsing the datetime</source>
         <translation>Fout bij verwerken van de datum en tijd</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="632"/>
+        <location filename="../core/libdivecomputer.c" line="644"/>
         <source>Dive %d: %s</source>
         <translation>Duik nr. %d: %s</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="638"/>
+        <location filename="../core/libdivecomputer.c" line="650"/>
         <source>Error parsing the divetime</source>
         <translation>Fout bij verwerken van de duikduur</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="648"/>
+        <location filename="../core/libdivecomputer.c" line="660"/>
         <source>Error parsing the maxdepth</source>
         <translation>Fout bij het verwerken van de maximum duikdiepte</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="662"/>
+        <location filename="../core/libdivecomputer.c" line="674"/>
         <source>Error parsing temperature</source>
         <translation>Fout bij het verwerken van de temperatuur</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="681"/>
+        <location filename="../core/libdivecomputer.c" line="693"/>
         <source>Error parsing the gas mix count</source>
         <translation>Fout bij het verwerken van het aantal gasmengsels</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="692"/>
+        <location filename="../core/libdivecomputer.c" line="704"/>
         <source>Error obtaining water salinity</source>
         <translation>Fout bij het verkrijgen van het zoutgehalte</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="701"/>
+        <location filename="../core/libdivecomputer.c" line="713"/>
         <source>Error obtaining surface pressure</source>
         <translation>Fout bij bekomen van oppervlaktedruk</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="724"/>
+        <location filename="../core/libdivecomputer.c" line="736"/>
         <source>Error obtaining dive mode</source>
         <translation>Fout bij bepalen duikmodus</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="746"/>
+        <location filename="../core/libdivecomputer.c" line="758"/>
         <source>Error parsing the gas mix</source>
         <translation>Fout bij het verwerken van het gasmengsel</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="772"/>
+        <location filename="../core/libdivecomputer.c" line="786"/>
         <source>Unable to create parser for %s %s</source>
         <translation>Kan geen parser creëren voor %s %s</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="778"/>
+        <location filename="../core/libdivecomputer.c" line="792"/>
         <source>Error registering the data</source>
         <translation>Fout bij het registreren van de gegevens</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="809"/>
+        <location filename="../core/libdivecomputer.c" line="822"/>
         <source>Error parsing the samples</source>
         <translation>Fout bij het verwerken van de samples</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="816"/>
+        <location filename="../core/libdivecomputer.c" line="831"/>
         <source>Already downloaded dive at %s</source>
         <translation>Duik al gedownload op %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>Event: wachten op handeling van gebruiker</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>model=%s firmware=%u serienummer=%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>Fout bij het registreren van de event handler.</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>Fout bij het registreren van de cancellation handler.</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="1171"/>
+        <location filename="../core/libdivecomputer.c" line="1185"/>
         <source>Dive data import error</source>
         <translation>Fout bij importeren van duikgegevens</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>Kan geen context creëren voor libdivecomputer</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>Fout bij openen van  %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>Fout bij openen van device %s %s (%s).
 Vaak is het, om software fouten te vinden, nuttig om een libdivecomputer log bestand te sturen aan de ontwikkelaars. Deze log kan in het &quot;Over&quot; scherm naar het plakbord worden gekopieerd.</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>
@@ -10825,133 +12091,92 @@ Vaak is het, om software fouten te vinden, nuttig om een libdivecomputer log bes
 Dit log bestand kan worden aangemaakt door het selecteren van het juiste keuzeveld.</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>Geen nieuwe duiken uit duikcomputer geladen</translation>
     </message>
     <message>
-        <location filename="../core/load-git.c" line="186"/>
-        <location filename="../core/parse-xml.c" line="1208"/>
+        <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>meedere GPS locaties voor deze duikstek; ook %s
 </translation>
     </message>
     <message>
-        <location filename="../core/load-git.c" line="211"/>
-        <location filename="../core/parse.c" line="443"/>
+        <location filename="../core/load-git.c" line="195"/>
+        <location filename="../core/parse.c" line="441"/>
         <source>additional name for site: %s
 </source>
         <translation>extra naam voor duikstek: %s
 </translation>
     </message>
     <message>
-        <location filename="../core/load-git.c" line="1659"/>
+        <location filename="../core/load-git.c" line="1703"/>
         <source>Load dives from local cache</source>
         <translation>Duiken uit lokale cache laden</translation>
     </message>
     <message>
-        <location filename="../core/load-git.c" line="1663"/>
+        <location filename="../core/load-git.c" line="1707"/>
         <source>Successfully opened dive data</source>
         <translation>Duikgegevens openen gelukt</translation>
     </message>
     <message>
-        <location filename="../core/ostctools.c" line="129"/>
-        <location filename="../core/ostctools.c" line="160"/>
+        <location filename="../core/ostctools.c" line="121"/>
+        <location filename="../core/ostctools.c" line="152"/>
         <source>Unknown DC in dive %d</source>
         <translation>Onbekende duikcomputer in duik %d</translation>
     </message>
     <message>
-        <location filename="../core/ostctools.c" line="172"/>
+        <location filename="../core/ostctools.c" line="164"/>
         <source>Error - %s - parsing dive %d</source>
         <translation>Fout - %s - verwerking duik %d</translation>
     </message>
     <message>
-        <location filename="../core/parse-xml.c" line="401"/>
+        <location filename="../core/parse-xml.c" line="402"/>
         <source>Strange percentage reading %s
 </source>
         <translation>Vreemd percentage %s
 </translation>
     </message>
     <message>
-        <location filename="../core/parse-xml.c" line="1663"/>
+        <location filename="../core/parse-xml.c" line="1701"/>
         <source>Failed to parse &apos;%s&apos;</source>
         <translation>Fout bij analyse van &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../core/parse-xml.c" line="2256"/>
+        <location filename="../core/parse-xml.c" line="2297"/>
         <source>Can&apos;t open stylesheet %s</source>
         <translation>Kan stylesheet %s niet openen</translation>
     </message>
     <message>
-        <location filename="../core/plannernotes.c" line="113"/>
-        <source>Decompression calculation aborted due to excessive time</source>
-        <translation>Decompressieberekeningen gestopt omdat ze te lang duren</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>Waarschuwing:</translation>
-    </message>
-    <message>
-        <location filename="../core/plannernotes.c" line="416"/>
-        <source>, effective GF=%d/%d</source>
-        <translation>, effectieve GF=%d/%d</translation>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="300"/>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="194"/>
+        <location filename="../core/planner.c" line="298"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="193"/>
         <source>SP change</source>
         <translation>SP wijziging</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>Runtime: %dmin&lt;br&gt;&lt;/div&gt;</translation>
+        <location filename="../core/planner.c" line="901"/>
+        <source>Can&apos;t find gas %s</source>
+        <translation>Gas %s kan niet gevonden worden</translation>
     </message>
     <message>
-        <location filename="../core/plannernotes.c" line="160"/>
-        <source>depth</source>
-        <translation>diepte</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>duur</translation>
+        <location filename="../core/plannernotes.c" line="52"/>
+        <source>Isobaric counterdiffusion information</source>
+        <translation>Isobaric counterdiffusion informatie</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>runtime</translation>
     </message>
     <message>
-        <location filename="../core/plannernotes.c" line="166"/>
-        <source>gas</source>
-        <translation>gas</translation>
-    </message>
-    <message>
-        <location filename="../core/plannernotes.c" line="52"/>
-        <source>Isobaric counterdiffusion information</source>
-        <translation>Isobaric counterdiffusion informatie</translation>
-    </message>
-    <message>
         <location filename="../core/plannernotes.c" line="55"/>
         <source>&amp;#916;He</source>
         <translation>&amp;#916;He</translation>
@@ -10967,223 +12192,273 @@ Dit log bestand kan worden aangemaakt door het selecteren van het juiste keuzeve
         <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>%3dmin</translation>
-    </message>
-    <message>
-        <location filename="../core/plannernotes.c" line="372"/>
-        <source>Switch gas to %s (SP = %.1fbar)</source>
-        <translation>Gaswissel naar %s (SP = %.1fbar)</translation>
-    </message>
-    <message>
-        <location filename="../core/plannernotes.c" line="374"/>
-        <source>Switch gas to %s</source>
-        <translation>Gaswissel naar %s</translation>
-    </message>
-    <message>
-        <location filename="../core/plannernotes.c" line="403"/>
-        <source>CNS</source>
-        <translation>CNS</translation>
-    </message>
-    <message>
-        <location filename="../core/plannernotes.c" line="404"/>
-        <source>OTU</source>
-        <translation>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>Deco model: VPM-B op nominaal conservatisme</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>DISCLAIMER / WAARSCHUWING: DEZE IMPLEMENTATIE VAN HET %s ALGORITME EN DE DAAROP GEBASEERDE DUIKPLANNER IS SLECHTS BEPERKT GETEST. WE RADEN TEN ZEERSTE AF OM DUIKEN TE PLANNEN UITSLUITEND OP BASIS VAN DE HIER GEGEVEN RESULTATEN.</translation>
     </message>
     <message>
-        <location filename="../core/plannernotes.c" line="505"/>
-        <source>Minimum gas</source>
-        <translation>Minimum gas</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>gebaseerd op</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>Gasverbruik</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>Waarschuwing:</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 of &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>Decompressieberekeningen gestopt omdat ze te lang duren</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 of &lt;span style=&apos;color: red;&apos;&gt;&lt;b&gt;%s&lt;/b&gt;&lt;/span&gt; (%.0f%s in geplande opstijging)</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 of &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>duikplan&lt;/b&gt; (overlappende duiken vastgesteld)</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>duikplan&lt;/b&gt; gemaakt op</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>duikplan&lt;/b&gt; (oppervlakte interval </translation>
     </message>
     <message>
-        <location filename="../core/plannernotes.c" line="147"/>
+        <location filename="../core/plannernotes.c" line="159"/>
         <source>created on</source>
         <translation>gemaakt op</translation>
     </message>
     <message>
-        <location filename="../core/plannernotes.c" line="137"/>
-        <source>dive plan&lt;/b&gt; created on</source>
-        <translation>duikplan&lt;/b&gt; gemaakt op</translation>
+        <location filename="../core/plannernotes.c" line="166"/>
+        <location filename="../core/plannernotes.c" line="169"/>
+        <source>Runtime: %dmin%s</source>
+        <translation>Runtime: %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>DISCLAIMER / WAARSCHUWING: DEZE IMPLEMENTATIE VAN HET %s ALGORITME EN DE DAAROP GEBASEERDE DUIKPLANNER IS SLECHTS BEPERKT GETEST. WE RADEN TEN ZEERSTE AF OM DUIKEN TE PLANNEN UITSLUITEND OP BASIS VAN DE HIER GEGEVEN RESULTATEN.</translation>
+        <location filename="../core/plannernotes.c" line="174"/>
+        <source>depth</source>
+        <translation>diepte</translation>
     </message>
     <message>
-        <location filename="../core/plannernotes.c" line="130"/>
-        <source>dive plan&lt;/b&gt; (overlapping dives detected)</source>
-        <translation>duikplan&lt;/b&gt; (overlappende duiken vastgesteld)</translation>
+        <location filename="../core/plannernotes.c" line="176"/>
+        <source>duration</source>
+        <translation>duur</translation>
     </message>
     <message>
-        <location filename="../core/plannernotes.c" line="153"/>
-        <source>Runtime: %dmin%s</source>
-        <translation>Runtime: %dmin%s</translation>
+        <location filename="../core/plannernotes.c" line="180"/>
+        <source>gas</source>
+        <translation>gas</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 to %.*f %s in %d:%02d min - runtime %d:%02u op %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>Opstijging</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>Afdaling</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 to %.*f %s in %d:%02d min - runtime %d:%02u op %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>Blijf op %.*f %s voor %d:%02d min - runtime %d:%02u op %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>Blijf op %.*f %s voor %d:%02d min - runtime %d:%02u op %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>%3dmin</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>Gaswissel naar %s (SP = %.1fbar)</translation>
+    </message>
+    <message>
+        <location filename="../core/plannernotes.c" line="389"/>
+        <source>Switch gas to %s</source>
+        <translation>Gaswissel naar %s</translation>
+    </message>
+    <message>
+        <location filename="../core/plannernotes.c" line="418"/>
+        <source>CNS</source>
+        <translation>CNS</translation>
+    </message>
+    <message>
+        <location filename="../core/plannernotes.c" line="419"/>
+        <source>OTU</source>
+        <translation>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>Deco model: Bühlmann ZHL-16C met GFLow = %d%% en 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>Deco model: VPM-B op nominaal conservatisme</translation>
+    </message>
+    <message>
+        <location filename="../core/plannernotes.c" line="429"/>
         <source>Deco model: VPM-B at +%d conservatism</source>
         <translation>Deco model: VPM-B met +%d conservatisme</translation>
     </message>
     <message>
-        <location filename="../core/plannernotes.c" line="418"/>
+        <location filename="../core/plannernotes.c" line="431"/>
+        <source>, effective GF=%d/%d</source>
+        <translation>, effectieve 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>Deco model: Recreatieve mode gebaseerd op Bühlmann ZHL-16B met GFLow = %d%% en 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>Atmosferische druk: %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>Gasverbruik (uitgezonderd CCR segmenten):</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>Gasverbruik (gebaseerd op SAC</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>dit is meer gas dan beschikbaar in de geselecteerde duikfles!</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>niet genoeg reserve om gas te delen gedurende opstijging!</translation>
     </message>
     <message>
+        <location filename="../core/plannernotes.c" line="518"/>
+        <source>Minimum gas</source>
+        <translation>Minimum gas</translation>
+    </message>
+    <message>
         <location filename="../core/plannernotes.c" line="519"/>
+        <source>based on</source>
+        <translation>gebaseerd op</translation>
+    </message>
+    <message>
+        <location filename="../core/plannernotes.c" line="521"/>
+        <source>SAC</source>
+        <translation>Gasverbruik</translation>
+    </message>
+    <message>
+        <location filename="../core/plannernotes.c" line="532"/>
         <source>required minimum gas for ascent already exceeding start pressure of cylinder!</source>
         <translation>vereist minimum gas voor de opstijging is al meer dan de begindruk van de duikfles!</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 in geplande opstijging)</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 of &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 of &lt;span style=&apos;color: red;&apos;&gt;&lt;b&gt;%s&lt;/b&gt;&lt;/span&gt; (%.0f%s in geplande opstijging)</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 of &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>Isobaric counterdiffusion voorwaarden overschreden</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>hoge pO₂ waarde %.2f op %d:%02u met gas %s op diepte %.*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>lage pO₂ waarde %.2f op %d:%02u met gas %s op diepte %.*f %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="900"/>
-        <source>Can&apos;t find gas %s</source>
-        <translation>Gas %s kan niet gevonden worden</translation>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="1183"/>
-        <source>ean</source>
-        <translation>EAN</translation>
-    </message>
-    <message>
-        <location filename="../core/profile.c" line="1406"/>
+        <location filename="../core/profile.c" line="1446"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
@@ -11192,91 +12467,77 @@ D: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1417"/>
+        <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>T: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1423"/>
+        <location filename="../core/profile.c" line="1463"/>
         <source>V: %.1f%s
 </source>
         <translation>V: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1426"/>
+        <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="1428"/>
+        <location filename="../core/profile.c" line="1468"/>
         <source>CNS: %u%%
 </source>
         <translation>CNS: %u%%
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1437"/>
-        <source>pHe: %.2fbar
-</source>
-        <translation>pHe: %.2fbar
-</translation>
-    </message>
-    <message>
-        <location filename="../core/profile.c" line="1440"/>
-        <source>MOD: %d%s
-</source>
-        <translation>MOD: %d%s
-</translation>
-    </message>
-    <message>
-        <location filename="../core/profile.c" line="1480"/>
-        <source>Deco: %umin @ %.0f%s
+        <location filename="../core/profile.c" line="1470"/>
+        <source>pO₂: %.2fbar
 </source>
-        <translation>Deco: %umin @ %.0f%s
+        <translation>pO₂: %.2fbar
 </translation>
     </message>
     <message>
         <location filename="../core/profile.c" line="1472"/>
-        <source>Safety stop: %umin @ %.0f%s
-</source>
-        <translation>Veiligheidsstop: %umin @ %.0f%s
-</translation>
-    </message>
-    <message>
-        <location filename="../core/profile.c" line="1413"/>
-        <source>P: %d%s (%s)
+        <source>SCR ΔpO₂: %.2fbar
 </source>
-        <translation>P: %d%s (%s)
+        <translation>SCR ΔpO₂: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1430"/>
-        <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="1432"/>
-        <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="1435"/>
-        <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="1449"/>
+        <location filename="../core/profile.c" line="1489"/>
         <source>EAD: %d%s
 EADD: %d%s / %.1fg/ℓ
 </source>
@@ -11285,7 +12546,7 @@ EADD: %d%s / %.1fg/ℓ
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1455"/>
+        <location filename="../core/profile.c" line="1495"/>
         <source>END: %d%s
 EADD: %d%s / %.1fg/ℓ
 </source>
@@ -11294,194 +12555,215 @@ EADD: %d%s / %.1fg/ℓ
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1460"/>
+        <location filename="../core/profile.c" line="1500"/>
         <source>Density: %.1fg/ℓ
 </source>
         <translation>Dichtheid: %.1fg/ℓ
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1475"/>
+        <location filename="../core/profile.c" line="1512"/>
+        <source>Safety stop: %umin @ %.0f%s
+</source>
+        <translation>Veiligheidsstop: %umin @ %.0f%s
+</translation>
+    </message>
+    <message>
+        <location filename="../core/profile.c" line="1515"/>
         <source>Safety stop: unknown time @ %.0f%s
 </source>
         <translation>Veiligheidsstop: onbekende tijd @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1483"/>
+        <location filename="../core/profile.c" line="1520"/>
+        <source>Deco: %umin @ %.0f%s
+</source>
+        <translation>Deco: %umin @ %.0f%s
+</translation>
+    </message>
+    <message>
+        <location filename="../core/profile.c" line="1523"/>
         <source>Deco: unknown time @ %.0f%s
 </source>
         <translation>Deco: onbekende tijd @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1487"/>
+        <location filename="../core/profile.c" line="1527"/>
         <source>In deco
 </source>
         <translation>In deco
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1489"/>
+        <location filename="../core/profile.c" line="1529"/>
         <source>NDL: %umin
 </source>
         <translation>NDL: %umin
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1492"/>
+        <location filename="../core/profile.c" line="1532"/>
         <source>TTS: %umin
 </source>
         <translation>TTS: %umin
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1495"/>
+        <location filename="../core/profile.c" line="1535"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation>Deco: %umin @ %.0f%s (berekend)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1503"/>
+        <location filename="../core/profile.c" line="1543"/>
         <source>In deco (calc)
 </source>
         <translation>In deco (berekend)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1506"/>
+        <location filename="../core/profile.c" line="1546"/>
         <source>NDL: %umin (calc)
 </source>
         <translation>NDL: %umin (berekend)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1508"/>
+        <location filename="../core/profile.c" line="1548"/>
         <source>NDL: &gt;2h (calc)
 </source>
         <translation>NDL: &gt;2h (berekend)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1512"/>
+        <location filename="../core/profile.c" line="1552"/>
         <source>TTS: %umin (calc)
 </source>
         <translation>TTS: %umin (berekend)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1514"/>
+        <location filename="../core/profile.c" line="1554"/>
         <source>TTS: &gt;2h (calc)
 </source>
         <translation>TTS: &gt;2h (berekend)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1517"/>
+        <location filename="../core/profile.c" line="1557"/>
         <source>RBT: %umin
 </source>
         <translation>RBT: %umin
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1520"/>
+        <location filename="../core/profile.c" line="1560"/>
+        <source>GF %d%%
+</source>
+        <translation>GF %d%%
+</translation>
+    </message>
+    <message>
+        <location filename="../core/profile.c" line="1562"/>
         <source>Surface GF %.0f%%
 </source>
         <translation>Oppervlakte GF %.0f%%
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1523"/>
+        <location filename="../core/profile.c" line="1565"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation>Berekend plafond %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1529"/>
+        <location filename="../core/profile.c" line="1571"/>
         <source>Tissue %.0fmin: %.1f%s
 </source>
         <translation>Compartiment %.0fmin: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1536"/>
+        <location filename="../core/profile.c" line="1578"/>
         <source>ICD in leading tissue
 </source>
         <translation>ICD in leidende weefsel
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1538"/>
+        <location filename="../core/profile.c" line="1580"/>
         <source>heart rate: %d
 </source>
         <translation>hartslag: %d
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1540"/>
+        <location filename="../core/profile.c" line="1582"/>
         <source>bearing: %d
 </source>
         <translation>koers: %d
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1543"/>
+        <location filename="../core/profile.c" line="1585"/>
         <source>mean depth to here %.1f%s
 </source>
         <translation>gemiddelde diepte tot nu toe %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1640"/>
+        <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="1644"/>
+        <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="1648"/>
+        <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="1652"/>
+        <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="1656"/>
+        <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="1660"/>
+        <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="1664"/>
+        <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="1668"/>
+        <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="1675"/>
+        <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="1700"/>
+        <location filename="../core/profile.c" line="1741"/>
         <source>%s SAC:%.*f%s/min</source>
         <translation>%s SAC:%.*f%s/min</translation>
     </message>
@@ -11507,353 +12789,443 @@ EADD: %d%s / %.1fg/ℓ
     </message>
     <message>
         <location filename="../core/qthelper.cpp" line="96"/>
-        <location filename="../core/qthelper.cpp" line="236"/>
+        <location filename="../core/qthelper.cpp" line="235"/>
         <source>N</source>
         <translation>N</translation>
     </message>
     <message>
         <location filename="../core/qthelper.cpp" line="96"/>
-        <location filename="../core/qthelper.cpp" line="237"/>
+        <location filename="../core/qthelper.cpp" line="236"/>
         <source>S</source>
         <translation>Z</translation>
     </message>
     <message>
         <location filename="../core/qthelper.cpp" line="97"/>
-        <location filename="../core/qthelper.cpp" line="238"/>
+        <location filename="../core/qthelper.cpp" line="237"/>
         <source>E</source>
         <translation>O</translation>
     </message>
     <message>
         <location filename="../core/qthelper.cpp" line="97"/>
-        <location filename="../core/qthelper.cpp" line="239"/>
+        <location filename="../core/qthelper.cpp" line="238"/>
         <source>W</source>
         <translation>W</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="585"/>
-        <location filename="../core/qthelper.cpp" line="762"/>
+        <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>US pond</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="588"/>
-        <location filename="../core/qthelper.cpp" line="764"/>
+        <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="839"/>
-        <location filename="../core/qthelper.cpp" line="1181"/>
+        <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>AIR</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="841"/>
+        <location filename="../core/qthelper.cpp" line="847"/>
         <source>EAN</source>
         <translation>EAN</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="916"/>
+        <location filename="../core/qthelper.cpp" line="922"/>
         <source>more than %1 days</source>
         <translation>meer dan %1 dagen</translation>
     </message>
+    <message>
+        <location filename="../core/qthelper.cpp" line="960"/>
+        <location filename="../core/qthelper.cpp" line="965"/>
+        <source>no dives</source>
+        <translation>geen duiken</translation>
+    </message>
     <message numerus="yes">
-        <location filename="../core/qthelper.cpp" line="962"/>
+        <location filename="../core/qthelper.cpp" line="985"/>
         <source>(%n dive(s))</source>
         <translation><numerusform>(%n duik)</numerusform><numerusform>(%n duiken)</numerusform></translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="1181"/>
+        <location filename="../core/qthelper.cpp" line="1204"/>
         <source>OXYGEN</source>
         <translation>ZUURSTOF</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="1276"/>
+        <location filename="../core/qthelper.cpp" line="1307"/>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="482"/>
-        <location filename="../core/save-html.c" line="566"/>
-        <location filename="../core/worldmap-save.c" line="116"/>
-        <source>Can&apos;t open file %s</source>
-        <translation>Kan het bestand %s niet openen</translation>
+        <location filename="../core/qthelper.cpp" line="1308"/>
+        <location filename="../core/units.c" line="65"/>
+        <source>cuft</source>
+        <translation>cuft</translation>
+    </message>
+    <message>
+        <location filename="../core/save-git.c" line="922"/>
+        <source>Start saving data</source>
+        <translation>Opslaan data gestart</translation>
+    </message>
+    <message>
+        <location filename="../core/save-git.c" line="931"/>
+        <source>Start saving dives</source>
+        <translation>Opslaan duiken gestart</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="501"/>
+        <location filename="../core/save-git.c" line="964"/>
+        <source>Done creating local cache</source>
+        <translation>Lokale cache aangemaakt</translation>
+    </message>
+    <message>
+        <location filename="../core/save-git.c" line="1221"/>
+        <source>Preparing to save data</source>
+        <translation>Voorbereiden data opslag</translation>
+    </message>
+    <message>
+        <location filename="../core/save-html.c" line="505"/>
         <source>Number</source>
         <translation>Nummer</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="502"/>
+        <location filename="../core/save-html.c" line="506"/>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="503"/>
+        <location filename="../core/save-html.c" line="507"/>
         <source>Time</source>
         <translation>Tijd</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="504"/>
+        <location filename="../core/save-html.c" line="508"/>
         <source>Location</source>
         <translation>Locatie</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="505"/>
+        <location filename="../core/save-html.c" line="509"/>
         <source>Air temp.</source>
         <translation>Lucht temp.</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="506"/>
+        <location filename="../core/save-html.c" line="510"/>
         <source>Water temp.</source>
         <translation>Water temp.</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="507"/>
+        <location filename="../core/save-html.c" line="511"/>
         <source>Dives</source>
         <translation>Duiken</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="508"/>
+        <location filename="../core/save-html.c" line="512"/>
         <source>Expand all</source>
         <translation>Alles uitklappen</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="509"/>
+        <location filename="../core/save-html.c" line="513"/>
         <source>Collapse all</source>
         <translation>Alles inklappen</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="510"/>
+        <location filename="../core/save-html.c" line="514"/>
         <source>Trips</source>
         <translation>Trips</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="511"/>
+        <location filename="../core/save-html.c" line="515"/>
         <source>Statistics</source>
         <translation>Statistieken</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="512"/>
+        <location filename="../core/save-html.c" line="516"/>
         <source>Advanced search</source>
         <translation>Geavanceerd zoeken</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="515"/>
+        <location filename="../core/save-html.c" line="520"/>
         <source>Rating</source>
         <translation>Waardering</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="516"/>
+        <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>Zicht</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="517"/>
+        <location filename="../core/save-html.c" line="523"/>
+        <source>Current</source>
+        <translation>Stroming</translation>
+    </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>Koude</translation>
+    </message>
+    <message>
+        <location filename="../core/save-html.c" line="526"/>
         <source>Duration</source>
         <translation>Duur</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="518"/>
+        <location filename="../core/save-html.c" line="527"/>
         <source>Divemaster</source>
         <translation>Duikleider</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="519"/>
+        <location filename="../core/save-html.c" line="528"/>
         <source>Buddy</source>
         <translation>Buddy</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="520"/>
+        <location filename="../core/save-html.c" line="529"/>
         <source>Suit</source>
         <translation>Pak</translation>
     </message>
     <message>
-        <location filename="../core/divesite-helper.cpp" line="21"/>
-        <source>No dive site layout categories set in preferences!</source>
-        <translation>Geen duikplek layout categorieën in voorkeuren!</translation>
-    </message>
-    <message>
-        <location filename="../core/divesite-helper.cpp" line="29"/>
-        <location filename="../core/save-html.c" line="521"/>
-        <source>Tags</source>
-        <translation>Trefwoorden</translation>
-    </message>
-    <message>
-        <location filename="../core/save-html.c" line="522"/>
+        <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>Notities</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="523"/>
+        <location filename="../core/save-html.c" line="532"/>
         <source>Show more details</source>
         <translation>Toon meer details</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="526"/>
+        <location filename="../core/save-html.c" line="535"/>
         <source>Yearly statistics</source>
         <translation>Jaarlijkse statistieken</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="527"/>
+        <location filename="../core/save-html.c" line="536"/>
         <source>Year</source>
         <translation>Jaar</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="528"/>
+        <location filename="../core/save-html.c" line="537"/>
         <source>Total time</source>
         <translation>Totale tijd</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="529"/>
+        <location filename="../core/save-html.c" line="538"/>
         <source>Average time</source>
         <translation>Gemiddelde tijd</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="530"/>
+        <location filename="../core/save-html.c" line="539"/>
         <source>Shortest time</source>
         <translation>Kortste tijd</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="531"/>
+        <location filename="../core/save-html.c" line="540"/>
         <source>Longest time</source>
         <translation>Langste tijd</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="532"/>
+        <location filename="../core/save-html.c" line="541"/>
         <source>Average depth</source>
         <translation>Gemiddelde diepte</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="533"/>
+        <location filename="../core/save-html.c" line="542"/>
         <source>Min. depth</source>
         <translation>Min. diepte</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="534"/>
+        <location filename="../core/save-html.c" line="543"/>
         <source>Max. depth</source>
         <translation>Max. diepte</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="535"/>
+        <location filename="../core/save-html.c" line="544"/>
         <source>Average SAC</source>
         <translation>Gemiddeld gasverbruik</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="536"/>
+        <location filename="../core/save-html.c" line="545"/>
         <source>Min. SAC</source>
         <translation>Min. SAC</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="537"/>
+        <location filename="../core/save-html.c" line="546"/>
         <source>Max. SAC</source>
         <translation>Max. SAC</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="538"/>
+        <location filename="../core/save-html.c" line="547"/>
         <source>Average temp.</source>
         <translation>Gemiddelde temp.</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="539"/>
+        <location filename="../core/save-html.c" line="548"/>
         <source>Min. temp.</source>
         <translation>Min. temp.</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="540"/>
+        <location filename="../core/save-html.c" line="549"/>
         <source>Max. temp.</source>
         <translation>Max. temp.</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="541"/>
+        <location filename="../core/save-html.c" line="550"/>
         <source>Back to list</source>
         <translation>Terugkeren naar de lijst</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="544"/>
+        <location filename="../core/save-html.c" line="553"/>
         <source>Dive #</source>
         <translation>Duik #</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="545"/>
+        <location filename="../core/save-html.c" line="554"/>
         <source>Dive profile</source>
         <translation>Duikprofiel</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="546"/>
+        <location filename="../core/save-html.c" line="555"/>
         <source>Dive information</source>
         <translation>Duikinformatie</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="547"/>
+        <location filename="../core/save-html.c" line="556"/>
         <source>Dive equipment</source>
         <translation>Duikuitrusting</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="548"/>
-        <location filename="../core/save-html.c" line="555"/>
+        <location filename="../core/save-html.c" line="557"/>
+        <location filename="../core/save-html.c" line="564"/>
         <source>Type</source>
         <translation>Type</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="549"/>
+        <location filename="../core/save-html.c" line="558"/>
         <source>Size</source>
         <translation>Grootte</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="550"/>
+        <location filename="../core/save-html.c" line="559"/>
         <source>Work pressure</source>
         <translation>Werkdruk</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="551"/>
+        <location filename="../core/save-html.c" line="560"/>
         <source>Start pressure</source>
         <translation>Startdruk</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="552"/>
+        <location filename="../core/save-html.c" line="561"/>
         <source>End pressure</source>
         <translation>Einddruk</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="553"/>
+        <location filename="../core/save-html.c" line="562"/>
         <source>Gas</source>
         <translation>Gas</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="554"/>
+        <location filename="../core/save-html.c" line="563"/>
         <source>Weight</source>
         <translation>Gewicht</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="556"/>
+        <location filename="../core/save-html.c" line="565"/>
         <source>Events</source>
         <translation>Gebeurtenissen</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="557"/>
+        <location filename="../core/save-html.c" line="566"/>
         <source>Name</source>
         <translation>Naam</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="558"/>
+        <location filename="../core/save-html.c" line="567"/>
         <source>Value</source>
         <translation>Waarde</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="559"/>
+        <location filename="../core/save-html.c" line="568"/>
         <source>Coordinates</source>
         <translation>Coördinaten</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="560"/>
+        <location filename="../core/save-html.c" line="569"/>
         <source>Dive status</source>
         <translation>Duikstatus</translation>
     </message>
     <message>
+        <location filename="../core/save-xml.c" line="758"/>
+        <source>Failed to save dives to %s (%s)</source>
+        <translation>Fout bij opslaan duiken naar %s (%s)</translation>
+    </message>
+    <message>
+        <location filename="../core/save-xml.c" line="874"/>
+        <source>Failed to save divesites to %s (%s)</source>
+        <translation>Fout bij opslaan duikstekken naar %s (%s)</translation>
+    </message>
+    <message>
         <location filename="../core/statistics.c" line="146"/>
         <source>All (by type stats)</source>
         <translation>Alle (op type statistiek)</translation>
@@ -11869,86 +13241,156 @@ EADD: %d%s / %.1fg/ℓ
         <translation>Alle (op min. temp statistiek)</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="29"/>
-        <source>CCR</source>
-        <translation>CCR</translation>
-    </message>
-    <message>
-        <location filename="../core/dive.c" line="30"/>
-        <source>pSCR</source>
-        <translation>pSCR</translation>
-    </message>
-    <message>
-        <location filename="../core/dive.c" line="31"/>
-        <source>Freedive</source>
-        <translation>Apneu</translation>
-    </message>
-    <message>
         <location filename="../core/statistics.c" line="226"/>
         <source>All (by trip stats)</source>
         <translation>Alle (op trip statistiek)</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="118"/>
+        <location filename="../core/subsurfacestartup.c" line="121"/>
         <source>Jan</source>
         <translation>jan</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="118"/>
+        <location filename="../core/subsurfacestartup.c" line="121"/>
         <source>Feb</source>
         <translation>feb</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="118"/>
+        <location filename="../core/subsurfacestartup.c" line="121"/>
         <source>Mar</source>
         <translation>mar</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="118"/>
+        <location filename="../core/subsurfacestartup.c" line="121"/>
         <source>Apr</source>
         <translation>apr</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="118"/>
+        <location filename="../core/subsurfacestartup.c" line="121"/>
         <source>May</source>
         <translation>mei</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="118"/>
+        <location filename="../core/subsurfacestartup.c" line="121"/>
         <source>Jun</source>
         <translation>jun</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="119"/>
+        <location filename="../core/subsurfacestartup.c" line="122"/>
         <source>Jul</source>
         <translation>jul</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="119"/>
+        <location filename="../core/subsurfacestartup.c" line="122"/>
         <source>Aug</source>
         <translation>aug</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="119"/>
+        <location filename="../core/subsurfacestartup.c" line="122"/>
         <source>Sep</source>
         <translation>sept</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="119"/>
+        <location filename="../core/subsurfacestartup.c" line="122"/>
         <source>Oct</source>
         <translation>okt</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="119"/>
+        <location filename="../core/subsurfacestartup.c" line="122"/>
         <source>Nov</source>
         <translation>nov</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="119"/>
+        <location filename="../core/subsurfacestartup.c" line="122"/>
         <source>Dec</source>
         <translation>dec</translation>
     </message>
     <message>
+        <location filename="../core/tag.c" line="14"/>
+        <source>boat</source>
+        <translation>boot</translation>
+    </message>
+    <message>
+        <location filename="../core/tag.c" line="14"/>
+        <source>shore</source>
+        <translation>kust</translation>
+    </message>
+    <message>
+        <location filename="../core/tag.c" line="15"/>
+        <source>deep</source>
+        <translation>diep</translation>
+    </message>
+    <message>
+        <location filename="../core/tag.c" line="15"/>
+        <source>cavern</source>
+        <translation>spelonk</translation>
+    </message>
+    <message>
+        <location filename="../core/tag.c" line="16"/>
+        <source>altitude</source>
+        <translation>hoogte</translation>
+    </message>
+    <message>
+        <location filename="../core/tag.c" line="17"/>
+        <source>pool</source>
+        <translation>zwembad</translation>
+    </message>
+    <message>
+        <location filename="../core/tag.c" line="17"/>
+        <source>lake</source>
+        <translation>meer</translation>
+    </message>
+    <message>
+        <location filename="../core/tag.c" line="18"/>
+        <source>fresh</source>
+        <translation>zoet</translation>
+    </message>
+    <message>
+        <location filename="../core/tag.c" line="18"/>
+        <source>student</source>
+        <translation>student</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>Geen</translation>
+    </message>
+    <message>
+        <location filename="../core/taxonomy.c" line="10"/>
+        <source>Ocean</source>
+        <translation>Oceaan</translation>
+    </message>
+    <message>
+        <location filename="../core/taxonomy.c" line="11"/>
+        <source>Country</source>
+        <translation>Land</translation>
+    </message>
+    <message>
+        <location filename="../core/taxonomy.c" line="12"/>
+        <source>State</source>
+        <translation>Provincie</translation>
+    </message>
+    <message>
+        <location filename="../core/taxonomy.c" line="13"/>
+        <source>County</source>
+        <translation>Gemeente</translation>
+    </message>
+    <message>
+        <location filename="../core/taxonomy.c" line="14"/>
+        <source>Town</source>
+        <translation>Stad</translation>
+    </message>
+    <message>
+        <location filename="../core/taxonomy.c" line="15"/>
+        <source>City</source>
+        <translation>Stad</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
@@ -12004,67 +13446,67 @@ Is de Uemis Zurich correct aangesloten?</translation>
         <translation>details voor #</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="797"/>
+        <location filename="../core/uemis-downloader.c" line="798"/>
         <source>wetsuit</source>
         <translation>natpak</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="797"/>
+        <location filename="../core/uemis-downloader.c" line="798"/>
         <source>semidry</source>
         <translation>semidroog</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="797"/>
+        <location filename="../core/uemis-downloader.c" line="798"/>
         <source>drysuit</source>
         <translation>droogpak</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="798"/>
+        <location filename="../core/uemis-downloader.c" line="799"/>
         <source>shorty</source>
         <translation>shorty</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="798"/>
+        <location filename="../core/uemis-downloader.c" line="799"/>
         <source>vest</source>
         <translation>vest</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="798"/>
+        <location filename="../core/uemis-downloader.c" line="799"/>
         <source>long john</source>
         <translation>long john</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="798"/>
+        <location filename="../core/uemis-downloader.c" line="799"/>
         <source>jacket</source>
         <translation>jack</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="798"/>
+        <location filename="../core/uemis-downloader.c" line="799"/>
         <source>full suit</source>
         <translation>tweedelig pak</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="798"/>
+        <location filename="../core/uemis-downloader.c" line="799"/>
         <source>2 pcs full suit</source>
         <translation>2-delig pak</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="799"/>
+        <location filename="../core/uemis-downloader.c" line="800"/>
         <source>membrane</source>
         <translation>membraan droogpak</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="1338"/>
+        <location filename="../core/uemis-downloader.c" line="1339"/>
         <source>Initialise communication</source>
         <translation>Start communicatie</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="1341"/>
+        <location filename="../core/uemis-downloader.c" line="1342"/>
         <source>Uemis init failed</source>
         <translation>Uemis niet geïnitialiseerd</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="1353"/>
+        <location filename="../core/uemis-downloader.c" line="1354"/>
         <source>Start download</source>
         <translation>Begin download</translation>
     </message>
@@ -12159,6 +13601,36 @@ Is de Uemis Zurich correct aangesloten?</translation>
         <translation>Alarm: lege batterij</translation>
     </message>
     <message>
+        <location filename="../core/units.c" line="14"/>
+        <source>pascal</source>
+        <translation>Pa</translation>
+    </message>
+    <message>
+        <location filename="../core/units.c" line="60"/>
+        <source>ℓ</source>
+        <translation>ℓ</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/worldmap-save.c" line="44"/>
         <source>Date:</source>
         <translation>Datum:</translation>
@@ -12174,40 +13646,6 @@ Is de Uemis Zurich correct aangesloten?</translation>
         <translation>Duur:</translation>
     </message>
     <message>
-        <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="510"/>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="128"/>
-        <location filename="../core/worldmap-save.c" line="49"/>
-        <location filename="../desktop-widgets/templatelayout.h" line="102"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="105"/>
-        <source>min</source>
-        <translation>min</translation>
-    </message>
-    <message>
-        <location filename="../core/divelogexportlogic.cpp" line="57"/>
-        <location filename="../core/divelogexportlogic.cpp" line="95"/>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="128"/>
-        <location filename="../desktop-widgets/templatelayout.h" line="101"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="105"/>
-        <source>h</source>
-        <translation>h</translation>
-    </message>
-    <message>
-        <location filename="../core/divelogexportlogic.cpp" line="57"/>
-        <location filename="../core/divelogexportlogic.cpp" line="95"/>
-        <location filename="../core/qthelper.h" line="72"/>
-        <location filename="../desktop-widgets/templatelayout.h" line="102"/>
-        <source>sec</source>
-        <translation>sec</translation>
-    </message>
-    <message>
-        <location filename="../core/divelogexportlogic.cpp" line="153"/>
-        <source>Cannot find a folder called &apos;theme&apos; in the standard locations</source>
-        <translation>Kan map &apos;theme&apos; niet vinden in de standaard locaties</translation>
-    </message>
-    <message>
         <location filename="../core/worldmap-save.c" line="52"/>
         <source>Max. depth:</source>
         <translation>Max. diepte:</translation>
@@ -12233,6 +13671,66 @@ Is de Uemis Zurich correct aangesloten?</translation>
         <translation>Notities:</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="64"/>
+        <source>Remove this point</source>
+        <translation>Dit punt verwijderen</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="558"/>
+        <source>Don&apos;t save an empty log to the cloud</source>
+        <translation>Bewaar geen lege duiklog in de cloud</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="47"/>
+        <source>Average</source>
+        <translation>Gemiddelde</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="50"/>
+        <source>Minimum</source>
+        <translation>Kleinste</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="53"/>
+        <source>Maximum</source>
+        <translation>Grootste</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="155"/>
+        <source>Invalid response from server</source>
+        <translation>Ongeldig antwoord van de server</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="163"/>
+        <source>Expected XML tag &apos;DiveDateReader&apos;, got instead &apos;%1</source>
+        <translation>XML element &apos;DiveDateReader&apos; werd verwacht, maar kreeg &apos;%1</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="209"/>
+        <source>Expected XML tag &apos;DiveDates&apos; not found</source>
+        <translation>Verwacht XML element &apos;DiveDates&apos; werd niet gevonden</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="216"/>
+        <source>Malformed XML response. Line %1: %2</source>
+        <translation>Onjuist gevormd XML antwoord. Regel %1: %2</translation>
+    </message>
+    <message>
+        <location filename="../profile-widget/diveprofileitem.cpp" line="191"/>
+        <source>planned waypoint above ceiling</source>
+        <translation>gepland routepunt boven plafond</translation>
+    </message>
+    <message>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1655"/>
+        <source>modechange</source>
+        <translation>Duikmodus wijziging</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>Gebouwd</translation>
@@ -12307,250 +13805,172 @@ Is de Uemis Zurich correct aangesloten?</translation>
         <source>Depth</source>
         <translation>Diepte</translation>
     </message>
+</context>
+<context>
+    <name>main</name>
     <message>
-        <location filename="../profile-widget/diveprofileitem.cpp" line="190"/>
-        <source>planned waypoint above ceiling</source>
-        <translation>gepland routepunt boven plafond</translation>
-    </message>
-    <message>
-        <location filename="../core/taxonomy.c" line="9"/>
-        <source>None</source>
-        <translation>Geen</translation>
-    </message>
-    <message>
-        <location filename="../core/taxonomy.c" line="10"/>
-        <source>Ocean</source>
-        <translation>Oceaan</translation>
-    </message>
-    <message>
-        <location filename="../core/taxonomy.c" line="11"/>
-        <source>Country</source>
-        <translation>Land</translation>
-    </message>
-    <message>
-        <location filename="../core/taxonomy.c" line="12"/>
-        <source>State</source>
-        <translation>Provincie</translation>
-    </message>
-    <message>
-        <location filename="../core/taxonomy.c" line="13"/>
-        <source>County</source>
-        <translation>Gemeente</translation>
-    </message>
-    <message>
-        <location filename="../core/taxonomy.c" line="14"/>
-        <source>Town</source>
-        <translation>Stad</translation>
-    </message>
-    <message>
-        <location filename="../core/taxonomy.c" line="15"/>
-        <source>City</source>
-        <translation>Stad</translation>
-    </message>
-    <message>
-        <location filename="../core/save-git.c" line="916"/>
-        <source>Start saving data</source>
-        <translation>Opslaan data gestart</translation>
-    </message>
-    <message>
-        <location filename="../core/save-git.c" line="925"/>
-        <source>Start saving dives</source>
-        <translation>Opslaan duiken gestart</translation>
-    </message>
-    <message>
-        <location filename="../core/save-git.c" line="958"/>
-        <source>Done creating local cache</source>
-        <translation>Lokale cache aangemaakt</translation>
-    </message>
-    <message>
-        <location filename="../core/save-git.c" line="1209"/>
-        <source>Preparing to save data</source>
-        <translation>Voorbereiden data opslag</translation>
-    </message>
-    <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1658"/>
-        <source>modechange</source>
-        <translation>Duikmodus wijziging</translation>
-    </message>
-    <message>
-        <location filename="../core/gpslocation.h" line="14"/>
-        <source>Waiting to aquire GPS location</source>
-        <translation>Wacht op GPS fix</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="66"/>
-        <source>Remove this point</source>
-        <translation>Dit punt verwijderen</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="559"/>
-        <source>Don&apos;t save an empty log to the cloud</source>
-        <translation>Bewaar geen lege duiklog in de cloud</translation>
+        <location filename="../mobile-widgets/qml/main.qml" line="16"/>
+        <source>Subsurface-mobile</source>
+        <translation>Subsurface-mobile</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="47"/>
-        <source>Average</source>
-        <translation>Gemiddelde</translation>
+        <location filename="../mobile-widgets/qml/main.qml" line="232"/>
+        <source>Dive list</source>
+        <translation>Duiklijst</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="50"/>
-        <source>Minimum</source>
-        <translation>Kleinste</translation>
+        <location filename="../mobile-widgets/qml/main.qml" line="243"/>
+        <source>Dive management</source>
+        <translation>Beheer duiken</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="53"/>
-        <source>Maximum</source>
-        <translation>Grootste</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>Terug</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="406"/>
-        <source>Invalid response from server</source>
-        <translation>Ongeldig antwoord van de server</translation>
+        <location filename="../mobile-widgets/qml/main.qml" line="255"/>
+        <source>Add dive manually</source>
+        <translation>Handmatig duik toevoegen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="414"/>
-        <source>Expected XML tag &apos;DiveDateReader&apos;, got instead &apos;%1</source>
-        <translation>XML element &apos;DiveDateReader&apos; werd verwacht, maar kreeg &apos;%1</translation>
+        <location filename="../mobile-widgets/qml/main.qml" line="267"/>
+        <source>Download from DC</source>
+        <translation>Download uit DC</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="460"/>
-        <source>Expected XML tag &apos;DiveDates&apos; not found</source>
-        <translation>Verwacht XML element &apos;DiveDates&apos; werd niet gevonden</translation>
+        <location filename="../mobile-widgets/qml/main.qml" line="279"/>
+        <source>Apply GPS fixes</source>
+        <translation>GPS fixes toepassen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="467"/>
-        <source>Malformed XML response. Line %1: %2</source>
-        <translation>Onjuist gevormd XML antwoord. Regel %1: %2</translation>
+        <location filename="../mobile-widgets/qml/main.qml" line="299"/>
+        <source>Manual sync with cloud</source>
+        <translation>Handmatig synchroniseren met cloud</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="122"/>
-        <source>/min</source>
-        <translation>/min</translation>
+        <location filename="../mobile-widgets/qml/main.qml" line="312"/>
+        <source>Disable auto cloud sync</source>
+        <translation>Automatische cloud synchronisatie uitzetten </translation>
     </message>
     <message>
-        <location filename="../core/save-xml.c" line="749"/>
-        <source>Failed to save dives to %s (%s)</source>
-        <translation>Fout bij opslaan duiken naar %s (%s)</translation>
+        <location filename="../mobile-widgets/qml/main.qml" line="312"/>
+        <source>Enable auto cloud sync</source>
+        <translation>Automatische cloud synchronisatie aanzetten </translation>
     </message>
     <message>
-        <location filename="../core/save-xml.c" line="871"/>
-        <source>Failed to save divesites to %s (%s)</source>
-        <translation>Fout bij opslaan duikstekken naar %s (%s)</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>Door automatische synchronisatie uit te zetten, wordt de data alleen lokaal opgeslagen. Dit kan nuttig zijn op plekken zonder mobiele data. Door &quot;Handmatig synchroniseren met cloud&quot;, wordt de data alsnog met de cloud gesynchroniseerd.</translation>
     </message>
-</context>
-<context>
-    <name>main</name>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="15"/>
-        <source>Subsurface-mobile</source>
-        <translation>Subsurface-mobile</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>Duiklijst</translation>
+        <location filename="../mobile-widgets/qml/main.qml" line="339"/>
+        <source>Export</source>
+        <translation>Exporteren</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="233"/>
-        <source>Dive management</source>
-        <translation>Beheer duiken</translation>
+        <location filename="../mobile-widgets/qml/main.qml" line="351"/>
+        <source>Location</source>
+        <translation>Locatie</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="295"/>
-        <source>Disable auto cloud sync</source>
-        <translation>Automatische cloud synchronisatie uitzetten </translation>
+        <location filename="../mobile-widgets/qml/main.qml" line="373"/>
+        <source>Show GPS fixes</source>
+        <translation>Toon GPS fixes</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="295"/>
-        <source>Enable auto cloud sync</source>
-        <translation>Automatische cloud synchronisatie aanzetten </translation>
+        <location filename="../mobile-widgets/qml/main.qml" line="386"/>
+        <source>Clear GPS cache</source>
+        <translation>Maak GPS cache leeg</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>Zet locatie service uit</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="365"/>
-        <source>Settings</source>
-        <translation>Instellingen</translation>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="238"/>
-        <source>Add dive manually</source>
-        <translation>Handmatig duik toevoegen</translation>
+        <location filename="../mobile-widgets/qml/main.qml" line="397"/>
+        <source>Run location service</source>
+        <translation>Draai locatie service</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="252"/>
-        <source>Download from DC</source>
-        <translation>Download uit DC</translation>
+        <location filename="../mobile-widgets/qml/main.qml" line="408"/>
+        <source>Settings</source>
+        <translation>Instellingen</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="273"/>
-        <source>Manual sync with cloud</source>
-        <translation>Handmatig synchroniseren met cloud</translation>
+        <location filename="../mobile-widgets/qml/main.qml" line="421"/>
+        <source>Help</source>
+        <translation>Help</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>Door automatische synchronisatie uit te zetten, wordt de data alleen lokaal opgeslagen. Dit kan nuttig zijn op plekken zonder mobiele data. Door &quot;Handmatig synchroniseren met cloud&quot;, wordt de data alsnog met de cloud gesynchroniseerd.</translation>
+        <location filename="../mobile-widgets/qml/main.qml" line="433"/>
+        <source>About</source>
+        <translation>Over</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="444"/>
+        <source>Show user manual</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="400"/>
-        <source>Help</source>
-        <translation>Help</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="264"/>
-        <source>Apply GPS fixes</source>
-        <translation>GPS fixes toepassen</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="319"/>
-        <source>Show GPS fixes</source>
-        <translation>Toon GPS fixes</translation>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="332"/>
-        <source>Clear GPS cache</source>
-        <translation>Maak GPS cache leeg</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>Ontwikkelaar</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>App log</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="389"/>
-        <source>Theme information</source>
-        <translation>Thema informatie</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>Over</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>Draai locatie service</translation>
+        <location filename="../mobile-widgets/qml/main.qml" line="511"/>
+        <source>Theme information</source>
+        <translation>Thema informatie</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/main.qml" line="519"/>
+        <source>Enable verbose logging</source>
+        <translation type="unfinished"/>
     </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>Hallo Wereld</translation>
+        <location filename="../mobile-widgets/qml/main.qml" line="521"/>
+        <source>Not persistent</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -12665,33 +14085,9 @@ p, li { white-space: pre-wrap; }
         <translation>Planning</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>Min. gaswissel tijd O₂% lager dan 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 decompressie</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 decompressie</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>Reserve gas</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"/>
@@ -12699,14 +14095,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>
@@ -12719,10 +14107,24 @@ p, li { white-space: pre-wrap; }
         <translation>Alleen gaswissels op verplichte stops</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>Plan backgas pauzes</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>Laatste stop op 6m</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"/>
@@ -12734,10 +14136,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>Laatste stop op 6m</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>Plan backgas pauzes</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>Min. gaswissel tijd O₂% lager dan 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>Afdalen tot eerste dieptetrap</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"/>
@@ -12752,28 +14178,22 @@ p, li { white-space: pre-wrap; }
         <translation>Recreatieve mode</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>Afdalen tot eerste dieptetrap</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>Veiligheidsstop</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>Conservatisme niveau</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 decompressie</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>Veiligheidsstop</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="495"/>
@@ -12782,6 +14202,18 @@ p, li { white-space: pre-wrap; }
         <translation>Duikmodus</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 decompressie</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>Reserve gas</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="522"/>
         <source>Bailout: Deco on OC</source>
         <translation>Bailout: Deco op OC</translation>
@@ -12799,29 +14231,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>Notities</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>Gedetailleerd duikplan</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>Toon overgangen of beschouw hen als geïmpliceerd in het duikplan</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>Toon overgangen in deco</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>Toon runtime (absolute tijd) van de pauzes in het duikplan</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>Runtime tonen</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>Toon duur (relatieve tijd) van de pauzes in het duikplan</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>Duur van het segment tonen</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>Bereken variaties op het plan (kost rekentijd)</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>Toon plan variaties</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>Gasverbruik (deco)</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>Gebruikt bij berekenen van Best Mix. Selecteer Best Mix diepte in de &apos;Beschikbare gassen&apos; tabel door gas diepte, gevolgd door &quot;B&quot; (Best Trimix mix) of &quot;BN&quot; (Best Nitrox mix) in te voeren</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>Bereken variaties op het plan (kost rekentijd)</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="754"/>
+        <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="613"/>
+        <source>Bottom SAC</source>
+        <translation>Gasverbruik (bodem)</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>Toon plan variaties</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="761"/>
+        <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="614"/>
+        <source>Bottom pO₂</source>
+        <translation>Bodem pO₂</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>Best mix 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>Deco pO₂</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="782"/>
@@ -12848,100 +14364,106 @@ p, li { white-space: pre-wrap; }
         <translation>Gebruikt om minimum gas te berekenen. Extra tijd op max. diepte na een OoG moment.</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>Gebruikt bij berekenen van Best Mix. Selecteer Best Mix diepte in de &apos;Beschikbare gassen&apos; tabel door gas diepte, gevolgd door &quot;B&quot; (Best Trimix mix) of &quot;BN&quot; (Best Nitrox mix) in te voeren</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>O₂ narcotisch</translation>
     </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>Gasverbruik (bodem)</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>Bodem pO₂</translation>
+        <location filename="../core/uploadDiveLogsDE.cpp" line="76"/>
+        <source>Stylesheet to export to divelogs.de is not found</source>
+        <translation>Stylesheet niet gevonden om naar divelogs.de te exporteren</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>Best mix END</translation>
+        <location filename="../core/uploadDiveLogsDE.cpp" line="86"/>
+        <source>Failed to create zip file for upload: %s</source>
+        <translation>Fout bij aanmaken zip bestand voor upload: %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>Notities</translation>
+        <location filename="../core/uploadDiveLogsDE.cpp" line="148"/>
+        <source>internal error</source>
+        <translation>interne fout</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>Toon runtime (absolute tijd) van de pauzes in het duikplan</translation>
+        <location filename="../core/uploadDiveLogsDE.cpp" line="159"/>
+        <source>Conversion of dive %1 to divelogs.de format failed</source>
+        <translation>Conversie van duik %1 naar divelogs.de formaat is mislukt</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>Runtime tonen</translation>
+        <location filename="../core/uploadDiveLogsDE.cpp" line="187"/>
+        <source>error writing zip file: %s zip error %d system error %d - %s</source>
+        <translation>Fout bij schrijven zip bestand: %s zip fout %d systeem fout %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>Toon duur (relatieve tijd) van de pauzes in het duikplan</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>Duur van het segment tonen</translation>
+        <location filename="../core/uploadDiveLogsDE.cpp" line="294"/>
+        <source>Upload failed</source>
+        <translation>Upload mislukt</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>Toon overgangen of beschouw hen als geïmpliceerd in het duikplan</translation>
+        <location filename="../core/uploadDiveLogsDE.cpp" line="298"/>
+        <source>Upload successful</source>
+        <translation>Upload gelukt</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>Toon overgangen in deco</translation>
+        <location filename="../core/uploadDiveLogsDE.cpp" line="303"/>
+        <source>Login failed</source>
+        <translation>Login mislukt</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>Gedetailleerd duikplan</translation>
+        <location filename="../core/uploadDiveLogsDE.cpp" line="309"/>
+        <location filename="../core/uploadDiveLogsDE.cpp" line="310"/>
+        <source>Cannot parse response</source>
+        <translation>Kan antwoord niet correct ontleden</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>Deco pO₂</translation>
+        <location filename="../core/uploadDiveLogsDE.cpp" line="323"/>
+        <source>divelogs.de not responding</source>
+        <translation>divelogs.de reageert niet</translation>
     </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>Gasverbruik (deco)</translation>
+        <location filename="../core/uploadDiveLogsDE.cpp" line="336"/>
+        <source>network error %1</source>
+        <translation>netwerk fout %1</translation>
+    </message>
+</context>
+<context>
+    <name>uploadDiveShare</name>
+    <message>
+        <location filename="../core/uploadDiveShare.cpp" line="85"/>
+        <source>Upload successful</source>
+        <translation>Upload gelukt</translation>
+    </message>
+    <message>
+        <location filename="../core/uploadDiveShare.cpp" line="97"/>
+        <source>dive-share.com not responding</source>
+        <translation>dive-share.com reageert niet</translation>
+    </message>
+    <message>
+        <location filename="../core/uploadDiveShare.cpp" line="110"/>
+        <source>network error %1</source>
+        <translation>netwerk fout %1</translation>
     </message>
 </context>
 </TS>
\ No newline at end of file